@simplysm/service-client 14.0.89 → 14.0.90

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,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,EAC5B,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAClC,OAAO,CAAC,CAAC,CAAC,CAAC;IACd,yBAAyB,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,EAC9C,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAClC,OAAO,CAAC,CAAC,CAAC,CAAC;CACf;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,aAAa,GAAG,kBAAkB,CAkDzF"}
+{"version":3,"file":"orm-client-connector.d.ts","sourceRoot":"","sources":["../../../src/features/orm/orm-client-connector.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,EAC5B,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAClC,OAAO,CAAC,CAAC,CAAC,CAAC;IACd,yBAAyB,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,EAC9C,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAClC,OAAO,CAAC,CAAC,CAAC,CAAC;CACf;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,aAAa,GAAG,kBAAkB,CAsDzF"}

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

@@ -1,5 +1,6 @@
 import { OrmClientDbContextExecutor } from "./orm-client-db-context-executor.js";
 import {} from "@simplysm/orm-common";
+import { SdError } from "@simplysm/core-common";
 export function createOrmClientConnector(serviceClient) {
     async function _createConfiguredDb(config) {
         const executor = new OrmClientDbContextExecutor(serviceClient, config.connOpt);
@@ -21,9 +22,11 @@ export function createOrmClientConnector(serviceClient) {
             }
             catch (err) {
                 if (err instanceof Error &&
-                    (err.message.includes("a parent row: a foreign key constraint") ||
-                        err.message.includes("conflicted with the REFERENCE"))) {
-                    throw new Error("경고! 연관된 작업으로 인해 작업이 거부되었습니다. 후속 작업을 확인해 주세요.", { cause: err });
+                    (err.message.includes("a parent row: a foreign key constraint") || // MySQL
+                        err.message.includes("conflicted with the REFERENCE") || // MSSQL
+                        err.message.includes("violates foreign key constraint")) // PostgreSQL
+                ) {
+                    throw new SdError(err, "경고! 연관된 작업으로 인해 작업이 거부되었습니다. 후속 작업을 확인해 주세요.");
                 }
                 throw err;
             }

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

@@ -1 +1 @@
-{"version":3,"file":"orm-client-connector.js","sourceRoot":"","sources":["../../../src/features/orm/orm-client-connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E,OAAO,EAAkB,MAAM,sBAAsB,CAAC;AActD,MAAM,UAAU,wBAAwB,CAAC,aAA4B;IACnE,KAAK,UAAU,mBAAmB,CAChC,MAA4B;QAE5B,MAAM,QAAQ,GAAG,IAAI,0BAA0B,CAAC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/E,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,EAAE,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC;QAChE,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YAClC,QAAQ;YACR,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,IAAI,IAAI,CAAC,MAAM;SACnD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,UAAU,OAAO,CACpB,MAA4B,EAC5B,QAAmC;QAEnC,MAAM,EAAE,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC3B,IAAI,CAAC;gBACH,OAAO,MAAM,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC5B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IACE,GAAG,YAAY,KAAK;oBACpB,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,wCAAwC,CAAC;wBAC7D,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC,EACxD,CAAC;oBACD,MAAM,IAAI,KAAK,CAAC,8CAA8C,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;gBAClF,CAAC;gBAED,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,UAAU,yBAAyB,CACtC,MAA4B,EAC5B,QAAmC;QAEnC,MAAM,EAAE,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,EAAE,CAAC,yBAAyB,CAAC,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,OAAO;QACL,OAAO;QACP,yBAAyB;KAC1B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"orm-client-connector.js","sourceRoot":"","sources":["../../../src/features/orm/orm-client-connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E,OAAO,EAAkB,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAahD,MAAM,UAAU,wBAAwB,CAAC,aAA4B;IACnE,KAAK,UAAU,mBAAmB,CAChC,MAA4B;QAE5B,MAAM,QAAQ,GAAG,IAAI,0BAA0B,CAAC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/E,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,EAAE,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC;QAChE,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YAClC,QAAQ;YACR,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,IAAI,IAAI,CAAC,MAAM;SACnD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,UAAU,OAAO,CACpB,MAA4B,EAC5B,QAAmC;QAEnC,MAAM,EAAE,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC3B,IAAI,CAAC;gBACH,OAAO,MAAM,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC5B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IACE,GAAG,YAAY,KAAK;oBACpB,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,wCAAwC,CAAC,IAAI,QAAQ;wBACzE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAC,IAAI,QAAQ;wBACjE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC,CAAC,aAAa;kBACxE,CAAC;oBACD,MAAM,IAAI,OAAO,CACf,GAAG,EACH,8CAA8C,CAC/C,CAAC;gBACJ,CAAC;gBAED,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,UAAU,yBAAyB,CACtC,MAA4B,EAC5B,QAAmC;QAEnC,MAAM,EAAE,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,EAAE,CAAC,yBAAyB,CAAC,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,OAAO;QACL,OAAO;QACP,yBAAyB;KAC1B,CAAC;AACJ,CAAC"}

package/dist/features/orm/orm-connect-options.d.ts

@@ -10,7 +10,7 @@ export interface OrmConnectOptions<T extends DbContext> {
     };
     dbContextOpt?: {
         database: string;
-        schema: string;
+        schema?: string;
     };
 }
 //# sourceMappingURL=orm-connect-options.d.ts.map

package/dist/features/orm/orm-connect-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orm-connect-options.d.ts","sourceRoot":"","sources":["../../../src/features/orm/orm-connect-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,SAAS;IACpD,OAAO,EAAE,KAAK,QAAQ,EAAE,iBAAiB,EAAE,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,CAAC,CAAC;IAC5F,OAAO,EAAE,aAAa,GAAG;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,YAAY,CAAC,EAAE;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH"}
+{"version":3,"file":"orm-connect-options.d.ts","sourceRoot":"","sources":["../../../src/features/orm/orm-connect-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,SAAS;IACpD,OAAO,EAAE,KAAK,QAAQ,EAAE,iBAAiB,EAAE,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,CAAC,CAAC;IAC5F,OAAO,EAAE,aAAa,GAAG;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,YAAY,CAAC,EAAE;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/service-client",
-  "version": "14.0.89",
+  "version": "14.0.90",
   "description": "심플리즘 패키지 - 서비스 (client)",
   "author": "심플리즘",
   "license": "Apache-2.0",
@@ -18,9 +18,9 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@simplysm/core-common": "14.0.89",
-    "@simplysm/orm-common": "14.0.89",
-    "@simplysm/service-common": "14.0.89"
+    "@simplysm/service-common": "14.0.90",
+    "@simplysm/orm-common": "14.0.90",
+    "@simplysm/core-common": "14.0.90"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",

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

@@ -1,67 +1,72 @@
-import { OrmClientDbContextExecutor } from "./orm-client-db-context-executor";
-import type { OrmConnectOptions } from "./orm-connect-options";
-import { type DbContext } from "@simplysm/orm-common";
-import type { ServiceClient } from "../../service-client";
-
-export interface OrmClientConnector {
-  connect<T extends DbContext, R>(
-    config: OrmConnectOptions<T>,
-    callback: (db: T) => Promise<R> | R,
-  ): Promise<R>;
-  connectWithoutTransaction<T extends DbContext, R>(
-    config: OrmConnectOptions<T>,
-    callback: (db: T) => Promise<R> | R,
-  ): Promise<R>;
-}
-
-export function createOrmClientConnector(serviceClient: ServiceClient): OrmClientConnector {
-  async function _createConfiguredDb<T extends DbContext>(
-    config: OrmConnectOptions<T>,
-  ): Promise<T> {
-    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는 필수입니다.");
-    }
-    return new config.DbClass(executor, {
-      database,
-      schema: config.dbContextOpt?.schema ?? info.schema,
-    });
-  }
-
-  async function connect<T extends DbContext, R>(
-    config: OrmConnectOptions<T>,
-    callback: (db: T) => Promise<R> | R,
-  ): Promise<R> {
-    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"))
-        ) {
-          throw new Error("경고! 연관된 작업으로 인해 작업이 거부되었습니다. 후속 작업을 확인해 주세요.", { cause: err });
-        }
-
-        throw err;
-      }
-    });
-  }
-
-  async function connectWithoutTransaction<T extends DbContext, R>(
-    config: OrmConnectOptions<T>,
-    callback: (db: T) => Promise<R> | R,
-  ): Promise<R> {
-    const db = await _createConfiguredDb(config);
-    return db.connectWithoutTransaction(async () => callback(db));
-  }
-
-  return {
-    connect,
-    connectWithoutTransaction,
-  };
-}
+import { OrmClientDbContextExecutor } from "./orm-client-db-context-executor";
+import type { OrmConnectOptions } from "./orm-connect-options";
+import { type DbContext } from "@simplysm/orm-common";
+import type { ServiceClient } from "../../service-client";
+import { SdError } from "@simplysm/core-common";
+
+export interface OrmClientConnector {
+  connect<T extends DbContext, R>(
+    config: OrmConnectOptions<T>,
+    callback: (db: T) => Promise<R> | R,
+  ): Promise<R>;
+  connectWithoutTransaction<T extends DbContext, R>(
+    config: OrmConnectOptions<T>,
+    callback: (db: T) => Promise<R> | R,
+  ): Promise<R>;
+}
+
+export function createOrmClientConnector(serviceClient: ServiceClient): OrmClientConnector {
+  async function _createConfiguredDb<T extends DbContext>(
+    config: OrmConnectOptions<T>,
+  ): Promise<T> {
+    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는 필수입니다.");
+    }
+    return new config.DbClass(executor, {
+      database,
+      schema: config.dbContextOpt?.schema ?? info.schema,
+    });
+  }
+
+  async function connect<T extends DbContext, R>(
+    config: OrmConnectOptions<T>,
+    callback: (db: T) => Promise<R> | R,
+  ): Promise<R> {
+    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") || // MySQL
+            err.message.includes("conflicted with the REFERENCE") || // MSSQL
+            err.message.includes("violates foreign key constraint")) // PostgreSQL
+        ) {
+          throw new SdError(
+            err,
+            "경고! 연관된 작업으로 인해 작업이 거부되었습니다. 후속 작업을 확인해 주세요.",
+          );
+        }
+
+        throw err;
+      }
+    });
+  }
+
+  async function connectWithoutTransaction<T extends DbContext, R>(
+    config: OrmConnectOptions<T>,
+    callback: (db: T) => Promise<R> | R,
+  ): Promise<R> {
+    const db = await _createConfiguredDb(config);
+    return db.connectWithoutTransaction(async () => callback(db));
+  }
+
+  return {
+    connect,
+    connectWithoutTransaction,
+  };
+}

package/src/features/orm/orm-connect-options.ts

@@ -6,6 +6,6 @@ export interface OrmConnectOptions<T extends DbContext> {
   connOpt: DbConnOptions & { configName: string };
   dbContextOpt?: {
     database: string;
-    schema: string;
+    schema?: string;
   };
 }