@jsonpages/cli 3.0.3 → 3.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonpages/cli",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "JsonPages CLI - Sovereign Projection Engine",
   "type": "module",
   "bin": {

package/src/index.js

@@ -6,24 +6,74 @@ import path from 'path';
 import { execa } from 'execa';
 import ora from 'ora';
 import { fileURLToPath } from 'url';
-import { projectSrc } from './projection.js';
 
-// 🛡️ Risoluzione path per rendere la CLI shippable
+// 🛡️ Risoluzione path ESM
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-/** Cross-platform: on Windows, npm/yalc are .cmd; execa needs shell to resolve them. */
-const execOpts = (cwd) => ({
-  cwd,
-  ...(process.platform === 'win32' && { shell: true }),
-});
-
 const program = new Command();
 
 program
   .name('jsonpages')
   .description('JsonPages CLI - Sovereign Projection Engine')
-  .version('2.2.0');
+  .version('2.0.2'); // Bump version
+
+/**
+ * 🧠 THE UNIVERSAL INTERPRETER
+ * Legge lo script bash "DNA" e lo esegue usando le API di Node.js.
+ * Rende la CLI compatibile con Windows (PowerShell/CMD) senza bisogno di Bash.
+ */
+async function processScriptInNode(scriptPath, targetDir) {
+  const content = await fs.readFile(scriptPath, 'utf-8');
+  const lines = content.split('\n');
+  
+  let captureMode = false;
+  let delimiter = '';
+  let currentFile = '';
+  let fileBuffer = [];
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+
+    // 1. Modalità Cattura (Siamo dentro un cat << 'DELIMITER')
+    if (captureMode) {
+      if (trimmed === delimiter) {
+        // Fine del blocco: Scriviamo su disco
+        const filePath = path.join(targetDir, currentFile);
+        await fs.outputFile(filePath, fileBuffer.join('\n'));
+        captureMode = false;
+        fileBuffer = [];
+      } else {
+        fileBuffer.push(line); // Preserva l'indentazione originale
+      }
+      continue;
+    }
+
+    // 2. Parsing Comandi Bash -> Node Operations
+    
+    // Rileva: mkdir -p "path"
+    if (trimmed.startsWith('mkdir -p')) {
+      const match = trimmed.match(/"([^"]+)"/) || trimmed.match(/\s+([^\s]+)/); 
+      // Supporta sia mkdir -p "foo/bar" che mkdir -p foo/bar
+      const dirPath = match ? match[1].replace(/"/g, '') : null;
+      if (dirPath) {
+        await fs.ensureDir(path.join(targetDir, dirPath));
+      }
+    }
+    
+    // Rileva: cat << 'DELIMITER' > "path"
+    else if (trimmed.startsWith('cat <<')) {
+      // Regex robusta per catturare il delimitatore e il path del file
+      const match = trimmed.match(/<<\s*'([^']+)'\s*>\s*"([^"]+)"/);
+      if (match) {
+        delimiter = match[1];
+        currentFile = match[2];
+        captureMode = true;
+      }
+    }
+    // Ignora echo, set -e, commenti #, ecc.
+  }
+}
 
 program
   .command('new')
@@ -38,15 +88,14 @@ program
 
     const targetDir = path.join(process.cwd(), name);
     
-    // 🔍 Logica Asset Interno: 
-    // Se l'utente non fornisce uno script, usa quello dentro packages/cli/assets/
+    // 🔍 Asset Resolution
+    // Cerca lo script nella cartella assets installata col pacchetto
     const defaultScriptPath = path.resolve(__dirname, '../assets/src_tenant_alpha.sh');
     const scriptPath = options.script ? path.resolve(process.cwd(), options.script) : defaultScriptPath;
 
