chore(svelte-ast-print): Simplify package.json#exports & expand modules (#117)

Author: xeho91

knip.json

@@ -9,31 +9,31 @@
 			"vite": false
 		},
 		"pkgs/js-ast-analyze": {
-			"entry": ["src/lib.ts"],
+			"entry": ["src/*.ts"],
 			"project": ["**/*.{json,js,ts}"]
 		},
 		"pkgs/js-ast-build": {
-			"entry": ["src/lib.ts"],
+			"entry": ["src/*.ts"],
 			"project": ["**/*.{json,js,ts}"]
 		},
 		"pkgs/ts-ast-analyze": {
-			"entry": ["src/lib.ts"],
+			"entry": ["src/*.ts"],
 			"project": ["**/*.{json,js,ts}"]
 		},
 		"pkgs/ts-ast-build": {
-			"entry": ["src/lib.ts"],
+			"entry": ["src/*.ts"],
 			"project": ["**/*.{json,js,ts}"]
 		},
 		"pkgs/svelte-ast-analyze": {
-			"entry": ["src/lib.ts"],
+			"entry": ["src/*.ts"],
 			"project": ["**/*.{json,js,ts}"]
 		},
 		"pkgs/svelte-ast-build": {
-			"entry": ["src/lib.ts"],
+			"entry": ["src/*.ts"],
 			"project": ["**/*.{json,js,ts}"]
 		},
 		"pkgs/svelte-ast-print": {
-			"entry": ["src/lib.ts"],
+			"entry": ["src/*.ts", "!src/_internal/"],
 			"project": ["**/*.{json,js,ts}"]
 		}
 	}

pkgs/svelte-ast-print/package.json

