@trunkrs/common 1.4.34 → 1.5.2

package/models/errors/OperationNotSupportedError.d.ts

@@ -0,0 +1,5 @@
+import ErrorBase from './ErrorBase';
+declare class OperationNotSupportedError extends ErrorBase {
+    constructor(message: string);
+}
+export default OperationNotSupportedError;

package/models/errors/OperationNotSupportedError.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ErrorBase_1 = __importDefault(require("./ErrorBase"));
+class OperationNotSupportedError extends ErrorBase_1.default {
+    constructor(message) {
+        super();
+        this.name = 'OperationNotSupportedError';
+        this.message = message;
+        Error.captureStackTrace(this);
+    }
+}
+exports.default = OperationNotSupportedError;
+//# sourceMappingURL=OperationNotSupportedError.js.map

package/models/errors/OperationNotSupportedError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OperationNotSupportedError.js","sourceRoot":"","sources":["../../../models/errors/OperationNotSupportedError.ts"],"names":[],"mappings":";;;;;AAAA,4DAAmC;AAEnC,MAAM,0BAA2B,SAAQ,mBAAS;IAChD,YAAmB,OAAe;QAChC,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QAEtB,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;IAC/B,CAAC;CACF;AAED,kBAAe,0BAA0B,CAAA"}

package/models/errors/index.d.ts

@@ -3,3 +3,4 @@ export { default as OAuthClientError } from './OAuthClientError';
 export { default as HttpRequestError } from './HttpRequestError';
 export { default as OAuthExchangeFailedError } from './OAuthExchangeFailedError';
 export { default as CoreServicesRequestFailedError } from './CoreServicesRequestFailedError';
+export { default as OperationNotSupportedError } from './OperationNotSupportedError';

package/models/errors/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoreServicesRequestFailedError = exports.OAuthExchangeFailedError = exports.HttpRequestError = exports.OAuthClientError = exports.ErrorBase = void 0;
+exports.OperationNotSupportedError = exports.CoreServicesRequestFailedError = exports.OAuthExchangeFailedError = exports.HttpRequestError = exports.OAuthClientError = exports.ErrorBase = void 0;
 var ErrorBase_1 = require("./ErrorBase");
 Object.defineProperty(exports, "ErrorBase", { enumerable: true, get: function () { return __importDefault(ErrorBase_1).default; } });
 var OAuthClientError_1 = require("./OAuthClientError");
@@ -14,4 +14,6 @@ var OAuthExchangeFailedError_1 = require("./OAuthExchangeFailedError");
 Object.defineProperty(exports, "OAuthExchangeFailedError", { enumerable: true, get: function () { return __importDefault(OAuthExchangeFailedError_1).default; } });
 var CoreServicesRequestFailedError_1 = require("./CoreServicesRequestFailedError");
 Object.defineProperty(exports, "CoreServicesRequestFailedError", { enumerable: true, get: function () { return __importDefault(CoreServicesRequestFailedError_1).default; } });
+var OperationNotSupportedError_1 = require("./OperationNotSupportedError");
+Object.defineProperty(exports, "OperationNotSupportedError", { enumerable: true, get: function () { return __importDefault(OperationNotSupportedError_1).default; } });
 //# sourceMappingURL=index.js.map

package/models/errors/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../models/errors/index.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAkD;AAAzC,uHAAA,OAAO,OAAa;AAC7B,uDAAgE;AAAvD,qIAAA,OAAO,OAAoB;AACpC,uDAAgE;AAAvD,qIAAA,OAAO,OAAoB;AACpC,uEAAgF;AAAvE,qJAAA,OAAO,OAA4B;AAC5C,mFAA4F;AAAnF,iKAAA,OAAO,OAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../models/errors/index.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAkD;AAAzC,uHAAA,OAAO,OAAa;AAC7B,uDAAgE;AAAvD,qIAAA,OAAO,OAAoB;AACpC,uDAAgE;AAAvD,qIAAA,OAAO,OAAoB;AACpC,uEAAgF;AAAvE,qJAAA,OAAO,OAA4B;AAC5C,mFAA4F;AAAnF,iKAAA,OAAO,OAAkC;AAClD,2EAAoF;AAA3E,yJAAA,OAAO,OAA8B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trunkrs/common",
-  "version": "1.4.34",
+  "version": "1.5.2",
   "description": "Common standards library for development in Trunkrs",
   "types": "./index.d.ts",
   "repository": "https://github.com/Trunkrs/common.git",

