@xylabs/ts-scripts-yarn3 3.15.16 → 4.0.0-rc.5

package/dist/actions/package/index.mjs

@@ -44,7 +44,7 @@ var packageClean = /* @__PURE__ */ __name(async () => {
 }, "packageClean");
 
 // src/actions/package/compile/compile.ts
-import chalk8 from "chalk";
+import chalk7 from "chalk";
 
 // src/lib/checkResult.ts
 import chalk3 from "chalk";
@@ -165,7 +165,7 @@ var packageCompileTsc = /* @__PURE__ */ __name(async (noEmit, config2, compilerO
     console.log(`Compiling with NoEmit TSC [${pkg}]`);
   }
   const compilerOptions = {
-    ...await getCompilerOptions({
+    ...getCompilerOptions({
       outDir: "dist",
       removeComments: true,
       rootDir: "src"
@@ -204,7 +204,6 @@ var packageCompileTsc = /* @__PURE__ */ __name(async (noEmit, config2, compilerO
 }, "packageCompileTsc");
 
 // src/actions/package/compile/packageCompileTsup.ts
-import merge3 from "lodash/merge.js";
 import { build, defineConfig } from "tsup";
 
 // src/actions/package/compile/inputs.ts
@@ -243,103 +242,6 @@ var buildEntries = /* @__PURE__ */ __name((folder, entryMode, verbose = false) =
   }
 }, "buildEntries");
 
-// src/actions/package/compile/packageCompileTscTypes.ts
-import { cwd as cwd2 } from "node:process";
-import chalk7 from "chalk";
-import { createProgramFromConfig as createProgramFromConfig2 } from "tsc-prog";
-import { DiagnosticCategory as DiagnosticCategory2 } from "typescript";
-
-// src/actions/package/compile/copyTypeFiles.ts
-import { copyFile, readdir } from "node:fs/promises";
-import { Mutex } from "async-mutex";
-var copyFileMutex = new Mutex();
-var getDistTypeFiles = /* @__PURE__ */ __name(async (compilerOptions) => {
-  const outDir = compilerOptions.outDir ?? "dist";
-  return (await readdir(outDir, {
-    recursive: true
-  })).filter((file) => file.endsWith("d.ts")).map((file) => `${outDir}/${file}`);
-}, "getDistTypeFiles");
-var getDistTypeMapFiles = /* @__PURE__ */ __name(async (compilerOptions) => {
-  const outDir = compilerOptions.outDir ?? "dist";
-  return (await readdir(outDir, {
-    recursive: true
-  })).filter((file) => file.endsWith("d.ts.map")).map((file) => `${outDir}/${file}`);
-}, "getDistTypeMapFiles");
-var copyTypeFiles = /* @__PURE__ */ __name(async (compilerOptions) => {
-  await copyFileMutex.runExclusive(async () => {
-    const distTypeFiles = await getDistTypeFiles(compilerOptions);
-    await Promise.all(distTypeFiles.map(async (file) => {
-      await copyFile(file, file.replace("d.ts", "d.mts"));
-      await copyFile(file, file.replace("d.ts", "d.cts"));
-    }));
-    const distTypeMapFiles = await getDistTypeMapFiles(compilerOptions);
-    await Promise.all(distTypeMapFiles.map(async (file) => {
-      await copyFile(file, file.replace("d.ts.map", "d.mts.map"));
-      await copyFile(file, file.replace("d.ts.map", "d.cts.map"));
-    }));
-  });
-}, "copyTypeFiles");
-
-// src/actions/package/compile/packageCompileTscTypes.ts
-var packageCompileTscTypes = /* @__PURE__ */ __name(async (folder = "src", { verbose } = {}, compilerOptionsParam, generateMts = true) => {
-  const pkg = process.env.INIT_CWD ?? cwd2();
-  if (verbose) {
-    console.log(`Compiling types with TSC [${pkg}]`);
-  }
-  const compilerOptions = {
-    ...await getCompilerOptions({
-      declaration: true,
-      emitDeclarationOnly: true,
-      outDir: "dist",
-      removeComments: true,
-      skipDefaultLibCheck: true,
-      skipLibCheck: true,
-      sourceMap: true
-    }),
-    ...compilerOptionsParam
-  };
-  const files = buildEntries(folder, "all");
-  const result = createProgramFromConfig2({
-    basePath: pkg ?? cwd2(),
-    compilerOptions,
-    exclude: [
-      "dist",
-      "docs",
-      "**/*.spec.*",
-      "**/*.stories.*",
-      "src/**/spec/**/*"
-    ],
-    files
-  }).emit();
-  const diagResults = result.diagnostics.length;
-  for (const diag of result.diagnostics) {
-    switch (diag.category) {
-      case DiagnosticCategory2.Error: {
-        console.error(chalk7.red(diag.messageText));
-        console.error(chalk7.grey(pkg));
-        console.error(chalk7.blue(diag.file?.fileName));
-        break;
-      }
-      case DiagnosticCategory2.Warning: {
-        console.error(chalk7.yellow(diag.messageText));
-        console.error(chalk7.grey(pkg));
-        console.error(chalk7.blue(diag.file?.fileName));
-        break;
-      }
-      case DiagnosticCategory2.Suggestion: {
-        console.error(chalk7.white(diag.messageText));
-        console.error(chalk7.grey(pkg));
-        console.error(chalk7.blue(diag.file?.fileName));
-        break;
-      }
-    }
-  }
-  if (generateMts) {
-    await copyTypeFiles(compilerOptions);
-  }
-  return diagResults;
-}, "packageCompileTscTypes");
-
 // src/actions/package/compile/packageCompileTsup.ts
 var compileFolder = /* @__PURE__ */ __name(async (folder, entryMode = "single", options, verbose) => {
   const outDir = options?.outDir ?? "dist";
@@ -348,18 +250,15 @@ var compileFolder = /* @__PURE__ */ __name(async (folder, entryMode = "single",
     bundle: true,
     cjsInterop: true,
     clean: true,
-    dts: false,
+    dts: true,
     entry,
     format: [
-      "cjs",
       "esm"
     ],
-    // minify: true,
     outDir,
     silent: true,
     sourcemap: true,
     splitting: false,
-    // terserOptions: { format: { comments: false } },
     tsconfig: "tsconfig.json",
     ...options
   });
@@ -374,11 +273,6 @@ var compileFolder = /* @__PURE__ */ __name(async (folder, entryMode = "single",
     ];
   }))).flat();
   await Promise.all(optionsList.map((options2) => build(options2)));
-  await packageCompileTscTypes(folder, {
-    verbose
-  }, {
-    outDir
-  });
   return 0;
 }, "compileFolder");
 var packageCompileTsup = /* @__PURE__ */ __name(async (config2) => {
@@ -397,172 +291,79 @@ var packageCompileTsup = /* @__PURE__ */ __name(async (config2) => {
   const compileForNeutral = compile?.neutral ?? {
     src: {}
   };
+  const standardLoaders = {
+    ".gif": "copy",
+    ".html": "copy",
+    ".jpg": "copy",
+    ".json": "json",
+    ".png": "copy",
+    ".svg": "copy",
+    ".webp": "copy"
+  };
+  const standardOptions = {
+    bundle: true,
+    format: [
+      "esm"
+    ],
+    loader: standardLoaders,
+    outExtension: /* @__PURE__ */ __name(({ format }) => format === "esm" ? {
+      js: ".mjs"
+    } : {
+      js: ".cjs"
+    }, "outExtension"),
+    skipNodeModulesBundle: true,
+    sourcemap: true,
+    target: "esnext"
+  };
   return await packageCompileTsc(true, {
     publint: false,
     verbose
   }) || (await Promise.all(Object.entries(compileForNode).map(async ([folder, options]) => {
     const inEsBuildOptions = typeof compile?.node?.esbuildOptions === "object" ? compile?.node?.esbuildOptions : {};
     return folder ? await compileFolder(folder, compile?.entryMode, {
-      bundle: true,
-      format: [
-        "cjs",
-        "esm"
-      ],
-      loader: merge3({}, {
-        ".gif": "copy",
-        ".html": "copy",
-        ".jpg": "copy",
-        ".json": "json",
-        ".png": "copy",
-        ".svg": "copy",
-        ".webp": "copy"
-      }, inEsBuildOptions?.loader),
-      // minify: true,
+      ...standardOptions,
+      loader: {
+        ...standardOptions.loader,
+        ...inEsBuildOptions?.loader
+      },
       outDir: "dist/node",
-      outExtension: /* @__PURE__ */ __name(({ format }) => format === "esm" ? {
-        js: ".mjs"
-      } : {
-        js: ".cjs"
-      }, "outExtension"),
       platform: "node",
-      skipNodeModulesBundle: true,
-      sourcemap: true,
-      target: "node16",
-      // terserOptions: { format: { comments: false } },
       ...compile?.tsup?.options,
       ...typeof options === "object" ? options : {}
     }, verbose) : 0;
   }))).reduce((prev, value) => prev + value, 0) || (await Promise.all(Object.entries(compileForBrowser).map(async ([folder, options]) => {
     const inEsBuildOptions = typeof compile?.browser?.esbuildOptions === "object" ? compile?.browser?.esbuildOptions : {};
-    return folder ? (await Promise.all([
-      compileFolder(folder, compile?.entryMode, {
-        bundle: true,
-        format: [
-          "cjs"
-        ],
-        loader: merge3({}, {
-          ".gif": "copy",
-          ".html": "copy",
-          ".jpg": "copy",
-          ".json": "json",
-          ".png": "copy",
-          ".svg": "copy",
-          ".webp": "copy"
-        }, inEsBuildOptions?.loader),
-        // minify: true,
-        outDir: "dist/browser",
-        outExtension: /* @__PURE__ */ __name(({ format }) => format === "esm" ? {
-          js: ".mjs"
-        } : {
-          js: ".cjs"
-        }, "outExtension"),
-        platform: "browser",
-        skipNodeModulesBundle: true,
-        sourcemap: true,
-        target: "esnext",
-        // terserOptions: { format: { comments: false } },
-        ...compile?.tsup?.options,
-        ...typeof options === "object" ? options : {}
-      }, verbose),
-      compileFolder(folder, compile?.entryMode, {
-        bundle: true,
-        format: [
-          "esm"
-        ],
-        loader: merge3({}, {
-          ".gif": "copy",
-          ".html": "copy",
-          ".jpg": "copy",
-          ".json": "json",
-          ".png": "copy",
-          ".svg": "copy",
-          ".webp": "copy"
-        }, inEsBuildOptions?.loader),
-        // minify: true,
-        outDir: "dist/browser",
-        outExtension: /* @__PURE__ */ __name(({ format }) => format === "esm" ? {
-          js: ".mjs"
-        } : {
-          js: ".cjs"
-        }, "outExtension"),
-        platform: "browser",
-        skipNodeModulesBundle: true,
-        sourcemap: true,
-        target: "esnext",
-        // terserOptions: { format: { comments: false } },
-        ...compile?.tsup?.options,
-        ...typeof options === "object" ? options : {}
-      }, verbose)
-    ])).reduce((prev, value) => prev + value, 0) : 0;
+    return folder ? await compileFolder(folder, compile?.entryMode, {
+      ...standardOptions,
+      loader: {
+        ...standardOptions.loader,
+        ...inEsBuildOptions?.loader
+      },
+      outDir: "dist/browser",
+      platform: "browser",
+      ...compile?.tsup?.options,
+      ...typeof options === "object" ? options : {}
+    }, verbose) : 0;
   }))).reduce((prev, value) => prev + value, 0) || (await Promise.all(Object.entries(compileForNeutral).map(async ([folder, options]) => {
     const inEsBuildOptions = typeof compile?.neutral?.esbuildOptions === "object" ? compile?.neutral?.esbuildOptions : {};
-    return folder ? (await Promise.all([
-      compileFolder(folder, compile?.entryMode, {
-        bundle: true,
-        format: [
-          "cjs"
-        ],
-        loader: merge3({}, {
-          ".gif": "copy",
-          ".html": "copy",
-          ".jpg": "copy",
-          ".json": "json",
-          ".png": "copy",
-          ".svg": "copy",
-          ".webp": "copy"
-        }, inEsBuildOptions?.loader),
-        // minify: true,
-        outDir: "dist/neutral",
-        outExtension: /* @__PURE__ */ __name(({ format }) => format === "esm" ? {
-          js: ".mjs"
-        } : {
-          js: ".cjs"
-        }, "outExtension"),
-        platform: "neutral",
-        skipNodeModulesBundle: true,
-        sourcemap: true,
-        target: "esnext",
-        // terserOptions: { format: { comments: false } },
-        ...compile?.tsup?.options,
-        ...typeof options === "object" ? options : {}
-      }, verbose),
-      compileFolder(folder, compile?.entryMode, {
-        bundle: true,
-        format: [
-          "esm"
-        ],
-        loader: merge3({}, {
-          ".gif": "copy",
-          ".html": "copy",
-          ".jpg": "copy",
-          ".json": "json",
-          ".png": "copy",
-          ".svg": "copy",
-          ".webp": "copy"
-        }, inEsBuildOptions?.loader),
-        // minify: true,
-        outDir: "dist/neutral",
-        outExtension: /* @__PURE__ */ __name(({ format }) => format === "esm" ? {
-          js: ".mjs"
-        } : {
-          js: ".cjs"
-        }, "outExtension"),
-        platform: "neutral",
-        skipNodeModulesBundle: true,
-        sourcemap: true,
-        target: "esnext",
-        // terserOptions: { format: { comments: false } },
-        ...compile?.tsup?.options,
-        ...typeof options === "object" ? options : {}
-      }, verbose)
-    ])).reduce((prev, value) => prev + value, 0) : 0;
+    return folder ? await compileFolder(folder, compile?.entryMode, {
+      ...standardOptions,
+      loader: {
+        ...standardOptions.loader,
+        ...inEsBuildOptions?.loader
+      },
+      outDir: "dist/neutral",
+      platform: "neutral",
+      ...compile?.tsup?.options,
+      ...typeof options === "object" ? options : {}
+    }, verbose) : 0;
   }))).reduce((prev, value) => prev + value, 0) || (publint ? await packagePublint() : 0);
 }, "packageCompileTsup");
 
 // src/actions/package/compile/compile.ts
 var packageCompile = /* @__PURE__ */ __name(async (inConfig = {}) => {
   const pkg = process.env.INIT_CWD;
-  console.log(chalk8.green(`Compiling ${pkg}`));
+  console.log(chalk7.green(`Compiling ${pkg}`));
   const config2 = await loadConfig(inConfig);
   const publint = config2.publint;
   const mode = config2.compile?.mode ?? "tsup";
@@ -582,7 +383,7 @@ var packageCompile = /* @__PURE__ */ __name(async (inConfig = {}) => {
 
 // src/actions/package/copy-assets.ts
 import path3 from "node:path/posix";
-import chalk9 from "chalk";
+import chalk8 from "chalk";
 import cpy from "cpy";
 var copyTargetAssets = /* @__PURE__ */ __name(async (target, name, location) => {
   try {
@@ -601,7 +402,7 @@ var copyTargetAssets = /* @__PURE__ */ __name(async (target, name, location) =>
       flat: false
     });
     if (values.length > 0) {
-      console.log(chalk9.green(`Copying Assets [${target.toUpperCase()}] - ${name} - ${location}`));
+      console.log(chalk8.green(`Copying Assets [${target.toUpperCase()}] - ${name} - ${location}`));
     }
     for (const value of values) {
       console.log(`${value.split("/").pop()} => ./dist/${target}`);
@@ -631,8 +432,8 @@ var packageCopyAssets = /* @__PURE__ */ __name(async ({ target }) => {
 
 // src/actions/package/deps.ts
 import { existsSync, readFileSync } from "node:fs";
-import { cwd as cwd3 } from "node:process";
-import chalk10 from "chalk";
+import { cwd as cwd2 } from "node:process";
+import chalk9 from "chalk";
 import depcheck from "depcheck";
 var special = depcheck.special;
 var defaultIgnorePatterns = [
@@ -659,21 +460,21 @@ var defaultIgnoreDevPatterns = [
 var reportUnused = /* @__PURE__ */ __name((name, unused) => {
   if (unused.length > 0) {
     const message = [
-      chalk10.yellow(`${unused.length} Unused ${name}`)
+      chalk9.yellow(`${unused.length} Unused ${name}`)
     ];
-    for (const value of unused) message.push(chalk10.gray(`  ${value}`));
+    for (const value of unused) message.push(chalk9.gray(`  ${value}`));
     console.log(message.join("\n"));
   }
 }, "reportUnused");
 var reportMissing = /* @__PURE__ */ __name((name, missing) => {
   if (Object.keys(missing).length > 0) {
     const message = [
-      chalk10.yellow(`${Object.entries(missing).length} Missing ${name}`)
+      chalk9.yellow(`${Object.entries(missing).length} Missing ${name}`)
     ];
     for (const [key, value] of Object.entries(missing)) {
-      message.push(`${key}`, chalk10.gray(`  ${value.at(0)}`));
+      message.push(`${key}`, chalk9.gray(`  ${value.at(0)}`));
     }
-    console.log(chalk10.yellow(message.join("\n")));
+    console.log(chalk9.yellow(message.join("\n")));
   }
 }, "reportMissing");
 var analyzeDeps = /* @__PURE__ */ __name(async (pkg, ignoreMatches) => {
@@ -728,7 +529,7 @@ var analyzeDeps = /* @__PURE__ */ __name(async (pkg, ignoreMatches) => {
   };
 }, "analyzeDeps");
 var packageDeps = /* @__PURE__ */ __name(async () => {
-  const pkg = process.env.INIT_CWD ?? cwd3();
+  const pkg = process.env.INIT_CWD ?? cwd2();
   const pkgName = process.env.npm_package_name;
   const packageContent = existsSync(`${pkg}/package.json`) ? JSON.parse(readFileSync(`${pkg}/package.json`, {
     encoding: "utf8"
@@ -778,10 +579,10 @@ var packageDeps = /* @__PURE__ */ __name(async () => {
   reportUnused("dependencies", unusedDeps);
   reportUnused("devDependencies", unusedDevDeps);
   if (Object.entries(invalidDirs).length > 0) {
-    for (const [key, value] of Object.entries(invalidDirs)) console.warn(chalk10.gray(`Invalid Dir: ${key}: ${value}`));
+    for (const [key, value] of Object.entries(invalidDirs)) console.warn(chalk9.gray(`Invalid Dir: ${key}: ${value}`));
   }
   if (Object.entries(invalidFiles).length > 0) {
-    for (const [key, value] of Object.entries(invalidFiles)) console.warn(chalk10.gray(`Invalid File: ${key}: ${value}`));
+    for (const [key, value] of Object.entries(invalidFiles)) console.warn(chalk9.gray(`Invalid File: ${key}: ${value}`));
   }
   reportMissing("dependencies", missingDepsObject);
   reportMissing("devDependencies", missingDevDepsObject);
@@ -792,7 +593,7 @@ var packageDeps = /* @__PURE__ */ __name(async () => {
 // src/actions/package/gen-docs.ts
 import { existsSync as existsSync2 } from "node:fs";
 import path4 from "node:path";
-import chalk11 from "chalk";
+import chalk10 from "chalk";
 import { Application, ArgumentsReader, TSConfigReader, TypeDocReader } from "typedoc";
 var ExitCodes = {
   CompileError: 3,
@@ -894,7 +695,7 @@ var runTypeDoc = /* @__PURE__ */ __name(async (app) => {
       return ExitCodes.OutputError;
     }
   }
-  console.log(chalk11.green(`${pkgName} - Ok`));
+  console.log(chalk10.green(`${pkgName} - Ok`));
   return ExitCodes.Ok;
 }, "runTypeDoc");