@zokugun/artifact 0.1.0 → 0.2.2

package/README.md

@@ -63,16 +63,23 @@ artifact-configs/base/
   └── README.md
 ```
 
-Yeoman
+Update
 ------
 
-`artifact` can be used in a yeoman generator. Ex: [@daiyam/generator-new-project](https://github.com/daiyam/generator-new-project)
+Update your configurations with the command:
+
+```
+artifact update
+```
 
-Limitation
-----------
+It is **recommended** to review the changes and manually revert any bad changes.
 
-The `update` command haven't been developed, yet.<br />
-But, to keep your configurations up to date, you can *re-add* the configuration packages and manually revert the bad changes.
+Furthermore, a configuration package can control how to apply an update via the file `.artifactrc`.
+
+Yeoman
+------
+
+`artifact` can be used in a yeoman generator. Ex: [@daiyam/generator-new-project](https://github.com/daiyam/generator-new-project)
 
 Donations
 ---------

package/lib/cli.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const package_json_1 = __importDefault(require("../package.json"));
-const add_1 = require("./commands/add");
+const commands_1 = require("./commands");
 const program = new commander_1.Command();
 program.version(package_json_1.default.version);
 program
@@ -13,5 +13,10 @@ program
     .description('add an artifact to the current project')
     .option('-v, --verbose', 'output more details')
     .argument('<artifacts...>')
-    .action(add_1.add);
+    .action(commands_1.add);
+program
+    .command('update')
+    .description('update the current project using the installed artifact')
+    .option('-v, --verbose', 'output more details')
+    .action(commands_1.update);
 program.parse();

package/lib/commands/add.js

@@ -14,10 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.add = void 0;
 const process_1 = __importDefault(require("process"));
+const npm_1 = __importDefault(require("npm"));
 const pacote_1 = __importDefault(require("pacote"));
 const tempy_1 = __importDefault(require("tempy"));
-const npm_1 = __importDefault(require("npm"));
-const install_1 = require("../install");
+const config_1 = require("../config");
+const steps_1 = require("../steps");
+const commonFlow = (0, steps_1.composeSteps)(steps_1.steps.readIncomingPackage, steps_1.steps.validateNotPresentPackage, steps_1.steps.readFiles, steps_1.steps.readEditorConfig, steps_1.steps.mergeTextFiles, steps_1.steps.insertFinalNewLine, steps_1.steps.applyFormatting, steps_1.steps.copyBinaryFiles, steps_1.steps.writeTextFiles);
 function expandSpec(spec) {
     if (spec.includes('/')) {
         const [scope, name] = spec.split('/');
@@ -37,20 +39,52 @@ function expandSpec(spec) {
         }
     }
 } // }}}
-function add(specs, options) {
+function add(specs, inputOptions) {
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         yield npm_1.default.load();
         const registry = npm_1.default.config.get('registry');
         const targetPath = process_1.default.env.INIT_CWD;
+        const options = {
+            force: (_a = inputOptions === null || inputOptions === void 0 ? void 0 : inputOptions.force) !== null && _a !== void 0 ? _a : false,
+            skip: (_b = inputOptions === null || inputOptions === void 0 ? void 0 : inputOptions.skip) !== null && _b !== void 0 ? _b : false,
+            verbose: (_c = inputOptions === null || inputOptions === void 0 ? void 0 : inputOptions.verbose) !== null && _c !== void 0 ? _c : false,
+        };
+        const [config, configStats] = yield (0, config_1.readConfig)(targetPath);
         for (const spec of specs) {
             const dir = tempy_1.default.directory();
-            const result = yield pacote_1.default.extract(expandSpec(spec), dir, { registry });
-            if (!result.resolved) {
-                throw new Error(result.from);
+            const pkgResult = yield pacote_1.default.extract(expandSpec(spec), dir, { registry });
+            if (!pkgResult.resolved) {
+                if (options.force || options.skip) {
+                    if (options.verbose) {
+                        console.log(`The artifact '${spec}' couldn't be found, skipping...`);
+                    }
+                    continue;
+                }
+                else {
+                    throw new Error(pkgResult.from);
+                }
+            }
+            const flowResult = yield commonFlow(targetPath, dir, config, options);
+            if (!flowResult) {
+                continue;
+            }
+            const { name, version } = flowResult.incomingPackage;
+            let nf = true;
+            for (const artifact of config.artifacts) {
+                if (artifact.name === name) {
+                    artifact.version = version;
+                    nf = false;
+                    break;
+                }
+            }
+            if (nf) {
+                config.artifacts.push({
+                    name,
+                    version,
+                });
             }