package/services/aws/dynamodb/BaseDynamoDataStorage.d.ts

@@ -1,14 +1,10 @@
-import { AWSError, DynamoDB } from 'aws-sdk';
-import { Key } from 'aws-sdk/clients/dynamodb';
-import { PromiseResult } from 'aws-sdk/lib/request';
-import { DocumentClient } from 'aws-sdk/lib/dynamodb/document_client';
-import { QueryOperation } from './utils';
+import { DynamoDB } from 'aws-sdk';
 declare abstract class BaseDynamoDataStorage<TEntity> {
     protected readonly tableName: string;
     protected abstract readonly keys: Array<keyof TEntity>;
     protected readonly documentClient: DynamoDB.DocumentClient;
     protected constructor(tableName: string);
-    protected executeQueryOperation({ operation, query }: QueryOperation, lastKey?: Key): Promise<PromiseResult<DocumentClient.QueryOutput, AWSError>>;
+    protected executeOperation<TResultEntity = TEntity>(operation: 'Scan' | 'Query', query: DynamoDB.DocumentClient.ScanInput): Promise<TResultEntity[]>;
     protected getKeyPairFromModel(model: TEntity): Partial<TEntity>;
 }
 export default BaseDynamoDataStorage;

package/services/aws/dynamodb/BaseDynamoDataStorage.js

@@ -6,14 +6,24 @@ class BaseDynamoDataStorage {
         this.tableName = tableName;
         this.documentClient = new aws_sdk_1.DynamoDB.DocumentClient();
     }
