@8ms/helpers 2.0.29 → 2.0.31

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.29",
+	"version": "2.0.31",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"

package/string/getCapitalised.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCapitalised = void 0;
+const reservedWords_1 = require("./reservedWords");
 /**
  * Convert a string into Capitalised Text.
  * https://stackoverflow.com/a/196991/2664955
@@ -10,6 +11,12 @@ const getCapitalised = (input, split = "_") => {
     return input
         .replace(regex, " ")
         .replace(/\w\S*/g, function (txt) {
+        // Check if individual word is reserved
+        const reservedWord = (0, reservedWords_1.isReservedWord)(txt);
+        if (reservedWord) {
+            return reservedWord;
+        }
+        // Regular capitalization for non-reserved words
         return txt.charAt(0)
             .toUpperCase() + txt.substr(1)
             .toLowerCase();

package/string/getProperCase.d.ts

@@ -1,5 +1,5 @@
 type GetProperCaseProps = {
-    input: string;
+    input: any;
     hyphen?: boolean;
     pipe?: boolean;
     underscore?: boolean;

package/string/getProperCase.js

@@ -1,25 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProperCase = void 0;
+const reservedWords_1 = require("./reservedWords");
 /**
  * Return a string "With Proper Casing".
  */
 const getProperCase = (props) => {
-    let response = props.input;
+    const cleanInput = props.input.toString()
+        .trim();
+    // Don't process if the entire input is a reserved word
+    if (reservedWords_1.reservedWords.includes(cleanInput.toUpperCase())) {
+        return cleanInput;
+    }
+    // Build the split pattern - always include spaces
+    let splitPattern = /\s+/;
+    // Add optional separators based on user preferences
+    const separators = [];
     if (props?.hyphen) {
-        response = response.split(/-/g)
-            .join(" ");
+        separators.push("-");
     }
     if (props?.pipe) {
-        response = response.split(/\|/g)
-            .join(" ");
+        separators.push("\\|");
     }
     if (props?.underscore) {
-        response = response.split(/_/g)
-            .join(" ");
+        separators.push("_");
+    }
+    if (separators.length > 0) {
+        splitPattern = new RegExp(`[\\s${separators.join("")}]+`, "g");
     }
-    return response.replace(/\w\S*/g, word => word.charAt(0)
-        .toUpperCase() + word.substr(1)
-        .toLowerCase());
+    // Split the input into words and apply proper casing
+    const words = cleanInput.split(splitPattern)
+        .filter(word => word.length > 0) // Remove empty strings
+        .map(word => {
+        // Check if individual word is reserved
+        const reservedWord = (0, reservedWords_1.isReservedWord)(word);
+        if (reservedWord) {
+            return reservedWord;
+        }
+        // Apply proper case
+        return word.charAt(0)
+            .toUpperCase() + word.slice(1)
+            .toLowerCase();
+    });
+    return words.join(' ');
 };
 exports.getProperCase = getProperCase;

package/string/reservedWords.d.ts

@@ -0,0 +1,5 @@
+export declare const reservedWords: string[];
+/**
+ * Check if its a reserved word, the casing may be specific eg, OpenAI.
+ */
+export declare const isReservedWord: (word: string) => any;

package/string/reservedWords.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isReservedWord = exports.reservedWords = void 0;
+exports.reservedWords = [
+    "AI",
+    "GA4",
+    "GSC",
+    "OpenAI",
+    "PPC",
+    "SEO",
+    "UpTimeRobot",
+];
+/**
+ * Check if its a reserved word, the casing may be specific eg, OpenAI.
+ */
+const isReservedWord = (word) => {
+    let response = null;
+    for (let i = 0; i < exports.reservedWords.length; i++) {
+        if (exports.reservedWords[i].toLowerCase() === word.toLowerCase()) {
+            response = exports.reservedWords[i];
+            break;
+        }
+    }
+    return response;
+};
+exports.isReservedWord = isReservedWord;