@zokugun/artifact 0.8.0 → 0.9.0

package/lib/commands/add.js

@@ -12,10 +12,10 @@ const tempy_1 = __importDefault(require("tempy"));
 const index_js_1 = require("../configs/index.js");
 const read_listing_config_js_1 = require("../configs/package/read-listing-config.js");
 const index_js_2 = require("../steps/index.js");
+const load_package_js_1 = require("../utils/load-package.js");
 const resolve_request_js_1 = require("../utils/resolve-request.js");
 const { mainFlow } = (0, index_js_2.composeSteps)([
     index_js_2.steps.readIncomingPackage,
-    index_js_2.steps.validateNotPresentPackage,
     index_js_2.steps.readIncomingConfig,
     index_js_2.steps.executeFirstBlock,
 ], [
@@ -37,24 +37,6 @@ const { mainFlow } = (0, index_js_2.composeSteps)([
 ]);
 async function add(specs, inputOptions) {
     cli_utils_1.logger.beginTimer();
-    const targetPath = node_process_1.default.cwd();
-    const options = {
-        dryRun: inputOptions?.dryRun ?? false,
-        force: inputOptions?.force ?? false,
-        skip: inputOptions?.skip ?? false,
-        variables: {},
-        verbose: inputOptions?.verbose ?? false,
-    };
-    if (inputOptions?.var) {
-        for (const { name, value } of inputOptions.var) {
-            options.variables[name] = value;
-        }
-    }
-    const configResult = await (0, index_js_1.readInstallConfig)(targetPath);
-    if (configResult.fails) {
-        cli_utils_1.logger.fatal(configResult.error);
-    }
-    const { config, configStats } = configResult.value;
     if (specs.length === 1 && /^@\w+$/.test(specs[0])) {
         const request = `${specs.shift()}/artifact-listing`;
         const spinner = cli_utils_1.logger.createSpinner(`${cli_utils_1.c.cyan.bold(request)}`);
@@ -96,28 +78,76 @@ async function add(specs, inputOptions) {
             }
         }
     }
+    const targetPath = node_process_1.default.cwd();
+    const options = {
+        dryRun: inputOptions?.dryRun ?? false,
+        force: inputOptions?.force ?? false,
+        skip: inputOptions?.skip ?? false,
+        variables: {},
+        verbose: inputOptions?.verbose ?? false,
+    };
+    if (inputOptions?.var) {
+        for (const { name, value } of inputOptions.var) {
+            options.variables[name] = value;
+        }
+    }
+    const configResult = await (0, index_js_1.readInstallConfig)(targetPath);
+    if (configResult.fails) {
+        cli_utils_1.logger.fatal(configResult.error);
+    }
+    const config = configResult.value;
+    const requests = [];
     for (const spec of specs) {
-        const requestResult = (0, resolve_request_js_1.resolveRequest)(spec);
-        if (requestResult.fails) {
-            cli_utils_1.logger.fatal(requestResult.error);
+        const request = (0, resolve_request_js_1.resolveRequest)(spec);
+        if (request.fails) {
+            cli_utils_1.logger.fatal(request.error);
         }
-        const request = requestResult.value;
-        const spinner = cli_utils_1.logger.createSpinner(`${cli_utils_1.c.cyan.bold(request.name)}`);
-        const dir = tempy_1.default.directory();
-        const pkgResult = await pacote_1.default.extract(request.name, dir);
-        if (!pkgResult.resolved) {
-            if (options.force || options.skip) {
-                spinner.fail();
-                if (options.verbose) {
-                    cli_utils_1.logger.warn(`The artifact '${spec}' couldn't be found, skipping...`);
+        if (!options.force) {
+            const { name } = request.value;
+            const artifact = config.artifacts[name];
+            if (artifact) {
+                if (options.skip) {
+                    if (options.verbose) {
+                        cli_utils_1.logger.debug(`The "${name}" artifact is already present, skipping...`);
+                    }
+                }
+                else {
+                    cli_utils_1.logger.fatal(`The "${name}" artifact has already been added.`);
                 }
-                continue;
-            }
-            else {
-                cli_utils_1.logger.fatal(pkgResult.from);
             }
         }
-        const flowResult = await mainFlow(targetPath, dir, request, config, options);
+        requests.push(request.value);
+    }
+    const global = {
+        journeys: {},
+        overwrittenTextFiles: [],
+        routes: {},
+    };
+    for (const [name, { version }] of Object.entries(config.artifacts)) {
+        const spinner = cli_utils_1.logger.createSpinner(`${cli_utils_1.c.cyan.bold(name)}`);
+        const dir = await (0, load_package_js_1.loadPackage)(`${name}@${version}`, spinner, options);
+        if (!dir) {
+            continue;
+        }
+        const result = await (0, index_js_1.readPackageConfig)(dir, global.routes);
+        if (result.fails) {
+            cli_utils_1.logger.fatal(result.error);
+        }
+        for (const [name, journey] of Object.entries(result.value.journeys)) {
+            global.journeys[name] = journey;
+        }
+        for (const [name, route] of Object.entries(result.value.routes)) {
+            global.routes[name] = route;
+        }
+        spinner.succeed();
+    }
+    for (const request of requests) {
+        const spinner = cli_utils_1.logger.createSpinner(`${cli_utils_1.c.cyan.bold(request.name)}`);
+        const dir = await (0, load_package_js_1.loadPackage)(request.name, spinner, options);
+        if (!dir) {
+            continue;
+        }
+        const flowResult = await mainFlow(targetPath, dir, request, config, global, options);
         if (flowResult.fails) {
             cli_utils_1.logger.fatal(flowResult.error);
         }
@@ -126,7 +156,7 @@ async function add(specs, inputOptions) {
             continue;
         }
         (0, index_js_1.updateInstallConfig)(config, flowResult.value.result);
-        await (0, index_js_1.writeInstallConfig)(config, configStats, flowResult.value.formats, targetPath, options);
+        await (0, index_js_1.writeInstallConfig)(config, flowResult.value.formats, targetPath, options);
         spinner.succeed();
     }
     cli_utils_1.logger.finishTimer();

package/lib/commands/list.js

@@ -31,14 +31,14 @@ async function list() {
         cli_utils_1.logger.fatal((0, xtry_1.stringifyError)(packageResult.error));
     }
     const { name } = packageResult.value;
-    const { config, configStats } = configResult.value;
+    const config = configResult.value;
     const artifacts = Object.entries(config.artifacts);
     cli_utils_1.logger.newLine();
     if (artifacts.length === 0) {
         cli_utils_1.logger.info('No artifacts have been installed.');
     }
     else {
-        cli_utils_1.logger.print(`${name} ${cli_utils_1.c.grey(configStats.name)}`);
+        cli_utils_1.logger.print(`${name} ${cli_utils_1.c.grey(config.file.name)}`);
         cli_utils_1.logger.newLine();
         const table = [];
         for (const [name, artifact] of artifacts) {

package/lib/commands/outdated.js

@@ -26,14 +26,14 @@ async function outdated() {
         cli_utils_1.logger.fatal((0, xtry_1.stringifyError)(packageResult.error));
     }
     const { name } = packageResult.value;
-    const { config, configStats } = configResult.value;
+    const config = configResult.value;
     const artifacts = Object.entries(config.artifacts);
     cli_utils_1.logger.newLine();
     if (artifacts.length === 0) {
         cli_utils_1.logger.info('No artifacts have been installed.');
     }
     else {
-        cli_utils_1.logger.print(`${name} ${cli_utils_1.c.grey(configStats.name)}`);
+        cli_utils_1.logger.print(`${name} ${cli_utils_1.c.grey(config.file.name)}`);
         const bar = new cli_progress_1.SingleBar({
             clearOnComplete: true,
             hideCursor: true,

package/lib/commands/remove.js

@@ -7,10 +7,9 @@ exports.remove = remove;
 const process_1 = __importDefault(require("process"));
 const cli_utils_1 = require("@zokugun/cli-utils");
 const async_1 = require("@zokugun/xtry/async");
-const pacote_1 = __importDefault(require("pacote"));
-const tempy_1 = __importDefault(require("tempy"));
 const index_js_1 = require("../configs/index.js");
 const index_js_2 = require("../steps/index.js");
+const load_package_js_1 = require("../utils/load-package.js");
 const resolve_request_js_1 = require("../utils/resolve-request.js");
 const { mainFlow } = (0, index_js_2.composeSteps)([
     index_js_2.steps.readIncomingPackage,
@@ -43,7 +42,7 @@ async function remove(specs, inputOptions) {
     if (configResult.fails) {
         cli_utils_1.logger.fatal(configResult.error);
     }
-    const { config, configStats } = configResult.value;
+    const config = configResult.value;
     if (specs.length === 0) {
         const { value } = await (0, async_1.xtry)(cli_utils_1.enquirer.prompt({
             type: 'multiselect',
@@ -70,6 +69,11 @@ async function remove(specs, inputOptions) {
             }
         }
     }
+    const global = {
+        journeys: {},
+        overwrittenTextFiles: [],
+        routes: {},
+    };
     for (const spec of specs) {
         const requestResult = (0, resolve_request_js_1.resolveRequest)(spec);
         if (requestResult.fails) {
@@ -77,21 +81,11 @@ async function remove(specs, inputOptions) {
         }
         const request = requestResult.value;
         const spinner = cli_utils_1.logger.createSpinner(`${cli_utils_1.c.cyan.bold(request.name)}`);
-        const dir = tempy_1.default.directory();
-        const pkgResult = await pacote_1.default.extract(request.name, dir);
-        if (!pkgResult.resolved) {
-            if (options.force || options.skip) {
-                spinner.fail();
-                if (options.verbose) {
-                    cli_utils_1.logger.debug(`The artifact '${spec}' couldn't be found, skipping...`);
-                }
-                continue;
-            }
-            else {
-                cli_utils_1.logger.fatal(pkgResult.from);
-            }
+        const dir = await (0, load_package_js_1.loadPackage)(request.name, spinner, options);
+        if (!dir) {
+            continue;
         }
-        const flowResult = await mainFlow(targetPath, dir, request, config, options);
+        const flowResult = await mainFlow(targetPath, dir, request, config, global, options);
         if (flowResult.fails) {
             cli_utils_1.logger.fatal(flowResult.error);
         }
@@ -100,7 +94,7 @@ async function remove(specs, inputOptions) {
             continue;
         }
         (0, index_js_1.updateUninstallConfig)(config, flowResult.value.result);
-        await (0, index_js_1.writeInstallConfig)(config, configStats, flowResult.value.formats, targetPath, options);
+        await (0, index_js_1.writeInstallConfig)(config, flowResult.value.formats, targetPath, options);
         spinner.succeed();
     }
     cli_utils_1.logger.finishTimer();

package/lib/commands/update.js

@@ -7,10 +7,9 @@ exports.update = update;
 const process_1 = __importDefault(require("process"));
 const cli_utils_1 = require("@zokugun/cli-utils");
 const lodash_es_1 = require("lodash-es");
-const pacote_1 = __importDefault(require("pacote"));
-const tempy_1 = __importDefault(require("tempy"));
 const index_js_1 = require("../configs/index.js");
 const index_js_2 = require("../steps/index.js");
+const load_package_js_1 = require("../utils/load-package.js");
 const { mainFlow } = (0, index_js_2.composeSteps)([
     index_js_2.steps.readIncomingPackage,
     index_js_2.steps.validateNewerPackage,
@@ -47,34 +46,50 @@ async function update(inputOptions) {
     if (configResult.fails) {
         cli_utils_1.logger.fatal(configResult.error);
     }
-    const { config, configStats } = configResult.value;
+    const config = configResult.value;
+    const global = {
+        journeys: {},
+        overwrittenTextFiles: [],
+        routes: {},
+    };
     for (const [name, artifact] of Object.entries(config.artifacts)) {
         const spinner = cli_utils_1.logger.createSpinner(`${cli_utils_1.c.cyan.bold(name)}`);
-        const dir = tempy_1.default.directory();
-        const pkgResult = await pacote_1.default.extract(name, dir);
-        if (!pkgResult.resolved) {
-            if (options.force) {
-                spinner.fail();
-                if (options.verbose) {
-                    cli_utils_1.logger.debug(`The artifact '${name}' couldn't be found, skipping...`);
-                }
-                continue;
+        const request = artifact.requires ? { name, variant: (0, lodash_es_1.last)(artifact.requires) } : { name };
+        const dir = await (0, load_package_js_1.loadPackage)(request.name, spinner, options);
+        if (!dir) {
+            continue;
+        }
+        const result = await mainFlow(targetPath, dir, request, config, global, options);
+        if (result.fails) {
+            cli_utils_1.logger.fatal(result.error);
+        }
+        const context = result.value;
+        if (context?.incomingConfig) {
+            for (const [name, journey] of Object.entries(context.incomingConfig.journeys)) {
+                global.journeys[name] = journey;
             }
-            else {
-                cli_utils_1.logger.fatal(pkgResult.from);
+            for (const [name, route] of Object.entries(context.incomingConfig.routes)) {
+                global.routes[name] = route;
             }
         }
-        const request = artifact.requires ? { name, variant: (0, lodash_es_1.last)(artifact.requires) } : { name };
-        const flowResult = await mainFlow(targetPath, dir, request, config, options);
-        if (flowResult.fails) {
-            cli_utils_1.logger.fatal(flowResult.error);
+        else {
+            const result = await (0, index_js_1.readPackageConfig)(dir, global.routes);
+            if (result.fails) {
+                cli_utils_1.logger.fatal(result.error);
+            }
+            for (const [name, journey] of Object.entries(result.value.journeys)) {
+                global.journeys[name] = journey;
+            }
+            for (const [name, route] of Object.entries(result.value.routes)) {
+                global.routes[name] = route;
+            }
         }
-        if (!flowResult.value?.result) {
+        if (!context?.result) {
             spinner.succeed();
             continue;
         }
-        (0, index_js_1.updateInstallConfig)(config, flowResult.value.result);
-        await (0, index_js_1.writeInstallConfig)(config, configStats, flowResult.value.formats, targetPath, options);
+        (0, index_js_1.updateInstallConfig)(config, context.result);
+        await (0, index_js_1.writeInstallConfig)(config, context.formats, targetPath, options);
         spinner.succeed();
     }
     cli_utils_1.logger.finishTimer();

package/lib/compositors/codec.d.ts

@@ -0,0 +1,3 @@
+import { type Codec } from '../types/context.js';
+import { type Route } from '../types/travel.js';
+export declare function codec(codecs: Codec[], ...routes: Array<Route<Record<string, any>>>): Route<string>;

package/lib/compositors/codec.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.codec = codec;
+const is_it_type_1 = require("@zokugun/is-it-type");
+const list_concat_js_1 = require("../routes/list-concat.js");
+const primitive_js_1 = require("../routes/primitive.js");
+const apply_transforms_js_1 = require("../utils/apply-transforms.js");
+const flow_js_1 = require("../utils/flow.js");
+const compose_js_1 = require("./compose.js");
+const fork_js_1 = require("./fork.js");
+const merge = (0, compose_js_1.compose)({
+    $$default: (0, fork_js_1.fork)([is_it_type_1.isArray, list_concat_js_1.listConcat], [is_it_type_1.isRecord, async (...args) => merge(...args)], primitive_js_1.primitive),
+});
+function codec(codecs, ...routes) {
+    return async ({ current, incoming, filters, ignores, transforms }) => {
+        if (!(0, is_it_type_1.isNonBlankString)(current)) {
+            return incoming;
+        }
+        for (const { parse, stringify } of codecs) {
+            const currentResult = parse(current);
+            if (currentResult.fails) {
+                continue;
+            }
+            if ((0, is_it_type_1.isNonBlankString)(incoming)) {
+                const incomingResult = parse(incoming);
+                if (incomingResult.fails) {
+                    continue;
+                }
+                const incomingData = incomingResult.value.data;
+                if (!(0, is_it_type_1.isArray)(incomingData) && !(0, is_it_type_1.isRecord)(incomingData)) {
+                    return incoming;
+                }
+                const mergedTransform = currentResult.value.transform
+                    ? await merge({ current: currentResult.value.transform, incoming: incomingResult.value.transform })
+                    : incomingResult.value.transform;
+                const run = (0, flow_js_1.flow)(...routes, (0, apply_transforms_js_1.applyTransforms)(transforms), (data) => stringify(data, mergedTransform));
+                return run({ current: currentResult.value.data, incoming: incomingData, filters, ignores });
+            }
+            else {
+                const run = (0, flow_js_1.flow)(...routes, (0, apply_transforms_js_1.applyTransforms)(transforms), (data) => stringify(data, currentResult.value.transform));
+                return run({ current: currentResult.value.data, filters, ignores });
+            }
+        }
+        return incoming;
+    };
+}

package/lib/compositors/compose.d.ts

@@ -2,6 +2,7 @@ import { type Route } from '../types/travel.js';
 type ComposeMap = {
     [key: string]: Route<any> | string[] | undefined;
     $$ignore?: string[];
+    $$remove?: string[];
 };
 export declare function compose(map: ComposeMap): Route<Record<string, any>>;
 export {};

package/lib/compositors/compose.js

@@ -7,7 +7,11 @@ async function apply(map, keys, current, incoming, result) {
         return;
     }
     const ignores = map.$$ignore ?? [];
+    const removes = map.$$remove ?? [];
     for (const key of keys) {
+        if (removes.includes(key)) {
+            continue;
+        }
         const currentValue = current[key];
         const transform = map[key] ?? map.$$default;
         if (!transform || !(0, lodash_es_1.has)(incoming, key) || ignores.includes(key)) {

package/lib/compositors/index.d.ts

@@ -1,3 +1,4 @@
+export { codec } from './codec.js';
 export { compose } from './compose.js';
 export { fork } from './fork.js';
 export { json } from './json.js';

package/lib/compositors/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yaml = exports.rc = exports.mapSort = exports.json = exports.fork = exports.compose = void 0;
+exports.yaml = exports.rc = exports.mapSort = exports.json = exports.fork = exports.compose = exports.codec = void 0;
+var codec_js_1 = require("./codec.js");
+Object.defineProperty(exports, "codec", { enumerable: true, get: function () { return codec_js_1.codec; } });
 var compose_js_1 = require("./compose.js");
 Object.defineProperty(exports, "compose", { enumerable: true, get: function () { return compose_js_1.compose; } });
 var fork_js_1 = require("./fork.js");

package/lib/compositors/json.js

@@ -1,71 +1,8 @@
 "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.json = json;
-const is_it_type_1 = require("@zokugun/is-it-type");
-const JSON = __importStar(require("../parsers/json.js"));
-const JSONC = __importStar(require("../parsers/jsonc/index.js"));
-const index_js_1 = require("../routes/index.js");
-const apply_transforms_js_1 = require("../utils/apply-transforms.js");
-const flow_js_1 = require("../utils/flow.js");
-const compose_js_1 = require("./compose.js");
-const fork_js_1 = require("./fork.js");
-function tryJson(value) {
-    try {
-        return JSON.parse(value);
-    }
-    catch {
-        return undefined;
-    }
-}
-const merge = (0, compose_js_1.compose)({
-    $$default: (0, fork_js_1.fork)([is_it_type_1.isArray, index_js_1.listConcat], [is_it_type_1.isRecord, async (...args) => merge(...args)], index_js_1.primitive),
-});
+const index_js_1 = require("../parsers/index.js");
+const codec_js_1 = require("./codec.js");
 function json(...routes) {
-    return async ({ current, incoming, filters, ignores, transforms }) => {
-        const currentData = current && tryJson(current);
-        const incomingData = incoming && tryJson(incoming);
-        if ((!current || currentData) && (!incoming || incomingData)) {
-            return await (0, flow_js_1.flow)(...routes, (0, apply_transforms_js_1.applyTransforms)(transforms), JSON.stringify)({ current: currentData, incoming: incomingData, filters, ignores, transforms });
-        }
-        else {
-            const { data: currentData, transform: currentTransform } = JSONC.parse(current);
-            const { data: incomingData, transform: incomingTransform } = JSONC.parse(incoming);
-            const mergedTransform = await merge({ current: currentTransform, incoming: incomingTransform });
-            const toJSON = (data) => JSONC.stringify(data, mergedTransform);
-            return await (0, flow_js_1.flow)(...routes, (0, apply_transforms_js_1.applyTransforms)(transforms), toJSON)({ current: currentData, incoming: incomingData, filters, ignores, transforms });
-        }
-    };
+    return (0, codec_js_1.codec)([index_js_1.JSON, index_js_1.JSONC], ...routes);
 }

package/lib/compositors/rc.js

@@ -1,61 +1,8 @@
 "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.rc = rc;
-const is_it_type_1 = require("@zokugun/is-it-type");
-const lodash_es_1 = require("lodash-es");
-const JSON = __importStar(require("../parsers/json.js"));
-const YAML = __importStar(require("../parsers/yaml.js"));
-const apply_transforms_js_1 = require("../utils/apply-transforms.js");
-const flow_js_1 = require("../utils/flow.js");
-const try_json_js_1 = require("../utils/try-json.js");
+const index_js_1 = require("../parsers/index.js");
+const codec_js_1 = require("./codec.js");
 function rc(...routes) {
-    return async ({ current, incoming, filters, ignores, transforms }) => {
-        const currentData = current && ((0, try_json_js_1.tryJSON)(current) ?? YAML.parse(current));
-        const incomingData = incoming && (0, try_json_js_1.tryJSON)(incoming);
-        if (incomingData) {
-            return await (0, flow_js_1.flow)(...routes, (0, apply_transforms_js_1.applyTransforms)(transforms), JSON.stringify)({ current: currentData, incoming: incomingData, filters, ignores });
-        }
-        else {
-            const incomingData = incoming && YAML.parse(incoming);
-            if ((0, lodash_es_1.isArray)(incomingData) || (0, is_it_type_1.isRecord)(incomingData)) {
-                return await (0, flow_js_1.flow)(...routes, (0, apply_transforms_js_1.applyTransforms)(transforms), YAML.stringify)({ current: currentData, incoming: incomingData, filters, ignores });
-            }
-            else {
-                return incoming;
-            }
-        }
-    };
+    return (0, codec_js_1.codec)([index_js_1.JSON, index_js_1.YAML], ...routes);
 }

package/lib/compositors/yaml.js

@@ -34,13 +34,34 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yaml = yaml;
+const is_it_type_1 = require("@zokugun/is-it-type");
 const YAML = __importStar(require("../parsers/yaml.js"));
 const apply_transforms_js_1 = require("../utils/apply-transforms.js");
 const flow_js_1 = require("../utils/flow.js");
 function yaml(...routes) {
     return async ({ current, incoming, filters, ignores, transforms }) => {
-        const currentData = current === undefined ? undefined : YAML.parse(current);
-        const incomingData = YAML.parse(incoming);
-        return await (0, flow_js_1.flow)(...routes, (0, apply_transforms_js_1.applyTransforms)(transforms), YAML.stringify)({ current: currentData, incoming: incomingData, filters, ignores, transforms });
+        if (!(0, is_it_type_1.isNonBlankString)(current)) {
+            return incoming;
+        }
+        const currentResult = YAML.parse(current);
+        if (currentResult.fails) {
+            return incoming;
+        }
+        if ((0, is_it_type_1.isNonBlankString)(incoming)) {
+            const incomingResult = YAML.parse(incoming);
+            if (incomingResult.fails) {
+                return current;
+            }
+            const incomingData = incomingResult.value.data;
+            if (!(0, is_it_type_1.isArray)(incomingData) && !(0, is_it_type_1.isRecord)(incomingData)) {
+                return incoming;
+            }
+            const run = (0, flow_js_1.flow)(...routes, (0, apply_transforms_js_1.applyTransforms)(transforms), YAML.stringify);
+            return run({ current: currentResult.value.data, incoming: incomingData, filters, ignores });
+        }
+        else {
+            const run = (0, flow_js_1.flow)(...routes, (0, apply_transforms_js_1.applyTransforms)(transforms), YAML.stringify);
+            return run({ current: currentResult.value.data, filters, ignores });
+        }
     };
 }

package/lib/configs/install/read-install-config.d.ts

@@ -1,6 +1,3 @@
 import { type AsyncDResult } from '@zokugun/xtry';
-import { type InstallConfig, type InstallConfigStats } from '../../types/config.js';
-export declare function readInstallConfig(targetPath: string): AsyncDResult<{
-    config: InstallConfig;
-    configStats: InstallConfigStats;
-}>;
+import { type InstallConfig } from '../../types/config.js';
+export declare function readInstallConfig(targetPath: string): AsyncDResult<InstallConfig>;