-    executeQueryOperation({ operation, query }, lastKey) {
-        return operation === 'Query'
-            ? this.documentClient
-                .query({ ...query, ExclusiveStartKey: lastKey })
-                .promise()
-            : this.documentClient
-                .scan({ ...query, ExclusiveStartKey: lastKey })
-                .promise();
+    async executeOperation(operation, query) {
+        var _a;
+        const results = [];
+        let lastEvaluatedKey;
+        do {
+            const page = operation === 'Scan'
+                ? await this.documentClient
+                    .scan({ ...query, ExclusiveStartKey: lastEvaluatedKey })
+                    .promise()
+                : await this.documentClient
+                    .query({ ...query, ExclusiveStartKey: lastEvaluatedKey })
+                    .promise();
+            if ((_a = page.Items) === null || _a === void 0 ? void 0 : _a.length) {
+                results.push(...page.Items);
+            }
+            lastEvaluatedKey = page.LastEvaluatedKey;
+        } while (lastEvaluatedKey);
+        return results;
     }
     getKeyPairFromModel(model) {
         const keyDictionary = {};

package/services/aws/dynamodb/BaseDynamoDataStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseDynamoDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/BaseDynamoDataStorage.ts"],"names":[],"mappings":";;AAAA,qCAA4C;AAQ5C,MAAe,qBAAqB;IAKlC,YAAyC,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QACxD,IAAI,CAAC,cAAc,GAAG,IAAI,kBAAQ,CAAC,cAAc,EAAE,CAAA;IACrD,CAAC;IAES,qBAAqB,CAC7B,EAAE,SAAS,EAAE,KAAK,EAAkB,EACpC,OAAa;QAEb,OAAO,SAAS,KAAK,OAAO;YAC1B,CAAC,CAAC,IAAI,CAAC,cAAc;iBAChB,KAAK,CAAC,EAAE,GAAG,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC;iBAC/C,OAAO,EAAE;YACd,CAAC,CAAC,IAAI,CAAC,cAAc;iBAChB,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC;iBAC9C,OAAO,EAAE,CAAA;IAClB,CAAC;IAES,mBAAmB,CAAC,KAAc;QAC1C,MAAM,aAAa,GAAqB,EAAE,CAAA;QAE1C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,OAAO,aAAa,CAAA;IACtB,CAAC;CACF;AAED,kBAAe,qBAAqB,CAAA"}
+{"version":3,"file":"BaseDynamoDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/BaseDynamoDataStorage.ts"],"names":[],"mappings":";;AACA,qCAAkC;AAGlC,MAAe,qBAAqB;IAKlC,YAAyC,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QACxD,IAAI,CAAC,cAAc,GAAG,IAAI,kBAAQ,CAAC,cAAc,EAAE,CAAA;IACrD,CAAC;IAES,KAAK,CAAC,gBAAgB,CAC9B,SAA2B,EAC3B,KAAwC;;QAExC,MAAM,OAAO,GAAG,EAAE,CAAA;QAClB,IAAI,gBAAgB,CAAA;QAEpB,GAAG;YACD,MAAM,IAAI,GACR,SAAS,KAAK,MAAM;gBAClB,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc;qBACtB,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;qBACvD,OAAO,EAAE;gBACd,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc;qBACtB,KAAK,CAAC,EAAE,GAAG,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;qBACxD,OAAO,EAAE,CAAA;YAElB,IAAI,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,EAAE;gBACtB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;aAC5B;YAED,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAA;SACzC,QAAQ,gBAAgB,EAAC;QAE1B,OAAO,OAA0B,CAAA;IACnC,CAAC;IAES,mBAAmB,CAAC,KAAc;QAC1C,MAAM,aAAa,GAAqB,EAAE,CAAA;QAE1C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,OAAO,aAAa,CAAA;IACtB,CAAC;CACF;AAED,kBAAe,qBAAqB,CAAA"}

package/services/aws/dynamodb/BatchSizeTooBigError.js

@@ -7,7 +7,8 @@ const ErrorBase_1 = __importDefault(require("../../../models/errors/ErrorBase"))
 class BatchSizeTooBigError extends ErrorBase_1.default {
     constructor() {
         super();
-        this.message = 'BatchSizes cannot be bigger than 24 with dynamodb write actions';
+        this.message =
+            'BatchSizes cannot be bigger than 24 with dynamodb write actions';
     }
 }
 exports.default = BatchSizeTooBigError;

package/services/aws/dynamodb/BatchSizeTooBigError.js.map

@@ -1 +1 @@
-{"version":3,"file":"BatchSizeTooBigError.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/BatchSizeTooBigError.ts"],"names":[],"mappings":";;;;;AAAA,iFAAwD;AAExD,MAAM,oBAAqB,SAAQ,mBAAS;IAC1C;QACE,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,iEAAiE,CAAA;IAClF,CAAC;CACF;AAED,kBAAe,oBAAoB,CAAA"}
+{"version":3,"file":"BatchSizeTooBigError.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/BatchSizeTooBigError.ts"],"names":[],"mappings":";;;;;AAAA,iFAAwD;AAExD,MAAM,oBAAqB,SAAQ,mBAAS;IAC1C;QACE,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO;YACV,iEAAiE,CAAA;IACrE,CAAC;CACF;AAED,kBAAe,oBAAoB,CAAA"}

package/services/aws/dynamodb/DynamoDataStorage.js

