@datatruck/cli 0.30.1 → 0.32.0

package/utils/string.js

@@ -1,30 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.undefIfEmpty = exports.formatDateTime = exports.checkMatch = exports.createMatchFilter = exports.endsWith = exports.match = exports.makePathPatterns = exports.formatSeconds = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = exports.serialize = void 0;
+exports.undefIfEmpty = exports.checkMatch = exports.createMatchFilter = exports.endsWith = exports.match = exports.makePathPatterns = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = void 0;
 const AppError_1 = require("../Error/AppError");
 const micromatch_1 = require("micromatch");
-function serialize(message, data) {
-    if (data)
-        return `${message} (${JSON.stringify(data, null, 2)})`;
-    return message;
-}
-exports.serialize = serialize;
 function snakeCase(value, char = "_") {
     return value.replace(/[A-Z]/g, (letter) => `${char}${letter.toLowerCase()}`);
 }
 exports.snakeCase = snakeCase;
 function render(subject, vars) {
-    return subject.replace(/{([\w/]*)}/g, function (match, name) {
+    return subject.replace(/{([\w\./]*)}/g, function (match, name) {
         if (!name.length) {
             return "{";
         }
         else if (name === "/") {
             return "}";
         }
-        const value = vars[name];
-        if (typeof value === "undefined")
-            throw new AppError_1.AppError(`Variable is not defined: '${subject}' (${name})`);
-        return value;
+        let ref = vars;
+        for (const key of name.split(".")) {
+            if (!!ref && typeof ref === "object") {
+                ref = ref[key];
+            }
+            else {
+                ref = undefined;
+                break;
+            }
+        }
+        if (typeof ref !== "string" &&
+            typeof ref !== "number" &&
+            typeof ref !== "boolean")
+            throw new Error(`Variable is not valid: ${name}`, {
+                cause: {
+                    vars,
+                    value: ref,
+                },
+            });
+        return ref.toString();
     });
 }
 exports.render = render;
@@ -61,26 +71,6 @@ function formatUri(input, hidePassword) {
     return uri;
 }
 exports.formatUri = formatUri;
-function formatSeconds(seconds) {
-    let unit;
-    let value;
-    if (seconds > 60 * 60) {
-        value = seconds / 60 / 60;
-        unit = `hour`;
-    }
-    else if (seconds > 60) {
-        value = seconds / 60;
-        unit = `minute`;
-    }
-    else {
-        value = seconds;
-        unit = `second`;
-    }
-    if (value !== 1)
-        unit += `s`;
-    return `${value.toFixed(2)} ${unit}`;
-}
-exports.formatSeconds = formatSeconds;
 function makePathPatterns(values) {
     return values?.flatMap((v) => {
         if (v === "*" || v === "**" || v === "<empty>" || v === "!<empty>") {
@@ -111,16 +101,6 @@ function checkMatch(subject, patterns) {
     return (0, micromatch_1.isMatch)(subject, patterns);
 }
 exports.checkMatch = checkMatch;
-function formatDateTime(datetime) {
-    const date = new Date(datetime);
-    const [result] = new Date(date.getTime() - date.getTimezoneOffset() * 60000)
-        .toISOString()
-        .replace("Z", "")
-        .replace("T", " ")
-        .split(".");
-    return result;
-}
-exports.formatDateTime = formatDateTime;
 function undefIfEmpty(input) {
     return input.length ? input : undefined;
 }

package/utils/ObjectVault.d.ts

@@ -1,13 +0,0 @@
-export type KeysType = (string | number)[];
-export declare class ObjectVault<TObject> {
-    protected counter: number;
-    protected readonly ids: Record<string, number>;
-    protected readonly objects: Record<number, TObject>;
-    static serializeKeys(keys: KeysType): string;
-    get(id: number): TObject;
-    getId(keys: KeysType): number;
-    add(options: {
-        keys: KeysType;
-        handler: (id: number) => TObject;
-    }): TObject;
-}

package/utils/ObjectVault.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectVault = void 0;
-class ObjectVault {
-    counter = 0;
-    ids = {};
-    objects = {};
-    static serializeKeys(keys) {
-        return JSON.stringify(keys);
-    }
-    get(id) {
-        if (!(id in this.objects))
-            throw new Error(`Object not found: ${id}`);
-        return this.objects[id];
-    }
-    getId(keys) {
-        const key = ObjectVault.serializeKeys(keys);
-        const id = this.ids[key];
-        if (!id)
-            throw new Error(`Id not found: ${JSON.stringify(keys)}`);
-        return id;
-    }
-    add(options) {
-        const key = ObjectVault.serializeKeys(options.keys);
-        const id = (this.ids[key] = ++this.counter);
-        return (this.objects[id] = options.handler(id));
-    }
-}
-exports.ObjectVault = ObjectVault;