-    const scriptExists = await fs.pathExists(scriptPath);
-    if (!scriptExists) {
-      console.log(chalk.red(`❌ Error: Deterministic script not found at ${scriptPath}`));
-      console.log(chalk.yellow(`Expected internal asset at: ${defaultScriptPath}`));
+    if (!fs.existsSync(scriptPath)) {
+      console.log(chalk.red(`❌ Error: DNA script not found at ${scriptPath}`));
+      console.log(chalk.yellow(`Debug info: __dirname is ${__dirname}`));
       return;
     }
 
@@ -57,10 +106,14 @@ program
       // 1. SCAFFOLDING INFRA
       spinner.start('Setting up environment (Vite + TS)...');
       await fs.ensureDir(targetDir);
-      await execa('npm', ['create', 'vite@latest', '.', '--', '--template', 'react-ts'], execOpts(targetDir));
+      
+      // Windows fix: npm.cmd invece di npm
+      const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+      
+      await execa(npmCmd, ['create', 'vite@latest', '.', '--', '--template', 'react-ts'], { cwd: targetDir });
       spinner.succeed('Environment scaffolded.');
 
-      // 2. CLEANUP (Piazza pulita per il determinismo)
+      // 2. CLEANUP
       spinner.start('Wiping default boilerplate...');
       await fs.emptyDir(path.join(targetDir, 'src'));
       const junk = ['App.css', 'App.tsx', 'main.tsx', 'vite-env.d.ts', 'favicon.ico', 'index.html'];
@@ -75,65 +128,35 @@ program
       await injectInfraFiles(targetDir, name);
       spinner.succeed('Infrastructure configured.');
 
-      // 4. DETERMINISTIC SRC (Node-only projection — no shell; Windows-compatible)
-      spinner.start('Projecting source files (Node)...');
-      const { fileCount } = await projectSrc(targetDir, scriptPath);
-      spinner.succeed(`Source code and assets projected (${fileCount} files).`);
+      // 4. DETERMINISTIC PROJECTION (Node-based Interpreter)
+      spinner.start('Executing deterministic src projection...');
+      // Invece di execa('./script.sh'), usiamo il nostro interprete
+      await processScriptInNode(scriptPath, targetDir);
+      spinner.succeed('Source code and assets projected successfully.');
 
-      // 5. DEPENDENCY RESOLUTION (Green Build Enforcement)
+      // 5. DEPENDENCY RESOLUTION
       spinner.start('Installing dependencies (this may take a minute)...');
       
-      // 5a. Runtime Dependencies (Risolve Radix, CVA e Animations)
-      await execa(
-        'npm',
-        [
-          'install',
-          'react',
-          'react-dom',
-          'zod',
-          'react-router-dom',
-          'lucide-react',
-          'radix-ui',
-          '@base-ui/react',
-          'class-variance-authority',
-          'tailwind-merge',
-          'clsx',
-          'tw-animate-css',
-          'file-saver',
-          'jszip',
-        ],
-        execOpts(targetDir)
-      );
-
-      // 5b. Dev Dependencies
-      await execa(
-        'npm',
-        [
-          'install',
-          '-D',
-          'vite',
-          '@vitejs/plugin-react',
-          'typescript',
-          '@tailwindcss/vite',
-          'tailwindcss',
-          '@types/node',
-          '@types/react',
-          '@types/react-dom',
-          '@types/file-saver',
-        ],
-        execOpts(targetDir)
-      );
-
-      // 5c. Linking Core via yalc
-      spinner.text = 'Linking @jsonpages/core via yalc...';
-      try {
-        await execa('yalc', ['add', '@jsonpages/core'], execOpts(targetDir));
-      } catch (e) {
-        spinner.warn(chalk.yellow('Yalc link failed. Ensure "@jsonpages/core" is published in yalc.'));
-      }
+      const deps = [
+        'react', 'react-dom', 'zod', 'react-router-dom', 
+        'lucide-react', 'radix-ui', 
+        'tailwind-merge', 'clsx', 
+        'file-saver', 'jszip',
+        '@jsonpages/core@^1.0.0',
+      ];
       
+      const devDeps = [
+        'vite', '@vitejs/plugin-react', 'typescript', 
+        '@tailwindcss/vite', 'tailwindcss', 
+        '@types/node', '@types/react', '@types/react-dom', '@types/file-saver'
+      ];
+
+      await execa(npmCmd, ['install', ...deps], { cwd: targetDir });
+      await execa(npmCmd, ['install', '-D', ...devDeps], { cwd: targetDir });
+
       spinner.succeed(chalk.green.bold('✨ Tenant Ready!'));
 
+      console.log(chalk.gray('  (Ensure @jsonpages/core is published: npm view @jsonpages/core)'));
       console.log(`\n${chalk.white.bgBlue(' NEXT STEPS ')}`);
       console.log(`  ${chalk.cyan(`cd ${name}`)}`);
       console.log(`  ${chalk.cyan(`npm run dev`)}   <- Start development`);