@@ -63,27 +63,22 @@ class DynamoDataStorage extends BaseDynamoDataStorage_1.default {
         }, []);
     }
     async find(query) {
-        var _a;
-        const operation = utils_1.QueryBuilder.buildQuery(query, this.tableName, this.keys);
-        const results = [];
-        let lastEvaluatedKey;
-        do {
-            const page = await this.executeQueryOperation(operation, lastEvaluatedKey);
-            if ((_a = page.Items) === null || _a === void 0 ? void 0 : _a.length) {
-                results.push(...page.Items);
-            }
-            lastEvaluatedKey = page.LastEvaluatedKey;
-        } while (lastEvaluatedKey);
-        return results;
+        var _a, _b;
+        const queryOp = (_b = (_a = query.queryOptions) === null || _a === void 0 ? void 0 : _a.operation) !== null && _b !== void 0 ? _b : 'Query';
+        const builderParams = { query, tableName: this.tableName, primaryKeys: this.keys };
+        const ddbQuery = queryOp === 'Scan'
+            ? utils_1.QueryBuilder.buildScan(builderParams)
+            : utils_1.QueryBuilder.buildQuery(builderParams);
+        const result = await this.executeOperation(queryOp, ddbQuery);
+        return result;
     }
     async findOne(query) {
         const limitedQuery = {
             ...query,
             limit: 1,
         };
-        const operation = utils_1.QueryBuilder.buildQuery(limitedQuery, this.tableName, this.keys);
-        const results = await this.executeQueryOperation(operation);
-        return results.Items ? results.Items[0] : null;
+        const [result] = await this.find(limitedQuery);
+        return result !== null && result !== void 0 ? result : null;
     }
     async remove(entity) {
         const keyPair = this.getKeyPairFromModel(entity);

package/services/aws/dynamodb/DynamoDataStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamoDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/DynamoDataStorage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DynamoDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/DynamoDataStorage.ts"],"names":[],"mappings":"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"}

package/services/aws/dynamodb/DynamoIndexDataStorage.js

@@ -11,27 +11,27 @@ class DynamoIndexDataStorage extends BaseDynamoDataStorage_1.default {
         this.indexName = indexName;
     }
     async find(query) {
-        var _a;
-        const operation = utils_1.QueryBuilder.buildQuery(query, this.tableName, this.keys, this.indexName);
-        const results = [];
-        let lastEvaluatedKey;
-        do {
-            const page = await this.executeQueryOperation(operation, lastEvaluatedKey);
-            if ((_a = page.Items) === null || _a === void 0 ? void 0 : _a.length) {
-                results.push(...page.Items);
-            }
-            lastEvaluatedKey = page.LastEvaluatedKey;
-        } while (lastEvaluatedKey);
-        return results;
+        var _a, _b;
+        const queryOp = (_b = (_a = query.queryOptions) === null || _a === void 0 ? void 0 : _a.operation) !== null && _b !== void 0 ? _b : 'Query';
+        const builderParams = {
+            query,
+            tableName: this.tableName,
+            primaryKeys: this.keys,
+            indexName: this.indexName,
+        };
+        const ddbQuery = queryOp === 'Scan'
+            ? utils_1.QueryBuilder.buildScan(builderParams)
+            : utils_1.QueryBuilder.buildQuery(builderParams);
+        const result = await this.executeOperation(queryOp, ddbQuery);
+        return result;
     }
     async findOne(query) {
         const limitedQuery = {
             ...query,
             limit: 1,
         };
-        const operation = utils_1.QueryBuilder.buildQuery(limitedQuery, this.tableName, this.keys, this.indexName);
-        const results = await this.executeQueryOperation(operation);
-        return results.Items ? results.Items[0] : null;
+        const [result] = await this.find(limitedQuery);
+        return result !== null && result !== void 0 ? result : null;
     }
 }
 exports.default = DynamoIndexDataStorage;

package/services/aws/dynamodb/DynamoIndexDataStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamoIndexDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/DynamoIndexDataStorage.ts"],"names":[],"mappings":";;;;;AAEA,oFAA2D;AAC3D,mCAAuD;AAGvD,MAAe,sBACb,SAAQ,+BAA8B;IAGtC,YACE,SAAiB,EACE,SAAiB;QAEpC,KAAK,CAAC,SAAS,CAAC,CAAA;QAFG,cAAS,GAAT,SAAS,CAAQ;IAGtC,CAAC;IAEM,KAAK,CAAC,IAAI,CACf,KAA+B;;QAE/B,MAAM,SAAS,GAAG,oBAAY,CAAC,UAAU,CACvC,KAAK,EACL,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,SAAS,CACf,CAAA;QAED,MAAM,OAAO,GAAG,EAAE,CAAA;QAClB,IAAI,gBAAgB,CAAA;QAEpB,GAAG;YAED,MAAM,IAAI,GAA+B,MAAM,IAAI,CAAC,qBAAqB,CACvE,SAAS,EACT,gBAAgB,CACjB,CAAA;YAED,IAAI,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,EAAE;gBACtB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;aAC5B;YAED,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAA;SACzC,QAAQ,gBAAgB,EAAC;QAE1B,OAAO,OAA0B,CAAA;IACnC,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,KAA8C;QAE9C,MAAM,YAAY,GAAG;YACnB,GAAG,KAAK;YACR,KAAK,EAAE,CAAC;SACT,CAAA;QAED,MAAM,SAAS,GAAG,oBAAY,CAAC,UAAU,CACvC,YAAY,EACZ,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,SAAS,CACf,CAAA;QAGD,MAAM,OAAO,GACX,MAAM,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAA;QAC7C,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAa,CAAC,CAAC,CAAC,IAAI,CAAA;IAC7D,CAAC;CACF;AAED,kBAAe,sBAAsB,CAAA"}
+{"version":3,"file":"DynamoIndexDataStorage.js","sourceRoot":"","sources":["../../../../services/aws/dynamodb/DynamoIndexDataStorage.ts"],"names":[],"mappings":";;;;;AAAA,oFAA2D;AAC3D,mCAAuD;AAGvD,MAAe,sBACb,SAAQ,+BAA8B;IAGtC,YACE,SAAiB,EACE,SAAiB;QAEpC,KAAK,CAAC,SAAS,CAAC,CAAA;QAFG,cAAS,GAAT,SAAS,CAAQ;IAGtC,CAAC;IAEM,KAAK,CAAC,IAAI,CACf,KAA+B;;QAE/B,MAAM,OAAO,GAAG,MAAA,MAAA,KAAK,CAAC,YAAY,0CAAE,SAAS,mCAAI,OAAO,CAAA;QACxD,MAAM,aAAa,GAAG;YACpB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAA;QAED,MAAM,QAAQ,GACZ,OAAO,KAAK,MAAM;YAChB,CAAC,CAAC,oBAAY,CAAC,SAAS,CAAC,aAAa,CAAC;YACvC,CAAC,CAAC,oBAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;QAE5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CACxC,OAAO,EACP,QAAQ,CACT,CAAA;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,KAA8C;QAE9C,MAAM,YAAY,GAAG;YACnB,GAAG,KAAK;YACR,KAAK,EAAE,CAAC;SACT,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC9C,OAAO,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAA;IACvB,CAAC;CACF;AAED,kBAAe,sBAAsB,CAAA"}

