@xylabs/ts-scripts-yarn3 7.0.0-rc.13 → 7.0.0-rc.15

package/dist/actions/index.mjs

@@ -299,14 +299,17 @@ import { TypeScriptLoader } from "cosmiconfig-typescript-loader";
 import deepmerge from "deepmerge";
 var config;
 var loadConfig = async (params) => {
-  if (config) {
+  if (config !== void 0) {
     return deepmerge(config, params ?? {});
   }
   const cosmicConfigResult = await cosmiconfig("xy", { cache: true, loaders: { ".ts": TypeScriptLoader() } }).search();
   config = cosmicConfigResult?.config;
   const configFilePath = cosmicConfigResult?.filepath;
-  if (configFilePath) {
-    console.log(chalk5.gray(`Loading config from ${configFilePath}`));
+  if (configFilePath !== void 0) {
+    console.log(chalk5.green(`Loaded config from ${configFilePath}`));
+    if (config.verbose) {
+      console.log(chalk5.gray(`${JSON.stringify(config, null, 2)}`));
+    }
   }
   return deepmerge(config, params ?? {});
 };
@@ -1448,9 +1451,12 @@ var getCompilerOptions = (options = {}, fileName = "tsconfig.json") => {
 };
 
 // src/actions/package/compile/packageCompileTsc.ts
-var packageCompileTsc = (entries, folder = "src", config2 = {}, compilerOptionsParam) => {
+var packageCompileTsc = (entries, folder = "src", outDir = "build", config2 = {}, compilerOptionsParam, verbose = false) => {
   const pkg = process.env.INIT_CWD ?? cwd2();
-  const verbose = config2?.verbose ?? false;
+  const resolvedVerbose = verbose ?? config2?.verbose ?? false;
+  if (resolvedVerbose) {
+    console.log(`Verifying code START: ${entries.length} files to ${outDir} from ${folder}`);
+  }
   const compilerOptions = {
     ...getCompilerOptions({
       removeComments: false,
@@ -1459,38 +1465,44 @@ var packageCompileTsc = (entries, folder = "src", config2 = {}, compilerOptionsP
       sourceMap: false
     }),
     ...compilerOptionsParam,
-    outDir: "build",
+    outDir,
     emitDeclarationOnly: true,
     noEmit: false
   };
   console.log(chalk26.green(`Validating Files: ${entries.length}`));
-  if (verbose) {
+  if (resolvedVerbose) {
     for (const entry of entries) {
       console.log(chalk26.grey(`Validating: ${entry}`));
     }
   }
-  if (entries.length > 0) {
-    const program = createProgramFromConfig({
-      basePath: pkg ?? cwd2(),
-      compilerOptions,
-      files: entries.map((entry) => `${folder}/${entry}`)
-    });
-    const diagnostics = getPreEmitDiagnostics(program);
-    if (diagnostics.length > 0) {
-      const formattedDiagnostics = formatDiagnosticsWithColorAndContext(
-        diagnostics,
-        {
-          getCanonicalFileName: (fileName) => fileName,
-          getCurrentDirectory: () => folder,
-          getNewLine: () => sys.newLine
-        }
-      );
-      console.error(formattedDiagnostics);
+  try {
+    if (entries.length > 0) {
+      const program = createProgramFromConfig({
+        basePath: pkg ?? cwd2(),
+        compilerOptions,
+        files: entries.map((entry) => `${folder}/${entry}`)
+      });
+      const diagnostics = getPreEmitDiagnostics(program);
+      if (diagnostics.length > 0) {
+        const formattedDiagnostics = formatDiagnosticsWithColorAndContext(
+          diagnostics,
+          {
+            getCanonicalFileName: (fileName) => fileName,
+            getCurrentDirectory: () => folder,
+            getNewLine: () => sys.newLine
+          }
+        );
+        console.error(formattedDiagnostics);
+      }
+      program.emit();
+      return diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory.Error ? 1 : 0), 0);
+    }
+    return 0;
+  } finally {
+    if (resolvedVerbose) {
+      console.log(`Verifying code FINISH: ${entries.length} files to ${outDir} from ${folder}`);
     }
-    program.emit();
-    return diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory.Error ? 1 : 0), 0);
   }
-  return 0;
 };
 
 // src/actions/package/compile/packageCompileTscTypes.ts
@@ -1498,7 +1510,7 @@ import { cwd as cwd3 } from "process";
 import { rollup } from "rollup";
 import dts from "rollup-plugin-dts";
 import nodeExternals from "rollup-plugin-node-externals";
-async function bundleDts(inputPath, outputPath, platform, options) {
+async function bundleDts(inputPath, outputPath, platform, options, verbose = false) {
   const nodePlugIns = platform === "node" ? [nodeExternals()] : [];
   const bundle = await rollup({
     input: inputPath,
@@ -1512,9 +1524,14 @@ async function bundleDts(inputPath, outputPath, platform, options) {
     file: outputPath,
     format: "es"
   });
-  console.log(`Bundled declarations written to ${outputPath}`);
+  if (verbose) {
+    console.log(`Bundled declarations written to ${outputPath}`);
+  }
 }
-var packageCompileTscTypes = async (entries, outDir, platform, folder = "build") => {
+var packageCompileTscTypes = async (entries, outDir, platform, folder = "build", verbose = false) => {
+  if (verbose) {
+    console.log(`Compiling Types START: ${entries.length} files to ${outDir} from ${folder}`);
+  }
   const pkg = process.env.INIT_CWD ?? cwd3();
   const srcRoot = `${pkg}/${folder}`;
   const entryNameToTypeName = (entry) => {
@@ -1534,8 +1551,11 @@ var packageCompileTscTypes = async (entries, outDir, platform, folder = "build")
   await Promise.all(entryNames.map(async (entryName) => {
     const entryTypeName = entryNameToTypeName(entryName);
     console.log(`Compiling Types: ${srcRoot}/${entryTypeName} to ${outDir}/${entryTypeName}`);
-    await bundleDts(`${srcRoot}/${entryTypeName}`, outDir + "/" + entryTypeName, platform, { compilerOptions, tsconfig: "tsconfig.json" });
+    await bundleDts(`${srcRoot}/${entryTypeName}`, outDir + "/" + entryTypeName, platform, { compilerOptions, tsconfig: "tsconfig.json" }, verbose);
   }));
+  if (verbose) {
+    console.log(`Compiling Types FINISH: ${entries.length} files to ${outDir} from ${folder}`);
+  }
   return 0;
 };
 
@@ -1559,7 +1579,7 @@ var compileFolder = async (folder, entries, options, verbose) => {
     tsconfig: "tsconfig.json",
     ...options
   });
-  const validationResult = packageCompileTsc(entries);
+  const validationResult = packageCompileTsc(entries, folder, void 0, void 0, void 0, verbose);
   if (validationResult !== 0) {
     console.error(`Compile:Validation had ${validationResult} errors`);
     return validationResult;
@@ -1577,7 +1597,7 @@ var compileFolder = async (folder, entries, options, verbose) => {
   if (verbose) {
     console.log(`TSUP:build:stop [${folder}]`);
   }
-  await packageCompileTscTypes(entries, outDir, options?.platform ?? "neutral", "build");
+  await packageCompileTscTypes(entries, outDir, options?.platform ?? "neutral", "build", verbose);
   return 0;
 };
 var tsupOptions = (options = []) => {
@@ -1603,8 +1623,8 @@ var tsupOptions = (options = []) => {
 };
 var packageCompileTsup = async (config2) => {
   const compile2 = config2?.compile;
-  const verbose = config2?.verbose ?? false;
-  if (verbose) {
+  const resolvedVerbose = config2?.verbose ?? false;
+  if (resolvedVerbose) {
     console.log(`Compiling with TSUP [Depth: ${compile2?.depth}]`);
   }
   const compileForNode = compile2?.node ?? { src: {} };
@@ -1616,14 +1636,14 @@ var packageCompileTsup = async (config2) => {
       const inEsBuildOptions = typeof compile2?.node?.esbuildOptions === "object" ? compile2?.node?.esbuildOptions : {};
       return typeof folder === "string" ? await compileFolder(
         folder,
-        buildEntries(folder, compile2?.entryMode, options, true, verbose),
+        buildEntries(folder, compile2?.entryMode, options, true, resolvedVerbose),
         tsupOptions([
           inEsBuildOptions,
           compile2?.tsup?.options ?? {},
           typeof options === "object" ? options : {},
           { platform: "node", outDir: optionsObject.outDir ?? "dist/node" }
         ]),
-        verbose
+        resolvedVerbose
       ) : 0;
     })
   )).reduce((prev, value) => prev + value, 0) + (await Promise.all(
@@ -1632,14 +1652,14 @@ var packageCompileTsup = async (config2) => {
       const inEsBuildOptions = typeof compile2?.browser?.esbuildOptions === "object" ? compile2?.browser?.esbuildOptions : {};
       return typeof folder === "string" ? await compileFolder(
         folder,
-        buildEntries(folder, compile2?.entryMode, options, true, verbose),
+        buildEntries(folder, compile2?.entryMode, options, true, resolvedVerbose),
         tsupOptions([
           inEsBuildOptions,
           compile2?.tsup?.options ?? {},
           typeof options === "object" ? options : {},
           { platform: "browser", outDir: optionsObject.outDir ?? "dist/browser" }
         ]),
-        verbose
+        resolvedVerbose
       ) : 0;
     })
   )).reduce((prev, value) => prev + value, 0) + (await Promise.all(
@@ -1648,14 +1668,14 @@ var packageCompileTsup = async (config2) => {
       const inEsBuildOptions = typeof compile2?.neutral?.esbuildOptions === "object" ? compile2?.neutral?.esbuildOptions : {};
       return typeof folder === "string" ? await compileFolder(
         folder,
-        buildEntries(folder, compile2?.entryMode, options, true, verbose),
+        buildEntries(folder, compile2?.entryMode, options, true, resolvedVerbose),
         tsupOptions([
           inEsBuildOptions,
           compile2?.tsup?.options ?? {},
           typeof options === "object" ? options : {},
           { platform: "neutral", outDir: optionsObject.outDir ?? "dist/neutral" }
         ]),
-        verbose
+        resolvedVerbose
       ) : 0;
     })
   )).reduce((prev, value) => prev + value, 0) + 0;