juxscript 1.0.7 → 1.0.9

package/machinery/server.js

@@ -12,7 +12,7 @@ const __dirname = path.dirname(__filename);
 
 let db = null;
 
-async function serve(port = 3000, distDir = './jux-dist') {  // Changed default
+async function serve(port = 3000, distDir = './jux-dist') {
   const app = express();
   const absoluteDistDir = path.resolve(distDir);
   const projectRoot = path.resolve('.');
@@ -29,14 +29,14 @@ async function serve(port = 3000, distDir = './jux-dist') {  // Changed default
   app.post('/api/query', async (req, res) => {
     try {
       const { sql, params = [] } = req.body;
-      
+
       if (!db) {
         return res.status(500).json({ error: 'Database not initialized' });
       }
 
       const stmt = db.prepare(sql);
       stmt.bind(params);
-      
+
       const rows = [];
       while (stmt.step()) {
         rows.push(stmt.getAsObject());
@@ -61,16 +61,20 @@ async function serve(port = 3000, distDir = './jux-dist') {  // Changed default
   // Serve HTML files with clean URLs
   const heyPath = path.join(absoluteDistDir, 'hey.html');
   const indexPath = path.join(absoluteDistDir, 'index.html');
-  
+
   app.use((req, res, next) => {
-    let requestPath = req.path.endsWith('/') && req.path.length > 1 
-      ? req.path.slice(0, -1) 
+    let requestPath = req.path.endsWith('/') && req.path.length > 1
+      ? req.path.slice(0, -1)
       : req.path;
 
     // Root path - serve hey.html or index.html
     if (requestPath === '/') {
-      if (fs.existsSync(heyPath)) return res.sendFile(heyPath);
-      if (fs.existsSync(indexPath)) return res.sendFile(indexPath);
+      if (fs.existsSync(heyPath)) {
+        return res.sendFile(heyPath);
+      }
+      if (fs.existsSync(indexPath)) {
+        return res.sendFile(indexPath);
+      }
     }
 
     // Try to serve as HTML file
@@ -87,7 +91,7 @@ async function serve(port = 3000, distDir = './jux-dist') {  // Changed default
 
     next();
   });
-  
+
   // Serve static files (CSS, JS, images, etc.)
   app.use(express.static(absoluteDistDir));
 
@@ -96,25 +100,24 @@ async function serve(port = 3000, distDir = './jux-dist') {  // Changed default
     const notFoundPath = path.join(absoluteDistDir, '404.html');
     const requestedPath = path.join(absoluteDistDir, req.path);
     const fileType = path.extname(req.path) || 'directory';
-    
+
     // Log to console for debugging
     console.log(`❌ 404: ${req.path}`);
     console.log(`   Looked for: ${requestedPath}`);
     console.log(`   Type: ${fileType}`);
     console.log(`   Referer: ${req.get('referer') || 'direct'}`);
-    
+
     // If custom 404.html exists and this isn't already /404
     if (fs.existsSync(notFoundPath) && req.path !== '/404') {
-      // Add debug info as query params
       const debugUrl = `/404?path=${encodeURIComponent(req.path)}&type=${fileType}&from=${encodeURIComponent(req.get('referer') || 'direct')}`;
       return res.redirect(debugUrl);
     }
-    
+
     // Serve custom 404 page
     if (fs.existsSync(notFoundPath)) {
       return res.status(404).sendFile(notFoundPath);
     }
-    
+
     // Fallback: minimal 404 response
     res.status(404).send('<h1>404 - Not Found</h1>');
   });
@@ -175,7 +178,7 @@ async function serve(port = 3000, distDir = './jux-dist') {  // Changed default
 async function initDatabase() {
   const SQL = await initSqlJs();
   const dbPath = path.join(__dirname, '../db/jux.db');
-  
+
   if (fs.existsSync(dbPath)) {
     const buffer = fs.readFileSync(dbPath);
     db = new SQL.Database(buffer);
@@ -188,5 +191,5 @@ async function initDatabase() {
 
 export async function start(port = 3000) {
   await initDatabase();
-  return serve(port, './jux-dist');  // Changed default
+  return serve(port, './jux-dist');
 }

package/package.json

@@ -1,84 +1,64 @@
 {
   "name": "juxscript",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "type": "module",
   "description": "A JavaScript UX authorship platform",
   "main": "lib/jux.js",
   "types": "lib/jux.d.ts",
+  "access": "public",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jux/juxscript.git"
+  },
   "exports": {
     ".": {
       "types": "./lib/jux.d.ts",
       "import": "./lib/jux.js",
       "default": "./lib/jux.js"
     },
-    "./lib/*": "./lib/*",
-    "./lib/components/*": "./lib/components/*",
+    "./reactivity": {
+      "types": "./lib/reactivity/index.d.ts",
+      "import": "./lib/reactivity/index.js",
+      "default": "./lib/reactivity/index.js"
+    },
+    "./components/*": "./lib/components/*/index.js",
+    "./presets/*": "./lib/presets/*.js",
     "./package.json": "./package.json"
   },
-  "typesVersions": {
-    "*": {
-      "*": [
-        "lib/*"
-      ],
-      "lib/*": [
-        "lib/*"
-      ],
-      "lib/components/*": [
-        "lib/components/*"
-      ]
-    }
-  },
-  "bin": {
-    "jux": "./bin/cli.js"
-  },
-  "scripts": {
-    "dev": "cd examples && npx jux serve",
-    "build:examples": "cd examples && rm -rf dist && npx jux build",
-    "build": "tsc",
-    "test": "node test/run-tests.js",
-    "generate:icons": "node scripts/generate-icon-types.js"
-  },
   "files": [
     "lib",
     "bin",
     "machinery",
     "types",
-    "lib/**/*.d.ts",
     "README.md",
     "LICENSE"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/juxscript/jux.git"
+  "bin": {
+    "jux": "./bin/cli.js"
   },
   "keywords": [
-    "jux",
     "ui",
-    "authoring",
+    "ux",
+    "components",
+    "framework",
+    "reactive",
     "javascript"
   ],
-  "author": "Tim Kerr",
-  "license": "MIT",
-  "dependencies": {
-    "acorn": "^8.15.0",
-    "chokidar": "^5.0.0",
-    "clean-css": "^5.3.3",
-    "esbuild": "^0.27.2",
-    "express": "^5.2.1",
-    "glob": "^13.0.0",
-    "node": "^24.12.0",
-    "sql.js": "^1.10.3",
-    "terser": "^5.44.1",
-    "ws": "^8.19.0"
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc --watch",
+    "prepublishOnly": "npm run build"
   },
-  "optionalDependencies": {
-    "mysql2": "^3.6.5",
-    "pg": "^8.11.3"
+  "dependencies": {
+    "express": "^4.18.2",
+    "chokidar": "^3.5.3",
+    "ws": "^8.13.0",
+    "sql.js": "^1.8.0"
   },
   "devDependencies": {
-    "typescript": "^5.9.3"
+    "typescript": "^5.0.0",
+    "@types/express": "^4.17.17",
+    "@types/node": "^20.0.0",
+    "@types/ws": "^8.5.5"
   }
 }

package/machinery/generators/css.js

@@ -1,128 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import CleanCSS from 'clean-css';
-import { FileValidator } from '../validators/file-validator.js';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-/**
- * Generates CSS content from Jux configuration
- * Handles: global.css, themes, imports, styleImports, and styleInline blocks
- */
-export function generateCSS(juxConfig, layoutParsed = null) {
-  const fileValidator = new FileValidator();
-  let cssOutput = '';
-
-  // 1. Add global.css (always first)
-  const globalCssPath = path.join(__dirname, '../../lib/global.css');
-  if (fs.existsSync(globalCssPath)) {
-    cssOutput += `/* Global Styles */\n`;
-    cssOutput += fs.readFileSync(globalCssPath, 'utf-8') + '\n\n';
-    console.log(`  ✓ Included global.css`);
-  }
-
-  // 2. Add theme CSS (layout theme first, then page theme if different)
-  const themesToLoad = [];
-  
-  if (layoutParsed?.config?.theme) {
-    themesToLoad.push({ theme: layoutParsed.config.theme, source: 'layout' });
-  }
-  
-  if (juxConfig.theme && juxConfig.theme !== layoutParsed?.config?.theme) {
-    themesToLoad.push({ theme: juxConfig.theme, source: 'page' });
-  }
-
-  for (const { theme, source } of themesToLoad) {
-    const themePath = path.join(__dirname, '../../lib/themes', `${theme}.css`);
-    if (fs.existsSync(themePath)) {
-      cssOutput += `/* Theme: ${theme} (${source}) */\n`;
-      cssOutput += fs.readFileSync(themePath, 'utf-8') + '\n\n';
-      console.log(`  ✓ Included theme: ${theme} (${source})`);
-    } else {
-      console.warn(`  ⚠️  Theme not found: ${theme}`);
-    }
-  }
-
-  // 3. Process @import directives (CSS files only from layout, then page)
-  const allImports = [
-    ...(layoutParsed?.config?.import || []),
-    ...(juxConfig.import || [])
-  ];
-
-  if (allImports.length > 0) {
-    const { categorized } = fileValidator.categorizeImports(allImports);
-
-    // Only process CSS files
-    for (const cssImport of categorized.css) {
-      const resolvedPath = path.join(__dirname, '../../', cssImport);
-      if (fs.existsSync(resolvedPath)) {
-        cssOutput += `/* Import: ${cssImport} */\n`;
-        cssOutput += fs.readFileSync(resolvedPath, 'utf-8') + '\n\n';
-        console.log(`  ✓ Included import: ${cssImport}`);
-      } else {
-        console.warn(`  ⚠️  Import not found: ${cssImport} (resolved to ${resolvedPath})`);
-      }
-    }
-
-    // Log skipped JS imports (will be handled in HTML)
-    if (categorized.js.length > 0) {
-      console.log(`  ℹ️  Skipped JS imports (will be added to HTML): ${categorized.js.length} file(s)`);
-    }
-  }
-
-  // 4. Process @style imports (CSS file references from layout, then page)
-  const allStyleImports = [
-    ...(layoutParsed?.config?.styleImports || []),
-    ...(juxConfig.styleImports || [])
-  ];
-
-  for (const styleImport of allStyleImports) {
-    // Handle URLs (CDN)
-    if (styleImport.startsWith('http://') || styleImport.startsWith('https://')) {
-      cssOutput += `/* External CSS: ${styleImport} */\n`;
-      cssOutput += `@import url('${styleImport}');\n\n`;
-      console.log(`  ✓ Added CDN import: ${styleImport}`);
-    } else {
-      // Handle local files
-      const resolvedPath = path.join(__dirname, '../../', styleImport);
-      if (fs.existsSync(resolvedPath)) {
-        cssOutput += `/* Style Import: ${styleImport} */\n`;
-        cssOutput += fs.readFileSync(resolvedPath, 'utf-8') + '\n\n';
-        console.log(`  ✓ Included style import: ${styleImport}`);
-      } else {
-        console.warn(`  ⚠️  Style import not found: ${styleImport} (resolved to ${resolvedPath})`);
-      }
-    }
-  }
-
-  // 5. Process inline @style blocks (layout first, then page)
-  const allInlineStyles = [
-    ...(layoutParsed?.config?.styleInline || []),
-    ...(juxConfig.styleInline || [])
-  ];
-
-  if (allInlineStyles.length > 0) {
-    cssOutput += `/* Inline Styles (${allInlineStyles.length} block(s)) */\n`;
-    
-    allInlineStyles.forEach((styleBlock, index) => {
-      const source = index < (layoutParsed?.config?.styleInline?.length || 0) ? 'layout' : 'page';
-      
-      try {
-        const validatedStyle = fileValidator.validateStyleContent(styleBlock, `inline block #${index + 1}`);
-        
-        if (!fileValidator.isEmptyStyle(validatedStyle)) {
-          cssOutput += `/* Inline Block #${index + 1} (${source}) */\n`;
-          cssOutput += validatedStyle + '\n\n';
-        }
-      } catch (error) {
-        console.error(`  ❌ ${error.message}`);
-      }
-    });
-
-    console.log(`  ✓ Included ${allInlineStyles.length} inline style block(s)`);
-  }
-
-  return cssOutput.trim();
-}