powerlines 0.42.33 → 0.42.35

package/dist/{api-KqyZ6kMY.mjs → api-DBPe7xMz.mjs}

@@ -1,7 +1,7 @@
 import { n as createProgram } from "./ts-morph-B85ZbV1Q.mjs";
 import { t as utils_exports } from "./utils.mjs";
 import { t as plugin_utils_exports } from "./plugin-utils.mjs";
-import { d as writeMetaFile, f as callHook, p as mergeConfigs, t as PowerlinesAPIContext } from "./api-context-DiZCovj6.mjs";
+import { d as writeMetaFile, f as callHook, p as mergeConfigs, t as PowerlinesAPIContext } from "./api-context-CEJ3s11k.mjs";
 import { a as isIncludeMatchFound, i as getTsconfigFilePath, r as getParsedTypeScriptConfig } from "./tsconfig-DoV1dUYg.mjs";
 import { formatLogMessage } from "@storm-software/config-tools/logger/console";
 import { toArray } from "@stryke/convert/to-array";
@@ -33,8 +33,7 @@ import chalk from "chalk";
 import defu$1 from "defu";
 import Handlebars from "handlebars";
 import { prettyBytes } from "@stryke/string-format/pretty-bytes";
-import { match } from "bundle-require";
-import { DiagnosticCategory } from "ts-morph";
+import { DiagnosticCategory, Node, Project } from "ts-morph";
 import { getPackageName, getPackageVersion, hasPackageVersion } from "@stryke/string-format/package";
 import { readJsonFile } from "@stryke/fs/json";
 import { getObjectDiff } from "@donedeal0/superdiff";
@@ -42,7 +41,7 @@ import { StormJSON } from "@stryke/json/storm-json";
 
 //#region package.json
 var name = "powerlines";
-var version = "0.42.33";
+var version = "0.42.35";
 
 //#endregion
 //#region src/_internal/helpers/generate-types.ts
@@ -55,31 +54,96 @@ var version = "0.42.33";
 function formatTypes(code = "") {
 	return code.replaceAll("#private;", "").replace(/__Ω/g, "");
 }
