juxscript 1.0.70 → 1.0.72

package/create/layout.jux

@@ -1,63 +1,4 @@
-import { Element, Grid } from 'juxscript';
-
-// Import the layout styles - testing link.
-
-
-// ═══════════════════════════════════════════════════════════════════
-// GRID LAYOUT - INITIALIZATION FUNCTION
-// ═══════════════════════════════════════════════════════════════════
-// Note: #app is automatically created by the Jux compiler
-
-export function initializeGrid() {
-    // add the base jux styles via style tag import
-    Element('layout-css', { tag: 'style' })
-        .text('@import "style.css";')
-        .render(document.head);
-
-    // Header area
-    const appHeader = Element('appheader').render('#app');
-    const appHeaderContent = Element('appheader-content').render('#appheader');
-    const appHeaderLogo = Element('appheader-logo').render('#appheader-content');
-    const appHeaderNav = Element('appheader-nav').render('#appheader-content');
-    const appHeaderActions = Element('appheader-actions').render('#appheader-content');
-
-    // Left sidebar
-    const appAside = Element('appaside').render('#app');
-
-    // Main content area
-    const appMain = Element('appmain').render('#app');
-    const appMainContent = Element('appmain-content').render('#appmain');
-
-    // Right sidebar (optional - starts hidden)
-    const appSidebar = Element('appsidebar').render('#app');
-    const appSidebarHeader = Element('appsidebar-header').render('#appsidebar');
-    const appSidebarContent = Element('appsidebar-content').render('#appsidebar');
-    const appSidebarFooter = Element('appsidebar-footer').render('#appsidebar');
-
-    // Footer area
-    const appFooter = Element('appfooter').render('#app');
-    const appFooterContent = Element('appfooter-content').render('#appfooter');
-    const appFooterLegal = Element('appfooter-legal').render('#appfooter-content');
-
-    // Return references to all containers
-    return {
-        appHeader,
-        appHeaderContent,
-        appHeaderLogo,
-        appHeaderNav,
-        appHeaderActions,
-        appAside,
-        appMain,
-        appMainContent,
-        appSidebar,
-        appSidebarHeader,
-        appSidebarContent,
-        appSidebarFooter,
-        appFooter,
-        appFooterContent,
-        appFooterLegal
-    };
-}
+import { Grid } from 'juxscript';
 
 export function LandingLayout() {
     // Defines a classic landing page structure using JUX Grid

package/machinery/compiler.js

@@ -89,12 +89,15 @@ export async function copyPresetsToOutput(packageRoot, distDir) {
 }
 
 function findFiles(dir, extension, fileList = []) {
+  if (!fs.existsSync(dir)) return fileList;
   const files = fs.readdirSync(dir);
   files.forEach(file => {
     const filePath = path.join(dir, file);
     const stat = fs.statSync(filePath);
     if (stat.isDirectory()) {
-      findFiles(filePath, extension, fileList);
+      if (file !== 'node_modules' && file !== '.git' && file !== 'jux-dist') {
+        findFiles(filePath, extension, fileList);
+      }
     } else if (file.endsWith(extension)) {
       fileList.push(filePath);
     }
@@ -149,12 +152,22 @@ function findProjectFiles(dir, extensions, fileList = [], rootDir = dir, exclude
  */
 export async function bundleJuxFilesToRouter(projectRoot, distDir, options = {}) {
   const { routePrefix = '', config } = options;
+
+  // ✅ 1. Find all processable source files (.jux AND .js)
+  // This ensures locally imported helper JS files are bundled and namespaced correctly.
   const juxFiles = findFiles(projectRoot, '.jux');
+  const jsFiles = findFiles(projectRoot, '.js');
 
-  if (juxFiles.length === 0) {
+  // Combine, filtering duplicates if any
+  const allSourceFiles = Array.from(new Set([...juxFiles, ...jsFiles]));
+
+  if (allSourceFiles.length === 0) {
     return { mainJsFilename: 'main.js', routes: [], external: new Set(), vendoredPaths: {} };
   }
 
+  // Set of relative paths being bundled (used to decide if an import should be skipped)
+  const bundledPaths = new Set(allSourceFiles.map(f => path.relative(projectRoot, f).replace(/\\/g, '/')));
+
   const pages = config?.pages || {};
   const views = [];
   const routes = [];
@@ -163,28 +176,50 @@ export async function bundleJuxFilesToRouter(projectRoot, distDir, options = {})
   const externalModules = new Set();
   const fileToFunction = new Map();
 
-  for (const juxFile of juxFiles) {
-    const relativePath = path.relative(projectRoot, juxFile);
+  for (const sourceFile of allSourceFiles) {
+    const isJux = sourceFile.endsWith('.jux');
+    const relativePath = path.relative(projectRoot, sourceFile);
     const parsedPath = path.parse(relativePath);
+
+    // Normalize function name: experiments/my-data -> ExperimentsMyData
     const rawFunctionName = parsedPath.dir ? `${parsedPath.dir.replace(/\//g, '_')}_${parsedPath.name}` : parsedPath.name;
     const cleanFunctionName = rawFunctionName.replace(/[-_]/g, ' ').split(' ').map(w => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join('');
 
-    fileToFunction.set(relativePath, cleanFunctionName);
-    fileToFunction.set(relativePath.split(path.sep).join('/'), cleanFunctionName);
+    // Only .jux files generate Routes/Views
+    if (isJux) {
+      fileToFunction.set(relativePath, cleanFunctionName);
+      fileToFunction.set(relativePath.split(path.sep).join('/'), cleanFunctionName);
+    }
 
     const routePath = routePrefix + '/' + (parsedPath.dir ? `${parsedPath.dir}/` : '') + parsedPath.name;
     const cleanRoutePath = routePath.replace(/\/+/g, '/');
-    const juxContent = fs.readFileSync(juxFile, 'utf-8');
 
+    const fileContent = fs.readFileSync(sourceFile, 'utf-8');
+
+    // Parse Imports
     try {
-      const ast = acorn.parse(juxContent, { ecmaVersion: 'latest', sourceType: 'module' });
+      const ast = acorn.parse(fileContent, { ecmaVersion: 'latest', sourceType: 'module' });
       ast.body.forEach(node => {
         if (node.type === 'ImportDeclaration') {
-          const importStatement = juxContent.slice(node.start, node.end);
-          allImports.push({ code: importStatement, filePath: relativePath });
+          const importStatement = fileContent.slice(node.start, node.end);
           const moduleName = node.source.value;
-          if (!moduleName.startsWith('.') && !moduleName.startsWith('/') && !moduleName.startsWith('http') && !moduleName.startsWith('juxscript')) {
-            externalModules.add(moduleName);
+
+          // ✅ CHECK: Is this import pointing to a file we are bundling?
+          let isBundledLocal = false;
+          if (moduleName.startsWith('.')) {
+            const resolved = resolveImportPath(moduleName, relativePath);
+            if (bundledPaths.has(resolved)) {
+              isBundledLocal = true;
+            }
+          }
+
+          // ONLY add to global imports if it is NOT a local bundled file
+          if (!isBundledLocal) {
+            allImports.push({ code: importStatement, filePath: relativePath });
+
+            if (!moduleName.startsWith('.') && !moduleName.startsWith('/') && !moduleName.startsWith('http') && !moduleName.startsWith('juxscript')) {
+              externalModules.add(moduleName);
+            }
           }
         }
       });
@@ -192,18 +227,23 @@ export async function bundleJuxFilesToRouter(projectRoot, distDir, options = {})
       console.warn(`   ⚠️  Failed to parse imports in ${relativePath}, skipping`);
     }
 
-    const hasExports = /^\s*export\s+(const|let|function|class|{)/m.test(juxContent);
+    // Process Exports -> Shared Modules (Code Hoisting)
+    const hasExports = /^\s*export\s+(const|let|function|class|{)/m.test(fileContent);
     if (hasExports) {
       const exportKey = relativePath;
-      const exportCode = extractSharedModule(juxContent, rawFunctionName, relativePath);
+      const exportCode = extractSharedModule(fileContent, rawFunctionName, relativePath);
       if (exportCode.trim()) sharedModules.set(exportKey, exportCode);
     }
 
-    const viewFunction = transformJuxToViewFunction(juxContent, rawFunctionName, parsedPath.name, relativePath, sharedModules);
-    views.push(viewFunction);
+    // Process .jux -> View Functions
+    if (isJux) {
+      // Pass bundledPaths so we know which imports to rewrite
+      const viewFunction = transformJuxToViewFunction(fileContent, rawFunctionName, parsedPath.name, relativePath, sharedModules, bundledPaths);
+      views.push(viewFunction);
 
-    if (config?.defaults?.autoRoute !== false) {
-      routes.push({ path: cleanRoutePath, functionName: cleanFunctionName });
+      if (config?.defaults?.autoRoute !== false) {
+        routes.push({ path: cleanRoutePath, functionName: cleanFunctionName });
+      }
     }
   }
 
@@ -265,7 +305,8 @@ function extractSharedModule(juxContent, moduleName, sourceFilePath) {
 }
 
 function namespaceExportedIdentifiers(code, sourceFilePath) {
-  const namespace = sourceFilePath.replace(/\.jux$/, '').replace(/[\/\\]/g, '$').replace(/[^a-zA-Z0-9$]/g, '_');
+  // ✅ FIX: Strip .jux AND .js extensions for stable namespacing
+  const namespace = sourceFilePath.replace(/\.(jux|js)$/, '').replace(/[\/\\]/g, '$').replace(/[^a-zA-Z0-9$]/g, '_');
   try {
     const ast = acorn.parse(code, { ecmaVersion: 'latest', sourceType: 'module' });
     const identifiers = [];
@@ -285,7 +326,7 @@ function namespaceExportedIdentifiers(code, sourceFilePath) {
   }
 }
 
-function transformJuxToViewFunction(juxContent, functionName, pageName, relativePath, sharedModules) {
+function transformJuxToViewFunction(juxContent, functionName, pageName, relativePath, sharedModules, bundledPaths) {
   let result;
   try {
     const ast = acorn.parse(juxContent, { ecmaVersion: 'latest', sourceType: 'module' });
@@ -294,16 +335,22 @@ function transformJuxToViewFunction(juxContent, functionName, pageName, relative
     ast.body.forEach(node => {
       if (node.type === 'ImportDeclaration') {
         const importPath = node.source.value;
-        if (importPath.endsWith('.jux')) {
+        const resolvedPath = resolveImportPath(importPath, relativePath);
+
+        // ✅ Check if this import is pointing to a bundled file
+        const isBundled = (bundledPaths && bundledPaths.has(resolvedPath)) || importPath.endsWith('.jux');
+
+        if (isBundled) {
           node.specifiers.forEach(spec => {
             if (spec.type === 'ImportSpecifier') {
-              const resolvedPath = resolveImportPath(importPath, relativePath);
-              const namespace = resolvedPath.replace(/\.jux$/, '').replace(/[\/\\]/g, '$').replace(/[^a-zA-Z0-9$]/g, '_');
+              // ✅ Apply namespace convention to .js imports too
+              const namespace = resolvedPath.replace(/\.(jux|js)$/, '').replace(/[\/\\]/g, '$').replace(/[^a-zA-Z0-9$]/g, '_');
               importReplacements.set(spec.local.name, `${spec.imported.name}$${namespace}`);
             }
           });
+          // Remove local imports as they will be inlined in main.js
+          nodesToRemove.push({ start: node.start, end: node.end });
         }
-        nodesToRemove.push({ start: node.start, end: node.end });
       }
       if (node.type === 'ExportNamedDeclaration' || node.type === 'ExportDefaultDeclaration') {
         nodesToRemove.push({ start: node.start, end: node.end });
@@ -341,7 +388,13 @@ function generateRouterBundle(views, routes, sharedModules = new Map(), allImpor
       return 'juxscript' + subPath.replace(/\\/g, '/');
     }
     if (joinedPath.includes('lib/components')) return 'juxscript/components';
-    return joinedPath.replace(/\\/g, '/');
+
+    // ✅ Fix: Ensure local relative paths start with ./ or /
+    let normalized = joinedPath.replace(/\\/g, '/');
+    if (!normalized.startsWith('.') && !normalized.startsWith('/')) {
+      normalized = './' + normalized;
+    }
+    return normalized;
   };
 
   const importList = Array.isArray(allImports) ? allImports : Array.from(allImports);
@@ -353,7 +406,6 @@ function generateRouterBundle(views, routes, sharedModules = new Map(), allImpor
       const node = ast.body[0];
       if (node && node.type === 'ImportDeclaration') {
         const rawSource = node.source.value;
-        if (rawSource.endsWith('.jux')) continue;
         const source = getCanonicalSource(rawSource, filePath);
         if (!mergedImports.has(source)) mergedImports.set(source, { defaults: new Set(), named: new Set(), namespace: null });
         const storage = mergedImports.get(source);

package/package.json

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