bio-dts 0.9.0 → 0.11.0

package/lib/post-transform.js

@@ -531,12 +531,24 @@ declare function p${
     // remove entirely, if empty
     if (!newDoc.replace(/[/*\s]/g, '')) {
       return null;
-    } else {
-      return b.commentBlock.from({
-        leading: true,
-        value: newDoc
-      });
     }
+
+    // leave comment unchanged
+    if (newDoc === comment.value) {
+      return comment;
+    }
+
+    const commentBuilder = {
+      'CommentLine': b.commentLine,
+      'CommentBlock': b.commentBlock
+    };
+
+    return commentBuilder[comment.type].from({
+      leading: comment.leading,
+      trailing: comment.trailing,
+      loc: comment.loc,
+      value: newDoc
+    });
   }
 
   /**
@@ -551,29 +563,31 @@ declare function p${
       const comment = comments.get(key);
 
       const newComment = cleanComment(comment.value);
-      if (newComment) {
+
+      if (newComment && newComment !== comment.value) {
         replace(comment, newComment);
-      } else {
+      }
+
+      if (!newComment) {
         replace(comment);
       }
     }
   }
 
-  traverse(body, function(path) {
-
-    const {
-      value
-    } = path;
+  function transformPath(path) {
 
     // filter private members
-    if (!isPublic(value)) {
+    if (!isPublic(path.value)) {
       return replace(path);
     }
 
+    // generate overloads based on @overlord annotation
     if (generateOverloads(path)) {
       return false;
     }
 
+    // fix optional before required args
+    // (just fine in JavaScript)
     if (fixOptionalArgsMethods(path)) {
       return false;
     }
@@ -582,15 +596,27 @@ declare function p${
     cleanComments(path);
 
     fixTypeExport(path);
-  });
+  }
+
+  const nodes = [ body ];
 
-  for (const [ path, args ] of replacements) {
-    try {
-      path.replace(...args);
-    } catch (err) {
-      console.error('Failed to replace path', path, ...args, err);
+  while (nodes.length) {
+    const node = nodes.shift();
 
-      throw error(path.value, 'failed to replace path: ' + err.message);
+    traverse(node, transformPath);
+
+    while (replacements.length) {
+      const [ path, args ] = replacements.shift();
+
+      try {
+        const replacedPaths = path.replace(...args);
+
+        nodes.push(...replacedPaths);
+      } catch (err) {
+        console.error('Failed to replace path', path, ...args, err);
+
+        throw error(path.value, 'failed to replace path: ' + err.message);
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bio-dts",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "Generate sane and clean types from JavaScript sources",
   "type": "module",
   "bin": "bin/cmd.js",