juxscript 1.1.2 → 1.1.4

package/machinery/build3.js

@@ -18,31 +18,23 @@ try {
 }
 
 // ═══════════════════════════════════════════════════════════════
-// EXPLODE CONFIG INTO NAMED OBJECTS
+// EXPLODE CONFIG
 // ═══════════════════════════════════════════════════════════════
 const directories = {
     source: rawConfig.directories?.source || './jux',
-    distribution: rawConfig.directories?.distribution || './.jux-dist',
-    themes: rawConfig.directories?.themes || './themes',
-    layouts: rawConfig.directories?.layouts || './themes/layouts',
-    assets: rawConfig.directories?.assets || './themes/assets'
+    distribution: rawConfig.directories?.distribution || './.jux-dist'
 };
 
 const defaults = {
     httpPort: rawConfig.defaults?.httpPort || 3000,
     wsPort: rawConfig.defaults?.wsPort || 3001,
-    autoRoute: rawConfig.defaults?.autoRoute ?? true,
-    layout: rawConfig.defaults?.layout || null,
-    theme: rawConfig.defaults?.theme || null
+    autoRoute: rawConfig.defaults?.autoRoute ?? true
 };
 
 // Resolve absolute paths
 const paths = {
     source: path.resolve(PROJECT_ROOT, directories.source),
-    distribution: path.resolve(PROJECT_ROOT, directories.distribution),
-    themes: path.resolve(PROJECT_ROOT, directories.source, directories.themes),
-    layouts: path.resolve(PROJECT_ROOT, directories.source, directories.layouts),
-    assets: path.resolve(PROJECT_ROOT, directories.source, directories.assets)
+    distribution: path.resolve(PROJECT_ROOT, directories.distribution)
 };
 
 // ═══════════════════════════════════════════════════════════════
