powerlines 0.42.24 → 0.42.26

package/README.md

@@ -27,7 +27,7 @@ This package is part of the <b>🔌 Powerlines</b> monorepo. Powerlines is the "
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-0.42.22-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://stormsoftware.com/projects/powerlines)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/powerlines/release.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
+[![Version](https://img.shields.io/badge/version-0.42.23-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://stormsoftware.com/projects/powerlines)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/powerlines/release.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->

package/dist/{api-DECsh_tb.cjs → api-CvAosB7E.cjs}

@@ -1,5 +1,5 @@
 const require_chunk = require('./chunk-AIJqnxB6.cjs');
-const require_tsconfig = require('./tsconfig-l-UmDdrR.cjs');
+const require_tsconfig = require('./tsconfig-BC3TZxD4.cjs');
 const require_plugin_utils = require('./plugin-utils.cjs');
 const require_constants = require('./constants.cjs');
 const require_config = require('./config.cjs');
@@ -15,6 +15,7 @@ let _stryke_fs_install = require("@stryke/fs/install");
 let _stryke_fs_list_files = require("@stryke/fs/list-files");
 let _stryke_fs_package_fns = require("@stryke/fs/package-fns");
 let _stryke_fs_resolve = require("@stryke/fs/resolve");
+let _stryke_helpers_get_unique = require("@stryke/helpers/get-unique");
 let _stryke_helpers_omit = require("@stryke/helpers/omit");
 let _stryke_path_append = require("@stryke/path/append");
 let _stryke_path_file_path_fns = require("@stryke/path/file-path-fns");
@@ -32,12 +33,12 @@ let _stryke_type_checks_is_set_string = require("@stryke/type-checks/is-set-stri
 let _stryke_type_checks_is_string = require("@stryke/type-checks/is-string");
 let chalk = require("chalk");
 chalk = require_chunk.__toESM(chalk);
+let defu = require("defu");
+defu = require_chunk.__toESM(defu);
 let handlebars = require("handlebars");
 handlebars = require_chunk.__toESM(handlebars);
 let _stryke_string_format_pretty_bytes = require("@stryke/string-format/pretty-bytes");
 let ts_morph = require("ts-morph");
-let defu = require("defu");
-defu = require_chunk.__toESM(defu);
 let _stryke_string_format_package = require("@stryke/string-format/package");
 let _stryke_fs_json = require("@stryke/fs/json");
 require("@stryke/fs/remove-file");
@@ -50,7 +51,6 @@ let _stryke_env_get_env_paths = require("@stryke/env/get-env-paths");
 let _stryke_hash = require("@stryke/hash");
 let _stryke_hash_node = require("@stryke/hash/node");
 let _stryke_helpers_deep_clone = require("@stryke/helpers/deep-clone");
-let _stryke_helpers_get_unique = require("@stryke/helpers/get-unique");
 let _stryke_http_fetch = require("@stryke/http/fetch");
 let _stryke_path_join = require("@stryke/path/join");
 let _stryke_type_checks_is_null = require("@stryke/type-checks/is-null");
@@ -77,7 +77,7 @@ let unplugin = require("unplugin");
 
 //#region package.json
 var name = "powerlines";
-var version = "0.42.24";
+var version = "0.42.26";
 
 //#endregion
 //#region src/_internal/helpers/generate-types.ts
@@ -161,7 +161,8 @@ const mergeResultObjects = (0, defu.createDefu)((obj, key, value) => {
 * @returns The merged result.
 */
 function mergeResults(currentResult, previousResults) {
-	if ((0, _stryke_type_checks_is_string.isString)(currentResult)) previousResults = [`${(0, _stryke_type_checks_is_string.isString)(previousResults[0]) ? previousResults[0] || "" : ""}\n${currentResult || ""}`.trim()];
+	if (!previousResults || previousResults.length === 0) return [currentResult];
+	if ((0, _stryke_type_checks_is_set_string.isSetString)(currentResult)) previousResults = [`${(0, _stryke_type_checks_is_set_string.isSetString)(previousResults[0]) ? previousResults[0] || "" : ""}\n${(0, _stryke_type_checks_is_set_string.isSetString)(previousResults[0]) ? currentResult.replace(previousResults[0], "") : currentResult}`.trim()];
 	else if ((0, _stryke_type_checks_is_object.isObject)(currentResult)) previousResults = [mergeResultObjects(currentResult, previousResults[0] ?? {})];
 	return previousResults;
 }
@@ -173,8 +174,8 @@ function mergeResults(currentResult, previousResults) {
 * @returns The merged result.
 */
 function mergeConfigs(currentResult, previousResults) {
-	if ((0, _stryke_type_checks_is_string.isString)(currentResult)) previousResults = [`${(0, _stryke_type_checks_is_string.isString)(previousResults[0]) ? previousResults[0] || "" : ""}\n${currentResult || ""}`.trim()];
-	else if ((0, _stryke_type_checks_is_object.isObject)(currentResult)) previousResults = [(0, require_plugin_utils.plugin_utils_exports.mergeConfig)(currentResult, previousResults[0] ?? {})];
+	if ((0, _stryke_type_checks_is_string.isString)(currentResult)) previousResults = `${(0, _stryke_type_checks_is_string.isString)(previousResults) ? previousResults || "" : ""}\n${currentResult || ""}`.trim();
+	else if ((0, _stryke_type_checks_is_object.isObject)(currentResult)) previousResults = (0, require_plugin_utils.plugin_utils_exports.mergeConfig)(currentResult, previousResults ?? {});
 	return previousResults;
 }
 /**
@@ -208,7 +209,7 @@ async function callHook(context, key, options, ...args) {
 				if (results.length > 0 && sequenceArgs.length > 0) sequenceArgs[0] = (0, _stryke_type_checks_is_function.isFunction)(options.asNextParam) ? await Promise.resolve(options.asNextParam(results[0])) : results[0];
 				const result = await Promise.resolve(invokeHook(hook, [...sequenceArgs]));
 				if (result) if (options.result === "last") results = [result];
-				else if (options.result === "merge" && options.merge) results = options.merge(result, results);
+				else if (options.result === "merge" && options.merge) results = [results.length > 0 && results[0] ? options.merge(result, results[0]) : result];
 				else results = mergeResults(result, results);
 			}
 		}
@@ -3345,6 +3346,11 @@ var PowerlinesAPI = class PowerlinesAPI {
 			})}`);
 			if (!context.fs.existsSync(context.cachePath)) await (0, _stryke_fs_helpers.createDirectory)(context.cachePath);
 			if (!context.fs.existsSync(context.dataPath)) await (0, _stryke_fs_helpers.createDirectory)(context.dataPath);
+			if (context.config.skipCache === true || context.persistedMeta?.checksum !== context.meta.checksum) context.debug(`Using previously prepared files as the meta checksum has not changed.`);
+			else {
+				context.info(`Running \`prepare\` command as the meta checksum has changed since the last run.`);
+				await this.prepare((0, defu.default)({ output: { types: false } }, inlineConfig));
+			}
 			await this.#types(context);
 			this.context.debug("Formatting files generated during the types step.");
 			await (0, require_utils.utils_exports.format)(context, context.typesPath, await context.fs.read(context.typesPath) ?? "");
@@ -3579,6 +3585,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 		await this.#executeEnvironments(async (context) => {
 			await this.callHook("finalize", { environment: context });
 			await context.fs.dispose();
+			if ((0, _stryke_fs_exists.existsSync)(context.cachePath) && !(await (0, _stryke_fs_list_files.listFiles)((0, _stryke_path_join_paths.joinPaths)(context.cachePath, "**/*")))?.length) await (0, _stryke_fs_helpers.removeDirectory)(context.cachePath);
 		});
 		this.context.debug("✔ Powerlines finalization completed successfully");
 	}
@@ -3785,25 +3792,34 @@ Note: Please ensure the plugin package's default export is a class that extends
 		if (context.fs.existsSync(context.typesPath)) await context.fs.remove(context.typesPath);
 		if (!await (0, _stryke_fs_resolve.resolvePackage)("typescript")) throw new Error("Could not resolve TypeScript package location. Please ensure TypeScript is installed.");
 		context.debug("Running TypeScript compiler for built-in runtime module files.");
-		let types = await emitBuiltinTypes(context, (await context.getBuiltins()).reduce((ret, builtin) => {
+		let types = (await emitBuiltinTypes(context, (await context.getBuiltins()).reduce((ret, builtin) => {
 			const formatted = (0, _stryke_path_replace.replacePath)(builtin.path, context.workspaceConfig.workspaceRoot);
 			if (!ret.includes(formatted)) ret.push(formatted);
 			return ret;
-		}, []));
+		}, []))).trim();
 		context.debug(`Generating TypeScript declaration file ${context.typesPath}.`);
-		const directives = [];
+		let directives = [];
+		const merge = (currentResult, previousResult) => {
+			if (!(0, _stryke_type_checks_is_set_string.isSetString)(currentResult) && !(0, _stryke_type_checks_is_set_object.isSetObject)(currentResult) && !(0, _stryke_type_checks_is_set_string.isSetString)(previousResult) && !(0, _stryke_type_checks_is_set_object.isSetObject)(previousResult)) return types;
+			const previous = ((0, _stryke_type_checks_is_set_string.isSetString)(previousResult) ? previousResult : (0, _stryke_type_checks_is_set_object.isSetObject)(previousResult) ? previousResult.code : "").trim().replace(types, "").trim();
+			return {
+				directives: [...(0, _stryke_type_checks_is_set_object.isSetObject)(currentResult) && currentResult.directives ? currentResult.directives : [], ...(0, _stryke_type_checks_is_set_object.isSetObject)(previousResult) && previousResult.directives ? previousResult.directives : []],
+				code: `${types}\n${previous}\n${((0, _stryke_type_checks_is_set_string.isSetString)(currentResult) ? currentResult : (0, _stryke_type_checks_is_set_object.isSetObject)(currentResult) ? currentResult.code : "").trim().replace(previous, "").trim().replace(types, "").trim()}`
+			};
+		};
 		const asNextParam = (previousResult) => (0, _stryke_type_checks_is_object.isObject)(previousResult) ? previousResult.code : previousResult;
 		let result = await this.callHook("types", {
 			environment: context,
 			sequential: true,
 			order: "pre",
 			result: "merge",
+			merge,
 			asNextParam
 		}, types);
 		if (result) {
 			if ((0, _stryke_type_checks_is_set_object.isSetObject)(result)) {
 				types = result.code;
-				if (Array.isArray(result.directives) && result.directives.length > 0) directives.push(...result.directives);
+				if (Array.isArray(result.directives) && result.directives.length > 0) directives = (0, _stryke_helpers_get_unique.getUnique)([...directives, ...result.directives]).filter(Boolean);
 			} else if ((0, _stryke_type_checks_is_set_string.isSetString)(result)) types = result;
 		}
 		result = await this.callHook("types", {
@@ -3811,12 +3827,13 @@ Note: Please ensure the plugin package's default export is a class that extends
 			sequential: true,
 			order: "normal",
 			result: "merge",
+			merge,
 			asNextParam
 		}, types);
 		if (result) {
 			if ((0, _stryke_type_checks_is_set_object.isSetObject)(result)) {
 				types = result.code;
-				if (Array.isArray(result.directives) && result.directives.length > 0) directives.push(...result.directives);
+				if (Array.isArray(result.directives) && result.directives.length > 0) directives = (0, _stryke_helpers_get_unique.getUnique)([...directives, ...result.directives]).filter(Boolean);
 			} else if ((0, _stryke_type_checks_is_set_string.isSetString)(result)) types = result;
 		}
 		result = await this.callHook("types", {
@@ -3824,12 +3841,13 @@ Note: Please ensure the plugin package's default export is a class that extends
 			sequential: true,
 			order: "post",
 			result: "merge",
+			merge,
 			asNextParam
 		}, types);
 		if (result) {
 			if ((0, _stryke_type_checks_is_set_object.isSetObject)(result)) {
 				types = result.code;
-				if (Array.isArray(result.directives) && result.directives.length > 0) directives.push(...result.directives);
+				if (Array.isArray(result.directives) && result.directives.length > 0) directives = (0, _stryke_helpers_get_unique.getUnique)([...directives, ...result.directives]).filter(Boolean);
 			} else if ((0, _stryke_type_checks_is_set_string.isSetString)(result)) types = result;
 		}
 		if ((0, _stryke_type_checks_is_set_string.isSetString)(types?.trim()) || directives.length > 0) await context.fs.write(context.typesPath, `${directives.length > 0 ? `${directives.map((directive) => `/// <reference types="${directive}" />`).join("\n")}
@@ -3945,4 +3963,4 @@ Object.defineProperty(exports, 'version', {
     return version;
   }
 });
-//# sourceMappingURL=api-DECsh_tb.cjs.map
+//# sourceMappingURL=api-CvAosB7E.cjs.map