@runtime-type-inspector/transpiler 2.0.9 → 2.0.10

package/index.cjs

@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/parser'), require('typescript')) :
 	typeof define === 'function' && define.amd ? define(['exports', '@babel/parser', 'typescript'], factory) :
-	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.rtiTranspiler = {}, global.parser, global.ts$1));
-})(this, (function (exports, parser, ts$1) { 'use strict';
+	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.rtiTranspiler = {}, global.parser, global.ts));
+})(this, (function (exports, parser, ts) { 'use strict';
 
 	function _iterableToArrayLimit(r, l) {
 	  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
@@ -260,7 +260,7 @@
 
 	function expandTypeDepFree(type) {
 	  type = type.trim();
-	  while (!type.includes('|') && type[0] == '(' && type[type.length - 1] == ')') {
+	  while (!type.includes('|') && type[0] === '(' && type[type.length - 1] === ')') {
 	    type = type.slice(1, -1).trim();
 	  }
 	  if (type[0] === '.' && type[1] === '.' && type[2] === '.') {
@@ -290,7 +290,7 @@
 	      val: expandTypeDepFree(val)
 	    };
 	  }
-	  if (type[0] == '{' && type[type.length - 1] == '}') {
+	  if (type[0] === '{' && type[type.length - 1] === '}') {
 	    var propertiesArray = type.slice(1, -1).split(',');
 	    var properties = {};
 	    propertiesArray.forEach(function (_) {
@@ -328,7 +328,7 @@
 	      elementType: expandTypeDepFree(_typeSlice)
 	    };
 	  }
-	  if (type[0] == '[' && type[type.length - 1] == ']') {
+	  if (type[0] === '[' && type[type.length - 1] === ']') {
 	    var elements = type.slice(1, -1).split(',');
 	    return {
 	      type: 'tuple',
@@ -362,7 +362,7 @@
 	    type.optional = optional;
 	  } else if (typeof type === 'string') {
 	    type = type.trim();
-	    if (type != 'object' && type != 'object[]' && type != 'union' && !optional) {
+	    if (type !== 'object' && type !== 'object[]' && type !== 'union' && !optional) {
 	      return type;
 	    }
 	    type = {
@@ -373,7 +373,7 @@
 	    debugger;
 	    console.warn("simplifyType> neither object nor string for type", type);
 	  }
-	  if (type.type == 'object' && type.properties && Object.keys(type.properties).length === 0) {
+	  if (type.type === 'object' && type.properties && Object.keys(type.properties).length === 0) {
 	    delete type.properties;
 	  }
 	  return type;
@@ -396,28 +396,28 @@
 	    name = name.split(' ')[0].split('=')[0].trim();
 	    var simplifiedType = simplifyType(type, optional);
 	    var parts = name.split(".");
-	    if (parts.length == 3) {
+	    if (parts.length === 3) {
 	      var parts0 = parts[0];
 	      var parts1 = parts[1];
 	      var parts2 = parts[2];
 	      var toptype = params[parts0];
 	      toptype.properties[parts1].properties = toptype.properties[parts1].properties || {};
 	      toptype.properties[parts1].properties[parts2] = simplifiedType;
-	    } else if (parts.length == 2) {
+	    } else if (parts.length === 2) {
 	      var _parts = parts[0];
 	      var _parts2 = parts[1];
 	      if (_parts.endsWith('[]')) {
 	        _parts = _parts.slice(0, -2);
 	      }
 	      var _toptype = params[_parts];
-	      if ((_toptype === null || _toptype === void 0 ? void 0 : _toptype.type) == "union") {
+	      if ((_toptype === null || _toptype === void 0 ? void 0 : _toptype.type) === "union") {
 	        var typeObject = _toptype.members.find(function (_) {
-	          return (_ === null || _ === void 0 ? void 0 : _.type) == 'object';
+	          return (_ === null || _ === void 0 ? void 0 : _.type) === 'object';
 	        });
 	        typeObject.properties[_parts2] = simplifiedType;
-	      } else if ((_toptype === null || _toptype === void 0 ? void 0 : _toptype.type) == "array") {
+	      } else if ((_toptype === null || _toptype === void 0 ? void 0 : _toptype.type) === "array") {
 	        _toptype.elementType.properties[_parts2] = simplifiedType;
-	      } else if ((_toptype === null || _toptype === void 0 ? void 0 : _toptype.type) == "object") {
+	      } else if ((_toptype === null || _toptype === void 0 ? void 0 : _toptype.type) === "object") {
 	        _toptype.properties = _toptype.properties || {};
 	        _toptype.properties[_parts2] = simplifiedType;
 	      } else {
@@ -491,7 +491,7 @@
 	    return;
 	  }
 	  var lines = value.split('\n');
-	  var lastTypedef = undefined;
+	  var lastTypedef;
 	  var _iterator = _createForOfIteratorHelper(lines),
 	    _step;
 	  try {
@@ -556,8 +556,9 @@
 	    _classCallCheck(this, Stringifier);
 	    _defineProperty(this, "forceCurly", false);
 	    _defineProperty(this, "parents", []);
-	    _defineProperty(this, "numSpaces", 0);
+	    _defineProperty(this, "lastCommentBlockIndex", -1);
 	    _defineProperty(this, "lastCommentLineIndex", -1);
+	    _defineProperty(this, "numSpaces", 0);
 	  }
 	  _createClass(Stringifier, [{
 	    key: "toSource",
@@ -575,7 +576,7 @@
 	      var out = '';
 	      var comments = '';
 	      if (leadingComments) {
-	        comments += this.mapToSource(leadingComments).join('');
+	        comments = this.leadingCommentsToSource(leadingComments);
 	      }
 	      if (node !== null && node !== void 0 && (_node$extra = node.extra) !== null && _node$extra !== void 0 && _node$extra.parenthesized) {
 	        out += "(".concat(comments).concat(this.toSource_(node), ")");
@@ -583,21 +584,7 @@
 	        out += comments + this.toSource_(node);
 	      }
 	      if (trailingComments) {
-	        var _iterator = _createForOfIteratorHelper(trailingComments),
-	          _step;
-	        try {
-	          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-	            var trailingComment = _step.value;
-	            if (trailingComment.type === 'CommentBlock') {
-	              out += ' ';
-	            }
-	            out += this.toSource(trailingComment);
-	          }
-	        } catch (err) {
-	          _iterator.e(err);
-	        } finally {
-	          _iterator.f();
-	        }
+	        out += this.trailingCommentsToSource(trailingComments);
 	      }
 	      this.parents.pop();
 	      return out;
@@ -625,6 +612,120 @@
 	      console.warn('TODO ADD METHOD:', fn);
 	      return "rtiUnhandled(\"".concat(node.type, "\");\n");
 	    }
+	  }, {
+	    key: "parentProvidesSpaces",
+	    value: function parentProvidesSpaces(reverseIndex) {
+	      var parents = this.parents;
+	      var parent = parents[parents.length - reverseIndex];
+	      return (parent === null || parent === void 0 ? void 0 : parent.type) === 'ArrayExpression';
+	    }
+	  }, {
+	    key: "CommentBlock",
+	    value: function CommentBlock(node) {
+	      var loc = node.loc;
+	      var value = node.value;
+	      if (this.lastCommentBlockIndex === loc.start.index) {
+	        return '';
+	      }
+	      this.lastCommentBlockIndex = loc.start.index;
+	      var spaces = this.spaces;
+	      var out = '';
+	      var dedicatedLine = spaces.length === loc.start.column;
+	      if (dedicatedLine) {
+	        out += spaces;
+	      }
+	      out += '/*';
+	      if (value.includes('\n')) {
+	        value = trimEndSpaces(value.replace(/^\s*\*/gm, '*')).split('\n').filter(function (_) {
+	          return _.length;
+	        }).map(function (line, i) {
+	          return (i ? spaces + ' ' : '') + line;
+	        }).join('\n');
+	        out += "".concat(value, "\n").concat(spaces, " */");
+	      } else {
+	        out += "".concat(value, "*/");
+	      }
+	      if (dedicatedLine) {
+	        out += '\n';
+	      } else {
+	        out += ' ';
+	      }
+	      return out;
+	    }
+	  }, {
+	    key: "CommentLine",
+	    value: function CommentLine(node) {
+	      var value = node.value,
+	        loc = node.loc;
+	      if (this.lastCommentLineIndex === loc.start.index) {
+	        return '';
+	      }
+	      this.lastCommentLineIndex = loc.start.index;
+	      var out = '';
+	      var spaces = this.spaces;
+	      var dedicatedLine = spaces.length === loc.start.column;
+	      if (dedicatedLine) {
+	        if (!this.parentProvidesSpaces(2)) {
+	          out += '\n';
+	          out += spaces;
+	        }
+	      } else {
+	        out += ' ';
+	      }
+	      out += "//".concat(value, "\n");
+	      return out;
+	    }
+	  }, {
+	    key: "leadingCommentsToSource",
+	    value: function leadingCommentsToSource(leadingComments) {
+	      var _this = this;
+	      var out = leadingComments.map(function (_) {
+	        return _this.commentToSource(_, 'leading');
+	      }).join('');
+	      if (this.parentProvidesSpaces(2)) {
+	        out += this.spaces;
+	      }
+	      return out;
+	    }
+	  }, {
+	    key: "trailingCommentsToSource",
+	    value: function trailingCommentsToSource(trailingComments) {
+	      var out = '';
+	      var _iterator = _createForOfIteratorHelper(trailingComments),
+	        _step;
+	      try {
+	        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+	          var trailingComment = _step.value;
+	          if (trailingComment.type === 'CommentBlock') {
+	            var loc = trailingComment.loc;
+	            var dedicatedLine = this.spaces.length === loc.start.column;
+	            if (dedicatedLine) {
+	              out += '\n';
+	            } else {
+	              out += ' ';
+	            }
+	          }
+	          out += this.commentToSource(trailingComment, 'trailing');
+	        }
+	      } catch (err) {
+	        _iterator.e(err);
+	      } finally {
+	        _iterator.f();
+	      }
+	      return out;
+	    }
+	  }, {
+	    key: "commentToSource",
+	    value: function commentToSource(comment, pos) {
+	      if (comment.type === 'CommentBlock') {
+	        return this.CommentBlock(comment);
+	      } else if (comment.type === 'CommentLine') {
+	        return this.CommentLine(comment);
+	      }
+	      console.warn("Unknown comment type", comment);
+	      debugger;
+	      return '';
+	    }
 	  }, {
 	    key: "toSourceCurly",
 	    value: function toSourceCurly(node) {
@@ -632,7 +733,7 @@
 	        return this.toSource(node);
 	      }
 	      var type = node.type;
-	      var needCurly = type != 'BlockStatement' && type != 'EmptyStatement';
+	      var needCurly = type !== 'BlockStatement' && type !== 'EmptyStatement';
 	      var spaces = this.spaces;
 	      var out = '';
 	      if (needCurly) {
@@ -661,21 +762,20 @@
 	    key: "needSpaces",
 	    get: function get() {
 	      var t = this.parentType;
-	      return t != "ForStatement" && t != "ForInStatement" && t != "ForOfStatement";
+	      return t !== "ForStatement" && t !== "ForInStatement" && t !== "ForOfStatement";
 	    }
 	  }, {
 	    key: "mapToSource",
 	    value: function mapToSource(arr) {
-	      var _this = this;
+	      var _this2 = this;
 	      return arr.map(function (_) {
-	        return _this.toSource(_);
+	        return _this2.toSource(_);
 	      });
 	    }
 	  }, {
 	    key: "generateTypeChecks",
 	    value: function generateTypeChecks(node) {
-	      var spaces = this.spaces;
-	      return "".concat(spaces, "/* Stub of Stringifier#generateTypeChecks({type=").concat(node.type, "}); */\n");
+	      return '';
 	    }
 	  }, {
 	    key: "spaces",
@@ -988,9 +1088,7 @@
 	        test = node.test;
 	      var spaces = this.spaces;
 	      var out = '';
-	      {
-	        out += spaces;
-	      }
+	      out += spaces;
 	      out += "if (".concat(this.toSource(test), ")");
 	      out += this.toSourceCurly(consequent);
 	      if (alternate) {
@@ -1152,9 +1250,23 @@
 	    key: "ArrayExpression",
 	    value: function ArrayExpression(node) {
 	      var elements = node.elements,
-	        extra = node.extra;
+	        extra = node.extra,
+	        loc = node.loc;
 	      var e = !!(extra !== null && extra !== void 0 && extra.trailingComma) ? ',' : '';
-	      return '[' + this.mapToSource(elements).join(', ') + e + ']';
+	      var sameLine = loc.start.line === loc.end.line;
+	      if (sameLine) {
+	        return '[' + this.mapToSource(elements).join(', ') + e + ']';
+	      }
+	      var out = '[\n';
+	      this.numSpaces++;
+	      var spaces = this.spaces;
+	      out += this.mapToSource(elements).map(function (_) {
+	        return spaces + _;
+	      }).join(',\n');
+	      this.numSpaces--;
+	      out += e;
+	      out += '\n' + this.spaces + ']';
+	      return out;
 	    }
 	  }, {
 	    key: "VariableDeclaration",
@@ -1225,9 +1337,8 @@
 	        argument = node.argument;
 	      if (prefix) {
 	        return "".concat(operator).concat(this.toSource(argument));
-	      } else {
-	        return "".concat(this.toSource(argument)).concat(operator);
 	      }
+	      return "".concat(this.toSource(argument)).concat(operator);
 	    }
 	  }, {
 	    key: "NewExpression",
@@ -1273,7 +1384,7 @@
 	  }, {
 	    key: "ExportNamedDeclaration",
 	    value: function ExportNamedDeclaration(node) {
-	      var _this2 = this;
+	      var _this3 = this;
 	      var declaration = node.declaration,
 	        source = node.source,
 	        specifiers = node.specifiers;
@@ -1281,7 +1392,7 @@
 	      if (specifiers.length) {
 	        out += 'export {\n';
 	        out += this.mapToSource(specifiers).map(function (_) {
-	          return "  ".concat(_this2.spaces).concat(_);
+	          return "  ".concat(_this3.spaces).concat(_);
 	        }).join(',\n');
 	        out += '\n';
 	        out += this.spaces;
@@ -1582,56 +1693,6 @@
 	    value: function DebuggerStatement(node) {
 	      return "".concat(this.spaces, "debugger;");
 	    }
-	  }, {
-	    key: "CommentBlock",
-	    value: function CommentBlock(node) {
-	      var value = node.value,
-	        loc = node.loc;
-	      var spaces = this.spaces;
-	        this.parents;
-	      var out = '';
-	      var dedicatedLine = spaces.length === loc.start.column;
-	      if (dedicatedLine) {
-	        out += spaces;
-	      }
-	      out += '/*';
-	      if (value.includes('\n')) {
-	        value = trimEndSpaces(value.replace(/^\s*\*/gm, '*')).split('\n').filter(function (_) {
-	          return _.length;
-	        }).map(function (line, i) {
-	          return (i ? spaces + ' ' : '') + line;
-	        }).join('\n');
-	        out += "".concat(value, "\n").concat(spaces, " */");
-	      } else {
-	        out += "".concat(value, "*/");
-	      }
-	      if (dedicatedLine) {
-	        out += '\n';
-	      } else {
-	        out += ' ';
-	      }
-	      return out;
-	    }
-	  }, {
-	    key: "CommentLine",
-	    value: function CommentLine(node) {
-	      var value = node.value,
-	        loc = node.loc;
-	      if (this.lastCommentLineIndex === loc.start.index) {
-	        return '';
-	      }
-	      this.lastCommentLineIndex = loc.start.index;
-	      var out = '';
-	      var spaces = this.spaces;
-	      var dedicatedLine = spaces.length === loc.start.column;
-	      if (dedicatedLine) {
-	        out += '\n' + spaces;
-	      } else {
-	        out += ' ';
-	      }
-	      out += "//".concat(value, "\n");
-	      return out;
-	    }
 	  }, {
 	    key: "Import",
 	    value: function Import(node) {
@@ -1684,9 +1745,7 @@
 	  }, {
 	    key: "Program",
 	    value: function Program(node) {
-	      node.sourceType;
-	        node.interpreter;
-	        var body = node.body,
+	      var body = node.body,
 	        directives = node.directives;
 	      var out = '';
 	      out += this.mapToSource(directives);
@@ -1856,7 +1915,7 @@
 	    key: "findParentOfType",
 	    value: function findParentOfType(node, type) {
 	      var currentIndex = this.parents.findLastIndex(function (_) {
-	        return _ == node;
+	        return _ === node;
 	      });
 	      return this.parents.findLast(function (_, i) {
 	        if (i > currentIndex) {
@@ -1870,7 +1929,7 @@
 	    value: function getLeadingCommentsNodeForArrowFunctionExpression(node) {
 	      var parents = this.parents;
 	      var i = parents.findLastIndex(function (_) {
-	        return _ == node;
+	        return _ === node;
 	      });
 	      var parent = parents[i];
 	      if (parent.leadingComments) {
@@ -1914,7 +1973,7 @@
 	        node = this.findParentOfType(node, 'ExpressionStatement');
 	        if (!node) {
 	          node = this.parents.findLast(function (_) {
-	            return _.type == 'VariableDeclaration';
+	            return _.type === 'VariableDeclaration';
 	          });
 	          if (!node) {
 	            return;
@@ -1935,7 +1994,7 @@
 	      }
 	      if (leadingComments && leadingComments.length) {
 	        var lastComment = leadingComments[leadingComments.length - 1];
-	        if (lastComment.type == "CommentBlock") {
+	        if (lastComment.type === "CommentBlock") {
 	          if (lastComment.value.includes('@event')) {
 	            return;
 	          }
@@ -2023,11 +2082,10 @@
 	          return node.name === name;
 	        } else if (type === 'ArrayPattern' || type === 'ObjectPattern' || type === 'RestElement') {
 	          return false;
-	        } else {
-	          var _ = new Stringifier();
-	          var code = _.toSource(node);
-	          console.log("Unknown type to test params for", type, code);
 	        }
+	        var _ = new Stringifier();
+	        var code = _.toSource(node);
+	        console.log("Unknown type to test params for", type, code);
 	        return false;
 	      });
 	    }
@@ -2169,7 +2227,7 @@
 	        case 'ClassMethod':
 	        case 'ClassPrivateMethod':
 	          var classDecl = this.parents.findLast(function (_) {
-	            return _.type == 'ClassDeclaration';
+	            return _.type === 'ClassDeclaration';
 	          });
 	          var out = '';
 	          if (classDecl) {
@@ -2190,9 +2248,8 @@
 	          var parent = this.findParentOfType(node, 'VariableDeclarator');
 	          if (parent) {
 	            return toSource(parent.id);
-	          } else {
-	            return 'getName> missing parent for ' + node.type;
 	          }
+	          return 'getName> missing parent for ' + node.type;
 	        case 'ObjectMethod':
 	          return toSource(key);
 	        default:
@@ -2219,8 +2276,7 @@
 	  }, {
 	    key: "File",
 	    value: function File(node) {
-	      node.errors;
-	        var program = node.program,
+	      var program = node.program,
 	        comments = node.comments;
 	      if (comments) {
 	        var _iterator3 = _createForOfIteratorHelper(comments),
@@ -2267,8 +2323,8 @@
 
 	function ast2json(ast) {
 	  return JSON.stringify(ast, function (name, val) {
-	    if (name == "loc" || name == "start" || name == "end") {
-	      return undefined;
+	    if (name === "loc" || name === "start" || name === "end") {
+	      return;
 	    }
 	    return val;
 	  }, 2);
@@ -2309,14 +2365,14 @@
 	    str += '[]';
 	  }
 	  str = "type tmp = ".concat(str, ";");
-	  var ast = ts$1.createSourceFile('repl.ts', str, ts$1.ScriptTarget.Latest, true);
+	  var ast = ts.createSourceFile('repl.ts', str, ts.ScriptTarget.Latest, true);
 	  return ast.statements[0].type;
 	}
 	function toSourceTS(node) {
 	  var typeArguments = node.typeArguments,
 	    typeName = node.typeName;
-	  var kind_ = ts$1.SyntaxKind[node.kind];
-	  var _ts$SyntaxKind = ts$1.SyntaxKind,
+	  var kind_ = ts.SyntaxKind[node.kind];
+	  var _ts$SyntaxKind = ts.SyntaxKind,
 	    AnyKeyword = _ts$SyntaxKind.AnyKeyword,
 	    ArrayType = _ts$SyntaxKind.ArrayType,
 	    BooleanKeyword = _ts$SyntaxKind.BooleanKeyword,
@@ -2344,8 +2400,21 @@
 	    JSDocNullableType = _ts$SyntaxKind.JSDocNullableType,
 	    TrueKeyword = _ts$SyntaxKind.TrueKeyword,
 	    FalseKeyword = _ts$SyntaxKind.FalseKeyword,
-	    VoidKeyword = _ts$SyntaxKind.VoidKeyword;
+	    VoidKeyword = _ts$SyntaxKind.VoidKeyword,
+	    UnknownKeyword = _ts$SyntaxKind.UnknownKeyword,
+	    NeverKeyword = _ts$SyntaxKind.NeverKeyword,
+	    ConstructorType = _ts$SyntaxKind.ConstructorType;
 	  switch (node.kind) {
+	    case ConstructorType:
+	      {
+	        var _parameters = node.parameters.map(toSourceTS);
+	        var _ret = toSourceTS(node.type);
+	        return {
+	          type: 'new',
+	          parameters: _parameters,
+	          ret: _ret
+	        };
+	      }
 	    case FunctionType:
 	      var parameters = node.parameters.map(toSourceTS);
 	      return {
@@ -2407,15 +2476,14 @@
 	          type: 'class',
 	          elementType: toSourceTS(typeArguments[0])
 	        };
-	      } else {
-	        if (!typeArguments) {
-	          return typeName.getText();
-	        }
-	        console.warn('unhandled TypeReference', kind_, node);
-	        return {
-	          type: 'unhandled TypeReference'
-	        };
 	      }
+	      if (!typeArguments) {
+	        return typeName.getText();
+	      }
+	      console.warn('unhandled TypeReference', kind_, node);
+	      return {
+	        type: 'unhandled TypeReference'
+	      };
 	    case StringKeyword:
 	      return node.getText();
 	    case NumberKeyword:
@@ -2469,6 +2537,8 @@
 	    case TrueKeyword:
 	    case FalseKeyword:
 	    case VoidKeyword:
+	    case UnknownKeyword:
+	    case NeverKeyword:
 	      return node.getText();
 	    case ObjectKeyword:
 	      return {
@@ -2500,12 +2570,13 @@
 	  return ast.program.body[0].typeAnnotation;
 	}
 	function toSourceBabelTS(node) {
-	  var typeName = node.typeName;
-	  var kind_ = ts.SyntaxKind[node.kind];
 	  switch (node.type) {
 	    case 'TSTypeReference':
 	      {
 	        var name = toSourceBabelTS(node.typeName);
+	        if (!node.typeParameters) {
+	          return node.typeName.name;
+	        }
 	        console.assert(node.typeParameters.type === 'TSTypeParameterInstantiation');
 	        var typeArguments = node.typeParameters.params;
 	        if ((name === 'Object' || name === 'Record') && (typeArguments === null || typeArguments === void 0 ? void 0 : typeArguments.length) === 2) {
@@ -2542,15 +2613,11 @@
 	            type: 'class',
 	            elementType: toSourceBabelTS(typeArguments[0])
 	          };
-	        } else {
-	          if (!typeArguments) {
-	            return typeName.name;
-	          }
-	          console.warn('unhandled TypeReference', kind_, node);
-	          return {
-	            type: 'unhandled TypeReference'
-	          };
 	        }
+	        console.warn('unhandled TypeReference', node);
+	        return {
+	          type: 'unhandled TypeReference'
+	        };
 	      }
 	    case 'TSStringKeyword':
 	      return 'string';
@@ -2604,6 +2671,10 @@
 	      return node.extra.raw;
 	    case 'TSUndefinedKeyword':
 	      return 'undefined';
+	    case 'TSUnknownKeyword':
+	      return 'unknown';
+	    case 'TSNeverKeyword':
+	      return 'never';
 	    case 'TSVoidKeyword':
 	      return 'void';
 	    case 'TSThisType':

package/index.mjs

@@ -1,9 +1,9 @@
 import { parse } from '@babel/parser';
-import ts$1 from 'typescript';
+import ts from 'typescript';
 
 function expandTypeDepFree(type) {
   type = type.trim();
-  while (!type.includes('|') && type[0] == '(' && type[type.length - 1] == ')') {
+  while (!type.includes('|') && type[0] === '(' && type[type.length - 1] === ')') {
     type = type.slice(1, -1).trim();
   }
   if (type[0] === '.' && type[1] === '.' && type[2] === '.') {
@@ -33,7 +33,7 @@ function expandTypeDepFree(type) {
       val: expandTypeDepFree(val)
     };
   }
-  if (type[0] == '{' && type[type.length - 1] == '}') {
+  if (type[0] === '{' && type[type.length - 1] === '}') {
     const propertiesArray = type.slice(1, -1).split(',');
     const properties = {};
     propertiesArray.forEach(_ => {
@@ -64,7 +64,7 @@ function expandTypeDepFree(type) {
       elementType: expandTypeDepFree(typeSlice)
     };
   }
-  if (type[0] == '[' && type[type.length - 1] == ']') {
+  if (type[0] === '[' && type[type.length - 1] === ']') {
     const elements = type.slice(1, -1).split(',');
     return {
       type: 'tuple',
@@ -98,7 +98,7 @@ function simplifyType(type, optional) {
     type.optional = optional;
   } else if (typeof type === 'string') {
     type = type.trim();
-    if (type != 'object' && type != 'object[]' && type != 'union' && !optional) {
+    if (type !== 'object' && type !== 'object[]' && type !== 'union' && !optional) {
       return type;
     }
     type = {
@@ -109,7 +109,7 @@ function simplifyType(type, optional) {
     debugger;
     console.warn("simplifyType> neither object nor string for type", type);
   }
-  if (type.type == 'object' && type.properties && Object.keys(type.properties).length === 0) {
+  if (type.type === 'object' && type.properties && Object.keys(type.properties).length === 0) {
     delete type.properties;
   }
   return type;
@@ -131,26 +131,26 @@ function parseJSDoc(src, expandType = expandTypeDepFree) {
     name = name.split(' ')[0].split('=')[0].trim();
     const simplifiedType = simplifyType(type, optional);
     const parts = name.split(".");
-    if (parts.length == 3) {
-      let parts0 = parts[0];
-      let parts1 = parts[1];
-      let parts2 = parts[2];
+    if (parts.length === 3) {
+      const parts0 = parts[0];
+      const parts1 = parts[1];
+      const parts2 = parts[2];
       const toptype = params[parts0];
       toptype.properties[parts1].properties = toptype.properties[parts1].properties || {};
       toptype.properties[parts1].properties[parts2] = simplifiedType;
-    } else if (parts.length == 2) {
+    } else if (parts.length === 2) {
       let parts0 = parts[0];
-      let parts1 = parts[1];
+      const parts1 = parts[1];
       if (parts0.endsWith('[]')) {
         parts0 = parts0.slice(0, -2);
       }
       const toptype = params[parts0];
-      if ((toptype == null ? void 0 : toptype.type) == "union") {
-        const typeObject = toptype.members.find(_ => (_ == null ? void 0 : _.type) == 'object');
+      if ((toptype == null ? void 0 : toptype.type) === "union") {
+        const typeObject = toptype.members.find(_ => (_ == null ? void 0 : _.type) === 'object');
         typeObject.properties[parts1] = simplifiedType;
-      } else if ((toptype == null ? void 0 : toptype.type) == "array") {
+      } else if ((toptype == null ? void 0 : toptype.type) === "array") {
         toptype.elementType.properties[parts1] = simplifiedType;
-      } else if ((toptype == null ? void 0 : toptype.type) == "object") {
+      } else if ((toptype == null ? void 0 : toptype.type) === "object") {
         toptype.properties = toptype.properties || {};
         toptype.properties[parts1] = simplifiedType;
       } else {
@@ -225,7 +225,7 @@ function parseJSDocTypedef(typedefs, warn, comment, expandType) {
     return;
   }
   const lines = value.split('\n');
-  let lastTypedef = undefined;
+  let lastTypedef;
   for (let line of lines) {
     line = line.trim();
     if (line[0] === '*') {
@@ -279,8 +279,9 @@ class Stringifier {
   constructor() {
     this.forceCurly = false;
     this.parents = [];
-    this.numSpaces = 0;
+    this.lastCommentBlockIndex = -1;
     this.lastCommentLineIndex = -1;
+    this.numSpaces = 0;
   }
   toSource(node) {
     var _node$extra;
@@ -298,7 +299,7 @@ class Stringifier {
     let out = '';
     let comments = '';
     if (leadingComments) {
-      comments += this.mapToSource(leadingComments).join('');
+      comments = this.leadingCommentsToSource(leadingComments);
     }
     if (node != null && (_node$extra = node.extra) != null && _node$extra.parenthesized) {
       out += `(${comments}${this.toSource_(node)})`;
@@ -306,12 +307,7 @@ class Stringifier {
       out += comments + this.toSource_(node);
     }
     if (trailingComments) {
-      for (const trailingComment of trailingComments) {
-        if (trailingComment.type === 'CommentBlock') {
-          out += ' ';
-        }
-        out += this.toSource(trailingComment);
-      }
+      out += this.trailingCommentsToSource(trailingComments);
     }
     this.parents.pop();
     return out;
@@ -337,6 +333,106 @@ class Stringifier {
     console.warn('TODO ADD METHOD:', fn);
     return `rtiUnhandled("${node.type}");\n`;
   }
+  parentProvidesSpaces(reverseIndex) {
+    const {
+      parents
+    } = this;
+    const parent = parents[parents.length - reverseIndex];
+    return (parent == null ? void 0 : parent.type) === 'ArrayExpression';
+  }
+  CommentBlock(node) {
+    const {
+      loc
+    } = node;
+    let {
+      value
+    } = node;
+    if (this.lastCommentBlockIndex === loc.start.index) {
+      return '';
+    }
+    this.lastCommentBlockIndex = loc.start.index;
+    const {
+      spaces
+    } = this;
+    let out = '';
+    const dedicatedLine = spaces.length === loc.start.column;
+    if (dedicatedLine) {
+      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 (dedicatedLine) {
+      out += '\n';
+    } else {
+      out += ' ';
+    }
+    return out;
+  }
+  CommentLine(node) {
+    const {
+      value,
+      loc
+    } = node;
+    if (this.lastCommentLineIndex === loc.start.index) {
+      return '';
+    }
+    this.lastCommentLineIndex = loc.start.index;
+    let out = '';
+    const {
+      spaces
+    } = this;
+    const dedicatedLine = spaces.length === loc.start.column;
+    if (dedicatedLine) {
+      if (!this.parentProvidesSpaces(2)) {
+        out += '\n';
+        out += spaces;
+      }
+    } else {
+      out += ' ';
+    }
+    out += `//${value}\n`;
+    return out;
+  }
+  leadingCommentsToSource(leadingComments) {
+    let out = leadingComments.map(_ => this.commentToSource(_, 'leading')).join('');
+    if (this.parentProvidesSpaces(2)) {
+      out += this.spaces;
+    }
+    return out;
+  }
+  trailingCommentsToSource(trailingComments) {
+    let out = '';
+    for (const trailingComment of trailingComments) {
+      if (trailingComment.type === 'CommentBlock') {
+        const {
+          loc
+        } = trailingComment;
+        const dedicatedLine = this.spaces.length === loc.start.column;
+        if (dedicatedLine) {
+          out += '\n';
+        } else {
+          out += ' ';
+        }
+      }
+      out += this.commentToSource(trailingComment, 'trailing');
+    }
+    return out;
+  }
+  commentToSource(comment, pos) {
+    if (comment.type === 'CommentBlock') {
+      return this.CommentBlock(comment);
+    } else if (comment.type === 'CommentLine') {
+      return this.CommentLine(comment);
+    }
+    console.warn("Unknown comment type", comment);
+    debugger;
+    return '';
+  }
   toSourceCurly(node) {
     if (!this.forceCurly) {
       return this.toSource(node);
@@ -344,7 +440,7 @@ class Stringifier {
     const {
       type
     } = node;
-    const needCurly = type != 'BlockStatement' && type != 'EmptyStatement';
+    const needCurly = type !== 'BlockStatement' && type !== 'EmptyStatement';
     const spaces = this.spaces;
     let out = '';
     if (needCurly) {
@@ -367,16 +463,13 @@ class Stringifier {
   }
   get needSpaces() {
     const t = this.parentType;
-    return t != "ForStatement" && t != "ForInStatement" && t != "ForOfStatement";
+    return t !== "ForStatement" && t !== "ForInStatement" && t !== "ForOfStatement";
   }
   mapToSource(arr) {
     return arr.map(_ => this.toSource(_));
   }
   generateTypeChecks(node) {
-    const {
-      spaces
-    } = this;
-    return `${spaces}/* Stub of Stringifier#generateTypeChecks({type=${node.type}}); */\n`;
+    return '';
   }
   get spaces() {
     return '  '.repeat(this.numSpaces);
@@ -685,9 +778,7 @@ class Stringifier {
     } = node;
     const spaces = this.spaces;
     let out = '';
-    {
-      out += spaces;
-    }
+    out += spaces;
     out += `if (${this.toSource(test)})`;
     out += this.toSourceCurly(consequent);
     if (alternate) {
@@ -846,10 +937,24 @@ class Stringifier {
   ArrayExpression(node) {
     const {
       elements,
-      extra
+      extra,
+      loc
     } = node;
     const e = !!(extra != null && extra.trailingComma) ? ',' : '';
-    return '[' + this.mapToSource(elements).join(', ') + e + ']';
+    const sameLine = loc.start.line === loc.end.line;
+    if (sameLine) {
+      return '[' + this.mapToSource(elements).join(', ') + e + ']';
+    }
+    let out = '[\n';
+    this.numSpaces++;
+    const {
+      spaces
+    } = this;
+    out += this.mapToSource(elements).map(_ => spaces + _).join(',\n');
+    this.numSpaces--;
+    out += e;
+    out += '\n' + this.spaces + ']';
+    return out;
   }
   VariableDeclaration(node) {
     const {
@@ -920,9 +1025,8 @@ class Stringifier {
     } = node;
     if (prefix) {
       return `${operator}${this.toSource(argument)}`;
-    } else {
-      return `${this.toSource(argument)}${operator}`;
     }
+    return `${this.toSource(argument)}${operator}`;
   }
   NewExpression(node) {
     const {
@@ -1282,56 +1386,6 @@ class Stringifier {
   DebuggerStatement(node) {
     return `${this.spaces}debugger;`;
   }
-  CommentBlock(node) {
-    let {
-      value,
-      loc
-    } = node;
-    const {
-      spaces,
-      parents
-    } = this;
-    let out = '';
-    const dedicatedLine = spaces.length === loc.start.column;
-    if (dedicatedLine) {
-      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 (dedicatedLine) {
-      out += '\n';
-    } else {
-      out += ' ';
-    }
-    return out;
-  }
-  CommentLine(node) {
-    const {
-      value,
-      loc
-    } = node;
-    if (this.lastCommentLineIndex === loc.start.index) {
-      return '';
-    }
-    this.lastCommentLineIndex = loc.start.index;
-    let out = '';
-    const {
-      spaces
-    } = this;
-    const dedicatedLine = spaces.length === loc.start.column;
-    if (dedicatedLine) {
-      out += '\n' + spaces;
-    } else {
-      out += ' ';
-    }
-    out += `//${value}\n`;
-    return out;
-  }
   Import(node) {
     return 'import';
   }
@@ -1379,8 +1433,6 @@ class Stringifier {
   }
   Program(node) {
     const {
-      sourceType,
-      interpreter,
       body,
       directives
     } = node;
@@ -1535,7 +1587,7 @@ class Asserter extends Stringifier {
     return out;
   }
   findParentOfType(node, type) {
-    const currentIndex = this.parents.findLastIndex(_ => _ == node);
+    const currentIndex = this.parents.findLastIndex(_ => _ === node);
     return this.parents.findLast((_, i) => {
       if (i > currentIndex) {
         return false;
@@ -1547,7 +1599,7 @@ class Asserter extends Stringifier {
     const {
       parents
     } = this;
-    let i = parents.findLastIndex(_ => _ == node);
+    let i = parents.findLastIndex(_ => _ === node);
     let parent = parents[i];
     if (parent.leadingComments) {
       return parent;
@@ -1584,7 +1636,7 @@ class Asserter extends Stringifier {
       }
       node = this.findParentOfType(node, 'ExpressionStatement');
       if (!node) {
-        node = this.parents.findLast(_ => _.type == 'VariableDeclaration');
+        node = this.parents.findLast(_ => _.type === 'VariableDeclaration');
         if (!node) {
           return;
         }
@@ -1605,7 +1657,7 @@ class Asserter extends Stringifier {
     }
     if (leadingComments && leadingComments.length) {
       const lastComment = leadingComments[leadingComments.length - 1];
-      if (lastComment.type == "CommentBlock") {
+      if (lastComment.type === "CommentBlock") {
         if (lastComment.value.includes('@event')) {
           return;
         }
@@ -1696,11 +1748,10 @@ class Asserter extends Stringifier {
         return node.name === name;
       } else if (type === 'ArrayPattern' || type === 'ObjectPattern' || type === 'RestElement') {
         return false;
-      } else {
-        const _ = new Stringifier();
-        const code = _.toSource(node);
-        console.log("Unknown type to test params for", type, code);
       }
+      const _ = new Stringifier();
+      const code = _.toSource(node);
+      console.log("Unknown type to test params for", type, code);
       return false;
     });
   }
@@ -1816,7 +1867,7 @@ class Asserter extends Stringifier {
         return toSource(id);
       case 'ClassMethod':
       case 'ClassPrivateMethod':
-        const classDecl = this.parents.findLast(_ => _.type == 'ClassDeclaration');
+        const classDecl = this.parents.findLast(_ => _.type === 'ClassDeclaration');
         let out = '';
         if (classDecl) {
           out += toSource(classDecl.id) + '#';
@@ -1836,9 +1887,8 @@ class Asserter extends Stringifier {
         const parent = this.findParentOfType(node, 'VariableDeclarator');
         if (parent) {
           return toSource(parent.id);
-        } else {
-          return 'getName> missing parent for ' + node.type;
         }
+        return 'getName> missing parent for ' + node.type;
       case 'ObjectMethod':
         return toSource(key);
       default:
@@ -1864,7 +1914,6 @@ class Asserter extends Stringifier {
   }
   File(node) {
     const {
-      errors,
       program,
       comments
     } = node;
@@ -1902,8 +1951,8 @@ function addTypeChecks(src, options) {
 
 function ast2json(ast) {
   return JSON.stringify(ast, function (name, val) {
-    if (name == "loc" || name == "start" || name == "end") {
-      return undefined;
+    if (name === "loc" || name === "start" || name === "end") {
+      return;
     }
     return val;
   }, 2);
@@ -1944,7 +1993,7 @@ function parseType(str) {
     str += '[]';
   }
   str = `type tmp = ${str};`;
-  const ast = ts$1.createSourceFile('repl.ts', str, ts$1.ScriptTarget.Latest, true);
+  const ast = ts.createSourceFile('repl.ts', str, ts.ScriptTarget.Latest, true);
   return ast.statements[0].type;
 }
 function toSourceTS(node) {
@@ -1952,7 +2001,7 @@ function toSourceTS(node) {
     typeArguments,
     typeName
   } = node;
-  const kind_ = ts$1.SyntaxKind[node.kind];
+  const kind_ = ts.SyntaxKind[node.kind];
   const {
     AnyKeyword,
     ArrayType,
@@ -1981,9 +2030,22 @@ function toSourceTS(node) {
     JSDocNullableType,
     TrueKeyword,
     FalseKeyword,
-    VoidKeyword
-  } = ts$1.SyntaxKind;
+    VoidKeyword,
+    UnknownKeyword,
+    NeverKeyword,
+    ConstructorType
+  } = ts.SyntaxKind;
   switch (node.kind) {
+    case ConstructorType:
+      {
+        const _parameters = node.parameters.map(toSourceTS);
+        const _ret = toSourceTS(node.type);
+        return {
+          type: 'new',
+          parameters: _parameters,
+          ret: _ret
+        };
+      }
     case FunctionType:
       const parameters = node.parameters.map(toSourceTS);
       return {
@@ -2045,15 +2107,14 @@ function toSourceTS(node) {
           type: 'class',
           elementType: toSourceTS(typeArguments[0])
         };
-      } else {
-        if (!typeArguments) {
-          return typeName.getText();
-        }
-        console.warn('unhandled TypeReference', kind_, node);
-        return {
-          type: 'unhandled TypeReference'
-        };
       }
+      if (!typeArguments) {
+        return typeName.getText();
+      }
+      console.warn('unhandled TypeReference', kind_, node);
+      return {
+        type: 'unhandled TypeReference'
+      };
     case StringKeyword:
       return node.getText();
     case NumberKeyword:
@@ -2107,6 +2168,8 @@ function toSourceTS(node) {
     case TrueKeyword:
     case FalseKeyword:
     case VoidKeyword:
+    case UnknownKeyword:
+    case NeverKeyword:
       return node.getText();
     case ObjectKeyword:
       return {
@@ -2138,14 +2201,13 @@ function parseTypeBabelTS(str) {
   return ast.program.body[0].typeAnnotation;
 }
 function toSourceBabelTS(node) {
-  const {
-    typeName
-  } = node;
-  const kind_ = ts.SyntaxKind[node.kind];
   switch (node.type) {
     case 'TSTypeReference':
       {
         const name = toSourceBabelTS(node.typeName);
+        if (!node.typeParameters) {
+          return node.typeName.name;
+        }
         console.assert(node.typeParameters.type === 'TSTypeParameterInstantiation');
         const typeArguments = node.typeParameters.params;
         if ((name === 'Object' || name === 'Record') && (typeArguments == null ? void 0 : typeArguments.length) === 2) {
@@ -2182,15 +2244,11 @@ function toSourceBabelTS(node) {
             type: 'class',
             elementType: toSourceBabelTS(typeArguments[0])
           };
-        } else {
-          if (!typeArguments) {
-            return typeName.name;
-          }
-          console.warn('unhandled TypeReference', kind_, node);
-          return {
-            type: 'unhandled TypeReference'
-          };
         }
+        console.warn('unhandled TypeReference', node);
+        return {
+          type: 'unhandled TypeReference'
+        };
       }
     case 'TSStringKeyword':
       return 'string';
@@ -2244,6 +2302,10 @@ function toSourceBabelTS(node) {
       return node.extra.raw;
     case 'TSUndefinedKeyword':
       return 'undefined';
+    case 'TSUnknownKeyword':
+      return 'unknown';
+    case 'TSNeverKeyword':
+      return 'never';
     case 'TSVoidKeyword':
       return 'void';
     case 'TSThisType':

package/package.json

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