@jskit-ai/database-runtime 0.1.159 → 0.1.161

package/src/server/providers/DatabaseRuntimeServiceProvider.js

@@ -1,212 +0,0 @@
-import { symlinkSafeRequire } from "@jskit-ai/kernel/server/support";
-import * as databaseRuntime from "../../shared/index.js";
-import { createTransactionManager } from "../../shared/transactionManager.js";
-import {
-  normalizeDatabaseClient,
-  toKnexClientId
-} from "../../shared/databaseClient.js";
-import { resolveKnexConnectionFromEnvironment } from "../../shared/databaseConnection.js";
-
-const DATABASE_RUNTIME_SERVER_API = Object.freeze({
-  ...databaseRuntime
-});
-
-function resolveDatabaseEnv(scope) {
-  const envFromScope = scope?.has?.("jskit.env") ? scope.make("jskit.env") : {};
-  const source = envFromScope && typeof envFromScope === "object" ? envFromScope : {};
-  return {
-    ...process.env,
-    ...source
-  };
-}
-
-function resolveDriverDialectId(driver) {
-  const source = driver && typeof driver === "object" ? driver : {};
-  const fromConstant = normalizeDatabaseClient(source.DIALECT_ID || source.dialectId || source.dialect, {
-    allowEmpty: true
-  });
-  if (fromConstant) {
-    return fromConstant;
-  }
-  if (typeof source.getDialectId === "function") {
-    return normalizeDatabaseClient(source.getDialectId(), {
-      allowEmpty: true
-    });
-  }
-  return "";
-}
-
-function loadKnexFactory() {
-  let moduleValue;
-  try {
-    moduleValue = symlinkSafeRequire("knex");
-  } catch {
-    throw new Error(
-      "Knex package is not installed. Run `npm install`, then `npx jskit migrations sync`."
-    );
-  }
-
-  const knexFactory =
-    typeof moduleValue === "function"
-      ? moduleValue
-      : typeof moduleValue?.default === "function"
-        ? moduleValue.default
-        : null;
-  if (!knexFactory) {
-    throw new Error("Knex package resolved but did not expose a callable factory.");
-  }
-
-  return knexFactory;
-}
-
-function resolveRegisteredDriver(scope) {
-  const drivers = resolveRegisteredDrivers(scope);
-  if (drivers.length === 1) {
-    return drivers[0];
-  }
-  if (drivers.length < 1) {
-    throw new Error("No database driver is registered. Install @jskit-ai/database-runtime-mysql or @jskit-ai/database-runtime-postgres.");
-  }
-
-  const env = resolveDatabaseEnv(scope);
-  const preferredClient = normalizeDatabaseClient(env.DB_CLIENT, {
-    allowEmpty: true
-  });
-  if (!preferredClient) {
-    throw new Error("Multiple database drivers are registered. Set DB_CLIENT to mysql2 or pg, or keep exactly one database runtime driver package installed.");
-  }
-
-  const matched = drivers.find((driver) => resolveDriverDialectId(driver) === preferredClient) || null;
-  if (!matched) {
-    throw new Error(`Multiple database drivers are registered, but DB_CLIENT="${preferredClient}" did not match any registered driver.`);
-  }
-
-  return matched;
-}
-
-function resolveRegisteredDrivers(scope) {
-  const drivers = [];
-
-  if (scope.has("runtime.database.driver.mysql")) {
-    drivers.push(scope.make("runtime.database.driver.mysql"));
-  }
-
-  if (scope.has("runtime.database.driver.postgres")) {
-    drivers.push(scope.make("runtime.database.driver.postgres"));
-  }
-
-  return drivers;
-}
-
-function resolveSingleRegisteredDriver(scope) {
-  return resolveRegisteredDriver(scope);
-}
-
-function createKnexConfig(scope) {
-  const env = resolveDatabaseEnv(scope);
-  const configuredClient = normalizeDatabaseClient(env.DB_CLIENT, {
-    allowEmpty: true
-  });
-  const driver = resolveRegisteredDriver(scope);
-  const dialectId = resolveDriverDialectId(driver);
-
-  if (!dialectId) {
-    throw new Error("Selected database driver did not expose a valid dialect id.");
-  }
-
-  if (configuredClient && configuredClient !== dialectId) {
-    throw new Error(`DB_CLIENT="${configuredClient}" does not match installed database driver "${dialectId}".`);
-  }
-
-  const client = toKnexClientId(dialectId);
-  const defaultPort = dialectId === "pg" ? 5432 : 3306;
-  const connection = resolveKnexConnectionFromEnvironment(env, {
-    client: dialectId,
-    defaultPort,
-    context: "database runtime"
-  });
-
-  return {
-    client,
-    connection
-  };
-}
-
-function createKnexInstance(scope) {
-  const knexFactory = loadKnexFactory();
-  const config = createKnexConfig(scope);
-  return knexFactory(config);
-}
-
-class DatabaseRuntimeServiceProvider {
-  static id = "runtime.database";
-
-  constructor() {
-    this.knexInstance = null;
-    this.knexDestroyed = false;
-  }
-
-  register(app) {
-    if (!app || typeof app.singleton !== "function" || typeof app.has !== "function") {
-      throw new Error("DatabaseRuntimeServiceProvider requires application singleton()/has().");
-    }
-
-    app.singleton("runtime.database", () => DATABASE_RUNTIME_SERVER_API);
-
-    if (!app.has("runtime.database.driver")) {
-      app.singleton("runtime.database.driver", (scope) => resolveSingleRegisteredDriver(scope));
-    }
-
-    if (!app.has("jskit.database.knex")) {
-      app.singleton("jskit.database.knex", (scope) => {
-        const knex = createKnexInstance(scope);
-        this.knexInstance = knex;
-        this.knexDestroyed = false;
-        return knex;
-      });
-    }
-
-    if (!app.has("jskit.database.transactionManager")) {
-      app.singleton("jskit.database.transactionManager", (scope) => {
-        const knex = scope.make("jskit.database.knex");
-        return createTransactionManager({ knex });
-      });
-    }
-  }
-
-  boot() {}
-
-  async shutdown(app) {
-    if (this.knexDestroyed) {
-      return;
-    }
-
-    let knex = this.knexInstance || null;
-
-    if (!knex) {
-      const container = app?.container;
-      const instanceRecord =
-        container && typeof container.findInstanceRecord === "function"
-          ? container.findInstanceRecord("jskit.database.knex")
-          : null;
-      knex = instanceRecord?.value || null;
-    }
-
-    if (!knex && app && typeof app.has === "function" && app.has("jskit.database.knex") && typeof app.make === "function") {
-      try {
-        knex = app.make("jskit.database.knex");
-      } catch {
-        knex = null;
-      }
-    }
-
-    if (!knex || typeof knex.destroy !== "function") {
-      return;
-    }
-
-    await knex.destroy();
-    this.knexDestroyed = true;
-  }
-}
-
-export { DatabaseRuntimeServiceProvider };

