@mostajs/orm-cli 0.4.3 → 0.4.5

package/bin/install-bridge.mjs

@@ -30,11 +30,13 @@ const argv = process.argv.slice(2);
 const flag = (name) => argv.includes(`--${name}`);
 const val  = (name) => { const i = argv.indexOf(`--${name}`); return i >= 0 ? argv[i + 1] : null; };
 
-const APPLY    = flag('apply');
-const RESTORE  = flag('restore');
-const ONE_FILE = val('file');
-const ROOT     = resolve(val('project') ?? process.cwd());
-const QUIET    = flag('quiet');
+const APPLY          = flag('apply');
+const RESTORE        = flag('restore');
+const RESTORE_SEEDS  = flag('restore-seeds');      // NEW : restore only seed-like .prisma.bak files
+const ONE_FILE       = val('file');
+const ROOT           = resolve(val('project') ?? process.cwd());
+const QUIET          = flag('quiet');
+const REWRITE_SEEDS  = flag('rewrite-seeds');      // NEW : force rewriting seed scripts (legacy behavior)
 
 const log = (...a) => { if (!QUIET) console.log(...a); };
 const c   = { cyan: s => `\x1b[36m${s}\x1b[0m`, yellow: s => `\x1b[33m${s}\x1b[0m`, green: s => `\x1b[32m${s}\x1b[0m`, red: s => `\x1b[31m${s}\x1b[0m`, bold: s => `\x1b[1m${s}\x1b[0m`, dim: s => `\x1b[2m${s}\x1b[0m` };
