@xylabs/ts-scripts-yarn3 7.0.0-rc.21 → 7.0.0-rc.23

package/dist/actions/index.mjs

@@ -315,8 +315,8 @@ var loadConfig = async (params) => {
 
 // src/lib/parsedPackageJSON.ts
 import { readFileSync as readFileSync2 } from "fs";
-var parsedPackageJSON = (path10) => {
-  const pathToPackageJSON = path10 ?? process.env.npm_package_json ?? "";
+var parsedPackageJSON = (path11) => {
+  const pathToPackageJSON = path11 ?? process.env.npm_package_json ?? "";
   const packageJSON = readFileSync2(pathToPackageJSON).toString();
   return JSON.parse(packageJSON);
 };
@@ -683,11 +683,11 @@ function findFilesByGlob(cwd5, pattern) {
 }
 
 // src/actions/deplint/findFiles.ts
-function findFiles(path10) {
+function findFiles(path11) {
   const allSourceInclude = ["./src/**/*.{ts,tsx}"];
   const allDistInclude = ["./dist/**/*.d.ts", "./dist/**/*.{mjs,js,cjs}"];
-  const srcFiles = allSourceInclude.flatMap((pattern) => findFilesByGlob(path10, pattern));
-  const distFiles = allDistInclude.flatMap((pattern) => findFilesByGlob(path10, pattern));
+  const srcFiles = allSourceInclude.flatMap((pattern) => findFilesByGlob(path11, pattern));
+  const distFiles = allDistInclude.flatMap((pattern) => findFilesByGlob(path11, pattern));
   return { srcFiles, distFiles };
 }
 
@@ -782,11 +782,11 @@ function getExternalImportsFromFiles({ srcFiles, distFiles }) {
   const srcImportPaths = {};
   const distImportPaths = {};
   const distTypeImportPaths = {};
-  for (const path10 of srcFiles) getImportsFromFile(path10, srcImportPaths, srcImportPaths).flat();
+  for (const path11 of srcFiles) getImportsFromFile(path11, srcImportPaths, srcImportPaths).flat();
   const distTypeFiles = distFiles.filter((file) => file.endsWith(".d.ts") || file.endsWith(".d.cts") || file.endsWith(".d.mts"));
   const distCodeFiles = distFiles.filter((file) => !(file.endsWith(".d.ts") || file.endsWith(".d.cts") || file.endsWith(".d.mts")));
-  for (const path10 of distCodeFiles) getImportsFromFile(path10, distImportPaths, distImportPaths).flat();
-  for (const path10 of distTypeFiles) getImportsFromFile(path10, distTypeImportPaths, distTypeImportPaths).flat();
+  for (const path11 of distCodeFiles) getImportsFromFile(path11, distImportPaths, distImportPaths).flat();
+  for (const path11 of distTypeFiles) getImportsFromFile(path11, distTypeImportPaths, distTypeImportPaths).flat();
   const srcImports = Object.keys(srcImportPaths);
   const distImports = Object.keys(distImportPaths);
   const distTypeImports = Object.keys(distTypeImportPaths);
@@ -1375,13 +1375,19 @@ import { build as build2, defineConfig } from "tsup";
 import chalk26 from "chalk";
 import { glob as glob2 } from "glob";
 var getAllInputs = (srcDir, verbose = false) => {
-  return glob2.sync(`${srcDir}/**/*.*`, { posix: true }).map((file) => {
+  return [...glob2.sync(`${srcDir}/**/*.ts`, { posix: true }).map((file) => {
     const result = file.slice(Math.max(0, srcDir.length + 1));
     if (verbose) {
       console.log(chalk26.gray(`getAllInputs: ${JSON.stringify(result, null, 2)}`));
     }
     return result;
-  });
+  }), ...glob2.sync(`${srcDir}/**/*.tsx`, { posix: true }).map((file) => {
+    const result = file.slice(Math.max(0, srcDir.length + 1));
+    if (verbose) {
+      console.log(chalk26.gray(`getAllInputs: ${JSON.stringify(result, null, 2)}`));
+    }
+    return result;
+  })];
 };
 
 // src/actions/package/compile/buildEntries.ts
@@ -1393,7 +1399,7 @@ var buildEntries = (srcDir, entryMode = "single", options, excludeSpecAndStories
       break;
     }
     case "all": {
-      entries = excludeSpecAndStories ? getAllInputs(srcDir).filter((entry) => !entry.includes(".spec.") && !entry.includes(".stories.")) : getAllInputs(srcDir);
+      entries = (excludeSpecAndStories ? getAllInputs(srcDir).filter((entry) => !entry.includes(".spec.") && !entry.includes(".stories.")) : getAllInputs(srcDir)).filter((entry) => !entry.endsWith(".d.ts"));
       break;
     }
     case "custom": {
@@ -1439,7 +1445,7 @@ function deepMergeObjects(objects) {
 import { cwd as cwd2 } from "process";
 import chalk27 from "chalk";
 import { createProgramFromConfig } from "tsc-prog";
-import {
+import ts2, {
   DiagnosticCategory,
   formatDiagnosticsWithColorAndContext,
   getPreEmitDiagnostics,
@@ -1456,11 +1462,20 @@ var getCompilerOptions = (options = {}, fileName = "tsconfig.json") => {
 };
 
 // src/actions/package/compile/packageCompileTsc.ts
-var packageCompileTsc = (platform, entries, srcDir = "src", outDir = "build", compilerOptionsParam, verbose = false) => {
+var packageCompileTsc = (platform, entries, srcDir = "src", outDir = "dist", compilerOptionsParam, verbose = false) => {
   const pkg = process.env.INIT_CWD ?? cwd2();
   if (verbose) {
     console.log(chalk27.cyan(`Validating code START: ${entries.length} files to ${outDir} from ${srcDir}`));
   }
+  const configFilePath = ts2.findConfigFile(
+    "./",
+    // search path
+    ts2.sys.fileExists,
+    "tsconfig.json"
+  );
+  if (configFilePath === void 0) {
+    throw new Error("Could not find tsconfig.json");
+  }
   const compilerOptions = {
     ...getCompilerOptions({
       removeComments: false,
@@ -1482,9 +1497,11 @@ var packageCompileTsc = (platform, entries, srcDir = "src", outDir = "build", co
   try {
     if (entries.length > 0) {
       const program = createProgramFromConfig({
+        configFilePath,
         basePath: pkg ?? cwd2(),
         compilerOptions,
-        files: entries.map((entry) => `${srcDir}/${entry}`)
+        files: entries.map((entry) => `${srcDir}/${entry}`),
+        include: [`${srcDir}/**/*.*`]
       });
       const diagnostics = getPreEmitDiagnostics(program);
       if (diagnostics.length > 0) {
@@ -1504,33 +1521,42 @@ var packageCompileTsc = (platform, entries, srcDir = "src", outDir = "build", co
     return 0;
   } finally {
     if (verbose) {
-      console.log(chalk27.cyan(`Verifying code FINISH: ${entries.length} files to ${outDir} from ${srcDir}`));
+      console.log(chalk27.cyan(`Validating code FINISH: ${entries.length} files to ${outDir} from ${srcDir}`));
     }
   }
 };
 
 // src/actions/package/compile/packageCompileTscTypes.ts
+import path7 from "path";
 import { cwd as cwd3 } from "process";
 import chalk28 from "chalk";
 import { rollup } from "rollup";
 import dts from "rollup-plugin-dts";
-import inlineSvg from "rollup-plugin-inline-svg";
 import nodeExternals from "rollup-plugin-node-externals";
 async function bundleDts(inputPath, outputPath, platform, options, verbose = false) {
+  const pkg = process.env.INIT_CWD ?? cwd3();
+  const tsconfigPath = path7.resolve(pkg, "tsconfig.json");
   const nodePlugIns = platform === "node" ? [nodeExternals()] : [];
-  const bundle = await rollup({
-    input: inputPath,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    plugins: [dts(options), inlineSvg(), ...nodePlugIns],
-    onwarn(warning, warn) {
-      if (warning.code === "UNUSED_EXTERNAL_IMPORT") return;
-      warn(warning);
-    }
-  });
-  await bundle.write({
-    file: outputPath,
-    format: "es"
-  });
+  try {
+    const bundle = await rollup({
+      input: inputPath,
+      plugins: [dts({
+        ...options,
+        tsconfig: tsconfigPath,
+        compilerOptions: { emitDeclarationOnly: true, noEmit: false }
+      }), ...nodePlugIns],
+      onwarn(warning, warn) {
+        if (warning.code === "UNUSED_EXTERNAL_IMPORT") return;
+        warn(warning);
+      }
+    });
+    await bundle.write({
+      file: outputPath,
+      format: "es"
+    });
+  } catch (ex) {
+    console.error(ex);
+  }
   if (verbose) {
     console.log(`Bundled declarations written to ${outputPath}`);
   }
@@ -1547,19 +1573,18 @@ var packageCompileTscTypes = async (entries, outDir, platform, srcDir = "build",
     const newEntryExtension = "d." + splitEntryName.at(-1);
     return [...splitEntryName.slice(0, -1), newEntryExtension].join(".");
   };
-  const compilerOptions = {
+  const compilerOptions = getCompilerOptions({
     removeComments: false,
     skipDefaultLibCheck: true,
     skipLibCheck: true,
     sourceMap: false,
     emitDeclarationOnly: false,
     noEmit: true
-  };
+  });
   const entryNames = entries.map((entry) => entry.split(`${srcDir}/`).at(-1) ?? entry);
   await Promise.all(entryNames.map(async (entryName) => {
     const entryTypeName = entryNameToTypeName(entryName);
-    console.log(`Compiling Types: ${srcRoot}/${entryTypeName} to ${outDir}/${entryTypeName}`);
-    await bundleDts(`${srcRoot}/${entryTypeName}`, `${outDir}/${entryTypeName}`, platform, { compilerOptions, tsconfig: "tsconfig.json" }, verbose);
+    await bundleDts(`${srcRoot}/${entryTypeName}`, `${outDir}/${entryTypeName}`, platform, { compilerOptions }, verbose);
   }));
   if (verbose) {
     console.log(chalk28.cyan(`Compiling Types FINISH: ${entries.length} files to ${outDir} from ${srcDir}`));
@@ -1577,7 +1602,7 @@ var compileFolder = async (srcDir, entries, options, verbose) => {
     console.warn(chalk29.yellow(`No entries found in ${srcDir} to compile`));
     return 0;
   }
-  const tscOutDir = "build";
+  const tscOutDir = "dist";
   if (verbose) {
     console.log(chalk29.gray(`tscOutDir [${tscOutDir}]`));
   }
@@ -1586,10 +1611,10 @@ var compileFolder = async (srcDir, entries, options, verbose) => {
     console.error(chalk29.red(`Compile:Validation had ${validationResult} errors`));
     return validationResult;
   }
-  const optionsParams = {
+  const optionsParams = tsupOptions([{
     bundle: true,
     cjsInterop: true,
-    clean: true,
+    clean: false,
     dts: false,
     format: ["esm"],
     outDir,
@@ -1599,7 +1624,7 @@ var compileFolder = async (srcDir, entries, options, verbose) => {
     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) => {
@@ -1625,7 +1650,7 @@ var tsupOptions = (options = []) => {
     ".jpg": "copy",
     ".json": "json",
     ".png": "copy",
-    ".svg": "copy",
+    ".svg": "text",
     ".webp": "copy"
   };
   const standardOptions = {
@@ -1716,7 +1741,7 @@ var packageCompile = async (inConfig = {}) => {
 };
 
 // src/actions/package/copy-assets.ts
-import path7 from "path/posix";
+import path8 from "path/posix";
 import chalk31 from "chalk";
 import cpy2 from "cpy";
 var copyTargetAssets2 = async (target, name, location) => {
@@ -1725,7 +1750,7 @@ var copyTargetAssets2 = async (target, name, location) => {
       ["**/*.jpg", "**/*.png", "**/*.gif", "**/*.svg", "**/*.webp", "**/*.sass", "**/*.scss", "**/*.gif", "**/*.css"],
       `../dist/${target}`,
       {
-        cwd: path7.join(location, "src"),
+        cwd: path8.join(location, "src"),
         flat: false
       }
     );
@@ -1796,7 +1821,7 @@ var packageCycle = async () => {
 
 // src/actions/package/gen-docs.ts
 import { existsSync as existsSync4 } from "fs";
-import path8 from "path";
+import path9 from "path";
 import chalk32 from "chalk";
 import {
   Application,
@@ -1815,7 +1840,7 @@ var ExitCodes = {
 };
 var packageGenDocs = async () => {
   const pkg = process.env.INIT_CWD;
-  if (pkg && !existsSync4(path8.join(pkg, "typedoc.json"))) {
+  if (pkg && !existsSync4(path9.join(pkg, "typedoc.json"))) {
     return;
   }
   const app = await Application.bootstrap({
@@ -1907,7 +1932,7 @@ var runTypeDoc = async (app) => {
 
 // src/actions/package/lint.ts
 import { readdirSync } from "fs";
-import path9 from "path";
+import path10 from "path";
 import { cwd as cwd4 } from "process";
 import { pathToFileURL } from "url";
 import chalk33 from "chalk";
@@ -1944,7 +1969,7 @@ function getFiles(dir, ignoreFolders) {
   const subDirectory = dir.split(currentDirectory)[1];
   if (ignoreFolders.includes(subDirectory)) return [];
   return readdirSync(dir, { withFileTypes: true }).flatMap((dirent) => {
-    const res = path9.resolve(dir, dirent.name);
+    const res = path10.resolve(dir, dirent.name);
     const relativePath = subDirectory === void 0 ? dirent.name : `${subDirectory}/${dirent.name}`;
     const ignoreMatchers = ignoreFolders.map((pattern) => picomatch(pattern));
     if (ignoreMatchers.some((isMatch) => isMatch(relativePath))) return [];