@xylabs/ts-scripts-yarn3 5.1.14 → 6.0.1

package/dist/actions/package/index.mjs

@@ -262,13 +262,39 @@ var buildEntries = /* @__PURE__ */ __name((folder, entryMode = "single", verbose
   return entries;
 }, "buildEntries");
 
+// src/actions/package/compile/deepMerge.ts
+function deepMerge(target, source) {
+  if (!source || typeof source !== "object") return target;
+  for (const key of Object.keys(source)) {
+    if (typeof source[key] === "object" && source[key] !== null && !Array.isArray(source[key])) {
+      if (!target[key] || typeof target[key] !== "object") {
+        target[key] = {};
+      }
+      deepMerge(target[key], source[key]);
+    } else {
+      target[key] = source[key];
+    }
+  }
+  return target;
+}
+__name(deepMerge, "deepMerge");
+function deepMergeObjects(objects) {
+  const result = {};
+  for (const obj of objects) {
+    deepMerge(result, obj);
+  }
+  return result;
+}
+__name(deepMergeObjects, "deepMergeObjects");
+
 // 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";
-var packageCompileTscTypes = /* @__PURE__ */ __name((folder = "src", { verbose } = {}, compilerOptionsParam) => {
+var packageCompileTscTypes = /* @__PURE__ */ __name((folder = "src", config2 = {}, compilerOptionsParam) => {
   const pkg = process.env.INIT_CWD ?? cwd2();
+  const verbose = config2?.verbose ?? false;
   if (verbose) {
     console.log(`Compiling types with TSC [${pkg}]`);
   }
@@ -276,7 +302,7 @@ var packageCompileTscTypes = /* @__PURE__ */ __name((folder = "src", { verbose }
     ...getCompilerOptions({
       declaration: true,
       emitDeclarationOnly: true,
-      outDir: "dist",
+      outDir: "dist/types",
       removeComments: false,
       skipDefaultLibCheck: true,
       skipLibCheck: true,
@@ -365,37 +391,9 @@ var compileFolder = /* @__PURE__ */ __name(async (folder, entryMode = "single",
   if (verbose) {
     console.log(`TSUP:build:stop [${folder}] ${types}`);
   }
-  if (types === "tsc") {
-    if (verbose) {
-      console.log(`Calling packageCompileTscTypes [${folder}] ${types}`);
-    }
-    const errors = packageCompileTscTypes(folder, {
-      verbose
-    }, {
-      outDir
-    });
-    if (errors) {
-      return errors;
-    }
-  }
   return 0;
 }, "compileFolder");
-var packageCompileTsup = /* @__PURE__ */ __name(async (config2, types = "tsc") => {
-  console.warn("packageCompileTsup-types", types);
-  const compile = config2?.compile;
-  const verbose = config2?.verbose ?? false;
-  if (verbose) {
-    console.log(`Compiling with TSUP [Depth: ${compile?.depth}]`);
-  }
-  const compileForNode = compile?.node ?? {
-    src: {}
-  };
-  const compileForBrowser = compile?.browser ?? {
-    src: {}
-  };
-  const compileForNeutral = compile?.neutral ?? {
-    src: {}
-  };
+var tsupOptions = /* @__PURE__ */ __name((options = []) => {
   const standardLoaders = {
     ".gif": "copy",
     ".html": "copy",
@@ -420,45 +418,71 @@ var packageCompileTsup = /* @__PURE__ */ __name(async (config2, types = "tsc") =
     sourcemap: true,
     target: "esnext"
   };
+  return deepMergeObjects([
+    standardOptions,
+    ...options
+  ]);
+}, "tsupOptions");
+var packageCompileTsup = /* @__PURE__ */ __name(async (config2, types = "tsc") => {
+  console.warn("packageCompileTsup-types", types);
+  const compile = config2?.compile;
+  const verbose = config2?.verbose ?? false;
+  if (verbose) {
+    console.log(`Compiling with TSUP [Depth: ${compile?.depth}]`);
+  }
+  const compileForNode = compile?.node ?? {
+    src: {}
+  };
+  const compileForBrowser = compile?.browser ?? {
+    src: {}
+  };
+  const compileForNeutral = compile?.neutral ?? {
+    src: {}
+  };
+  if (types === "tsc") {
+    if (verbose) {
+      console.log(`Calling packageCompileTscTypes [${types}`);
+    }
+    const errors = packageCompileTscTypes("src", {
+      verbose
+    });
+    if (errors) {
+      return errors;
+    }
+  }
   return (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, {
-      ...standardOptions,
-      loader: {
-        ...standardOptions.loader,
-        ...inEsBuildOptions?.loader
-      },
-      outDir: "dist/node",
-      platform: "node",
-      ...compile?.tsup?.options,
-      ...typeof options === "object" ? options : {}
-    }, types, verbose) : 0;
+    return folder ? await compileFolder(folder, compile?.entryMode, tsupOptions([
+      inEsBuildOptions,
+      compile?.tsup?.options ?? {},
+      typeof options === "object" ? options : {},
+      {
+        platform: "node",
+        outDir: "dist/node"
+      }
+    ]), types, 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 compileFolder(folder, compile?.entryMode, {
-      ...standardOptions,
-      loader: {
-        ...standardOptions.loader,
-        ...inEsBuildOptions?.loader
-      },
-      outDir: "dist/browser",
-      platform: "browser",
-      ...compile?.tsup?.options,
-      ...typeof options === "object" ? options : {}
-    }, types, verbose) : 0;
+    return folder ? await compileFolder(folder, compile?.entryMode, tsupOptions([
+      inEsBuildOptions,
+      compile?.tsup?.options ?? {},
+      typeof options === "object" ? options : {},
+      {
+        platform: "browser",
+        outDir: "dist/browser"
+      }
+    ]), types, 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 compileFolder(folder, compile?.entryMode, {
-      ...standardOptions,
-      loader: {
-        ...standardOptions.loader,
-        ...inEsBuildOptions?.loader
-      },
-      outDir: "dist/neutral",
-      platform: "neutral",
-      ...compile?.tsup?.options,
-      ...typeof options === "object" ? options : {}
-    }, types, verbose) : 0;
+    return folder ? await compileFolder(folder, compile?.entryMode, tsupOptions([
+      inEsBuildOptions,
+      compile?.tsup?.options ?? {},
+      typeof options === "object" ? options : {},
+      {
+        platform: "neutral",
+        outDir: "dist/neutral"
+      }
+    ]), types, verbose) : 0;
   }))).reduce((prev, value) => prev + value, 0) || 0;
 }, "packageCompileTsup");
 
@@ -483,9 +507,18 @@ var packageCompile = /* @__PURE__ */ __name(async (inConfig = {}, types) => {
   return result + (publint ? await packagePublint(config2) : 0);
 }, "packageCompile");
 
+// src/actions/package/compile/compileTypes.ts
+import chalk9 from "chalk";
+var packageCompileTypes = /* @__PURE__ */ __name(async (inConfig = {}) => {
+  const pkg = process.env.INIT_CWD;
+  console.log(chalk9.green(`Compiling Types ${pkg}`));
+  const config2 = await loadConfig(inConfig);
+  return packageCompileTscTypes(void 0, config2);
+}, "packageCompileTypes");
+
 // src/actions/package/copy-assets.ts
 import path3 from "node:path/posix";
-import chalk9 from "chalk";
+import chalk10 from "chalk";
 import cpy from "cpy";
 var copyTargetAssets = /* @__PURE__ */ __name(async (target, name, location) => {
   try {
@@ -504,7 +537,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(chalk10.green(`Copying Assets [${target.toUpperCase()}] - ${name} - ${location}`));
     }
     for (const value of values) {
       console.log(`${value.split("/").pop()} => ./dist/${target}`);
@@ -535,7 +568,7 @@ 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 chalk11 from "chalk";
 import depcheck from "depcheck";
 var special = depcheck.special;
 var defaultIgnorePatterns = [
@@ -561,21 +594,21 @@ var defaultIgnoreDevPatterns = [
 var reportUnused = /* @__PURE__ */ __name((name, unused) => {
   if (unused.length > 0) {
     const message = [
-      chalk10.yellow(`${unused.length} Unused ${name}`)
+      chalk11.yellow(`${unused.length} Unused ${name}`)
     ];
-    for (const value of unused) message.push(chalk10.gray(`  ${value}`));
+    for (const value of unused) message.push(chalk11.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}`)
+      chalk11.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}`, chalk11.gray(`  ${value.at(0)}`));
     }
-    console.log(chalk10.yellow(message.join("\n")));
+    console.log(chalk11.yellow(message.join("\n")));
   }
 }, "reportMissing");
 var analyzeDeps = /* @__PURE__ */ __name(async (pkg, ignoreMatches) => {
@@ -680,10 +713,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(chalk11.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(chalk11.gray(`Invalid File: ${key}: ${value}`));
   }
   reportMissing("dependencies", missingDepsObject);
   reportMissing("devDependencies", missingDevDepsObject);
@@ -694,7 +727,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 chalk12 from "chalk";
 import { Application, ArgumentsReader, TSConfigReader, TypeDocReader } from "typedoc";
 var ExitCodes = {
   CompileError: 3,
@@ -796,7 +829,7 @@ var runTypeDoc = /* @__PURE__ */ __name(async (app) => {
       return ExitCodes.OutputError;
     }
   }
-  console.log(chalk11.green(`${pkgName} - Ok`));
+  console.log(chalk12.green(`${pkgName} - Ok`));
   return ExitCodes.Ok;
 }, "runTypeDoc");
 
@@ -805,7 +838,7 @@ import { readdirSync } from "node:fs";
 import path5 from "node:path";
 import { cwd as cwd4 } from "node:process";
 import { pathToFileURL } from "node:url";
-import chalk12 from "chalk";
+import chalk13 from "chalk";
 import { ESLint } from "eslint";
 import { findUp } from "find-up";
 import picomatch from "picomatch";
@@ -822,10 +855,10 @@ var dumpMessages = /* @__PURE__ */ __name((lintResults) => {
   ];
   for (const lintResult of lintResults) {
     if (lintResult.messages.length > 0) {
-      console.log(chalk12.gray(`
+      console.log(chalk13.gray(`
 ${lintResult.filePath}`));
       for (const message of lintResult.messages) {
-        console.log(chalk12.gray(`	${message.line}:${message.column}`), chalk12[colors[message.severity]](`	${severity[message.severity]}`), chalk12.white(`	${message.message}`), chalk12.gray(`	${message.ruleId}`));
+        console.log(chalk13.gray(`	${message.line}:${message.column}`), chalk13[colors[message.severity]](`	${severity[message.severity]}`), chalk13.white(`	${message.message}`), chalk13.gray(`	${message.ruleId}`));
       }
     }
   }
@@ -856,6 +889,7 @@ function getFiles(dir, ignoreFolders) {
 }
 __name(getFiles, "getFiles");
 var packageLint = /* @__PURE__ */ __name(async (fix = false) => {
+  const pkg = process.env.INIT_CWD;
   const configPath = await getRootESLintConfig();
   const { default: eslintConfig } = await import(configPath.href);
   const ignoreFolders = [
@@ -876,6 +910,7 @@ var packageLint = /* @__PURE__ */ __name(async (fix = false) => {
     warnIgnored: false
   });
   const files = getFiles(cwd4(), ignoreFolders);
+  console.log(chalk13.green(`Linting ${pkg} [${files.length}]`));
   const lintResults = await engine.lintFiles(files);
   dumpMessages(lintResults);
   if (fix) {
@@ -894,12 +929,15 @@ export {
   packageCleanTypescript,
   packageCompile,
   packageCompileTsc,
+  packageCompileTscTypes,
   packageCompileTsup,
+  packageCompileTypes,
   packageCopyAssets,
   packageDeps,
   packageGenDocs,
   packageLint,
   packagePublint,
-  packageRecompile
+  packageRecompile,
+  tsupOptions
 };
 //# sourceMappingURL=index.mjs.map