@@ -43,6 +45,17 @@ const c   = { cyan: s => `\x1b[36m${s}\x1b[0m`, yellow: s => `\x1b[33m${s}\x1b[0
 const SKIP_DIRS = new Set(['node_modules', '.next', '.svelte-kit', 'dist', 'build', '.turbo', '.vercel', '.cache', 'coverage', '.git', '.vscode', '.idea']);
 const EXTENSIONS = new Set(['.ts', '.tsx', '.mts', '.js', '.jsx', '.mjs']);
 
+// Paths that look like seed SCRIPTS (not db modules). These must NOT be
+// rewritten — their `new PrismaClient()` is a local instance scoped to the
+// script, not a reusable export. Rewriting them turns the script into a
+// 2-line stub and destroys the seed logic.
+//
+// Heuristic : last path segment starts with `seed` or `seeder`, OR file sits
+// inside a `seeds/` or `fixtures/` directory, OR the path is Prisma's
+// canonical `prisma/seed.(ts|js)`.
+const RX_SEED_PATH = /(^|[\\\/])(seeds?|fixtures|seeders?)[\\\/]|(^|[\\\/])(seed[^\\\/]*|seeder[^\\\/]*)\.(ts|tsx|mts|js|jsx|mjs)$|(^|[\\\/])prisma[\\\/]seed\.(ts|tsx|mts|js|jsx|mjs)$/i;
+function looksLikeSeedScript(relPath) { return RX_SEED_PATH.test(relPath); }
+
 function* walk(dir) {
   let entries;
   try { entries = readdirSync(dir); } catch { return; }
@@ -52,7 +65,8 @@ function* walk(dir) {
     let st;
     try { st = statSync(p); } catch { continue; }
     if (st.isDirectory()) yield* walk(p);
-    else if (EXTENSIONS.has(extname(name))) yield p;
+    // Source files we might rewrite, OR .prisma.bak we might restore.
+    else if (EXTENSIONS.has(extname(name)) || name.endsWith('.prisma.bak')) yield p;
   }
 }
 
@@ -113,16 +127,18 @@ function buildReplacement(shape) {
 }
 
 // ---------- Restore ----------
-function restoreBackups() {
+function restoreBackups({ onlySeeds = false } = {}) {
   const restored = [];
   for (const p of walk(ROOT)) {
     if (!p.endsWith('.prisma.bak')) continue;
     const original = p.slice(0, -'.prisma.bak'.length);
+    const rel = relative(ROOT, original);
+    if (onlySeeds && !looksLikeSeedScript(rel)) continue;
     if (APPLY) {
       renameSync(p, original);
-      log(`  ${c.green('✓')} restored ${c.dim(relative(ROOT, original))}`);
+      log(`  ${c.green('✓')} restored ${c.dim(rel)}`);
     } else {
-      log(`  ${c.yellow('•')} would restore ${c.dim(relative(ROOT, original))}`);
+      log(`  ${c.yellow('•')} would restore ${c.dim(rel)}`);
     }
     restored.push(original);
   }
@@ -130,6 +146,12 @@ function restoreBackups() {
 }
 
 // ---------- Main ----------
+if (RESTORE_SEEDS) {
+  log(c.bold('▶ Restoring seed-looking .prisma.bak files only' + (APPLY ? '' : c.yellow(' (dry-run, use --apply)'))));
+  const r = restoreBackups({ onlySeeds: true });
+  log(`\n${r.length} seed file(s) ${APPLY ? 'restored' : 'would be restored'}`);
+  process.exit(0);
+}
 if (RESTORE) {
   log(c.bold('▶ Restoring .prisma.bak files' + (APPLY ? '' : c.yellow(' (dry-run, use --apply)'))));
   const r = restoreBackups();
@@ -141,6 +163,7 @@ log(c.bold(`▶ mostajs install-bridge — scanning ${c.cyan(ROOT)}`));
 log('');
 
 const candidates = [];
+const skippedSeeds = [];
 const iter = ONE_FILE ? [resolve(ROOT, ONE_FILE)] : walk(ROOT);
 for (const p of iter) {
   let src;
@@ -151,12 +174,18 @@ for (const p of iter) {
     continue;
   }
   if (!RX_NEW.test(src)) continue;  // imports only = not an instantiation site
+  const rel = relative(ROOT, p);
+  if (looksLikeSeedScript(rel) && !REWRITE_SEEDS) {
+    skippedSeeds.push(rel);
+    log(`  ${c.yellow('⚠ skip seed script')} ${c.dim(rel)}`);
+    continue;
+  }
   const shape = detectExportShape(src);
   if (!shape) {
-    log(`  ${c.yellow('?')} ${relative(ROOT, p)} — PrismaClient detected but export shape unknown, skipping`);
+    log(`  ${c.yellow('?')} ${rel} — PrismaClient detected but export shape unknown, skipping`);
     continue;
   }
-  candidates.push({ path: p, rel: relative(ROOT, p), shape, src });
+  candidates.push({ path: p, rel, shape, src });
 }
 
 if (candidates.length === 0) {
@@ -171,6 +200,13 @@ log(c.bold(`Found ${candidates.length} PrismaClient instantiation site(s):`));
 for (const ca of candidates) {
   log(`  ${c.green('→')} ${ca.rel}  ${c.dim(`(${ca.shape.kind}${ca.shape.name ? ' ' + ca.shape.name : ''})`)}`);
 }
+if (skippedSeeds.length) {
+  log('');
+  log(c.yellow(`${skippedSeeds.length} seed script(s) were skipped (preserved as-is).`));
+  log(c.dim('  These files keep their original content. To run them with the bridge,'));
+  log(c.dim('  either:  (a) re-link @prisma/client,  (b) rewrite them with --rewrite-seeds,'));
+  log(c.dim('           (c) use the mostajs seed system (menu S) with JSON fixtures.'));
+}
 log('');
 
 if (!APPLY) {
@@ -201,4 +237,5 @@ log(`  2. ${c.cyan('npx @mostajs/orm-cli')}  →  menu 1 (Convert Prisma → ent
 log(`  3. Set ${c.cyan('DB_DIALECT')} + ${c.cyan('SGBD_URI')} in .env (or: menu 2 → i to import)`);
 log(`  4. ${c.cyan('npm run dev')}  and test.`);
 log('');
-log(`To undo : ${c.cyan('mostajs install-bridge --restore --apply')}`);
+log(`To undo all         : ${c.cyan('mostajs install-bridge --restore --apply')}`);
+log(`To restore seeds    : ${c.cyan('mostajs install-bridge --restore-seeds --apply')}`);

package/bin/mostajs.sh

@@ -1653,6 +1653,9 @@ menu_seeding() {
   echo -e "  ${CYAN}8${RESET}) Clear the seeds directory"
   echo -e "  ${CYAN}9${RESET}) Show a seed file"
   echo -e "  ${CYAN}h${RESET}) ${BOLD}Hash plain-text passwords in seed files${RESET} (bcrypt)"
+  echo -e "  ${CYAN}r${RESET}) ${BOLD}Restore seed scripts${RESET} from ${DIM}*.prisma.bak${RESET} (undo install-bridge on seeds)"
+  echo -e "  ${CYAN}s${RESET}) ${BOLD}Run seed scripts${RESET} (${DIM}scripts/seed-*.ts | prisma/seed.ts${RESET}) via tsx"
+  echo -e "  ${RED}d${RESET}) ${BOLD}Drop table(s)${RESET} — pick one / many / all, then DROP TABLE (DESTRUCTIVE)"
   echo
   echo -e "  ${CYAN}b${RESET}) Back"
   echo
@@ -1669,12 +1672,187 @@ menu_seeding() {
     8) action_seed_clear ;;
     9) action_seed_show ;;
     h|H) action_seed_hash_passwords ;;
+    r|R) action_seed_restore_scripts ;;
+    s|S) action_seed_run_scripts ;;
+    d|D) action_drop_tables ;;
     b|B) return ;;
     *) warn "Unknown"; pause ;;
   esac
   menu_seeding
 }
 
