@badisi/agadoo 4.0.0 → 4.0.1

package/cli.mjs

@@ -1,11 +1,42 @@
-import { access, readFile, stat } from "node:fs/promises";
 import { relative, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { styleText } from "node:util";
+import { access, readFile, stat } from "node:fs/promises";
 import { rollup } from "rollup";
 import virtual from "@rollup/plugin-virtual";
 //#region package.json
-var version = "4.0.0";
+var version = "4.0.1";
+//#endregion
+//#region src/cli-utils.ts
+const ifExists = async (path) => {
+	try {
+		await access(path);
+		return path;
+	} catch {
+		return null;
+	}
+};
+const isDirectory = async (path) => {
+	try {
+		return (await stat(path)).isDirectory();
+	} catch {
+		return false;
+	}
+};
+const exitWithError = (message) => {
+	console.error(styleText("red", `Error: ${message}`));
+	process.exit(1);
+};
+const resolveEntry = async (value) => {
+	if (await isDirectory(value)) {
+		try {
+			const pkgJson = JSON.parse(await readFile(resolve(value, "package.json"), "utf-8"));
+			const name = pkgJson.module ?? pkgJson.main;
+			if (name) return await resolveEntry(resolve(value, name));
+		} catch {}
+		return await ifExists(resolve(value, "index.mjs")) ?? await ifExists(resolve(value, "index.js")) ?? exitWithError(`Could not resolve entry point in '${value}'`);
+	} else return await ifExists(value) ?? await ifExists(`${value}.mjs`) ?? await ifExists(`${value}.js`) ?? exitWithError(`Could not resolve entry point '${value}'`);
+};
 //#endregion
 //#region src/index.ts
 const check = async (path, rollupOptions) => {
@@ -20,11 +51,17 @@ const check = async (path, rollupOptions) => {
 			else if (warning.code !== "EMPTY_BUNDLE") warnings.push(warning.message);
 		}
 	})).generate({ format: "esm" });
