@batijs/cli 0.0.650 → 0.0.651

package/dist/index.js

@@ -7,7 +7,7 @@ import { access, constants, lstat, mkdir, opendir, readFile, readdir, rm, rmdir,
 import { tmpdir } from "node:os";
 import path, { dirname, extname, join, normalize, parse, relative } from "node:path";
 import { fileURLToPath } from "node:url";
-import { formatCode, getVersion, packageManager, parseModule, transformAndFormat, which, withIcon } from "@batijs/core";
+import { formatCode, getVersion, markEmptyExport, mergeDts, packageManager, transformAndFormat, which, withIcon } from "@batijs/core";
 import { BatiSet, cliFlags, features } from "@batijs/features";
 import { RulesMessage, execRules } from "@batijs/features/rules";
 import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
@@ -49,39 +49,36 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 //#endregion
 //#region ../build/dist/index.js
-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);
-}
-function clearExports(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);
+}
+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, {});
 }
 async function executeOperationFile(op, { meta, previousOperationSameDestination }) {
 	const code = await readFile(op.sourceAbsolute, { encoding: "utf-8" });
 	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
@@ -188,14 +185,14 @@ async function executeOperationTransform(op, { meta, previousOperationSameDestin
 }
 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 {
@@ -214,10 +211,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);
 	}
@@ -290,8 +287,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));
 	}
@@ -336,7 +333,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,
@@ -2521,7 +2518,7 @@ var colorette_exports = /* @__PURE__ */ __exportAll({
 	underline: () => underline,
 	white: () => white,
 	whiteBright: () => whiteBright,
-	yellow: () => yellow$1,
+	yellow: () => yellow,
 	yellowBright: () => yellowBright
 });
 const { env = {}, argv = [], platform = "" } = typeof process === "undefined" ? {} : process;
@@ -2583,7 +2580,7 @@ const createColors = ({ useColor = isColorSupported } = {}) => useColor ? colors
 	...colors,
 	[key]: String
 }), {});
-const { reset, bold, dim, italic, underline, inverse, hidden, strikethrough, black, red, green, yellow: yellow$1, blue, magenta, cyan, white, gray, bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite, blackBright, redBright, greenBright, yellowBright, blueBright, magentaBright, cyanBright, whiteBright, bgBlackBright, bgRedBright, bgGreenBright, bgYellowBright, bgBlueBright, bgMagentaBright, bgCyanBright, bgWhiteBright } = createColors();
+const { reset, bold, dim, italic, underline, inverse, hidden, strikethrough, black, red, green, yellow, blue, magenta, cyan, white, gray, bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite, blackBright, redBright, greenBright, yellowBright, blueBright, magentaBright, cyanBright, whiteBright, bgBlackBright, bgRedBright, bgGreenBright, bgYellowBright, bgBlueBright, bgMagentaBright, bgCyanBright, bgWhiteBright } = createColors();
 //#endregion
 //#region ../../node_modules/.bun/scule@1.3.0/node_modules/scule/dist/index.mjs
 const NUMBER_CHAR_RE = /\d/;
