@lambada/utils 1.4.6 → 1.5.1

package/dist/cors.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCorsHeaders = void 0;
 const getCorsHeaders = (domainName, origins) => {
-    var _a, _b, _c;
-    const allowedOrigins = (_a = origins === null || origins === void 0 ? void 0 : origins.map(x => x.trim())) !== null && _a !== void 0 ? _a : ["*"];
-    const requestOrigin = (domainName !== null && domainName !== void 0 ? domainName : '').trim();
+    const allowedOrigins = origins?.map(x => x.trim()) ?? ["*"];
+    const requestOrigin = (domainName ?? '').trim();
     const origin = allowedOrigins.indexOf("*") >= 0 ? "*" :
-        (_b = allowedOrigins.find(x => x == requestOrigin)) !== null && _b !== void 0 ? _b : ((_c = allowedOrigins.shift()) !== null && _c !== void 0 ? _c : "*");
+        allowedOrigins.find(x => x == requestOrigin) ??
+            (allowedOrigins.shift() ?? "*");
     return {
         "Access-Control-Allow-Headers": "*",
         "Access-Control-Allow-Origin": origin,

package/dist/cors.js.map

@@ -1 +1 @@
-{"version":3,"file":"cors.js","sourceRoot":"","sources":["../src/cors.ts"],"names":[],"mappings":";;;AAAO,MAAM,cAAc,GAAG,CAAC,UAAmB,EAAE,OAAkB,EAAE,EAAE;;IACtE,MAAM,cAAc,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,mCAAI,CAAC,GAAG,CAAC,CAAA;IAC3D,MAAM,aAAa,GAAG,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;IAE/C,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACnD,MAAA,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,aAAa,CAAC,mCAC5C,CAAC,MAAA,cAAc,CAAC,KAAK,EAAE,mCAAI,GAAG,CAAC,CAAA;IAEnC,OAAO;QACH,8BAA8B,EAAE,GAAG;QACnC,6BAA6B,EAAE,MAAM;QACrC,8BAA8B,EAAE,GAAG;QACnC,wBAAwB,EAAE,OAAO;KACpC,CAAA;AACL,CAAC,CAAA;AAdY,QAAA,cAAc,kBAc1B"}
+{"version":3,"file":"cors.js","sourceRoot":"","sources":["../src/cors.ts"],"names":[],"mappings":";;;AAAO,MAAM,cAAc,GAAG,CAAC,UAAmB,EAAE,OAAkB,EAAE,EAAE;IACtE,MAAM,cAAc,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC3D,MAAM,aAAa,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;IAE/C,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACnD,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,aAAa,CAAC;YAC5C,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAA;IAEnC,OAAO;QACH,8BAA8B,EAAE,GAAG;QACnC,6BAA6B,EAAE,MAAM;QACrC,8BAA8B,EAAE,GAAG;QACnC,wBAAwB,EAAE,OAAO;KACpC,CAAA;AACL,CAAC,CAAA;AAdY,QAAA,cAAc,kBAc1B"}

package/dist/data/repositoryExtended.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RepositoryExtended = void 0;
 const repository_1 = require("../repository");
@@ -20,26 +11,29 @@ class RepositoryExtended extends repository_1.RepositoryBase {
      * @param params
      * @returns
      */
-    queryBegins_with(params) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const { primaryKey, rangeKey, indexName } = params;
-            const command = {
-                TableName: this.tableName,
-                IndexName: indexName,
-                KeyConditionExpression: `#PK = :PK ${rangeKey ? 'AND begins_with(#SK,:SK)' : ''}`,
-                ExpressionAttributeNames: Object.assign({ '#PK': primaryKey.name }, (rangeKey ? { '#SK': rangeKey.name } : {})),
-                ExpressionAttributeValues: Object.assign({ ':PK': this.marshaller.marshallValue(primaryKey.value) }, (rangeKey ? { ':SK': this.marshaller.marshallValue(rangeKey.value) } : {})),
-                Limit: params.limit,
-                ScanIndexForward: params.scanForward,
-                ExclusiveStartKey: params.lastKey ? JSON.parse(params.lastKey) : undefined,
-            };
-            const response = yield this.getDb().query(command).promise();
-            return {
-                data: ((_a = response.Items) !== null && _a !== void 0 ? _a : []).map(item => this.marshaller.unmarshallItem(item)),
-                lastKey: response.LastEvaluatedKey && JSON.stringify(response.LastEvaluatedKey)
-            };
-        });
+    async queryBegins_with(params) {
+        const { primaryKey, rangeKey, indexName } = params;
+        const command = {
+            TableName: this.tableName,
+            IndexName: indexName,
+            KeyConditionExpression: `#PK = :PK ${rangeKey ? 'AND begins_with(#SK,:SK)' : ''}`,
+            ExpressionAttributeNames: {
+                '#PK': primaryKey.name,
+                ...(rangeKey ? { '#SK': rangeKey.name } : {}),
+            },
+            ExpressionAttributeValues: {
+                ':PK': this.marshaller.marshallValue(primaryKey.value),
+                ...(rangeKey ? { ':SK': this.marshaller.marshallValue(rangeKey.value) } : {}),
+            },
+            Limit: params.limit,
+            ScanIndexForward: params.scanForward,
+            ExclusiveStartKey: params.lastKey ? JSON.parse(params.lastKey) : undefined,
+        };
+        const response = await this.getDb().query(command).promise();
+        return {
+            data: (response.Items ?? []).map(item => this.marshaller.unmarshallItem(item)),
+            lastKey: response.LastEvaluatedKey && JSON.stringify(response.LastEvaluatedKey)
+        };
     }
     /**
      * Execute a query with conditional range key.
@@ -47,85 +41,95 @@ class RepositoryExtended extends repository_1.RepositoryBase {
      * @param params
      * @returns
      */
-    queryCondition(params) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const { primaryKey, rangeKey, indexName } = params;
-            const skCondition = {
-                EQ: 'AND #SK = :SK',
-                GT: 'AND #SK > :SK',
-                LT: 'AND #SK < :SK',
-                GE: 'AND #SK >= :SK',
-                LE: 'AND #SK <= :SK',
-                BEGINS_WITH: 'AND begins_with(#SK, :SK)',
-                BETWEEN: 'AND #SK between :SKfrom and :SKto'
-            };
-            const command = {
-                TableName: this.tableName,
-                IndexName: indexName,
-                KeyConditionExpression: `#PK = :PK ${rangeKey ? skCondition[rangeKey.condition] : ''}`,
-                ExpressionAttributeNames: Object.assign({ '#PK': primaryKey.name }, (rangeKey ? { '#SK': rangeKey.name } : {})),
-                ExpressionAttributeValues: Object.assign({ ':PK': this.marshaller.marshallValue(primaryKey.value) }, (rangeKey ?
+    async queryCondition(params) {
+        const { primaryKey, rangeKey, indexName } = params;
+        const skCondition = {
+            EQ: 'AND #SK = :SK',
+            GT: 'AND #SK > :SK',
+            LT: 'AND #SK < :SK',
+            GE: 'AND #SK >= :SK',
+            LE: 'AND #SK <= :SK',
+            BEGINS_WITH: 'AND begins_with(#SK, :SK)',
+            BETWEEN: 'AND #SK between :SKfrom and :SKto'
+        };
+        const command = {
+            TableName: this.tableName,
+            IndexName: indexName,
+            KeyConditionExpression: `#PK = :PK ${rangeKey ? skCondition[rangeKey.condition] : ''}`,
+            ExpressionAttributeNames: {
+                '#PK': primaryKey.name,
+                ...(rangeKey ? { '#SK': rangeKey.name } : {}),
+            },
+            ExpressionAttributeValues: {
+                ':PK': this.marshaller.marshallValue(primaryKey.value),
+                ...(rangeKey ?
                     typeof rangeKey.value === 'object' ?
                         {
                             ':SKfrom': this.marshaller.marshallValue(rangeKey.value.from),
                             ':SKto': this.marshaller.marshallValue(rangeKey.value.to),
                         }
                         : { ':SK': this.marshaller.marshallValue(rangeKey.value) }
-                    : {})),
-            };
-            const response = yield this.getDb().query(command).promise();
-            return ((_a = response.Items) !== null && _a !== void 0 ? _a : []).map(item => this.fromItem(item));
-        });
+                    : {}),
+            },
+        };
+        const response = await this.getDb().query(command).promise();
+        return (response.Items ?? []).map(item => this.fromItem(item));
     }
     /**
      * Requires `updateItem` permission
      * @param params update params
      * @returns all updated items
      */
