@zokugun/artifact 0.4.4 → 0.5.1

package/lib/utils/read-buffer.js

@@ -1,13 +1,4 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,21 +6,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readBuffer = readBuffer;
 const buffer_1 = require("buffer");
 const promises_1 = __importDefault(require("fs/promises"));
-function readBuffer(filepath_1, size_1) {
-    return __awaiter(this, arguments, void 0, function* (filepath, size, offset = 0) {
-        const buffer = buffer_1.Buffer.alloc(size);
-        const file = yield promises_1.default.open(filepath, 'r');
-        try {
-            const { bytesRead } = yield file.read(buffer, 0, size, offset);
-            if (bytesRead < size) {
-                return buffer.slice(0, bytesRead);
-            }
-            else {
-                return buffer;
-            }
+async function readBuffer(filepath, size, offset = 0) {
+    const buffer = buffer_1.Buffer.alloc(size);
+    const file = await promises_1.default.open(filepath, 'r');
+    try {
+        const { bytesRead } = await file.read(buffer, 0, size, offset);
+        if (bytesRead < size) {
+            return buffer.slice(0, bytesRead);
         }
-        finally {
-            yield file.close();
+        else {
+            return buffer;
         }
-    });
+    }
+    finally {
+        await file.close();
+    }
 }

package/lib/utils/template.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemplateEngine = void 0;
+exports.unescapeCode = unescapeCode;
 const path_1 = __importDefault(require("path"));
 const dayjs_1 = __importDefault(require("dayjs"));
 const utc_1 = __importDefault(require("dayjs/plugin/utc"));
@@ -45,7 +46,8 @@ const lodash_1 = require("lodash");
 const YAML = __importStar(require("../parsers/yaml"));
 const try_json_1 = require("./try-json");
 dayjs_1.default.extend(utc_1.default);
-const PLACEHOLDER_REGEX = /^((?:[^/]+(?:[^/]+\/)*\/)?\.?[^.]+(?:\.(?:json|ya?ml))?)\.(.*)$/;
+const NEXT_PROPERTY_REGEX = /^(\w+?)((?=\.|$).*)$/;
+const PLACEHOLDER_REGEX = /^((?:[^/.]+(?:[^/]+\/)*\/)?\.?[^.]+(?:\.(?:json|ya?ml))?)\.(.*)$/;
 class TemplateError extends Error {
     constructor(message) {
         super(message);
@@ -53,49 +55,44 @@ class TemplateError extends Error {
     } // }}}
 }
 class TemplateEngine {
-    constructor(basePath) {
+    constructor(basePath, variables) {
         this.fileCache = new Map();
+        this.variableCache = new Map();
         this.basePath = basePath;
+        this.variables = variables ?? {};
     } // }}}
     render(template) {
         const pattern = /#\[\[(.*?)]]/g;
-        return template.replace(pattern, (_, placeholder) => {
-            const [name, propertyPath] = this.splitPlaceholder(placeholder);
-            if (!name || !propertyPath) {
-                throw new TemplateError(`Invalid placeholder format: ${placeholder}. Expected format: #[[filename.property]]`);
-            }
-            if (name === 'date') {
-                return this.toDate(propertyPath);
-            }
-            const fileContent = this.readConfigFile(name);
-            const value = this.getValueByPath(fileContent, propertyPath);
-            if ((0, lodash_1.isNil)(value)) {
-                throw new TemplateError(placeholder);
-            }
-            return String(value);
-        });
+        return template.replace(pattern, (_, placeholder) => this.resolveExpression(placeholder));
     } // }}}
     getValueByPath(values, propertyPath) {
-        const parts = propertyPath.split('.');
-        let current = values;
-        for (const part of parts) {
-            if (!(0, lodash_1.isPlainObject)(current)) {
+        let currentPath = propertyPath;
+        let currentValue = values;
+        // eslint-disable-next-line @typescript-eslint/ban-types
+        let match;
+        while ((match = NEXT_PROPERTY_REGEX.exec(currentPath))) {
+            if (!(0, lodash_1.isPlainObject)(currentValue)) {
                 throw new TemplateError(`Property path not found: ${propertyPath}`);
             }
-            current = current[part];
-        }
-        if ((0, lodash_1.isNil)(current)) {
-            throw new TemplateError(`Property not found: ${propertyPath}`);
+            currentValue = currentValue[match[1]];
+            if ((0, lodash_1.isNil)(currentValue)) {
+                throw new TemplateError(`Property not found: ${propertyPath}`);
+            }
+            currentPath = match[2];
+            if (currentPath.length === 0) {
+                return currentValue;
+            }
         }
-        return current;
+        // eslint-disable-next-line no-new-func
+        const fn = new Function('it', `return it${unescapeCode(currentPath)};`);
+        return fn(currentValue);
     } // }}}
     parseFile(filename) {
-        var _a;
         let content;
         try {
             content = fs_extra_1.default.readFileSync(filename, 'utf8');
         }
-        catch (_b) {
+        catch {
             throw new TemplateError(`File not found: ${filename}`);
         }
         const ext = path_1.default.extname(filename).toLowerCase();
@@ -107,7 +104,7 @@ class TemplateEngine {
                 return YAML.parse(content);
             }
             else {
-                return (_a = (0, try_json_1.tryJson)(content)) !== null && _a !== void 0 ? _a : YAML.parse(content);
+                return (0, try_json_1.tryJson)(content) ?? YAML.parse(content);
             }
         }
         catch (parseError) {
@@ -124,10 +121,42 @@ class TemplateEngine {
         this.fileCache.set(filename, content);
         return content;
     } // }}}
+    resolveExpression(expression) {
+        const [name, propertyPath] = this.splitPlaceholder(expression);
+        if (!name || !propertyPath) {
+            throw new TemplateError(`Invalid expression format: ${expression}. Expected format: #[[filename.property]]`);
+        }
+        if (name === 'date') {
+            return this.toDate(propertyPath);
+        }
+        else if (name === 'vars') {
+            return this.resolveVariable(propertyPath);
+        }
+        else {
+            const fileContent = this.readConfigFile(name);
+            const value = this.getValueByPath(fileContent, propertyPath);
+            if ((0, lodash_1.isNil)(value)) {
+                throw new TemplateError(expression);
+            }
+            return String(value);
+        }
+    } // }}}
+    resolveVariable(name) {
+        if (this.variableCache.has(name)) {
+            return this.variableCache.get(name);
+        }
+        const expression = this.variables[name];
+        if (typeof expression !== 'string' || expression.trim().length === 0) {
+            throw new TemplateError(`Invalid variable: ${name}.`);
+        }
+        const content = this.resolveExpression(expression);
+        this.variableCache.set(name, content);
+        return content;
+    } // }}}
     splitPlaceholder(placeholder) {
         const matches = PLACEHOLDER_REGEX.exec(placeholder);
         if (!matches) {
-            throw new TemplateError(`Invalid placeholder format: ${placeholder}. Expected format: #[[filename.property]]`);
+            throw new TemplateError(`Invalid expression format: ${placeholder}. Expected format: #[[filename.property]]`);
         }
         const [, filename, propertyPath] = matches;
         return [filename, propertyPath];
@@ -140,9 +169,12 @@ class TemplateEngine {
             }
             return now.format(format);
         }
-        catch (_a) {
+        catch {
             throw new TemplateError(`Invalid date format: ${format}`);
         }
     } // }}}
 }
 exports.TemplateEngine = TemplateEngine;
+function unescapeCode(code) {
+    return code.replace(/\\('|\\)/g, '$1').replace(/[\r\t\n]/g, ' ');
+}

package/lib/utils/try-json.js

@@ -5,7 +5,7 @@ function tryJson(value) {
     try {
         return JSON.parse(value);
     }
-    catch (_a) {
+    catch {
         return undefined;
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@zokugun/artifact",
 	"description": "Boilerplate your project & keep your configurations up to date",
-	"version": "0.4.4",
+	"version": "0.5.1",
 	"author": {
 		"name": "Baptiste Augrain",
 		"email": "daiyam@zokugun.org"
@@ -27,14 +27,14 @@
 		"release": "release-it",
 		"test": "tsc -p test && mocha",
 		"test:dev": "mocha",
-		"test:watch": "tsc-watch -p src -p test --onSuccess 'mocha'",
+		"test:watch": "tsc-watch -p src -p test --onSuccess 'mocha -g=\"\"'",
 		"watch:src": "tsc-watch -p src",
 		"watch:test": "tsc-watch -p test"
 	},
 	"dependencies": {
+		"@zokugun/cli-utils": "^0.2.0",
 		"@zokugun/configdotts-merge": "^0.2.0",
 		"ansi-colors": "^4.1.1",
-		"commander": "^9.0.0",
 		"dayjs": "^1.11.13",
 		"detect-indent": "^6.1.0",
 		"editorconfig": "^0.15.3",
@@ -62,7 +62,7 @@
 		"@types/lodash": "^4.14.172",
 		"@types/micromatch": "^4.0.2",
 		"@types/mocha": "^9.0.0",
-		"@types/node": "^14.17.15",
+		"@types/node": "20.19.39",
 		"@types/npm": "^7.19.0",
 		"@types/pacote": "^11.1.1",
 		"@types/semver": "^7.3.8",