@@ -2641,7 +2638,7 @@ function kebabCase(str, joiner) {
 //#endregion
 //#region package.json
 var name = "@batijs/cli";
-var version = "0.0.650";
+var version = "0.0.651";
 var description = "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want";
 //#endregion
 //#region rules.ts
@@ -2856,13 +2853,13 @@ async function checkArguments(args) {
 			newArgs.project = `my-app-${generateRandomFilename(5)}`;
 			return newArgs;
 		} else if (!stat.isDirectory()) {
-			console.error(`${yellow$1("⚠")} Target ${cyan(newArgs.project)} already exists but is not a directory. ${yellow$1("Aborting")}.`);
+			console.error(`${yellow("⚠")} Target ${cyan(newArgs.project)} already exists but is not a directory. ${yellow("Aborting")}.`);
 			process.exit(2);
 		}
 		try {
 			await access(newArgs.project, constants.W_OK);
 		} catch {
-			console.error(`${yellow$1("⚠")} Target folder ${cyan(newArgs.project)} already exists but is not writable. ${yellow$1("Aborting")}.`);
+			console.error(`${yellow("⚠")} Target folder ${cyan(newArgs.project)} already exists but is not writable. ${yellow("Aborting")}.`);
 			process.exit(3);
 		}
 		if (!newArgs.force) {
@@ -2870,7 +2867,7 @@ async function checkArguments(args) {
 				newArgs.project = `my-app-${generateRandomFilename(5)}`;
 				return newArgs;
 			} else {
-				console.error(`${yellow$1("⚠")} Target folder ${cyan(newArgs.project)} already exists and is not empty.\n  Continuing might erase existing files. ${yellow$1("Aborting")}.`);
+				console.error(`${yellow("⚠")} Target folder ${cyan(newArgs.project)} already exists and is not empty.\n  Continuing might erase existing files. ${yellow("Aborting")}.`);
 				process.exit(4);
 			}
 		}
@@ -2898,7 +2895,7 @@ async function checkFlagsIncludesUiFramework(flags) {
 	const flagsUi = features.filter((fs) => fs.category === "UI Framework").map((fs) => fs.flag);
 	const flagsHosting = features.filter((fs) => fs.category === "Hosting").map((fs) => fs.flag);
 	const flagsUiFound = flags.some((f) => flagsUi.includes(f));
-	if (flags.filter((f) => !flagsUi.includes(f) && !flagsHosting.includes(f)).length === 0) console.warn(`${yellow$1("🛈 Scaffolding a bare-bones app")} ➡️  Go to ${underline("https://vike.dev/new")} to scaffold full-fledged apps with Tailwind, authentication, database, deployment, and more.\n`);
+	if (flags.filter((f) => !flagsUi.includes(f) && !flagsHosting.includes(f)).length === 0) console.warn(`${yellow("🛈 Scaffolding a bare-bones app")} ➡️  Go to ${underline("https://vike.dev/new")} to scaffold full-fledged apps with Tailwind, authentication, database, deployment, and more.\n`);
 	if (!flagsUiFound) {
 		const ui = await dist_default({
 			theme: { style: { highlight(t) {
@@ -2937,7 +2934,7 @@ function checkRules(flags) {
 	}
 	if (warnings.length > 0) {
 		warnings.forEach((m) => {
-			console.warn(yellow$1(`⚠ ${m.value}.`));
+			console.warn(yellow(`⚠ ${m.value}.`));
 		});
 		console.log("");
 	}
@@ -3004,7 +3001,7 @@ function gitInit(cwd) {
 				force: true
 			});
 		} catch {}
-		console.warn(`${yellow$1("⚠")} failed to initialize a git repository in destination folder. Skipping.`);
+		console.warn(`${yellow("⚠")} failed to initialize a git repository in destination folder. Skipping.`);
 	}
 }
 async function run() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.650",
+  "version": "0.0.651",
   "type": "module",
   "scripts": {
     "check-types": "tsc --noEmit",
@@ -13,8 +13,8 @@
   "repository": "https://github.com/vikejs/bati",
   "license": "MIT",
   "devDependencies": {
-    "@batijs/build": "0.0.650",
-    "@batijs/compile": "0.0.650",
+    "@batijs/build": "0.0.651",
+    "@batijs/compile": "0.0.651",
     "@inquirer/prompts": "^8.5.2",
     "@types/node": "^20.19.37",
     "@types/which": "^3.0.4",
@@ -30,8 +30,8 @@
     "vite": "^8.0.16"
   },
   "dependencies": {
-    "@batijs/core": "0.0.650",
-    "@batijs/features": "0.0.650"
+    "@batijs/core": "0.0.651",
+    "@batijs/features": "0.0.651"
   },
   "bin": "./cli.js",
   "exports": {