@stacksjs/stx 0.2.144 → 0.2.146

package/dist/client-script-bundler.js

@@ -32,8 +32,6 @@ export function hasUserImports(code) {
     const source = match[1];
     if (/\.css(?:\?.*)?$/.test(source))
       continue;
-    if (source === "@stacksjs/browser")
-      continue;
     if (!EXTERNAL_PATTERNS.some((p) => p.test(source))) {
       logBundlerDiagnostic("detected side-effect import:", source);
       return !0;

package/dist/client-script.d.ts

@@ -94,6 +94,7 @@ export declare interface VendorCssImport {
 export declare interface BrowserCoreAutoImportResult {
   code: string
   imports: string[]
+  models: string[]
 }
 // =============================================================================
 // Types

package/dist/client-script.js

@@ -270,13 +270,19 @@ export function injectBrowserCoreAutoImports(code) {
     if (explicitlyImported.has(symbol) || locallyDeclared.has(symbol))
       return !1;
     return new RegExp(`\\b${symbol}\\b`).test(code);
-  });
-  if (imports.length === 0)
-    return { code, imports };
+  }), models = detectModelUsage(code).filter((model) => !explicitlyImported.has(model) && !locallyDeclared.has(model));
+  if (imports.length === 0 && models.length === 0)
+    return { code, imports, models };
   return {
-    code: `import { ${imports.join(", ")} } from '@stacksjs/browser'
+    code: `${[
+      imports.length > 0 ? `import { ${imports.join(", ")} } from '@stacksjs/browser'` : "",
+      models.length > 0 ? "import '@stacksjs/browser'" : "",
+      models.length > 0 ? `const { ${models.join(", ")} } = window.StacksBrowser || {}` : ""
+    ].filter(Boolean).join(`
+`)}
 ${code}`,
-    imports
+    imports,
+    models
   };
 }
 const JS_BUILTINS = new Set([
@@ -344,6 +350,18 @@ function detectModelUsage(code) {
       models.add(match[1]);
   return Array.from(models);
 }
+function collectLocalBindings(code) {
+  const bindings = new Set;
+  for (const match of code.matchAll(/\b(?:const|let|var|function|class)\s+([A-Za-z_$][\w$]*)/g))
+    bindings.add(match[1]);
+  for (const match of code.matchAll(/\b(?:const|let|var)\s*\{([^}]*)\}/g))
+    for (const binding of match[1].split(",")) {
+      const localName = binding.trim().split(/[:=]/).pop()?.trim();
+      if (localName && /^[A-Za-z_$][\w$]*$/.test(localName))
+        bindings.add(localName);
+    }
+  return bindings;
+}
 function transformAutoImports(code) {
   const usedStxImports = new Set, usedBrowserImports = new Set;
   let transformedCode = code;
@@ -354,30 +372,43 @@ function transformAutoImports(code) {
     const imports = match[1], source = match[2];
     if (match[0].includes("import type"))
       continue;
-    imports.split(",").map((s) => s.trim().split(/\s+as\s+/)[0]).filter((s) => s.length > 0).forEach((name) => {
-      existingImports.add(name);
+    const aliases = [];
+    for (const rawSpecifier of imports.split(",")) {
+      const specifier = rawSpecifier.trim();
+      if (!specifier || specifier.startsWith("type "))
+        continue;
+      const aliasMatch = specifier.match(/^([A-Za-z_$][\w$]*)(?:\s+as\s+([A-Za-z_$][\w$]*))?$/);
+      if (!aliasMatch)
+        continue;
+      const importedName = aliasMatch[1], localName = aliasMatch[2] || importedName;
+      existingImports.add(importedName);
+      existingImports.add(localName);
       if (source === "stx" || source === "@stacksjs/stx")
-        usedStxImports.add(name);
+        usedStxImports.add(importedName);
       else
-        usedBrowserImports.add(name);
-    });
-    transformedCode = transformedCode.replace(match[0], "// [auto-import processed]");
+        usedBrowserImports.add(importedName);
+      if (localName !== importedName)
+        aliases.push(`${localName} = ${importedName}`);
+    }
+    const replacement = aliases.length > 0 ? `var ${aliases.join(", ")}; /* [auto-import processed] */` : "// [auto-import processed]";
+    transformedCode = transformedCode.replace(match[0], replacement);
   }
+  const locallyDeclared = collectLocalBindings(transformedCode);
   for (const symbol of STX_AUTO_IMPORTS) {
-    if (existingImports.has(symbol))
+    if (existingImports.has(symbol) || locallyDeclared.has(symbol))
       continue;
     if (new RegExp(`\\b${symbol}\\s*\\(`, "g").test(transformedCode))
       usedStxImports.add(symbol);
   }
   for (const symbol of BROWSER_CORE_IMPORTS) {
-    if (existingImports.has(symbol))
+    if (existingImports.has(symbol) || locallyDeclared.has(symbol))
       continue;
     if (new RegExp(`\\b${symbol}\\b`, "g").test(transformedCode))
       usedBrowserImports.add(symbol);
   }
   const detectedModels = detectModelUsage(transformedCode);
   for (const model of detectedModels)
-    if (!existingImports.has(model))
+    if (!existingImports.has(model) && !locallyDeclared.has(model))
       usedBrowserImports.add(model);
   return {
     code: transformedCode,
@@ -813,7 +844,7 @@ export async function processClientScript(scriptContent, options = {}) {
   code = cssExtraction.code;
   const vendorStyleTags = renderVendorStyleTags(cssExtraction.styles), browserCoreImports = injectBrowserCoreAutoImports(code);
   code = browserCoreImports.code;
-  bundledBrowserImports = browserCoreImports.imports;
+  bundledBrowserImports = [...browserCoreImports.imports, ...browserCoreImports.models];
   const { hasUserImports, bundleClientScript } = await importOnce("stx/client-script-bundler", () => import("./client-script-bundler.js"));
   if (hasUserImports(code)) {
     code = await bundleClientScript(code, options.filePath || "", {