@@ -38,11 +38,8 @@
 	"files": ["dist/"],
 	"exports": {
 		".": "./dist/lib.js",
-		"./css": "./dist/css/mod.js",
-		"./html": "./dist/html/mod.js",
-		"./js": "./dist/js/mod.js",
-		"./template": "./dist/template/mod.js",
-		"./package.json": "./package.json"
+		"./*": "./dist/*.js",
+		"./_internal/*": null
 	},
 	"scripts": {
 		"build": "pnpm run \"/^build:.*/\" ",

pkgs/svelte-ast-print/src/_internal/shared.ts

@@ -8,7 +8,7 @@ type Node = JS.Node | SvelteOnlyNode;
 
 /**
  * @internal
- * State to store our garbage collectible state for node that is being processed for printing.
+ * Storage to store our garbage collectible state for node that is being processed for printing.
  * Each function call should generate unique identifier to the passed user options - by default is `{}`.
  */
 const STORE = new WeakMap<Node, State>();
@@ -128,7 +128,6 @@ class Collector {
 
 /**
  * @internal
- * @lintignore
  */
 export class Result<N extends Node = Node> {
 	node: N;
@@ -285,3 +284,6 @@ export abstract class Wrapper<T extends WrapperType = WrapperType> {
 		}
 	}
 }
+
+// @ts-expect-error NOTE: This to solve cyclic dependency issue
+export const hub: typeof import("../lib.ts") = {};

pkgs/svelte-ast-print/src/_internal/template/element.ts

@@ -1,6 +1,7 @@
 import type { AST as SV } from "svelte/compiler";
 
-import type { printAttributeLike, printFragment } from "../../template/mod.js";
+import { printAttributeLike } from "../../attribute.ts";
+import { printFragment } from "../../fragment.ts";
 import * as char from "../char.js";
 import { HTMLClosingTag, HTMLOpeningTag, HTMLSelfClosingTag } from "../html.js";
 import type { PrintOptions } from "../option.js";
@@ -91,10 +92,8 @@ function is_el_self_closing(n: SV.ElementLike): boolean {
 export function print_maybe_self_closing_el<N extends SV.ElementLike>(params: {
 	n: N;
 	opts: Partial<PrintOptions>;
-	attr_printer: typeof printAttributeLike;
-	frag_printer: typeof printFragment;
 }): Result<N> {
-	const { n, opts, attr_printer, frag_printer } = params;
+	const { n, opts } = params;
 	const st = State.get(n, opts);
 	const self_closing = is_el_self_closing(n);
 	if (self_closing) {
@@ -104,22 +103,22 @@ export function print_maybe_self_closing_el<N extends SV.ElementLike>(params: {
 			n.name,
 		);
 		if (n.attributes.length > 0) {
-			for (const a of n.attributes) tag.insert(char.SPACE, attr_printer(a));
+			for (const a of n.attributes) tag.insert(char.SPACE, printAttributeLike(a));
 		}
 		tag.insert(char.SPACE);
 		st.add(tag);
 		return st.result;
 	}
 	const opening = new HTMLOpeningTag("inline", n.name);
 	if (n.attributes.length > 0) {
-		for (const a of n.attributes) opening.insert(char.SPACE, attr_printer(a));
+		for (const a of n.attributes) opening.insert(char.SPACE, printAttributeLike(a));
 	}
 	st.add(opening);
 	const should_break =
 		// @ts-expect-error `Set.prototype.has()` doesn't accept loose string
 		!NATIVE_INLINE_ELS.has(n.name) && !has_frag_text_or_exp_tag_only(n.fragment.nodes);
 	if (should_break) st.break(+1);
-	if (n.fragment) st.add(frag_printer(n.fragment, opts));
+	if (n.fragment) st.add(printFragment(n.fragment, opts));
 	if (should_break) st.break(-1);
 	st.add(new HTMLClosingTag("inline", n.name));
 	return st.result;
@@ -132,13 +131,12 @@ export function print_maybe_self_closing_el<N extends SV.ElementLike>(params: {
 export function print_self_closing_el<N extends SV.ElementLike>(params: {
 	n: N;
 	opts: Partial<PrintOptions>;
-	attr_printer: typeof printAttributeLike;
 }): Result<N> {
-	const { n, opts, attr_printer } = params;
+	const { n, opts } = params;
 	const st = State.get(params.n, opts);
 	const tag = new HTMLSelfClosingTag("inline", n.name);
 	if (n.attributes.length > 0) {
-		for (const a of n.attributes) tag.insert(char.SPACE, attr_printer(a, opts));
+		for (const a of n.attributes) tag.insert(char.SPACE, printAttributeLike(a, opts));
 	}
 	tag.insert(char.SPACE);
 	st.add(tag);
@@ -152,21 +150,19 @@ export function print_self_closing_el<N extends SV.ElementLike>(params: {
 export function print_non_self_closing_el<N extends SV.ElementLike>(params: {
 	n: N;
 	opts: Partial<PrintOptions>;
-	attr_printer: typeof printAttributeLike;
-	frag_printer: typeof printFragment;
 }): Result<N> {
-	const { n, opts, attr_printer, frag_printer } = params;
+	const { n, opts } = params;
 	const st = State.get(n, opts);
 	const opening = new HTMLOpeningTag("inline", n.name);
 	if (n.attributes.length > 0) {
-		for (const a of n.attributes) opening.insert(char.SPACE, attr_printer(a));
+		for (const a of n.attributes) opening.insert(char.SPACE, printAttributeLike(a));
 	}
 	st.add(opening);
 	const should_break =
 		// @ts-expect-error `Set.prototype.has()` doesn't accept loose string
 		!NATIVE_INLINE_ELS.has(n.name) && !has_frag_text_or_exp_tag_only(n.fragment.nodes);
 	if (should_break) st.break(+1);
-	st.add(frag_printer(n.fragment, opts));
+	st.add(printFragment(n.fragment, opts));
 	if (should_break) st.break(-1);
 	st.add(new HTMLClosingTag("inline", n.name));
 	return st.result;

pkgs/svelte-ast-print/src/template/attribute.test.ts renamed to pkgs/svelte-ast-print/src/attribute.test.ts

@@ -14,7 +14,7 @@ import {
 	printStyleDirective,
 	printTransitionDirective,
 	printUseDirective,
-} from "./mod.ts";
+} from "./attribute.ts";
 
 vitest.describe(printAttributeLike.name, () => {
 	vitest.describe(printAttribute.name, () => {