juxscript 1.0.96 → 1.0.98

package/machinery/compiler3.js

@@ -215,16 +215,97 @@ export class JuxCompiler {
     }
 
     generateEntryPoint(views, dataModules, sharedModules) {
+        let entry = `// Auto-generated JUX entry point\n\n`;
         const allIssues = [];
         const sourceSnapshot = {};
 
-        // ═══════════════════════════════════════════════════════════════
-        // STEP 1: ERROR OVERLAY FIRST (before any imports!)
-        // This ensures module-level errors are caught
-        // ═══════════════════════════════════════════════════════════════
-        let entry = `// Auto-generated JUX entry point
+        const juxImports = new Set();
+        [...views, ...dataModules, ...sharedModules].forEach(m => {
+            for (const match of m.content.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`;
+        }
+
+        dataModules.forEach(m => {
+            entry += `import * as ${this.sanitizeName(m.name)}Data from './jux/${m.file}';\n`;
+        });
+        sharedModules.forEach(m => {
+            entry += `import * as ${this.sanitizeName(m.name)}Shared from './jux/${m.file}';\n`;
+        });
+
+        entry += `\n// Expose to window\n`;
+        dataModules.forEach(m => entry += `Object.assign(window, ${this.sanitizeName(m.name)}Data);\n`);
+        sharedModules.forEach(m => entry += `Object.assign(window, ${this.sanitizeName(m.name)}Shared);\n`);
 
