@fuzdev/fuz_code 0.43.0 → 0.44.1

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;AAcxE,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;AAgBxE,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

@@ -3,10 +3,10 @@ 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, resolve_component_names, } from '@fuzdev/fuz_util/svelte_preprocess_helpers.js';
+import { find_attribute, extract_static_string, try_extract_conditional_chain, build_static_bindings, resolve_component_names, handle_preprocess_error, } 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 {
@@ -27,12 +27,14 @@ export const svelte_preprocess_fuz_code = (options = {}) => {
             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 };
@@ -61,7 +63,7 @@ const try_highlight = (text, lang, syntax_styler, options) => {
             options.cache?.set(cache_key, html);
         }
         catch (error) {
-            handle_error(error, options);
+            handle_preprocess_error(error, '[fuz-code]', options.filename, options.on_error);
             return null;
         }
     }
@@ -95,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)
@@ -113,53 +117,43 @@ 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);
-            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);
-                if (html_a === null || html_b === null)
-                    return;
-                if (html_a === conditional.consequent && html_b === conditional.alternate)
+            // Try conditional chain (handles both simple and nested ternaries)
+            const chain = try_extract_conditional_chain(content_attr.value, options.source, options.bindings);
+            if (chain) {
+                // Highlight all branches
+                const highlighted = [];
+                let any_changed = false;
+                for (const branch of chain) {
+                    const html = try_highlight(branch.value, lang_value, syntax_styler, options);
+                    if (html === null)
+                        return;
+                    if (html !== branch.value)
+                        any_changed = true;
+                    highlighted.push({ html, original: branch.value });
+                }
+                if (!any_changed)
                     return;
+                // Build nested ternary expression for dangerous_raw_html
+                // chain: [{test_source: 'a', value: ...}, {test_source: 'b', value: ...}, {test_source: null, value: ...}]
+                // → a ? 'html_a' : b ? 'html_b' : 'html_c'
+                let expr = '';
+                for (let i = 0; i < chain.length; i++) {
+                    const branch = chain[i];
+                    const html = highlighted[i].html;
+                    if (branch.test_source !== null) {
+                        expr += `${branch.test_source} ? '${escape_js_string(html)}' : `;
+                    }
+                    else {
+                        expr += `'${escape_js_string(html)}'`;
+                    }
+                }
                 transformations.push({
                     start: content_attr.start,
                     end: content_attr.end,
-                    replacement: `dangerous_raw_html={${conditional.test_source} ? '${escape_js_string(html_a)}' : '${escape_js_string(html_b)}'}`,
+                    replacement: `dangerous_raw_html={${expr}}`,
                 });
             }
         },
     });
     return transformations;
 };
-/**
- * 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) => {
-    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);
-    if (consequent === null)
-        return null;
-    const alternate = evaluate_static_expr(expr.alternate);
-    if (alternate === null)
-        return null;
-    const test = expr.test;
-    const test_source = source.slice(test.start, test.end);
-    return { test_source, consequent, alternate };
-};
-/**
- * Handle errors during highlighting.
- */
-const handle_error = (error, options) => {
-    const message = `[fuz-code] Highlighting failed${options.filename ? ` in ${options.filename}` : ''}: ${error instanceof Error ? error.message : String(error)}`;
-    if (options.on_error === 'throw') {
-        throw new Error(message);
-    }
-    // eslint-disable-next-line no-console
-    console.error(message);
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fuzdev/fuz_code",
-  "version": "0.43.0",
+  "version": "0.44.1",
   "description": "syntax styling utilities and components for TypeScript, Svelte, and Markdown",
   "glyph": "🎨",
   "logo": "logo.svg",
@@ -32,8 +32,8 @@
     "node": ">=22.15"
   },
   "peerDependencies": {
-    "@fuzdev/fuz_css": ">=0.44.1",
-    "@fuzdev/fuz_util": ">=0.49.0",
+    "@fuzdev/fuz_css": ">=0.47.0",
+    "@fuzdev/fuz_util": ">=0.49.2",
     "esm-env": "^1",
     "magic-string": "^0.30",
     "svelte": "^5",
@@ -60,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.49.0",
+    "@fuzdev/fuz_util": "^0.50.0",
     "@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

@@ -5,9 +5,11 @@ 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,
+	try_extract_conditional_chain,
+	build_static_bindings,
 	resolve_component_names,
+	handle_preprocess_error,
 	type ResolvedComponentImport,
 } from '@fuzdev/fuz_util/svelte_preprocess_helpers.js';
 
