naider 1.20.0 → 1.21.1

package/README.md

@@ -77,6 +77,9 @@ naide pkg install <name>      # Install a NAIDE package
 naide pkg publish             # Publish package to npm
 naide -w <file>               # Watch mode (auto-restart on changes)
 naide -d <file>               # Debug mode (Node.js inspector)
+naide ~~ "instruction"        # Generate NAIDE code from natural language
+naide gen "instruction"       # Same as ~~ (alias)
+naide --expand <file>         # Show ~~ directive expansion results
 naide --emit <file>           # Print generated JavaScript
 naide -o <out.js> <file>      # Write JavaScript to file
 naide --mid <file.nx>         # Show intermediate NAIDE v1 (debug X mode)
@@ -84,11 +87,80 @@ naide --ast <file>            # Print AST
 naide --tokens <file>         # Print token stream
 ```
 
+### Code Generation (`~~`)
+
+Generate valid NAIDE code from natural language instructions — no AI, no network, no dependencies. Pure pattern matching + template composition with self-healing parser validation. Multi-entity support with automatic relationship detection, paginated CRUD, soft delete, batch operations, nested routes, seed data, tests, and full project scaffolding.
+
+```bash
+# Single entity
+naide ~~ "REST API for users with auth"
+naide ~~ "todo app with database"
+
+# Multi-entity (auto-detects relationships, injects foreign keys)
+naide ~~ "users and products and orders with auth"
+
+# Composite presets
+naide ~~ "shop"        # User + Product + Order
+naide ~~ "crm"         # User + Contact + Deal + Activity
+naide ~~ "sns"         # User + Post + Comment + Message + Notification
+naide ~~ "booking"     # User + Event + Reservation
+
+# Project mode (generates full directory)
+naide ~~ "e-commerce app with auth" --project
+
+# File write mode (merge into existing file)
+naide ~~ "REST API for users" --write app.naide
+
+# Japanese
+naide ~~ "ECサイト"
+naide ~~ "ユーザー管理APIを認証付きで"
+```
+
+Generated routes per entity: paginated list, CRUD, soft delete, restore, batch create/delete, nested routes (from relationships), file upload, webhooks. With auth: register, login, profile, admin stats, audit log.
+
+Project mode (`--project`) generates: `app.naide`, `package.json`, `.env`, `Dockerfile`, `README.md`, `openapi.json`, `admin.html`, `client.mjs`.
+
+API usage:
+
+```javascript
+import { generate, generateProject } from 'naider';
+
+const result = generate("users and products with auth");
+console.log(result.entities);      // ['User', 'Product']
+console.log(result.relationships); // [{parent:'User', child:'Product', fk:'user_id'}]
+console.log(result.valid);         // true
+console.log(result.analysis);      // {entities, relationships, plan, ...}
+
+const project = generateProject("e-commerce with auth");
+project.files.forEach(f => console.log(f.path));
+```
+
+**Self-healing**: Generated code is validated against the actual NAIDE parser. Parse errors are auto-fixed (up to 5 retries) — missing colons, indent issues, reserved keyword conflicts.
+
+**Field normalization**: Smart aliases — `e-mail` → `email`, `pwd` → `password`, `tel` → `phone`, `desc` → `description`. Field types are auto-inferred from names (`email` → `str + email`, `age` → `int`, `done` → `bool`).
+
+<details>
+<summary>Keyword Cheat Sheet</summary>
+
+| Category | Keywords |
+|----------|----------|
+| Intent | `server` `api` `rest` `bot` `cli` `page` `test` `database` `ai` `crud` `auth` `websocket` `mail` `graphql` |
+| Composite | `todo` `blog` `chat` `shop` `fullstack` `board` `crm` `inventory` `booking` `sns` |
+| Platform | `discord` `slack` `telegram` `line` |
+| DB Type | `sqlite` `postgres` |
+| JP Intent | `サーバー` `認証` `ログイン` `会員` `CRUD` `管理` `データベース` `ボット` `テスト` `ページ` `メール` |
+| JP Entity | `ユーザー` `商品` `記事` `タスク` `注文` `コメント` `イベント` `問い合わせ` `通知` `カテゴリ` `掲示板` `決済` `予約` `社員` |
+| JP Composite | `管理システム` `やることリスト` `ブログ` `チャットアプリ` `ECサイト` `掲示板` |
+| NL Phrases | `"users can comment"` `"admin manage"` `"upload"` `"search"` `"notification"` `"deploy"` `"seed"` |
+| Fields | `"with name email age"` — auto-inferred types & validators |
+
+</details>
+
 ### REPL
 
 ```
 $ naide
