@technicity/data-service-generator 0.14.4 → 0.15.0

package/dist/generation/generate.js

@@ -43,6 +43,7 @@ const json_schema_to_typescript_1 = require("json-schema-to-typescript");
 const getDuplicates_1 = require("../lib/getDuplicates");
 const isNotNullOrUndefined_1 = require("../lib/isNotNullOrUndefined");
 const MySQL_1 = require("../runtime/lib/MySQL");
+const capitalizeFirstLetter_1 = require("../lib/capitalizeFirstLetter");
 // json-schema-to-typescript inlines everything. We don't want that,
 // so use `tsType`, and add imports manually.
 // https://github.com/bcherny/json-schema-to-typescript#custom-schema-properties
@@ -256,13 +257,18 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts,
             .concat(Array.from(set).sort())
             .join(",\n")} } from "./types";`;
     }
-    const src = `import type { IRuntime, TMiddleware, TContext } from "./IRuntime"
+    const src = `import { AsyncLocalStorage } from "node:async_hooks";
+  import type { IRuntime, TMiddleware, TContext, TOnHandler, EventOnHandlerError } from "./IRuntime"
   import { artifacts } from "./artifacts";
 
   ${getTypeImports()}
 
+  const asyncLocalStorage = new AsyncLocalStorage<{ isInOnHandler: boolean }>();
+
   export class SDK {
     runtime: IRuntime;
+    onHandlerMap: Map<string, TOnHandler>;
+    eventTarget: EventTarget;
   
     constructor(opts: {
       runtime: any;
@@ -276,6 +282,8 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts,
       this.runtime = new opts.runtime(opts.clientOpts, ${supplementClientOpts === true
         ? "{ supplementClientOpts: true, ...otherOpts }"
         : "otherOpts"}, artifacts);
+      this.onHandlerMap = new Map();
+      this.eventTarget = new EventTarget();
     }
 
     $use(middleware: TMiddleware) {
@@ -310,6 +318,8 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts,
     }) {
       const { dbCall, commit, rollback } = await this.runtime.$startTransaction(input);
       const runtime = this.runtime;
+      const eventTarget = this.eventTarget;
+      const onHandlerMap = this.onHandlerMap;
       return {
         $commit: commit,
         $rollback: rollback,
@@ -345,6 +355,10 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts,
       }
     }
 
+    onOnHandlerError(cb: (event: EventOnHandlerError<unknown>) => void) {
+      this.eventTarget.addEventListener("error", cb);
+    }
+
     ${(await Promise.all(input.flatMap(async (x) => {
         if (x.kind === "getOne") {
             const findOnes = await getFindOnes(x, specialCaseUuidColumn);
@@ -374,6 +388,15 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts,
             return getMethodSourceDeleteList(x, false);
         }
     }))).join("\n\n")}
+
+    ${(await Promise.all(input.flatMap(async (x) => {
+        if (x.kind === "patchOne") {
+            const findOnes = await getFindOnes(x, specialCaseUuidColumn);
+            return getMethodSourceOnHandlerPatchOne(x, findOnes);
+        }
+    })))
+        .filter(Boolean)
+        .join("\n\n")}
   }
 
   ${await Promise.all(Object.entries(artifacts).map(async ([table, tableArtifacts]) => {
@@ -490,6 +513,7 @@ function getMethodSourceGetOne(x, findOnes, isTransaction) {
       artifacts,
       context: param2?.context,
       skipCache: param2?.skipCache,
+      eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
       ${isTransaction ? "dbCall" : ""}
     }
   );
@@ -510,6 +534,7 @@ function getMethodSourceGetList(x, isTransaction) {
         artifacts,
         context: param2?.context,
         skipCache: param2?.skipCache,
+        eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
         ${isTransaction ? "dbCall" : ""}
       }
     );
@@ -530,6 +555,7 @@ function getMethodSourceGetListPaginated(x, isTransaction) {
         artifacts,
         context: param2?.context,
         skipCache: param2?.skipCache,
+        eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
         ${isTransaction ? "dbCall" : ""}
       }
     );
@@ -548,6 +574,10 @@ function getMethodSourcePostOne(x, specialCaseUuidColumn, isTransaction) {
     artifacts,
     fields: param2?.$fields as any,
     context: {...param2?.context, specialCaseUuidColumn: ${JSON.stringify(specialCaseUuidColumn)}},
+    eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
+    onHandler: ${isTransaction ? "onHandlerMap" : "this.onHandlerMap"}.get("${mapKindToAction(x.kind)}-${x.table}"),
+    asyncLocalStorage,
+    sdk: this,
     ${isTransaction ? "dbCall" : ""}
   });
 }`;
