From b8a6d421ec39774ea239bec3e4d9d5907de2f5ce Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Fri, 31 Jan 2020 00:19:20 +0100 Subject: [PATCH 01/28] correct good export naming in library mode --- src/lib/converter/factories/index.ts | 2 +- src/lib/converter/nodes/block.ts | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/lib/converter/factories/index.ts b/src/lib/converter/factories/index.ts index 8f5d9fe2c..2de16a4b6 100644 --- a/src/lib/converter/factories/index.ts +++ b/src/lib/converter/factories/index.ts @@ -1,6 +1,6 @@ export { createComment } from './comment'; export { createDeclaration } from './declaration'; export { createParameter } from './parameter'; -export { createReferenceType } from './reference'; +export { createReferenceType, createReferenceReflection } from './reference'; export { createSignature } from './signature'; export { createTypeParameter } from './type-parameter'; diff --git a/src/lib/converter/nodes/block.ts b/src/lib/converter/nodes/block.ts index 5b28e0ff9..59ab0bde5 100644 --- a/src/lib/converter/nodes/block.ts +++ b/src/lib/converter/nodes/block.ts @@ -2,7 +2,7 @@ import * as ts from 'typescript'; import { resolve } from 'path'; import { Reflection, ReflectionKind, ReflectionFlag } from '../../models/index'; -import { createDeclaration } from '../factories/index'; +import { createDeclaration, createReferenceReflection } from '../factories/index'; import { Context } from '../context'; import { Component, ConverterNodeComponent } from '../components'; import { BindOption, SourceFileMode } from '../../utils'; @@ -112,8 +112,18 @@ export class BlockConverter extends ConverterNodeComponent { + for (const declaration of resolved.declarations) { + this.owner.convertNode(context, declaration); + } + }; + + if (symbol.getName() !== resolved.getName()) { + const reflection = createReferenceReflection(context, symbol, resolved); + context.withScope(reflection, declarationsProcess); + } else { + declarationsProcess(); } } } From 44b98fcdcebeace6871e6c7db91fab209fdccff0 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Fri, 31 Jan 2020 00:43:02 +0100 Subject: [PATCH 02/28] correct good export naming in library mode: unit test update --- src/test/converter/exports/specs.lib.json | 7804 +++++++++++---------- 1 file changed, 4078 insertions(+), 3726 deletions(-) diff --git a/src/test/converter/exports/specs.lib.json b/src/test/converter/exports/specs.lib.json index 0a4b7b43c..12ea504e6 100644 --- a/src/test/converter/exports/specs.lib.json +++ b/src/test/converter/exports/specs.lib.json @@ -1,3810 +1,4162 @@ { - "id": 0, - "name": "typedoc", - "kind": 0, - "flags": {}, - "children": [ - { - "id": 10, - "name": "\"export\"", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true - }, - "originalName": "%BASE%/exports/export.ts", - "children": [ + "id": 0, + "name": "typedoc", + "kind": 0, + "flags": {}, + "children": [ { - "id": 19, - "name": "\"mod\"", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true - }, - "originalName": "%BASE%/exports/mod.ts", - "children": [ - { - "id": 24, - "name": "Node", - "kind": 256, - "kindString": "Interface", - "flags": { + "id": 11, + "name": "\"export\"", + "kind": 1, + "kindString": "Module", + "flags": { "isExported": true - }, - "children": [ - { - "id": 27, - "name": "decorators", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 499, - "character": 18 - } - ], - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "name": "Decorator" - } - ], - "name": "NodeArray" - } - }, - { - "id": 31, - "name": "end", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 73, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 31, - "name": "TextRange.end" - } - }, - { - "id": 26, - "name": "flags", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 498, - "character": 13 - } - ], - "type": { - "type": "reference", - "name": "NodeFlags" - } - }, - { - "id": 25, - "name": "kind", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 497, - "character": 12 - } - ], - "type": { - "type": "reference", - "name": "SyntaxKind" - } - }, - { - "id": 28, - "name": "modifiers", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 500, - "character": 17 - } - ], - "type": { - "type": "reference", - "name": "ModifiersArray" - } - }, - { - "id": 29, - "name": "parent", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 501, - "character": 14 - } - ], - "type": { - "type": "reference", - "id": 24, - "name": "Node" - } - }, - { - "id": 30, - "name": "pos", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 72, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 30, - "name": "TextRange.pos" - } - }, + }, + "originalName": "%BASE%/exports/export.ts", + "children": [ { - "id": 72, - "name": "forEachChild", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 73, - "name": "forEachChild", - "kind": 4096, - "kindString": "Call signature", - "flags": { + "id": 21, + "name": "Mod", + "kind": 16777216, + "kindString": "Reference", + "flags": { "isExported": true - }, - "typeParameter": [ - { - "id": 74, - "name": "T", - "kind": 131072, - "kindString": "Type parameter", - "flags": { - "isExported": true - } - } - ], - "parameters": [ - { - "id": 75, - "name": "cbNode", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 76, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { + }, + "children": [ + { + "id": 22, + "name": "\"mod\"", + "kind": 1, + "kindString": "Module", + "flags": { "isExported": true - }, - "signatures": [ - { - "id": 77, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 78, - "name": "node", - "kind": 32768, - "kindString": "Parameter", - "flags": { + }, + "originalName": "%BASE%/exports/mod.ts", + "children": [ + { + "id": 26, + "name": "b", + "kind": 16777216, + "kindString": "Reference", + "flags": { "isExported": true - }, - "type": { - "type": "reference", - "id": 24, - "name": "Node" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ + }, + "children": [ + { + "id": 27, + "name": "a", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 27 + ] + } + ], + "target": 16 + }, { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 31 - } - ] - } - } - }, - { - "id": 79, - "name": "cbNodeArray", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 80, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 81, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 82, - "name": "nodes", - "kind": 32768, - "kindString": "Parameter", - "flags": { + "id": 28, + "name": "c", + "kind": 16777216, + "kindString": "Reference", + "flags": { "isExported": true - }, - "type": { - "type": "reference", - "typeArguments": [ - { + }, + "children": [ + { + "id": 29, + "name": "a", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 29 + ] + } + ], + "target": 16 + }, + { + "id": 31, + "name": "Node", + "kind": 256, + "kindString": "Interface", + "flags": { + "isExported": true + }, + "children": [ + { + "id": 34, + "name": "decorators", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 499, + "character": 18 + } + ], + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "name": "Decorator" + } + ], + "name": "NodeArray" + } + }, + { + "id": 38, + "name": "end", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 73, + "character": 11 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 38, + "name": "TextRange.end" + } + }, + { + "id": 33, + "name": "flags", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 498, + "character": 13 + } + ], + "type": { + "type": "reference", + "name": "NodeFlags" + } + }, + { + "id": 32, + "name": "kind", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 497, + "character": 12 + } + ], + "type": { + "type": "reference", + "name": "SyntaxKind" + } + }, + { + "id": 35, + "name": "modifiers", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 500, + "character": 17 + } + ], + "type": { + "type": "reference", + "name": "ModifiersArray" + } + }, + { + "id": 36, + "name": "parent", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 501, + "character": 14 + } + ], + "type": { + "type": "reference", + "id": 31, + "name": "Node" + } + }, + { + "id": 37, + "name": "pos", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 72, + "character": 11 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 37, + "name": "TextRange.pos" + } + }, + { + "id": 79, + "name": "forEachChild", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 80, + "name": "forEachChild", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "typeParameter": [ + { + "id": 81, + "name": "T", + "kind": 131072, + "kindString": "Type parameter", + "flags": { + "isExported": true + } + } + ], + "parameters": [ + { + "id": 82, + "name": "cbNode", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "reflection", + "declaration": { + "id": 83, + "name": "__type", + "kind": 65536, + "kindString": "Type literal", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 84, + "name": "__call", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 85, + "name": "node", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "reference", + "id": 31, + "name": "Node" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "typeParameter", + "name": "T" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4871, + "character": 31 + } + ] + } + } + }, + { + "id": 86, + "name": "cbNodeArray", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reflection", + "declaration": { + "id": 87, + "name": "__type", + "kind": 65536, + "kindString": "Type literal", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 88, + "name": "__call", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 89, + "name": "nodes", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "id": 31, + "name": "Node" + } + ], + "name": "NodeArray" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "typeParameter", + "name": "T" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4871, + "character": 76 + } + ] + } + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "typeParameter", + "name": "T" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4871, + "character": 20 + } + ] + }, + { + "id": 44, + "name": "getChildAt", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 45, + "name": "getChildAt", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 46, + "name": "index", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + }, + { + "id": 47, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "reference", + "id": 31, + "name": "Node" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4859, + "character": 18 + } + ] + }, + { + "id": 41, + "name": "getChildCount", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 42, + "name": "getChildCount", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 43, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4858, + "character": 21 + } + ] + }, + { + "id": 48, + "name": "getChildren", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 49, + "name": "getChildren", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 50, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "array", + "elementType": { + "type": "reference", + "id": 31, + "name": "Node" + } + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4860, + "character": 19 + } + ] + }, + { + "id": 57, + "name": "getEnd", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 58, + "name": "getEnd", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4863, + "character": 14 + } + ] + }, + { + "id": 73, + "name": "getFirstToken", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 74, + "name": "getFirstToken", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 75, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "reference", + "id": 31, + "name": "Node" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4869, + "character": 21 + } + ] + }, + { + "id": 55, + "name": "getFullStart", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 56, + "name": "getFullStart", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4862, + "character": 20 + } + ] + }, + { + "id": 67, + "name": "getFullText", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 68, + "name": "getFullText", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 69, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "string" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4867, + "character": 19 + } + ] + }, + { + "id": 62, + "name": "getFullWidth", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 63, + "name": "getFullWidth", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4865, + "character": 20 + } + ] + }, + { + "id": 76, + "name": "getLastToken", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 77, + "name": "getLastToken", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 78, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "reference", + "id": 31, + "name": "Node" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4870, + "character": 20 + } + ] + }, + { + "id": 64, + "name": "getLeadingTriviaWidth", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 65, + "name": "getLeadingTriviaWidth", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 66, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4866, + "character": 29 + } + ] + }, + { + "id": 39, + "name": "getSourceFile", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 40, + "name": "getSourceFile", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4857, + "character": 21 + } + ] + }, + { + "id": 51, + "name": "getStart", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 52, + "name": "getStart", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 53, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + }, + { + "id": 54, + "name": "includeJsDocComment", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "intrinsic", + "name": "boolean" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4861, + "character": 16 + } + ] + }, + { + "id": 70, + "name": "getText", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 71, + "name": "getText", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 72, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "string" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4868, + "character": 15 + } + ] + }, + { + "id": 59, + "name": "getWidth", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 60, + "name": "getWidth", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 61, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFileLike" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4864, + "character": 16 + } + ] + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 34, + 38, + 33, + 32, + 35, + 36, + 37 + ] + }, + { + "title": "Methods", + "kind": 2048, + "children": [ + 79, + 44, + 41, + 48, + 57, + 73, + 55, + 67, + 62, + 76, + 64, + 39, + 51, + 70, + 59 + ] + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 496, + "character": 25 + }, + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4856, + "character": 18 + } + ], + "extendedTypes": [ + { "type": "reference", + "name": "TextRange" + } + ] + }, + { + "id": 25, + "name": "a", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 23, + "name": "default", + "kind": 64, + "kindString": "Function", + "flags": {}, + "signatures": [ + { "id": 24, - "name": "Node" - } - ], - "name": "NodeArray" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } + "name": "default", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "comment": { + "shortText": "Will not be re-exported from export.ts using export * from..." + }, + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 14, + "character": 31 + } + ] + } + ], + "groups": [ + { + "title": "References", + "kind": 16777216, + "children": [ + 26, + 28 + ] + }, + { + "title": "Interfaces", + "kind": 256, + "children": [ + 31 + ] + }, + { + "title": "Variables", + "kind": 32, + "children": [ + 25 + ] + }, + { + "title": "Functions", + "kind": 64, + "children": [ + 23 ] - } } - ], - "sources": [ + ], + "sources": [ { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 76 + "fileName": "dist/test/converter/exports/mod.ts", + "line": 1, + "character": 0 } - ] - } - } + ] } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 20 - } - ] - }, - { - "id": 37, - "name": "getChildAt", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 38, - "name": "getChildAt", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 39, - "name": "index", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, + ], + "groups": [ { - "id": 40, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "reference", - "id": 24, - "name": "Node" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4859, - "character": 18 - } - ] - }, - { - "id": 34, - "name": "getChildCount", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 35, - "name": "getChildCount", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 36, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } + "title": "Modules", + "kind": 1, + "children": [ + 22 + ] } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4858, - "character": 21 - } - ] + ], + "target": 22 }, { - "id": 41, - "name": "getChildren", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 42, - "name": "getChildren", - "kind": 4096, - "kindString": "Call signature", - "flags": { + "id": 90, + "name": "ModDefault", + "kind": 16777216, + "kindString": "Reference", + "flags": { "isExported": true - }, - "parameters": [ - { - "id": 43, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } + }, + "children": [ + { + "id": 91, + "name": "default", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 92, + "name": "default", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "comment": { + "shortText": "Will not be re-exported from export.ts using export * from..." + }, + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 14, + "character": 31 + } + ] } - ], - "type": { - "type": "array", - "elementType": { - "type": "reference", - "id": 24, - "name": "Node" + ], + "groups": [ + { + "title": "Functions", + "kind": 64, + "children": [ + 91 + ] } - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4860, - "character": 19 - } - ] - }, - { - "id": 50, - "name": "getEnd", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 51, - "name": "getEnd", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4863, - "character": 14 - } - ] + ], + "target": 23 }, { - "id": 66, - "name": "getFirstToken", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 67, - "name": "getFirstToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { + "id": 94, + "name": "b", + "kind": 16777216, + "kindString": "Reference", + "flags": { "isExported": true - }, - "parameters": [ - { - "id": 68, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } + }, + "children": [ + { + "id": 95, + "name": "a", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 24, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4869, - "character": 21 - } - ] - }, - { - "id": 48, - "name": "getFullStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 49, - "name": "getFullStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4862, - "character": 20 - } - ] - }, - { - "id": 60, - "name": "getFullText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 61, - "name": "getFullText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 62, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 95 + ] } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4867, - "character": 19 - } - ] - }, - { - "id": 55, - "name": "getFullWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 56, - "name": "getFullWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4865, - "character": 20 - } - ] + ], + "target": 16 }, { - "id": 69, - "name": "getLastToken", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 70, - "name": "getLastToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { + "id": 15, + "name": "c", + "kind": 16777216, + "kindString": "Reference", + "flags": { "isExported": true - }, - "parameters": [ - { - "id": 71, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } + }, + "children": [ + { + "id": 16, + "name": "a", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 24, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4870, - "character": 20 - } - ] - }, - { - "id": 57, - "name": "getLeadingTriviaWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 58, - "name": "getLeadingTriviaWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 59, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 16 + ] } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4866, - "character": 29 - } - ] - }, - { - "id": 32, - "name": "getSourceFile", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 33, - "name": "getSourceFile", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4857, - "character": 21 - } - ] + ], + "target": 16 }, { - "id": 44, - "name": "getStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 45, - "name": "getStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { + "id": 97, + "name": "Node", + "kind": 256, + "kindString": "Interface", + "flags": { "isExported": true - }, - "parameters": [ - { - "id": 46, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } + }, + "children": [ + { + "id": 100, + "name": "decorators", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 499, + "character": 18 + } + ], + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "name": "Decorator" + } + ], + "name": "NodeArray" + } }, { - "id": 47, - "name": "includeJsDocComment", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "intrinsic", - "name": "boolean" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4861, - "character": 16 - } - ] - }, - { - "id": 63, - "name": "getText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 64, - "name": "getText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 65, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4868, - "character": 15 - } - ] - }, - { - "id": 52, - "name": "getWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 53, - "name": "getWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 54, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFileLike" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4864, - "character": 16 - } - ] - } - ], - "groups": [ - { - "title": "Properties", - "kind": 1024, - "children": [ - 27, - 31, - 26, - 25, - 28, - 29, - 30 - ] - }, - { - "title": "Methods", - "kind": 2048, - "children": [ - 72, - 37, - 34, - 41, - 50, - 66, - 48, - 60, - 55, - 69, - 57, - 32, - 44, - 63, - 52 - ] - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 496, - "character": 25 - }, - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4856, - "character": 18 - } - ], - "extendedTypes": [ - { - "type": "reference", - "name": "TextRange" - } - ] - }, - { - "id": 22, - "name": "a", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - }, - { - "id": 20, - "name": "default", - "kind": 64, - "kindString": "Function", - "flags": {}, - "signatures": [ - { - "id": 21, - "name": "default", - "kind": 4096, - "kindString": "Call signature", - "flags": {}, - "comment": { - "shortText": "Will not be re-exported from export.ts using export * from..." - }, - "type": { - "type": "intrinsic", - "name": "void" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 14, - "character": 31 - } - ] - } - ], - "groups": [ - { - "title": "Interfaces", - "kind": 256, - "children": [ - 24 - ] - }, - { - "title": "Variables", - "kind": 32, - "children": [ - 22 - ] - }, - { - "title": "Functions", - "kind": 64, - "children": [ - 20 - ] - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 1, - "character": 0 - } - ] - }, - { - "id": 84, - "name": "Node", - "kind": 256, - "kindString": "Interface", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 87, - "name": "decorators", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 499, - "character": 18 - } - ], - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "name": "Decorator" - } - ], - "name": "NodeArray" - } - }, - { - "id": 91, - "name": "end", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 73, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 31, - "name": "TextRange.end" - } - }, - { - "id": 86, - "name": "flags", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 498, - "character": 13 - } - ], - "type": { - "type": "reference", - "name": "NodeFlags" - } - }, - { - "id": 85, - "name": "kind", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 497, - "character": 12 - } - ], - "type": { - "type": "reference", - "name": "SyntaxKind" - } - }, - { - "id": 88, - "name": "modifiers", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 500, - "character": 17 - } - ], - "type": { - "type": "reference", - "name": "ModifiersArray" - } - }, - { - "id": 89, - "name": "parent", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 501, - "character": 14 - } - ], - "type": { - "type": "reference", - "id": 24, - "name": "Node" - } - }, - { - "id": 90, - "name": "pos", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 72, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 30, - "name": "TextRange.pos" - } - }, - { - "id": 132, - "name": "forEachChild", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 133, - "name": "forEachChild", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "typeParameter": [ - { - "id": 134, - "name": "T", - "kind": 131072, - "kindString": "Type parameter", - "flags": { - "isExported": true - } - } - ], - "parameters": [ - { - "id": 135, - "name": "cbNode", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 136, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 137, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { + "id": 104, + "name": "end", + "kind": 1024, + "kindString": "Property", + "flags": { "isExported": true - }, - "parameters": [ - { - "id": 138, - "name": "node", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "id": 24, - "name": "Node" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 73, + "character": 11 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 38, + "name": "TextRange.end" } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 31 + }, + { + "id": 99, + "name": "flags", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 498, + "character": 13 + } + ], + "type": { + "type": "reference", + "name": "NodeFlags" } - ] - } - } - }, - { - "id": 139, - "name": "cbNodeArray", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 140, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 141, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { + }, + { + "id": 98, + "name": "kind", + "kind": 1024, + "kindString": "Property", + "flags": { "isExported": true - }, - "parameters": [ - { - "id": 142, - "name": "nodes", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "id": 24, - "name": "Node" - } - ], - "name": "NodeArray" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 497, + "character": 12 + } + ], + "type": { + "type": "reference", + "name": "SyntaxKind" } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 76 + }, + { + "id": 101, + "name": "modifiers", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 500, + "character": 17 + } + ], + "type": { + "type": "reference", + "name": "ModifiersArray" } - ] - } - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 20 - } - ] - }, - { - "id": 97, - "name": "getChildAt", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 98, - "name": "getChildAt", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 99, - "name": "index", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, - { - "id": 100, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "reference", - "id": 24, - "name": "Node" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4859, - "character": 18 - } - ] - }, - { - "id": 94, - "name": "getChildCount", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 95, - "name": "getChildCount", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 96, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4858, - "character": 21 - } - ] - }, - { - "id": 101, - "name": "getChildren", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 102, - "name": "getChildren", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 103, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "array", - "elementType": { - "type": "reference", - "id": 24, - "name": "Node" - } - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4860, - "character": 19 - } - ] - }, - { - "id": 110, - "name": "getEnd", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 111, - "name": "getEnd", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4863, - "character": 14 - } - ] - }, - { - "id": 126, - "name": "getFirstToken", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ + }, + { + "id": 102, + "name": "parent", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 501, + "character": 14 + } + ], + "type": { + "type": "reference", + "id": 31, + "name": "Node" + } + }, + { + "id": 103, + "name": "pos", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 72, + "character": 11 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 37, + "name": "TextRange.pos" + } + }, + { + "id": 145, + "name": "forEachChild", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 146, + "name": "forEachChild", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "typeParameter": [ + { + "id": 147, + "name": "T", + "kind": 131072, + "kindString": "Type parameter", + "flags": { + "isExported": true + } + } + ], + "parameters": [ + { + "id": 148, + "name": "cbNode", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "reflection", + "declaration": { + "id": 149, + "name": "__type", + "kind": 65536, + "kindString": "Type literal", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 150, + "name": "__call", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 151, + "name": "node", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "reference", + "id": 31, + "name": "Node" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "typeParameter", + "name": "T" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4871, + "character": 31 + } + ] + } + } + }, + { + "id": 152, + "name": "cbNodeArray", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reflection", + "declaration": { + "id": 153, + "name": "__type", + "kind": 65536, + "kindString": "Type literal", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 154, + "name": "__call", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 155, + "name": "nodes", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "id": 31, + "name": "Node" + } + ], + "name": "NodeArray" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "typeParameter", + "name": "T" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4871, + "character": 76 + } + ] + } + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "typeParameter", + "name": "T" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4871, + "character": 20 + } + ] + }, + { + "id": 110, + "name": "getChildAt", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 111, + "name": "getChildAt", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 112, + "name": "index", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + }, + { + "id": 113, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "reference", + "id": 31, + "name": "Node" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4859, + "character": 18 + } + ] + }, + { + "id": 107, + "name": "getChildCount", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 108, + "name": "getChildCount", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 109, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4858, + "character": 21 + } + ] + }, + { + "id": 114, + "name": "getChildren", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 115, + "name": "getChildren", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 116, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "array", + "elementType": { + "type": "reference", + "id": 31, + "name": "Node" + } + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4860, + "character": 19 + } + ] + }, + { + "id": 123, + "name": "getEnd", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 124, + "name": "getEnd", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4863, + "character": 14 + } + ] + }, + { + "id": 139, + "name": "getFirstToken", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 140, + "name": "getFirstToken", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 141, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "reference", + "id": 31, + "name": "Node" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4869, + "character": 21 + } + ] + }, + { + "id": 121, + "name": "getFullStart", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 122, + "name": "getFullStart", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4862, + "character": 20 + } + ] + }, + { + "id": 133, + "name": "getFullText", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 134, + "name": "getFullText", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 135, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "string" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4867, + "character": 19 + } + ] + }, + { + "id": 128, + "name": "getFullWidth", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 129, + "name": "getFullWidth", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4865, + "character": 20 + } + ] + }, + { + "id": 142, + "name": "getLastToken", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 143, + "name": "getLastToken", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 144, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "reference", + "id": 31, + "name": "Node" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4870, + "character": 20 + } + ] + }, + { + "id": 130, + "name": "getLeadingTriviaWidth", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 131, + "name": "getLeadingTriviaWidth", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 132, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4866, + "character": 29 + } + ] + }, + { + "id": 105, + "name": "getSourceFile", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 106, + "name": "getSourceFile", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4857, + "character": 21 + } + ] + }, + { + "id": 117, + "name": "getStart", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 118, + "name": "getStart", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 119, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + }, + { + "id": 120, + "name": "includeJsDocComment", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "intrinsic", + "name": "boolean" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4861, + "character": 16 + } + ] + }, + { + "id": 136, + "name": "getText", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 137, + "name": "getText", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 138, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "string" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4868, + "character": 15 + } + ] + }, + { + "id": 125, + "name": "getWidth", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 126, + "name": "getWidth", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 127, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFileLike" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4864, + "character": 16 + } + ] + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 100, + 104, + 99, + 98, + 101, + 102, + 103 + ] + }, + { + "title": "Methods", + "kind": 2048, + "children": [ + 145, + 110, + 107, + 114, + 123, + 139, + 121, + 133, + 128, + 142, + 130, + 105, + 117, + 136, + 125 + ] + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 496, + "character": 25 + }, + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4856, + "character": 18 + } + ], + "extendedTypes": [ + { + "type": "reference", + "name": "TextRange" + } + ] + }, { - "id": 127, - "name": "getFirstToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 128, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { + "id": 93, + "name": "a", + "kind": 32, + "kindString": "Variable", + "flags": { "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 24, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } + "isConst": true + }, + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 17, + "name": "add", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 18, + "name": "add", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 19, + "name": "x", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + }, + { + "id": 20, + "name": "y", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export.ts", + "line": 7, + "character": 12 + } ] - } - } - ], - "sources": [ + }, { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4869, - "character": 21 + "id": 12, + "name": "default", + "kind": 64, + "kindString": "Function", + "flags": {}, + "signatures": [ + { + "id": 13, + "name": "default", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "parameters": [ + { + "id": 14, + "name": "a", + "kind": 32768, + "kindString": "Parameter", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export.ts", + "line": 9, + "character": 1 + } + ] } - ] - }, - { - "id": 108, - "name": "getFullStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ + ], + "groups": [ { - "id": 109, - "name": "getFullStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ + "title": "References", + "kind": 16777216, + "children": [ + 21, + 90, + 94, + 15 + ] + }, { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4862, - "character": 20 - } - ] - }, - { - "id": 120, - "name": "getFullText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ + "title": "Interfaces", + "kind": 256, + "children": [ + 97 + ] + }, { - "id": 121, - "name": "getFullText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 122, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ + "title": "Variables", + "kind": 32, + "children": [ + 93 + ] + }, { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4867, - "character": 19 + "title": "Functions", + "kind": 64, + "children": [ + 17, + 12 + ] } - ] - }, - { - "id": 115, - "name": "getFullWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ + ], + "sources": [ { - "id": 116, - "name": "getFullWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } + "fileName": "dist/test/converter/exports/export.ts", + "line": 1, + "character": 0 } - ], - "sources": [ + ] + }, + { + "id": 1, + "name": "\"export-assignment\"", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/export-assignment.ts", + "sources": [ { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4865, - "character": 20 + "fileName": "dist/test/converter/exports/export-assignment.ts", + "line": 1, + "character": 0 } - ] - }, - { - "id": 129, - "name": "getLastToken", - "kind": 2048, - "kindString": "Method", - "flags": { + ] + }, + { + "id": 2, + "name": "\"export-default\"", + "kind": 1, + "kindString": "Module", + "flags": { "isExported": true - }, - "signatures": [ + }, + "originalName": "%BASE%/exports/export-default.ts", + "children": [ + { + "id": 3, + "name": "default", + "kind": 16777216, + "kindString": "Reference", + "flags": { + "isExported": true + }, + "children": [ + { + "id": 4, + "name": "x", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/export-default.ts", + "line": 1, + "character": 7 + } + ], + "type": { + "type": "unknown", + "name": "5" + }, + "defaultValue": "5" + } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 4 + ] + } + ], + "target": 4 + } + ], + "groups": [ + { + "title": "References", + "kind": 16777216, + "children": [ + 3 + ] + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export-default.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 5, + "name": "\"export-with-local\"", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/export-with-local.ts", + "children": [ { - "id": 130, - "name": "getLastToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 131, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { + "id": 10, + "name": "x", + "kind": 32, + "kindString": "Variable", + "flags": { "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 24, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } + "isConst": true + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/export-with-local.ts", + "line": 1, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "5" + }, + "defaultValue": "5" + }, + { + "id": 6, + "name": "add", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 7, + "name": "add", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 8, + "name": "x", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + }, + { + "id": 9, + "name": "y", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export-with-local.ts", + "line": 3, + "character": 19 + } + ] + } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 10 + ] + }, + { + "title": "Functions", + "kind": 64, + "children": [ + 6 + ] + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export-with-local.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 156, + "name": "\"mod\"", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/mod.ts", + "children": [ + { + "id": 160, + "name": "b", + "kind": 16777216, + "kindString": "Reference", + "flags": { + "isExported": true + }, + "children": [ + { + "id": 161, + "name": "a", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 161 + ] + } + ], + "target": 16 + }, + { + "id": 162, + "name": "c", + "kind": 16777216, + "kindString": "Reference", + "flags": { + "isExported": true + }, + "children": [ + { + "id": 163, + "name": "a", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 163 + ] + } + ], + "target": 16 + }, + { + "id": 165, + "name": "Node", + "kind": 256, + "kindString": "Interface", + "flags": { + "isExported": true + }, + "children": [ + { + "id": 168, + "name": "decorators", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 499, + "character": 18 + } + ], + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "name": "Decorator" + } + ], + "name": "NodeArray" + } + }, + { + "id": 172, + "name": "end", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 73, + "character": 11 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 38, + "name": "TextRange.end" + } + }, + { + "id": 167, + "name": "flags", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 498, + "character": 13 + } + ], + "type": { + "type": "reference", + "name": "NodeFlags" + } + }, + { + "id": 166, + "name": "kind", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 497, + "character": 12 + } + ], + "type": { + "type": "reference", + "name": "SyntaxKind" + } + }, + { + "id": 169, + "name": "modifiers", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 500, + "character": 17 + } + ], + "type": { + "type": "reference", + "name": "ModifiersArray" + } + }, + { + "id": 170, + "name": "parent", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 501, + "character": 14 + } + ], + "type": { + "type": "reference", + "id": 31, + "name": "Node" + } + }, + { + "id": 171, + "name": "pos", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 72, + "character": 11 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 37, + "name": "TextRange.pos" + } + }, + { + "id": 213, + "name": "forEachChild", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 214, + "name": "forEachChild", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "typeParameter": [ + { + "id": 215, + "name": "T", + "kind": 131072, + "kindString": "Type parameter", + "flags": { + "isExported": true + } + } + ], + "parameters": [ + { + "id": 216, + "name": "cbNode", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "reflection", + "declaration": { + "id": 217, + "name": "__type", + "kind": 65536, + "kindString": "Type literal", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 218, + "name": "__call", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 219, + "name": "node", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "reference", + "id": 31, + "name": "Node" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "typeParameter", + "name": "T" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4871, + "character": 31 + } + ] + } + } + }, + { + "id": 220, + "name": "cbNodeArray", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reflection", + "declaration": { + "id": 221, + "name": "__type", + "kind": 65536, + "kindString": "Type literal", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 222, + "name": "__call", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 223, + "name": "nodes", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "id": 31, + "name": "Node" + } + ], + "name": "NodeArray" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "typeParameter", + "name": "T" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4871, + "character": 76 + } + ] + } + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "typeParameter", + "name": "T" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4871, + "character": 20 + } + ] + }, + { + "id": 178, + "name": "getChildAt", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 179, + "name": "getChildAt", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 180, + "name": "index", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + }, + { + "id": 181, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "reference", + "id": 31, + "name": "Node" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4859, + "character": 18 + } + ] + }, + { + "id": 175, + "name": "getChildCount", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 176, + "name": "getChildCount", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 177, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4858, + "character": 21 + } + ] + }, + { + "id": 182, + "name": "getChildren", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 183, + "name": "getChildren", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 184, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "array", + "elementType": { + "type": "reference", + "id": 31, + "name": "Node" + } + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4860, + "character": 19 + } + ] + }, + { + "id": 191, + "name": "getEnd", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 192, + "name": "getEnd", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4863, + "character": 14 + } + ] + }, + { + "id": 207, + "name": "getFirstToken", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 208, + "name": "getFirstToken", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 209, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "reference", + "id": 31, + "name": "Node" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4869, + "character": 21 + } + ] + }, + { + "id": 189, + "name": "getFullStart", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 190, + "name": "getFullStart", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4862, + "character": 20 + } + ] + }, + { + "id": 201, + "name": "getFullText", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 202, + "name": "getFullText", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 203, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "string" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4867, + "character": 19 + } + ] + }, + { + "id": 196, + "name": "getFullWidth", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 197, + "name": "getFullWidth", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4865, + "character": 20 + } + ] + }, + { + "id": 210, + "name": "getLastToken", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 211, + "name": "getLastToken", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 212, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "union", + "types": [ + { + "type": "reference", + "id": 31, + "name": "Node" + }, + { + "type": "intrinsic", + "name": "undefined" + } + ] + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4870, + "character": 20 + } + ] + }, + { + "id": 198, + "name": "getLeadingTriviaWidth", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 199, + "name": "getLeadingTriviaWidth", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 200, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4866, + "character": 29 + } + ] + }, + { + "id": 173, + "name": "getSourceFile", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 174, + "name": "getSourceFile", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4857, + "character": 21 + } + ] + }, + { + "id": 185, + "name": "getStart", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 186, + "name": "getStart", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 187, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + }, + { + "id": 188, + "name": "includeJsDocComment", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "intrinsic", + "name": "boolean" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4861, + "character": 16 + } + ] + }, + { + "id": 204, + "name": "getText", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 205, + "name": "getText", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 206, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFile" + } + } + ], + "type": { + "type": "intrinsic", + "name": "string" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4868, + "character": 15 + } + ] + }, + { + "id": 193, + "name": "getWidth", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 194, + "name": "getWidth", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 195, + "name": "sourceFile", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true, + "isOptional": true + }, + "type": { + "type": "reference", + "name": "SourceFileLike" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4864, + "character": 16 + } + ] + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 168, + 172, + 167, + 166, + 169, + 170, + 171 + ] + }, + { + "title": "Methods", + "kind": 2048, + "children": [ + 213, + 178, + 175, + 182, + 191, + 207, + 189, + 201, + 196, + 210, + 198, + 173, + 185, + 204, + 193 + ] + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 496, + "character": 25 + }, + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 4856, + "character": 18 + } + ], + "extendedTypes": [ + { + "type": "reference", + "name": "TextRange" + } ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4870, - "character": 20 - } - ] - }, - { - "id": 117, - "name": "getLeadingTriviaWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 118, - "name": "getLeadingTriviaWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 119, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4866, - "character": 29 - } - ] - }, - { - "id": 92, - "name": "getSourceFile", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 93, - "name": "getSourceFile", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4857, - "character": 21 - } - ] - }, - { - "id": 104, - "name": "getStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ + }, { - "id": 105, - "name": "getStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 106, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { + "id": 159, + "name": "a", + "kind": 32, + "kindString": "Variable", + "flags": { "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } + "isConst": true }, - { - "id": 107, - "name": "includeJsDocComment", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "intrinsic", - "name": "boolean" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4861, - "character": 16 - } - ] - }, - { - "id": 123, - "name": "getText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 124, - "name": "getText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 125, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4868, - "character": 15 - } - ] - }, - { - "id": 112, - "name": "getWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 113, - "name": "getWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 114, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFileLike" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4864, - "character": 16 - } - ] - } - ], - "groups": [ - { - "title": "Properties", - "kind": 1024, - "children": [ - 87, - 91, - 86, - 85, - 88, - 89, - 90 - ] - }, - { - "title": "Methods", - "kind": 2048, - "children": [ - 132, - 97, - 94, - 101, - 110, - 126, - 108, - 120, - 115, - 129, - 117, - 92, - 104, - 123, - 112 - ] - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 496, - "character": 25 - }, - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4856, - "character": 18 - } - ], - "extendedTypes": [ - { - "type": "reference", - "name": "TextRange" - } - ] - }, - { - "id": 14, - "name": "a", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - }, - { - "id": 15, - "name": "add", - "kind": 64, - "kindString": "Function", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 16, - "name": "add", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 17, - "name": "x", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, - { - "id": 18, - "name": "y", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export.ts", - "line": 7, - "character": 12 - } - ] - }, - { - "id": 11, - "name": "default", - "kind": 64, - "kindString": "Function", - "flags": {}, - "comment": { - "shortText": "Will not be re-exported from export.ts using export * from..." - }, - "signatures": [ - { - "id": 12, - "name": "default", - "kind": 4096, - "kindString": "Call signature", - "flags": {}, - "comment": { - "shortText": "Will not be re-exported from export.ts using export * from..." - }, - "parameters": [ - { - "id": 13, - "name": "a", - "kind": 32768, - "kindString": "Parameter", - "flags": {}, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "type": { - "type": "intrinsic", - "name": "void" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export.ts", - "line": 9, - "character": 1 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 14, - "character": 31 - } - ] - } - ], - "groups": [ - { - "title": "Modules", - "kind": 1, - "children": [ - 19 - ] - }, - { - "title": "Interfaces", - "kind": 256, - "children": [ - 84 - ] - }, - { - "title": "Variables", - "kind": 32, - "children": [ - 14 - ] - }, - { - "title": "Functions", - "kind": 64, - "children": [ - 15, - 11 - ] - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export.ts", - "line": 1, - "character": 0 - } - ] - }, - { - "id": 1, - "name": "\"export-assignment\"", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true - }, - "originalName": "%BASE%/exports/export-assignment.ts", - "sources": [ - { - "fileName": "dist/test/converter/exports/export-assignment.ts", - "line": 1, - "character": 0 - } - ] - }, - { - "id": 2, - "name": "\"export-default\"", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true - }, - "originalName": "%BASE%/exports/export-default.ts", - "children": [ - { - "id": 3, - "name": "x", - "kind": 32, - "kindString": "Variable", - "flags": { - "isConst": true - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/export-default.ts", - "line": 1, - "character": 7 - } - ], - "type": { - "type": "unknown", - "name": "5" - }, - "defaultValue": "5" - } - ], - "groups": [ - { - "title": "Variables", - "kind": 32, - "children": [ - 3 - ] - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export-default.ts", - "line": 1, - "character": 0 - } - ] - }, - { - "id": 4, - "name": "\"export-with-local\"", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true - }, - "originalName": "%BASE%/exports/export-with-local.ts", - "children": [ - { - "id": 9, - "name": "x", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/export-with-local.ts", - "line": 1, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "5" - }, - "defaultValue": "5" - }, - { - "id": 5, - "name": "add", - "kind": 64, - "kindString": "Function", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 6, - "name": "add", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 7, - "name": "x", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" }, { - "id": 8, - "name": "y", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export-with-local.ts", - "line": 3, - "character": 19 - } - ] - } - ], - "groups": [ - { - "title": "Variables", - "kind": 32, - "children": [ - 9 - ] - }, - { - "title": "Functions", - "kind": 64, - "children": [ - 5 - ] - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export-with-local.ts", - "line": 1, - "character": 0 - } - ] - }, - { - "id": 143, - "name": "\"mod\"", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true - }, - "originalName": "%BASE%/exports/mod.ts", - "children": [ - { - "id": 148, - "name": "Node", - "kind": 256, - "kindString": "Interface", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 151, - "name": "decorators", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 499, - "character": 18 - } - ], - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "name": "Decorator" - } - ], - "name": "NodeArray" - } - }, - { - "id": 155, - "name": "end", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 73, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 31, - "name": "TextRange.end" - } - }, - { - "id": 150, - "name": "flags", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 498, - "character": 13 - } - ], - "type": { - "type": "reference", - "name": "NodeFlags" - } - }, - { - "id": 149, - "name": "kind", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 497, - "character": 12 - } - ], - "type": { - "type": "reference", - "name": "SyntaxKind" - } - }, - { - "id": 152, - "name": "modifiers", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 500, - "character": 17 - } - ], - "type": { - "type": "reference", - "name": "ModifiersArray" - } - }, - { - "id": 153, - "name": "parent", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 501, - "character": 14 - } - ], - "type": { - "type": "reference", - "id": 24, - "name": "Node" - } - }, - { - "id": 154, - "name": "pos", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 72, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 30, - "name": "TextRange.pos" - } - }, - { - "id": 196, - "name": "forEachChild", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 197, - "name": "forEachChild", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "typeParameter": [ - { - "id": 198, - "name": "T", - "kind": 131072, - "kindString": "Type parameter", - "flags": { - "isExported": true - } - } - ], - "parameters": [ - { - "id": 199, - "name": "cbNode", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 200, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 201, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 202, - "name": "node", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "id": 24, - "name": "Node" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 31 + "id": 157, + "name": "default", + "kind": 64, + "kindString": "Function", + "flags": {}, + "signatures": [ + { + "id": 158, + "name": "default", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "comment": { + "shortText": "Will not be re-exported from export.ts using export * from..." + }, + "type": { + "type": "intrinsic", + "name": "void" } - ] } - } - }, - { - "id": 203, - "name": "cbNodeArray", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 204, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 205, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 206, - "name": "nodes", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "id": 24, - "name": "Node" - } - ], - "name": "NodeArray" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 76 - } - ] + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 14, + "character": 31 } - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 20 - } - ] - }, - { - "id": 161, - "name": "getChildAt", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 162, - "name": "getChildAt", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 163, - "name": "index", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, - { - "id": 164, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "reference", - "id": 24, - "name": "Node" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4859, - "character": 18 - } - ] - }, - { - "id": 158, - "name": "getChildCount", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 159, - "name": "getChildCount", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 160, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } } - ], - "sources": [ + ], + "groups": [ { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4858, - "character": 21 - } - ] - }, - { - "id": 165, - "name": "getChildren", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 166, - "name": "getChildren", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 167, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "array", - "elementType": { - "type": "reference", - "id": 24, - "name": "Node" - } - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4860, - "character": 19 - } - ] - }, - { - "id": 174, - "name": "getEnd", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 175, - "name": "getEnd", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4863, - "character": 14 - } - ] - }, - { - "id": 190, - "name": "getFirstToken", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 191, - "name": "getFirstToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 192, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 24, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } + "title": "References", + "kind": 16777216, + "children": [ + 160, + 162 ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4869, - "character": 21 - } - ] - }, - { - "id": 172, - "name": "getFullStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 173, - "name": "getFullStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4862, - "character": 20 - } - ] - }, - { - "id": 184, - "name": "getFullText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 185, - "name": "getFullText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 186, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4867, - "character": 19 - } - ] - }, - { - "id": 179, - "name": "getFullWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 180, - "name": "getFullWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4865, - "character": 20 - } - ] - }, - { - "id": 193, - "name": "getLastToken", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ + }, { - "id": 194, - "name": "getLastToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 195, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 24, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } + "title": "Interfaces", + "kind": 256, + "children": [ + 165 ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4870, - "character": 20 - } - ] - }, - { - "id": 181, - "name": "getLeadingTriviaWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 182, - "name": "getLeadingTriviaWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 183, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4866, - "character": 29 - } - ] - }, - { - "id": 156, - "name": "getSourceFile", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 157, - "name": "getSourceFile", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4857, - "character": 21 - } - ] - }, - { - "id": 168, - "name": "getStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 169, - "name": "getStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 170, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - }, - { - "id": 171, - "name": "includeJsDocComment", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "intrinsic", - "name": "boolean" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4861, - "character": 16 - } - ] - }, - { - "id": 187, - "name": "getText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 188, - "name": "getText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 189, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ + }, { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4868, - "character": 15 - } - ] - }, - { - "id": 176, - "name": "getWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ + "title": "Variables", + "kind": 32, + "children": [ + 159 + ] + }, { - "id": 177, - "name": "getWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 178, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFileLike" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } + "title": "Functions", + "kind": 64, + "children": [ + 157 + ] } - ], - "sources": [ + ], + "sources": [ { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4864, - "character": 16 + "fileName": "dist/test/converter/exports/mod.ts", + "line": 1, + "character": 0 } - ] - } - ], - "groups": [ - { - "title": "Properties", - "kind": 1024, - "children": [ - 151, - 155, - 150, - 149, - 152, - 153, - 154 - ] - }, - { - "title": "Methods", - "kind": 2048, - "children": [ - 196, - 161, - 158, - 165, - 174, - 190, - 172, - 184, - 179, - 193, - 181, - 156, - 168, - 187, - 176 - ] - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 496, - "character": 25 - }, - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4856, - "character": 18 - } - ], - "extendedTypes": [ - { - "type": "reference", - "name": "TextRange" - } - ] - }, - { - "id": 146, - "name": "a", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - }, - { - "id": 144, - "name": "default", - "kind": 64, - "kindString": "Function", - "flags": {}, - "signatures": [ - { - "id": 145, - "name": "default", - "kind": 4096, - "kindString": "Call signature", - "flags": {}, - "comment": { - "shortText": "Will not be re-exported from export.ts using export * from..." - }, - "type": { - "type": "intrinsic", - "name": "void" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 14, - "character": 31 - } - ] - } - ], - "groups": [ - { - "title": "Interfaces", - "kind": 256, - "children": [ - 148 - ] - }, - { - "title": "Variables", - "kind": 32, - "children": [ - 146 - ] - }, - { - "title": "Functions", - "kind": 64, - "children": [ - 144 - ] + ] } - ], - "sources": [ + ], + "groups": [ { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 1, - "character": 0 + "title": "Modules", + "kind": 1, + "children": [ + 11, + 1, + 2, + 5, + 156 + ] } - ] - } - ], - "groups": [ - { - "title": "Modules", - "kind": 1, - "children": [ - 10, - 1, - 2, - 4, - 143 - ] - } - ] -} \ No newline at end of file + ] +} From 754ec6ec327945593f63fc7fae9082e4bbd6bc3e Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Tue, 4 Feb 2020 16:08:47 +0100 Subject: [PATCH 03/28] [module naming] fix remaining index.d after module naming. Remove useless modules double quotes --- .../converter/plugins/DynamicModulePlugin.ts | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/lib/converter/plugins/DynamicModulePlugin.ts b/src/lib/converter/plugins/DynamicModulePlugin.ts index 07a3ca8b6..430e85791 100644 --- a/src/lib/converter/plugins/DynamicModulePlugin.ts +++ b/src/lib/converter/plugins/DynamicModulePlugin.ts @@ -23,6 +23,9 @@ export class DynamicModulePlugin extends ConverterComponent { */ private reflections!: Reflection[]; + private hiddenExtension = ['.ts', '.d']; + private hiddenPathPart = ['/index', '/lib', '/src']; + /** * Create a new DynamicModuleHandler instance. */ @@ -72,8 +75,24 @@ export class DynamicModulePlugin extends ConverterComponent { private onBeginResolve(context: Context) { this.reflections.forEach((reflection) => { let name = reflection.name.replace(/"/g, ''); - name = name.substr(0, name.length - Path.extname(name).length); - reflection.name = '"' + this.basePath.trim(name) + '"'; + + const currentExtension = Path.extname(name); + const hiddenExtensions = (this.hiddenExtension.includes(currentExtension)) ? + this.hiddenExtension : [currentExtension, ...this.hiddenExtension]; + + hiddenExtensions.forEach((extension) => { + if (name.endsWith(extension)) { + name = name.substr(0, name.length - extension.length); + } + }); + + this.hiddenPathPart.forEach((pathPart) => { + if (name.endsWith(pathPart)) { + name = name.substr(0, name.length - pathPart.length); + } + }); + + reflection.name = this.basePath.trim(name); }); } } From fd02c12a1ac24cddd879f18608e01b34671293b1 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Tue, 4 Feb 2020 16:17:48 +0100 Subject: [PATCH 04/28] update declaration ".d" removal unit test --- src/test/converter/declaration/specs.d.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/converter/declaration/specs.d.json b/src/test/converter/declaration/specs.d.json index 43dc46084..729670c57 100644 --- a/src/test/converter/declaration/specs.d.json +++ b/src/test/converter/declaration/specs.d.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"declaration.d\"", + "name": "\"declaration\"", "kind": 1, "kindString": "Module", "flags": { @@ -109,7 +109,7 @@ }, { "id": 5, - "name": "\"export-declaration.d\"", + "name": "\"export-declaration\"", "kind": 1, "kindString": "Module", "flags": { @@ -179,4 +179,4 @@ ] } ] -} \ No newline at end of file +} From 4b48ba9c7bbc55b175c993ff5a3b999fa6985080 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Tue, 4 Feb 2020 16:33:27 +0100 Subject: [PATCH 05/28] update double quote removal in unit tests --- ...ateclass.html => access.privateclass.html} | 66 +++--- ....baseclass.html => classes.baseclass.html} | 168 ++++++------- ...icclass.html => classes.genericclass.html} | 106 ++++----- ...lclass.html => classes.internalclass.html} | 60 ++--- ...lass.html => classes.nongenericclass.html} | 128 +++++----- ....subclassa.html => classes.subclassa.html} | 224 +++++++++--------- ....subclassb.html => classes.subclassb.html} | 178 +++++++------- ... default_export.defaultexportedclass.html} | 58 ++--- ... default_export.notexportedclassname.html} | 58 ++--- ...ass.html => flattened.flattenedclass.html} | 90 +++---- .../{_mixin_.base.html => mixin.base.html} | 64 ++--- ...xin.html => mixin.someclasswithmixin.html} | 128 +++++----- ...ml => single_export.notexportedclass.html} | 56 ++--- ...=> single_export.singleexportedclass.html} | 56 ++--- ...ions.html => enumerations.directions.html} | 70 +++--- ...ions_.size.html => enumerations.size.html} | 70 +++--- src/test/renderer/specs/globals.html | 52 ++-- src/test/renderer/specs/index.html | 26 +- ...erface.html => classes.nameinterface.html} | 68 +++--- ...rface.html => classes.printinterface.html} | 56 ++--- ...e.html => classes.printnameinterface.html} | 84 +++---- .../{_generics_.a.html => generics.a.html} | 56 ++--- .../{_generics_.ab.html => generics.ab.html} | 80 +++---- ..._.abnumber.html => generics.abnumber.html} | 74 +++--- ..._.abstring.html => generics.abstring.html} | 74 +++--- .../{_generics_.b.html => generics.b.html} | 62 ++--- ....mixin1type.html => mixin.mixin1type.html} | 96 ++++---- ...{_mixin_.mixin2.html => mixin.mixin2.html} | 116 ++++----- .../modules/{_access_.html => access.html} | 64 ++--- ...emodule.html => access.privatemodule.html} | 38 +-- .../modules/{_classes_.html => classes.html} | 68 +++--- ...fault_export_.html => default_export.html} | 46 ++-- ...{_enumerations_.html => enumerations.html} | 40 ++-- .../{_flattened_.html => flattened.html} | 54 ++--- .../{_functions_.html => functions.html} | 124 +++++----- ...ion.html => functions.modulefunction.html} | 52 ++-- .../{_generics_.html => generics.html} | 78 +++--- .../modules/{_mixin_.html => mixin.html} | 102 ++++---- .../specs/modules/{_mod_.html => mod.html} | 44 ++-- .../specs/modules/{_mod2_.html => mod2.html} | 44 ++-- .../modules/{_modules_.html => modules.html} | 76 +++--- ...s_.mymodule.html => modules.mymodule.html} | 64 ++--- ...html => modules.mymodule.mysubmodule.html} | 48 ++-- ...single_export_.html => single_export.html} | 40 ++-- .../{_weird_names_.html => weird_names.html} | 42 ++-- 45 files changed, 1724 insertions(+), 1724 deletions(-) rename src/test/renderer/specs/classes/{_access_.privateclass.html => access.privateclass.html} (81%) rename src/test/renderer/specs/classes/{_classes_.baseclass.html => classes.baseclass.html} (73%) rename src/test/renderer/specs/classes/{_classes_.genericclass.html => classes.genericclass.html} (79%) rename src/test/renderer/specs/classes/{_classes_.internalclass.html => classes.internalclass.html} (81%) rename src/test/renderer/specs/classes/{_classes_.nongenericclass.html => classes.nongenericclass.html} (70%) rename src/test/renderer/specs/classes/{_classes_.subclassa.html => classes.subclassa.html} (71%) rename src/test/renderer/specs/classes/{_classes_.subclassb.html => classes.subclassb.html} (70%) rename src/test/renderer/specs/classes/{_default_export_.defaultexportedclass.html => default_export.defaultexportedclass.html} (81%) rename src/test/renderer/specs/classes/{_default_export_.notexportedclassname.html => default_export.notexportedclassname.html} (81%) rename src/test/renderer/specs/classes/{_flattened_.flattenedclass.html => flattened.flattenedclass.html} (86%) rename src/test/renderer/specs/classes/{_mixin_.base.html => mixin.base.html} (82%) rename src/test/renderer/specs/classes/{_mixin_.someclasswithmixin.html => mixin.someclasswithmixin.html} (69%) rename src/test/renderer/specs/classes/{_single_export_.notexportedclass.html => single_export.notexportedclass.html} (82%) rename src/test/renderer/specs/classes/{_single_export_.singleexportedclass.html => single_export.singleexportedclass.html} (82%) rename src/test/renderer/specs/enums/{_enumerations_.directions.html => enumerations.directions.html} (80%) rename src/test/renderer/specs/enums/{_enumerations_.size.html => enumerations.size.html} (80%) rename src/test/renderer/specs/interfaces/{_classes_.nameinterface.html => classes.nameinterface.html} (80%) rename src/test/renderer/specs/interfaces/{_classes_.printinterface.html => classes.printinterface.html} (83%) rename src/test/renderer/specs/interfaces/{_classes_.printnameinterface.html => classes.printnameinterface.html} (78%) rename src/test/renderer/specs/interfaces/{_generics_.a.html => generics.a.html} (83%) rename src/test/renderer/specs/interfaces/{_generics_.ab.html => generics.ab.html} (79%) rename src/test/renderer/specs/interfaces/{_generics_.abnumber.html => generics.abnumber.html} (80%) rename src/test/renderer/specs/interfaces/{_generics_.abstring.html => generics.abstring.html} (80%) rename src/test/renderer/specs/interfaces/{_generics_.b.html => generics.b.html} (83%) rename src/test/renderer/specs/interfaces/{_mixin_.mixin1type.html => mixin.mixin1type.html} (74%) rename src/test/renderer/specs/interfaces/{_mixin_.mixin2.html => mixin.mixin2.html} (72%) rename src/test/renderer/specs/modules/{_access_.html => access.html} (83%) rename src/test/renderer/specs/modules/{_access_.privatemodule.html => access.privatemodule.html} (87%) rename src/test/renderer/specs/modules/{_classes_.html => classes.html} (78%) rename src/test/renderer/specs/modules/{_default_export_.html => default_export.html} (83%) rename src/test/renderer/specs/modules/{_enumerations_.html => enumerations.html} (87%) rename src/test/renderer/specs/modules/{_flattened_.html => flattened.html} (90%) rename src/test/renderer/specs/modules/{_functions_.html => functions.html} (83%) rename src/test/renderer/specs/modules/{_functions_.modulefunction.html => functions.modulefunction.html} (86%) rename src/test/renderer/specs/modules/{_generics_.html => generics.html} (78%) rename src/test/renderer/specs/modules/{_mixin_.html => mixin.html} (80%) rename src/test/renderer/specs/modules/{_mod_.html => mod.html} (88%) rename src/test/renderer/specs/modules/{_mod2_.html => mod2.html} (88%) rename src/test/renderer/specs/modules/{_modules_.html => modules.html} (88%) rename src/test/renderer/specs/modules/{_modules_.mymodule.html => modules.mymodule.html} (83%) rename src/test/renderer/specs/modules/{_modules_.mymodule.mysubmodule.html => modules.mymodule.mysubmodule.html} (85%) rename src/test/renderer/specs/modules/{_single_export_.html => single_export.html} (86%) rename src/test/renderer/specs/modules/{_weird_names_.html => weird_names.html} (87%) diff --git a/src/test/renderer/specs/classes/_access_.privateclass.html b/src/test/renderer/specs/classes/access.privateclass.html similarity index 81% rename from src/test/renderer/specs/classes/_access_.privateclass.html rename to src/test/renderer/specs/classes/access.privateclass.html index 6c2a46487..afd950748 100644 --- a/src/test/renderer/specs/classes/_access_.privateclass.html +++ b/src/test/renderer/specs/classes/access.privateclass.html @@ -56,10 +56,10 @@ Globals
  • - "access" + access
  • - PrivateClass + PrivateClass

    • Class PrivateClass

    @@ -91,15 +91,15 @@

    Index

    Properties

    Methods

    @@ -113,7 +113,7 @@

    Private fakePrivateVa
    fakePrivateVariable: string
    @@ -128,7 +128,7 @@

    Protected fakeProtected<
    fakeProtectedVariable: string
    @@ -150,7 +150,7 @@

    Private fakePrivateFu
  • @@ -172,7 +172,7 @@

    Protected fakeProtected<
  • @@ -193,48 +193,48 @@

    Returns voidGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • @@ -243,35 +243,35 @@

    Returns void diff --git a/src/test/renderer/specs/classes/_classes_.baseclass.html b/src/test/renderer/specs/classes/classes.baseclass.html similarity index 73% rename from src/test/renderer/specs/classes/_classes_.baseclass.html rename to src/test/renderer/specs/classes/classes.baseclass.html index 66dd51afe..ba3756123 100644 --- a/src/test/renderer/specs/classes/_classes_.baseclass.html +++ b/src/test/renderer/specs/classes/classes.baseclass.html @@ -56,10 +56,10 @@ Globals

  • - "classes" + classes
  • - BaseClass + BaseClass

    • Class BaseClass

    @@ -84,10 +84,10 @@

    Hierarchy

    BaseClass @@ -96,7 +96,7 @@

    Hierarchy

    Implements

    @@ -106,30 +106,30 @@

    Index

    Constructors

    Properties

    Methods

    @@ -141,14 +141,14 @@

    Constructors

    constructor

    -

    Returns BaseClass

    +

    Returns BaseClass

  • Parameters

    -

    Returns BaseClass

    +

    Returns BaseClass

    • @@ -181,10 +181,10 @@

    Properties

    Private internalClass

    -
    internalClass: InternalClass<keyof BaseClass>
    +
    internalClass: InternalClass<keyof BaseClass>
    @@ -199,7 +199,7 @@

    Protected kind

    kind: number
    @@ -213,9 +213,9 @@

    Protected kind

    name

    name: string
    @@ -227,10 +227,10 @@

    name

    Static instance

    -
    instance: BaseClass
    +
    instance: BaseClass
    @@ -243,10 +243,10 @@

    Static instance

    Static instances

    -
    instances: BaseClass[]
    +
    instances: BaseClass[]
    @@ -263,7 +263,7 @@

    Abstract abstractMethod

    Returns void

    @@ -280,7 +280,7 @@

    arrowFunction

  • @@ -321,7 +321,7 @@

    Private checkName

  • @@ -342,9 +342,9 @@

    getName

    @@ -533,77 +533,77 @@

    Returns string diff --git a/src/test/renderer/specs/classes/_classes_.genericclass.html b/src/test/renderer/specs/classes/classes.genericclass.html similarity index 79% rename from src/test/renderer/specs/classes/_classes_.genericclass.html rename to src/test/renderer/specs/classes/classes.genericclass.html index a6dad41ff..8fb2ed0af 100644 --- a/src/test/renderer/specs/classes/_classes_.genericclass.html +++ b/src/test/renderer/specs/classes/classes.genericclass.html @@ -56,10 +56,10 @@ Globals

  • - "classes" + classes
  • - GenericClass + GenericClass

    • Class GenericClass<T>

    @@ -80,7 +80,7 @@

    Class GenericClass<T>

    Type parameters

    @@ -138,13 +138,13 @@

    Constructors

    constructor

      -
    • new GenericClass(p1: any, p2: T, p3: number, p4: number, p5: string): GenericClass
      • +
    • new GenericClass(p1: any, p2: T, p3: number, p4: number, p5: string): GenericClass
    -

    Returns GenericClass

    +

    Returns GenericClass

    @@ -208,7 +208,7 @@

    Protected p2

    p2: T
    @@ -223,7 +223,7 @@

    p3

    p3: number
    @@ -238,7 +238,7 @@

    Private p4

    p4: number
    @@ -253,7 +253,7 @@

    p5

    p5: string
    @@ -268,7 +268,7 @@

    value

    value: T
    @@ -285,7 +285,7 @@

    getValue

  • Returns T

    @@ -302,7 +302,7 @@

    setValue

  • @@ -312,7 +312,7 @@

    Parameters

  • value: T
    -

    getValue is the counterpart.

    +

    getValue is the counterpart.

    • @@ -329,104 +329,104 @@

    Returns voidGlobals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/classes/_classes_.internalclass.html b/src/test/renderer/specs/classes/classes.internalclass.html similarity index 81% rename from src/test/renderer/specs/classes/_classes_.internalclass.html rename to src/test/renderer/specs/classes/classes.internalclass.html index 4ff47dd12..0e31d0cb1 100644 --- a/src/test/renderer/specs/classes/_classes_.internalclass.html +++ b/src/test/renderer/specs/classes/classes.internalclass.html @@ -56,10 +56,10 @@ Globals
  • - "classes" + classes
  • - InternalClass + InternalClass

    • Class InternalClass<TTT>

    @@ -80,7 +80,7 @@

    Class InternalClass<TTT>

    Type parameters

    @@ -99,7 +99,7 @@

    Index

    Constructors

    @@ -111,13 +111,13 @@

    Constructors

    constructor

    @@ -144,83 +144,83 @@

    Returns Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/classes/_classes_.nongenericclass.html b/src/test/renderer/specs/classes/classes.nongenericclass.html similarity index 70% rename from src/test/renderer/specs/classes/_classes_.nongenericclass.html rename to src/test/renderer/specs/classes/classes.nongenericclass.html index ed162ff6b..6871906ca 100644 --- a/src/test/renderer/specs/classes/_classes_.nongenericclass.html +++ b/src/test/renderer/specs/classes/classes.nongenericclass.html @@ -56,10 +56,10 @@ Globals
  • - "classes" + classes
  • - NonGenericClass + NonGenericClass

    • Class NonGenericClass

    @@ -72,7 +72,7 @@

    Class NonGenericClass

    -

    This a non generic class derived from a generic class.

    +

    This a non generic class derived from a generic class.

    @@ -80,7 +80,7 @@

    Class NonGenericClass

    Hierarchy

    Class SubClassA

    @@ -82,7 +82,7 @@

    Class SubClassA

    Hierarchy

    diff --git a/src/test/renderer/specs/classes/_default_export_.notexportedclassname.html b/src/test/renderer/specs/classes/default_export.notexportedclassname.html similarity index 81% rename from src/test/renderer/specs/classes/_default_export_.notexportedclassname.html rename to src/test/renderer/specs/classes/default_export.notexportedclassname.html index d2e9f44b5..d103e0c99 100644 --- a/src/test/renderer/specs/classes/_default_export_.notexportedclassname.html +++ b/src/test/renderer/specs/classes/default_export.notexportedclassname.html @@ -56,10 +56,10 @@ Globals
  • - "default-export" + default-export
  • - NotExportedClassName + NotExportedClassName

    • Class NotExportedClassName

    @@ -93,19 +93,19 @@

    Index

    Constructors

    Properties

    Methods

    @@ -117,13 +117,13 @@

    Constructors

    constructor

    @@ -144,7 +144,7 @@

    notExportedProperty

    notExportedProperty: string
    @@ -166,7 +166,7 @@

    getNotExportedProperty

  • @@ -187,67 +187,67 @@

    Returns stringGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • @@ -114,13 +114,13 @@

    Constructors

    constructor

      -
    • new FlattenedClass(options: { anotherValue?: string; moreOptions?: { moreValues: number }; value?: string }): FlattenedClass
      • +
    • new FlattenedClass(options: { anotherValue?: string; moreOptions?: { moreValues: number }; value?: string }): FlattenedClass
    @@ -180,7 +180,7 @@

    callback

    callback: (param: number, optionalParam?: string) => string
    @@ -225,7 +225,7 @@

    indexed

    indexed: { test: string }
    @@ -259,10 +259,10 @@
    test:

    multipleCallSignatures

    -
    multipleCallSignatures: { (): number; (value: number): FlattenedClass }
    +
    multipleCallSignatures: { (): number; (value: number): FlattenedClass }
    @@ -281,7 +281,7 @@

    Type declaration

    • @@ -308,7 +308,7 @@
      value: number
    • -

    Returns FlattenedClass

    +

    Returns FlattenedClass

    The calling Foo.

    @@ -322,7 +322,7 @@

    options

    options: { anotherValue?: string; emptyObject: {}; moreOptions?: { moreValues: number }; value?: string }
    @@ -376,7 +376,7 @@

    singleCallSignature

    singleCallSignature: (...args: string[]) => () => string
    @@ -424,7 +424,7 @@

    unionAndFunction

    unionAndFunction: (() => 1) | 2
    @@ -442,43 +442,43 @@

    unionAndFunction

    Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • @@ -487,41 +487,41 @@

    unionAndFunction

    diff --git a/src/test/renderer/specs/classes/_mixin_.base.html b/src/test/renderer/specs/classes/mixin.base.html similarity index 82% rename from src/test/renderer/specs/classes/_mixin_.base.html rename to src/test/renderer/specs/classes/mixin.base.html index d28f5fa1a..335f3e018 100644 --- a/src/test/renderer/specs/classes/_mixin_.base.html +++ b/src/test/renderer/specs/classes/mixin.base.html @@ -56,10 +56,10 @@ Globals
  • - "mixin" + mixin
  • - Base + Base

    • Class Base

    @@ -91,13 +91,13 @@

    Index

    Properties

    Methods

    @@ -111,7 +111,7 @@

    baseProperty

    baseProperty: string = "init"
    @@ -128,7 +128,7 @@

    baseMethod

  • Returns number

    @@ -144,43 +144,43 @@

    Returns numberGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • @@ -189,47 +189,47 @@

    Returns number diff --git a/src/test/renderer/specs/classes/_mixin_.someclasswithmixin.html b/src/test/renderer/specs/classes/mixin.someclasswithmixin.html similarity index 69% rename from src/test/renderer/specs/classes/_mixin_.someclasswithmixin.html rename to src/test/renderer/specs/classes/mixin.someclasswithmixin.html index f30f2b94e..85266498b 100644 --- a/src/test/renderer/specs/classes/_mixin_.someclasswithmixin.html +++ b/src/test/renderer/specs/classes/mixin.someclasswithmixin.html @@ -56,10 +56,10 @@ Globals
  • - "mixin" + mixin
  • - SomeClassWithMixin + SomeClassWithMixin

    • Class SomeClassWithMixin

    @@ -80,7 +80,7 @@

    Class SomeClassWithMixin

    Hierarchy

    @@ -121,10 +121,10 @@

    Properties

    baseProperty

    baseProperty: string = "init"
    @@ -134,7 +134,7 @@

    classWithMixinProperty

    classWithMixinProperty: string = "init"
    @@ -143,10 +143,10 @@

    classWithMixinProperty

    property1

    property1: string = "init"
    @@ -155,9 +155,9 @@

    property1

    property2

    property2: string = "init"
    @@ -173,10 +173,10 @@

    baseMethod

    Class NotExportedClass

    @@ -91,19 +91,19 @@

    Index

    Constructors

    Properties

    Methods

    @@ -115,13 +115,13 @@

    Constructors

    constructor

    -

    Returns NotExportedClass

    +

    Returns NotExportedClass

    @@ -142,7 +142,7 @@

    notExportedProperty

    notExportedProperty: string
    @@ -164,7 +164,7 @@

    getNotExportedProperty

  • @@ -185,43 +185,43 @@

    Returns stringGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • @@ -230,23 +230,23 @@

    Returns string diff --git a/src/test/renderer/specs/classes/_single_export_.singleexportedclass.html b/src/test/renderer/specs/classes/single_export.singleexportedclass.html similarity index 82% rename from src/test/renderer/specs/classes/_single_export_.singleexportedclass.html rename to src/test/renderer/specs/classes/single_export.singleexportedclass.html index 6ffbb599a..2b8759dff 100644 --- a/src/test/renderer/specs/classes/_single_export_.singleexportedclass.html +++ b/src/test/renderer/specs/classes/single_export.singleexportedclass.html @@ -56,10 +56,10 @@ Globals
  • - "single-export" + single-export
  • - SingleExportedClass + SingleExportedClass

    • Class SingleExportedClass

    @@ -92,19 +92,19 @@

    Index

    Constructors

    Properties

    Methods

    @@ -116,13 +116,13 @@

    Constructors

    constructor

    -

    Returns SingleExportedClass

    +

    Returns SingleExportedClass

    @@ -143,7 +143,7 @@

    exportedProperty

    exportedProperty: string
    @@ -165,7 +165,7 @@

    getExportedProperty

  • @@ -186,64 +186,64 @@

    Returns stringGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • @@ -102,7 +102,7 @@

    Bottom

    Bottom:
    @@ -117,7 +117,7 @@

    Left

    Left:
    @@ -132,7 +132,7 @@

    Right

    Right:
    @@ -147,7 +147,7 @@

    Top

    Top:
    @@ -162,7 +162,7 @@

    TopLeft

    TopLeft: = Top | Left
    @@ -177,7 +177,7 @@

    TopRight

    TopRight: = Top | Right
    @@ -195,43 +195,43 @@

    TopRight

    Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • @@ -240,32 +240,32 @@

    TopRight

    diff --git a/src/test/renderer/specs/enums/_enumerations_.size.html b/src/test/renderer/specs/enums/enumerations.size.html similarity index 80% rename from src/test/renderer/specs/enums/_enumerations_.size.html rename to src/test/renderer/specs/enums/enumerations.size.html index 29f793652..bb2b2707e 100644 --- a/src/test/renderer/specs/enums/_enumerations_.size.html +++ b/src/test/renderer/specs/enums/enumerations.size.html @@ -56,10 +56,10 @@ Globals
  • - "enumerations" + enumerations
  • - Size + Size

    • Enumeration Size

    @@ -85,21 +85,21 @@

    Index

    Enumeration members

    Variables

    Functions

    @@ -113,7 +113,7 @@

    Large

    Large:
    @@ -128,7 +128,7 @@

    Medium

    Medium:
    @@ -143,7 +143,7 @@

    Small

    Small:
    @@ -158,10 +158,10 @@

    Variables

    Let defaultSize

    -
    defaultSize: Size = Size.Medium
    +
    defaultSize: Size = Size.Medium
    @@ -177,13 +177,13 @@

    Functions

    isSmall

      -
    • isSmall(value: Size): boolean
      • +
    • isSmall(value: Size): boolean
    diff --git a/src/test/renderer/specs/index.html b/src/test/renderer/specs/index.html index 30aa29265..a4bbde6c4 100644 --- a/src/test/renderer/specs/index.html +++ b/src/test/renderer/specs/index.html @@ -123,43 +123,43 @@

    Repeated Heading

    Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/interfaces/_classes_.nameinterface.html b/src/test/renderer/specs/interfaces/classes.nameinterface.html similarity index 80% rename from src/test/renderer/specs/interfaces/_classes_.nameinterface.html rename to src/test/renderer/specs/interfaces/classes.nameinterface.html index b6ba2dec9..95c757294 100644 --- a/src/test/renderer/specs/interfaces/_classes_.nameinterface.html +++ b/src/test/renderer/specs/interfaces/classes.nameinterface.html @@ -56,10 +56,10 @@ Globals
  • - "classes" + classes
  • - NameInterface + NameInterface

    • Interface NameInterface

    @@ -83,7 +83,7 @@

    Hierarchy

    NameInterface @@ -92,9 +92,9 @@

    Hierarchy

    Implemented by

    @@ -104,13 +104,13 @@

    Index

    Properties

    Methods

    @@ -124,7 +124,7 @@

    name

    name: string
    @@ -147,7 +147,7 @@

    getName

  • @@ -169,86 +169,86 @@

    Returns stringGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/interfaces/_classes_.printinterface.html b/src/test/renderer/specs/interfaces/classes.printinterface.html similarity index 83% rename from src/test/renderer/specs/interfaces/_classes_.printinterface.html rename to src/test/renderer/specs/interfaces/classes.printinterface.html index eb0b14842..d6ace832e 100644 --- a/src/test/renderer/specs/interfaces/_classes_.printinterface.html +++ b/src/test/renderer/specs/interfaces/classes.printinterface.html @@ -56,10 +56,10 @@ Globals
  • - "classes" + classes
  • - PrintInterface + PrintInterface

    • Interface PrintInterface

    @@ -83,7 +83,7 @@

    Hierarchy

    PrintInterface @@ -96,7 +96,7 @@

    Index

    Methods

    @@ -114,7 +114,7 @@

    print

  • @@ -142,83 +142,83 @@

    Returns voidGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/interfaces/_classes_.printnameinterface.html b/src/test/renderer/specs/interfaces/classes.printnameinterface.html similarity index 78% rename from src/test/renderer/specs/interfaces/_classes_.printnameinterface.html rename to src/test/renderer/specs/interfaces/classes.printnameinterface.html index b7dc763e6..707914c6b 100644 --- a/src/test/renderer/specs/interfaces/_classes_.printnameinterface.html +++ b/src/test/renderer/specs/interfaces/classes.printnameinterface.html @@ -56,10 +56,10 @@ Globals
  • - "classes" + classes
  • - PrintNameInterface + PrintNameInterface

    • Interface PrintNameInterface

    @@ -80,10 +80,10 @@

    Interface PrintNameInterface

    Hierarchy

    @@ -126,9 +126,9 @@

    Properties

    name

    name: string
    @@ -150,9 +150,9 @@

    getName

    @@ -127,7 +127,7 @@

    getT

  • @@ -149,43 +149,43 @@

    Returns T< Globals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • @@ -194,38 +194,38 @@

    Returns T< diff --git a/src/test/renderer/specs/interfaces/_generics_.ab.html b/src/test/renderer/specs/interfaces/generics.ab.html similarity index 79% rename from src/test/renderer/specs/interfaces/_generics_.ab.html rename to src/test/renderer/specs/interfaces/generics.ab.html index 183c2be7e..4ea1fbba3 100644 --- a/src/test/renderer/specs/interfaces/_generics_.ab.html +++ b/src/test/renderer/specs/interfaces/generics.ab.html @@ -56,10 +56,10 @@ Globals
  • - "generics" + generics
  • - AB + AB

    • Interface AB<T>

    @@ -94,19 +94,19 @@

    T

    Hierarchy

    @@ -140,9 +140,9 @@

    getC

    @@ -136,7 +136,7 @@

    getC

  • @@ -159,7 +159,7 @@

    setT

  • @@ -189,86 +189,86 @@

    Returns voidGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/interfaces/_mixin_.mixin1type.html b/src/test/renderer/specs/interfaces/mixin.mixin1type.html similarity index 74% rename from src/test/renderer/specs/interfaces/_mixin_.mixin1type.html rename to src/test/renderer/specs/interfaces/mixin.mixin1type.html index 01a7c6ee9..cce2ee655 100644 --- a/src/test/renderer/specs/interfaces/_mixin_.mixin1type.html +++ b/src/test/renderer/specs/interfaces/mixin.mixin1type.html @@ -56,10 +56,10 @@ Globals
  • - "mixin" + mixin
  • - Mixin1Type + Mixin1Type

    • Interface Mixin1Type

    @@ -80,7 +80,7 @@

    Interface Mixin1Type

    Hierarchy

    @@ -117,10 +117,10 @@

    Properties

    baseProperty

    baseProperty: string = "init"
    @@ -129,9 +129,9 @@

    baseProperty

    property1

    property1: string = "init"
    @@ -147,10 +147,10 @@

    baseMethod

    diff --git a/src/test/renderer/specs/interfaces/_mixin_.mixin2.html b/src/test/renderer/specs/interfaces/mixin.mixin2.html similarity index 72% rename from src/test/renderer/specs/interfaces/_mixin_.mixin2.html rename to src/test/renderer/specs/interfaces/mixin.mixin2.html index 6614c2f83..916fac449 100644 --- a/src/test/renderer/specs/interfaces/_mixin_.mixin2.html +++ b/src/test/renderer/specs/interfaces/mixin.mixin2.html @@ -56,10 +56,10 @@ Globals
  • - "mixin" + mixin
  • - Mixin2 + Mixin2

    • Interface Mixin2

    @@ -80,7 +80,7 @@

    Interface Mixin2

    Hierarchy

    @@ -119,10 +119,10 @@

    Properties

    baseProperty

    baseProperty: string = "init"
    @@ -131,10 +131,10 @@

    baseProperty

    property1

    property1: string = "init"
    @@ -143,9 +143,9 @@

    property1

    property2

    property2: string = "init"
    @@ -161,10 +161,10 @@

    baseMethod

    -

    Module "access"

    +

    Module access

    @@ -73,27 +73,27 @@

    Index

    Namespaces

    Classes

    Variables

    Functions

    @@ -107,7 +107,7 @@

    Private fakePrivateVa
    fakePrivateVariable: string = "test"
    @@ -122,7 +122,7 @@

    Protected fakeProtectedVariable: string = "test"

    @@ -144,7 +144,7 @@

    Private fakePrivateFu
  • @@ -166,7 +166,7 @@

    Protected fakeProtected<
  • @@ -187,67 +187,67 @@

    Returns voidGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_access_.privatemodule.html b/src/test/renderer/specs/modules/access.privatemodule.html similarity index 87% rename from src/test/renderer/specs/modules/_access_.privatemodule.html rename to src/test/renderer/specs/modules/access.privatemodule.html index 3dc788a50..abbb4c9d4 100644 --- a/src/test/renderer/specs/modules/_access_.privatemodule.html +++ b/src/test/renderer/specs/modules/access.privatemodule.html @@ -56,10 +56,10 @@ Globals

  • - "access" + access
  • - PrivateModule + PrivateModule

    • Namespace PrivateModule

    @@ -83,7 +83,7 @@

    Index

    Functions

    @@ -101,7 +101,7 @@

    functionInsidePrivateModule

  • Returns void

    @@ -117,55 +117,55 @@

    Returns voidGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_classes_.html b/src/test/renderer/specs/modules/classes.html similarity index 78% rename from src/test/renderer/specs/modules/_classes_.html rename to src/test/renderer/specs/modules/classes.html index a430fc1b2..1ac6774ee 100644 --- a/src/test/renderer/specs/modules/_classes_.html +++ b/src/test/renderer/specs/modules/classes.html @@ -3,7 +3,7 @@ - "classes" | typedoc + classes | typedoc @@ -56,10 +56,10 @@ Globals
  • - "classes" + classes
    • -

    Module "classes"

    +

    Module classes

    @@ -73,20 +73,20 @@

    Index

    Classes

    Interfaces

    @@ -100,74 +100,74 @@

    Interfaces

    Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_default_export_.html b/src/test/renderer/specs/modules/default_export.html similarity index 83% rename from src/test/renderer/specs/modules/_default_export_.html rename to src/test/renderer/specs/modules/default_export.html index 6c969c81a..019a8c910 100644 --- a/src/test/renderer/specs/modules/_default_export_.html +++ b/src/test/renderer/specs/modules/default_export.html @@ -3,7 +3,7 @@ - "default-export" | typedoc + default-export | typedoc @@ -56,10 +56,10 @@ Globals
  • - "default-export" + default-export
    • -

    Module "default-export"

    +

    Module default-export

    @@ -73,14 +73,14 @@

    Index

    References

    Classes

    @@ -91,7 +91,7 @@

    References

    ExportedClassName

    - Renames and exports NotExportedClassName + Renames and exports NotExportedClassName
    @@ -102,56 +102,56 @@

    ExportedClassName

    Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_enumerations_.html b/src/test/renderer/specs/modules/enumerations.html similarity index 87% rename from src/test/renderer/specs/modules/_enumerations_.html rename to src/test/renderer/specs/modules/enumerations.html index e53226034..e32f692b3 100644 --- a/src/test/renderer/specs/modules/_enumerations_.html +++ b/src/test/renderer/specs/modules/enumerations.html @@ -3,7 +3,7 @@ - "enumerations" | typedoc + enumerations | typedoc @@ -56,10 +56,10 @@ Globals
  • - "enumerations" + enumerations
    • -

    Module "enumerations"

    +

    Module enumerations

    @@ -73,8 +73,8 @@

    Index

    Enumerations

    @@ -88,53 +88,53 @@

    Enumerations

    Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_flattened_.html b/src/test/renderer/specs/modules/flattened.html similarity index 90% rename from src/test/renderer/specs/modules/_flattened_.html rename to src/test/renderer/specs/modules/flattened.html index e6dcaff06..34a31859e 100644 --- a/src/test/renderer/specs/modules/_flattened_.html +++ b/src/test/renderer/specs/modules/flattened.html @@ -3,7 +3,7 @@ - "flattened" | typedoc + flattened | typedoc @@ -56,10 +56,10 @@ Globals
  • - "flattened" + flattened
    • -

    Module "flattened"

    +

    Module flattened

    @@ -73,15 +73,15 @@

    Index

    Classes

    Functions

    @@ -99,7 +99,7 @@

    flattenedCallback

  • @@ -157,7 +157,7 @@

    flattenedIndexSignature

  • @@ -207,7 +207,7 @@

    flattenedParameter

  • @@ -268,59 +268,59 @@

    Returns voidGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_functions_.html b/src/test/renderer/specs/modules/functions.html similarity index 83% rename from src/test/renderer/specs/modules/_functions_.html rename to src/test/renderer/specs/modules/functions.html index 584658c43..fa0b4dec3 100644 --- a/src/test/renderer/specs/modules/_functions_.html +++ b/src/test/renderer/specs/modules/functions.html @@ -3,7 +3,7 @@ - "functions" | typedoc + functions | typedoc @@ -56,10 +56,10 @@ Globals
  • - "functions" + functions
    • -

    Module "functions"

    +

    Module functions

    @@ -73,29 +73,29 @@

    Index

    Namespaces

    Variables

    Functions

    @@ -106,10 +106,10 @@

    Variables

    classes

    -
    classes: "classes"
    +
    classes: classes
    @@ -126,7 +126,7 @@

    createSomething

  • @@ -149,7 +149,7 @@
    doAnotherThing: function

  • Returns void

    @@ -165,7 +165,7 @@
    doSomething: function

  • Parameters

    @@ -192,7 +192,7 @@

    exportedFunction

  • @@ -208,13 +208,13 @@

    Returns void

    functionWithArguments

      -
    • functionWithArguments(paramZ: string, paramG: any, paramA: NameInterface): number
      • +
    • functionWithArguments(paramZ: string, paramG: any, paramA: NameInterface): number

    Namespace moduleFunction

    @@ -85,7 +85,7 @@

    Callable

  • @@ -113,14 +113,14 @@

    Index

    Variables

    Functions

    @@ -134,7 +134,7 @@

    Let functionVariable

    functionVariable: string
    @@ -156,7 +156,7 @@

    append

  • @@ -178,7 +178,7 @@

    prepend

  • @@ -199,61 +199,61 @@

    Returns voidGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_generics_.html b/src/test/renderer/specs/modules/generics.html similarity index 78% rename from src/test/renderer/specs/modules/_generics_.html rename to src/test/renderer/specs/modules/generics.html index ad51d6102..fcb7ec6ab 100644 --- a/src/test/renderer/specs/modules/_generics_.html +++ b/src/test/renderer/specs/modules/generics.html @@ -3,7 +3,7 @@ - "generics" | typedoc + generics | typedoc @@ -56,10 +56,10 @@ Globals

  • - "generics" + generics
    • -

    Module "generics"

    +

    Module generics

    @@ -73,25 +73,25 @@

    Index

    Interfaces

    Type aliases

    Functions

    @@ -102,10 +102,10 @@

    Type aliases

    HorribleRecursiveTypeThatShouldNotBeUsedByAnyone

    -
    HorribleRecursiveTypeThatShouldNotBeUsedByAnyone<T, R>: { 0: R; 1: HorribleRecursiveTypeThatShouldNotBeUsedByAnyone<PopFront<T>, {}> }[T["length"] extends 0 ? 0 : 1]
    +
    HorribleRecursiveTypeThatShouldNotBeUsedByAnyone<T, R>: { 0: R; 1: HorribleRecursiveTypeThatShouldNotBeUsedByAnyone<PopFront<T>, {}> }[T["length"] extends 0 ? 0 : 1]
    @@ -130,7 +130,7 @@

    PopFront

    PopFront<T>: ((...args: T) => any) extends (a: any, ...r: infer R) => any ? R : never
    @@ -158,7 +158,7 @@

    getGenericArray

  • @@ -181,7 +181,7 @@

    testFunction

  • @@ -221,74 +221,74 @@

    Returns T< Globals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_mixin_.html b/src/test/renderer/specs/modules/mixin.html similarity index 80% rename from src/test/renderer/specs/modules/_mixin_.html rename to src/test/renderer/specs/modules/mixin.html index 8e00800c4..e05b9860f 100644 --- a/src/test/renderer/specs/modules/_mixin_.html +++ b/src/test/renderer/specs/modules/mixin.html @@ -3,7 +3,7 @@ - "mixin" | typedoc + mixin | typedoc @@ -56,10 +56,10 @@ Globals
  • - "mixin" + mixin
    • -

    Module "mixin"

    +

    Module mixin

    @@ -73,32 +73,32 @@

    Index

    Classes

    Interfaces

    Type aliases

    Functions

    @@ -112,7 +112,7 @@

    AnyConstructor

    AnyConstructor<A>: {}
    @@ -138,7 +138,7 @@

    AnyFunction

    AnyFunction<A>: (...input: any[]) => A
    @@ -175,12 +175,12 @@

    Returns A<

    - +

    Mixin

    Mixin<T>: InstanceType<ReturnType<T>>
    @@ -191,17 +191,17 @@

    Mixin

    Type parameters

    Mixin3

    -
    Mixin3: Mixin<typeof Mixin3>
    +
    Mixin3: Mixin<typeof Mixin3>
    @@ -224,7 +224,7 @@

    Const Mixin1Func

  • @@ -235,7 +235,7 @@

    Const Mixin1Func

    Type parameters

    Parameters

    @@ -258,7 +258,7 @@

    Const Mixin2

  • @@ -269,7 +269,7 @@

    Const Mixin2

    Type parameters

    Parameters

    @@ -292,7 +292,7 @@

    Const Mixin3

  • @@ -303,7 +303,7 @@

    Const Mixin3

    Type parameters

    Parameters

    @@ -325,80 +325,80 @@

    Returns Mixin3Globals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_mod_.html b/src/test/renderer/specs/modules/mod.html similarity index 88% rename from src/test/renderer/specs/modules/_mod_.html rename to src/test/renderer/specs/modules/mod.html index cd0a5f349..fb4b920a9 100644 --- a/src/test/renderer/specs/modules/_mod_.html +++ b/src/test/renderer/specs/modules/mod.html @@ -3,7 +3,7 @@ - "mod" | typedoc + mod | typedoc @@ -56,10 +56,10 @@ Globals
  • - "mod" + mod
    • -

    Module "mod"

    +

    Module mod

    @@ -73,13 +73,13 @@

    Index

    Variables

    Functions

    @@ -93,7 +93,7 @@

    Const a

    a: 1 = 1
    @@ -110,7 +110,7 @@

    default

  • @@ -131,53 +131,53 @@

    Returns voidGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_mod2_.html b/src/test/renderer/specs/modules/mod2.html similarity index 88% rename from src/test/renderer/specs/modules/_mod2_.html rename to src/test/renderer/specs/modules/mod2.html index 2f9020adc..7d8fa3fcc 100644 --- a/src/test/renderer/specs/modules/_mod2_.html +++ b/src/test/renderer/specs/modules/mod2.html @@ -3,7 +3,7 @@ - "mod2" | typedoc + mod2 | typedoc @@ -56,10 +56,10 @@ Globals
  • - "mod2" + mod2
    • -

    Module "mod2"

    +

    Module mod2

    @@ -73,13 +73,13 @@

    Index

    References

    Functions

    @@ -90,7 +90,7 @@

    References

    a

    - Re-exports a + Re-exports a
    @@ -105,7 +105,7 @@

    default

  • @@ -126,53 +126,53 @@

    Returns voidGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_modules_.html b/src/test/renderer/specs/modules/modules.html similarity index 88% rename from src/test/renderer/specs/modules/_modules_.html rename to src/test/renderer/specs/modules/modules.html index 70fa4dec9..485e89a34 100644 --- a/src/test/renderer/specs/modules/_modules_.html +++ b/src/test/renderer/specs/modules/modules.html @@ -3,7 +3,7 @@ - "modules" | typedoc + modules | typedoc @@ -56,10 +56,10 @@ Globals
  • - "modules" + modules
    • -

    Module "modules"

    +

    Module modules

    @@ -80,21 +80,21 @@

    Index

    Namespaces

    Variables

    Object literals

    @@ -108,7 +108,7 @@

    Let exportedGlobalVariabl
    exportedGlobalVariable: string = "foo"
    @@ -123,7 +123,7 @@

    Let globalVariable

    globalVariable: string = "foo"
    @@ -138,7 +138,7 @@

    Let typeLiteral

    typeLiteral: { valueA?: number; valueB?: boolean; valueX: { valueA: number[]; valueY: (z: string) => { a: string; b: string }; valueZ: string }; valueY: () => string; valueZ: string }
    @@ -230,7 +230,7 @@

    Let objectLiteral

    objectLiteral: object
    @@ -244,7 +244,7 @@

    valueA

    valueA: number = 100

    @@ -254,7 +254,7 @@

    valueB

    valueB: boolean = true
    @@ -264,7 +264,7 @@

    valueZ

    valueZ: string = "foo"
    @@ -278,7 +278,7 @@

    valueY

  • Returns string

    @@ -291,7 +291,7 @@

    valueX

    valueX: object
    @@ -300,7 +300,7 @@

    valueA

    valueA: number[] = [100, 200, 300]
    @@ -310,7 +310,7 @@

    valueZ

    valueZ: string = "foo"
    @@ -324,7 +324,7 @@

    valueY

  • Parameters

    @@ -356,64 +356,64 @@
    b: Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_modules_.mymodule.html b/src/test/renderer/specs/modules/modules.mymodule.html similarity index 83% rename from src/test/renderer/specs/modules/_modules_.mymodule.html rename to src/test/renderer/specs/modules/modules.mymodule.html index 3a2e7ba26..cc51987d9 100644 --- a/src/test/renderer/specs/modules/_modules_.mymodule.html +++ b/src/test/renderer/specs/modules/modules.mymodule.html @@ -56,10 +56,10 @@ Globals
  • - "modules" + modules
  • - MyModule + MyModule

    • Namespace MyModule

    @@ -83,21 +83,21 @@

    Index

    Namespaces

    Variables

    Object literals

    @@ -111,7 +111,7 @@

    Let exportedModuleVariabl
    exportedModuleVariable: string = "foo"
    @@ -121,7 +121,7 @@

    Let moduleVariable

    moduleVariable: number[] = [100, 200]
    @@ -131,7 +131,7 @@

    Let moduleVariable2

    moduleVariable2: number[]
    @@ -144,7 +144,7 @@

    Let object

    object: object
    @@ -158,7 +158,7 @@

    name

    name: string = "Test"
    @@ -177,7 +177,7 @@

    print

  • @@ -205,69 +205,69 @@

    Returns voidGlobals

  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_modules_.mymodule.mysubmodule.html b/src/test/renderer/specs/modules/modules.mymodule.mysubmodule.html similarity index 85% rename from src/test/renderer/specs/modules/_modules_.mymodule.mysubmodule.html rename to src/test/renderer/specs/modules/modules.mymodule.mysubmodule.html index 56c35ad31..72c1f57d9 100644 --- a/src/test/renderer/specs/modules/_modules_.mymodule.mysubmodule.html +++ b/src/test/renderer/specs/modules/modules.mymodule.mysubmodule.html @@ -56,13 +56,13 @@ Globals
  • - "modules" + modules
  • - MyModule + MyModule
  • - MySubmodule + MySubmodule

    • Namespace MySubmodule

    @@ -86,8 +86,8 @@

    Index

    Variables

    @@ -101,7 +101,7 @@

    Let a

    a: string
    @@ -111,7 +111,7 @@

    Let b

    b: string
    @@ -124,63 +124,63 @@

    Let b

    Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_single_export_.html b/src/test/renderer/specs/modules/single_export.html similarity index 86% rename from src/test/renderer/specs/modules/_single_export_.html rename to src/test/renderer/specs/modules/single_export.html index 1391b0887..7b03f9d23 100644 --- a/src/test/renderer/specs/modules/_single_export_.html +++ b/src/test/renderer/specs/modules/single_export.html @@ -3,7 +3,7 @@ - "single-export" | typedoc + single-export | typedoc @@ -56,10 +56,10 @@ Globals
  • - "single-export" + single-export
    • -

    Module "single-export"

    +

    Module single-export

    @@ -73,8 +73,8 @@

    Index

    Classes

    @@ -88,53 +88,53 @@

    Classes

    Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • diff --git a/src/test/renderer/specs/modules/_weird_names_.html b/src/test/renderer/specs/modules/weird_names.html similarity index 87% rename from src/test/renderer/specs/modules/_weird_names_.html rename to src/test/renderer/specs/modules/weird_names.html index 6653d7a4d..4302e4343 100644 --- a/src/test/renderer/specs/modules/_weird_names_.html +++ b/src/test/renderer/specs/modules/weird_names.html @@ -3,7 +3,7 @@ - "weird-names" | typedoc + weird-names | typedoc @@ -56,10 +56,10 @@ Globals
  • - "weird-names" + weird-names
    • -

    Module "weird-names"

    +

    Module weird-names

    @@ -73,7 +73,7 @@

    Index

    Object literals

    @@ -87,7 +87,7 @@

    Const foo

    foo: object
    @@ -101,7 +101,7 @@

    <c-a>

    <c-a>: string = "<c-b>"
    @@ -111,7 +111,7 @@

    =

    =: string = "="
    @@ -125,50 +125,50 @@

    =

    Globals
  • - "access" + access
  • - "classes" + classes
  • - "default-export" + default-export
  • - "enumerations" + enumerations
  • - "flattened" + flattened
  • - "functions" + functions
  • - "generics" + generics
  • - "mixin" + mixin
  • - "mod" + mod
  • - "mod2" + mod2
  • - "modules" + modules
  • - "single-export" + single-export
  • - "weird-names" + weird-names
    • From b2874cee827ad74a4496f3bb5de16b440af87fd6 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Tue, 4 Feb 2020 17:04:47 +0100 Subject: [PATCH 06/28] correct unit tests for double quote useless escaping --- src/test/converter/alias/specs.json | 4 ++-- .../class/specs-with-lump-categories.json | 24 +++++++++---------- .../class/specs-without-exported.json | 24 +++++++++---------- src/test/converter/class/specs.json | 24 +++++++++---------- src/test/converter/comment/specs.json | 6 ++--- src/test/converter/declaration/specs.d.json | 4 ++-- src/test/converter/dots.in.path/specs.json | 6 ++--- src/test/converter/enum/specs.json | 4 ++-- .../exports/specs-without-exported.json | 12 +++++----- src/test/converter/exports/specs.json | 12 +++++----- src/test/converter/exports/specs.lib.json | 12 +++++----- src/test/converter/function/specs.json | 8 +++---- src/test/converter/interface/specs.json | 8 +++---- src/test/converter/mixin/specs.json | 4 ++-- src/test/converter/react/specs.json | 4 ++-- src/test/converter/types/specs.json | 6 ++--- src/test/converter/variables/specs.json | 10 ++++---- 17 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/test/converter/alias/specs.json b/src/test/converter/alias/specs.json index 9b2ae3bf7..0071665df 100644 --- a/src/test/converter/alias/specs.json +++ b/src/test/converter/alias/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"alias\"", + "name": "alias", "kind": 1, "kindString": "Module", "flags": { @@ -636,4 +636,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/class/specs-with-lump-categories.json b/src/test/converter/class/specs-with-lump-categories.json index f485f048d..f0a9cf8b6 100644 --- a/src/test/converter/class/specs-with-lump-categories.json +++ b/src/test/converter/class/specs-with-lump-categories.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"access\"", + "name": "access", "kind": 1, "kindString": "Module", "flags": { @@ -334,7 +334,7 @@ }, { "id": 15, - "name": "\"class\"", + "name": "class", "kind": 1, "kindString": "Module", "flags": { @@ -1739,7 +1739,7 @@ }, { "id": 75, - "name": "\"clodule-with-subclass\"", + "name": "clodule-with-subclass", "kind": 1, "kindString": "Module", "flags": { @@ -1885,7 +1885,7 @@ }, { "id": 80, - "name": "\"constructor-properties\"", + "name": "constructor-properties", "kind": 1, "kindString": "Module", "flags": { @@ -2356,7 +2356,7 @@ }, { "id": 101, - "name": "\"decorators\"", + "name": "decorators", "kind": 1, "kindString": "Module", "flags": { @@ -2723,7 +2723,7 @@ }, { "id": 145, - "name": "\"events\"", + "name": "events", "kind": 1, "kindString": "Module", "flags": { @@ -2800,7 +2800,7 @@ }, { "id": 118, - "name": "\"events-overloads\"", + "name": "events-overloads", "kind": 1, "kindString": "Module", "flags": { @@ -3225,7 +3225,7 @@ }, { "id": 148, - "name": "\"generic-class\"", + "name": "generic-class", "kind": 1, "kindString": "Module", "flags": { @@ -3662,7 +3662,7 @@ }, { "id": 166, - "name": "\"getter-setter\"", + "name": "getter-setter", "kind": 1, "kindString": "Module", "flags": { @@ -3869,7 +3869,7 @@ }, { "id": 178, - "name": "\"this\"", + "name": "this", "kind": 1, "kindString": "Module", "flags": { @@ -3963,7 +3963,7 @@ }, { "id": 182, - "name": "\"type-operator\"", + "name": "type-operator", "kind": 1, "kindString": "Module", "flags": { @@ -4164,4 +4164,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/class/specs-without-exported.json b/src/test/converter/class/specs-without-exported.json index 75a0e7b26..590d5c588 100644 --- a/src/test/converter/class/specs-without-exported.json +++ b/src/test/converter/class/specs-without-exported.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"access\"", + "name": "access", "kind": 1, "kindString": "Module", "flags": { @@ -334,7 +334,7 @@ }, { "id": 15, - "name": "\"class\"", + "name": "class", "kind": 1, "kindString": "Module", "flags": { @@ -1622,7 +1622,7 @@ }, { "id": 69, - "name": "\"clodule-with-subclass\"", + "name": "clodule-with-subclass", "kind": 1, "kindString": "Module", "flags": { @@ -1768,7 +1768,7 @@ }, { "id": 74, - "name": "\"constructor-properties\"", + "name": "constructor-properties", "kind": 1, "kindString": "Module", "flags": { @@ -1785,7 +1785,7 @@ }, { "id": 75, - "name": "\"decorators\"", + "name": "decorators", "kind": 1, "kindString": "Module", "flags": { @@ -1802,7 +1802,7 @@ }, { "id": 77, - "name": "\"events\"", + "name": "events", "kind": 1, "kindString": "Module", "flags": { @@ -1819,7 +1819,7 @@ }, { "id": 76, - "name": "\"events-overloads\"", + "name": "events-overloads", "kind": 1, "kindString": "Module", "flags": { @@ -1836,7 +1836,7 @@ }, { "id": 78, - "name": "\"generic-class\"", + "name": "generic-class", "kind": 1, "kindString": "Module", "flags": { @@ -1853,7 +1853,7 @@ }, { "id": 79, - "name": "\"getter-setter\"", + "name": "getter-setter", "kind": 1, "kindString": "Module", "flags": { @@ -1870,7 +1870,7 @@ }, { "id": 80, - "name": "\"this\"", + "name": "this", "kind": 1, "kindString": "Module", "flags": { @@ -1964,7 +1964,7 @@ }, { "id": 84, - "name": "\"type-operator\"", + "name": "type-operator", "kind": 1, "kindString": "Module", "flags": { @@ -2165,4 +2165,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/class/specs.json b/src/test/converter/class/specs.json index b6e61523b..456ba6147 100644 --- a/src/test/converter/class/specs.json +++ b/src/test/converter/class/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"access\"", + "name": "access", "kind": 1, "kindString": "Module", "flags": { @@ -334,7 +334,7 @@ }, { "id": 15, - "name": "\"class\"", + "name": "class", "kind": 1, "kindString": "Module", "flags": { @@ -1735,7 +1735,7 @@ }, { "id": 75, - "name": "\"clodule-with-subclass\"", + "name": "clodule-with-subclass", "kind": 1, "kindString": "Module", "flags": { @@ -1881,7 +1881,7 @@ }, { "id": 80, - "name": "\"constructor-properties\"", + "name": "constructor-properties", "kind": 1, "kindString": "Module", "flags": { @@ -2352,7 +2352,7 @@ }, { "id": 101, - "name": "\"decorators\"", + "name": "decorators", "kind": 1, "kindString": "Module", "flags": { @@ -2719,7 +2719,7 @@ }, { "id": 145, - "name": "\"events\"", + "name": "events", "kind": 1, "kindString": "Module", "flags": { @@ -2796,7 +2796,7 @@ }, { "id": 118, - "name": "\"events-overloads\"", + "name": "events-overloads", "kind": 1, "kindString": "Module", "flags": { @@ -3221,7 +3221,7 @@ }, { "id": 148, - "name": "\"generic-class\"", + "name": "generic-class", "kind": 1, "kindString": "Module", "flags": { @@ -3658,7 +3658,7 @@ }, { "id": 166, - "name": "\"getter-setter\"", + "name": "getter-setter", "kind": 1, "kindString": "Module", "flags": { @@ -3865,7 +3865,7 @@ }, { "id": 178, - "name": "\"this\"", + "name": "this", "kind": 1, "kindString": "Module", "flags": { @@ -3959,7 +3959,7 @@ }, { "id": 182, - "name": "\"type-operator\"", + "name": "type-operator", "kind": 1, "kindString": "Module", "flags": { @@ -4160,4 +4160,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/comment/specs.json b/src/test/converter/comment/specs.json index 9300c4626..5c98660bd 100644 --- a/src/test/converter/comment/specs.json +++ b/src/test/converter/comment/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 6, - "name": "\"comment\"", + "name": "comment", "kind": 1, "kindString": "Module", "flags": { @@ -230,7 +230,7 @@ }, { "id": 1, - "name": "\"comment2\"", + "name": "comment2", "kind": 1, "kindString": "Module", "flags": { @@ -329,4 +329,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/declaration/specs.d.json b/src/test/converter/declaration/specs.d.json index 729670c57..3a23604ca 100644 --- a/src/test/converter/declaration/specs.d.json +++ b/src/test/converter/declaration/specs.d.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"declaration\"", + "name": "declaration", "kind": 1, "kindString": "Module", "flags": { @@ -109,7 +109,7 @@ }, { "id": 5, - "name": "\"export-declaration\"", + "name": "export-declaration", "kind": 1, "kindString": "Module", "flags": { diff --git a/src/test/converter/dots.in.path/specs.json b/src/test/converter/dots.in.path/specs.json index 931a5bb1a..7b8cd0dee 100644 --- a/src/test/converter/dots.in.path/specs.json +++ b/src/test/converter/dots.in.path/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 3, - "name": "\"function\"", + "name": "function", "kind": 1, "kindString": "Module", "flags": { @@ -84,7 +84,7 @@ }, { "id": 1, - "name": "\"interface-empty\"", + "name": "interface-empty", "kind": 1, "kindString": "Module", "flags": { @@ -140,4 +140,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/enum/specs.json b/src/test/converter/enum/specs.json index d54a65615..800970538 100644 --- a/src/test/converter/enum/specs.json +++ b/src/test/converter/enum/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"enum\"", + "name": "enum", "kind": 1, "kindString": "Module", "flags": { @@ -370,4 +370,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/exports/specs-without-exported.json b/src/test/converter/exports/specs-without-exported.json index 459ffeb24..d3cfecf89 100644 --- a/src/test/converter/exports/specs-without-exported.json +++ b/src/test/converter/exports/specs-without-exported.json @@ -6,7 +6,7 @@ "children": [ { "id": 14, - "name": "\"export\"", + "name": "export", "kind": 1, "kindString": "Module", "flags": { @@ -143,7 +143,7 @@ }, { "id": 1, - "name": "\"export-assignment\"", + "name": "export-assignment", "kind": 1, "kindString": "Module", "flags": { @@ -160,7 +160,7 @@ }, { "id": 2, - "name": "\"export-default\"", + "name": "export-default", "kind": 1, "kindString": "Module", "flags": { @@ -177,7 +177,7 @@ }, { "id": 3, - "name": "\"export-with-local\"", + "name": "export-with-local", "kind": 1, "kindString": "Module", "flags": { @@ -293,7 +293,7 @@ }, { "id": 9, - "name": "\"mod\"", + "name": "mod", "kind": 1, "kindString": "Module", "flags": { @@ -386,4 +386,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/exports/specs.json b/src/test/converter/exports/specs.json index 3bfb0bc12..dc524c537 100644 --- a/src/test/converter/exports/specs.json +++ b/src/test/converter/exports/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 26, - "name": "\"export\"", + "name": "export", "kind": 1, "kindString": "Module", "flags": { @@ -184,7 +184,7 @@ }, { "id": 1, - "name": "\"export-assignment\"", + "name": "export-assignment", "kind": 1, "kindString": "Module", "flags": { @@ -266,7 +266,7 @@ }, { "id": 6, - "name": "\"export-default\"", + "name": "export-default", "kind": 1, "kindString": "Module", "flags": { @@ -316,7 +316,7 @@ }, { "id": 8, - "name": "\"export-with-local\"", + "name": "export-with-local", "kind": 1, "kindString": "Module", "flags": { @@ -506,7 +506,7 @@ }, { "id": 19, - "name": "\"mod\"", + "name": "mod", "kind": 1, "kindString": "Module", "flags": { @@ -636,4 +636,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/exports/specs.lib.json b/src/test/converter/exports/specs.lib.json index 12ea504e6..92acabb85 100644 --- a/src/test/converter/exports/specs.lib.json +++ b/src/test/converter/exports/specs.lib.json @@ -6,7 +6,7 @@ "children": [ { "id": 11, - "name": "\"export\"", + "name": "export", "kind": 1, "kindString": "Module", "flags": { @@ -25,7 +25,7 @@ "children": [ { "id": 22, - "name": "\"mod\"", + "name": "mod", "kind": 1, "kindString": "Module", "flags": { @@ -2680,7 +2680,7 @@ }, { "id": 1, - "name": "\"export-assignment\"", + "name": "export-assignment", "kind": 1, "kindString": "Module", "flags": { @@ -2697,7 +2697,7 @@ }, { "id": 2, - "name": "\"export-default\"", + "name": "export-default", "kind": 1, "kindString": "Module", "flags": { @@ -2768,7 +2768,7 @@ }, { "id": 5, - "name": "\"export-with-local\"", + "name": "export-with-local", "kind": 1, "kindString": "Module", "flags": { @@ -2884,7 +2884,7 @@ }, { "id": 156, - "name": "\"mod\"", + "name": "mod", "kind": 1, "kindString": "Module", "flags": { diff --git a/src/test/converter/function/specs.json b/src/test/converter/function/specs.json index ddb1a8a0a..5cf9ccdd7 100644 --- a/src/test/converter/function/specs.json +++ b/src/test/converter/function/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"function\"", + "name": "function", "kind": 1, "kindString": "Module", "flags": { @@ -1087,7 +1087,7 @@ }, { "id": 57, - "name": "\"generic-function\"", + "name": "generic-function", "kind": 1, "kindString": "Module", "flags": { @@ -1263,7 +1263,7 @@ }, { "id": 67, - "name": "\"implicit-types\"", + "name": "implicit-types", "kind": 1, "kindString": "Module", "flags": { @@ -1685,4 +1685,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/interface/specs.json b/src/test/converter/interface/specs.json index a2b5d9147..ca42348c8 100644 --- a/src/test/converter/interface/specs.json +++ b/src/test/converter/interface/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"constructor-type\"", + "name": "constructor-type", "kind": 1, "kindString": "Module", "flags": { @@ -208,7 +208,7 @@ }, { "id": 14, - "name": "\"interface-empty\"", + "name": "interface-empty", "kind": 1, "kindString": "Module", "flags": { @@ -358,7 +358,7 @@ }, { "id": 20, - "name": "\"interface-implementation\"", + "name": "interface-implementation", "kind": 1, "kindString": "Module", "flags": { @@ -1634,4 +1634,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/mixin/specs.json b/src/test/converter/mixin/specs.json index 406504a54..160902955 100644 --- a/src/test/converter/mixin/specs.json +++ b/src/test/converter/mixin/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"mixin\"", + "name": "mixin", "kind": 1, "kindString": "Module", "flags": { @@ -1694,4 +1694,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/react/specs.json b/src/test/converter/react/specs.json index a5ba4a925..f92f1b183 100644 --- a/src/test/converter/react/specs.json +++ b/src/test/converter/react/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"react\"", + "name": "react", "kind": 1, "kindString": "Module", "flags": { @@ -286,4 +286,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/types/specs.json b/src/test/converter/types/specs.json index ab4e5d3f4..07925ae71 100644 --- a/src/test/converter/types/specs.json +++ b/src/test/converter/types/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"query\"", + "name": "query", "kind": 1, "kindString": "Module", "flags": { @@ -87,7 +87,7 @@ }, { "id": 4, - "name": "\"union-or-intersection\"", + "name": "union-or-intersection", "kind": 1, "kindString": "Module", "flags": { @@ -381,4 +381,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/variables/specs.json b/src/test/converter/variables/specs.json index 238676526..9072bb837 100644 --- a/src/test/converter/variables/specs.json +++ b/src/test/converter/variables/specs.json @@ -6,7 +6,7 @@ "children": [ { "id": 1, - "name": "\"array\"", + "name": "array", "kind": 1, "kindString": "Module", "flags": { @@ -4568,7 +4568,7 @@ }, { "id": 234, - "name": "\"destructuring\"", + "name": "destructuring", "kind": 1, "kindString": "Module", "flags": { @@ -4975,7 +4975,7 @@ }, { "id": 253, - "name": "\"literal\"", + "name": "literal", "kind": 1, "kindString": "Module", "flags": { @@ -6032,7 +6032,7 @@ }, { "id": 310, - "name": "\"variable\"", + "name": "variable", "kind": 1, "kindString": "Module", "flags": { @@ -6213,4 +6213,4 @@ ] } ] -} \ No newline at end of file +} From 8ba596436d1bf67209e1921f74fcbb3968800ffd Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Wed, 5 Feb 2020 13:04:27 +0100 Subject: [PATCH 07/28] in case of mono-repo (node_modules outside the project), trunk the module name after the node_modules folder --- src/lib/converter/plugins/DynamicModulePlugin.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/converter/plugins/DynamicModulePlugin.ts b/src/lib/converter/plugins/DynamicModulePlugin.ts index 430e85791..a9d018e3d 100644 --- a/src/lib/converter/plugins/DynamicModulePlugin.ts +++ b/src/lib/converter/plugins/DynamicModulePlugin.ts @@ -74,6 +74,10 @@ export class DynamicModulePlugin extends ConverterComponent { */ private onBeginResolve(context: Context) { this.reflections.forEach((reflection) => { + // in case of mono-repo (node_modules outside the project), trunk the module name after the node_modules folder + const nodeModulesRegexp = new RegExp('^(.*)node_modules/'); + reflection.name = reflection.name.replace(nodeModulesRegexp, ''); + let name = reflection.name.replace(/"/g, ''); const currentExtension = Path.extname(name); From 55f62adf53f6491c2dbccffb0a97fb084df99831 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Wed, 5 Feb 2020 13:05:13 +0100 Subject: [PATCH 08/28] library export declaration refactoring --- src/lib/converter/nodes/block.ts | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/lib/converter/nodes/block.ts b/src/lib/converter/nodes/block.ts index 59ab0bde5..a6cc78df8 100644 --- a/src/lib/converter/nodes/block.ts +++ b/src/lib/converter/nodes/block.ts @@ -113,17 +113,23 @@ export class BlockConverter extends ConverterNodeComponent { - for (const declaration of resolved.declarations) { - this.owner.convertNode(context, declaration); + // export declaration is always unique: no need of loop + const declaration = resolved?.declarations?.[0]; + if (declaration) { + const declarationReflexion = this.owner.convertNode(context, declaration); + if (declarationReflexion) { + if (!declarationReflexion.kindOf([ReflectionKind.ClassOrInterface, ReflectionKind.SomeModule])) { + // rename the declaration to the exported one + declarationReflexion.name = symbol.name; + declarationReflexion.flags.setFlag(ReflectionFlag.Exported, true); + } else if (declarationReflexion.name !== symbol.name) { + // create a extra reference to the declaration + declarationReflexion.flags.setFlag(ReflectionFlag.Exported, false); + createReferenceReflection(context, symbol, resolved); + } + + declarationReflexion.flags.setFlag(ReflectionFlag.External, false); } - }; - - if (symbol.getName() !== resolved.getName()) { - const reflection = createReferenceReflection(context, symbol, resolved); - context.withScope(reflection, declarationsProcess); - } else { - declarationsProcess(); } } } From 9e90746746ccc8557997663fdfce53e8c1a48d2e Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Wed, 5 Feb 2020 13:26:13 +0100 Subject: [PATCH 09/28] only consider the program files paths for basePath construction --- src/lib/converter/plugins/DynamicModulePlugin.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/converter/plugins/DynamicModulePlugin.ts b/src/lib/converter/plugins/DynamicModulePlugin.ts index a9d018e3d..012756015 100644 --- a/src/lib/converter/plugins/DynamicModulePlugin.ts +++ b/src/lib/converter/plugins/DynamicModulePlugin.ts @@ -45,6 +45,11 @@ export class DynamicModulePlugin extends ConverterComponent { private onBegin(context: Context) { this.basePath.reset(); this.reflections = []; + + // only consider the program files paths for basePath construction + context.program.getRootFileNames().forEach((fileName) => { + this.basePath.add(fileName); + }); } /** @@ -61,9 +66,7 @@ export class DynamicModulePlugin extends ConverterComponent { return; } - name = name.replace(/"/g, ''); this.reflections.push(reflection); - this.basePath.add(name); } } @@ -74,10 +77,6 @@ export class DynamicModulePlugin extends ConverterComponent { */ private onBeginResolve(context: Context) { this.reflections.forEach((reflection) => { - // in case of mono-repo (node_modules outside the project), trunk the module name after the node_modules folder - const nodeModulesRegexp = new RegExp('^(.*)node_modules/'); - reflection.name = reflection.name.replace(nodeModulesRegexp, ''); - let name = reflection.name.replace(/"/g, ''); const currentExtension = Path.extname(name); @@ -97,6 +96,10 @@ export class DynamicModulePlugin extends ConverterComponent { }); reflection.name = this.basePath.trim(name); + + // in case of mono-repo (node_modules outside the project), trunk the module name after the node_modules folder + const nodeModulesRegexp = new RegExp('^(.*)node_modules/'); + reflection.name = reflection.name.replace(nodeModulesRegexp, ''); }); } } From ad615b326ce607a4ad50994775531e453f990d70 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Wed, 5 Feb 2020 13:40:18 +0100 Subject: [PATCH 10/28] wording fix --- src/lib/converter/nodes/block.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/converter/nodes/block.ts b/src/lib/converter/nodes/block.ts index a6cc78df8..15b6bf6c9 100644 --- a/src/lib/converter/nodes/block.ts +++ b/src/lib/converter/nodes/block.ts @@ -116,19 +116,19 @@ export class BlockConverter extends ConverterNodeComponent Date: Wed, 5 Feb 2020 14:01:32 +0100 Subject: [PATCH 11/28] update export specs --- src/test/converter/exports/specs.lib.json | 4381 ++++----------------- 1 file changed, 760 insertions(+), 3621 deletions(-) diff --git a/src/test/converter/exports/specs.lib.json b/src/test/converter/exports/specs.lib.json index 92acabb85..95916808b 100644 --- a/src/test/converter/exports/specs.lib.json +++ b/src/test/converter/exports/specs.lib.json @@ -5,7 +5,7 @@ "flags": {}, "children": [ { - "id": 11, + "id": 10, "name": "export", "kind": 1, "kindString": "Module", @@ -15,1300 +15,282 @@ "originalName": "%BASE%/exports/export.ts", "children": [ { - "id": 21, + "id": 33, "name": "Mod", "kind": 16777216, "kindString": "Reference", "flags": { "isExported": true }, + "target": 19 + }, + { + "id": 19, + "name": "mod", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/mod.ts", "children": [ { - "id": 22, - "name": "mod", - "kind": 1, - "kindString": "Module", + "id": 25, + "name": "Node", + "kind": 256, + "kindString": "Interface", "flags": { "isExported": true }, - "originalName": "%BASE%/exports/mod.ts", "children": [ { - "id": 26, - "name": "b", - "kind": 16777216, - "kindString": "Reference", + "id": 28, + "name": "decorators", + "kind": 1024, + "kindString": "Property", "flags": { - "isExported": true + "isExported": true, + "isOptional": true }, - "children": [ - { - "id": 27, - "name": "a", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - } - ], - "groups": [ + "sources": [ { - "title": "Variables", - "kind": 32, - "children": [ - 27 - ] + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 499, + "character": 18 } ], - "target": 16 + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "name": "Decorator" + } + ], + "name": "NodeArray" + } }, { - "id": 28, - "name": "c", - "kind": 16777216, - "kindString": "Reference", + "id": 32, + "name": "end", + "kind": 1024, + "kindString": "Property", "flags": { "isExported": true }, - "children": [ - { - "id": 29, - "name": "a", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - } - ], - "groups": [ + "sources": [ { - "title": "Variables", - "kind": 32, - "children": [ - 29 - ] + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 73, + "character": 11 } ], - "target": 16 + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 32, + "name": "TextRange.end" + } }, { - "id": 31, - "name": "Node", - "kind": 256, - "kindString": "Interface", + "id": 27, + "name": "flags", + "kind": 1024, + "kindString": "Property", "flags": { "isExported": true }, - "children": [ - { - "id": 34, - "name": "decorators", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 499, - "character": 18 - } - ], - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "name": "Decorator" - } - ], - "name": "NodeArray" - } - }, - { - "id": 38, - "name": "end", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 73, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 38, - "name": "TextRange.end" - } - }, - { - "id": 33, - "name": "flags", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 498, - "character": 13 - } - ], - "type": { - "type": "reference", - "name": "NodeFlags" - } - }, - { - "id": 32, - "name": "kind", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 497, - "character": 12 - } - ], - "type": { - "type": "reference", - "name": "SyntaxKind" - } - }, - { - "id": 35, - "name": "modifiers", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 500, - "character": 17 - } - ], - "type": { - "type": "reference", - "name": "ModifiersArray" - } - }, - { - "id": 36, - "name": "parent", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 501, - "character": 14 - } - ], - "type": { - "type": "reference", - "id": 31, - "name": "Node" - } - }, - { - "id": 37, - "name": "pos", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 72, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 37, - "name": "TextRange.pos" - } - }, - { - "id": 79, - "name": "forEachChild", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 80, - "name": "forEachChild", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "typeParameter": [ - { - "id": 81, - "name": "T", - "kind": 131072, - "kindString": "Type parameter", - "flags": { - "isExported": true - } - } - ], - "parameters": [ - { - "id": 82, - "name": "cbNode", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 83, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 84, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 85, - "name": "node", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "id": 31, - "name": "Node" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 31 - } - ] - } - } - }, - { - "id": 86, - "name": "cbNodeArray", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 87, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 88, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 89, - "name": "nodes", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "id": 31, - "name": "Node" - } - ], - "name": "NodeArray" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 76 - } - ] - } - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 20 - } - ] - }, - { - "id": 44, - "name": "getChildAt", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 45, - "name": "getChildAt", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 46, - "name": "index", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, - { - "id": 47, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "reference", - "id": 31, - "name": "Node" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4859, - "character": 18 - } - ] - }, - { - "id": 41, - "name": "getChildCount", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 42, - "name": "getChildCount", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 43, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4858, - "character": 21 - } - ] - }, - { - "id": 48, - "name": "getChildren", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 49, - "name": "getChildren", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 50, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "array", - "elementType": { - "type": "reference", - "id": 31, - "name": "Node" - } - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4860, - "character": 19 - } - ] - }, - { - "id": 57, - "name": "getEnd", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 58, - "name": "getEnd", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4863, - "character": 14 - } - ] - }, - { - "id": 73, - "name": "getFirstToken", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 74, - "name": "getFirstToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 75, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 31, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4869, - "character": 21 - } - ] - }, - { - "id": 55, - "name": "getFullStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 56, - "name": "getFullStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4862, - "character": 20 - } - ] - }, - { - "id": 67, - "name": "getFullText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 68, - "name": "getFullText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 69, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4867, - "character": 19 - } - ] - }, - { - "id": 62, - "name": "getFullWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 63, - "name": "getFullWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4865, - "character": 20 - } - ] - }, - { - "id": 76, - "name": "getLastToken", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 77, - "name": "getLastToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 78, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 31, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4870, - "character": 20 - } - ] - }, - { - "id": 64, - "name": "getLeadingTriviaWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 65, - "name": "getLeadingTriviaWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 66, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4866, - "character": 29 - } - ] - }, - { - "id": 39, - "name": "getSourceFile", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 40, - "name": "getSourceFile", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4857, - "character": 21 - } - ] - }, - { - "id": 51, - "name": "getStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 52, - "name": "getStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 53, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - }, - { - "id": 54, - "name": "includeJsDocComment", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "intrinsic", - "name": "boolean" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4861, - "character": 16 - } - ] - }, - { - "id": 70, - "name": "getText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 71, - "name": "getText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 72, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4868, - "character": 15 - } - ] - }, - { - "id": 59, - "name": "getWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 60, - "name": "getWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 61, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFileLike" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4864, - "character": 16 - } - ] - } - ], - "groups": [ - { - "title": "Properties", - "kind": 1024, - "children": [ - 34, - 38, - 33, - 32, - 35, - 36, - 37 - ] - }, + "sources": [ { - "title": "Methods", - "kind": 2048, - "children": [ - 79, - 44, - 41, - 48, - 57, - 73, - 55, - 67, - 62, - 76, - 64, - 39, - 51, - 70, - 59 - ] + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 498, + "character": 13 } ], + "type": { + "type": "reference", + "name": "NodeFlags" + } + }, + { + "id": 26, + "name": "kind", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, "sources": [ { "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 496, - "character": 25 - }, - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4856, - "character": 18 + "line": 497, + "character": 12 } ], - "extendedTypes": [ - { - "type": "reference", - "name": "TextRange" - } - ] + "type": { + "type": "reference", + "name": "SyntaxKind" + } }, { - "id": 25, - "name": "a", - "kind": 32, - "kindString": "Variable", + "id": 29, + "name": "modifiers", + "kind": 1024, + "kindString": "Property", "flags": { "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts" + "isOptional": true }, "sources": [ { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 500, + "character": 17 } ], "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" + "type": "reference", + "name": "ModifiersArray" + } }, { - "id": 23, - "name": "default", - "kind": 64, - "kindString": "Function", - "flags": {}, - "signatures": [ + "id": 30, + "name": "parent", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ { - "id": 24, - "name": "default", - "kind": 4096, - "kindString": "Call signature", - "flags": {}, - "comment": { - "shortText": "Will not be re-exported from export.ts using export * from..." - }, - "type": { - "type": "intrinsic", - "name": "void" - } + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 501, + "character": 14 } ], + "type": { + "type": "reference", + "id": 25, + "name": "Node" + } + }, + { + "id": 31, + "name": "pos", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, "sources": [ { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 14, - "character": 31 + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 72, + "character": 11 } - ] + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 31, + "name": "TextRange.pos" + } } ], "groups": [ { - "title": "References", - "kind": 16777216, + "title": "Properties", + "kind": 1024, "children": [ + 28, + 32, + 27, 26, - 28 - ] - }, - { - "title": "Interfaces", - "kind": 256, - "children": [ + 29, + 30, 31 ] - }, + } + ], + "sources": [ { - "title": "Variables", - "kind": 32, - "children": [ - 25 - ] + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 496, + "character": 25 + } + ], + "extendedTypes": [ + { + "type": "reference", + "name": "TextRange" + } + ] + }, + { + "id": 22, + "name": "b", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 }, { - "title": "Functions", - "kind": 64, - "children": [ - 23 - ] + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 } ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 23, + "name": "c", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, "sources": [ { "fileName": "dist/test/converter/exports/mod.ts", - "line": 1, - "character": 0 + "line": 4, + "character": 14 } - ] - } - ], - "groups": [ - { - "title": "Modules", - "kind": 1, - "children": [ - 22 - ] - } - ], - "target": 22 - }, - { - "id": 90, - "name": "ModDefault", - "kind": 16777216, - "kindString": "Reference", - "flags": { - "isExported": true - }, - "children": [ + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, { - "id": 91, + "id": 20, "name": "default", "kind": 64, "kindString": "Function", @@ -1317,13 +299,11 @@ }, "signatures": [ { - "id": 92, + "id": 21, "name": "default", "kind": 4096, "kindString": "Call signature", - "flags": { - "isExported": true - }, + "flags": {}, "comment": { "shortText": "Will not be re-exported from export.ts using export * from..." }, @@ -1343,131 +323,60 @@ } ], "groups": [ + { + "title": "Interfaces", + "kind": 256, + "children": [ + 25 + ] + }, + { + "title": "Variables", + "kind": 32, + "children": [ + 22, + 23 + ] + }, { "title": "Functions", "kind": 64, "children": [ - 91 + 20 ] } ], - "target": 23 + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 1, + "character": 0 + } + ] }, { - "id": 94, - "name": "b", - "kind": 16777216, - "kindString": "Reference", + "id": 36, + "name": "Node", + "kind": 256, + "kindString": "Interface", "flags": { "isExported": true }, "children": [ { - "id": 95, - "name": "a", - "kind": 32, - "kindString": "Variable", + "id": 39, + "name": "decorators", + "kind": 1024, + "kindString": "Property", "flags": { "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts" + "isOptional": true }, "sources": [ { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - } - ], - "groups": [ - { - "title": "Variables", - "kind": 32, - "children": [ - 95 - ] - } - ], - "target": 16 - }, - { - "id": 15, - "name": "c", - "kind": 16777216, - "kindString": "Reference", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 16, - "name": "a", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - } - ], - "groups": [ - { - "title": "Variables", - "kind": 32, - "children": [ - 16 - ] - } - ], - "target": 16 - }, - { - "id": 97, - "name": "Node", - "kind": 256, - "kindString": "Interface", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 100, - "name": "decorators", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 499, - "character": 18 + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 499, + "character": 18 } ], "type": { @@ -1482,7 +391,7 @@ } }, { - "id": 104, + "id": 43, "name": "end", "kind": 1024, "kindString": "Property", @@ -1502,12 +411,12 @@ }, "inheritedFrom": { "type": "reference", - "id": 38, + "id": 32, "name": "TextRange.end" } }, { - "id": 99, + "id": 38, "name": "flags", "kind": 1024, "kindString": "Property", @@ -1527,7 +436,7 @@ } }, { - "id": 98, + "id": 37, "name": "kind", "kind": 1024, "kindString": "Property", @@ -1547,7 +456,7 @@ } }, { - "id": 101, + "id": 40, "name": "modifiers", "kind": 1024, "kindString": "Property", @@ -1568,7 +477,7 @@ } }, { - "id": 102, + "id": 41, "name": "parent", "kind": 1024, "kindString": "Property", @@ -1584,12 +493,12 @@ ], "type": { "type": "reference", - "id": 31, + "id": 25, "name": "Node" } }, { - "id": 103, + "id": 42, "name": "pos", "kind": 1024, "kindString": "Property", @@ -1609,379 +518,394 @@ }, "inheritedFrom": { "type": "reference", - "id": 37, + "id": 31, "name": "TextRange.pos" } + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 39, + 43, + 38, + 37, + 40, + 41, + 42 + ] + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 496, + "character": 25 + } + ], + "extendedTypes": [ + { + "type": "reference", + "name": "TextRange" + } + ] + }, + { + "id": 34, + "name": "b", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 }, { - "id": 145, - "name": "forEachChild", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 14, + "name": "c", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 11, + "name": "ModDefault", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "originalName": "default", + "comment": { + "shortText": "Will not be re-exported from export.ts using export * from..." + }, + "signatures": [ + { + "id": 12, + "name": "default", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "comment": { + "shortText": "Will not be re-exported from export.ts using export * from..." }, - "signatures": [ + "parameters": [ { - "id": 146, - "name": "forEachChild", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "typeParameter": [ - { - "id": 147, - "name": "T", - "kind": 131072, - "kindString": "Type parameter", - "flags": { - "isExported": true - } - } - ], - "parameters": [ - { - "id": 148, - "name": "cbNode", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 149, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 150, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 151, - "name": "node", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "id": 31, - "name": "Node" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 31 - } - ] - } - } - }, - { - "id": 152, - "name": "cbNodeArray", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 153, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 154, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 155, - "name": "nodes", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "id": 31, - "name": "Node" - } - ], - "name": "NodeArray" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 76 - } - ] - } - } - } - ], + "id": 13, + "name": "a", + "kind": 32768, + "kindString": "Parameter", + "flags": {}, "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] + "type": "intrinsic", + "name": "number" } } ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 20 - } - ] + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export.ts", + "line": 9, + "character": 1 }, { - "id": 110, - "name": "getChildAt", - "kind": 2048, - "kindString": "Method", + "fileName": "dist/test/converter/exports/mod.ts", + "line": 14, + "character": 31 + } + ] + }, + { + "id": 15, + "name": "add", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 16, + "name": "add", + "kind": 4096, + "kindString": "Call signature", "flags": { "isExported": true }, - "signatures": [ + "parameters": [ { - "id": 111, - "name": "getChildAt", - "kind": 4096, - "kindString": "Call signature", + "id": 17, + "name": "x", + "kind": 32768, + "kindString": "Parameter", "flags": { "isExported": true }, - "parameters": [ - { - "id": 112, - "name": "index", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, - { - "id": 113, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], "type": { - "type": "reference", - "id": 31, - "name": "Node" + "type": "intrinsic", + "name": "number" } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4859, - "character": 18 - } - ] - }, - { - "id": 107, - "name": "getChildCount", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ + }, { - "id": 108, - "name": "getChildCount", - "kind": 4096, - "kindString": "Call signature", + "id": 18, + "name": "y", + "kind": 32768, + "kindString": "Parameter", "flags": { "isExported": true }, - "parameters": [ - { - "id": 109, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], "type": { "type": "intrinsic", "name": "number" } } ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4858, - "character": 21 - } - ] - }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export.ts", + "line": 7, + "character": 12 + } + ] + } + ], + "groups": [ + { + "title": "References", + "kind": 16777216, + "children": [ + 33 + ] + }, + { + "title": "Modules", + "kind": 1, + "children": [ + 19 + ] + }, + { + "title": "Interfaces", + "kind": 256, + "children": [ + 36 + ] + }, + { + "title": "Variables", + "kind": 32, + "children": [ + 34, + 14 + ] + }, + { + "title": "Functions", + "kind": 64, + "children": [ + 11, + 15 + ] + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 1, + "name": "export-assignment", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/export-assignment.ts", + "sources": [ + { + "fileName": "dist/test/converter/exports/export-assignment.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 2, + "name": "export-default", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/export-default.ts", + "children": [ + { + "id": 3, + "name": "default", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "x", + "sources": [ + { + "fileName": "dist/test/converter/exports/export-default.ts", + "line": 1, + "character": 7 + } + ], + "type": { + "type": "unknown", + "name": "5" + }, + "defaultValue": "5" + } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 3 + ] + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export-default.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 4, + "name": "export-with-local", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/export-with-local.ts", + "children": [ + { + "id": 9, + "name": "x", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/export-with-local.ts", + "line": 1, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "5" + }, + "defaultValue": "5" + }, + { + "id": 5, + "name": "add", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "signatures": [ { - "id": 114, - "name": "getChildren", - "kind": 2048, - "kindString": "Method", + "id": 6, + "name": "add", + "kind": 4096, + "kindString": "Call signature", "flags": { "isExported": true }, - "signatures": [ + "parameters": [ { - "id": 115, - "name": "getChildren", - "kind": 4096, - "kindString": "Call signature", + "id": 7, + "name": "x", + "kind": 32768, + "kindString": "Parameter", "flags": { "isExported": true }, - "parameters": [ - { - "id": 116, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], "type": { - "type": "array", - "elementType": { - "type": "reference", - "id": 31, - "name": "Node" - } + "type": "intrinsic", + "name": "number" } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4860, - "character": 19 - } - ] - }, - { - "id": 123, - "name": "getEnd", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ + }, { - "id": 124, - "name": "getEnd", - "kind": 4096, - "kindString": "Call signature", + "id": 8, + "name": "y", + "kind": 32768, + "kindString": "Parameter", "flags": { "isExported": true }, @@ -1991,865 +915,13 @@ } } ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4863, - "character": 14 - } - ] - }, - { - "id": 139, - "name": "getFirstToken", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 140, - "name": "getFirstToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 141, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 31, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4869, - "character": 21 - } - ] - }, - { - "id": 121, - "name": "getFullStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 122, - "name": "getFullStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4862, - "character": 20 - } - ] - }, - { - "id": 133, - "name": "getFullText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 134, - "name": "getFullText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 135, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4867, - "character": 19 - } - ] - }, - { - "id": 128, - "name": "getFullWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 129, - "name": "getFullWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4865, - "character": 20 - } - ] - }, - { - "id": 142, - "name": "getLastToken", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 143, - "name": "getLastToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 144, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 31, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4870, - "character": 20 - } - ] - }, - { - "id": 130, - "name": "getLeadingTriviaWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 131, - "name": "getLeadingTriviaWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 132, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4866, - "character": 29 - } - ] - }, - { - "id": 105, - "name": "getSourceFile", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 106, - "name": "getSourceFile", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4857, - "character": 21 - } - ] - }, - { - "id": 117, - "name": "getStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 118, - "name": "getStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 119, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - }, - { - "id": 120, - "name": "includeJsDocComment", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "intrinsic", - "name": "boolean" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4861, - "character": 16 - } - ] - }, - { - "id": 136, - "name": "getText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 137, - "name": "getText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 138, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4868, - "character": 15 - } - ] - }, - { - "id": 125, - "name": "getWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 126, - "name": "getWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 127, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFileLike" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4864, - "character": 16 - } - ] - } - ], - "groups": [ - { - "title": "Properties", - "kind": 1024, - "children": [ - 100, - 104, - 99, - 98, - 101, - 102, - 103 - ] - }, - { - "title": "Methods", - "kind": 2048, - "children": [ - 145, - 110, - 107, - 114, - 123, - 139, - 121, - 133, - 128, - 142, - 130, - 105, - 117, - 136, - 125 - ] - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 496, - "character": 25 - }, - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4856, - "character": 18 - } - ], - "extendedTypes": [ - { - "type": "reference", - "name": "TextRange" - } - ] - }, - { - "id": 93, - "name": "a", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - }, - { - "id": 17, - "name": "add", - "kind": 64, - "kindString": "Function", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 18, - "name": "add", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 19, - "name": "x", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, - { - "id": 20, - "name": "y", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export.ts", - "line": 7, - "character": 12 - } - ] - }, - { - "id": 12, - "name": "default", - "kind": 64, - "kindString": "Function", - "flags": {}, - "signatures": [ - { - "id": 13, - "name": "default", - "kind": 4096, - "kindString": "Call signature", - "flags": {}, - "parameters": [ - { - "id": 14, - "name": "a", - "kind": 32768, - "kindString": "Parameter", - "flags": {}, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "type": { - "type": "intrinsic", - "name": "void" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export.ts", - "line": 9, - "character": 1 - } - ] - } - ], - "groups": [ - { - "title": "References", - "kind": 16777216, - "children": [ - 21, - 90, - 94, - 15 - ] - }, - { - "title": "Interfaces", - "kind": 256, - "children": [ - 97 - ] - }, - { - "title": "Variables", - "kind": 32, - "children": [ - 93 - ] - }, - { - "title": "Functions", - "kind": 64, - "children": [ - 17, - 12 - ] - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export.ts", - "line": 1, - "character": 0 - } - ] - }, - { - "id": 1, - "name": "export-assignment", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true - }, - "originalName": "%BASE%/exports/export-assignment.ts", - "sources": [ - { - "fileName": "dist/test/converter/exports/export-assignment.ts", - "line": 1, - "character": 0 - } - ] - }, - { - "id": 2, - "name": "export-default", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true - }, - "originalName": "%BASE%/exports/export-default.ts", - "children": [ - { - "id": 3, - "name": "default", - "kind": 16777216, - "kindString": "Reference", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 4, - "name": "x", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/export-default.ts", - "line": 1, - "character": 7 - } - ], - "type": { - "type": "unknown", - "name": "5" - }, - "defaultValue": "5" - } - ], - "groups": [ - { - "title": "Variables", - "kind": 32, - "children": [ - 4 - ] - } - ], - "target": 4 - } - ], - "groups": [ - { - "title": "References", - "kind": 16777216, - "children": [ - 3 - ] - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export-default.ts", - "line": 1, - "character": 0 - } - ] - }, - { - "id": 5, - "name": "export-with-local", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true - }, - "originalName": "%BASE%/exports/export-with-local.ts", - "children": [ - { - "id": 10, - "name": "x", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/export-with-local.ts", - "line": 1, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "5" - }, - "defaultValue": "5" - }, - { - "id": 6, - "name": "add", - "kind": 64, - "kindString": "Function", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 7, - "name": "add", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 8, - "name": "x", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, - { - "id": 9, - "name": "y", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ { "fileName": "dist/test/converter/exports/export-with-local.ts", "line": 3, @@ -2863,14 +935,14 @@ "title": "Variables", "kind": 32, "children": [ - 10 + 9 ] }, { "title": "Functions", "kind": 64, "children": [ - 6 + 5 ] } ], @@ -2883,7 +955,7 @@ ] }, { - "id": 156, + "id": 44, "name": "mod", "kind": 1, "kindString": "Module", @@ -2893,1106 +965,172 @@ "originalName": "%BASE%/exports/mod.ts", "children": [ { - "id": 160, - "name": "b", - "kind": 16777216, - "kindString": "Reference", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 161, - "name": "a", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - } - ], - "groups": [ - { - "title": "Variables", - "kind": 32, - "children": [ - 161 - ] - } - ], - "target": 16 - }, - { - "id": 162, - "name": "c", - "kind": 16777216, - "kindString": "Reference", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 163, - "name": "a", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "comment": { - "shortText": "A simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - } - ], - "groups": [ - { - "title": "Variables", - "kind": 32, - "children": [ - 163 - ] - } - ], - "target": 16 - }, - { - "id": 165, - "name": "Node", - "kind": 256, - "kindString": "Interface", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 168, - "name": "decorators", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 499, - "character": 18 - } - ], - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "name": "Decorator" - } - ], - "name": "NodeArray" - } - }, - { - "id": 172, - "name": "end", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 73, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 38, - "name": "TextRange.end" - } - }, - { - "id": 167, - "name": "flags", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 498, - "character": 13 - } - ], - "type": { - "type": "reference", - "name": "NodeFlags" - } - }, - { - "id": 166, - "name": "kind", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 497, - "character": 12 - } - ], - "type": { - "type": "reference", - "name": "SyntaxKind" - } - }, - { - "id": 169, - "name": "modifiers", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 500, - "character": 17 - } - ], - "type": { - "type": "reference", - "name": "ModifiersArray" - } - }, - { - "id": 170, - "name": "parent", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 501, - "character": 14 - } - ], - "type": { - "type": "reference", - "id": 31, - "name": "Node" - } - }, + "id": 50, + "name": "Node", + "kind": 256, + "kindString": "Interface", + "flags": { + "isExported": true + }, + "children": [ { - "id": 171, - "name": "pos", + "id": 53, + "name": "decorators", "kind": 1024, "kindString": "Property", "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 72, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 37, - "name": "TextRange.pos" - } - }, - { - "id": 213, - "name": "forEachChild", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 214, - "name": "forEachChild", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "typeParameter": [ - { - "id": 215, - "name": "T", - "kind": 131072, - "kindString": "Type parameter", - "flags": { - "isExported": true - } - } - ], - "parameters": [ - { - "id": 216, - "name": "cbNode", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 217, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 218, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 219, - "name": "node", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "id": 31, - "name": "Node" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 31 - } - ] - } - } - }, - { - "id": 220, - "name": "cbNodeArray", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 221, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 222, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 223, - "name": "nodes", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "id": 31, - "name": "Node" - } - ], - "name": "NodeArray" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 76 - } - ] - } - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "typeParameter", - "name": "T" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4871, - "character": 20 - } - ] - }, - { - "id": 178, - "name": "getChildAt", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 179, - "name": "getChildAt", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 180, - "name": "index", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, - { - "id": 181, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "reference", - "id": 31, - "name": "Node" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4859, - "character": 18 - } - ] - }, - { - "id": 175, - "name": "getChildCount", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 176, - "name": "getChildCount", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 177, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4858, - "character": 21 - } - ] - }, - { - "id": 182, - "name": "getChildren", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 183, - "name": "getChildren", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 184, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "array", - "elementType": { - "type": "reference", - "id": 31, - "name": "Node" - } - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4860, - "character": 19 - } - ] - }, - { - "id": 191, - "name": "getEnd", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 192, - "name": "getEnd", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4863, - "character": 14 - } - ] - }, - { - "id": 207, - "name": "getFirstToken", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 208, - "name": "getFirstToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 209, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 31, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4869, - "character": 21 - } - ] - }, - { - "id": 189, - "name": "getFullStart", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 190, - "name": "getFullStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4862, - "character": 20 - } - ] - }, - { - "id": 201, - "name": "getFullText", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 202, - "name": "getFullText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 203, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4867, - "character": 19 - } - ] - }, - { - "id": 196, - "name": "getFullWidth", - "kind": 2048, - "kindString": "Method", - "flags": { - "isExported": true + "isExported": true, + "isOptional": true }, - "signatures": [ - { - "id": 197, - "name": "getFullWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], "sources": [ { "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4865, - "character": 20 + "line": 499, + "character": 18 } - ] + ], + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "name": "Decorator" + } + ], + "name": "NodeArray" + } }, { - "id": 210, - "name": "getLastToken", - "kind": 2048, - "kindString": "Method", + "id": 57, + "name": "end", + "kind": 1024, + "kindString": "Property", "flags": { "isExported": true }, - "signatures": [ - { - "id": 211, - "name": "getLastToken", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 212, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "union", - "types": [ - { - "type": "reference", - "id": 31, - "name": "Node" - }, - { - "type": "intrinsic", - "name": "undefined" - } - ] - } - } - ], "sources": [ { "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4870, - "character": 20 + "line": 73, + "character": 11 } - ] + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 32, + "name": "TextRange.end" + } }, { - "id": 198, - "name": "getLeadingTriviaWidth", - "kind": 2048, - "kindString": "Method", + "id": 52, + "name": "flags", + "kind": 1024, + "kindString": "Property", "flags": { "isExported": true }, - "signatures": [ - { - "id": 199, - "name": "getLeadingTriviaWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 200, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], "sources": [ { "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4866, - "character": 29 + "line": 498, + "character": 13 } - ] + ], + "type": { + "type": "reference", + "name": "NodeFlags" + } }, { - "id": 173, - "name": "getSourceFile", - "kind": 2048, - "kindString": "Method", + "id": 51, + "name": "kind", + "kind": 1024, + "kindString": "Property", "flags": { "isExported": true }, - "signatures": [ - { - "id": 174, - "name": "getSourceFile", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], "sources": [ { "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4857, - "character": 21 + "line": 497, + "character": 12 } - ] + ], + "type": { + "type": "reference", + "name": "SyntaxKind" + } }, { - "id": 185, - "name": "getStart", - "kind": 2048, - "kindString": "Method", + "id": 54, + "name": "modifiers", + "kind": 1024, + "kindString": "Property", "flags": { - "isExported": true + "isExported": true, + "isOptional": true }, - "signatures": [ - { - "id": 186, - "name": "getStart", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 187, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - }, - { - "id": 188, - "name": "includeJsDocComment", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "intrinsic", - "name": "boolean" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], "sources": [ { "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4861, - "character": 16 + "line": 500, + "character": 17 } - ] + ], + "type": { + "type": "reference", + "name": "ModifiersArray" + } }, { - "id": 204, - "name": "getText", - "kind": 2048, - "kindString": "Method", + "id": 55, + "name": "parent", + "kind": 1024, + "kindString": "Property", "flags": { "isExported": true }, - "signatures": [ - { - "id": 205, - "name": "getText", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 206, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFile" - } - } - ], - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], "sources": [ { "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4868, - "character": 15 + "line": 501, + "character": 14 } - ] + ], + "type": { + "type": "reference", + "id": 25, + "name": "Node" + } }, { - "id": 193, - "name": "getWidth", - "kind": 2048, - "kindString": "Method", + "id": 56, + "name": "pos", + "kind": 1024, + "kindString": "Property", "flags": { "isExported": true }, - "signatures": [ - { - "id": 194, - "name": "getWidth", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 195, - "name": "sourceFile", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true, - "isOptional": true - }, - "type": { - "type": "reference", - "name": "SourceFileLike" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], "sources": [ { "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4864, - "character": 16 + "line": 72, + "character": 11 } - ] + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 31, + "name": "TextRange.pos" + } } ], "groups": [ @@ -4000,34 +1138,13 @@ "title": "Properties", "kind": 1024, "children": [ - 168, - 172, - 167, - 166, - 169, - 170, - 171 - ] - }, - { - "title": "Methods", - "kind": 2048, - "children": [ - 213, - 178, - 175, - 182, - 191, - 207, - 189, - 201, - 196, - 210, - 198, - 173, - 185, - 204, - 193 + 53, + 57, + 52, + 51, + 54, + 55, + 56 ] } ], @@ -4036,11 +1153,6 @@ "fileName": "node_modules/typescript/lib/typescript.d.ts", "line": 496, "character": 25 - }, - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 4856, - "character": 18 } ], "extendedTypes": [ @@ -4051,14 +1163,46 @@ ] }, { - "id": 159, - "name": "a", + "id": 47, + "name": "b", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + }, + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 48, + "name": "c", "kind": 32, "kindString": "Variable", "flags": { "isExported": true, "isConst": true }, + "originalName": "a", "comment": { "shortText": "A simple named export that will be exported from export.ts" }, @@ -4076,14 +1220,16 @@ "defaultValue": "1" }, { - "id": 157, + "id": 45, "name": "default", "kind": 64, "kindString": "Function", - "flags": {}, + "flags": { + "isExported": true + }, "signatures": [ { - "id": 158, + "id": 46, "name": "default", "kind": 4096, "kindString": "Call signature", @@ -4107,33 +1253,26 @@ } ], "groups": [ - { - "title": "References", - "kind": 16777216, - "children": [ - 160, - 162 - ] - }, { "title": "Interfaces", "kind": 256, "children": [ - 165 + 50 ] }, { "title": "Variables", "kind": 32, "children": [ - 159 + 47, + 48 ] }, { "title": "Functions", "kind": 64, "children": [ - 157 + 45 ] } ], @@ -4151,11 +1290,11 @@ "title": "Modules", "kind": 1, "children": [ - 11, + 10, 1, 2, - 5, - 156 + 4, + 44 ] } ] From 42ebbee927d05d42d9a4ff67ea12bf32d204f8b7 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Thu, 6 Feb 2020 14:55:18 +0100 Subject: [PATCH 12/28] typescript getFullyQualifiedName wrapping to prefix by sourceFile name in case not present --- src/lib/converter/context.ts | 26 ++++++++++++++++++-- src/lib/converter/factories/reference.ts | 4 +-- src/lib/converter/nodes/export.ts | 2 +- src/lib/converter/plugins/DecoratorPlugin.ts | 2 +- src/lib/converter/types/alias.ts | 3 +-- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts index be6a747f3..76839c8f7 100644 --- a/src/lib/converter/context.ts +++ b/src/lib/converter/context.ts @@ -179,7 +179,7 @@ export class Context { */ registerReflection(reflection: Reflection, symbol?: ts.Symbol) { if (symbol) { - this.project.registerReflection(reflection, this.checker.getFullyQualifiedName(symbol)); + this.project.registerReflection(reflection, this.getFullyQualifiedName(symbol)); } else { this.project.registerReflection(reflection); } @@ -304,7 +304,7 @@ export class Context { } if (baseNode.symbol) { - const id = this.checker.getFullyQualifiedName(baseNode.symbol); + const id = this.getFullyQualifiedName(baseNode.symbol); if (this.inheritedChildren && this.inheritedChildren.includes(id)) { return target; } else { @@ -398,6 +398,28 @@ export class Context { return typeParameters; } + + /** + * Typscript getFullyQualifiedName method don't always return unique string + * in this case prefix it with sourcefile name + * + * @param symbol + */ + getFullyQualifiedName(symbol: ts.Symbol): string { + let fullyQualifiedName = this.checker.getFullyQualifiedName(symbol); + if (!fullyQualifiedName.startsWith(`"`)) { + if (symbol.declarations) { + const node = symbol.declarations[0]; + if (node) { + const sourceFile = node.getSourceFile(); + const filePath = sourceFile.fileName; + fullyQualifiedName = `"${filePath}".${fullyQualifiedName}`; + } + } + } + + return fullyQualifiedName; + } } function isNamedNode(node: ts.Node): node is ts.Node & { name: ts.Identifier | ts.ComputedPropertyName } { diff --git a/src/lib/converter/factories/reference.ts b/src/lib/converter/factories/reference.ts index dbd92a2f2..c26103a66 100644 --- a/src/lib/converter/factories/reference.ts +++ b/src/lib/converter/factories/reference.ts @@ -25,7 +25,7 @@ export function createReferenceType(context: Context, symbol: ts.Symbol | undefi name = checker.symbolToString(symbol.parent) + '.' + name; } - return new ReferenceType(name, context.checker.getFullyQualifiedName(symbol)); + return new ReferenceType(name, context.getFullyQualifiedName(symbol)); } export function createReferenceReflection(context: Context, source: ts.Symbol, target: ts.Symbol): ReferenceReflection | undefined { @@ -39,7 +39,7 @@ export function createReferenceReflection(context: Context, source: ts.Symbol, t return; } - const reflection = new ReferenceReflection(source.name, [ReferenceState.Unresolved, context.checker.getFullyQualifiedName(target)], context.scope); + const reflection = new ReferenceReflection(source.name, [ReferenceState.Unresolved, context.getFullyQualifiedName(target)], context.scope); reflection.flags.setFlag(ReflectionFlag.Exported, true); // References are exported by necessity if (!context.scope.children) { context.scope.children = []; diff --git a/src/lib/converter/nodes/export.ts b/src/lib/converter/nodes/export.ts index f48cfc3c4..9c6aaf401 100644 --- a/src/lib/converter/nodes/export.ts +++ b/src/lib/converter/nodes/export.ts @@ -32,7 +32,7 @@ export class ExportConverter extends ConverterNodeComponent return; } - const reflection = project.getReflectionFromFQN(context.checker.getFullyQualifiedName(declaration.symbol)); + const reflection = project.getReflectionFromFQN(context.getFullyQualifiedName(declaration.symbol)); if (node.isExportEquals && reflection instanceof DeclarationReflection) { reflection.setFlag(ReflectionFlag.ExportAssignment, true); } diff --git a/src/lib/converter/plugins/DecoratorPlugin.ts b/src/lib/converter/plugins/DecoratorPlugin.ts index 1015ca1a4..79e0a4a6b 100644 --- a/src/lib/converter/plugins/DecoratorPlugin.ts +++ b/src/lib/converter/plugins/DecoratorPlugin.ts @@ -95,7 +95,7 @@ export class DecoratorPlugin extends ConverterComponent { const type = context.checker.getTypeAtLocation(identifier); if (type && type.symbol) { - const fqn = context.checker.getFullyQualifiedName(type.symbol); + const fqn = context.getFullyQualifiedName(type.symbol); info.type = new ReferenceType(info.name, fqn); if (callExpression && callExpression.arguments) { diff --git a/src/lib/converter/types/alias.ts b/src/lib/converter/types/alias.ts index ccd726c9a..da19bd48a 100644 --- a/src/lib/converter/types/alias.ts +++ b/src/lib/converter/types/alias.ts @@ -32,8 +32,7 @@ export class AliasConverter extends ConverterTypeComponent implements TypeNodeCo return true; } - const checker = context.checker; - const fqn = checker.getFullyQualifiedName(type.symbol); + const fqn = context.getFullyQualifiedName(type.symbol); let symbolName = fqn.replace(/".*"\./, '').split('.'); if (!symbolName.length) { From db1f74f4816076b2cd437b54c7ec3fcad288db58 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Thu, 6 Feb 2020 14:56:21 +0100 Subject: [PATCH 13/28] typescript getFullyQualifiedName wrapping to prefix by sourceFile name in case not present --- src/lib/converter/context.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts index 76839c8f7..0532e8de1 100644 --- a/src/lib/converter/context.ts +++ b/src/lib/converter/context.ts @@ -407,7 +407,7 @@ export class Context { */ getFullyQualifiedName(symbol: ts.Symbol): string { let fullyQualifiedName = this.checker.getFullyQualifiedName(symbol); - if (!fullyQualifiedName.startsWith(`"`)) { + if (!fullyQualifiedName.startsWith('"')) { if (symbol.declarations) { const node = symbol.declarations[0]; if (node) { From cf8ed0c263fdabe88109223c24b40f9105b65bf5 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Thu, 6 Feb 2020 15:19:12 +0100 Subject: [PATCH 14/28] don't forgot to flag as exported the default case --- src/lib/converter/nodes/block.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/converter/nodes/block.ts b/src/lib/converter/nodes/block.ts index 15b6bf6c9..1bb6e2277 100644 --- a/src/lib/converter/nodes/block.ts +++ b/src/lib/converter/nodes/block.ts @@ -126,6 +126,8 @@ export class BlockConverter extends ConverterNodeComponent Date: Thu, 6 Feb 2020 23:30:01 +0100 Subject: [PATCH 15/28] always create ReferenceReflection in export {A} declaration: event if the A reflection is already locally declared, exports inside local modules/namespaces need to refer it. In case of library mode, if ReferenceReflection not created, local modules/namespaces were empty without it --- src/lib/converter/nodes/export.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/lib/converter/nodes/export.ts b/src/lib/converter/nodes/export.ts index 9c6aaf401..575b48e9c 100644 --- a/src/lib/converter/nodes/export.ts +++ b/src/lib/converter/nodes/export.ts @@ -74,12 +74,6 @@ export class ExportDeclarationConverter extends ConverterNodeComponent Date: Fri, 7 Feb 2020 00:12:02 +0100 Subject: [PATCH 16/28] referenceReflexion in namespaces fix: copy the sourcefile export logic --- package.json | 2 +- src/lib/converter/nodes/block.ts | 2 +- src/lib/converter/nodes/export.ts | 45 ++++++++++++++++++++++++++++--- 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e087b92ff..f464b1cbf 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ ], "scripts": { "pretest": "node scripts/copy_test_files.js", - "test": "nyc --reporter=html --reporter=text-summary mocha --timeout=10000 'dist/test/**/*.test.js'", + "test": "nyc --reporter=html --reporter=text-summary mocha --timeout=20000 'dist/test/**/*.test.js'", "prerebuild_specs": "npm run pretest", "rebuild_specs": "node scripts/rebuild_specs.js", "build": "tsc --project .", diff --git a/src/lib/converter/nodes/block.ts b/src/lib/converter/nodes/block.ts index 1bb6e2277..5fbe6f825 100644 --- a/src/lib/converter/nodes/block.ts +++ b/src/lib/converter/nodes/block.ts @@ -114,7 +114,7 @@ export class BlockConverter extends ConverterNodeComponent { @@ -58,9 +64,12 @@ export class ExportConverter extends ConverterNodeComponent export class ExportDeclarationConverter extends ConverterNodeComponent { supports = [ts.SyntaxKind.ExportDeclaration]; + @BindOption('mode') + mode!: SourceFileMode; + convert(context: Context, node: ts.ExportDeclaration): Reflection | undefined { // It doesn't make sense to convert export declarations if we are pretending everything is global. - if (this.application.options.getValue('mode') === SourceFileMode.File) { + if (this.mode === SourceFileMode.File) { return; } @@ -74,7 +83,35 @@ export class ExportDeclarationConverter extends ConverterNodeComponent Date: Fri, 7 Feb 2020 00:37:55 +0100 Subject: [PATCH 17/28] tslint fix --- src/lib/converter/nodes/export.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/converter/nodes/export.ts b/src/lib/converter/nodes/export.ts index 07c99d10b..2c5e8c7db 100644 --- a/src/lib/converter/nodes/export.ts +++ b/src/lib/converter/nodes/export.ts @@ -10,7 +10,7 @@ import { import { Context } from '../context'; import { Component, ConverterNodeComponent } from '../components'; import { createReferenceReflection } from '../factories/reference'; -import {BindOption, SourceFileMode} from '../../utils'; +import { BindOption, SourceFileMode } from '../../utils'; @Component({name: 'node:export'}) export class ExportConverter extends ConverterNodeComponent { From 5eb1a7b71aa5bf6a709a7befde886163bca41c88 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Mon, 4 May 2020 11:01:10 +0200 Subject: [PATCH 18/28] correct isExported support --- src/lib/converter/factories/declaration.ts | 10 ++++------ src/lib/converter/nodes/block.ts | 8 +++++--- src/lib/converter/nodes/export.ts | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/converter/factories/declaration.ts b/src/lib/converter/factories/declaration.ts index 008a39537..3fed65fb5 100644 --- a/src/lib/converter/factories/declaration.ts +++ b/src/lib/converter/factories/declaration.ts @@ -71,14 +71,14 @@ export function createDeclaration(context: Context, node: ts.Declaration, kind: // Test whether the node is exported let isExported: boolean; - if (kind === ReflectionKind.Module || kind === ReflectionKind.Global) { + if (kind === ReflectionKind.Global) { isExported = true; - } else if (container.kind === ReflectionKind.Global) { + } else if (!container || container.kind === ReflectionKind.Global) { // In file mode, everything is exported. isExported = true; } else if (container.kindOf([ReflectionKind.Namespace, ReflectionKind.Module])) { const symbol = context.getSymbolAtLocation(node); - if (!symbol) { + if (!symbol || !node.parent) { isExported = false; } else { let parentNode = node.parent; @@ -87,9 +87,7 @@ export function createDeclaration(context: Context, node: ts.Declaration, kind: } const parentSymbol = context.getSymbolAtLocation(parentNode); if (!parentSymbol) { - // This is a file with no imports/exports, so everything is - // global and therefore exported. - isExported = true; + isExported = false; } else { isExported = !!parentSymbol.exports?.get(symbol.escapedName); } diff --git a/src/lib/converter/nodes/block.ts b/src/lib/converter/nodes/block.ts index 5fbe6f825..7793fd24c 100644 --- a/src/lib/converter/nodes/block.ts +++ b/src/lib/converter/nodes/block.ts @@ -72,7 +72,11 @@ export class BlockConverter extends ConverterNodeComponent { this.convertVisibleDeclarations(context, node); - result!.setFlag(ReflectionFlag.Exported); + + // only mark as exported the input files + if (isInputFile(node)) { + result!.setFlag(ReflectionFlag.Exported); + } }); } else { this.convertVisibleDeclarations(context, node); @@ -129,8 +133,6 @@ export class BlockConverter extends ConverterNodeComponent { + const elements = (node.exportClause as ts.NamedExports).elements || []; + elements.forEach(specifier => { const source = context.getSymbolAtLocation(specifier.name); const target = context.resolveAliasedSymbol(context.getSymbolAtLocation(specifier.propertyName ?? specifier.name)); if (source && target) { @@ -102,7 +103,6 @@ export class ExportDeclarationConverter extends ConverterNodeComponent Date: Mon, 4 May 2020 11:02:15 +0200 Subject: [PATCH 19/28] update type reference management with real FQN --- src/lib/converter/plugins/TypePlugin.ts | 4 +++- src/lib/converter/types/alias.ts | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib/converter/plugins/TypePlugin.ts b/src/lib/converter/plugins/TypePlugin.ts index 0c015e0e6..f07cc8210 100644 --- a/src/lib/converter/plugins/TypePlugin.ts +++ b/src/lib/converter/plugins/TypePlugin.ts @@ -1,5 +1,5 @@ import { Reflection, ReflectionKind, Decorator, DeclarationReflection, DeclarationHierarchy } from '../../models/reflections/index'; -import { Type, ReferenceType, TupleType, UnionType, IntersectionType, ArrayType, TypeOperatorType, QueryType } from '../../models/types/index'; +import { Type, ReferenceType, TupleType, UnionType, IntersectionType, ArrayType, TypeOperatorType, QueryType, IndexedAccessType } from '../../models/types/index'; import { Component, ConverterComponent } from '../components'; import { Converter } from '../converter'; import { Context } from '../context'; @@ -110,6 +110,8 @@ export class TypePlugin extends ConverterComponent { resolveType(reflection, type.target); } else if (type instanceof QueryType) { resolveType(reflection, type.queryType); + } else if (type instanceof IndexedAccessType) { + resolveType(reflection, type.objectType); } } } diff --git a/src/lib/converter/types/alias.ts b/src/lib/converter/types/alias.ts index da19bd48a..a0f7207df 100644 --- a/src/lib/converter/types/alias.ts +++ b/src/lib/converter/types/alias.ts @@ -69,7 +69,13 @@ export class AliasConverter extends ConverterTypeComponent implements TypeNodeCo */ convertNode(context: Context, node: ts.TypeReferenceNode): ReferenceType { const name = node.typeName.getText(); - const result = new ReferenceType(name, ReferenceType.SYMBOL_FQN_RESOLVE_BY_NAME); + + let result: ReferenceType; + const identifier = (ts.isQualifiedName(node.typeName)) ? node.typeName.right : node.typeName; + const symbol = context.getSymbolAtLocation(identifier); + const resolved = context.resolveAliasedSymbol(symbol); + const FQN = (resolved) ? context.getFullyQualifiedName(resolved) : ReferenceType.SYMBOL_FQN_RESOLVE_BY_NAME; + result = new ReferenceType(name, FQN); if (node.typeArguments) { result.typeArguments = this.owner.convertTypes(context, node.typeArguments); From 47fb9380006f3b74cfb58af34b982fe03e1b8d64 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Wed, 6 May 2020 18:19:59 +0200 Subject: [PATCH 20/28] correct export symbol comparison (do not base it only on name) --- src/lib/converter/factories/declaration.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/converter/factories/declaration.ts b/src/lib/converter/factories/declaration.ts index 3fed65fb5..3d293c29e 100644 --- a/src/lib/converter/factories/declaration.ts +++ b/src/lib/converter/factories/declaration.ts @@ -88,8 +88,16 @@ export function createDeclaration(context: Context, node: ts.Declaration, kind: const parentSymbol = context.getSymbolAtLocation(parentNode); if (!parentSymbol) { isExported = false; + } else if (parentSymbol.exports) { + isExported = false; + parentSymbol.exports.forEach((exportSymbol) => { + if (!isExported) { + const realSymbol = context.resolveAliasedSymbol(exportSymbol); + isExported = (realSymbol === symbol); + } + }); } else { - isExported = !!parentSymbol.exports?.get(symbol.escapedName); + isExported = false; } } } else { From ebfd032844ebf1dd866cfcbad299f10b20bd4ab6 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Wed, 6 May 2020 18:29:03 +0200 Subject: [PATCH 21/28] context remaining symbol reflections support added --- src/lib/converter/context.ts | 61 +++++++++++++++++++++++++++- src/lib/converter/converter.ts | 4 +- src/lib/converter/types/alias.ts | 4 ++ src/lib/converter/types/reference.ts | 3 ++ 4 files changed, 69 insertions(+), 3 deletions(-) diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts index 0532e8de1..f46b40f24 100644 --- a/src/lib/converter/context.ts +++ b/src/lib/converter/context.ts @@ -3,10 +3,11 @@ import { IMinimatch } from 'minimatch'; import { Logger } from '../utils/loggers'; import { createMinimatch } from '../utils/paths'; -import { Reflection, ProjectReflection, ContainerReflection, Type } from '../models/index'; +import { Reflection, ProjectReflection, ContainerReflection, Type, ReflectionFlag, ReflectionKind } from '../models/index'; import { createTypeParameter } from './factories/type-parameter'; import { Converter } from './converter'; +import {createDeclaration} from './factories'; /** * The context describes the current state the converter is in. @@ -87,6 +88,11 @@ export class Context { */ visitStack: ts.Node[]; + /** + * A map of remaining symbols to process. + */ + remainingSymbolReflections = new Map(); + /** * The pattern that should be used to flag external source files. */ @@ -179,7 +185,10 @@ export class Context { */ registerReflection(reflection: Reflection, symbol?: ts.Symbol) { if (symbol) { - this.project.registerReflection(reflection, this.getFullyQualifiedName(symbol)); + const fqn = this.getFullyQualifiedName(symbol); + this.project.registerReflection(reflection, fqn); + + this.removeRemainingSymbolReflection(fqn); } else { this.project.registerReflection(reflection); } @@ -420,6 +429,54 @@ export class Context { return fullyQualifiedName; } + + saveRemainingSymbolReflection(fqn: string, symbol: ts.Symbol) { + if (!this.remainingSymbolReflections.has(fqn) && !this.project.getReflectionFromFQN(fqn)) { + this.remainingSymbolReflections.set(fqn, symbol); + } + } + + removeRemainingSymbolReflection(fqn: string) { + this.remainingSymbolReflections.delete(fqn); + } + + hasRemainingSymbolReflections() { + return (this.remainingSymbolReflections.size > 0); + } + + convertRemainingSymbolReflections() { + if (this.hasRemainingSymbolReflections()) { + this.remainingSymbolReflections.forEach((symbol, fqn) => { + const declaration = symbol.declarations?.[0]; + if (declaration) { + const sourceFile = declaration.getSourceFile(); + if (sourceFile.symbol) { + const sourceFQN = this.getFullyQualifiedName(sourceFile.symbol); + const sourceReflection = this.project.getReflectionFromFQN(sourceFQN); + + if (sourceReflection) { + this.withScope(sourceReflection, () => { + const reflection = this.converter.convertNode(this, declaration); + reflection?.setFlag(ReflectionFlag.Exported, true); + }); + } else { + this.withSourceFile(sourceFile, () => { + const containerReflection = createDeclaration(this, sourceFile, ReflectionKind.Module, sourceFile.fileName); + containerReflection?.setFlag(ReflectionFlag.Exported, false); + + this.withScope(containerReflection, () => { + const reflection = this.converter.convertNode(this, declaration); + reflection?.setFlag(ReflectionFlag.Exported, true); + }); + }); + } + } + + } + }); + this.remainingSymbolReflections.clear(); + } + } } function isNamedNode(node: ts.Node): node is ts.Node & { name: ts.Identifier | ts.ComputedPropertyName } { diff --git a/src/lib/converter/converter.ts b/src/lib/converter/converter.ts index 1c59e826a..c68b7b2b5 100644 --- a/src/lib/converter/converter.ts +++ b/src/lib/converter/converter.ts @@ -1,5 +1,4 @@ import * as ts from 'typescript'; -import * as _ts from '../ts-internal'; import * as _ from 'lodash'; import { Application } from '../application'; @@ -383,6 +382,9 @@ export class Converter extends ChildableComponent Date: Wed, 6 May 2020 19:18:34 +0200 Subject: [PATCH 22/28] shortcut sub-modules namings by removing parent name from it --- .../converter/plugins/DynamicModulePlugin.ts | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/lib/converter/plugins/DynamicModulePlugin.ts b/src/lib/converter/plugins/DynamicModulePlugin.ts index 012756015..e0a16f2b9 100644 --- a/src/lib/converter/plugins/DynamicModulePlugin.ts +++ b/src/lib/converter/plugins/DynamicModulePlugin.ts @@ -77,7 +77,17 @@ export class DynamicModulePlugin extends ConverterComponent { */ private onBeginResolve(context: Context) { this.reflections.forEach((reflection) => { - let name = reflection.name.replace(/"/g, ''); + let name = reflection.name; + + // // for sub modules, remove the parent name prefix instead of the full name + if (reflection.parent) { + const commonString = this.getCommonString(reflection.parent.originalName, reflection.originalName); + if (commonString && commonString.endsWith('/')) { + name = reflection.originalName.substring(commonString.length); + } + } + + name = name.replace(/"/g, ''); const currentExtension = Path.extname(name); const hiddenExtensions = (this.hiddenExtension.includes(currentExtension)) ? @@ -102,4 +112,14 @@ export class DynamicModulePlugin extends ConverterComponent { reflection.name = reflection.name.replace(nodeModulesRegexp, ''); }); } + + private getCommonString(string1: string, string2: string): string { + let i = 0; + const maxlength = Math.max(string1.length, string2.length); + while (i < maxlength && string1[i] === string2[i]) { + i++; + } + + return string1.substring(0, i); + } } From d24a41894abcac31359a041b6a893b74440c9727 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Thu, 7 May 2020 01:13:33 +0200 Subject: [PATCH 23/28] add all referenceType symbol support --- src/lib/converter/factories/reference.ts | 5 ++++- src/lib/converter/types/reference.ts | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/converter/factories/reference.ts b/src/lib/converter/factories/reference.ts index c26103a66..a947a5e38 100644 --- a/src/lib/converter/factories/reference.ts +++ b/src/lib/converter/factories/reference.ts @@ -25,7 +25,10 @@ export function createReferenceType(context: Context, symbol: ts.Symbol | undefi name = checker.symbolToString(symbol.parent) + '.' + name; } - return new ReferenceType(name, context.getFullyQualifiedName(symbol)); + const FQN = context.getFullyQualifiedName(symbol); + context.saveRemainingSymbolReflection(FQN, symbol); + + return new ReferenceType(name, FQN); } export function createReferenceReflection(context: Context, source: ts.Symbol, target: ts.Symbol): ReferenceReflection | undefined { diff --git a/src/lib/converter/types/reference.ts b/src/lib/converter/types/reference.ts index fc16f4aa0..4d5ed2449 100644 --- a/src/lib/converter/types/reference.ts +++ b/src/lib/converter/types/reference.ts @@ -52,9 +52,6 @@ export class ReferenceConverter extends ConverterTypeComponent implements TypeNo } const result = createReferenceType(context, type.symbol); - if (result) { - context.saveRemainingSymbolReflection(result.symbolFullyQualifiedName, type.symbol); - } if (result && node.typeArguments) { result.typeArguments = this.owner.convertTypes(context, node.typeArguments); } From f61beccf7c8dc51d89bdb2b4ba73c54fa41029e6 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Thu, 7 May 2020 01:14:57 +0200 Subject: [PATCH 24/28] upgrade typescript version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f464b1cbf..675e69bdc 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "mockery": "^2.1.0", "nyc": "15.0.0", "tslint": "^5.20.1", - "typescript": "3.7.x" + "typescript": "3.8.x" }, "files": [ "bin", From fcfc68b85a73cb64875b51dd82a21167aa3abd93 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Mon, 11 May 2020 09:49:02 +0200 Subject: [PATCH 25/28] remaining symbols declaration refactoring --- src/lib/converter/context.ts | 52 +++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts index f46b40f24..f75cb61ba 100644 --- a/src/lib/converter/context.ts +++ b/src/lib/converter/context.ts @@ -448,30 +448,46 @@ export class Context { if (this.hasRemainingSymbolReflections()) { this.remainingSymbolReflections.forEach((symbol, fqn) => { const declaration = symbol.declarations?.[0]; + if (declaration) { - const sourceFile = declaration.getSourceFile(); - if (sourceFile.symbol) { - const sourceFQN = this.getFullyQualifiedName(sourceFile.symbol); - const sourceReflection = this.project.getReflectionFromFQN(sourceFQN); - - if (sourceReflection) { - this.withScope(sourceReflection, () => { - const reflection = this.converter.convertNode(this, declaration); - reflection?.setFlag(ReflectionFlag.Exported, true); + const declareRecursively = (node): Reflection | undefined => { + let reflection: Reflection | undefined = undefined; + let scope: Reflection | undefined = undefined; + const parentNode = node.parent; + if (parentNode) { + if (parentNode.symbol) { + const parentFQN = this.getFullyQualifiedName(parentNode.symbol); + const parentReflection = this.project.getReflectionFromFQN(parentFQN); + + if (parentReflection) { + scope = parentReflection; + } + } + + if (!scope) { + scope = declareRecursively(parentNode); + } + } + + if (scope) { + this.withScope(scope, () => { + reflection = this.converter.convertNode(this, node); }); - } else { + } else if (node.kind === ts.SyntaxKind.SourceFile) { + const sourceFile = node as ts.SourceFile; this.withSourceFile(sourceFile, () => { - const containerReflection = createDeclaration(this, sourceFile, ReflectionKind.Module, sourceFile.fileName); - containerReflection?.setFlag(ReflectionFlag.Exported, false); - - this.withScope(containerReflection, () => { - const reflection = this.converter.convertNode(this, declaration); - reflection?.setFlag(ReflectionFlag.Exported, true); - }); + reflection = createDeclaration(this, sourceFile, ReflectionKind.Module, sourceFile.fileName); + reflection?.setFlag(ReflectionFlag.Exported, false); }); } - } + return reflection; + }; + + const reflection = declareRecursively(declaration); + if (reflection) { + reflection.setFlag(ReflectionFlag.Exported, true); + } } }); this.remainingSymbolReflections.clear(); From cbb97ee48b7a4e7704a1d67a8c4802be05fda30f Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Mon, 11 May 2020 10:46:37 +0200 Subject: [PATCH 26/28] correct file extension problem in FQN generation --- src/lib/converter/context.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts index f75cb61ba..84a3121bf 100644 --- a/src/lib/converter/context.ts +++ b/src/lib/converter/context.ts @@ -421,7 +421,15 @@ export class Context { const node = symbol.declarations[0]; if (node) { const sourceFile = node.getSourceFile(); - const filePath = sourceFile.fileName; + let filePath = sourceFile.fileName; + + const hiddenExtensions = ['.d.ts', '.ts', '.js']; + hiddenExtensions.forEach((hiddenExtension) => { + if (filePath.endsWith(hiddenExtension)) { + filePath = filePath.substr(0, filePath.length - hiddenExtension.length); + } + }) + fullyQualifiedName = `"${filePath}".${fullyQualifiedName}`; } } @@ -450,8 +458,7 @@ export class Context { const declaration = symbol.declarations?.[0]; if (declaration) { - const declareRecursively = (node): Reflection | undefined => { - let reflection: Reflection | undefined = undefined; + const declareRecursively = (node: ts.Node): Reflection | undefined => { let scope: Reflection | undefined = undefined; const parentNode = node.parent; if (parentNode) { @@ -469,6 +476,7 @@ export class Context { } } + let reflection: Reflection | undefined = undefined; if (scope) { this.withScope(scope, () => { reflection = this.converter.convertNode(this, node); From 3ceae584dfe0b64d19504ad08e7f18f6b8256866 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Mon, 11 May 2020 13:33:00 +0200 Subject: [PATCH 27/28] test specs alignment on updates --- src/test/converter/declaration/specs.d.json | 9 +- .../exports/specs-without-exported.json | 184 +- src/test/converter/exports/specs.json | 12 +- src/test/converter/exports/specs.lib.json | 2462 ++++++++--------- src/test/converter/mixin/specs.json | 215 ++ src/test/converter/react/specs.json | 40 +- .../default_export.defaultexportedclass.html | 2 +- .../default_export.notexportedclassname.html | 42 +- .../classes/flattened.flattenedclass.html | 82 +- .../renderer/specs/classes/mixin.base.html | 9 +- .../classes/mixin.someclasswithmixin.html | 24 +- .../renderer/specs/interfaces/generics.a.html | 32 +- .../specs/interfaces/generics.ab.html | 52 +- .../specs/interfaces/generics.abnumber.html | 52 +- .../specs/interfaces/generics.abstring.html | 52 +- .../renderer/specs/interfaces/generics.b.html | 42 +- .../specs/interfaces/mixin.mixin1type.html | 10 +- .../specs/interfaces/mixin.mixin2.html | 20 +- .../specs/modules/default_export.html | 6 +- .../renderer/specs/modules/flattened.html | 42 +- src/test/renderer/specs/modules/generics.html | 66 +- src/test/renderer/specs/modules/mixin.html | 103 +- 22 files changed, 1968 insertions(+), 1590 deletions(-) diff --git a/src/test/converter/declaration/specs.d.json b/src/test/converter/declaration/specs.d.json index 3a23604ca..a03be1301 100644 --- a/src/test/converter/declaration/specs.d.json +++ b/src/test/converter/declaration/specs.d.json @@ -19,18 +19,14 @@ "name": "Decl", "kind": 128, "kindString": "Class", - "flags": { - "isExported": true - }, + "flags": {}, "children": [ { "id": 3, "name": "prop", "kind": 1024, "kindString": "Property", - "flags": { - "isExported": true - }, + "flags": {}, "sources": [ { "fileName": "declaration.d.ts", @@ -67,7 +63,6 @@ "kind": 32, "kindString": "Variable", "flags": { - "isExported": true, "isConst": true }, "sources": [ diff --git a/src/test/converter/exports/specs-without-exported.json b/src/test/converter/exports/specs-without-exported.json index d3cfecf89..1f71514a7 100644 --- a/src/test/converter/exports/specs-without-exported.json +++ b/src/test/converter/exports/specs-without-exported.json @@ -5,7 +5,7 @@ "flags": {}, "children": [ { - "id": 14, + "id": 19, "name": "export", "kind": 1, "kindString": "Module", @@ -15,47 +15,47 @@ "originalName": "%BASE%/exports/export.ts", "children": [ { - "id": 15, + "id": 20, "name": "a", "kind": 16777216, "kindString": "Reference", "flags": { "isExported": true }, - "target": 10 + "target": 15 }, { - "id": 16, + "id": 21, "name": "b", "kind": 16777216, "kindString": "Reference", "flags": { "isExported": true }, - "target": 10 + "target": 15 }, { - "id": 17, + "id": 22, "name": "c", "kind": 16777216, "kindString": "Reference", "flags": { "isExported": true }, - "target": 10 + "target": 15 }, { - "id": 19, + "id": 24, "name": "c", "kind": 16777216, "kindString": "Reference", "flags": { "isExported": true }, - "target": 10 + "target": 15 }, { - "id": 20, + "id": 25, "name": "add", "kind": 64, "kindString": "Function", @@ -64,7 +64,7 @@ }, "signatures": [ { - "id": 21, + "id": 26, "name": "add", "kind": 4096, "kindString": "Call signature", @@ -73,7 +73,7 @@ }, "parameters": [ { - "id": 22, + "id": 27, "name": "x", "kind": 32768, "kindString": "Parameter", @@ -86,7 +86,7 @@ } }, { - "id": 23, + "id": 28, "name": "y", "kind": 32768, "kindString": "Parameter", @@ -119,17 +119,17 @@ "title": "References", "kind": 16777216, "children": [ - 15, - 16, - 17, - 19 + 20, + 21, + 22, + 24 ] }, { "title": "Functions", "kind": 64, "children": [ - 20 + 25 ] } ], @@ -150,6 +150,77 @@ "isExported": true }, "originalName": "%BASE%/exports/export-assignment.ts", + "children": [ + { + "id": 2, + "name": "add", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExportAssignment": true + }, + "signatures": [ + { + "id": 3, + "name": "add", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 4, + "name": "x", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + }, + { + "id": 5, + "name": "y", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "export-assignment.ts", + "line": 1, + "character": 12 + } + ] + } + ], + "groups": [ + { + "title": "Functions", + "kind": 64, + "children": [ + 2 + ] + } + ], "sources": [ { "fileName": "export-assignment.ts", @@ -159,7 +230,7 @@ ] }, { - "id": 2, + "id": 6, "name": "export-default", "kind": 1, "kindString": "Module", @@ -167,6 +238,39 @@ "isExported": true }, "originalName": "%BASE%/exports/export-default.ts", + "children": [ + { + "id": 7, + "name": "x", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "sources": [ + { + "fileName": "export-default.ts", + "line": 1, + "character": 7 + } + ], + "type": { + "type": "unknown", + "name": "5" + }, + "defaultValue": "5" + } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 7 + ] + } + ], "sources": [ { "fileName": "export-default.ts", @@ -176,7 +280,7 @@ ] }, { - "id": 3, + "id": 8, "name": "export-with-local", "kind": 1, "kindString": "Module", @@ -186,7 +290,7 @@ "originalName": "%BASE%/exports/export-with-local.ts", "children": [ { - "id": 4, + "id": 9, "name": "x", "kind": 32, "kindString": "Variable", @@ -208,7 +312,7 @@ "defaultValue": "5" }, { - "id": 5, + "id": 10, "name": "add", "kind": 64, "kindString": "Function", @@ -217,7 +321,7 @@ }, "signatures": [ { - "id": 6, + "id": 11, "name": "add", "kind": 4096, "kindString": "Call signature", @@ -226,7 +330,7 @@ }, "parameters": [ { - "id": 7, + "id": 12, "name": "x", "kind": 32768, "kindString": "Parameter", @@ -239,7 +343,7 @@ } }, { - "id": 8, + "id": 13, "name": "y", "kind": 32768, "kindString": "Parameter", @@ -272,14 +376,14 @@ "title": "Variables", "kind": 32, "children": [ - 4 + 9 ] }, { "title": "Functions", "kind": 64, "children": [ - 5 + 10 ] } ], @@ -292,7 +396,7 @@ ] }, { - "id": 9, + "id": 14, "name": "mod", "kind": 1, "kindString": "Module", @@ -302,27 +406,27 @@ "originalName": "%BASE%/exports/mod.ts", "children": [ { - "id": 11, + "id": 16, "name": "b", "kind": 16777216, "kindString": "Reference", "flags": { "isExported": true }, - "target": 10 + "target": 15 }, { - "id": 12, + "id": 17, "name": "c", "kind": 16777216, "kindString": "Reference", "flags": { "isExported": true }, - "target": 10 + "target": 15 }, { - "id": 10, + "id": 15, "name": "a", "kind": 32, "kindString": "Variable", @@ -352,15 +456,15 @@ "title": "References", "kind": 16777216, "children": [ - 11, - 12 + 16, + 17 ] }, { "title": "Variables", "kind": 32, "children": [ - 10 + 15 ] } ], @@ -378,11 +482,11 @@ "title": "Modules", "kind": 1, "children": [ - 14, + 19, 1, - 2, - 3, - 9 + 6, + 8, + 14 ] } ] diff --git a/src/test/converter/exports/specs.json b/src/test/converter/exports/specs.json index dc524c537..24f23808f 100644 --- a/src/test/converter/exports/specs.json +++ b/src/test/converter/exports/specs.json @@ -207,14 +207,18 @@ "name": "add", "kind": 4096, "kindString": "Call signature", - "flags": {}, + "flags": { + "isExported": true + }, "parameters": [ { "id": 4, "name": "x", "kind": 32768, "kindString": "Parameter", - "flags": {}, + "flags": { + "isExported": true + }, "type": { "type": "intrinsic", "name": "number" @@ -225,7 +229,9 @@ "name": "y", "kind": 32768, "kindString": "Parameter", - "flags": {}, + "flags": { + "isExported": true + }, "type": { "type": "intrinsic", "name": "number" diff --git a/src/test/converter/exports/specs.lib.json b/src/test/converter/exports/specs.lib.json index 95916808b..ac15a5dc0 100644 --- a/src/test/converter/exports/specs.lib.json +++ b/src/test/converter/exports/specs.lib.json @@ -1,1301 +1,1297 @@ { - "id": 0, - "name": "typedoc", - "kind": 0, - "flags": {}, - "children": [ + "id": 0, + "name": "typedoc", + "kind": 0, + "flags": {}, + "children": [ + { + "id": 10, + "name": "export", + "kind": 1, + "kindString": "Module", + "flags": {}, + "originalName": "%BASE%/exports/export.ts", + "children": [ { - "id": 10, - "name": "export", - "kind": 1, - "kindString": "Module", - "flags": { + "id": 33, + "name": "Mod", + "kind": 16777216, + "kindString": "Reference", + "flags": { + "isExported": true + }, + "target": 19 + }, + { + "id": 19, + "name": "mod", + "kind": 1, + "kindString": "Module", + "flags": {}, + "originalName": "%BASE%/exports/mod.ts", + "children": [ + { + "id": 25, + "name": "Node", + "kind": 256, + "kindString": "Interface", + "flags": { "isExported": true - }, - "originalName": "%BASE%/exports/export.ts", - "children": [ + }, + "children": [ { - "id": 33, - "name": "Mod", - "kind": 16777216, - "kindString": "Reference", - "flags": { - "isExported": true - }, - "target": 19 + "id": 28, + "name": "decorators", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 503, + "character": 18 + } + ], + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "name": "Decorator" + } + ], + "name": "NodeArray" + } }, { - "id": 19, - "name": "mod", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true - }, - "originalName": "%BASE%/exports/mod.ts", - "children": [ - { - "id": 25, - "name": "Node", - "kind": 256, - "kindString": "Interface", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 28, - "name": "decorators", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 499, - "character": 18 - } - ], - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "name": "Decorator" - } - ], - "name": "NodeArray" - } - }, - { - "id": 32, - "name": "end", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 73, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 32, - "name": "TextRange.end" - } - }, - { - "id": 27, - "name": "flags", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 498, - "character": 13 - } - ], - "type": { - "type": "reference", - "name": "NodeFlags" - } - }, - { - "id": 26, - "name": "kind", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 497, - "character": 12 - } - ], - "type": { - "type": "reference", - "name": "SyntaxKind" - } - }, - { - "id": 29, - "name": "modifiers", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 500, - "character": 17 - } - ], - "type": { - "type": "reference", - "name": "ModifiersArray" - } - }, - { - "id": 30, - "name": "parent", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 501, - "character": 14 - } - ], - "type": { - "type": "reference", - "id": 25, - "name": "Node" - } - }, - { - "id": 31, - "name": "pos", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 72, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 31, - "name": "TextRange.pos" - } - } - ], - "groups": [ - { - "title": "Properties", - "kind": 1024, - "children": [ - 28, - 32, - 27, - 26, - 29, - 30, - 31 - ] - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 496, - "character": 25 - } - ], - "extendedTypes": [ - { - "type": "reference", - "name": "TextRange" - } - ] - }, - { - "id": 22, - "name": "b", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "originalName": "a", - "comment": { - "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - }, - { - "id": 23, - "name": "c", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "originalName": "a", - "comment": { - "shortText": "A simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - }, - { - "id": 20, - "name": "default", - "kind": 64, - "kindString": "Function", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 21, - "name": "default", - "kind": 4096, - "kindString": "Call signature", - "flags": {}, - "comment": { - "shortText": "Will not be re-exported from export.ts using export * from..." - }, - "type": { - "type": "intrinsic", - "name": "void" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 14, - "character": 31 - } - ] - } - ], - "groups": [ - { - "title": "Interfaces", - "kind": 256, - "children": [ - 25 - ] - }, - { - "title": "Variables", - "kind": 32, - "children": [ - 22, - 23 - ] - }, - { - "title": "Functions", - "kind": 64, - "children": [ - 20 - ] - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 1, - "character": 0 - } - ] + "id": 32, + "name": "end", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 71, + "character": 11 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 32, + "name": "TextRange.end" + } }, { - "id": 36, - "name": "Node", - "kind": 256, - "kindString": "Interface", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 39, - "name": "decorators", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 499, - "character": 18 - } - ], - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "name": "Decorator" - } - ], - "name": "NodeArray" - } - }, - { - "id": 43, - "name": "end", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 73, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 32, - "name": "TextRange.end" - } - }, - { - "id": 38, - "name": "flags", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 498, - "character": 13 - } - ], - "type": { - "type": "reference", - "name": "NodeFlags" - } - }, - { - "id": 37, - "name": "kind", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 497, - "character": 12 - } - ], - "type": { - "type": "reference", - "name": "SyntaxKind" - } - }, - { - "id": 40, - "name": "modifiers", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 500, - "character": 17 - } - ], - "type": { - "type": "reference", - "name": "ModifiersArray" - } - }, - { - "id": 41, - "name": "parent", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 501, - "character": 14 - } - ], - "type": { - "type": "reference", - "id": 25, - "name": "Node" - } - }, - { - "id": 42, - "name": "pos", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 72, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 31, - "name": "TextRange.pos" - } - } - ], - "groups": [ - { - "title": "Properties", - "kind": 1024, - "children": [ - 39, - 43, - 38, - 37, - 40, - 41, - 42 - ] - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 496, - "character": 25 - } - ], - "extendedTypes": [ - { - "type": "reference", - "name": "TextRange" - } - ] + "id": 27, + "name": "flags", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 502, + "character": 13 + } + ], + "type": { + "type": "reference", + "name": "NodeFlags" + } }, { - "id": 34, - "name": "b", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "originalName": "a", - "comment": { - "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" + "id": 26, + "name": "kind", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 501, + "character": 12 + } + ], + "type": { + "type": "reference", + "name": "SyntaxKind" + } }, { - "id": 14, - "name": "c", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "originalName": "a", - "comment": { - "shortText": "A simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" + "id": 29, + "name": "modifiers", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 504, + "character": 17 + } + ], + "type": { + "type": "reference", + "name": "ModifiersArray" + } }, { - "id": 11, - "name": "ModDefault", - "kind": 64, - "kindString": "Function", - "flags": { - "isExported": true - }, - "originalName": "default", - "comment": { - "shortText": "Will not be re-exported from export.ts using export * from..." - }, - "signatures": [ - { - "id": 12, - "name": "default", - "kind": 4096, - "kindString": "Call signature", - "flags": {}, - "comment": { - "shortText": "Will not be re-exported from export.ts using export * from..." - }, - "parameters": [ - { - "id": 13, - "name": "a", - "kind": 32768, - "kindString": "Parameter", - "flags": {}, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "type": { - "type": "intrinsic", - "name": "void" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export.ts", - "line": 9, - "character": 1 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 14, - "character": 31 - } - ] + "id": 30, + "name": "parent", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 505, + "character": 14 + } + ], + "type": { + "type": "reference", + "id": 25, + "name": "Node" + } }, { - "id": 15, - "name": "add", - "kind": 64, - "kindString": "Function", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 16, - "name": "add", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 17, - "name": "x", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, - { - "id": 18, - "name": "y", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export.ts", - "line": 7, - "character": 12 - } - ] + "id": 31, + "name": "pos", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 70, + "character": 11 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 31, + "name": "TextRange.pos" + } } - ], - "groups": [ + ], + "groups": [ { - "title": "References", - "kind": 16777216, - "children": [ - 33 - ] - }, + "title": "Properties", + "kind": 1024, + "children": [ + 28, + 32, + 27, + 26, + 29, + 30, + 31 + ] + } + ], + "sources": [ { - "title": "Modules", - "kind": 1, - "children": [ - 19 - ] - }, + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 500, + "character": 25 + } + ], + "extendedTypes": [ { - "title": "Interfaces", - "kind": 256, - "children": [ - 36 - ] - }, + "type": "reference", + "name": "TextRange" + } + ] + }, + { + "id": 22, + "name": "b", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" + }, + "sources": [ { - "title": "Variables", - "kind": 32, - "children": [ - 34, - 14 - ] + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 }, { - "title": "Functions", - "kind": 64, - "children": [ - 11, - 15 - ] + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 23, + "name": "c", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 20, + "name": "default", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 21, + "name": "default", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "comment": { + "shortText": "Will not be re-exported from export.ts using export * from..." + }, + "type": { + "type": "intrinsic", + "name": "void" + } } - ], - "sources": [ + ], + "sources": [ { - "fileName": "dist/test/converter/exports/export.ts", - "line": 1, - "character": 0 + "fileName": "dist/test/converter/exports/mod.ts", + "line": 14, + "character": 31 } - ] + ] + } + ], + "groups": [ + { + "title": "Interfaces", + "kind": 256, + "children": [ + 25 + ] + }, + { + "title": "Variables", + "kind": 32, + "children": [ + 22, + 23 + ] + }, + { + "title": "Functions", + "kind": 64, + "children": [ + 20 + ] + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 1, + "character": 0 + } + ] }, { - "id": 1, - "name": "export-assignment", - "kind": 1, - "kindString": "Module", - "flags": { + "id": 36, + "name": "Node", + "kind": 256, + "kindString": "Interface", + "flags": { + "isExported": true + }, + "children": [ + { + "id": 39, + "name": "decorators", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 503, + "character": 18 + } + ], + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "name": "Decorator" + } + ], + "name": "NodeArray" + } + }, + { + "id": 43, + "name": "end", + "kind": 1024, + "kindString": "Property", + "flags": { "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 71, + "character": 11 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 32, + "name": "TextRange.end" + } }, - "originalName": "%BASE%/exports/export-assignment.ts", - "sources": [ + { + "id": 38, + "name": "flags", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ { - "fileName": "dist/test/converter/exports/export-assignment.ts", - "line": 1, - "character": 0 + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 502, + "character": 13 } - ] - }, - { - "id": 2, - "name": "export-default", - "kind": 1, - "kindString": "Module", - "flags": { + ], + "type": { + "type": "reference", + "name": "NodeFlags" + } + }, + { + "id": 37, + "name": "kind", + "kind": 1024, + "kindString": "Property", + "flags": { "isExported": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 501, + "character": 12 + } + ], + "type": { + "type": "reference", + "name": "SyntaxKind" + } }, - "originalName": "%BASE%/exports/export-default.ts", - "children": [ + { + "id": 40, + "name": "modifiers", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ { - "id": 3, - "name": "default", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "originalName": "x", - "sources": [ - { - "fileName": "dist/test/converter/exports/export-default.ts", - "line": 1, - "character": 7 - } - ], - "type": { - "type": "unknown", - "name": "5" - }, - "defaultValue": "5" + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 504, + "character": 17 } - ], - "groups": [ + ], + "type": { + "type": "reference", + "name": "ModifiersArray" + } + }, + { + "id": 41, + "name": "parent", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ { - "title": "Variables", - "kind": 32, - "children": [ - 3 - ] + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 505, + "character": 14 } - ], - "sources": [ + ], + "type": { + "type": "reference", + "id": 25, + "name": "Node" + } + }, + { + "id": 42, + "name": "pos", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ { - "fileName": "dist/test/converter/exports/export-default.ts", - "line": 1, - "character": 0 + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 70, + "character": 11 } - ] + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 31, + "name": "TextRange.pos" + } + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 39, + 43, + 38, + 37, + 40, + 41, + 42 + ] + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 500, + "character": 25 + } + ], + "extendedTypes": [ + { + "type": "reference", + "name": "TextRange" + } + ] }, { - "id": 4, - "name": "export-with-local", - "kind": 1, - "kindString": "Module", - "flags": { - "isExported": true + "id": 34, + "name": "b", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 }, - "originalName": "%BASE%/exports/export-with-local.ts", - "children": [ - { - "id": 9, - "name": "x", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/export-with-local.ts", - "line": 1, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "5" - }, - "defaultValue": "5" - }, + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 14, + "name": "c", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 11, + "name": "ModDefault", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "originalName": "default", + "comment": { + "shortText": "Will not be re-exported from export.ts using export * from..." + }, + "signatures": [ + { + "id": 12, + "name": "default", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "comment": { + "shortText": "Will not be re-exported from export.ts using export * from..." + }, + "parameters": [ { - "id": 5, - "name": "add", - "kind": 64, - "kindString": "Function", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 6, - "name": "add", - "kind": 4096, - "kindString": "Call signature", - "flags": { - "isExported": true - }, - "parameters": [ - { - "id": 7, - "name": "x", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - }, - { - "id": 8, - "name": "y", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isExported": true - }, - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export-with-local.ts", - "line": 3, - "character": 19 - } - ] + "id": 13, + "name": "a", + "kind": 32768, + "kindString": "Parameter", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "number" + } } - ], - "groups": [ + ], + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export.ts", + "line": 9, + "character": 1 + }, + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 14, + "character": 31 + } + ] + }, + { + "id": 15, + "name": "add", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 16, + "name": "add", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ { - "title": "Variables", - "kind": 32, - "children": [ - 9 - ] + "id": 17, + "name": "x", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } }, { - "title": "Functions", - "kind": 64, - "children": [ - 5 - ] + "id": 18, + "name": "y", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/export-with-local.ts", - "line": 1, - "character": 0 - } - ] + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export.ts", + "line": 7, + "character": 12 + } + ] + } + ], + "groups": [ + { + "title": "References", + "kind": 16777216, + "children": [ + 33 + ] + }, + { + "title": "Modules", + "kind": 1, + "children": [ + 19 + ] + }, + { + "title": "Interfaces", + "kind": 256, + "children": [ + 36 + ] }, { - "id": 44, - "name": "mod", - "kind": 1, - "kindString": "Module", - "flags": { + "title": "Variables", + "kind": 32, + "children": [ + 34, + 14 + ] + }, + { + "title": "Functions", + "kind": 64, + "children": [ + 11, + 15 + ] + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 1, + "name": "export-assignment", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/export-assignment.ts", + "sources": [ + { + "fileName": "dist/test/converter/exports/export-assignment.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 2, + "name": "export-default", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/export-default.ts", + "children": [ + { + "id": 3, + "name": "default", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "x", + "sources": [ + { + "fileName": "dist/test/converter/exports/export-default.ts", + "line": 1, + "character": 7 + } + ], + "type": { + "type": "unknown", + "name": "5" + }, + "defaultValue": "5" + } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 3 + ] + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export-default.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 4, + "name": "export-with-local", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/export-with-local.ts", + "children": [ + { + "id": 9, + "name": "x", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/export-with-local.ts", + "line": 1, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "5" + }, + "defaultValue": "5" + }, + { + "id": 5, + "name": "add", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 6, + "name": "add", + "kind": 4096, + "kindString": "Call signature", + "flags": { "isExported": true - }, - "originalName": "%BASE%/exports/mod.ts", - "children": [ + }, + "parameters": [ { - "id": 50, - "name": "Node", - "kind": 256, - "kindString": "Interface", - "flags": { - "isExported": true - }, - "children": [ - { - "id": 53, - "name": "decorators", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 499, - "character": 18 - } - ], - "type": { - "type": "reference", - "typeArguments": [ - { - "type": "reference", - "name": "Decorator" - } - ], - "name": "NodeArray" - } - }, - { - "id": 57, - "name": "end", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 73, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 32, - "name": "TextRange.end" - } - }, - { - "id": 52, - "name": "flags", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 498, - "character": 13 - } - ], - "type": { - "type": "reference", - "name": "NodeFlags" - } - }, - { - "id": 51, - "name": "kind", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 497, - "character": 12 - } - ], - "type": { - "type": "reference", - "name": "SyntaxKind" - } - }, - { - "id": 54, - "name": "modifiers", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true, - "isOptional": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 500, - "character": 17 - } - ], - "type": { - "type": "reference", - "name": "ModifiersArray" - } - }, - { - "id": 55, - "name": "parent", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 501, - "character": 14 - } - ], - "type": { - "type": "reference", - "id": 25, - "name": "Node" - } - }, - { - "id": 56, - "name": "pos", - "kind": 1024, - "kindString": "Property", - "flags": { - "isExported": true - }, - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 72, - "character": 11 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - }, - "inheritedFrom": { - "type": "reference", - "id": 31, - "name": "TextRange.pos" - } - } - ], - "groups": [ - { - "title": "Properties", - "kind": 1024, - "children": [ - 53, - 57, - 52, - 51, - 54, - 55, - 56 - ] - } - ], - "sources": [ - { - "fileName": "node_modules/typescript/lib/typescript.d.ts", - "line": 496, - "character": 25 - } - ], - "extendedTypes": [ - { - "type": "reference", - "name": "TextRange" - } - ] + "id": 7, + "name": "x", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } }, { - "id": 47, - "name": "b", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "originalName": "a", - "comment": { - "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - }, - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - }, + "id": 8, + "name": "y", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export-with-local.ts", + "line": 3, + "character": 19 + } + ] + } + ], + "groups": [ + { + "title": "Variables", + "kind": 32, + "children": [ + 9 + ] + }, + { + "title": "Functions", + "kind": 64, + "children": [ + 5 + ] + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/export-with-local.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 44, + "name": "mod", + "kind": 1, + "kindString": "Module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/exports/mod.ts", + "children": [ + { + "id": 50, + "name": "Node", + "kind": 256, + "kindString": "Interface", + "flags": { + "isExported": true + }, + "children": [ + { + "id": 53, + "name": "decorators", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ { - "id": 48, - "name": "c", - "kind": 32, - "kindString": "Variable", - "flags": { - "isExported": true, - "isConst": true - }, - "originalName": "a", - "comment": { - "shortText": "A simple named export that will be exported from export.ts" - }, - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 4, - "character": 14 - } - ], - "type": { - "type": "unknown", - "name": "1" - }, - "defaultValue": "1" - }, + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 503, + "character": 18 + } + ], + "type": { + "type": "reference", + "typeArguments": [ + { + "type": "reference", + "name": "Decorator" + } + ], + "name": "NodeArray" + } + }, + { + "id": 57, + "name": "end", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ { - "id": 45, - "name": "default", - "kind": 64, - "kindString": "Function", - "flags": { - "isExported": true - }, - "signatures": [ - { - "id": 46, - "name": "default", - "kind": 4096, - "kindString": "Call signature", - "flags": {}, - "comment": { - "shortText": "Will not be re-exported from export.ts using export * from..." - }, - "type": { - "type": "intrinsic", - "name": "void" - } - } - ], - "sources": [ - { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 14, - "character": 31 - } - ] + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 71, + "character": 11 } - ], - "groups": [ + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 32, + "name": "TextRange.end" + } + }, + { + "id": 52, + "name": "flags", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ { - "title": "Interfaces", - "kind": 256, - "children": [ - 50 - ] - }, + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 502, + "character": 13 + } + ], + "type": { + "type": "reference", + "name": "NodeFlags" + } + }, + { + "id": 51, + "name": "kind", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ { - "title": "Variables", - "kind": 32, - "children": [ - 47, - 48 - ] - }, + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 501, + "character": 12 + } + ], + "type": { + "type": "reference", + "name": "SyntaxKind" + } + }, + { + "id": 54, + "name": "modifiers", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true, + "isOptional": true + }, + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 504, + "character": 17 + } + ], + "type": { + "type": "reference", + "name": "ModifiersArray" + } + }, + { + "id": 55, + "name": "parent", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ { - "title": "Functions", - "kind": 64, - "children": [ - 45 - ] + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 505, + "character": 14 } - ], - "sources": [ + ], + "type": { + "type": "reference", + "id": 25, + "name": "Node" + } + }, + { + "id": 56, + "name": "pos", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ { - "fileName": "dist/test/converter/exports/mod.ts", - "line": 1, - "character": 0 + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 70, + "character": 11 } - ] + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 31, + "name": "TextRange.pos" + } + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 53, + 57, + 52, + 51, + 54, + 55, + 56 + ] + } + ], + "sources": [ + { + "fileName": "node_modules/typescript/lib/typescript.d.ts", + "line": 500, + "character": 25 + } + ], + "extendedTypes": [ + { + "type": "reference", + "name": "TextRange" + } + ] + }, + { + "id": 47, + "name": "b", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts\nA simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + }, + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 48, + "name": "c", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "isConst": true + }, + "originalName": "a", + "comment": { + "shortText": "A simple named export that will be exported from export.ts" + }, + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 4, + "character": 14 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 45, + "name": "default", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 46, + "name": "default", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "comment": { + "shortText": "Will not be re-exported from export.ts using export * from..." + }, + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "dist/test/converter/exports/mod.ts", + "line": 14, + "character": 31 + } + ] + } + ], + "groups": [ + { + "title": "Interfaces", + "kind": 256, + "children": [ + 50 + ] + }, + { + "title": "Variables", + "kind": 32, + "children": [ + 47, + 48 + ] + }, + { + "title": "Functions", + "kind": 64, + "children": [ + 45 + ] } - ], - "groups": [ + ], + "sources": [ { - "title": "Modules", - "kind": 1, - "children": [ - 10, - 1, - 2, - 4, - 44 - ] + "fileName": "dist/test/converter/exports/mod.ts", + "line": 1, + "character": 0 } - ] + ] + } + ], + "groups": [ + { + "title": "Modules", + "kind": 1, + "children": [ + 10, + 1, + 2, + 4, + 44 + ] + } + ] } diff --git a/src/test/converter/mixin/specs.json b/src/test/converter/mixin/specs.json index 160902955..335d90ea5 100644 --- a/src/test/converter/mixin/specs.json +++ b/src/test/converter/mixin/specs.json @@ -101,6 +101,13 @@ "line": 21, "character": 17 } + ], + "extendedBy": [ + { + "type": "reference", + "id": 66, + "name": "Mixin1Class" + } ] }, { @@ -405,6 +412,7 @@ }, "type": { "type": "reference", + "id": 15, "name": "Mixin2" } } @@ -413,6 +421,7 @@ "type": "array", "elementType": { "type": "reference", + "id": 15, "name": "Mixin2" } }, @@ -472,12 +481,14 @@ "types": [ { "type": "reference", + "id": 15, "typeArguments": [ { "type": "intersection", "types": [ { "type": "reference", + "id": 66, "name": "Mixin1Class" }, { @@ -496,6 +507,7 @@ }, { "type": "reference", + "id": 66, "typeArguments": [ { "type": "reference", @@ -737,6 +749,7 @@ "types": [ { "type": "reference", + "id": 66, "typeArguments": [ { "type": "reflection", @@ -1012,6 +1025,7 @@ }, "type": { "type": "reference", + "id": 15, "name": "Mixin2" } } @@ -1020,6 +1034,7 @@ "type": "array", "elementType": { "type": "reference", + "id": 15, "name": "Mixin2" } }, @@ -1077,6 +1092,7 @@ "types": [ { "type": "reference", + "id": 15, "typeArguments": [ { "type": "reflection", @@ -1408,6 +1424,7 @@ "types": [ { "type": "reference", + "id": 66, "name": "Mixin1Class" }, { @@ -1418,6 +1435,202 @@ } } ], + "children": [ + { + "id": 66, + "name": "Mixin1Class", + "kind": 128, + "kindString": "Class", + "flags": { + "isExported": true + }, + "comment": { + "shortText": "Internal class of the Mixin1" + }, + "children": [ + { + "id": 71, + "name": "baseProperty", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "mixin.ts", + "line": 22, + "character": 16 + } + ], + "type": { + "type": "intrinsic", + "name": "string" + }, + "defaultValue": "\"init\"", + "inheritedFrom": { + "type": "reference", + "id": 3, + "name": "Base.baseProperty" + } + }, + { + "id": 67, + "name": "property1", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "mixin.ts", + "line": 38, + "character": 13 + } + ], + "type": { + "type": "intrinsic", + "name": "string" + }, + "defaultValue": "\"init\"" + }, + { + "id": 72, + "name": "baseMethod", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 73, + "name": "baseMethod", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "type": { + "type": "intrinsic", + "name": "number" + }, + "inheritedFrom": { + "type": "reference", + "id": 4, + "name": "Base.baseMethod" + } + } + ], + "sources": [ + { + "fileName": "mixin.ts", + "line": 24, + "character": 14 + } + ], + "inheritedFrom": { + "type": "reference", + "id": 4, + "name": "Base.baseMethod" + } + }, + { + "id": 68, + "name": "method1", + "kind": 2048, + "kindString": "Method", + "flags": { + "isExported": true + }, + "signatures": [ + { + "id": 69, + "name": "method1", + "kind": 4096, + "kindString": "Call signature", + "flags": { + "isExported": true + }, + "parameters": [ + { + "id": 70, + "name": "arg", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isExported": true + }, + "type": { + "type": "reference", + "id": 6, + "name": "Mixin1Type" + } + } + ], + "type": { + "type": "array", + "elementType": { + "type": "reference", + "id": 6, + "name": "Mixin1Type" + } + } + } + ], + "sources": [ + { + "fileName": "mixin.ts", + "line": 40, + "character": 11 + } + ] + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 71, + 67 + ] + }, + { + "title": "Methods", + "kind": 2048, + "children": [ + 72, + 68 + ] + } + ], + "sources": [ + { + "fileName": "mixin.ts", + "line": 37, + "character": 17 + } + ], + "extendedTypes": [ + { + "type": "reference", + "id": 2, + "name": "Base" + } + ] + } + ], + "groups": [ + { + "title": "Classes", + "kind": 128, + "children": [ + 66 + ] + } + ], "sources": [ { "fileName": "mixin.ts", @@ -1525,6 +1738,7 @@ "types": [ { "type": "reference", + "id": 15, "name": "Mixin2" }, { @@ -1620,6 +1834,7 @@ "types": [ { "type": "reference", + "id": 61, "name": "Mixin3" }, { diff --git a/src/test/converter/react/specs.json b/src/test/converter/react/specs.json index f92f1b183..b1bc7c765 100644 --- a/src/test/converter/react/specs.json +++ b/src/test/converter/react/specs.json @@ -19,36 +19,28 @@ "name": "Demo", "kind": 128, "kindString": "Class", - "flags": { - "isExported": true - }, + "flags": {}, "children": [ { "id": 7, "name": "constructor", "kind": 512, "kindString": "Constructor", - "flags": { - "isExported": true - }, + "flags": {}, "signatures": [ { "id": 8, "name": "new Demo", "kind": 16384, "kindString": "Constructor signature", - "flags": { - "isExported": true - }, + "flags": {}, "parameters": [ { "id": 9, "name": "props", "kind": 32768, "kindString": "Parameter", - "flags": { - "isExported": true - }, + "flags": {}, "type": { "type": "reference", "id": 2, @@ -77,8 +69,7 @@ "kind": 1024, "kindString": "Property", "flags": { - "isPrivate": true, - "isExported": true + "isPrivate": true }, "sources": [ { @@ -97,18 +88,14 @@ "name": "render", "kind": 2048, "kindString": "Method", - "flags": { - "isExported": true - }, + "flags": {}, "signatures": [ { "id": 11, "name": "render", "kind": 4096, "kindString": "Call signature", - "flags": { - "isExported": true - }, + "flags": {}, "type": { "type": "intrinsic", "name": "any" @@ -160,18 +147,14 @@ "name": "DemoProps", "kind": 256, "kindString": "Interface", - "flags": { - "isExported": true - }, + "flags": {}, "children": [ { "id": 4, "name": "age", "kind": 1024, "kindString": "Property", - "flags": { - "isExported": true - }, + "flags": {}, "sources": [ { "fileName": "react.tsx", @@ -189,9 +172,7 @@ "name": "name", "kind": 1024, "kindString": "Property", - "flags": { - "isExported": true - }, + "flags": {}, "sources": [ { "fileName": "react.tsx", @@ -229,7 +210,6 @@ "kind": 32, "kindString": "Variable", "flags": { - "isExported": true, "isConst": true }, "sources": [ diff --git a/src/test/renderer/specs/classes/default_export.defaultexportedclass.html b/src/test/renderer/specs/classes/default_export.defaultexportedclass.html index 0f218504a..533a6dcd4 100644 --- a/src/test/renderer/specs/classes/default_export.defaultexportedclass.html +++ b/src/test/renderer/specs/classes/default_export.defaultexportedclass.html @@ -249,7 +249,7 @@

    Returns string diff --git a/src/test/renderer/specs/classes/default_export.notexportedclassname.html b/src/test/renderer/specs/classes/default_export.notexportedclassname.html index d103e0c99..2bc4482ed 100644 --- a/src/test/renderer/specs/classes/default_export.notexportedclassname.html +++ b/src/test/renderer/specs/classes/default_export.notexportedclassname.html @@ -90,40 +90,40 @@

    Hierarchy

    Index

    -
    +

    Constructors

    -
    +

    Properties

    -
    +

    Methods

    -
    +

    Constructors

    -
    +

    constructor

    -

    @@ -150,7 +150,7 @@

    ExportedClassName

  • DefaultExportedClass
    • -
  • +
  • NotExportedClassName
    • diff --git a/src/test/renderer/specs/modules/flattened.html b/src/test/renderer/specs/modules/flattened.html index 34a31859e..2f65c3da4 100644 --- a/src/test/renderer/specs/modules/flattened.html +++ b/src/test/renderer/specs/modules/flattened.html @@ -70,36 +70,36 @@

    Module flattened

    Index

    -
    +

    Classes

    -
    +

    Functions

    -
    +

    Functions

    -
    +

    flattenedCallback

    -
      +
      • flattenedCallback(callback: (param: number, optionalParam?: string) => string): void
      • @@ -116,7 +116,7 @@
        callback: (param
      • -
          +
          • (param: number, optionalParam?: string): string
            @@ -147,17 +147,17 @@

            Returns void

    -
    +

    flattenedIndexSignature

    -
    -
    +

    flattenedParameter

    -
    -
    +

    Type aliases

    -
    +

    HorribleRecursiveTypeThatShouldNotBeUsedByAnyone

    HorribleRecursiveTypeThatShouldNotBeUsedByAnyone<T, R>: { 0: R; 1: HorribleRecursiveTypeThatShouldNotBeUsedByAnyone<PopFront<T>, {}> }[T["length"] extends 0 ? 0 : 1]
    @@ -124,13 +124,13 @@

    R

    -
    +

    PopFront

    PopFront<T>: ((...args: T) => any) extends (a: any, ...r: infer R) => any ? R : never
    @@ -146,19 +146,19 @@

    T: +

    Functions

    -
    +

    getGenericArray

    -
    -
    +

    testFunction

    -

    Const Mixin2

      -
    • Mixin2<T>(base: T): Mixin2 & T
      • +
    • Mixin2<T>(base: T): Mixin2 & T
    -

    Returns Mixin2 & T

    +

    Returns Mixin2 & T

    @@ -286,13 +363,13 @@

    Returns Mixin2

    Const Mixin3

      -
    • Mixin3<T>(base: T): Mixin3 & T
      • +
    • Mixin3<T>(base: T): Mixin3 & T
    -

    Returns Mixin3 & T

    +

    Returns Mixin3 & T

    From ccfcf4a773254839c536f09aae06d43578059c73 Mon Sep 17 00:00:00 2001 From: JEROMEH Date: Mon, 11 May 2020 13:37:53 +0200 Subject: [PATCH 28/28] tslint --- src/lib/converter/context.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts index 84a3121bf..40e5e7439 100644 --- a/src/lib/converter/context.ts +++ b/src/lib/converter/context.ts @@ -7,7 +7,7 @@ import { Reflection, ProjectReflection, ContainerReflection, Type, ReflectionFla import { createTypeParameter } from './factories/type-parameter'; import { Converter } from './converter'; -import {createDeclaration} from './factories'; +import { createDeclaration } from './factories'; /** * The context describes the current state the converter is in. @@ -428,7 +428,7 @@ export class Context { if (filePath.endsWith(hiddenExtension)) { filePath = filePath.substr(0, filePath.length - hiddenExtension.length); } - }) + }); fullyQualifiedName = `"${filePath}".${fullyQualifiedName}`; }