@zokugun/artifact 0.4.4 → 0.5.1

package/lib/configs/package/read-package-config.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 };
 };
@@ -33,45 +24,43 @@ const places = [
         name: '.artifactrc',
     },
 ];
-function readPackageConfig(targetPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let content;
-        let type;
-        for (const place of places) {
-            try {
-                content = yield fs_extra_1.default.readFile(path_1.default.join(targetPath, place.name), 'utf-8');
-                type = place.type;
-                break;
-            }
-            catch (_a) {
-            }
+async function readPackageConfig(targetPath) {
+    let content;
+    let type;
+    for (const place of places) {
+        try {
+            content = await fs_extra_1.default.readFile(path_1.default.join(targetPath, place.name), 'utf-8');
+            type = place.type;
+            break;
         }
-        if (!content) {
-            return {
-                install: {},
-                update: {},
-            };
+        catch {
         }
-        let config;
-        if (type === 'json') {
+    }
+    if (!content) {
+        return {
+            install: {},
+            update: {},
+        };
+    }
+    let config;
+    if (type === 'json') {
+        config = JSON.parse(content);
+    }
+    else if (type === 'yaml') {
+        config = yaml_1.default.parse(content);
+    }
+    else {
+        try {
             config = JSON.parse(content);
+            type = 'json';
         }
-        else if (type === 'yaml') {
+        catch {
             config = yaml_1.default.parse(content);
+            type = 'yaml';
         }
-        else {
-            try {
-                config = JSON.parse(content);
-                type = 'json';
-            }
-            catch (_b) {
-                config = yaml_1.default.parse(content);
-                type = 'yaml';
-            }
-        }
-        if (typeof config.update === 'undefined') {
-            config.update = {};
-        }
-        return config;
-    });
+    }
+    if (typeof config.update === 'undefined') {
+        config.update = {};
+    }
+    return config;
 }

package/lib/parsers/jsonc/stringify.js

@@ -7,7 +7,6 @@ function stringify(data, transform = {}) {
     return result;
 }
 function format(data, indentValue, transform, separator = false) {
-    var _a;
     let result;
     if (Array.isArray(data)) {
         result = formatArray(data, indentValue, transform);
@@ -26,28 +25,27 @@ function format(data, indentValue, transform, separator = false) {
         if (separator) {
             result += ',';
         }
-        if ((_a = transform.comments) === null || _a === void 0 ? void 0 : _a.right) {
+        if (transform.comments?.right) {
             result += transform.comments.right[0];
         }
     }
     return result;
 }
 function formatArray(data, indentValue, transform) {
-    var _a, _b, _c, _d, _e;
     let result = '[';
-    if ((_a = transform.comments) === null || _a === void 0 ? void 0 : _a.right) {
+    if (transform.comments?.right) {
         result += transform.comments.right[0];
     }
     result += '\n';
     const indent = indentValue + '\t';
     const lastIndex = data.length - 1;
-    const children = (_b = transform.children) !== null && _b !== void 0 ? _b : {};
+    const children = transform.children ?? {};
     for (const [index, value] of data.entries()) {
-        const transform = (_c = children[index]) !== null && _c !== void 0 ? _c : {};
+        const transform = children[index] ?? {};
         if (transform.emptyLines) {
             result += '\n'.repeat(transform.emptyLines);
         }
-        if ((_d = transform.comments) === null || _d === void 0 ? void 0 : _d.top) {
+        if (transform.comments?.top) {
             for (const line of transform.comments.top) {
                 result += `${indent}${line}\n`;
             }
@@ -55,7 +53,7 @@ function formatArray(data, indentValue, transform) {
         result += `${indent}`;
         result += format(value, indent, transform, index !== lastIndex || transform.separator);
         result += '\n';
-        if ((_e = transform.comments) === null || _e === void 0 ? void 0 : _e.bottom) {
+        if (transform.comments?.bottom) {
             for (const line of transform.comments.bottom) {
                 result += `${indent}${line}\n`;
             }
@@ -65,22 +63,21 @@ function formatArray(data, indentValue, transform) {
     return result;
 }
 function formatObject(data, indentValue, transform) {
-    var _a, _b, _c, _d, _e;
     let result = '{';
-    if ((_a = transform.comments) === null || _a === void 0 ? void 0 : _a.right) {
+    if (transform.comments?.right) {
         result += transform.comments.right[0];
     }
     result += '\n';
     const indent = indentValue + '\t';
     const values = Object.entries(data);
     const lastIndex = values.length - 1;
-    const children = (_b = transform.children) !== null && _b !== void 0 ? _b : {};
+    const children = transform.children ?? {};
     for (const [index, [key, value]] of values.entries()) {
-        const transform = (_c = children[key]) !== null && _c !== void 0 ? _c : {};
+        const transform = children[key] ?? {};
         if (transform.emptyLines) {
             result += '\n'.repeat(transform.emptyLines);
         }
-        if ((_d = transform.comments) === null || _d === void 0 ? void 0 : _d.top) {
+        if (transform.comments?.top) {
             for (const line of transform.comments.top) {
                 result += `${indent}${line}\n`;
             }
@@ -88,7 +85,7 @@ function formatObject(data, indentValue, transform) {
         result += `${indent}"${key}": `;
         result += format(value, indent, transform, index !== lastIndex || transform.separator);
         result += '\n';
-        if ((_e = transform.comments) === null || _e === void 0 ? void 0 : _e.bottom) {
+        if (transform.comments?.bottom) {
             for (const line of transform.comments.bottom) {
                 result += `${indent}${line}\n`;
             }

package/lib/routes/command.js

@@ -2,44 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = command;
 const command_1 = require("../utils/command");
-const list_concat_1 = require("./list-concat");
 function command({ current, incoming }) {
-    var _a;
     if (!incoming) {
-        return current !== null && current !== void 0 ? current : '';
+        return current ?? '';
     }
     if (!current) {
         return incoming;
     }
+    const trueAndMatch = /^true\s*&&\s*(.+)$/.exec(incoming);
+    const currentSegments = new Set(current.split(/;|&&|\|\|/).map((s) => s.trim()).filter(Boolean));
+    if (currentSegments.has(incoming)) {
+        return current;
+    }
+    if (trueAndMatch) {
+        const incomingCommand = trueAndMatch[1].trim();
+        return currentSegments.has(incomingCommand) ? current : `${current} && ${incomingCommand}`;
+    }
+    const mixed = (0, command_1.mergeWithSemicolonMix)(current, incoming);
+    if (mixed) {
+        return mixed;
+    }
+    const andMerged = (0, command_1.mergeAndChains)(current, incoming);
+    if (andMerged) {
+        return andMerged;
+    }
+    if (incoming.includes('||')) {
+        return (0, command_1.mergeOrSegments)(current, incoming);
+    }
+    if (incoming.includes(';')) {
+        return (0, command_1.mergeSemicolonSegments)(current, incoming);
+    }
     const currentCommand = (0, command_1.splitCommand)(current);
     const incomingCommand = (0, command_1.splitCommand)(incoming);
-    const result = {};
-    for (const [name, instances] of Object.entries(incomingCommand)) {
-        if (currentCommand[name]) {
-            result[name] = [];
-            for (const [index, instance] of instances.entries()) {
-                if (currentCommand[name][index]) {
-                    const currentInstance = currentCommand[name][index];
-                    result[name].push({
-                        args: (0, list_concat_1.listConcat)({
-                            current: currentInstance.args,
-                            incoming: instance.args,
-                        }),
-                        env: (0, list_concat_1.listConcat)({
-                            current: currentInstance.env,
-                            incoming: instance.env,
-                        }),
-                        separator: (_a = instance.separator) !== null && _a !== void 0 ? _a : currentInstance.separator,
-                    });
-                }
-                else {
-                    result[name].push(instance);
-                }
-            }
-        }
-        else {
-            result[name] = instances;
-        }
-    }
-    return (0, command_1.joinCommand)(result);
+    const merged = (0, command_1.mergeCommandRecords)(currentCommand, incomingCommand, current);
+    return (0, command_1.joinCommand)(merged);
 }

package/lib/routes/lines-concat.js

@@ -6,7 +6,7 @@ const trim_final_newline_1 = require("../utils/trim-final-newline");
 const list_concat_1 = require("./list-concat");
 function linesConcat({ current, incoming }) {
     if (!incoming) {
-        return current !== null && current !== void 0 ? current : '';
+        return current ?? '';
     }
     if (!current) {
         return incoming;

package/lib/routes/list-concat.js

@@ -8,7 +8,7 @@ const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const uniqWith_1 = __importDefault(require("lodash/uniqWith"));
 function listConcat({ current, incoming }) {
     if (!incoming) {
-        return current !== null && current !== void 0 ? current : [];
+        return current ?? [];
     }
     if (!current) {
         return incoming;

package/lib/routes/list-sort-concat.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.listSortConcat = listSortConcat;
 function listSortConcat({ current, incoming }) {
     if (!incoming) {
-        return current !== null && current !== void 0 ? current : [];
+        return current ?? [];
     }
     if (!current) {
         return incoming;

package/lib/routes/map-concat.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapConcat = mapConcat;
 function mapConcat({ current, incoming }) {
     if (!incoming) {
-        return current !== null && current !== void 0 ? current : {};
+        return current ?? {};
     }
     if (!current) {
         return incoming;
     }
-    return Object.assign(Object.assign({}, current), incoming);
+    return { ...current, ...incoming };
 }

package/lib/routes/overwrite.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.overwrite = overwrite;
 function overwrite({ current, incoming }) {
     if (typeof incoming === 'undefined') {
-        return current !== null && current !== void 0 ? current : [];
+        return current ?? [];
     }
     else {
         return incoming;

package/lib/routes/primitive.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.primitive = primitive;
 function primitive({ current, incoming }) {
     if (typeof incoming === 'undefined') {
-        return current !== null && current !== void 0 ? current : [];
+        return current ?? [];
     }
     if (typeof current === 'undefined') {
         return incoming;

package/lib/steps/apply-formatting.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 };
 };
@@ -63,15 +54,13 @@ function indentWithTab(data) {
         return data;
     }
 } // }}}
-function applyFormatting(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ mergedTextFiles, formats }) {
-        for (const file of mergedTextFiles) {
-            for (const format of formats) {
-                if (fnmatch(file.name, format.glob)) {
-                    applyFormat(file, format);
-                    break;
-                }
+async function applyFormatting({ mergedTextFiles, formats }) {
+    for (const file of mergedTextFiles) {
+        for (const format of formats) {
+            if (fnmatch(file.name, format.glob)) {
+                applyFormat(file, format);
+                break;
             }
         }
-    });
+    }
 }

package/lib/steps/configure-branches.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 };
 };
@@ -16,35 +7,30 @@ exports.configureBranches = configureBranches;
 const node_path_1 = __importDefault(require("node:path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const globby_1 = __importDefault(require("globby"));
-function configureBranches(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const cwd = node_path_1.default.join(context.incomingPath, 'branches');
-        if (yield fs_extra_1.default.pathExists(cwd)) {
-            const directories = yield (0, globby_1.default)('*', {
-                cwd,
-                onlyDirectories: true,
-            });
-            const bucket = [];
-            for (const directory of directories) {
-                const match = /^\[(@[\w-]+:[\w-]+|[\w-]+)(?::([\w-]+))?]$/.exec(directory);
-                if (match) {
-                    const [branch, name, variant] = match;
-                    const packageName = name.replace(/:(artifact-)?/g, '/artifact-');
-                    const artifact = context.config.artifacts[packageName];
-                    let found = false;
-                    if (artifact) {
-                        if (variant) {
-                            if (Array.isArray(artifact.requires)) {
-                                if (artifact.requires.includes(variant)) {
-                                    found = true;
-                                }
-                            }
-                            else if (Array.isArray(artifact.provides)) {
-                                if (artifact.provides.includes(variant)) {
-                                    found = true;
-                                }
+async function configureBranches(context) {
+    const cwd = node_path_1.default.join(context.incomingPath, 'branches');
+    if (await fs_extra_1.default.pathExists(cwd)) {
+        const directories = await (0, globby_1.default)('*', {
+            cwd,
+            onlyDirectories: true,
+        });
+        const bucket = [];
+        for (const directory of directories) {
+            const match = /^\[(@[\w-]+:[\w-]+|[\w-]+)(?::([\w-]+))?]$/.exec(directory);
+            if (match) {
+                const [branch, name, variant] = match;
+                const packageName = name.replace(/:(artifact-)?/g, '/artifact-');
+                const artifact = context.config.artifacts[packageName];
+                let found = false;
+                if (artifact) {
+                    if (variant) {
+                        if (Array.isArray(artifact.requires)) {
+                            if (artifact.requires.includes(variant)) {
+                                found = true;
                             }
-                            else {
+                        }
+                        else if (Array.isArray(artifact.provides)) {
+                            if (artifact.provides.includes(variant)) {
                                 found = true;
                             }
                         }
@@ -52,26 +38,29 @@ function configureBranches(context) {
                             found = true;
                         }
                     }
-                    if (found) {
-                        if (context.options.verbose) {
-                            console.log(`- branch: ${name}${variant ? `:${variant}` : ''} has been matched`);
-                        }
-                        bucket.push({
-                            name: context.incomingName,
-                            version: context.incomingVersion,
-                            variant: context.incomingVariant,
-                            branch,
-                            incomingPath: node_path_1.default.join(cwd, directory),
-                        });
-                    }
                     else {
-                        if (context.options.verbose) {
-                            console.log(`- branch: ${name}${variant ? `:${variant}` : ''} hasn't been matched (${artifact ? 'variant' : 'artifact'} not found)`);
-                        }
+                        found = true;
+                    }
+                }
+                if (found) {
+                    if (context.options.verbose) {
+                        console.log(`- branch: ${name}${variant ? `:${variant}` : ''} has been matched`);
+                    }
+                    bucket.push({
+                        name: context.incomingName,
+                        version: context.incomingVersion,
+                        variant: context.incomingVariant,
+                        branch,
+                        incomingPath: node_path_1.default.join(cwd, directory),
+                    });
+                }
+                else {
+                    if (context.options.verbose) {
+                        console.log(`- branch: ${name}${variant ? `:${variant}` : ''} hasn't been matched (${artifact ? 'variant' : 'artifact'} not found)`);
                     }
                 }
             }
-            context.blocks.unshift(...bucket);
         }
-    });
+        context.blocks.unshift(...bucket);
+    }
 }

package/lib/steps/configure-install-file-actions.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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureInstallFileActions = configureInstallFileActions;
 const lodash_1 = require("lodash");
@@ -88,64 +79,62 @@ function buildTravel(route) {
         throw new Error('Can\'t build route');
     }
 } // }}}
-function configureInstallFileActions(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { install } = context.incomingConfig;
-        if (!install) {
-            return;
+async function configureInstallFileActions(context) {
+    const { install } = context.incomingConfig;
+    if (!install) {
+        return;
+    }
+    const overwrites = [];
+    const filters = {};
+    const routes = {};
+    for (const [file, fileUpdate] of Object.entries(install)) {
+        const { overwrite, remove, filter, route } = fileUpdate;
+        if (remove) {
+            context.removedPatterns.push(file);
+            continue;
         }
-        const overwrites = [];
-        const filters = {};
-        const routes = {};
-        for (const [file, fileUpdate] of Object.entries(install)) {
-            const { overwrite, remove, filter, route } = fileUpdate;
-            if (remove) {
-                context.removedPatterns.push(file);
-                continue;
-            }
-            if (overwrite) {
-                overwrites.push(file);
-            }
-            if (filter) {
-                filters[file] = filter;
+        if (overwrite) {
+            overwrites.push(file);
+        }
+        if (filter) {
+            filters[file] = filter;
+        }
+        if (route) {
+            const { alias } = route;
+            if (alias) {
+                routes[file] = {
+                    alias,
+                    travel: buildTravel(route),
+                };
             }
-            if (route) {
-                const { alias } = route;
-                if (alias) {
-                    routes[file] = {
-                        alias,
-                        travel: buildTravel(route),
-                    };
-                }
-                else {
-                    routes[file] = {
-                        travel: buildTravel(route),
-                    };
-                }
+            else {
+                routes[file] = {
+                    travel: buildTravel(route),
+                };
             }
         }
-        if (overwrites.length > 0) {
-            context.onExisting = (file) => (0, micromatch_1.isMatch)(file, overwrites) ? 'overwrite' : 'merge';
-        }
-        if (!(0, lodash_1.isEmpty)(filters)) {
-            context.filters = (file) => {
-                for (const [pattern, value] of Object.entries(filters)) {
-                    if ((0, micromatch_1.isMatch)(file, pattern)) {
-                        return value;
-                    }
+    }
+    if (overwrites.length > 0) {
+        context.onExisting = (file) => (0, micromatch_1.isMatch)(file, overwrites) ? 'overwrite' : 'merge';
+    }
+    if (!(0, lodash_1.isEmpty)(filters)) {
+        context.filters = (file) => {
+            for (const [pattern, value] of Object.entries(filters)) {
+                if ((0, micromatch_1.isMatch)(file, pattern)) {
+                    return value;
                 }
-                return undefined;
-            };
-        }
-        if (!(0, lodash_1.isEmpty)(routes)) {
-            context.routes = (file) => {
-                for (const [pattern, route] of Object.entries(routes)) {
-                    if ((0, micromatch_1.isMatch)(file, pattern)) {
-                        return route;
-                    }
+            }
+            return undefined;
+        };
+    }
+    if (!(0, lodash_1.isEmpty)(routes)) {
+        context.routes = (file) => {
+            for (const [pattern, route] of Object.entries(routes)) {
+                if ((0, micromatch_1.isMatch)(file, pattern)) {
+                    return route;
                 }
-                return undefined;
-            };
-        }
-    });
+            }
+            return undefined;
+        };
+    }
 }