@zokugun/artifact 0.3.1 → 0.4.1

package/lib/compositors/yaml.js

@@ -15,15 +15,25 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yaml = void 0;
+exports.yaml = yaml;
 const lodash_1 = require("lodash");
 const YAML = __importStar(require("../parsers/yaml"));
 function fromYaml({ current, incoming, filters, ignores }) {
@@ -37,4 +47,3 @@ function fromYaml({ current, incoming, filters, ignores }) {
 function yaml(...routes) {
     return (0, lodash_1.flow)(fromYaml, ...routes, YAML.stringify);
 }
-exports.yaml = yaml;

package/lib/configs/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./install"), exports);
+__exportStar(require("./package"), exports);

package/lib/configs/install/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateInstallConfig = exports.writeInstallConfig = exports.readInstallConfig = void 0;
+var read_install_config_1 = require("./read-install-config");
+Object.defineProperty(exports, "readInstallConfig", { enumerable: true, get: function () { return read_install_config_1.readInstallConfig; } });
+var write_install_config_1 = require("./write-install-config");
+Object.defineProperty(exports, "writeInstallConfig", { enumerable: true, get: function () { return write_install_config_1.writeInstallConfig; } });
+var update_install_config_1 = require("./update-install-config");
+Object.defineProperty(exports, "updateInstallConfig", { enumerable: true, get: function () { return update_install_config_1.updateInstallConfig; } });

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

@@ -0,0 +1,120 @@
+"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 };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readInstallConfig = readInstallConfig;
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const yaml_1 = __importDefault(require("yaml"));
+const places = [
+    {
+        name: '.artifactrc.yml',
+        type: 'yaml',
+    },
+    {
+        name: '.artifactrc.yaml',
+        type: 'yaml',
+    },
+    {
+        name: '.artifactrc.json',
+        type: 'json',
+    },
+    {
+        name: '.artifactrc',
+    },
+];
+function readInstallConfig(targetPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let content;
+        let name;
+        let type;
+        for (const place of places) {
+            try {
+                content = yield fs_extra_1.default.readFile(path_1.default.join(targetPath, place.name), 'utf-8');
+                name = place.name;
+                type = place.type;
+                break;
+            }
+            catch (_a) {
+            }
+        }
+        if (!content) {
+            return {
+                config: {
+                    artifacts: {},
+                    install: {},
+                    update: {},
+                },
+                configStats: {
+                    name: '.artifactrc.yml',
+                    type: 'yaml',
+                    finalNewLine: true,
+                },
+            };
+        }
+        const finalNewLine = content.endsWith('\n');
+        let data;
+        if (type === 'json') {
+            data = JSON.parse(content);
+        }
+        else if (type === 'yaml') {
+            data = yaml_1.default.parse(content);
+        }
+        else {
+            try {
+                data = JSON.parse(content);
+                type = 'json';
+            }
+            catch (_b) {
+                data = yaml_1.default.parse(content);
+                type = 'yaml';
+            }
+        }
+        if (typeof data.update === 'undefined') {
+            data.update = {};
+        }
+        if (isOldInstallConfig(data)) {
+            const config = {
+                artifacts: {},
+                install: data.install,
+                update: data.update,
+            };
+            for (const { name, version } of data.artifacts) {
+                config.artifacts[name] = {
+                    version,
+                };
+            }
+            return {
+                config,
+                configStats: {
+                    name: name,
+                    type,
+                    finalNewLine,
+                },
+            };
+        }
+        else {
+            return {
+                config: data,
+                configStats: {
+                    name: name,
+                    type,
+                    finalNewLine,
+                },
+            };
+        }
+    });
+}
+function isOldInstallConfig(config) {
+    return Array.isArray(config.artifacts);
+}

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateInstallConfig = updateInstallConfig;
+function updateInstallConfig(config, { name, version, provides, requires }) {
+    const artifact = {
+        version,
+    };
+    if (requires) {
+        artifact.requires = requires;
+    }
+    if (provides) {
+        artifact.provides = provides;
+    }
+    config.artifacts[name] = artifact;
+}

package/lib/{config/write-config.js → configs/install/write-install-config.js}

@@ -12,20 +12,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeConfig = void 0;
+exports.writeInstallConfig = writeInstallConfig;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = require("lodash");
 const yaml_1 = __importDefault(require("yaml"));
