@barefootjs/test 0.25.0 → 0.26.0

package/dist/index.js

@@ -191421,6 +191421,37 @@ function extractFreeIdentifiersFromNode(node) {
   visit2(node);
   return ids;
 }
+function extractFreeTypeIdentifiersFromNode(node) {
+  const ids = new Set;
+  const boundTypeParams = new Set;
+  function rootName(name) {
+    return import_typescript8.default.isQualifiedName(name) ? rootName(name.left) : name;
+  }
+  function visit2(n) {
+    if (import_typescript8.default.isTypeReferenceNode(n)) {
+      const name = rootName(n.typeName).text;
+      if (!boundTypeParams.has(name))
+        ids.add(name);
+    }
+    if (import_typescript8.default.isTypeQueryNode(n)) {
+      const name = rootName(n.exprName).text;
+      if (!boundTypeParams.has(name))
+        ids.add(name);
+    }
+    if (import_typescript8.default.isFunctionLike(n) && n.typeParameters && n.typeParameters.length > 0) {
+      const names = n.typeParameters.map((p) => p.name.text);
+      for (const p of names)
+        boundTypeParams.add(p);
+      import_typescript8.default.forEachChild(n, visit2);
+      for (const p of names)
+        boundTypeParams.delete(p);
+      return;
+    }
+    import_typescript8.default.forEachChild(n, visit2);
+  }
+  visit2(node);
+  return ids;
+}
 function initializerShapeContainsJsx(node) {
   let found = false;
   function visit2(n) {
@@ -192243,16 +192274,17 @@ function buildEntryImportIndex(sf, filePath) {
       continue;
     if (!import_typescript8.default.isStringLiteral(stmt.moduleSpecifier))
       continue;
-    if (stmt.importClause?.isTypeOnly)
-      continue;
     const src = stmt.moduleSpecifier.text;
     const targetKey = src.startsWith("./") || src.startsWith("../") ? resolveRelativeImportToFile(src, filePath) ?? "unresolved:" + src : src;
+    const wholeTypeOnly = stmt.importClause?.isTypeOnly === true;
     const namedBindings = stmt.importClause?.namedBindings;
     if (namedBindings && import_typescript8.default.isNamedImports(namedBindings)) {
       for (const el of namedBindings.elements) {
-        if (el.isTypeOnly)
-          continue;
-        index.set(el.name.text, { targetKey, exportedName: (el.propertyName ?? el.name).text });
+        index.set(el.name.text, {
+          targetKey,
+          exportedName: (el.propertyName ?? el.name).text,
+          isTypeOnly: wholeTypeOnly || el.isTypeOnly
+        });
       }
     }
   }
@@ -192282,6 +192314,9 @@ function collectEntryBindingNames(sf) {
     if ((import_typescript8.default.isFunctionDeclaration(node) || import_typescript8.default.isClassDeclaration(node) || import_typescript8.default.isEnumDeclaration(node)) && node.name) {
       names.add(node.name.text);
     }
+    if ((import_typescript8.default.isTypeAliasDeclaration(node) || import_typescript8.default.isInterfaceDeclaration(node)) && node.name) {
+      names.add(node.name.text);
+    }
     if (import_typescript8.default.isFunctionLike(node)) {
       for (const p of node.parameters) {
         const out = [];
@@ -192477,7 +192512,11 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
           const required = [];
           const pending = [];
           let declinedEntry = null;
-          for (const ref of capture.importedRefs) {
+          const allRefs = [
+            ...capture.importedRefs.map((r) => ({ ...r, isTypeOnly: false })),
+            ...capture.importedTypeRefs.map((r) => ({ ...r, isTypeOnly: true }))
+          ];
+          for (const ref of allRefs) {
             let specifier;
             let targetKey;
             if (ref.source.startsWith("./") || ref.source.startsWith("../")) {
@@ -192497,7 +192536,7 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
               targetKey = ref.source;
             }
             const existing = entryImportIndex.get(ref.localName);
-            if (existing && existing.targetKey === targetKey && existing.exportedName === ref.exportedName) {
+            if (existing && existing.targetKey === targetKey && existing.exportedName === ref.exportedName && (ref.isTypeOnly || !existing.isTypeOnly)) {
               continue;
             }
             const planned = plannedInjections.get(ref.localName);
@@ -192511,7 +192550,7 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
               break;
             }
             pending.push([ref.localName, { targetKey, exportedName: ref.exportedName }]);
-            required.push({ localName: ref.localName, exportedName: ref.exportedName, specifier });
+            required.push({ localName: ref.localName, exportedName: ref.exportedName, specifier, isTypeOnly: ref.isTypeOnly || undefined });
           }
           if (declinedEntry) {
             result.declined.set(spec.local, declinedEntry);
@@ -192531,6 +192570,8 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
 }
 function collectHelperModuleValueBindings(sf) {
   const local = new Set;
+  const localTypes = new Set;
+  const importedTypes = new Map;
   const imported = new Map;
   for (const stmt of sf.statements) {
     if (import_typescript8.default.isVariableStatement(stmt)) {
@@ -192546,35 +192587,41 @@ function collectHelperModuleValueBindings(sf) {
       local.add(stmt.name.text);
       continue;
     }
+    if ((import_typescript8.default.isTypeAliasDeclaration(stmt) || import_typescript8.default.isInterfaceDeclaration(stmt)) && stmt.name) {
+      localTypes.add(stmt.name.text);
+      continue;
+    }
     if (import_typescript8.default.isImportDeclaration(stmt)) {
-      if (stmt.importClause?.isTypeOnly)
-        continue;
       if (!import_typescript8.default.isStringLiteral(stmt.moduleSpecifier))
         continue;
       const src = stmt.moduleSpecifier.text;
       if (src === "@barefootjs/client" || src === "@barefootjs/client/runtime")
         continue;
+      const wholeTypeOnly = stmt.importClause?.isTypeOnly === true;
       if (stmt.importClause?.name)
-        local.add(stmt.importClause.name.text);
+        (wholeTypeOnly ? localTypes : local).add(stmt.importClause.name.text);
       const namedBindings = stmt.importClause?.namedBindings;
       if (namedBindings && import_typescript8.default.isNamedImports(namedBindings)) {
         for (const el of namedBindings.elements) {
-          if (el.isTypeOnly)
-            continue;
-          imported.set(el.name.text, { source: src, exportedName: (el.propertyName ?? el.name).text });
+          const entry = { source: src, exportedName: (el.propertyName ?? el.name).text };
+          if (wholeTypeOnly || el.isTypeOnly)
+            importedTypes.set(el.name.text, entry);
+          else
+            imported.set(el.name.text, entry);
         }
       }
       if (namedBindings && import_typescript8.default.isNamespaceImport(namedBindings)) {
-        local.add(namedBindings.name.text);
+        (wholeTypeOnly ? localTypes : local).add(namedBindings.name.text);
       }
     }
   }
-  return { local, imported };
+  return { local, imported, localTypes, importedTypes };
 }
 function moduleCaptureCheck(fn, info, moduleBindings, selfName) {
   if (!fn.body)
-    return { captured: [], importedRefs: [] };
+    return { captured: [], importedRefs: [], importedTypeRefs: [] };
   const free = extractFreeIdentifiersFromNode(fn.body);
+  const freeTypes = extractFreeTypeIdentifiersFromNode(fn.body);
   const exclude = new Set(info.params);
   for (const b of info.localBindings)
     exclude.add(b);
@@ -192583,8 +192630,12 @@ function moduleCaptureCheck(fn, info, moduleBindings, selfName) {
   for (const p of REACTIVE_PRIMITIVES)
     exclude.add(p);
   exclude.add(selfName);
+  if (fn.typeParameters)
+    for (const p of fn.typeParameters)
+      exclude.add(p.name.text);
   const captured = [];
   const importedRefs = [];
+  const importedTypeRefs = [];
   for (const id of free) {
     if (exclude.has(id))
       continue;
@@ -192596,9 +192647,28 @@ function moduleCaptureCheck(fn, info, moduleBindings, selfName) {
     if (imp)
       importedRefs.push({ localName: id, source: imp.source, exportedName: imp.exportedName });
   }
+  for (const id of freeTypes) {
+    if (exclude.has(id))
+      continue;
+    if (free.has(id))
+      continue;
+    if (moduleBindings.localTypes.has(id) || moduleBindings.local.has(id)) {
+      captured.push(id);
+      continue;
+    }
+    const typeImp = moduleBindings.importedTypes.get(id);
+    if (typeImp) {
+      importedTypeRefs.push({ localName: id, source: typeImp.source, exportedName: typeImp.exportedName });
+      continue;
+    }
+    const valueImp = moduleBindings.imported.get(id);
+    if (valueImp)
+      importedRefs.push({ localName: id, source: valueImp.source, exportedName: valueImp.exportedName });
+  }
   captured.sort();
   importedRefs.sort((a, b) => a.localName < b.localName ? -1 : 1);
-  return { captured, importedRefs };
+  importedTypeRefs.sort((a, b) => a.localName < b.localName ? -1 : 1);
+  return { captured, importedRefs, importedTypeRefs };
 }
 function detectReactiveFactory(node, sourceFile, filePath) {
   if (!node.body || !node.name)
@@ -192937,20 +193007,44 @@ function rewriteFactoryCallsInSource(source, prescan) {
   if (edits.length === 0)
     return source;
   const importsBySpecifier = new Map;
+  const typeImportsBySpecifier = new Map;
   for (const f of inlinedFactories) {
     for (const r of f.requiredImports ?? []) {
-      let names = importsBySpecifier.get(r.specifier);
+      const bySpecifier = r.isTypeOnly ? typeImportsBySpecifier : importsBySpecifier;
+      let names = bySpecifier.get(r.specifier);
       if (!names) {
         names = new Map;
-        importsBySpecifier.set(r.specifier, names);
+        bySpecifier.set(r.specifier, names);
       }
       names.set(r.localName, r.exportedName);
     }
   }
-  if (importsBySpecifier.size > 0) {
-    const lines = [...importsBySpecifier].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([spec, names]) => {
+  for (const [spec, typeNames] of typeImportsBySpecifier) {
+    const valueNames = importsBySpecifier.get(spec);
+    if (!valueNames)
+      continue;
+    for (const local of [...typeNames.keys()]) {
+      if (valueNames.has(local))
+        typeNames.delete(local);
+    }
+    if (typeNames.size === 0)
+      typeImportsBySpecifier.delete(spec);
+  }
+  if (importsBySpecifier.size > 0 || typeImportsBySpecifier.size > 0) {
+    const buildLine = (names, keyword, spec) => {
       const specifiers = [...names].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([local, exported]) => exported === local ? local : `${exported} as ${local}`);
-      return `import { ${specifiers.join(", ")} } from '${spec}'`;
+      return `import ${keyword}{ ${specifiers.join(", ")} } from '${spec}'`;
+    };
+    const allSpecifiers = new Set([...importsBySpecifier.keys(), ...typeImportsBySpecifier.keys()]);
+    const lines = [...allSpecifiers].sort().flatMap((spec) => {
+      const out2 = [];
+      const valueNames = importsBySpecifier.get(spec);
+      if (valueNames)
+        out2.push(buildLine(valueNames, "", spec));
+      const typeNames = typeImportsBySpecifier.get(spec);
+      if (typeNames)
+        out2.push(buildLine(typeNames, "type ", spec));
+      return out2;
     });
     const at = factoryImportInsertionOffset(sourceFile);
     edits.push({ start: at, end: at, replacement: at === 0 ? lines.join(`
@@ -193530,6 +193624,20 @@ function resolveFreeRefs(node, env) {
 
 // ../jsx/src/to-locale-date-lowering.ts
 var TO_LOCALE_TZ_RE = /^(?:UTC|[+-](?:[01]\d|2[0-3]):[0-5]\d)$/;
+var tzProbeCache = new Map;
+function isBuildResolvableTimeZone(value) {
+  const cached = tzProbeCache.get(value);
+  if (cached !== undefined)
+    return cached;
+  let verified;
+  try {
+    verified = new Intl.DateTimeFormat("en-US", { timeZone: value }).resolvedOptions().timeZone === value;
+  } catch {
+    verified = false;
+  }
+  tzProbeCache.set(value, verified);
+  return verified;
+}
 var PROBE_UTC = new Date(Date.UTC(2001, 1, 3));
 var formatCache = new Map;
 var namesCache = new Map;
@@ -193768,7 +193876,7 @@ function matchToLocaleDateStringCall(callee, args, metadata) {
       return null;
     const value = String(prop.value.value);
     if (prop.key === "timeZone") {
-      if (!TO_LOCALE_TZ_RE.test(value))
+      if (!TO_LOCALE_TZ_RE.test(value) && !isBuildResolvableTimeZone(value))
         return null;
       tz = value;
     } else {

package/package.json

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