powerlines 0.42.37 → 0.42.38

package/dist/{api-BVTRS4-e.mjs → api-BrPeHPR6.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-CEJ3s11k.mjs";
+import { d as writeMetaFile, f as callHook, p as mergeConfigs, t as PowerlinesAPIContext } from "./api-context-DuZIIJsm.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";
@@ -41,7 +41,7 @@ import { StormJSON } from "@stryke/json/storm-json";
 
 //#region package.json
 var name = "powerlines";
-var version = "0.42.37";
+var version = "0.42.38";
 
 //#endregion
 //#region src/_internal/helpers/generate-types.ts
@@ -54,96 +54,135 @@ var version = "0.42.37";
 function formatTypes(code = "") {
 	return code.replaceAll("#private;", "").replace(/__Ω/g, "");
 }
-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
+async function extractModuleDeclarations(ctx, filePath, name, text) {
+	const imports = [];
+	const exports = [];
+	const comment = text.match(new RegExp(`\\/\\*\\*(?s:.)*?@module\\s+${ctx.context.config.framework}:${name}(?s:.)*?\\*\\/\\s+`))?.find((comment) => isSetString(comment?.trim()));
+	const sourceFile = new Project({ useInMemoryFileSystem: true }).createSourceFile("module.d.ts", text);
+	for (const ref of sourceFile.getTypeReferenceDirectives()) if (ref.getFileName() && !ctx.context.builtins.some((builtin) => ref.getFileName().endsWith(builtin))) imports.push({
+		name: ref.getFileName(),
+		ambient: 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)
+	for (const statement of sourceFile.getStatements()) if (Node.isImportDeclaration(statement)) {
+		const moduleSpec = statement.getModuleSpecifierValue();
+		if (statement.getNamespaceImport()) imports.push({
+			name: moduleSpec,
+			specifiers: [{ name: statement.getNamespaceImport().getText() }],
+			all: true
+		});
+		else if (statement.getNamedImports().length > 0 || statement.getDefaultImport()) {
+			const specifiers = [];
+			if (statement.getDefaultImport()) specifiers.push({
+				name: statement.getDefaultImport().getText(),
+				default: true,
+				type: statement.isTypeOnly()
+			});
+			statement.getNamedImports().forEach((named) => {
+				specifiers.push({
+					name: named.getName(),
+					alias: named.getAliasNode()?.getText(),
+					type: statement.isTypeOnly()
 				});
-				continue;
-			}
+			});
+			imports.push({
+				name: moduleSpec,
+				specifiers
+			});
+		}
+	} else 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.`);
-				}
-			}
-			if (namespaceImport) importLines.push(`\timport * as ${namespaceImport.getText()} from '${resolvedSpec}';`);
+			if (!ctx.context.builtins.includes(moduleSpec)) if (ctx.emitted.has(moduleSpec)) resolvedSpec = ctx.emitted.get(moduleSpec);
 			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}';`);
-				}
+				const resolvedModule = await ctx.context.resolve(moduleSpec, filePath);
+				if (isSetString(resolvedModule?.id)) resolvedSpec = resolvedModule.id;
 			}
-			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 namedExports = statement.getNamedExports();
+			if (namedExports.length > 0) exports.push({
+				name: resolvedSpec,
+				text: statement.getText(),
+				fullText: statement.getFullText(),
+				specifiers: namedExports.map((named) => ({
+					name: named.getName(),
+					alias: named.getAliasNode()?.getText(),
+					type: statement.isTypeOnly()
+				})),
+				comment: statement.getLeadingCommentRanges().filter((c) => isSetString(c.getText().trim()) && !c.getText().includes("@module")).map((c) => c.getText().trim()).join("\n").trim()
+			});
+			else exports.push({
+				name: resolvedSpec,
+				text: statement.getText(),
+				fullText: statement.getFullText(),
+				all: true,
+				comment: statement.getLeadingCommentRanges().filter((c) => isSetString(c.getText().trim()) && !c.getText().includes("@module")).map((c) => c.getText().trim()).join("\n").trim()
+			});
+		} else {
+			const specifiers = statement.getNamedExports().map((named) => ({
+				name: named.getName(),
+				alias: named.getAliasNode()?.getText(),
+				type: statement.isTypeOnly()
+			}));
+			if (specifiers.length > 0) exports.push({
+				text: statement.getText(),
+				fullText: statement.getFullText(),
+				specifiers,
+				comment: statement.getLeadingCommentRanges().filter((c) => isSetString(c.getText().trim()) && !c.getText().includes("@module")).map((c) => c.getText().trim()).join("\n")
+			});
 		}