-    updateItem(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { primaryKey, rangeKey, update } = params;
-            const attributes = Object.entries(update);
-            const command = {
-                TableName: this.tableName,
-                Key: this.marshaller.marshallItem(Object.assign({ [primaryKey.name]: primaryKey.value }, (rangeKey ? { [rangeKey.name]: rangeKey.value } : {}))),
-                ConditionExpression: `#PK = :PK ${rangeKey ? `AND #SK = :SK` : ''}`,
-                UpdateExpression: `set ${attributes.map(([k]) => `#${k} = :${k}`).join(', ')}`,
-                ExpressionAttributeNames: Object.assign({ '#PK': primaryKey.name }, (rangeKey ? { '#SK': rangeKey.name } : {})),
-                ExpressionAttributeValues: Object.assign({ ':PK': this.marshaller.marshallValue(primaryKey.value) }, (rangeKey
+    async updateItem(params) {
+        const { primaryKey, rangeKey, update } = params;
+        const attributes = Object.entries(update);
+        const command = {
+            TableName: this.tableName,
+            Key: this.marshaller.marshallItem({
+                [primaryKey.name]: primaryKey.value,
+                ...(rangeKey ? { [rangeKey.name]: rangeKey.value } : {}),
+            }),
+            ConditionExpression: `#PK = :PK ${rangeKey ? `AND #SK = :SK` : ''}`,
+            UpdateExpression: `set ${attributes.map(([k]) => `#${k} = :${k}`).join(', ')}`,
+            ExpressionAttributeNames: {
+                '#PK': primaryKey.name,
+                ...(rangeKey ? { '#SK': rangeKey.name } : {}),
+            },
+            ExpressionAttributeValues: {
+                ':PK': this.marshaller.marshallValue(primaryKey.value),
+                ...(rangeKey
                     ? { ':SK': this.marshaller.marshallValue(rangeKey.value) }
-                    : {})),
-                ReturnValues: 'ALL_NEW',
-            };
-            attributes.forEach(([name, value]) => {
-                command.ExpressionAttributeNames[`#${name}`] = name;
-                command.ExpressionAttributeValues[`:${name}`] = this.marshaller.marshallValue(value);
-            });
-            const response = yield this.getDb().updateItem(command).promise();
-            if (!response.Attributes)
-                throw new Error('Failed to update item');
-            return this.marshaller.unmarshallItem(response.Attributes);
+                    : {}),
+            },
+            ReturnValues: 'ALL_NEW',
+        };
+        attributes.forEach(([name, value]) => {
+            command.ExpressionAttributeNames[`#${name}`] = name;
+            command.ExpressionAttributeValues[`:${name}`] = this.marshaller.marshallValue(value);
         });
+        const response = await this.getDb().updateItem(command).promise();
+        if (!response.Attributes)
+            throw new Error('Failed to update item');
+        return this.marshaller.unmarshallItem(response.Attributes);
     }
     /**
      * Reads all items of the table
      * @param params
      * @returns
      */
-    fullScan(params) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            let lastEvaluatedKey = params.ExclusiveStartKey;
-            let items = [];
-            do {
-                const command = Object.assign(Object.assign({}, params), { ExclusiveStartKey: lastEvaluatedKey });
-                const response = yield this.getDb().scan(command).promise();
-                lastEvaluatedKey = response.LastEvaluatedKey;
-                items = items.concat(((_a = response.Items) !== null && _a !== void 0 ? _a : []).map(item => this.fromItem(item)));
-            } while (lastEvaluatedKey);
-            return items;
-        });
+    async fullScan(params) {
+        let lastEvaluatedKey = params.ExclusiveStartKey;
+        let items = [];
+        do {
+            const command = {
+                ...params,
+                ExclusiveStartKey: lastEvaluatedKey,
+            };
+            const response = await this.getDb().scan(command).promise();
+            lastEvaluatedKey = response.LastEvaluatedKey;
+            items = items.concat((response.Items ?? []).map(item => this.fromItem(item)));
+        } while (lastEvaluatedKey);
+        return items;
     }
     fromItem(item) {
         return this.marshaller.unmarshallItem(item);

package/dist/data/repositoryExtended.js.map

@@ -1 +1 @@
-{"version":3,"file":"repositoryExtended.js","sourceRoot":"","sources":["../../src/data/repositoryExtended.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"repositoryExtended.js","sourceRoot":"","sources":["../../src/data/repositoryExtended.ts"],"names":[],"mappings":";;;AACA,8CAA+C;AAE/C,MAAa,kBAAmB,SAAQ,2BAAc;IAElD,YAAY,GAAG,IAAkD;QAC7D,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;IAClB,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,gBAAgB,CAAI,MAcnC;QACG,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;QAElD,MAAM,OAAO,GAAwB;YACjC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,SAAS;YACpB,sBAAsB,EAAE,aAAa,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAAE,EAAE;YACjF,wBAAwB,EAAE;gBACtB,KAAK,EAAE,UAAU,CAAC,IAAI;gBACtB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChD;YACD,yBAAyB,EAAE;gBACvB,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAA4B;gBACjF,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChF;YACD,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,gBAAgB,EAAE,MAAM,CAAC,WAAW;YACpC,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;SAC7E,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAA;QAC5D,OAAO;YACH,IAAI,EAAE,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC9E,OAAO,EAAE,QAAQ,CAAC,gBAAgB,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC;SAClF,CAAA;IACL,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,cAAc,CAAI,MAkBjC;QACG,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;QAElD,MAAM,WAAW,GAAuE;YACpF,EAAE,EAAE,eAAe;YACnB,EAAE,EAAE,eAAe;YACnB,EAAE,EAAE,eAAe;YACnB,EAAE,EAAE,gBAAgB;YACpB,EAAE,EAAE,gBAAgB;YACpB,WAAW,EAAE,2BAA2B;YACxC,OAAO,EAAE,mCAAmC;SAC/C,CAAA;QAED,MAAM,OAAO,GAAwB;YACjC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,SAAS;YACpB,sBAAsB,EAAE,aAAa,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;YACtF,wBAAwB,EAAE;gBACtB,KAAK,EAAE,UAAU,CAAC,IAAI;gBACtB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChD;YACD,yBAAyB,EAAE;gBACvB,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAQ;gBAC7D,GAAG,CAAC,QAAQ,CAAC,CAAC;oBACV,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC;wBAChC;4BACI,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAQ;4BACpE,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAQ;yBACnE;wBACD,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAS;oBACrE,CAAC,CAAC,EAAE,CAAC;aACZ;SACJ,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAA;QAC5D,OAAO,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAI,IAAI,CAAC,CAAC,CAAA;IACrE,CAAC;IAGD;;;;OAIG;IACO,KAAK,CAAC,UAAU,CAAmC,MAY5D;QACG,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;QAE/C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAGzC,MAAM,OAAO,GAAgG;YACzG,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;gBAC9B,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,KAAK;gBACnC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC3D,CAAC;YACF,mBAAmB,EAAE,aAAa,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE;YACnE,gBAAgB,EAAE,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC9E,wBAAwB,EAAE;gBACtB,KAAK,EAAE,UAAU,CAAC,IAAI;gBACtB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChD;YACD,yBAAyB,EAAE;gBACvB,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAA4B;gBACjF,GAAG,CAAC,QAAQ;oBACR,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAA4B,EAAE;oBACrF,CAAC,CAAC,EAAE,CAAC;aACZ;YAED,YAAY,EAAE,SAAS;SAC1B,CAAA;QAED,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;YACjC,OAAO,CAAC,wBAAwB,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,IAAI,CAAA;YACnD,OAAO,CAAC,yBAAyB,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CACzE,KAAK,CACmB,CAAA;QAChC,CAAC,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAA;QAEjE,IAAI,CAAC,QAAQ,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;QAElE,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAM,CAAA;IACnE,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,QAAQ,CAAI,MAA0B;QAClD,IAAI,gBAAgB,GAA6B,MAAM,CAAC,iBAAiB,CAAA;QACzE,IAAI,KAAK,GAAQ,EAAE,CAAA;QACnB,GAAG;YACC,MAAM,OAAO,GAAuB;gBAChC,GAAG,MAAM;gBACT,iBAAiB,EAAE,gBAAgB;aACtC,CAAA;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAA;YAC3D,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAA;YAC5C,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAI,IAAI,CAAC,CAAC,CAAC,CAAA;SAEnF,QAAQ,gBAAgB,EAAC;QAC1B,OAAO,KAAK,CAAA;IAChB,CAAC;IAEO,QAAQ,CAAI,IAA2B;QAC3C,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAM,CAAA;IACpD,CAAC;CACJ;AAtMD,gDAsMC"}

package/dist/dynamoMarsharler.d.ts

@@ -0,0 +1,10 @@
+import { AttributeValue, AttributeMap } from 'aws-sdk/clients/dynamodb';
+export interface IMarshaller {
+    marshallItem(item: {
+        [key: string]: any;
+    }): AttributeMap;
+    marshallValue(value: any): AttributeValue | undefined;
+    unmarshallItem(item: AttributeMap): any;
+    unmarshallValue(item: AttributeValue): any;
+}
+export declare const DefaultMarshaller: IMarshaller;

package/dist/dynamoMarsharler.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultMarshaller = void 0;
+const AWS = require("aws-sdk");
+exports.DefaultMarshaller = {
+    marshallItem: AWS.DynamoDB.Converter.marshall,
+    unmarshallItem: AWS.DynamoDB.Converter.unmarshall,
+    marshallValue: AWS.DynamoDB.Converter.input,
+    unmarshallValue: AWS.DynamoDB.Converter.output,
+};
+//# sourceMappingURL=dynamoMarsharler.js.map

package/dist/dynamoMarsharler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dynamoMarsharler.js","sourceRoot":"","sources":["../src/dynamoMarsharler.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAclB,QAAA,iBAAiB,GAAgB;IAC1C,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ;IAC7C,cAAc,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU;IACjD,aAAa,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK;IAC3C,eAAe,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM;CACjD,CAAC"}

package/dist/repository.d.ts

@@ -1,15 +1,6 @@
 import * as AWS from "aws-sdk";
-import { AttributeValue, AttributeMap } from 'aws-sdk/clients/dynamodb';
 import { ConditionExpression, ExpressionAttributeValueMap } from "aws-sdk/clients/dynamodb";
-export interface IMarshaller {
-    marshallItem(item: {
-        [key: string]: any;
-    }): AttributeMap;
-    marshallValue(value: any): AttributeValue | undefined;
-    unmarshallItem(item: AttributeMap): any;
-    unmarshallValue(item: AttributeValue): any;
-}
-export declare const DefaultMarshaller: IMarshaller;
+import { IMarshaller } from "./dynamoMarsharler";
 export declare class RepositoryBase {
     protected readonly table: {
         envKeyName: string;

package/dist/repository.js

@@ -1,32 +1,17 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RepositoryBase = exports.DefaultMarshaller = void 0;
+exports.RepositoryBase = void 0;
 const AWS = require("aws-sdk");
-exports.DefaultMarshaller = {
-    marshallItem: AWS.DynamoDB.Converter.marshall,
-    unmarshallItem: AWS.DynamoDB.Converter.unmarshall,
-    marshallValue: AWS.DynamoDB.Converter.input,
-    unmarshallValue: AWS.DynamoDB.Converter.output,
-};
+const dynamoMarsharler_1 = require("./dynamoMarsharler");
 class RepositoryBase {
     constructor(table, customMarshaller, clientConfig) {
-        var _a;
         this.table = table;
-        this.tableName = (_a = process.env[table.envKeyName]) !== null && _a !== void 0 ? _a : '';
+        this.tableName = process.env[table.envKeyName] ?? '';
         if (customMarshaller) {
             this.marshaller = customMarshaller;
         }
         else {
-            this.marshaller = exports.DefaultMarshaller;
+            this.marshaller = dynamoMarsharler_1.DefaultMarshaller;
         }
         this.clientConfig = clientConfig;
     }
@@ -40,91 +25,82 @@ class RepositoryBase {
             throw new Error(`Could not find env var: ${this.table.envKeyName}`);
         return new AWS.DynamoDB(this.clientConfig);
     }
-    scan(args) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const db = this.getDb();
-            const result = yield db.scan({
-                TableName: this.tableName,
-                FilterExpression: args === null || args === void 0 ? void 0 : args.filter,
-                ExpressionAttributeValues: args === null || args === void 0 ? void 0 : args.filterValues,
-            }).promise();
-            if (!result.Items) {
-                return [];
-            }
-            return (_a = result.Items) === null || _a === void 0 ? void 0 : _a.map((x) => this.marshaller.unmarshallItem(x));
-        });
+    async scan(args) {
+        const db = this.getDb();
+        const result = await db.scan({
+            TableName: this.tableName,
+            FilterExpression: args?.filter,
+            ExpressionAttributeValues: args?.filterValues,
+        }).promise();
+        if (!result.Items) {
+            return [];
+        }
+        return result.Items?.map((x) => this.marshaller.unmarshallItem(x));
     }
-    upsert(item) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const db = this.getDb();
-            const marsharlledItem = this.marshaller.marshallItem(item);
-            const command = {
-                Item: marsharlledItem,
-                TableName: this.tableName,
-                ReturnValues: 'NONE'
-            };
-            yield db.putItem(command).promise();
-            return item;
-        });
+    async upsert(item) {
+        const db = this.getDb();
+        const marsharlledItem = this.marshaller.marshallItem(item);
+        const command = {
+            Item: marsharlledItem,
+            TableName: this.tableName,
+            ReturnValues: 'NONE'
+        };
+        await db.putItem(command).promise();
+        return item;
     }
-    query(primaryKey, rangeKey, indexName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (typeof rangeKey === 'string') {
-                indexName = rangeKey;
-                rangeKey = undefined;
-            }
-            const db = this.getDb();
-            const value = this.marshaller.marshallValue(primaryKey.value);
-            if (!value)
-                throw new Error(`Invalid primary key. ${JSON.stringify(primaryKey)}`);
-            let params = {
-                TableName: this.tableName,
-                KeyConditionExpression: "#primaryKey = :primaryKeyValue",
-                ExpressionAttributeNames: {
-                    "#primaryKey": primaryKey.name
-                },
-                ExpressionAttributeValues: {
-                    ":primaryKeyValue": value
-                },
-                IndexName: indexName
-            };
-            if ((rangeKey === null || rangeKey === void 0 ? void 0 : rangeKey.name) && (rangeKey === null || rangeKey === void 0 ? void 0 : rangeKey.value) && params.ExpressionAttributeNames && params.ExpressionAttributeValues) {
-                params.KeyConditionExpression += " AND #rangeKey = :rangeKeyValue";
-                params.ExpressionAttributeNames["#rangeKey"] = rangeKey.name;
-                params.ExpressionAttributeValues[":rangeKeyValue"] = this.marshaller.marshallValue(rangeKey.value);
-            }
-            const result = yield db.query(params).promise();
-            const items = result.Items;
-            if (!items)
-                return [];
-            return items.map(item => this.marshaller.unmarshallItem(item));
-        });
+    async query(primaryKey, rangeKey, indexName) {
+        if (typeof rangeKey === 'string') {
+            indexName = rangeKey;
+            rangeKey = undefined;
+        }
+        const db = this.getDb();
+        const value = this.marshaller.marshallValue(primaryKey.value);
+        if (!value)
+            throw new Error(`Invalid primary key. ${JSON.stringify(primaryKey)}`);
+        let params = {
+            TableName: this.tableName,
+            KeyConditionExpression: "#primaryKey = :primaryKeyValue",
+            ExpressionAttributeNames: {
+                "#primaryKey": primaryKey.name
+            },
+            ExpressionAttributeValues: {
+                ":primaryKeyValue": value
+            },
+            IndexName: indexName
+        };
+        if (rangeKey?.name && rangeKey?.value && params.ExpressionAttributeNames && params.ExpressionAttributeValues) {
+            params.KeyConditionExpression += " AND #rangeKey = :rangeKeyValue";
+            params.ExpressionAttributeNames["#rangeKey"] = rangeKey.name;
+            params.ExpressionAttributeValues[":rangeKeyValue"] = this.marshaller.marshallValue(rangeKey.value);
+        }
+        const result = await db.query(params).promise();
+        const items = result.Items;
+        if (!items)
+            return [];
+        return items.map(item => this.marshaller.unmarshallItem(item));
     }
-    getById(primaryKey, rangeKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const db = this.getDb();
-            let value = this.marshaller.marshallValue(primaryKey.value);
-            if (!value)
-                throw new Error(`Invalid primary key. ${JSON.stringify(primaryKey)}`);
-            const key = {
-                [primaryKey.name]: value
-            };
-            if (rangeKey) {
-                const range = this.marshaller.marshallValue(rangeKey.value);
-                if (!range)
-                    throw new Error(`Invalid range key. ${JSON.stringify(primaryKey)}`);
-                key[rangeKey.name] = range;
-            }
-            const item = yield db.getItem({
-                TableName: this.tableName,
-                Key: key,
-                ConsistentRead: true,
-            }).promise();
-            if (!item.Item)
-                return null;
-            return this.marshaller.unmarshallItem(item.Item);
-        });
+    async getById(primaryKey, rangeKey) {
+        const db = this.getDb();
+        let value = this.marshaller.marshallValue(primaryKey.value);
+        if (!value)
+            throw new Error(`Invalid primary key. ${JSON.stringify(primaryKey)}`);
+        const key = {
+            [primaryKey.name]: value
+        };
+        if (rangeKey) {
+            const range = this.marshaller.marshallValue(rangeKey.value);
+            if (!range)
+                throw new Error(`Invalid range key. ${JSON.stringify(primaryKey)}`);
+            key[rangeKey.name] = range;
+        }
+        const item = await db.getItem({
+            TableName: this.tableName,
+            Key: key,
+            ConsistentRead: true,
+        }).promise();
+        if (!item.Item)
+            return null;
+        return this.marshaller.unmarshallItem(item.Item);
     }
 }
 exports.RepositoryBase = RepositoryBase;

