@8ms/helpers 1.3.16 → 1.3.18

package/aws/s3/deleteFolder.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const getCleanFolder_1 = __importDefault(require("../../string/getCleanFolder"));
+const getFolder_1 = __importDefault(require("../../string/getFolder"));
 /**
  * Iteratively delete all the files within a directory and delete the directory.
  */
 const deleteFolder = async ({ bucket, folder }) => {
-    const cleanFolder = (0, getCleanFolder_1.default)({ input: folder });
+    const cleanFolder = (0, getFolder_1.default)({ input: folder });
     const { ListObjectsV2Command, DeleteObjectsCommand } = require('@aws-sdk/client-s3');
     // Get a list of all files to be deleted
     const apiResponse = await global.awsS3Client.send(new ListObjectsV2Command({

package/aws/s3/listFiles.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const getCleanFolder_1 = __importDefault(require("../../string/getCleanFolder"));
+const getFolder_1 = __importDefault(require("../../string/getFolder"));
 /**
  * List the files in the given bucket and option folder
  */
 const listFiles = async ({ bucket, folder = '' }) => {
-    const cleanFolder = (0, getCleanFolder_1.default)({ input: folder });
+    const cleanFolder = (0, getFolder_1.default)({ input: folder });
     let response = [];
     let valid = [];
     const { ListObjectsV2Command } = require('@aws-sdk/client-s3');

package/aws/s3/listFolders.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const getCleanFolder_1 = __importDefault(require("../../string/getCleanFolder"));
+const getFolder_1 = __importDefault(require("../../string/getFolder"));
 /**
  * List the files in the given bucket and option folder.
  */
 const listFolders = async ({ bucket, folder }) => {
-    const cleanFolder = (0, getCleanFolder_1.default)({ input: folder });
+    const cleanFolder = (0, getFolder_1.default)({ input: folder });
     let response = [];
     const { ListObjectsV2Command } = require('@aws-sdk/client-s3');
     const apiResponse = await global.awsS3Client.send(new ListObjectsV2Command({

package/google/storage/copyToCloud.d.ts

@@ -2,9 +2,10 @@ type CopyToCloud = {
     bucket: string;
     localFile: string;
     options?: object;
+    projectId?: string;
 };
 /**
  * Copy a local file to Google Cloud Storage.
  */
-export declare const copyToCloud: ({ bucket, localFile, options }: CopyToCloud) => Promise<any>;
+export declare const copyToCloud: ({ bucket, localFile, options, projectId }: CopyToCloud) => Promise<any>;
 export default copyToCloud;

package/google/storage/copyToCloud.js

@@ -1,11 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyToCloud = void 0;
+const getClient_1 = __importDefault(require("./getClient"));
 /**
  * Copy a local file to Google Cloud Storage.
  */
-const copyToCloud = async ({ bucket, localFile, options }) => {
-    const bucketInstance = global.googleStorageClient.bucket(bucket);
+const copyToCloud = async ({ bucket, localFile, options, projectId }) => {
+    const bucketInstance = (0, getClient_1.default)({ projectId })
+        .bucket(bucket);
     const apiResponse = await bucketInstance.upload(localFile, options);
     return apiResponse;
 };

package/google/storage/writeFile.d.ts

@@ -2,10 +2,11 @@ type WriteFile = {
     bucket: string;
     data: any;
     key: string;
+    projectId?: string;
     [options: string]: any;
 };
 /**
  * Write a file to Google Cloud Storage.
  */
-export declare const writeFile: ({ bucket, contentType, data, key, ...options }: WriteFile) => Promise<any>;
+export declare const writeFile: ({ bucket, contentType, data, key, projectId, ...options }: WriteFile) => Promise<any>;
 export default writeFile;

package/google/storage/writeFile.js

@@ -1,13 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeFile = void 0;
+const getClient_1 = __importDefault(require("./getClient"));
 /**
  * Write a file to Google Cloud Storage.
  */
-const writeFile = async ({ bucket, contentType, data, key, ...options }) => {
+const writeFile = async ({ bucket, contentType, data, key, projectId, ...options }) => {
     const stream = require('stream');
     const dataStream = new stream.PassThrough();
-    const googleFile = global.googleStorageClient.bucket(bucket)
+    const googleFile = (0, getClient_1.default)({ projectId })
+        .bucket(bucket)
         .file(key);
     dataStream.push(data);
     dataStream.push(null);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name":            "@8ms/helpers",
 	"license":         "UNLICENSED",
-	"version":         "1.3.16",
+	"version":         "1.3.18",
 	"repository":      {
 		"type": "git",
 		"url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"

package/string/getFolder.d.ts

@@ -0,0 +1,8 @@
+type GetFolder = {
+    input: string;
+};
+/**
+ * Take an input that may have a / before or after the input and return just the folder.
+ */
+declare const getFolder: ({ input }: GetFolder) => string;
+export default getFolder;

package/string/{getCleanFolder.js → getFolder.js}

@@ -7,8 +7,8 @@ const trim_1 = __importDefault(require("lodash/trim"));
 /**
  * Take an input that may have a / before or after the input and return just the folder.
  */
-const getCleanFolder = ({ input }) => {
+const getFolder = ({ input }) => {
     return (0, trim_1.default)(input, '/')
         .trim();
 };
-exports.default = getCleanFolder;
+exports.default = getFolder;

package/string/getCleanFolder.d.ts

@@ -1,8 +0,0 @@
-type GetCleanFolder = {
-    input: string;
-};
-/**
- * Take an input that may have a / before or after the input and return just the folder.
- */
-declare const getCleanFolder: ({ input }: GetCleanFolder) => string;
-export default getCleanFolder;