@@ -569,10 +599,25 @@ return ${isTransaction ? "runtime" : "this.runtime"}.resolve({
   artifacts,
   fields: param2?.$fields as any,
   context: param2?.context,
+  eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
+  onHandler: ${isTransaction ? "onHandlerMap" : "this.onHandlerMap"}.get("${mapKindToAction(x.kind)}-${x.table}"),
+  asyncLocalStorage,
+  sdk: this,
   ${isTransaction ? "dbCall" : ""}
 });
 }`;
 }
+function getMethodSourceOnHandlerPatchOne(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(" | ")}, data: ${x.typeDataName} },
+    output: Partial<${getTypeReturnName(x.table)}>
+  ) => Promise<void>
+): void {
+  this.onHandlerMap.set("${mapKindToAction(x.kind)}-${x.table}", handler);
+}`;
+}
 function getMethodSourcePatchList(x, isTransaction) {
     const param2 = `{ ${keyFields}?: ${x.typeFieldsName}, correlationId?: string, context?: TContext }`;
     return `async ${x.methodName}<T extends ${param2}>(
@@ -588,6 +633,10 @@ function getMethodSourcePatchList(x, isTransaction) {
     artifacts,
     fields: param2?.$fields as any,
     context: param2?.context,
+    eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
+    onHandler: ${isTransaction ? "onHandlerMap" : "this.onHandlerMap"}.get("${mapKindToAction(x.kind)}-${x.table}"),
+    asyncLocalStorage,
+    sdk: this,
     ${isTransaction ? "dbCall" : ""}
   });
 }`;
@@ -605,6 +654,10 @@ function getMethodSourceDeleteOne(x, findOnes, isTransaction) {
     args: { $where: param1 },
     artifacts,
     context: param2?.context,
+    eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
+    onHandler: ${isTransaction ? "onHandlerMap" : "this.onHandlerMap"}.get("${mapKindToAction(x.kind)}-${x.table}"),
+    asyncLocalStorage,
+    sdk: this,
     ${isTransaction ? "dbCall" : ""}
   });
 }`;
@@ -620,6 +673,10 @@ function getMethodSourceDeleteList(x, isTransaction) {
       args: param1,
       artifacts,
       context: param2?.context,
+      eventTarget: ${isTransaction ? "eventTarget" : "this.eventTarget"},
+      onHandler: ${isTransaction ? "onHandlerMap" : "this.onHandlerMap"}.get("${mapKindToAction(x.kind)}-${x.table}"),
+      asyncLocalStorage,
+      sdk: this,
       ${isTransaction ? "dbCall" : ""}
     });
   }`;

package/dist/lib/capitalizeFirstLetter.d.ts

@@ -0,0 +1 @@
+export declare function capitalizeFirstLetter(str: string): string;

package/dist/lib/capitalizeFirstLetter.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.capitalizeFirstLetter = void 0;
+function capitalizeFirstLetter(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+}
+exports.capitalizeFirstLetter = capitalizeFirstLetter;

package/dist/runtime/IRuntime.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { AsyncLocalStorage } from "node:async_hooks";
 export interface IRuntime {
     resolve(input: TResolveParams): Promise<any>;
     $queryRaw(sql: string, values?: any[]): Promise<any>;
@@ -20,7 +22,21 @@ export declare type TResolveParams = {
     context?: TContext;
     skipCache?: boolean;
     dbCall?: TDbCall;
-};
+    eventTarget: EventTarget;
+    onHandler?: TOnHandler;
+    asyncLocalStorage?: AsyncLocalStorage<{
+        isInOnHandler?: boolean;
+        isTransaction?: boolean;
+    }>;
+    sdk?: unknown;
+};
+export declare type TOnHandler = (sdk: unknown, input: unknown, output: unknown) => Promise<void>;
+export declare class EventOnHandlerError<T> extends Event {
+    error: T;
+    constructor(message: string, data: ConstructorParameters<typeof Event>[1] & {
+        error: T;
+    });
+}
 export declare type TContext = {
     [k: string]: any;
 };

package/dist/runtime/IRuntime.js

@@ -1,2 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventOnHandlerError = void 0;
+class EventOnHandlerError extends Event {
+    constructor(message, data) {
+        super(message, data);
+        this.error = data.error;
+    }
+}
+exports.EventOnHandlerError = EventOnHandlerError;

package/dist/runtime/RuntimeSQLite.js

@@ -128,7 +128,12 @@ class RuntimeSQLite {
         }
     }
     async rollback() {
-        __classPrivateFieldGet(this, _RuntimeSQLite_db, "f").prepare("ROLLBACK").run();
+        try {
+            __classPrivateFieldGet(this, _RuntimeSQLite_db, "f").prepare("ROLLBACK").run();
+        }
+        catch (e) {
+            console.log(e);
+        }
     }
 }
 exports.RuntimeSQLite = RuntimeSQLite;

package/dist/runtime/lib/shared.d.ts