-NAIDE REPL v1.11.0 — type NAIDE code, see JavaScript output
+NAIDE REPL v1.21.0 — type NAIDE code, see JavaScript output
 Type .exit to quit, .eval to toggle eval mode
 
 >>> str name = "hello"

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.20.0';
+const NAIDE_VERSION = '1.21.1';
 
 function crashReport(err, context = {}) {
   const info = [
@@ -114,6 +114,9 @@ const flags = {
   check: false,
   target: 'node',
   expand: false,
+  project: false,
+  write: null,
+  replace: false,
 };
 
 const files = [];
@@ -133,6 +136,9 @@ for (let i = 0; i < args.length; i++) {
     case '--check': flags.check = true; flags.run = false; break;
     case '--target': case '-t': flags.target = args[++i]; break;
     case '--expand': flags.expand = true; flags.run = false; break;
+    case '--project': case '-p': flags.project = true; break;
+    case '--write': flags.write = args[++i]; break;
+    case '--replace': flags.replace = true; break;
     default: files.push(arg);
   }
 }
@@ -142,25 +148,41 @@ if (files[0] === 'gen' || files[0] === '~~') {
   const instruction = files.slice(1).join(' ');
   if (!instruction) {
     console.log(`
-  NAIDE Code Generator (~~)
+  NAIDE Agent Coder (~~)
 
   Usage:
     naide ~~ "REST API for users with auth"
     naide gen "todo app with database"
-    naide gen "Discord bot with hello command"
+    naide gen "users and products and orders with auth"
+    naide ~~ "ECサイト" --project
 
-  Generates valid NAIDE code from natural language instructions.
-  No AI, no network — pure pattern matching with self-healing validation.
+  Autonomous code generator with analysis, multi-entity support,
+  relationship detection, and full auth routes. No AI, no network.
 
   Examples:
     naide ~~ "REST API for products with name price stock"
-    naide ~~ "blog app with auth and database"
+    naide ~~ "users and products with auth"            # multi-entity
+    naide ~~ "SNS app"                                 # User+Post+Comment
+    naide ~~ "ECサイト"                                 # User+Product+Order
+    naide ~~ "予約システム"                              # User+Reservation
     naide ~~ "Discord bot with hello and help commands"
-    naide ~~ "CLI tool"
-    naide ~~ "chat app with websocket"
-    naide ~~ "user management fullstack app"
-    naide ~~ "ユーザー管理APIを認証付きで"
-    naide ~~ "掲示板アプリ"
+    naide ~~ "ユーザーと商品と注文の管理APIを認証付きで"   # JP multi-entity
+
+  Project Mode (--project):
+    naide ~~ "e-commerce app with auth" --project
+    # Creates: app.naide, package.json, .env, .gitignore,
+    #          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
+    naide ~~ "add websocket" --write app.naide # explicit --write
+    naide ~~ "REST API" --write app.naide --replace  # overwrite file
 
   In .naide files:
     ~~ "REST API for users with auth"
@@ -170,15 +192,18 @@ if (files[0] === 'gen' || files[0] === '~~') {
     naide --expand app.naide     Show ~~ expansion results
 
   API:
-    import { generate } from 'naider';
-    const result = generate("REST API for users");
-    console.log(result.code);
+    import { generate, generateProject, writeToFile } from 'naider';
+    const result = generate("users and products with auth");
+    console.log(result.analysis);  // agent analysis
+    console.log(result.entities);  // ['User', 'Product']
+    writeToFile("app.naide", "add auth");  // merge into file
 
   ── Keyword Cheat Sheet ──────────────────────────────────────
 
   Intent     server, api, rest, bot, cli, page, test, database,
              ai, crud, auth, websocket, mail, graphql
-  Composite  todo, blog, chat, shop, fullstack, board
+  Composite  todo, blog, chat, shop, fullstack, board,
+             crm, inventory, booking, sns
   Platform   discord, slack, telegram, line
   DB Type    sqlite, postgres
   JP Intent  サーバー, 認証, ログイン, 会員, CRUD, 管理, データベース,
@@ -187,25 +212,130 @@ if (files[0] === 'gen' || files[0] === '~~') {
              問い合わせ, 通知, カテゴリ, プロジェクト, 掲示板, 決済
   Fields     "with name email age" — auto-inferred types & validators
   Field Alias  e-mail→email, pwd→password, tel→phone, desc→description
+  Relations  Auto-detected: User→Post, User→Order, Product→Order, etc.
 
   ────────────────────────────────────────────────────────────
 `);
     process.exit(0);
   }
 
-  const { generate } = 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];
+  if (targetFile || flags.write) {
+    const file = flags.write || targetFile;
+    const cleanInstruction = targetFile ? instruction.replace(/\s+\S+\.(?:naide|nx)$/, '') : instruction;
+    const mode = flags.replace ? 'replace' : 'append';
+    const result = writeToFile(resolve(file), cleanInstruction, { mode });
+    const a = result.analysis;
+    process.stderr.write('\n  ── NAIDE Agent ──────────────────────────────────────────\n');
+    process.stderr.write(`  Input:    "${a.instruction}"\n`);
+    process.stderr.write(`  Action:   ${result.action} → ${file}\n`);
+    if (a.entities.length > 0) {
+      process.stderr.write(`  Entities: ${a.entities.map(e => `${e.name} (${e.fieldCount} fields)`).join(', ')}\n`);
+    }
+    process.stderr.write('  ────────────────────────────────────────────────────────\n\n');
+    console.log(result.code);
+    process.stderr.write(`  ── ${result.action}: ${file} (valid: ${result.valid}) ──\n`);
+    process.exit(0);
+  }
+
+  // Project mode: generate or update project directory
+  if (flags.project) {
+    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);
+    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(finalDir, f.path);
+      writeFileSync(fp, f.content, 'utf-8');
+    }
+    const a = result.analysis;
+    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 && 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 ${isUpdate ? 'updated' : 'created'}: ${dir}/`);
+    for (const f of result.files) console.log(`    ${f.path}`);
+    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);
+  }
+
   const result = generate(instruction);
 
   if (flags.output) {
     writeFileSync(flags.output, result.code, 'utf-8');
     console.log(`  Generated: ${flags.output} (${result.intents.join(' + ')})`);
   } else {
+    // Agent-style analysis header
+    const a = result.analysis;
+    process.stderr.write('\n  ── NAIDE Agent ──────────────────────────────────────────\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) {
+      for (const r of a.relationships) {
+        process.stderr.write(`  Relation: ${r.parent} 1→N ${r.child} (${r.fk})\n`);
+      }
+    }
+    process.stderr.write(`  Plan:\n`);
+    for (const step of a.plan) {
+      process.stderr.write(`    + ${step}\n`);
+    }
+    process.stderr.write('  ────────────────────────────────────────────────────────\n\n');
+
     console.log(result.code);
+
     const meta = [`[${result.intents.join(' + ')}]`];
-    if (result.schema) meta.push(`→ ${result.schema}`);
+    if (result.entities && result.entities.length > 1) {
+      meta.push(`→ ${result.entities.join(', ')}`);
+    } else if (result.schema) {
+      meta.push(`→ ${result.schema}`);
+    }
     meta.push(`valid: ${result.valid}`);
     if (result.fixed) meta.push('(auto-fixed)');
-    process.stderr.write(`\n  ── gen ~~ ${meta.join(' ')} ──\n`);
+    process.stderr.write(`  ── gen ~~ ${meta.join(' ')} ──\n`);
     if (result.repairs.length > 0) {
       process.stderr.write('  Repairs:\n');
       for (const r of result.repairs) process.stderr.write(`    - ${r}\n`);

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.20.0' }
+        serverInfo: { name: 'naide-mcp', version: '1.21.1' }
       });
       break;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naider",
-  "version": "1.20.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": {