+# ------------------------------------------------------------
+# seed : drop tables (interactive picker)
+# ------------------------------------------------------------
+action_drop_tables() {
+  header
+  echo -e "${BOLD}${RED}▶ Drop table(s) — DESTRUCTIVE${RESET}"
+  echo
+  load_env
+  local seed_dir="$CONFIG_DIR/seeds"
+  local entities_json="$GENERATED_DIR/entities.json"
+  if [[ ! -f "$entities_json" ]]; then
+    warn "No entities.json found at $entities_json — run menu 1 (Convert) first."
+    pause; return
+  fi
+
+  # Run a Node helper that lists live tables, lets the user pick, then drops via dialect
+  node --input-type=module -e "
+    import { readFileSync } from 'node:fs';
+    import { createInterface } from 'node:readline/promises';
+    import { stdin, stdout } from 'node:process';
+    import { getDialect } from '${PROJECT_ROOT}/node_modules/@mostajs/orm/dist/index.js';
+
+    const env = readFileSync('${PROJECT_ROOT}/.mostajs/config.env', 'utf8');
+    for (const line of env.split('\n')) {
+      const [k, v] = line.split('=');
+      if (k && v) process.env[k.trim()] = v.trim();
+    }
+
+    const entities = JSON.parse(readFileSync('${PROJECT_ROOT}/.mostajs/generated/entities.json', 'utf8'));
+    const tableSet = new Set(entities.map(e => e.collection));
+    // Add junction tables (many-to-many.through)
+    for (const e of entities) {
+      for (const r of Object.values(e.relations || {})) {
+        if (r && r.type === 'many-to-many' && r.through) tableSet.add(r.through);
+      }
+    }
+
+    const d = await getDialect({
+      dialect: process.env.DB_DIALECT,
+      uri:     process.env.SGBD_URI,
+      schemaStrategy: 'none',
+    });
+
+    // Try to list live tables (dialects that expose getTableListQuery via internal call)
+    let live = [];
+    try {
+      const sql = d.getTableListQuery && d.getTableListQuery();
+      if (sql) {
+        const rows = await d.executeQuery(sql, []);
+        live = rows.map(r => r.name || r.TABLE_NAME || r.table_name || Object.values(r)[0]).filter(Boolean);
+      }
+    } catch {}
+    // Intersect with schema-known tables (only show ones we own)
+    const owned = (live.length ? live : Array.from(tableSet)).filter(t => tableSet.has(t)).sort();
+
+    if (owned.length === 0) {
+      console.log('  No tables found that match this project\'s entities.');
+      await d.disconnect();
+      process.exit(0);
+    }
+
+    console.log('  Live tables in this project :');
+    owned.forEach((t, i) => console.log('    ' + (i + 1).toString().padStart(2) + ') ' + t));
+    console.log('    a) ALL of the above');
+    console.log('    q) Cancel');
+
+    const rl = createInterface({ input: stdin, output: stdout });
+    const pick = (await rl.question('  Pick (number, comma-separated, or a) : ')).trim();
+    if (!pick || pick.toLowerCase() === 'q') { rl.close(); await d.disconnect(); console.log('  Cancelled.'); process.exit(0); }
+
+    const targets = pick.toLowerCase() === 'a'
+      ? owned
+      : pick.split(',').map(s => s.trim()).map(s => owned[parseInt(s, 10) - 1]).filter(Boolean);
+
+    if (targets.length === 0) { rl.close(); await d.disconnect(); console.log('  Nothing to drop.'); process.exit(0); }
+
+    console.log('  About to DROP : ' + targets.join(', '));
+    const confirm = (await rl.question('  Type DROP to confirm : ')).trim();
+    rl.close();
+    if (confirm !== 'DROP') { await d.disconnect(); console.log('  Aborted.'); process.exit(0); }
+
+    let ok = 0, fail = 0;
+    for (const t of targets) {
+      try {
+        await d.dropTable(t);
+        console.log('  ✓ dropped ' + t);
+        ok++;
+      } catch (e) {
+        console.error('  ✗ ' + t + ' : ' + (e.message ?? e));
+        fail++;
+      }
+    }
+    await d.disconnect();
+    console.log('\nDropped : ' + ok + ' · failed : ' + fail);
+  " 2>&1
+  echo
+  pause
+}
+
+# ------------------------------------------------------------
+# seed : restore TS seed scripts from .prisma.bak (undo install-bridge)
+# ------------------------------------------------------------
+action_seed_restore_scripts() {
+  header
+  echo -e "${BOLD}${MAGENTA}▶ Restore seed scripts from *.prisma.bak${RESET}"
+  echo
+  echo -e "  ${DIM}Scans for seed-like .prisma.bak files that were rewritten by install-bridge${RESET}"
+  echo -e "  ${DIM}and moves each backup back to its original filename.${RESET}"
+  echo
+  local cli_dir
+  cli_dir="$(cd "$(dirname "$0")/.." && pwd)"
+  echo -e "${DIM}\$ node install-bridge.mjs --restore-seeds --project \"$PROJECT_ROOT\"${RESET}"
+  node "$cli_dir/bin/install-bridge.mjs" --restore-seeds --project "$PROJECT_ROOT"
+  echo
+  if confirm "Apply the restoration above?"; then
+    node "$cli_dir/bin/install-bridge.mjs" --restore-seeds --apply --project "$PROJECT_ROOT"
+  else
+    dim "  Skipped."
+  fi
+  pause
+}
+
+# ------------------------------------------------------------
+# seed : run TS seed scripts via tsx (or node --loader ts-node)
+# ------------------------------------------------------------
+action_seed_run_scripts() {
+  header
+  echo -e "${BOLD}${MAGENTA}▶ Run seed scripts${RESET}"
+  echo
+  # Candidate scripts : prisma/seed.ts, scripts/seed*.{ts,js}, scripts/seed.ts
+  local -a candidates=()
+  [[ -f "$PROJECT_ROOT/prisma/seed.ts" ]] && candidates+=("$PROJECT_ROOT/prisma/seed.ts")
+  [[ -f "$PROJECT_ROOT/prisma/seed.js" ]] && candidates+=("$PROJECT_ROOT/prisma/seed.js")
+  if [[ -d "$PROJECT_ROOT/scripts" ]]; then
+    while IFS= read -r f; do candidates+=("$f"); done < <(
+      find "$PROJECT_ROOT/scripts" -maxdepth 2 \( -name 'seed-*.ts' -o -name 'seed-*.js' -o -name 'seed.ts' -o -name 'seed.js' \) 2>/dev/null | sort
+    )
+  fi
+  if [[ ${#candidates[@]} -eq 0 ]]; then
+    warn "No seed scripts found under prisma/ or scripts/."
+    dim "  Expected : prisma/seed.ts | scripts/seed.ts | scripts/seed-*.ts (or .js)"
+    pause
+    return
+  fi
+  echo -e "  Found ${CYAN}${#candidates[@]}${RESET} seed script(s):"
+  local i=1
+  for f in "${candidates[@]}"; do
+    echo -e "    ${CYAN}$i${RESET}) ${f#$PROJECT_ROOT/}"
+    ((i++))
+  done
+  echo -e "    ${CYAN}a${RESET}) Run ALL sequentially"
+  echo
+  local pick
+  pick=$(ask "Choice" "a")
+  local runner="npx --yes tsx"
+  command -v tsx >/dev/null && runner="tsx"
+  if [[ "$pick" == "a" || "$pick" == "A" ]]; then
+    for f in "${candidates[@]}"; do
+      echo -e "${CYAN}▶ ${runner} ${f#$PROJECT_ROOT/}${RESET}"
+      (cd "$PROJECT_ROOT" && $runner "$f") || { warn "Script failed: $f"; pause; return; }
+    done
+    ok "All seed scripts ran successfully."
+  elif [[ "$pick" =~ ^[0-9]+$ ]] && (( pick >= 1 && pick <= ${#candidates[@]} )); then
+    local f="${candidates[$((pick-1))]}"
+    echo -e "${CYAN}▶ ${runner} ${f#$PROJECT_ROOT/}${RESET}"
+    (cd "$PROJECT_ROOT" && $runner "$f") && ok "Done." || warn "Script failed."
+  else
+    warn "Unknown choice"
+  fi
+  pause
+}
+
 # ------------------------------------------------------------
 # seed : hash plain-text passwords
 # ------------------------------------------------------------
@@ -1995,6 +2173,15 @@ function validateRow(row, entity) {
   const errors = [];
   const fieldNames = new Set(Object.keys(entity.fields ?? {}));
   const relationNames = new Set(Object.keys(entity.relations ?? {}));
+  // FK columns generated by relations (many-to-one / one-to-one joinColumn, plus
+  // the conventional <relName>Id fallback). These appear in seed JSONs as direct
+  // FK values ("userId": "user-admin") and must NOT be flagged as "unknown field".
+  const relationFkColumns = new Set();
+  for (const [relName, rel] of Object.entries(entity.relations ?? {})) {
+    if (rel && (rel.type === 'many-to-one' || rel.type === 'one-to-one')) {
+      relationFkColumns.add(rel.joinColumn || (relName + 'Id'));
+    }
+  }
   // Required fields
   for (const [k, def] of Object.entries(entity.fields ?? {})) {
     if (def.required && (row[k] === undefined || row[k] === null)) {
@@ -2017,7 +2204,7 @@ function validateRow(row, entity) {
   // Unknown fields (warn-level)
   const warnings = [];
   for (const k of Object.keys(row)) {
-    if (!fieldNames.has(k) && !relationNames.has(k) && k !== 'id' && k !== '_id') {
+    if (!fieldNames.has(k) && !relationNames.has(k) && !relationFkColumns.has(k) && k !== 'id' && k !== '_id') {
       warnings.push('unknown field "' + k + '" (not in schema)');
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/orm-cli",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Universal CLI to integrate @mostajs/orm into any project — one-shot `mostajs bootstrap` migrates a Prisma project (codemod + deps + schema convert + DDL) to 13 databases with zero code change.",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "AGPL-3.0-or-later",