@8ms/helpers 2.0.28 → 2.0.30

package/api/ApiResponseClass.d.ts

@@ -25,7 +25,7 @@ export declare class ApiResponseClass<T = any, E = any> {
     isSuccess: () => boolean;
     setToIdle: () => this;
     setToPending: () => this;
-    setToError: (error: any, body: any) => this;
+    setToError: (error: any, body?: any) => this;
     setToSuccess: (body: any) => this;
     setBody: (body: any) => this;
     setError: (error: any) => this;

package/aws/s3/AwsS3Namespace.js

@@ -286,17 +286,8 @@ class AwsS3Namespace extends _class_1.BaseNamespace {
                 }));
                 //console.log('apiResponse', apiResponse);
                 if ((0, server_1.isResponse200)(apiResponse)) {
-                    let modified = (0, date_1.getDate)(apiResponse.LastModified);
                     // Convert the date to unix
-                    response.modified.unix = modified.toUnixInteger();
-                    // Compare now to unix
-                    response.modified.vs_now.months = today.diff(modified, "months").months;
-                    response.modified.vs_now.days = today.diff(modified, "days").days;
-                    response.modified.vs_now.hours = today.diff(modified, "hours").hours;
-                    response.modified.vs_now.minutes = today.diff(modified, "minutes").minutes;
-                    // Compare now to midnight
-                    response.modified.vs_midnight.hours = today.diff(midnight, "hours").hours;
-                    response.modified.vs_midnight.minutes = today.diff(midnight, "minutes").hours;
+                    response.modified = (0, date_1.getYmdHisString)(apiResponse.LastModified);
                     // Convert stream into a string
                     response.body = await (0, string_1.getStringFromStream)(apiResponse.Body);
                 }

package/aws/s3/server.d.ts

@@ -3,19 +3,7 @@ import { AwsConfig } from "../server";
 export declare const awsS3Client: (key?: string, config?: AwsConfig, vaultId?: string, itemId?: string) => Promise<AwsS3Namespace>;
 export type Modified = {
     now: number;
-    modified: {
-        unix: null | number;
-        vs_now: {
-            months: number;
-            days: number;
-            hours: number;
-            minutes: number;
-        };
-        vs_midnight: {
-            hours: number;
-            minutes: number;
-        };
-    };
+    modified: string;
 };
 export type ReadFileResponse = Modified & {
     body: any;

package/aws/s3/server.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.payloadSchema = exports.readFileDefault = exports.awsS3Client = void 0;
 const AwsS3Namespace_1 = require("./AwsS3Namespace");
 const server_1 = require("../server");
+const date_1 = require("../../date");
 const awsS3Namespaces = new Map();
 const awsS3Client = async (key = "default", config, vaultId, itemId) => {
     if (awsS3Namespaces.has(key)) {
@@ -18,19 +19,7 @@ exports.readFileDefault = {
     body: undefined,
     now: undefined,
     error: undefined,
-    modified: {
-        unix: null,
-        vs_now: {
-            months: 0,
-            days: 0,
-            hours: 0,
-            minutes: 0,
-        },
-        vs_midnight: {
-            hours: 0,
-            minutes: 0,
-        },
-    },
+    modified: date_1.defaultDateTime,
 };
 var payload_1 = require("./payload");
 Object.defineProperty(exports, "payloadSchema", { enumerable: true, get: function () { return payload_1.payloadSchema; } });

package/file/index.d.ts

@@ -3,3 +3,7 @@
  * Requires fs-extra
  */
 export declare const createDirectory: (filePath: string) => Promise<unknown>;
+/**
+ * Create a file key from the inputs so it can handle objects/number/etc.
+ */
+export declare const getFileKey: (inputs: any[]) => string;

package/file/index.js

@@ -33,7 +33,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDirectory = void 0;
+exports.getFileKey = exports.createDirectory = void 0;
+const date_1 = require("../date");
+const luxon_1 = require("luxon");
 /**
  * Create a directory recursively.
  * Requires fs-extra
@@ -48,3 +50,25 @@ const createDirectory = (filePath) => {
     });
 };
 exports.createDirectory = createDirectory;
+/**
+ * Create a file key from the inputs so it can handle objects/number/etc.
+ */
+const getFileKey = (inputs) => {
+    let response = "";
+    for (let i = 0; i < inputs.length; i++) {
+        if (i > 0) {
+            response += "/";
+        }
+        if ("string" === typeof inputs[i]) {
+            response += inputs[i];
+        }
+        else if (inputs[i] instanceof Date || inputs[i] instanceof luxon_1.DateTime) {
+            response += (0, date_1.format)(inputs[i], "YYYY-MM-DD");
+        }
+        else {
+            response += JSON.stringify(inputs[i]);
+        }
+    }
+    return response;
+};
+exports.getFileKey = getFileKey;

package/google/bigQuery/GoogleBigQueryNamespace.d.ts

@@ -1,7 +1,7 @@
 import { BaseNamespace } from "../../_class";
 import type { BigQuery, QueryOptions } from "@google-cloud/bigquery";
 import { GoogleCloudConfig } from "../server";
-type Query = string | {
+export type QueryInput = string | {
     query: string;
     location?: string;
     params: QueryOptions;
@@ -33,7 +33,7 @@ export declare class GoogleBigQueryNamespace extends BaseNamespace {
      * Retrieve all the Datasets
      */
     getDataset: () => Promise<Datasets[]>;
-    query: (props: Query) => Promise<any>;
+    query: (props: QueryInput) => Promise<any>;
     /**
      * Create a Table if it doesn't already exist.
      */

package/google/bigQuery/server.d.ts

@@ -3,3 +3,4 @@ import type { GoogleAuthOptions } from "@google-cloud/common";
 export declare const googleBigQueryClient: (key?: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleBigQueryNamespace>;
 export declare const getHandlerPath: (input: string) => string;
 export { loadData } from "./loadData";
+export type { QueryInput } from "./GoogleBigQueryNamespace";

package/package.json

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