zshy 0.0.6 → 0.0.8

package/{out → dist}/index.cjs

@@ -62,6 +62,7 @@ async function main() {
             "--verbose": Boolean,
             "--project": String,
             "--dry-run": Boolean,
+            // "--attw": Boolean,
             // Aliases
             "-h": "--help",
             "-p": "--project",
@@ -69,7 +70,7 @@ async function main() {
     }
     catch (error) {
         if (error instanceof Error) {
-            console.error(`❌ ${error.message}`);
+            (0, utils_1.emojiLog)("❌", error.message, "error");
         }
         console.error(`Use --help for usage information`);
         process.exit(1);
@@ -93,14 +94,27 @@ Examples:
 		`);
         process.exit(0);
     }
-    console.log("💎 Starting zshy build...");
+    const userAgent = process.env.npm_config_user_agent;
+    let pmExec;
+    if (userAgent?.startsWith("pnpm")) {
+        pmExec = "pnpm exec";
+    }
+    else if (userAgent?.startsWith("yarn")) {
+        pmExec = "yarn exec";
+    }
+    else {
+        pmExec = "npx";
+    }
+    (0, utils_1.emojiLog)("💎", "Starting build... 🐒");
     const isVerbose = args["--verbose"];
     const isDryRun = args["--dry-run"];
+    const isAttw = false; // args["--attw"];
     if (isVerbose) {
-        console.log("🗣️  Verbose mode enabled");
+        (0, utils_1.emojiLog)("ℹ️", "Verbose mode enabled");
+        (0, utils_1.emojiLog)("📦", `Detected package manager: ${pmExec}`);
     }
     if (isDryRun) {
-        console.log("🔍 Dry run mode enabled - no files will be written");
+        (0, utils_1.emojiLog)("🔍", "Dry run mode enabled - no files will be written");
     }
     ///////////////////////////////////
     ///    find and read pkg json   ///
@@ -117,7 +131,7 @@ Examples:
         currentDir = path.dirname(currentDir);
     }
     if (!fs.existsSync(packageJsonPath)) {
-        console.error("❌ package.json not found in current directory or any parent directories");
+        (0, utils_1.emojiLog)("❌", "package.json not found in current directory or any parent directories", "error");
         process.exit(1);
     }
     // read package.json and extract the "zshy" exports config
@@ -125,8 +139,8 @@ Examples:
     const pkgJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
     const pkgJsonDir = path.dirname(packageJsonPath);
     // print project root
-    console.log(`⚙️  Detected project root: ${pkgJsonDir}`);
-    console.log(`📦 Reading package.json from ./${path.relative(pkgJsonDir, packageJsonPath)}`);
+    (0, utils_1.emojiLog)("⚙️", `Detected project root: ${pkgJsonDir}`);
+    (0, utils_1.emojiLog)("📦", `Reading package.json from ./${path.relative(pkgJsonDir, packageJsonPath)}`);
     /////////////////////////////////
     ///    parse zshy config      ///
     /////////////////////////////////
@@ -134,7 +148,7 @@ Examples:
     const CONFIG_KEY = "zshy";
     let config;
     if (!pkgJson[CONFIG_KEY]) {
-        console.error(`❌ No "${CONFIG_KEY}" key found in package.json`);
+        (0, utils_1.emojiLog)("❌", `No "${CONFIG_KEY}" key found in package.json`, "error");
         process.exit(1);
     }
     if (typeof pkgJson[CONFIG_KEY] === "string") {
@@ -148,11 +162,11 @@ Examples:
             config.exports = { ".": config.exports };
         }
         else if (typeof config.exports === "undefined") {
-            console.error(`❌ Missing "exports" key in package.json#/${CONFIG_KEY}`);
+            (0, utils_1.emojiLog)("❌", `Missing "exports" key in package.json#/${CONFIG_KEY}`, "error");
             process.exit(1);
         }
         else if (typeof config.exports !== "object") {
-            console.error(`❌ Invalid "exports" key in package.json#/${CONFIG_KEY}`);
+            (0, utils_1.emojiLog)("❌", `Invalid "exports" key in package.json#/${CONFIG_KEY}`, "error");
             process.exit(1);
         }
         // Validate bin field if present
@@ -164,7 +178,7 @@ Examples:
                 // Object format is valid
             }
             else {
-                console.error(`❌ Invalid "bin" key in package.json#/${CONFIG_KEY}, expected string or object`);
+                (0, utils_1.emojiLog)("❌", `Invalid "bin" key in package.json#/${CONFIG_KEY}, expected string or object`, "error");
                 process.exit(1);
             }
         }
