naider 1.21.0 → 1.21.1

package/bin/naide.js

@@ -8,7 +8,7 @@ import { spawn } from 'child_process';
 import { createRequire } from 'module';
 const _require = createRequire(import.meta.url);
 
-const NAIDE_VERSION = '1.21.0';
+const NAIDE_VERSION = '1.21.1';
 
 function crashReport(err, context = {}) {
   const info = [
@@ -171,7 +171,13 @@ if (files[0] === 'gen' || files[0] === '~~') {
   Project Mode (--project):
     naide ~~ "e-commerce app with auth" --project
     # Creates: app.naide, package.json, .env, .gitignore,
-    #          Dockerfile, .dockerignore, README.md
+    #          Dockerfile, .dockerignore, README.md, openapi.json,
+    #          admin.html, client.mjs
+
+  Update existing project (re-run --project in same dir):
+    naide ~~ "add users with auth" --project -o my-app
+    naide ~~ "add products" --project -o my-app
+    # Merges new entities, regenerates all supporting files
 
   File Write Mode:
     naide ~~ "add auth" app.naide              # merge into existing file
@@ -213,7 +219,7 @@ if (files[0] === 'gen' || files[0] === '~~') {
     process.exit(0);
   }
 
-  const { generate, generateProject, writeToFile } = await import('../src/gen.js');
+  const { generate, generateProject, updateProject, writeToFile } = await import('../src/gen.js');
 
   // Write mode: inject into existing .naide/.nx file
   const targetFile = instruction.match(/\S+\.(?:naide|nx)$/)?.[0];
@@ -235,32 +241,63 @@ if (files[0] === 'gen' || files[0] === '~~') {
     process.exit(0);
   }
 
-  // Project mode: generate full project directory
+  // Project mode: generate or update project directory
   if (flags.project) {
-    const result = generateProject(instruction);
-    const primaryName = (result.entities[0] || 'app').toLowerCase().replace(/[^a-z0-9]/g, '');
-    const dir = flags.output || (primaryName + '-app');
+    const isCurrentDir = instruction === '.' || instruction === './';
+    let dir, result;
+
+    if (isCurrentDir) {
+      // naide gen . --project  → update current directory
+      dir = '.';
+      const outDir = resolve(dir);
+      if (!existsSync(resolve(outDir, 'app.naide'))) {
+        process.stderr.write('  Error: no app.naide found in current directory.\n');
+        process.stderr.write('  Use naide ~~ "instruction" --project to create a new project.\n');
+        process.exit(1);
+      }
+      process.stderr.write('  Error: use naide ~~ "instruction" --project in an existing project dir to update.\n');
+      process.exit(1);
+    }
+
+    const primaryGuess = instruction.split(/\s+/)[0].toLowerCase().replace(/[^a-z0-9]/g, '') || 'app';
+    dir = flags.output || (primaryGuess + '-app');
     const outDir = resolve(dir);
-    if (!existsSync(outDir)) mkdirSync(outDir, { recursive: true });
+    const isUpdate = existsSync(resolve(outDir, 'app.naide'));
+
+    if (isUpdate) {
+      result = updateProject(outDir, instruction);
+    } else {
+      result = generateProject(instruction);
+    }
+
+    const primaryName = (result.entities[0] || 'app').toLowerCase().replace(/[^a-z0-9]/g, '');
+    if (!flags.output && !isUpdate) dir = primaryName + '-app';
+    const finalDir = resolve(dir);
+    if (!existsSync(finalDir)) mkdirSync(finalDir, { recursive: true });
     for (const f of result.files) {
-      const fp = resolve(outDir, f.path);
+      const fp = resolve(finalDir, f.path);
       writeFileSync(fp, f.content, 'utf-8');
     }
     const a = result.analysis;
-    process.stderr.write('\n  ── NAIDE Agent ──────────────────────────────────────────\n');
+    const mode = isUpdate ? 'Updated' : 'Created';
+    process.stderr.write(`\n  ── NAIDE Agent (${mode}) ────────────────────────────────\n`);
     process.stderr.write(`  Input:    "${a.instruction}"\n`);
     if (a.entities.length > 0) {
       process.stderr.write(`  Entities: ${a.entities.map(e => `${e.name} (${e.fieldCount} fields)`).join(', ')}\n`);
     }
-    if (a.relationships.length > 0) {
+    if (a.relationships && a.relationships.length > 0) {
       for (const r of a.relationships) process.stderr.write(`  Relation: ${r.parent} 1→N ${r.child} (${r.fk})\n`);
     }
+    if (a.added && a.added.length > 0) {
+      process.stderr.write(`  Added:    ${a.added.join(', ')}\n`);
+    }
     process.stderr.write(`  Plan:\n`);
     for (const step of a.plan) process.stderr.write(`    + ${step}\n`);
     process.stderr.write('  ────────────────────────────────────────────────────────\n\n');
-    console.log(`  Project created: ${dir}/`);
+    console.log(`  Project ${isUpdate ? 'updated' : 'created'}: ${dir}/`);
     for (const f of result.files) console.log(`    ${f.path}`);
-    console.log(`\n  cd ${dir} && npm install && npm run dev\n`);
+    if (!isUpdate) console.log(`\n  cd ${dir} && npm install && npm run dev\n`);
+    else console.log(`\n  Files regenerated. Run: npm run dev\n`);
     process.exit(0);
   }
 

package/mcp/server.js

@@ -192,7 +192,7 @@ async function handleMessage(msg) {
       respond(msg.id, {
         protocolVersion: '2024-11-05',
         capabilities: { tools: {} },
-        serverInfo: { name: 'naide-mcp', version: '1.21.0' }
+        serverInfo: { name: 'naide-mcp', version: '1.21.1' }
       });
       break;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naider",
-  "version": "1.21.0",
+  "version": "1.21.1",
   "description": "NAIDE - Simpler than Python, compiles to 15 targets. AI-specialized language with 35+ built-in functions, syntax sugar (unless/until/repeat/swap/is/isnt), and 47 features. Targets: Node.js, Python, TypeScript, C, C++, Java, Go, Rust, PHP, Ruby, Kotlin, Swift, Dart, C#, Bun.",
   "main": "src/index.js",
   "exports": {

package/src/gen.js

@@ -1479,6 +1479,200 @@ CMD ["node", "dist/app.mjs"]
   return { ...result, files };
 }
 
+// ── Project Update Mode ───────────────────────────────────
+
+export function updateProject(projectDir, instruction, options = {}) {
+  const appPath = projectDir + '/app.naide';
+  const existing = _existsFS(appPath) ? _readFS(appPath, 'utf-8') : '';
+
+  const existingState = existing ? parseExistingProject(existing) : { entities: [], intents: [], port: 3000 };
+  const newResult = generate(instruction, options);
+  const newEntities = (newResult.entities || []).filter(e => !existingState.entities.includes(e));
+
+  const allEntities = [...existingState.entities, ...newEntities];
+  const combinedIntents = [...new Set([...existingState.intents, ...newResult.intents])];
+  const extras = [];
+  if (combinedIntents.includes('auth')) extras.push('auth');
+  if (combinedIntents.includes('websocket')) extras.push('websocket');
+  if (combinedIntents.includes('database')) extras.push('database');
+  const fullInstruction = 'REST API for ' + allEntities.join(' and ') + (extras.length ? ' with ' + extras.join(' and ') : '');
+
+  const combined = generate(fullInstruction, options);
+  const finalCode = combined.code;
+
+  const files = [];
+  files.push({ path: 'app.naide', content: finalCode });
+
+  const intents = new Set(combined.intents);
+  const entities = combined.entities || allEntities;
+  const relationships = combined.relationships || detectRelationships(entities);
+
+  const primaryName = (entities[0] || 'app').toLowerCase();
+  const projectName = safeName(primaryName) + '-app';
+  const port = existingState.port || combined.port || 3000;
+
+  const deps = {};
+  if (intents.has('server'))    deps.express = '^4.21.0';
+  if (intents.has('websocket')) deps.ws = '^8.18.0';
+  if (intents.has('auth')) {
+    deps.jsonwebtoken = '^9.0.2';
+    deps.bcryptjs = '^2.4.3';
+  }
+  if (intents.has('mail'))      deps.nodemailer = '^6.9.0';
+  if (entities.length > 0)     deps.naider = '^1.21.0';
+
+  const existingPkgPath = projectDir + '/package.json';
+  let pkg;
+  if (_existsFS(existingPkgPath)) {
+    pkg = JSON.parse(_readFS(existingPkgPath, 'utf-8'));
+    pkg.dependencies = { ...pkg.dependencies, ...deps };
+  } else {
+    pkg = {
+      name: projectName, version: '1.0.0', type: 'module',
+      scripts: { dev: 'naide app.naide', build: 'naide app.naide --emit -o dist/app.mjs',
+        start: 'node dist/app.mjs', test: 'naide test app.naide', seed: 'naide app.naide --run-seed' },
+      dependencies: deps,
+    };
+  }
+  files.push({ path: 'package.json', content: JSON.stringify(pkg, null, 2) + '\n' });
+
+  const envL = [];
+  envL.push(`PORT=${port}`);
+  if (intents.has('auth')) envL.push('JWT_SECRET=change-me-in-production');
+  if (intents.has('bot'))  envL.push(`${(options.platform || 'DISCORD').toUpperCase()}_TOKEN=your-bot-token`);
+  if (intents.has('mail')) { envL.push('SMTP_HOST=smtp.example.com'); envL.push('SMTP_USER=user@example.com'); envL.push('SMTP_PASS=password'); }
+  if (intents.has('ai'))   envL.push('OPENAI_API_KEY=your-api-key');
+  const existingEnvPath = projectDir + '/.env';
+  if (_existsFS(existingEnvPath)) {
+    const existingEnv = _readFS(existingEnvPath, 'utf-8');
+    const existingKeys = new Set(existingEnv.split('\n').map(l => l.split('=')[0]).filter(Boolean));
+    const newEnvLines = envL.filter(l => !existingKeys.has(l.split('=')[0]));
+    if (newEnvLines.length > 0) {
+      files.push({ path: '.env', content: existingEnv.trimEnd() + '\n' + newEnvLines.join('\n') + '\n' });
+    }
+  } else {
+    files.push({ path: '.env', content: envL.join('\n') + '\n' });
+  }
+
+  files.push({ path: '.gitignore', content: 'node_modules/\ndist/\ndata/\n.env\n*.mjs\n' });
+
+  if (intents.has('server')) {
+    files.push({ path: 'Dockerfile', content: `FROM node:22-slim\nWORKDIR /app\nCOPY package*.json ./\nRUN npm ci --omit=dev\nRUN npm install -g naider\nCOPY . .\nRUN naide app.naide --emit -o dist/app.mjs\nEXPOSE ${port}\nCMD ["node", "dist/app.mjs"]\n` });
+    files.push({ path: '.dockerignore', content: 'node_modules\ndist\ndata\n.env\n.git\n' });
+  }
+
+  const readmeLines = [`# ${projectName}\n`];
+  readmeLines.push(`Generated by NAIDE Agent Coder (~~)\n`);
+  readmeLines.push(`## Entities\n`);
+  for (const e of entities) {
+    const preset = SCHEMA_PRESETS[e.toLowerCase()];
+    const fc = preset ? preset.length : 3;
+    readmeLines.push(`- **${e}** (${fc} fields)`);
+  }
+  if (relationships.length > 0) {
+    readmeLines.push(`\n## Relationships\n`);
+    for (const r of relationships) readmeLines.push(`- ${r.parent} → ${r.child} (${r.fk})`);
+  }
+  readmeLines.push(`\n## Quick Start\n`);
+  readmeLines.push('```bash\nnpm install\nnpm run dev\n```\n');
+  if (intents.has('server')) {
+    readmeLines.push(`## API Endpoints\n`);
+    readmeLines.push(`- \`GET /api/health\` — Health check`);
+    for (const e of entities) {
+      const ep = pluralize(e.toLowerCase());
+      readmeLines.push(`- \`GET /api/${ep}?page=1&limit=20&search=\` — List ${ep} (paginated)`);
+      readmeLines.push(`- \`POST /api/${ep}\` — Create ${e.toLowerCase()}`);
+      readmeLines.push(`- \`GET /api/${ep}/:id\` — Get ${e.toLowerCase()}`);
+      readmeLines.push(`- \`PUT /api/${ep}/:id\` — Update ${e.toLowerCase()}`);
+      readmeLines.push(`- \`DELETE /api/${ep}/:id\` — Delete ${e.toLowerCase()}`);
+      readmeLines.push(`- \`DELETE /api/${ep}/:id/soft\` — Soft delete`);
+      readmeLines.push(`- \`PUT /api/${ep}/:id/restore\` — Restore`);
+      readmeLines.push(`- \`POST /api/${ep}/batch\` — Batch create`);
+      readmeLines.push(`- \`DELETE /api/${ep}/batch\` — Batch delete`);
+    }
+    for (const r of relationships) {
+      readmeLines.push(`- \`GET /api/${pluralize(r.parent.toLowerCase())}/:id/${pluralize(r.child.toLowerCase())}\` — ${r.child}s by ${r.parent}`);
+    }
+    readmeLines.push(`- \`POST /api/upload\` — File upload`);
+    readmeLines.push(`- \`POST /api/webhooks\` — Register webhook`);
+    if (intents.has('auth')) {
+      readmeLines.push(`- \`POST /api/auth/register\` — Register`);
+      readmeLines.push(`- \`POST /api/auth/login\` — Login`);
+      readmeLines.push(`- \`GET /api/auth/me\` — Current user`);
+      readmeLines.push(`- \`GET /api/admin/stats\` — Admin stats`);
+    }
+  }
+  if (intents.has('server')) {
+    readmeLines.push(`\n## Docker\n`);
+    readmeLines.push('```bash');
+    readmeLines.push(`docker build -t ${projectName} .`);
+    readmeLines.push(`docker run -p ${port}:${port} --env-file .env ${projectName}`);
+    readmeLines.push('```');
+  }
+  files.push({ path: 'README.md', content: readmeLines.join('\n') + '\n' });
+
+  const entityObjs = entities.map(name => {
+    const preset = SCHEMA_PRESETS[name.toLowerCase()];
+    const fields = preset ? preset.map(f => ({ name: f[0], type: f[1], modifiers: f.slice(2) })) : defaultFields(name);
+    if (!fields.some(f => f.name === 'deleted')) fields.push({ name: 'deleted', type: 'bool', modifiers: [] });
+    return { name, fields };
+  });
+
+  if (intents.has('server') && entityObjs.length > 0) {
+    files.push({ path: 'openapi.json', content: JSON.stringify(openApiSpec(entityObjs, intents, { port }, relationships), null, 2) + '\n' });
+    files.push({ path: 'admin.html', content: adminPage(entityObjs, intents) });
+  }
+  if (intents.has('server')) {
+    files.push({ path: 'client.mjs', content: apiClientCode(entityObjs, intents, port) });
+  }
+
+  const added = existing
+    ? entities.filter(e => !existing.includes(`schema ${e}`))
+    : entities;
+  const analysis = {
+    instruction,
+    entities: entityObjs.map(e => ({ name: e.name, fieldCount: e.fields.length })),
+    relationships,
+    plan: [],
+    added,
+  };
+  if (added.length > 0) analysis.plan.push(`Added: ${added.join(', ')}`);
+  if (existing) analysis.plan.push('Merged with existing app.naide');
+  analysis.plan.push(`Total entities: ${entities.length}`);
+  analysis.plan.push(`Supporting files regenerated`);
+
+  return {
+    code: finalCode, valid: combined.valid, fixed: combined.fixed, repairs: combined.repairs,
+    intents: [...intents], entities, relationships, port,
+    files, analysis, action: existing ? 'updated' : 'created',
+  };
+}
+
+function parseExistingProject(code) {
+  const lines = code.split('\n');
+  const entities = [];
+  const intents = new Set();
+  let port = 3000;
+
+  for (const line of lines) {
+    const sm = line.match(/^schema\s+(\w+)\s*:/);
+    if (sm && sm[1] !== 'AuditLog') {
+      entities.push(sm[1]);
+      intents.add('schema');
+    }
+    if (line.match(/^server\s/))    intents.add('server');
+    if (line.match(/\bcrud\b/))     intents.add('crud');
+    if (line.match(/\bauth\b/))     intents.add('auth');
+    if (line.match(/\bdb\b/))       intents.add('database');
+    if (line.match(/\bws\b/))       intents.add('websocket');
+    if (line.match(/\bbot\b/))      intents.add('bot');
+    const pm = line.match(/port\s+(\d+)/);
+    if (pm) port = parseInt(pm[1], 10);
+  }
+
+  return { entities, intents: [...intents], port };
+}
+
 // ── File Write Mode ────────────────────────────────────────
 
 export function writeToFile(filePath, instruction, options = {}) {

package/src/index.js

@@ -3,7 +3,7 @@ import { Parser } from './parser.js';
 import { Generator } from './generator.js';
 import { preprocess } from './preprocess.js';
 import { TypeChecker } from './typechecker.js';
-import { generate, expandDirectives } from './gen.js';
+import { generate, generateProject, updateProject, expandDirectives } from './gen.js';
 
 async function getGenerator(target, options) {
   switch (target) {
@@ -162,4 +162,4 @@ export function transpile(source, opts) {
   return compile(source, opts).js;
 }
 
-export { preprocess, generate };
+export { preprocess, generate, generateProject, updateProject };