dtsroll 1.4.0 → 1.5.0

package/dist/cli.mjs

@@ -1,15 +1,18 @@
 #!/usr/bin/env node
 import { cli } from 'cleye';
-import { b as bgYellow, a as black, d as dtsroll, l as logOutput } from './index-BR0PvbQA.mjs';
+import { b as bgYellow, a as black, d as dtsroll, l as logOutput } from './index-DfxmCmBK.mjs';
 import 'node:path';
 import 'node:fs/promises';
 import 'rollup';
 import 'rollup-plugin-dts';
 import '@rollup/plugin-node-resolve';
+import 'node:fs';
+import 'empathic/find';
+import 'resolve-pkg-maps';
 import 'byte-size';
 
 var name = "dtsroll";
-var version = "1.4.0";
+var version = "1.5.0";
 var description = "Bundle dts files";
 
 const argv = cli({

package/dist/{index-BR0PvbQA.mjs → index-DfxmCmBK.mjs}

@@ -3,86 +3,64 @@ import fs from 'node:fs/promises';
 import { rollup } from 'rollup';
 import { dts } from 'rollup-plugin-dts';
 import nodeResolve from '@rollup/plugin-node-resolve';
+import fs$1 from 'node:fs';
+import { up } from 'empathic/find';
+import { resolveImports } from 'resolve-pkg-maps';
 import byteSize from 'byte-size';
 
 let enabled = true;
-// Support both browser and node environments
-const globalVar = typeof self !== 'undefined'
-    ? self
-    : typeof window !== 'undefined'
-        ? window
-        : typeof global !== 'undefined'
-            ? global
-            : {};
-/**
- * Detect how much colors the current terminal supports
- */
-let supportLevel = 0 /* none */;
+const globalVar = typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : {};
+let supportLevel = 0;
 if (globalVar.process && globalVar.process.env && globalVar.process.stdout) {
-    const { FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM, COLORTERM } = globalVar.process.env;
-    if (NODE_DISABLE_COLORS || NO_COLOR || FORCE_COLOR === '0') {
-        enabled = false;
-    }
-    else if (FORCE_COLOR === '1' ||
-        FORCE_COLOR === '2' ||
-        FORCE_COLOR === '3') {
-        enabled = true;
-    }
-    else if (TERM === 'dumb') {
-        enabled = false;
-    }
-    else if ('CI' in globalVar.process.env &&
-        [
-            'TRAVIS',
-            'CIRCLECI',
-            'APPVEYOR',
-            'GITLAB_CI',
-            'GITHUB_ACTIONS',
-            'BUILDKITE',
-            'DRONE',
-        ].some(vendor => vendor in globalVar.process.env)) {
-        enabled = true;
-    }
-    else {
-        enabled = process.stdout.isTTY;
-    }
-    if (enabled) {
-        // Windows supports 24bit True Colors since Windows 10 revision #14931,
-        // see https://devblogs.microsoft.com/commandline/24-bit-color-in-the-windows-console/
-        if (process.platform === 'win32') {
-            supportLevel = 3 /* trueColor */;
-        }
-        else {
-            if (COLORTERM && (COLORTERM === 'truecolor' || COLORTERM === '24bit')) {
-                supportLevel = 3 /* trueColor */;
-            }
-            else if (TERM && (TERM.endsWith('-256color') || TERM.endsWith('256'))) {
-                supportLevel = 2 /* ansi256 */;
-            }
-            else {
-                supportLevel = 1 /* ansi */;
-            }
-        }
+  const { FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM, COLORTERM } = globalVar.process.env;
+  if (NODE_DISABLE_COLORS || NO_COLOR || FORCE_COLOR === "0") {
+    enabled = false;
+  } else if (FORCE_COLOR === "1" || FORCE_COLOR === "2" || FORCE_COLOR === "3") {
+    enabled = true;
+  } else if (TERM === "dumb") {
+    enabled = false;
+  } else if ("CI" in globalVar.process.env && [
+    "TRAVIS",
+    "CIRCLECI",
+    "APPVEYOR",
+    "GITLAB_CI",
+    "GITHUB_ACTIONS",
+    "BUILDKITE",
+    "DRONE"
+  ].some((vendor) => vendor in globalVar.process.env)) {
+    enabled = true;
+  } else {
+    enabled = process.stdout.isTTY;
+  }
+  if (enabled) {
+    if (process.platform === "win32") {
+      supportLevel = 3;
+    } else {
+      if (COLORTERM && (COLORTERM === "truecolor" || COLORTERM === "24bit")) {
+        supportLevel = 3;
+      } else if (TERM && (TERM.endsWith("-256color") || TERM.endsWith("256"))) {
+        supportLevel = 2;
+      } else {
+        supportLevel = 1;
+      }
     }
+  }
 }
 let options = {
-    enabled,
-    supportLevel,
+  enabled,
+  supportLevel
 };
-function kolorist(start, end, level = 1 /* ansi */) {
-    const open = `\x1b[${start}m`;
-    const close = `\x1b[${end}m`;
-    const regex = new RegExp(`\\x1b\\[${end}m`, 'g');
-    return (str) => {
-        return options.enabled && options.supportLevel >= level
-            ? open + ('' + str).replace(regex, open) + close
-            : '' + str;
-    };
+function kolorist(start, end, level = 1) {
+  const open = `\x1B[${start}m`;
+  const close = `\x1B[${end}m`;
+  const regex = new RegExp(`\\x1b\\[${end}m`, "g");
+  return (str) => {
+    return options.enabled && options.supportLevel >= level ? open + ("" + str).replace(regex, open) + close : "" + str;
+  };
 }
 const bold = kolorist(1, 22);
 const dim = kolorist(2, 22);
 const underline = kolorist(4, 24);
-// colors
 const black = kolorist(30, 39);
 const red = kolorist(31, 39);
 const green = kolorist(32, 39);
@@ -529,6 +507,58 @@ const removeBundledModulesPlugin = (outputDirectory, sizeRef) => {
   };
 };
 
+const packageJsonCache = /* @__PURE__ */ new Map();
+const findPackageJsonUp = (cwd) => {
+  const packageJsonPath = up("package.json", { cwd });
+  if (!packageJsonPath) {
+    return void 0;
+  }
+  const packageRoot = path.dirname(packageJsonPath);
+  let packageJson = packageJsonCache.get(packageRoot);
+  if (!packageJson) {
+    try {
+      const content = fs$1.readFileSync(packageJsonPath, "utf8");
+      packageJson = JSON.parse(content);
+      packageJsonCache.set(packageRoot, packageJson);
+    } catch {
+      return void 0;
+    }
+  }
+  if (packageJson.imports) {
+    return {
+      imports: packageJson.imports,
+      packageRoot
+    };
+  }
+};
+const resolveSubpathImportsPlugin = () => ({
+  name: "resolve-subpath-imports",
+  async resolveId(id, importer) {
+    if (id[0] !== "#" || !importer) {
+      return null;
+    }
+    const result = findPackageJsonUp(path.dirname(importer));
+    if (!result) {
+      return null;
+    }
+    const { imports, packageRoot } = result;
+    let resolvedPaths;
+    try {
+      resolvedPaths = resolveImports(imports, id, ["types", "import"]);
+    } catch {
+      return null;
+    }
+    if (resolvedPaths.length === 0) {
+      return null;
+    }
+    return this.resolve(
+      path.join(packageRoot, resolvedPaths[0]),
+      importer,
+      { skipSelf: true }
+    );
+  }
+});
+
 const createInputMap = (input, outputDirectory) => Object.fromEntries(
   input.map((inputFile) => [
     inputFile.slice(outputDirectory.length + 1),
@@ -548,11 +578,12 @@ 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,
       removeBundledModulesPlugin(outputDirectory, sizeRef),
+      resolveSubpathImportsPlugin(),
       nodeResolve({
         extensions: [".ts", ...dtsExtensions],
         exportConditions: conditions

package/dist/index.d.ts

@@ -40,4 +40,5 @@ type Options = {
 };
 declare const dtsroll: ({ cwd, inputs, external, conditions, dryRun, }?: Options) => Promise<DtsrollOutput>;
 
-export { type DtsrollOutput, type Options, dtsroll };
+export { dtsroll };
+export type { DtsrollOutput, Options };

package/dist/index.mjs

@@ -1,7 +1,11 @@
+#!/usr/bin/env node
 import 'node:path';
-export { d as dtsroll } from './index-BR0PvbQA.mjs';
+export { d as dtsroll } from './index-DfxmCmBK.mjs';
 import 'node:fs/promises';
 import 'rollup';
 import 'rollup-plugin-dts';
 import '@rollup/plugin-node-resolve';
+import 'node:fs';
+import 'empathic/find';
+import 'resolve-pkg-maps';
 import 'byte-size';

package/dist/vite.mjs

@@ -1,9 +1,13 @@
-import { d as dtsroll, l as logOutput } from './index-BR0PvbQA.mjs';
+#!/usr/bin/env node
+import { d as dtsroll, l as logOutput } from './index-DfxmCmBK.mjs';
 import 'node:path';
 import 'node:fs/promises';
 import 'rollup';
 import 'rollup-plugin-dts';
 import '@rollup/plugin-node-resolve';
+import 'node:fs';
+import 'empathic/find';
+import 'resolve-pkg-maps';
 import 'byte-size';
 
 const dtsrollPlugin = (options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtsroll",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Bundle dts files",
   "keywords": [
     "bundle",
@@ -37,15 +37,17 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "byte-size": "^9.0.1",
-    "cleye": "^1.3.2",
-    "rollup": "^4.29.1",
-    "rollup-plugin-dts": "6.1.1"
+    "cleye": "^2.2.1",
+    "empathic": "^2.0.0",
+    "resolve-pkg-maps": "^1.0.0",
+    "rollup": "^4.55.1",
+    "rollup-plugin-dts": "6.3.0"
   },
   "peerDependencies": {
     "typescript": "^4.5 || ^5.0",
-    "vite": "5 || 6"
+    "vite": "5 || 6 || 7"
   },
   "peerDependenciesMeta": {
     "vite": {