@simplysm/service-client 13.0.24 → 13.0.25

package/README.md

@@ -269,7 +269,7 @@ const connector = createOrmClientConnector(client);
 // Connect with transaction (auto rollback on error)
 await connector.connect(
   {
-    dbContextType: MyDbContext,
+    dbContextDef: MyDbContext,
     connOpt: { configName: "default" },
     dbContextOpt: { database: "mydb", schema: "dbo" }, // Optional
   },
@@ -283,7 +283,7 @@ await connector.connect(
 // Connect without transaction (suitable for read-only operations)
 await connector.connectWithoutTransaction(
   {
-    dbContextType: MyDbContext,
+    dbContextDef: MyDbContext,
     connOpt: { configName: "default" },
   },
   async (db) => {
@@ -370,7 +370,7 @@ ORM remote connection configuration interface.
 
 | Property | Type | Required | Description |
 |------|------|------|------|
-| `dbContextType` | `Type<T>` | Yes | DbContext class |
+| `dbContextDef` | `TDef` | Yes | DbContext class |
 | `connOpt` | `DbConnOptions & { configName: string }` | Yes | DB connection options. `configName` identifies the server-side DB config; `config` can pass additional connection settings |
 | `dbContextOpt` | `{ database: string; schema: string }` | No | Database/schema override |
 

package/dist/features/orm/orm-client-connector.d.ts

@@ -2,8 +2,8 @@ import type { OrmConnectConfig } from "./orm-connect-config";
 import { type DbContextDef, type DbContextInstance } from "@simplysm/orm-common";
 import type { ServiceClient } from "../../service-client";
 export interface OrmClientConnector {
-    connect<TDef extends DbContextDef<any, any, any>, R>(config: OrmConnectConfig<TDef>, callback: (conn: DbContextInstance<TDef>) => Promise<R> | R): Promise<R>;
-    connectWithoutTransaction<TDef extends DbContextDef<any, any, any>, R>(config: OrmConnectConfig<TDef>, callback: (conn: DbContextInstance<TDef>) => Promise<R> | R): Promise<R>;
+    connect<TDef extends DbContextDef<any, any, any>, R>(config: OrmConnectConfig<TDef>, callback: (db: DbContextInstance<TDef>) => Promise<R> | R): Promise<R>;
+    connectWithoutTransaction<TDef extends DbContextDef<any, any, any>, R>(config: OrmConnectConfig<TDef>, callback: (db: DbContextInstance<TDef>) => Promise<R> | R): Promise<R>;
 }
 export declare function createOrmClientConnector(serviceClient: ServiceClient): OrmClientConnector;
 //# sourceMappingURL=orm-client-connector.d.ts.map

package/dist/features/orm/orm-client-connector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orm-client-connector.d.ts","sourceRoot":"","sources":["../../../src/features/orm/orm-client-connector.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAmB,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAClG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,IAAI,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EACjD,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC9B,QAAQ,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAC1D,OAAO,CAAC,CAAC,CAAC,CAAC;IACd,yBAAyB,CAAC,IAAI,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EACnE,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC9B,QAAQ,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAC1D,OAAO,CAAC,CAAC,CAAC,CAAC;CACf;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,aAAa,GAAG,kBAAkB,CAqDzF"}
+{"version":3,"file":"orm-client-connector.d.ts","sourceRoot":"","sources":["../../../src/features/orm/orm-client-connector.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAmB,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAClG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,IAAI,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EACjD,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC9B,QAAQ,EAAE,CAAC,EAAE,EAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GACxD,OAAO,CAAC,CAAC,CAAC,CAAC;IACd,yBAAyB,CAAC,IAAI,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EACnE,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC9B,QAAQ,EAAE,CAAC,EAAE,EAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GACxD,OAAO,CAAC,CAAC,CAAC,CAAC;CACf;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,aAAa,GAAG,kBAAkB,CAkDzF"}

package/dist/features/orm/orm-client-connector.js

@@ -1,41 +1,34 @@
 import { OrmClientDbContextExecutor } from "./orm-client-db-context-executor.js";
 import { createDbContext } from "@simplysm/orm-common";
 function createOrmClientConnector(serviceClient) {
-  async function connect(config, callback) {
+  async function _createConfiguredDb(config) {
     var _a, _b;
     const executor = new OrmClientDbContextExecutor(serviceClient, config.connOpt);
     const info = await executor.getInfo();
     const database = ((_a = config.dbContextOpt) == null ? void 0 : _a.database) ?? info.database;
     if (database == null || database === "") {
-      throw new Error("Database name is required");
+      throw new Error("database is required");
     }
-    const db = createDbContext(config.dbContextDef, executor, {
+    return createDbContext(config.dbContextDef, executor, {
       database,
       schema: ((_b = config.dbContextOpt) == null ? void 0 : _b.schema) ?? info.schema
     });
+  }
+  async function connect(config, callback) {
+    const db = await _createConfiguredDb(config);
     return db.connect(async () => {
       try {
         return await callback(db);
       } catch (err) {
         if (err instanceof Error && (err.message.includes("a parent row: a foreign key constraint") || err.message.includes("conflicted with the REFERENCE"))) {
-          err.message = "\uACBD\uACE0! \uC5F0\uACB0\uB41C \uC791\uC5C5\uC5D0 \uC758\uD55C \uCC98\uB9AC \uAC70\uBD80. \uD6C4\uC18D\uC791\uC5C5 \uD655\uC778\uC694\uB9DD";
+          throw new Error("\uACBD\uACE0! \uC5F0\uACB0\uB41C \uC791\uC5C5\uC5D0 \uC758\uD55C \uCC98\uB9AC \uAC70\uBD80. \uD6C4\uC18D\uC791\uC5C5 \uD655\uC778\uC694\uB9DD", { cause: err });
         }
         throw err;
       }
     });
   }
   async function connectWithoutTransaction(config, callback) {
-    var _a, _b;
-    const executor = new OrmClientDbContextExecutor(serviceClient, config.connOpt);
-    const info = await executor.getInfo();
-    const database = ((_a = config.dbContextOpt) == null ? void 0 : _a.database) ?? info.database;
-    if (database == null || database === "") {
-      throw new Error("Database name is required");
-    }
-    const db = createDbContext(config.dbContextDef, executor, {
-      database,
-      schema: ((_b = config.dbContextOpt) == null ? void 0 : _b.schema) ?? info.schema
-    });
+    const db = await _createConfiguredDb(config);
     return db.connectWithoutTransaction(async () => callback(db));
   }
   return {

package/dist/features/orm/orm-client-connector.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/features/orm/orm-client-connector.ts"],
-  "mappings": "AAAA,SAAS,kCAAkC;AAE3C,SAAS,uBAAkE;AAcpE,SAAS,yBAAyB,eAAkD;AACzF,iBAAe,QACb,QACA,UACY;AApBhB;AAqBI,UAAM,WAAW,IAAI,2BAA2B,eAAe,OAAO,OAAO;AAC7E,UAAM,OAAO,MAAM,SAAS,QAAQ;AACpC,UAAM,aAAW,YAAO,iBAAP,mBAAqB,aAAY,KAAK;AACvD,QAAI,YAAY,QAAQ,aAAa,IAAI;AACvC,YAAM,IAAI,MAAM,2BAA2B;AAAA,IAC7C;AACA,UAAM,KAAK,gBAAgB,OAAO,cAAc,UAAU;AAAA,MACxD;AAAA,MACA,UAAQ,YAAO,iBAAP,mBAAqB,WAAU,KAAK;AAAA,IAC9C,CAAC;AACD,WAAO,GAAG,QAAQ,YAAY;AAC5B,UAAI;AACF,eAAO,MAAM,SAAS,EAAE;AAAA,MAC1B,SAAS,KAAK;AACZ,YACE,eAAe,UACd,IAAI,QAAQ,SAAS,wCAAwC,KAC5D,IAAI,QAAQ,SAAS,+BAA+B,IACtD;AACA,cAAI,UAAU;AAAA,QAChB;AAEA,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AAEA,iBAAe,0BACb,QACA,UACY;AAnDhB;AAoDI,UAAM,WAAW,IAAI,2BAA2B,eAAe,OAAO,OAAO;AAC7E,UAAM,OAAO,MAAM,SAAS,QAAQ;AACpC,UAAM,aAAW,YAAO,iBAAP,mBAAqB,aAAY,KAAK;AACvD,QAAI,YAAY,QAAQ,aAAa,IAAI;AACvC,YAAM,IAAI,MAAM,2BAA2B;AAAA,IAC7C;AACA,UAAM,KAAK,gBAAgB,OAAO,cAAc,UAAU;AAAA,MACxD;AAAA,MACA,UAAQ,YAAO,iBAAP,mBAAqB,WAAU,KAAK;AAAA,IAC9C,CAAC;AACD,WAAO,GAAG,0BAA0B,YAAY,SAAS,EAAE,CAAC;AAAA,EAC9D;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;",
+  "mappings": "AAAA,SAAS,kCAAkC;AAE3C,SAAS,uBAAkE;AAcpE,SAAS,yBAAyB,eAAkD;AACzF,iBAAe,oBACb,QACkC;AAnBtC;AAoBI,UAAM,WAAW,IAAI,2BAA2B,eAAe,OAAO,OAAO;AAC7E,UAAM,OAAO,MAAM,SAAS,QAAQ;AACpC,UAAM,aAAW,YAAO,iBAAP,mBAAqB,aAAY,KAAK;AACvD,QAAI,YAAY,QAAQ,aAAa,IAAI;AACvC,YAAM,IAAI,MAAM,sBAAsB;AAAA,IACxC;AACA,WAAO,gBAAgB,OAAO,cAAc,UAAU;AAAA,MACpD;AAAA,MACA,UAAQ,YAAO,iBAAP,mBAAqB,WAAU,KAAK;AAAA,IAC9C,CAAC;AAAA,EACH;AAEA,iBAAe,QACb,QACA,UACY;AACZ,UAAM,KAAK,MAAM,oBAAoB,MAAM;AAC3C,WAAO,GAAG,QAAQ,YAAY;AAC5B,UAAI;AACF,eAAO,MAAM,SAAS,EAAE;AAAA,MAC1B,SAAS,KAAK;AACZ,YACE,eAAe,UACd,IAAI,QAAQ,SAAS,wCAAwC,KAC5D,IAAI,QAAQ,SAAS,+BAA+B,IACtD;AACA,gBAAM,IAAI,MAAM,iJAAmC,EAAE,OAAO,IAAI,CAAC;AAAA,QACnE;AAEA,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AAEA,iBAAe,0BACb,QACA,UACY;AACZ,UAAM,KAAK,MAAM,oBAAoB,MAAM;AAC3C,WAAO,GAAG,0BAA0B,YAAY,SAAS,EAAE,CAAC;AAAA,EAC9D;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/service-client",
-  "version": "13.0.24",
+  "version": "13.0.25",
   "description": "심플리즘 패키지 - 서비스 모듈 (client)",
   "author": "김석래",
   "license": "Apache-2.0",
@@ -19,9 +19,9 @@
   "sideEffects": false,
   "dependencies": {
     "consola": "^3.4.2",
-    "@simplysm/core-common": "13.0.24",
-    "@simplysm/service-common": "13.0.24",
-    "@simplysm/orm-common": "13.0.24"
+    "@simplysm/core-common": "13.0.25",
+    "@simplysm/orm-common": "13.0.25",
+    "@simplysm/service-common": "13.0.25"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",

package/src/features/orm/orm-client-connector.ts

@@ -6,29 +6,35 @@ import type { ServiceClient } from "../../service-client";
 export interface OrmClientConnector {
   connect<TDef extends DbContextDef<any, any, any>, R>(
     config: OrmConnectConfig<TDef>,
-    callback: (conn: DbContextInstance<TDef>) => Promise<R> | R,
+    callback: (db: DbContextInstance<TDef>) => Promise<R> | R,
   ): Promise<R>;
   connectWithoutTransaction<TDef extends DbContextDef<any, any, any>, R>(
     config: OrmConnectConfig<TDef>,
-    callback: (conn: DbContextInstance<TDef>) => Promise<R> | R,
+    callback: (db: DbContextInstance<TDef>) => Promise<R> | R,
   ): Promise<R>;
 }
 
 export function createOrmClientConnector(serviceClient: ServiceClient): OrmClientConnector {
-  async function connect<TDef extends DbContextDef<any, any, any>, R>(
+  async function _createConfiguredDb<TDef extends DbContextDef<any, any, any>>(
     config: OrmConnectConfig<TDef>,
-    callback: (conn: DbContextInstance<TDef>) => Promise<R> | R,
-  ): Promise<R> {
+  ): Promise<DbContextInstance<TDef>> {
     const executor = new OrmClientDbContextExecutor(serviceClient, config.connOpt);
     const info = await executor.getInfo();
     const database = config.dbContextOpt?.database ?? info.database;
     if (database == null || database === "") {
-      throw new Error("Database name is required");
+      throw new Error("database is required");
     }
-    const db = createDbContext(config.dbContextDef, executor, {
+    return createDbContext(config.dbContextDef, executor, {
       database,
       schema: config.dbContextOpt?.schema ?? info.schema,
     });
+  }
+
+  async function connect<TDef extends DbContextDef<any, any, any>, R>(
+    config: OrmConnectConfig<TDef>,
+    callback: (db: DbContextInstance<TDef>) => Promise<R> | R,
+  ): Promise<R> {
+    const db = await _createConfiguredDb(config);
     return db.connect(async () => {
       try {
         return await callback(db);
@@ -38,7 +44,7 @@ export function createOrmClientConnector(serviceClient: ServiceClient): OrmClien
           (err.message.includes("a parent row: a foreign key constraint") ||
             err.message.includes("conflicted with the REFERENCE"))
         ) {
-          err.message = "경고! 연결된 작업에 의한 처리 거부. 후속작업 확인요망";
+          throw new Error("경고! 연결된 작업에 의한 처리 거부. 후속작업 확인요망", { cause: err });
         }
 
         throw err;
@@ -48,18 +54,9 @@ export function createOrmClientConnector(serviceClient: ServiceClient): OrmClien
 
   async function connectWithoutTransaction<TDef extends DbContextDef<any, any, any>, R>(
     config: OrmConnectConfig<TDef>,
-    callback: (conn: DbContextInstance<TDef>) => Promise<R> | R,
+    callback: (db: DbContextInstance<TDef>) => Promise<R> | R,
   ): Promise<R> {
-    const executor = new OrmClientDbContextExecutor(serviceClient, config.connOpt);
-    const info = await executor.getInfo();
-    const database = config.dbContextOpt?.database ?? info.database;
-    if (database == null || database === "") {
-      throw new Error("Database name is required");
-    }
-    const db = createDbContext(config.dbContextDef, executor, {
-      database,
-      schema: config.dbContextOpt?.schema ?? info.schema,
-    });
+    const db = await _createConfiguredDb(config);
     return db.connectWithoutTransaction(async () => callback(db));
   }