powerlines 0.42.24 → 0.42.25

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-Dpz6n-IJ.mjs → api-CpVy0jQR.mjs}

@@ -10,11 +10,12 @@ import { formatLogMessage } from "@storm-software/config-tools/logger/console";
 import { toArray } from "@stryke/convert/to-array";
 import { copyFiles } from "@stryke/fs/copy-file";
 import { existsSync } from "@stryke/fs/exists";
-import { createDirectory } from "@stryke/fs/helpers";
+import { createDirectory, removeDirectory } from "@stryke/fs/helpers";
 import { install } from "@stryke/fs/install";
 import { listFiles } from "@stryke/fs/list-files";
 import { doesPackageMatch, getPackageListing, isPackageExists, isPackageListed } from "@stryke/fs/package-fns";
 import { getResolutionCombinations, resolve, resolvePackage, resolveSync } from "@stryke/fs/resolve";
+import { getUnique, getUniqueBy } from "@stryke/helpers/get-unique";
 import { omit } from "@stryke/helpers/omit";
 import { appendPath } from "@stryke/path/append";
 import { findFileDotExtensionSafe, findFileExtensionSafe, findFileName, findFilePath, hasFileExtension, relativePath } from "@stryke/path/file-path-fns";
@@ -47,7 +48,6 @@ import { getEnvPaths } from "@stryke/env/get-env-paths";
 import { murmurhash } from "@stryke/hash";
 import { hashDirectory } from "@stryke/hash/node";
 import { deepClone } from "@stryke/helpers/deep-clone";
-import { getUnique, getUniqueBy } from "@stryke/helpers/get-unique";
 import { fetchRequest } from "@stryke/http/fetch";
 import { joinPaths as joinPaths$1 } from "@stryke/path/join";
 import { isNull } from "@stryke/type-checks/is-null";
@@ -73,7 +73,7 @@ import { setParseImpl } from "unplugin";
 
 //#region package.json
 var name = "powerlines";
-var version = "0.42.24";
+var version = "0.42.25";
 
 //#endregion
 //#region src/_internal/helpers/generate-types.ts
@@ -157,7 +157,8 @@ const mergeResultObjects = createDefu((obj, key, value) => {
 * @returns The merged result.
 */
 function mergeResults(currentResult, previousResults) {
-	if (isString(currentResult)) previousResults = [`${isString(previousResults[0]) ? previousResults[0] || "" : ""}\n${currentResult || ""}`.trim()];
+	if (!previousResults || previousResults.length === 0) return [currentResult];
+	if (isSetString(currentResult)) previousResults = [`${isSetString(previousResults[0]) ? previousResults[0] || "" : ""}\n${isSetString(previousResults[0]) ? currentResult.replace(previousResults[0], "") : currentResult}`.trim()];
 	else if (isObject(currentResult)) previousResults = [mergeResultObjects(currentResult, previousResults[0] ?? {})];
 	return previousResults;
 }
@@ -169,8 +170,8 @@ function mergeResults(currentResult, previousResults) {
 * @returns The merged result.
 */
 function mergeConfigs(currentResult, previousResults) {
-	if (isString(currentResult)) previousResults = [`${isString(previousResults[0]) ? previousResults[0] || "" : ""}\n${currentResult || ""}`.trim()];
-	else if (isObject(currentResult)) previousResults = [(0, plugin_utils_exports.mergeConfig)(currentResult, previousResults[0] ?? {})];
+	if (isString(currentResult)) previousResults = `${isString(previousResults) ? previousResults || "" : ""}\n${currentResult || ""}`.trim();
+	else if (isObject(currentResult)) previousResults = (0, plugin_utils_exports.mergeConfig)(currentResult, previousResults ?? {});
 	return previousResults;
 }
 /**
@@ -204,7 +205,7 @@ async function callHook(context, key, options, ...args) {
 				if (results.length > 0 && sequenceArgs.length > 0) sequenceArgs[0] = 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);
 			}
 		}
@@ -3576,6 +3577,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 		await this.#executeEnvironments(async (context) => {
 			await this.callHook("finalize", { environment: context });
 			await context.fs.dispose();
+			if (existsSync(context.cachePath) && !(await listFiles(joinPaths(context.cachePath, "**/*")))?.length) await removeDirectory(context.cachePath);
 		});
 		this.context.debug("✔ Powerlines finalization completed successfully");
 	}
@@ -3782,25 +3784,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 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 = 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 (!isSetString(currentResult) && !isSetObject(currentResult) && !isSetString(previousResult) && !isSetObject(previousResult)) return types;
+			const previous = (isSetString(previousResult) ? previousResult : isSetObject(previousResult) ? previousResult.code : "").trim().replace(types, "").trim();
+			return {
+				directives: [...isSetObject(currentResult) && currentResult.directives ? currentResult.directives : [], ...isSetObject(previousResult) && previousResult.directives ? previousResult.directives : []],
+				code: `${types}\n${previous}\n${(isSetString(currentResult) ? currentResult : isSetObject(currentResult) ? currentResult.code : "").trim().replace(previous, "").trim().replace(types, "").trim()}`
+			};
+		};
 		const asNextParam = (previousResult) => 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 (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 = getUnique([...directives, ...result.directives]).filter(Boolean);
 			} else if (isSetString(result)) types = result;
 		}
 		result = await this.callHook("types", {
@@ -3808,12 +3819,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 (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 = getUnique([...directives, ...result.directives]).filter(Boolean);
 			} else if (isSetString(result)) types = result;
 		}
 		result = await this.callHook("types", {
@@ -3821,12 +3833,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 (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 = getUnique([...directives, ...result.directives]).filter(Boolean);
 			} else if (isSetString(result)) types = result;
 		}
 		if (isSetString(types?.trim()) || directives.length > 0) await context.fs.write(context.typesPath, `${directives.length > 0 ? `${directives.map((directive) => `/// <reference types="${directive}" />`).join("\n")}
@@ -3853,4 +3866,4 @@ ${formatTypes(types)}
 
 //#endregion
 export { createUnpluginFactory as a, FileMetadata as c, FileSystem as d, _capnpFileId as f, createPluginContext as i, FileMetadata_KeyValuePair as l, version as m, PowerlinesAPIContext as n, PowerlinesContext as o, name as p, PowerlinesEnvironmentContext as r, FileId as s, PowerlinesAPI as t, FileStorage as u };
-//# sourceMappingURL=api-Dpz6n-IJ.mjs.map
+//# sourceMappingURL=api-CpVy0jQR.mjs.map