@batijs/build 0.0.650 → 0.0.652

package/dist/index.js

@@ -1,28 +1,25 @@
 import { existsSync } from "node:fs";
 import { mkdir, opendir, readFile, rm, rmdir, writeFile } from "node:fs/promises";
 import path, { extname, parse, relative } from "node:path";
-import { formatCode, parseModule, transformAndFormat } from "@batijs/core";
+import { formatCode, markEmptyExport, mergeDts, transformAndFormat } from "@batijs/core";
 //#region src/operations/merge-dts.ts
-async function mergeDts({ fileContent, previousContent, filepath, meta }) {
-	const previousAst = parseModule(previousContent);
-	const currentAst = parseModule(fileContent);
-	for (const imp of previousAst.imports.$items) currentAst.imports[imp.local] = imp;
-	const index = currentAst.$ast.body.findIndex((node) => node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration");
-	for (const node of previousAst.$ast.body) {
-		if (node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration") continue;
-		if (index === -1) currentAst.$ast.body.push(node);
-		else currentAst.$ast.body.splice(index, 0, node);
-	}
-	return clearExports((await transformAndFormat(currentAst.generate().code, meta, { filepath })).code, meta);
+let merger;
+let emptyExportMarker;
+/**
+* Merge two already-`$$`-transformed `.d.ts` files into one: concatenate them and run the `mergeDts`
+* codemod, which hoists/dedupes imports and folds same-named `declare global` / `declare module` /
+* `namespace` / `interface` declarations together. Then tidy whitespace and strip a now-empty
+* `export {}`.
+*/
+async function mergeDts$1({ fileContent, previousContent, filepath, meta }) {
+	merger ??= mergeDts.forTarget("tsx");
+	return clearExports(await formatCode((await merger).transform(`${previousContent}\n${fileContent}`, {}), { filepath }), meta);
 }
-function clearExports(code, meta) {
+async function clearExports(code, meta) {
 	if (code.trim() === "export {};") return;
-	if (meta.BATI.has("biome")) {
-		const index = code.indexOf("\nexport {};");
-		const foundImport = code.match(/^import .* from /gm);
-		if (index !== -1 && foundImport) return code.slice(0, index) + "\n// biome-ignore lint/complexity/noUselessEmptyExport: ensure that the file is considered as a module" + code.slice(index);
-	}
-	return code;
+	if (!meta.BATI.has("biome")) return code;
+	emptyExportMarker ??= markEmptyExport.forTarget("tsx");
+	return (await emptyExportMarker).transform(code, {});
 }
 //#endregion
 //#region src/operations/file.ts
@@ -31,13 +28,13 @@ async function executeOperationFile(op, { meta, previousOperationSameDestination
 	const filepath = relative(op.source, op.sourceAbsolute);
 	const result = await transformAndFormat(code, meta, { filepath });
 	let fileContent = result.code;
-	if (op.sourceAbsolute.endsWith(".d.ts")) if (previousOperationSameDestination?.content) fileContent = await mergeDts({
+	if (op.sourceAbsolute.endsWith(".d.ts")) if (previousOperationSameDestination?.content) fileContent = await mergeDts$1({
 		fileContent,
 		previousContent: previousOperationSameDestination.content,
-		meta,
-		filepath
+		filepath,
+		meta
 	});
-	else fileContent = clearExports(fileContent, meta);
+	else fileContent = await clearExports(fileContent, meta);
 	return {
 		context: result.context,
 		content: fileContent ? fileContent.trimStart() : void 0
@@ -152,14 +149,14 @@ async function executeOperationTransform(op, { meta, previousOperationSameDestin
 //#region src/relations.ts
 var RelationFile = class RelationFile {
 	pathAbsolute;
-	includeIfImported;
+	keepFileIfImported;
 	static allPathAbsolute = /* @__PURE__ */ new Map();
-	static allIncludeIfImported = [];
-	constructor(pathAbsolute, includeIfImported) {
+	static allKeepFileIfImported = [];
+	constructor(pathAbsolute, keepFileIfImported) {
 		this.pathAbsolute = pathAbsolute;
-		this.includeIfImported = includeIfImported;
+		this.keepFileIfImported = keepFileIfImported;
 		RelationFile.allPathAbsolute.set(pathAbsolute, this);
-		if (includeIfImported) RelationFile.allIncludeIfImported.push(this);
+		if (keepFileIfImported) RelationFile.allKeepFileIfImported.push(this);
 	}
 };
 var RelationImport = class RelationImport {
@@ -178,10 +175,10 @@ var RelationImport = class RelationImport {
 	static computeUnimportedFiles() {
 		const unimportedFiles = [];
 		const importedByVolatileFile = [];
-		for (const file of RelationFile.allIncludeIfImported) {
+		for (const file of RelationFile.allKeepFileIfImported) {
 			const importedFile = RelationImport.allImports.find((ai) => ai.importTargetRelationFile === file);
 			if (!importedFile) unimportedFiles.push(file);
-			else if (importedFile.source.includeIfImported) importedByVolatileFile.push(importedFile);
+			else if (importedFile.source.keepFileIfImported) importedByVolatileFile.push(importedFile);
 		}
 		return computeDeepUnimportedFiles(importedByVolatileFile, unimportedFiles);
 	}
@@ -256,8 +253,8 @@ async function main(options, meta) {
 	const sources = Array.isArray(options.source) ? options.source : [options.source];
 	const env = options.env ?? [];
 	const deploy = options.deploy ?? [];
-	function updateAllImports(target, imports, includeIfImported) {
-		const rf = new RelationFile(target, includeIfImported);
+	function updateAllImports(target, imports, keepFileIfImported) {
+		const rf = new RelationFile(target, keepFileIfImported);
 		if (!imports) return;
 		for (const imp of imports.values()) new RelationImport(rf, path.resolve(path.dirname(target), imp));
 	}
@@ -302,7 +299,7 @@ Please report this issue to https://github.com/vikejs/bati`);
 				meta,
 				previousOperationSameDestination: previousOp
 			});
-			updateAllImports(op.destinationAbsolute, report.context?.imports, Boolean(report.context?.flags.has("include-if-imported")));
+			updateAllImports(op.destinationAbsolute, report.context?.imports, Boolean(report.context?.flags.has("keep-file-if-imported")));
 		} else if (op.kind === "transform") report = await executeOperationTransform(op, {
 			meta,
 			previousOperationSameDestination: previousOp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/build",
-  "version": "0.0.650",
+  "version": "0.0.652",
   "description": "",
   "type": "module",
   "scripts": {
@@ -13,14 +13,14 @@
   "repository": "https://github.com/vikejs/bati",
   "license": "MIT",
   "devDependencies": {
-    "@batijs/compile": "0.0.650",
-    "@batijs/core": "0.0.650",
-    "@batijs/features": "0.0.650",
+    "@batijs/compile": "0.0.652",
+    "@batijs/core": "0.0.652",
+    "@batijs/features": "0.0.652",
     "@types/node": "^20.19.37",
     "tsdown": "^0.22.2"
   },
   "peerDependencies": {
-    "@batijs/core": "0.0.650"
+    "@batijs/core": "0.0.652"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",