@decaf-ts/for-nest 0.11.2-refactor.3 → 0.11.2-refactor.5

package/lib/esm/webhooks/controllers.js

@@ -62,69 +62,64 @@ let WebhookEventActionsController = WebhookEventActionsController_1 = class Webh
         const { ctx } = (await this.logCtx([], "replay", true)).for(this.replay);
         const eventRepo = Repository.forModel(WebhookEventRecord);
         const deliveryRepo = Repository.forModel(WebhookDelivery);
+        let event;
         try {
-            let event;
-            try {
-                event = await eventRepo.read(id, ctx);
-            }
-            catch (error) {
-                const events = await eventRepo
-                    .select()
-                    .where(eventRepo.attr("id").eq(id))
-                    .limit(1)
-                    .execute(ctx);
-                if (!events.length)
-                    throw error;
-                event = events[0];
-            }
-            let deliveries = [];
+            event = await eventRepo.read(id, ctx);
+        }
+        catch (error) {
+            const events = await eventRepo
+                .select()
+                .where(eventRepo.attr("id").eq(id))
+                .limit(1)
+                .execute(ctx);
+            if (!events.length)
+                throw error;
+            event = events[0];
+        }
+        let deliveries = [];
+        try {
+            deliveries = await collectPagedResults(() => deliveryRepo
+                .select()
+                .where(deliveryRepo.attr("eventId").eq(event.id))
+                .orderBy("createdAt", OrderDirection.ASC)
+                .thenBy("id", OrderDirection.ASC)
+                .paginate(250, ctx), 250, ctx);
+        }
+        catch {
             try {
-                deliveries = await collectPagedResults(() => deliveryRepo
+                deliveries = await deliveryRepo
                     .select()
                     .where(deliveryRepo.attr("eventId").eq(event.id))
-                    .orderBy("createdAt", OrderDirection.ASC)
-                    .thenBy("id", OrderDirection.ASC)
-                    .paginate(250, ctx), 250, ctx);
+                    .execute(ctx);
             }
             catch {
-                try {
-                    deliveries = await deliveryRepo
-                        .select()
-                        .where(deliveryRepo.attr("eventId").eq(event.id))
-                        .execute(ctx);
-                }
-                catch {
-                    deliveries = [];
-                }
+                deliveries = [];
             }
-            const now = new Date();
-            for (const delivery of deliveries) {
-                delivery.status = WebhookStatus.PENDING;
-                delivery.attempts = 0;
-                delivery.nextAttemptAt = now;
-                delivery.lastAttemptAt = null;
-                delivery.errorMessage = undefined;
-                delivery.responseStatus = undefined;
-                delivery.responseBody = undefined;
+        }
+        const now = new Date();
+        for (const delivery of deliveries) {
+            delivery.status = WebhookStatus.PENDING;
+            delivery.attempts = 0;
+            delivery.nextAttemptAt = now;
+            delivery.lastAttemptAt = null;
+            delivery.errorMessage = undefined;
+            delivery.responseStatus = undefined;
+            delivery.responseBody = undefined;
+        }
+        event.status = WebhookStatus.PENDING;
+        event.deliveriesSucceeded = 0;
+        event.deliveriesFailed = 0;
+        event.nextAttemptAt = now;
+        event.updatedAt = now;
+        if (deliveries.length) {
+            try {
+                await deliveryRepo.updateAll(deliveries, ctx.override({ applyUpdateValidation: false }));
             }
-            event.status = WebhookStatus.PENDING;
-            event.deliveriesSucceeded = 0;
-            event.deliveriesFailed = 0;
-            event.nextAttemptAt = now;
-            event.updatedAt = now;
-            if (deliveries.length) {
-                try {
-                    await deliveryRepo.updateAll(deliveries, ctx.override({ applyUpdateValidation: false }));
-                }
-                catch {
-                    // Replay still resets the event state even if bulk delivery updates are not queryable here.
-                }
+            catch {
+                // Replay still resets the event state even if bulk delivery updates are not queryable here.
             }
-            return eventRepo.update(event, ctx);
-        }
-        catch (error) {
-            throw error;
         }
+        return eventRepo.update(event, ctx);
     }
 };
 __decorate([
@@ -139,4 +134,4 @@ WebhookEventActionsController = WebhookEventActionsController_1 = __decorate([
     __metadata("design:paramtypes", [DecafRequestContext])
 ], WebhookEventActionsController);
 export { WebhookEventActionsController };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"controllers.js","sourceRoot":"","sources":["../../../src/webhooks/controllers.ts"],"names":[],"mappings":"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","sourcesContent":["import { Controller, Param, Post } from \"@nestjs/common\";\nimport { Repository, type Repo, OrderDirection } from \"@decaf-ts/core\";\nimport { DecafController } from \"../controllers\";\nimport { DecafRequestContext } from \"../request\";\nimport { DecafServerCtx } from \"../constants\";\nimport {\n  WebhookDelivery,\n  WebhookEventRecord,\n  WebhookStatus,\n  WebhookSubscription,\n  collectPagedResults,\n} from \"@decaf-ts/for-http/hooks\";\n\n@Controller(\"webhook-subscriptions\")\nexport class WebhookSubscriptionActionsController extends DecafController<DecafServerCtx> {\n  constructor(clientContext: DecafRequestContext) {\n    super(clientContext, WebhookSubscriptionActionsController.name);\n  }\n\n  @Post(\":id/deactivate\")\n  async deactivate(@Param(\"id\") id: string) {\n    const { ctx } = (await this.logCtx([], \"deactivate\", true)).for(\n      this.deactivate\n    );\n    const repo = Repository.forModel<\n      WebhookSubscription,\n      Repo<WebhookSubscription>\n    >(WebhookSubscription);\n    const current = await repo.read(id, ctx);\n    current.active = false;\n    return repo.update(current, ctx);\n  }\n\n  @Post(\":id/reactivate\")\n  async reactivate(@Param(\"id\") id: string) {\n    const { ctx } = (await this.logCtx([], \"reactivate\", true)).for(\n      this.reactivate\n    );\n    const repo = Repository.forModel<\n      WebhookSubscription,\n      Repo<WebhookSubscription>\n    >(WebhookSubscription);\n    const current = await repo.read(id, ctx);\n    current.active = true;\n    return repo.update(current, ctx);\n  }\n}\n\n@Controller(\"webhook-events\")\nexport class WebhookEventActionsController extends DecafController<DecafServerCtx> {\n  constructor(clientContext: DecafRequestContext) {\n    super(clientContext, WebhookEventActionsController.name);\n  }\n\n  @Post(\":id/replay\")\n  async replay(@Param(\"id\") id: string) {\n    const { ctx } = (await this.logCtx([], \"replay\", true)).for(this.replay);\n    const eventRepo = Repository.forModel<\n      WebhookEventRecord,\n      Repo<WebhookEventRecord>\n    >(WebhookEventRecord);\n    const deliveryRepo = Repository.forModel<\n      WebhookDelivery,\n      Repo<WebhookDelivery>\n    >(WebhookDelivery);\n    try {\n      let event;\n      try {\n        event = await eventRepo.read(id, ctx);\n      } catch (error) {\n        const events = await eventRepo\n          .select()\n          .where(eventRepo.attr(\"id\").eq(id))\n          .limit(1)\n          .execute(ctx);\n        if (!events.length) throw error;\n        event = events[0];\n      }\n      let deliveries: any[] = [];\n      try {\n        deliveries = await collectPagedResults(\n          () =>\n            deliveryRepo\n              .select()\n              .where(deliveryRepo.attr(\"eventId\").eq(event.id))\n              .orderBy(\"createdAt\", OrderDirection.ASC)\n              .thenBy(\"id\", OrderDirection.ASC)\n              .paginate(250, ctx),\n          250,\n          ctx\n        );\n      } catch {\n        try {\n          deliveries = await deliveryRepo\n            .select()\n            .where(deliveryRepo.attr(\"eventId\").eq(event.id))\n            .execute(ctx);\n        } catch {\n          deliveries = [];\n        }\n      }\n      const now = new Date();\n\n      for (const delivery of deliveries) {\n        delivery.status = WebhookStatus.PENDING;\n        delivery.attempts = 0;\n        delivery.nextAttemptAt = now;\n        delivery.lastAttemptAt = null as any;\n        delivery.errorMessage = undefined;\n        delivery.responseStatus = undefined;\n        delivery.responseBody = undefined;\n      }\n\n      event.status = WebhookStatus.PENDING;\n      event.deliveriesSucceeded = 0;\n      event.deliveriesFailed = 0;\n      event.nextAttemptAt = now;\n      event.updatedAt = now;\n\n      if (deliveries.length) {\n        try {\n          await deliveryRepo.updateAll(\n            deliveries,\n            ctx.override({ applyUpdateValidation: false } as any)\n          );\n        } catch {\n          // Replay still resets the event state even if bulk delivery updates are not queryable here.\n        }\n      }\n      return eventRepo.update(event, ctx);\n    } catch (error) {\n      throw error;\n    }\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"controllers.js","sourceRoot":"","sources":["../../../src/webhooks/controllers.ts"],"names":[],"mappings":"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","sourcesContent":["import { Controller, Param, Post } from \"@nestjs/common\";\nimport { Repository, type Repo, OrderDirection } from \"@decaf-ts/core\";\nimport { DecafController } from \"../controllers\";\nimport { DecafRequestContext } from \"../request\";\nimport { DecafServerCtx } from \"../constants\";\nimport {\n  WebhookDelivery,\n  WebhookEventRecord,\n  WebhookStatus,\n  WebhookSubscription,\n  collectPagedResults,\n} from \"@decaf-ts/for-http/hooks\";\n\n@Controller(\"webhook-subscriptions\")\nexport class WebhookSubscriptionActionsController extends DecafController<DecafServerCtx> {\n  constructor(clientContext: DecafRequestContext) {\n    super(clientContext, WebhookSubscriptionActionsController.name);\n  }\n\n  @Post(\":id/deactivate\")\n  async deactivate(@Param(\"id\") id: string) {\n    const { ctx } = (await this.logCtx([], \"deactivate\", true)).for(\n      this.deactivate\n    );\n    const repo = Repository.forModel<\n      WebhookSubscription,\n      Repo<WebhookSubscription>\n    >(WebhookSubscription);\n    const current = await repo.read(id, ctx);\n    current.active = false;\n    return repo.update(current, ctx);\n  }\n\n  @Post(\":id/reactivate\")\n  async reactivate(@Param(\"id\") id: string) {\n    const { ctx } = (await this.logCtx([], \"reactivate\", true)).for(\n      this.reactivate\n    );\n    const repo = Repository.forModel<\n      WebhookSubscription,\n      Repo<WebhookSubscription>\n    >(WebhookSubscription);\n    const current = await repo.read(id, ctx);\n    current.active = true;\n    return repo.update(current, ctx);\n  }\n}\n\n@Controller(\"webhook-events\")\nexport class WebhookEventActionsController extends DecafController<DecafServerCtx> {\n  constructor(clientContext: DecafRequestContext) {\n    super(clientContext, WebhookEventActionsController.name);\n  }\n\n  @Post(\":id/replay\")\n  async replay(@Param(\"id\") id: string) {\n    const { ctx } = (await this.logCtx([], \"replay\", true)).for(this.replay);\n    const eventRepo = Repository.forModel<\n      WebhookEventRecord,\n      Repo<WebhookEventRecord>\n    >(WebhookEventRecord);\n    const deliveryRepo = Repository.forModel<\n      WebhookDelivery,\n      Repo<WebhookDelivery>\n    >(WebhookDelivery);\n    let event;\n    try {\n      event = await eventRepo.read(id, ctx);\n    } catch (error) {\n      const events = await eventRepo\n        .select()\n        .where(eventRepo.attr(\"id\").eq(id))\n        .limit(1)\n        .execute(ctx);\n      if (!events.length) throw error;\n      event = events[0];\n    }\n    let deliveries: any[] = [];\n    try {\n      deliveries = await collectPagedResults(\n        () =>\n          deliveryRepo\n            .select()\n            .where(deliveryRepo.attr(\"eventId\").eq(event.id))\n            .orderBy(\"createdAt\", OrderDirection.ASC)\n            .thenBy(\"id\", OrderDirection.ASC)\n            .paginate(250, ctx),\n        250,\n        ctx\n      );\n    } catch {\n      try {\n        deliveries = await deliveryRepo\n          .select()\n          .where(deliveryRepo.attr(\"eventId\").eq(event.id))\n          .execute(ctx);\n      } catch {\n        deliveries = [];\n      }\n    }\n    const now = new Date();\n\n    for (const delivery of deliveries) {\n      delivery.status = WebhookStatus.PENDING;\n      delivery.attempts = 0;\n      delivery.nextAttemptAt = now;\n      delivery.lastAttemptAt = null as any;\n      delivery.errorMessage = undefined;\n      delivery.responseStatus = undefined;\n      delivery.responseBody = undefined;\n    }\n\n    event.status = WebhookStatus.PENDING;\n    event.deliveriesSucceeded = 0;\n    event.deliveriesFailed = 0;\n    event.nextAttemptAt = now;\n    event.updatedAt = now;\n\n    if (deliveries.length) {\n      try {\n        await deliveryRepo.updateAll(\n          deliveries,\n          ctx.override({ applyUpdateValidation: false } as any)\n        );\n      } catch {\n        // Replay still resets the event state even if bulk delivery updates are not queryable here.\n      }\n    }\n    return eventRepo.update(event, ctx);\n  }\n}\n"]}

package/lib/types/decaf-model/FromModelController.d.cts

@@ -6,6 +6,7 @@ import "../overrides";
 import { type ModelControllerFactoryConfig } from "@decaf-ts/for-http/server";
 export declare class FromModelController {
     private static readonly log;
+    private static toDecafError;
     static getPersistence<T extends Model<boolean>>(ModelClazz: ModelConstructor<T>): Repo<T> | ModelService<T>;
     static createQueryRoutesFromRepository<T extends Model<boolean>>(persistence: Repo<T> | ModelService<T>, prefix?: string): ControllerConstructor<T>;
     static create<T extends Model<any>>(ModelConstr: ModelConstructor<T>, moduleConfigOverrides?: Record<string, ModelControllerFactoryConfig>, globalDefaults?: Partial<ModelControllerFactoryConfig>): ControllerConstructor<T>;
@@ -15,6 +16,7 @@ export declare class FromModelController {
         apiProperties: DecafApiProperty[];
         getPK: (...params: Array<string | number>) => string;
     };
+    private static routeParamDecorators;
     private static defineMethod;
     private static applyDecorators;
     private static matchRoute;
@@ -22,19 +24,9 @@ export declare class FromModelController {
     private static statementMethodName;
     private static statementShortcutParams;
     private static complexQueryParams;
-    private static createCreateHandler;
-    private static createBulkCreateHandler;
-    private static createBulkReadHandler;
-    private static createBulkUpdateHandler;
-    private static createBulkDeleteHandler;
-    private static createReadHandler;
-    private static createUpdateHandler;
-    private static createDeleteHandler;
-    private static createStatementHandler;
-    private static createStatementShortcutHandler;
     private static createComplexQueryHandler;
-    private static createCustomRouteHandler;
     private static extractQueryArgs;
+    private static normalizeQueryArgs;
     private static createCreateDecorators;
     private static bulkCreateDecorators;
     private static bulkReadDecorators;

package/lib/types/decaf-model/FromModelController.d.mts

@@ -6,6 +6,7 @@ import "../overrides";
 import { type ModelControllerFactoryConfig } from "@decaf-ts/for-http/server";
 export declare class FromModelController {
     private static readonly log;
+    private static toDecafError;
     static getPersistence<T extends Model<boolean>>(ModelClazz: ModelConstructor<T>): Repo<T> | ModelService<T>;
     static createQueryRoutesFromRepository<T extends Model<boolean>>(persistence: Repo<T> | ModelService<T>, prefix?: string): ControllerConstructor<T>;
     static create<T extends Model<any>>(ModelConstr: ModelConstructor<T>, moduleConfigOverrides?: Record<string, ModelControllerFactoryConfig>, globalDefaults?: Partial<ModelControllerFactoryConfig>): ControllerConstructor<T>;
@@ -15,6 +16,7 @@ export declare class FromModelController {
         apiProperties: DecafApiProperty[];
         getPK: (...params: Array<string | number>) => string;
     };
+    private static routeParamDecorators;
     private static defineMethod;
     private static applyDecorators;
     private static matchRoute;
@@ -22,19 +24,9 @@ export declare class FromModelController {
     private static statementMethodName;
     private static statementShortcutParams;
     private static complexQueryParams;
-    private static createCreateHandler;
-    private static createBulkCreateHandler;
-    private static createBulkReadHandler;
-    private static createBulkUpdateHandler;
-    private static createBulkDeleteHandler;
-    private static createReadHandler;
-    private static createUpdateHandler;
-    private static createDeleteHandler;
-    private static createStatementHandler;
-    private static createStatementShortcutHandler;
     private static createComplexQueryHandler;
-    private static createCustomRouteHandler;
     private static extractQueryArgs;
+    private static normalizeQueryArgs;
     private static createCreateDecorators;
     private static bulkCreateDecorators;
     private static bulkReadDecorators;

package/lib/types/index.d.cts

@@ -41,19 +41,19 @@ export * from "./events-module/index.d.cts";
  * @constant
  * @type {string}
  */
-export declare const VERSION = "0.11.2-refactor.3";
+export declare const VERSION = "0.11.2-refactor.4";
 /**
  * @description Represents the current commit hash of the module build.
  * @summary Stores the current git commit hash for the package. The build replaces
  * the placeholder with the actual commit hash at publish time.
  * @const COMMIT
  */
-export declare const COMMIT = "d657fc5";
+export declare const COMMIT = "1b4f98c";
 /**
  * @description Represents the full version string of the module.
  * @summary Stores the semver version and commit hash for the package.
  * The build replaces the placeholder with the actual `<version>-<commit>` value at publish time.
  * @const FULL_VERSION
  */
-export declare const FULL_VERSION = "0.11.2-refactor.3-d657fc5";
+export declare const FULL_VERSION = "0.11.2-refactor.4-1b4f98c";
 export declare const PACKAGE_NAME = "@decaf-ts/for-nest";

package/lib/types/index.d.mts

@@ -41,19 +41,19 @@ export * from "./events-module/index.d.mts";
  * @constant
  * @type {string}
  */
-export declare const VERSION = "0.11.2-refactor.3";
+export declare const VERSION = "0.11.2-refactor.4";
 /**
  * @description Represents the current commit hash of the module build.
  * @summary Stores the current git commit hash for the package. The build replaces
  * the placeholder with the actual commit hash at publish time.
  * @const COMMIT
  */
-export declare const COMMIT = "d657fc5";
+export declare const COMMIT = "1b4f98c";
 /**
  * @description Represents the full version string of the module.
  * @summary Stores the semver version and commit hash for the package.
  * The build replaces the placeholder with the actual `<version>-<commit>` value at publish time.
  * @const FULL_VERSION
  */
-export declare const FULL_VERSION = "0.11.2-refactor.3-d657fc5";
+export declare const FULL_VERSION = "0.11.2-refactor.4-1b4f98c";
 export declare const PACKAGE_NAME = "@decaf-ts/for-nest";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decaf-ts/for-nest",
-  "version": "0.11.2-refactor.3",
+  "version": "0.11.2-refactor.5",
   "description": "NestJS decaf integration",
   "type": "module",
   "exports": {
@@ -164,6 +164,12 @@
       "jsrsasign": "^11.1.0"
     },
     "ajv": "^8.17.2",
+    "@eslint/eslintrc": {
+      "ajv": "^6.14.0"
+    },
+    "eslint": {
+      "ajv": "^6.14.0"
+    },
     "multer": "^2.1.2",
     "js-yaml": "^4.2.0"
   }