@8ms/helpers 1.1.49 → 1.1.52

package/{dist/aws → aws}/s3/getSignedUrl.js

@@ -46,31 +46,35 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var api_1 = require("../../api");
+var response_1 = __importDefault(require("../../api/response"));
+var states_1 = __importDefault(require("../../api/states"));
 /**
  * Returns a signed for URL to allow download of private buckets for a given duration.
  * Library: @aws-sdk/s3-request-presigner
  */
 var getSignedUrl = function (_a) {
-    var S3Lib = _a.S3Lib, S3PresignerLib = _a.S3PresignerLib, bucket = _a.bucket, client = _a.client, expires = _a.expires, key = _a.key;
+    var bucket = _a.bucket, expires = _a.expires, key = _a.key;
     return __awaiter(void 0, void 0, void 0, function () {
         var response, GetObjectCommand, getSignedUrl, command, awsResponse;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    response = __assign({}, api_1.response);
-                    GetObjectCommand = S3Lib.GetObjectCommand;
-                    getSignedUrl = S3PresignerLib.getSignedUrl;
+                    response = __assign({}, response_1.default);
+                    GetObjectCommand = require('@aws-sdk/client-s3').GetObjectCommand;
+                    getSignedUrl = require('@aws-sdk/s3-request-presigner').getSignedUrl;
                     command = new GetObjectCommand({
                         Bucket: bucket,
                         Key: key,
                     });
-                    return [4 /*yield*/, getSignedUrl(client, command, { expiresIn: expires })];
+                    return [4 /*yield*/, getSignedUrl(global.awsS3Client, command, { expiresIn: expires })];
                 case 1:
                     awsResponse = _b.sent();
                     if (awsResponse && 'string' === typeof awsResponse) {
-                        response.state = api_1.states.SUCCESS;
+                        response.state = states_1.default.SUCCESS;
                         response.body = awsResponse;
                     }
                     return [2 /*return*/, response];

package/aws/s3/initClient.d.ts

@@ -0,0 +1,9 @@
+import { Config } from '../config';
+/**
+ * Shorthand function to get the Lambda Client.
+ * Library: @aws-sdk/client-s3
+ */
+declare const initClient: ({ config }: {
+    config?: Config;
+}) => void;
+export default initClient;

package/{dist/aws/s3/getClient.js → aws/s3/initClient.js}

@@ -4,19 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var getConfig_1 = __importDefault(require("../getConfig"));
-var s3Client = undefined;
+global.awsS3Client = null;
 /**
- * Shorthand function to get the S3 Client.
+ * Shorthand function to get the Lambda Client.
  * Library: @aws-sdk/client-s3
  */
-var getClient = function (_a) {
-    var S3Lib = _a.S3Lib, config = _a.config;
+var initClient = function (_a) {
+    var config = _a.config;
     if (!global.awsS3Client) {
-        var S3Client = S3Lib.S3Client;
-        var formattedConfig = (0, getConfig_1.default)({ config: config, isAthenaExpress: false });
+        var S3Client = require('@aws-sdk/client-s3').S3Client;
+        var formattedConfig = (0, getConfig_1.default)({ config: config });
         global.awsS3Client = new S3Client(formattedConfig);
     }
-    s3Client = global.awsS3Client;
-    return s3Client;
 };
-exports.default = getClient;
+exports.default = initClient;

package/{dist/aws → aws}/s3/listFiles.d.ts

@@ -1,10 +1,9 @@
+declare type ListFiles = {
+    bucket: string;
+    folder: string;
+};
 /**
  * List the files in the given bucket and option folder
  */
-declare const listFiles: ({ S3Lib, bucket, client, folder }: {
-    S3Lib: any;
-    bucket: string;
-    client: any;
-    folder: string;
-}) => Promise<string[]>;
+declare const listFiles: ({ bucket, folder }: ListFiles) => Promise<string[]>;
 export default listFiles;

package/{dist/aws → aws}/s3/listFiles.js

@@ -35,23 +35,26 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var string_1 = require("../../string");
+var getCleanFolder_1 = __importDefault(require("../../string/getCleanFolder"));
 /**
  * List the files in the given bucket and option folder
  */
 var listFiles = function (_a) {
-    var S3Lib = _a.S3Lib, bucket = _a.bucket, client = _a.client, _b = _a.folder, folder = _b === void 0 ? '' : _b;
+    var bucket = _a.bucket, _b = _a.folder, folder = _b === void 0 ? '' : _b;
     return __awaiter(void 0, void 0, void 0, function () {
         var cleanFolder, response, valid, ListObjectsV2Command, apiResponse;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    cleanFolder = (0, string_1.getCleanFolder)({ input: folder });
+                    cleanFolder = (0, getCleanFolder_1.default)({ input: folder });
                     response = [];
                     valid = [];
-                    ListObjectsV2Command = S3Lib.ListObjectsV2Command;
-                    return [4 /*yield*/, client.send(new ListObjectsV2Command({
+                    ListObjectsV2Command = require('@aws-sdk/client-s3').ListObjectsV2Command;
+                    return [4 /*yield*/, global.awsS3Client.send(new ListObjectsV2Command({
                             Bucket: bucket,
                             Delimiter: '/',
                             Prefix: ('' === cleanFolder ? '' : cleanFolder + '/'),

package/{dist/aws → aws}/s3/listFolders.d.ts

@@ -1,10 +1,9 @@
+declare type ListFolders = {
+    bucket: string;
+    folder: string;
+};
 /**
  * List the files in the given bucket and option folder.
  */
-declare const listFolders: ({ S3Lib, bucket, client, folder }: {
-    S3Lib: any;
-    bucket: string;
-    client: any;
-    folder: string;
-}) => Promise<string[]>;
+declare const listFolders: ({ bucket, folder }: ListFolders) => Promise<string[]>;
 export default listFolders;

package/{dist/aws → aws}/s3/listFolders.js

@@ -35,28 +35,31 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var string_1 = require("../../string");
+var getCleanFolder_1 = __importDefault(require("../../string/getCleanFolder"));
 /**
  * List the files in the given bucket and option folder.
  */
 var listFolders = function (_a) {
-    var S3Lib = _a.S3Lib, bucket = _a.bucket, client = _a.client, _b = _a.folder, folder = _b === void 0 ? '' : _b;
+    var bucket = _a.bucket, folder = _a.folder;
     return __awaiter(void 0, void 0, void 0, function () {
         var cleanFolder, response, ListObjectsV2Command, apiResponse;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    cleanFolder = (0, string_1.getCleanFolder)({ input: folder });
+                    cleanFolder = (0, getCleanFolder_1.default)({ input: folder });
                     response = [];
-                    ListObjectsV2Command = S3Lib.ListObjectsV2Command;
-                    return [4 /*yield*/, client.send(new ListObjectsV2Command({
+                    ListObjectsV2Command = require('@aws-sdk/client-s3').ListObjectsV2Command;
+                    return [4 /*yield*/, global.awsS3Client.send(new ListObjectsV2Command({
                             Bucket: bucket,
                             Delimiter: '/',
                             Prefix: ('' === cleanFolder ? '' : cleanFolder + '/'),
                         }))];
                 case 1:
-                    apiResponse = _c.sent();
+                    apiResponse = _b.sent();
                     // Ensure the data exists
                     if (undefined !== apiResponse['CommonPrefixes']) {
                         // Return an array of folders removing the trailing folder

package/aws/s3/moveFile.d.ts

@@ -0,0 +1,9 @@
+import { File } from './copyFile';
+/**
+ * It's not possible to just move or rename a file, you must copy then delete the old file.
+ */
+declare const moveFile: ({ from, to }: {
+    from: File;
+    to: File;
+}) => Promise<void>;
+export default moveFile;

package/{dist/aws → aws}/s3/moveFile.js

@@ -45,22 +45,18 @@ var deleteFile_1 = __importDefault(require("./deleteFile"));
  * It's not possible to just move or rename a file, you must copy then delete the old file.
  */
 var moveFile = function (_a) {
-    var S3Lib = _a.S3Lib, client = _a.client, from = _a.from, to = _a.to;
+    var from = _a.from, to = _a.to;
     return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0: return [4 /*yield*/, (0, copyFile_1.default)({
-                        S3Lib: S3Lib,
-                        client: client,
                         from: from,
                         to: to,
                     })];
                 case 1:
                     _b.sent();
                     return [4 /*yield*/, (0, deleteFile_1.default)({
-                            S3Lib: S3Lib,
                             bucket: from.bucket,
-                            client: client,
                             key: from.key,
                         })];
                 case 2:

package/aws/s3/readBuffer.d.ts

@@ -0,0 +1,13 @@
+import { Modified } from './readFile';
+export declare type ReadBufferResponse = Modified & {
+    buffer: any;
+};
+declare type ReadBuffer = {
+    bucket: string;
+    key: string;
+};
+/**
+ * Similar function to reading the S3 file, but instead of a text file return a buffer.
+ */
+declare const readBuffer: ({ bucket, key }: ReadBuffer) => Promise<ReadBufferResponse>;
+export default readBuffer;

package/{dist/aws → aws}/s3/readBuffer.js

@@ -45,7 +45,7 @@ var isResponse200_1 = __importDefault(require("../isResponse200"));
  * Similar function to reading the S3 file, but instead of a text file return a buffer.
  */
 var readBuffer = function (_a) {
-    var S3Lib = _a.S3Lib, bucket = _a.bucket, client = _a.client, key = _a.key;
+    var bucket = _a.bucket, key = _a.key;
     return __awaiter(void 0, void 0, void 0, function () {
         var response, GetObjectCommand, apiResponse, chunks_1, _b;
         return __generator(this, function (_c) {
@@ -68,8 +68,8 @@ var readBuffer = function (_a) {
                             },
                         },
                     };
-                    GetObjectCommand = S3Lib.GetObjectCommand;
-                    return [4 /*yield*/, client.send(new GetObjectCommand({
+                    GetObjectCommand = require('@aws-sdk/client-s3').GetObjectCommand;
+                    return [4 /*yield*/, global.awsS3Client.send(new GetObjectCommand({
                             Bucket: bucket,
                             Key: key,
                         }))];

package/{dist/aws → aws}/s3/readFile.d.ts

@@ -1,4 +1,4 @@
-export declare type ReadType = {
+export declare type Modified = {
     now: number;
     modified: {
         unix: null | number;
@@ -14,18 +14,17 @@ export declare type ReadType = {
         };
     };
 };
-export declare type ReadFileType = ReadType & {
+export declare type ReadFileResponse = Modified & {
     body: any;
 };
-export declare const readFileDefault: ReadFileType;
+export declare const readFileDefault: ReadFileResponse;
+declare type ReadFile = {
+    bucket: string;
+    key: string;
+    isJson?: boolean;
+};
 /**
  * Read a file from S3 and return either null, the content or JSON decoded.
  */
-declare const readFile: ({ S3Lib, bucket, client, key, isJson }: {
-    S3Lib: any;
-    bucket: string;
-    client: any;
-    key: string;
-    isJson: boolean;
-}) => Promise<ReadFileType>;
+declare const readFile: ({ bucket, key, isJson }: ReadFile) => Promise<ReadFileResponse>;
 export default readFile;

package/{dist/aws → aws}/s3/readFile.js

@@ -47,8 +47,9 @@ var differenceInMonths_1 = __importDefault(require("date-fns/differenceInMonths"
 var getHours_1 = __importDefault(require("date-fns/getHours"));
 var getMinutes_1 = __importDefault(require("date-fns/getMinutes"));
 var getUnixTime_1 = __importDefault(require("date-fns/getUnixTime"));
-var date_1 = require("../../date");
-var string_1 = require("../../string");
+var getToday_1 = __importDefault(require("../../date/getToday"));
+var getDate_1 = __importDefault(require("../../date/getDate"));
+var getStringFromStream_1 = __importDefault(require("../../string/getStringFromStream"));
 var isResponse200_1 = __importDefault(require("../isResponse200"));
 var cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 exports.readFileDefault = {
@@ -72,17 +73,17 @@ exports.readFileDefault = {
  * Read a file from S3 and return either null, the content or JSON decoded.
  */
 var readFile = function (_a) {
-    var S3Lib = _a.S3Lib, bucket = _a.bucket, client = _a.client, key = _a.key, isJson = _a.isJson;
+    var bucket = _a.bucket, key = _a.key, isJson = _a.isJson;
     return __awaiter(void 0, void 0, void 0, function () {
         var response, today, GetObjectCommand, apiResponse, now, modified, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
                     response = (0, cloneDeep_1.default)(exports.readFileDefault);
-                    today = (0, date_1.getToday)({ setMidnight: false });
+                    today = (0, getToday_1.default)({ setMidnight: false });
                     response.now = (0, getUnixTime_1.default)(today);
-                    GetObjectCommand = S3Lib.GetObjectCommand;
-                    return [4 /*yield*/, client.send(new GetObjectCommand({
+                    GetObjectCommand = require('@aws-sdk/client-s3').GetObjectCommand;
+                    return [4 /*yield*/, global.awsS3Client.send(new GetObjectCommand({
                             Bucket: bucket,
                             Key: key,
                         }))];
@@ -90,7 +91,7 @@ var readFile = function (_a) {
                     apiResponse = _c.sent();
                     if (!(0, isResponse200_1.default)({ apiResponse: apiResponse })) return [3 /*break*/, 3];
                     now = today;
-                    modified = (0, date_1.getDate)({ input: apiResponse.LastModified, setMidnight: false });
+                    modified = (0, getDate_1.default)({ input: apiResponse.LastModified, setMidnight: false });
                     // Convert the date to unix
                     response.modified.unix = (0, getUnixTime_1.default)(modified);
                     // Compare now to unix
@@ -103,7 +104,7 @@ var readFile = function (_a) {
                     response.modified.vsMidnight.minutes = (0, getMinutes_1.default)(now);
                     // Convert stream into a string
                     _b = response;
-                    return [4 /*yield*/, (0, string_1.getStringFromStream)({ stream: apiResponse.Body })];
+                    return [4 /*yield*/, (0, getStringFromStream_1.default)({ stream: apiResponse.Body })];
                 case 2:
                     // Convert stream into a string
                     _b.body = _c.sent();

package/aws/s3/writeFile.d.ts

@@ -0,0 +1,10 @@
+declare type WriteFile = {
+    bucket: string;
+    data: any;
+    key: string;
+};
+/**
+ * Write a file to S3.
+ */
+declare const writeFile: ({ bucket, data, key, ...options }: WriteFile) => Promise<any>;
+export default writeFile;

package/{dist/aws → aws}/s3/writeFile.js

@@ -58,23 +58,21 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeFile = void 0;
 /**
  * Write a file to S3.
  */
 var writeFile = function (_a) { return __awaiter(void 0, void 0, void 0, function () {
     var PutObjectCommand, apiResponse;
-    var S3Lib = _a.S3Lib, bucket = _a.bucket, client = _a.client, data = _a.data, key = _a.key, options = __rest(_a, ["S3Lib", "bucket", "client", "data", "key"]);
+    var bucket = _a.bucket, data = _a.data, key = _a.key, options = __rest(_a, ["bucket", "data", "key"]);
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                PutObjectCommand = S3Lib.PutObjectCommand;
-                return [4 /*yield*/, client.send(new PutObjectCommand(__assign({ Bucket: bucket, Body: data, Key: key }, options)))];
+                PutObjectCommand = require('@aws-sdk/client-s3').PutObjectCommand;
+                return [4 /*yield*/, global.awsS3Client.send(new PutObjectCommand(__assign({ Bucket: bucket, Body: data, Key: key }, options)))];
             case 1:
                 apiResponse = _b.sent();
                 return [2 /*return*/, apiResponse];
         }
     });
 }); };
-exports.writeFile = writeFile;
-exports.default = exports.writeFile;
+exports.default = writeFile;

package/{dist/aws → aws}/s3/writeGlueJsonFile.d.ts

@@ -1,13 +1,12 @@
+declare type WriteGlueJsonFile = {
+    bucket: string;
+    data: object[];
+    key: string;
+};
 /**
  * Convert the object into a JSON file so it's ready to be used with AWS Glue.
  * Input: Must be an array of objects that are the same.
  * Output: No array [] brackets, each object must on its own new line.
  */
-export declare const writeGlueJsonFile: ({ S3Lib, bucket, client, data, key }: {
-    S3Lib: any;
-    bucket: string;
-    client: any;
-    data: object[];
-    key: string;
-}) => Promise<any>;
+export declare const writeGlueJsonFile: ({ bucket, data, key }: WriteGlueJsonFile) => Promise<any>;
 export default writeGlueJsonFile;

package/{dist/aws → aws}/s3/writeGlueJsonFile.js

@@ -35,26 +35,29 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeGlueJsonFile = void 0;
-var array_1 = require("../../array");
-var writeFile_1 = require("./writeFile");
+var getArray_1 = __importDefault(require("../../array/getArray"));
+var writeFile_1 = __importDefault(require("./writeFile"));
 /**
  * Convert the object into a JSON file so it's ready to be used with AWS Glue.
  * Input: Must be an array of objects that are the same.
  * Output: No array [] brackets, each object must on its own new line.
  */
 var writeGlueJsonFile = function (_a) {
-    var S3Lib = _a.S3Lib, bucket = _a.bucket, client = _a.client, data = _a.data, key = _a.key;
+    var bucket = _a.bucket, data = _a.data, key = _a.key;
     return __awaiter(void 0, void 0, void 0, function () {
         var inputArray, stringRows, concatString;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    inputArray = (0, array_1.getArray)({ input: data });
+                    inputArray = (0, getArray_1.default)({ input: data });
                     stringRows = inputArray.map(function (row) { return JSON.stringify(row); });
                     concatString = stringRows.join("\n");
-                    return [4 /*yield*/, (0, writeFile_1.writeFile)({ S3Lib: S3Lib, bucket: bucket, client: client, data: concatString, key: key })];
+                    return [4 /*yield*/, (0, writeFile_1.default)({ bucket: bucket, data: concatString, key: key })];
                 case 1: return [2 /*return*/, _b.sent()];
             }
         });

package/{dist/aws → aws}/s3/writePresignedPost.d.ts

@@ -1,8 +1,8 @@
-import { ResponseType } from '../../api';
-import { ConfigType } from '../config';
-declare type WritePresignedPostType = {
+import { Response } from '../../api/response';
+import { Config } from '../config';
+declare type WritePresignedPost = {
     bucket: string;
-    config: ConfigType;
+    config: Config;
     fields: any;
     file: any;
     key: string;
@@ -11,5 +11,5 @@ declare type WritePresignedPostType = {
 /**
  * Get a presigned post URL so we can upload directly to S3 via frontend.
  */
-declare const writePresignedPost: ({ bucket, config, fields, file, key, url }: WritePresignedPostType) => Promise<ResponseType>;
+declare const writePresignedPost: ({ bucket, config, fields, file, key, url }: WritePresignedPost) => Promise<Response>;
 export default writePresignedPost;

package/{dist/aws → aws}/s3/writePresignedPost.js

@@ -46,8 +46,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var api_1 = require("../../api");
+var response_1 = __importDefault(require("../../api/response"));
+var states_1 = __importDefault(require("../../api/states"));
 /**
  * Get a presigned post URL so we can upload directly to S3 via frontend.
  */
@@ -60,7 +64,7 @@ var writePresignedPost = function (_a) {
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                response = __assign({}, api_1.response);
+                                response = __assign({}, response_1.default);
                                 formData = new FormData();
                                 Object.entries({ fields: fields, file: file })
                                     .forEach(function (_a) {
@@ -76,7 +80,7 @@ var writePresignedPost = function (_a) {
                                 upload = _a.sent();
                                 // Uploaded to S3
                                 if (upload.ok) {
-                                    response.state = api_1.states.SUCCESS;
+                                    response.state = states_1.default.SUCCESS;
                                     response.body = {
                                         url: "https://".concat(bucket, ".s3.").concat(config.region, ".amazonaws.com/").concat(key),
                                     };
@@ -84,7 +88,7 @@ var writePresignedPost = function (_a) {
                                 }
                                 // Failed to upload to S3
                                 else {
-                                    response.state = api_1.states.ERROR;
+                                    response.state = states_1.default.ERROR;
                                     response.error = 'Failed to upload file, please try again.';
                                     reject(response);
                                 }

package/{dist/aws → aws}/s3cache/cache.d.ts

@@ -1,5 +1,6 @@
-import { durationComparisons, durations } from '../../date';
-export declare type CacheType = {
+import durationComparisons from '../../date/durationComparisons';
+import durations from '../../date/durations';
+export declare type Cache = {
     duration: number;
     from: typeof durationComparisons.VS_MIDNIGHT | typeof durationComparisons.VS_NOW;
     timeframe: typeof durations.FOREVER | typeof durations.MONTHS | typeof durations.DAYS | typeof durations.HOURS | typeof durations.MINUTES;

package/aws/s3cache/getCache.d.ts

@@ -0,0 +1,12 @@
+import { Cache } from './cache';
+import { GetKey } from './getKey';
+declare type GetCache = GetKey & {
+    bucket: string;
+    cache: Cache;
+    isJson?: boolean;
+};
+/**
+ * Get the stored cache if it exists.
+ */
+declare const getCache: ({ bucket, cache, fileName, folder, isJson }: GetCache) => Promise<any>;
+export default getCache;

package/{dist/aws → aws}/s3cache/getCache.js

@@ -39,40 +39,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var date_1 = require("../../date");
-var s3_1 = require("../s3");
+var durations_1 = __importDefault(require("../../date/durations"));
+var readFile_1 = __importDefault(require("../s3/readFile"));
 var getKey_1 = __importDefault(require("./getKey"));
 /**
  * Get the stored cache if it exists.
  */
 var getCache = function (_a) {
-    var S3Lib = _a.S3Lib, CryptoLib = _a.CryptoLib, bucket = _a.bucket, cache = _a.cache, config = _a.config, fileName = _a.fileName, folder = _a.folder, _b = _a.isJson, isJson = _b === void 0 ? true : _b;
+    var bucket = _a.bucket, cache = _a.cache, fileName = _a.fileName, folder = _a.folder, isJson = _a.isJson;
     return __awaiter(void 0, void 0, void 0, function () {
-        var response, s3CacheKey, client, cached, error_1;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var response, s3CacheKey, cached, error_1;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     response = undefined;
                     s3CacheKey = (0, getKey_1.default)({
-                        CryptoLib: CryptoLib,
                         fileName: fileName,
                         folder: folder,
                     });
                     if (!cache) return [3 /*break*/, 4];
-                    _c.label = 1;
+                    _b.label = 1;
                 case 1:
-                    _c.trys.push([1, 3, , 4]);
-                    client = (0, s3_1.getClient)({ S3Lib: S3Lib, config: config });
-                    return [4 /*yield*/, (0, s3_1.readFile)({ S3Lib: S3Lib, bucket: bucket, client: client, key: s3CacheKey, isJson: isJson })];
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, (0, readFile_1.default)({ bucket: bucket, key: s3CacheKey, isJson: isJson })];
                 case 2:
-                    cached = _c.sent();
+                    cached = _b.sent();
                     // Cache exists and is still within our caching timeframe
-                    if (undefined !== cached.body && (date_1.durations.FOREVER === cache.timeframe || cached.modified[cache.from][cache.timeframe] < cache.duration)) {
+                    if (undefined !== cached.body && (durations_1.default.FOREVER === cache.timeframe || cached.modified[cache.from][cache.timeframe] < cache.duration)) {
                         response = cached.body;
                     }
                     return [3 /*break*/, 4];
                 case 3:
-                    error_1 = _c.sent();
+                    error_1 = _b.sent();
                     return [3 /*break*/, 4];
                 case 4: return [2 /*return*/, response];
             }

package/{dist/aws → aws}/s3cache/getKey.d.ts

@@ -1,5 +1,4 @@
-export declare type GetKeyType = {
-    CryptoLib: any;
+export declare type GetKey = {
     fileName: any;
     folder: string;
 };
@@ -7,5 +6,5 @@ export declare type GetKeyType = {
  * Take an input and return the key.
  * Always in the "_cache" folder with the "environment" followed by the optional folder then the key.
  */
-declare const getKey: ({ CryptoLib, fileName, folder }: GetKeyType) => string;
+declare const getKey: ({ fileName, folder }: GetKey) => string;
 export default getKey;

package/{dist/aws → aws}/s3cache/getKey.js

@@ -5,15 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var trimStart_1 = __importDefault(require("lodash/trimStart"));
 var getSha256_1 = __importDefault(require("../../crypto/getSha256"));
-var environment_1 = require("../../environment");
+var getEnvironment_1 = __importDefault(require("../../environment/getEnvironment"));
 /**
  * Take an input and return the key.
  * Always in the "_cache" folder with the "environment" followed by the optional folder then the key.
  */
 var getKey = function (_a) {
-    var CryptoLib = _a.CryptoLib, fileName = _a.fileName, folder = _a.folder;
-    var fileNameString = (0, getSha256_1.default)({ CryptoLib: CryptoLib, input: fileName });
+    var fileName = _a.fileName, folder = _a.folder;
+    var fileNameString = (0, getSha256_1.default)({ input: fileName });
     var folderPath = (0, trimStart_1.default)('' === folder ? '' : "".concat(folder, "/"), '/');
-    return "cache/".concat((0, environment_1.getEnvironment)(), "/").concat(folderPath).concat(fileNameString, ".json");
+    return "cache/".concat((0, getEnvironment_1.default)(), "/").concat(folderPath).concat(fileNameString, ".json");
 };
 exports.default = getKey;

package/aws/s3cache/saveCache.d.ts

@@ -0,0 +1,10 @@
+declare type SaveCache = {
+    bucket: string;
+    data: any;
+    key: string;
+};
+/**
+ * Save the cache.
+ */
+declare const saveCache: ({ bucket, data, key }: SaveCache) => Promise<void>;
+export default saveCache;