@@ -1,4 +1,4 @@
-import type { IGetSQLASTInput, IArtifacts, IDialect, TDbCall, TFormatQuery, TBeginTransaction, TContext, TMiddleware, TResolveParams } from "../IRuntime";
+import { type IGetSQLASTInput, type IArtifacts, type IDialect, type TDbCall, type TFormatQuery, type TBeginTransaction, type TContext, type TMiddleware, type TResolveParams } from "../IRuntime";
 import Cache from "../Cache";
 export declare function resolve(input: TResolveParams, dbCall: TDbCall, formatQuery: TFormatQuery, beginTransaction: TBeginTransaction, dialect: IDialect, middlewareHandler: MiddlewareHandler<TMiddleware>, context: TContext, cache?: Cache): Promise<any>;
 export declare class MiddlewareHandler<M extends Function> {

package/dist/runtime/lib/shared.js

@@ -39,6 +39,7 @@ const async_hooks_1 = require("async_hooks");
 const _ = __importStar(require("lodash/fp"));
 const uuid_1 = require("uuid");
 const getSqlAst_1 = require("./getSqlAst");
+const IRuntime_1 = require("../IRuntime");
 const getWhere_1 = require("./getWhere");
 const getDateTimeStringMySQL_1 = require("./getDateTimeStringMySQL");
 const cursor_1 = require("./cursor");
@@ -60,11 +61,39 @@ async function resolve(input, dbCall, formatQuery, beginTransaction, dialect, mi
                 return nextMiddleware(paramsMaybeMutated, consumer);
             }
             const paramsChanged = { ...input, ...params };
-            return _resolve(paramsChanged, dbCall, formatQuery, beginTransaction, dialect, context, cache);
+            const p = _resolve(paramsChanged, dbCall, formatQuery, beginTransaction, dialect, context, cache);
+            const onHandler = input.onHandler;
+            const asyncLocalStorage = input.asyncLocalStorage;
+            if (typeof onHandler === "function" &&
+                asyncLocalStorage != null &&
+                asyncLocalStorage?.getStore()?.isInOnHandler !== true) {
+                return p.then((output) => asyncLocalStorage
+                    .run({ isInOnHandler: true }, async () => onHandler(input.sdk, { ...input.args, data: input.data }, output))
+                    .then(() => output)
+                    .catch((error) => {
+                    input.eventTarget.dispatchEvent(new IRuntime_1.EventOnHandlerError("error", { error }));
+                    return output;
+                }));
+            }
+            return p;
         };
         return resource.runInAsyncScope(() => consumer(params));
     }
-    return _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache);
+    const p = _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache);
+    const onHandler = input.onHandler;
+    const asyncLocalStorage = input.asyncLocalStorage;
+    if (typeof onHandler === "function" &&
+        asyncLocalStorage != null &&
+        asyncLocalStorage?.getStore()?.isInOnHandler !== true) {
+        return p.then((output) => asyncLocalStorage
+            .run({ isInOnHandler: true }, async () => onHandler(input.sdk, { ...input.args, data: input.data }, output))
+            .then(() => output)
+            .catch((error) => {
+            input.eventTarget.dispatchEvent(new IRuntime_1.EventOnHandlerError("error", { error }));
+            return output;
+        }));
+    }
+    return p;
 }
 exports.resolve = resolve;
 function _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache) {

package/dist/runtime/lib/stringifyWhere.js

@@ -118,7 +118,7 @@ function _stringifyWhere(where, table, escapeId, escape, result) {
             const operator = keys[0];
             const operand = v[operator];
             if (operator === "$neq") {
-                return `${table}.${escapeId(k)} ${getOperatorNeq(v)} ${printValue(operand)}`;
+                return `${table}.${escapeId(k)} ${getOperatorNeq(operand)} ${printValue(operand)}`;
             }
             if (operator === "$gt") {
                 return `${table}.${escapeId(k)} > ${printValue(operand)}`;

package/dist/runtime/lib/stringifyWhere.test.js

@@ -59,6 +59,15 @@ const stringifyWhere_1 = require("./stringifyWhere");
         });
         strict_1.default.deepEqual(result, "Usr.`userId` != 2 AND Usr.`text` = 'foo'");
     });
+    (0, globals_1.test)("should handle $neq null", () => {
+        const result = (0, stringifyWhere_1.stringifyWhere)({
+            where: { userId: { $neq: null }, text: "foo" },
+            table,
+            dialect,
+            args
+        });
+        strict_1.default.deepEqual(result, "Usr.`userId` IS NOT NULL AND Usr.`text` = 'foo'");
+    });
     (0, globals_1.test)("should handle $gt", () => {
         const result = (0, stringifyWhere_1.stringifyWhere)({
             where: { userId: { $gt: 2 }, text: "foo" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.14.4",
+  "version": "0.15.0",
   "main": "./dist/index.js",
   "files": [
     "dist"