@simplysm/orm-node 14.0.16 → 14.0.18

package/dist/create-orm.d.ts

@@ -1,4 +1,4 @@
-import { type DbContextDef, type DbContextInstance, type IsolationLevel } from "@simplysm/orm-common";
+import { DbContext, type DbContextExecutor, type IsolationLevel } from "@simplysm/orm-common";
 import type { DbConnConfig } from "./types/db-conn";
 /**
  * ORM 옵션
@@ -20,8 +20,11 @@ export interface OrmOptions {
  *
  * createOrm에서 반환하는 객체의 타입
  */
-export interface Orm<TDef extends DbContextDef<any, any, any>> {
-    readonly dbContextDef: TDef;
+export interface Orm<T extends DbContext> {
+    readonly DbClass: new (executor: DbContextExecutor, opt: {
+        database: string;
+        schema?: string;
+    }) => T;
     readonly config: DbConnConfig;
     readonly options?: OrmOptions;
     /**
@@ -31,26 +34,26 @@ export interface Orm<TDef extends DbContextDef<any, any, any>> {
      * @param isolationLevel - 트랜잭션 격리 수준
      * @returns 콜백 결과
      */
-    connect<R>(callback: (conn: DbContextInstance<TDef>) => Promise<R>, isolationLevel?: IsolationLevel): Promise<R>;
+    connect<R>(callback: (conn: T) => Promise<R>, isolationLevel?: IsolationLevel): Promise<R>;
     /**
      * 트랜잭션 없이 콜백을 실행한다
      *
      * @param callback - DB 연결 후 실행할 콜백
      * @returns 콜백 결과
      */
-    connectWithoutTransaction<R>(callback: (conn: DbContextInstance<TDef>) => Promise<R>): Promise<R>;
+    connectWithoutTransaction<R>(callback: (conn: T) => Promise<R>): Promise<R>;
 }
 /**
  * Node.js ORM 팩토리 함수
  *
  * DbContext와 DB 연결을 관리하는 인스턴스를 생성한다.
- * DbContext 정의와 연결 설정을 받아 트랜잭션을 관리한다.
+ * DbContext 서브클래스와 연결 설정을 받아 트랜잭션을 관리한다.
  *
  * @example
  * ```typescript
- * const MyDb = defineDbContext({
- *   user: (db) => queryable(db, User),
- * });
+ * class MyDb extends DbContext {
+ *   user = this.queryable(User);
+ * }
  *
  * const orm = createOrm(MyDb, {
  *   dialect: "mysql",
@@ -74,5 +77,8 @@ export interface Orm<TDef extends DbContextDef<any, any, any>> {
  * });
  * ```
  */
-export declare function createOrm<TDef extends DbContextDef<any, any, any>>(dbContextDef: TDef, config: DbConnConfig, options?: OrmOptions): Orm<TDef>;
+export declare function createOrm<T extends DbContext>(DbClass: new (executor: DbContextExecutor, opt: {
+    database: string;
+    schema?: string;
+}) => T, config: DbConnConfig, options?: OrmOptions): Orm<T>;
 //# sourceMappingURL=create-orm.d.ts.map

package/dist/create-orm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-orm.d.ts","sourceRoot":"","sources":["../src/create-orm.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGpD;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,GAAG,CAAC,IAAI,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAC3D,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;IAE9B;;;;;;OAMG;IACH,OAAO,CAAC,CAAC,EACP,QAAQ,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,CAAC,CAAC,CAAC;IAEd;;;;;OAKG;IACH,yBAAyB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACnG;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,SAAS,CAAC,IAAI,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAChE,YAAY,EAAE,IAAI,EAClB,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE,UAAU,GACnB,GAAG,CAAC,IAAI,CAAC,CA8BX"}
+{"version":3,"file":"create-orm.d.ts","sourceRoot":"","sources":["../src/create-orm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGpD;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,SAAS;IACtC,QAAQ,CAAC,OAAO,EAAE,KAChB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KACvC,CAAC,CAAC;IACP,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;IAE9B;;;;;;OAMG;IACH,OAAO,CAAC,CAAC,EACP,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EACjC,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,CAAC,CAAC,CAAC;IAEd;;;;;OAKG;IACH,yBAAyB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC7E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,SAAS,EAC3C,OAAO,EAAE,KAAK,QAAQ,EAAE,iBAAiB,EAAE,GAAG,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,CAAC,EAC3F,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE,UAAU,GACnB,GAAG,CAAC,CAAC,CAAC,CA8BR"}

package/dist/create-orm.js

@@ -1,16 +1,16 @@
-import { createDbContext, } from "@simplysm/orm-common";
+import { DbContext, } from "@simplysm/orm-common";
 import { NodeDbContextExecutor } from "./node-db-context-executor.js";
 /**
  * Node.js ORM 팩토리 함수
  *
  * DbContext와 DB 연결을 관리하는 인스턴스를 생성한다.
- * DbContext 정의와 연결 설정을 받아 트랜잭션을 관리한다.
+ * DbContext 서브클래스와 연결 설정을 받아 트랜잭션을 관리한다.
  *
  * @example
  * ```typescript
- * const MyDb = defineDbContext({
- *   user: (db) => queryable(db, User),
- * });
+ * class MyDb extends DbContext {
+ *   user = this.queryable(User);
+ * }
  *
  * const orm = createOrm(MyDb, {
  *   dialect: "mysql",
@@ -34,8 +34,8 @@ import { NodeDbContextExecutor } from "./node-db-context-executor.js";
  * });
  * ```
  */
-export function createOrm(dbContextDef, config, options) {
-    function _createDbContext() {
+export function createOrm(DbClass, config, options) {
+    function _createInstance() {
         // options의 database를 우선 사용, 없으면 config에서
         const database = options?.database ?? ("database" in config ? config.database : undefined);
         if (database == null || database === "") {
@@ -43,21 +43,21 @@ export function createOrm(dbContextDef, config, options) {
         }
         // options의 schema를 우선 사용, 없으면 config에서
         const schema = options?.schema ?? ("schema" in config ? config.schema : undefined);
-        return createDbContext(dbContextDef, new NodeDbContextExecutor(config), {
+        return new DbClass(new NodeDbContextExecutor(config), {
             database,
             schema,
         });
     }
     return {
-        dbContextDef,
+        DbClass,
         config,
         options,
         async connect(callback, isolationLevel) {
-            const db = _createDbContext();
+            const db = _createInstance();
             return db.connect(async () => callback(db), isolationLevel);
         },
         async connectWithoutTransaction(callback) {
-            const db = _createDbContext();
+            const db = _createInstance();
             return db.connectWithoutTransaction(async () => callback(db));
         },
     };

package/dist/create-orm.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-orm.js","sourceRoot":"","sources":["../src/create-orm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,GAIhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAkDnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,UAAU,SAAS,CACvB,YAAkB,EAClB,MAAoB,EACpB,OAAoB;IAEpB,SAAS,gBAAgB;QACvB,yCAAyC;QACzC,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC3F,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QAED,uCAAuC;QACvC,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAEnF,OAAO,eAAe,CAAC,YAAY,EAAE,IAAI,qBAAqB,CAAC,MAAM,CAAC,EAAE;YACtE,QAAQ;YACR,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,YAAY;QACZ,MAAM;QACN,OAAO;QACP,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAe;YACrC,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAAC;YAC9B,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;QAC9D,CAAC;QACD,KAAK,CAAC,yBAAyB,CAAC,QAAQ;YACtC,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAAC;YAC9B,OAAO,EAAE,CAAC,yBAAyB,CAAC,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"create-orm.js","sourceRoot":"","sources":["../src/create-orm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,GAGV,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAqDnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,UAAU,SAAS,CACvB,OAA2F,EAC3F,MAAoB,EACpB,OAAoB;IAEpB,SAAS,eAAe;QACtB,yCAAyC;QACzC,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC3F,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QAED,uCAAuC;QACvC,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAEnF,OAAO,IAAI,OAAO,CAAC,IAAI,qBAAqB,CAAC,MAAM,CAAC,EAAE;YACpD,QAAQ;YACR,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,OAAO;QACP,MAAM;QACN,OAAO;QACP,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAe;YACrC,MAAM,EAAE,GAAG,eAAe,EAAE,CAAC;YAC7B,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;QAC9D,CAAC;QACD,KAAK,CAAC,yBAAyB,CAAC,QAAQ;YACtC,MAAM,EAAE,GAAG,eAAe,EAAE,CAAC;YAC7B,OAAO,EAAE,CAAC,yBAAyB,CAAC,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC;KACF,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/orm-node",
-  "version": "14.0.16",
+  "version": "14.0.18",
   "description": "심플리즘 패키지 - ORM (node)",
   "author": "심플리즘",
   "license": "Apache-2.0",
@@ -20,8 +20,8 @@
   "sideEffects": false,
   "dependencies": {
     "consola": "^3.4.2",
-    "@simplysm/core-common": "14.0.16",
-    "@simplysm/orm-common": "14.0.16"
+    "@simplysm/core-common": "14.0.18",
+    "@simplysm/orm-common": "14.0.18"
   },
   "devDependencies": {
     "@types/pg": "^8.20.0",

package/src/create-orm.ts

@@ -1,7 +1,6 @@
 import {
-  createDbContext,
-  type DbContextDef,
-  type DbContextInstance,
+  DbContext,
+  type DbContextExecutor,
   type IsolationLevel,
 } from "@simplysm/orm-common";
 import type { DbConnConfig } from "./types/db-conn";
@@ -29,8 +28,11 @@ export interface OrmOptions {
  *
  * createOrm에서 반환하는 객체의 타입
  */
-export interface Orm<TDef extends DbContextDef<any, any, any>> {
-  readonly dbContextDef: TDef;
+export interface Orm<T extends DbContext> {
+  readonly DbClass: new (
+    executor: DbContextExecutor,
+    opt: { database: string; schema?: string },
+  ) => T;
   readonly config: DbConnConfig;
   readonly options?: OrmOptions;
 
@@ -42,7 +44,7 @@ export interface Orm<TDef extends DbContextDef<any, any, any>> {
    * @returns 콜백 결과
    */
   connect<R>(
-    callback: (conn: DbContextInstance<TDef>) => Promise<R>,
+    callback: (conn: T) => Promise<R>,
     isolationLevel?: IsolationLevel,
   ): Promise<R>;
 
@@ -52,20 +54,20 @@ export interface Orm<TDef extends DbContextDef<any, any, any>> {
    * @param callback - DB 연결 후 실행할 콜백
    * @returns 콜백 결과
    */
-  connectWithoutTransaction<R>(callback: (conn: DbContextInstance<TDef>) => Promise<R>): Promise<R>;
+  connectWithoutTransaction<R>(callback: (conn: T) => Promise<R>): Promise<R>;
 }
 
 /**
  * Node.js ORM 팩토리 함수
  *
  * DbContext와 DB 연결을 관리하는 인스턴스를 생성한다.
- * DbContext 정의와 연결 설정을 받아 트랜잭션을 관리한다.
+ * DbContext 서브클래스와 연결 설정을 받아 트랜잭션을 관리한다.
  *
  * @example
  * ```typescript
- * const MyDb = defineDbContext({
- *   user: (db) => queryable(db, User),
- * });
+ * class MyDb extends DbContext {
+ *   user = this.queryable(User);
+ * }
  *
  * const orm = createOrm(MyDb, {
  *   dialect: "mysql",
@@ -89,12 +91,12 @@ export interface Orm<TDef extends DbContextDef<any, any, any>> {
  * });
  * ```
  */
-export function createOrm<TDef extends DbContextDef<any, any, any>>(
-  dbContextDef: TDef,
+export function createOrm<T extends DbContext>(
+  DbClass: new (executor: DbContextExecutor, opt: { database: string; schema?: string }) => T,
   config: DbConnConfig,
   options?: OrmOptions,
-): Orm<TDef> {
-  function _createDbContext(): DbContextInstance<TDef> {
+): Orm<T> {
+  function _createInstance(): T {
     // options의 database를 우선 사용, 없으면 config에서
     const database = options?.database ?? ("database" in config ? config.database : undefined);
     if (database == null || database === "") {
@@ -104,22 +106,22 @@ export function createOrm<TDef extends DbContextDef<any, any, any>>(
     // options의 schema를 우선 사용, 없으면 config에서
     const schema = options?.schema ?? ("schema" in config ? config.schema : undefined);
 
-    return createDbContext(dbContextDef, new NodeDbContextExecutor(config), {
+    return new DbClass(new NodeDbContextExecutor(config), {
       database,
       schema,
     });
   }
 
   return {
-    dbContextDef,
+    DbClass,
     config,
     options,
     async connect(callback, isolationLevel?) {
-      const db = _createDbContext();
+      const db = _createInstance();
       return db.connect(async () => callback(db), isolationLevel);
     },
     async connectWithoutTransaction(callback) {
-      const db = _createDbContext();
+      const db = _createInstance();
       return db.connectWithoutTransaction(async () => callback(db));
     },
   };