juxscript 1.0.82 → 1.0.84

package/machinery/compiler.js

@@ -238,7 +238,8 @@ export async function bundleJuxFilesToRouter(projectRoot, distDir, options = {})
     const hasExports = /^\s*export\s+(const|let|function|class|{)/m.test(fileContent);
     if (hasExports) {
       const exportKey = relativePath;
-      const exportCode = extractSharedModule(fileContent, rawFunctionName, relativePath);
+      // ✅ FIX: Pass bundledPaths so imports can be resolved and rewritten in shared code
+      const exportCode = extractSharedModule(fileContent, rawFunctionName, relativePath, bundledPaths);
       if (exportCode.trim()) sharedModules.set(exportKey, exportCode);
     }
 
@@ -300,45 +301,97 @@ export async function bundleJuxFilesToRouter(projectRoot, distDir, options = {})
   };
 }
 
-function extractSharedModule(juxContent, moduleName, sourceFilePath) {
-  const exportLines = [];
-  try {
-    const ast = acorn.parse(juxContent, { ecmaVersion: 'latest', sourceType: 'module' });
-    ast.body.forEach(node => {
-      if (node.type === 'ExportNamedDeclaration' && node.declaration) {
-        const exportCode = juxContent.slice(node.start, node.end).replace(/^export\s+/, '');
-        exportLines.push(`// From: ${sourceFilePath}\n${namespaceExportedIdentifiers(exportCode, sourceFilePath)}`);
-      } else if (node.type === 'ExportDefaultDeclaration') {
-        const exportCode = juxContent.slice(node.start, node.end).replace(/^export\s+default\s+/, '');
-        exportLines.push(`// From: ${sourceFilePath}\n${namespaceExportedIdentifiers(exportCode, sourceFilePath)}`);
-      }
-    });
-  } catch (err) {
-    throw new Error(`Invalid JavaScript syntax in ${sourceFilePath}.`);
-  }
-  return exportLines.join('\n\n');
-}
-
-function namespaceExportedIdentifiers(code, sourceFilePath) {
-  // ✅ FIX: Strip .jux AND .js extensions for stable namespacing
+function extractSharedModule(juxContent, moduleName, sourceFilePath, bundledPaths) {
+  // 1. Calculate Namespace
   const namespace = sourceFilePath.replace(/\.(jux|js)$/, '').replace(/[\/\\]/g, '$').replace(/[^a-zA-Z0-9$]/g, '_');
+
+  let ast;
   try {
-    const ast = acorn.parse(code, { ecmaVersion: 'latest', sourceType: 'module' });
-    const identifiers = [];
-    ast.body.forEach(node => {
-      if (node.type === 'FunctionDeclaration' && node.id) identifiers.push(node.id);
-      else if (node.type === 'VariableDeclaration') node.declarations.forEach(d => { if (d.id.type === 'Identifier') identifiers.push(d.id); });
-      else if (node.type === 'ClassDeclaration' && node.id) identifiers.push(node.id);
-    });
-    identifiers.sort((a, b) => b.start - a.start);
-    let result = code;
-    identifiers.forEach(id => {
-      result = result.slice(0, id.start) + `${id.name}$${namespace}` + result.slice(id.end);
-    });
-    return result;
+    ast = acorn.parse(juxContent, { ecmaVersion: 'latest', sourceType: 'module' });
   } catch (err) {
-    return code;
+    throw new Error(`Invalid JavaScript syntax in ${sourceFilePath}: ${err.message}`);
   }
+
+  // 2. Identify ALL Identifiers to rename (Local defs + Imports)
+  // We must rename everything to avoid global collision in the flat bundle
+  const identifiersToRename = new Map();
+
+  // A. Local Declarations (Self-namespacing)
+  const addId = (idNode) => {
+    if (idNode && idNode.type === 'Identifier') {
+      identifiersToRename.set(idNode.name, `${idNode.name}$${namespace}`);
+    }
+  };
+
+  ast.body.forEach(node => {
+    if (node.type === 'FunctionDeclaration' || node.type === 'ClassDeclaration') {
+      addId(node.id);
+    } else if (node.type === 'VariableDeclaration') {
+      node.declarations.forEach(d => addId(d.id));
+    } else if ((node.type === 'ExportNamedDeclaration' || node.type === 'ExportDefaultDeclaration') && node.declaration) {
+      const d = node.declaration;
+      if (d.type === 'FunctionDeclaration' || d.type === 'ClassDeclaration') addId(d.id);
+      else if (d.type === 'VariableDeclaration') d.declarations.forEach(v => addId(v.id));
+    } else if (node.type === 'ImportDeclaration') {
+      // B. Imports (Rewriting references to other bundled modules)
+      const importPath = node.source.value;
+      const resolvedPath = resolveImportPath(importPath, sourceFilePath);
+      // Check if this import is pointing to a bundled file
+      const isBundled = (bundledPaths && bundledPaths.has(resolvedPath)) || importPath.endsWith('.jux');
+
+      if (isBundled) {
+        const targetNamespace = resolvedPath.replace(/\.(jux|js)$/, '').replace(/[\/\\]/g, '$').replace(/[^a-zA-Z0-9$]/g, '_');
+        node.specifiers.forEach(spec => {
+          if (spec.type === 'ImportSpecifier') {
+            identifiersToRename.set(spec.local.name, `${spec.imported.name}$${targetNamespace}`);
+          } else if (spec.type === 'ImportDefaultSpecifier') {
+            // Best effort for defaults in this flat bundle scheme usually implies named export match or similar convention
+            // For now, assuming standard View exports which don't usually default export to shared
+          }
+        });
+      }
+    }
+  });
+
+  // 3. Reconstruct Code Line-by-Line (Node-by-Node)
+  const outputLines = [`// From: ${sourceFilePath}`];
+
+  // Sort keys by length desc to avoid partial replacement issues
+  const sortedKeys = Array.from(identifiersToRename.keys()).sort((a, b) => b.length - a.length);
+
+  ast.body.forEach(node => {
+    // Skip Imports (handled globally in bundling phase)
+    if (node.type === 'ImportDeclaration') return;
+    // Skip "export { a, b }" (re-exports) as 'a' and 'b' are already declared/renamed locally
+    if (node.type === 'ExportNamedDeclaration' && !node.declaration) return;
+
+    // Extract relevant code slice
+    let code = '';
+    if (node.type === 'ExportNamedDeclaration' || node.type === 'ExportDefaultDeclaration') {
+      if (node.declaration) {
+        code = juxContent.slice(node.declaration.start, node.declaration.end);
+      }
+    } else {
+      code = juxContent.slice(node.start, node.end);
+    }
+
+    if (!code) return;
+
+    // Replace Identifiers in this block
+    // Regex:
+    // (?<!\.) -> Negative lookbehind to avoid property access (obj.foo)
+    // \bkey\b -> Word boundary
+    // (?!\s*:) -> Negative lookahead to avoid object keys ({ foo: 1 })
+    for (const key of sortedKeys) {
+      const namespaced = identifiersToRename.get(key);
+      const regex = new RegExp(`(?<!\\.)\\b${key}\\b(?!\\s*:)`, 'g');
+      code = code.replace(regex, namespaced);
+    }
+
+    outputLines.push(code);
+  });
+
+  return outputLines.join('\n\n');
 }
 
 function transformJuxToViewFunction(juxContent, functionName, pageName, relativePath, sharedModules, bundledPaths) {
@@ -367,9 +420,7 @@ function transformJuxToViewFunction(juxContent, functionName, pageName, relative
         }
 
         // 🔥 FIX: Always remove ImportDeclaration from the view function contents.
-        // External imports are hoisted to 'allImports' and placed at the top of main.js.
-        // Local/Bundled imports are hoisted via sharedModules mechanism with namespacing.
-        // Leaving import statements inside the function body causes SyntaxError.
+        // Leftover imports inside a function body cause SyntaxError.
         nodesToRemove.push({ start: node.start, end: node.end });
       }
       if (node.type === 'ExportNamedDeclaration' || node.type === 'ExportDefaultDeclaration') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juxscript",
-  "version": "1.0.82",
+  "version": "1.0.84",
   "type": "module",
   "description": "A JavaScript UX authorship platform",
   "main": "lib/jux.js",