@8ms/helpers 1.3.28 → 1.3.31

package/.github/workflows/deploy_npmjs.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - run: yarn
       - run: yarn build
       - uses: JS-DevTools/npm-publish@v1

package/aws/s3/readBrotli.d.ts

@@ -0,0 +1,11 @@
+import { ReadFileResponse } from "./readFile";
+type ReadBrotli = {
+    bucket: string;
+    key: string;
+    isJson?: boolean;
+};
+/**
+ * Read a file from S3 and return either null, the content or JSON decoded.
+ */
+declare const readBrotli: ({ bucket, key, isJson }: ReadBrotli) => Promise<ReadFileResponse>;
+export default readBrotli;

package/aws/s3/readBrotli.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const getBrotliDecompressed_1 = __importDefault(require("../../util/getBrotliDecompressed"));
+const readFile_1 = __importDefault(require("./readFile"));
+/**
+ * Read a file from S3 and return either null, the content or JSON decoded.
+ */
+const readBrotli = async ({ bucket, key, isJson }) => {
+    let response = await (0, readFile_1.default)({
+        bucket,
+        key,
+        isJson: false
+    });
+    // Cache exists and is still within our caching timeframe
+    if (undefined !== response.body) {
+        response.body = await (0, getBrotliDecompressed_1.default)({
+            input: response.body,
+        });
+        if (false !== isJson) {
+            response.body = JSON.parse(response.body);
+        }
+    }
+    return response;
+};
+exports.default = readBrotli;

package/aws/s3/writeBrotli.d.ts

@@ -0,0 +1,12 @@
+type WriteBrotli = {
+    bucket: string;
+    data: any;
+    key: string;
+    isJson?: boolean;
+    [options: string]: any;
+};
+/**
+ * Write a brotli file to S3.
+ */
+declare const writeBrotli: ({ bucket, data, key, isJson, ...options }: WriteBrotli) => Promise<any>;
+export default writeBrotli;

package/aws/s3/writeBrotli.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const getBrotliCompressed_1 = __importDefault(require("../../util/getBrotliCompressed"));
+const writeFile_1 = __importDefault(require("./writeFile"));
+/**
+ * Write a brotli file to S3.
+ */
+const writeBrotli = async ({ bucket, data, key, isJson, ...options }) => {
+    let finalData = data;
+    if (false !== isJson) {
+        finalData = JSON.stringify(data);
+    }
+    // Compress the data
+    const brotliData = await (0, getBrotliCompressed_1.default)({
+        input: finalData,
+    });
+    const apiResponse = await (0, writeFile_1.default)({
+        bucket,
+        data: brotliData,
+        key,
+        ...options,
+    });
+    return apiResponse;
+};
+exports.default = writeBrotli;

package/aws/s3cache/getCache.d.ts

@@ -3,10 +3,9 @@ import { GetKey } from './getKey';
 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>;
+declare const getCache: ({ bucket, cache, fileName, folder }: GetCache) => Promise<any>;
 export default getCache;

package/aws/s3cache/getCache.js

@@ -4,13 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const durations_1 = __importDefault(require("../../date/durations"));
-const readFile_1 = __importDefault(require("../s3/readFile"));
 const getKey_1 = __importDefault(require("./getKey"));
-const getBrotliDecompressed_1 = __importDefault(require("../../util/getBrotliDecompressed"));
+const readBrotli_1 = __importDefault(require("../s3/readBrotli"));
 /**
  * Get the stored cache if it exists.
  */