@@ -173,15 +187,15 @@ Examples:
         // };
     }
     else if (typeof pkgJson[CONFIG_KEY] === "undefined") {
-        console.error(`❌ Missing "${CONFIG_KEY}" key in package.json`);
+        (0, utils_1.emojiLog)("❌", `Missing "${CONFIG_KEY}" key in package.json`, "error");
         process.exit(1);
     }
     else {
-        console.error(`❌ Invalid "${CONFIG_KEY}" key in package.json, expected string or object`);
+        (0, utils_1.emojiLog)("❌", `Invalid "${CONFIG_KEY}" key in package.json, expected string or object`, "error");
         process.exit(1);
     }
     if (isVerbose) {
-        console.log("🔧 Parsed zshy config:", (0, utils_1.formatForLog)(config));
+        (0, utils_1.emojiLog)("🔧", `Parsed zshy config: ${(0, utils_1.formatForLog)(config)}`);
     }
     ///////////////////////////
     ///    read tsconfig    ///
@@ -193,7 +207,7 @@ Examples:
         const resolvedProjectPath = path.resolve(process.cwd(), args["--project"]);
         if (fs.existsSync(resolvedProjectPath)) {
             if (fs.statSync(resolvedProjectPath).isDirectory()) {
-                console.error(`❌ --project must point to a tsconfig.json file, not a directory: ${resolvedProjectPath}`);
+                (0, utils_1.emojiLog)("❌", `--project must point to a tsconfig.json file, not a directory: ${resolvedProjectPath}`, "error");
                 process.exit(1);
             }
             else {
@@ -202,7 +216,7 @@ Examples:
             }
         }
         else {
-            console.error(`❌ tsconfig.json file not found: ${resolvedProjectPath}`);
+            (0, utils_1.emojiLog)("❌", `tsconfig.json file not found: ${resolvedProjectPath}`, "error");
             process.exit(1);
         }
     }
@@ -211,7 +225,7 @@ Examples:
         const resolvedProjectPath = path.resolve(pkgJsonDir, config.tsconfig);
         if (fs.existsSync(resolvedProjectPath)) {
             if (fs.statSync(resolvedProjectPath).isDirectory()) {
-                console.error(`❌ zshy.tsconfig must point to a tsconfig.json file, not a directory: ${resolvedProjectPath}`);
+                (0, utils_1.emojiLog)("❌", `zshy.tsconfig must point to a tsconfig.json file, not a directory: ${resolvedProjectPath}`, "error");
                 process.exit(1);
             }
             else {
@@ -220,7 +234,7 @@ Examples:
             }
         }
         else {
-            console.error(`❌ Tsconfig file not found: ${resolvedProjectPath}`);
+            (0, utils_1.emojiLog)("❌", `Tsconfig file not found: ${resolvedProjectPath}`, "error");
             process.exit(1);
         }
     }
@@ -231,10 +245,10 @@ Examples:
     const _parsedConfig = (0, utils_1.readTsconfig)(tsconfigPath);
     if (!fs.existsSync(tsconfigPath)) {
         // Check if tsconfig.json exists
-        console.error(`❌ tsconfig.json not found at ${path.resolve(tsconfigPath)}`);
+        (0, utils_1.emojiLog)("❌", `tsconfig.json not found at ${path.resolve(tsconfigPath)}`, "error");
         process.exit(1);
     }
-    console.log(`📁 Reading tsconfig from ./${path.relative(pkgJsonDir, tsconfigPath)}`);
+    (0, utils_1.emojiLog)("📁", `Reading tsconfig from ./${path.relative(pkgJsonDir, tsconfigPath)}`);
     // if (_parsedConfig.rootDir) {
     // 	console.error(
     // 		`❌ rootDir is determined from your set of entrypoints; you can remove it from your tsconfig.json.`,
