@barefootjs/xslate 0.17.0 → 0.17.1

package/src/adapter/memo/seed.ts

@@ -13,13 +13,10 @@ import {
   type ComponentIR,
   type ContextConsumer,
   collectContextConsumers,
-  extractArrowBodyExpression,
-  isSupported,
-  parseExpression,
+  computeSsrSeedPlan,
 } from '@barefootjs/jsx'
 
 import type { XslateMemoContext } from '../emit-context.ts'
-import { referencedVarsAreAvailable } from '../lib/ir-scope.ts'
 
 /** Kolon literal for a context-consumer's `createContext` default. */
 export function contextDefaultKolon(c: ContextConsumer): string {
@@ -49,77 +46,33 @@ export function generateContextConsumerSeed(ir: ComponentIR): string {
 }
 
 /**
- * Seed memos whose SSR default is `null` (not statically evaluable) by
- * computing them in-template from the already-seeded prop / signal vars
- * (`createMemo(() => props.value * 10)` → `: my $x = $value * 10;`). Without
- * this the memo's `$x` renders empty — the reason
- * `props-reactivity-comparison` was skipped. Only emitted when every var the
- * lowering references is already in scope. (#1297)
+ * Emit `: my $<name> = <kolon>;` line-statements for every `derived` step of
+ * the backend-neutral SSR seed plan — the scope/availability/ordering
+ * analysis lives in `computeSsrSeedPlan` (packages/jsx/src/ssr-seed-plan.ts);
+ * this only lowers each step's expression to Kolon and applies the
+ * backend-specific emit guards: skip an empty lowering, skip a lowering that
+ * references no `$var` at all (a constant init/body — e.g. a `derived` step
+ * with empty `frees` — keeps the existing static ssr-defaults seed instead),
+ * and skip a self-referencing lowering (Kolon's `my` shadows the RHS, so
+ * `: my $x = … $x …` would read the just-declared undefined lexical rather
+ * than the render var — the plan rules out SOURCE-level self-refs, but a
+ * lowered canonical name could still collide, so this stays as the cheap
+ * defense it always was). `env-reader` and `opaque` steps emit nothing (the
+ * runtime supplies the reader, or the adapter's ssr-defaults path already
+ * covers it). (#1297, #2075)
  */
 export function generateDerivedMemoSeed(ctx: XslateMemoContext, ir: ComponentIR): string {
-  const memos = ir.metadata.memos ?? []
-  const signals = ir.metadata.signals ?? []
-  if (memos.length === 0 && signals.length === 0) return ''
-  // Props seed first; each signal/memo adds its own name as it lands.
-  const available = new Set<string>(ir.metadata.propsParams.map(p => p.name))
+  // Package G attached this to metadata at compile time; the `??` fallback
+  // only covers hand-built metadata in older tests that predate the attached
+  // plan — same shared function, so there's no divergence from the compiler.
+  const plan = ir.metadata.ssrSeedPlan ?? computeSsrSeedPlan(ir.metadata)
   const lines: string[] = []
-
-  // Prop/signal-derived signals (`createSignal(props.defaultOn ?? false)`):
-  // a loop-child render gets no stash seed, so its `$on` would render nil;
-  // and the static default can't capture the per-call prop. Seed it
-  // in-template when the init lowers cleanly AND references an in-scope var.
-  // Object/array/constant inits keep the existing ssr-defaults seeding.
-  for (const signal of signals) {
-    const kolon = tryLowerToKolon(ctx, signal.initialValue, available)
-    // Kolon can't express `: my $x = … $x …` — declaring `my $x` makes the
-    // RHS `$x` an undefined lexical rather than the render var. A same-name
-    // signal (`createSignal(props.x ?? d)`, getter == prop) is just the prop
-    // with a default, which the harness already seeds correctly from the
-    // passed prop — skip the in-template seed for it. (Different-name
-    // prop-derived signals like toggle's `on` from `defaultOn` are unaffected.)
-    const refsSelf = kolon !== null && new RegExp(`\\$${signal.getter}\\b`).test(kolon)
-    if (kolon !== null && !refsSelf) lines.push(`: my $${signal.getter} = ${kolon};`)
-    available.add(signal.getter)
-  }
-
-  for (const memo of memos) {
-    // Seed every memo whose body lowers cleanly — not just the ones whose
-    // static SSR default is null. A statically-foldable prop-derived memo
-    // (`createMemo(() => props.disabled ?? false)` → default `false`)
-    // still depends on the per-call prop: the static stash seed bakes in
-    // the absent-prop fold, so a caller passing `disabled => 1` would
-    // render the default branch (#1897, select's disabled item). The
-    // in-template recomputation reads the prop lexical already in scope;
-    // block-bodied arrows / out-of-scope references fall back to the
-    // static ssr-defaults seed. Same self-reference guard as the signal
-    // loop above — Kolon's `my` shadows the render var on the RHS.
-    const body = extractArrowBodyExpression(memo.computation)
-    if (body !== null) {
-      const kolon = tryLowerToKolon(ctx, body, available)
-      const refsSelf = kolon !== null && new RegExp(`\\$${memo.name}\\b`).test(kolon)
-      if (kolon !== null && !refsSelf) lines.push(`: my $${memo.name} = ${kolon};`)
-    }
-    available.add(memo.name)
+  for (const step of plan.steps) {
+    if (step.kind !== 'derived') continue
+    const kolon = ctx.convertExpressionToKolon(step.expr, step.parsed)
+    if (kolon === '' || !/\$[A-Za-z_]\w*/.test(kolon)) continue
+    if (new RegExp(`\\$${step.name}\\b`).test(kolon)) continue
+    lines.push(`: my $${step.name} = ${kolon};`)
   }
   return lines.length > 0 ? lines.join('\n') + '\n' : ''
 }
-
-/**
- * Lower a signal init / memo body to Kolon for an in-template SSR seed, or
- * `null` when it shouldn't be seeded this way: not a supported shape
- * (`isSupported` pre-check, so object/array literals don't fail the build),
- * references no in-scope var (a constant — keep ssr-defaults seeding), or
- * references an out-of-scope binding. (#1297)
- */
-export function tryLowerToKolon(
-  ctx: XslateMemoContext,
-  expr: string,
-  available: ReadonlySet<string>,
-): string | null {
-  const trimmed = expr.trim()
-  if (!trimmed) return null
-  if (!isSupported(parseExpression(trimmed)).supported) return null
-  const kolon = ctx.convertExpressionToKolon(trimmed)
-  if (kolon === '' || !/\$[A-Za-z_]\w*/.test(kolon)) return null
-  return referencedVarsAreAvailable(kolon, available) ? kolon : null
-}

package/src/adapter/xslate-adapter.ts

@@ -568,8 +568,15 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
   // ===========================================================================
 
   renderLoop(loop: IRLoop): string {
-    // Client-only loops: skip SSR rendering entirely
-    if (loop.clientOnly) return ''
+    // clientOnly loops must not render items at SSR time, but must still emit
+    // the `loop:`/`/loop:` boundary marker pair (Hono and Go parity) so the
+    // client runtime's mapArray() can locate the insertion anchor when
+    // hydrating the array. Without the markers, mapArray() resolves
+    // anchor = null and appends after sibling markers (#872). The marker id
+    // disambiguates sibling `.map()` calls under the same parent (#1087).
+    if (loop.clientOnly) {
+      return `<: $bf.comment("loop:${loop.markerId}") | mark_raw :><: $bf.comment("/loop:${loop.markerId}") | mark_raw :>`
+    }
 
     // An array/object-destructure loop param (`([emoji, users]) => ...` or
     // `({ name, age }) => ...`) lowers to invalid Kolon — Kolon's `for LIST
@@ -1147,7 +1154,18 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
     param: string,
     localVarMap: Map<string, string> = new Map(),
   ): string {
-    return emitParsedExpr(expr, new XslateFilterEmitter(param, localVarMap, n => this._isStringValueName(n)))
+    return emitParsedExpr(
+      expr,
+      new XslateFilterEmitter(
+        param,
+        localVarMap,
+        n => this._isStringValueName(n),
+        // A nested callback method inside the predicate has no Kolon scalar
+        // form — surface BF101 (#2038) instead of silently degrading it to
+        // its receiver.
+        (message, reason) => this._recordExprBF101(message, reason),
+      ),
+    )
   }
 
   // ===========================================================================