-            yield (0, install_1.install)(targetPath, dir, {
-                verbose: options.verbose,
-            });
+            yield (0, config_1.writeConfig)(config, configStats, flowResult.formats, targetPath, options);
         }
     });
 }

package/lib/commands/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.update = exports.add = void 0;
+var add_1 = require("./add");
+Object.defineProperty(exports, "add", { enumerable: true, get: function () { return add_1.add; } });
+var update_1 = require("./update");
+Object.defineProperty(exports, "update", { enumerable: true, get: function () { return update_1.update; } });

package/lib/commands/update.js

@@ -0,0 +1,73 @@
+"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.update = void 0;
+const process_1 = __importDefault(require("process"));
+const ansi_colors_1 = require("ansi-colors");
+const npm_1 = __importDefault(require("npm"));
+const ora_1 = __importDefault(require("ora"));
+const pacote_1 = __importDefault(require("pacote"));
+const tempy_1 = __importDefault(require("tempy"));
+const config_1 = require("../config");
+const steps_1 = require("../steps");
+const dev_null_1 = require("../utils/dev-null");
+const commonFlow = (0, steps_1.composeSteps)(steps_1.steps.readIncomingPackage, steps_1.steps.validateNewerPackage, steps_1.steps.readIncomingConfig, steps_1.steps.validateUpdatability, steps_1.steps.readFiles, steps_1.steps.readEditorConfig, steps_1.steps.mergeTextFiles, steps_1.steps.insertFinalNewLine, steps_1.steps.applyFormatting, steps_1.steps.copyBinaryFiles, steps_1.steps.writeTextFiles);
+function update(inputOptions) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        // @ts-expect-error log property isn't exposed
+        npm_1.default.log.stream = (0, dev_null_1.createDevNull)();
+        yield npm_1.default.load();
+        const registry = npm_1.default.config.get('registry');
+        const targetPath = process_1.default.env.INIT_CWD;
+        const options = {
+            force: (_a = inputOptions === null || inputOptions === void 0 ? void 0 : inputOptions.force) !== null && _a !== void 0 ? _a : false,
+            skip: false,
+            verbose: (_b = inputOptions === null || inputOptions === void 0 ? void 0 : inputOptions.verbose) !== null && _b !== void 0 ? _b : false,
+        };
+        const [config, configStats] = yield (0, config_1.readConfig)(targetPath);
+        for (const artifact of config.artifacts) {
+            const spinner = (0, ora_1.default)(`${ansi_colors_1.cyan.bold(artifact.name)}`).start();
+            const dir = tempy_1.default.directory();
+            const pkgResult = yield pacote_1.default.extract(artifact.name, dir, { registry });
+            if (!pkgResult.resolved) {
+                if (options.force) {
+                    spinner.fail();
+                    if (options.verbose) {
+                        console.log(`The artifact '${artifact.name}' couldn't be found, skipping...`);
+                    }
+                    continue;
+                }
+                else {
+                    throw new Error(pkgResult.from);
+                }
+            }
+            const flowResult = yield commonFlow(targetPath, dir, config, options);
+            if (!flowResult) {
+                spinner.succeed();
+                continue;
+            }
+            const { name, version } = flowResult.incomingPackage;
+            for (const artifact of config.artifacts) {
+                if (artifact.name === name) {
+                    artifact.version = version;
+                    break;
+                }
+            }
+            yield (0, config_1.writeConfig)(config, configStats, flowResult.formats, targetPath, options);
+            spinner.succeed();
+        }
+    });
+}
+exports.update = update;

package/lib/compositors/compose.js

