@cheetah.js/orm 0.1.141 → 0.1.142

package/dist/domain/entities.js

@@ -12,6 +12,7 @@ var EntityStorage_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityStorage = void 0;
 const core_1 = require("@cheetah.js/core");
+const orm_session_context_1 = require("../orm-session-context");
 const utils_1 = require("../utils");
 let EntityStorage = EntityStorage_1 = class EntityStorage {
     constructor() {
@@ -69,6 +70,10 @@ let EntityStorage = EntityStorage_1 = class EntityStorage {
         return this.entities.entries();
     }
     static getInstance() {
+        const scoped = orm_session_context_1.ormSessionContext.getStorage();
+        if (scoped) {
+            return scoped;
+        }
         return EntityStorage_1.instance;
     }
     async snapshot(values) {

package/dist/orm-session-context.d.ts

@@ -0,0 +1,16 @@
+import type { Orm } from './orm';
+import type { EntityStorage } from './domain/entities';
+type OrmSession = {
+    orm: Orm<any>;
+    storage: EntityStorage;
+};
+declare class OrmSessionContext {
+    private storage;
+    constructor();
+    run<T>(session: OrmSession, routine: () => Promise<T>): Promise<T>;
+    getOrm(): Orm<any> | undefined;
+    getStorage(): EntityStorage | undefined;
+    hasContext(): boolean;
+}
+export declare const ormSessionContext: OrmSessionContext;
+export type { OrmSession };

package/dist/orm-session-context.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ormSessionContext = void 0;
+const async_hooks_1 = require("async_hooks");
+class OrmSessionContext {
+    constructor() {
+        this.storage = new async_hooks_1.AsyncLocalStorage();
+    }
+    run(session, routine) {
+        return this.storage.run(session, routine);
+    }
+    getOrm() {
+        return this.storage.getStore()?.orm;
+    }
+    getStorage() {
+        return this.storage.getStore()?.storage;
+    }
+    hasContext() {
+        return this.storage.getStore() !== undefined;
+    }
+}
+exports.ormSessionContext = new OrmSessionContext();

package/dist/orm.js

@@ -15,6 +15,7 @@ const core_1 = require("@cheetah.js/core");
 const SqlBuilder_1 = require("./SqlBuilder");
 const query_cache_manager_1 = require("./cache/query-cache-manager");
 const transaction_context_1 = require("./transaction/transaction-context");
+const orm_session_context_1 = require("./orm-session-context");
 let Orm = Orm_1 = class Orm {
     constructor(logger, cacheService) {
         this.logger = logger;
@@ -28,6 +29,10 @@ let Orm = Orm_1 = class Orm {
         }
     }
     static getInstance() {
+        const scoped = orm_session_context_1.ormSessionContext.getOrm();
+        if (scoped) {
+            return scoped;
+        }
         return Orm_1.instance;
     }
     setConnection(connection) {

package/dist/testing/with-database.js

@@ -45,6 +45,8 @@ const entities_1 = require("../domain/entities");
 const orm_1 = require("../orm");
 const orm_service_1 = require("../orm.service");
 const bun_pg_driver_1 = require("../driver/bun-pg.driver");
+const orm_session_context_1 = require("../orm-session-context");
+const constants_1 = require("../constants");
 const DEFAULT_SCHEMA = 'public';
 const DEFAULT_CONNECTION = {
     host: 'localhost',
@@ -57,6 +59,7 @@ const DEFAULT_CONNECTION = {
 const sessionCache = new Map();
 function getCacheKey(options) {
     const connection = resolveConnection(options.connection);
+    const entitySignature = resolveEntitySignature();
     return JSON.stringify({
         host: connection.host,
         port: connection.port,
@@ -64,8 +67,20 @@ function getCacheKey(options) {
         schema: options.schema ?? DEFAULT_SCHEMA,
         entityFile: options.entityFile,
         migrationPath: connection.migrationPath,
+        entitySignature,
     });
 }
+function resolveEntitySignature() {
+    const entities = core_1.Metadata.get(constants_1.ENTITIES, Reflect) || [];
+    return buildEntitySignature(entities);
+}
+function buildEntitySignature(entities) {
+    if (entities.length < 1) {
+        return 'none';
+    }
+    const names = entities.map((entity) => entity.target?.name ?? 'unknown');
+    return names.sort().join('|');
+}
 async function withDatabase(arg1, arg2, arg3) {
     const { routine: targetRoutine, options: targetOptions, statements } = await normalizeArgs(arg1, arg2, arg3);
     const cacheKey = getCacheKey(targetOptions);
@@ -80,12 +95,13 @@ async function withDatabase(arg1, arg2, arg3) {
         };
         sessionCache.set(cacheKey, cachedSession);
     }
-    activateSession(cachedSession);
-    const context = buildContext(cachedSession.orm);
-    await dropAndRecreateSchema(context, cachedSession.schema);
-    await prepareSchema(context, cachedSession.schema);
-    await createTables(context, schemaStatements);
-    await targetRoutine(context);
+    await runWithSession(cachedSession, async () => {
+        const context = buildContext(cachedSession.orm);
+        await dropAndRecreateSchema(context, cachedSession.schema);
+        await prepareSchema(context, cachedSession.schema);
+        await createTables(context, schemaStatements);
+        await targetRoutine(context);
+    });
 }
 async function createSession(options) {
     const logger = selectLogger(options);
@@ -112,9 +128,8 @@ async function initializeOrm(orm, storage, options) {
     const connection = resolveConnection(options.connection);
     await service.onInit(connection);
 }
-function activateSession(session) {
-    orm_1.Orm.instance = session.orm;
-    entities_1.EntityStorage.instance = session.storage;
+async function runWithSession(session, routine) {
+    await orm_session_context_1.ormSessionContext.run({ orm: session.orm, storage: session.storage }, routine);
 }
 function resolveConnection(overrides) {
     if (!overrides) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.141",
+  "version": "0.1.142",
   "description": "A simple ORM for Cheetah.js.",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "f3f3004bde2d552db43db3ac56b4d286bbfbc7f6"
+  "gitHead": "eb70114c61e3b2467bf063bade66ba6cba9ed4cf"
 }