@barefootjs/test 0.33.2 → 0.33.3

package/dist/index.js

@@ -187288,7 +187288,7 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
 });
 
 // ../jsx/src/compiler.ts
-var import_typescript24 = __toESM(require_typescript(), 1);
+var import_typescript25 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/analyzer.ts
 var import_typescript9 = __toESM(require_typescript(), 1);
@@ -188980,6 +188980,11 @@ function applyReplacement(slice, re, replacement) {
 var BF_SCOPE = "bf-s";
 var BF_SLOT = "bf";
 var BF_COND = "bf-c";
+var BF_KEY = "data-key";
+var BF_KEY_PREFIX = "data-key-";
+function keyAttrName(loopDepth) {
+  return loopDepth > 0 ? `${BF_KEY_PREFIX}${loopDepth}` : BF_KEY;
+}
 // ../shared/src/dom-prop.ts
 var BOOLEAN_ATTRS = new Set([
   "checked",
@@ -189625,6 +189630,19 @@ function buildPropAliasMap(params) {
   }
   return map;
 }
+function resolveRestSpreadOriginCore(bindings, constantValues, name) {
+  const visited = new Set;
+  let current = name.trim();
+  while (current !== undefined && !visited.has(current)) {
+    if (bindings.restPropsName && current === bindings.restPropsName)
+      return "rest";
+    if (bindings.propsObjectName && current === bindings.propsObjectName)
+      return "props";
+    visited.add(current);
+    current = constantValues.get(current)?.trim();
+  }
+  return null;
+}
 
 // ../jsx/src/instrumentation.ts
 var _enabled = false;
@@ -194951,10 +194969,44 @@ function attachParsedExpressions(node, analyzer, bound = EMPTY_BOUND) {
       break;
   }
 }
+function resolveRootKeyAttr(node) {
+  if (!node)
+    return;
+  switch (node.type) {
+    case "element":
+      if (node.needsScope && !node.keyAttr)
+        node.keyAttr = { name: BF_KEY };
+      for (const c of node.children)
+        resolveRootKeyAttr(c);
+      return;
+    case "fragment":
+    case "component":
+    case "provider":
+    case "loop":
+      for (const c of node.children)
+        resolveRootKeyAttr(c);
+      return;
+    case "async":
+      resolveRootKeyAttr(node.fallback);
+      for (const c of node.children)
+        resolveRootKeyAttr(c);
+      return;
+    case "conditional":
+      resolveRootKeyAttr(node.whenTrue);
+      resolveRootKeyAttr(node.whenFalse);
+      return;
+    case "if-statement":
+      resolveRootKeyAttr(node.consequent);
+      resolveRootKeyAttr(node.alternate);
+      return;
+  }
+}
 function jsxToIR(analyzer) {
   const root = buildIRRoot(analyzer);
-  if (root)
+  if (root) {
     attachParsedExpressions(root, analyzer);
+    resolveRootKeyAttr(root);
+  }
   return root;
 }
 function buildIRRoot(analyzer) {
@@ -195143,6 +195195,7 @@ function lowerFormControlValueSsr(tagName, attrs, children) {
       type: "expression",
       expr,
       templateExpr: `escapeText(${templateExpr ?? expr})`,
+      escapeInClientTemplate: true,
       typeInfo: null,
       reactive: false,
       slotId: null,
@@ -195180,7 +195233,7 @@ function transformHtmlElement(node, ctx, tagName) {
   ctx.isRoot = false;
   const children = transformChildren(node.children, ctx);
   lowerFormControlValueSsr(tagName, attrs, children);
-  const needsSlot = events.length > 0 || hasDynamicContent(children) || hasReactiveAttributes(attrs, ctx) || ref !== null;
+  const needsSlot = events.length > 0 || hasDynamicContent(children) || hasReactiveAttributes(attrs, ctx) || ref !== null || forwardsCallerRestProps(attrs, ctx);
   const slotId = needsSlot ? generateSlotId(ctx) : null;
   if (slotId) {
     propagateSlotIdToLoops(children, slotId);
@@ -195213,7 +195266,7 @@ function transformSelfClosingElement(node, ctx) {
   const { attrs, events, ref } = processAttributes(node.attributes, ctx);
   const selfClosingChildren = [];
   lowerFormControlValueSsr(tagName, attrs, selfClosingChildren);
-  const needsSlot = events.length > 0 || hasReactiveAttributes(attrs, ctx) || ref !== null;
+  const needsSlot = events.length > 0 || hasReactiveAttributes(attrs, ctx) || ref !== null || forwardsCallerRestProps(attrs, ctx);
   const slotId = needsSlot ? generateSlotId(ctx) : null;
   const needsScope = ctx.isRoot;
   ctx.isRoot = false;
@@ -195452,7 +195505,9 @@ function markDataKeyCarrier(children) {
 }
 function markCarrierIn(node) {
   if (node.type === "element") {
-    return { ...node, carriesDataKey: true };
+    if (node.keyAttr)
+      return null;
+    return { ...node, keyAttr: { name: BF_KEY } };
   }
   if (node.type === "conditional") {
     const cond = node;
@@ -195527,7 +195582,7 @@ function transformExpressionInner(expr, ctx, node, isClientOnly) {
   if (isRenderNothingLiteral(expr, ctx)) {
     return null;
   }
-  checkBareSignalOrMemoIdentifier(expr, ctx);
+  checkBareSignalOrMemoIdentifier(expr, ctx, { descendNested: true });
   if (import_typescript13.default.isIdentifier(expr)) {
     const jsxNode = ctx.analyzer.jsxConstants.get(expr.text);
     if (jsxNode) {
@@ -196644,6 +196699,16 @@ function tagLoopItemRootComponents(nodes) {
     }
   }
 }
+function applyLoopKeyAttr(node, name, value) {
+  if (node.type === "element") {
+    node.keyAttr = { name, value };
+    return;
+  }
+  if (node.type === "conditional") {
+    applyLoopKeyAttr(node.whenTrue, name, value);
+    applyLoopKeyAttr(node.whenFalse, name, value);
+  }
+}
 function loopBodyItemConditional(children) {
   const real = children.filter((c) => !(c.type === "text" && typeof c.value === "string" && !c.value.trim()));
   if (real.length !== 1)
@@ -197026,6 +197091,14 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
   const itemConditional = children.length > 0 ? loopBodyItemConditional(children) : null;
   const bodyIsItemConditional = itemConditional !== null;
   const key = bodyIsItemConditional ? extractItemConditionalKey(itemConditional) : children.length > 0 ? extractLoopKey(children[0]) : null;
+  if (key !== null) {
+    const resolvedKeyAttrName = keyAttrName(depth);
+    if (bodyIsItemConditional) {
+      applyLoopKeyAttr(itemConditional, resolvedKeyAttrName, key);
+    } else if (children.length > 0) {
+      applyLoopKeyAttr(children[0], resolvedKeyAttrName, key);
+    }
+  }
   const declaredNameSet = preamble && preamble.declaredNames.length > 0 ? new Set(preamble.declaredNames) : undefined;
   if (key && declaredNameSet) {
     const keyRefs = extractFreeIdentifiersFromText(key);
@@ -197716,7 +197789,7 @@ function getAttributeValue(attr, ctx) {
       ctx.analyzer.errors.push(createError(ErrorCodes.STAGE_AWAIT_IN_TEMPLATE, getSourceLocation(expr, ctx.sourceFile, ctx.filePath)));
       return AttrValueOf.expression("undefined");
     }
-    checkBareSignalOrMemoIdentifier(expr, ctx);
+    checkBareSignalOrMemoIdentifier(expr, ctx, { descendNested: isRenderedElementAttribute(attr, ctx) });
     if (attr.name.getText(ctx.sourceFile) === "style" && import_typescript13.default.isObjectLiteralExpression(expr)) {
       const cssString = tryStaticStyleObjectToCss(expr);
       if (cssString !== null) {
@@ -198224,34 +198297,142 @@ function processComponentProps(attributes, ctx) {
   }
   return props;
 }
-function checkBareSignalOrMemoIdentifier(expr, ctx) {
-  if (!import_typescript13.default.isIdentifier(expr))
+function isRenderedElementAttribute(attr, ctx) {
+  const tagName = attr.parent.parent.tagName.getText(ctx.sourceFile);
+  return !/^[A-Z]/.test(tagName);
+}
+function checkBareSignalOrMemoIdentifier(expr, ctx, options) {
+  const reactiveNames = new Map;
+  for (const signal of ctx.analyzer.signals)
+    reactiveNames.set(signal.getter, "signal");
+  for (const memo of ctx.analyzer.memos)
+    reactiveNames.set(memo.name, "memo");
+  if (reactiveNames.size === 0)
     return;
-  const name = expr.text;
-  for (const signal of ctx.analyzer.signals) {
-    if (signal.getter === name) {
-      ctx.analyzer.errors.push(createError(ErrorCodes.SIGNAL_GETTER_NOT_CALLED, getSourceLocation(expr, ctx.sourceFile, ctx.filePath), {
-        message: `Signal getter '${name}' passed without calling it`,
-        suggestion: {
-          message: `Signal getters must be called to read the value. Use \`${name}()\` instead of \`${name}\`.`,
-          replacement: `${name}()`
-        }
-      }));
+  const report = (id, name, kind) => {
+    const label = kind === "signal" ? "Signal" : "Memo";
+    ctx.analyzer.errors.push(createError(ErrorCodes.SIGNAL_GETTER_NOT_CALLED, getSourceLocation(id, ctx.sourceFile, ctx.filePath), {
+      message: `${label} getter '${name}' passed without calling it`,
+      suggestion: {
+        message: `${label} getters must be called to read the value. Use \`${name}()\` instead of \`${name}\`.`,
+        replacement: `${name}()`
+      }
+    }));
+  };
+  if (import_typescript13.default.isIdentifier(expr)) {
+    const kind = reactiveNames.get(expr.text);
+    if (kind && !ctx.scope.isBound(expr.text))
+      report(expr, expr.text, kind);
+    return;
+  }
+  if (!options?.descendNested)
+    return;
+  const boundStack = [];
+  const isBound = (name) => {
+    for (let i2 = boundStack.length - 1;i2 >= 0; i2--) {
+      if (boundStack[i2].has(name))
+        return true;
+    }
+    return ctx.scope.isBound(name);
+  };
+  const visitBindingDefaults = (name, bound) => {
+    if (import_typescript13.default.isIdentifier(name)) {
+      bound.add(name.text);
       return;
     }
-  }
-  for (const memo of ctx.analyzer.memos) {
-    if (memo.name === name) {
-      ctx.analyzer.errors.push(createError(ErrorCodes.SIGNAL_GETTER_NOT_CALLED, getSourceLocation(expr, ctx.sourceFile, ctx.filePath), {
-        message: `Memo getter '${name}' passed without calling it`,
-        suggestion: {
-          message: `Memo getters must be called to read the value. Use \`${name}()\` instead of \`${name}\`.`,
-          replacement: `${name}()`
-        }
-      }));
+    for (const el of name.elements) {
+      if (import_typescript13.default.isOmittedExpression(el))
+        continue;
+      if (el.initializer)
+        visit2(el.initializer);
+      visitBindingDefaults(el.name, bound);
+    }
+  };
+  const collectBindingNames3 = (name, out) => {
+    if (import_typescript13.default.isIdentifier(name))
+      out.add(name.text);
+    else if (import_typescript13.default.isObjectBindingPattern(name)) {
+      for (const el of name.elements)
+        collectBindingNames3(el.name, out);
+    } else if (import_typescript13.default.isArrayBindingPattern(name)) {
+      for (const el of name.elements) {
+        if (!import_typescript13.default.isOmittedExpression(el))
+          collectBindingNames3(el.name, out);
+      }
+    }
+  };
+  const collectBlockDeclarations = (block, out) => {
+    for (const stmt of block.statements) {
+      if (import_typescript13.default.isVariableStatement(stmt)) {
+        for (const decl of stmt.declarationList.declarations)
+          collectBindingNames3(decl.name, out);
+      } else if (import_typescript13.default.isFunctionDeclaration(stmt) && stmt.name) {
+        out.add(stmt.name.text);
+      }
+    }
+  };
+  function visit2(node) {
+    if (import_typescript13.default.isJsxElement(node) || import_typescript13.default.isJsxSelfClosingElement(node) || import_typescript13.default.isJsxFragment(node)) {
+      return;
+    }
+    if (import_typescript13.default.isTypeNode(node))
+      return;
+    if (import_typescript13.default.isCallExpression(node) && node.arguments.length === 0 && import_typescript13.default.isIdentifier(node.expression)) {
+      return;
+    }
+    if (import_typescript13.default.isPropertyAccessExpression(node)) {
+      visit2(node.expression);
+      return;
+    }
+    if (import_typescript13.default.isPropertyAssignment(node)) {
+      if (import_typescript13.default.isComputedPropertyName(node.name))
+        visit2(node.name.expression);
+      visit2(node.initializer);
+      return;
+    }
+    if (import_typescript13.default.isShorthandPropertyAssignment(node)) {
+      if (import_typescript13.default.isIdentifier(node.name) && !isBound(node.name.text)) {
+        const kind = reactiveNames.get(node.name.text);
+        if (kind)
+          report(node.name, node.name.text, kind);
+      }
+      return;
+    }
+    if (import_typescript13.default.isArrowFunction(node) || import_typescript13.default.isFunctionExpression(node)) {
+      const bound = new Set;
+      boundStack.push(bound);
+      for (const p of node.parameters) {
+        if (p.initializer)
+          visit2(p.initializer);
+        visitBindingDefaults(p.name, bound);
+      }
+      if (node.body && import_typescript13.default.isBlock(node.body))
+        collectBlockDeclarations(node.body, bound);
+      if (node.body)
+        visit2(node.body);
+      boundStack.pop();
+      return;
+    }
+    if (import_typescript13.default.isVariableDeclaration(node)) {
+      if (node.initializer)
+        visit2(node.initializer);
+      const declared = new Set;
+      boundStack.push(declared);
+      visitBindingDefaults(node.name, declared);
+      boundStack.pop();
       return;
     }
+    if (import_typescript13.default.isIdentifier(node)) {
+      if (isBound(node.text))
+        return;
+      const kind = reactiveNames.get(node.text);
+      if (kind)
+        report(node, node.text, kind);
+      return;
+    }
+    import_typescript13.default.forEachChild(node, visit2);
   }
+  visit2(expr);
 }
 function isArrayExprDirectPropRef(arrayExpr, ctx) {
   const propNames = new Set(ctx.patterns.props.map((p) => p.name));
@@ -198350,6 +198531,31 @@ function isPropsReference(expr, ctx, visited) {
   }
   return false;
 }
+function forwardsCallerRestProps(attrs, ctx) {
+  for (const attr of attrs) {
+    if (attr.value.kind !== "spread")
+      continue;
+    const constants3 = restSpreadConstantValues(ctx);
+    for (const name of new Set([attr.value.expr, attr.value.templateExpr])) {
+      if (!name)
+        continue;
+      if (resolveRestSpreadOriginCore(ctx.analyzer, constants3, name) !== null)
+        return true;
+    }
+  }
+  return false;
+}
+function restSpreadConstantValues(ctx) {
+  if (ctx._restSpreadConstantValues)
+    return ctx._restSpreadConstantValues;
+  const byName = new Map;
+  for (const constant of ctx.analyzer.localConstants) {
+    if (!byName.has(constant.name))
+      byName.set(constant.name, constant.value);
+  }
+  ctx._restSpreadConstantValues = byName;
+  return byName;
+}
 function hasReactiveAttributes(attrs, ctx) {
   for (const attr of attrs) {
     if (attr.name === "key")
@@ -198695,11 +198901,14 @@ var KEYWORDS_AND_GLOBALS = new Set([
 // ../jsx/src/ir-to-client-js/walk-prop-accesses.ts
 var import_typescript14 = __toESM(require_typescript(), 1);
 
+// ../jsx/src/ir-to-client-js/imports.ts
+var import_typescript16 = __toESM(require_typescript(), 1);
+
 // ../jsx/src/value-references.ts
 var import_typescript15 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/relocate.ts
-var import_typescript16 = __toESM(require_typescript(), 1);
+var import_typescript17 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/lowering-registry.ts
 var plugins = [];
@@ -198878,10 +199087,10 @@ function formatDateLocalNames(metadata) {
 }
 
 // ../jsx/src/ir-to-client-js/prune-unused-prop-extractions.ts
-var import_typescript17 = __toESM(require_typescript(), 1);
+var import_typescript18 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ir-to-client-js/control-flow/plan/lazy-preamble.ts
-var import_typescript18 = __toESM(require_typescript(), 1);
+var import_typescript19 = __toESM(require_typescript(), 1);
 var NO_PREAMBLE = {
   lazySafe: true,
   facts: { declaredNames: new Set, freeNames: new Set }
@@ -198931,7 +199140,7 @@ var INERT_BINDING_GLOBALS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/emit-reactive.ts
-var import_typescript19 = __toESM(require_typescript(), 1);
+var import_typescript20 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ir-to-client-js/control-flow/stringify/event-delegation.ts
 var NON_BUBBLING_EVENTS = new Set([
@@ -198946,7 +199155,7 @@ var NON_BUBBLING_EVENTS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/rewrite-props-object.ts
-var import_typescript20 = __toESM(require_typescript(), 1);
+var import_typescript21 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ir-to-client-js/source-map.ts
 var BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -199037,21 +199246,21 @@ class SourceMapGenerator {
 }
 
 // ../jsx/src/preprocess-inline-jsx-callbacks.ts
-var import_typescript21 = __toESM(require_typescript(), 1);
+var import_typescript22 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ssr-defaults.ts
-var import_typescript22 = __toESM(require_typescript(), 1);
+var import_typescript23 = __toESM(require_typescript(), 1);
 var UNRESOLVED = Symbol("unresolved");
 var NO_RETURN = Symbol("no-return");
 
 // ../jsx/src/augment-inherited-props.ts
-var import_typescript23 = __toESM(require_typescript(), 1);
+var import_typescript24 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/rich-type-refusal.ts
 var EMPTY_BINDINGS2 = new Map;
 // ../jsx/src/shared-program.ts
 init_path();
-var import_typescript25 = __toESM(require_typescript(), 1);
+var import_typescript26 = __toESM(require_typescript(), 1);
 // ../jsx/src/adapters/interface.ts
 class BaseAdapter {
   renderChildren(children) {
@@ -199333,7 +199542,7 @@ class JsxAdapter extends BaseAdapter {
 }
 
 // ../jsx/src/adapters/template-imports.ts
-var import_typescript26 = __toESM(require_typescript(), 1);
+var import_typescript27 = __toESM(require_typescript(), 1);
 var CLIENT_PACKAGE_SOURCES = new Set([
   "@barefootjs/client",
   "@barefootjs/client/runtime"
@@ -199726,9 +199935,9 @@ function registerBuiltinLoweringPlugins() {
     registerLoweringPlugin(plugin);
 }
 // ../jsx/src/combine-client-js.ts
-var import_typescript27 = __toESM(require_typescript(), 1);
-// ../jsx/src/debug.ts
 var import_typescript28 = __toESM(require_typescript(), 1);
+// ../jsx/src/debug.ts
+var import_typescript29 = __toESM(require_typescript(), 1);
 function escapeForIdBoundary(name) {
   return name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -199820,7 +200029,7 @@ function resolveSetters(handler, setterToSignal, fnSetters) {
   return refs;
 }
 // ../jsx/src/profiler.ts
-var import_typescript29 = __toESM(require_typescript(), 1);
+var import_typescript30 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/index.ts
 registerBuiltinLoweringPlugins();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/test",
-  "version": "0.33.2",
+  "version": "0.33.3",
   "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.33.2"
+    "@barefootjs/jsx": "0.33.3"
   },
   "devDependencies": {
     "typescript": "^5.0.0"