@@ -47,7 +49,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
@@ -76,12 +78,15 @@ export const svelte_preprocess_fuz_code = (
 				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) {
@@ -112,6 +117,7 @@ interface FindCodeUsagesOptions {
 	on_error: 'log' | 'throw';
 	filename: string | undefined;
 	source: string;
+	bindings: ReadonlyMap<string, string>;
 }
 
 /**
@@ -131,7 +137,7 @@ const try_highlight = (
 			html = syntax_styler.stylize(text, lang);
 			options.cache?.set(cache_key, html);
 		} catch (error) {
-			handle_error(error, options);
+			handle_preprocess_error(error, '[fuz-code]', options.filename, options.on_error);
 			return null;
 		}
 	}
@@ -160,7 +166,7 @@ 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;
+			if (node.attributes.some((attr) => attr.type === 'SpreadAttribute')) return;
 
 			const content_attr = find_attribute(node, 'content');
 			if (!content_attr) return;
@@ -176,12 +182,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;
@@ -193,17 +201,42 @@ const find_code_usages = (
 				return;
 			}
 
-			// Try conditional expression with static string branches
-			const conditional = try_extract_conditional(content_attr.value, options.source);
-			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);
-				if (html_a === null || html_b === null) return;
-				if (html_a === conditional.consequent && html_b === conditional.alternate) return;
+			// Try conditional chain (handles both simple and nested ternaries)
+			const chain = try_extract_conditional_chain(
+				content_attr.value,
+				options.source,
+				options.bindings,
+			);
+			if (chain) {
+				// Highlight all branches
+				const highlighted: Array<{html: string; original: string}> = [];
+				let any_changed = false;
+				for (const branch of chain) {
+					const html = try_highlight(branch.value, lang_value, syntax_styler, options);
+					if (html === null) return;
+					if (html !== branch.value) any_changed = true;
+					highlighted.push({html, original: branch.value});
+				}
+				if (!any_changed) return;
+
+				// Build nested ternary expression for dangerous_raw_html
+				// chain: [{test_source: 'a', value: ...}, {test_source: 'b', value: ...}, {test_source: null, value: ...}]
+				// → a ? 'html_a' : b ? 'html_b' : 'html_c'
+				let expr = '';
+				for (let i = 0; i < chain.length; i++) {
+					const branch = chain[i]!;
+					const html = highlighted[i]!.html;
+					if (branch.test_source !== null) {
+						expr += `${branch.test_source} ? '${escape_js_string(html)}' : `;
+					} else {
+						expr += `'${escape_js_string(html)}'`;
+					}
+				}
+
 				transformations.push({
 					start: content_attr.start,
 					end: content_attr.end,
-					replacement: `dangerous_raw_html={${conditional.test_source} ? '${escape_js_string(html_a)}' : '${escape_js_string(html_b)}'}`,
+					replacement: `dangerous_raw_html={${expr}}`,
 				});
 			}
 		},
@@ -211,46 +244,3 @@ const find_code_usages = (
 
 	return transformations;
 };
-
-type Attribute_Value = AST.Attribute['value'];
-
-interface ConditionalStaticStrings {
-	test_source: string;
-	consequent: string;
-	alternate: string;
-}
-
-/**
- * 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: Attribute_Value,
-	source: 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);
-	if (consequent === null) return null;
-	const alternate = evaluate_static_expr(expr.alternate);
-	if (alternate === null) return null;
-
-	const test = expr.test as any;
-	const test_source = source.slice(test.start, test.end);
-	return {test_source, consequent, alternate};
-};
-
-/**
- * Handle errors during highlighting.
- */
-const handle_error = (error: unknown, options: FindCodeUsagesOptions): void => {
-	const message = `[fuz-code] Highlighting failed${options.filename ? ` in ${options.filename}` : ''}: ${error instanceof Error ? error.message : String(error)}`;
-
-	if (options.on_error === 'throw') {
-		throw new Error(message);
-	}
-	// eslint-disable-next-line no-console
-	console.error(message);
-};