@barefootjs/test 0.26.1 → 0.26.2

package/dist/index.js

@@ -198880,9 +198880,9 @@ function resolveConstants(constants3) {
   for (const c of constants3) {
     if (c.parsed?.kind === "object-literal") {
       for (const prop of c.parsed.properties) {
-        if (prop.value.kind === "literal" && prop.value.literalType === "string") {
-          resolved.set(`${c.name}.${prop.key}`, String(prop.value.value));
-        }
+        const value2 = resolveObjectPropValue(prop.value, resolved);
+        if (value2 !== null)
+          resolved.set(`${c.name}.${prop.key}`, value2);
       }
       continue;
     }
@@ -198910,6 +198910,31 @@ function resolveConstants(constants3) {
   }
   return resolved;
 }
+function resolveObjectPropValue(expr, resolved) {
+  if (expr.kind === "literal" && expr.literalType === "string") {
+    return String(expr.value);
+  }
+  if (expr.kind === "identifier") {
+    return resolved.get(expr.name) ?? null;
+  }
+  if (expr.kind === "template-literal") {
+    const strs = [];
+    for (const part of expr.parts) {
+      if (part.type === "string") {
+        strs.push(part.value);
+        continue;
+      }
+      if (part.expr.kind !== "identifier")
+        return null;
+      const value = resolved.get(part.expr.name);
+      if (value === undefined)
+        return null;
+      strs.push(value);
+    }
+    return strs.join("");
+  }
+  return null;
+}
 function tryResolve(raw, resolved) {
   const value = raw.trim();
   if (value.startsWith("'") && value.endsWith("'") && !value.slice(1, -1).includes("'")) {

package/dist/resolve-constants.d.ts

@@ -13,12 +13,14 @@ import type { ParsedExpr } from '@barefootjs/jsx';
  * Resolves string literals, template literals, array.join() patterns,
  * and plain identifier references. When `valueBranches` is present
  * (from ternary initializers), each branch is resolved and merged
- * with union semantics. An object-literal const with string-valued
- * properties (`const rowClass = { active: 'row row-active', plain: 'row' }`)
- * additionally seeds member-path keys (`rowClass.active` → `'row row-active'`)
- * so a member-access className (`className={rowClass.active}`, or a
- * ternary arm) resolves through the same lookup (#2354). Function
- * expressions and other complex values are skipped.
+ * with union semantics. An object-literal const with string-literal,
+ * template-literal, or bare-identifier-valued properties (`const rowClass
+ * = { active: \`${base} row-active\`, plain: base }`) additionally seeds
+ * member-path
+ * keys (`rowClass.active` → `'row row-active'`) so a member-access
+ * className (`className={rowClass.active}`, or a ternary arm) resolves
+ * through the same lookup (#2354, template-literal values #2360).
+ * Function expressions and other complex property values are skipped.
  */
 export declare function resolveConstants(constants: Array<{
     name: string;

package/dist/resolve-constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-constants.d.ts","sourceRoot":"","sources":["../src/resolve-constants.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,CAAA;CAAE,CAAC,GAChG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAuCrB"}
+{"version":3,"file":"resolve-constants.d.ts","sourceRoot":"","sources":["../src/resolve-constants.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,CAAA;CAAE,CAAC,GAChG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CA0CrB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/test",
-  "version": "0.26.1",
+  "version": "0.26.2",
   "description": "Test utilities for BarefootJS - IR-based component testing without a browser",
   "type": "module",
   "main": "./dist/index.js",
@@ -39,7 +39,7 @@
     "directory": "packages/test"
   },
   "dependencies": {
-    "@barefootjs/jsx": "0.26.1"
+    "@barefootjs/jsx": "0.26.2"
   },
   "devDependencies": {
     "typescript": "^5.0.0"

package/src/resolve-constants.ts

@@ -15,12 +15,14 @@ import type { ParsedExpr } from '@barefootjs/jsx'
  * Resolves string literals, template literals, array.join() patterns,
  * and plain identifier references. When `valueBranches` is present
  * (from ternary initializers), each branch is resolved and merged
- * with union semantics. An object-literal const with string-valued
- * properties (`const rowClass = { active: 'row row-active', plain: 'row' }`)
- * additionally seeds member-path keys (`rowClass.active` → `'row row-active'`)
- * so a member-access className (`className={rowClass.active}`, or a
- * ternary arm) resolves through the same lookup (#2354). Function
- * expressions and other complex values are skipped.
+ * with union semantics. An object-literal const with string-literal,
+ * template-literal, or bare-identifier-valued properties (`const rowClass
+ * = { active: \`${base} row-active\`, plain: base }`) additionally seeds
+ * member-path
+ * keys (`rowClass.active` → `'row row-active'`) so a member-access
+ * className (`className={rowClass.active}`, or a ternary arm) resolves
+ * through the same lookup (#2354, template-literal values #2360).
+ * Function expressions and other complex property values are skipped.
  */
 export function resolveConstants(
   constants: Array<{ name: string; value?: string; valueBranches?: string[]; parsed?: ParsedExpr }>
@@ -28,14 +30,17 @@ export function resolveConstants(
   const resolved = new Map<string, string>()
 
   for (const c of constants) {
-    // Object-literal const: expose each string-valued property as a
-    // `name.key` member-path key. The bare identifier stays unresolved
-    // (an object is not a class string), matching prior behavior.
+    // Object-literal const: expose each resolvable property as a
+    // `name.key` member-path key. The object's OWN bare identifier
+    // (`c.name` referenced directly, e.g. `className={rowClass}`) stays
+    // unresolved — an object is not a class string — matching prior
+    // behavior; this is unrelated to a resolvable identifier-valued
+    // PROPERTY (`{ plain: base }`), handled by resolveObjectPropValue
+    // below (Copilot review, PR #2361).
     if (c.parsed?.kind === 'object-literal') {
       for (const prop of c.parsed.properties) {
-        if (prop.value.kind === 'literal' && prop.value.literalType === 'string') {
-          resolved.set(`${c.name}.${prop.key}`, String(prop.value.value))
-        }
+        const value = resolveObjectPropValue(prop.value, resolved)
+        if (value !== null) resolved.set(`${c.name}.${prop.key}`, value)
       }
       continue
     }
@@ -65,6 +70,56 @@ export function resolveConstants(
   return resolved
 }
 
+/**
+ * Resolve one object-literal property's value to a string, for the
+ * `name.key` member-path seeding above. Supports the same shapes as
+ * `tryResolve` — string literal, template literal, plain identifier
+ * reference — but walks the already-structured `ParsedExpr` (available
+ * here, unlike `tryResolve`'s raw-string input) instead of re-parsing
+ * with a regex, and is stricter about "unresolvable": `tryResolve`'s
+ * template-literal branch folds an unresolved `${...}` to `''` (its
+ * caller only ever uses that for the whole-constant case, where a
+ * partial string is an acceptable degrade), but a property value here
+ * returns `null` for the whole property instead — seeding `name.key`
+ * with a misleadingly partial class string would be worse than not
+ * seeding it at all. A bare identifier property (`{ plain: base }`) and
+ * an interpolated identifier inside a template literal both resolve
+ * against `resolved` — safe because `resolveConstants` processes
+ * `constants` in declaration order, so a module-scope const referenced
+ * inside a later object literal's property is already in the map
+ * (#2360). Anything else (a nested object/array, a call, a binary
+ * expression, ...) is left unresolved, same posture as `tryResolve`
+ * skipping "complex values".
+ */
+function resolveObjectPropValue(expr: ParsedExpr, resolved: Map<string, string>): string | null {
+  if (expr.kind === 'literal' && expr.literalType === 'string') {
+    return String(expr.value)
+  }
+  if (expr.kind === 'identifier') {
+    return resolved.get(expr.name) ?? null
+  }
+  if (expr.kind === 'template-literal') {
+    const strs: string[] = []
+    for (const part of expr.parts) {
+      if (part.type === 'string') {
+        strs.push(part.value)
+        continue
+      }
+      // An interpolation that isn't a plain identifier reference (a
+      // conditional, a member access, ...), or one that IS an identifier
+      // but doesn't resolve, makes the whole template unresolved — don't
+      // fold it to '' and seed a partial, misleadingly "resolved" string
+      // (Copilot review, PR #2361).
+      if (part.expr.kind !== 'identifier') return null
+      const value = resolved.get(part.expr.name)
+      if (value === undefined) return null
+      strs.push(value)
+    }
+    return strs.join('')
+  }
+  return null
+}
+
 function tryResolve(raw: string, resolved: Map<string, string>): string | null {
   const value = raw.trim()