juxscript 1.1.368 → 1.1.370

package/bin/cli.js

@@ -12,6 +12,135 @@ const PACKAGE_ROOT = path.resolve(__dirname, '..');
 
 const [, , command, ...args] = process.argv;
 
+// ═══════════════════════════════════════════════════════════════
+// UTILITIES (must be defined before commands that use them)
+// ═══════════════════════════════════════════════════════════════
+function copyDirRecursive(src, dest) {
+  if (!fs.existsSync(dest)) {
+    fs.mkdirSync(dest, { recursive: true });
+  }
+
+  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+    if (entry.name.startsWith('.')) continue;
+
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+
+    if (entry.isDirectory()) {
+      copyDirRecursive(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
+function resolveProjectSrcDir() {
+  const projectRoot = process.cwd();
+  const configPath = path.join(projectRoot, 'juxconfig.js');
+
+  if (fs.existsSync(configPath)) {
+    try {
+      const configContent = fs.readFileSync(configPath, 'utf8');
+      const srcDirMatch = configContent.match(/srcDir\s*:\s*['"]([^'"]+)['"]/);
+      if (srcDirMatch) {
+        return path.resolve(projectRoot, srcDirMatch[1]);
+      }
+    } catch (_) { }
+  }
+
+  return path.resolve(projectRoot, 'jux');
+}
+
+function resolveDestFolderName(parentDir, baseName) {
+  const first = path.join(parentDir, baseName);
+  if (!fs.existsSync(first)) return baseName;
+
+  const juxName = baseName + '-jux';
+  const second = path.join(parentDir, juxName);
+  if (!fs.existsSync(second)) return juxName;
+
+  for (let i = 1; i <= 99; i++) {
+    const numbered = `${baseName}-${i}`;
+    if (!fs.existsSync(path.join(parentDir, numbered))) return numbered;
+  }
+
+  return `${baseName}-${Date.now()}`;
+}
+
+function listFilesRecursive(dir, base = '') {
+  const results = [];
+  const entries = fs.readdirSync(dir, { withFileTypes: true });
+
+  for (const entry of entries) {
+    if (entry.name.startsWith('.')) continue;
+    const rel = base ? path.join(base, entry.name) : entry.name;
+
+    if (entry.isDirectory()) {
+      results.push(...listFilesRecursive(path.join(dir, entry.name), rel));
+    } else {
+      results.push(rel);
+    }
+  }
+
+  return results;
+}
+
+function promptPresetSelection(presets) {
+  return new Promise((resolve) => {
+    console.log('\n📦 Available component presets:\n');
+    presets.forEach((p, i) => {
+      const presetDir = path.join(PACKAGE_ROOT, 'presets', p);
+      const files = fs.readdirSync(presetDir).filter(f => !f.startsWith('.'));
+      console.log(`   ${i + 1}) ${p}  (${files.join(', ')})`);
+    });
+    console.log(`   0) Cancel\n`);
+
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    rl.question('Select a preset (number or name): ', (answer) => {
+      rl.close();
+      const trimmed = answer.trim();
+
+      const num = parseInt(trimmed, 10);
+      if (num === 0) return resolve(null);
+      if (num >= 1 && num <= presets.length) return resolve(presets[num - 1]);
+
+      if (presets.includes(trimmed)) return resolve(trimmed);
+
+      console.error(`❌ Invalid selection: "${trimmed}"`);
+      resolve(null);
+    });
+  });
+}
+
+function promptYesNo(question) {
+  return new Promise((resolve) => {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(`${question} (y/N): `, (answer) => {
+      rl.close();
+      resolve(answer.trim().toLowerCase() === 'y');
+    });
+  });
+}
+
+function showHelp() {
+  console.log(`
+JUX CLI
+
+Usage:
+  jux create <name>    Create a new JUX project
+  jux init             Initialize JUX in current directory
+  jux build            Build for production
+  jux serve            Start production server
+  jux serve --hot      Start dev server with hot reload
+  jux comp [name]      Add a component preset to your project
+  jux comp [name] -f   Force overwrite (backs up existing files)
+
+Options:
+  --help, -h           Show this help message
+  --force, -f          Overwrite existing files (creates .bak backups)
+`);
+}
+
 // ═══════════════════════════════════════════════════════════════
 // COMMAND: create <project-name>
 // Creates a new JUX project from the template
@@ -256,51 +385,13 @@ function runServe() {
   child.on('close', (code) => process.exit(code || 0));
 }
 
-// ═══════════════════════════════════════════════════════════════
-// UTILITIES
-// ═══════════════════════════════════════════════════════════════
-function copyDirRecursive(src, dest) {
-  if (!fs.existsSync(dest)) {
-    fs.mkdirSync(dest, { recursive: true });
-  }
-
-  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
-    if (entry.name.startsWith('.')) continue; // Skip hidden files
-
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
-
-    if (entry.isDirectory()) {
-      copyDirRecursive(srcPath, destPath);
-    } else {
-      fs.copyFileSync(srcPath, destPath);
-    }
-  }
-}
-
-function showHelp() {
-  console.log(`
-JUX CLI
-
-Usage:
-  jux create <name>    Create a new JUX project
-  jux init             Initialize JUX in current directory
-  jux build            Build for production
-  jux serve            Start production server
-  jux serve --hot      Start dev server with hot reload
-  jux comp [name]      Add a component preset to your project
-
-Options:
-  --help, -h           Show this help message
-`);
-}
-
 // ═══════════════════════════════════════════════════════════════
 // COMMAND: comp [name]
 // Copies a preset component into the project's jux directory
 // ═══════════════════════════════════════════════════════════════
 async function runComp(compName) {
   const presetsDir = path.join(PACKAGE_ROOT, 'presets');
+  const forceFlag = args.includes('--force') || args.includes('-f');
 
   if (!fs.existsSync(presetsDir)) {
     console.error('❌ No presets directory found in juxscript package.');
@@ -342,87 +433,109 @@ async function runComp(compName) {
     fs.mkdirSync(targetSrcDir, { recursive: true });
   }
 
-  // Copy all files from preset to project src dir
-  const presetFiles = fs.readdirSync(presetDir, { withFileTypes: true });
-  let copied = 0;
+  // Resolve a safe destination folder name
+  const destFolderName = resolveDestFolderName(targetSrcDir, compName);
+  const destDir = path.join(targetSrcDir, destFolderName);
 
-  for (const entry of presetFiles) {
-    if (entry.isFile()) {
-      const srcPath = path.join(presetDir, entry.name);
-      const destPath = path.join(targetSrcDir, entry.name);
-
-      if (fs.existsSync(destPath)) {
-        const overwrite = await promptYesNo(`   ⚠️  "${entry.name}" already exists. Overwrite?`);
-        if (!overwrite) {
-          console.log(`   ⏭️  Skipped ${entry.name}`);
-          continue;
-        }
-      }
+  // List what will be copied
+  const presetFiles = listFilesRecursive(presetDir);
 
-      fs.copyFileSync(srcPath, destPath);
-      console.log(`   ✅ ${entry.name}`);
-      copied++;
+  console.log(`\n📦 Preset: ${compName}`);
+  console.log(`   Source: presets/${compName}/`);
+  console.log(`   Target: ${path.relative(process.cwd(), destDir)}/\n`);
+
+  if (destFolderName !== compName) {
+    console.log(`   ⚠️  "${compName}" already exists, using "${destFolderName}" instead.\n`);
+  }
+
+  console.log(`   Files to copy:`);
+  presetFiles.forEach(f => console.log(`     📄 ${f}`));
+  console.log('');
+
+  // If dest exists (shouldn't with our naming, but just in case with --force)
+  if (fs.existsSync(destDir) && !forceFlag) {
+    const proceed = await promptYesNo(`   Directory "${destFolderName}" exists. Overwrite contents?`);
+    if (!proceed) {
+      console.log('   Cancelled.\n');
+      process.exit(0);
     }
   }
 
-  console.log(`\n✅ Copied ${copied} file(s) from preset "${compName}" to ${path.relative(process.cwd(), targetSrcDir)}/\n`);
-}
+  // Copy the entire preset folder
+  fs.mkdirSync(destDir, { recursive: true });
+  let copied = 0;
+  let backed = 0;
 
-function resolveProjectSrcDir() {
-  const projectRoot = process.cwd();
-  const configPath = path.join(projectRoot, 'juxconfig.js');
+  for (const relFile of presetFiles) {
+    const srcPath = path.join(presetDir, relFile);
+    const destPath = path.join(destDir, relFile);
 
-  if (fs.existsSync(configPath)) {
-    try {
-      const configContent = fs.readFileSync(configPath, 'utf8');
-      const srcDirMatch = configContent.match(/srcDir\s*:\s*['"]([^'"]+)['"]/);
-      if (srcDirMatch) {
-        return path.resolve(projectRoot, srcDirMatch[1]);
-      }
-    } catch (_) { }
+    // Ensure subdirectory exists
+    const destFileDir = path.dirname(destPath);
+    if (!fs.existsSync(destFileDir)) {
+      fs.mkdirSync(destFileDir, { recursive: true });
+    }
+
+    if (fs.existsSync(destPath)) {
+      // Backup existing
+      const backupPath = destPath + '.bak';
+      fs.copyFileSync(destPath, backupPath);
+      backed++;
+      console.log(`   🔄 ${relFile} (backed up to ${relFile}.bak)`);
+    } else {
+      console.log(`   ✅ ${relFile}`);
+    }
+
+    fs.copyFileSync(srcPath, destPath);
+    copied++;
   }
 
-  return path.resolve(projectRoot, 'jux');
+  console.log(`\n✅ Done: ${copied} file(s) copied to ${path.relative(process.cwd(), destDir)}/`);
+  if (backed > 0) {
+    console.log(`   ${backed} existing file(s) backed up with .bak extension`);
+  }
+  console.log('');
 }
 
-function promptPresetSelection(presets) {
-  return new Promise((resolve) => {
-    console.log('\n📦 Available component presets:\n');
-    presets.forEach((p, i) => {
-      // Read files in preset to show what's included
-      const presetDir = path.join(PACKAGE_ROOT, 'presets', p);
-      const files = fs.readdirSync(presetDir).filter(f => !f.startsWith('.'));
-      console.log(`   ${i + 1}) ${p}  (${files.join(', ')})`);
-    });
-    console.log(`   0) Cancel\n`);
-
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    rl.question('Select a preset (number or name): ', (answer) => {
-      rl.close();
-      const trimmed = answer.trim();
+/**
+ * Resolve a safe folder name: compName -> compName-jux -> compName-1, compName-2, ...
+ */
+function resolveDestFolderName(parentDir, baseName) {
+  const first = path.join(parentDir, baseName);
+  if (!fs.existsSync(first)) return baseName;
 
-      // By number
-      const num = parseInt(trimmed, 10);
-      if (num === 0) return resolve(null);
-      if (num >= 1 && num <= presets.length) return resolve(presets[num - 1]);
+  const juxName = baseName + '-jux';
+  const second = path.join(parentDir, juxName);
+  if (!fs.existsSync(second)) return juxName;
 
-      // By name
-      if (presets.includes(trimmed)) return resolve(trimmed);
+  for (let i = 1; i <= 99; i++) {
+    const numbered = `${baseName}-${i}`;
+    if (!fs.existsSync(path.join(parentDir, numbered))) return numbered;
+  }
 
-      console.error(`❌ Invalid selection: "${trimmed}"`);
-      resolve(null);
-    });
-  });
+  // Last resort — timestamp
+  return `${baseName}-${Date.now()}`;
 }
 
-function promptYesNo(question) {
-  return new Promise((resolve) => {
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    rl.question(`${question} (y/N): `, (answer) => {
-      rl.close();
-      resolve(answer.trim().toLowerCase() === 'y');
-    });
-  });
+/**
+ * List all files in a directory recursively, returning relative paths
+ */
+function listFilesRecursive(dir, base = '') {
+  const results = [];
+  const entries = fs.readdirSync(dir, { withFileTypes: true });
+
+  for (const entry of entries) {
+    if (entry.name.startsWith('.')) continue;
+    const rel = base ? path.join(base, entry.name) : entry.name;
+
+    if (entry.isDirectory()) {
+      results.push(...listFilesRecursive(path.join(dir, entry.name), rel));
+    } else {
+      results.push(rel);
+    }
+  }
+
+  return results;
 }
 
 // ═══════════════════════════════════════════════════════════════

package/package.json

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

package/presets/sidebar/{sidebar-usage.jux → usage.jux}

@@ -1,5 +1,5 @@
 import { jux } from 'juxscript';
-import { juxSidebar } from './sidebar.jux';
+import { juxSidebar } from './index.jux';
 const allRoutes = jux.routes.all();
 
 juxSidebar('my-sidebar', allRoutes,