@xylabs/ts-scripts-yarn3 6.5.17 → 7.0.0-rc.1

package/dist/actions/index.mjs

@@ -313,8 +313,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);
 };
@@ -681,11 +681,11 @@ function findFilesByGlob(cwd4, 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 };
 }
 
@@ -779,47 +779,29 @@ var removeInternalImports = (imports) => {
 function getExternalImportsFromFiles({ srcFiles, distFiles }) {
   const srcImportPaths = {};
   const distImportPaths = {};
-  const distTypeImportPaths = {};
-  for (const path10 of srcFiles) getImportsFromFile(path10, 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 srcFiles) getImportsFromFile(path11, srcImportPaths, srcImportPaths).flat();
+  for (const path11 of distFiles) getImportsFromFile(path11, distImportPaths, distImportPaths).flat();
   const srcImports = Object.keys(srcImportPaths);
   const distImports = Object.keys(distImportPaths);
-  const distTypeImports = Object.keys(distTypeImportPaths);
   const externalSrcImports = removeInternalImports(srcImports);
   const externalDistImports = removeInternalImports(distImports);
-  const externalDistTypeImports = removeInternalImports(distTypeImports);
   return {
     srcImports,
     srcImportPaths,
     externalSrcImports,
     distImports,
     distImportPaths,
-    externalDistImports,
-    externalDistTypeImports
+    externalDistImports
   };
 }
 
 // src/actions/deplint/checkPackage/getUnlistedDependencies.ts
 import { builtinModules } from "module";
 import chalk13 from "chalk";
-function getUnlistedDependencies({ name, location }, { dependencies, peerDependencies }, {
-  externalDistImports,
-  externalDistTypeImports,
-  distImportPaths
-}) {
+function getUnlistedDependencies({ name, location }, { dependencies, peerDependencies }, { externalDistImports, distImportPaths }) {
   let unlistedDependencies = 0;
   for (const imp of externalDistImports) {
-    if (!dependencies.includes(imp) && !dependencies.includes(`@types/${imp}`) && !peerDependencies.includes(imp) && !peerDependencies.includes(`@types/${imp}`) && !builtinModules.includes(imp) && !builtinModules.includes(`@types/${imp}`)) {
-      unlistedDependencies++;
-      console.log(`[${chalk13.blue(name)}] Missing dependency in package.json: ${chalk13.red(imp)}`);
-      console.log(`  ${distImportPaths[imp].join("\n ")}`);
-    }
-  }
-  for (const imp of externalDistTypeImports) {
-    if (!dependencies.includes(imp) && dependencies.includes(`@types/${imp}`) && !peerDependencies.includes(imp) && peerDependencies.includes(`@types/${imp}`) && !builtinModules.includes(imp) && builtinModules.includes(`@types/${imp}`)) {
+    if (!dependencies.includes(imp) && !peerDependencies.includes(imp) && !builtinModules.includes(imp)) {
       unlistedDependencies++;
       console.log(`[${chalk13.blue(name)}] Missing dependency in package.json: ${chalk13.red(imp)}`);
       console.log(`  ${distImportPaths[imp].join("\n ")}`);
@@ -847,7 +829,7 @@ function getUnlistedDevDependencies({ name, location }, {
 }) {
   let unlistedDevDependencies = 0;
   for (const imp of externalSrcImports) {
-    if (!distImports.includes(imp) && !dependencies.includes(imp) && !dependencies.includes(`@types/${imp}`) && !peerDependencies.includes(imp) && !peerDependencies.includes(`@types/${imp}`) && !devDependencies.includes(imp) && !devDependencies.includes(`@types/${imp}`) && !builtinModules2.includes(imp)) {
+    if (!distImports.includes(imp) && !dependencies.includes(imp) && !peerDependencies.includes(imp) && !devDependencies.includes(imp) && !builtinModules2.includes(imp)) {
       unlistedDevDependencies++;
       console.log(`[${chalk14.blue(name)}] Missing devDependency in package.json: ${chalk14.red(imp)}`);
       console.log(`  ${srcImportPaths[imp].join("\n ")}`);
@@ -869,7 +851,7 @@ function getUnusedDependencies({ name, location }, { dependencies }, {
 }) {
   let unusedDependencies = 0;
   for (const dep of dependencies) {
-    if (!externalDistImports.includes(dep) && !externalDistImports.includes(dep.replace(/^@types\//, ""))) {
+    if (!externalDistImports.includes(dep)) {
       unusedDependencies++;
       if (externalSrcImports.includes(dep)) {
         console.log(`[${chalk15.blue(name)}] dependency should be devDependency in package.json: ${chalk15.red(dep)}`);
@@ -891,7 +873,7 @@ import chalk16 from "chalk";
 function getUnusedPeerDependencies({ name, location }, { peerDependencies, dependencies }, { externalDistImports }) {
   let unusedDependencies = 0;
   for (const dep of peerDependencies) {
-    if (!externalDistImports.includes(dep) && !externalDistImports.includes(dep.replace(/^@types\//, ""))) {
+    if (!externalDistImports.includes(dep)) {
       unusedDependencies++;
       if (dependencies.includes(dep)) {
         console.log(`[${chalk16.blue(name)}] Unused peerDependency [already a dependency] in package.json: ${chalk16.red(dep)}`);
@@ -1318,7 +1300,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";
@@ -1394,8 +1376,34 @@ var buildEntries = (folder, entryMode = "single", excludeSpecAndStories = true,
   return entries;
 };
 
+// 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/packageCompileTscTypes.ts
+import { rm, writeFileSync as writeFileSync2 } from "fs";
+import path7 from "path";
 import { cwd } from "process";
+import { Extractor, ExtractorConfig } from "@microsoft/api-extractor";
 import chalk26 from "chalk";
 import { createProgramFromConfig } from "tsc-prog";
 import {
@@ -1432,13 +1440,20 @@ var getCompilerOptions = (options = {}, tsconfig = "tsconfig.json") => {
 };
 
 // src/actions/package/compile/packageCompileTscTypes.ts
-var packageCompileTscTypes = (folder = "src", config2 = {}, compilerOptionsParam) => {
+var packageCompileTscTypes = (entries, outDir, folder = "src", config2 = {}, compilerOptionsParam) => {
   const pkg = process.env.INIT_CWD ?? cwd();
   const verbose = config2?.verbose ?? false;
+  const tempDir = `${pkg}/.xylabs/ts-scripts-yarn3/compile/tsc/types/${Date.now()}`;
+  rm(tempDir, { force: true, recursive: true }, (err) => {
+    if (err) {
+      console.error(chalk26.red(`Error removing temporary directory: ${tempDir}`), err);
+      return 1;
+    }
+  });
   const compilerOptions = {
     ...getCompilerOptions({
       emitDeclarationOnly: true,
-      outDir: config2.compile?.tsup?.options?.outDir ?? "dist/types",
+      outDir: tempDir,
       removeComments: false,
       skipDefaultLibCheck: true,
       skipLibCheck: true,
@@ -1472,90 +1487,52 @@ var packageCompileTscTypes = (folder = "src", config2 = {}, compilerOptionsParam
       console.error(formattedDiagnostics);
     }
     program.emit();
-    return diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory.Error ? 1 : 0), 0);
-  }
-  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];
+    const tscErrorCount = diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory.Error ? 1 : 0), 0);
+    if (tscErrorCount > 0) {
+      return tscErrorCount;
     }
-  }
-  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 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) => {
-  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 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);
+    const entryNameToTypeName = (entry) => {
+      const splitEntryName = entry.split(".");
+      const newEntryExtension = "d." + splitEntryName.at(-1);
+      return [...splitEntryName.slice(0, -1), newEntryExtension].join(".");
+    };
+    const entryNames = entries.map((entry) => entry.split(`${folder}/`).at(-1) ?? entry);
+    for (const entry of entryNames) {
+      const entryTypeName = entryNameToTypeName(entry);
+      const configObject = {
+        projectFolder: ".",
+        mainEntryPointFilePath: path7.resolve([tempDir, entryTypeName].join("/")),
+        bundledPackages: [],
+        compiler: { tsconfigFilePath: path7.resolve(`${pkg}/tsconfig.json`) },
+        dtsRollup: {
+          enabled: true,
+          untrimmedFilePath: path7.resolve(`${outDir}/${entryTypeName}`)
+        },
+        apiReport: { enabled: false },
+        docModel: { enabled: false },
+        tsdocMetadata: { enabled: false }
+      };
+      writeFileSync2(`${tempDir}/api-extractor.json`, JSON.stringify(configObject, null, 2));
+      const extractorConfig = ExtractorConfig.prepare({
+        configObject,
+        configObjectFullPath: path7.resolve(`${tempDir}/api-extractor.json`),
+        // just a virtual label, doesn't have to exist
+        packageJsonFullPath: path7.resolve("package.json")
+      });
+      const extractorResult = Extractor.invoke(extractorConfig, {
+        localBuild: true,
+        showVerboseMessages: true
+      });
+      if (extractorResult.succeeded) {
+        console.log("API Extractor completed successfully");
+        process.exitCode = 0;
+      } else {
+        console.error(
+          `API Extractor completed with ${extractorResult.errorCount} errors and ${extractorResult.warningCount} warnings`
+        );
+        process.exitCode = 1;
+      }
     }
-    program.emit();
-    return diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory2.Error ? 1 : 0), 0);
   }
   return 0;
 };
@@ -1594,6 +1571,7 @@ var compileFolder = async (folder, entryMode = "single", options, verbose) => {
   if (verbose) {
     console.log(`TSUP:build:stop [${folder}]`);
   }
+  packageCompileTscTypes(entry, outDir);
   return 0;
 };
 var tsupOptions = (options = []) => {
@@ -1629,11 +1607,6 @@ var packageCompileTsup = async (config2) => {
   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 : {};
@@ -1688,7 +1661,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);
@@ -1698,8 +1671,62 @@ var packageCompile = async (inConfig = {}) => {
   return publint2 ? await packagePublint(config2) : 0;
 };
 
+// src/actions/package/compile/packageCompileTsc.ts
+import { cwd as cwd2 } from "process";
+import chalk28 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) => {
+  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 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(chalk28.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);
+  }
+  return 0;
+};
+
 // src/actions/package/copy-assets.ts
-import path7 from "path/posix";
+import path8 from "path/posix";
 import chalk29 from "chalk";
 import cpy2 from "cpy";
 var copyTargetAssets2 = async (target, name, location) => {
@@ -1708,7 +1735,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
       }
     );
@@ -1781,7 +1808,7 @@ var packageCycle = async ({ verbose = false }) => {
 
 // src/actions/package/gen-docs.ts
 import { existsSync as existsSync4 } from "fs";
-import path8 from "path";
+import path9 from "path";
 import chalk30 from "chalk";
 import {
   Application,
@@ -1800,7 +1827,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({
@@ -1892,7 +1919,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 cwd3 } from "process";
 import { pathToFileURL } from "url";
 import chalk31 from "chalk";
@@ -1929,7 +1956,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 [];
@@ -2236,7 +2263,6 @@ export {
   packageCompileTsc,
   packageCompileTscTypes,
   packageCompileTsup,
-  packageCompileTypes,
   packageCopyAssets,
   packageCycle,
   packageGenDocs,