@barefootjs/mojolicious 0.31.8 → 0.31.10

package/dist/test-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-render.d.ts","sourceRoot":"","sources":["../src/test-render.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAeH,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAKxE;AAkCD,MAAM,WAAW,aAAa;IAC5B,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,8BAA8B;IAC9B,OAAO,EAAE,OAAO,iBAAiB,EAAE,eAAe,CAAA;IAClD,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAoOjF"}
+{"version":3,"file":"test-render.d.ts","sourceRoot":"","sources":["../src/test-render.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAeH,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAKxE;AAkCD,MAAM,WAAW,aAAa;IAC5B,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,8BAA8B;IAC9B,OAAO,EAAE,OAAO,iBAAiB,EAAE,eAAe,CAAA;IAClD,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAgPjF"}

package/dist/vite.js

@@ -3025,6 +3025,34 @@ var SVG_ROOT_TAGS = new Set([
   "animateTransform",
   "animateMotion"
 ]);
+var MATHML_ROOT_TAGS = new Set([
+  "math",
+  "mrow",
+  "mfrac",
+  "msup",
+  "msub",
+  "msubsup",
+  "mn",
+  "mi",
+  "mo",
+  "mtext",
+  "munder",
+  "mover",
+  "munderover",
+  "mtable",
+  "mtr",
+  "mtd",
+  "msqrt",
+  "mroot",
+  "mstyle",
+  "merror",
+  "mpadded",
+  "mphantom",
+  "menclose",
+  "semantics",
+  "annotation",
+  "annotation-xml"
+]);
 
 // ../jsx/src/ir-to-client-js/collect-elements.ts
 var EMPTY_RENDER_EXPRS = new Set(["null", "undefined", "false", "''", '""', "``"]);
@@ -3888,6 +3916,38 @@ function classify(name, origin, expr, parsed, available) {
   }
   return { kind: "derived", name, origin, expr, parsed, frees: [...frees] };
 }
+function localConstExprsByName(metadata) {
+  const out = new Map;
+  for (const c of metadata.localConstants ?? []) {
+    if (c.isModule || c.declarationKind !== "const" || c.value === undefined)
+      continue;
+    out.set(c.name, c.parsed ?? parseExpression(c.value.trim()));
+  }
+  return out;
+}
+function resolveThroughLocalConsts(parsed, localConsts) {
+  let current = parsed;
+  const maxIter = localConsts.size + 1;
+  for (let i = 0;i < maxIter; i++) {
+    const frees = freeIdentifiers(current);
+    if (frees === null)
+      break;
+    let changed = false;
+    for (const name of frees) {
+      const value = localConsts.get(name);
+      if (!value)
+        continue;
+      const inlined = inlineBinding(current, name, value);
+      if (inlined === null)
+        continue;
+      current = inlined;
+      changed = true;
+    }
+    if (!changed)
+      break;
+  }
+  return current;
+}
 function computeSsrSeedPlan(metadata) {
   const baseScope = metadata.propsParams.map((p) => p.name);
   if (metadata.propsObjectName)
@@ -3896,6 +3956,7 @@ function computeSsrSeedPlan(metadata) {
     baseScope.push(name);
   }
   const available = new Set(baseScope);
+  const localConsts = localConstExprsByName(metadata);
   const steps = [];
   for (const signal of metadata.signals) {
     if (signal.envReader) {
@@ -3907,13 +3968,13 @@ function computeSsrSeedPlan(metadata) {
       }
     }
     const expr = signal.initialValue.trim();
-    steps.push(expr === "" ? { kind: "opaque", name: signal.getter, origin: "signal" } : classify(signal.getter, "signal", expr, parseExpression(expr), available));
+    steps.push(expr === "" ? { kind: "opaque", name: signal.getter, origin: "signal" } : classify(signal.getter, "signal", expr, resolveThroughLocalConsts(parseExpression(expr), localConsts), available));
     available.add(signal.getter);
   }
   for (const memo of metadata.memos) {
     const body = extractArrowBodyExpression(memo.computation);
     const expr = body?.trim() ?? "";
-    steps.push(expr === "" ? { kind: "opaque", name: memo.name, origin: "memo" } : classify(memo.name, "memo", expr, memo.parsed ?? parseExpression(expr), available));
+    steps.push(expr === "" ? { kind: "opaque", name: memo.name, origin: "memo" } : classify(memo.name, "memo", expr, resolveThroughLocalConsts(memo.parsed ?? parseExpression(expr), localConsts), available));
     available.add(memo.name);
   }
   return { baseScope, steps };

package/lib/BarefootJS/Backend/Mojo.pm

@@ -1,5 +1,5 @@
 package BarefootJS::Backend::Mojo;
-our $VERSION = "0.31.7";
+our $VERSION = "0.31.9";
 use Mojo::Base -base, -signatures;
 
 use Mojo::ByteStream qw(b);

package/lib/Mojolicious/Plugin/BarefootJS/DevReload.pm

@@ -1,5 +1,5 @@
 package Mojolicious::Plugin::BarefootJS::DevReload;
-our $VERSION = "0.31.7";
+our $VERSION = "0.31.9";
 use Mojo::Base 'Mojolicious::Plugin', -signatures;
 
 =head1 NAME

package/lib/Mojolicious/Plugin/BarefootJS.pm

@@ -1,5 +1,5 @@
 package Mojolicious::Plugin::BarefootJS;
-our $VERSION = "0.31.7";
+our $VERSION = "0.31.9";
 use Mojo::Base 'Mojolicious::Plugin', -signatures;
 
 use Mojo::File qw(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/mojolicious",
-  "version": "0.31.8",
+  "version": "0.31.10",
   "description": "Mojolicious EP template adapter for BarefootJS - generates .html.ep files from IR",
   "type": "module",
   "main": "./dist/index.js",
@@ -52,7 +52,7 @@
     "directory": "packages/adapter-mojolicious"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.31.8"
+    "@barefootjs/shared": "0.31.10"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
@@ -70,9 +70,9 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.31.8",
-    "@barefootjs/vite": "0.31.8",
-    "@barefootjs/client": "0.31.8",
+    "@barefootjs/jsx": "0.31.10",
+    "@barefootjs/vite": "0.31.10",
+    "@barefootjs/client": "0.31.10",
     "vite": "^6.0.0"
   }
 }

