db-model-router 1.0.13 → 1.0.15

package/README.md

@@ -394,6 +394,7 @@ Generate models, routes, tests, OpenAPI spec, and LLM docs from a schema file. A
 | Flag / Arg               | Description                                       |
 | ------------------------ | ------------------------------------------------- |
 | `--from <path>`          | Path to schema file (default: `dbmr.schema.json`) |
+| `--output <dir>`         | Directory for generated files (default: cwd)      |
 | `--models=false`         | Disable model file generation                     |
 | `--routes=false`         | Disable route file generation                     |
 | `--openapi=false`        | Disable OpenAPI spec generation                   |
@@ -424,6 +425,7 @@ db-model-router generate --tests=false --dry-run       # skip tests
 db-model-router generate --saas-structure=false        # skip SaaS generation
 db-model-router generate --openapi=false --tests=false # skip OpenAPI and tests
 db-model-router generate --from dbmr.schema.json --json
+db-model-router generate --from dbmr.schema.json --output ./backend
 ```
 
 #### `doctor`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db-model-router",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Generative API Creation using mysql2 and express libraries in node js",
   "main": "src/index.js",
   "bin": {

package/skill/SKILL.md

@@ -270,7 +270,7 @@ db-model-router inspect --type postgres --env .env [--out schema.json] [--tables
 ### `generate` — Generate code from schema
 
 ```bash