@@ -50,84 +42,10 @@ const paths = {
 // ═══════════════════════════════════════════════════════════════
 console.log(`\n📁 Directory Check:`);
 
-const dirStatus = {};
-for (const [name, dirPath] of Object.entries(paths)) {
-    if (name === 'distribution') continue;
-
-    const exists = fs.existsSync(dirPath);
-    dirStatus[name] = exists;
-
-    const icon = exists ? '✓' : '✗';
-    const suffix = exists ? '' : ' (will be skipped)';
-    console.log(`   ${icon} ${name}: ${dirPath}${suffix}`);
-}
-
-// ═══════════════════════════════════════════════════════════════
-// RESOLVE DEFAULT LAYOUT & THEME
-// ═══════════════════════════════════════════════════════════════
-function resolveFile(filename, ...searchPaths) {
-    if (!filename) return null;
-
-    // First try the filename as-is
-    if (fs.existsSync(filename)) {
-        return path.resolve(filename);
-    }
-
-    // Try each search path
-    for (const searchPath of searchPaths) {
-        if (!searchPath || !fs.existsSync(searchPath)) continue;
-
-        const fullPath = path.resolve(searchPath, filename);
-        if (fs.existsSync(fullPath)) {
-            return fullPath;
-        }
-    }
-
-    return null;
-}
-
-console.log(`\n🎨 Defaults Resolution:`);
-
-// Resolve layout
-const layoutPath = defaults.layout ? resolveFile(
-    defaults.layout,
-    paths.layouts,
-    paths.source,
-    PROJECT_ROOT
-) : null;
-
-if (defaults.layout) {
-    if (layoutPath) {
-        console.log(`   ✓ layout: ${layoutPath}`);
-    } else {
-        console.log(`   ✗ layout: "${defaults.layout}" not found, will be skipped`);
-    }
+if (fs.existsSync(paths.source)) {
+    console.log(`   ✓ source: ${paths.source}`);
 } else {
-    console.log(`   - layout: not configured`);
-}
-
-// Resolve theme
-const themePath = defaults.theme ? resolveFile(
-    defaults.theme,
-    paths.themes,
-    paths.source,
-    PROJECT_ROOT
-) : null;
-
-if (defaults.theme) {
-    if (themePath) {
-        console.log(`   ✓ theme: ${themePath}`);
-    } else {
-        console.log(`   ✗ theme: "${defaults.theme}" not found, will be skipped`);
-    }
-} else {
-    console.log(`   - theme: not configured`);
-}
-
-// ═══════════════════════════════════════════════════════════════
-// VALIDATE SOURCE DIRECTORY EXISTS
-// ═══════════════════════════════════════════════════════════════
-if (!dirStatus.source) {
+    console.log(`   ✗ source: ${paths.source} (not found)`);
     console.error(`\n❌ Source directory not found: ${paths.source}`);
     console.error(`   Create the directory or update juxconfig.js`);
     process.exit(1);
@@ -141,8 +59,6 @@ console.log(`\n`);
 const compiler = new JuxCompiler({
     srcDir: paths.source,
     distDir: paths.distribution,
-    layoutPath,
-    themePath,
     defaults,
     paths
 });

package/machinery/compiler3.js

@@ -13,8 +13,6 @@ export class JuxCompiler {
         this.config = config;
         this.srcDir = config.srcDir || './jux';
         this.distDir = config.distDir || './.jux-dist';
-        this.layoutPath = config.layoutPath || null;
-        this.themePath = config.themePath || null;
         this.defaults = config.defaults || {};
         this.paths = config.paths || {};
         this._juxscriptExports = null;
@@ -94,163 +92,8 @@ export class JuxCompiler {
     }
 
     /**
-     * Copy all source assets (themes, layouts, assets folders) to dist
+     * Generate entry point without layout/theme logic
      */
-    copySourceAssets() {
-        const copied = { themes: 0, layouts: 0, assets: 0, other: 0 };
-
-        const copyDir = (srcDir, destDir, category) => {
-            if (!fs.existsSync(srcDir)) return 0;
-
-            let count = 0;
-            fs.mkdirSync(destDir, { recursive: true });
-
-            const entries = fs.readdirSync(srcDir, { withFileTypes: true });
-            for (const entry of entries) {
-                const srcPath = path.join(srcDir, entry.name);
-                const destPath = path.join(destDir, entry.name);
-
-                if (entry.isDirectory()) {
-                    count += copyDir(srcPath, destPath, category);
-                } else {
-                    fs.copyFileSync(srcPath, destPath);
-                    count++;
-                }
-            }
-            return count;
-        };
-
-        // Copy themes folder
-        if (this.paths.themes && fs.existsSync(this.paths.themes)) {
-            copied.themes = copyDir(this.paths.themes, path.join(this.distDir, 'themes'), 'themes');
-        }
-
-        // Copy layouts folder (if separate from themes)
-        if (this.paths.layouts && fs.existsSync(this.paths.layouts) && this.paths.layouts !== this.paths.themes) {
-            copied.layouts = copyDir(this.paths.layouts, path.join(this.distDir, 'layouts'), 'layouts');
-        }
-
-        // Copy assets folder
-        if (this.paths.assets && fs.existsSync(this.paths.assets)) {
-            copied.assets = copyDir(this.paths.assets, path.join(this.distDir, 'assets'), 'assets');
-        }
-
-        const total = copied.themes + copied.layouts + copied.assets;
-        if (total > 0) {
-            console.log(`📂 Copied source assets: ${copied.themes} themes, ${copied.layouts} layouts, ${copied.assets} assets`);
-        }
-
-        return copied;
-    }
-
-    /**
-     * Generate CSS links including theme if configured
-     */
-    generateCssLinks() {
-        const links = [];
-
-        // Note: Component CSS is no longer bundled (handled by Styler)
-
-        // User theme CSS
-        if (this.themePath) {
-            const themeName = path.basename(this.themePath);
-            links.push(`    <link rel="stylesheet" href="./themes/${themeName}" id="jux-theme">`);
-            console.log(`🎨 🎨 🎨 🎨 Included theme: ${themeName} 🎨 🎨 🎨 🎨 `);
-        }
-
-        return links.join('\n');
-    }
-
-    async loadJuxscriptExports() {
-        if (this._juxscriptExports) return this._juxscriptExports;
-
-        try {
-            const juxscriptPath = this.findJuxscriptPath();
-            if (juxscriptPath) {
-                const indexContent = fs.readFileSync(juxscriptPath, 'utf8');
-                const exports = new Set();
-
-                for (const match of indexContent.matchAll(/export\s*\{\s*([^}]+)\s*\}/g)) {
-                    match[1].split(',').forEach(exp => {
-                        const name = exp.trim().split(/\s+as\s+/)[0].trim();
-                        if (name) exports.add(name);
-                    });
-                }
-
-                this._juxscriptExports = [...exports];
-                if (this._juxscriptExports.length > 0) {
-                    console.log(`📦 juxscript exports: ${this._juxscriptExports.join(', ')}`);
-                }
-            }
-        } catch (err) {
-            this._juxscriptExports = [];
-        }
-
-        return this._juxscriptExports;
-    }
-
-    validateViewCode(viewName, code) {
-        const issues = [];
-
-        let ast;
-        try {
-            ast = acorn.parse(code, { ecmaVersion: 'latest', sourceType: 'module', locations: true });
-        } catch (parseError) {
-            issues.push({
-                type: 'error',
-                view: viewName,
-                line: parseError.loc?.line || 0,
-                message: `Syntax error: ${parseError.message}`,
-                code: ''
-            });
-            return issues;
-        }
-
-        const allImports = new Set();
-
-        walk(ast, {
-            ImportDeclaration(node) {
-                node.specifiers.forEach(spec => {
-                    allImports.add(spec.local.name);
-                });
-            }
-        });
-
-        // Default known facades/components if load fails
-        const knownComponents = this._juxscriptExports || ['element', 'input', 'buttonGroup'];
-
-        walk(ast, {
-            Identifier(node, parent) {
-                if (parent?.type === 'CallExpression' && parent.callee === node) {
-                    const name = node.name;
-                    // Updated: Removed strict Capitalization check to allow facades (lowercase)
-                    if (!allImports.has(name) && knownComponents.includes(name)) {
-                        issues.push({
-                            type: 'warning',
-                            view: viewName,
-                            line: node.loc?.start?.line || 0,
-                            message: `"${name}" is used but not imported from juxscript`,
-                            code: ''
-                        });
-                    }
-                }
-            }
-        });
-
-        return issues;
-    }
-
-    /**
-     * Extract layout function name from layout file
-     */
-    getLayoutFunctionName() {
-        if (!this.layoutPath || !fs.existsSync(this.layoutPath)) return null;
-
-        const content = fs.readFileSync(this.layoutPath, 'utf8');
-        const match = content.match(/export\s+function\s+(\w+)/);
-        return match ? match[1] : null;
-    }
-
     generateEntryPoint(views, dataModules, sharedModules) {
         let entry = `// Auto-generated JUX entry point\n\n`;
         const allIssues = [];
@@ -265,16 +108,6 @@ export class JuxCompiler {
             }
         });
 
-        // Check layout file for juxscript imports too
-        if (this.layoutPath && fs.existsSync(this.layoutPath)) {
-            const layoutContent = fs.readFileSync(this.layoutPath, 'utf8');
-            for (const match of layoutContent.matchAll(/import\s*\{\s*([^}]+)\s*\}\s*from\s*['"]juxscript['"]/g)) {
-                match[1].split(',').map(s => s.trim()).forEach(imp => {
-                    if (imp) juxImports.add(imp);
-                });
-            }
-        }
-
         if (juxImports.size > 0) {
             entry += `import { ${[...juxImports].sort().join(', ')} } from 'juxscript';\n\n`;
         }
@@ -294,25 +127,6 @@ export class JuxCompiler {
             entry += `\nObject.assign(window, { ${[...juxImports].join(', ')} });\n`;
         }
 
-        // Add layout function if configured
-        const layoutFnName = this.getLayoutFunctionName();
-        if (layoutFnName && this.layoutPath) {
-            const layoutContent = fs.readFileSync(this.layoutPath, 'utf8');
-            const layoutCode = this.removeImports(layoutContent);
-            entry += `\n// --- DEFAULT LAYOUT ---\n`;
-            entry += layoutCode;
-            entry += `\n`;
-
-            // Store in source snapshot
-            const layoutFile = path.basename(this.layoutPath);
-            sourceSnapshot[layoutFile] = {
-                name: 'layout',
-                file: layoutFile,
-                content: layoutContent,
-                lines: layoutContent.split('\n')
-            };
-        }
-
         entry += `\n// --- VIEW FUNCTIONS ---\n`;
 
         views.forEach(v => {
@@ -341,7 +155,6 @@ export class JuxCompiler {
 
         this._sourceSnapshot = sourceSnapshot;
         this._validationIssues = allIssues;
-        this._layoutFnName = layoutFnName;
         entry += this._generateRouter(views);
         return entry;
     }
@@ -371,11 +184,6 @@ export class JuxCompiler {
             routeMap += `  '/${v.name.toLowerCase()}': render${cap},\n`;
         });
 
-        // Initialize layout call if configured
-        const layoutInit = this._layoutFnName
-            ? `\n// Initialize default layout\nif (typeof ${this._layoutFnName} === 'function') {\n    ${this._layoutFnName}();\n}\n`
-            : '';
-
         return `
 // --- JUX SOURCE LOADER ---
 var __juxSources = null;
@@ -400,14 +208,6 @@ function __juxFindSource(stack) {
             }
         }
     }
-    // Also check for layout
-    if (stack.indexOf('Layout') > -1) {
-        for (var file in __juxSources || {}) {
-            if (file.indexOf('layout') > -1) {
-                return { file: file, source: __juxSources[file] };
-            }
-        }
-    }
     return null;
 }
 
@@ -508,7 +308,7 @@ window.addEventListener('unhandledrejection', function(e) { __juxErrorOverlay.sh
 
 // --- JUX ROUTER ---
 const routes = {\n${routeMap}};
-${layoutInit}
+
 async function navigate(path) {
     const view = routes[path];
     if (!view) {
@@ -555,9 +355,6 @@ navigate(location.pathname);
         const { views, dataModules, sharedModules } = this.scanFiles();
         console.log(`📁 Found ${views.length} views, ${sharedModules.length} shared, ${dataModules.length} data`);
 
-        // Copy source assets (themes, layouts, assets)
-        this.copySourceAssets();
-
         // Copy data/shared modules to dist
         const juxDistDir = path.join(this.distDir, 'jux');
         fs.mkdirSync(juxDistDir, { recursive: true });
@@ -602,7 +399,6 @@ navigate(location.pathname);
             return { success: false, errors: [{ message: err.message }], warnings: [] };
         }
 
-        // Generate HTML with layout container sibling to app
         const html = `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -612,9 +408,7 @@ navigate(location.pathname);
     <script type="module" src="./bundle.js"></script>
 </head>
 <body>
-     <div id="jux-layout">
-        <div id="app"></div>
-     </div>
+    <div id="app"></div>
 </body>
 </html>`;
         fs.writeFileSync(path.join(this.distDir, 'index.html'), html);

package/machinery/config.js

@@ -23,12 +23,12 @@ export const defaultConfig = {
 // Load user configuration
 export async function loadConfig(projectRoot) {
   const configPath = path.join(projectRoot, 'juxconfig.js');
-  
+
   if (fs.existsSync(configPath)) {
     try {
       const configModule = await import(`file://${configPath}`);
       const userConfig = configModule.default || configModule;
-      
+
       return {
         ...defaultConfig,
         ...userConfig,
@@ -41,7 +41,7 @@ export async function loadConfig(projectRoot) {
       return defaultConfig;
     }
   }
-  
+
   console.log('ℹ️  No juxconfig.js found, using defaults');
   return defaultConfig;
 }
@@ -51,9 +51,9 @@ export async function runBootstrap(bootstrapFunctions = []) {
   if (!Array.isArray(bootstrapFunctions) || bootstrapFunctions.length === 0) {
     return;
   }
-  
+
   console.log('🚀 Running bootstrap functions...\n');
-  
+
   for (const fn of bootstrapFunctions) {
     if (typeof fn === 'function') {
       try {
@@ -63,6 +63,93 @@ export async function runBootstrap(bootstrapFunctions = []) {
       }
     }
   }
-  
+
   console.log('✅ Bootstrap complete\n');
+}
+
+/**
+ * Type helper for JUX Configuration (Identity function for Autocomplete)
+ * Used in juxconfig.js to provide Intellisense.
+ * @param {Object} config
+ * @returns {Object}
+ */
+export function defineConfig(config) {
+  return config;
+}
+
+/**
+ * Normalizes user configuration into the strict format used by the compiler/server.
+ * Handles "DX Sugar" like:
+ * - Inferring file extensions (.jux, .css)
+ * - Mapping 'dist' -> 'distribution'
+ * - Resolving shortcuts (e.g. layouts)
+ * - Defaulting ports
+ */
+export function resolveConfig(userConfig, projectRoot = process.cwd()) {
+  const root = userConfig.root || projectRoot;
+
+  // 1. Directories (Map 'dist' alias to 'distribution')
+  const dirs = userConfig.directories || {};
+  const directories = {
+    source: dirs.source || 'jux',
+    distribution: dirs.dist || dirs.distribution || '.jux-dist',
+    themes: dirs.themes || 'themes',
+    layouts: dirs.layouts || 'themes/layouts',
+    assets: dirs.assets || 'themes/assets'
+  };
+
+  // 2. Defaults (Infer extensions)
+  const defs = userConfig.defaults || {};
+  const httpPort = defs.port || defs.httpPort || 3000;
+
+  const defaults = {
+    httpPort,
+    wsPort: defs.wsPort || (httpPort + 1),
+    autoRoute: defs.autoRoute !== false, // default true
+    layout: ensureExt(defs.layout, '.jux') || 'base.jux',
+    theme: ensureExt(defs.theme, '.css') || 'base.css'
+  };
+
+  // 3. Pages Normalization (Recursively fix route paths)
+  const pages = normalizePages(userConfig.pages || {});
+
+  // 4. Return Normalized Config
+  return {
+    root,
+    directories,
+    defaults,
+    pages,
+    hooks: userConfig.hooks || {}
+  };
+}
+
+/**
+ * Helper: Appends extension if missing
+ */
+function ensureExt(file, ext) {
+  if (!file) return file;
+  return file.endsWith(ext) ? file : `${file}${ext}`;
+}
+
+/**
+ * Helper: Recursively normalizes page routes
+ */
+function normalizePages(pages) {
+  const normalized = {};
+  for (const [key, value] of Object.entries(pages)) {
+    if (typeof value === 'string') {
+      // Direct route: '/' -> 'experiments/index'
+      // Becomes: '/' -> 'experiments/index.jux'
+      normalized[key] = ensureExt(value, '.jux');
+    } else if (typeof value === 'object') {
+      // Route Group
+      normalized[key] = {
+        ...value,
+        layout: value.layout ? ensureExt(value.layout, '.jux') : undefined,
+        theme: value.theme ? ensureExt(value.theme, '.css') : undefined,
+        routes: normalizePages(value.routes || {})
+      };
+    }
+  }
+  return normalized;
 }