@runtime-type-inspector/transpiler 2.0.6 → 2.0.7

package/index.cjs

@@ -557,6 +557,7 @@
 	    _defineProperty(this, "forceCurly", false);
 	    _defineProperty(this, "parents", []);
 	    _defineProperty(this, "numSpaces", 0);
+	    _defineProperty(this, "lastCommentLineIndex", -1);
 	  }
 	  _createClass(Stringifier, [{
 	    key: "toSource",
@@ -587,6 +588,9 @@
 	        try {
 	          for (_iterator.s(); !(_step = _iterator.n()).done;) {
 	            var trailingComment = _step.value;
+	            if (trailingComment.type === 'CommentBlock') {
+	              out += ' ';
+	            }
 	            out += this.toSource(trailingComment);
 	          }
 	        } catch (err) {
@@ -1583,14 +1587,14 @@
 	    value: function CommentBlock(node) {
 	      var value = node.value,
 	        loc = node.loc;
-	      var spaces = this.spaces,
-	        parents = this.parents;
-	      var par = parents[parents.length - 3];
+	      var spaces = this.spaces;
+	        this.parents;
 	      var out = '';
-	      if (!loc.start.column) {
-	        out += '\n' + this.spaces;
+	      var dedicatedLine = spaces.length === loc.start.column;
+	      if (dedicatedLine) {
+	        out += spaces;
 	      }
-	      out += "".concat(spaces, "/*");
+	      out += '/*';
 	      if (value.includes('\n')) {
 	        value = trimEndSpaces(value.replace(/^\s*\*/gm, '*')).split('\n').filter(function (_) {
 	          return _.length;
@@ -1601,19 +1605,28 @@
 	      } else {
 	        out += "".concat(value, "*/");
 	      }
-	      if (par && par.type === 'BlockStatement' || par.type === 'ObjectExpression' || par.type === 'Program') {
-	        return out + '\n';
+	      if (dedicatedLine) {
+	        out += '\n';
+	      } else {
+	        out += ' ';
 	      }
-	      return ' ' + out + ' ';
+	      return out;
 	    }
 	  }, {
 	    key: "CommentLine",
 	    value: function CommentLine(node) {
 	      var value = node.value,
 	        loc = node.loc;
+	      if (this.lastCommentLineIndex === loc.start.index) {
+	        console.log("CommentLine> ignore double");
+	        return '';
+	      }
+	      this.lastCommentLineIndex = loc.start.index;
 	      var out = '';
-	      if (!loc.start.column) {
-	        out += '\n' + this.spaces;
+	      var spaces = this.spaces;
+	      var dedicatedLine = spaces.length === loc.start.column;
+	      if (dedicatedLine) {
+	        out += '\n' + spaces;
 	      } else {
 	        out += ' ';
 	      }
@@ -1870,6 +1883,9 @@
 	        if (parent.leadingComments) {
 	          return parent;
 	        }
+	        if (parent.type === 'CallExpression') {
+	          break;
+	        }
 	        if (nodeIsFunction(parent)) {
 	          break;
 	        }

package/index.mjs

@@ -280,6 +280,7 @@ class Stringifier {
     this.forceCurly = false;
     this.parents = [];
     this.numSpaces = 0;
+    this.lastCommentLineIndex = -1;
   }
   toSource(node) {
     var _node$extra;
@@ -306,6 +307,9 @@ class Stringifier {
     }
     if (trailingComments) {
       for (const trailingComment of trailingComments) {
+        if (trailingComment.type === 'CommentBlock') {
+          out += ' ';
+        }
         out += this.toSource(trailingComment);
       }
     }
@@ -1287,31 +1291,42 @@ class Stringifier {
       spaces,
       parents
     } = this;
-    const par = parents[parents.length - 3];
     let out = '';
-    if (!loc.start.column) {
-      out += '\n' + this.spaces;
+    const dedicatedLine = spaces.length === loc.start.column;
+    if (dedicatedLine) {
+      out += spaces;
     }
-    out += `${spaces}/*`;
+    out += '/*';
     if (value.includes('\n')) {
       value = trimEndSpaces(value.replace(/^\s*\*/gm, '*')).split('\n').filter(_ => _.length).map((line, i) => (i ? spaces + ' ' : '') + line).join('\n');
       out += `${value}\n${spaces} */`;
     } else {
       out += `${value}*/`;
     }
-    if (par && par.type === 'BlockStatement' || par.type === 'ObjectExpression' || par.type === 'Program') {
-      return out + '\n';
+    if (dedicatedLine) {
+      out += '\n';
+    } else {
+      out += ' ';
     }
-    return ' ' + out + ' ';
+    return out;
   }
   CommentLine(node) {
     const {
       value,
       loc
     } = node;
+    if (this.lastCommentLineIndex === loc.start.index) {
+      console.log("CommentLine> ignore double");
+      return '';
+    }
+    this.lastCommentLineIndex = loc.start.index;
     let out = '';
-    if (!loc.start.column) {
-      out += '\n' + this.spaces;
+    const {
+      spaces
+    } = this;
+    const dedicatedLine = spaces.length === loc.start.column;
+    if (dedicatedLine) {
+      out += '\n' + spaces;
     } else {
       out += ' ';
     }
@@ -1544,6 +1559,9 @@ class Asserter extends Stringifier {
       if (parent.leadingComments) {
         return parent;
       }
+      if (parent.type === 'CallExpression') {
+        break;
+      }
       if (nodeIsFunction(parent)) {
         break;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runtime-type-inspector/transpiler",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Validating JSDoc types at runtime for high-quality types - Trust is good, control is better.",
   "main": "./index.cjs",
   "module": "./index.mjs",