@@ -255,31 +269,31 @@ Examples:
     const relDeclarationDir = path.relative(pkgJsonDir, declarationDir);
     // clean up outDir and declarationDir
     if (relOutDir !== "") {
-        console.log(`🗑️  Cleaning up outDir...`);
+        (0, utils_1.emojiLog)("🗑️", `Cleaning up outDir...`);
         fs.rmSync(outDir, { recursive: true, force: true });
         // // print success mesage in verbose mode
         if (isVerbose) {
             if (fs.existsSync(outDir)) {
-                console.error(`❌ Failed to clean up outDir: ${relOutDir}. Directory still exists.`);
+                (0, utils_1.emojiLog)("❌", `Failed to clean up outDir: ${relOutDir}. Directory still exists.`, "error");
             }
         }
     }
     else {
-        console.log(`🗑️  Skipping cleanup of outDir as it contains source files`);
+        (0, utils_1.emojiLog)("🗑️", `Skipping cleanup of outDir as it contains source files`);
     }
     if (relDeclarationDir !== relOutDir && relDeclarationDir !== "") {
-        console.log(`🗑️  Cleaning up declarationDir...`);
+        (0, utils_1.emojiLog)("🗑️", `Cleaning up declarationDir...`);
         fs.rmSync(declarationDir, { recursive: true, force: true });
         // // print success mesage in verbose mode
         if (isVerbose) {
             if (fs.existsSync(declarationDir)) {
-                console.error(`❌ Failed to clean up declarationDir: ${relDeclarationDir}. Directory still exists.`);
+                (0, utils_1.emojiLog)("❌", `Failed to clean up declarationDir: ${relDeclarationDir}. Directory still exists.`, "error");
             }
         }
     }
     else {
         if (isVerbose)
-            console.log(`🗑️  Skipping cleanup of declarationDir as it contains source files`);
+            (0, utils_1.emojiLog)("🗑️", `Skipping cleanup of declarationDir as it contains source files`);
     }
     const tsconfigJson = {
         ..._parsedConfig,
@@ -294,20 +308,18 @@ Examples:
     };
     if (relOutDir === "") {
         if (!pkgJson.files) {
-            console.log('⚠️  You\'re building your code to the project root. This means your compiled files will be generated alongside your source files.\n   ➜ Setting "files" in package.json to exclude TypeScript source from the published package.');
+            (0, utils_1.emojiLog)("⚠️", 'You\'re building your code to the project root. This means your compiled files will be generated alongside your source files.\n   ➜ Setting "files" in package.json to exclude TypeScript source from the published package.');
             pkgJson.files = ["**/*.js", "**/*.mjs", "**/*.cjs", "**/*.d.ts", "**/*.d.mts", "**/*.d.cts"];
         }
         else {
-            console.warn(`⚠️  You're building your code to the project root. This means your compiled files will be generated alongside your source files.
-   ➜ Ensure that your "files" in package.json excludes TypeScript source files, or your users may experience .d.ts resolution issues in some environments:
-
-   "files": ["**/*.js", "**/*.mjs", "**/*.cjs", "**/*.d.ts", "**/*.d.mts", "**/*.d.cts"],
-`);
+            (0, utils_1.emojiLog)(`⚠️`, `You\'re building your code to the project root. This means your compiled files will be generated alongside your source files.
+   Ensure that your "files" in package.json excludes TypeScript source files, or your users may experience .d.ts resolution issues in some environments:
+     "files": ["**/*.js", "**/*.mjs", "**/*.cjs", "**/*.d.ts", "**/*.d.mts", "**/*.d.cts"]`);
         }
     }
     else {
         if (!pkgJson.files) {
-            console.log(`⚠️  The "files" key is missing in package.json. Setting to "${relOutDir}".`);
+            (0, utils_1.emojiLog)("⚠️", `The "files" key is missing in package.json. Setting to "${relOutDir}".`);
             pkgJson.files = [relOutDir];
             if (relOutDir !== relDeclarationDir) {
                 pkgJson.files.push(relDeclarationDir);
@@ -318,7 +330,7 @@ Examples:
     ///   extract entry points    ///
     /////////////////////////////////
     // Extract entry points from zshy exports config
-    console.log("➡️  Determining entrypoints...");
+    (0, utils_1.emojiLog)("➡️", "Determining entrypoints...");
     const entryPatterns = [];
     const rows = [["Subpath", "Entrypoint"]];
     for (const [exportPath, sourcePath] of Object.entries(config.exports)) {
@@ -332,13 +344,13 @@ Examples:
             cleanExportPath = pkgJson.name + "/" + exportPath.slice(2);
         }
         else {
-            console.error(`⚠️  Invalid subpath export "${exportPath}" — should start with "./"`);
+            (0, utils_1.emojiLog)("⚠️", `Invalid subpath export "${exportPath}" — should start with "./"`, "warn");
             process.exit(1);
         }
         if (typeof sourcePath === "string") {
             if (sourcePath.includes("*")) {
                 if (!sourcePath.endsWith("/*")) {
-                    console.error(`❌ Wildcard paths should not contain file extensions: ${sourcePath}`);
+                    (0, utils_1.emojiLog)("❌", `Wildcard paths should not contain file extensions: ${sourcePath}`, "error");
                     process.exit(1);
                 }
                 const pattern = sourcePath.slice(0, -2) + "/*.{ts,tsx,mts,cts}";
@@ -394,11 +406,11 @@ Examples:
     const entryPoints = await (0, utils_1.getEntryPoints)(entryPatterns);
     // disallow .mts and .cts files
     if (entryPoints.some((ep) => ep.endsWith(".mts") || ep.endsWith(".cts"))) {
-        console.error("❌ Source files with .mts or .cts extensions are not supported. Please use regular .ts files.");
+        (0, utils_1.emojiLog)("❌", "Source files with .mts or .cts extensions are not supported. Please use regular .ts files.", "error");
         process.exit(1);
     }
     if (entryPoints.length === 0) {
-        console.error("❌ No entry points found matching the specified patterns in package.json#/zshy exports");
+        (0, utils_1.emojiLog)("❌", "No entry points found matching the specified patterns in package.json#/zshy exports", "error");
         process.exit(1);
     }
     ///////////////////////////////
@@ -429,7 +441,7 @@ Examples:
     }
     const relRootDir = path.relative(pkgJsonDir, rootDir);
     // Display resolved paths table
-    console.log("🔧 Resolved build paths:");
+    (0, utils_1.emojiLog)("🔧", "Resolved build paths:");
     const pathRows = [["Location", "Resolved path"]];
     // pathRows.push([
     // 	"package.json",
@@ -455,19 +467,29 @@ Examples:
             .trim());
     const isTypeModule = pkgJson.type === "module";
     if (isTypeModule) {
-        console.log(`🟨 Package is an ES module (package.json#/type is \"module\")`);
+        (0, utils_1.emojiLog)("🟨", `Package is an ES module (package.json#/type is "module")`);
     }
     else {
-        console.log(`🐢 Package is a CommonJS module (${pkgJson.type === "commonjs" ? 'package.json#/type is "commonjs"' : 'package.json#/type not set to "module"'})`);
+        (0, utils_1.emojiLog)("🐢", `Package is a CommonJS module (${pkgJson.type === "commonjs" ? 'package.json#/type is "commonjs"' : 'package.json#/type not set to "module"'})`);
     }
     ///////////////////////////////
     ///       compile tsc        ///
     ///////////////////////////////
+    const uniqueEntryPoints = [...new Set(entryPoints)];
     try {
+        if (isVerbose) {
+            (0, utils_1.emojiLog)("→", `Resolved entrypoints: ${(0, utils_1.formatForLog)(uniqueEntryPoints)}`);
+            (0, utils_1.emojiLog)("→", `Resolved compilerOptions: ${(0, utils_1.formatForLog)({
+                ...tsconfigJson,
+                module: ts.ModuleKind[tsconfigJson.module],
+                moduleResolution: ts.ModuleResolutionKind[tsconfigJson.moduleResolution],
+                target: ts.ScriptTarget[tsconfigJson.target],
+            })}`);
+        }
         // Track all written files
         const allWrittenFiles = [];
         // CJS
-        console.log(`🧱 Building CJS...${isTypeModule ? ` (rewriting .ts -> .cjs/.d.cts)` : ``}`);
+        (0, utils_1.emojiLog)("🧱", `Building CJS...${isTypeModule ? ` (rewriting .ts -> .cjs/.d.cts)` : ``}`);
         const cjsFiles = await (0, utils_1.compileProject)({
             configPath: tsconfigPath,
             mode: isTypeModule ? "cts" : "ts",
@@ -480,10 +502,10 @@ Examples:
                 moduleResolution: ts.ModuleResolutionKind.Node10,
                 outDir,
             },
-        }, entryPoints);
+        }, uniqueEntryPoints);
         allWrittenFiles.push(...cjsFiles);
         // ESM
-        console.log(`🧱 Building ESM...${isTypeModule ? `` : ` (rewriting .ts -> .mjs/.d.mts)`}`);
+        (0, utils_1.emojiLog)("🧱", `Building ESM...${isTypeModule ? `` : ` (rewriting .ts -> .mjs/.d.mts)`}`);
         const esmFiles = await (0, utils_1.compileProject)({
             configPath: tsconfigPath,
             mode: isTypeModule ? "ts" : "mts",
@@ -496,28 +518,28 @@ Examples:
                 moduleResolution: ts.ModuleResolutionKind.Bundler,
                 outDir,
             },
-        }, entryPoints);
+        }, uniqueEntryPoints);
         allWrittenFiles.push(...esmFiles);
         ///////////////////////////////////
         ///      display written files  ///
         ///////////////////////////////////
         // Display files that were written or would be written (only in verbose mode)
         if (isVerbose && allWrittenFiles.length > 0) {
-            console.log(`📜 ${isDryRun ? "[dryrun] " : ""}Writing files... (${allWrittenFiles.length} total):`);
+            (0, utils_1.emojiLog)("📜", `${isDryRun ? "[dryrun] " : ""}Writing files (${allWrittenFiles.length} total)...`);
             // Sort files by relative path for consistent display
             const sortedFiles = [...allWrittenFiles]
                 .map((file) => path.relative(pkgJsonDir, file))
                 .sort()
                 .map((relPath) => (relPath.startsWith(".") ? relPath : `./${relPath}`));
             sortedFiles.forEach((file) => {
-                console.log(`   ${file}`);
+                console.log(`     ${file}`);
             });
         }
         ///////////////////////////////
         ///   generate exports      ///
         ///////////////////////////////
         // generate package.json exports
