@xylabs/ts-scripts-yarn3 6.5.18 → 7.0.0-rc.10

package/dist/actions/index.mjs

@@ -1319,7 +1319,7 @@ var packageClean = async () => {
 };
 
 // src/actions/package/compile/compile.ts
-import chalk28 from "chalk";
+import chalk27 from "chalk";
 
 // src/actions/package/publint.ts
 import { promises as fs4 } from "fs";
@@ -1375,7 +1375,7 @@ var getAllInputs = (folder) => {
 };
 
 // src/actions/package/compile/buildEntries.ts
-var buildEntries = (folder, entryMode = "single", excludeSpecAndStories = true, verbose = false) => {
+var buildEntries = (folder, entryMode = "single", options, excludeSpecAndStories = true, verbose = false) => {
   let entries = [];
   switch (entryMode) {
     case "platform": {
@@ -1386,16 +1386,46 @@ var buildEntries = (folder, entryMode = "single", excludeSpecAndStories = true,
       entries = excludeSpecAndStories ? getAllInputs(folder).filter((entry) => !entry.includes(".spec.") && !entry.includes(".stories.")) : getAllInputs(folder);
       break;
     }
+    case "custom": {
+      entries = [];
+      break;
+    }
     default: {
       entries = [`${folder}/index.ts`];
       break;
     }
   }
+  if (typeof options !== "boolean" && Array.isArray(options?.entry)) {
+    entries.push(...options.entry);
+  }
   if (verbose) console.log(`buildEntries [${entryMode}] ${entries.length}`);
   return entries;
 };
 
-// src/actions/package/compile/packageCompileTscTypes.ts
+// 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;
+}
+function deepMergeObjects(objects) {
+  const result = {};
+  for (const obj of objects) {
+    deepMerge(result, obj);
+  }
+  return result;
+}
+
+// src/actions/package/compile/packageCompileTsc.ts
 import { cwd } from "process";
 import chalk26 from "chalk";
 import { createProgramFromConfig } from "tsc-prog";
@@ -1432,33 +1462,33 @@ var getCompilerOptions = (options = {}, tsconfig = "tsconfig.json") => {
   return deepmerge2(configFileCompilerOptions, options);
 };
 
-// src/actions/package/compile/packageCompileTscTypes.ts
-var packageCompileTscTypes = (folder = "src", config2 = {}, compilerOptionsParam) => {
+// src/actions/package/compile/packageCompileTsc.ts
+var packageCompileTsc = (entries, folder = "src", config2 = {}, compilerOptionsParam) => {
   const pkg = process.env.INIT_CWD ?? cwd();
   const verbose = config2?.verbose ?? false;
   const compilerOptions = {
     ...getCompilerOptions({
-      emitDeclarationOnly: true,
-      outDir: config2.compile?.tsup?.options?.outDir ?? "dist/types",
+      outDir: "dist/types",
       removeComments: false,
       skipDefaultLibCheck: true,
       skipLibCheck: true,
       sourceMap: false
     }),
     ...compilerOptionsParam,
-    emitDeclarationOnly: true,
-    noEmit: false
+    emitDeclarationOnly: false,
+    noEmit: true
   };
-  const validTsExt = [".ts", ".tsx", ".d.ts", ".cts", ".d.cts", ".mts", ".d.mts"];
-  const excludes = [".stories.", ".spec.", "/stories/", "/spec/"];
-  const files = buildEntries(folder, "all", verbose).filter((file) => validTsExt.find((ext) => file.endsWith(ext)) && !excludes.some((exclude) => file.includes(exclude)));
-  console.log(chalk26.green(`Compiling Types ${pkg}: ${files.length}`));
-  if (files.length > 0) {
+  console.log(chalk26.green(`Validating Files: ${entries.length}`));
+  if (verbose) {
+    for (const entry of entries) {
+      console.log(chalk26.grey(`Validating: ${entry}`));
+    }
+  }
+  if (entries.length > 0) {
     const program = createProgramFromConfig({
       basePath: pkg ?? cwd(),
       compilerOptions,
-      exclude: ["build", "dist", "docs", "**/*.spec.*", "**/*.stories.*", "src/**/spec/**/*"],
-      files
+      files: entries
     });
     const diagnostics = getPreEmitDiagnostics(program);
     if (diagnostics.length > 0) {
@@ -1478,102 +1508,54 @@ var packageCompileTscTypes = (folder = "src", config2 = {}, compilerOptionsParam
   return 0;
 };
 
-// src/actions/package/compile/compileTypes.ts
-var packageCompileTypes = async (inConfig = {}) => {
-  const config2 = await loadConfig(inConfig);
-  return packageCompileTscTypes(void 0, config2);
-};
-
-// 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];
+// src/actions/package/compile/packageCompileTscTypes.ts
+import { cwd as cwd2 } 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) {
+  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);
     }
-  }
-  return target;
-}
-function deepMergeObjects(objects) {
-  const result = {};
-  for (const obj of objects) {
-    deepMerge(result, obj);
-  }
-  return result;
+  });
+  await bundle.write({
+    file: outputPath,
+    format: "es"
+  });
+  console.log(`Bundled declarations written to ${outputPath}`);
 }
