@jskit-ai/database-runtime 0.1.57 → 0.1.58

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/database-runtime",
-  version: "0.1.57",
+  version: "0.1.58",
   kind: "runtime",
   dependsOn: [
     "@jskit-ai/kernel"
@@ -58,7 +58,7 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/kernel": "0.1.57",
+        "@jskit-ai/kernel": "0.1.58",
         "dotenv": "^16.4.5",
         "knex": "^3.1.0"
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/database-runtime",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -25,6 +25,6 @@
     "./shared/transactions": "./src/shared/transactions.js"
   },
   "dependencies": {
-    "@jskit-ai/kernel": "0.1.57"
+    "@jskit-ai/kernel": "0.1.58"
   }
 }

package/src/server/providers/DatabaseRuntimeServiceProvider.js

@@ -141,6 +141,11 @@ function createKnexInstance(scope) {
 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().");
@@ -153,7 +158,12 @@ class DatabaseRuntimeServiceProvider {
     }
 
     if (!app.has("jskit.database.knex")) {
-      app.singleton("jskit.database.knex", (scope) => createKnexInstance(scope));
+      app.singleton("jskit.database.knex", (scope) => {
+        const knex = createKnexInstance(scope);
+        this.knexInstance = knex;
+        this.knexDestroyed = false;
+        return knex;
+      });
     }
 
     if (!app.has("jskit.database.transactionManager")) {
@@ -165,6 +175,38 @@ class DatabaseRuntimeServiceProvider {
   }
 
   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/dateUtils.js

@@ -42,6 +42,14 @@ function toNullableDateTime(value) {
 }
 
 function toDatabaseDateTimeUtc(value) {
+  if (value == null) {
+    return null;
+  }
+
+  if (typeof value === "string" && value.trim() === "") {
+    return null;
+  }
+
   const date = toDateOrThrow(value);
   const year = date.getUTCFullYear();
   const month = pad(date.getUTCMonth() + 1);

package/test/dateUtils.test.js

@@ -11,6 +11,13 @@ test("toDatabaseDateTimeUtc formats DATETIME(3) UTC string", () => {
   assert.equal(toDatabaseDateTimeUtc(new Date("2024-01-01T01:02:03.045Z")), "2024-01-01 01:02:03.045");
 });
 
+test("toDatabaseDateTimeUtc preserves nullable empty values", () => {
+  assert.equal(toDatabaseDateTimeUtc(null), null);
+  assert.equal(toDatabaseDateTimeUtc(undefined), null);
+  assert.equal(toDatabaseDateTimeUtc(""), null);
+  assert.equal(toDatabaseDateTimeUtc("   "), null);
+});
+
 test("date utils throw on invalid date", () => {
   assert.throws(() => toIsoString("not-a-date"), /Invalid date value\./);
   assert.throws(() => toDatabaseDateTimeUtc("not-a-date"), /Invalid date value\./);

package/test/providerRuntime.test.js

@@ -50,8 +50,12 @@ function createSingletonApp() {
 
 function createKnexStub() {
   return {
+    destroyCalls: 0,
     async transaction(callback) {
       return callback({ trxId: "trx-1" });
+    },
+    async destroy() {
+      this.destroyCalls += 1;
     }
   };
 }
@@ -198,3 +202,18 @@ test("DatabaseRuntimeServiceProvider resolves knex config from DATABASE_URL when
     assert.equal(knex.__config.connection.password, "urlpass");
   });
 });
+
+test("DatabaseRuntimeServiceProvider destroys resolved knex during shutdown", async () => {
+  const app = createSingletonApp();
+  const knex = createKnexStub();
+  app.instance("jskit.database.knex", knex);
+
+  const provider = new DatabaseRuntimeServiceProvider();
+  provider.register(app);
+
+  await provider.shutdown(app);
+  assert.equal(knex.destroyCalls, 1);
+
+  await provider.shutdown(app);
+  assert.equal(knex.destroyCalls, 1);
+});