@zokugun/artifact 0.6.1 → 0.6.3

package/lib/configs/install/read-install-config.js

@@ -70,7 +70,6 @@ async function readInstallConfig(targetPath) {
 }
 function normalizeConfig(data, configStats) {
     const artifacts = {};
-    let constants = {};
     const install = {};
     let update = {};
     let variables = {};
@@ -78,7 +77,6 @@ function normalizeConfig(data, configStats) {
         return (0, xtry_1.ok)({
             config: {
                 artifacts,
-                constants,
                 install,
                 update,
                 variables,
@@ -128,9 +126,6 @@ function normalizeConfig(data, configStats) {
             }
         }
     }
-    if ((0, is_it_type_1.isRecord)(data.constants, (_key, value) => (0, is_it_type_1.isString)(value))) {
-        constants = data.constants;
-    }
     if (data.update === false) {
         update = false;
     }
@@ -143,13 +138,12 @@ function normalizeConfig(data, configStats) {
             update[key] = normalized.value;
         }
     }
-    if ((0, is_it_type_1.isRecord)(data.variables, (_key, value) => (0, is_it_type_1.isString)(value))) {
+    if ((0, is_it_type_1.isRecord)(data.variables, (_key, value) => (0, is_it_type_1.isPrimitive)(value))) {
         variables = data.variables;
     }
     return (0, xtry_1.ok)({
         config: {
             artifacts,
-            constants,
             install,
             update,
             variables,

package/lib/configs/install/write-install-config.js

@@ -21,9 +21,6 @@ async function writeInstallConfig(config, { name, finalNewLine, indent, type },
     if ((0, is_it_type_1.isNonEmptyRecord)(config.update)) {
         exported.update = config.update;
     }
-    if ((0, is_it_type_1.isNonEmptyRecord)(config.constants)) {
-        exported.constants = config.constants;
-    }
     if ((0, is_it_type_1.isNonEmptyRecord)(config.variables)) {
         exported.variables = config.variables;
     }

package/lib/configs/package/read-package-config.js

@@ -44,7 +44,6 @@ async function readPackageConfig(targetPath) {
     }
 }
 function normalizeConfig(data, source) {
-    let constants = {};
     let xtends;
     const install = [];
     let orphan = false;
@@ -54,7 +53,6 @@ function normalizeConfig(data, source) {
     let variants = {};
     if (!data) {
         return (0, xtry_1.ok)({
-            constants,
             extends: xtends,
             install,
             orphan,
@@ -77,9 +75,6 @@ function normalizeConfig(data, source) {
             return (0, xtry_1.err)(`Don't support newer version (v${version}) in the package's "${source}".`);
         }
     }
-    if ((0, is_it_type_1.isRecord)(data.constants, (_key, value) => (0, is_it_type_1.isString)(value))) {
-        constants = data.constants;
-    }
     if ((0, is_it_type_1.isString)(data.extends)) {
         xtends = data.extends;
     }
@@ -89,7 +84,7 @@ function normalizeConfig(data, source) {
     if (data.orphan === true) {
         orphan = true;
     }
-    if ((0, is_it_type_1.isRecord)(data.variables, (_key, value) => (0, is_it_type_1.isString)(value))) {
+    if ((0, is_it_type_1.isRecord)(data.variables, (_key, value) => (0, is_it_type_1.isPrimitive)(value))) {
         variables = data.variables;
     }
     if ((0, is_it_type_1.isRecord)(data.variants, (_key, value) => (0, is_it_type_1.isString)(value) || (0, is_it_type_1.isNumber)(value))) {
@@ -174,7 +169,6 @@ function normalizeConfig(data, source) {
         }
     }
     return (0, xtry_1.ok)({
-        constants,
         extends: xtends,
         install,
         orphan,

package/lib/journeys/commitlint/index.js

@@ -4,14 +4,14 @@ const index_js_1 = require("../../compositors/index.js");
 const index_js_2 = require("../../routes/index.js");
 const build_journey_plan_js_1 = require("../../utils/build-journey-plan.js");
 const build_travel_plan_js_1 = require("../../utils/build-travel-plan.js");
-const mainRoute = (0, index_js_1.compose)({
+const mainRoute = (0, index_js_1.mapSort)((0, index_js_1.compose)({
     extends: index_js_2.listConcat,
     parserPreset: index_js_2.primitive,
-    rules: (0, index_js_1.compose)({
+    rules: (0, index_js_1.mapSort)((0, index_js_1.compose)({
         $$default: index_js_2.overwrite,
-    }),
+    })),
     $$default: index_js_2.primitive,
-});
+}));
 const jsonRoute = (0, index_js_1.json)(mainRoute);
 const yamlRoute = (0, index_js_1.yaml)(mainRoute);
 const rcRoute = (0, index_js_1.rc)(mainRoute);

package/lib/journeys/fixpack/index.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_es_1 = require("lodash-es");
+const is_it_type_1 = require("@zokugun/is-it-type");
 const index_js_1 = require("../../compositors/index.js");
 const index_js_2 = require("../../routes/index.js");
 const build_journey_plan_js_1 = require("../../utils/build-journey-plan.js");
 const build_travel_plan_js_1 = require("../../utils/build-travel-plan.js");
-const mainRoute = (0, index_js_1.compose)({
+const mainRoute = (0, index_js_1.mapSort)((0, index_js_1.compose)({
     sortToTop: index_js_2.listSortConcat,
-    $$default: (0, index_js_1.fork)([Array.isArray, index_js_2.listConcat], [lodash_es_1.isPlainObject, index_js_2.mapConcat], index_js_2.primitive),
-});
+    $$default: (0, index_js_1.fork)([is_it_type_1.isArray, index_js_2.listConcat], [is_it_type_1.isRecord, index_js_2.mapConcat], index_js_2.primitive),
+}));
 const jsonRoute = (0, index_js_1.json)(mainRoute);
 const yamlRoute = (0, index_js_1.yaml)(mainRoute);
 const rcRoute = (0, index_js_1.rc)(mainRoute);

package/lib/steps/configure-branches.js

@@ -14,6 +14,7 @@ async function configureBranches(context) {
     if (await async_1.default.isExisting(cwd)) {
         const directories = await (0, globby_1.default)('*', {
             cwd,
+            deep: 1,
             onlyDirectories: true,
         });
         const bucket = [];

package/lib/steps/read-files.js

@@ -8,17 +8,14 @@ const path_1 = __importDefault(require("path"));
 const cli_utils_1 = require("@zokugun/cli-utils");
 const async_1 = __importDefault(require("@zokugun/fs-extra-plus/async"));
 const xtry_1 = require("@zokugun/xtry");
-const globby_1 = __importDefault(require("globby"));
 const istextorbinary_1 = require("istextorbinary");
 const detect_indent_js_1 = require("../utils/detect-indent.js");
 const has_final_new_line_js_1 = require("../utils/has-final-new-line.js");
+const list_working_files_js_1 = require("../utils/list-working-files.js");
 const read_buffer_js_1 = require("../utils/read-buffer.js");
 async function readFiles({ incomingPath, textFiles, binaryFiles, options }) {
     const cwd = path_1.default.join(incomingPath, 'configs');
-    const files = await (0, globby_1.default)(['**/*', '!**/*.lock', '!**/*-lock.*'], {
-        cwd,
-        dot: true,
-    });
+    const files = await (0, list_working_files_js_1.listWorkingFiles)(cwd);
     for (const file of files) {
         const filePath = path_1.default.join(cwd, file);
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call

package/lib/steps/remove-files.js

@@ -8,17 +8,14 @@ const path_1 = __importDefault(require("path"));
 const cli_utils_1 = require("@zokugun/cli-utils");
 const async_1 = __importDefault(require("@zokugun/fs-extra-plus/async"));
 const xtry_1 = require("@zokugun/xtry");
-const globby_1 = __importDefault(require("globby"));
 const micromatch_1 = require("micromatch");
+const list_working_files_js_1 = require("../utils/list-working-files.js");
 async function removeFiles({ removedPatterns, targetPath, options }) {
     if (removedPatterns.length === 0) {
         return xtry_1.OK;
     }
     const cwd = path_1.default.join(targetPath);
-    const files = await (0, globby_1.default)(['**/*', '!**/*.lock', '!**/*-lock.*', '!.git'], {
-        cwd,
-        dot: true,
-    });
+    const files = await (0, list_working_files_js_1.listWorkingFiles)(cwd);
     for (const file of files) {
         if ((0, micromatch_1.isMatch)(file, removedPatterns)) {
             if (!options.dryRun) {

package/lib/steps/replace-templates.js

@@ -7,8 +7,6 @@ async function replaceTemplates({ textFiles, binaryFiles, targetPath, config, in
     const variables = {
         ...incomingConfig?.variables,
         ...config?.variables,
-        ...incomingConfig?.constants,
-        ...config?.constants,
     };
     const engine = new template_js_1.TemplateEngine(targetPath, variables);
     for (const file of textFiles) {

package/lib/steps/transform-untouched-files.js

@@ -9,19 +9,16 @@ const cli_utils_1 = require("@zokugun/cli-utils");
 const async_1 = __importDefault(require("@zokugun/fs-extra-plus/async"));
 const is_it_type_1 = require("@zokugun/is-it-type");
 const xtry_1 = require("@zokugun/xtry");
-const globby_1 = __importDefault(require("globby"));
 const index_js_1 = require("../journeys/index.js");
 const detect_indent_js_1 = require("../utils/detect-indent.js");
 const has_final_new_line_js_1 = require("../utils/has-final-new-line.js");
+const list_working_files_js_1 = require("../utils/list-working-files.js");
 async function transformUntouchedFiles({ formats, options, routes, targetPath, textFiles, transformedFiles, transforms }) {
     if (transforms.length === 0) {
         return xtry_1.OK;
     }
     const cwd = path_1.default.join(targetPath);
-    const files = await (0, globby_1.default)(['**/*', '!**/*.lock', '!**/*-lock.*'], {
-        cwd,
-        dot: true,
-    });
+    const files = await (0, list_working_files_js_1.listWorkingFiles)(cwd);
     for (const file of files) {
         if (textFiles.some(({ name }) => name === file)) {
             continue;

package/lib/types/config.d.ts

@@ -1,3 +1,4 @@
+import { type Primitive } from '@zokugun/is-it-type';
 import { type Indent } from './format.js';
 export type Request = {
     name: string;
@@ -8,13 +9,12 @@ export type PackageManifest = {
     version: string;
 };
 export type PackageConfig = {
-    constants: Record<string, string>;
     extends?: string;
     install: InstallFileConfig[];
     orphan: boolean;
     uninstall: UninstallFileConfig[];
     update: false | UpdateFileConfig[];
-    variables: Record<string, string>;
+    variables: Record<string, Primitive>;
     variants: Record<string, string>;
 };
 export type Artifact = {
@@ -27,10 +27,9 @@ export type ArtifactResult = Artifact & {
 };
 export type InstallConfig = {
     artifacts: Record<string, Artifact>;
-    constants: Record<string, string>;
     install: Record<string, InstallFileConfig>;
     update: false | Record<string, UpdateFileConfig>;
-    variables: Record<string, string>;
+    variables: Record<string, Primitive>;
 };
 export type FileConfig<E> = {
     ifExists: E;

package/lib/utils/list-working-files.d.ts

@@ -0,0 +1 @@
+export declare function listWorkingFiles(cwd: string): Promise<string[]>;

package/lib/utils/list-working-files.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listWorkingFiles = listWorkingFiles;
+const globby_1 = __importDefault(require("globby"));
+async function listWorkingFiles(cwd) {
+    return (0, globby_1.default)(['**/*', '!**/*.lock', '!**/*-lock.*', '!.git', '!**/node_modules/**'], {
+        cwd,
+        dot: true,
+        followSymbolicLinks: false,
+    });
+}

package/lib/utils/template.d.ts

@@ -1,10 +1,11 @@
+import { type Primitive } from '@zokugun/is-it-type';
 import { type DResult } from '@zokugun/xtry';
 export declare class TemplateEngine {
     private readonly basePath;
     private readonly fileCache;
     private readonly variables;
     private readonly variableCache;
-    constructor(basePath: string, variables?: Record<string, string>);
+    constructor(basePath: string, variables?: Record<string, Primitive>);
     render(template: string): DResult<string>;
     private getValueByPath;
     private parseFile;

package/lib/utils/template.js

@@ -40,6 +40,7 @@ exports.TemplateEngine = void 0;
 exports.unescapeCode = unescapeCode;
 const path_1 = __importDefault(require("path"));
 const sync_1 = __importDefault(require("@zokugun/fs-extra-plus/sync"));
+const is_it_type_1 = require("@zokugun/is-it-type");
 const xtry_1 = require("@zokugun/xtry");
 const dayjs_1 = __importDefault(require("dayjs"));
 const utc_1 = __importDefault(require("dayjs/plugin/utc"));
@@ -164,16 +165,27 @@ class TemplateEngine {
         if (this.variableCache.has(name)) {
             return (0, xtry_1.ok)(this.variableCache.get(name));
         }
-        const expression = this.variables[name];
-        if (typeof expression !== 'string' || expression.trim().length === 0) {
+        const value = this.variables[name];
+        if (!(0, is_it_type_1.isPrimitive)(value)) {
             return (0, xtry_1.err)(`Invalid variable: ${name}.`);
         }
-        const result = this.resolveExpression(expression);
-        if (result.fails) {
+        const expression = String(value).trim();
+        if (expression.length === 0) {
+            return (0, xtry_1.err)(`Invalid variable: ${name}.`);
+        }
+        if (expression.at(0) === '=') {
+            const result = this.resolveExpression(expression.slice(1));
+            if (result.fails) {
+                return result;
+            }
+            this.variableCache.set(name, result.value);
             return result;
         }
-        this.variableCache.set(name, result.value);
-        return result;
+        else {
+            const value = expression.at(0) === '\\' && expression.at(1) === '=' ? expression.slice(1) : expression;
+            this.variableCache.set(name, value);
+            return (0, xtry_1.ok)(value);
+        }
     } // }}}
     splitPlaceholder(placeholder) {
         const matches = PLACEHOLDER_REGEX.exec(placeholder);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@zokugun/artifact",
 	"description": "Boilerplate your project & keep your configurations up to date",
-	"version": "0.6.1",
+	"version": "0.6.3",
 	"author": {
 		"name": "Baptiste Augrain",
 		"email": "daiyam@zokugun.org"