-	const code = output[0].code.trim();
+	let openRegionsCount = 0;
+	const code = [...output[0].code.trim().split("\n").filter((line) => {
+		const trimmedLine = line.trim();
+		if (trimmedLine.startsWith("//#region ")) return ++openRegionsCount;
+		else if (trimmedLine.startsWith("//#endregion")) return openRegionsCount > 0 ? openRegionsCount-- : false;
+		return true;
+	}), ...Array(openRegionsCount).fill("//#endregion")].join("\n");
 	return {
 		isShaken: !code.split("\n").some((line) => {
-			const t = line.trim();
-			return t && !t.startsWith("import ") && !t.startsWith("//") && !t.startsWith("/*") && !t.startsWith("*") && !t.startsWith("*/");
+			const trimmedLine = line.trim();
+			return trimmedLine && !trimmedLine.startsWith("import ") && !trimmedLine.startsWith("//") && !trimmedLine.startsWith("/*") && !trimmedLine.startsWith("*") && !trimmedLine.startsWith("*/");
 		}),
 		code,
 		warnings
@@ -32,41 +69,6 @@ const check = async (path, rollupOptions) => {
 };
 //#endregion
 //#region src/cli.ts
-const exitWithError = (message) => {
-	console.error(message);
-	process.exit(1);
-};
-const ifExists = async (path) => {
-	try {
-		await access(path);
-		return path;
-	} catch {
-		return null;
-	}
-};
-const isDirectory = async (path) => {
-	try {
-		return (await stat(path)).isDirectory();
-	} catch {
-		return false;
-	}
-};
-const resolveEntry = async (value) => {
-	if (await isDirectory(value)) return await ifExists(`${value}/index.mjs`) ?? await ifExists(`${value}/index.js`);
-	return await ifExists(value) ?? await ifExists(`${value}.mjs`) ?? await ifExists(`${value}.js`);
-};
-const getInput = async () => {
-	let pkgJson;
-	try {
-		pkgJson = JSON.parse(await readFile("package.json", "utf-8"));
-	} catch {
-		exitWithError(`Could not find or parse 'package.json'`);
-	}
-	const name = pkgJson.module ?? pkgJson.main ?? "index";
-	const entryPath = await resolveEntry(name);
-	if (!entryPath) exitWithError(`Could not resolve entry point '${name}' from package.json`);
-	return entryPath;
-};
 const displayHelp = () => {
 	console.log([
 		`🍃 ${styleText(["bgGreen", "black"], " bagadoo ")}`,
@@ -81,8 +83,8 @@ const displayHelp = () => {
 		"    $ bagadoo [path] [options]",
 		"",
 		styleText("bold", "ARGUMENTS:"),
-		`    ${styleText("cyan", "[path]")}             Path to an entry file or package directory`,
-		`    ${styleText(["gray", "italic"], "                   (default: read module or main from package.json)")}`,
+		`    ${styleText("cyan", "[path]")}               Path to an entry file or package directory`,
+		`    ${styleText(["gray", "italic"], "                     (default: read module or main from package.json)")}`,
 		"",
 		styleText("bold", "OPTIONS:"),
 		`    ${styleText("cyan", "-c, --config <file>")}  Path to a Rollup config file`,
@@ -114,7 +116,7 @@ const getOptions = async () => {
 		rollupOptions = config?.rollup ?? config;
 	}
 	const input = args[0];
-	const absolutePath = input ? await resolveEntry(resolve(process.cwd(), input)) ?? resolve(process.cwd(), input) : resolve(process.cwd(), await getInput());
+	const absolutePath = await resolveEntry(input ? resolve(process.cwd(), input) : process.cwd());
 	const relativePath = relative(process.cwd(), absolutePath);
 	return {
 		rollupOptions,
@@ -134,11 +136,12 @@ const getOptions = async () => {
 		const result = await check(options.absolutePath, options.rollupOptions);
 		result.warnings.forEach((w) => console.error(styleText("yellow", w)));
 		result.code.split("\n").forEach((line) => {
-			const t = line.trim();
-			console.error(t.startsWith("//#region") || t.startsWith("//#endregion") ? styleText("gray", line) : line);
+			const trimmedLine = line.trim();
+			const isRegion = trimmedLine.startsWith("//#region") || trimmedLine.startsWith("//#endregion");
+			console.error(isRegion ? styleText("gray", line) : line);
 		});
 		if (result.isShaken) console.log(`\n${styleText("green", "✓ Success:")} ${styleText("cyan", options.relativePath)} ${styleText("green", "is fully tree-shakeable.")}`);
-		else exitWithError(`\n${styleText("red", "✗ Failed:")} ${styleText("cyan", options.relativePath)} ${styleText("red", "is not fully tree-shakeable.")}`);
+		else console.error(`\n${styleText("red", "✗ Failed:")} ${styleText("cyan", options.relativePath)} ${styleText("red", "is not fully tree-shakeable.")}`);
 	}
 })();
 //#endregion

package/index.mjs

@@ -13,11 +13,17 @@ const check = async (path, rollupOptions) => {
 			else if (warning.code !== "EMPTY_BUNDLE") warnings.push(warning.message);
 		}
 	})).generate({ format: "esm" });
-	const code = output[0].code.trim();
+	let openRegionsCount = 0;
+	const code = [...output[0].code.trim().split("\n").filter((line) => {
+		const trimmedLine = line.trim();
+		if (trimmedLine.startsWith("//#region ")) return ++openRegionsCount;
+		else if (trimmedLine.startsWith("//#endregion")) return openRegionsCount > 0 ? openRegionsCount-- : false;
+		return true;
+	}), ...Array(openRegionsCount).fill("//#endregion")].join("\n");
 	return {
 		isShaken: !code.split("\n").some((line) => {
-			const t = line.trim();
-			return t && !t.startsWith("import ") && !t.startsWith("//") && !t.startsWith("/*") && !t.startsWith("*") && !t.startsWith("*/");
+			const trimmedLine = line.trim();
+			return trimmedLine && !trimmedLine.startsWith("import ") && !trimmedLine.startsWith("//") && !trimmedLine.startsWith("/*") && !trimmedLine.startsWith("*") && !trimmedLine.startsWith("*/");
 		}),
 		code,
 		warnings

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@badisi/agadoo",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "description": "Check whether a package is tree-shakeable.",
     "homepage": "https://github.com/Badisi/agadoo",
     "license": "MIT",