@technicity/data-service-generator 0.22.0 → 0.22.2-next.0

package/dist/generation/generate.js

@@ -111,6 +111,11 @@ async function generate(input) {
         devDependencies: {
             "@types/node": require("../../package.json").devDependencies["@types/node"],
             typescript: require("../../package.json").devDependencies.typescript
+        },
+        // Not `resolutions` because npm used for install
+        overrides: {
+            // Fix for: `Cannot find type definition file for 'glob'`
+            glob: ">9.0.0"
         }
     };
     const tmpDirPath = path.join(os.tmpdir(), 
@@ -159,8 +164,8 @@ async function generate(input) {
     // TODO: workaround for IRuntime.d.ts not being included
     // copyFileSync hangs for some reason, so use writeFileSync + readFileSync instead
     fs.writeFileSync(path.join(tmpBuildOutputPath, "IRuntime.d.ts"), fs.existsSync(path.join(__dirname, "../runtime", "IRuntime.d.ts"))
-        ? fs.readFileSync(path.join(__dirname, "../runtime", "IRuntime.d.ts"))
-        : fs.readFileSync(sourceIRuntimeFilePath));
+        ? fs.readFileSync(path.join(__dirname, "../runtime", "IRuntime.d.ts"), "utf-8")
+        : fs.readFileSync(sourceIRuntimeFilePath, "utf-8"));
     if (dialect === "mysql" && input.outputSqliteSchema) {
         // Since mysql2sqlite outputs a malformed string if a column
         // has the name `enum`, temporarily change the name to something else,
@@ -371,10 +376,17 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts,
     }))).join("\n\n")}
 
     ${(await Promise.all(input.flatMap(async (x) => {
+        if (x.kind === "postOne") {
+            return getMethodSourceOnHandlerPostOne(x);
+        }
         if (x.kind === "patchOne") {
             const findOnes = await getFindOnes(x, specialCaseUuidColumn);
             return getMethodSourceOnHandlerPatchOne(x, findOnes);
         }
+        if (x.kind === "deleteOne") {
+            const findOnes = await getFindOnes(x, specialCaseUuidColumn);
+            return getMethodSourceOnHandlerDeleteOne(x, findOnes);
+        }
     })))
         .filter(Boolean)
         .join("\n\n")}
@@ -563,6 +575,16 @@ function getMethodSourcePostOne(x, specialCaseUuidColumn, isTransaction) {
   });
 }`;
 }
+function getMethodSourceOnHandlerPostOne(x) {
+    return `on${(0, capitalizeFirstLetter_1.capitalizeFirstLetter)(x.methodName)}(handler:
+    (sdk: InstanceType<typeof SDK>, input: { data: ${x.typeDataName} },
+    output: Partial<${getTypeReturnName(x.table)}>,
+    context: TContext,
+  ) => Promise<void>
+): void {
+  this.onHandlerMap.set("${mapKindToAction(x.kind)}-${x.table}", handler);
+}`;
+}
 function getMethodSourcePatchOne(x, findOnes, isTransaction) {
     const param2 = `{ ${keyFields}?: ${x.typeFieldsName}, correlationId?: string, context?: TContext }`;
     return `async ${x.methodName}<T extends ${param2}>(
@@ -593,7 +615,8 @@ function getMethodSourceOnHandlerPatchOne(x, findOnes) {
     (sdk: InstanceType<typeof SDK>, input: { $where: ${findOnes
         .map((findOne) => `{ ${findOne.name}: ${findOne.type}${findOne.nullable ? " | null" : ""} }`)
         .join(" | ")}, data: ${x.typeDataName} },
-    output: Partial<${getTypeReturnName(x.table)}>
+    output: Partial<${getTypeReturnName(x.table)}>,
+    context: TContext,
   ) => Promise<void>
 ): void {
   this.onHandlerMap.set("${mapKindToAction(x.kind)}-${x.table}", handler);
@@ -643,6 +666,18 @@ function getMethodSourceDeleteOne(x, findOnes, isTransaction) {
   });
 }`;
 }
+function getMethodSourceOnHandlerDeleteOne(x, findOnes) {
+    return `on${(0, capitalizeFirstLetter_1.capitalizeFirstLetter)(x.methodName)}(handler:
+    (sdk: InstanceType<typeof SDK>, input: { $where: ${findOnes
+        .map((findOne) => `{ ${findOne.name}: ${findOne.type}${findOne.nullable ? " | null" : ""} }`)
+        .join(" | ")}, },
+    output: void,
+    context: TContext,
+  ) => Promise<void>
+): void {
+  this.onHandlerMap.set("${mapKindToAction(x.kind)}-${x.table}", handler);
+}`;
+}
 function getMethodSourceDeleteList(x, isTransaction) {
     return `async ${x.methodName}(
     param1: { $where?: ${x.typeWhereName} },

package/dist/runtime/IRuntime.d.ts

@@ -29,11 +29,15 @@ export type TResolveParams = {
     }>;
     sdk?: unknown;
 };