-const apply_formatting_1 = require("../steps/apply-formatting");
-const insert_final_new_line_1 = require("../steps/insert-final-new-line");
-function writeConfig({ artifacts, update }, { name, finalNewLine, type }, formats, targetPath, options) {
-    return __awaiter(this, void 0, void 0, function* () {
+const apply_formatting_1 = require("../../steps/apply-formatting");
+const insert_final_new_line_1 = require("../../steps/insert-final-new-line");
+function writeInstallConfig(config_1, _a, formats_1, targetPath_1, options_1) {
+    return __awaiter(this, arguments, void 0, function* (config, { name, finalNewLine, type }, formats, targetPath, options) {
         const exported = {
-            artifacts: [...artifacts],
+            artifacts: config.artifacts,
         };
-        if (!(0, lodash_1.isPlainObject)(update) || !(0, lodash_1.isEmpty)(update)) {
-            exported.update = update;
+        if (!(0, lodash_1.isPlainObject)(config.update) || !(0, lodash_1.isEmpty)(config.update)) {
+            exported.update = config.update;
         }
         const file = {
             name,
@@ -41,4 +41,3 @@ function writeConfig({ artifacts, update }, { name, finalNewLine, type }, format
         }
     });
 }
-exports.writeConfig = writeConfig;

package/lib/configs/package/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readPackageConfig = void 0;
+var read_package_config_1 = require("./read-package-config");
+Object.defineProperty(exports, "readPackageConfig", { enumerable: true, get: function () { return read_package_config_1.readPackageConfig; } });

package/lib/{config/read-config.js → configs/package/read-package-config.js}

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readConfig = void 0;
+exports.readPackageConfig = readPackageConfig;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const yaml_1 = __importDefault(require("yaml"));
@@ -33,63 +33,45 @@ const places = [
         name: '.artifactrc',
     },
 ];
-function readConfig(targetPath) {
+function readPackageConfig(targetPath) {
     return __awaiter(this, void 0, void 0, function* () {
-        let data;
-        let name;
+        let content;
         let type;
         for (const place of places) {
             try {
-                data = yield fs_extra_1.default.readFile(path_1.default.join(targetPath, place.name), 'utf-8');
-                name = place.name;
+                content = yield fs_extra_1.default.readFile(path_1.default.join(targetPath, place.name), 'utf-8');
                 type = place.type;
                 break;
             }
             catch (_a) {
             }
         }
-        if (!data) {
-            return [
-                {
-                    artifacts: [],
-                    update: {},
-                },
-                {
-                    name: '.artifactrc.yml',
-                    type: 'yaml',
-                    finalNewLine: true,
-                },
-            ];
+        if (!content) {
+            return {
+                install: {},
+                update: {},
+            };
         }
-        const finalNewLine = data.endsWith('\n');
         let config;
         if (type === 'json') {
-            config = JSON.parse(data);
+            config = JSON.parse(content);
         }
         else if (type === 'yaml') {
-            config = yaml_1.default.parse(data);
+            config = yaml_1.default.parse(content);
         }
         else {
             try {
-                config = JSON.parse(data);
+                config = JSON.parse(content);
                 type = 'json';
             }
             catch (_b) {
-                config = yaml_1.default.parse(data);
+                config = yaml_1.default.parse(content);
                 type = 'yaml';
             }
         }
         if (typeof config.update === 'undefined') {
             config.update = {};
         }
-        return [
-            config,
-            {
-                name: name,
-                type,
-                finalNewLine,
-            },
-        ];
+        return config;
     });
 }
-exports.readConfig = readConfig;

package/lib/journeys/config.ts/index.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const configdotts_merge_1 = require("@zokugun/configdotts-merge");
+const build_journey_plan_1 = require("../../utils/build-journey-plan");
+const build_travel_plan_1 = require("../../utils/build-travel-plan");
+function route({ current, incoming }) {
+    const data = (0, configdotts_merge_1.merge)(current, incoming);
+    return data;
+}
+const travelPlan = (0, build_travel_plan_1.buildTravelPlan)([/\.config\.ts/, route]);
+exports.default = (0, build_journey_plan_1.buildJourneyPlan)(travelPlan);

package/lib/journeys/index.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getJourney = void 0;
+exports.getJourney = getJourney;
 const path_1 = __importDefault(require("path"));
 const commitlint_1 = __importDefault(require("./commitlint"));
+const config_ts_1 = __importDefault(require("./config.ts"));
 const default_1 = __importDefault(require("./default"));
 const fixpack_1 = __importDefault(require("./fixpack"));
 const gitignore_1 = __importDefault(require("./gitignore"));
@@ -23,6 +24,7 @@ const plans = [
     package_1.default,
     tsconfig_1.default,
     rc_1.default,
+    config_ts_1.default,
     default_1.default,
 ];
 function getJourney(filename) {
@@ -35,4 +37,3 @@ function getJourney(filename) {
     }
     return undefined;
 }
-exports.getJourney = getJourney;

package/lib/journeys/package/index.js

@@ -39,7 +39,6 @@ const mainRoute = (0, compositors_1.compose)({
         'os',
         'cpu',
         'preferGlobal',
-        'private',
     ],
     $$default: (0, compositors_1.fork)([Array.isArray, routes_1.listConcat], [isPlainObject_1.default, routes_1.mapConcat], routes_1.primitive),
 });

package/lib/parsers/json.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringify = exports.parse = void 0;
+exports.parse = parse;
+exports.stringify = stringify;
 function parse(data) {
     return JSON.parse(data);
 }
-exports.parse = parse;
 function stringify(data) {
     return JSON.stringify(data, null, '\t');
 }
-exports.stringify = stringify;

package/lib/parsers/jsonc/parse.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = void 0;
+exports.parse = parse;
 const jsonc_parser_1 = require("jsonc-parser");
 function parse(text) {
     if (!text) {
@@ -180,7 +180,7 @@ function parse(text) {
         },
         onError(error, _offset, _length, _startLine, _startCharacter) {
             // console.log('onError', error, _startLine, _startCharacter)
-            if ((error === 3 /* PropertyNameExpected */ || error === 4 /* ValueExpected */) && lastKid) {
+            if ((error === 3 /* ParseErrorCode.PropertyNameExpected */ || error === 4 /* ParseErrorCode.ValueExpected */) && lastKid) {
                 lastKid.separator = true;
             }
         },
@@ -191,4 +191,3 @@ function parse(text) {
         transform,
     };
 }
-exports.parse = parse;

package/lib/parsers/jsonc/stringify.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringify = void 0;
+exports.stringify = stringify;
 const lodash_1 = require("lodash");
 function stringify(data, transform = {}) {
     const result = format(data, '', transform);
     return result;
 }
-exports.stringify = stringify;
 function format(data, indentValue, transform, separator = false) {
     var _a;
     let result;

package/lib/parsers/yaml.js

@@ -3,13 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringify = exports.parse = void 0;
+exports.parse = parse;
+exports.stringify = stringify;
 const yaml_1 = __importDefault(require("yaml"));
 function parse(data) {
     return yaml_1.default.parse(data);
 }
-exports.parse = parse;
 function stringify(data) {
     return yaml_1.default.stringify(data);
 }
-exports.stringify = stringify;

package/lib/routes/command.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = void 0;
+exports.command = command;
 const command_1 = require("../utils/command");
 const list_concat_1 = require("./list-concat");
 function command({ current, incoming }) {
@@ -43,4 +43,3 @@ function command({ current, incoming }) {
     }
     return (0, command_1.joinCommand)(result);
 }
-exports.command = command;

package/lib/routes/lines-concat.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.linesConcat = void 0;
+exports.linesConcat = linesConcat;
 const to_lines_1 = require("../utils/to-lines");
 const trim_final_newline_1 = require("../utils/trim-final-newline");
 const list_concat_1 = require("./list-concat");
@@ -19,4 +19,3 @@ function linesConcat({ current, incoming }) {
     });
     return result.join('\n');
 }
-exports.linesConcat = linesConcat;

package/lib/routes/list-concat.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listConcat = void 0;
+exports.listConcat = listConcat;
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const uniqWith_1 = __importDefault(require("lodash/uniqWith"));
 function listConcat({ current, incoming }) {
@@ -15,4 +15,3 @@ function listConcat({ current, incoming }) {
     }
     return (0, uniqWith_1.default)([...current, ...incoming], isEqual_1.default);
 }
-exports.listConcat = listConcat;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listSortConcat = void 0;
+exports.listSortConcat = listSortConcat;
 function listSortConcat({ current, incoming }) {
     if (!incoming) {
         return current !== null && current !== void 0 ? current : [];
@@ -39,4 +39,3 @@ function listSortConcat({ current, incoming }) {
     const result = sorting.map((weight) => weight2values[weight]);
     return result;
 }
-exports.listSortConcat = listSortConcat;

package/lib/routes/map-concat.js

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

package/lib/routes/overwrite.js

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

package/lib/routes/primitive.js

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

package/lib/steps/apply-formatting.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyFormatting = void 0;
+exports.applyFormatting = applyFormatting;
 const detect_indent_1 = __importDefault(require("detect-indent"));
 const fnmatch_1 = __importDefault(require("editorconfig/src/lib/fnmatch"));
 const format_1 = require("../types/format");
@@ -55,16 +55,16 @@ function indentWithSpace(data, size) {
     }
 } // }}}
 function indentWithTab(data) {
-    const { type, indent } = (0, detect_indent_1.default)(data);
-    if (type === 'space') {
+    const { type, indent, amount } = (0, detect_indent_1.default)(data);
+    if (type === 'space' && amount > 1) {
         return data.replace(new RegExp(indent, 'gm'), '\t');
     }
     else {
         return data;
     }
 } // }}}
-function applyFormatting({ mergedTextFiles, formats }) {
-    return __awaiter(this, void 0, void 0, function* () {
+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)) {
@@ -75,4 +75,3 @@ function applyFormatting({ mergedTextFiles, formats }) {
         }
     });
 }
-exports.applyFormatting = applyFormatting;

package/lib/steps/configure-branches.js

@@ -0,0 +1,69 @@
+"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 };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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(/:/g, '/');
+                    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;
+                                }
+                            }
+                            else {
+                                found = true;
+                            }
+                        }
+                        else {
+                            found = true;
+                        }
+                    }
+                    if (found) {
+                        bucket.push({
+                            name: context.incomingName,
+                            version: context.incomingVersion,
+                            variant: context.incomingVariant,
+                            branch,
+                            incomingPath: node_path_1.default.join(cwd, directory),
+                        });
+                    }
+                }
+            }
+            context.blocks.unshift(...bucket);
+        }
+    });
+}