@d1g1tal/tsbuild 1.0.3 → 1.1.1

package/dist/{7SPSROV3.js → YGGCSRAC.js}

@@ -78,7 +78,7 @@ var ConfigurationError = class extends BuildError {
     this.name = "ConfigurationError";
   }
 };
-var UnsupportedSyntaxError = class extends Error {
+var UnsupportedSyntaxError = class extends BundleError {
   /**
    * Creates an instance of UnsupportedSyntaxError.
    * @param node The node with unsupported syntax
@@ -88,6 +88,7 @@ var UnsupportedSyntaxError = class extends Error {
     const syntaxKindName = SyntaxKind[node.kind] ?? `Unknown(${node.kind})`;
     const nodeText = node.getText ? node.getText().slice(0, 100) : "<no text>";
     super(`${message}: ${syntaxKindName} - "${nodeText}"`);
+    this.name = "UnsupportedSyntaxError";
   }
 };
 var castError = (exception) => {
@@ -557,7 +558,7 @@ var DeclarationProcessor = class _DeclarationProcessor {
       let hasDeclare = false;
       for (const modifier of node.modifiers ?? []) {
         if (modifier.kind === SyntaxKind2.DefaultKeyword || modifier.kind === SyntaxKind2.ExportKeyword) {
-          code.remove(modifier.getStart(), modifier.getEnd() + 1);
+          code.remove(modifier.getStart(), modifier.getEnd() + getTrailingWhitespaceLength(modifier.getEnd(), node.getEnd()));
         } else if (modifier.kind === SyntaxKind2.DeclareKeyword) {
           hasDeclare = true;
         }
@@ -828,8 +829,10 @@ function mergeImports(imports) {
   return result;
 }
 var DeclarationBundler = class {
-  /** d.ts Bundle Options (internally mutable for caching - stores pre-processed declarations) */
+  /** Project declaration files from in-memory FileManager */
   declarationFiles = /* @__PURE__ */ new Map();
+  /** External declaration files resolved from disk (node_modules) when resolve is enabled */
+  externalDeclarationFiles = /* @__PURE__ */ new Map();
   /** d.ts Bundle Options */
   options;
   /** WeakMap cache for identifier collection to avoid re-parsing same source files */
@@ -841,10 +844,10 @@ var DeclarationBundler = class {
   // Create a proper module resolution host that supports both in-memory files and disk files
   moduleResolutionHost = {
     fileExists: (fileName) => {
-      return this.declarationFiles.has(fileName) || this.options.resolve && sys.fileExists(fileName);
+      return this.declarationFiles.has(fileName) || this.externalDeclarationFiles.has(fileName) || this.options.resolve && sys.fileExists(fileName);
     },
     readFile: (fileName) => {
-      const cached = this.declarationFiles.get(fileName);
+      const cached = this.declarationFiles.get(fileName) ?? this.externalDeclarationFiles.get(fileName);
       if (cached) {
         return cached.code;
       }
@@ -854,7 +857,7 @@ var DeclarationBundler = class {
       const rawContent = sys.readFile(fileName, Encoding.utf8);
       if (rawContent !== void 0) {
         const preProcessOutput = DeclarationProcessor.preProcess(createSourceFile(fileName, rawContent, ScriptTarget.Latest, true));
-        this.declarationFiles.set(fileName, preProcessOutput);
+        this.externalDeclarationFiles.set(fileName, preProcessOutput);
         return preProcessOutput.code;
       }
       return void 0;
@@ -888,6 +891,14 @@ var DeclarationBundler = class {
     }
     this.options = dtsBundleOptions;
   }
+  /**
+   * Clears external declaration files and module resolution cache to free memory.
+   * Called after all entry points have been bundled.
+   */
+  clearExternalFiles() {
+    this.externalDeclarationFiles.clear();
+    this.moduleResolutionCache.clear();
+  }
   /**
    * Convert a source file path to its corresponding declaration file path
    * @param sourcePath - Absolute path to a source file (.ts, .tsx)
@@ -900,17 +911,20 @@ var DeclarationBundler = class {
       const dtsPath = posix.normalize(Paths.join(outDir, Paths.relative(rootDir, sourceWithoutExt) + FileExtension.DTS));
       return this.declarationFiles.has(dtsPath) ? dtsPath : sourcePath;
     }
+    let bestMatch;
+    let bestRelativeLength = Infinity;
     for (const dtsPath of this.declarationFiles.keys()) {
       if (!dtsPath.endsWith(FileExtension.DTS)) {
         continue;
       }
       const withoutOutDir = dtsPath.startsWith(outDir + "/") ? dtsPath.slice(outDir.length + 1) : dtsPath;
       const relativeDtsPath = withoutOutDir.slice(0, -FileExtension.DTS.length);
-      if (sourceWithoutExt === relativeDtsPath || sourceWithoutExt.endsWith("/" + relativeDtsPath)) {
-        return dtsPath;
+      if ((sourceWithoutExt === relativeDtsPath || sourceWithoutExt.endsWith("/" + relativeDtsPath)) && relativeDtsPath.length < bestRelativeLength) {
+        bestRelativeLength = relativeDtsPath.length;
+        bestMatch = dtsPath;
       }
     }
-    return sourcePath;
+    return bestMatch ?? sourcePath;
   }
   /**
    * Extract import statements from declaration file content using AST
@@ -984,7 +998,7 @@ var DeclarationBundler = class {
         return;
       }
       visited.add(path);
-      const cached = this.declarationFiles.get(path);
+      const cached = this.declarationFiles.get(path) ?? this.externalDeclarationFiles.get(path);
       if (cached === void 0) {
         return;
       }
@@ -1001,7 +1015,7 @@ var DeclarationBundler = class {
         if (resolvedPath?.includes(nodeModules) && !this.matchesPattern(specifier, this.options.noExternal)) {
           continue;
         }
-        if (resolvedPath && this.declarationFiles.has(resolvedPath)) {
+        if (resolvedPath && (this.declarationFiles.has(resolvedPath) || this.externalDeclarationFiles.has(resolvedPath))) {
           module.imports.add(resolvedPath);
           bundledSpecs.push(specifier);
           visit(resolvedPath);
@@ -1024,7 +1038,11 @@ var DeclarationBundler = class {
     const visited = /* @__PURE__ */ new Set();
     const visiting = /* @__PURE__ */ new Set();
     const visit = (path) => {
-      if (visited.has(path) || visiting.has(path)) {
+      if (visited.has(path)) {
+        return;
+      }
+      if (visiting.has(path)) {
+        Logger.warn(`Circular dependency detected: ${Paths.relative(this.options.currentDirectory, path)}`);
         return;
       }
       visiting.add(path);
@@ -1203,9 +1221,15 @@ var DeclarationBundler = class {
     for (const [name, sourcesSet] of declarationSources) {
       if (sourcesSet.size > 1) {
         const sources = Array.from(sourcesSet);
-        sources.slice(1).forEach((modulePath, index) => {
-          renameMap.set(`${name}:${modulePath}`, `${name}$${index + 1}`);
-        });
+        let suffix = 1;
+        for (const modulePath of sources.slice(1)) {
+          let candidate = `${name}$${suffix}`;
+          while (declarationSources.has(candidate)) {
+            candidate = `${name}$${++suffix}`;
+          }
+          renameMap.set(`${name}:${modulePath}`, candidate);
+          suffix++;
+        }
       }
     }
     for (const { path, typeReferences, fileReferences, sourceFile, code, identifiers } of sortedModules) {
@@ -1316,7 +1340,9 @@ async function bundleDeclarations(options) {
     await writeFile2(outPath, content, Encoding.utf8);
     return { path: Paths.relative(options.currentDirectory, outPath), size: content.length };
   });
-  return Promise.all(bundleTasks);
+  const results = await Promise.all(bundleTasks);
+  dtsBundler.clearExternalFiles();
+  return results;
 }
 
 // src/plugins/output.ts
@@ -1744,6 +1770,8 @@ var IncrementalBuildCache = class {
   cacheFilePath;
   /** Pre-loading promise started in constructor for async cache restoration */
   cacheLoaded;
+  /** Set to true when invalidate() is called to prevent stale cache from being restored */
+  invalidated = false;
   /**
    * Creates a new build cache instance and begins pre-loading the cache asynchronously.
    * @param projectRoot - Root directory of the project
@@ -1775,6 +1803,9 @@ var IncrementalBuildCache = class {
    * @param target - The map to populate with cached declarations
    */
   async restore(target) {
+    if (this.invalidated) {
+      return;
+    }
     const cache = await this.cacheLoaded;
     if (cache === void 0) {
       return;
@@ -1793,6 +1824,7 @@ var IncrementalBuildCache = class {
   }
   /** Invalidates the build cache by removing the cache directory. */
   invalidate() {
+    this.invalidated = true;
     try {
       rmSync(this.cacheDirectoryPath, defaultCleanOptions);
     } catch {
@@ -1815,6 +1847,97 @@ var IncrementalBuildCache = class {
   }
 };
 
+// src/entry-points.ts
+var importConditions = ["import", "default"];
+var outputToSourceExtension = /* @__PURE__ */ new Map([
+  [".js", ".ts"],
+  [".mjs", ".ts"],
+  [".jsx", ".tsx"],
+  [".d.ts", ".ts"],
+  [".d.mts", ".ts"]
+]);
+function outputToSourcePath(outputPath, outDir, sourceDir) {
+  const normalizedOutput = outputPath.replace(/^\.\//, "");
+  const normalizedOutDir = outDir.replace(/^\.\//, "").replace(/\/$/, "");
+  if (!normalizedOutput.startsWith(normalizedOutDir + "/") && normalizedOutput !== normalizedOutDir) {
+    return void 0;
+  }
+  const relativePortion = normalizedOutput.slice(normalizedOutDir.length + 1);
+  for (const [outExt, srcExt] of outputToSourceExtension) {
+    if (relativePortion.endsWith(outExt)) {
+      const stem = relativePortion.slice(0, -outExt.length);
+      return `./${sourceDir}/${stem}${srcExt}`;
+    }
+  }
+  return void 0;
+}
+function resolveConditionalExport(exportValue) {
+  if (typeof exportValue === "string") {
+    return exportValue;
+  }
+  for (const condition of importConditions) {
+    const value = exportValue[condition];
+    if (typeof value === "string") {
+      return value;
+    }
+  }
+  return void 0;
+}
+function subpathToEntryName(subpath, packageName) {
+  if (subpath === ".") {
+    return packageName ?? "index";
+  }
+  const withoutPrefix = subpath.replace(/^\.\//, "");
+  const lastSegment = withoutPrefix.lastIndexOf("/");
+  return lastSegment === -1 ? withoutPrefix : withoutPrefix.slice(lastSegment + 1);
+}
+function inferEntryPoints(packageJson, outDir, sourceDir = "src") {
+  const entryPoints = {};
+  if (packageJson.exports !== void 0) {
+    if (typeof packageJson.exports === "string") {
+      const sourcePath = outputToSourcePath(packageJson.exports, outDir, sourceDir);
+      if (sourcePath) {
+        entryPoints[packageJson.name ?? "index"] = sourcePath;
+      }
+    } else {
+      for (const [subpath, exportValue] of Object.entries(packageJson.exports)) {
+        if (subpath.includes("*")) {
+          continue;
+        }
+        const outputPath = resolveConditionalExport(exportValue);
+        if (outputPath === void 0) {
+          continue;
+        }
+        const sourcePath = outputToSourcePath(outputPath, outDir, sourceDir);
+        if (sourcePath) {
+          entryPoints[subpathToEntryName(subpath, packageJson.name)] = sourcePath;
+        }
+      }
+    }
+  }
+  if (packageJson.bin !== void 0) {
+    const binEntries = typeof packageJson.bin === "string" ? { [packageJson.name ?? "cli"]: packageJson.bin } : packageJson.bin;
+    for (const [name, outputPath] of Object.entries(binEntries)) {
+      if (entryPoints[name] === void 0) {
+        const sourcePath = outputToSourcePath(outputPath, outDir, sourceDir);
+        if (sourcePath) {
+          entryPoints[name] = sourcePath;
+        }
+      }
+    }
+  }
+  if (Object.keys(entryPoints).length === 0) {
+    const legacyPath = packageJson.module ?? packageJson.main;
+    if (legacyPath !== void 0) {
+      const sourcePath = outputToSourcePath(legacyPath, outDir, sourceDir);
+      if (sourcePath) {
+        entryPoints["index"] = sourcePath;
+      }
+    }
+  }
+  return Object.keys(entryPoints).length > 0 ? entryPoints : void 0;
+}
+
 // src/type-script-project.ts
 import { build as esbuild, formatMessages } from "esbuild";
 import { sys as sys3, createIncrementalProgram, formatDiagnostics, formatDiagnosticsWithColorAndContext, parseJsonConfigFileContent, readConfigFile, findConfigFile } from "typescript";
@@ -1840,6 +1963,7 @@ var _TypeScriptProject = class _TypeScriptProject {
     __publicField(this, "pendingChanges", []);
     __publicField(this, "buildDependencies", /* @__PURE__ */ new Set());
     __publicField(this, "dependencyPaths");
+    __publicField(this, "packageJson");
     this.directory = Paths.absolute(directory);
     this.configuration = _TypeScriptProject.resolveConfiguration(this.directory, options);
     const { buildCache, rootNames, projectReferences, configFileParsingDiagnostics, tsbuild: { entryPoints, ...tsbuildOptions }, compilerOptions: { target, outDir } } = this.configuration;
@@ -1858,7 +1982,7 @@ var _TypeScriptProject = class _TypeScriptProject {
     return Files.empty(this.buildConfiguration.outDir);
   }
   async build() {
-    Logger.header(`\u{1F680} tsbuild v${"1.0.3"}${this.configuration.compilerOptions.incremental ? " [incremental]" : ""}`);
+    Logger.header(`\u{1F680} tsbuild v${"1.1.1"}${this.configuration.compilerOptions.incremental ? " [incremental]" : ""}`);
     try {
       const processes = [];
       const filesWereEmitted = await this.typeCheck();
@@ -2073,6 +2197,19 @@ var _TypeScriptProject = class _TypeScriptProject {
     const bundle = typeScriptOptions.tsbuild?.bundle ?? configResult.config.tsbuild?.bundle ?? true;
     const platform2 = configResult.config.compilerOptions?.lib?.some(domPredicate) ? Platform.BROWSER : Platform.NODE;
     const noExternal = typeScriptOptions.tsbuild?.noExternal ?? configResult.config.tsbuild?.noExternal ?? [];
+    const hasExplicitEntryPoints = typeScriptOptions.tsbuild?.entryPoints !== void 0 || configResult.config.tsbuild?.entryPoints !== void 0;
+    let inferredEntryPoints;
+    if (!hasExplicitEntryPoints && bundle) {
+      const packageJsonContent = sys3.readFile(Paths.join(directory, "package.json"));
+      if (packageJsonContent) {
+        try {
+          const pkgJson = JSON.parse(packageJsonContent);
+          const outDir = typeScriptOptions.compilerOptions?.outDir ?? configResult.config.compilerOptions?.outDir ?? defaultOutDirectory;
+          inferredEntryPoints = inferEntryPoints(pkgJson, outDir);
+        } catch {
+        }
+      }
+    }
     const defaultTsbuildConfig = {
       splitting: bundle,
       minify: false,
@@ -2084,7 +2221,7 @@ var _TypeScriptProject = class _TypeScriptProject {
       platform: platform2,
       dts: { resolve: platform2 !== Platform.NODE, entryPoints: bundle ? void 0 : [] },
       watch: { enabled: false, recursive: true, ignoreInitial: true, persistent: true },
-      entryPoints: bundle ? { [defaultEntryPoint]: defaultEntryFile } : { src: defaultSourceDirectory }
+      entryPoints: inferredEntryPoints ?? (bundle ? { [defaultEntryPoint]: defaultEntryFile } : { src: defaultSourceDirectory })
     };
     const baseConfig = {
       ...configResult.config,
@@ -2140,11 +2277,14 @@ var _TypeScriptProject = class _TypeScriptProject {
   }
   /**
    * Gets the project dependency paths, cached after first call.
+   * Reads package.json and caches it for reuse.
    * @returns A promise that resolves to an array of project dependency paths.
    */
   getProjectDependencyPaths() {
     return this.dependencyPaths ??= Files.read(Paths.absolute(this.directory, "package.json")).then((content) => {
-      const { dependencies = {}, peerDependencies = {} } = Json.parse(content);
+      const packageJson = Json.parse(content);
+      this.packageJson = packageJson;
+      const { dependencies = {}, peerDependencies = {} } = packageJson;
       return [.../* @__PURE__ */ new Set([...Object.keys(dependencies), ...Object.keys(peerDependencies)])];
     });
   }

package/dist/index.d.ts

@@ -258,6 +258,7 @@ declare class TypeScriptProject implements Closable {
     private readonly pendingChanges;
     private readonly buildDependencies;
     private dependencyPaths?;
+    private packageJson?;
     /**
      * Creates a TypeScript project and prepares it for building/bundling.
      * @param directory - Project root directory (defaults to current working directory)
@@ -319,6 +320,7 @@ declare class TypeScriptProject implements Closable {
     private getEntryPoints;
     /**
      * Gets the project dependency paths, cached after first call.
+     * Reads package.json and caches it for reuse.
      * @returns A promise that resolves to an array of project dependency paths.
      */
     private getProjectDependencyPaths;

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   TypeScriptProject
-} from "./7SPSROV3.js";
+} from "./YGGCSRAC.js";
 import "./VMWNQL2J.js";
 export {
   TypeScriptProject

package/dist/tsbuild.js

@@ -2,7 +2,7 @@
 import {
   BuildError,
   TypeScriptProject
-} from "./7SPSROV3.js";
+} from "./YGGCSRAC.js";
 import "./VMWNQL2J.js";
 
 // src/tsbuild.ts
@@ -30,7 +30,7 @@ if (help) {
   process.exit(0);
 }
 if (version) {
-  console.log("1.0.3");
+  console.log("1.1.1");
   process.exit(0);
 }
 var typeScriptOptions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d1g1tal/tsbuild",
-  "version": "1.0.3",
+  "version": "1.1.1",
   "packageManager": "pnpm@10.29.3",
   "description": "A fast, ESM-only TypeScript build tool combining the TypeScript API for type checking and declaration generation, esbuild for bundling, and SWC for decorator metadata.",
   "type": "module",

package/schema.json

@@ -16,7 +16,7 @@
       "additionalProperties": false,
       "properties": {
         "entryPoints": {
-          "markdownDescription": "Files that each serve as an input to the bundling algorithm. Can be an array of paths or an object mapping output names to input paths.",
+          "markdownDescription": "Files that each serve as an input to the bundling algorithm. Can be an array of paths or an object mapping output names to input paths.\n\nWhen omitted, tsbuild auto-infers entry points from the `exports`, `bin`, `main`, or `module` fields in `package.json` by reverse-mapping output paths to source paths.",
           "oneOf": [
             {
               "type": "array",