@xylabs/ts-scripts-yarn3 7.0.0-rc.9 → 7.0.1

package/dist/bin/package/compile-tsup.mjs

@@ -1,27 +1,53 @@
 #!/usr/bin/env node
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
 // src/bin/package/compile-tsup.ts
-import chalk from "chalk";
+import chalk5 from "chalk";
 
 // src/actions/package/compile/packageCompileTsup.ts
+import chalk4 from "chalk";
 import { build, defineConfig } from "tsup";
 
 // src/actions/package/compile/inputs.ts
+import chalk from "chalk";
 import { glob } from "glob";
-var getAllInputs = (folder) => {
-  return glob.sync(`${folder}/**/*.*`, { posix: true });
-};
+var getAllInputs = /* @__PURE__ */ __name((srcDir, verbose = false) => {
+  return [
+    ...glob.sync(`${srcDir}/**/*.ts`, {
+      posix: true
+    }).map((file) => {
+      const result = file.slice(Math.max(0, srcDir.length + 1));
+      if (verbose) {
+        console.log(chalk.gray(`getAllInputs: ${JSON.stringify(result, null, 2)}`));
+      }
+      return result;
+    }),
+    ...glob.sync(`${srcDir}/**/*.tsx`, {
+      posix: true
+    }).map((file) => {
+      const result = file.slice(Math.max(0, srcDir.length + 1));
+      if (verbose) {
+        console.log(chalk.gray(`getAllInputs: ${JSON.stringify(result, null, 2)}`));
+      }
+      return result;
+    })
+  ];
+}, "getAllInputs");
 
 // src/actions/package/compile/buildEntries.ts
