db-model-router 1.0.19 → 1.0.21

package/dbmr.schema.mysql.json

@@ -0,0 +1,360 @@
+{
+  "adapter": "mysql",
+  "framework": "express",
+  "options": {
+    "session": "memory",
+    "rateLimiting": true,
+    "helmet": true,
+    "logger": true,
+    "loki": false,
+    "saasStructure": false,
+    "apiBasePath": "/api",
+    "output": "backend",
+    "port": 6000
+  },
+  "tables": {
+    "languages": {
+      "columns": {
+        "language_id": "auto_increment",
+        "name": "required|string|maxLength:100",
+        "slug": "required|string|regex:^[a-z0-9-]+$|maxLength:100",
+        "file_extension": "required|string|maxLength:20",
+        "runtime_family": "string|maxLength:50",
+        "package_registry": "string|maxLength:50",
+        "is_active": "boolean",
+        "created_at": "datetime"
+      },
+      "pk": "language_id",
+      "unique": ["slug"],
+      "timestamps": {
+        "created_at": "created_at"
+      },
+      "parent": null
+    },
+
+    "frameworks": {
+      "columns": {
+        "framework_id": "auto_increment",
+        "language_id": "required|integer:unsigned",
+        "name": "required|string|maxLength:150",
+        "slug": "required|string|regex:^[a-z0-9-]+$|maxLength:150",
+        "package_name": "string|maxLength:150",
+        "homepage_url": "string|maxLength:500",
+        "latest_version": "string|maxLength:50",
+        "weekly_downloads": "integer:unsigned",
+        "popularity_index": "numeric:decimal(5,2)",
+        "popularity_updated_at": "datetime",
+        "created_at": "datetime"
+      },
+      "pk": "framework_id",
+      "unique": ["slug"],
+      "search_columns": ["name", "package_name"],
+      "timestamps": {
+        "created_at": "created_at"
+      },
+      "parent": null
+    },
+
+    "libraries": {
+      "columns": {
+        "library_id": "auto_increment",
+        "language_id": "required|integer:unsigned",
+        "framework_id": "integer:unsigned",
+        "name": "required|string|maxLength:150",
+        "slug": "required|string|regex:^[a-z0-9-]+$|maxLength:150",
+        "package_name": "string|maxLength:150",
+        "homepage_url": "string|maxLength:500",
+        "latest_version": "string|maxLength:50",
+        "weekly_downloads": "integer:unsigned",
+        "popularity_index": "numeric:decimal(5,2)",
+        "popularity_updated_at": "datetime",
+        "created_at": "datetime"
+      },
+      "pk": "library_id",
+      "unique": ["slug"],
+      "search_columns": ["name", "package_name"],
+      "timestamps": {
+        "created_at": "created_at"
+      },
+      "parent": null
+    },
+
+    "tasks": {
+      "columns": {
+        "task_id": "auto_increment",
+        "name": "required|string|maxLength:150",
+        "slug": "required|string|regex:^[a-z0-9-]+$|maxLength:150",
+        "category": "required|string|in:auth,storage,networking,data-processing,messaging,payments,caching,middleware,ai-integration,database,validation,integration,utility",
+        "description": "string:text",
+        "created_at": "datetime"
+      },
+      "pk": "task_id",
+      "unique": ["slug"],
+      "search_columns": ["name", "description"],
+      "timestamps": {
+        "created_at": "created_at"
+      },
+      "parent": null
+    },
+
+    "tags": {
+      "columns": {
+        "tag_id": "auto_increment",
+        "name": "required|string|maxLength:100",
+        "slug": "required|string|regex:^[a-z0-9-]+$|maxLength:100"
+      },
+      "pk": "tag_id",
+      "unique": [["name"], ["slug"]],
+      "parent": null
+    },
+
+    "popularity_snapshots": {
+      "columns": {
+        "snapshot_id": "auto_increment",
+        "entity_type": "required|string|in:framework,library",
+        "entity_id": "required|integer:unsigned",
+        "weekly_downloads": "required|integer:unsigned",
+        "source": "string|maxLength:50",
+        "snapshot_date": "required|datetime"
+      },
+      "pk": "snapshot_id",
+      "parent": null
+    },
+
+    "sandbox_images": {
+      "columns": {
+        "image_id": "auto_increment",
+        "language_id": "required|integer:unsigned",
+        "image_name": "required|string|maxLength:255",
+        "os_base": "string|maxLength:100",
+        "installed_toolchain": "string:text",
+        "is_active": "boolean",
+        "created_at": "datetime"
+      },
+      "pk": "image_id",
+      "unique": ["image_name"],
+      "timestamps": {
+        "created_at": "created_at"
+      },
+      "parent": null
+    },
+
+    "snippets": {
+      "columns": {
+        "snippet_id": "required|string:uuid",
+        "title": "required|string|maxLength:255",
+        "description": "string:text",
+        "usecase": "string:text",
+        "task_id": "required|integer:unsigned",
+        "language_id": "required|integer:unsigned",
+        "framework_id": "integer:unsigned",
+        "status": "required|string|in:draft,in_verification,verified,failed,deprecated",
+        "current_stage": "required|string|in:execution,lint,static_analysis,security_scan,performance,published",
+        "verified": "boolean",
+        "quality_score": "numeric:decimal(5,2)",
+        "source": "required|string|in:ai-generated,human-curated,imported",
+        "generation_provider": "string|maxLength:64",
+        "generation_model": "string|maxLength:128",
+        "enrichment_model": "string|maxLength:128",
+        "usage_count": "integer:unsigned",
+        "last_tested_at": "datetime",
+        "created_at": "datetime",
+        "modified_at": "datetime"
+      },
+      "pk": "snippet_id",
+      "search_columns": ["title", "description", "usecase"],
+      "timestamps": {
+        "created_at": "created_at",
+        "modified_at": "modified_at"
+      },
+      "parent": null
+    },
+
+    "snippet_files": {
+      "columns": {
+        "file_id": "auto_increment",
+        "snippet_id": "required|string:uuid",
+        "file_role": "required|string|in:code,test,dependency,readme",
+        "file_name": "required|string|maxLength:255",
+        "content": "required|string:longtext",
+        "sort_order": "integer:unsigned",
+        "created_at": "datetime",
+        "modified_at": "datetime"
+      },
+      "pk": "file_id",
+      "timestamps": {
+        "created_at": "created_at",
+        "modified_at": "modified_at"
+      },
+      "parent": "snippets"
+    },
+
+    "snippet_dependencies": {
+      "columns": {
+        "dependency_id": "auto_increment",
+        "snippet_id": "required|string:uuid",
+        "library_id": "required|integer:unsigned",
+        "version_constraint": "string|maxLength:50",
+        "is_primary": "boolean",
+        "created_at": "datetime"
+      },
+      "pk": "dependency_id",
+      "unique": [["snippet_id", "library_id"]],
+      "timestamps": {
+        "created_at": "created_at"
+      },
+      "parent": "snippets"
+    },
+
+    "snippet_tags": {
+      "columns": {
+        "snippet_id": "required|string:uuid",
+        "tag_id": "required|integer:unsigned"
+      },
+      "pk": "snippet_id",
+      "unique": [["snippet_id", "tag_id"]],
+      "parent": "snippets"
+    },
+
+    "testing_logs": {
+      "columns": {
+        "testing_id": "auto_increment",
+        "snippet_id": "required|string:uuid",
+        "queue_id": "integer:bigint",
+        "language_id": "required|integer:unsigned",
+        "framework_id": "integer:unsigned",
+        "code_snapshot": "required|string:longtext",
+        "test_snapshot": "required|string:longtext",
+        "dependency_snapshot": "required|string:longtext",
+        "result": "required|string|in:pass,fail,error,timeout",
+        "exit_code": "integer",
+        "stdout": "string:longtext",
+        "stderr": "string:longtext",
+        "response_time_ms": "integer",
+        "sandbox_image": "string|maxLength:128",
+        "tested_at": "datetime"
+      },
+      "pk": "testing_id",
+      "timestamps": {
+        "tested_at": "tested_at"
+      },
+      "parent": "snippets"
+    },
+
+    "verification_stage_results": {
+      "columns": {
+        "result_id": "auto_increment",
+        "snippet_id": "required|string:uuid",
+        "queue_id": "integer:bigint",
+        "stage": "required|string|in:lint,static_analysis,security_scan,performance",
+        "status": "required|string|in:pass,fail,warning",
+        "score": "numeric:decimal(5,2)",
+        "tool_used": "string|maxLength:64",
+        "findings": "object",
+        "executed_at": "datetime"
+      },
+      "pk": "result_id",
+      "timestamps": {
+        "executed_at": "executed_at"
+      },
+      "parent": "snippets"
+    },
+
+    "enrichment_jobs": {
+      "columns": {
+        "job_id": "auto_increment",
+        "snippet_id": "required|string:uuid",
+        "provider": "required|string|maxLength:64",
+        "model": "required|string|maxLength:128",
+        "prompt_version": "string|maxLength:50",
+        "status": "required|string|in:pending,success,failed",
+        "raw_response": "string:longtext",
+        "tokens_used": "integer",
+        "latency_ms": "integer",
+        "created_at": "datetime"
+      },
+      "pk": "job_id",
+      "timestamps": {
+        "created_at": "created_at"
+      },
+      "parent": "snippets"
+    },
+
+    "generation_attempts": {
+      "columns": {
+        "attempt_id": "auto_increment",
+        "snippet_id": "required|string:uuid",
+        "attempt_number": "required|integer|min:1",
+        "previous_attempt_id": "integer:unsigned",
+        "prompt": "required|string:longtext",
+        "generated_code": "required|string:longtext",
+        "generated_test": "required|string:longtext",
+        "generated_dependency_manifest": "required|string:longtext",
+        "failure_stage": "string|in:execution,lint,static_analysis,security_scan",
+        "error_output": "string:longtext",
+        "outcome": "required|string|in:failed,succeeded",
+        "generation_provider": "string|maxLength:64",
+        "generation_model": "string|maxLength:128",
+        "created_at": "datetime"
+      },
+      "pk": "attempt_id",
+      "timestamps": {
+        "created_at": "created_at"
+      },
+      "parent": "snippets"
+    },
+
+    "execution_queue": {
+      "columns": {
+        "queue_id": "auto_increment",
+        "snippet_id": "required|string:uuid",
+        "stage": "required|string|in:execution,lint,static_analysis,security_scan,performance",
+        "status": "required|string|in:pending,locked,completed,failed",
+        "locked_by": "string|maxLength:100",
+        "locked_at": "datetime",
+        "lease_expires_at": "datetime",
+        "attempt_count": "integer:unsigned",
+        "max_attempts": "integer:unsigned",
+        "created_at": "datetime",
+        "updated_at": "datetime"
+      },
+      "pk": "queue_id",
+      "timestamps": {
+        "created_at": "created_at",
+        "updated_at": "updated_at"
+      },
+      "parent": "snippets"
+    },
+
+    "search_query_log": {
+      "columns": {
+        "log_id": "auto_increment",
+        "queries_json": "required|object",
+        "results_snippet_ids": "required|object",
+        "agent_session_id": "string|maxLength:100",
+        "created_at": "datetime"
+      },
+      "pk": "log_id",
+      "timestamps": {
+        "created_at": "created_at"
+      },
+      "parent": null
+    },
+
+    "snippet_feedback": {
+      "columns": {
+        "feedback_id": "auto_increment",
+        "snippet_id": "required|string:uuid",
+        "outcome": "required|string|in:used-success,used-failure,rejected-irrelevant",
+        "notes": "string:text",
+        "agent_session_id": "string|maxLength:100",
+        "created_at": "datetime"
+      },
+      "pk": "feedback_id",
+      "timestamps": {
+        "created_at": "created_at"
+      },
+      "parent": "snippets"
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db-model-router",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Generative API Creation using mysql2 and express libraries in node js",
   "main": "src/index.js",
   "bin": {
@@ -24,6 +24,8 @@
     "test:command": "mocha test/commands/*.test.js --timeout 30000 --exit",
     "demo:clear": "node -e \"var fs=require('fs'),p=require('path'),d=p.join(__dirname,'demo');fs.existsSync(d)&&fs.rmSync(d,{recursive:true,force:true});fs.mkdirSync(d,{recursive:true})\"",
     "demo:create": "node scripts/demo-create.js",
+    "demo:create-mysql": "node scripts/demo-create.js mysql",
+    "demo:create-mariadb": "node scripts/demo-create.js mariadb",
     "demo:create-postgres": "node scripts/demo-create.js postgres"
   },
   "repository": {

package/scripts/demo-create.js

@@ -29,20 +29,26 @@ const run = (cmd, cwd) => {
 };
 
 // 2. Copy schema into the demo folder
-const schemaPath =
-  ADAPTER === "postgres"
-    ? path.join(ROOT, "dbmr.postgres.test.schema.json")
-    : path.join(ROOT, "dbmr.schema.json");
+const SCHEMA_BY_ADAPTER = {
+  postgres: "dbmr.postgres.test.schema.json",
+  mysql: "dbmr.schema.mysql.json",
+  mariadb: "dbmr.schema.mysql.json",
+  sqlite3: "dbmr.schema.json",
+};
+const schemaPath = path.join(ROOT, SCHEMA_BY_ADAPTER[ADAPTER]);
 
 const schema = JSON.parse(fs.readFileSync(schemaPath, "utf8"));
 
-// Patch adapter-specific options for the sqlite3 demo
+// Patch adapter for sqlite3/mariadb demos. mysql/postgres use dedicated
+// schemas with adapter already set; mariadb reuses the mysql schema.
 if (ADAPTER === "sqlite3") {
   schema.adapter = "sqlite3";
   if (schema.options) {
     delete schema.options.session;
     delete schema.options.loki;
   }
+} else if (ADAPTER === "mariadb") {
+  schema.adapter = "mariadb";
 }
 
 const schemaDest = path.join(DEMO, "dbmr.schema.json");

package/src/cli/commands/generate.js

@@ -3,7 +3,7 @@
 const fs = require("fs");
 const path = require("path");
 const { schemaToModelMeta } = require("../../schema/schema-to-meta");
-const { generateModelFile } = require("../generate-model");
+const { generateModelFile, generateIndexFile } = require("../generate-model");
 const {
   generateRouteFile,
   generateParentRouteFile,
@@ -104,6 +104,14 @@ async function buildSchemaArtifacts({ schema, baseDir, ctx, flags }) {
         content: generateModelFile(m),
       });
     }
+
+    // Barrel re-exporting all schema models. When SaaS is enabled, the SaaS
+    // generator emits a combined barrel (SaaS + schema tables) and replaces
+    // this one below; without SaaS, this barrel is the final models/index.js.
+    planned.push({
+      relPath: "models/index.js",
+      content: generateIndexFile(meta),
+    });
   }
 
   // --- Route files ---
@@ -258,14 +266,15 @@ async function buildSchemaArtifacts({ schema, baseDir, ctx, flags }) {
       baseDir,
     });
 
-    // The SaaS generator produces a combined routes/index.js that includes
-    // both SaaS routes and dbmr schema-generated routes. Remove any previously
-    // planned routes/index.js from the schema generator.
-    const existingIndexIdx = planned.findIndex(
-      (p) => p.relPath === "routes/index.js",
-    );
-    if (existingIndexIdx !== -1) {
-      planned.splice(existingIndexIdx, 1);
+    // The SaaS generator produces a combined routes/index.js and models/index.js
+    // that include both SaaS and dbmr schema-generated entries. Remove the
+    // plain barrels previously planned by the schema generator so the combined
+    // SaaS versions win.
+    for (const barrel of ["routes/index.js", "models/index.js"]) {
+      const existingIdx = planned.findIndex((p) => p.relPath === barrel);
+      if (existingIdx !== -1) {
+        planned.splice(existingIdx, 1);
+      }
     }
 
     for (const entry of saasFiles) {

package/src/cli/commands/init.js

@@ -132,9 +132,6 @@ async function init(args, flags, ctx) {
   updatePackageJson(answers, outputDir);
 
   const installed = !flags.noInstall;
-  if (installed) {
-    runInstall();
-  }
 
   // Build init's JSON result first so it lands at ctx._results[0] (buildSchemaArtifacts
   // pushes its own result afterward).
@@ -153,10 +150,17 @@ async function init(args, flags, ctx) {
     });
   }
 
-  // Schema-driven artifacts: models, routes, migrations, openapi, tests, SaaS
+  // Schema-driven artifacts: models, routes, migrations, openapi, tests, SaaS.
+  // Generated BEFORE npm install so all files exist on disk first; bail skips
+  // install if the build reported an error.
   await buildSchemaArtifacts({ schema, baseDir, ctx, flags });
   if (process.exitCode) return; // bail if build reported an error
 
+  // Install dependencies only after every project file has been written.
+  if (installed) {
+    runInstall();
+  }
+
   // Human-readable summary (non-json only)
   if (!flags.json) {
     printSummary(generated);

package/src/cli/diff-engine.js

@@ -2,7 +2,7 @@
 
 const fs = require("fs");
 const path = require("path");
-const { generateModelFile } = require("./generate-model.js");
+const { generateModelFile, generateIndexFile } = require("./generate-model.js");
 const {
   generateRouteFile,
   generateParentRouteFile,
@@ -87,6 +87,10 @@ function buildExpectedFiles(meta, relationships, options = {}) {
     expected.set(`models/${m.table}.js`, generateModelFile(m));
   }
 
+  // Model barrel. SaaS mode overwrites this with the combined SaaS+dbmr
+  // barrel when saasFiles are merged below.
+  expected.set("models/index.js", generateIndexFile(meta));
+
   // Route files: exactly one per table at its correct nested path
   for (const m of meta) {
     const tableName = m.table;

package/src/cli/init/generators.js

@@ -703,9 +703,17 @@ function generateInitialMigration(answers, date) {
   executed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
   checksum VARCHAR2(64) NOT NULL
 );
+`;
+    } else if (answers.database === "mysql" || answers.database === "mariadb") {
+      content = `CREATE TABLE IF NOT EXISTS _migrations (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  filename VARCHAR(255) NOT NULL UNIQUE,
+  executed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  checksum VARCHAR(64) NOT NULL
+);
 `;
     } else {
-      // mysql, sqlite3
+      // sqlite3
       content = `CREATE TABLE IF NOT EXISTS _migrations (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   filename VARCHAR(255) NOT NULL UNIQUE,

package/src/mysql/db.js

@@ -7,6 +7,12 @@ function connect(credentails) {
   // Force UTC timezone so timestamps are consistent
   // dateStrings: true returns raw strings without JS Date conversion
   credentails.timezone = "+00:00";
+  // Enable multiple statements by default so multi-query migration files
+  // (e.g. a single .sql with many CREATE TABLE statements) run in one call.
+  // Applied to mysql and mariadb (both use this adapter).
+  if (credentails.multipleStatements === undefined) {
+    credentails.multipleStatements = true;
+  }
   pool = mysql.createPool(credentails);
   return pool;
 }