@xylabs/ts-scripts-yarn3 3.15.15 → 4.0.0-rc.4

package/dist/actions/index.mjs

@@ -1341,7 +1341,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"
@@ -1380,7 +1380,6 @@ var packageCompileTsc = /* @__PURE__ */ __name(async (noEmit, config2, compilerO
 }, "packageCompileTsc");
 
 // src/actions/package/compile/packageCompileTsup.ts
-import merge3 from "lodash/merge.js";
 import { build as build2, defineConfig } from "tsup";
 
 // src/actions/package/compile/inputs.ts
@@ -1424,46 +1423,13 @@ import { cwd as cwd2 } from "node:process";
 import chalk22 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) => {
+var packageCompileTscTypes = /* @__PURE__ */ __name((folder = "src", { verbose } = {}, compilerOptionsParam) => {
   const pkg = process.env.INIT_CWD ?? cwd2();
   if (verbose) {
     console.log(`Compiling types with TSC [${pkg}]`);
   }
   const compilerOptions = {
-    ...await getCompilerOptions({
+    ...getCompilerOptions({
       declaration: true,
       emitDeclarationOnly: true,
       outDir: "dist",
@@ -1510,9 +1476,6 @@ var packageCompileTscTypes = /* @__PURE__ */ __name(async (folder = "src", { ver
       }
     }
   }
-  if (generateMts) {
-    await copyTypeFiles(compilerOptions);
-  }
   return diagResults;
 }, "packageCompileTscTypes");
 
@@ -1527,7 +1490,6 @@ var compileFolder = /* @__PURE__ */ __name(async (folder, entryMode = "single",
     dts: false,
     entry,
     format: [
-      "cjs",
       "esm"
     ],
     // minify: true,
@@ -1550,7 +1512,7 @@ var compileFolder = /* @__PURE__ */ __name(async (folder, entryMode = "single",
     ];
   }))).flat();
   await Promise.all(optionsList.map((options2) => build2(options2)));
-  await packageCompileTscTypes(folder, {
+  packageCompileTscTypes(folder, {
     verbose
   }, {
     outDir
@@ -1573,165 +1535,72 @@ var packageCompileTsup = /* @__PURE__ */ __name(async (config2) => {
   const compileForNeutral = compile2?.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 compile2?.node?.esbuildOptions === "object" ? compile2?.node?.esbuildOptions : {};
     return folder ? await compileFolder(folder, compile2?.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 } },
       ...compile2?.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 compile2?.browser?.esbuildOptions === "object" ? compile2?.browser?.esbuildOptions : {};
-    return folder ? (await Promise.all([
-      compileFolder(folder, compile2?.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 } },
-        ...compile2?.tsup?.options,
-        ...typeof options === "object" ? options : {}
-      }, verbose),
-      compileFolder(folder, compile2?.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 } },
-        ...compile2?.tsup?.options,
-        ...typeof options === "object" ? options : {}
-      }, verbose)
-    ])).reduce((prev, value) => prev + value, 0) : 0;
+    return folder ? await compileFolder(folder, compile2?.entryMode, {
+      ...standardOptions,
+      loader: {
+        ...standardOptions.loader,
+        ...inEsBuildOptions?.loader
+      },
+      outDir: "dist/browser",
+      platform: "browser",
+      ...compile2?.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 compile2?.neutral?.esbuildOptions === "object" ? compile2?.neutral?.esbuildOptions : {};
-    return folder ? (await Promise.all([
-      compileFolder(folder, compile2?.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 } },
-        ...compile2?.tsup?.options,
-        ...typeof options === "object" ? options : {}
-      }, verbose),
-      compileFolder(folder, compile2?.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 } },
-        ...compile2?.tsup?.options,
-        ...typeof options === "object" ? options : {}
-      }, verbose)
-    ])).reduce((prev, value) => prev + value, 0) : 0;
+    return folder ? await compileFolder(folder, compile2?.entryMode, {
+      ...standardOptions,
+      loader: {
+        ...standardOptions.loader,
+        ...inEsBuildOptions?.loader
+      },
+      outDir: "dist/neutral",
+      platform: "neutral",
+      ...compile2?.tsup?.options,
+      ...typeof options === "object" ? options : {}
+    }, verbose) : 0;
   }))).reduce((prev, value) => prev + value, 0) || (publint2 ? await packagePublint() : 0);
 }, "packageCompileTsup");