-        console.log("📦 Updating package.json#/exports...");
+        (0, utils_1.emojiLog)("📦", `${isDryRun ? "[dryrun] " : ""}Updating package.json#/exports...`);
         // Generate exports based on zshy config
         const newExports = {};
         const sourceDialects = config.sourceDialects || [];
@@ -535,13 +557,6 @@ Examples:
             if (typeof sourcePath === "string") {
                 if (sourcePath.endsWith("/*")) {
                     // Handle wildcard exports
-                    // const relSourcePath =
-                    // 	"./" +
-                    // 	path.relative(
-                    // 		pkgJsonDir,
-                    // 		path.resolve(outDir, sourcePath.slice(0, -2)),
-                    // 	) +
-                    // 	"/*";
                     newExports[exportPath] = {
                         types: relDtsPath,
                         import: relJsPath,
@@ -555,7 +570,7 @@ Examples:
                     }
                 }
                 else if (isSourceFile(sourcePath)) {
-                    const esmPath = removeExtension(relJsPath) + (isTypeModule ? `.js` : `.mjs`); // ./v4/index.js or ./v4/index.mjs
+                    const esmPath = removeExtension(relJsPath) + (isTypeModule ? `.js` : `.mjs`);
                     const cjsPath = removeExtension(relJsPath) + (isTypeModule ? `.cjs` : `.js`);
                     const dtsPath = removeExtension(relDtsPath) + (isTypeModule ? `.d.cts` : `.d.ts`); // ./
                     newExports[exportPath] = {
@@ -576,17 +591,20 @@ Examples:
                     }
                 }
                 else {
-                    console.error(`❌ Invalid entrypoint: ${sourcePath}`);
+                    (0, utils_1.emojiLog)("❌", `Invalid entrypoint: ${sourcePath}`, "error");
                     process.exit();
                 }
             }
         }