-		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}";
+	} else if (Node.isExportAssignment(statement)) exports.push({
+		text: statement.getText(),
+		fullText: statement.getFullText(),
+		comment: statement.getLeadingCommentRanges().filter((c) => isSetString(c.getText().trim()) && !c.getText().includes("@module")).map((c) => c.getText().trim()).join("\n")
+	});
+	else if (Node.isFunctionDeclaration(statement) && statement.isExported() && statement.getNameNode()) exports.push({
+		text: statement.getText(),
+		fullText: statement.getFullText(),
+		specifiers: [{ name: statement.getNameNode().getText() }],
+		comment: statement.getLeadingCommentRanges().filter((c) => isSetString(c.getText().trim()) && !c.getText().includes("@module")).map((c) => c.getText().trim()).join("\n")
+	});
+	else if (Node.isVariableStatement(statement) && statement.isExported()) exports.push({
+		text: statement.getText(),
+		fullText: statement.getFullText(),
+		specifiers: statement.getDeclarationList().getDeclarations().filter((decl) => decl.getNameNode() && Node.isIdentifier(decl.getNameNode())).map((decl) => ({ name: decl.getNameNode().getText() })),
+		comment: statement.getLeadingCommentRanges().filter((c) => isSetString(c.getText().trim()) && !c.getText().includes("@module")).map((c) => c.getText().trim()).join("\n")
+	});
+	else if (Node.isClassDeclaration(statement) && statement.isExported()) {
+		const nameNode = statement.getNameNode();
+		exports.push({
+			text: statement.getText(),
+			fullText: statement.getFullText(),
+			specifiers: nameNode ? [{ name: nameNode.getText() }] : void 0,
+			comment: statement.getLeadingCommentRanges().filter((c) => isSetString(c.getText().trim()) && !c.getText().includes("@module")).map((c) => c.getText().trim()).join("\n")
+		});
+	} else if (Node.isInterfaceDeclaration(statement) && statement.isExported()) {
+		const nameNode = statement.getNameNode();
+		exports.push({
+			text: statement.getText(),
+			fullText: statement.getFullText(),
+			specifiers: nameNode ? [{ name: nameNode.getText() }] : void 0,
+			comment: statement.getLeadingCommentRanges().filter((c) => isSetString(c.getText().trim()) && !c.getText().includes("@module")).map((c) => c.getText().trim()).join("\n")
+		});
+	} else if (Node.isTypeAliasDeclaration(statement) && statement.isExported()) {
+		const nameNode = statement.getNameNode();
+		exports.push({
+			text: statement.getText(),
+			fullText: statement.getFullText(),
+			specifiers: nameNode ? [{ name: nameNode.getText() }] : void 0,
+			comment: statement.getLeadingCommentRanges().filter((c) => isSetString(c.getText().trim()) && !c.getText().includes("@module")).map((c) => c.getText().trim()).join("\n")
+		});
+	} else if (ctx.context.config.output.sourceMap || !statement.getFullText().includes("//# sourceMappingURL=")) exports.push({
+		text: statement.getText(),
+		fullText: statement.getFullText(),
+		comment: statement.getLeadingCommentRanges().filter((c) => isSetString(c.getText().trim()) && !c.getText().includes("@module")).map((c) => c.getText().trim()).join("\n")
+	});
 	return {
-		content,
-		mappings,
-		ambient
+		name,
+		text,
+		sourceFile,
+		comment,
+		imports,
+		exports
 	};
 }
 /**
@@ -190,68 +229,77 @@ async function emitBuiltinTypes(context, files) {
 			directives: []
 		};
 	}
-	const fileToModuleMap = /* @__PURE__ */ new Map();
-	const emittedBuiltinFiles = [];
-	for (const emittedFile of emittedFiles) {
+	const ctx = {
+		context,
+		modules: [],
+		emitted: /* @__PURE__ */ new Map()
+	};
+	await Promise.all(emittedFiles.map(async (emittedFile) => {
 		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)) {
-				fileToModuleMap.set(filePath, moduleId);
-				emittedBuiltinFiles.push({
-					filePath,
-					text: emittedFile.text
-				});
+			const moduleName = replaceExtension(replacePath(replacePath(filePath, context.builtinsPath), replacePath(context.builtinsPath, context.workspaceConfig.workspaceRoot)), "", { fullExtension: true });
+			if (context.builtins.includes(moduleName)) {
+				ctx.emitted.set(filePath, moduleName);
+				ctx.modules.push(await extractModuleDeclarations(ctx, filePath, moduleName, emittedFile.text));
 			}
 		}
-	}
-	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);
+	}));
+	const commonDeclarations = [];
+	for (const mod of ctx.modules) for (const importRef of mod.imports.filter((importRef) => context.builtins.some((builtin) => importRef.name.endsWith(`:${builtin}`)))) {
+		const moduleRef = ctx.modules.find((moduleRef) => importRef.name.endsWith(`:${moduleRef.name}`));
+		if (moduleRef) {
+			let declaration;
+			for (const decl of moduleRef.exports.filter((decl) => isSetObject(decl))) {
+				const specifiers = decl.specifiers?.filter((specifier) => importRef.specifiers?.some((s) => (specifier.alias ? specifier.alias : specifier.name) === (s.alias ? s.alias : s.name)));
+				if (specifiers && specifiers.length > 0) {
+					importRef.specifiers = importRef.specifiers?.filter((s) => !specifiers.some((specifier) => (specifier.alias ? specifier.alias : specifier.name) === (s.alias ? s.alias : s.name)));
+					if (importRef.specifiers && importRef.specifiers.length === 0 && !importRef.all && !importRef.ambient) mod.imports = mod.imports.filter((imp) => imp.name !== importRef.name);
+					declaration = decl;
 					break;
 				}
 			}
+			if (declaration) {
+				for (const decl of moduleRef.exports.filter((decl) => isSetObject(decl) && !decl.specifiers?.some((s) => declaration?.specifiers?.some((specifier) => (specifier.alias ? specifier.alias : specifier.name) === (s.alias ? s.alias : s.name))))) {
+					const exportModuleRef = decl;
+					if ((exportModuleRef.specifiers?.some((s) => s.alias || s.name) || exportModuleRef.name) && new RegExp(`(^|\\s|\\n|\\r\\n|\\(|\\)|<|>|{|}|\\[|\\]|\\!|\\?|\\.|,|\\*|&|:)(${exportModuleRef.specifiers?.map((s) => `${s.alias ? `${s.alias}|` : ""}${s.name}`).join("|") || exportModuleRef.name})($|\\s|\\n|\\r\\n|\\(|\\)|<|>|{|}|\\[|\\]|\\!|\\?|\\.|,|\\*|&|:|;)`).test(declaration.text)) commonDeclarations.push(exportModuleRef);
+				}
+				commonDeclarations.push(declaration);
+			}
 		}
 	}