-var buildEntries = (folder, entryMode = "single", options, excludeSpecAndStories = true, verbose = false) => {
+var buildEntries = /* @__PURE__ */ __name((srcDir, entryMode = "single", options, excludeSpecAndStories = true, verbose = false) => {
   let entries = [];
   switch (entryMode) {
     case "platform": {
-      entries = [`${folder}/index-node.ts`, `${folder}/index-browser.ts`];
+      entries = [
+        "index-node.ts",
+        "index-browser.ts"
+      ];
       break;
     }
     case "all": {
-      entries = excludeSpecAndStories ? getAllInputs(folder).filter((entry) => !entry.includes(".spec.") && !entry.includes(".stories.")) : getAllInputs(folder);
+      entries = (excludeSpecAndStories ? getAllInputs(srcDir).filter((entry) => !entry.includes(".spec.") && !entry.includes(".stories.")) : getAllInputs(srcDir)).filter((entry) => !entry.endsWith(".d.ts"));
       break;
     }
     case "custom": {
@@ -29,7 +55,9 @@ var buildEntries = (folder, entryMode = "single", options, excludeSpecAndStories
       break;
     }
     default: {
-      entries = [`${folder}/index.ts`];
+      entries = [
+        "index.ts"
+      ];
       break;
     }
   }
@@ -38,7 +66,7 @@ var buildEntries = (folder, entryMode = "single", options, excludeSpecAndStories
   }
   if (verbose) console.log(`buildEntries [${entryMode}] ${entries.length}`);
   return entries;
-};
+}, "buildEntries");
 
 // src/actions/package/compile/deepMerge.ts
 function deepMerge(target, source) {
@@ -55,6 +83,7 @@ function deepMerge(target, source) {
   }
   return target;
 }
+__name(deepMerge, "deepMerge");
 function deepMergeObjects(objects) {
   const result = {};
   for (const obj of objects) {
@@ -62,166 +91,334 @@ function deepMergeObjects(objects) {
   }
   return result;
 }
+__name(deepMergeObjects, "deepMergeObjects");
 
-// src/actions/package/compile/packageCompileTscTypes.ts
+// src/actions/package/compile/packageCompileTsc.ts
+import { cwd as cwd2 } from "process";
+import chalk2 from "chalk";
+import { createProgramFromConfig } from "tsc-prog";
+import ts, { DiagnosticCategory, formatDiagnosticsWithColorAndContext, getPreEmitDiagnostics, sys } from "typescript";
+
+// src/actions/package/compile/getCompilerOptions.ts
 import { cwd } from "process";
+import deepmerge from "deepmerge";
+import { getTsconfig } from "get-tsconfig";
+var getCompilerOptions = /* @__PURE__ */ __name((options = {}, fileName = "tsconfig.json") => {
+  const resolvedTsConfigCompilerOptions = getTsconfig(cwd(), fileName)?.config?.compilerOptions ?? {};
+  return deepmerge(resolvedTsConfigCompilerOptions, options);
+}, "getCompilerOptions");
+
+// src/actions/package/compile/packageCompileTsc.ts
+var packageCompileTsc = /* @__PURE__ */ __name((platform, entries, srcDir = "src", outDir = "dist", compilerOptionsParam, verbose = false) => {
+  const pkg = process.env.INIT_CWD ?? cwd2();
+  if (verbose) {
+    console.log(chalk2.cyan(`Validating code START: ${entries.length} files to ${outDir} from ${srcDir}`));
+  }
+  const configFilePath = ts.findConfigFile("./", ts.sys.fileExists, "tsconfig.json");
+  if (configFilePath === void 0) {
+    throw new Error("Could not find tsconfig.json");
+  }
+  const compilerOptions = {
+    ...getCompilerOptions({
+      removeComments: false,
+      skipDefaultLibCheck: true,
+      skipLibCheck: true,
+      sourceMap: false
+    }),
+    ...compilerOptionsParam,
+    outDir: `${outDir}/${platform}`,
+    emitDeclarationOnly: true,
+    noEmit: false
+  };
+  console.log(chalk2.cyan(`Validating Files: ${entries.length}`));
+  if (verbose) {
+    for (const entry of entries) {
+      console.log(chalk2.grey(`Validating: ${entry}`));
+    }
+  }
+  try {
+    if (entries.length > 0) {
+      const program = createProgramFromConfig({
+        configFilePath,
+        basePath: pkg ?? cwd2(),
+        compilerOptions,
+        files: entries.map((entry) => `${srcDir}/${entry}`),
+        include: [
+          `${srcDir}/**/*.*`
+        ]
+      });
+      const diagnostics = getPreEmitDiagnostics(program);
+      if (diagnostics.length > 0) {
+        const formattedDiagnostics = formatDiagnosticsWithColorAndContext(diagnostics, {
+          getCanonicalFileName: /* @__PURE__ */ __name((fileName) => fileName, "getCanonicalFileName"),
+          getCurrentDirectory: /* @__PURE__ */ __name(() => srcDir, "getCurrentDirectory"),
+          getNewLine: /* @__PURE__ */ __name(() => sys.newLine, "getNewLine")
+        });
+        console.error(formattedDiagnostics);
+      }
+      program.emit();
+      return diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory.Error ? 1 : 0), 0);
+    }
+    return 0;
+  } finally {
+    if (verbose) {
+      console.log(chalk2.cyan(`Validating code FINISH: ${entries.length} files to ${outDir} from ${srcDir}`));
+    }
+  }
+}, "packageCompileTsc");
+
+// src/actions/package/compile/packageCompileTscTypes.ts
+import path from "path";
+import { cwd as cwd3 } from "process";
+import chalk3 from "chalk";
 import { rollup } from "rollup";
 import dts from "rollup-plugin-dts";
 import nodeExternals from "rollup-plugin-node-externals";