@@ -30,20 +30,28 @@ function apply(map, keys, current, incoming, result) {
     }
 }
 function compose(map) {
-    return ({ current, incoming }) => {
+    return ({ current, incoming, filters }) => {
         if (incoming === undefined) {
             return current !== null && current !== void 0 ? current : {};
         }
         if (current === undefined || typeof current !== typeof incoming) {
             return incoming;
         }
-        const result = {};
         const currentKeys = Object.keys(current);
         const incomingKeys = Object.keys(incoming);
         const newKeys = (0, without_1.default)(incomingKeys, ...currentKeys);
-        apply(map, currentKeys, current, incoming, result);
-        apply(map, newKeys, current, incoming, result);
-        return result;
+        if (filters) {
+            const result = Object.assign({}, current);
+            apply(map, filters, current, incoming, result);
+            apply(map, newKeys, current, incoming, result);
+            return result;
+        }
+        else {
+            const result = {};
+            apply(map, currentKeys, current, incoming, result);
+            apply(map, newKeys, current, incoming, result);
+            return result;
+        }
     };
 }
 exports.compose = compose;

package/lib/compositors/index.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yaml = exports.rc = exports.json = exports.fork = exports.compose = void 0;
+exports.yaml = exports.rc = exports.mapSort = exports.json = exports.fork = exports.compose = void 0;
 var compose_1 = require("./compose");
 Object.defineProperty(exports, "compose", { enumerable: true, get: function () { return compose_1.compose; } });
 var fork_1 = require("./fork");
 Object.defineProperty(exports, "fork", { enumerable: true, get: function () { return fork_1.fork; } });
 var json_1 = require("./json");
 Object.defineProperty(exports, "json", { enumerable: true, get: function () { return json_1.json; } });
+var map_sort_1 = require("./map-sort");
+Object.defineProperty(exports, "mapSort", { enumerable: true, get: function () { return map_sort_1.mapSort; } });
 var rc_1 = require("./rc");
 Object.defineProperty(exports, "rc", { enumerable: true, get: function () { return rc_1.rc; } });
 var yaml_1 = require("./yaml");

package/lib/compositors/json.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -35,21 +39,21 @@ function tryJson(value) {
     }
 }
 const merge = (0, compose_1.compose)({
-    $$default: (0, fork_1.fork)([Array.isArray, routes_1.listConcat], [lodash_1.isPlainObject, routes_1.hash], routes_1.primitive),
+    $$default: (0, fork_1.fork)([Array.isArray, routes_1.listConcat], [lodash_1.isPlainObject, (...args) => merge(...args)], routes_1.primitive),
 });
 function json(...routes) {
-    return ({ current, incoming, ignores }) => {
+    return ({ current, incoming, filters, ignores }) => {
         const currentData = current && tryJson(current);
         const incomingData = incoming && tryJson(incoming);
         if ((!current || currentData) && (!incoming || incomingData)) {
-            return (0, lodash_1.flow)(...routes, JSON.stringify)({ current: currentData, incoming: incomingData, ignores });
+            return (0, lodash_1.flow)(...routes, JSON.stringify)({ current: currentData, incoming: incomingData, filters, ignores });
         }
         else {
             const { data: currentData, transform: currentTransform } = JSONC.parse(current);
             const { data: incomingData, transform: incomingTransform } = JSONC.parse(incoming);
             const mergedTransform = merge({ current: currentTransform, incoming: incomingTransform });
             const toJSON = (data) => JSONC.stringify(data, mergedTransform);
-            return (0, lodash_1.flow)(...routes, toJSON)({ current: currentData, incoming: incomingData, ignores });
+            return (0, lodash_1.flow)(...routes, toJSON)({ current: currentData, incoming: incomingData, filters, ignores });
         }
     };
 }

package/lib/compositors/map-sort.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapSort = void 0;
+const { compare } = new Intl.Collator('en');
+function mapSort(route) {
+    return (args) => {
+        const result = route(args);
+        const sorted = {};
+        const keys = Object.keys(result).sort((a, b) => compare(a, b));
+        for (const key of keys) {
+            sorted[key] = result[key];
+        }
+        return sorted;
+    };
+}
+exports.mapSort = mapSort;

package/lib/compositors/rc.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -32,15 +36,21 @@ function tryJson(value) {
     }
 }
 function rc(...routes) {
-    return ({ current, incoming, ignores }) => {
+    return ({ current, incoming, filters, ignores }) => {
         var _a;
         const currentData = current && ((_a = tryJson(current)) !== null && _a !== void 0 ? _a : YAML.parse(current));
         const incomingData = incoming && tryJson(incoming);
         if (incomingData) {
-            return (0, lodash_1.flow)(...routes, JSON.stringify)({ current: currentData, incoming: incomingData, ignores });
+            return (0, lodash_1.flow)(...routes, JSON.stringify)({ current: currentData, incoming: incomingData, filters, ignores });
         }
         else {
-            return (0, lodash_1.flow)(...routes, YAML.stringify)({ current: currentData, incoming: incoming && YAML.parse(incoming), ignores });
+            const incomingData = incoming && YAML.parse(incoming);
+            if ((0, lodash_1.isPlainObject)(incomingData) || Array.isArray(incomingData)) {
+                return (0, lodash_1.flow)(...routes, YAML.stringify)({ current: currentData, incoming: incomingData, filters, ignores });
+            }
+            else {
+                return incoming;
+            }
         }
     };
 }

package/lib/compositors/yaml.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -22,10 +26,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yaml = void 0;
 const lodash_1 = require("lodash");
 const YAML = __importStar(require("../parsers/yaml"));
-function fromYaml({ current, incoming }) {
+function fromYaml({ current, incoming, filters, ignores }) {
     return {
         current: typeof current === 'undefined' ? undefined : YAML.parse(current),
         incoming: YAML.parse(incoming),
+        filters,
+        ignores,
     };
 }
 function yaml(...routes) {

package/lib/config/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeConfig = exports.readConfig = void 0;
+var read_config_1 = require("./read-config");
+Object.defineProperty(exports, "readConfig", { enumerable: true, get: function () { return read_config_1.readConfig; } });
+var write_config_1 = require("./write-config");
+Object.defineProperty(exports, "writeConfig", { enumerable: true, get: function () { return write_config_1.writeConfig; } });

package/lib/{steps/read-target-config.js → config/read-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.readTargetConfig = void 0;
+exports.readConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const yaml_1 = __importDefault(require("yaml"));
@@ -33,14 +33,14 @@ const places = [
         name: '.artifactrc',
     },
 ];
-function readTargetConfig(context) {
+function readConfig(targetPath) {
     return __awaiter(this, void 0, void 0, function* () {
         let data;
         let name;
         let type;
         for (const place of places) {
             try {
-                data = yield fs_extra_1.default.readFile(path_1.default.join(context.targetPath, place.name), 'utf-8');
+                data = yield fs_extra_1.default.readFile(path_1.default.join(targetPath, place.name), 'utf-8');
                 name = place.name;
                 type = place.type;
                 break;
@@ -49,30 +49,47 @@ function readTargetConfig(context) {
             }
         }
         if (!data) {
-            return;
+            return [
+                {
+                    artifacts: [],
+                    update: {},
+                },
+                {
+                    name: '.artifactrc.yml',
+                    type: 'yaml',
+                    finalNewLine: true,
+                },
+            ];
         }
         const finalNewLine = data.endsWith('\n');
+        let config;
         if (type === 'json') {
-            context.configs = JSON.parse(data);
+            config = JSON.parse(data);
         }
         else if (type === 'yaml') {
-            context.configs = yaml_1.default.parse(data);
+            config = yaml_1.default.parse(data);
         }
         else {
             try {
-                context.configs = JSON.parse(data);
+                config = JSON.parse(data);
                 type = 'json';
             }
             catch (_b) {
-                context.configs = yaml_1.default.parse(data);
+                config = yaml_1.default.parse(data);
                 type = 'yaml';
             }
         }
-        context.configInfo = {
-            name: name,
-            type,
-            finalNewLine,
-        };
+        if (typeof config.update === 'undefined') {
+            config.update = {};
+        }
+        return [
+            config,
+            {
+                name: name,
+                type,
+                finalNewLine,
+            },
+        ];
     });
 }
-exports.readTargetConfig = readTargetConfig;
+exports.readConfig = readConfig;

package/lib/config/write-config.js

@@ -0,0 +1,44 @@
+"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.writeConfig = void 0;
+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 exported = {
+            artifacts: [...artifacts],
+        };
+        if (!(0, lodash_1.isPlainObject)(update) || !(0, lodash_1.isEmpty)(update)) {
+            exported.update = update;
+        }
+        const file = {
+            name,
+            data: type === 'yaml' ? yaml_1.default.stringify(exported) : JSON.stringify(exported, null, '\t'),
+            finalNewLine,
+        };
+        yield (0, insert_final_new_line_1.insertFinalNewLine)({ mergedTextFiles: [file] });
+        yield (0, apply_formatting_1.applyFormatting)({ mergedTextFiles: [file], formats });
+        const filePath = path_1.default.join(targetPath, name);
+        yield fs_extra_1.default.outputFile(filePath, file.data, 'utf-8');
+        if (options.verbose) {
+            console.log(`${name} has been written`);
+        }
+    });
+}
+exports.writeConfig = writeConfig;

package/lib/journeys/default/index.js

@@ -9,7 +9,7 @@ const routes_1 = require("../../routes");
 const build_journey_plan_1 = require("../../utils/build-journey-plan");
 const build_travel_plan_1 = require("../../utils/build-travel-plan");
 const mainRoute = (0, compositors_1.compose)({
-    $$default: (0, compositors_1.fork)([Array.isArray, routes_1.listConcat], [isPlainObject_1.default, routes_1.hash], routes_1.primitive),
+    $$default: (0, compositors_1.fork)([Array.isArray, routes_1.listConcat], [isPlainObject_1.default, routes_1.mapConcat], routes_1.primitive),
 });
 const jsonRoute = (0, compositors_1.json)(mainRoute);
 const yamlRoute = (0, compositors_1.yaml)(mainRoute);

package/lib/journeys/fixpack/index.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = require("lodash");
+const compositors_1 = require("../../compositors");
+const routes_1 = require("../../routes");
+const build_journey_plan_1 = require("../../utils/build-journey-plan");
+const build_travel_plan_1 = require("../../utils/build-travel-plan");
+const mainRoute = (0, compositors_1.compose)({
+    sortToTop: routes_1.listSortConcat,
+    $$default: (0, compositors_1.fork)([Array.isArray, routes_1.listConcat], [lodash_1.isPlainObject, routes_1.mapConcat], routes_1.primitive),
+});
+const jsonRoute = (0, compositors_1.json)(mainRoute);
+const yamlRoute = (0, compositors_1.yaml)(mainRoute);
+const rcRoute = (0, compositors_1.rc)(mainRoute);
+const travelPlan = (0, build_travel_plan_1.buildTravelPlan)([/^\.fixpackrc\.json$/, jsonRoute], [/^\.fixpackrc\.ya?ml$/, yamlRoute], [/^\.fixpackrc$/, rcRoute]);
+exports.default = (0, build_journey_plan_1.buildJourneyPlan)(travelPlan);

package/lib/journeys/index.js

@@ -7,17 +7,21 @@ exports.getJourney = void 0;
 const path_1 = __importDefault(require("path"));
 const commitlint_1 = __importDefault(require("./commitlint"));
 const default_1 = __importDefault(require("./default"));
+const fixpack_1 = __importDefault(require("./fixpack"));
 const gitignore_1 = __importDefault(require("./gitignore"));
 const ignore_1 = __importDefault(require("./ignore"));
 const npmignore_1 = __importDefault(require("./npmignore"));
 const package_1 = __importDefault(require("./package"));
 const rc_1 = __importDefault(require("./rc"));
+const tsconfig_1 = __importDefault(require("./tsconfig"));
 const plans = [
-    package_1.default,
+    commitlint_1.default,
+    fixpack_1.default,
     gitignore_1.default,
-    npmignore_1.default,
     ignore_1.default,
-    commitlint_1.default,
+    npmignore_1.default,
+    package_1.default,
+    tsconfig_1.default,
     rc_1.default,
     default_1.default,
 ];

package/lib/journeys/package/index.js

@@ -12,21 +12,21 @@ const mainRoute = (0, compositors_1.compose)({
     // default fields
     keywords: routes_1.listConcat,
     homepage: routes_1.primitive,
-    bugs: (0, compositors_1.fork)([isPlainObject_1.default, routes_1.hash], routes_1.primitive),
-    license: (0, compositors_1.fork)([isPlainObject_1.default, routes_1.hash], routes_1.primitive),
+    bugs: (0, compositors_1.fork)([isPlainObject_1.default, routes_1.mapConcat], routes_1.primitive),
+    license: (0, compositors_1.fork)([isPlainObject_1.default, routes_1.mapConcat], routes_1.primitive),
     licenses: routes_1.listConcat,
-    author: (0, compositors_1.fork)([isPlainObject_1.default, routes_1.hash], routes_1.primitive),
-    repository: (0, compositors_1.fork)([isPlainObject_1.default, routes_1.hash], routes_1.primitive),
-    scripts: (0, compositors_1.compose)({
+    author: (0, compositors_1.fork)([isPlainObject_1.default, routes_1.mapConcat], routes_1.primitive),
+    repository: (0, compositors_1.fork)([isPlainObject_1.default, routes_1.mapConcat], routes_1.primitive),
+    scripts: (0, compositors_1.mapSort)((0, compositors_1.compose)({
         $$default: routes_1.command,
-    }),
-    config: routes_1.hash,
-    engines: routes_1.hash,
-    dependencies: routes_1.hash,
-    devDependencies: routes_1.hash,
-    peerDependencies: routes_1.hash,
-    optionalDependencies: routes_1.hash,
-    bundledDependencies: routes_1.hash,
+    })),
+    config: (0, compositors_1.mapSort)(routes_1.mapConcat),
+    engines: (0, compositors_1.mapSort)(routes_1.mapConcat),
+    dependencies: (0, compositors_1.mapSort)(routes_1.mapConcat),
+    devDependencies: (0, compositors_1.mapSort)(routes_1.mapConcat),
+    peerDependencies: (0, compositors_1.mapSort)(routes_1.mapConcat),
+    optionalDependencies: (0, compositors_1.mapSort)(routes_1.mapConcat),
+    bundledDependencies: (0, compositors_1.mapSort)(routes_1.mapConcat),
     // tools fields
     browserslist: routes_1.listConcat,
     // other fields
@@ -41,7 +41,7 @@ const mainRoute = (0, compositors_1.compose)({
         'preferGlobal',
         'private',
     ],
-    $$default: (0, compositors_1.fork)([Array.isArray, routes_1.listConcat], [isPlainObject_1.default, routes_1.hash], routes_1.primitive),
+    $$default: (0, compositors_1.fork)([Array.isArray, routes_1.listConcat], [isPlainObject_1.default, routes_1.mapConcat], routes_1.primitive),
 });
 const jsonRoute = (0, compositors_1.json)(mainRoute);
 const travelPlan = (0, build_travel_plan_1.buildTravelPlan)(['package.json', jsonRoute]);

package/lib/journeys/rc/index.js

@@ -6,7 +6,7 @@ const routes_1 = require("../../routes");
 const build_journey_plan_1 = require("../../utils/build-journey-plan");
 const build_travel_plan_1 = require("../../utils/build-travel-plan");
 const mainRoute = (0, compositors_1.compose)({
-    $$default: (0, compositors_1.fork)([Array.isArray, routes_1.listConcat], [lodash_1.isPlainObject, routes_1.hash], routes_1.primitive),
+    $$default: (0, compositors_1.fork)([Array.isArray, routes_1.listConcat], [lodash_1.isPlainObject, routes_1.mapConcat], routes_1.primitive),
 });
 const jsonRoute = (0, compositors_1.json)(mainRoute);
 const yamlRoute = (0, compositors_1.yaml)(mainRoute);