package/src/shared/runtime.js

@@ -1,58 +0,0 @@
-import { createTransactionManager } from "./transactionManager.js";
-import { DatabaseRuntimeError } from "./runtimeErrors.js";
-
-function ensureContainerInterface(app) {
-  if (
-    !app ||
-    typeof app.instance !== "function" ||
-    typeof app.singleton !== "function" ||
-    typeof app.make !== "function" ||
-    typeof app.has !== "function"
-  ) {
-    throw new DatabaseRuntimeError("registerDatabaseRuntime requires application instance/singleton/make/has methods.");
-  }
-}
-
-function ensureKnexInterface(knex) {
-  if (!knex || typeof knex.transaction !== "function") {
-    throw new DatabaseRuntimeError("registerDatabaseRuntime requires knex with transaction().");
-  }
-}
-
-function ensureKnexBinding(app, knex) {
-  if (!app.has("jskit.database.knex")) {
-    app.instance("jskit.database.knex", knex);
-    return;
-  }
-
-  const existingKnex = app.make("jskit.database.knex");
-  if (existingKnex !== knex) {
-    throw new DatabaseRuntimeError("registerDatabaseRuntime received knex that differs from existing Knex binding.");
-  }
-}
-
-function ensureTransactionManagerBinding(app) {
-  if (app.has("jskit.database.transactionManager")) {
-    return;
-  }
-
-  app.singleton("jskit.database.transactionManager", (scope) => {
-    const knex = scope.make("jskit.database.knex");
-    return createTransactionManager({ knex });
-  });
-}
-
-function registerDatabaseRuntime(app, { knex } = {}) {
-  ensureContainerInterface(app);
-  ensureKnexInterface(knex);
-
-  ensureKnexBinding(app, knex);
-  ensureTransactionManagerBinding(app);
-
-  return {
-    knex: app.make("jskit.database.knex"),
-    transactionManager: app.make("jskit.database.transactionManager")
-  };
-}
-
-export { registerDatabaseRuntime };

package/templates/knexfile.js

@@ -1,36 +0,0 @@
-import path from "node:path";
-import dotenv from "dotenv";
-import {
-  normalizeText,
-  toKnexClientId,
-  resolveDatabaseClientFromEnvironment,
-  resolveKnexConnectionFromEnvironment
-} from "@jskit-ai/database-runtime/shared";
-
-const appRoot = process.cwd();
-dotenv.config({
-  path: path.join(appRoot, ".env"),
-  quiet: true
-});
-
-const dialectId = resolveDatabaseClientFromEnvironment(process.env);
-const client = toKnexClientId(dialectId);
-const defaultPort = dialectId === "pg" ? 5432 : 3306;
-const migrationsDirectory = path.resolve(appRoot, normalizeText(process.env.DB_MIGRATIONS_DIR) || "migrations");
-const deferredConstraintsDirectory = path.join(migrationsDirectory, "constraints");
-
-export default {
-  client,
-  connection: resolveKnexConnectionFromEnvironment(process.env, {
-    client: dialectId,
-    defaultPort,
-    context: "knex migrations"
-  }),
-  migrations: {
-    // Run every table-creation migration before deferred constraints. This keeps
-    // valid mutual foreign keys rebuildable without disabling database checks.
-    directory: [migrationsDirectory, deferredConstraintsDirectory],
-    extension: "cjs",
-    sortDirsSeparately: true
-  }
-};

package/templates/migrations/.gitkeep

@@ -1 +0,0 @@
-

package/templates/migrations/constraints/.gitkeep

@@ -1 +0,0 @@
-