dtsroll 1.7.7 → 1.7.9

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-CqO1yLQ_.mjs';
+import { b as bgYellow, a as black, d as dtsroll, l as logOutput } from './index-CwhQAGPV.mjs';
 import { patchErrorWithTrace } from 'rollup-plugin-import-trace';
 import 'node:path';
 import 'node:fs/promises';
@@ -14,7 +14,7 @@ import 'resolve-pkg-maps';
 import 'byte-size';
 
 var name = "dtsroll";
-var version = "1.7.7";
+var version = "1.7.9";
 var description = "Bundle dts files";
 
 const argv = cli({

package/dist/{index-CqO1yLQ_.mjs → index-CwhQAGPV.mjs}

@@ -2430,8 +2430,15 @@ class NamespaceFixer {
           });
         }
       }
-      if (ts.isModuleDeclaration(node) && node.body && ts.isModuleBlock(node.body)) {
-        for (const stmt of node.body.statements) {
+      if (ts.isModuleDeclaration(node) && node.body) {
+        let body = node.body;
+        while (ts.isModuleDeclaration(body) && body.body) {
+          body = body.body;
+        }
+        if (!ts.isModuleBlock(body)) {
+          continue;
+        }
+        for (const stmt of body.statements) {
           if (ts.isExportDeclaration(stmt) && stmt.exportClause) {
             if (ts.isNamespaceExport(stmt.exportClause)) {
               continue;
@@ -2938,9 +2945,15 @@ function getNodeIndent(node) {
   return " ".repeat(match?.[1]?.length || 0);
 }
 function preProcessNamespaceBody(body, code, sourceFile) {
+  if (ts.isModuleDeclaration(body)) {
+    if (body.body && (ts.isModuleBlock(body.body) || ts.isModuleDeclaration(body.body))) {
+      preProcessNamespaceBody(body.body, code);
+    }
+    return;
+  }
   for (const stmt of body.statements) {
     fixModifiers(code, stmt);
-    if (ts.isModuleDeclaration(stmt) && stmt.body && ts.isModuleBlock(stmt.body)) {
+    if (ts.isModuleDeclaration(stmt) && stmt.body && (ts.isModuleBlock(stmt.body) || ts.isModuleDeclaration(stmt.body))) {
       preProcessNamespaceBody(stmt.body, code);
     }
   }
@@ -2976,7 +2989,8 @@ function preProcess({ sourceFile, isEntry, isJSON }) {
       if (node.name) {
         const name = node.name.getText();
         declaredNames.add(name);
-        if (matchesModifier(node, ts.ModifierFlags.ExportDefault)) {
+        if (node.flags & ts.NodeFlags.GlobalAugmentation) ;
+        else if (matchesModifier(node, ts.ModifierFlags.ExportDefault)) {
           defaultExport = name;
         } else if (treatAsGlobalModule && ts.isIdentifier(node.name) || matchesModifier(node, ts.ModifierFlags.Export)) {
           exportedNames.add(name);
@@ -2986,7 +3000,7 @@ function preProcess({ sourceFile, isEntry, isJSON }) {
         }
       }
       if (ts.isModuleDeclaration(node)) {
-        if (node.body && ts.isModuleBlock(node.body)) {
+        if (node.body && (ts.isModuleBlock(node.body) || ts.isModuleDeclaration(node.body))) {
           preProcessNamespaceBody(node.body, code);
         }
         duplicateExports(code, node);
@@ -3240,7 +3254,14 @@ function fixModifiers(code, node) {
   }
 }
 function duplicateExports(code, module) {
-  if (!module.body || !ts.isModuleBlock(module.body)) {
+  if (!module.body) {
+    return;
+  }
+  if (ts.isModuleDeclaration(module.body)) {
+    duplicateExports(code, module.body);
+    return;
+  }
+  if (!ts.isModuleBlock(module.body)) {
     return;
   }
   for (const node of module.body.statements) {
@@ -3736,7 +3757,7 @@ class Transformer {
     }
     const scope = this.createDeclaration(node, node.name);
     scope.pushIdentifierReference(node.name);
-    scope.convertNamespace(node);
+    scope.convertNamespace(node, true);
   }
   convertEnumDeclaration(node) {
     const scope = this.createDeclaration(node, node.name);

package/dist/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import 'node:path';
-export { d as dtsroll } from './index-CqO1yLQ_.mjs';
+export { d as dtsroll } from './index-CwhQAGPV.mjs';
 import 'node:fs/promises';
 import 'rollup';
 import 'typescript';

package/dist/vite.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { d as dtsroll, l as logOutput } from './index-CqO1yLQ_.mjs';
+import { d as dtsroll, l as logOutput } from './index-CwhQAGPV.mjs';
 import 'node:path';
 import 'node:fs/promises';
 import 'rollup';
@@ -20,7 +20,7 @@ const dtsrollPlugin = (options) => {
     name: "dtsroll",
     apply: "build",
     enforce: "post",
-    config: ({ root, logLevel }) => {
+    configResolved: ({ root, logLevel }) => {
       cwd = root;
       noLog = logLevel === "silent";
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtsroll",
-  "version": "1.7.7",
+  "version": "1.7.9",
   "description": "Bundle dts files",
   "keywords": [
     "bundle",
@@ -44,7 +44,7 @@
     "empathic": "^2.0.0",
     "resolve-pkg-maps": "^1.0.0",
     "rollup": "^4.55.3",
-    "rollup-plugin-import-trace": "^1.0.0"
+    "rollup-plugin-import-trace": "^1.0.1"
   },
   "peerDependencies": {
     "typescript": "^4.5 || ^5.0",