@barefootjs/client 0.31.3 → 0.31.5

package/dist/csr-adapter.js

@@ -168754,7 +168754,7 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
 });
 
 // ../jsx/src/compiler.ts
-var import_typescript23 = __toESM(require_typescript(), 1);
+var import_typescript24 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/analyzer.ts
 var import_typescript9 = __toESM(require_typescript(), 1);
@@ -168861,6 +168861,20 @@ function templatePartsToJsExpr(parts, opts) {
   return result;
 }
 
+// ../jsx/src/identifier-pattern.ts
+function withUnicodeFlag(flags) {
+  return flags.includes("u") ? flags : `${flags}u`;
+}
+function escapeIdentifierForRegex(name) {
+  return name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+var ID_BOUNDARY_BEFORE = "(?<![\\p{ID_Continue}$])";
+var ID_BOUNDARY_AFTER = "(?![\\p{ID_Continue}$])";
+function identifierPattern(name, flags = "") {
+  const esc = escapeIdentifierForRegex(name);
+  return new RegExp(`${ID_BOUNDARY_BEFORE}${esc}${ID_BOUNDARY_AFTER}`, withUnicodeFlag(flags));
+}
+
 // ../jsx/src/scanner/js-scanner.ts
 var import_typescript2 = __toESM(require_typescript(), 1);
 
@@ -168965,6 +168979,83 @@ function extractFreeIdentifiersFromText(text) {
   return extractFreeIdentifiersFromNode(expr);
 }
 
+// ../jsx/src/scope/binding-scope.ts
+class BindingScope {
+  frames;
+  static EMPTY = new BindingScope([]);
+  constructor(frames) {
+    this.frames = frames;
+  }
+  enterLoopRow(loop) {
+    const bindings = new Map;
+    if (loop.paramBindings && loop.paramBindings.length > 0) {
+      for (const b of loop.paramBindings)
+        bindings.set(b.name, { source: "destructure" });
+    } else {
+      bindings.set(loop.param, { source: "item" });
+    }
+    if (loop.index != null)
+      bindings.set(loop.index, { source: "index" });
+    for (const name of loop.preamble?.declaredNames ?? [])
+      bindings.set(name, { source: "preamble" });
+    const frame = { kind: "loop-row", bindings };
+    return new BindingScope([frame, ...this.frames]);
+  }
+  enterCallback(params) {
+    const bindings = new Map;
+    for (const name of params)
+      bindings.set(name, { source: "param" });
+    const frame = { kind: "callback", bindings };
+    return new BindingScope([frame, ...this.frames]);
+  }
+  isBound(name) {
+    for (const frame of this.frames) {
+      if (frame.bindings.has(name))
+        return true;
+    }
+    return false;
+  }
+  lookup(name) {
+    for (let depth = 0;depth < this.frames.length; depth++) {
+      const frame = this.frames[depth];
+      const binding = frame.bindings.get(name);
+      if (binding)
+        return { depth, frame, binding };
+    }
+    return null;
+  }
+  boundNames() {
+    if (this.boundNamesCache)
+      return this.boundNamesCache;
+    const names = new Set;
+    for (const frame of this.frames) {
+      for (const name of frame.bindings.keys())
+        names.add(name);
+    }
+    this.boundNamesCache = names;
+    return names;
+  }
+  boundNamesCache;
+  valueBoundNamesCache;
+  valueBoundNames() {
+    if (this.valueBoundNamesCache)
+      return this.valueBoundNamesCache;
+    const names = new Set;
+    for (const frame of this.frames) {
+      for (const [name, binding] of frame.bindings) {
+        if (binding.source === "item" || binding.source === "index" || binding.source === "destructure") {
+          names.add(name);
+        }
+      }
+    }
+    this.valueBoundNamesCache = names;
+    return names;
+  }
+  asShadowPredicate() {
+    return (name) => this.isBound(name);
+  }
+}
+
 // ../jsx/src/ir-to-client-js/html-template.ts
 var VOID_ELEMENTS = new Set([
   "area",
@@ -169336,7 +169427,7 @@ var REACTIVE_PRIMITIVES = new Set([
 ]);
 
 // ../jsx/src/jsx-to-ir.ts
-var import_typescript12 = __toESM(require_typescript(), 1);
+var import_typescript13 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/types.ts
 var SCOPE_FORBIDDEN = {
@@ -169372,6 +169463,7 @@ var REACTIVE_BINDING_KINDS = new Set([
 ]);
 
 // ../jsx/src/module-exports.ts
+var import_typescript10 = __toESM(require_typescript(), 1);
 function formatParamWithType(p) {
   const rest = p.isRest ? "..." : "";
   const optional = p.optional ? "?" : "";
@@ -169385,7 +169477,7 @@ function findReachableNames(primaryRefs, declarations) {
   const reachable = new Set;
   const queue = [];
   for (const name of allNames) {
-    if (new RegExp(`\\b${name}\\b`).test(primaryRefs)) {
+    if (identifierPattern(name).test(primaryRefs)) {
       reachable.add(name);
       queue.push(name);
     }
@@ -169394,7 +169486,7 @@ function findReachableNames(primaryRefs, declarations) {
     const current = queue.shift();
     const body = bodyMap.get(current) || "";
     for (const name of allNames) {
-      if (!reachable.has(name) && new RegExp(`\\b${name}\\b`).test(body)) {
+      if (!reachable.has(name) && identifierPattern(name).test(body)) {
         reachable.add(name);
         queue.push(name);
       }
@@ -169402,12 +169494,55 @@ function findReachableNames(primaryRefs, declarations) {
   }
   return reachable;
 }
+function findAssignedNames(bodyText, candidates) {
+  const assigned = new Set;
+  if (candidates.size === 0)
+    return assigned;
+  const sf = import_typescript10.default.createSourceFile("bf-assignment-scan.tsx", bodyText, import_typescript10.default.ScriptTarget.Latest, false, import_typescript10.default.ScriptKind.TSX);
+  const record = (target) => {
+    if (import_typescript10.default.isIdentifier(target) && candidates.has(target.text)) {
+      assigned.add(target.text);
+    }
+  };
+  const visit = (node) => {
+    if (import_typescript10.default.isBinaryExpression(node) && isAssignmentOperator(node.operatorToken.kind)) {
+      record(node.left);
+    } else if ((import_typescript10.default.isPrefixUnaryExpression(node) || import_typescript10.default.isPostfixUnaryExpression(node)) && (node.operator === import_typescript10.default.SyntaxKind.PlusPlusToken || node.operator === import_typescript10.default.SyntaxKind.MinusMinusToken)) {
+      record(node.operand);
+    }
+    import_typescript10.default.forEachChild(node, visit);
+  };
+  import_typescript10.default.forEachChild(sf, visit);
+  return assigned;
+}
+function closeOverWritersOfMutableBindings(primaryRefs, declarations, mutableNames) {
+  let reachable = findReachableNames(primaryRefs, declarations);
+  if (mutableNames.size === 0)
+    return reachable;
+  let seedText = primaryRefs;
+  for (let round = 0;round <= declarations.length; round++) {
+    const survivingMutables = new Set([...reachable].filter((name) => mutableNames.has(name)));
+    if (survivingMutables.size === 0)
+      return reachable;
+    const added = declarations.filter((d) => !reachable.has(d.name)).filter((d) => findAssignedNames(d.body, survivingMutables).size > 0).map((d) => d.name);
+    if (added.length === 0)
+      return reachable;
+    seedText += `
+` + added.join(`
+`);
+    reachable = findReachableNames(seedText, declarations);
+  }
+  return reachable;
+}
+function isAssignmentOperator(kind) {
+  return kind >= import_typescript10.default.SyntaxKind.FirstAssignment && kind <= import_typescript10.default.SyntaxKind.LastAssignment;
+}
 
 // ../jsx/src/reactivity-checker.ts
-var import_typescript10 = __toESM(require_typescript(), 1);
+var import_typescript11 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/free-refs.ts
-var import_typescript11 = __toESM(require_typescript(), 1);
+var import_typescript12 = __toESM(require_typescript(), 1);
 var _bindingMapCache = new WeakMap;
 
 // ../jsx/src/to-locale-date-lowering.ts
@@ -169725,83 +169860,6 @@ var toLocaleDatePlugin = {
   }
 };
 
-// ../jsx/src/scope/binding-scope.ts
-class BindingScope {
-  frames;
-  static EMPTY = new BindingScope([]);
-  constructor(frames) {
-    this.frames = frames;
-  }
-  enterLoopRow(loop) {
-    const bindings = new Map;
-    if (loop.paramBindings && loop.paramBindings.length > 0) {
-      for (const b of loop.paramBindings)
-        bindings.set(b.name, { source: "destructure" });
-    } else {
-      bindings.set(loop.param, { source: "item" });
-    }
-    if (loop.index != null)
-      bindings.set(loop.index, { source: "index" });
-    for (const name of loop.preamble?.declaredNames ?? [])
-      bindings.set(name, { source: "preamble" });
-    const frame = { kind: "loop-row", bindings };
-    return new BindingScope([frame, ...this.frames]);
-  }
-  enterCallback(params) {
-    const bindings = new Map;
-    for (const name of params)
-      bindings.set(name, { source: "param" });
-    const frame = { kind: "callback", bindings };
-    return new BindingScope([frame, ...this.frames]);
-  }
-  isBound(name) {
-    for (const frame of this.frames) {
-      if (frame.bindings.has(name))
-        return true;
-    }
-    return false;
-  }
-  lookup(name) {
-    for (let depth = 0;depth < this.frames.length; depth++) {
-      const frame = this.frames[depth];
-      const binding = frame.bindings.get(name);
-      if (binding)
-        return { depth, frame, binding };
-    }
-    return null;
-  }
-  boundNames() {
-    if (this.boundNamesCache)
-      return this.boundNamesCache;
-    const names = new Set;
-    for (const frame of this.frames) {
-      for (const name of frame.bindings.keys())
-        names.add(name);
-    }
-    this.boundNamesCache = names;
-    return names;
-  }
-  boundNamesCache;
-  valueBoundNamesCache;
-  valueBoundNames() {
-    if (this.valueBoundNamesCache)
-      return this.valueBoundNamesCache;
-    const names = new Set;
-    for (const frame of this.frames) {
-      for (const [name, binding] of frame.bindings) {
-        if (binding.source === "item" || binding.source === "index" || binding.source === "destructure") {
-          names.add(name);
-        }
-      }
-    }
-    this.valueBoundNamesCache = names;
-    return names;
-  }
-  asShadowPredicate() {
-    return (name) => this.isBound(name);
-  }
-}
-
 // ../jsx/src/jsx-to-ir.ts
 var EMPTY_BOUND = new Set;
 var constInitializerCache = new WeakMap;
@@ -169898,13 +169956,13 @@ var KEYWORDS_AND_GLOBALS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/walk-prop-accesses.ts
-var import_typescript13 = __toESM(require_typescript(), 1);
+var import_typescript14 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/value-references.ts
-var import_typescript14 = __toESM(require_typescript(), 1);
+var import_typescript15 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/relocate.ts
-var import_typescript15 = __toESM(require_typescript(), 1);
+var import_typescript16 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/lowering-registry.ts
 var plugins = [];
@@ -170083,10 +170141,10 @@ function formatDateLocalNames(metadata) {
 }
 
 // ../jsx/src/ir-to-client-js/prune-unused-prop-extractions.ts
-var import_typescript16 = __toESM(require_typescript(), 1);
+var import_typescript17 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ir-to-client-js/control-flow/plan/lazy-preamble.ts
-var import_typescript17 = __toESM(require_typescript(), 1);
+var import_typescript18 = __toESM(require_typescript(), 1);
 var NO_PREAMBLE = {
   lazySafe: true,
   facts: { declaredNames: new Set, freeNames: new Set }
@@ -170136,7 +170194,7 @@ var INERT_BINDING_GLOBALS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/emit-reactive.ts
-var import_typescript18 = __toESM(require_typescript(), 1);
+var import_typescript19 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ir-to-client-js/control-flow/stringify/event-delegation.ts
 var NON_BUBBLING_EVENTS = new Set([
@@ -170151,7 +170209,7 @@ var NON_BUBBLING_EVENTS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/rewrite-props-object.ts
-var import_typescript19 = __toESM(require_typescript(), 1);
+var import_typescript20 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ir-to-client-js/source-map.ts
 var BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -170242,20 +170300,20 @@ class SourceMapGenerator {
 }
 
 // ../jsx/src/preprocess-inline-jsx-callbacks.ts
-var import_typescript20 = __toESM(require_typescript(), 1);
+var import_typescript21 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ssr-defaults.ts
-var import_typescript21 = __toESM(require_typescript(), 1);
+var import_typescript22 = __toESM(require_typescript(), 1);
 var UNRESOLVED = Symbol("unresolved");
 var NO_RETURN = Symbol("no-return");
 
 // ../jsx/src/augment-inherited-props.ts
-var import_typescript22 = __toESM(require_typescript(), 1);
+var import_typescript23 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/rich-type-refusal.ts
 var EMPTY_BINDINGS2 = new Map;
 // ../jsx/src/shared-program.ts
-var import_typescript24 = __toESM(require_typescript(), 1);
+var import_typescript25 = __toESM(require_typescript(), 1);
 // ../jsx/src/adapters/interface.ts
 class BaseAdapter {
   renderChildren(children) {
@@ -170308,7 +170366,7 @@ class JsxAdapter extends BaseAdapter {
       ...localFunctions.map((f) => ({ name: f.name, body: f.body })),
       ...localConstants.map((c) => ({ name: c.name, body: c.value }))
     ];
-    const reachable = findReachableNames(primaryRefText, declarations);
+    const reachable = closeOverWritersOfMutableBindings(primaryRefText, declarations, new Set(ir.metadata.localConstants.filter((c) => (c.declarationKind ?? "const") !== "const").map((c) => c.name)));
     const reachableBodies = [...reachable].map((name) => {
       const func = localFunctions.find((f) => f.name === name);
       if (func)
@@ -170338,9 +170396,10 @@ class JsxAdapter extends BaseAdapter {
         lines.push(`  const ${signal.getter} = () => ${initialValue}`);
       }
       if (signal.setter) {
-        const setterUsed = new RegExp(`\\b${signal.setter}\\b`).test(setterRefText);
+        const setterUsed = identifierPattern(signal.setter).test(setterRefText);
         if (setterUsed) {
-          lines.push(`  const ${signal.setter} = (..._args: any[]) => {}`);
+          const setterType = preserveTypes && signal.type.kind !== "unknown" ? `(valueOrFn: ${signal.type.raw} | ((prev: ${signal.type.raw}) => ${signal.type.raw})) => void` : null;
+          lines.push(setterType ? `  const ${signal.setter}: ${setterType} = () => {}` : `  const ${signal.setter} = (..._args: any[]) => {}`);
         }
       }
     }
@@ -170536,6 +170595,7 @@ class JsxAdapter extends BaseAdapter {
 }
 
 // ../jsx/src/adapters/template-imports.ts
+var import_typescript26 = __toESM(require_typescript(), 1);
 var CLIENT_PACKAGE_SOURCES = new Set([
   "@barefootjs/client",
   "@barefootjs/client/runtime"
@@ -170674,7 +170734,8 @@ export default ${this.componentName}` : "";
     const noArgDefault = hasRequiredProps ? "" : ` = {} as ${propsTypeExpr}`;
     const lines = [];
     const exportPrefix = ir.metadata.isExported === false ? "" : "export ";
-    lines.push(`${exportPrefix}function ${name}(${fullPropsDestructure}${typeAnnotation}${noArgDefault}) {`);
+    const typeParameters = ir.metadata.typeParameters ?? "";
+    lines.push(`${exportPrefix}function ${name}${typeParameters}(${fullPropsDestructure}${typeAnnotation}${noArgDefault}) {`);
     if (hasClientInteractivity) {
       lines.push(`  const __scopeId = (/_s\\d/.test(__bfScope || '') ? __bfScope : null) || __instanceId || \`${name}_\${Math.random().toString(36).slice(2, 8)}\``);
     } else {
@@ -170925,11 +170986,11 @@ function registerBuiltinLoweringPlugins() {
     registerLoweringPlugin(plugin);
 }
 // ../jsx/src/combine-client-js.ts
-var import_typescript25 = __toESM(require_typescript(), 1);
+var import_typescript27 = __toESM(require_typescript(), 1);
 // ../jsx/src/debug.ts
-var import_typescript26 = __toESM(require_typescript(), 1);
+var import_typescript28 = __toESM(require_typescript(), 1);
 // ../jsx/src/profiler.ts
-var import_typescript27 = __toESM(require_typescript(), 1);
+var import_typescript29 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/index.ts
 registerBuiltinLoweringPlugins();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/client",
-  "version": "0.31.3",
+  "version": "0.31.5",
   "description": "BarefootJS client package: reactive primitives (SSR-safe) plus browser runtime under the `/runtime` subpath (compiler target)",
   "type": "module",
   "main": "./dist/index.js",
@@ -55,7 +55,7 @@
     "directory": "packages/client"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.31.3"
+    "@barefootjs/shared": "0.31.5"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0"