-const getCache = async ({ bucket, cache, fileName, folder, isJson }) => {
+const getCache = async ({ bucket, cache, fileName, folder }) => {
     let response = undefined;
     // Store the cache key
     const s3CacheKey = (0, getKey_1.default)({ fileName, folder });
@@ -18,12 +17,14 @@ const getCache = async ({ bucket, cache, fileName, folder, isJson }) => {
     if (cache) {
         // Try to get the cache
         try {
-            const cached = await (0, readFile_1.default)({ bucket, key: s3CacheKey, isJson });
+            const cached = await (0, readBrotli_1.default)({
+                bucket,
+                key: s3CacheKey,
+                isJson: true,
+            });
             // Cache exists and is still within our caching timeframe
             if (undefined !== cached.body && (durations_1.default.FOREVER === cache.timeframe || cached.modified[cache.from][cache.timeframe] < cache.duration)) {
-                response = await (0, getBrotliDecompressed_1.default)({
-                    input: cached.body,
-                });
+                response = cached.body;
             }
         }
         catch (error) {

package/aws/s3cache/saveCache.d.ts

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

package/aws/s3cache/saveCache.js

@@ -3,15 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const writeFile_1 = __importDefault(require("../s3/writeFile"));
-const getBrotliCompressed_1 = __importDefault(require("../../util/getBrotliCompressed"));
+const writeBrotli_1 = __importDefault(require("../s3/writeBrotli"));
 /**
  * Save the cache.
  */
 const saveCache = async ({ bucket, data, key }) => {
-    const brotliData = await (0, getBrotliCompressed_1.default)({
-        input: data,
+    return await (0, writeBrotli_1.default)({
+        bucket,
+        data,
+        key,
     });
-    await (0, writeFile_1.default)({ bucket, data: brotliData, key });
 };
 exports.default = saveCache;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name":            "@8ms/helpers",
 	"license":         "UNLICENSED",
-	"version":         "1.3.28",
+	"version":         "1.3.31",
 	"repository":      {
 		"type": "git",
 		"url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"
@@ -13,36 +13,35 @@
 		"jest":  "jest --watch"
 	},
 	"dependencies":    {
-		"axios":       "1.3.5",
+		"axios":       "1.4.0",
 		"crypto-js":   "4.1.1",
-		"date-fns":    "2.29.3",
+		"date-fns":    "2.30.0",
 		"date-fns-tz": "1.3.7",
 		"lodash":      "4.17.21",
 		"zod":         "3.21.4"
 	},
 	"devDependencies": {
-		"@aws-sdk/client-s3":            "3.306.0",
-		"@aws-sdk/client-ses":           "3.306.0",
-		"@aws-sdk/client-sqs":           "3.306.0",
-		"@aws-sdk/client-ssm":           "3.306.0",
-		"@aws-sdk/s3-request-presigner": "3.306.0",
-		"@babel/preset-env":             "7.21.4",
+		"@aws-sdk/client-s3":            "3.345.0",
+		"@aws-sdk/client-ses":           "3.345.0",
+		"@aws-sdk/client-sqs":           "3.345.0",
+		"@aws-sdk/client-ssm":           "3.345.0",
+		"@aws-sdk/s3-request-presigner": "3.345.0",
+		"@babel/preset-env":             "7.22.4",
 		"@babel/preset-flow":            "7.21.4",
-		"@babel/preset-typescript":      "7.21.4",
+		"@babel/preset-typescript":      "7.21.5",
 		"@google-cloud/bigquery":        "6.2.0",
-		"@google-cloud/storage":         "6.9.5",
-		"@prisma/client":                "4.12.0",
-		"@types/jest":                   "29.5.0",
-		"@types/lodash":                 "4.14.192",
-		"@types/node":                   "18.15.11",
+		"@google-cloud/storage":         "6.10.1",
+		"@prisma/client":                "4.15.0",
+		"@types/jest":                   "29.5.2",
+		"@types/lodash":                 "4.14.195",
+		"@types/node":                   "20.2.5",
 		"babel-jest":                    "29.5.0",
 		"jest":                          "29.5.0",
 		"node-fetch":                    "3.3.1",
 		"numbro":                        "2.3.6",
-		"prisma-query-log":              "3.2.0",
 		"timezone-mock":                 "1.3.6",
 		"ts-node":                       "10.9.1",
-		"tslib":                         "2.5.0",
+		"tslib":                         "2.5.3",
 		"typescript":                    "5.0.3"
 	}
 }

package/prisma/initClient.js

@@ -20,9 +20,6 @@ const initClient = ({ debug } = { debug: false }) => {
                     },
                 ],
             });
-            const { createPrismaQueryEventHandler } = require('prisma-query-log');
-            const log = createPrismaQueryEventHandler();
-            global.prisma.$on('query', log);
         }
         // Standard prisma
         else {