@fuzdev/fuz_code 0.42.0 → 0.44.0

package/README.md

@@ -175,7 +175,7 @@ Experimental modules:
 
 ## License [🐦](https://wikipedia.org/wiki/Free_and_open-source_software)
 
-based on [Prism](https://github.com/PrismJS/prism)
+based on [Prism](https://github.com/PrismJS/prism) ([prismjs.com](https://prismjs.com/))
 by [Lea Verou](https://lea.verou.me/)
 
 the [Svelte grammar](src/lib/grammar_svelte.ts)

package/dist/svelte_preprocess_fuz_code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svelte_preprocess_fuz_code.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/svelte_preprocess_fuz_code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,iBAAiB,EAAW,MAAM,iBAAiB,CAAC;AAKxE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAErD,MAAM,WAAW,wBAAwB;IACxC,gCAAgC;IAChC,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAEjC,0DAA0D;IAC1D,aAAa,CAAC,EAAE,YAAY,CAAC;IAE7B,8CAA8C;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAElC;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC;CAC3B;AAED,eAAO,MAAM,0BAA0B,GACtC,UAAS,wBAA6B,KACpC,iBA0DF,CAAC"}
+{"version":3,"file":"svelte_preprocess_fuz_code.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/svelte_preprocess_fuz_code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,iBAAiB,EAAW,MAAM,iBAAiB,CAAC;AAexE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAErD,MAAM,WAAW,wBAAwB;IACxC,gCAAgC;IAChC,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAEjC,0DAA0D;IAC1D,aAAa,CAAC,EAAE,YAAY,CAAC;IAE7B,8CAA8C;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAElC;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC;CAC3B;AAED,eAAO,MAAM,0BAA0B,GACtC,UAAS,wBAA6B,KACpC,iBA6DF,CAAC"}

package/dist/svelte_preprocess_fuz_code.js

@@ -1,16 +1,19 @@
 import { parse } from 'svelte/compiler';
 import MagicString from 'magic-string';
 import { walk } from 'zimmerframe';
+import { should_exclude_path } from '@fuzdev/fuz_util/path.js';
+import { escape_js_string } from '@fuzdev/fuz_util/string.js';
+import { find_attribute, evaluate_static_expr, extract_static_string, build_static_bindings, resolve_component_names, } from '@fuzdev/fuz_util/svelte_preprocess_helpers.js';
 import { syntax_styler_global } from './syntax_styler_global.js';
 export const svelte_preprocess_fuz_code = (options = {}) => {
-    const { exclude = [], syntax_styler = syntax_styler_global, cache = true, component_imports = ['@fuzdev/fuz_code/Code.svelte'], on_error = process.env.CI ? 'throw' : 'log', } = options;
+    const { exclude = [], syntax_styler = syntax_styler_global, cache = true, component_imports = ['@fuzdev/fuz_code/Code.svelte'], on_error = process.env.CI === 'true' ? 'throw' : 'log', } = options;
     // In-memory cache: content+lang hash → highlighted HTML
     const highlight_cache = new Map();
     return {
         name: 'fuz-code',
         markup: ({ content, filename }) => {
             // Skip excluded files
-            if (should_exclude(filename, exclude)) {
+            if (should_exclude_path(filename, exclude)) {
                 return { code: content };
             }
             // Quick check: does file import from a known Code component source?
@@ -20,16 +23,18 @@ export const svelte_preprocess_fuz_code = (options = {}) => {
             const s = new MagicString(content);
             const ast = parse(content, { filename, modern: true });
             // Resolve which local names map to the Code component
-            const code_names = resolve_code_names(ast, component_imports);
+            const code_names = resolve_component_names(ast, component_imports);
             if (code_names.size === 0) {
                 return { code: content };
             }
+            const bindings = build_static_bindings(ast);
             // Find Code component usages with static content
             const transformations = find_code_usages(ast, syntax_styler, code_names, {
                 cache: cache ? highlight_cache : null,
                 on_error,
                 filename,
                 source: content,
+                bindings,
             });
             if (transformations.length === 0) {
                 return { code: content };
@@ -45,39 +50,6 @@ export const svelte_preprocess_fuz_code = (options = {}) => {
         },
     };
 };
-/**
- * Check if a filename matches any exclusion pattern.
- */
-const should_exclude = (filename, exclude) => {
-    if (!filename || exclude.length === 0)
-        return false;
-    return exclude.some((pattern) => typeof pattern === 'string' ? filename.includes(pattern) : pattern.test(filename));
-};
-/**
- * Scans import declarations to find local names that import from known Code component sources.
- * Handles default imports, named imports, and aliased imports.
- * Checks both instance (`<script>`) and module (`<script module>`) scripts.
- */
-const resolve_code_names = (ast, component_imports) => {
-    const names = new Set();
-    for (const script of [ast.instance, ast.module]) {
-        if (!script)
-            continue;
-        for (const node of script.content.body) {
-            if (node.type !== 'ImportDeclaration')
-                continue;
-            if (!component_imports.includes(node.source.value))
-                continue;
-            for (const specifier of node.specifiers) {
-                // default import: `import Code from '...'`
-                // aliased: `import Highlighter from '...'`
-                // named: `import { default as Code } from '...'`
-                names.add(specifier.local.name);
-            }
-        }
-    }
-    return names;
-};
 /**
  * Attempt to highlight content, using cache if available.
  * Returns the highlighted HTML, or `null` on error.
@@ -111,6 +83,9 @@ const find_code_usages = (ast, syntax_styler, code_names, options) => {
             context.next();
             if (!code_names.has(node.name))
                 return;
+            // Skip if spread attributes present — can't determine content statically
+            if (node.attributes.some((attr) => attr.type === 'SpreadAttribute'))
+                return;
             const content_attr = find_attribute(node, 'content');
             if (!content_attr)
                 return;
@@ -122,13 +97,15 @@ const find_code_usages = (ast, syntax_styler, code_names, options) => {
             }
             // Resolve language - must be static and supported
             const lang_attr = find_attribute(node, 'lang');
-            const lang_value = lang_attr ? extract_static_string(lang_attr.value) : 'svelte';
+            const lang_value = lang_attr
+                ? extract_static_string(lang_attr.value, options.bindings)
+                : 'svelte';
             if (lang_value === null)
                 return;
             if (!syntax_styler.langs[lang_value])
                 return;
             // Try simple static string
-            const content_value = extract_static_string(content_attr.value);
+            const content_value = extract_static_string(content_attr.value, options.bindings);
             if (content_value !== null) {
                 const html = try_highlight(content_value, lang_value, syntax_styler, options);
                 if (html === null || html === content_value)
@@ -141,7 +118,7 @@ const find_code_usages = (ast, syntax_styler, code_names, options) => {
                 return;
             }
             // Try conditional expression with static string branches
-            const conditional = try_extract_conditional(content_attr.value, options.source);
+            const conditional = try_extract_conditional(content_attr.value, options.source, options.bindings);
             if (conditional) {
                 const html_a = try_highlight(conditional.consequent, lang_value, syntax_styler, options);
                 const html_b = try_highlight(conditional.alternate, lang_value, syntax_styler, options);
@@ -159,94 +136,26 @@ const find_code_usages = (ast, syntax_styler, code_names, options) => {
     });
     return transformations;
 };
-/**
- * Find an attribute by name on a component node.
- */
-const find_attribute = (node, name) => {
-    for (const attr of node.attributes) {
-        if (attr.type === 'Attribute' && attr.name === name) {
-            return attr;
-        }
-    }
-    return undefined;
-};
-/**
- * Recursively evaluate an expression AST node to a static string value.
- * Handles string literals, template literals (no interpolation), and string concatenation.
- * Returns `null` for dynamic or non-string expressions.
- */
-const evaluate_static_expr = (expr) => {
-    if (expr.type === 'Literal' && typeof expr.value === 'string')
-        return expr.value;
-    if (expr.type === 'TemplateLiteral' && expr.expressions.length === 0) {
-        return expr.quasis.map((q) => q.value.cooked ?? q.value.raw).join('');
-    }
-    if (expr.type === 'BinaryExpression' && expr.operator === '+') {
-        const left = evaluate_static_expr(expr.left);
-        if (left === null)
-            return null;
-        const right = evaluate_static_expr(expr.right);
-        if (right === null)
-            return null;
-        return left + right;
-    }
-    return null;
-};
-/**
- * Extract the string value from a static attribute value.
- * Returns `null` for dynamic, non-string, or null literal values.
- */
-const extract_static_string = (value) => {
-    // Boolean attribute
-    if (value === true)
-        return null;
-    // Plain attribute: content="text"
-    if (Array.isArray(value)) {
-        const first = value[0];
-        if (value.length === 1 && first?.type === 'Text') {
-            return first.data;
-        }
-        return null;
-    }
-    // ExpressionTag
-    const expr = value.expression;
-    // Null literal
-    if (expr.type === 'Literal' && expr.value === null)
-        return null;
-    return evaluate_static_expr(expr);
-};
 /**
  * Try to extract a conditional expression where both branches are static strings.
  * Returns the condition source text and both branch values, or `null` if not applicable.
  */
-const try_extract_conditional = (value, source) => {
+const try_extract_conditional = (value, source, bindings) => {
     if (value === true || Array.isArray(value))
         return null;
     const expr = value.expression;
     if (expr.type !== 'ConditionalExpression')
         return null;
-    const consequent = evaluate_static_expr(expr.consequent);
+    const consequent = evaluate_static_expr(expr.consequent, bindings);
     if (consequent === null)
         return null;
-    const alternate = evaluate_static_expr(expr.alternate);
+    const alternate = evaluate_static_expr(expr.alternate, bindings);
     if (alternate === null)
         return null;
     const test = expr.test;
     const test_source = source.slice(test.start, test.end);
     return { test_source, consequent, alternate };
 };
-/**
- * Escapes a string for use inside a single-quoted JS string literal.
- * Single quotes are used because `stylize()` output contains double quotes
- * on every token span, so wrapping with single quotes avoids escaping those.
- */
-const escape_js_string = (html) => {
-    return html
-        .replace(/\\/g, '\\\\') // backslashes first
-        .replace(/'/g, "\\'") // single quotes
-        .replace(/\n/g, '\\n') // newlines
-        .replace(/\r/g, '\\r'); // carriage returns
-};
 /**
  * Handle errors during highlighting.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fuzdev/fuz_code",
-  "version": "0.42.0",
+  "version": "0.44.0",
   "description": "syntax styling utilities and components for TypeScript, Svelte, and Markdown",
   "glyph": "🎨",
   "logo": "logo.svg",
@@ -32,7 +32,9 @@
     "node": ">=22.15"
   },
   "peerDependencies": {
-    "@fuzdev/fuz_css": ">=0.44.1",
+    "@fuzdev/fuz_css": ">=0.47.0",
+    "@fuzdev/fuz_util": ">=0.49.2",
+    "esm-env": "^1",
     "magic-string": "^0.30",
     "svelte": "^5",
     "zimmerframe": "^1"
@@ -41,6 +43,9 @@
     "@fuzdev/fuz_css": {
       "optional": true
     },
+    "@fuzdev/fuz_util": {
+      "optional": true
+    },
     "magic-string": {
       "optional": true
     },
@@ -55,9 +60,9 @@
     "@changesets/changelog-git": "^0.2.1",
     "@fuzdev/fuz_css": "^0.47.0",
     "@fuzdev/fuz_ui": "^0.181.1",
-    "@fuzdev/fuz_util": "^0.48.3",
+    "@fuzdev/fuz_util": "^0.49.2",
     "@ryanatkn/eslint-config": "^0.9.0",
-    "@ryanatkn/gro": "^0.190.0",
+    "@ryanatkn/gro": "^0.191.0",
     "@sveltejs/adapter-static": "^3.0.10",
     "@sveltejs/kit": "^2.50.1",
     "@sveltejs/package": "^2.5.7",

package/src/lib/svelte_preprocess_fuz_code.ts

@@ -1,6 +1,16 @@
 import {parse, type PreprocessorGroup, type AST} from 'svelte/compiler';
 import MagicString from 'magic-string';
 import {walk} from 'zimmerframe';
+import {should_exclude_path} from '@fuzdev/fuz_util/path.js';
+import {escape_js_string} from '@fuzdev/fuz_util/string.js';
+import {
+	find_attribute,
+	evaluate_static_expr,
+	extract_static_string,
+	build_static_bindings,
+	resolve_component_names,
+	type ResolvedComponentImport,
+} from '@fuzdev/fuz_util/svelte_preprocess_helpers.js';
 
 import {syntax_styler_global} from './syntax_styler_global.js';
 import type {SyntaxStyler} from './syntax_styler.js';
@@ -38,7 +48,7 @@ export const svelte_preprocess_fuz_code = (
 		syntax_styler = syntax_styler_global,
 		cache = true,
 		component_imports = ['@fuzdev/fuz_code/Code.svelte'],
-		on_error = process.env.CI ? 'throw' : 'log',
+		on_error = process.env.CI === 'true' ? 'throw' : 'log',
 	} = options;
 
 	// In-memory cache: content+lang hash → highlighted HTML
@@ -49,7 +59,7 @@ export const svelte_preprocess_fuz_code = (
 
 		markup: ({content, filename}) => {
 			// Skip excluded files
-			if (should_exclude(filename, exclude)) {
+			if (should_exclude_path(filename, exclude)) {
 				return {code: content};
 			}
 
@@ -62,17 +72,20 @@ export const svelte_preprocess_fuz_code = (
 			const ast = parse(content, {filename, modern: true});
 
 			// Resolve which local names map to the Code component
-			const code_names = resolve_code_names(ast, component_imports);
+			const code_names = resolve_component_names(ast, component_imports);
 			if (code_names.size === 0) {
 				return {code: content};
 			}
 
+			const bindings = build_static_bindings(ast);
+
 			// Find Code component usages with static content
 			const transformations = find_code_usages(ast, syntax_styler, code_names, {
 				cache: cache ? highlight_cache : null,
 				on_error,
 				filename,
 				source: content,
+				bindings,
 			});
 
 			if (transformations.length === 0) {
@@ -92,43 +105,6 @@ export const svelte_preprocess_fuz_code = (
 	};
 };
 
-/**
- * Check if a filename matches any exclusion pattern.
- */
-const should_exclude = (filename: string | undefined, exclude: Array<string | RegExp>): boolean => {
-	if (!filename || exclude.length === 0) return false;
-	return exclude.some((pattern) =>
-		typeof pattern === 'string' ? filename.includes(pattern) : pattern.test(filename),
-	);
-};
-
-/**
- * Scans import declarations to find local names that import from known Code component sources.
- * Handles default imports, named imports, and aliased imports.
- * Checks both instance (`<script>`) and module (`<script module>`) scripts.
- */
-const resolve_code_names = (ast: AST.Root, component_imports: Array<string>): Set<string> => {
-	const names: Set<string> = new Set();
-
-	for (const script of [ast.instance, ast.module]) {
-		if (!script) continue;
-
-		for (const node of script.content.body) {
-			if (node.type !== 'ImportDeclaration') continue;
-			if (!component_imports.includes(node.source.value as string)) continue;
-
-			for (const specifier of node.specifiers) {
-				// default import: `import Code from '...'`
-				// aliased: `import Highlighter from '...'`
-				// named: `import { default as Code } from '...'`
-				names.add(specifier.local.name);
-			}
-		}
-	}
-
-	return names;
-};
-
 interface Transformation {
 	start: number;
 	end: number;
@@ -140,6 +116,7 @@ interface FindCodeUsagesOptions {
 	on_error: 'log' | 'throw';
 	filename: string | undefined;
 	source: string;
+	bindings: ReadonlyMap<string, string>;
 }
 
 /**
@@ -173,7 +150,7 @@ const try_highlight = (
 const find_code_usages = (
 	ast: AST.Root,
 	syntax_styler: SyntaxStyler,
-	code_names: Set<string>,
+	code_names: Map<string, ResolvedComponentImport>,
 	options: FindCodeUsagesOptions,
 ): Array<Transformation> => {
 	const transformations: Array<Transformation> = [];
@@ -187,6 +164,9 @@ const find_code_usages = (
 
 			if (!code_names.has(node.name)) return;
 
+			// Skip if spread attributes present — can't determine content statically
+			if (node.attributes.some((attr: any) => attr.type === 'SpreadAttribute')) return;
+
 			const content_attr = find_attribute(node, 'content');
 			if (!content_attr) return;
 
@@ -201,12 +181,14 @@ const find_code_usages = (
 
 			// Resolve language - must be static and supported
 			const lang_attr = find_attribute(node, 'lang');
-			const lang_value = lang_attr ? extract_static_string(lang_attr.value) : 'svelte';
+			const lang_value = lang_attr
+				? extract_static_string(lang_attr.value, options.bindings)
+				: 'svelte';
 			if (lang_value === null) return;
 			if (!syntax_styler.langs[lang_value]) return;
 
 			// Try simple static string
-			const content_value = extract_static_string(content_attr.value);
+			const content_value = extract_static_string(content_attr.value, options.bindings);
 			if (content_value !== null) {
 				const html = try_highlight(content_value, lang_value, syntax_styler, options);
 				if (html === null || html === content_value) return;
@@ -219,7 +201,11 @@ const find_code_usages = (
 			}
 
 			// Try conditional expression with static string branches
-			const conditional = try_extract_conditional(content_attr.value, options.source);
+			const conditional = try_extract_conditional(
+				content_attr.value,
+				options.source,
+				options.bindings,
+			);
 			if (conditional) {
 				const html_a = try_highlight(conditional.consequent, lang_value, syntax_styler, options);
 				const html_b = try_highlight(conditional.alternate, lang_value, syntax_styler, options);
@@ -237,63 +223,7 @@ const find_code_usages = (
 	return transformations;
 };
 
-/**
- * Find an attribute by name on a component node.
- */
-const find_attribute = (node: AST.Component, name: string): AST.Attribute | undefined => {
-	for (const attr of node.attributes) {
-		if (attr.type === 'Attribute' && attr.name === name) {
-			return attr;
-		}
-	}
-	return undefined;
-};
-
-type Attribute_Value = AST.Attribute['value'];
-
-/**
- * Recursively evaluate an expression AST node to a static string value.
- * Handles string literals, template literals (no interpolation), and string concatenation.
- * Returns `null` for dynamic or non-string expressions.
- */
-const evaluate_static_expr = (expr: any): string | null => {
-	if (expr.type === 'Literal' && typeof expr.value === 'string') return expr.value;
-	if (expr.type === 'TemplateLiteral' && expr.expressions.length === 0) {
-		return expr.quasis.map((q: any) => q.value.cooked ?? q.value.raw).join('');
-	}
-	if (expr.type === 'BinaryExpression' && expr.operator === '+') {
-		const left = evaluate_static_expr(expr.left);
-		if (left === null) return null;
-		const right = evaluate_static_expr(expr.right);
-		if (right === null) return null;
-		return left + right;
-	}
-	return null;
-};
-
-/**
- * Extract the string value from a static attribute value.
- * Returns `null` for dynamic, non-string, or null literal values.
- */
-const extract_static_string = (value: Attribute_Value): string | null => {
-	// Boolean attribute
-	if (value === true) return null;
-
-	// Plain attribute: content="text"
-	if (Array.isArray(value)) {
-		const first = value[0];
-		if (value.length === 1 && first?.type === 'Text') {
-			return first.data;
-		}
-		return null;
-	}
-
-	// ExpressionTag
-	const expr = value.expression;
-	// Null literal
-	if (expr.type === 'Literal' && expr.value === null) return null;
-	return evaluate_static_expr(expr);
-};
+type AttributeValue = AST.Attribute['value'];
 
 interface ConditionalStaticStrings {
 	test_source: string;
@@ -306,16 +236,17 @@ interface ConditionalStaticStrings {
  * Returns the condition source text and both branch values, or `null` if not applicable.
  */
 const try_extract_conditional = (
-	value: Attribute_Value,
+	value: AttributeValue,
 	source: string,
+	bindings: ReadonlyMap<string, string>,
 ): ConditionalStaticStrings | null => {
 	if (value === true || Array.isArray(value)) return null;
 	const expr = value.expression;
 	if (expr.type !== 'ConditionalExpression') return null;
 
-	const consequent = evaluate_static_expr(expr.consequent);
+	const consequent = evaluate_static_expr(expr.consequent, bindings);
 	if (consequent === null) return null;
-	const alternate = evaluate_static_expr(expr.alternate);
+	const alternate = evaluate_static_expr(expr.alternate, bindings);
 	if (alternate === null) return null;
 
 	const test = expr.test as any;
@@ -323,19 +254,6 @@ const try_extract_conditional = (
 	return {test_source, consequent, alternate};
 };
 
-/**
- * Escapes a string for use inside a single-quoted JS string literal.
- * Single quotes are used because `stylize()` output contains double quotes
- * on every token span, so wrapping with single quotes avoids escaping those.
- */
-const escape_js_string = (html: string): string => {
-	return html
-		.replace(/\\/g, '\\\\') // backslashes first
-		.replace(/'/g, "\\'") // single quotes
-		.replace(/\n/g, '\\n') // newlines
-		.replace(/\r/g, '\\r'); // carriage returns
-};
-
 /**
  * Handle errors during highlighting.
  */