@barefootjs/xslate 0.14.0 → 0.15.1

package/dist/build.js

@@ -187292,6 +187292,8 @@ import {
   BaseAdapter,
   isBooleanAttr,
   parseExpression as parseExpression2,
+  exprToString,
+  parseProviderObjectLiteral,
   parseStyleObjectEntries,
   isSupported,
   identifierPath,
@@ -187301,10 +187303,13 @@ import {
   augmentInheritedPropAccesses,
   parseRecordIndexAccess,
   evalStringArrayJoin,
+  collectModuleStringConsts,
   extractArrowBodyExpression,
   collectContextConsumers,
   isLowerableObjectRestDestructure,
-  extractSsrDefaults
+  lookupStaticRecordLiteral,
+  searchParamsLocalNames,
+  matchSearchParamsMethodCall
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -187351,6 +187356,8 @@ var ARIA_BOOLEAN_ATTRS = new Set([
   "aria-multiselectable",
   "aria-readonly",
   "aria-required",
+  "aria-selected",
+  "aria-expanded",
   "aria-checked",
   "aria-pressed"
 ]);
@@ -187360,7 +187367,7 @@ function isAriaBooleanAttr(name) {
 
 // src/adapter/xslate-adapter.ts
 var import_typescript = __toESM(require_typescript(), 1);
-import { BF_SLOT, BF_COND } from "@barefootjs/shared";
+import { BF_SLOT, BF_COND, BF_REGION } from "@barefootjs/shared";
 var XSLATE_TEMPLATE_PRIMITIVES = {
   "JSON.stringify": { arity: 1, emit: (args) => `$bf.json(${args[0]})` },
   String: { arity: 1, emit: (args) => `$bf.string(${args[0]})` },
@@ -187428,8 +187435,10 @@ class XslateAdapter extends BaseAdapter {
   inLoop = false;
   propsObjectName = null;
   propsParams = [];
+  booleanTypedProps = new Set;
   stringValueNames = new Set;
   moduleStringConsts = new Map;
+  _searchParamsLocals = new Set;
   localConstants = [];
   nullableOptionalProps = new Set;
   constructor(options = {}) {
@@ -187444,6 +187453,7 @@ class XslateAdapter extends BaseAdapter {
     this.propsObjectName = ir.metadata.propsObjectName ?? null;
     augmentInheritedPropAccesses(ir);
     this.propsParams = ir.metadata.propsParams.map((p) => ({ name: p.name }));
+    this.booleanTypedProps = new Set(ir.metadata.propsParams.filter((prop) => prop.type?.primitive === "boolean" || prop.type?.raw === "boolean").map((prop) => prop.name));
     this.localConstants = ir.metadata.localConstants ?? [];
     this.nullableOptionalProps = new Set(ir.metadata.propsParams.filter((p) => p.defaultValue === undefined && !p.isRest && p.type?.kind !== "primitive").map((p) => p.name));
     this.stringValueNames = new Set;
@@ -187457,6 +187467,7 @@ class XslateAdapter extends BaseAdapter {
         this.stringValueNames.add(p.name);
     }
     this.moduleStringConsts = collectModuleStringConsts(ir.metadata.localConstants);
+    this._searchParamsLocals = searchParamsLocalNames(ir.metadata);
     this.errors = [];
     this.childrenCaptureCounter = 0;
     if (!options?.siblingTemplatesRegistered) {
@@ -187542,12 +187553,29 @@ class XslateAdapter extends BaseAdapter {
     if (v.kind === "literal") {
       return typeof v.value === "string" ? `'${v.value.replace(/[\\']/g, (m) => `\\${m}`)}'` : String(v.value);
     }
-    if (v.kind === "expression")
+    if (v.kind === "expression") {
+      const hashref = this.providerObjectLiteralKolon(v.expr);
+      if (hashref !== null)
+        return hashref;
       return this.convertExpressionToKolon(v.expr);
+    }
     if (v.kind === "template")
       return this.convertTemplateLiteralPartsToKolon(v.parts);
     return "nil";
   }
+  providerObjectLiteralKolon(expr) {
+    const members = parseProviderObjectLiteral(expr.trim());
+    if (members === null)
+      return null;
+    const entries = members.map((m) => {
+      const key = `'${m.name.replace(/[\\']/g, (c) => `\\${c}`)}'`;
+      if (m.kind === "function" || /^on[A-Z]/.test(m.name))
+        return `${key} => nil`;
+      const src = m.kind === "getter" ? m.body : m.expr;
+      return `${key} => ${this.convertExpressionToKolon(src)}`;
+    });
+    return `{ ${entries.join(", ")} }`;
+  }
   contextDefaultKolon(c) {
     const d = c.defaultValue;
     if (d === null || d === undefined)
@@ -187571,7 +187599,6 @@ class XslateAdapter extends BaseAdapter {
     const signals = ir.metadata.signals ?? [];
     if (memos.length === 0 && signals.length === 0)
       return "";
-    const ssrDefaults = extractSsrDefaults(ir.metadata) ?? {};
     const available = new Set(ir.metadata.propsParams.map((p) => p.name));
     const lines = [];
     for (const signal of signals) {
@@ -187582,18 +187609,13 @@ class XslateAdapter extends BaseAdapter {
       available.add(signal.getter);
     }
     for (const memo of memos) {
-      const def = ssrDefaults[memo.name];
-      const isNull2 = !def || typeof def === "object" && "value" in def && def.value === null;
-      if (!isNull2) {
-        available.add(memo.name);
-        continue;
-      }
       const body = extractArrowBodyExpression(memo.computation);
-      if (body === null)
-        continue;
-      const kolon = this.tryLowerToKolon(body, available);
-      if (kolon !== null)
-        lines.push(`: my $${memo.name} = ${kolon};`);
+      if (body !== null) {
+        const kolon = this.tryLowerToKolon(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);
     }
     return lines.length > 0 ? lines.join(`
@@ -187628,6 +187650,9 @@ class XslateAdapter extends BaseAdapter {
     if (element.slotId) {
       hydrationAttrs += ` ${this.renderSlotMarker(element.slotId)}`;
     }
+    if (element.regionId) {
+      hydrationAttrs += ` ${BF_REGION}="${element.regionId}"`;
+    }
     const voidElements = [
       "area",
       "base",
@@ -187895,7 +187920,7 @@ ${childrenUnderLoop}` : childrenUnderLoop;
   renderComponent(comp) {
     const propParts = [];
     for (const p of comp.props) {
-      if (p.name.match(/^on[A-Z]/) && p.value.kind === "expression")
+      if ((p.name.match(/^on[A-Z]/) || p.name === "ref") && p.value.kind === "expression")
         continue;
       if (p.value.kind === "spread") {
         const trimmed = p.value.expr.trim();
@@ -187926,7 +187951,10 @@ ${childrenUnderLoop}` : childrenUnderLoop;
     const tplName = this.toTemplateName(comp.name);
     const effectiveChildren = comp.children.length > 0 ? comp.children : resolveJsxChildrenProp(comp.props);
     if (effectiveChildren.length > 0) {
+      const prevInLoop = this.inLoop;
+      this.inLoop = false;
       const childrenBody = this.renderChildren(effectiveChildren);
+      this.inLoop = prevInLoop;
       const macroName = `bf_children_${comp.slotId ?? "c" + this.childrenCaptureCounter++}`;
       const childrenEntry = `children => ${macroName}()`;
       const allParts = [...propParts, childrenEntry];
@@ -187936,6 +187964,7 @@ ${childrenUnderLoop}` : childrenUnderLoop;
     return `<: $bf.render_child('${tplName}'${hashEntries}) | mark_raw :>`;
   }
   childrenCaptureCounter = 0;
+  presenceVarCounter = 0;
   toTemplateName(componentName) {
     return componentName.replace(/([A-Z])/g, "_$1").toLowerCase().replace(/^_/, "");
   }
@@ -187991,18 +188020,41 @@ ${children}`;
       const normalizedBareId = this.propsObjectName && bareId.startsWith(`${this.propsObjectName}.`) ? bareId.slice(this.propsObjectName.length + 1) : bareId;
       if (!isBooleanAttr(name) && !value.presenceOrUndefined && /^[A-Za-z_$][\w$]*$/.test(normalizedBareId) && this.nullableOptionalProps.has(normalizedBareId)) {
         const perl2 = this.convertExpressionToKolon(value.expr);
-        const body = isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) ? `${name}="<: $bf.bool_str(${perl2}) :>"` : `${name}="<: ${perl2} :>"`;
+        const body = isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) || this.isBooleanTypedPropRef(value.expr) ? `${name}="<: $bf.bool_str(${perl2}) :>"` : `${name}="<: ${perl2} :>"`;
         return `
 : if (defined ${perl2}) {
 ${body}
 : }
 `;
       }
-      if (isBooleanAttr(name) || value.presenceOrUndefined) {
+      if (isBooleanAttr(name)) {
         return `<: ${this.convertExpressionToKolon(value.expr)} ? '${name}' : '' :>`;
       }
+      if (value.presenceOrUndefined) {
+        const perl2 = this.convertExpressionToKolon(value.expr);
+        const tmp = `$bf_pu${this.presenceVarCounter++}`;
+        const body = isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) || this.isBooleanTypedPropRef(value.expr) ? `${name}="<: $bf.bool_str(${tmp}) :>"` : `${name}="<: ${tmp} :>"`;
+        return `
+: my ${tmp} = ${perl2};
+: if (${tmp}) {
+${body}
+: }
+`;
+      }
+      {
+        const m = this.parseUndefinedAlternateTernary(value.expr);
+        if (m) {
+          const cond = this.convertExpressionToKolon(m.condition);
+          const val = this.convertExpressionToKolon(m.consequent);
+          return `
+: if (${cond}) {
+${name}="<: ${val} :>"
+: }
+`;
+        }
+      }
       const perl = this.convertExpressionToKolon(value.expr);
-      if (isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name)) {
+      if (isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) || this.isBooleanTypedPropRef(value.expr)) {
         return `${name}="<: $bf.bool_str(${perl}) :>"`;
       }
       return `${name}="<: ${perl} :>"`;
@@ -188261,6 +188313,18 @@ ${reason}` : "";
         return n;
       })();
       const indexed = this.recordIndexAccessToKolon(initNode);
+      if (indexed === null && import_typescript.default.isElementAccessExpression(initNode) && initNode.argumentExpression && !import_typescript.default.isNumericLiteral(initNode.argumentExpression) && !import_typescript.default.isStringLiteral(initNode.argumentExpression)) {
+        this.errors.push({
+          code: "BF101",
+          severity: "error",
+          message: `Spread object value '${initNode.getText(sf)}' indexes a record map whose values aren't scalar literals — it can't lower to an inline Kolon hashref.`,
+          loc: { file: this.componentName + ".tsx", start: { line: 1, column: 0 }, end: { line: 1, column: 0 } },
+          suggestion: {
+            message: "Index a record whose values are number/string literals, or move the spread into a `'use client'` component so hydration computes it."
+          }
+        });
+        return null;
+      }
       const valPerl = indexed !== null ? indexed : this.convertExpressionToKolon(prop.initializer.getText(sf));
       entries.push(`'${escapeKolonSingleQuoted(key)}' => ${valPerl}`);
     }
@@ -188308,6 +188372,46 @@ Options:
   _isStringValueName(name) {
     return this.stringValueNames.has(name);
   }
+  parseUndefinedAlternateTernary(expr) {
+    const parsed = parseExpression2(expr.trim());
+    if (parsed?.kind !== "conditional")
+      return null;
+    const alt = parsed.alternate;
+    const isUndef = alt.kind === "identifier" && (alt.name === "undefined" || alt.name === "null") || alt.kind === "literal" && (alt.value === null || alt.value === undefined);
+    if (!isUndef)
+      return null;
+    return {
+      condition: exprToString(parsed.test),
+      consequent: exprToString(parsed.consequent)
+    };
+  }
+  isBooleanTypedPropRef(expr) {
+    let bare = expr.trim();
+    if (this.propsObjectName && bare.startsWith(`${this.propsObjectName}.`)) {
+      bare = bare.slice(this.propsObjectName.length + 1);
+    }
+    if (!/^[A-Za-z_$][\w$]*$/.test(bare))
+      return false;
+    return this.booleanTypedProps.has(bare);
+  }
+  _resolveLiteralConst(name) {
+    const c = (this.localConstants ?? []).find((lc) => lc.name === name);
+    if (c?.value === undefined)
+      return null;
+    const v = c.value.trim();
+    if (/^-?\d+(\.\d+)?$/.test(v))
+      return v;
+    const strLit = /^'([^'\\]*)'$/.exec(v) ?? /^"([^"\\]*)"$/.exec(v);
+    if (strLit)
+      return `'${strLit[1].replace(/[\\']/g, (m) => `\\${m}`)}'`;
+    return null;
+  }
+  _resolveStaticRecordLiteral(objectName, key) {
+    const hit = lookupStaticRecordLiteral(objectName, key, this.localConstants);
+    if (!hit)
+      return null;
+    return hit.kind === "number" ? hit.text : `'${hit.text.replace(/[\\']/g, (m) => `\\${m}`)}'`;
+  }
   _resolveModuleStringConst(name) {
     if (this.inLoop)
       return null;
@@ -188392,6 +188496,11 @@ function renderArrayMethod(method, object, args, emit) {
       const recv = emit(object);
       return `$bf.trim(${recv})`;
     }
+    case "toFixed": {
+      const recv = emit(object);
+      const digits = args.length >= 1 ? emit(args[0]) : "0";
+      return `$bf.to_fixed(${recv}, ${digits})`;
+    }
     case "split": {
       const recv = emit(object);
       if (args.length === 0) {
@@ -188471,68 +188580,6 @@ function renderFlatMapMethod(recv, op) {
     return `$bf.flat_map(${recv}, 'self', '')`;
   return `$bf.flat_map(${recv}, 'field', '${proj.field}')`;
 }
-function parsePureStringLiteral(source) {
-  let s = source.trim();
-  while (s.startsWith("(") && s.endsWith(")"))
-    s = s.slice(1, -1).trim();
-  const quote = s[0];
-  if ((quote === "'" || quote === '"') && s[s.length - 1] === quote) {
-    const body = s.slice(1, -1);
-    if (containsUnescaped(body, quote))
-      return null;
-    return unescapeStringLiteralBody(body);
-  }
-  if (quote === "`" && s[s.length - 1] === "`") {
-    const body = s.slice(1, -1);
-    if (body.includes("${"))
-      return null;
-    if (containsUnescaped(body, "`"))
-      return null;
-    return unescapeStringLiteralBody(body);
-  }
-  return evalStringArrayJoin(source);
-}
-function containsUnescaped(s, ch) {
-  for (let i2 = 0;i2 < s.length; i2++) {
-    if (s[i2] === "\\") {
-      i2++;
-      continue;
-    }
-    if (s[i2] === ch)
-      return true;
-  }
-  return false;
-}
-function unescapeStringLiteralBody(s) {
-  return s.replace(/\\(.)/g, (_, c) => {
-    switch (c) {
-      case "n":
-        return `
-`;
-      case "r":
-        return "\r";
-      case "t":
-        return "\t";
-      case "0":
-        return "\x00";
-      default:
-        return c;
-    }
-  });
-}
-function collectModuleStringConsts(constants3) {
-  const map = new Map;
-  for (const c of constants3 ?? []) {
-    if (!c.isModule)
-      continue;
-    if (c.value === undefined)
-      continue;
-    const literal = parsePureStringLiteral(c.value);
-    if (literal !== null)
-      map.set(c.name, literal);
-  }
-  return map;
-}
 function isStringTypeInfo(type2) {
   return type2?.kind === "primitive" && type2.primitive === "string";
 }
@@ -188574,6 +188621,9 @@ class XslateFilterEmitter {
     }
     return `${emit(object)}.${property}`;
   }
+  indexAccess(object, index, emit) {
+    return `${emit(object)}[${emit(index)}]`;
+  }
   call(callee, args, emit) {
     if (callee.kind === "identifier" && args.length === 0) {
       return `$${callee.name}`;
@@ -188657,9 +188707,14 @@ class XslateTopLevelEmitter {
     this.adapter = adapter;
   }
   identifier(name) {
+    if (name === "undefined" || name === "null")
+      return "nil";
     const inlined = this.adapter._resolveModuleStringConst(name);
     if (inlined !== null)
       return inlined;
+    const literalConst = this.adapter._resolveLiteralConst(name);
+    if (literalConst !== null)
+      return literalConst;
     return `$${name}`;
   }
   literal(value, literalType) {
@@ -188675,15 +188730,29 @@ class XslateTopLevelEmitter {
     if (object.kind === "identifier" && object.name === "props") {
       return `$${property}`;
     }
+    if (object.kind === "identifier") {
+      const staticValue = this.adapter._resolveStaticRecordLiteral(object.name, property);
+      if (staticValue !== null)
+        return staticValue;
+    }
     const obj = emit(object);
     if (property === "length")
       return `$bf.length(${obj})`;
     return `${obj}.${property}`;
   }
+  indexAccess(object, index, emit) {
+    return `${emit(object)}[${emit(index)}]`;
+  }
   call(callee, args, emit) {
     if (callee.kind === "identifier" && args.length === 0) {
       return `$${callee.name}`;
     }
+    if (this.adapter._searchParamsLocals.size > 0) {
+      const sp = matchSearchParamsMethodCall(callee, args, this.adapter._searchParamsLocals);
+      if (sp) {
+        return `$searchParams.${sp.method}(${sp.args.map(emit).join(", ")})`;
+      }
+    }
     const path = identifierPath(callee);
     const spec = path ? XSLATE_TEMPLATE_PRIMITIVES[path] : undefined;
     if (path && spec) {