quidproquo-actionprocessor-awslambda 0.0.187 → 0.0.189

package/lib/commonjs/getActionProcessor/core/event/getAPIGatewayEventActionProcessor.js

@@ -93,16 +93,9 @@ const getProcessMatchStory = (qpqConfig) => {
     return (payload) => __awaiter(void 0, void 0, void 0, function* () {
         // Sort the routes by string length
         // Note: We may need to filter variable routes out {} as the variables are length independent
-        const sortedRoutes = routes
-            .filter((r) => r.method === payload.transformedEventParams.method ||
-            payload.transformedEventParams.method === 'OPTIONS')
-            .sort((a, b) => {
-            if (a.path.length < b.path.length)
-                return -1;
-            if (a.path.length > b.path.length)
-                return 1;
-            return 0;
-        });
+        const routesWithNoOptions = routes.filter((r) => r.method === payload.transformedEventParams.method ||
+            payload.transformedEventParams.method === 'OPTIONS');
+        const sortedRoutes = quidproquo_webserver_1.qpqWebServerUtils.sortPathMatchConfigs(routesWithNoOptions);
         // Find the most relevant match
         const matchedRoute = sortedRoutes
             .map((r) => ({

package/lib/commonjs/getActionProcessor/core/event/getCloudFrontOriginRequestEventActionProcessor.js

@@ -41,15 +41,9 @@ const getProcessAutoRespond = () => {
 };
 const getProcessMatchStory = (seoConfigs) => {
     return (payload) => __awaiter(void 0, void 0, void 0, function* () {
-        /// Sort the routes by string length
-        // Note: We may need to filter variable routes out {} as the variables are length independent
-        const sortedSeoConfigs = seoConfigs.sort((a, b) => {
-            if (a.path.length < b.path.length)
-                return -1;
-            if (a.path.length > b.path.length)
-                return 1;
-            return 0;
-        });
+        // Sort the routes by string length
+        // we don't sort them here for SEO... its the order they are defined.
+        const sortedSeoConfigs = seoConfigs; // qpqWebServerUtils.sortPathMatchConfigs(seoConfigs);
         // Find the most relevant match
         const matchedSeoConfig = sortedSeoConfigs
             .map((r) => ({

package/lib/commonjs/logic/dynamo/qpqDynamoOrm/buildDynamoUpdate.d.ts

@@ -1,5 +1,5 @@
 import { AttributeValue } from '@aws-sdk/client-dynamodb';
-import { KvsUpdate } from 'quidproquo-core';
+import { KvsUpdateActionType, KvsUpdate } from 'quidproquo-core';
 interface ExpressionAttributeNameMap {
     [key: string]: string;
 }
@@ -7,5 +7,6 @@ export declare const buildUpdateExpressionAttributeNames: (updates: KvsUpdate) =
 export declare const buildUpdateExpressionAttributeValues: (updates: KvsUpdate) => {
     [key: string]: AttributeValue;
 } | undefined;
+export declare const buildDynamoUpdateExpressionForType: (type: KvsUpdateActionType, kvsUpdate: KvsUpdate) => string;
 export declare const buildDynamoUpdateExpression: (updates: KvsUpdate) => string;
 export {};

package/lib/commonjs/logic/dynamo/qpqDynamoOrm/buildDynamoUpdate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildDynamoUpdateExpression = exports.buildUpdateExpressionAttributeValues = exports.buildUpdateExpressionAttributeNames = void 0;
+exports.buildDynamoUpdateExpression = exports.buildDynamoUpdateExpressionForType = exports.buildUpdateExpressionAttributeValues = exports.buildUpdateExpressionAttributeNames = void 0;
 const quidproquo_core_1 = require("quidproquo-core");
 const buildDynamoQuery_1 = require("./buildDynamoQuery");
 const buildUpdateExpressionAttributeNames = (updates) => {
@@ -43,23 +43,23 @@ const buildDynamoUpdateExpressionSet = (update) => {
     if (!update.value) {
         throw new Error("Value must be provided for 'SET' action");
     }
-    return `SET ${getNestedItemName(update.attributePath)} = ${(0, buildDynamoQuery_1.getValueName)(update.value)}`;
+    return `${getNestedItemName(update.attributePath)} = ${(0, buildDynamoQuery_1.getValueName)(update.value)}`;
 };
 const buildDynamoUpdateExpressionRemove = (update) => {
-    return `REMOVE ${getNestedItemName(update.attributePath)}`;
+    return `${getNestedItemName(update.attributePath)}`;
 };
 const buildDynamoUpdateExpressionAdd = (update) => {
     if (!update.value) {
         throw new Error("Value must be provided for 'ADD' action");
     }
-    return `ADD ${getNestedItemName(update.attributePath)} ${(0, buildDynamoQuery_1.getValueName)(update.value)}`;
+    return `${getNestedItemName(update.attributePath)} ${(0, buildDynamoQuery_1.getValueName)(update.value)}`;
 };
 const buildDynamoUpdateExpressionDelete = (update) => {
     if (update.value) {
-        return `DELETE ${getNestedItemName(update.attributePath)} ${(0, buildDynamoQuery_1.getValueName)(update.value)}`;
+        return `${getNestedItemName(update.attributePath)} ${(0, buildDynamoQuery_1.getValueName)(update.value)}`;
     }
     else {
-        return `DELETE ${getNestedItemName(update.attributePath)}`;
+        return `${getNestedItemName(update.attributePath)}`;
     }
 };
 const getNestedItemName = (attributePath) => {
@@ -79,7 +79,7 @@ const getNestedItemName = (attributePath) => {
         return (0, buildDynamoQuery_1.getItemName)(attributePath);
     }
 };
-const buildDynamoUpdateExpressionRoot = (update) => {
+const buildDynamoUpdateExpressionPart = (update, updateIndex) => {
     switch (update.action) {
         case quidproquo_core_1.KvsUpdateActionType.Set:
             return buildDynamoUpdateExpressionSet(update);
@@ -93,7 +93,40 @@ const buildDynamoUpdateExpressionRoot = (update) => {
             throw new Error(`Invalid update action type: ${update.action}`);
     }
 };
+const buildDynamoUpdateExpressionForType = (type, kvsUpdate) => {
+    const actions = kvsUpdate.filter((update) => update.action === type);
+    // If there are no actions of this type, return an empty string
+    if (actions.length === 0) {
+        return '';
+    }
+    const expressions = actions
+        .map((update, index) => buildDynamoUpdateExpressionPart(update, index))
+        .join(', ');
+    switch (type) {
+        case quidproquo_core_1.KvsUpdateActionType.Set:
+            return `SET ${expressions}`;
+        case quidproquo_core_1.KvsUpdateActionType.Remove:
+            return `REMOVE ${expressions}`;
+        case quidproquo_core_1.KvsUpdateActionType.Add:
+            return `ADD ${expressions}`;
+        case quidproquo_core_1.KvsUpdateActionType.Delete:
+            return `DELETE ${expressions}`;
+        default:
+            throw new Error(`Invalid update action type: ${type}`);
+    }
+};
+exports.buildDynamoUpdateExpressionForType = buildDynamoUpdateExpressionForType;
 const buildDynamoUpdateExpression = (updates) => {
-    return updates.map((update) => buildDynamoUpdateExpressionRoot(update)).join(', ');
+    const updatesExpressions = [
+        quidproquo_core_1.KvsUpdateActionType.Set,
+        quidproquo_core_1.KvsUpdateActionType.Remove,
+        quidproquo_core_1.KvsUpdateActionType.Add,
+        quidproquo_core_1.KvsUpdateActionType.Delete,
+    ]
+        .map((kvsUpdateActionType) => (0, exports.buildDynamoUpdateExpressionForType)(kvsUpdateActionType, updates))
+        .filter((expression) => !!expression);
+    const result = updatesExpressions.join(' ');
+    console.log('Update Expression: ', result);
+    return result;
 };
 exports.buildDynamoUpdateExpression = buildDynamoUpdateExpression;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.187",
+  "version": "0.0.189",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "types": "./lib/commonjs/index.d.ts",
@@ -47,9 +47,9 @@
     "lodash": "^4.17.21",
     "node-cache": "^5.1.2",
     "node-match-path": "^0.6.3",
-    "quidproquo-config-aws": "0.0.187",
-    "quidproquo-core": "0.0.187",
-    "quidproquo-webserver": "0.0.187"
+    "quidproquo-config-aws": "0.0.189",
+    "quidproquo-core": "0.0.189",
+    "quidproquo-webserver": "0.0.189"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.109",
@@ -57,7 +57,7 @@
     "@types/jsonwebtoken": "^9.0.2",
     "@types/lodash": "^4.14.194",
     "@types/node": "^18.11.9",
-    "quidproquo-tsconfig": "0.0.187",
+    "quidproquo-tsconfig": "0.0.189",
     "typescript": "^4.9.3"
   }
 }