quidproquo-actionprocessor-awslambda 0.1.6 → 0.1.8

package/lib/esm/getActionProcessor/core/userDirectory/getUserDirectorySetAccessTokenActionProcessor.js

@@ -1,8 +1,18 @@
-import { actionResult, UserDirectoryActionType, } from 'quidproquo-core';
+import { actionResult, actionResultError, ErrorTypeEnum, UserDirectoryActionType, } from 'quidproquo-core';
 import { decodeAccessToken } from '../../../logic/cognito';
 const getProcessSetAccessToken = (qpqConfig) => {
     return async ({ accessToken, userDirectoryName }, session, apl, logger, updateSession) => {
-        const decodedAccessToken = await decodeAccessToken(userDirectoryName, qpqConfig, accessToken, false);
+        // decodeAccessToken throws on a missing/unverifiable/expired token; surface that
+        // as a typed Unauthorized result (matching the dev-server processor and
+        // ReadAccessToken) instead of letting the raw error escape as a GenericError.
+        // The session is left untouched on failure.
+        let decodedAccessToken;
+        try {
+            decodedAccessToken = await decodeAccessToken(userDirectoryName, qpqConfig, accessToken, false);
+        }
+        catch {
+            return actionResultError(ErrorTypeEnum.Unauthorized, 'Invalid accessToken');
+        }
         updateSession({
             decodedAccessToken: decodedAccessToken,
             accessToken,

package/lib/esm/getActionProcessor/core/userDirectory/getUserDirectorySetAccessTokenActionProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUserDirectorySetAccessTokenActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/userDirectory/getUserDirectorySetAccessTokenActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAEZ,uBAAuB,GAExB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,wBAAwB,GAAG,CAAC,SAAoB,EAA8C,EAAE;IACpG,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE;QACvF,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QAErG,aAAa,CAAC;YACZ,kBAAkB,EAAE,kBAAkB;YACtC,WAAW;SACZ,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAC1C,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6CAA6C,GAAgC,KAAK,EAC7F,SAAoB,EACU,EAAE,CAAC,CAAC;IAClC,CAAC,uBAAuB,CAAC,cAAc,CAAC,EAAE,wBAAwB,CAAC,SAAS,CAAC;CAC9E,CAAC,CAAC","sourcesContent":["import {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  QPQConfig,\n  UserDirectoryActionType,\n  UserDirectorySetAccessTokenActionProcessor,\n} from 'quidproquo-core';\n\nimport { decodeAccessToken } from '../../../logic/cognito';\n\nconst getProcessSetAccessToken = (qpqConfig: QPQConfig): UserDirectorySetAccessTokenActionProcessor => {\n  return async ({ accessToken, userDirectoryName }, session, apl, logger, updateSession) => {\n    const decodedAccessToken = await decodeAccessToken(userDirectoryName, qpqConfig, accessToken, false);\n\n    updateSession({\n      decodedAccessToken: decodedAccessToken,\n      accessToken,\n    });\n\n    return actionResult(decodedAccessToken);\n  };\n};\n\nexport const getUserDirectorySetAccessTokenActionProcessor: ActionProcessorListResolver = async (\n  qpqConfig: QPQConfig,\n): Promise<ActionProcessorList> => ({\n  [UserDirectoryActionType.SetAccessToken]: getProcessSetAccessToken(qpqConfig),\n});\n"]}
+{"version":3,"file":"getUserDirectorySetAccessTokenActionProcessor.js","sourceRoot":"","sources":["../../../../../src/getActionProcessor/core/userDirectory/getUserDirectorySetAccessTokenActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACZ,iBAAiB,EAEjB,aAAa,EAEb,uBAAuB,GAExB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,wBAAwB,GAAG,CAAC,SAAoB,EAA8C,EAAE;IACpG,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE;QACvF,iFAAiF;QACjF,wEAAwE;QACxE,8EAA8E;QAC9E,4CAA4C;QAC5C,IAAI,kBAAsC,CAAC;QAC3C,IAAI,CAAC;YACH,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QACjG,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,iBAAiB,CAAC,aAAa,CAAC,YAAY,EAAE,qBAAqB,CAAC,CAAC;QAC9E,CAAC;QAED,aAAa,CAAC;YACZ,kBAAkB,EAAE,kBAAkB;YACtC,WAAW;SACZ,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAC1C,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6CAA6C,GAAgC,KAAK,EAC7F,SAAoB,EACU,EAAE,CAAC,CAAC;IAClC,CAAC,uBAAuB,CAAC,cAAc,CAAC,EAAE,wBAAwB,CAAC,SAAS,CAAC;CAC9E,CAAC,CAAC","sourcesContent":["import {\n  ActionProcessorList,\n  ActionProcessorListResolver,\n  actionResult,\n  actionResultError,\n  DecodedAccessToken,\n  ErrorTypeEnum,\n  QPQConfig,\n  UserDirectoryActionType,\n  UserDirectorySetAccessTokenActionProcessor,\n} from 'quidproquo-core';\n\nimport { decodeAccessToken } from '../../../logic/cognito';\n\nconst getProcessSetAccessToken = (qpqConfig: QPQConfig): UserDirectorySetAccessTokenActionProcessor => {\n  return async ({ accessToken, userDirectoryName }, session, apl, logger, updateSession) => {\n    // decodeAccessToken throws on a missing/unverifiable/expired token; surface that\n    // as a typed Unauthorized result (matching the dev-server processor and\n    // ReadAccessToken) instead of letting the raw error escape as a GenericError.\n    // The session is left untouched on failure.\n    let decodedAccessToken: DecodedAccessToken;\n    try {\n      decodedAccessToken = await decodeAccessToken(userDirectoryName, qpqConfig, accessToken, false);\n    } catch {\n      return actionResultError(ErrorTypeEnum.Unauthorized, 'Invalid accessToken');\n    }\n\n    updateSession({\n      decodedAccessToken: decodedAccessToken,\n      accessToken,\n    });\n\n    return actionResult(decodedAccessToken);\n  };\n};\n\nexport const getUserDirectorySetAccessTokenActionProcessor: ActionProcessorListResolver = async (\n  qpqConfig: QPQConfig,\n): Promise<ActionProcessorList> => ({\n  [UserDirectoryActionType.SetAccessToken]: getProcessSetAccessToken(qpqConfig),\n});\n"]}

package/lib/esm/lambdaHandlers/getSqsEvent_queueEvent.js

@@ -2,9 +2,9 @@ import { askProcessEvent, askProcessEventWithGroupOrdering, QpqRuntimeType } fro
 import { getSqsQueueEventProcessor } from '../getActionProcessor';
 import { getQueueConfigSetting } from '../getActionProcessor/core/event/sqs/queue/getEventMatchStoryActionProcessor';
 import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
-const getProcessEventStory = () => {
+const getProcessEventStory = (qpqConfig) => {
     // FIFO queues must process records one group at a time, blocking a group once a record fails
-    if (getQueueConfigSetting().isFifo) {
+    if (getQueueConfigSetting(qpqConfig).isFifo) {
         return function* askProcessQueueEventWithGroupOrdering(...eventArguments) {
             return yield* askProcessEventWithGroupOrdering((record) => record.groupId, ...eventArguments);
         };
@@ -16,5 +16,5 @@ export const getSqsEvent_queueEvent = (dynamicModuleLoader, qpqConfig) => getQpq
         depth: 0,
         context: {},
     };
-}, getSqsQueueEventProcessor, dynamicModuleLoader, qpqConfig, getProcessEventStory);
+}, getSqsQueueEventProcessor, dynamicModuleLoader, qpqConfig, () => getProcessEventStory(qpqConfig));
 //# sourceMappingURL=getSqsEvent_queueEvent.js.map

package/lib/esm/lambdaHandlers/getSqsEvent_queueEvent.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSqsEvent_queueEvent.js","sourceRoot":"","sources":["../../../src/lambdaHandlers/getSqsEvent_queueEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gCAAgC,EAAkC,cAAc,EAAc,MAAM,iBAAiB,CAAC;AAIhJ,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8EAA8E,CAAC;AACrH,OAAO,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AAEpF,MAAM,oBAAoB,GAAG,GAA2B,EAAE;IACxD,6FAA6F;IAC7F,IAAI,qBAAqB,EAAE,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,QAAQ,CAAC,CAAC,qCAAqC,CAAC,GAAG,cAAc;YACtE,OAAO,KAAK,CAAC,CAAC,gCAAgC,CAAC,CAAC,MAAuB,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC,CAAC;QACjH,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,mBAAwC,EAAE,SAAoB,EAAE,EAAE,CACvG,2BAA2B,CACzB,cAAc,CAAC,WAAW,EAC1B,CAAC,KAAK,EAAE,EAAE;IACR,OAAO;QACL,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,EAAE;KACZ,CAAC;AACJ,CAAC,EACD,yBAAyB,EACzB,mBAAmB,EACnB,SAAS,EACT,oBAAoB,CACrB,CAAC","sourcesContent":["import { askProcessEvent, askProcessEventWithGroupOrdering, DynamicModuleLoader, QPQConfig, QpqRuntimeType, QueueEvent } from 'quidproquo-core';\n\nimport { SQSEvent } from 'aws-lambda';\n\nimport { getSqsQueueEventProcessor } from '../getActionProcessor';\nimport { getQueueConfigSetting } from '../getActionProcessor/core/event/sqs/queue/getEventMatchStoryActionProcessor';\nimport { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';\n\nconst getProcessEventStory = (): typeof askProcessEvent => {\n  // FIFO queues must process records one group at a time, blocking a group once a record fails\n  if (getQueueConfigSetting().isFifo) {\n    return function* askProcessQueueEventWithGroupOrdering(...eventArguments) {\n      return yield* askProcessEventWithGroupOrdering((record: QueueEvent<any>) => record.groupId, ...eventArguments);\n    };\n  }\n\n  return askProcessEvent;\n};\n\nexport const getSqsEvent_queueEvent = (dynamicModuleLoader: DynamicModuleLoader, qpqConfig: QPQConfig) =>\n  getQpqLambdaRuntimeForEvent<SQSEvent>(\n    QpqRuntimeType.QUEUE_EVENT,\n    (event) => {\n      return {\n        depth: 0,\n        context: {},\n      };\n    },\n    getSqsQueueEventProcessor,\n    dynamicModuleLoader,\n    qpqConfig,\n    getProcessEventStory,\n  );\n"]}
+{"version":3,"file":"getSqsEvent_queueEvent.js","sourceRoot":"","sources":["../../../src/lambdaHandlers/getSqsEvent_queueEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gCAAgC,EAAkC,cAAc,EAAc,MAAM,iBAAiB,CAAC;AAIhJ,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8EAA8E,CAAC;AACrH,OAAO,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AAEpF,MAAM,oBAAoB,GAAG,CAAC,SAAoB,EAA0B,EAAE;IAC5E,6FAA6F;IAC7F,IAAI,qBAAqB,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;QAC5C,OAAO,QAAQ,CAAC,CAAC,qCAAqC,CAAC,GAAG,cAAc;YACtE,OAAO,KAAK,CAAC,CAAC,gCAAgC,CAAC,CAAC,MAAuB,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC,CAAC;QACjH,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,mBAAwC,EAAE,SAAoB,EAAE,EAAE,CACvG,2BAA2B,CACzB,cAAc,CAAC,WAAW,EAC1B,CAAC,KAAK,EAAE,EAAE;IACR,OAAO;QACL,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,EAAE;KACZ,CAAC;AACJ,CAAC,EACD,yBAAyB,EACzB,mBAAmB,EACnB,SAAS,EACT,GAAG,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,CACtC,CAAC","sourcesContent":["import { askProcessEvent, askProcessEventWithGroupOrdering, DynamicModuleLoader, QPQConfig, QpqRuntimeType, QueueEvent } from 'quidproquo-core';\n\nimport { SQSEvent } from 'aws-lambda';\n\nimport { getSqsQueueEventProcessor } from '../getActionProcessor';\nimport { getQueueConfigSetting } from '../getActionProcessor/core/event/sqs/queue/getEventMatchStoryActionProcessor';\nimport { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';\n\nconst getProcessEventStory = (qpqConfig: QPQConfig): typeof askProcessEvent => {\n  // FIFO queues must process records one group at a time, blocking a group once a record fails\n  if (getQueueConfigSetting(qpqConfig).isFifo) {\n    return function* askProcessQueueEventWithGroupOrdering(...eventArguments) {\n      return yield* askProcessEventWithGroupOrdering((record: QueueEvent<any>) => record.groupId, ...eventArguments);\n    };\n  }\n\n  return askProcessEvent;\n};\n\nexport const getSqsEvent_queueEvent = (dynamicModuleLoader: DynamicModuleLoader, qpqConfig: QPQConfig) =>\n  getQpqLambdaRuntimeForEvent<SQSEvent>(\n    QpqRuntimeType.QUEUE_EVENT,\n    (event) => {\n      return {\n        depth: 0,\n        context: {},\n      };\n    },\n    getSqsQueueEventProcessor,\n    dynamicModuleLoader,\n    qpqConfig,\n    () => getProcessEventStory(qpqConfig),\n  );\n"]}

package/lib/esm/logic/cognito/requestEmailVerificationCode.d.ts

@@ -1 +1,2 @@
-export declare const requestEmailVerificationCode: (region: string, accessToken: string) => Promise<void>;
+import { AuthenticationDeliveryDetails } from 'quidproquo-core';
+export declare const requestEmailVerificationCode: (region: string, accessToken: string) => Promise<AuthenticationDeliveryDetails>;

package/lib/esm/logic/cognito/requestEmailVerificationCode.js

@@ -8,6 +8,12 @@ export const requestEmailVerificationCode = async (region, accessToken) => {
         AccessToken: accessToken,
         AttributeName: 'email', // Request verification for the email attribute
     };
-    const requestEmailVerificationCodeResponse = await cognitoClient.send(new GetUserAttributeVerificationCodeCommand(params));
+    const response = await cognitoClient.send(new GetUserAttributeVerificationCodeCommand(params));
+    const deliveryInfo = {
+        attributeName: response.CodeDeliveryDetails?.AttributeName || 'email',
+        destination: response.CodeDeliveryDetails?.Destination || 'unknown@email.com',
+        deliveryMedium: response.CodeDeliveryDetails?.DeliveryMedium || 'EMAIL',
+    };
+    return deliveryInfo;
 };
 //# sourceMappingURL=requestEmailVerificationCode.js.map

package/lib/esm/logic/cognito/requestEmailVerificationCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestEmailVerificationCode.js","sourceRoot":"","sources":["../../../../src/logic/cognito/requestEmailVerificationCode.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,uCAAuC,GAExC,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAAE,MAAc,EAAE,WAAmB,EAAE,EAAE;IACxF,MAAM,aAAa,GAAG,eAAe,CAAC,6BAA6B,EAAE;QACnE,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,MAAM,GAAiD;QAC3D,WAAW,EAAE,WAAW;QACxB,aAAa,EAAE,OAAO,EAAE,+CAA+C;KACxE,CAAC;IAEF,MAAM,oCAAoC,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,uCAAuC,CAAC,MAAM,CAAC,CAAC,CAAC;AAC7H,CAAC,CAAC","sourcesContent":["import {\n  CognitoIdentityProviderClient,\n  GetUserAttributeVerificationCodeCommand,\n  GetUserAttributeVerificationCodeCommandInput,\n} from '@aws-sdk/client-cognito-identity-provider';\n\nimport { createAwsClient } from '../createAwsClient';\n\nexport const requestEmailVerificationCode = async (region: string, accessToken: string) => {\n  const cognitoClient = createAwsClient(CognitoIdentityProviderClient, {\n    region,\n  });\n\n  const params: GetUserAttributeVerificationCodeCommandInput = {\n    AccessToken: accessToken,\n    AttributeName: 'email', // Request verification for the email attribute\n  };\n\n  const requestEmailVerificationCodeResponse = await cognitoClient.send(new GetUserAttributeVerificationCodeCommand(params));\n};\n"]}
+{"version":3,"file":"requestEmailVerificationCode.js","sourceRoot":"","sources":["../../../../src/logic/cognito/requestEmailVerificationCode.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,6BAA6B,EAC7B,uCAAuC,GAExC,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAAE,MAAc,EAAE,WAAmB,EAA0C,EAAE;IAChI,MAAM,aAAa,GAAG,eAAe,CAAC,6BAA6B,EAAE;QACnE,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,MAAM,GAAiD;QAC3D,WAAW,EAAE,WAAW;QACxB,aAAa,EAAE,OAAO,EAAE,+CAA+C;KACxE,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,uCAAuC,CAAC,MAAM,CAAC,CAAC,CAAC;IAE/F,MAAM,YAAY,GAAG;QACnB,aAAa,EAAE,QAAQ,CAAC,mBAAmB,EAAE,aAAa,IAAI,OAAO;QACrE,WAAW,EAAE,QAAQ,CAAC,mBAAmB,EAAE,WAAW,IAAI,mBAAmB;QAC7E,cAAc,EAAE,QAAQ,CAAC,mBAAmB,EAAE,cAAc,IAAI,OAAO;KACvC,CAAC;IAEnC,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC","sourcesContent":["import { AuthenticationDeliveryDetails } from 'quidproquo-core';\n\nimport {\n  CognitoIdentityProviderClient,\n  GetUserAttributeVerificationCodeCommand,\n  GetUserAttributeVerificationCodeCommandInput,\n} from '@aws-sdk/client-cognito-identity-provider';\n\nimport { createAwsClient } from '../createAwsClient';\n\nexport const requestEmailVerificationCode = async (region: string, accessToken: string): Promise<AuthenticationDeliveryDetails> => {\n  const cognitoClient = createAwsClient(CognitoIdentityProviderClient, {\n    region,\n  });\n\n  const params: GetUserAttributeVerificationCodeCommandInput = {\n    AccessToken: accessToken,\n    AttributeName: 'email', // Request verification for the email attribute\n  };\n\n  const response = await cognitoClient.send(new GetUserAttributeVerificationCodeCommand(params));\n\n  const deliveryInfo = {\n    attributeName: response.CodeDeliveryDetails?.AttributeName || 'email',\n    destination: response.CodeDeliveryDetails?.Destination || 'unknown@email.com',\n    deliveryMedium: response.CodeDeliveryDetails?.DeliveryMedium || 'EMAIL',\n  } as AuthenticationDeliveryDetails;\n\n  return deliveryInfo;\n};\n"]}

package/lib/esm/logic/dynamo/getAllItems.d.ts

@@ -1 +1,2 @@
-export declare function getAllItems(tableName: string, region: string): Promise<any[]>;
+import { KvsQueryOperation } from 'quidproquo-core';
+export declare function getAllItems(tableName: string, region: string, filterExpression?: KvsQueryOperation): Promise<any[]>;

package/lib/esm/logic/dynamo/getAllItems.js

@@ -1,17 +1,22 @@
 import { DynamoDBClient, ScanCommand } from '@aws-sdk/client-dynamodb';
 import { createAwsClient } from '../createAwsClient';
-export async function getAllItems(tableName, region) {
+import { convertDynamoMapToObject } from './convertObjectToDynamoMap';
+import { buildDynamoQueryExpression, buildExpressionAttributeNames, buildExpressionAttributeValues } from './qpqDynamoOrm';
+export async function getAllItems(tableName, region, filterExpression) {
     const dynamoDBClient = createAwsClient(DynamoDBClient, { region });
     let records = [];
     let lastEvaluatedKey;
     do {
         const scanParams = {
             TableName: tableName,
+            FilterExpression: buildDynamoQueryExpression(filterExpression),
+            ExpressionAttributeValues: filterExpression && buildExpressionAttributeValues([filterExpression]),
+            ExpressionAttributeNames: filterExpression && buildExpressionAttributeNames([filterExpression]),
             ExclusiveStartKey: lastEvaluatedKey,
         };
         try {
             const result = await dynamoDBClient.send(new ScanCommand(scanParams));
-            records = records.concat(result.Items);
+            records = records.concat((result.Items || []).map((item) => convertDynamoMapToObject(item)));
             lastEvaluatedKey = result.LastEvaluatedKey;
         }
         catch (error) {

package/lib/esm/logic/dynamo/getAllItems.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAllItems.js","sourceRoot":"","sources":["../../../../src/logic/dynamo/getAllItems.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAoB,MAAM,0BAA0B,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,SAAiB,EAAE,MAAc;IACjE,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEnE,IAAI,OAAO,GAAU,EAAE,CAAC;IACxB,IAAI,gBAAoD,CAAC;IAEzD,GAAG,CAAC;QACF,MAAM,UAAU,GAAqB;YACnC,SAAS,EAAE,SAAS;YACpB,iBAAiB,EAAE,gBAAgB;SACpC,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;YACtE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAc,CAAC,CAAC;YAChD,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;YACvD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,QAAQ,gBAAgB,EAAE;IAE3B,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import { DynamoDBClient, ScanCommand, ScanCommandInput } from '@aws-sdk/client-dynamodb';\n\nimport { createAwsClient } from '../createAwsClient';\n\nexport async function getAllItems(tableName: string, region: string): Promise<any[]> {\n  const dynamoDBClient = createAwsClient(DynamoDBClient, { region });\n\n  let records: any[] = [];\n  let lastEvaluatedKey: { [key: string]: any } | undefined;\n\n  do {\n    const scanParams: ScanCommandInput = {\n      TableName: tableName,\n      ExclusiveStartKey: lastEvaluatedKey,\n    };\n\n    try {\n      const result = await dynamoDBClient.send(new ScanCommand(scanParams));\n      records = records.concat(result.Items as any[]);\n      lastEvaluatedKey = result.LastEvaluatedKey;\n    } catch (error) {\n      console.error('Error scanning DynamoDB table:', error);\n      throw error;\n    }\n  } while (lastEvaluatedKey);\n\n  return records;\n}\n"]}
+{"version":3,"file":"getAllItems.js","sourceRoot":"","sources":["../../../../src/logic/dynamo/getAllItems.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAoB,MAAM,0BAA0B,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,6BAA6B,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AAE3H,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,SAAiB,EAAE,MAAc,EAAE,gBAAoC;IACvG,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEnE,IAAI,OAAO,GAAU,EAAE,CAAC;IACxB,IAAI,gBAAoD,CAAC;IAEzD,GAAG,CAAC;QACF,MAAM,UAAU,GAAqB;YACnC,SAAS,EAAE,SAAS;YACpB,gBAAgB,EAAE,0BAA0B,CAAC,gBAAgB,CAAC;YAC9D,yBAAyB,EAAE,gBAAgB,IAAI,8BAA8B,CAAC,CAAC,gBAAgB,CAAC,CAAC;YACjG,wBAAwB,EAAE,gBAAgB,IAAI,6BAA6B,CAAC,CAAC,gBAAgB,CAAC,CAAC;YAC/F,iBAAiB,EAAE,gBAAgB;SACpC,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;YACtE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7F,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;YACvD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,QAAQ,gBAAgB,EAAE;IAE3B,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import { KvsQueryOperation } from 'quidproquo-core';\n\nimport { DynamoDBClient, ScanCommand, ScanCommandInput } from '@aws-sdk/client-dynamodb';\n\nimport { createAwsClient } from '../createAwsClient';\nimport { convertDynamoMapToObject } from './convertObjectToDynamoMap';\nimport { buildDynamoQueryExpression, buildExpressionAttributeNames, buildExpressionAttributeValues } from './qpqDynamoOrm';\n\nexport async function getAllItems(tableName: string, region: string, filterExpression?: KvsQueryOperation): Promise<any[]> {\n  const dynamoDBClient = createAwsClient(DynamoDBClient, { region });\n\n  let records: any[] = [];\n  let lastEvaluatedKey: { [key: string]: any } | undefined;\n\n  do {\n    const scanParams: ScanCommandInput = {\n      TableName: tableName,\n      FilterExpression: buildDynamoQueryExpression(filterExpression),\n      ExpressionAttributeValues: filterExpression && buildExpressionAttributeValues([filterExpression]),\n      ExpressionAttributeNames: filterExpression && buildExpressionAttributeNames([filterExpression]),\n      ExclusiveStartKey: lastEvaluatedKey,\n    };\n\n    try {\n      const result = await dynamoDBClient.send(new ScanCommand(scanParams));\n      records = records.concat((result.Items || []).map((item) => convertDynamoMapToObject(item)));\n      lastEvaluatedKey = result.LastEvaluatedKey;\n    } catch (error) {\n      console.error('Error scanning DynamoDB table:', error);\n      throw error;\n    }\n  } while (lastEvaluatedKey);\n\n  return records;\n}\n"]}

package/lib/esm/logic/dynamo/getItem.d.ts

@@ -1 +1,2 @@
-export declare function getItem(tableName: string, key: string, region: string): Promise<any | null>;
+import { KvsCoreDataType } from 'quidproquo-core';
+export declare function getItem(tableName: string, region: string, keyName: string, key: KvsCoreDataType, sortKeyName?: string, sortKey?: KvsCoreDataType): Promise<any | null>;

package/lib/esm/logic/dynamo/getItem.js

@@ -1,18 +1,21 @@
 import { DynamoDBClient, GetItemCommand } from '@aws-sdk/client-dynamodb';
 import { createAwsClient } from '../createAwsClient';
-export async function getItem(tableName, key, region) {
+import { convertDynamoMapToObject } from './convertObjectToDynamoMap';
+import { buildAttributeValue } from './qpqDynamoOrm';
+export async function getItem(tableName, region, keyName, key, sortKeyName, sortKey) {
     const dynamoDBClient = createAwsClient(DynamoDBClient, { region });
     const getItemParams = {
         TableName: tableName,
         Key: {
-            key: {
-                S: key,
-            },
+            [keyName]: buildAttributeValue(key),
         },
     };
+    if (sortKeyName && sortKey !== undefined) {
+        getItemParams.Key[sortKeyName] = buildAttributeValue(sortKey);
+    }
     try {
         const result = await dynamoDBClient.send(new GetItemCommand(getItemParams));
-        return result.Item ? JSON.parse(result.Item.value.S) : null;
+        return result.Item ? convertDynamoMapToObject(result.Item) : null;
     }
     catch (error) {
         console.error('Error getting item from DynamoDB:', error);

package/lib/esm/logic/dynamo/getItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"getItem.js","sourceRoot":"","sources":["../../../../src/logic/dynamo/getItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAuB,MAAM,0BAA0B,CAAC;AAE/F,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,SAAiB,EAAE,GAAW,EAAE,MAAc;IAC1E,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEnE,MAAM,aAAa,GAAwB;QACzC,SAAS,EAAE,SAAS;QACpB,GAAG,EAAE;YACH,GAAG,EAAE;gBACH,CAAC,EAAE,GAAG;aACP;SACF;KACF,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;QAC5E,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACxE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC1D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC","sourcesContent":["import { DynamoDBClient, GetItemCommand, GetItemCommandInput } from '@aws-sdk/client-dynamodb';\n\nimport { createAwsClient } from '../createAwsClient';\n\nexport async function getItem(tableName: string, key: string, region: string): Promise<any | null> {\n  const dynamoDBClient = createAwsClient(DynamoDBClient, { region });\n\n  const getItemParams: GetItemCommandInput = {\n    TableName: tableName,\n    Key: {\n      key: {\n        S: key,\n      },\n    },\n  };\n\n  try {\n    const result = await dynamoDBClient.send(new GetItemCommand(getItemParams));\n    return result.Item ? JSON.parse(result.Item.value.S as string) : null;\n  } catch (error) {\n    console.error('Error getting item from DynamoDB:', error);\n    throw error;\n  }\n}\n"]}
+{"version":3,"file":"getItem.js","sourceRoot":"","sources":["../../../../src/logic/dynamo/getItem.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAuB,MAAM,0BAA0B,CAAC;AAE/F,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,SAAiB,EACjB,MAAc,EACd,OAAe,EACf,GAAoB,EACpB,WAAoB,EACpB,OAAyB;IAEzB,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEnE,MAAM,aAAa,GAAwB;QACzC,SAAS,EAAE,SAAS;QACpB,GAAG,EAAE;YACH,CAAC,OAAO,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC;SACpC;KACF,CAAC;IAEF,IAAI,WAAW,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACzC,aAAa,CAAC,GAAI,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;QAC5E,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACpE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC1D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC","sourcesContent":["import { KvsCoreDataType } from 'quidproquo-core';\n\nimport { DynamoDBClient, GetItemCommand, GetItemCommandInput } from '@aws-sdk/client-dynamodb';\n\nimport { createAwsClient } from '../createAwsClient';\nimport { convertDynamoMapToObject } from './convertObjectToDynamoMap';\nimport { buildAttributeValue } from './qpqDynamoOrm';\n\nexport async function getItem(\n  tableName: string,\n  region: string,\n  keyName: string,\n  key: KvsCoreDataType,\n  sortKeyName?: string,\n  sortKey?: KvsCoreDataType,\n): Promise<any | null> {\n  const dynamoDBClient = createAwsClient(DynamoDBClient, { region });\n\n  const getItemParams: GetItemCommandInput = {\n    TableName: tableName,\n    Key: {\n      [keyName]: buildAttributeValue(key),\n    },\n  };\n\n  if (sortKeyName && sortKey !== undefined) {\n    getItemParams.Key![sortKeyName] = buildAttributeValue(sortKey);\n  }\n\n  try {\n    const result = await dynamoDBClient.send(new GetItemCommand(getItemParams));\n    return result.Item ? convertDynamoMapToObject(result.Item) : null;\n  } catch (error) {\n    console.error('Error getting item from DynamoDB:', error);\n    throw error;\n  }\n}\n"]}