-	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)}`;
+	let code = "";
+	const directives = [];
+	for (const commonDeclaration of commonDeclarations) {
+		code += formatTypes(`${commonDeclaration.comment?.trim() ? commonDeclaration.comment.trim() : ""}${commonDeclaration.comment?.trim() ? "\n" : ""}${formatTypes(commonDeclaration.text.replace(/\s*export\s*/, "").replace(/\s*declare\s*interface\s*/, "interface ").replace(/\s*declare\s*type\s*/, "type "))}`);
+		code += "\n\n";
+	}
+	for (const mod of ctx.modules) {
+		code += mod.comment ? `${mod.comment.trim()}\n` : "";
+		code += `declare module "${context.config.framework}:${mod.name}" { \n`;
+		for (const importRef of mod.imports) if (importRef.ambient) code += directives.push(importRef.name);
+		else if (importRef.all) code += `\timport * as ${findFileName(importRef.name)} from "${importRef.name}";\n`;
+		else if (importRef.specifiers) {
+			const typeOnly = importRef.specifiers.every((s) => s.type) ? " type" : "";
+			const specifiers = importRef.specifiers.map((s) => s.alias ? `${s.name} as ${s.alias}` : s.name).join(", ");
+			code += `\timport${typeOnly} { ${specifiers} } from "${importRef.name}";\n`;
 		}
+		if (mod.imports.length > 0) code += "\n";
+		for (const exportRef of mod.exports.filter((e) => isString(e) || !e.specifiers || !commonDeclarations.some((commonDecl) => commonDecl.specifiers && commonDecl.specifiers.some((specifier) => e.specifiers?.some((s) => (s.alias ? s.alias : s.name) === (specifier.alias ? specifier.alias : specifier.name)))))) if (isSetString(exportRef)) code += `${exportRef}\n`;
+		else if (exportRef.name) {
+			if (exportRef.all) code += `${exportRef.comment?.trim() ? exportRef.comment.trim() : ""}${exportRef.comment?.trim() ? "\n" : ""}export * from "${exportRef.name}";\n`;
+			else if (exportRef.specifiers) {
+				if (exportRef.comment?.trim()) code += `${exportRef.comment.trim()}\n`;
+				code += `\texport${exportRef.specifiers.every((s) => s.type) ? " type" : ""} { ${exportRef.specifiers.map((s) => s.alias ? `${s.name} as ${s.alias}` : s.name).join(", ")} } from "${exportRef.name}";\n`;
+			}
+		} else code += `${exportRef.comment?.trim() ? exportRef.comment.trim() : ""}${exportRef.comment?.trim() ? "\n" : ""}${formatTypes(exportRef.text.replace(/\s*export\s*declare\s*/, "export ").replace(/\s*declare\s*/, " "))}\n`;
+		mod.exports.filter((e) => !isString(e) && e.specifiers && commonDeclarations.some((commonDeclaration) => commonDeclaration.specifiers && commonDeclaration.specifiers.some((specifier) => e.specifiers?.some((s) => (s.alias ? s.alias : s.name) === (specifier.alias ? specifier.alias : specifier.name))))).forEach((e, i, arr) => {
+			if (i === 0) code += "\nexport { ";
+			else code += ", ";
+			code += `${e?.specifiers?.filter((s) => commonDeclarations.some((commonDeclaration) => commonDeclaration.specifiers && commonDeclaration.specifiers.some((specifier) => (s.alias ? s.alias : s.name) === (specifier.alias ? specifier.alias : specifier.name)))).map((s) => s.alias ? `${s.name} as ${s.alias}` : s.name).join(", ") || ""}`;
+			if (i === arr.length - 1) code += ` };\n`;
+		});
+		code += "}";
+		code += "\n\n";
 	}
 	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.`);
@@ -1027,4 +1075,4 @@ ${formatTypes(code)}
 
 //#endregion
 export { name as n, version as r, PowerlinesAPI as t };
-//# sourceMappingURL=api-BVTRS4-e.mjs.map
+//# sourceMappingURL=api-BrPeHPR6.mjs.map