+        if (isVerbose) {
+            (0, utils_1.emojiLog)("🔧", `Generated "exports": ${(0, utils_1.formatForLog)(newExports)}`);
+        }
         ///////////////////////////////
         ///      generate bin        ///
         ///////////////////////////////
         // Generate bin field based on zshy bin config
         if (config.bin) {
-            console.log("📦 Updating package.json#/bin...");
+            (0, utils_1.emojiLog)("📦", `${isDryRun ? "[dryrun] " : ""}Updating package.json#/bin...`);
             const newBin = {};
             // Convert config.bin to object format for processing
             const binEntries = typeof config.bin === "string" ? [[pkgJson.name, config.bin]] : Object.entries(config.bin);
@@ -604,49 +622,74 @@ Examples:
             // If original config.bin was a string, output as string
             if (typeof config.bin === "string") {
                 pkgJson.bin = Object.values(newBin)[0];
-                if (isVerbose) {
-                    console.log(`🗣️ Updated package.json#/bin: "${Object.values(newBin)[0]}"`);
-                }
             }
             else {
                 // Output as object
                 pkgJson.bin = newBin;
-                if (isVerbose) {
-                    console.log("🗣️  Updated package.json#/bin: " + (0, utils_1.formatForLog)(newBin));
-                }
             }
         }
