@zokugun/artifact 0.7.0 → 0.9.0

package/lib/configs/utils/normalize-file-upsert.js

@@ -3,8 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeFileUpsert = normalizeFileUpsert;
 const is_it_type_1 = require("@zokugun/is-it-type");
 const xtry_1 = require("@zokugun/xtry");
+const build_journey_plan_js_1 = require("../../utils/build-journey-plan.js");
+const build_route_js_1 = require("../../utils/build-route.js");
+const build_travel_plan_js_1 = require("../../utils/build-travel-plan.js");
 const is_transform_js_1 = require("./is-transform.js");
-function normalizeFileUpsert(pattern, data, name) {
+function normalizeFileUpsert(pattern, data, name, journeys, routes) {
     if (!(0, is_it_type_1.isRecord)(data)) {
         return (0, xtry_1.err)(`"${name}" must be an object.`);
     }
@@ -12,7 +15,6 @@ function normalizeFileUpsert(pattern, data, name) {
     let ifExists = 'merge';
     let ifMissing = 'merge';
     let rename;
-    let route;
     let transforms = [];
     if ((0, is_it_type_1.isArray)(data.filter, is_it_type_1.isString)) {
         filter = data.filter;
@@ -37,8 +39,14 @@ function normalizeFileUpsert(pattern, data, name) {
     if ((0, is_it_type_1.isString)(data.rename)) {
         rename = data.rename;
     }
-    if ((0, is_it_type_1.isRecord)(data.route)) {
-        route = data.route;
+    if (journeys && routes && (0, is_it_type_1.isRecord)(data.route)) {
+        const route = (0, build_route_js_1.buildRoute)(data.route);
+        if (route.fails) {
+            return route;
+        }
+        const travel = (0, build_travel_plan_js_1.buildTravelPlan)([pattern, route.value]);
+        const journey = (0, build_journey_plan_js_1.buildJourneyPlan)(travel);
+        journeys[pattern] = journey;
     }
     if ((0, is_it_type_1.isArray)(data.transforms, is_transform_js_1.isTransform)) {
         transforms = data.transforms;
@@ -49,7 +57,6 @@ function normalizeFileUpsert(pattern, data, name) {
         ifMissing,
         pattern,
         rename,
-        route,
         transforms,
     });
 } // }}}

package/lib/journeys/commitlint/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (basename: string) => import("../../types/travel.js").Journey | undefined;
+declare const _default: import("../../types/travel.js").JourneyPlan;
 export default _default;

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

@@ -1,2 +1,2 @@
-declare const _default: (basename: string) => import("../../types/travel.js").Journey | undefined;
+declare const _default: import("../../types/travel.js").JourneyPlan;
 export default _default;

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

@@ -1,11 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const configdotts_merge_1 = require("@zokugun/configdotts-merge");
+const index_js_1 = 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");
-async function route({ current, incoming }) {
-    const data = (0, configdotts_merge_1.merge)(current, incoming);
-    return data;
-}
-const travelPlan = (0, build_travel_plan_js_1.buildTravelPlan)([/\.config\.ts/, route]);
+const travelPlan = (0, build_travel_plan_js_1.buildTravelPlan)([/\.config\.ts/, index_js_1.mergeDotJs]);
 exports.default = (0, build_journey_plan_js_1.buildJourneyPlan)(travelPlan);

package/lib/journeys/default/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (basename: string) => import("../../types/travel.js").Journey | undefined;
+declare const _default: import("../../types/travel.js").JourneyPlan;
 export default _default;

package/lib/journeys/gitignore/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (basename: string) => import("../../types/travel.js").Journey | undefined;
+declare const _default: import("../../types/travel.js").JourneyPlan;
 export default _default;

package/lib/journeys/ignore/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (basename: string) => import("../../types/travel.js").Journey | undefined;
+declare const _default: import("../../types/travel.js").JourneyPlan;
 export default _default;

package/lib/journeys/index.d.ts

@@ -1,2 +1,2 @@
-import { type Journey } from '../types/travel.js';
-export declare function getJourney(filename: string): Journey | undefined;
+import { type JourneyPlan, type Journey } from '../types/travel.js';
+export declare function getJourney(filename: string, plans?: JourneyPlan[]): Journey | undefined;

package/lib/journeys/index.js

@@ -8,26 +8,24 @@ const path_1 = __importDefault(require("path"));
 const index_js_1 = __importDefault(require("./commitlint/index.js"));
 const index_js_2 = __importDefault(require("./config.ts/index.js"));
 const index_js_3 = __importDefault(require("./default/index.js"));
-const index_js_4 = __importDefault(require("./fixpack/index.js"));
-const index_js_5 = __importDefault(require("./gitignore/index.js"));
-const index_js_6 = __importDefault(require("./ignore/index.js"));
-const index_js_7 = __importDefault(require("./npmignore/index.js"));
-const index_js_8 = __importDefault(require("./package/index.js"));
-const index_js_9 = __importDefault(require("./rc/index.js"));
-const index_js_10 = __importDefault(require("./tsconfig/index.js"));
-const plans = [
+const index_js_4 = __importDefault(require("./gitignore/index.js"));
+const index_js_5 = __importDefault(require("./ignore/index.js"));
+const index_js_6 = __importDefault(require("./npmignore/index.js"));
+const index_js_7 = __importDefault(require("./package/index.js"));
+const index_js_8 = __importDefault(require("./rc/index.js"));
+const index_js_9 = __importDefault(require("./tsconfig/index.js"));
+const DEFAULT_PLANS = [
     index_js_1.default,
     index_js_4.default,
     index_js_5.default,
     index_js_6.default,
     index_js_7.default,
-    index_js_8.default,
-    index_js_10.default,
     index_js_9.default,
+    index_js_8.default,
     index_js_2.default,
     index_js_3.default,
 ];
-function getJourney(filename) {
+function getJourney(filename, plans = DEFAULT_PLANS) {
     const basename = path_1.default.basename(filename);
     for (const plan of plans) {
         const journey = plan(basename);

package/lib/journeys/npmignore/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (basename: string) => import("../../types/travel.js").Journey | undefined;
+declare const _default: import("../../types/travel.js").JourneyPlan;
 export default _default;

package/lib/journeys/package/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (basename: string) => import("../../types/travel.js").Journey | undefined;
+declare const _default: import("../../types/travel.js").JourneyPlan;
 export default _default;

package/lib/journeys/rc/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (basename: string) => import("../../types/travel.js").Journey | undefined;
+declare const _default: import("../../types/travel.js").JourneyPlan;
 export default _default;

package/lib/journeys/tsconfig/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (basename: string) => import("../../types/travel.js").Journey | undefined;
+declare const _default: import("../../types/travel.js").JourneyPlan;
 export default _default;

package/lib/parsers/index.d.ts

@@ -0,0 +1,4 @@
+export { toFormat } from './to-format.js';
+export * as JSON from './json.js';
+export * as JSONC from './jsonc/index.js';
+export * as YAML from './yaml.js';

package/lib/parsers/index.js

@@ -0,0 +1,41 @@
+"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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 = exports.JSONC = exports.JSON = exports.toFormat = void 0;
+var to_format_js_1 = require("./to-format.js");
+Object.defineProperty(exports, "toFormat", { enumerable: true, get: function () { return to_format_js_1.toFormat; } });
+exports.JSON = __importStar(require("./json.js"));
+exports.JSONC = __importStar(require("./jsonc/index.js"));
+exports.YAML = __importStar(require("./yaml.js"));

package/lib/parsers/json.d.ts

@@ -1,2 +1,4 @@
-export declare function parse(data: string): Record<string, any>;
-export declare function stringify(data: Record<string, any>): string;
+import { type ParseResult } from '../types/context.js';
+import { type Transform } from './jsonc/transform.js';
+export declare function parse(data: string): ParseResult;
+export declare function stringify(data: Record<string, unknown>, _transform?: Transform): string;

package/lib/parsers/json.js

@@ -2,9 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = parse;
 exports.stringify = stringify;
+const sync_1 = require("@zokugun/xtry/sync");
 function parse(data) {
-    return JSON.parse(data);
+    const result = (0, sync_1.xtry)(() => JSON.parse(data));
+    if (result.fails) {
+        return (0, sync_1.err)((0, sync_1.stringifyError)(result.error));
+    }
+    return (0, sync_1.ok)({ data: result.value });
 }
-function stringify(data) {
+function stringify(data, _transform) {
     return JSON.stringify(data, null, '\t');
 }

package/lib/parsers/jsonc/parse.d.ts

@@ -1,5 +1,2 @@
-import { type Transform } from './transform.js';
-export declare function parse(text: string | undefined): {
-    data: any;
-    transform: Transform | undefined;
-};
+import { type ParseResult } from '../../types/context.js';
+export declare function parse(text: string): ParseResult;

package/lib/parsers/jsonc/parse.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = parse;
+const is_it_type_1 = require("@zokugun/is-it-type");
+const xtry_1 = require("@zokugun/xtry");
 const jsonc_parser_1 = require("jsonc-parser");
 function parse(text) {
-    if (!text) {
-        return {
-            data: undefined,
+    if (!(0, is_it_type_1.isNonBlankString)(text)) {
+        return (0, xtry_1.ok)({
+            data: {},
             transform: {},
-        };
+        });
     }
     const stack = [];
     let current;
@@ -174,8 +176,8 @@ function parse(text) {
             }
         },
     });
-    return {
+    return (0, xtry_1.ok)({
         data: current,
         transform,
-    };
+    });
 }

package/lib/parsers/to-format.d.ts

@@ -0,0 +1,2 @@
+import { type Codec } from '../types/context.js';
+export declare function toFormat(value: 'json' | 'jsonc' | 'yaml'): Codec;

package/lib/parsers/to-format.js

@@ -0,0 +1,50 @@
+"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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.toFormat = toFormat;
+const JSON = __importStar(require("./json.js"));
+const JSONC = __importStar(require("./jsonc/index.js"));
+const YAML = __importStar(require("./yaml.js"));
+function toFormat(value) {
+    if (value === 'json') {
+        return JSON;
+    }
+    else if (value === 'yaml') {
+        return YAML;
+    }
+    else {
+        return JSONC;
+    }
+}

package/lib/parsers/yaml.d.ts

@@ -1,2 +1,4 @@
-export declare function parse(data: string): Record<string, unknown>;
-export declare function stringify(data: Record<string, unknown>): string;
+import { type ParseResult } from '../types/context.js';
+import { type Transform } from './jsonc/transform.js';
+export declare function parse(data: string): ParseResult;
+export declare function stringify(data: Record<string, unknown>, _transform?: Transform): string;

package/lib/parsers/yaml.js

@@ -5,10 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = parse;
 exports.stringify = stringify;
+const sync_1 = require("@zokugun/xtry/sync");
 const yaml_1 = __importDefault(require("yaml"));
 function parse(data) {
-    return yaml_1.default.parse(data);
+    const result = (0, sync_1.xtry)(() => yaml_1.default.parse(data));
+    if (result.fails) {
+        return (0, sync_1.err)((0, sync_1.stringifyError)(result.error));
+    }
+    return (0, sync_1.ok)({ data: result.value });
 }
-function stringify(data) {
+function stringify(data, _transform) {
     return yaml_1.default.stringify(data);
 }

package/lib/routes/command.js

@@ -18,6 +18,13 @@ async function command({ current, incoming }) {
         const incomingCommand = trueAndMatch[1].trim();
         return currentSegments.has(incomingCommand) ? current : `${current} && ${incomingCommand}`;
     }
+    const incomingAndMatch = /^(.+?)\s*&&\s*(.+)$/.exec(incoming);
+    if (incomingAndMatch && !current.includes('&&')) {
+        const left = incomingAndMatch[1].trim();
+        if (current.trim() === left || currentSegments.has(left)) {
+            return incoming;
+        }
+    }
     const mixed = (0, index_js_1.mergeWithSemicolonMix)(current, incoming);
     if (mixed) {
         return mixed;

package/lib/routes/index.d.ts

@@ -1,8 +1,9 @@
 export { command } from './command.js';
-export { mapConcat } from './map-concat.js';
-export { mapDelete } from './map-delete.js';
 export { linesConcat } from './lines-concat.js';
 export { listConcat } from './list-concat.js';
-export { listSortConcat } from './list-sort-concat.js';
+export { listConcatAfter } from './list-concat-after.js';
+export { mapConcat } from './map-concat.js';
+export { mapDelete } from './map-delete.js';
+export { mergeDotJs } from './merge-dot-js.js';
 export { overwrite } from './overwrite.js';
 export { primitive } from './primitive.js';

package/lib/routes/index.js

@@ -1,18 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.primitive = exports.overwrite = exports.listSortConcat = exports.listConcat = exports.linesConcat = exports.mapDelete = exports.mapConcat = exports.command = void 0;
+exports.primitive = exports.overwrite = exports.mergeDotJs = exports.mapDelete = exports.mapConcat = exports.listConcatAfter = exports.listConcat = exports.linesConcat = exports.command = void 0;
 var command_js_1 = require("./command.js");
 Object.defineProperty(exports, "command", { enumerable: true, get: function () { return command_js_1.command; } });
-var map_concat_js_1 = require("./map-concat.js");
-Object.defineProperty(exports, "mapConcat", { enumerable: true, get: function () { return map_concat_js_1.mapConcat; } });
-var map_delete_js_1 = require("./map-delete.js");
-Object.defineProperty(exports, "mapDelete", { enumerable: true, get: function () { return map_delete_js_1.mapDelete; } });
 var lines_concat_js_1 = require("./lines-concat.js");
 Object.defineProperty(exports, "linesConcat", { enumerable: true, get: function () { return lines_concat_js_1.linesConcat; } });
 var list_concat_js_1 = require("./list-concat.js");
 Object.defineProperty(exports, "listConcat", { enumerable: true, get: function () { return list_concat_js_1.listConcat; } });
-var list_sort_concat_js_1 = require("./list-sort-concat.js");
-Object.defineProperty(exports, "listSortConcat", { enumerable: true, get: function () { return list_sort_concat_js_1.listSortConcat; } });
+var list_concat_after_js_1 = require("./list-concat-after.js");
+Object.defineProperty(exports, "listConcatAfter", { enumerable: true, get: function () { return list_concat_after_js_1.listConcatAfter; } });
+var map_concat_js_1 = require("./map-concat.js");
+Object.defineProperty(exports, "mapConcat", { enumerable: true, get: function () { return map_concat_js_1.mapConcat; } });
+var map_delete_js_1 = require("./map-delete.js");
+Object.defineProperty(exports, "mapDelete", { enumerable: true, get: function () { return map_delete_js_1.mapDelete; } });
+var merge_dot_js_js_1 = require("./merge-dot-js.js");
+Object.defineProperty(exports, "mergeDotJs", { enumerable: true, get: function () { return merge_dot_js_js_1.mergeDotJs; } });
 var overwrite_js_1 = require("./overwrite.js");
 Object.defineProperty(exports, "overwrite", { enumerable: true, get: function () { return overwrite_js_1.overwrite; } });
 var primitive_js_1 = require("./primitive.js");

package/lib/routes/{list-sort-concat.d.ts → list-concat-after.d.ts}

@@ -1,4 +1,4 @@
-export declare function listSortConcat({ current, incoming }: {
+export declare function listConcatAfter({ current, incoming }: {
     current: unknown[] | undefined;
     incoming: unknown[] | undefined;
 }): Promise<any[]>;

package/lib/routes/{list-sort-concat.js → list-concat-after.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listSortConcat = listSortConcat;
-async function listSortConcat({ current, incoming }) {
+exports.listConcatAfter = listConcatAfter;
+async function listConcatAfter({ current, incoming }) {
     if (!incoming) {
         return current ?? [];
     }

package/lib/routes/merge-dot-js.d.ts

@@ -0,0 +1,2 @@
+import { type Args } from '../types/travel.js';
+export declare function mergeDotJs({ current, incoming }: Args<string>): Promise<string>;

package/lib/routes/merge-dot-js.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeDotJs = mergeDotJs;
+const configdotts_merge_1 = require("@zokugun/configdotts-merge");
+async function mergeDotJs({ current, incoming }) {
+    const data = (0, configdotts_merge_1.merge)(current, incoming);
+    return data;
+}

package/lib/steps/configure-install-file-actions.js

@@ -4,7 +4,6 @@ exports.configureInstallFileActions = configureInstallFileActions;
 const is_it_type_1 = require("@zokugun/is-it-type");
 const xtry_1 = require("@zokugun/xtry");
 const micromatch_1 = require("micromatch");
-const build_travel_js_1 = require("../utils/build-travel.js");
 async function configureInstallFileActions(context) {
     const { install } = context.incomingConfig;
     if (!install) {
@@ -15,7 +14,7 @@ async function configureInstallFileActions(context) {
     const routes = {};
     const transformations = {};
     for (const file of install) {
-        const { filter, ifExists, pattern, rename, route, transforms } = file;
+        const { filter, ifExists, pattern, rename, transforms } = file;
         if (rename) {
             context.renamedPatterns.push({
                 from: pattern,
@@ -39,24 +38,6 @@ async function configureInstallFileActions(context) {
         if (filter) {
             filters[pattern] = filter;
         }
-        if (route) {
-            const { alias } = route;
-            const travel = (0, build_travel_js_1.buildTravel)(route);
-            if (travel.fails) {
-                return travel;
-            }
-            if (alias) {
-                routes[pattern] = {
-                    alias,
-                    travel: travel.value,
-                };
-            }
-            else {
-                routes[pattern] = {
-                    travel: travel.value,
-                };
-            }
-        }
         if (transforms) {
             transformations[pattern] = transforms;
         }

package/lib/steps/configure-update-file-actions.js

@@ -4,7 +4,6 @@ exports.configureUpdateFileActions = configureUpdateFileActions;
 const is_it_type_1 = require("@zokugun/is-it-type");
 const xtry_1 = require("@zokugun/xtry");
 const micromatch_1 = require("micromatch");
-const build_travel_js_1 = require("../utils/build-travel.js");
 async function configureUpdateFileActions(context) {
     const { update } = context.incomingConfig;
     if (update === false) {
@@ -18,7 +17,7 @@ async function configureUpdateFileActions(context) {
         const routes = {};
         const transformations = {};
         for (const file of update) {
-            const { filter, ifExists, ifMissing, pattern, rename, route, transforms } = file;
+            const { filter, ifExists, ifMissing, pattern, rename, transforms } = file;
             if (rename) {
                 context.renamedPatterns.push({
                     from: pattern,
@@ -45,24 +44,6 @@ async function configureUpdateFileActions(context) {
             if (filter) {
                 filters[pattern] = filter;
             }
-            if (route) {
-                const { alias } = route;
-                const travel = (0, build_travel_js_1.buildTravel)(route);
-                if (travel.fails) {
-                    return travel;
-                }
-                if (alias) {
-                    routes[pattern] = {
-                        alias,
-                        travel: travel.value,
-                    };
-                }
-                else {
-                    routes[pattern] = {
-                        travel: travel.value,
-                    };
-                }
-            }
             if (transforms) {
                 transformations[pattern] = transforms;
             }

package/lib/steps/execute-first-block.js

@@ -23,7 +23,7 @@ async function executeFirstBlock(context) {
             alias = true;
         }
         const variantPath = node_path_1.default.join(context.packagePath, 'variants', variant);
-        const configResult = await (0, index_js_1.readPackageConfig)(variantPath);
+        const configResult = await (0, index_js_1.readPackageConfig)(variantPath, context.global.routes);
         if (configResult.fails) {
             return configResult;
         }

package/lib/steps/index.d.ts

@@ -20,7 +20,6 @@ import { replaceTemplates } from './replace-templates.js';
 import { transformUntouchedFiles } from './transform-untouched-files.js';
 import { unmergeTextFiles } from './unmerge-text-files.js';
 import { validateNewerPackage } from './validate-newer-package.js';
-import { validateNotPresentPackage } from './validate-not-present-package.js';
 import { validatePresentPackage } from './validate-present-package.js';
 import { writeTextFiles } from './write-text-files.js';
 export declare const steps: {
@@ -44,7 +43,6 @@ export declare const steps: {
     transformUntouchedFiles: typeof transformUntouchedFiles;
     unmergeTextFiles: typeof unmergeTextFiles;
     validateNewerPackage: typeof validateNewerPackage;
-    validateNotPresentPackage: typeof validateNotPresentPackage;
     validatePresentPackage: typeof validatePresentPackage;
     writeTextFiles: typeof writeTextFiles;
 };

package/lib/steps/index.js

@@ -4,6 +4,7 @@ exports.steps = void 0;
 exports.composeSteps = composeSteps;
 const cli_utils_1 = require("@zokugun/cli-utils");
 const xtry_1 = require("@zokugun/xtry");
+const context_js_1 = require("../types/context.js");
 const apply_formatting_js_1 = require("./apply-formatting.js");
 const configure_branches_js_1 = require("./configure-branches.js");
 const configure_install_file_actions_js_1 = require("./configure-install-file-actions.js");
@@ -24,7 +25,6 @@ const replace_templates_js_1 = require("./replace-templates.js");
 const transform_untouched_files_js_1 = require("./transform-untouched-files.js");
 const unmerge_text_files_js_1 = require("./unmerge-text-files.js");
 const validate_newer_package_js_1 = require("./validate-newer-package.js");
-const validate_not_present_package_js_1 = require("./validate-not-present-package.js");
 const validate_present_package_js_1 = require("./validate-present-package.js");
 const write_text_files_js_1 = require("./write-text-files.js");
 exports.steps = {
@@ -48,12 +48,11 @@ exports.steps = {
     transformUntouchedFiles: transform_untouched_files_js_1.transformUntouchedFiles,
     unmergeTextFiles: unmerge_text_files_js_1.unmergeTextFiles,
     validateNewerPackage: validate_newer_package_js_1.validateNewerPackage,
-    validateNotPresentPackage: validate_not_present_package_js_1.validateNotPresentPackage,
     validatePresentPackage: validate_present_package_js_1.validatePresentPackage,
     writeTextFiles: write_text_files_js_1.writeTextFiles,
 };
 function composeSteps(validations, processes) {
-    const mainFlow = async (targetPath, incomingPath, request, config, options) => {
+    const mainFlow = async (targetPath, incomingPath, request, config, global, options) => {
         const context = {
             binaryFiles: [],
             blocks: [],
@@ -61,9 +60,11 @@ function composeSteps(validations, processes) {
             config,
             filters: () => undefined,
             formats: [],
+            global,
             incomingPath,
             incomingVariant: request.variant,
             mergedTextFiles: [],
+            mode: context_js_1.Mode.Default,
             onExisting: () => 'merge',
             onMissing: () => 'continue',
             options,

package/lib/steps/merge-text-files.d.ts

@@ -1,3 +1,3 @@
 import { type AsyncDResult } from '@zokugun/xtry';
 import { type Context } from '../types/context.js';
-export declare function mergeTextFiles({ targetPath, textFiles, mergedTextFiles, onExisting, onMissing, filters, routes, transforms, options }: Context): AsyncDResult;
+export declare function mergeTextFiles({ targetPath, textFiles, mergedTextFiles, onExisting, onMissing, filters, routes, transforms, incomingConfig, global, options }: Context): AsyncDResult;

package/lib/steps/merge-text-files.js

@@ -11,12 +11,15 @@ const xtry_1 = require("@zokugun/xtry");
 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");
-async function mergeTextFiles({ targetPath, textFiles, mergedTextFiles, onExisting, onMissing, filters, routes, transforms, options }) {
+async function mergeTextFiles({ targetPath, textFiles, mergedTextFiles, onExisting, onMissing, filters, routes, transforms, incomingConfig, global, options }) {
     for (const file of textFiles) {
         if (options.verbose) {
             cli_utils_1.logger.debug(`${file.name} is going to be merged`);
         }
-        const journey = routes(file.name) ?? (0, index_js_1.getJourney)(file.name);
+        const journey = routes(file.name)
+            ?? (0, index_js_1.getJourney)(file.name, Object.values(incomingConfig.journeys))
+            ?? (0, index_js_1.getJourney)(file.name, Object.values(global.journeys))
+            ?? (0, index_js_1.getJourney)(file.name);
         if (!journey) {
             if (options.verbose) {
                 cli_utils_1.logger.debug(`${file.name}, no merger has been found`);
@@ -85,6 +88,7 @@ async function mergeTextFiles({ targetPath, textFiles, mergedTextFiles, onExisti
                 }
                 case 'overwrite': {
                     mergedTextFiles.push(file);
+                    global.overwrittenTextFiles.push(fileName);
                     if (options.verbose) {
                         cli_utils_1.logger.debug(`${file.name} has been overwritten`);
                     }

package/lib/steps/read-files.d.ts

@@ -1,3 +1,3 @@
 import { type AsyncDResult } from '@zokugun/xtry';
 import { type Context } from '../types/context.js';
-export declare function readFiles({ incomingPath, textFiles, binaryFiles, options }: Context): AsyncDResult;
+export declare function readFiles({ incomingPath, textFiles, binaryFiles, mode, global, options }: Context): AsyncDResult;