@technicity/data-service-generator 0.22.1 → 0.22.2-next.1

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,
@@ -247,11 +252,13 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts,
     runtime: IRuntime;
     onHandlerMap: Map<string, TOnHandler>;
     eventTarget: EventTarget;
+    passBeforeValueToAfterCallback: boolean;
   
     constructor(opts: {
       runtime: any;
       clientOpts: { [k: string]: any; },
-      otherOpts?: { [k: string]: any; }
+      otherOpts?: { [k: string]: any; },
+      passBeforeValueToAfterCallback: boolean,
      }) {
       let otherOpts = opts.otherOpts ?? {};
       if (opts.clientOpts.filename === ":memory:") {
@@ -264,6 +271,7 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts,
         : "otherOpts"}, artifacts);
       this.onHandlerMap = new Map();
       this.eventTarget = new EventTarget();
+      this.passBeforeValueToAfterCallback = opts.passBeforeValueToAfterCallback;
     }
 
     $use(middleware: TMiddleware) {
@@ -371,10 +379,23 @@ 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 === "patchList") {
+            return getMethodSourceOnHandlerPatchList(x);
+        }
+        if (x.kind === "deleteOne") {
+            const findOnes = await getFindOnes(x, specialCaseUuidColumn);
+            return getMethodSourceOnHandlerDeleteOne(x, findOnes);
+        }
+        if (x.kind === "deleteList") {
+            return getMethodSourceOnHandlerDeleteList(x);
+        }
     })))
         .filter(Boolean)
         .join("\n\n")}
@@ -495,7 +516,8 @@ function getMethodSourceGetOne(x, findOnes, isTransaction) {
       context: param2?.context,
       skipCache: param2?.skipCache,
       eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
-      ${isTransaction ? "dbCall" : ""}
+      ${isTransaction ? "dbCall," : ""}
+      passBeforeValueToAfterCallback: this.passBeforeValueToAfterCallback,
     }
   );
 }`;
@@ -516,7 +538,8 @@ function getMethodSourceGetList(x, isTransaction) {
         context: param2?.context,
         skipCache: param2?.skipCache,
         eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
-        ${isTransaction ? "dbCall" : ""}
+        ${isTransaction ? "dbCall," : ""}
+        passBeforeValueToAfterCallback: this.passBeforeValueToAfterCallback,
       }
     );
   }`;
@@ -537,7 +560,8 @@ function getMethodSourceGetListPaginated(x, isTransaction) {
         context: param2?.context,
         skipCache: param2?.skipCache,
         eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
-        ${isTransaction ? "dbCall" : ""}
+        ${isTransaction ? "dbCall," : ""}
+        passBeforeValueToAfterCallback: this.passBeforeValueToAfterCallback,
       }
     );
   }`;
@@ -559,10 +583,21 @@ function getMethodSourcePostOne(x, specialCaseUuidColumn, isTransaction) {
     onHandler: ${isTransaction ? "onHandlerMap" : "this.onHandlerMap"}.get("${mapKindToAction(x.kind)}-${x.table}"),
     asyncLocalStorage,
     sdk: this,
-    ${isTransaction ? "dbCall" : ""}
+    ${isTransaction ? "dbCall," : ""}
+    passBeforeValueToAfterCallback: this.passBeforeValueToAfterCallback,
   });
 }`;
 }
+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}>(
@@ -584,7 +619,8 @@ return ${isTransaction ? "runtime" : "this.runtime"}.resolve({
   onHandler: ${isTransaction ? "onHandlerMap" : "this.onHandlerMap"}.get("${mapKindToAction(x.kind)}-${x.table}"),
   asyncLocalStorage,
   sdk: this,
-  ${isTransaction ? "dbCall" : ""}
+  ${isTransaction ? "dbCall," : ""}
+  passBeforeValueToAfterCallback: this.passBeforeValueToAfterCallback,
 });
 }`;
 }
@@ -593,7 +629,9 @@ 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)}>,
+    before: ${getTypeReturnName(x.table)} | null,
+    context: TContext,
   ) => Promise<void>
 ): void {
   this.onHandlerMap.set("${mapKindToAction(x.kind)}-${x.table}", handler);
@@ -618,10 +656,22 @@ function getMethodSourcePatchList(x, isTransaction) {
     onHandler: ${isTransaction ? "onHandlerMap" : "this.onHandlerMap"}.get("${mapKindToAction(x.kind)}-${x.table}"),
     asyncLocalStorage,
     sdk: this,
-    ${isTransaction ? "dbCall" : ""}
+    ${isTransaction ? "dbCall," : ""}
+    passBeforeValueToAfterCallback: this.passBeforeValueToAfterCallback,
   });
 }`;
 }
