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

package/dist/actions/package/compile/packageCompileTscTypes.mjs

@@ -1,113 +1,40 @@
 // src/actions/package/compile/packageCompileTscTypes.ts
 import { cwd } from "process";
-import chalk from "chalk";
-import { createProgramFromConfig } from "tsc-prog";
-import {
-  DiagnosticCategory,
-  formatDiagnosticsWithColorAndContext,
-  getPreEmitDiagnostics,
-  sys as sys2
-} from "typescript";
-
-// src/actions/package/compile/inputs.ts
-import { glob } from "glob";
-var getAllInputs = (folder) => {
-  return glob.sync(`${folder}/**/*.*`, { posix: true });
-};
-
-// src/actions/package/compile/buildEntries.ts
-var buildEntries = (folder, entryMode = "single", excludeSpecAndStories = true, verbose = false) => {
-  let entries = [];
-  switch (entryMode) {
-    case "platform": {
-      entries = [`${folder}/index-node.ts`, `${folder}/index-browser.ts`];
-      break;
-    }
-    case "all": {
-      entries = excludeSpecAndStories ? getAllInputs(folder).filter((entry) => !entry.includes(".spec.") && !entry.includes(".stories.")) : getAllInputs(folder);
-      break;
-    }
-    default: {
-      entries = [`${folder}/index.ts`];
-      break;
+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);
     }
-  }
-  if (verbose) console.log(`buildEntries [${entryMode}] ${entries.length}`);
-  return entries;
-};
-
-// src/actions/package/compile/getCompilerOptions.ts
-import { createRequire } from "module";
-import deepmerge from "deepmerge";
-import {
-  findConfigFile,
-  readConfigFile,
-  sys
-} from "typescript";
-var getNested = (config) => {
-  if (config.extends) {
-    const require2 = createRequire(import.meta.url);
-    const opts = require2(config.extends);
-    return deepmerge(getNested(opts), config.compilerOptions ?? {});
-  }
-  return config.compilerOptions;
-};
-var getCompilerOptionsJSONFollowExtends = (filename) => {
-  const config = readConfigFile(filename, sys.readFile).config;
-  return getNested(config);
-};
-var getCompilerOptions = (options = {}, tsconfig = "tsconfig.json") => {
-  const configFileName = findConfigFile("./", sys.fileExists, tsconfig);
-  const configFileCompilerOptions = (configFileName ? getCompilerOptionsJSONFollowExtends(configFileName) : void 0) ?? {};
-  return deepmerge(configFileCompilerOptions, options);
-};
-
-// src/actions/package/compile/packageCompileTscTypes.ts
-var packageCompileTscTypes = (folder = "src", config = {}, compilerOptionsParam) => {
+  });
+  await bundle.write({
+    file: outputPath,
+    format: "es"
+  });
+  console.log(`Bundled declarations written to ${outputPath}`);
+}
+var packageCompileTscTypes = async (entries, outDir, platform, folder = "src") => {
   const pkg = process.env.INIT_CWD ?? cwd();
-  const verbose = config?.verbose ?? false;
-  const compilerOptions = {
-    ...getCompilerOptions({
-      emitDeclarationOnly: true,
-      outDir: config.compile?.tsup?.options?.outDir ?? "dist/types",
-      removeComments: false,
-      skipDefaultLibCheck: true,
-      skipLibCheck: true,
-      sourceMap: false
-    }),
-    ...compilerOptionsParam,
-    emitDeclarationOnly: true,
-    noEmit: false
+  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 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(chalk.green(`Compiling Types ${pkg}: ${files.length}`));
-  if (files.length > 0) {
-    const program = createProgramFromConfig({
-      basePath: pkg ?? cwd(),
-      compilerOptions,
-      exclude: ["build", "dist", "docs", "**/*.spec.*", "**/*.stories.*", "src/**/spec/**/*"],
-      files
-    });
-    const diagnostics = getPreEmitDiagnostics(program);
-    if (diagnostics.length > 0) {
-      const formattedDiagnostics = formatDiagnosticsWithColorAndContext(
-        diagnostics,
-        {
-          getCanonicalFileName: (fileName) => fileName,
-          getCurrentDirectory: () => folder,
-          getNewLine: () => sys2.newLine
-        }
-      );
-      console.error(formattedDiagnostics);
-    }
-    program.emit();
-    return diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory.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;
 };
 export {
+  bundleDts,
   packageCompileTscTypes
 };
 //# sourceMappingURL=packageCompileTscTypes.mjs.map

package/dist/actions/package/compile/packageCompileTscTypes.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/actions/package/compile/packageCompileTscTypes.ts","../../../../src/actions/package/compile/inputs.ts","../../../../src/actions/package/compile/buildEntries.ts","../../../../src/actions/package/compile/getCompilerOptions.ts"],"sourcesContent":["import { cwd } from 'node:process'\n\nimport chalk from 'chalk'\nimport type { TsConfigCompilerOptions } from 'tsc-prog'\nimport { createProgramFromConfig } from 'tsc-prog'\nimport type { CompilerOptions } from 'typescript'\nimport {\n  DiagnosticCategory, formatDiagnosticsWithColorAndContext, getPreEmitDiagnostics, sys,\n} from 'typescript'\n\nimport { buildEntries } from './buildEntries.ts'\nimport { getCompilerOptions } from './getCompilerOptions.ts'\nimport type { XyConfig, XyTsupConfig } from './XyConfig.ts'\n\nexport const packageCompileTscTypes = (\n  folder: string = 'src',\n  config: XyConfig = {},\n  compilerOptionsParam?: CompilerOptions,\n): number => {\n  const pkg = process.env.INIT_CWD ?? cwd()\n  const verbose = config?.verbose ?? false\n\n  const compilerOptions = {\n    ...(getCompilerOptions({\n      emitDeclarationOnly: true,\n      outDir: (config as XyTsupConfig).compile?.tsup?.options?.outDir ?? 'dist/types',\n      removeComments: false,\n      skipDefaultLibCheck: true,\n      skipLibCheck: true,\n      sourceMap: false,\n    })),\n    ...compilerOptionsParam,\n    emitDeclarationOnly: true,\n    noEmit: false,\n  } as TsConfigCompilerOptions\n\n  const validTsExt = ['.ts', '.tsx', '.d.ts', '.cts', '.d.cts', '.mts', '.d.mts']\n  const excludes = ['.stories.', '.spec.', '/stories/', '/spec/']\n\n  // calling all here since the types do not get rolled up\n  const files = buildEntries(folder, 'all', verbose)\n    .filter(file => validTsExt.find(ext => file.endsWith(ext)) && !(excludes.some(exclude => file.includes(exclude))))\n\n  console.log(chalk.green(`Compiling Types ${pkg}: ${files.length}`))\n\n  if (files.length > 0) {\n    const program = createProgramFromConfig({\n      basePath: pkg ?? cwd(),\n      compilerOptions,\n      exclude: ['build', 'dist', 'docs', '**/*.spec.*', '**/*.stories.*', 'src/**/spec/**/*'],\n      files,\n    })\n\n    const diagnostics = getPreEmitDiagnostics(program)\n\n    if (diagnostics.length > 0) {\n      const formattedDiagnostics = formatDiagnosticsWithColorAndContext(\n        diagnostics,\n        {\n          getCanonicalFileName: fileName => fileName,\n          getCurrentDirectory: () => folder,\n          getNewLine: () => sys.newLine,\n        },\n      )\n      console.error(formattedDiagnostics)\n    }\n\n    program.emit()\n    return diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory.Error ? 1 : 0), 0)\n  }\n  return 0\n}\n","import { glob } from 'glob'\n\nexport const getAllInputs = (folder: string) => {\n  /* tsup wants posix paths */\n  return glob.sync(`${folder}/**/*.*`, { posix: true })\n}\n","import { getAllInputs } from './inputs.ts'\nimport type { EntryMode } from './XyConfig.ts'\n\nexport const buildEntries = (folder: string, entryMode: EntryMode = 'single', excludeSpecAndStories = true, verbose = false) => {\n  let entries: string[] = []\n  switch (entryMode) {\n    case 'platform': {\n      entries = [`${folder}/index-node.ts`, `${folder}/index-browser.ts`]\n      break\n    }\n    case 'all': {\n      entries = excludeSpecAndStories ? getAllInputs(folder).filter(entry => !entry.includes('.spec.') && !entry.includes('.stories.')) : getAllInputs(folder)\n      break\n    }\n    default: {\n      entries = [`${folder}/index.ts`]\n      break\n    }\n  }\n  if (verbose) console.log(`buildEntries [${entryMode}] ${entries.length}`)\n  return entries\n}\n","import { createRequire } from 'node:module'\n\nimport deepmerge from 'deepmerge'\nimport type { TsConfig } from 'tsc-prog'\nimport type { CompilerOptions } from 'typescript'\nimport {\n  findConfigFile, readConfigFile, sys,\n} from 'typescript'\n\nconst getNested = (config: TsConfig): CompilerOptions => {\n  if (config.extends) {\n    const require = createRequire(import.meta.url)\n    const opts = require(config.extends)\n    return deepmerge(getNested(opts), config.compilerOptions ?? {}) as CompilerOptions\n  }\n\n  return config.compilerOptions as CompilerOptions\n}\n\nconst getCompilerOptionsJSONFollowExtends = (filename: string): CompilerOptions => {\n  const config = readConfigFile(filename, sys.readFile).config\n  return getNested(config)\n}\n\nexport const getCompilerOptions = (options: CompilerOptions = {}, tsconfig: string = 'tsconfig.json'): CompilerOptions => {\n  const configFileName = findConfigFile('./', sys.fileExists, tsconfig)\n  const configFileCompilerOptions = (configFileName ? getCompilerOptionsJSONFollowExtends(configFileName) : undefined) ?? {}\n\n  return deepmerge(configFileCompilerOptions, options)\n}\n"],"mappings":"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","names":["sys","require","sys"]}
+{"version":3,"sources":["../../../../src/actions/package/compile/packageCompileTscTypes.ts"],"sourcesContent":["import { cwd } from 'node:process'\n\nimport { rollup } from 'rollup'\nimport dts from 'rollup-plugin-dts'\nimport nodeExternals from 'rollup-plugin-node-externals'\n\nexport async function bundleDts(inputPath: string, outputPath: string, platform: 'node' | 'browser' | 'neutral') {\n  const nodePlugIns = platform === 'node' ? [nodeExternals()] : []\n  const bundle = await rollup({\n    input: inputPath,\n    plugins: [dts(), ...nodePlugIns],\n    onwarn(warning, warn) {\n      // Ignore certain warnings if needed\n      if (warning.code === 'UNUSED_EXTERNAL_IMPORT') return\n      warn(warning)\n    },\n  })\n\n  await bundle.write({\n    file: outputPath,\n    format: 'es',\n  })\n\n  console.log(`Bundled declarations written to ${outputPath}`)\n}\n\nexport const packageCompileTscTypes = async (\n  entries: string[],\n  outDir: string,\n  platform: 'node' | 'browser' | 'neutral',\n  folder: string = 'src',\n): Promise<number> => {\n  const pkg = process.env.INIT_CWD ?? cwd()\n  const srcRoot = `${pkg}/${folder}`\n\n  const entryNameToTypeName = (entry: string): string => {\n    const splitEntryName = entry.split('.')\n    const newEntryExtension = 'd.' + splitEntryName.at(-1)\n    return [...splitEntryName.slice(0, -1), newEntryExtension].join('.')\n  }\n\n  const entryNames = entries.map(entry => entry.split(`${folder}/`).at(-1) ?? entry)\n\n  await Promise.all(entryNames.map(async (entryName) => {\n    await bundleDts(`${srcRoot}/${entryName}`, outDir + '/' + entryNameToTypeName(entryName), platform)\n  }))\n  return 0\n}\n"],"mappings":";AAAA,SAAS,WAAW;AAEpB,SAAS,cAAc;AACvB,OAAO,SAAS;AAChB,OAAO,mBAAmB;AAE1B,eAAsB,UAAU,WAAmB,YAAoB,UAA0C;AAC/G,QAAM,cAAc,aAAa,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC;AAC/D,QAAM,SAAS,MAAM,OAAO;AAAA,IAC1B,OAAO;AAAA,IACP,SAAS,CAAC,IAAI,GAAG,GAAG,WAAW;AAAA,IAC/B,OAAO,SAAS,MAAM;AAEpB,UAAI,QAAQ,SAAS,yBAA0B;AAC/C,WAAK,OAAO;AAAA,IACd;AAAA,EACF,CAAC;AAED,QAAM,OAAO,MAAM;AAAA,IACjB,MAAM;AAAA,IACN,QAAQ;AAAA,EACV,CAAC;AAED,UAAQ,IAAI,mCAAmC,UAAU,EAAE;AAC7D;AAEO,IAAM,yBAAyB,OACpC,SACA,QACA,UACA,SAAiB,UACG;AACpB,QAAM,MAAM,QAAQ,IAAI,YAAY,IAAI;AACxC,QAAM,UAAU,GAAG,GAAG,IAAI,MAAM;AAEhC,QAAM,sBAAsB,CAAC,UAA0B;AACrD,UAAM,iBAAiB,MAAM,MAAM,GAAG;AACtC,UAAM,oBAAoB,OAAO,eAAe,GAAG,EAAE;AACrD,WAAO,CAAC,GAAG,eAAe,MAAM,GAAG,EAAE,GAAG,iBAAiB,EAAE,KAAK,GAAG;AAAA,EACrE;AAEA,QAAM,aAAa,QAAQ,IAAI,WAAS,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,GAAG,EAAE,KAAK,KAAK;AAEjF,QAAM,QAAQ,IAAI,WAAW,IAAI,OAAO,cAAc;AACpD,UAAM,UAAU,GAAG,OAAO,IAAI,SAAS,IAAI,SAAS,MAAM,oBAAoB,SAAS,GAAG,QAAQ;AAAA,EACpG,CAAC,CAAC;AACF,SAAO;AACT;","names":[]}

package/dist/actions/package/compile/packageCompileTsup.mjs

@@ -8,7 +8,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": {
@@ -19,37 +19,48 @@ 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/lib/loadConfig.ts
-import chalk from "chalk";
-import { cosmiconfig } from "cosmiconfig";
-import { TypeScriptLoader } from "cosmiconfig-typescript-loader";
-import deepmerge from "deepmerge";
-var config;
-var loadConfig = async (params) => {
-  if (config) {
-    return deepmerge(config, params ?? {});
+// 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 cosmicConfigResult = await cosmiconfig("xy", { cache: true, loaders: { ".ts": TypeScriptLoader() } }).search();
-  config = cosmicConfigResult?.config;
-  const configFilePath = cosmicConfigResult?.filepath;
-  if (configFilePath) {
-    console.log(chalk.gray(`Loading config from ${configFilePath}`));
+  return target;
+}
+function deepMergeObjects(objects) {
+  const result = {};
+  for (const obj of objects) {
+    deepMerge(result, obj);
   }
-  return deepmerge(config, params ?? {});
-};
+  return result;
+}
 
-// src/actions/package/compile/packageCompileTscTypes.ts
+// src/actions/package/compile/packageCompileTsc.ts
 import { cwd } from "process";
-import chalk2 from "chalk";
+import chalk from "chalk";
 import { createProgramFromConfig } from "tsc-prog";
 import {
   DiagnosticCategory,
@@ -60,57 +71,57 @@ import {
 
 // src/actions/package/compile/getCompilerOptions.ts
 import { createRequire } from "module";
-import deepmerge2 from "deepmerge";
+import deepmerge from "deepmerge";
 import {
   findConfigFile,
   readConfigFile,
   sys
 } from "typescript";
-var getNested = (config2) => {
-  if (config2.extends) {
+var getNested = (config) => {
+  if (config.extends) {
     const require2 = createRequire(import.meta.url);
-    const opts = require2(config2.extends);
-    return deepmerge2(getNested(opts), config2.compilerOptions ?? {});
+    const opts = require2(config.extends);
+    return deepmerge(getNested(opts), config.compilerOptions ?? {});
   }
-  return config2.compilerOptions;
+  return config.compilerOptions;
 };
 var getCompilerOptionsJSONFollowExtends = (filename) => {
-  const config2 = readConfigFile(filename, sys.readFile).config;
-  return getNested(config2);
+  const config = readConfigFile(filename, sys.readFile).config;
+  return getNested(config);
 };
 var getCompilerOptions = (options = {}, tsconfig = "tsconfig.json") => {
   const configFileName = findConfigFile("./", sys.fileExists, tsconfig);
   const configFileCompilerOptions = (configFileName ? getCompilerOptionsJSONFollowExtends(configFileName) : void 0) ?? {};
-  return deepmerge2(configFileCompilerOptions, options);
+  return deepmerge(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", config = {}, compilerOptionsParam) => {
   const pkg = process.env.INIT_CWD ?? cwd();
-  const verbose = config2?.verbose ?? false;
+  const verbose = config?.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(chalk2.green(`Compiling Types ${pkg}: ${files.length}`));
-  if (files.length > 0) {
+  console.log(chalk.green(`Validating Files: ${entries.length}`));
+  if (verbose) {
+    for (const entry of entries) {
+      console.log(chalk.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) {
@@ -130,102 +141,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 chalk3 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(chalk3.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,
@@ -234,6 +197,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];
@@ -247,6 +215,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 = []) => {
@@ -270,30 +239,22 @@ var tsupOptions = (options = []) => {
   };
   return deepMergeObjects([standardOptions, ...options]);
 };
-var packageCompileTsup = async (config2) => {
-  const compile = config2?.compile;
-  const verbose = config2?.verbose ?? false;
+var packageCompileTsup = async (config) => {
+  const compile = config?.compile;
+  const verbose = config?.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 (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 compile?.node?.esbuildOptions === "object" ? compile?.node?.esbuildOptions : {};
       return typeof folder === "string" ? await compileFolder(
         folder,
-        compile?.entryMode,
+        buildEntries(folder, compile?.entryMode, options, true, verbose),
         tsupOptions([
           inEsBuildOptions,
           compile?.tsup?.options ?? {},
@@ -309,7 +270,7 @@ var packageCompileTsup = async (config2) => {
       const inEsBuildOptions = typeof compile?.browser?.esbuildOptions === "object" ? compile?.browser?.esbuildOptions : {};
       return typeof folder === "string" ? await compileFolder(
         folder,
-        compile?.entryMode,
+        buildEntries(folder, compile?.entryMode, options, true, verbose),
         tsupOptions([
           inEsBuildOptions,
           compile?.tsup?.options ?? {},
@@ -325,7 +286,7 @@ var packageCompileTsup = async (config2) => {
       const inEsBuildOptions = typeof compile?.neutral?.esbuildOptions === "object" ? compile?.neutral?.esbuildOptions : {};
       return typeof folder === "string" ? await compileFolder(
         folder,
-        compile?.entryMode,
+        buildEntries(folder, compile?.entryMode, options, true, verbose),
         tsupOptions([
           inEsBuildOptions,
           compile?.tsup?.options ?? {},