-async function bundleDts(inputPath, outputPath, platform) {
-  const nodePlugIns = platform === "node" ? [nodeExternals()] : [];
-  const bundle = await rollup({
-    input: inputPath,
-    plugins: [dts(), ...nodePlugIns],
-    onwarn(warning, warn) {
-      if (warning.code === "UNUSED_EXTERNAL_IMPORT") return;
-      warn(warning);
-    }
-  });
-  await bundle.write({
-    file: outputPath,
-    format: "es"
-  });
-  console.log(`Bundled declarations written to ${outputPath}`);
+var ignoredWarningCodes = /* @__PURE__ */ new Set([
+  "EMPTY_BUNDLE",
+  "UNRESOLVED_IMPORT"
+]);
+async function bundleDts(inputPath, outputPath, platform, options, verbose = false) {
+  const pkg = process.env.INIT_CWD ?? cwd3();
+  const tsconfigPath = path.resolve(pkg, "tsconfig.json");
+  const nodePlugIns = platform === "node" ? [
+    nodeExternals()
+  ] : [];
+  try {
+    const bundle = await rollup({
+      input: inputPath,
+      plugins: [
+        dts({
+          ...options,
+          tsconfig: tsconfigPath,
+          compilerOptions: {
+            emitDeclarationOnly: true,
+            noEmit: false,
+            declarationMap: true
+          }
+        }),
+        ...nodePlugIns
+      ],
+      onwarn(warning, warn) {
+        if (ignoredWarningCodes.has(warning.code ?? "")) {
+          return;
+        }
+        console.warn(chalk3.yellow(`[${warning.code}] ${warning.message}`));
+        console.warn(chalk3.gray(inputPath));
+        warn(warning);
+      }
+    });
+    await bundle.write({
+      file: outputPath,
+      format: "es"
+    });
+  } catch (ex) {
+    const error = ex;
+    console.warn(chalk3.red(error));
+    console.warn(chalk3.gray(inputPath));
+  }
+  if (verbose) {
+    console.log(`Bundled declarations written to ${outputPath}`);
+  }
 }
-var packageCompileTscTypes = async (entries, outDir, platform, folder = "src") => {
-  const pkg = process.env.INIT_CWD ?? cwd();
-  const srcRoot = `${pkg}/${folder}`;
-  const entryNameToTypeName = (entry) => {
+__name(bundleDts, "bundleDts");
+var packageCompileTscTypes = /* @__PURE__ */ __name(async (entries, outDir, platform, srcDir = "build", verbose = false) => {
+  if (verbose) {
+    console.log(chalk3.cyan(`Compiling Types START [${platform}]: ${entries.length} files to ${outDir} from ${srcDir}`));
+    console.log(`Entries: ${entries.join(", ")}`);
+  }
+  const pkg = process.env.INIT_CWD ?? cwd3();
+  const srcRoot = `${pkg}/${srcDir}/${platform}`;
+  const entryNameToTypeName = /* @__PURE__ */ __name((entry) => {
     const splitEntryName = entry.split(".");
     const newEntryExtension = "d." + splitEntryName.at(-1);
-    return [...splitEntryName.slice(0, -1), newEntryExtension].join(".");
-  };
-  const entryNames = entries.map((entry) => entry.split(`${folder}/`).at(-1) ?? entry);
+    return [
+      ...splitEntryName.slice(0, -1),
+      newEntryExtension
+    ].join(".");
+  }, "entryNameToTypeName");
+  const compilerOptions = getCompilerOptions({
+    removeComments: false,
+    skipDefaultLibCheck: true,
+    skipLibCheck: true,
+    declarationMap: true,
+    emitDeclarationOnly: true,
+    noEmit: true
+  });
+  const entryNames = entries.map((entry) => entry.split(`${srcDir}/`).at(-1) ?? entry);
   await Promise.all(entryNames.map(async (entryName) => {
-    await bundleDts(`${srcRoot}/${entryName}`, outDir + "/" + entryNameToTypeName(entryName), platform);
+    const entryTypeName = entryNameToTypeName(entryName);
+    await bundleDts(`${srcRoot}/${entryTypeName}`, `${outDir}/${entryTypeName}`, platform, {
+      compilerOptions
+    }, verbose);
   }));
+  if (verbose) {
+    console.log(chalk3.cyan(`Compiling Types FINISH: ${entries.length} files to ${outDir} from ${srcDir}`));
+  }
   return 0;
-};
+}, "packageCompileTscTypes");
 
 // src/actions/package/compile/packageCompileTsup.ts
-var compileFolder = async (folder, entries, options, verbose) => {
+var compileFolder = /* @__PURE__ */ __name(async (srcDir, entries, buildDir, options, bundleTypes = false, verbose) => {
   const outDir = options?.outDir ?? "dist";
   if (verbose) {
-    console.log(`compileFolder [${folder}]`);
+    console.log(`compileFolder [${srcDir}, ${options?.outDir}]`);
   }
-  const optionsResult = defineConfig({
-    bundle: true,
-    cjsInterop: true,
-    clean: true,
-    dts: false,
-    entry: entries,
-    format: ["esm"],
-    outDir,
-    silent: true,
-    sourcemap: true,
-    splitting: false,
-    tsconfig: "tsconfig.json",
-    ...options
-  });
-  const optionsList = (await Promise.all(
-    (Array.isArray(optionsResult) ? optionsResult : [optionsResult]).flatMap(async (options2) => {
-      const result = typeof options2 === "function" ? await options2({}) : [options2];
-      return Array.isArray(result) ? result : [result];
-    })
-  )).flat();
+  if (entries.length === 0) {
+    console.warn(chalk4.yellow(`No entries found in ${srcDir} to compile`));
+    return 0;
+  }
+  if (verbose) {
+    console.log(chalk4.gray(`buildDir [${buildDir}]`));
+  }
+  const validationResult = packageCompileTsc(options?.platform ?? "neutral", entries, srcDir, buildDir, void 0, verbose);
+  if (validationResult !== 0) {
+    console.error(chalk4.red(`Compile:Validation had ${validationResult} errors`));
+    return validationResult;
+  }
+  const optionsParams = tsupOptions([
+    {
+      bundle: true,
+      cjsInterop: true,
+      clean: false,
+      dts: false,
+      format: [
+        "esm"
+      ],
+      outDir,
+      silent: true,
+      sourcemap: true,
+      splitting: false,
+      tsconfig: "tsconfig.json",
+      ...options,
+      entry: entries.map((entry) => `${srcDir}/${entry}`)
+    }
+  ]);
+  const optionsResult = defineConfig(optionsParams);
+  const optionsList = (await Promise.all((Array.isArray(optionsResult) ? optionsResult : [
+    optionsResult
+  ]).flatMap(async (options2) => {
+    const result = typeof options2 === "function" ? await options2({}) : [
+      options2
+    ];
+    return Array.isArray(result) ? result : [
+      result
+    ];
+  }))).flat();
   if (verbose) {
-    console.log(`TSUP:build:start [${folder}]`);
+    console.log(chalk4.cyan(`TSUP:build:start [${srcDir}]`));
+    console.log(chalk4.gray(`TSUP:build:options [${JSON.stringify(optionsList, null, 2)}]`));
   }
   await Promise.all(optionsList.map((options2) => build(options2)));
   if (verbose) {
-    console.log(`TSUP:build:stop [${folder}]`);
+    console.log(chalk4.cyan(`TSUP:build:stop [${srcDir}]`));
+  }
+  if (bundleTypes) {
+    await packageCompileTscTypes(entries, outDir, options?.platform ?? "neutral", buildDir, verbose);
   }
-  await packageCompileTscTypes(entries, outDir, options?.platform ?? "neutral", folder);
   return 0;
-};
-var tsupOptions = (options = []) => {
+}, "compileFolder");
+var tsupOptions = /* @__PURE__ */ __name((options = []) => {
   const standardLoaders = {
     ".gif": "copy",
     ".html": "copy",
     ".jpg": "copy",
     ".json": "json",
     ".png": "copy",
-    ".svg": "copy",
+    ".svg": "text",
     ".webp": "copy"
   };
   const standardOptions = {
     bundle: true,
-    format: ["esm"],
+    format: [
+      "esm"
+    ],
     loader: standardLoaders,
-    outExtension: ({ format }) => format === "esm" ? { js: ".mjs" } : { js: ".cjs" },
+    outExtension: /* @__PURE__ */ __name(({ format }) => format === "esm" ? {
+      js: ".mjs"
+    } : {
+      js: ".cjs"
+    }, "outExtension"),
     skipNodeModulesBundle: true,
     sourcemap: true,
     target: "esnext"
   };
-  return deepMergeObjects([standardOptions, ...options]);
-};
-var packageCompileTsup = async (config) => {
+  return deepMergeObjects([
+    standardOptions,
+    ...options
+  ]);
+}, "tsupOptions");
+var packageCompileTsup = /* @__PURE__ */ __name(async (config) => {
   const compile = config?.compile;
   const verbose = config?.verbose ?? false;
+  const outDirAsBuildDir = compile?.outDirAsBuildDir ?? true;
+  const bundleTypes = compile?.bundleTypes ?? false;
   if (verbose) {
-    console.log(`Compiling with TSUP [Depth: ${compile?.depth}]`);
+    console.log("Compiling with TSUP");
   }
-  const compileForNode = compile?.node ?? { src: {} };
-  const compileForBrowser = compile?.browser ?? { src: {} };
-  const compileForNeutral = compile?.neutral ?? { src: {} };
-  if (verbose) {
-    console.log("Calling packageCompileTscTypes");
-  }
-  return (await Promise.all(
-    Object.entries(compileForNode).map(async ([folder, options]) => {
-      const optionsObject = typeof options === "object" ? options : {};
-      const inEsBuildOptions = typeof compile?.node?.esbuildOptions === "object" ? compile?.node?.esbuildOptions : {};
-      return typeof folder === "string" ? await compileFolder(
-        folder,
-        buildEntries(folder, compile?.entryMode, options, true, verbose),
-        tsupOptions([
-          inEsBuildOptions,
-          compile?.tsup?.options ?? {},
-          typeof options === "object" ? options : {},
-          { platform: "node", outDir: optionsObject.outDir ?? "dist/node" }
-        ]),
-        verbose
-      ) : 0;
-    })
-  )).reduce((prev, value) => prev + value, 0) + (await Promise.all(
-    Object.entries(compileForBrowser).map(async ([folder, options]) => {
-      const optionsObject = typeof options === "object" ? options : {};
-      const inEsBuildOptions = typeof compile?.browser?.esbuildOptions === "object" ? compile?.browser?.esbuildOptions : {};
-      return typeof folder === "string" ? await compileFolder(
-        folder,
-        buildEntries(folder, compile?.entryMode, options, true, verbose),
-        tsupOptions([
-          inEsBuildOptions,
-          compile?.tsup?.options ?? {},
-          typeof options === "object" ? options : {},
-          { platform: "browser", outDir: optionsObject.outDir ?? "dist/browser" }
-        ]),
-        verbose
-      ) : 0;
-    })
-  )).reduce((prev, value) => prev + value, 0) + (await Promise.all(
-    Object.entries(compileForNeutral).map(async ([folder, options]) => {
-      const optionsObject = typeof options === "object" ? options : {};
-      const inEsBuildOptions = typeof compile?.neutral?.esbuildOptions === "object" ? compile?.neutral?.esbuildOptions : {};
-      return typeof folder === "string" ? await compileFolder(
-        folder,
-        buildEntries(folder, compile?.entryMode, options, true, verbose),
-        tsupOptions([
-          inEsBuildOptions,
-          compile?.tsup?.options ?? {},
-          typeof options === "object" ? options : {},
-          { platform: "neutral", outDir: optionsObject.outDir ?? "dist/neutral" }
-        ]),
-        verbose
-      ) : 0;
-    })
-  )).reduce((prev, value) => prev + value, 0) + 0;
-};
+  const compileForNode = compile?.node ?? {
+    src: {}
+  };
+  const compileForBrowser = compile?.browser ?? {
+    src: {}
+  };
+  const compileForNeutral = compile?.neutral ?? {
+    src: {}
+  };
+  return (await Promise.all(Object.entries(compileForNode).map(async ([srcDir, options]) => {
+    const optionsObject = typeof options === "object" ? options : {};
+    const inEsBuildOptions = typeof compile?.node?.esbuildOptions === "object" ? compile?.node?.esbuildOptions : {};
+    const entry = buildEntries(srcDir, compile?.entryMode, options, true, verbose);
+    const platform = "node";
+    const rootOutDir = optionsObject.outDir ?? "dist";
+    const outDir = rootOutDir + "/" + platform;
+    return typeof srcDir === "string" ? await compileFolder(srcDir, entry, outDirAsBuildDir ? rootOutDir : "build", tsupOptions([
+      inEsBuildOptions,
+      compile?.tsup?.options ?? {},
+      typeof options === "object" ? options : {},
+      {
+        platform: "node",
+        outDir
+      }
+    ]), bundleTypes, verbose) : 0;
+  }))).reduce((prev, value) => prev + value, 0) + (await Promise.all(Object.entries(compileForBrowser).map(async ([srcDir, options]) => {
+    const optionsObject = typeof options === "object" ? options : {};
+    const inEsBuildOptions = typeof compile?.browser?.esbuildOptions === "object" ? compile?.browser?.esbuildOptions : {};
+    const entry = buildEntries(srcDir, compile?.entryMode, options, true, verbose);
+    const platform = "browser";
+    const rootOutDir = optionsObject.outDir ?? "dist";
+    const outDir = rootOutDir + "/" + platform;
+    return typeof srcDir === "string" ? await compileFolder(srcDir, entry, outDirAsBuildDir ? rootOutDir : "build", tsupOptions([
+      inEsBuildOptions,
+      compile?.tsup?.options ?? {},
+      typeof options === "object" ? options : {},
+      {
+        platform: "browser",
+        outDir
+      }
+    ]), bundleTypes, verbose) : 0;
+  }))).reduce((prev, value) => prev + value, 0) + (await Promise.all(Object.entries(compileForNeutral).map(async ([srcDir, options]) => {
+    const optionsObject = typeof options === "object" ? options : {};
+    const inEsBuildOptions = typeof compile?.neutral?.esbuildOptions === "object" ? compile?.neutral?.esbuildOptions : {};
+    const entry = buildEntries(srcDir, compile?.entryMode, options, true, verbose);
+    const platform = "neutral";
+    const rootOutDir = optionsObject.outDir ?? "dist";
+    const outDir = rootOutDir + "/" + platform;
+    return typeof srcDir === "string" ? await compileFolder(srcDir, entry, outDirAsBuildDir ? rootOutDir : "build", tsupOptions([
+      inEsBuildOptions,
+      compile?.tsup?.options ?? {},
+      typeof options === "object" ? options : {},
+      {
+        platform: "neutral",
+        outDir
+      }
+    ]), bundleTypes, verbose) : 0;
+  }))).reduce((prev, value) => prev + value, 0) + 0;
+}, "packageCompileTsup");
 
 // src/bin/package/compile-tsup.ts
-packageCompileTsup({ verbose: true }).then((value) => process.exitCode = value).catch((reason) => {
-  console.error(chalk.red(reason));
+packageCompileTsup().then((value) => process.exitCode = value).catch((reason) => {
+  console.error(chalk5.red(reason));
   process.exitCode = 1;
 });
 //# sourceMappingURL=compile-tsup.mjs.map