+        if (isVerbose) {
+            (0, utils_1.emojiLog)("🔧", `Generated "bin": ${(0, utils_1.formatForLog)(pkgJson.bin)}`);
+        }
         ///////////////////////////////
         ///     write pkg json      ///
         ///////////////////////////////
         // Update package.json with new exports
         pkgJson.exports = newExports;
         if (isDryRun) {
-            console.log("🔍 Skipping package.json modification (dry-run)");
+            (0, utils_1.emojiLog)("📦", "[dryrun] Skipping package.json modification");
         }
         else {
             fs.writeFileSync(packageJsonPath, JSON.stringify(pkgJson, null, 2) + "\n");
         }
-        // console.log("✅ Updating package.json#/exports");
-        if (isVerbose) {
-            console.log(`🗣️  Updated package.json#/exports: ${(0, utils_1.formatForLog)(newExports)}`);
+        if (isAttw) {
+            // run `@arethetypeswrong/cli --pack .` to check types
+            (0, utils_1.emojiLog)("🔍", "Checking types with @arethetypeswrong/cli...");
+            const { execFile } = await Promise.resolve().then(() => __importStar(require("node:child_process")));
+            const { promisify } = await Promise.resolve().then(() => __importStar(require("node:util")));
+            const execFileAsync = promisify(execFile);
+            const [cmd, ...args] = `${pmExec} @arethetypeswrong/cli --pack ${pkgJsonDir}`.split(" ");
+            console.dir([cmd, ...args], { depth: null });
+            let stdout = "";
+            let stderr = "";
+            let exitCode = 0;
+            try {
+                const result = await execFileAsync(cmd, args, {
+                    cwd: pkgJsonDir,
+                    encoding: "utf-8",
+                });
+                stdout = result.stdout;
+                stderr = result.stderr;
+            }
+            catch (error) {
+                stdout = error.stdout || "";
+                stderr = error.stderr || "";
+                exitCode = error.code || 1;
+            }
+            const output = stdout || stderr;
+            if (output) {
+                const indentedOutput = output
+                    .split("\n")
+                    .map((line) => `   ${line}`)
+                    .join("\n");
+                if (exitCode === 0) {
+                    console.log(indentedOutput);
+                }
+                else {
+                    console.error(indentedOutput);
+                    (0, utils_1.emojiLog)("⚠️", "ATTW found issues, but the build was not affected.", "warn");
+                }
+            }
         }
-        // // run `@arethetypeswrong/cli --pack .` to check types
-        // console.log("🔍 Checking types with @arethetypeswrong/cli...");
-        // const { execSync } = await import("node:child_process");
-        // execSync(`npx @arethetypeswrong/cli --pack ${pkgJsonDir}`, {
-        // 	stdio: "inherit",
-        // 	cwd: pkgJsonDir,
-        // });
-        console.log("🎉 Build complete!");
+        (0, utils_1.emojiLog)("🎉", "Build complete! ✅");
     }
     catch (error) {
-        console.error("❌ Build failed:", error);
+        (0, utils_1.emojiLog)("❌", `Build failed: ${error}`, "error");
         process.exit(1);
     }
 }
 // Run the script
 main().catch((error) => {
-    console.error("❌ Script failed:", error);
+    (0, utils_1.emojiLog)("❌", `Script failed: ${error}`, "error");
     process.exit(1);
 });