-
-// src/actions/package/compile/packageCompileTsc.ts
-import { cwd as cwd2 } from "process";
-import chalk27 from "chalk";
-import { createProgramFromConfig as createProgramFromConfig2 } from "tsc-prog";
-import {
-  DiagnosticCategory as DiagnosticCategory2,
-  formatDiagnosticsWithColorAndContext as formatDiagnosticsWithColorAndContext2,
-  getPreEmitDiagnostics as getPreEmitDiagnostics2,
-  sys as sys3
-} from "typescript";
-var packageCompileTsc = (folder = "src", config2 = {}, compilerOptionsParam) => {
+var packageCompileTscTypes = async (entries, outDir, platform, folder = "src") => {
   const pkg = process.env.INIT_CWD ?? cwd2();
-  const verbose = config2?.verbose ?? false;
-  const compilerOptions = {
-    ...getCompilerOptions({
-      outDir: "dist/types",
-      removeComments: false,
-      skipDefaultLibCheck: true,
-      skipLibCheck: true,
-      sourceMap: false
-    }),
-    ...compilerOptionsParam,
-    emitDeclarationOnly: false,
-    noEmit: true
+  const srcRoot = `${pkg}/${folder}`;
+  const entryNameToTypeName = (entry) => {
+    const splitEntryName = entry.split(".");
+    const newEntryExtension = "d." + splitEntryName.at(-1);
+    return [...splitEntryName.slice(0, -1), newEntryExtension].join(".");
   };
-  const validTsExt = [".ts", ".tsx", ".d.ts", ".cts", ".d.cts", ".mts", ".d.mts"];
-  const includes = [".stories.", ".spec.", ".d.ts", ".d.cts", ".d.mts"];
-  const files = buildEntries(folder, "all", verbose).filter((file) => validTsExt.find((ext) => file.endsWith(ext)) && includes.find((include) => file.includes(include)));
-  console.log(chalk27.green(`Compiling Files ${pkg}: ${files.length}`));
-  if (files.length > 0) {
-    const program = createProgramFromConfig2({
-      basePath: pkg ?? cwd2(),
-      compilerOptions,
-      exclude: ["dist", "docs"],
-      files
-    });
-    const diagnostics = getPreEmitDiagnostics2(program);
-    if (diagnostics.length > 0) {
-      const formattedDiagnostics = formatDiagnosticsWithColorAndContext2(
-        diagnostics,
-        {
-          getCanonicalFileName: (fileName) => fileName,
-          getCurrentDirectory: () => folder,
-          getNewLine: () => sys3.newLine
-        }
-      );
-      console.error(formattedDiagnostics);
-    }
-    program.emit();
-    return diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory2.Error ? 1 : 0), 0);
-  }
+  const entryNames = entries.map((entry) => entry.split(`${folder}/`).at(-1) ?? entry);
+  await Promise.all(entryNames.map(async (entryName) => {
+    await bundleDts(`${srcRoot}/${entryName}`, outDir + "/" + entryNameToTypeName(entryName), platform);
+  }));
   return 0;
 };
 
 // src/actions/package/compile/packageCompileTsup.ts
