@yopdev/dev-server 1.5.6 → 1.5.7

package/dist/src/cloudformation-event-proxy.js

@@ -16,7 +16,8 @@ class CloudFormationEventsProxy extends cloudformation_1.CloudFormationSetup {
                 const actual = Object.entries(attributes).flatMap((entry) => entry[1].Value + entry[0]);
                 return required.filter((e) => actual.includes(e)).length > 0;
             },
-        }), config.prepare, (_name, _config, routes) => routes, config);
+        }), config.prepare, config);
+        this.afterStart = (_name, _config, routes) => routes;
     }
     logHandler(handler) {
         return `detected sns handler ${handler.name}`;

package/dist/src/cloudformation-lambda-http-proxy.js

@@ -15,15 +15,15 @@ class CloudFormationLambdaProxy extends cloudformation_1.CloudFormationSetup {
             path: new RegExp(`^${pathWithCapturingGroups}${QUERY_STRING_OR_LOCATION_REG_EXP}?$`),
             weight: this.computeWeight(pathWithCapturingGroups),
             handler: this.pathParameterCapture(new RegExp(pathWithCapturingGroups), handler, config.context),
-        })), config.prepare, (name, cfg, routes) => {
-            return (0, lambda_http_proxy_1.newLambdaHttpProxy)(`${name}:apigw`, {
-                settings: this.settings,
-                routes: this.extraRoutes.concat(routes),
-                authorizer: (config?.authorizer || (() => undefined))(cfg),
-            }, callback);
-        }, config);
+        })), config.prepare, config);
         this.settings = settings;
         this.extraRoutes = extraRoutes;
+        this.callback = callback;
+        this.afterStart = (name, cfg, routes) => (0, lambda_http_proxy_1.newLambdaHttpProxy)(`${name}:apigw`, {
+            settings: this.settings,
+            routes: this.extraRoutes.concat(routes),
+            authorizer: (this.authorizer || (() => undefined))(cfg),
+        }, this.callback);
         this.computeWeight = (path) => this.segments(path) - this.variables(path);
         this.segments = (path) => path.split('/').length;
         this.variables = (path) => path.split('(?<').length;
@@ -35,6 +35,7 @@ class CloudFormationLambdaProxy extends cloudformation_1.CloudFormationSetup {
                 .map(([k, v]) => [k, decodeURIComponent(v)]));
             return handler(event, context?.());
         };
+        this.authorizer = config?.authorizer;
     }
     logHandler(handler) {
         return `detected handler for ${handler.method} on ${handler.path} with weight ${handler.weight}`;

package/dist/src/cloudformation.d.ts

@@ -5,13 +5,13 @@ export declare abstract class CloudFormationSetup<P, H, R, F> implements Startab
     private readonly eventFilter;
     private readonly handlerResolver;
     private readonly beforeStart;
-    private readonly afterStart;
     private readonly template;
     private readonly handlers;
     private readonly handlerNameResolver;
     private readonly LOGGER;
-    constructor(name: string, eventFilter: (event: Event<P>) => boolean, handlerResolver: (event: Event<P>, handler: H) => Promise<R>, beforeStart: ((config: DevServerConfig) => Promise<void>) | undefined, afterStart: (name: string, config: DevServerConfig, routes: R[]) => F, config: CloudFormationSetupConfig);
+    constructor(name: string, eventFilter: (event: Event<P>) => boolean, handlerResolver: (event: Event<P>, handler: H) => Promise<R>, beforeStart: ((config: DevServerConfig) => Promise<void>) | undefined, config: CloudFormationSetupConfig);
     start: (config: DevServerConfig) => Promise<F>;
+    protected abstract afterStart: (name: string, config: DevServerConfig, routes: R[]) => F;
     private resolvedHandlers;
     abstract logHandler(handler: R): string;
     private parseApiEvents;

package/dist/src/cloudformation.js

@@ -6,12 +6,11 @@ const fs_1 = require("fs");
 const js_yaml_1 = require("js-yaml");
 const logging_1 = require("@yopdev/logging");
 class CloudFormationSetup {
-    constructor(name, eventFilter, handlerResolver, beforeStart, afterStart, config) {
+    constructor(name, eventFilter, handlerResolver, beforeStart, config) {
         this.name = name;
         this.eventFilter = eventFilter;
         this.handlerResolver = handlerResolver;
         this.beforeStart = beforeStart;
-        this.afterStart = afterStart;
         this.start = async (config) => (this.beforeStart || Promise.resolve)(config)
             .then(this.resolvedHandlers)
             .then(async (routes) => this.afterStart(this.name, config, routes));

package/dist/src/sqs.js

@@ -14,7 +14,7 @@ class Sqs {
             .send(new client_sqs_1.CreateQueueCommand({
             QueueName: fifo ? `${name}.fifo` : name,
             Attributes: {
-                FifoQueue: fifo ? 'true' : 'false',
+                FifoQueue: fifo ? 'true' : undefined,
             }
         }))
             .then((create) => this.client

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yopdev/dev-server",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "scripts": {
     "compile": "tsc",
     "pretest": "npm run compile",