package/src/test-render.ts

@@ -229,7 +229,7 @@ export async function renderMojoComponent(options: RenderOptions): Promise<strin
     // bare `$var` aborts under Mojo::Template's strict vars.
     augmentInheritedPropAccesses(ir)
     // Build props hash for Perl
-    const propsPerl = buildPerlProps(componentName, props, ir)
+    const { propsPerl, userPropsPerl } = buildPerlProps(componentName, props, ir)
 
     // Honour `__instanceId` from props for the root scope id so
     // shared-component fixtures (which pin `<ComponentName>_test`) match
@@ -281,6 +281,18 @@ my $bf = BarefootJS->new($c, {});
 # (which pin <ComponentName>_test scope ids for cross-adapter normalisation)
 # match what Hono renderHonoComponent emits. Default to 'test' otherwise.
 $bf->_scope_id('${rootScopeId}');
+# Mirrors production's \`props_attr\` contract (BarefootJS.pm's \`_props\`
+# accessor): the caller is expected to seed it before rendering the root
+# component, so this harness must call it explicitly.
+#
+# \$user_props — NOT \$props above — is what \`_props\` gets: \$props is
+# this harness's internal vars hash (scope_id, inherited-attribute \`undef\`
+# placeholders, signal/memo seed values, and — when the component imports
+# searchParams — a SearchParams reader object), none of which a real
+# Mojolicious route handler has or passes. Production's bf-p carries none
+# of those, only the caller-facing props.
+my $user_props = ${userPropsPerl};
+$bf->_props($user_props);
 
 ${childRenderers}
 