-db-model-router generate --from dbmr.schema.json [--models=false] [--routes=false] [--openapi=false] [--tests=false] [--migrations=false] [--saas-structure=false]
+db-model-router generate --from dbmr.schema.json [--output <dir>] [--models=false] [--routes=false] [--openapi=false] [--tests=false] [--migrations=false] [--saas-structure=false]
 ```
 
 All artifact types are **enabled by default**. Use `--flag=false` to disable specific ones.

package/src/cli/commands/doctor.js

@@ -6,6 +6,7 @@ const { parseSchema } = require("../../schema/schema-parser");
 const { SchemaValidationError } = require("../../schema/schema-validator");
 const { schemaToModelMeta } = require("../../schema/schema-to-meta");
 const { computeDiff } = require("../diff-engine");
+const { generateSaasStructure } = require("../generate-saas-structure");
 
 /**
  * Adapter-to-driver mapping.
@@ -111,13 +112,53 @@ async function doctor(args, flags, ctx) {
 
   if (schema) {
     const meta = schemaToModelMeta(schema);
-    const relationships = schema.relationships || [];
-    const diff = computeDiff(baseDir, meta, relationships);
+
+    // Derive route relationships from parent fields (same logic as generate)
+    const routeRelationships = [];
+    for (const [tableName, tableDef] of Object.entries(schema.tables || {})) {
+      if (tableDef.parent) {
+        const parentTable = schema.tables[tableDef.parent];
+        if (parentTable) {
+          routeRelationships.push({
+            parent: tableDef.parent,
+            child: tableName,
+            foreignKey: parentTable.pk,
+          });
+        }
+      }
+    }
+
+    const tableNames = meta.map((m) => m.table).sort();
+
+    // Detect whether OpenAPI docs were generated
+    const includeDocs = fs.existsSync(path.join(baseDir, "openapi.json"));
+
+    // Detect whether SaaS structure was generated
+    const saasFiles = [];
+    if (fs.existsSync(path.join(baseDir, "routes", "auth", "index.js"))) {
+      const adapter = schema.adapter;
+      saasFiles.push(
+        ...generateSaasStructure(adapter, {
+          tableNames,
+          relationships: routeRelationships,
+          routeOptions: { includeDocs },
+        }),
+      );
+    }
+
+    const diffOptions = { includeDocs, saasFiles };
+    const diff = computeDiff(baseDir, meta, routeRelationships, diffOptions);
+
+    // Filter out known init-scaffold files that doctor should ignore
+    const initWhitelist = new Set(["routes/health.js"]);
+    const filteredDeleted = diff.deleted.filter(
+      (f) => !initWhitelist.has(f),
+    );
 
     if (
       diff.added.length > 0 ||
       diff.modified.length > 0 ||
-      diff.deleted.length > 0
+      filteredDeleted.length > 0
     ) {
       sync.ok = false;
       for (const f of diff.added) {
@@ -126,7 +167,7 @@ async function doctor(args, flags, ctx) {
       for (const m of diff.modified) {
         sync.outOfSync.push({ file: m.file, status: "modified" });
       }
-      for (const f of diff.deleted) {
+      for (const f of filteredDeleted) {
         sync.outOfSync.push({ file: f, status: "extra" });
       }
     }

package/src/cli/commands/generate.js

@@ -156,7 +156,7 @@ async function generate(args, flags, ctx) {
     genSaas = args["saas-structure"] !== false;
   }
 
-  const baseDir = process.cwd();
+  const baseDir = path.resolve(args.output || process.cwd());
 
   // Collect all planned files: { relPath, content }
   const planned = [];
@@ -338,6 +338,7 @@ async function generate(args, flags, ctx) {
       tableNames,
       relationships: routeRelationships,
       routeOptions: { includeDocs: genOpenapi },
+      baseDir,
     });
 
     // The SaaS generator produces a combined routes/index.js that includes

package/src/cli/commands/init.js

@@ -11,6 +11,7 @@ const {
   ensurePackageJson,
 } = require("../init");
 const { promptUser } = require("../init/prompt");
+const generateCmd = require("./generate");
 
 /**
  * Default answers used when --yes is provided and no schema is available.
@@ -86,6 +87,12 @@ async function init(args, flags, ctx) {
       for (const f of planned) {
         ctx.log(`  ${f}`);
       }
+    }
+    // Also preview schema-generated artifacts when --from is used
+    if (args.from) {
+      await generateCmd(args, flags, ctx);
+    }
+    if (!flags.json) {
       ctx.log("\nNo files were written.");
     }
     return;
@@ -106,6 +113,12 @@ async function init(args, flags, ctx) {
     runInstall();
   }
 
+  // When --from points to a schema, also generate models, routes, tests, etc.
+  if (args.from) {
+    await generateCmd(args, flags, ctx);
+    if (process.exitCode) return; // bail if generate reported an error
+  }
+
   // Output
   const allFiles = [
     ...generated.files,

package/src/cli/diff-engine.js

@@ -49,7 +49,8 @@ function lineDiff(expected, actual) {
  * @param {Array<{parent, child, foreignKey}>} relationships
  * @returns {Map<string, string>}
  */
-function buildExpectedFiles(meta, relationships) {
+function buildExpectedFiles(meta, relationships, options = {}) {
+  const { includeDocs = true, saasFiles = [] } = options;
   const expected = new Map();
   const tableNames = meta.map((m) => m.table).sort();
 
@@ -114,14 +115,16 @@ function buildExpectedFiles(meta, relationships) {
     }
   }
 
-  // Routes index file (with docs route)
+  // Routes index file
   expected.set(
     "routes/index.js",
-    generateRoutesIndexFile(tableNames, relationships, { includeDocs: true }),
+    generateRoutesIndexFile(tableNames, relationships, { includeDocs }),
   );
 
   // Docs route (Swagger UI)
-  expected.set("routes/docs.js", generateDocsRoute());
+  if (includeDocs) {
+    expected.set("routes/docs.js", generateDocsRoute());
+  }
 
   // Test files at correct nested paths
   for (const m of meta) {
@@ -154,6 +157,11 @@ function buildExpectedFiles(meta, relationships) {
       "\n",
   );
 
+  // Merge SaaS expected files last so they overwrite schema files where needed
+  for (const entry of saasFiles) {
+    expected.set(entry.relPath, entry.content);
+  }
+
   return expected;
 }
 
@@ -220,8 +228,8 @@ function scanDiskFiles(baseDir) {
  * @param {Array<{parent, child, foreignKey}>} relationships
  * @returns {{ added: string[], modified: Array<{file: string, diff: string}>, deleted: string[] }}
  */
-function computeDiff(baseDir, meta, relationships) {
-  const expected = buildExpectedFiles(meta, relationships);
+function computeDiff(baseDir, meta, relationships, options = {}) {
+  const expected = buildExpectedFiles(meta, relationships, options);
   const diskFiles = scanDiskFiles(baseDir);
 
   const added = [];

package/src/cli/generate-saas-structure.js

@@ -29,8 +29,8 @@ const { generateSaasTests } = require("./saas/generate-saas-tests");
  *
  * @returns {string} Updated .gitignore content
  */
-function getGitignoreContent() {
-  const gitignorePath = path.join(process.cwd(), ".gitignore");
+function getGitignoreContent(baseDir) {
+  const gitignorePath = path.join(baseDir || process.cwd(), ".gitignore");
   let content = "";
   if (fs.existsSync(gitignorePath)) {
     content = fs.readFileSync(gitignorePath, "utf8");
@@ -121,7 +121,7 @@ function generateSaasStructure(adapter, options) {
   }
 
   // 8. .gitignore update (add credentials.md)
-  planned.push({ relPath: ".gitignore", content: getGitignoreContent() });
+  planned.push({ relPath: ".gitignore", content: getGitignoreContent(opts.baseDir) });
 
   return planned;
 }

package/src/cli/init.js

@@ -239,14 +239,17 @@ function updatePackageJson(answers, outputDir) {
   const { dependencies, devDependencies } = collectDependencies(answers);
   const scripts = getScripts(outputDir);
 
+  const normalizedOutput = outputDir ? outputDir.replace(/\/+$/, "") : "";
+  const importPrefix = normalizedOutput ? `./${normalizedOutput}/` : "./";
+
   pkg.type = "module";
   pkg.imports = {
     "#root/*.js": "./*.js",
-    "#models": "./models/index.js",
-    "#models/*.js": "./models/*.js",
-    "#routes/*.js": "./routes/*.js",
-    "#commons/*.js": "./commons/*.js",
-    "#middleware/*.js": "./middleware/*.js",
+    "#models": `${importPrefix}models/index.js`,
+    "#models/*.js": `${importPrefix}models/*.js`,
+    "#routes/*.js": `${importPrefix}routes/*.js`,
+    "#commons/*.js": `${importPrefix}commons/*.js`,
+    "#middleware/*.js": `${importPrefix}middleware/*.js`,
   };
   pkg.scripts = Object.assign({}, pkg.scripts || {}, scripts);
   pkg.dependencies = Object.assign({}, pkg.dependencies || {}, dependencies);

package/src/cli/main.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 "use strict";
 
 const { parseFlags, OutputContext } = require("./flags");
@@ -63,6 +63,7 @@ const COMMAND_FLAGS = {
   ],
   generate: [
     ["--from <path>", "Schema file (default: dbmr.schema.json)"],
+    ["--output <dir>", "Directory for generated files (default: cwd)"],
     ["--models", "Generate only model files"],
     ["--routes", "Generate only route files"],
     ["--openapi", "Generate only OpenAPI spec"],

package/src/postgres/db.js

@@ -304,8 +304,9 @@ function where(filter, safeDelete = null) {
           ),
         );
       } else if (j[1] === "like" || j[1] === "not like") {
+        const pgOp = j[1] === "like" ? "ILIKE" : "NOT ILIKE";
         bindIdx++;
-        conditionAnd.push(`${escapeId(j[0])} ${j[1]} $${bindIdx}`);
+        conditionAnd.push(`${escapeId(j[0])} ${pgOp} $${bindIdx}`);
         value.push("%" + j[2] + "%");
       } else {
         bindIdx++;