+function getMethodSourceOnHandlerPatchList(x) {
+    return `on${(0, capitalizeFirstLetter_1.capitalizeFirstLetter)(x.methodName)}(handler:
+    (sdk: InstanceType<typeof SDK>, input: { $where?: ${x.typeWhereName}, $orderBy?: ${x.typeOrderByName}, data: ${x.typeDataName} },
+    output: Partial<${getTypeReturnName(x.table)}>[],
+    before: ${getTypeReturnName(x.table)}[] | null,
+    context: TContext,
+  ) => Promise<void>
+): void {
+  this.onHandlerMap.set("${mapKindToAction(x.kind)}-${x.table}", handler);
+}`;
+}
 function getMethodSourceDeleteOne(x, findOnes, isTransaction) {
     return `async ${x.methodName}(
     param1: ${findOnes
@@ -639,10 +689,23 @@ function getMethodSourceDeleteOne(x, findOnes, isTransaction) {
     onHandler: ${isTransaction ? "onHandlerMap" : "this.onHandlerMap"}.get("${mapKindToAction(x.kind)}-${x.table}"),
     asyncLocalStorage,
     sdk: this,
-    ${isTransaction ? "dbCall" : ""}
+    ${isTransaction ? "dbCall," : ""}
+    passBeforeValueToAfterCallback: this.passBeforeValueToAfterCallback,
   });
 }`;
 }
+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} },
@@ -658,10 +721,22 @@ function getMethodSourceDeleteList(x, isTransaction) {
       onHandler: ${isTransaction ? "onHandlerMap" : "this.onHandlerMap"}.get("${mapKindToAction(x.kind)}-${x.table}"),
       asyncLocalStorage,
       sdk: this,
-      ${isTransaction ? "dbCall" : ""}
+      ${isTransaction ? "dbCall," : ""}
+      passBeforeValueToAfterCallback: this.passBeforeValueToAfterCallback,
     });
   }`;
 }
+function getMethodSourceOnHandlerDeleteList(x) {
+    return `on${(0, capitalizeFirstLetter_1.capitalizeFirstLetter)(x.methodName)}(handler:
+    (sdk: InstanceType<typeof SDK>, input: { $where?: ${x.typeWhereName} },
+    output: void,
+    before: ${getTypeReturnName(x.table)}[] | null,
+    context: TContext,
+  ) => Promise<void>
+): void {
+  this.onHandlerMap.set("${mapKindToAction(x.kind)}-${x.table}", handler);
+}`;
+}
 function mapKindToAction(kind) {
     if (kind === "getOne") {
         return "findUnique";

package/dist/runtime/IRuntime.d.ts

@@ -27,13 +27,18 @@ export type TResolveParams = {
         isInOnHandler?: boolean;
         isTransaction?: boolean;
     }>;
+    passBeforeValueToAfterCallback: boolean;
     sdk?: unknown;
 };
-export type TOnHandler = (sdk: unknown, input: unknown, output: unknown) => Promise<void>;
+export type TOnHandler = (sdk: unknown, input: unknown, output: unknown, before: 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

@@ -59,23 +59,38 @@ async function resolve(input, dbCall, formatQuery, beginTransaction, dialect, mi
     if (middlewareHandler.length() > 0) {
         const resource = new async_hooks_1.AsyncResource("sdk-request");
         const params = input;
-        const consumer = (paramsMaybeMutated) => {
+        const consumer = async (paramsMaybeMutated) => {
             const nextMiddleware = middlewareHandler.get(++index);
             if (nextMiddleware != null) {
                 return nextMiddleware(paramsMaybeMutated, consumer);
             }
             const paramsChanged = { ...input, ...params };
-            const p = _resolve(paramsChanged, dbCall, formatQuery, beginTransaction, dialect, context, cache);
             const onHandler = input.onHandler;
             const asyncLocalStorage = input.asyncLocalStorage;
-            if (typeof onHandler === "function" &&
+            const shouldRunOnHandler = typeof onHandler === "function" &&
                 asyncLocalStorage != null &&
-                asyncLocalStorage?.getStore()?.isInOnHandler !== true) {
+                asyncLocalStorage?.getStore()?.isInOnHandler !== true;
+            const beforeValue = shouldRunOnHandler && input.passBeforeValueToAfterCallback
+                ? await _resolve({
+                    ...paramsChanged,
+                    action: paramsChanged.action === "updateMany" ||
+                        paramsChanged.action === "deleteMany"
+                        ? "findMany"
+                        : "findUnique",
+                    fields: undefined
+                }, dbCall, formatQuery, beginTransaction, dialect, context, cache)
+                : null;
+            const p = _resolve(paramsChanged, dbCall, formatQuery, beginTransaction, dialect, context, cache);
+            if (shouldRunOnHandler) {
                 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, beforeValue, 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;
                 }));
             }
@@ -83,17 +98,31 @@ async function resolve(input, dbCall, formatQuery, beginTransaction, dialect, mi
         };
         return resource.runInAsyncScope(() => consumer(params));
     }
-    const p = _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache);
     const onHandler = input.onHandler;
     const asyncLocalStorage = input.asyncLocalStorage;
-    if (typeof onHandler === "function" &&
+    const shouldRunOnHandler = typeof onHandler === "function" &&
         asyncLocalStorage != null &&
-        asyncLocalStorage?.getStore()?.isInOnHandler !== true) {
+        asyncLocalStorage?.getStore()?.isInOnHandler !== true;
+    const beforeValue = shouldRunOnHandler && input.passBeforeValueToAfterCallback
+        ? await _resolve({
+            ...input,
+            action: input.action === "updateMany" || input.action === "deleteMany"
+                ? "findMany"
+                : "findUnique",
+            fields: undefined
+        }, dbCall, formatQuery, beginTransaction, dialect, context, cache)
+        : null;
+    const p = _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache);
+    if (shouldRunOnHandler) {
         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, beforeValue, 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.1",
+  "version": "0.22.2-next.1",
   "main": "./dist/index.js",
   "files": [
     "dist"