db-model-router 1.0.2 → 1.0.3

package/docs/adapters/cockroachdb.md

@@ -46,4 +46,4 @@ CREATE TABLE users (
 );
 ```
 
-[← Back to main docs](../README.md)
+[← Back to main docs](../../README.md)

package/docs/adapters/dynamodb.md

@@ -50,4 +50,4 @@ aws dynamodb create-table \
   --endpoint-url http://localhost:8000
 ```
 
-[← Back to main docs](../README.md)
+[← Back to main docs](../../README.md)

package/docs/adapters/mongodb.md

@@ -53,4 +53,4 @@ const users = model(
 );
 ```
 
-[← Back to main docs](../README.md)
+[← Back to main docs](../../README.md)

package/docs/adapters/mssql.md

@@ -52,4 +52,4 @@ CREATE TABLE users (
 );
 ```
 
-[← Back to main docs](../README.md)
+[← Back to main docs](../../README.md)

package/docs/adapters/oracle.md

@@ -49,4 +49,4 @@ CREATE TABLE users (
 );
 ```
 
-[← Back to main docs](../README.md)
+[← Back to main docs](../../README.md)

package/docs/adapters/postgres.md

@@ -47,4 +47,4 @@ CREATE TABLE users (
 );
 ```
 
-[← Back to main docs](../README.md)
+[← Back to main docs](../../README.md)

package/docs/adapters/redis.md

@@ -50,4 +50,4 @@ const users = model(
 );
 ```
 
-[← Back to main docs](../README.md)
+[← Back to main docs](../../README.md)

package/docs/adapters/sqlite3.md

@@ -40,4 +40,4 @@ CREATE TABLE users (
 );
 ```
 