-export type TOnHandler = (sdk: unknown, input: unknown, output: unknown) => Promise<void>;
+export type TOnHandler = (sdk: unknown, input: unknown, output: unknown, TContext: TContext) => Promise<void>;
 export declare class EventOnHandlerError<T> extends Event {
     error: T;
+    resource: string;
+    action: TAction;
     constructor(message: string, data: ConstructorParameters<typeof Event>[1] & {
         error: T;
+        resource: string;
+        action: TAction;
     });
 }
 export type TContext = {

package/dist/runtime/IRuntime.js

@@ -5,6 +5,8 @@ class EventOnHandlerError extends Event {
     constructor(message, data) {
         super(message, data);
         this.error = data.error;
+        this.resource = data.resource;
+        this.action = data.action;
     }
 }
 exports.EventOnHandlerError = EventOnHandlerError;

package/dist/runtime/lib/shared.js

@@ -72,10 +72,10 @@ async function resolve(input, dbCall, formatQuery, beginTransaction, dialect, mi
                 asyncLocalStorage != null &&
                 asyncLocalStorage?.getStore()?.isInOnHandler !== true) {
                 return p.then((output) => asyncLocalStorage
-                    .run({ isInOnHandler: true }, async () => onHandler(input.sdk, { ...input.args, data: input.data }, output))
+                    .run({ isInOnHandler: true }, async () => onHandler(input.sdk, { ...input.args, data: input.data }, output, context))
                     .then(() => output)
                     .catch((error) => {
-                    input.eventTarget.dispatchEvent(new IRuntime_1.EventOnHandlerError("error", { error }));
+                    input.eventTarget.dispatchEvent(new IRuntime_1.EventOnHandlerError("error", { error, resource: input.resource, action: input.action }));
                     return output;
                 }));
             }
@@ -90,10 +90,10 @@ async function resolve(input, dbCall, formatQuery, beginTransaction, dialect, mi
         asyncLocalStorage != null &&
         asyncLocalStorage?.getStore()?.isInOnHandler !== true) {
         return p.then((output) => asyncLocalStorage
-            .run({ isInOnHandler: true }, async () => onHandler(input.sdk, { ...input.args, data: input.data }, output))
+            .run({ isInOnHandler: true }, async () => onHandler(input.sdk, { ...input.args, data: input.data }, output, context))
             .then(() => output)
             .catch((error) => {
-            input.eventTarget.dispatchEvent(new IRuntime_1.EventOnHandlerError("error", { error }));
+            input.eventTarget.dispatchEvent(new IRuntime_1.EventOnHandlerError("error", { error, resource: input.resource, action: input.action }));
             return output;
         }));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.22.0",
+  "version": "0.22.2-next.0",
   "main": "./dist/index.js",
   "files": [
     "dist"
@@ -47,6 +47,6 @@
     "typescript": "5.5.2"
   },
   "resolutions": {
-    "tar-fs": "2.1.2"
+    "tar-fs": "2.1.3"
   }
 }