-// --- JUX SOURCE LOADER (must be first) ---
+        if (juxImports.size > 0) {
+            entry += `\nObject.assign(window, { ${[...juxImports].join(', ')} });\n`;
+        }
+
+        entry += `\n// --- VIEW FUNCTIONS ---\n`;
+
+        views.forEach(v => {
+            const capitalized = v.name.charAt(0).toUpperCase() + v.name.slice(1);
+            allIssues.push(...this.validateViewCode(v.name, v.content));
+
+            sourceSnapshot[v.file] = {
+                name: v.name,
+                file: v.file,
+                content: v.content,
+                lines: v.content.split('\n')
+            };
+
+            let viewCode = this.removeImports(v.content).replace(/^\s*export\s+default\s+.*$/gm, '');
+            const asyncPrefix = viewCode.includes('await ') ? 'async ' : '';
+
+            entry += `\n${asyncPrefix}function render${capitalized}() {\n${viewCode}\n}\n`;
+        });
+
+        dataModules.forEach(m => {
+            sourceSnapshot[m.file] = { name: m.name, file: m.file, content: m.content, lines: m.content.split('\n') };
+        });
+        sharedModules.forEach(m => {
+            sourceSnapshot[m.file] = { name: m.name, file: m.file, content: m.content, lines: m.content.split('\n') };
+        });
+
+        this._sourceSnapshot = sourceSnapshot;
+        this._validationIssues = allIssues;
+        entry += this._generateRouter(views);
+        return entry;
+    }
+
+    reportValidationIssues() {
+        const issues = this._validationIssues || [];
+        const errors = issues.filter(i => i.type === 'error');
+        const warnings = issues.filter(i => i.type === 'warning');
+
+        if (issues.length > 0) {
+            console.log('\n⚠️  Validation Issues:\n');
+            issues.forEach(issue => {
+                const icon = issue.type === 'error' ? '❌' : '⚠️';
+                console.log(`${icon} [${issue.view}:${issue.line}] ${issue.message}`);
+            });
+            console.log('');
+        }
+
+        return { isValid: errors.length === 0, errors, warnings };
+    }
+
+    _generateRouter(views) {
+        let routeMap = '';
+        views.forEach(v => {
+            const cap = v.name.charAt(0).toUpperCase() + v.name.slice(1);
+            if (v.name.toLowerCase() === 'index') routeMap += `  '/': render${cap},\n`;
+            routeMap += `  '/${v.name.toLowerCase()}': render${cap},\n`;
+        });
+
+        return `
+// --- JUX SOURCE LOADER ---
 var __juxSources = null;
 async function __juxLoadSources() {
     if (__juxSources) return __juxSources;
@@ -237,6 +318,7 @@ async function __juxLoadSources() {
     return __juxSources;
 }
 
+// Find source file from error stack
 function __juxFindSource(stack) {
     var match = stack.match(/render(\\w+)/);
     if (match) {
@@ -247,12 +329,6 @@ function __juxFindSource(stack) {
             }
         }
     }
-    // Also check for module names in stack
-    for (var file in __juxSources || {}) {
-        if (stack.indexOf(file) > -1 || stack.indexOf(__juxSources[file].name) > -1) {
-            return { file: file, source: __juxSources[file] };
-        }
-    }
     return null;
 }
 
@@ -416,6 +492,7 @@ var __juxErrorOverlay = {
         
         document.body.appendChild(overlay);
         
+        // Trigger transition
         requestAnimationFrame(function() {
             overlay.classList.add('visible');
         });
@@ -424,10 +501,7 @@ var __juxErrorOverlay = {
     }
 };
 
-// ═══════════════════════════════════════════════════════════════
-// INSTALL GLOBAL ERROR HANDLERS IMMEDIATELY (before imports!)
-// This catches errors during module loading
-// ═══════════════════════════════════════════════════════════════
+// Global error handlers
 window.addEventListener('error', function(e) {
     __juxErrorOverlay.show(e.error || new Error(e.message), 'Uncaught Error');
 }, true);
@@ -436,109 +510,6 @@ window.addEventListener('unhandledrejection', function(e) {
     __juxErrorOverlay.show(e.reason || new Error('Promise rejected'), 'Unhandled Promise Rejection');
 }, true);
 
-// ═══════════════════════════════════════════════════════════════
-// NOW SAFE TO IMPORT MODULES
-// ═══════════════════════════════════════════════════════════════
-
-`;
-
-        // ═══════════════════════════════════════════════════════════════
-        // STEP 2: Collect and add imports
-        // ═══════════════════════════════════════════════════════════════
-        const juxImports = new Set();
-        [...views, ...dataModules, ...sharedModules].forEach(m => {
-            for (const match of m.content.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`;
-        }
-
-        dataModules.forEach(m => {
-            entry += `import * as ${this.sanitizeName(m.name)}Data from './jux/${m.file}';\n`;
-        });
-        sharedModules.forEach(m => {
-            entry += `import * as ${this.sanitizeName(m.name)}Shared from './jux/${m.file}';\n`;
-        });
-
-        entry += `\n// Expose to window\n`;
-        dataModules.forEach(m => entry += `Object.assign(window, ${this.sanitizeName(m.name)}Data);\n`);
-        sharedModules.forEach(m => entry += `Object.assign(window, ${this.sanitizeName(m.name)}Shared);\n`);
-
-        if (juxImports.size > 0) {
-            entry += `\nObject.assign(window, { ${[...juxImports].join(', ')} });\n`;
-        }
-
-        // ═══════════════════════════════════════════════════════════════
-        // STEP 3: View functions
-        // ═══════════════════════════════════════════════════════════════
-        entry += `\n// --- VIEW FUNCTIONS ---\n`;
-
-        views.forEach(v => {
-            const capitalized = v.name.charAt(0).toUpperCase() + v.name.slice(1);
-            allIssues.push(...this.validateViewCode(v.name, v.content));
-
-            sourceSnapshot[v.file] = {
-                name: v.name,
-                file: v.file,
-                content: v.content,
-                lines: v.content.split('\n')
-            };
-
-            let viewCode = this.removeImports(v.content).replace(/^\s*export\s+default\s+.*$/gm, '');
-            const asyncPrefix = viewCode.includes('await ') ? 'async ' : '';
-
-            entry += `\n${asyncPrefix}function render${capitalized}() {\n${viewCode}\n}\n`;
-        });
-
-        dataModules.forEach(m => {
-            sourceSnapshot[m.file] = { name: m.name, file: m.file, content: m.content, lines: m.content.split('\n') };
-        });
-        sharedModules.forEach(m => {
-            sourceSnapshot[m.file] = { name: m.name, file: m.file, content: m.content, lines: m.content.split('\n') };
-        });
-
-        this._sourceSnapshot = sourceSnapshot;
-        this._validationIssues = allIssues;
-
-        // ═══════════════════════════════════════════════════════════════
-        // STEP 4: Router (no error overlay code - it's already at top)
-        // ═══════════════════════════════════════════════════════════════
-        entry += this._generateRouter(views);
-        return entry;
-    }
-
-    reportValidationIssues() {
-        const issues = this._validationIssues || [];
-        const errors = issues.filter(i => i.type === 'error');
-        const warnings = issues.filter(i => i.type === 'warning');
-
-        if (issues.length > 0) {
-            console.log('\n⚠️  Validation Issues:\n');
-            issues.forEach(issue => {
-                const icon = issue.type === 'error' ? '❌' : '⚠️';
-                console.log(`${icon} [${issue.view}:${issue.line}] ${issue.message}`);
-            });
-            console.log('');
-        }
-
-        return { isValid: errors.length === 0, errors, warnings };
-    }
-
-    _generateRouter(views) {
-        let routeMap = '';
-        views.forEach(v => {
-            const cap = v.name.charAt(0).toUpperCase() + v.name.slice(1);
-            if (v.name.toLowerCase() === 'index') routeMap += `  '/': render${cap},\n`;
-            routeMap += `  '/${v.name.toLowerCase()}': render${cap},\n`;
-        });
-
-        // Router ONLY - error handlers are now at the TOP of the bundle
-        return `
 // --- JUX ROUTER ---
 const routes = {\n${routeMap}};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juxscript",
-  "version": "1.0.96",
+  "version": "1.0.98",
   "type": "module",
   "description": "A JavaScript UX authorship platform",
   "main": "./index.js",