@@ -502,11 +514,37 @@ function buildChildDefaultsPerl(ir: ComponentIR): string {
   // semantic divergence from those adapters.
   for (const signal of ir.metadata.signals) {
     if (signal.envReader) continue // env signal is the request reader, not a stashed value (#2057)
+    // #2669: a self-derivation collision (the signal's initializer derives
+    // from a same-named prop) gets a `propName`-carrying entry from
+    // `extractSsrDefaults` (see its docstring's invariant) — that entry
+    // MUST stay a hashref so `_derive_stash_from_defaults` resolves it
+    // against the REAL child props at runtime; the declared-prop loop above
+    // already emitted it for a DECLARED prop, so only an undeclared one
+    // needs adding here. Either way, do NOT fall through to this harness's
+    // own `evaluateSignalInit(..., undefined)` recompute below — that call
+    // sees no props at all and would silently re-flatten the collision back
+    // to a bare, non-caller-overridable value.
+    const d = ssrDefaults[signal.getter]
+    if (d?.propName !== undefined) {
+      if (!declared.has(signal.getter)) {
+        entries.push(`${signal.getter} => ${ssrDefaultEntryToPerl(d)}`)
+        declared.add(signal.getter)
+      }
+      continue
+    }
     const value = evaluateSignalInit(signal.initialValue.trim(), undefined)
     entries.push(`${signal.getter} => ${value !== null ? toPerlLiteral(value) : 'undef'}`)
   }
   for (const memo of ir.metadata.memos) {
     const entry = ssrDefaults[memo.name]
+    // #2669: same self-derivation handling as the signal loop above.
+    if (entry?.propName !== undefined) {
+      if (!declared.has(memo.name)) {
+        entries.push(`${memo.name} => ${ssrDefaultEntryToPerl(entry)}`)
+        declared.add(memo.name)
+      }
+      continue
+    }
     const value = entry ? entry.value : undefined
     entries.push(
       `${memo.name} => ${value !== undefined && value !== null ? toPerlLiteral(value) : 'undef'}`,
@@ -515,11 +553,22 @@ function buildChildDefaultsPerl(ir: ComponentIR): string {
   return `{${entries.join(', ')}}`
 }
 
+/**
+ * Returns the full internal vars-hash Perl literal (`props`, what the
+ * inline `Mojo::Template` renders against) AND `userPropsPerl` — the
+ * exact raw fixture props (no defaults, no null-fill, no signal/memo
+ * seeding, no rest-bag nesting), mirroring production's route-handler
+ * call `$bf->_props($props)` verbatim. `userPropsPerl` is for
+ * `$bf->_props(...)` (bf-p hydration payload) only — these must NOT be
+ * the same value, and `userPropsPerl` must NOT be derived from
+ * `entries` or the defaulted stash: production's own bf-p carries only
+ * what the caller actually passed in, unmodified.
+ */
 function buildPerlProps(
   _componentName: string,
   props: Record<string, unknown> | undefined,
   ir: ComponentIR,
-): string {
+): { propsPerl: string; userPropsPerl: string } {
   const entries: string[] = []
 
   // Add scope_id — honour an explicit `__instanceId` from props so
@@ -552,7 +601,8 @@ function buildPerlProps(
     // emits a literal `$label` reference where the BF101 path used
     // to emit `''`, exposing this latent test-harness gap.
     const value = derivedProps[param.name]
-    entries.push(`${param.name} => ${value !== undefined && value !== null ? toPerlLiteral(value) : 'undef'}`)
+    const literal = value !== undefined && value !== null ? toPerlLiteral(value) : 'undef'
+    entries.push(`${param.name} => ${literal}`)
   }
 
   // (#checkbox) SolidJS props-object pattern: `function Checkbox(props:
@@ -623,8 +673,12 @@ function buildPerlProps(
   const localParamNames = new Set(ir.metadata.propsParams.map(p => p.name))
   if (props) {
     for (const [key, value] of Object.entries(props)) {
+      // Internal hydration markers (`__instanceId` etc.) are routed by
+      // the framework, never a real caller-facing prop.
+      if (key.startsWith('__')) continue
       if (routedKeys.has(key)) continue
       if (localParamNames.has(key)) continue
+      let literal: string | null = null
       if (value === null) {
         // An explicit-null prop must still DECLARE the template var —
         // `typeof null === 'object'` fails every branch below, so the key
@@ -632,15 +686,15 @@ function buildPerlProps(
         // `my $user`, tripping Perl's strict-mode "Global symbol requires
         // explicit package name" before the `//` fallback could apply
         // (data-point conformance, optional-chaining-prop:null-user).
-        entries.push(`${key} => undef`)
+        literal = 'undef'
       } else if (typeof value === 'string') {
-        entries.push(`${key} => '${value.replace(/'/g, "\\'")}'`)
+        literal = `'${value.replace(/'/g, "\\'")}'`
       } else if (typeof value === 'number') {
-        entries.push(`${key} => ${value}`)
+        literal = `${value}`
       } else if (typeof value === 'boolean') {
         // Mojo::JSON sentinels so BarefootJS helpers can detect
         // booleans via ref() (see toPerlLiteral / spread_attrs).
-        entries.push(`${key} => ${value ? 'Mojo::JSON::true' : 'Mojo::JSON::false'}`)
+        literal = value ? 'Mojo::JSON::true' : 'Mojo::JSON::false'
       } else if (Array.isArray(value)) {
         // Array → Perl arrayref literal. Fixtures that exercise
         // array-receiver methods (`items.every(...)`, `items.some(...)`,
@@ -651,17 +705,38 @@ function buildPerlProps(
         // declares `my $items` (the key is absent from the vars
         // hash) and the template trips Perl's strict-mode "Global
         // symbol $items requires explicit package name" check.
-        entries.push(`${key} => ${toPerlLiteral(value)}`)
+        literal = toPerlLiteral(value)
       } else if (value && typeof value === 'object') {
         // Plain object → Perl hashref literal (#1407 follow-up).
         // Used by the destructured-rest / propsObject fixtures
         // (`jsx-spread-rest-prop`, `jsx-spread-props-object`) so
         // the test harness can pass through bag-shaped props that
         // weren't enumerated by the analyzer.
-        entries.push(`${key} => ${toPerlLiteral(value)}`)
+        literal = toPerlLiteral(value)
       }
+      if (literal !== null) {
+        entries.push(`${key} => ${literal}`)
+      }
+    }
+  }
+
+  // `$bf->_props(...)` payload (bf-p hydration): mirrors production's
+  // route-handler call `$bf->_props($props)` verbatim — the caller's raw
+  // props hash, unmodified. No default-filling, no signal/memo seeding,
+  // no rest-bag nesting: a real Mojolicious route handler never
+  // rearranges the hash it received before handing it to `_props`.
+  // Excludes internal harness-only keys (`__instanceId` etc.), which are
+  // never a real caller-facing prop. Bareword key relies on Perl's
+  // fat-comma auto-quoting, matching this function's other hash-literal
+  // construction above.
+  const userEntries: string[] = []
+  if (props) {
+    for (const [key, value] of Object.entries(props)) {
+      if (key.startsWith('__')) continue
+      userEntries.push(`${key} => ${toPerlLiteral(value)}`)
     }
   }
+  const userPropsPerl = `{${userEntries.join(', ')}}`
 
   // Add signal values evaluated from props (must come after user props).
   // Seed `undef` for a null / unevaluable initial (e.g. a
@@ -671,6 +746,12 @@ function buildPerlProps(
   // rule `buildChildDefaultsPerl` applies to child signals (#1897).
   for (const signal of ir.metadata.signals) {
     if (signal.envReader) continue // env signal bound below via search_params('') (#2057)
+    // #2669: a self-derivation collision already got the correct RAW-prop
+    // seed above via `derivedProps` — `extractSsrDefaults` marks that with
+    // a `propName`-carrying entry (see its docstring's invariant). Skip
+    // re-seeding here or this harness's own `evaluateSignalInit` recompute
+    // clobbers the correctly-derived caller value.
+    if (rootSsrDefaults[signal.getter]?.propName !== undefined) continue
     const value = evaluateSignalInit(signal.initialValue.trim(), props)
     entries.push(`${signal.getter} => ${value !== null ? toPerlLiteral(value) : 'undef'}`)
   }
@@ -682,6 +763,8 @@ function buildPerlProps(
   // from the plugin: hard-coding `0` masked memos with non-zero
   // initial values until #1423 added a fixture that exposed the gap.
   for (const memo of ir.metadata.memos) {
+    // #2669: same self-derivation skip as the signal loop above.
+    if (rootSsrDefaults[memo.name]?.propName !== undefined) continue
     const entry = rootSsrDefaults[memo.name]
     const value = entry ? entry.value : 0
     entries.push(`${memo.name} => ${toPerlLiteral(value ?? 0)}`)
@@ -697,7 +780,7 @@ function buildPerlProps(
     entries.push(`searchParams => BarefootJS->search_params('')`)
   }
 
-  return `{${entries.join(', ')}}`
+  return { propsPerl: `{${entries.join(', ')}}`, userPropsPerl }
 }
 
 /**