@8ms/helpers 1.1.56 → 1.1.59

package/aws/athenaExpress/initClient.d.ts

@@ -1,10 +1,12 @@
 import { Config } from '../config';
+declare type InitClient = {
+    config: Config;
+    database: string;
+    s3Bucket: string;
+    s3Key: string;
+};
 /**
  * Initialise the database using manually provided credentials.
  */
-declare const initClient: ({ athenaS3, config, database }: {
-    athenaS3?: string;
-    config?: Config;
-    database?: string;
-}) => void;
+declare const initClient: ({ config, database, s3Bucket, s3Key }: InitClient) => void;
 export default initClient;

package/aws/athenaExpress/initClient.js

@@ -9,7 +9,7 @@ global.awsAthenaExpressClient = null;
  * Initialise the database using manually provided credentials.
  */
 var initClient = function (_a) {
-    var athenaS3 = _a.athenaS3, config = _a.config, database = _a.database;
+    var config = _a.config, database = _a.database, s3Bucket = _a.s3Bucket, s3Key = _a.s3Key;
     if (!global.awsAthenaExpressClient) {
         var athenaExpress = require('athena-express');
         var awsSdk = require('aws-sdk');
@@ -18,7 +18,7 @@ var initClient = function (_a) {
         awsSdk.config.update(formattedConfig);
         global.awsAthenaExpressClient = new athenaExpress.AthenaExpress({
             aws: awsSdk,
-            s3: athenaS3,
+            s3: "s3://".concat(s3Bucket, "/").concat(s3Key),
             db: database,
             formatJson: true,
             retry: 200,

package/aws/athenaExpress/request.d.ts

@@ -1,12 +1,8 @@
-import { Config } from '../config';
 declare type Request = {
-    athenaS3?: string;
-    config?: Config;
-    database?: string;
     query: string;
 };
 /**
  * Build the query and return the data.
  */
-declare const request: ({ athenaS3, config, database, query }: Request) => Promise<any>;
+declare const request: ({ query }: Request) => Promise<any>;
 export default request;

package/aws/athenaExpress/request.js

@@ -35,23 +35,17 @@ 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 initClient_1 = __importDefault(require("./initClient"));
 /**
  * Build the query and return the data.
  */
 var request = function (_a) {
-    var athenaS3 = _a.athenaS3, config = _a.config, database = _a.database, query = _a.query;
+    var query = _a.query;
     return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_b) {
             switch (_b.label) {
-                case 0:
-                    (0, initClient_1.default)({ athenaS3: athenaS3, config: config, database: database });
-                    return [4 /*yield*/, global.awsAthenaExpressClient.query(query)
-                            .then(function (data) { return undefined === data['Items'] ? [] : data['Items']; })];
+                case 0: return [4 /*yield*/, global.awsAthenaExpressClient.query(query)
+                        .then(function (data) { return undefined === data['Items'] ? [] : data['Items']; })];
                 case 1: return [2 /*return*/, _b.sent()];
             }
         });

package/aws/s3/getGlueJson.d.ts

@@ -0,0 +1,4 @@
+declare const getGlueJson: ({ data }: {
+    data: any;
+}) => string;
+export default getGlueJson;

package/aws/s3/getGlueJson.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var getArray_1 = __importDefault(require("../../array/getArray"));
+var getGlueJson = function (_a) {
+    var data = _a.data;
+    // Must be an array
+    var inputArray = (0, getArray_1.default)({ input: data });
+    // For each array row convert the row
+    var stringRows = inputArray.map(function (row) { return JSON.stringify(row); });
+    // Combine each row with a line separator
+    return stringRows.join("\n");
+};
+exports.default = getGlueJson;

package/package.json

@@ -1,45 +1,45 @@
 {
-  "name":            "@8ms/helpers",
-  "license":         "UNLICENSED",
-  "version":         "1.1.56",
-  "repository":      {
-	"type": "git",
-	"url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"
-  },
-  "main":            "index.js",
-  "types":           "index.d.ts",
-  "scripts":         {
-	"build": "rimraf dist && tsc",
-	"jest":  "jest --watch"
-  },
-  "dependencies":    {
-	"axios":       "0.27.2",
-	"crypto-js":   "4.1.1",
-	"date-fns":    "2.29.2",
-	"date-fns-tz": "1.3.6",
-	"lodash":      "4.17.21"
-  },
-  "devDependencies": {
-	"@aws-sdk/client-s3":            "3.157.0",
-	"@aws-sdk/client-ses":           "3.154.0",
-	"@aws-sdk/client-ssm":           "3.154.0",
-	"@aws-sdk/s3-request-presigner": "3.157.0",
-	"@babel/preset-env":             "7.18.10",
-	"@babel/preset-flow":            "7.18.6",
-	"@babel/preset-typescript":      "7.18.6",
-	"@google-cloud/storage":         "6.4.1",
-	"@prisma/client":                "4.2.1",
-	"@types/jest":                   "28.1.8",
-	"@types/lodash":                 "4.14.184",
-	"@types/node":                   "18.7.13",
-	"babel-jest":                    "28.1.3",
-	"jest":                          "28.1.3",
-	"node-fetch":                    "3.2.10",
-	"numbro":                        "2.3.6",
-	"prisma-query-log":              "3.2.0",
-	"timezone-mock":                 "1.3.4",
-	"ts-node":                       "10.9.1",
-	"tslib":                         "2.4.0",
-	"typescript":                    "4.7.4"
-  }
+	"name": "@8ms/helpers",
+	"license": "UNLICENSED",
+	"version": "1.1.59",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"
+	},
+	"main": "index.js",
+	"types": "index.d.ts",
+	"scripts": {
+		"build": "rimraf dist && tsc",
+		"jest": "jest --watch"
+	},
+	"dependencies": {
+		"axios": "0.27.2",
+		"crypto-js": "4.1.1",
+		"date-fns": "2.29.2",
+		"date-fns-tz": "1.3.6",
+		"lodash": "4.17.21"
+	},
+	"devDependencies": {
+		"@aws-sdk/client-s3": "3.157.0",
+		"@aws-sdk/client-ses": "3.154.0",
+		"@aws-sdk/client-ssm": "3.154.0",
+		"@aws-sdk/s3-request-presigner": "3.157.0",
+		"@babel/preset-env": "7.18.10",
+		"@babel/preset-flow": "7.18.6",
+		"@babel/preset-typescript": "7.18.6",
+		"@google-cloud/storage": "6.4.1",
+		"@prisma/client": "4.2.1",
+		"@types/jest": "28.1.8",
+		"@types/lodash": "4.14.184",
+		"@types/node": "18.7.13",
+		"babel-jest": "28.1.3",
+		"jest": "28.1.3",
+		"node-fetch": "3.2.10",
+		"numbro": "2.3.6",
+		"prisma-query-log": "3.2.0",
+		"timezone-mock": "1.3.4",
+		"ts-node": "10.9.1",
+		"tslib": "2.4.0",
+		"typescript": "4.7.4"
+	}
 }

package/aws/s3/writeGlueJsonFile.d.ts

@@ -1,12 +0,0 @@
-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: ({ bucket, data, key }: WriteGlueJsonFile) => Promise<any>;
-export default writeGlueJsonFile;

package/aws/s3/writeGlueJsonFile.js

@@ -1,67 +0,0 @@
-"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());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        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 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 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, getArray_1.default)({ input: data });
-                    stringRows = inputArray.map(function (row) { return JSON.stringify(row); });
-                    concatString = stringRows.join("\n");
-                    return [4 /*yield*/, (0, writeFile_1.default)({ bucket: bucket, data: concatString, key: key })];
-                case 1: return [2 /*return*/, _b.sent()];
-            }
-        });
-    });
-};
-exports.writeGlueJsonFile = writeGlueJsonFile;
-exports.default = exports.writeGlueJsonFile;