@fuzdev/fuz_util 0.49.1 → 0.49.3

package/dist/svelte_preprocess_helpers.d.ts

@@ -67,6 +67,31 @@ export declare const evaluate_static_expr: (expr: Expression, bindings?: Readonl
  * @returns The resolved static string, or `null` if the value is dynamic.
  */
 export declare const extract_static_string: (value: AST.Attribute["value"], bindings?: ReadonlyMap<string, string>) => string | null;
+/** Result of extracting a conditional expression with static string branches. */
+export interface ConditionalStaticStrings {
+    /** The source text of the test/condition expression. */
+    test_source: string;
+    /** The static string value of the consequent (truthy) branch. */
+    consequent: string;
+    /** The static string value of the alternate (falsy) branch. */
+    alternate: string;
+}
+/**
+ * Extracts a conditional expression where both branches are static strings.
+ *
+ * Handles `content={test ? 'a' : 'b'}` where both the consequent and alternate
+ * branches resolve to static strings via `evaluate_static_expr`. The test expression
+ * is preserved as source text (sliced from the original source) since it may be dynamic.
+ *
+ * Returns `null` if the attribute value is not an `ExpressionTag` containing a
+ * `ConditionalExpression`, or if either branch is not statically resolvable.
+ *
+ * @param value The attribute value from `AST.Attribute['value']`.
+ * @param source The full source string (needed to slice the test expression source text).
+ * @param bindings Map of variable names to their resolved static string values.
+ * @returns The condition source and both branch values, or `null` if not extractable.
+ */
+export declare const try_extract_conditional: (value: AST.Attribute["value"], source: string, bindings: ReadonlyMap<string, string>) => ConditionalStaticStrings | null;
 /**
  * Builds a map of statically resolvable `const` bindings from a Svelte AST.
  *
@@ -123,6 +148,10 @@ export declare const generate_import_lines: (imports: Map<string, PreprocessImpo
  * `skip` set are excluded from traversal — used to skip `ImportDeclaration`
  * nodes so the import's own specifier identifier doesn't false-positive.
  *
+ * Skips `Identifier` nodes in non-reference positions defined by
+ * `NON_REFERENCE_FIELDS` — for example, `obj.Mdz` (non-computed member property),
+ * `{ Mdz: value }` (non-computed object key), and statement labels.
+ *
  * Safe for Svelte template ASTs: `Component.name` is a plain string property
  * (not an `Identifier` node), so `<Mdz>` tags do not produce false matches.
  *

package/dist/svelte_preprocess_helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svelte_preprocess_helpers.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/svelte_preprocess_helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAC,UAAU,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,eAAe,EAAC,MAAM,QAAQ,CAAC;AACnG,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAEzC,qDAAqD;AACrD,MAAM,WAAW,oBAAoB;IACpC,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,iDAAiD;IACjD,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC;CAC1B;AAED,qDAAqD;AACrD,MAAM,WAAW,uBAAuB;IACvC,gEAAgE;IAChE,WAAW,EAAE,iBAAiB,CAAC;IAC/B,mDAAmD;IACnD,SAAS,EAAE,eAAe,GAAG,sBAAsB,CAAC;CACpD;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,GAAG,CAAC,SAAS,EAAE,MAAM,MAAM,KAAG,GAAG,CAAC,SAAS,GAAG,SAOlF,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,GAChC,MAAM,UAAU,EAChB,WAAW,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,KACpC,MAAM,GAAG,IA+BX,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,GACjC,OAAO,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,EAC7B,WAAW,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,KACpC,MAAM,GAAG,IAkBX,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qBAAqB,GAAI,KAAK,GAAG,CAAC,IAAI,KAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAiBvE,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,uBAAuB,GACnC,KAAK,GAAG,CAAC,IAAI,EACb,mBAAmB,KAAK,CAAC,MAAM,CAAC,KAC9B,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAcrC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,2BAA2B,GAAI,QAAQ,GAAG,CAAC,MAAM,KAAG,MAYhE,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,qBAAqB,GACjC,SAAS,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC1C,SAAQ,MAAa,KACnB,MAyBF,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,sBAAsB,GAClC,MAAM,OAAO,EACb,MAAM,MAAM,EACZ,OAAO,GAAG,CAAC,OAAO,CAAC,KACjB,OAYF,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MAc/C,CAAC"}
+{"version":3,"file":"svelte_preprocess_helpers.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/svelte_preprocess_helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAC,UAAU,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,eAAe,EAAC,MAAM,QAAQ,CAAC;AACnG,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAEzC,qDAAqD;AACrD,MAAM,WAAW,oBAAoB;IACpC,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,iDAAiD;IACjD,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC;CAC1B;AAED,qDAAqD;AACrD,MAAM,WAAW,uBAAuB;IACvC,gEAAgE;IAChE,WAAW,EAAE,iBAAiB,CAAC;IAC/B,mDAAmD;IACnD,SAAS,EAAE,eAAe,GAAG,sBAAsB,CAAC;CACpD;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,GAAG,CAAC,SAAS,EAAE,MAAM,MAAM,KAAG,GAAG,CAAC,SAAS,GAAG,SAOlF,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,GAChC,MAAM,UAAU,EAChB,WAAW,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,KACpC,MAAM,GAAG,IA+BX,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,GACjC,OAAO,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,EAC7B,WAAW,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,KACpC,MAAM,GAAG,IAkBX,CAAC;AAEF,iFAAiF;AACjF,MAAM,WAAW,wBAAwB;IACxC,wDAAwD;IACxD,WAAW,EAAE,MAAM,CAAC;IACpB,iEAAiE;IACjE,UAAU,EAAE,MAAM,CAAC;IACnB,+DAA+D;IAC/D,SAAS,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,uBAAuB,GACnC,OAAO,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,EAC7B,QAAQ,MAAM,EACd,UAAU,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,KACnC,wBAAwB,GAAG,IAa7B,CAAC;AAOF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qBAAqB,GAAI,KAAK,GAAG,CAAC,IAAI,KAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAiBvE,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,uBAAuB,GACnC,KAAK,GAAG,CAAC,IAAI,EACb,mBAAmB,KAAK,CAAC,MAAM,CAAC,KAC9B,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAcrC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,2BAA2B,GAAI,QAAQ,GAAG,CAAC,MAAM,KAAG,MAYhE,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,qBAAqB,GACjC,SAAS,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC1C,SAAQ,MAAa,KACnB,MAyBF,CAAC;AA0BF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,sBAAsB,GAClC,MAAM,OAAO,EACb,MAAM,MAAM,EACZ,OAAO,GAAG,CAAC,OAAO,CAAC,KACjB,OAgBF,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MAc/C,CAAC"}

package/dist/svelte_preprocess_helpers.js

@@ -112,6 +112,41 @@ export const extract_static_string = (value, bindings) => {
         return null;
     return evaluate_static_expr(expr, bindings);
 };
+/**
+ * Extracts a conditional expression where both branches are static strings.
+ *
+ * Handles `content={test ? 'a' : 'b'}` where both the consequent and alternate
+ * branches resolve to static strings via `evaluate_static_expr`. The test expression
+ * is preserved as source text (sliced from the original source) since it may be dynamic.
+ *
+ * Returns `null` if the attribute value is not an `ExpressionTag` containing a
+ * `ConditionalExpression`, or if either branch is not statically resolvable.
+ *
+ * @param value The attribute value from `AST.Attribute['value']`.
+ * @param source The full source string (needed to slice the test expression source text).
+ * @param bindings Map of variable names to their resolved static string values.
+ * @returns The condition source and both branch values, or `null` if not extractable.
+ */
+export 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, bindings);
+    if (consequent === null)
+        return null;
+    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 };
+};
+// TODO cross-import tracing: resolve `import {x} from './constants.js'` by reading
+// and parsing the imported module, extracting `export const` values. Would need path
+// resolution ($lib, tsconfig paths), a Program-node variant of this function, and
+// cache invalidation when the imported file changes. Start with relative .ts/.js only.
 /**
  * Builds a map of statically resolvable `const` bindings from a Svelte AST.
  *
@@ -235,6 +270,26 @@ export const generate_import_lines = (imports, indent = '\t') => {
     }
     return lines.join('\n');
 };
+/**
+ * ESTree node fields that contain `Identifier` nodes which are NOT binding references.
+ *
+ * Keyed by node type. Each entry lists fields to skip during identifier search,
+ * optionally conditioned on the node's `computed` property being falsy.
+ *
+ * Examples of non-reference positions:
+ * - `obj.Mdz` — `MemberExpression.property` when `computed: false`
+ * - `{ Mdz: value }` — `Property.key` when `computed: false`
+ * - `label: for(...)` — `LabeledStatement.label`
+ */
+const NON_REFERENCE_FIELDS = new Map([
+    ['MemberExpression', [{ field: 'property', when_not_computed: true }]],
+    ['Property', [{ field: 'key', when_not_computed: true }]],
+    ['PropertyDefinition', [{ field: 'key', when_not_computed: true }]],
+    ['MethodDefinition', [{ field: 'key', when_not_computed: true }]],
+    ['LabeledStatement', [{ field: 'label' }]],
+    ['BreakStatement', [{ field: 'label' }]],
+    ['ContinueStatement', [{ field: 'label' }]],
+]);
 /**
  * Checks if an identifier with the given name appears anywhere in an AST subtree.
  *
@@ -243,6 +298,10 @@ export const generate_import_lines = (imports, indent = '\t') => {
  * `skip` set are excluded from traversal — used to skip `ImportDeclaration`
  * nodes so the import's own specifier identifier doesn't false-positive.
  *
+ * Skips `Identifier` nodes in non-reference positions defined by
+ * `NON_REFERENCE_FIELDS` — for example, `obj.Mdz` (non-computed member property),
+ * `{ Mdz: value }` (non-computed object key), and statement labels.
+ *
  * Safe for Svelte template ASTs: `Component.name` is a plain string property
  * (not an `Identifier` node), so `<Mdz>` tags do not produce false matches.
  *
@@ -262,7 +321,11 @@ export const has_identifier_in_tree = (node, name, skip) => {
     const record = node;
     if (record.type === 'Identifier' && record.name === name)
         return true;
+    const rules = NON_REFERENCE_FIELDS.get(record.type);
     for (const key of Object.keys(record)) {
+        if (rules?.some((r) => r.field === key && (!r.when_not_computed || !record.computed))) {
+            continue;
+        }
         if (has_identifier_in_tree(record[key], name, skip))
             return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fuzdev/fuz_util",
-  "version": "0.49.1",
+  "version": "0.49.3",
   "description": "utility belt for JS",
   "glyph": "🦕",
   "logo": "logo.svg",

package/src/lib/svelte_preprocess_helpers.ts

@@ -136,6 +136,55 @@ export const extract_static_string = (
 	return evaluate_static_expr(expr, bindings);
 };
 
+/** Result of extracting a conditional expression with static string branches. */
+export interface ConditionalStaticStrings {
+	/** The source text of the test/condition expression. */
+	test_source: string;
+	/** The static string value of the consequent (truthy) branch. */
+	consequent: string;
+	/** The static string value of the alternate (falsy) branch. */
+	alternate: string;
+}
+
+/**
+ * Extracts a conditional expression where both branches are static strings.
+ *
+ * Handles `content={test ? 'a' : 'b'}` where both the consequent and alternate
+ * branches resolve to static strings via `evaluate_static_expr`. The test expression
+ * is preserved as source text (sliced from the original source) since it may be dynamic.
+ *
+ * Returns `null` if the attribute value is not an `ExpressionTag` containing a
+ * `ConditionalExpression`, or if either branch is not statically resolvable.
+ *
+ * @param value The attribute value from `AST.Attribute['value']`.
+ * @param source The full source string (needed to slice the test expression source text).
+ * @param bindings Map of variable names to their resolved static string values.
+ * @returns The condition source and both branch values, or `null` if not extractable.
+ */
+export const try_extract_conditional = (
+	value: AST.Attribute['value'],
+	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, bindings);
+	if (consequent === null) return null;
+	const alternate = evaluate_static_expr(expr.alternate, bindings);
+	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};
+};
+
+// TODO cross-import tracing: resolve `import {x} from './constants.js'` by reading
+// and parsing the imported module, extracting `export const` values. Would need path
+// resolution ($lib, tsconfig paths), a Program-node variant of this function, and
+// cache invalidation when the imported file changes. Start with relative .ts/.js only.
+
 /**
  * Builds a map of statically resolvable `const` bindings from a Svelte AST.
  *
@@ -262,6 +311,30 @@ export const generate_import_lines = (
 	return lines.join('\n');
 };
 
+/**
+ * ESTree node fields that contain `Identifier` nodes which are NOT binding references.
+ *
+ * Keyed by node type. Each entry lists fields to skip during identifier search,
+ * optionally conditioned on the node's `computed` property being falsy.
+ *
+ * Examples of non-reference positions:
+ * - `obj.Mdz` — `MemberExpression.property` when `computed: false`
+ * - `{ Mdz: value }` — `Property.key` when `computed: false`
+ * - `label: for(...)` — `LabeledStatement.label`
+ */
+const NON_REFERENCE_FIELDS: Map<
+	string,
+	Array<{field: string; when_not_computed?: boolean}>
+> = new Map([
+	['MemberExpression', [{field: 'property', when_not_computed: true}]],
+	['Property', [{field: 'key', when_not_computed: true}]],
+	['PropertyDefinition', [{field: 'key', when_not_computed: true}]],
+	['MethodDefinition', [{field: 'key', when_not_computed: true}]],
+	['LabeledStatement', [{field: 'label'}]],
+	['BreakStatement', [{field: 'label'}]],
+	['ContinueStatement', [{field: 'label'}]],
+]);
+
 /**
  * Checks if an identifier with the given name appears anywhere in an AST subtree.
  *
@@ -270,6 +343,10 @@ export const generate_import_lines = (
  * `skip` set are excluded from traversal — used to skip `ImportDeclaration`
  * nodes so the import's own specifier identifier doesn't false-positive.
  *
+ * Skips `Identifier` nodes in non-reference positions defined by
+ * `NON_REFERENCE_FIELDS` — for example, `obj.Mdz` (non-computed member property),
+ * `{ Mdz: value }` (non-computed object key), and statement labels.
+ *
  * Safe for Svelte template ASTs: `Component.name` is a plain string property
  * (not an `Identifier` node), so `<Mdz>` tags do not produce false matches.
  *
@@ -290,7 +367,11 @@ export const has_identifier_in_tree = (
 	}
 	const record = node as Record<string, unknown>;
 	if (record.type === 'Identifier' && record.name === name) return true;
+	const rules = NON_REFERENCE_FIELDS.get(record.type as string);
 	for (const key of Object.keys(record)) {
+		if (rules?.some((r) => r.field === key && (!r.when_not_computed || !record.computed))) {
+			continue;
+		}
 		if (has_identifier_in_tree(record[key], name, skip)) return true;
 	}
 	return false;