dtsroll 1.3.0 → 1.4.1

package/README.md

@@ -1,11 +1,13 @@
-# dtsroll
-
-_dtsroll_ is a CLI tool for bundling TypeScript declaration (`.d.ts`) files.
-
 <p align="center">
-    <img width="600" src="./.github/screenshot.webp">
+    <img width="150" src="./.github/logo.webp">
 </p>
 
+<h2 align="center">
+dtsroll
+</h2>
+
+_dtsroll_ is a CLI tool for bundling TypeScript declaration (`.d.ts`) files.
+
 ### Why bundle `.d.ts` files?
 
 - **Smaller distribution**
@@ -20,6 +22,11 @@ _dtsroll_ is a CLI tool for bundling TypeScript declaration (`.d.ts`) files.
 
 	Flattens multiple files into one, reducing TypeScript's file resolution for type checking.
 
+<p align="center">
+    <img width="600" src="./.github/screenshot.webp">
+</p>
+
+
 ## Install
 ```
 npm install --save-dev dtsroll
@@ -86,6 +93,13 @@ To fix this, _dtsroll_ will display a warning suggesting you move the `@types/*`
 
 ## CLI
 
+### Usage
+```sh
+dtsroll [-flags] [...entry dts files]
+```
+
+The default usage is to run `dtsroll` without any flags/arguments in a directory containing a `package.json` file. This allows the configuration to be inferred automatically.
+
 ### --help, -h
 Display usage instructions.
 

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { cli } from 'cleye';
-import { b as bgYellow, a as black, d as dtsroll, l as logOutput } from './index-0B0-hvfH.mjs';
+import { b as bgYellow, a as black, d as dtsroll, l as logOutput } from './index-C9-38zEa.mjs';
 import 'node:path';
 import 'node:fs/promises';
 import 'rollup';
@@ -9,7 +9,7 @@ import '@rollup/plugin-node-resolve';
 import 'byte-size';
 
 var name = "dtsroll";
-var version = "1.3.0";
+var version = "1.4.1";
 var description = "Bundle dts files";
 
 const argv = cli({

package/dist/{index-0B0-hvfH.mjs → index-C9-38zEa.mjs}

@@ -291,11 +291,41 @@ const getPackageName = (id) => {
   return id.slice(0, indexOfSlash);
 };
 
+const getAllFiles = async (directoryPath, dontShortenPath) => {
+  const directoryFiles = await fs.readdir(directoryPath, { withFileTypes: true });
+  const fileTree = await Promise.all(
+    directoryFiles.map(async (entry) => {
+      const filePath = path.join(directoryPath, entry.name);
+      if (entry.isDirectory()) {
+        const files = await getAllFiles(filePath, true);
+        return dontShortenPath ? files : files.map((file) => `./${path.relative(directoryPath, file)}`);
+      }
+      return dontShortenPath ? filePath : `./${path.relative(directoryPath, filePath)}`;
+    })
+  );
+  return fileTree.flat();
+};
+
 const readPackageJson = async (filePath) => {
   const packageJsonString = await fs.readFile(filePath, "utf8");
   return JSON.parse(packageJsonString);
 };
-const getDtsEntryPoints = (packageJson, packageJsonDirectory) => {
+const traverseExports = (exportValue, propertyPath) => {
+  if (typeof exportValue === "string") {
+    return [[exportValue, propertyPath]];
+  }
+  if (Array.isArray(exportValue)) {
+    return exportValue.flatMap((value, index) => traverseExports(value, `${propertyPath}[${index}]`));
+  }
+  if (typeof exportValue === "object" && exportValue !== null) {
+    return Object.entries(exportValue).flatMap(([property, value]) => {
+      const newProperty = propertyNeedsQuotes(property) ? `["${property}"]` : `.${property}`;
+      return traverseExports(value, propertyPath + newProperty);
+    });
+  }
+  return [];
+};
+const getDtsEntryPoints = async (packageJson, packageJsonDirectory) => {
   const entryPoints = {};
   const addEntry = (subpath, from) => {
     if (!isDts(subpath)) {
@@ -313,19 +343,23 @@ const getDtsEntryPoints = (packageJson, packageJsonDirectory) => {
     addEntry(packageJson.typings, "typings");
   }
   if (packageJson.exports) {
-    (function gather(exportValue, propertyPath) {
-      if (typeof exportValue === "string") {
-        addEntry(exportValue, propertyPath);
-      } else if (Array.isArray(exportValue)) {
-        exportValue.forEach((value, index) => gather(value, `${propertyPath}[${index}]`));
+    const subpaths = traverseExports(packageJson.exports, "exports");
+    let packageFiles;
+    for (const [subpath, fromProperty] of subpaths) {
+      if (!subpath.includes("*")) {
+        addEntry(subpath, fromProperty);
+        continue;
       }
-      if (typeof exportValue === "object" && exportValue) {
-        for (const [property, value] of Object.entries(exportValue)) {
-          const newProperty = propertyNeedsQuotes(property) ? `["${property}"]` : `.${property}`;
-          gather(value, propertyPath + newProperty);
+      if (!packageFiles) {
+        packageFiles = await getAllFiles(packageJsonDirectory);
+      }
+      const [prefix, suffix] = subpath.split("*", 2);
+      for (const file of packageFiles) {
+        if (file.startsWith(prefix) && file.endsWith(suffix)) {
+          addEntry(file, fromProperty);
         }
       }
-    })(packageJson.exports, "exports");
+    }
   }
   return entryPoints;
 };
@@ -514,7 +548,7 @@ const build = async (input, outputDirectory, externals, mode, conditions) => {
       // sourcemap: true,
       dir: outputDirectory,
       entryFileNames: "[name]",
-      chunkFileNames: "_dtsroll-chunks/[name].ts"
+      chunkFileNames: "_dtsroll-chunks/[hash]-[name].ts"
     },
     plugins: [
       externalizePlugin,
@@ -566,7 +600,7 @@ const dtsroll = async ({
   }
   const manualInput = inputs && inputs.length > 0;
   const validatedInputs = await validateInput(
-    manualInput ? inputs.map((file) => path.resolve(file)) : pkgJson?.getDtsEntryPoints()
+    manualInput ? inputs.map((file) => path.resolve(file)) : await pkgJson?.getDtsEntryPoints()
   );
   const inputFiles = validatedInputs.filter((input) => !input[2]).map(([file]) => file);
   if (inputFiles.length === 0) {

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import 'node:path';
-export { d as dtsroll } from './index-0B0-hvfH.mjs';
+export { d as dtsroll } from './index-C9-38zEa.mjs';
 import 'node:fs/promises';
 import 'rollup';
 import 'rollup-plugin-dts';

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { d as dtsroll, l as logOutput } from './index-0B0-hvfH.mjs';
+import { d as dtsroll, l as logOutput } from './index-C9-38zEa.mjs';
 import 'node:path';
 import 'node:fs/promises';
 import 'rollup';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtsroll",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Bundle dts files",
   "keywords": [
     "bundle",