@stacksjs/stx 0.2.145 → 0.2.146

package/dist/client-script.js

@@ -350,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;
@@ -360,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,