-/**
-* Formats a generated TypeScript module in the types source code.
-*
-* @param context - The Powerlines context.
-* @param id - The module ID for the generated TypeScript module.
-* @param code - The generated TypeScript module code.
-* @returns The formatted TypeScript module code.
-*/
-async function formatTypesModule(context, id, code) {
-	const moduleComment = code.match(new RegExp(`\\/\\*\\*(?s:.)*?@module\\s+${context.config.framework}:${id}(?s:.)*?\\*\\/\\s+`))?.find((comment) => isSetString(comment?.trim()));
-	const ast = await context.parse(code, {
-		lang: "dts",
-		astType: "ts"
+async function writeModuleDeclarations(context, filePath, id, code, fileToModuleMap) {
+	const mappings = /* @__PURE__ */ new Map();
+	const ambient = [];
+	const sourceFile = new Project({ useInMemoryFileSystem: true }).createSourceFile("module.d.ts", code);
+	for (const ref of sourceFile.getTypeReferenceDirectives()) ambient.push({
+		id: ref.getFileName(),
+		external: true
 	});
+	const importLines = [];
+	const reExportLines = [];
+	const declarationLines = [];
+	for (const statement of sourceFile.getStatements()) {
+		if (Node.isImportDeclaration(statement)) {
+			const moduleSpec = statement.getModuleSpecifierValue();
+			const defaultImport = statement.getDefaultImport();
+			const namedImports = statement.getNamedImports();
+			const namespaceImport = statement.getNamespaceImport();
+			if (!defaultImport && namedImports.length === 0 && !namespaceImport) {
+				ambient.push({
+					id: moduleSpec,
+					external: !context.fs.isResolvableId(moduleSpec, filePath)
+				});
+				continue;
+			}
+			let resolvedSpec = moduleSpec;
+			if (context.fs.isResolvableId(moduleSpec, filePath)) {
+				const resolved = await context.resolve(moduleSpec, filePath);
+				if (resolved) {
+					const mapped = fileToModuleMap.get(resolved.id);
+					if (mapped) resolvedSpec = mapped;
+					else context.trace(`Could not resolve relative import '${moduleSpec}' from '${filePath}' to a builtin module. Keeping as-is.`);
+				}
+			}
+			if (namespaceImport) importLines.push(`\timport * as ${namespaceImport.getText()} from '${resolvedSpec}';`);
+			else {
+				const specifiers = [];
+				if (defaultImport) specifiers.push(`default as ${defaultImport.getText()}`);
+				for (const named of namedImports) {
+					const alias = named.getAliasNode()?.getText();
+					specifiers.push(alias ? `${named.getName()} as ${alias}` : named.getName());
+				}
+				if (specifiers.length > 0) {
+					const typeOnly = statement.isTypeOnly() ? " type" : "";
+					importLines.push(`\timport${typeOnly} { ${specifiers.join(", ")} } from '${resolvedSpec}';`);
+				}
+			}
+			continue;
+		}
+		if (Node.isExportDeclaration(statement)) {
+			const moduleSpec = statement.getModuleSpecifierValue();
+			if (moduleSpec) {
+				let resolvedSpec = moduleSpec;
+				if (context.fs.isResolvableId(moduleSpec, filePath)) {
+					const resolved = await context.resolve(moduleSpec, filePath);
+					if (resolved) {
+						const mapped = fileToModuleMap.get(resolved.id);
+						if (mapped) resolvedSpec = mapped;
+						else context.trace(`Could not resolve relative import '${moduleSpec}' from '${filePath}' to a builtin module. Keeping as-is.`);
+					}
+				}
+				const namedExports = statement.getNamedExports();
+				if (namedExports.length > 0) {
+					const specifiers = namedExports.map((named) => {
+						const alias = named.getAliasNode()?.getText();
+						return alias ? `${named.getName()} as ${alias}` : named.getName();
+					});
+					const typeOnly = statement.isTypeOnly() ? " type" : "";
+					reExportLines.push(`\texport${typeOnly} { ${specifiers.join(", ")} } from '${resolvedSpec}';`);
+				} else reExportLines.push(`\texport * from '${resolvedSpec}';`);
+			} else declarationLines.push(`\t${statement.getText()}`);
+			continue;
+		}
+		if (Node.isExportAssignment(statement)) {
+			declarationLines.push(`\t${statement.getText()}`);
+			continue;
+		}
+		const text = statement.getText();
+		if (text.includes("//# sourceMappingURL=")) continue;
+		declarationLines.push(formatTypes(text.replace(/^(export\s+)?declare\s+/, "$1")).split("\n").map((line) => `\t${line}`).join("\n"));
+	}
+	const moduleComment = code.match(new RegExp(`\\/\\*\\*(?s:.)*?@module\\s+${context.config.framework}:${id}(?s:.)*?\\*\\/\\s+`))?.find((comment) => isSetString(comment?.trim()));
+	let content = `${moduleComment ? `${moduleComment.trim()}\n` : ""}declare module "${context.config.framework}:${id}" {`;
+	for (const line of importLines) content += `\n${line}`;
+	for (const line of reExportLines) content += `\n${line}`;
+	for (const line of declarationLines) content += `\n${line}`;
+	content += "\n}";
 	return {
-		code: `${moduleComment ? `
-${moduleComment.trim()}` : ""}
-declare module "${context.config.framework}:${id}" {
-  ${ast.module.staticImports.filter((staticImport) => !match(staticImport.moduleRequest.value, context.config.resolve.external) && !staticImport.moduleRequest.value.startsWith("node:")).reduce((ret, staticImport) => {
-			return ret.replaceAll(new RegExp(`^import.*from\\s+['"]${staticImport.moduleRequest.value}['"]\\s*;?$`, "gm"), "");
-		}, code).replace(moduleComment ?? "", "").replaceAll(/^\s*export\s*declare\s*/gm, "export ").replaceAll(/^\s*declare\s*/gm, "").replaceAll(/^\s*export\s*\{\s*\}/gm, "").replaceAll(/^\s*export\s*=\s*/gm, "export default ").replaceAll(/^\s*export\s*\{/gm, "export {").replaceAll(/^\s*export\s*default\s*\{/gm, "export default {").replaceAll(/^\s*export\s*function\s*/gm, "export function ").replaceAll(/^\s*export\s*class\s*/gm, "export class ").replaceAll(/^\s*export\s*interface\s*/gm, "export interface ").replaceAll(/^\s*export\s*type\s*/gm, "export type ").replaceAll(/^\s*export\s*enum\s*/gm, "export enum ").replaceAll(/^\s*export\s*namespace\s*/gm, "export namespace ")}${ast.module.staticExports.length === 0 ? `
-  export {};` : ""}
-}
-`,
-		directives: ast.module.staticImports.filter((staticImport) => match(staticImport.moduleRequest.value, context.config.resolve.external) || staticImport.moduleRequest.value.startsWith("node:")).map((staticImport) => staticImport.moduleRequest.value.startsWith("node:") ? "node" : Object.keys(context.packageJson.dependencies ?? {}).find((dependency) => staticImport.moduleRequest.value.startsWith(dependency) || staticImport.moduleRequest.value.startsWith(dependency.replace(/^@types\//, ""))) || Object.keys(context.packageJson.devDependencies ?? {}).find((dependency) => staticImport.moduleRequest.value.startsWith(dependency) || staticImport.moduleRequest.value.startsWith(dependency.replace(/^@types\//, ""))) || Object.keys(context.packageJson.peerDependencies ?? {}).find((dependency) => staticImport.moduleRequest.value.startsWith(dependency) || staticImport.moduleRequest.value.startsWith(dependency.replace(/^@types\//, ""))) || staticImport.moduleRequest.value).filter(Boolean).map((dependency) => dependency.replace(/^@types\//, ""))
+		content,
+		mappings,
+		ambient
 	};
 }
 /**
@@ -126,24 +190,73 @@ async function emitBuiltinTypes(context, files) {
 			directives: []
 		};
 	}
-	let result = "";
-	const directives = [];
+	const fileToModuleMap = /* @__PURE__ */ new Map();
+	const emittedBuiltinFiles = [];
 	for (const emittedFile of emittedFiles) {
-		context.trace(`Processing emitted type declaration file: ${emittedFile.filePath}`);
 		const filePath = appendPath(emittedFile.filePath, context.workspaceConfig.workspaceRoot);
 		if (!filePath.endsWith(".map") && findFileName(filePath) !== "tsconfig.tsbuildinfo" && isParentPath(filePath, context.builtinsPath)) {
 			const moduleId = replaceExtension(replacePath(replacePath(filePath, context.builtinsPath), replacePath(context.builtinsPath, context.workspaceConfig.workspaceRoot)), "", { fullExtension: true });
 			if (context.builtins.includes(moduleId)) {
-				const formatted = await formatTypesModule(context, moduleId, emittedFile.text);
-				result += formatted.code;
-				directives.push(...formatted.directives);
+				fileToModuleMap.set(filePath, moduleId);
+				emittedBuiltinFiles.push({
+					filePath,
+					text: emittedFile.text
+				});
 			}
 		}
 	}
-	result = await (0, utils_exports.format)(context, context.typesPath, formatTypes(result));
-	context.debug(`A TypeScript declaration file (size: ${prettyBytes(new Blob(toArray(result)).size)}) emitted for the built-in modules types.`);
+	const builtins = await context.getBuiltins();
+	const emittedContentMap = /* @__PURE__ */ new Map();
+	for (const emittedFile of emittedFiles) {
+		const filePath = appendPath(emittedFile.filePath, context.workspaceConfig.workspaceRoot);
+		if (!filePath.endsWith(".map") && findFileName(filePath) !== "tsconfig.tsbuildinfo") emittedContentMap.set(filePath, emittedFile.text);
+	}
+	let code = "";
+	const directives = [];
+	const ambientModules = /* @__PURE__ */ new Set();
+	let isFirst = true;
+	for (const entry of emittedBuiltinFiles) {
+		context.trace(`Processing emitted type declaration file: ${entry.filePath}`);
+		const moduleId = fileToModuleMap.get(entry.filePath);
+		const moduleDecl = await writeModuleDeclarations(context, entry.filePath, moduleId, entry.text, fileToModuleMap);
+		if (!isFirst) code += "\n\n";
+		isFirst = false;
+		code += moduleDecl.content;
+		for (const dep of moduleDecl.ambient) if (dep.external) {
+			const directive = dep.id;
+			if (!directives.includes(directive)) directives.push(directive);
+		} else if (builtins.some((builtin) => builtin.id === dep.id)) ambientModules.add(builtins.find((builtin) => builtin.id === dep.id).path);
+		else if (builtins.some((builtin) => replaceExtension(builtin.path) === replaceExtension(dep.id))) ambientModules.add(dep.id);
+		else {
+			const resolved = await context.resolve(dep.id, entry.filePath);
+			if (resolved) {
+				for (const name of [
+					resolved.id,
+					`${resolved.id}.d.ts`,
+					`${resolved.id}.d.mts`,
+					`${resolved.id}.d.cts`,
+					replaceExtension(resolved.id, ".d.ts"),
+					replaceExtension(resolved.id, ".d.mts"),
+					replaceExtension(resolved.id, ".d.cts"),
+					`${resolved.id}/index.d.ts`
+				]) if (emittedContentMap.has(name)) {
+					ambientModules.add(name);
+					break;
+				}
+			}
+		}
+	}
+	for (const ambientFile of ambientModules) {
+		const dts = emittedContentMap.get(ambientFile);
+		if (dts) {
+			const cleaned = dts.replace(/\/\/# sourceMappingURL=.*$/m, "").trim();
+			if (cleaned) code += `\n\n${formatTypes(cleaned)}`;
+		}
+	}
+	code = await (0, utils_exports.format)(context, context.typesPath, code);
+	context.debug(`A TypeScript declaration file (size: ${prettyBytes(new Blob(toArray(code)).size)}) emitted for the built-in modules types.`);
 	return {
-		code: result,
+		code,
 		directives
 	};
 }
@@ -320,10 +433,11 @@ var PowerlinesAPI = class PowerlinesAPI {
 			api,
 			addPlugin: api.#addPlugin.bind(api)
 		};
+		const timer = api.context.timer("Initialization");
 		api.context.info(`🔌 The Powerlines Engine v${version} has started`);
 		for (const plugin of api.context.config.plugins.flat(10) ?? []) await api.#addPlugin(plugin);
 		if (api.context.plugins.length === 0) api.context.warn("No Powerlines plugins were specified in the options. Please ensure this is correct, as it is generally not recommended.");
-		else api.context.info(`🔌 Loaded ${api.context.plugins.length} ${titleCase(api.context.config.framework)} plugin${api.context.plugins.length > 1 ? "s" : ""}: \n\n${api.context.plugins.map((plugin, index) => ` ${index + 1}. ${(0, utils_exports.colorText)(plugin.name)}`).join("\n")}`);
+		else api.context.info(`Loaded ${api.context.plugins.length} ${titleCase(api.context.config.framework)} plugin${api.context.plugins.length > 1 ? "s" : ""}: \n${api.context.plugins.map((plugin, index) => ` ${index + 1}. ${(0, utils_exports.colorText)(plugin.name)}`).join("\n")}`);
 		const pluginConfig = await api.callHook("config", {
 			environment: await api.context.getEnvironment(),
 			sequential: true,
@@ -331,6 +445,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 			merge: mergeConfigs
 		});
 		await api.context.withUserConfig(pluginConfig, { isHighPriority: false });
+		timer();
 		return api;
 	}
 	/**
@@ -342,6 +457,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 	* @param inlineConfig - The inline configuration for the types command
 	*/
 	async types(inlineConfig = { command: "types" }) {
+		const timer = this.context.timer("Types");
 		this.context.info(" 🏗️  Generating typescript declarations for the Powerlines project");
 		this.context.debug(" Aggregating configuration options for the Powerlines project");
 		inlineConfig.command ??= "types";
@@ -385,6 +501,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 			context.persistedMeta = context.meta;
 		});
 		this.context.debug("✔ Powerlines types generation has completed successfully");
+		timer();
 	}
 	/**
 	* Prepare the Powerlines API
@@ -395,6 +512,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 	* @param inlineConfig - The inline configuration for the prepare command
 	*/
 	async prepare(inlineConfig = { command: "prepare" }) {
+		const timer = this.context.timer("Prepare");
 		this.context.info(" 🏗️  Preparing the Powerlines project");
 		this.context.debug(" Aggregating configuration options for the Powerlines project");
 		inlineConfig.command ??= "prepare";
@@ -445,6 +563,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 			context.persistedMeta = context.meta;
 		});
 		this.context.debug("✔ Powerlines preparation has completed successfully");
+		timer();
 	}
 	/**
 	* Create a new Powerlines project
@@ -456,6 +575,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 	* @returns A promise that resolves when the project has been created
 	*/
 	async new(inlineConfig) {
+		const timer = this.context.timer("New");
 		this.context.info(" 🆕 Creating a new Powerlines project");
 		inlineConfig.command ??= "new";
 		await this.prepare(inlineConfig);
@@ -496,6 +616,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 			});
 		});
 		this.context.debug("✔ Powerlines new command completed successfully");
+		timer();
 	}
 	/**
 	* Clean any previously prepared artifacts
@@ -507,6 +628,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 	* @returns A promise that resolves when the clean command has completed
 	*/
 	async clean(inlineConfig = { command: "clean" }) {
+		const timer = this.context.timer("Clean");
 		this.context.info(" 🧹 Cleaning the previous Powerlines artifacts");
 		inlineConfig.command ??= "clean";
 		await this.prepare(inlineConfig);
@@ -520,6 +642,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 			});
 		});
 		this.context.debug("✔ Powerlines cleaning completed successfully");
+		timer();
 	}
 	/**
 	* Lint the project
@@ -528,6 +651,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 	* @returns A promise that resolves when the lint command has completed
 	*/
 	async lint(inlineConfig = { command: "lint" }) {
+		const timer = this.context.timer("Lint");
 		this.context.info(" 📝 Linting the Powerlines project");
 		inlineConfig.command ??= "lint";
 		await this.prepare(inlineConfig);
@@ -538,6 +662,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 			});
 		});
 		this.context.debug("✔ Powerlines linting completed successfully");
+		timer();
 	}
 	/**
 	* Build the project
@@ -549,6 +674,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 	* @returns A promise that resolves when the build command has completed
 	*/
 	async build(inlineConfig = { command: "build" }) {
+		const timer = this.context.timer("Build");
 		this.context.info(" 📦  Building the Powerlines project");
 		await this.context.generateChecksum();
 		if (this.context.meta.checksum !== this.context.persistedMeta?.checksum || this.context.config.skipCache) {
@@ -561,6 +687,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 			await this.#handleBuild(context);
 		});
 		this.context.debug("✔ Powerlines build completed successfully");
+		timer();
 	}
 	/**
 	* Prepare the documentation for the project
@@ -569,6 +696,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 	* @returns A promise that resolves when the documentation generation has completed
 	*/
 	async docs(inlineConfig = { command: "docs" }) {
+		const timer = this.context.timer("Docs");
 		this.context.info(" 📓 Generating documentation for the Powerlines project");
 		inlineConfig.command ??= "docs";
 		await this.prepare(inlineConfig);
@@ -581,6 +709,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 			});
 		});
 		this.context.debug("✔ Powerlines documentation generation completed successfully");
+		timer();
 	}
 	/**
 	* Deploy the project source code
@@ -591,6 +720,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 	* @param inlineConfig - The inline configuration for the deploy command
 	*/
 	async deploy(inlineConfig = { command: "deploy" }) {
+		const timer = this.context.timer("Deploy");
 		this.context.info(" 🚀 Deploying the Powerlines project");
 		inlineConfig.command ??= "deploy";
 		await this.prepare(inlineConfig);
@@ -598,9 +728,10 @@ var PowerlinesAPI = class PowerlinesAPI {
 			await this.callHook("deploy", { environment: context });
 		});
 		this.context.debug("✔ Powerlines deploy completed successfully");
+		timer();
 	}
 	/**
-	* Finalization process
+	* Finalization/cleanup processing for the Powerlines API
 	*
 	* @remarks
 	* This step includes any final processes or clean up required by Powerlines. It will be run after each Powerlines command.
@@ -608,6 +739,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 	* @returns A promise that resolves when the finalization process has completed
 	*/
 	async finalize() {
+		const timer = this.context.timer("Finalization");
 		this.context.info(" 🏁 Powerlines finalization processes started");
 		await this.#executeEnvironments(async (context) => {
 			await this.callHook("finalize", { environment: context });
@@ -615,6 +747,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 			if (existsSync(context.cachePath) && !(await listFiles(joinPaths(context.cachePath, "**/*")))?.length) await removeDirectory(context.cachePath);
 		});
 		this.context.debug("✔ Powerlines finalization completed successfully");
+		timer();
 	}
 	/**
 	* Invokes the configured plugin hooks
@@ -764,7 +897,7 @@ var PowerlinesAPI = class PowerlinesAPI {
 		if (!plugins) throw new Error(`The plugin configuration ${JSON.stringify(awaited)} is invalid. This configuration must point to a valid Powerlines plugin module.`);
 		if (plugins.length > 0 && !plugins.every(plugin_utils_exports.isPlugin)) throw new Error(`The plugin option ${JSON.stringify(plugins)} does not export a valid module. This configuration must point to a valid Powerlines plugin module.`);
 		const result = [];
-		for (const plugin of plugins) if ((0, plugin_utils_exports.checkDedupe)(plugin, this.context.plugins)) this.context.trace(`Duplicate ${chalk.bold.cyanBright(plugin.name)} plugin dependency detected - Skipping initialization.`);
+		for (const plugin of plugins) if ((0, plugin_utils_exports.isDuplicate)(plugin, this.context.plugins)) this.context.trace(`Duplicate ${chalk.bold.cyanBright(plugin.name)} plugin dependency detected - Skipping initialization.`);
 		else {
 			result.push(plugin);
 			this.context.trace(`Initializing the ${chalk.bold.cyanBright(plugin.name)} plugin...`);
@@ -894,4 +1027,4 @@ ${formatTypes(code)}
 
 //#endregion
 export { name as n, version as r, PowerlinesAPI as t };
-//# sourceMappingURL=api-KqyZ6kMY.mjs.map
+//# sourceMappingURL=api-DBPe7xMz.mjs.map