@barefootjs/go-template 0.31.2 → 0.31.4

package/dist/vite.js

@@ -1946,6 +1946,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
 import ts2 from "typescript";
 function* iterateJsTokens(text, start = 0, end = text.length) {
@@ -2135,6 +2149,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",
@@ -2569,7 +2660,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);
     }
@@ -2578,7 +2669,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);
       }
@@ -3879,7 +3970,7 @@ 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[]) => {}`);
         }
@@ -3899,7 +3990,7 @@ class JsxAdapter extends BaseAdapter {
         continue;
       const keyword = constant.declarationKind ?? "const";
       if (!constant.value) {
-        const typeAnnotation = preserveTypes && constant.type ? `: ${constant.type.raw}` : "";
+        const typeAnnotation = preserveTypes && (constant.typeAnnotation ?? constant.type) ? `: ${constant.typeAnnotation ?? constant.type?.raw}` : "";
         lines.push(`  ${keyword} ${constant.name}${typeAnnotation}`);
         continue;
       }
@@ -3909,7 +4000,8 @@ class JsxAdapter extends BaseAdapter {
       if (!reachable.has(constant.name))
         continue;
       const constValue = preserveTypes ? constant.typedValue ?? constant.value : constant.value;
-      lines.push(`  ${keyword} ${constant.name} = ${constValue}`);
+      const letTypeAnnotation = preserveTypes && keyword === "let" && constant.typeAnnotation ? `: ${constant.typeAnnotation}` : "";
+      lines.push(`  ${keyword} ${constant.name}${letTypeAnnotation} = ${constValue}`);
     }
     for (const func of localFunctions) {
       if (moduleScopeNames.has(func.name))
@@ -4016,7 +4108,8 @@ class JsxAdapter extends BaseAdapter {
       const keyword = c.declarationKind ?? "const";
       const exportKw = c.isExported ? "export " : "";
       if (!c.value) {
-        entries.push({ line: c.loc.start.line, text: `${exportKw}${keyword} ${c.name}` });
+        const typeAnnotation = preserveTypes && (c.typeAnnotation ?? c.type) ? `: ${c.typeAnnotation ?? c.type?.raw}` : "";
+        entries.push({ line: c.loc.start.line, text: `${exportKw}${keyword} ${c.name}${typeAnnotation}` });
         continue;
       }
       const trimmed = c.value.trim();
@@ -4025,7 +4118,8 @@ class JsxAdapter extends BaseAdapter {
       if (c.isExported && /^createContext\b/.test(trimmed))
         continue;
       const value = preserveTypes ? c.typedValue ?? c.value : c.value;
-      entries.push({ line: c.loc.start.line, text: `${exportKw}${keyword} ${c.name} = ${value}` });
+      const letTypeAnnotation = preserveTypes && keyword === "let" && c.typeAnnotation ? `: ${c.typeAnnotation}` : "";
+      entries.push({ line: c.loc.start.line, text: `${exportKw}${keyword} ${c.name}${letTypeAnnotation} = ${value}` });
     }
     for (const f of ir.metadata.localFunctions) {
       if (!f.isModule || !moduleNames.has(f.name))
@@ -4074,6 +4168,7 @@ class JsxAdapter extends BaseAdapter {
 }
 
 // ../jsx/src/adapters/template-imports.ts
+import ts25 from "typescript";
 var CLIENT_PACKAGE_SOURCES = new Set([
   "@barefootjs/client",
   "@barefootjs/client/runtime"
@@ -4810,7 +4905,7 @@ function dangerousInnerHtmlDiagnostic(expr, loc, reason) {
   };
 }
 // ../jsx/src/combine-client-js.ts
-import ts25 from "typescript";
+import ts26 from "typescript";
 // ../jsx/src/loop-destructure.ts
 function isLowerableLoopDestructure(loop) {
   const bindings = loop.paramBindings;
@@ -4950,9 +5045,9 @@ function escapeRe(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 // ../jsx/src/debug.ts
-import ts26 from "typescript";
-// ../jsx/src/profiler.ts
 import ts27 from "typescript";
+// ../jsx/src/profiler.ts
+import ts28 from "typescript";
 
 // ../jsx/src/index.ts
 registerBuiltinLoweringPlugins();
@@ -6583,7 +6678,7 @@ function computeObjectMemoInitialValue(ctx, memo) {
 }
 
 // src/adapter/memo/template-interp.ts
-import ts28 from "typescript";
+import ts29 from "typescript";
 function computeTemplateLiteralMemoInitialValue(ctx, memo, propsParams) {
   const localKeyBindings = new Map;
   let templateValue;
@@ -7214,7 +7309,7 @@ function collectPropsReadByCtorInit(body, propsObjectName, propNames) {
 }
 
 // src/adapter/spread/spread-codegen.ts
-import ts29 from "typescript";
+import ts30 from "typescript";
 function collectSpreadSlots(ctx, node) {
   const result = [];
   collectSpreadSlotsRecursive(ctx, node, result);
@@ -7449,7 +7544,7 @@ function recordIndexAccessToGoMap(ctx, val, ir) {
   if (val.kind !== "index-access" || val.object.kind !== "identifier" || val.index.kind !== "identifier") {
     return null;
   }
-  const tsVal = ts29.factory.createElementAccessExpression(ts29.factory.createIdentifier(val.object.name), ts29.factory.createIdentifier(val.index.name));
+  const tsVal = ts30.factory.createElementAccessExpression(ts30.factory.createIdentifier(val.object.name), ts30.factory.createIdentifier(val.index.name));
   const parsed = parseRecordIndexAccess(tsVal, ir.metadata.localConstants ?? [], ir.metadata.propsParams);
   if (!parsed)
     return null;
@@ -9357,9 +9452,9 @@ ${goFields.join(`
       }
     }
     const propsObjectName = this.state.propsObjectName;
-    const identifierPattern = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
-    const bareIdentifier = identifierPattern.test(expr) ? expr : null;
-    const barePropAccess = propsObjectName && expr.startsWith(`${propsObjectName}.`) && identifierPattern.test(expr.slice(propsObjectName.length + 1)) ? expr.slice(propsObjectName.length + 1) : null;
+    const identifierPattern2 = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
+    const bareIdentifier = identifierPattern2.test(expr) ? expr : null;
+    const barePropAccess = propsObjectName && expr.startsWith(`${propsObjectName}.`) && identifierPattern2.test(expr.slice(propsObjectName.length + 1)) ? expr.slice(propsObjectName.length + 1) : null;
     const passthroughName = bareIdentifier ?? barePropAccess;
     const localConst = this.state.localConstants.find((c) => c.name === passthroughName);
     const isPropsDestructureAlias = localConst !== undefined && propsObjectName !== null && localConst.value === `${propsObjectName}.${passthroughName}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/go-template",
-  "version": "0.31.2",
+  "version": "0.31.4",
   "description": "Go html/template adapter for BarefootJS - generates Go template files from IR",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
     "directory": "packages/adapter-go-template"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.31.2"
+    "@barefootjs/shared": "0.31.4"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
@@ -67,9 +67,9 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/client": "0.31.2",
-    "@barefootjs/jsx": "0.31.2",
-    "@barefootjs/vite": "0.31.2",
+    "@barefootjs/client": "0.31.4",
+    "@barefootjs/jsx": "0.31.4",
+    "@barefootjs/vite": "0.31.4",
     "vite": "^6.0.0"
   }
 }