@barefootjs/test 0.33.6 → 0.35.0

package/dist/index.js

@@ -187295,6 +187295,29 @@ var import_typescript10 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/expression-parser.ts
 var import_typescript = __toESM(require_typescript(), 1);
+
+// ../jsx/src/lowering-registry.ts
+var plugins = [];
+function registerLoweringPlugin(plugin) {
+  const existing = plugins.findIndex((p) => p.name === plugin.name);
+  if (existing >= 0)
+    plugins[existing] = plugin;
+  else
+    plugins.push(plugin);
+}
+function loweringNodeChildren(node) {
+  if (node.kind === "helper-call")
+    return [...node.args];
+  const children = [node.base];
+  for (const t of node.triples) {
+    if (t.guard)
+      children.push(t.guard);
+    children.push(t.value);
+  }
+  return children;
+}
+
+// ../jsx/src/expression-parser.ts
 var UNSUPPORTED_METHODS = new Set([
   "filter",
   "map",
@@ -187454,7 +187477,7 @@ function convertNode(node, raw) {
           }
           if (n === undefined || Number.isNaN(n)) {
             const parsedDepth = convertNode(depthNode, raw);
-            if (checkSupport(parsedDepth, "rendered").supported) {
+            if (checkSupport(parsedDepth, "rendered", []).supported) {
               depthExpr = parsedDepth;
               flatDepth = 1;
             } else {
@@ -188232,10 +188255,10 @@ function getUnaryOperatorString(op) {
       return "unknown";
   }
 }
-function isSupported(expr) {
-  return checkSupport(expr, "rendered");
+function isSupported(expr, opts) {
+  return checkSupport(expr, "rendered", opts?.loweringMatchers ?? []);
 }
-function checkSupport(expr, pos) {
+function checkSupport(expr, pos, matchers) {
   switch (expr.kind) {
     case "unsupported":
       return { supported: false, reason: expr.reason };
@@ -188244,7 +188267,7 @@ function checkSupport(expr, pos) {
         return { supported: false, reason: "Unsupported syntax: ObjectLiteralExpression" };
       }
       for (const prop of expr.properties) {
-        const propSupport = checkSupport(prop.kind === "spread" ? prop.expr : prop.value, pos);
+        const propSupport = checkSupport(prop.kind === "spread" ? prop.expr : prop.value, pos, matchers);
         if (!propSupport.supported)
           return propSupport;
       }
@@ -188259,7 +188282,7 @@ function checkSupport(expr, pos) {
       return { supported: false, reason: "Standalone arrow functions / regex literals are not supported" };
     case "array-literal": {
       for (const el of expr.elements) {
-        const elSupport = checkSupport(el, pos);
+        const elSupport = checkSupport(el, pos, matchers);
         if (!elSupport.supported)
           return elSupport;
       }
@@ -188272,28 +188295,39 @@ function checkSupport(expr, pos) {
           reason: `String.prototype.${expr.method} supports only a string pattern + string replacement (the regex form is deferred); use a string pattern or wrap the expression in /* @client */`
         };
       }
-      const objSupport = checkSupport(expr.object, pos);
+      const objSupport = checkSupport(expr.object, pos, matchers);
       if (!objSupport.supported)
         return objSupport;
       for (const arg of expr.args) {
-        const argSupport = checkSupport(arg, pos);
+        const argSupport = checkSupport(arg, pos, matchers);
         if (!argSupport.supported)
           return argSupport;
       }
       if (expr.method === "flat" && expr.depthExpr) {
-        const depthSupport = checkSupport(expr.depthExpr, pos);
+        const depthSupport = checkSupport(expr.depthExpr, pos, matchers);
         if (!depthSupport.supported)
           return depthSupport;
       }
       return { supported: true, level: "L2" };
     }
     case "call": {
+      for (const matcher of matchers) {
+        const node = matcher(expr.callee, expr.args);
+        if (!node)
+          continue;
+        for (const child of loweringNodeChildren(node)) {
+          const childSupport = checkSupport(child, pos, matchers);
+          if (!childSupport.supported)
+            return childSupport;
+        }
+        return { supported: true, level: "L2" };
+      }
       const cb = asCallbackMethodCall(expr);
       if (cb) {
-        const objSupport = checkSupport(cb.object, pos);
+        const objSupport = checkSupport(cb.object, pos, matchers);
         if (!objSupport.supported)
           return objSupport;
-        const bodySupport = checkSupport(cb.arrow.body, pos);
+        const bodySupport = checkSupport(cb.arrow.body, pos, matchers);
         if (!bodySupport.supported) {
           return {
             supported: false,
@@ -188302,13 +188336,13 @@ function checkSupport(expr, pos) {
           };
         }
         for (const rest of cb.args) {
-          const restSupport = checkSupport(rest, pos);
+          const restSupport = checkSupport(rest, pos, matchers);
           if (!restSupport.supported)
             return restSupport;
         }
         return { supported: true, level: "L5" };
       }
-      const calleeSupport = checkSupport(expr.callee, pos);
+      const calleeSupport = checkSupport(expr.callee, pos, matchers);
       if (!calleeSupport.supported) {
         return calleeSupport;
       }
@@ -188327,7 +188361,7 @@ function checkSupport(expr, pos) {
         return { supported: true, level: "L1" };
       }
       for (const arg of expr.args) {
-        const argSupport = checkSupport(arg, pos);
+        const argSupport = checkSupport(arg, pos, matchers);
         if (!argSupport.supported) {
           return argSupport;
         }
@@ -188335,7 +188369,7 @@ function checkSupport(expr, pos) {
       return { supported: true, level: "L2" };
     }
     case "member": {
-      const objSupport = checkSupport(expr.object, pos);
+      const objSupport = checkSupport(expr.object, pos, matchers);
       if (!objSupport.supported) {
         return objSupport;
       }
@@ -188345,19 +188379,19 @@ function checkSupport(expr, pos) {
       return { supported: true, level: "L2" };
     }
     case "index-access": {
-      const objSupport = checkSupport(expr.object, pos);
+      const objSupport = checkSupport(expr.object, pos, matchers);
       if (!objSupport.supported)
         return objSupport;
-      const indexSupport = checkSupport(expr.index, pos);
+      const indexSupport = checkSupport(expr.index, pos, matchers);
       if (!indexSupport.supported)
         return indexSupport;
       return { supported: true, level: "L2" };
     }
     case "binary": {
-      const leftSupport = checkSupport(expr.left, pos);
+      const leftSupport = checkSupport(expr.left, pos, matchers);
       if (!leftSupport.supported)
         return leftSupport;
-      const rightSupport = checkSupport(expr.right, pos);
+      const rightSupport = checkSupport(expr.right, pos, matchers);
       if (!rightSupport.supported)
         return rightSupport;
       if (["===", "==", "!==", "!=", ">", "<", ">=", "<="].includes(expr.op)) {
@@ -188369,7 +188403,7 @@ function checkSupport(expr, pos) {
       return { supported: false, reason: `Unknown operator: ${expr.op}` };
     }
     case "unary": {
-      const argSupport = checkSupport(expr.argument, pos);
+      const argSupport = checkSupport(expr.argument, pos, matchers);
       if (!argSupport.supported)
         return argSupport;
       if (expr.op === "!") {
@@ -188381,25 +188415,25 @@ function checkSupport(expr, pos) {
       return { supported: false, reason: `Unsupported unary operator: ${expr.op}` };
     }
     case "logical": {
-      const leftSupport = checkSupport(expr.left, pos);
+      const leftSupport = checkSupport(expr.left, pos, matchers);
       if (!leftSupport.supported)
         return leftSupport;
       if (expr.op === "??" && expr.right.kind === "object-literal" && expr.right.properties.length === 0) {
         return { supported: true, level: "L4" };
       }
-      const rightSupport = checkSupport(expr.right, pos);
+      const rightSupport = checkSupport(expr.right, pos, matchers);
       if (!rightSupport.supported)
         return rightSupport;
       return { supported: true, level: "L4" };
     }
     case "conditional": {
-      const testSupport = checkSupport(expr.test, pos);
+      const testSupport = checkSupport(expr.test, pos, matchers);
       if (!testSupport.supported)
         return testSupport;
-      const consSupport = checkSupport(expr.consequent, pos);
+      const consSupport = checkSupport(expr.consequent, pos, matchers);
       if (!consSupport.supported)
         return consSupport;
-      const altSupport = checkSupport(expr.alternate, pos);
+      const altSupport = checkSupport(expr.alternate, pos, matchers);
       if (!altSupport.supported)
         return altSupport;
       return { supported: true, level: "L4" };
@@ -188407,7 +188441,7 @@ function checkSupport(expr, pos) {
     case "template-literal": {
       for (const part of expr.parts) {
         if (part.type === "expression") {
-          const partSupport = checkSupport(part.expr, pos);
+          const partSupport = checkSupport(part.expr, pos, matchers);
           if (!partSupport.supported)
             return partSupport;
         }
@@ -189404,6 +189438,12 @@ class BindingScope {
   }
 }
 
+// ../jsx/src/ir-to-client-js/safe-html.ts
+function safeHtml(expr) {
+  return expr;
+}
+var EMPTY_MARKUP = safeHtml("''");
+
 // ../jsx/src/ir-to-client-js/html-template.ts
 function splitTemplateInterpolations(inner) {
   const parts = [];
@@ -189592,8 +189632,6 @@ function collectAstPropRefs(node, propNames, out) {
   walkWithScope(node, (n, parent, shadowed) => {
     if (shadowed || !propNames.has(n.text))
       return;
-    if (parent && import_typescript7.default.isShorthandPropertyAssignment(parent) && parent.name === n)
-      return;
     if (isNonValuePosition(n, parent))
       return;
     out.add(n.text);
@@ -191415,6 +191453,7 @@ var CLIENT_EXPORTS = new Set([
   "isSSRPortal",
   "findSiblingSlot",
   "cleanupPortalPlaceholder",
+  "trackPosition",
   "createSearchParams",
   "queryHref",
   "formatDate",
@@ -192734,7 +192773,8 @@ var BROWSER_ONLY_CLIENT_APIS = new Set([
   "createPortal",
   "isSSRPortal",
   "findSiblingSlot",
-  "cleanupPortalPlaceholder"
+  "cleanupPortalPlaceholder",
+  "trackPosition"
 ]);
 function importsBrowserOnlyClientApi(ctx) {
   for (const imp of ctx.imports) {
@@ -194807,9 +194847,8 @@ function collectBranchLocalPropRefsViaSubstitution(node, ctx) {
   function visit2(n, parent) {
     if (import_typescript14.default.isIdentifier(n) && propDepsMap.has(n.text)) {
       const isObjectKey = parent && import_typescript14.default.isPropertyAssignment(parent) && parent.name === n;
-      const isShorthand = parent && import_typescript14.default.isShorthandPropertyAssignment(parent) && parent.name === n;
       const isAccessName = parent && import_typescript14.default.isPropertyAccessExpression(parent) && parent.name === n;
-      if (!isObjectKey && !isShorthand && !isAccessName) {
+      if (!isObjectKey && !isAccessName) {
         const deps = propDepsMap.get(n.text);
         if (deps && deps.size > 0) {
           if (!acc)
@@ -195287,8 +195326,7 @@ function lowerFormControlValueSsr(tagName, attrs, children) {
     children.push({
       type: "expression",
       expr,
-      templateExpr: `escapeText(${templateExpr ?? expr})`,
-      escapeInClientTemplate: true,
+      templateExpr,
       typeInfo: null,
       reactive: false,
       slotId: null,
@@ -195299,26 +195337,76 @@ function lowerFormControlValueSsr(tagName, attrs, children) {
   }
   const selectedForLiteral = (optValue) => AttrValueOf.expression(`(${expr}) === ${JSON.stringify(optValue)}`, templateExpr !== undefined ? { templateExpr: `(${templateExpr}) === ${JSON.stringify(optValue)}` } : undefined);
   const selectedForExpr = (optExpr, optTemplateExpr) => AttrValueOf.expression(`(${expr}) === (${optExpr})`, templateExpr !== undefined || optTemplateExpr !== undefined ? { templateExpr: `(${templateExpr ?? expr}) === (${optTemplateExpr ?? optExpr})` } : undefined);
+  const matchConditions = [];
+  let optionSetIsDynamic = false;
   const distribute = (nodes) => {
     for (const n of nodes) {
+      if (n.type === "text")
+        continue;
       if (n.type === "element" && n.tag === "option") {
-        if (n.attrs.some((a) => a.name === "selected"))
+        if (n.attrs.some((a) => a.name === "selected")) {
+          optionSetIsDynamic = true;
           continue;
+        }
         const optValue = n.attrs.find((a) => a.name === "value");
-        if (!optValue)
+        if (!optValue) {
+          optionSetIsDynamic = true;
           continue;
+        }
         if (optValue.value.kind === "literal") {
-          n.attrs.push({ name: "selected", value: selectedForLiteral(optValue.value.value), loc: n.loc });
+          const selected = selectedForLiteral(optValue.value.value);
+          n.attrs.push({ name: "selected", value: selected, loc: n.loc });
+          matchConditions.push(selected);
         } else if (optValue.value.kind === "expression") {
           const selected = selectedForExpr(optValue.value.expr, optValue.value.templateExpr);
           n.attrs.push({ name: "selected", value: selected, loc: n.loc });
+          matchConditions.push(selected);
+        } else {
+          optionSetIsDynamic = true;
         }
-      } else if (n.type === "fragment" || n.type === "loop" || n.type === "element" && n.tag === "optgroup") {
+      } else if (n.type === "fragment" || n.type === "element" && n.tag === "optgroup") {
         distribute(n.children);
+      } else if (n.type === "loop") {
+        optionSetIsDynamic = true;
+        distribute(n.children);
+      } else {
+        optionSetIsDynamic = true;
       }
     }
   };
   distribute(children);
+  if (optionSetIsDynamic || matchConditions.length === 0)
+    return;
+  if (isMultiSelection(attrs))
+    return;
+  const orExpr = matchConditions.map((c) => `(${c.expr})`).join(" || ");
+  const orTemplateExpr = matchConditions.some((c) => c.templateExpr !== undefined) ? matchConditions.map((c) => `(${c.templateExpr ?? c.expr})`).join(" || ") : undefined;
+  children.unshift({
+    type: "element",
+    tag: "option",
+    attrs: [
+      { name: "value", value: AttrValueOf.literal(""), loc: valueAttr.loc },
+      { name: "disabled", value: AttrValueOf.booleanAttr(), loc: valueAttr.loc },
+      { name: "hidden", value: AttrValueOf.booleanAttr(), loc: valueAttr.loc },
+      {
+        name: "selected",
+        value: AttrValueOf.expression(`!(${orExpr})`, orTemplateExpr !== undefined ? { templateExpr: `!(${orTemplateExpr})` } : undefined),
+        loc: valueAttr.loc
+      }
+    ],
+    events: [],
+    ref: null,
+    children: [],
+    slotId: null,
+    needsScope: false,
+    loc: valueAttr.loc
+  });
+}
+function isMultiSelection(attrs) {
+  if (attrs.some((a) => a.name === "multiple"))
+    return true;
+  const sizeAttr = attrs.find((a) => a.name === "size");
+  return sizeAttr?.value.kind === "literal" && Number(sizeAttr.value.value) > 1;
 }
 function transformHtmlElement(node, ctx, tagName) {
   const { attrs, events, ref } = processAttributes(node.openingElement.attributes, ctx);
@@ -199072,18 +199160,6 @@ var import_typescript16 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/relocate.ts
 var import_typescript18 = __toESM(require_typescript(), 1);
-
-// ../jsx/src/lowering-registry.ts
-var plugins = [];
-function registerLoweringPlugin(plugin) {
-  const existing = plugins.findIndex((p) => p.name === plugin.name);
-  if (existing >= 0)
-    plugins[existing] = plugin;
-  else
-    plugins.push(plugin);
-}
-
-// ../jsx/src/relocate.ts
 var REGISTRY_SAFE_BINDING_KINDS = new Set([
   "global",
   "module-import",

package/package.json

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