-var compileFolder = async (folder, entryMode = "single", options, verbose) => {
+var compileFolder = async (folder, entries, options, verbose) => {
   const outDir = options?.outDir ?? "dist";
   if (verbose) {
     console.log(`compileFolder [${folder}]`);
   }
-  const entry = buildEntries(folder, entryMode);
   const optionsResult = defineConfig({
     bundle: true,
     cjsInterop: true,
     clean: true,
     dts: false,
-    entry,
+    entry: entries,
     format: ["esm"],
     outDir,
     silent: true,
@@ -1582,6 +1564,11 @@ var compileFolder = async (folder, entryMode = "single", options, verbose) => {
     tsconfig: "tsconfig.json",
     ...options
   });
+  const validationResult = packageCompileTsc(entries);
+  if (validationResult !== 0) {
+    console.error(`Compile:Validation had ${validationResult} errors`);
+    return validationResult;
+  }
   const optionsList = (await Promise.all(
     (Array.isArray(optionsResult) ? optionsResult : [optionsResult]).flatMap(async (options2) => {
       const result = typeof options2 === "function" ? await options2({}) : [options2];
@@ -1595,6 +1582,7 @@ var compileFolder = async (folder, entryMode = "single", options, verbose) => {
   if (verbose) {
     console.log(`TSUP:build:stop [${folder}]`);
   }
+  await packageCompileTscTypes(entries, outDir, options?.platform ?? "neutral", folder);
   return 0;
 };
 var tsupOptions = (options = []) => {
@@ -1627,21 +1615,13 @@ var packageCompileTsup = async (config2) => {
   const compileForNode = compile2?.node ?? { src: {} };
   const compileForBrowser = compile2?.browser ?? { src: {} };
   const compileForNeutral = compile2?.neutral ?? { src: {} };
-  if (verbose) {
-    console.log("Calling packageCompileTscTypes");
-  }
-  let errors = await packageCompileTypes(config2);
-  errors = errors + packageCompileTsc(void 0, config2);
-  if (errors > 0) {
-    return errors;
-  }
   return (await Promise.all(
     Object.entries(compileForNode).map(async ([folder, options]) => {
       const optionsObject = typeof options === "object" ? options : {};
       const inEsBuildOptions = typeof compile2?.node?.esbuildOptions === "object" ? compile2?.node?.esbuildOptions : {};
       return typeof folder === "string" ? await compileFolder(
         folder,
-        compile2?.entryMode,
+        buildEntries(folder, compile2?.entryMode, options, true, verbose),
         tsupOptions([
           inEsBuildOptions,
           compile2?.tsup?.options ?? {},
@@ -1657,7 +1637,7 @@ var packageCompileTsup = async (config2) => {
       const inEsBuildOptions = typeof compile2?.browser?.esbuildOptions === "object" ? compile2?.browser?.esbuildOptions : {};
       return typeof folder === "string" ? await compileFolder(
         folder,
-        compile2?.entryMode,
+        buildEntries(folder, compile2?.entryMode, options, true, verbose),
         tsupOptions([
           inEsBuildOptions,
           compile2?.tsup?.options ?? {},
@@ -1673,7 +1653,7 @@ var packageCompileTsup = async (config2) => {
       const inEsBuildOptions = typeof compile2?.neutral?.esbuildOptions === "object" ? compile2?.neutral?.esbuildOptions : {};
       return typeof folder === "string" ? await compileFolder(
         folder,
-        compile2?.entryMode,
+        buildEntries(folder, compile2?.entryMode, options, true, verbose),
         tsupOptions([
           inEsBuildOptions,
           compile2?.tsup?.options ?? {},
@@ -1689,7 +1669,7 @@ var packageCompileTsup = async (config2) => {
 // src/actions/package/compile/compile.ts
 var packageCompile = async (inConfig = {}) => {
   const pkg = process.env.INIT_CWD;
-  console.log(chalk28.green(`Compiling ${pkg}`));
+  console.log(chalk27.green(`Compiling ${pkg}`));
   const config2 = await loadConfig(inConfig);
   const publint2 = config2.publint;
   const tsupResults = await packageCompileTsup(config2);
@@ -1701,7 +1681,7 @@ var packageCompile = async (inConfig = {}) => {
 
 // src/actions/package/copy-assets.ts
 import path7 from "path/posix";
-import chalk29 from "chalk";
+import chalk28 from "chalk";
 import cpy2 from "cpy";
 var copyTargetAssets2 = async (target, name, location) => {
   try {
@@ -1714,7 +1694,7 @@ var copyTargetAssets2 = async (target, name, location) => {
       }
     );
     if (values.length > 0) {
-      console.log(chalk29.green(`Copying Assets [${target.toUpperCase()}] - ${name} - ${location}`));
+      console.log(chalk28.green(`Copying Assets [${target.toUpperCase()}] - ${name} - ${location}`));
     }
     for (const value of values) {
       console.log(`${value.split("/").pop()} => ./dist/${target}`);
@@ -1783,7 +1763,7 @@ var packageCycle = async ({ verbose = false }) => {
 // src/actions/package/gen-docs.ts
 import { existsSync as existsSync4 } from "fs";
 import path8 from "path";
-import chalk30 from "chalk";
+import chalk29 from "chalk";
 import {
   Application,
   ArgumentsReader,
@@ -1887,7 +1867,7 @@ var runTypeDoc = async (app) => {
       return ExitCodes.OutputError;
     }
   }
-  console.log(chalk30.green(`${pkgName} - Ok`));
+  console.log(chalk29.green(`${pkgName} - Ok`));
   return ExitCodes.Ok;
 };
 
@@ -1896,7 +1876,7 @@ import { readdirSync } from "fs";
 import path9 from "path";
 import { cwd as cwd3 } from "process";
 import { pathToFileURL } from "url";
-import chalk31 from "chalk";
+import chalk30 from "chalk";
 import { ESLint } from "eslint";
 import { findUp } from "find-up";
 import picomatch from "picomatch";
@@ -1905,14 +1885,14 @@ var dumpMessages = (lintResults) => {
   const severity = ["none", "warning", "error"];
   for (const lintResult of lintResults) {
     if (lintResult.messages.length > 0) {
-      console.log(chalk31.gray(`
+      console.log(chalk30.gray(`
 ${lintResult.filePath}`));
       for (const message of lintResult.messages) {
         console.log(
-          chalk31.gray(`	${message.line}:${message.column}`),
-          chalk31[colors[message.severity]](`	${severity[message.severity]}`),
-          chalk31.white(`	${message.message}`),
-          chalk31.gray(`	${message.ruleId}`)
+          chalk30.gray(`	${message.line}:${message.column}`),
+          chalk30[colors[message.severity]](`	${severity[message.severity]}`),
+          chalk30.white(`	${message.message}`),
+          chalk30.gray(`	${message.ruleId}`)
         );
       }
     }
@@ -1951,7 +1931,7 @@ var packageLint = async (fix2 = false, verbose = false, cache = true) => {
   });
   const files = getFiles(cwd3(), ignoreFolders);
   if (verbose) {
-    console.log(chalk31.green(`Linting ${pkg} [files = ${files.length}]`));
+    console.log(chalk30.green(`Linting ${pkg} [files = ${files.length}]`));
   }
   const lintResults = await engine.lintFiles(files);
   dumpMessages(lintResults);
@@ -1961,7 +1941,7 @@ var packageLint = async (fix2 = false, verbose = false, cache = true) => {
   const filesCountColor = files.length < 100 ? "green" : files.length < 1e3 ? "yellow" : "red";
   const lintTime = Date.now() - start;
   const lintTimeColor = lintTime < 1e3 ? "green" : lintTime < 3e3 ? "yellow" : "red";
-  console.log(chalk31.white(`Linted ${chalk31[filesCountColor](files.length)} files in ${chalk31[lintTimeColor](lintTime)}ms`));
+  console.log(chalk30.white(`Linted ${chalk30[filesCountColor](files.length)} files in ${chalk30[lintTimeColor](lintTime)}ms`));
   return lintResults.reduce((prev, lintResult) => prev + lintResult.errorCount, 0);
 };
 
@@ -1991,7 +1971,7 @@ var rebuild = ({ target }) => {
 };
 
 // src/actions/recompile.ts
-import chalk32 from "chalk";
+import chalk31 from "chalk";
 var recompile = async ({
   verbose,
   target,
@@ -2027,7 +2007,7 @@ var recompileAll = async ({
   const incrementalOptions = incremental ? ["--since", "-Apt", "--topological-dev"] : ["--parallel", "-Apt", "--topological-dev"];
   const jobsOptions = jobs ? ["-j", `${jobs}`] : [];
   if (jobs) {
-    console.log(chalk32.blue(`Jobs set to [${jobs}]`));
+    console.log(chalk31.blue(`Jobs set to [${jobs}]`));
   }
   const result = await runStepsAsync(`Recompile${incremental ? "-Incremental" : ""} [All]`, [
     [
@@ -2058,7 +2038,7 @@ var recompileAll = async ({
     ]
   ]);
   console.log(
-    `${chalk32.gray("Recompiled in")} [${chalk32.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk32.gray("seconds")}`
+    `${chalk31.gray("Recompiled in")} [${chalk31.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk31.gray("seconds")}`
   );
   return result;
 };
@@ -2089,9 +2069,9 @@ var reinstall = () => {
 };
 
 // src/actions/relint.ts
-import chalk33 from "chalk";
+import chalk32 from "chalk";
 var relintPackage = ({ pkg }) => {
-  console.log(chalk33.gray(`${"Relint"} [All-Packages]`));
+  console.log(chalk32.gray(`${"Relint"} [All-Packages]`));
   const start = Date.now();
   const result = runSteps("Relint [All-Packages]", [
     ["yarn", [
@@ -2101,7 +2081,7 @@ var relintPackage = ({ pkg }) => {
       "package-relint"
     ]]
   ]);
-  console.log(chalk33.gray(`${"Relinted in"} [${chalk33.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk33.gray("seconds")}`));
+  console.log(chalk32.gray(`${"Relinted in"} [${chalk32.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk32.gray("seconds")}`));
   return result;
 };
 var relint = ({
@@ -2112,7 +2092,7 @@ var relint = ({
   return pkg ? relintPackage({ pkg }) : relintAllPackages({ verbose, incremental });
 };
 var relintAllPackages = ({ verbose = true, incremental } = {}) => {
-  console.log(chalk33.gray(`${"Relint"} [All-Packages]`));
+  console.log(chalk32.gray(`${"Relint"} [All-Packages]`));
   const start = Date.now();
   const verboseOptions = verbose ? ["--verbose"] : ["--no-verbose"];
   const incrementalOptions = incremental ? ["--since", "-Ap"] : ["--parallel", "-Ap"];
@@ -2126,7 +2106,7 @@ var relintAllPackages = ({ verbose = true, incremental } = {}) => {
       "package-relint"
     ]]
   ]);
-  console.log(chalk33.gray(`Relinted in [${chalk33.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk33.gray("seconds")}`));
+  console.log(chalk32.gray(`Relinted in [${chalk32.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk32.gray("seconds")}`));
   return result;
 };
 
@@ -2144,10 +2124,10 @@ var sonar = () => {
 };
 
 // src/actions/statics.ts
-import chalk34 from "chalk";
+import chalk33 from "chalk";
 var DefaultDependencies = ["axios", "@xylabs/pixel", "react", "graphql", "react-router", "@mui/material", "@mui/system"];
 var statics = () => {
-  console.log(chalk34.green("Check Required Static Dependencies"));
+  console.log(chalk33.green("Check Required Static Dependencies"));
   const statics2 = parsedPackageJSON()?.xy?.deps?.statics;
   return detectDuplicateDependencies(statics2, DefaultDependencies);
 };
@@ -2196,6 +2176,7 @@ var yarn3Only = () => {
 };
 export {
   build,
+  bundleDts,
   clean,
   cleanAll,
   cleanDocs,
@@ -2237,7 +2218,6 @@ export {
   packageCompileTsc,
   packageCompileTscTypes,
   packageCompileTsup,
-  packageCompileTypes,
   packageCopyAssets,
   packageCycle,
   packageGenDocs,