juxscript 1.0.83 → 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,9 +301,8 @@ export async function bundleJuxFilesToRouter(projectRoot, distDir, options = {})
   };
 }
 
-function extractSharedModule(juxContent, moduleName, sourceFilePath) {
+function extractSharedModule(juxContent, moduleName, sourceFilePath, bundledPaths) {
   // 1. Calculate Namespace
-  // Ensure we have a valid JS identifier suffix
   const namespace = sourceFilePath.replace(/\.(jux|js)$/, '').replace(/[\/\\]/g, '$').replace(/[^a-zA-Z0-9$]/g, '_');
 
   let ast;
@@ -312,10 +312,11 @@ function extractSharedModule(juxContent, moduleName, sourceFilePath) {
     throw new Error(`Invalid JavaScript syntax in ${sourceFilePath}: ${err.message}`);
   }
 
-  // 2. Identify ALL Top-Level Identifiers (Exported or Local) to rename
+  // 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}`);
@@ -331,6 +332,24 @@ function extractSharedModule(juxContent, moduleName, sourceFilePath) {
       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
+          }
+        });
+      }
     }
   });
 

package/package.json

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