package/services/aws/dynamodb/utils/index.d.ts

@@ -1,4 +1,4 @@
 export { default as QueryParameters } from './query/QueryParameters';
 export { default as QueryWhereStatement } from './query/QueryWhereStatement';
-export { default as QueryBuilder, QueryOperation } from './query/QueryBuilder';
+export { default as QueryBuilder } from './query/QueryBuilder';
 export { default as PrimaryKey } from './PrimaryKey';

package/services/aws/dynamodb/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../services/aws/dynamodb/utils/index.ts"],"names":[],"mappings":";;;;;;AAGA,qDAA8E;AAArE,6HAAA,OAAO,OAAgB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../services/aws/dynamodb/utils/index.ts"],"names":[],"mappings":";;;;;;AAGA,qDAA8D;AAArD,6HAAA,OAAO,OAAgB"}

package/services/aws/dynamodb/utils/query/QueryBuilder.d.ts

@@ -1,8 +1,10 @@
 import { DynamoDB } from 'aws-sdk';
 import QueryParameters from './QueryParameters';
-export interface QueryOperation {
-    operation: 'Query' | 'Scan';
-    query: DynamoDB.DocumentClient.QueryInput;
+export interface QueryBuilderParams<TEntity> {
+    query: QueryParameters<TEntity>;
+    tableName: string;
+    primaryKeys: Array<keyof TEntity>;
+    indexName?: string;
 }
 declare class QueryBuilder {
     private static buildProjectionExpression;
@@ -11,6 +13,7 @@ declare class QueryBuilder {
     private static buildQueryStatements;
     private static buildExpression;
     private static splitKeyAndFilterCondition;
-    static buildQuery<TEntity>(query: QueryParameters<TEntity>, tableName: string, primaryKeys: Array<keyof TEntity>, indexName?: string): QueryOperation;
+    static buildScan<TEntity>({ query, tableName, indexName, }: QueryBuilderParams<TEntity>): DynamoDB.DocumentClient.ScanInput;
+    static buildQuery<TEntity>({ query, primaryKeys, tableName, indexName, }: QueryBuilderParams<TEntity>): DynamoDB.DocumentClient.QueryInput;
 }
 export default QueryBuilder;

package/services/aws/dynamodb/utils/query/QueryBuilder.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const DynamoOperator_1 = __importDefault(require("../operators/DynamoOperator"));
+const errors_1 = require("../../../../../models/errors");
 class QueryBuilder {
     static buildProjectionExpression(selectStatement) {
         if (!selectStatement.length) {
@@ -64,24 +65,39 @@ class QueryBuilder {
             keyCondition,
         };
     }
-    static buildQuery(query, tableName, primaryKeys, indexName) {
-        const { where, limit, select } = query;
+    static buildScan({ query, tableName, indexName, }) {
+        const { where, limit, select, orderDescending } = query;
+        if (orderDescending) {
+            throw new errors_1.OperationNotSupportedError(`Descending order can't be enforced when using a Scan operation as no index is being evaluated. If descending order is important to the evaluation, please consider using a Query operation instead.`);
+        }
+        const op = {
+            TableName: tableName,
+            IndexName: indexName,
+            Limit: limit,
+            ProjectionExpression: select
+                ? QueryBuilder.buildProjectionExpression(select)
+                : undefined,
+            FilterExpression: this.buildExpression(where),
+            ExpressionAttributeNames: QueryBuilder.buildAttributeNames(where),
+            ExpressionAttributeValues: this.buildAttributeValues(where),
+        };
+        return op;
+    }
+    static buildQuery({ query, primaryKeys, tableName, indexName, }) {
+        const { where, limit, select, orderDescending } = query;
         const { keyCondition, filterCondition } = this.splitKeyAndFilterCondition(where, primaryKeys);
-        const keyExpression = this.buildExpression(keyCondition);
         const op = {
-            operation: keyExpression ? 'Query' : 'Scan',
-            query: {
-                TableName: tableName,
-                IndexName: indexName,
-                Limit: limit,
-                ProjectionExpression: select
-                    ? QueryBuilder.buildProjectionExpression(select)
-                    : undefined,
-                KeyConditionExpression: keyExpression,
-                FilterExpression: this.buildExpression(filterCondition),
-                ExpressionAttributeNames: QueryBuilder.buildAttributeNames(where),
-                ExpressionAttributeValues: this.buildAttributeValues(where),
-            },
+            TableName: tableName,
+            IndexName: indexName,
+            Limit: limit,
+            ScanIndexForward: !orderDescending,
+            ProjectionExpression: select
+                ? QueryBuilder.buildProjectionExpression(select)
+                : undefined,
+            KeyConditionExpression: this.buildExpression(keyCondition),
+            FilterExpression: this.buildExpression(filterCondition),
+            ExpressionAttributeNames: QueryBuilder.buildAttributeNames(where),
+            ExpressionAttributeValues: this.buildAttributeValues(where),
         };
         console.log('Execution ddb operation', op);
         return op;

package/services/aws/dynamodb/utils/query/QueryBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/query/QueryBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilder.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/query/QueryBuilder.ts"],"names":[],"mappings":"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"}

package/services/aws/dynamodb/utils/query/QueryParameters.d.ts

@@ -1,7 +1,11 @@
 import WhereParameters from './QueryWhereStatement';
 interface QueryParameters<TEntity> {
+    queryOptions?: {
+        operation?: 'Scan' | 'Query';
+    };
     where: WhereParameters<TEntity>;
     select?: Array<keyof TEntity>;
     limit?: number;
+    orderDescending?: boolean;
 }
 export default QueryParameters;

package/utils/controllers/HttpControllerFactory.js

@@ -39,7 +39,7 @@ class HttpControllerFactory {
             action: actionKey,
             params: [],
         };
-        descriptor === null || descriptor === void 0 ? void 0 : descriptor.params.push({ source, parameterKey });
+        descriptor === null || descriptor === void 0 ? void 0 : descriptor.params.unshift({ source, parameterKey });
         __classPrivateFieldGet(HttpControllerFactory, _a, "f", _HttpControllerFactory_httpActionByController).set(actionIndexKey, descriptor);
     }
     static getParamSource(source, input) {
@@ -64,6 +64,8 @@ class HttpControllerFactory {
             throw new handlers_1.NoEventHandlerSetError();
         }
         const controller = ControllerFactory_1.default.provide(descriptor.controller);
+        console.log('Action descriptor', descriptor);
+        console.log('Action input', input);
         const params = descriptor.params.map(({ source, parameterKey }) => {
             const paramSource = HttpControllerFactory.getParamSource(source, input);
             return parameterKey ? (paramSource !== null && paramSource !== void 0 ? paramSource : {})[parameterKey] : paramSource;

package/utils/controllers/HttpControllerFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"HttpControllerFactory.js","sourceRoot":"","sources":["../../../utils/controllers/HttpControllerFactory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HttpControllerFactory.js","sourceRoot":"","sources":["../../../utils/controllers/HttpControllerFactory.ts"],"names":[],"mappings":"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"}