-[← Back to main docs](../README.md)
+[← Back to main docs](../../README.md)

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "db-model-router",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Generative API Creation using mysql2 and express libraries in node js",
   "main": "src/index.js",
   "bin": {
-    "db-model-router-generate-model": "src/cli/generate-model.js",
-    "db-model-router-generate-route": "src/cli/generate-route.js",
-    "db-model-router-generate-app": "src/cli/generate-app.js"
+    "db-model-router": "src/cli/main.js"
   },
   "scripts": {
     "dev": "nodemon src/serve.js",
@@ -43,6 +41,7 @@
   "homepage": "https://github.com/AvinashSKaranth/db-model-router#readme",
   "dependencies": {
     "dotenv": "^10.0.0",
+    "inquirer": "^8.2.6",
     "lodash": "^4.17.21",
     "node-input-validator": "^4.5.0"
   },
@@ -95,7 +94,6 @@
     }
   },
   "devDependencies": {
-    "better-sqlite3": "^12.9.0",
     "dotenv-cli": "^11.0.0",
     "express": "^4.21.0",
     "faker": "^5.5.3",

package/src/cli/commands/diff.js

@@ -0,0 +1,114 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const { parseSchema } = require("../../schema/schema-parser");
+const { SchemaValidationError } = require("../../schema/schema-validator");
+const { schemaToModelMeta } = require("../../schema/schema-to-meta");
+const { computeDiff } = require("../diff-engine");
+
+/**
+ * Diff command handler for the unified CLI.
+ *
+ * Compares the current generated files against what the schema would produce,
+ * reporting additions, modifications (with line diffs), and deletions.
+ * Does NOT modify any files on disk.
+ *
+ * Supported flags:
+ *   --from      Path to schema file (default: dbmr.schema.json)
+ *   --json      Output JSON result via ctx
+ *
+ * @param {object} args - Parsed key-value args
+ * @param {object} flags - Universal flags: { yes, json, dryRun, noInstall, help }
+ * @param {import('../flags').OutputContext} ctx - Output context
+ */
+async function diff(args, flags, ctx) {
+  const schemaFile = args.from || "dbmr.schema.json";
+  const schemaPath = path.resolve(schemaFile);
+  const baseDir = process.cwd();
+
+  // --- 1. Read and parse schema ---
+  if (!fs.existsSync(schemaPath)) {
+    const msg = `Schema file not found: ${schemaFile}`;
+    if (flags.json) {
+      ctx.result({ error: true, code: "SCHEMA_NOT_FOUND", message: msg });
+    } else {
+      ctx.log(`Error: ${msg}`);
+    }
+    process.exitCode = 1;
+    return;
+  }
+
+  let schema;
+  try {
+    const raw = fs.readFileSync(schemaPath, "utf8");
+    schema = parseSchema(raw);
+  } catch (err) {
+    const msg = `Schema parse error: ${err.message}`;
+    if (flags.json) {
+      ctx.result({
+        error: true,
+        code: "SCHEMA_VALIDATION",
+        message: msg,
+        errors: err.errors || [],
+      });
+    } else {
+      ctx.log(`Error: ${msg}`);
+    }
+    process.exitCode = 1;
+    return;
+  }
+
+  // --- 2. Compute diff ---
+  const meta = schemaToModelMeta(schema);
+  const relationships = schema.relationships || [];
+  const result = computeDiff(baseDir, meta, relationships);
+
+  // --- 3. Output results ---
+  if (flags.json) {
+    ctx.result({
+      added: result.added,
+      modified: result.modified,
+      deleted: result.deleted,
+    });
+  } else {
+    const total =
+      result.added.length + result.modified.length + result.deleted.length;
+
+    if (total === 0) {
+      ctx.log("All generated files are up to date.");
+      return;
+    }
+
+    if (result.added.length > 0) {
+      ctx.log("Added (new files to create):");
+      for (const f of result.added) {
+        ctx.log(`  + ${f}`);
+      }
+    }
+
+    if (result.modified.length > 0) {
+      ctx.log("Modified (files with changes):");
+      for (const m of result.modified) {
+        ctx.log(`  ~ ${m.file}`);
+        // Display line diffs indented
+        for (const line of m.diff.split("\n")) {
+          if (line) {
+            ctx.log(`    ${line}`);
+          }
+        }
+      }
+    }
+
+    if (result.deleted.length > 0) {
+      ctx.log("Deleted (extra files to remove):");
+      for (const f of result.deleted) {
+        ctx.log(`  - ${f}`);
+      }
+    }
+
+    ctx.log(`\n${total} file(s) differ.`);
+  }
+}
+
+module.exports = diff;

package/src/cli/commands/doctor.js

@@ -0,0 +1,181 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const { parseSchema } = require("../../schema/schema-parser");
+const { SchemaValidationError } = require("../../schema/schema-validator");
+const { schemaToModelMeta } = require("../../schema/schema-to-meta");
+const { computeDiff } = require("../diff-engine");
+
+/**
+ * Adapter-to-driver mapping.
+ * Maps each supported adapter to the npm package name required.
+ */
+const ADAPTER_DRIVER_MAP = {
+  mysql: "mysql2",
+  postgres: "pg",
+  sqlite3: "better-sqlite3",
+  mongodb: "mongodb",
+  mssql: "tedious",
+  cockroachdb: "pg",
+  oracle: "oracledb",
+  redis: "redis",
+  dynamodb: "@aws-sdk/client-dynamodb",
+};
+
+/**
+ * Doctor command handler for the unified CLI.
+ *
+ * Validates the schema, checks adapter driver dependencies in package.json,
+ * and verifies generated files are in sync with the schema.
+ *
+ * Supported flags:
+ *   --from      Path to schema file (default: dbmr.schema.json)
+ *   --json      Output JSON result via ctx
+ *
+ * @param {object} args - Parsed key-value args
+ * @param {object} flags - Universal flags: { yes, json, dryRun, noInstall, help }
+ * @param {import('../flags').OutputContext} ctx - Output context
+ */
+async function doctor(args, flags, ctx) {
+  const schemaFile = args.from || "dbmr.schema.json";
+  const schemaPath = path.resolve(schemaFile);
+  const baseDir = process.cwd();
+
+  // --- 1. Schema validation ---
+  const validation = { valid: true, errors: [] };
+  let schema = null;
+
+  if (!fs.existsSync(schemaPath)) {
+    validation.valid = false;
+    validation.errors.push({
+      path: "",
+      message: `Schema file not found: ${schemaFile}`,
+    });
+  } else {
+    try {
+      const raw = fs.readFileSync(schemaPath, "utf8");
+      schema = parseSchema(raw);
+    } catch (err) {
+      validation.valid = false;
+      if (err instanceof SchemaValidationError) {
+        validation.errors = err.errors;
+      } else {
+        validation.errors.push({ path: "", message: err.message });
+      }
+    }
+  }
+
+  // --- 2. Dependency check ---
+  const dependencies = { ok: true, missing: [] };
+
+  if (schema) {
+    const driver = ADAPTER_DRIVER_MAP[schema.adapter];
+    if (driver) {
+      const pkgPath = path.join(baseDir, "package.json");
+      if (fs.existsSync(pkgPath)) {
+        try {
+          const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+          const allDeps = Object.assign(
+            {},
+            pkg.dependencies || {},
+            pkg.devDependencies || {},
+          );
+          if (!allDeps[driver]) {
+            dependencies.ok = false;
+            dependencies.missing.push({
+              adapter: schema.adapter,
+              driver,
+            });
+          }
+        } catch (_) {
+          // If package.json is unreadable, report driver as missing
+          dependencies.ok = false;
+          dependencies.missing.push({
+            adapter: schema.adapter,
+            driver,
+          });
+        }
+      } else {
+        dependencies.ok = false;
+        dependencies.missing.push({
+          adapter: schema.adapter,
+          driver,
+        });
+      }
+    }
+  }
+
+  // --- 3. Sync check ---
+  const sync = { ok: true, outOfSync: [] };
+
+  if (schema) {
+    const meta = schemaToModelMeta(schema);
+    const relationships = schema.relationships || [];
+    const diff = computeDiff(baseDir, meta, relationships);
+
+    if (
+      diff.added.length > 0 ||
+      diff.modified.length > 0 ||
+      diff.deleted.length > 0
+    ) {
+      sync.ok = false;
+      for (const f of diff.added) {
+        sync.outOfSync.push({ file: f, status: "missing" });
+      }
+      for (const m of diff.modified) {
+        sync.outOfSync.push({ file: m.file, status: "modified" });
+      }
+      for (const f of diff.deleted) {
+        sync.outOfSync.push({ file: f, status: "extra" });
+      }
+    }
+  }
+
+  // --- 4. Report results ---
+  const allPass = validation.valid && dependencies.ok && sync.ok;
+  const report = { validation, dependencies, sync };
+
+  if (flags.json) {
+    ctx.result(report);
+  } else {
+    // Validation
+    if (validation.valid) {
+      ctx.log("✓ Schema validation passed");
+    } else {
+      ctx.log("✗ Schema validation failed:");
+      for (const e of validation.errors) {
+        const loc = e.path ? ` (${e.path})` : "";
+        ctx.log(`    ${e.message}${loc}`);
+      }
+    }
+
+    // Dependencies
+    if (dependencies.ok) {
+      ctx.log("✓ Dependencies OK");
+    } else {
+      ctx.log("✗ Missing dependencies:");
+      for (const m of dependencies.missing) {
+        ctx.log(`    ${m.adapter} requires "${m.driver}" in package.json`);
+      }
+    }
+
+    // Sync
+    if (sync.ok) {
+      ctx.log("✓ Generated files in sync");
+    } else {
+      ctx.log("✗ Files out of sync:");
+      for (const s of sync.outOfSync) {
+        ctx.log(`    ${s.file} (${s.status})`);
+      }
+    }
+  }
+
+  // --- 5. Exit code ---
+  if (!allPass) {
+    process.exitCode = 1;
+  }
+}
+
+module.exports = doctor;
+module.exports.ADAPTER_DRIVER_MAP = ADAPTER_DRIVER_MAP;