package/dist/repository.js.map

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

package/dist/repository.test.js

@@ -1,24 +1,16 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const repository_1 = require("./repository");
+const dynamoMarsharler_1 = require("./dynamoMarsharler");
 describe("Repository", () => {
-    test("Marshaller", () => __awaiter(void 0, void 0, void 0, function* () {
+    test("Marshaller", async () => {
         // const repo = new TestRepo({
         //     envKeyName: "TEST_NAME",
         //     name: 'test',
         //     primaryKey: 'userId',
         //     rangeKey: 'id'
         // })
-        const marshaller = repository_1.DefaultMarshaller;
+        const marshaller = dynamoMarsharler_1.DefaultMarshaller;
         const original = {
             a: 1,
             b: 'b',
@@ -33,7 +25,7 @@ describe("Repository", () => {
         expect(unmarshalled.b).toBe(original.b);
         expect(unmarshalled.c).toStrictEqual(original.c);
         expect(unmarshalled.d).toStrictEqual(original.d);
-    }));
+    });
 });
 class TestRepo extends repository_1.RepositoryBase {
 }

package/dist/repository.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"repository.test.js","sourceRoot":"","sources":["../src/repository.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6CAA6E;AAE7E,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,IAAI,CAAC,YAAY,EAAE,GAAS,EAAE;QAC1B,8BAA8B;QAC9B,+BAA+B;QAC/B,oBAAoB;QACpB,4BAA4B;QAC5B,qBAAqB;QACrB,KAAK;QAEL,MAAM,UAAU,GAAgB,8BAAiB,CAAA;QACjD,MAAM,QAAQ,GAAG;YACb,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,GAAG;YACN,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACZ,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;SACrB,CAAA;QAED,MAAM,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QACpD,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;QACrC,MAAM,YAAY,GAAG,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;QAC1D,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;QAEzC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QACvC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QACvC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QAChD,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;IACpD,CAAC,CAAA,CAAC,CAAA;AACN,CAAC,CAAC,CAAA;AAEF,MAAM,QAAS,SAAQ,2BAAc;CAEpC"}
+{"version":3,"file":"repository.test.js","sourceRoot":"","sources":["../src/repository.test.ts"],"names":[],"mappings":";;AAAA,6CAA6C;AAC7C,yDAAmE;AAEnE,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,IAAI,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC1B,8BAA8B;QAC9B,+BAA+B;QAC/B,oBAAoB;QACpB,4BAA4B;QAC5B,qBAAqB;QACrB,KAAK;QAEL,MAAM,UAAU,GAAgB,oCAAiB,CAAA;QACjD,MAAM,QAAQ,GAAG;YACb,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,GAAG;YACN,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACZ,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;SACrB,CAAA;QAED,MAAM,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QACpD,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;QACrC,MAAM,YAAY,GAAG,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;QAC1D,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;QAEzC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QACvC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QACvC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QAChD,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA;AAEF,MAAM,QAAS,SAAQ,2BAAc;CAEpC"}

package/dist/request.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContext = exports.getUser = exports.getUserById = exports.getBody = exports.tryGetBody = void 0;
 const AWS = require("aws-sdk");
@@ -31,122 +22,113 @@ function getBody(request) {
     return body;
 }
 exports.getBody = getBody;
-function _FindUser(userPoolId, userId, username) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    return __awaiter(this, void 0, void 0, function* () {
-        //@ts-ignore
-        global.globalCognitoIdp = (_a = global.globalCognitoIdp) !== null && _a !== void 0 ? _a : new AWS.CognitoIdentityServiceProvider({ apiVersion: '2016-04-18' });
-        //@ts-ignore
-        global.globalUserCacheBySub = (_b = global.globalUserCacheBySub) !== null && _b !== void 0 ? _b : new Map();
-        //@ts-ignore
-        global.globalUserCacheByUsername = (_c = global.globalUserCacheByUsername) !== null && _c !== void 0 ? _c : new Map();
-        //@ts-ignore
-        const cognitoIdp = global.globalCognitoIdp;
-        //@ts-ignore
-        const userCacheBySub = global.globalUserCacheBySub;
-        //@ts-ignore
-        const userCacheByUsername = global.globalUserCacheByUsername;
-        const a = Date.now();
-        if (!userPoolId)
-            throw 'Invalid userPoolId';
-        let user;
-        if (username)
-            user = userCacheByUsername.get(username);
-        if (userId)
-            user = userCacheBySub.get(userId);
-        if (!user) {
-            console.log('user not in cache');
-            if (username) {
-                console.log('getting user by username', username);
-                const cu = yield cognitoIdp.adminGetUser({
-                    UserPoolId: userPoolId,
-                    Username: username
-                }).promise();
+async function _FindUser(userPoolId, userId, username) {
+    //@ts-ignore
+    global.globalCognitoIdp = global.globalCognitoIdp ?? new AWS.CognitoIdentityServiceProvider({ apiVersion: '2016-04-18' });
+    //@ts-ignore
+    global.globalUserCacheBySub = global.globalUserCacheBySub ?? new Map();
+    //@ts-ignore
+    global.globalUserCacheByUsername = global.globalUserCacheByUsername ?? new Map();
+    //@ts-ignore
+    const cognitoIdp = global.globalCognitoIdp;
+    //@ts-ignore
+    const userCacheBySub = global.globalUserCacheBySub;
+    //@ts-ignore
+    const userCacheByUsername = global.globalUserCacheByUsername;
+    const a = Date.now();
+    if (!userPoolId)
+        throw 'Invalid userPoolId';
+    let user;
+    if (username)
+        user = userCacheByUsername.get(username);
+    if (userId)
+        user = userCacheBySub.get(userId);
+    if (!user) {
+        console.log('user not in cache');
+        if (username) {
+            console.log('getting user by username', username);
+            const cu = await cognitoIdp.adminGetUser({
+                UserPoolId: userPoolId,
+                Username: username
+            }).promise();
+            if (!cu)
+                throw 'User not found';
+            if (!cu.UserAttributes)
+                throw 'User has no attributes';
+            //TODO Pass environment
+            var cutomAttributes = cu.UserAttributes.filter(x => x.Name.startsWith('dev:custom:'));
+            userId = cu.UserAttributes.find(x => x.Name == 'sub')?.Value;
+            var email = cu.UserAttributes.find(x => x.Name == 'email')?.Value;
+            var name = cu.UserAttributes.find(x => x.Name == 'name')?.Value;
+            if (!userId)
+                throw 'Invalid user, has no sub';
+            user = {
+                id: userId,
+                username,
+                name,
+                email: email ?? '',
+                attributes: cutomAttributes
+            };
+        }
+        else if (userId) {
+            console.log('getting user by userId', userId);
+            const cusers = await cognitoIdp.listUsers({
+                UserPoolId: userPoolId,
+                Filter: `sub = "${userId}"`
+            }).promise();
+            if (cusers && cusers.Users && cusers.Users.length > 0) {
+                const cu = cusers.Users[0];
                 if (!cu)
                     throw 'User not found';
-                if (!cu.UserAttributes)
+                if (!cu.Attributes)
                     throw 'User has no attributes';
-                //TODO Pass environment
-                var cutomAttributes = cu.UserAttributes.filter(x => x.Name.startsWith('dev:custom:'));
-                userId = (_d = cu.UserAttributes.find(x => x.Name == 'sub')) === null || _d === void 0 ? void 0 : _d.Value;
-                var email = (_e = cu.UserAttributes.find(x => x.Name == 'email')) === null || _e === void 0 ? void 0 : _e.Value;
-                var name = (_f = cu.UserAttributes.find(x => x.Name == 'name')) === null || _f === void 0 ? void 0 : _f.Value;
-                if (!userId)
+                username = cu.Username;
+                var cutomAttributes = cu.Attributes.filter(x => x.Name.startsWith('dev:custom:'));
+                var sub = cu.Attributes.find(x => x.Name == 'sub')?.Value;
+                var name = cu.Attributes.find(x => x.Name == 'name')?.Value;
+                var email = cu.Attributes.find(x => x.Name == 'email')?.Value;
+                if (!sub)
                     throw 'Invalid user, has no sub';
+                if (!username)
+                    throw 'username is empty';
                 user = {
-                    id: userId,
-                    username,
+                    id: sub,
+                    attributes: cutomAttributes,
                     name,
-                    email: email !== null && email !== void 0 ? email : '',
-                    attributes: cutomAttributes
+                    username,
+                    email: email ?? ''
                 };
             }
-            else if (userId) {
-                console.log('getting user by userId', userId);
-                const cusers = yield cognitoIdp.listUsers({
-                    UserPoolId: userPoolId,
-                    Filter: `sub = "${userId}"`
-                }).promise();
-                if (cusers && cusers.Users && cusers.Users.length > 0) {
-                    const cu = cusers.Users[0];
-                    if (!cu)
-                        throw 'User not found';
-                    if (!cu.Attributes)
-                        throw 'User has no attributes';
-                    username = cu.Username;
-                    var cutomAttributes = cu.Attributes.filter(x => x.Name.startsWith('dev:custom:'));
-                    var sub = (_g = cu.Attributes.find(x => x.Name == 'sub')) === null || _g === void 0 ? void 0 : _g.Value;
-                    var name = (_h = cu.Attributes.find(x => x.Name == 'name')) === null || _h === void 0 ? void 0 : _h.Value;
-                    var email = (_j = cu.Attributes.find(x => x.Name == 'email')) === null || _j === void 0 ? void 0 : _j.Value;
-                    if (!sub)
-                        throw 'Invalid user, has no sub';
-                    if (!username)
-                        throw 'username is empty';
-                    user = {
-                        id: sub,
-                        attributes: cutomAttributes,
-                        name,
-                        username,
-                        email: email !== null && email !== void 0 ? email : ''
-                    };
-                }
-            }
-            if (!userId)
-                throw 'Invalid user, has no sub';
-            if (!username)
-                throw 'username is empty';
-            if (!user)
-                throw 'Could not find user';
-            userCacheBySub.set(userId, user);
-            userCacheByUsername.set(username, user);
         }
-        var b = Date.now();
-        console.log('found user', user);
-        console.log('adminGetUser (ms): ', (b - a));
-        return user;
-    });
+        if (!userId)
+            throw 'Invalid user, has no sub';
+        if (!username)
+            throw 'username is empty';
+        if (!user)
+            throw 'Could not find user';
+        userCacheBySub.set(userId, user);
+        userCacheByUsername.set(username, user);
+    }
+    var b = Date.now();
+    console.log('found user', user);
+    console.log('adminGetUser (ms): ', (b - a));
+    return user;
 }
-function getUserById(userId, poolId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const user = yield _FindUser(poolId, userId);
-        return user;
-    });
+async function getUserById(userId, poolId) {
+    const user = await _FindUser(poolId, userId);
+    return user;
 }
 exports.getUserById = getUserById;
-function getUser(username, context) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const user = yield _FindUser((_a = context.poolId) !== null && _a !== void 0 ? _a : '', undefined, username);
-        return user;
-    });
+async function getUser(username, context) {
+    const user = await _FindUser(context.poolId ?? '', undefined, username);
+    return user;
 }
 exports.getUser = getUser;
 function getContext(request) {
-    var _a, _b;
     if (!request) {
         throw 'Server error';
     }
-    const claims = (_b = (_a = request === null || request === void 0 ? void 0 : request.requestContext) === null || _a === void 0 ? void 0 : _a.authorizer) === null || _b === void 0 ? void 0 : _b.claims;
+    const claims = request?.requestContext?.authorizer?.claims;
     if (claims) {
         const poolId = claims['iss'].split('/').pop();
         const userSub = claims['sub'];
@@ -157,9 +139,9 @@ function getContext(request) {
         //hash.update(accessToken, "utf8").digest('hex');
         const userIp = request.requestContext.identity.sourceIp;
         return {
-            userId: userSub !== null && userSub !== void 0 ? userSub : undefined,
-            poolId: poolId !== null && poolId !== void 0 ? poolId : undefined,
-            email: email !== null && email !== void 0 ? email : undefined,
+            userId: userSub ?? undefined,
+            poolId: poolId ?? undefined,
+            email: email ?? undefined,
             username: username,
             clientIP: userIp,
             claims: claims

package/dist/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA8B;AAE9B,mCAAuC;AAKvC,SAAgB,UAAU,CAAQ,OAAgB;IAC9C,IAAI,CAAC,OAAO,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAEpC,IAAI,WAAW,GAAQ,OAAO,CAAC,IAAI,CAAC;IACpC,IAAI,OAAO,CAAC,eAAe,EAAE;QACzB,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAA;KAC/D;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAU,CAAA;AAC3C,CAAC;AARD,gCAQC;AAED,SAAgB,OAAO,CAAQ,OAAgB;IAC3C,IAAI,CAAC,OAAO,CAAC,IAAI;QACb,MAAM,IAAI,oBAAY,CAAC,kCAAkC,CAAC,CAAA;IAE9D,MAAM,IAAI,GAAG,UAAU,CAAQ,OAAO,CAAC,CAAA;IACvC,IAAI,CAAC,IAAI;QACL,MAAM,IAAI,oBAAY,CAAC,kCAAkC,CAAC,CAAA;IAC9D,OAAO,IAAI,CAAA;AACf,CAAC;AARD,0BAQC;AAUD,SAAe,SAAS,CAAC,UAAkB,EAAE,MAAe,EAAE,QAAiB;;;QAC3E,YAAY;QACZ,MAAM,CAAC,gBAAgB,GAAG,MAAA,MAAM,CAAC,gBAAgB,mCAAI,IAAI,GAAG,CAAC,8BAA8B,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;QAC1H,YAAY;QACZ,MAAM,CAAC,oBAAoB,GAAG,MAAA,MAAM,CAAC,oBAAoB,mCAAI,IAAI,GAAG,EAA6B,CAAA;QACjG,YAAY;QACZ,MAAM,CAAC,yBAAyB,GAAG,MAAA,MAAM,CAAC,yBAAyB,mCAAI,IAAI,GAAG,EAA6B,CAAA;QAE3G,YAAY;QACZ,MAAM,UAAU,GAAG,MAAM,CAAC,gBAAsD,CAAA;QAChF,YAAY;QACZ,MAAM,cAAc,GAAG,MAAM,CAAC,oBAAsD,CAAA;QACpF,YAAY;QACZ,MAAM,mBAAmB,GAAG,MAAM,CAAC,yBAA2D,CAAA;QAE9F,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAEpB,IAAI,CAAC,UAAU;YAAE,MAAM,oBAAoB,CAAA;QAE3C,IAAI,IAAmC,CAAA;QAEvC,IAAI,QAAQ;YAAE,IAAI,GAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACtD,IAAI,MAAM;YAAE,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAE7C,IAAI,CAAC,IAAI,EAAE;YACP,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;YAChC,IAAI,QAAQ,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,QAAQ,CAAC,CAAA;gBACjD,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC;oBACrC,UAAU,EAAE,UAAU;oBACtB,QAAQ,EAAE,QAAQ;iBACrB,CAAC,CAAC,OAAO,EAAE,CAAA;gBAEZ,IAAI,CAAC,EAAE;oBAAE,MAAM,gBAAgB,CAAA;gBAC/B,IAAI,CAAC,EAAE,CAAC,cAAc;oBAAE,MAAM,wBAAwB,CAAA;gBAEtD,uBAAuB;gBACvB,IAAI,eAAe,GAAG,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAA;gBACrF,MAAM,GAAG,MAAA,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,0CAAE,KAAK,CAAC;gBAC7D,IAAI,KAAK,GAAG,MAAA,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,0CAAE,KAAK,CAAA;gBACjE,IAAI,IAAI,GAAG,MAAA,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,0CAAE,KAAK,CAAA;gBAE/D,IAAI,CAAC,MAAM;oBAAE,MAAM,0BAA0B,CAAA;gBAE7C,IAAI,GAAG;oBACH,EAAE,EAAE,MAAM;oBACV,QAAQ;oBACR,IAAI;oBACJ,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE;oBAClB,UAAU,EAAE,eAAe;iBAC9B,CAAA;aAEJ;iBACI,IAAI,MAAM,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAA;gBAC7C,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC;oBACtC,UAAU,EAAE,UAAU;oBACtB,MAAM,EAAE,UAAU,MAAM,GAAG;iBAC9B,CAAC,CAAC,OAAO,EAAE,CAAA;gBAEZ,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBACnD,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;oBAC1B,IAAI,CAAC,EAAE;wBAAE,MAAM,gBAAgB,CAAA;oBAC/B,IAAI,CAAC,EAAE,CAAC,UAAU;wBAAE,MAAM,wBAAwB,CAAA;oBAElD,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAA;oBAEtB,IAAI,eAAe,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;oBAClF,IAAI,GAAG,GAAG,MAAA,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,0CAAE,KAAK,CAAC;oBAC1D,IAAI,IAAI,GAAG,MAAA,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,0CAAE,KAAK,CAAA;oBAC3D,IAAI,KAAK,GAAG,MAAA,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,0CAAE,KAAK,CAAA;oBAE7D,IAAI,CAAC,GAAG;wBAAE,MAAM,0BAA0B,CAAA;oBAC1C,IAAI,CAAC,QAAQ;wBAAE,MAAM,mBAAmB,CAAA;oBAExC,IAAI,GAAG;wBACH,EAAE,EAAE,GAAG;wBACP,UAAU,EAAE,eAAe;wBAC3B,IAAI;wBACJ,QAAQ;wBACR,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE;qBACrB,CAAA;iBACJ;aACJ;YAED,IAAI,CAAC,MAAM;gBAAE,MAAM,0BAA0B,CAAA;YAC7C,IAAI,CAAC,QAAQ;gBAAE,MAAM,mBAAmB,CAAA;YACxC,IAAI,CAAC,IAAI;gBAAE,MAAM,qBAAqB,CAAA;YAEtC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YAChC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;SAC1C;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;QAC/B,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAE3C,OAAO,IAAI,CAAA;;CACd;AAED,SAAsB,WAAW,CAAC,MAAc,EAAE,MAAc;;QAC5D,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAA;IACf,CAAC;CAAA;AAHD,kCAGC;AAED,SAAsB,OAAO,CAAC,QAAgB,EAAE,OAA6B;;;QACzE,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,MAAA,OAAO,CAAC,MAAM,mCAAI,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;QACvE,OAAO,IAAI,CAAA;;CACd;AAHD,0BAGC;AAED,SAAgB,UAAU,CAAC,OAAgB;;IACvC,IAAI,CAAC,OAAO,EAAE;QACV,MAAM,cAAc,CAAA;KACvB;IAED,MAAM,MAAM,GAAG,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,0CAAE,UAAU,0CAAE,MAAM,CAAA;IAE1D,IAAI,MAAM,EAAE;QAER,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;QAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;QAE7B,wDAAwD;QACxD,mDAAmD;QACnD,iDAAiD;QAEjD,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAA;QAEvD,OAAO;YACH,MAAM,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,SAAS;YAC5B,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS;YAC3B,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,SAAS;YACzB,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE,MAAM;SACjB,CAAA;KACJ;SACI;QACD,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAhCD,gCAgCC"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"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"}

package/dist/secretManager.js

@@ -1,14 +1,5 @@
 "use strict";
 // FROM https://github.com/c-bandy/aws-secrets-manager-cache
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecretsManagerCache = exports.CachedSecret = void 0;
 const aws_sdk_1 = require("aws-sdk");
@@ -27,38 +18,39 @@ exports.CachedSecret = CachedSecret;
 class SecretsManagerCache {
     constructor(options) {
         this.cache = new Map();
-        this.config = Object.assign({ 
+        this.config = {
             // set defaults
-            ttl: defaultTTL, secretsManager: new aws_sdk_1.SecretsManager() }, options);
+            ttl: defaultTTL,
+            secretsManager: new aws_sdk_1.SecretsManager(),
+            // replace defaults with input options
+            ...options,
+        };
     }
     /**
      * Fetches a secret from SecretsManager and caches it as long as the given
      * `ttl`.
      */
-    getSecret(secretName, isJSON = false) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const itemExistsInCache = this.cache.has(secretName);
-            const itemHasExpired = (_a = this.cache.get(secretName)) === null || _a === void 0 ? void 0 : _a.hasExpired();
-            if (!itemExistsInCache || itemHasExpired) {
-                const getSecretValueResponse = yield this.config.secretsManager
-                    .getSecretValue({ SecretId: secretName })
-                    .promise();
-                if (getSecretValueResponse.SecretString) {
-                    this.cache.set(secretName, new CachedSecret(getSecretValueResponse.SecretString, this.config.ttl));
-                }
+    async getSecret(secretName, isJSON = false) {
+        const itemExistsInCache = this.cache.has(secretName);
+        const itemHasExpired = this.cache.get(secretName)?.hasExpired();
+        if (!itemExistsInCache || itemHasExpired) {
+            const getSecretValueResponse = await this.config.secretsManager
+                .getSecretValue({ SecretId: secretName })
+                .promise();
+            if (getSecretValueResponse.SecretString) {
+                this.cache.set(secretName, new CachedSecret(getSecretValueResponse.SecretString, this.config.ttl));
             }
-            const secret = (_b = this.cache.get(secretName)) === null || _b === void 0 ? void 0 : _b.value;
-            if (isJSON) {
-                try {
-                    return JSON.parse(secret);
-                }
-                catch (error) {
-                    throw new Error('Attempted to parse non-JSON secret string as JSON.');
-                }
+        }
+        const secret = this.cache.get(secretName)?.value;
+        if (isJSON) {
+            try {
+                return JSON.parse(secret);
             }
-            return secret;
-        });
+            catch (error) {
+                throw new Error('Attempted to parse non-JSON secret string as JSON.');
+            }
+        }
+        return secret;
     }
     static get() {
         return this._manager;

package/dist/secretManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"secretManager.js","sourceRoot":"","sources":["../src/secretManager.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;;;;;;;;;;AAE5D,qCAAyC;AAEzC,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,YAAY;AAEhD,MAAa,YAAY;IAKrB,YAAY,KAAa,EAAE,GAAW;QAClC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC;IACtC,CAAC;IAED,UAAU;QACN,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;CACJ;AAdD,oCAcC;AAcD,MAAa,mBAAmB;IAI5B,YAAY,OAAoC;QAFxC,UAAK,GAAG,IAAI,GAAG,EAAwB,CAAA;QAG3C,IAAI,CAAC,MAAM;YACP,eAAe;YACf,GAAG,EAAE,UAAU,EACf,cAAc,EAAE,IAAI,wBAAc,EAAE,IAEjC,OAAO,CACb,CAAC;IACN,CAAC;IAED;;;OAGG;IACG,SAAS,CAAC,UAAkB,EAAE,MAAM,GAAG,KAAK;;;YAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACrD,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,0CAAE,UAAU,EAAE,CAAC;YAEhE,IAAI,CAAC,iBAAiB,IAAI,cAAc,EAAE;gBACtC,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc;qBAC1D,cAAc,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;qBACxC,OAAO,EAAE,CAAC;gBAEf,IAAI,sBAAsB,CAAC,YAAY,EAAE;oBACrC,IAAI,CAAC,KAAK,CAAC,GAAG,CACV,UAAU,EACV,IAAI,YAAY,CACZ,sBAAsB,CAAC,YAAY,EACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAClB,CACJ,CAAC;iBACL;aACJ;YAED,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,0CAAE,KAAK,CAAC;YAEjD,IAAI,MAAM,EAAE;gBACR,IAAI;oBACA,OAAO,IAAI,CAAC,KAAK,CAAC,MAAa,CAAC,CAAC;iBACpC;gBAAC,OAAO,KAAK,EAAE;oBACZ,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;iBACxE;aACJ;YAED,OAAO,MAAM,CAAC;;KACjB;IAGM,MAAM,CAAC,GAAG;QACb,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;;AAtDL,kDAuDC;AAJkB,4BAAQ,GAAG,IAAI,mBAAmB,EAAE,CAAA"}
+{"version":3,"file":"secretManager.js","sourceRoot":"","sources":["../src/secretManager.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;AAE5D,qCAAyC;AAEzC,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,YAAY;AAEhD,MAAa,YAAY;IAKrB,YAAY,KAAa,EAAE,GAAW;QAClC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC;IACtC,CAAC;IAED,UAAU;QACN,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;CACJ;AAdD,oCAcC;AAcD,MAAa,mBAAmB;IAI5B,YAAY,OAAoC;QAFxC,UAAK,GAAG,IAAI,GAAG,EAAwB,CAAA;QAG3C,IAAI,CAAC,MAAM,GAAG;YACV,eAAe;YACf,GAAG,EAAE,UAAU;YACf,cAAc,EAAE,IAAI,wBAAc,EAAE;YACpC,sCAAsC;YACtC,GAAG,OAAO;SACb,CAAC;IACN,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,SAAS,CAAC,UAAkB,EAAE,MAAM,GAAG,KAAK;QAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC;QAEhE,IAAI,CAAC,iBAAiB,IAAI,cAAc,EAAE;YACtC,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc;iBAC1D,cAAc,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;iBACxC,OAAO,EAAE,CAAC;YAEf,IAAI,sBAAsB,CAAC,YAAY,EAAE;gBACrC,IAAI,CAAC,KAAK,CAAC,GAAG,CACV,UAAU,EACV,IAAI,YAAY,CACZ,sBAAsB,CAAC,YAAY,EACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAClB,CACJ,CAAC;aACL;SACJ;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;QAEjD,IAAI,MAAM,EAAE;YACR,IAAI;gBACA,OAAO,IAAI,CAAC,KAAK,CAAC,MAAa,CAAC,CAAC;aACpC;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;aACxE;SACJ;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAGM,MAAM,CAAC,GAAG;QACb,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;;AAtDL,kDAuDC;AAJkB,4BAAQ,GAAG,IAAI,mBAAmB,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambada/utils",
-  "version": "1.4.6",
+  "version": "1.5.1",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -33,5 +33,5 @@
     "aws-sdk": "~2.1009.0"
   },
   "description": "",
-  "gitHead": "eabeff22df6cb0d6fbea3e3ca0eff9e54168ffa8"
+  "gitHead": "79affa9b56b30039730089cedcc1c53f3e63cb7a"
 }