From 0847ebb9de7270283a7a4c80ee7f4cde2e70af57 Mon Sep 17 00:00:00 2001 From: Louis-Dominique Dubeau Date: Fri, 5 Apr 2019 15:11:50 -0400 Subject: [PATCH 01/15] Revert "rebuild specs" This reverts most of commit 3716ba7918bce8165e864d40ebf365cded3e3ee1. --- .../constructor-properties/specs.json | 12 +- src/test/converter/decorators/specs.json | 14 +- src/test/converter/destructuring/specs.json | 6 +- src/test/converter/enum/specs.json | 6 +- .../converter/events-overloads/specs.json | 2 + .../converter/export-assignment/specs.json | 2 + .../converter/export-with-local/specs.json | 2 + src/test/converter/export/specs.json | 2 + src/test/converter/function/specs.json | 4 +- src/test/converter/generic-class/specs.json | 12 +- .../converter/generic-function/specs.json | 2 + src/test/converter/getter-setter/specs.json | 6 +- src/test/converter/implicit-types/specs.json | 6 +- src/test/converter/interface-empty/specs.json | 6 +- .../interface-implementation/specs.json | 2 + .../literal-object-callbacks/specs.json | 4 +- src/test/converter/literal-object/specs.json | 4 +- src/test/converter/literal-type/specs.json | 6 +- src/test/converter/react/specs.json | 494 ++++++++++-------- src/test/converter/this/specs.json | 1 + src/test/converter/type-operator/specs.json | 15 +- .../union-or-intersection/specs.json | 21 +- src/test/converter/variable/specs.json | 3 +- 23 files changed, 369 insertions(+), 263 deletions(-) diff --git a/src/test/converter/constructor-properties/specs.json b/src/test/converter/constructor-properties/specs.json index 21ee5bc18..100275466 100644 --- a/src/test/converter/constructor-properties/specs.json +++ b/src/test/converter/constructor-properties/specs.json @@ -125,6 +125,7 @@ "id": 4, "name": "x", "kind": 1024, + "kindString": "Property", "flags": { "isConstructorProperty": true, "isPublic": true @@ -134,7 +135,7 @@ }, "sources": [ { - "fileName": "%BASE%/constructor-properties/constructor-properties.ts", + "fileName": "constructor-properties.ts", "line": 11, "character": 24 } @@ -148,6 +149,7 @@ "id": 5, "name": "y", "kind": 1024, + "kindString": "Property", "flags": { "isConstructorProperty": true, "isPublic": true @@ -157,7 +159,7 @@ }, "sources": [ { - "fileName": "%BASE%/constructor-properties/constructor-properties.ts", + "fileName": "constructor-properties.ts", "line": 11, "character": 41 } @@ -362,7 +364,8 @@ }, "inheritedFrom": { "type": "reference", - "name": "Vector2.x" + "name": "Vector2.x", + "id": 4 } }, { @@ -390,7 +393,8 @@ }, "overwrites": { "type": "reference", - "name": "Vector2.y" + "name": "Vector2.y", + "id": 5 } }, { diff --git a/src/test/converter/decorators/specs.json b/src/test/converter/decorators/specs.json index d61e5150d..659929283 100644 --- a/src/test/converter/decorators/specs.json +++ b/src/test/converter/decorators/specs.json @@ -48,7 +48,8 @@ "name": "decoratorAtom", "type": { "type": "reference", - "name": "decoratorAtom" + "name": "decoratorAtom", + "id": 5 } }, { @@ -68,6 +69,7 @@ "id": 4, "name": "decoratedMethod", "kind": 4096, + "kindString": "Call signature", "flags": {}, "comment": { "shortText": "A decorated method." @@ -108,7 +110,15 @@ "id": 5, "name": "decoratorAtom", "kind": 64, + "kindString": "Function", "flags": {}, + "decorates": [ + { + "type": "reference", + "name": "decoratedMethod", + "id": 3 + } + ], "signatures": [ { "id": 6, @@ -177,7 +187,7 @@ ], "sources": [ { - "fileName": "%BASE%/decorators/decorators.ts", + "fileName": "decorators.ts", "line": 21, "character": 22 } diff --git a/src/test/converter/destructuring/specs.json b/src/test/converter/destructuring/specs.json index 06f3f45db..b95cb2571 100644 --- a/src/test/converter/destructuring/specs.json +++ b/src/test/converter/destructuring/specs.json @@ -18,10 +18,11 @@ "id": 5, "name": "destructArrayA", "kind": 32, + "kindString": "Variable", "flags": {}, "sources": [ { - "fileName": "%BASE%/destructuring/destructuring.ts", + "fileName": "destructuring.ts", "line": 10, "character": 21 } @@ -225,10 +226,11 @@ "id": 4, "name": "destructObjectC", "kind": 32, + "kindString": "Variable", "flags": {}, "sources": [ { - "fileName": "%BASE%/destructuring/destructuring.ts", + "fileName": "destructuring.ts", "line": 4, "character": 56 } diff --git a/src/test/converter/enum/specs.json b/src/test/converter/enum/specs.json index 458ac7283..418970886 100644 --- a/src/test/converter/enum/specs.json +++ b/src/test/converter/enum/specs.json @@ -217,6 +217,7 @@ "id": 4, "name": "EnumValue2", "kind": 16, + "kindString": "Enumeration member", "flags": { "isExported": true }, @@ -225,7 +226,7 @@ }, "sources": [ { - "fileName": "%BASE%/enum/enum.ts", + "fileName": "enum.ts", "line": 14, "character": 14 } @@ -236,6 +237,7 @@ "id": 5, "name": "EnumValue3", "kind": 16, + "kindString": "Enumeration member", "flags": { "isExported": true }, @@ -244,7 +246,7 @@ }, "sources": [ { - "fileName": "%BASE%/enum/enum.ts", + "fileName": "enum.ts", "line": 19, "character": 14 } diff --git a/src/test/converter/events-overloads/specs.json b/src/test/converter/events-overloads/specs.json index 71445716d..a1445fb20 100644 --- a/src/test/converter/events-overloads/specs.json +++ b/src/test/converter/events-overloads/specs.json @@ -41,6 +41,7 @@ "id": 4, "name": "on", "kind": 8388608, + "kindString": "Event", "flags": {}, "comment": { "shortText": "Subscribe for a general event by name." @@ -50,6 +51,7 @@ "id": 5, "name": "event", "kind": 32768, + "kindString": "Parameter", "flags": {}, "comment": { "text": "The name of the event to subscribe for." diff --git a/src/test/converter/export-assignment/specs.json b/src/test/converter/export-assignment/specs.json index 290fd4001..11cf36c83 100644 --- a/src/test/converter/export-assignment/specs.json +++ b/src/test/converter/export-assignment/specs.json @@ -35,6 +35,7 @@ "id": 4, "name": "x", "kind": 32768, + "kindString": "Parameter", "flags": {}, "type": { "type": "intrinsic", @@ -45,6 +46,7 @@ "id": 5, "name": "y", "kind": 32768, + "kindString": "Parameter", "flags": {}, "type": { "type": "intrinsic", diff --git a/src/test/converter/export-with-local/specs.json b/src/test/converter/export-with-local/specs.json index 9459249bb..6b2f4c5d2 100644 --- a/src/test/converter/export-with-local/specs.json +++ b/src/test/converter/export-with-local/specs.json @@ -70,12 +70,14 @@ "id": 4, "name": "add", "kind": 4096, + "kindString": "Call signature", "flags": {}, "parameters": [ { "id": 5, "name": "x", "kind": 32768, + "kindString": "Parameter", "flags": {}, "type": { "type": "intrinsic", diff --git a/src/test/converter/export/specs.json b/src/test/converter/export/specs.json index 739182ffd..852eff5c2 100644 --- a/src/test/converter/export/specs.json +++ b/src/test/converter/export/specs.json @@ -49,12 +49,14 @@ "id": 4, "name": "add", "kind": 4096, + "kindString": "Call signature", "flags": {}, "parameters": [ { "id": 5, "name": "x", "kind": 32768, + "kindString": "Parameter", "flags": {}, "type": { "type": "intrinsic", diff --git a/src/test/converter/function/specs.json b/src/test/converter/function/specs.json index a0ce44973..4eb212e38 100644 --- a/src/test/converter/function/specs.json +++ b/src/test/converter/function/specs.json @@ -176,6 +176,7 @@ "id": 4, "name": "exportedFunction", "kind": 64, + "kindString": "Function", "flags": { "isExported": true }, @@ -184,6 +185,7 @@ "id": 5, "name": "exportedFunction", "kind": 4096, + "kindString": "Call signature", "flags": {}, "comment": { "shortText": "This is a simple exported function." @@ -196,7 +198,7 @@ ], "sources": [ { - "fileName": "%BASE%/function/function.ts", + "fileName": "function.ts", "line": 10, "character": 32 } diff --git a/src/test/converter/generic-class/specs.json b/src/test/converter/generic-class/specs.json index 05482c43f..d8eb54571 100644 --- a/src/test/converter/generic-class/specs.json +++ b/src/test/converter/generic-class/specs.json @@ -90,6 +90,7 @@ "id": 4, "name": "value", "kind": 1024, + "kindString": "Property", "flags": { "isProtected": true }, @@ -98,7 +99,7 @@ }, "sources": [ { - "fileName": "%BASE%/generic-class/generic-class.ts", + "fileName": "generic-class.ts", "line": 9, "character": 19 } @@ -112,6 +113,7 @@ "id": 5, "name": "values", "kind": 1024, + "kindString": "Property", "flags": { "isProtected": true }, @@ -120,7 +122,7 @@ }, "sources": [ { - "fileName": "%BASE%/generic-class/generic-class.ts", + "fileName": "generic-class.ts", "line": 14, "character": 20 } @@ -298,7 +300,8 @@ }, "inheritedFrom": { "type": "reference", - "name": "GenericClass.value" + "name": "GenericClass.value", + "id": 4 } }, { @@ -328,7 +331,8 @@ }, "inheritedFrom": { "type": "reference", - "name": "GenericClass.values" + "name": "GenericClass.values", + "id": 5 } }, { diff --git a/src/test/converter/generic-function/specs.json b/src/test/converter/generic-function/specs.json index 3871138d5..88e7e6f97 100644 --- a/src/test/converter/generic-function/specs.json +++ b/src/test/converter/generic-function/specs.json @@ -112,6 +112,7 @@ "id": 4, "name": "T", "kind": 131072, + "kindString": "Type parameter", "flags": {}, "comment": { "text": "Generic function type parameter." @@ -127,6 +128,7 @@ "id": 5, "name": "value", "kind": 32768, + "kindString": "Parameter", "flags": {}, "comment": { "text": "Generic function parameter." diff --git a/src/test/converter/getter-setter/specs.json b/src/test/converter/getter-setter/specs.json index d2a0343f0..5d158dc38 100644 --- a/src/test/converter/getter-setter/specs.json +++ b/src/test/converter/getter-setter/specs.json @@ -45,12 +45,14 @@ "id": 4, "name": "name", "kind": 262144, + "kindString": "Accessor", "flags": {}, "getSignature": [ { "id": 5, "name": "__get", "kind": 524288, + "kindString": "Get signature", "flags": {}, "type": { "type": "intrinsic", @@ -86,12 +88,12 @@ ], "sources": [ { - "fileName": "%BASE%/getter-setter/getter-setter.ts", + "fileName": "getter-setter.ts", "line": 6, "character": 12 }, { - "fileName": "%BASE%/getter-setter/getter-setter.ts", + "fileName": "getter-setter.ts", "line": 7, "character": 12 } diff --git a/src/test/converter/implicit-types/specs.json b/src/test/converter/implicit-types/specs.json index ef5088bc2..893195c83 100644 --- a/src/test/converter/implicit-types/specs.json +++ b/src/test/converter/implicit-types/specs.json @@ -27,12 +27,13 @@ "id": 4, "name": "end", "kind": 1024, + "kindString": "Property", "flags": { "isExported": true }, "sources": [ { - "fileName": "%BASE%/implicit-types/implicit-types.ts", + "fileName": "implicit-types.ts", "line": 1, "character": 54 } @@ -85,12 +86,13 @@ "id": 5, "name": "_breakpoints", "kind": 32, + "kindString": "Variable", "flags": { "isLet": true }, "sources": [ { - "fileName": "%BASE%/implicit-types/implicit-types.ts", + "fileName": "implicit-types.ts", "line": 3, "character": 16 } diff --git a/src/test/converter/interface-empty/specs.json b/src/test/converter/interface-empty/specs.json index 0a95dc85d..74c39a6f7 100644 --- a/src/test/converter/interface-empty/specs.json +++ b/src/test/converter/interface-empty/specs.json @@ -28,12 +28,13 @@ "id": 4, "name": "name", "kind": 1024, + "kindString": "Property", "flags": { "isPrivate": true }, "sources": [ { - "fileName": "%BASE%/interface-empty/interface-empty.ts", + "fileName": "interface-empty.ts", "line": 12, "character": 16 } @@ -47,6 +48,7 @@ "id": 5, "name": "goto", "kind": 2048, + "kindString": "Method", "flags": { "isPublic": true }, @@ -65,7 +67,7 @@ ], "sources": [ { - "fileName": "%BASE%/interface-empty/interface-empty.ts", + "fileName": "interface-empty.ts", "line": 13, "character": 15 } diff --git a/src/test/converter/interface-implementation/specs.json b/src/test/converter/interface-implementation/specs.json index b9af14563..c1e7b4049 100644 --- a/src/test/converter/interface-implementation/specs.json +++ b/src/test/converter/interface-implementation/specs.json @@ -997,6 +997,7 @@ "id": 4, "name": "T", "kind": 131072, + "kindString": "Type parameter", "flags": {} } ], @@ -1005,6 +1006,7 @@ "id": 5, "name": "__call", "kind": 4096, + "kindString": "Call signature", "flags": {}, "comment": { "shortText": "Function signature of an event listener callback" diff --git a/src/test/converter/literal-object-callbacks/specs.json b/src/test/converter/literal-object-callbacks/specs.json index efb6fdd56..4bc558c24 100644 --- a/src/test/converter/literal-object-callbacks/specs.json +++ b/src/test/converter/literal-object-callbacks/specs.json @@ -18,6 +18,7 @@ "id": 4, "name": "onError", "kind": 64, + "kindString": "Function", "flags": { "isLet": true }, @@ -26,6 +27,7 @@ "id": 5, "name": "onError", "kind": 4096, + "kindString": "Call signature", "flags": {}, "type": { "type": "intrinsic", @@ -35,7 +37,7 @@ ], "sources": [ { - "fileName": "%BASE%/literal-object-callbacks/literal-object-callbacks.ts", + "fileName": "literal-object-callbacks.ts", "line": 2, "character": 11 } diff --git a/src/test/converter/literal-object/specs.json b/src/test/converter/literal-object/specs.json index 6766842a0..5aac63ad6 100644 --- a/src/test/converter/literal-object/specs.json +++ b/src/test/converter/literal-object/specs.json @@ -87,12 +87,14 @@ "id": 4, "name": "valueY", "kind": 64, + "kindString": "Function", "flags": {}, "signatures": [ { "id": 5, "name": "valueY", "kind": 4096, + "kindString": "Call signature", "flags": {}, "type": { "type": "intrinsic", @@ -102,7 +104,7 @@ ], "sources": [ { - "fileName": "%BASE%/literal-object/literal-object.ts", + "fileName": "literal-object.ts", "line": 6, "character": 10 } diff --git a/src/test/converter/literal-type/specs.json b/src/test/converter/literal-type/specs.json index d926133d8..1d4145393 100644 --- a/src/test/converter/literal-type/specs.json +++ b/src/test/converter/literal-type/specs.json @@ -283,10 +283,11 @@ "id": 5, "name": "valueY", "kind": 32, + "kindString": "Variable", "flags": {}, "sources": [ { - "fileName": "%BASE%/literal-type/literal-type.ts", + "fileName": "literal-type.ts", "line": 3, "character": 10 } @@ -326,10 +327,11 @@ "id": 4, "name": "valueZ", "kind": 32, + "kindString": "Variable", "flags": {}, "sources": [ { - "fileName": "%BASE%/literal-type/literal-type.ts", + "fileName": "literal-type.ts", "line": 2, "character": 10 } diff --git a/src/test/converter/react/specs.json b/src/test/converter/react/specs.json index d92994165..2eaddf5cb 100644 --- a/src/test/converter/react/specs.json +++ b/src/test/converter/react/specs.json @@ -18,28 +18,9 @@ "id": 5, "name": "Demo", "kind": 128, + "kindString": "Class", "flags": {}, "children": [ - { - "id": 6, - "name": "foo", - "kind": 1024, - "kindString": "Property", - "flags": { - "isPrivate": true - }, - "sources": [ - { - "fileName": "react.tsx", - "line": 14, - "character": 15 - } - ], - "type": { - "type": "intrinsic", - "name": "number" - } - }, { "id": 7, "name": "constructor", @@ -90,6 +71,240 @@ "name": "Component.__constructor" } }, + { + "id": 34, + "name": "context", + "kind": 1024, + "kindString": "Property", + "flags": {}, + "sources": [ + { + "fileName": "react.d.ts", + "line": 142, + "character": 15 + } + ], + "type": { + "type": "reference", + "name": "__type" + }, + "inheritedFrom": { + "type": "reference", + "name": "Component.context" + } + }, + { + "id": 6, + "name": "foo", + "kind": 1024, + "kindString": "Property", + "flags": { + "isPrivate": true + }, + "sources": [ + { + "fileName": "react.tsx", + "line": 14, + "character": 15 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + }, + { + "id": 32, + "name": "props", + "kind": 1024, + "kindString": "Property", + "flags": {}, + "sources": [ + { + "fileName": "react.d.ts", + "line": 140, + "character": 13 + } + ], + "type": { + "type": "reference", + "name": "DemoProps", + "id": 2 + }, + "inheritedFrom": { + "type": "reference", + "name": "Component.props" + } + }, + { + "id": 35, + "name": "refs", + "kind": 1024, + "kindString": "Property", + "flags": {}, + "sources": [ + { + "fileName": "react.d.ts", + "line": 143, + "character": 12 + } + ], + "type": { + "type": "reflection", + "declaration": { + "id": 36, + "name": "__type", + "kind": 65536, + "kindString": "Type literal", + "flags": {}, + "indexSignature": [ + { + "id": 37, + "name": "__index", + "kind": 8192, + "kindString": "Index signature", + "flags": {}, + "parameters": [ + { + "id": 38, + "name": "key", + "kind": 32768, + "kindString": "Parameter", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "string" + } + } + ], + "type": { + "type": "reference", + "name": "Component", + "typeArguments": [ + { + "type": "intrinsic", + "name": "any" + }, + { + "type": "intrinsic", + "name": "any" + } + ] + } + } + ], + "sources": [ + { + "fileName": "react.d.ts", + "line": 143, + "character": 13 + } + ] + } + }, + "inheritedFrom": { + "type": "reference", + "name": "Component.refs" + } + }, + { + "id": 33, + "name": "state", + "kind": 1024, + "kindString": "Property", + "flags": {}, + "sources": [ + { + "fileName": "react.d.ts", + "line": 141, + "character": 13 + } + ], + "type": { + "type": "intrinsic", + "name": "any" + }, + "inheritedFrom": { + "type": "reference", + "name": "Component.state" + } + }, + { + "id": 27, + "name": "forceUpdate", + "kind": 2048, + "kindString": "Method", + "flags": {}, + "signatures": [ + { + "id": 28, + "name": "forceUpdate", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "parameters": [ + { + "id": 29, + "name": "callBack", + "kind": 32768, + "kindString": "Parameter", + "flags": { + "isOptional": true + }, + "type": { + "type": "reflection", + "declaration": { + "id": 30, + "name": "__type", + "kind": 65536, + "kindString": "Type literal", + "flags": {}, + "signatures": [ + { + "id": 31, + "name": "__call", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "any" + } + } + ], + "sources": [ + { + "fileName": "react.d.ts", + "line": 138, + "character": 30 + } + ] + } + } + } + ], + "type": { + "type": "intrinsic", + "name": "void" + }, + "inheritedFrom": { + "type": "reference", + "name": "Component.forceUpdate" + } + } + ], + "sources": [ + { + "fileName": "react.d.ts", + "line": 138, + "character": 19 + } + ], + "inheritedFrom": { + "type": "reference", + "name": "Component.forceUpdate" + } + }, { "id": 10, "name": "render", @@ -334,225 +549,40 @@ "type": "reference", "name": "Component.setState" } - }, - { - "id": 27, - "name": "forceUpdate", - "kind": 2048, - "kindString": "Method", - "flags": {}, - "signatures": [ - { - "id": 28, - "name": "forceUpdate", - "kind": 4096, - "kindString": "Call signature", - "flags": {}, - "parameters": [ - { - "id": 29, - "name": "callBack", - "kind": 32768, - "kindString": "Parameter", - "flags": { - "isOptional": true - }, - "type": { - "type": "reflection", - "declaration": { - "id": 30, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": {}, - "signatures": [ - { - "id": 31, - "name": "__call", - "kind": 4096, - "kindString": "Call signature", - "flags": {}, - "type": { - "type": "intrinsic", - "name": "any" - } - } - ], - "sources": [ - { - "fileName": "react.d.ts", - "line": 138, - "character": 30 - } - ] - } - } - } - ], - "type": { - "type": "intrinsic", - "name": "void" - }, - "inheritedFrom": { - "type": "reference", - "name": "Component.forceUpdate" - } - } - ], - "sources": [ - { - "fileName": "react.d.ts", - "line": 138, - "character": 19 - } - ], - "inheritedFrom": { - "type": "reference", - "name": "Component.forceUpdate" - } - }, - { - "id": 32, - "name": "props", - "kind": 1024, - "kindString": "Property", - "flags": {}, - "sources": [ - { - "fileName": "react.d.ts", - "line": 140, - "character": 13 - } - ], - "type": { - "type": "reference", - "name": "DemoProps", - "id": 2 - }, - "inheritedFrom": { - "type": "reference", - "name": "Component.props" - } - }, + } + ], + "groups": [ { - "id": 33, - "name": "state", - "kind": 1024, - "kindString": "Property", - "flags": {}, - "sources": [ - { - "fileName": "react.d.ts", - "line": 141, - "character": 13 - } - ], - "type": { - "type": "intrinsic", - "name": "any" - }, - "inheritedFrom": { - "type": "reference", - "name": "Component.state" - } + "title": "Constructors", + "kind": 512, + "children": [ + 7 + ] }, { - "id": 34, - "name": "context", + "title": "Properties", "kind": 1024, - "kindString": "Property", - "flags": {}, - "sources": [ - { - "fileName": "react.d.ts", - "line": 142, - "character": 15 - } - ], - "type": { - "type": "reference", - "name": "__type" - }, - "inheritedFrom": { - "type": "reference", - "name": "Component.context" - } + "children": [ + 34, + 6, + 32, + 35, + 33 + ] }, { - "id": 35, - "name": "refs", - "kind": 1024, - "kindString": "Property", - "flags": {}, - "sources": [ - { - "fileName": "react.d.ts", - "line": 143, - "character": 12 - } - ], - "type": { - "type": "reflection", - "declaration": { - "id": 36, - "name": "__type", - "kind": 65536, - "kindString": "Type literal", - "flags": {}, - "indexSignature": [ - { - "id": 37, - "name": "__index", - "kind": 8192, - "kindString": "Index signature", - "flags": {}, - "parameters": [ - { - "id": 38, - "name": "key", - "kind": 32768, - "kindString": "Parameter", - "flags": {}, - "type": { - "type": "intrinsic", - "name": "string" - } - } - ], - "type": { - "type": "reference", - "name": "Component", - "typeArguments": [ - { - "type": "intrinsic", - "name": "any" - }, - { - "type": "intrinsic", - "name": "any" - } - ] - } - } - ], - "sources": [ - { - "fileName": "react.d.ts", - "line": 143, - "character": 13 - } - ] - } - }, - "inheritedFrom": { - "type": "reference", - "name": "Component.refs" - } + "title": "Methods", + "kind": 2048, + "children": [ + 27, + 10, + 12 + ] } ], "sources": [ { - "fileName": "%BASE%/react/react.tsx", + "fileName": "react.tsx", "line": 12, "character": 10 } @@ -564,7 +594,8 @@ "typeArguments": [ { "type": "reference", - "name": "DemoProps" + "name": "DemoProps", + "id": 2 }, { "type": "intrinsic", @@ -585,10 +616,11 @@ "id": 4, "name": "age", "kind": 1024, + "kindString": "Property", "flags": {}, "sources": [ { - "fileName": "%BASE%/react/react.tsx", + "fileName": "react.tsx", "line": 8, "character": 7 } diff --git a/src/test/converter/this/specs.json b/src/test/converter/this/specs.json index 493acb2fd..47d1ec35c 100644 --- a/src/test/converter/this/specs.json +++ b/src/test/converter/this/specs.json @@ -41,6 +41,7 @@ "id": 4, "name": "chain", "kind": 4096, + "kindString": "Call signature", "flags": {}, "comment": { "shortText": "Chain method that returns this." diff --git a/src/test/converter/type-operator/specs.json b/src/test/converter/type-operator/specs.json index f103dfcf7..dd6f81c4a 100644 --- a/src/test/converter/type-operator/specs.json +++ b/src/test/converter/type-operator/specs.json @@ -18,6 +18,7 @@ "id": 5, "name": "GenericClass", "kind": 128, + "kindString": "Class", "flags": { "isExported": true }, @@ -68,9 +69,18 @@ } } ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 7 + ] + } + ], "sources": [ { - "fileName": "%BASE%/type-operator/type-operator.ts", + "fileName": "type-operator.ts", "line": 13, "character": 25 } @@ -119,12 +129,13 @@ "id": 4, "name": "b", "kind": 1024, + "kindString": "Property", "flags": { "isExported": true }, "sources": [ { - "fileName": "%BASE%/type-operator/type-operator.ts", + "fileName": "type-operator.ts", "line": 10, "character": 5 } diff --git a/src/test/converter/union-or-intersection/specs.json b/src/test/converter/union-or-intersection/specs.json index d9ad51e3b..2e407f988 100644 --- a/src/test/converter/union-or-intersection/specs.json +++ b/src/test/converter/union-or-intersection/specs.json @@ -71,6 +71,7 @@ "id": 4, "name": "SecondType", "kind": 256, + "kindString": "Interface", "flags": { "isExported": true }, @@ -82,6 +83,7 @@ "id": 5, "name": "secondProperty", "kind": 1024, + "kindString": "Property", "flags": { "isExported": true }, @@ -90,7 +92,7 @@ }, "sources": [ { - "fileName": "%BASE%/union-or-intersection/union-or-intersection.ts", + "fileName": "union-or-intersection.ts", "line": 20, "character": 18 } @@ -101,9 +103,18 @@ } } ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 5 + ] + } + ], "sources": [ { - "fileName": "%BASE%/union-or-intersection/union-or-intersection.ts", + "fileName": "union-or-intersection.ts", "line": 15, "character": 27 } @@ -160,7 +171,8 @@ }, { "type": "reference", - "name": "SecondType" + "name": "SecondType", + "id": 4 } ] } @@ -231,7 +243,8 @@ }, { "type": "reference", - "name": "SecondType" + "name": "SecondType", + "id": 4 } ] } diff --git a/src/test/converter/variable/specs.json b/src/test/converter/variable/specs.json index 442bc8bcf..793b1c733 100644 --- a/src/test/converter/variable/specs.json +++ b/src/test/converter/variable/specs.json @@ -62,12 +62,13 @@ "id": 4, "name": "myVar", "kind": 32, + "kindString": "Variable", "flags": { "isExported": true }, "sources": [ { - "fileName": "%BASE%/variable/variable.ts", + "fileName": "variable.ts", "line": 3, "character": 16 } From 4157c579a919a3827e5a314ef0c378daa461b441 Mon Sep 17 00:00:00 2001 From: Louis-Dominique Dubeau Date: Fri, 5 Apr 2019 15:25:14 -0400 Subject: [PATCH 02/15] Fix remaining specs that need fixing. These were not affected by the revert in the previous commit. --- src/test/converter/mixin/specs.json | 18 ++++++++++++++++-- src/test/converter/promise-object/specs.json | 5 +++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/test/converter/mixin/specs.json b/src/test/converter/mixin/specs.json index b5e6853aa..52481ab54 100644 --- a/src/test/converter/mixin/specs.json +++ b/src/test/converter/mixin/specs.json @@ -51,6 +51,7 @@ "id": 4, "name": "baseMethod", "kind": 2048, + "kindString": "Method", "flags": { "isExported": true }, @@ -59,6 +60,7 @@ "id": 5, "name": "baseMethod", "kind": 4096, + "kindString": "Call signature", "flags": {}, "type": { "type": "intrinsic", @@ -68,7 +70,7 @@ ], "sources": [ { - "fileName": "%BASE%/mixin/mixin.ts", + "fileName": "mixin.ts", "line": 11, "character": 14 } @@ -237,10 +239,12 @@ "name": "number" }, "overwrites": { + "id": 4, "type": "reference", "name": "Base.baseMethod" }, "inheritedFrom": { + "id": 4, "type": "reference", "name": "Base.baseMethod" } @@ -254,10 +258,12 @@ } ], "overwrites": { + "id": 4, "type": "reference", "name": "Base.baseMethod" }, "inheritedFrom": { + "id": 4, "type": "reference", "name": "Base.baseMethod" } @@ -583,10 +589,12 @@ "name": "number" }, "overwrites": { + "id": 4, "type": "reference", "name": "Base.baseMethod" }, "inheritedFrom": { + "id": 4, "type": "reference", "name": "Base.baseMethod" } @@ -600,10 +608,12 @@ } ], "overwrites": { + "id": 4, "type": "reference", "name": "Base.baseMethod" }, "inheritedFrom": { + "id": 4, "type": "reference", "name": "Base.baseMethod" } @@ -835,10 +845,12 @@ "name": "number" }, "overwrites": { + "id": 4, "type": "reference", "name": "Base.baseMethod" }, "inheritedFrom": { + "id": 4, "type": "reference", "name": "Base.baseMethod" } @@ -852,10 +864,12 @@ } ], "overwrites": { + "id": 4, "type": "reference", "name": "Base.baseMethod" }, "inheritedFrom": { + "id": 4, "type": "reference", "name": "Base.baseMethod" } @@ -1582,4 +1596,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/promise-object/specs.json b/src/test/converter/promise-object/specs.json index 982d61c08..4c8addd5c 100644 --- a/src/test/converter/promise-object/specs.json +++ b/src/test/converter/promise-object/specs.json @@ -64,12 +64,13 @@ "id": 4, "name": "z", "kind": 32, + "kindString": "Variable", "flags": { "isLet": true }, "sources": [ { - "fileName": "%BASE%/promise-object/promise-object.ts", + "fileName": "promise-object.ts", "line": 3, "character": 5 } @@ -115,4 +116,4 @@ ] } ] -} \ No newline at end of file +} From 2929533a42e7deaece3dba5377500344cbc5c226 Mon Sep 17 00:00:00 2001 From: Louis-Dominique Dubeau Date: Fri, 5 Apr 2019 15:12:27 -0400 Subject: [PATCH 03/15] Reset the hidden field at conversion start. In the test suite, a single app is reused for all the converter tests. If the plugins do not appropriately reset their state at the start of a conversion, then one test may affect later tests. --- src/lib/converter/plugins/CommentPlugin.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/converter/plugins/CommentPlugin.ts b/src/lib/converter/plugins/CommentPlugin.ts index 5ebb9196c..8305c6725 100644 --- a/src/lib/converter/plugins/CommentPlugin.ts +++ b/src/lib/converter/plugins/CommentPlugin.ts @@ -124,6 +124,7 @@ export class CommentPlugin extends ConverterComponent { * @param context The context object describing the current state the converter is in. */ private onBegin(context: Context) { + this.hidden = undefined; this.comments = {}; } From d5a69e5cb73acb495a398fc9b8e8d8baa4c034bd Mon Sep 17 00:00:00 2001 From: Louis-Dominique Dubeau Date: Thu, 22 Mar 2018 06:43:20 -0400 Subject: [PATCH 04/15] Prune non-exported declarations rather than not create them. The earlier code would skip the creation of a declaration when the flag excludeNotExported was turned on. This could cause problems because it is not always possible at the time of the declaration creation to know whether the declaration will ultimately be exported. Consider: const foo = 1; export { foo } At the time of processing the first line, it is not known that foo will be exported. The new code lets all declarations be created and later, if excludeNotExported is turned on, it prunes the declarations that were not exported. --- src/lib/converter/converter.ts | 18 +++++++++++++++++- src/lib/converter/factories/declaration.ts | 4 ---- src/lib/converter/nodes/variable.ts | 1 - 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/lib/converter/converter.ts b/src/lib/converter/converter.ts index caa5a2acc..208fe9ba7 100644 --- a/src/lib/converter/converter.ts +++ b/src/lib/converter/converter.ts @@ -4,13 +4,25 @@ import * as _ from 'lodash'; import { Application } from '../application'; import { ParameterType } from '../utils/options/declaration'; -import { Reflection, Type, ProjectReflection } from '../models/index'; +import { Reflection, Type, ProjectReflection, DeclarationReflection, ContainerReflection } from '../models/index'; import { Context } from './context'; import { ConverterComponent, ConverterNodeComponent, ConverterTypeComponent, TypeTypeConverter, TypeNodeConverter } from './components'; import { Component, Option, ChildableComponent, ComponentClass } from '../utils/component'; import { normalizePath } from '../utils/fs'; import { createMinimatch } from '../utils/paths'; +function pruneNotExported(child) { + if ((child instanceof DeclarationReflection) && + !child.flags.isExported) { + const siblings = ( child.parent).children; + const index = siblings.indexOf(child); + siblings.splice(index, 1); + return; + } + + child.traverse(pruneNotExported); +} + /** * Result structure of the [[Converter.convert]] method. */ @@ -283,6 +295,10 @@ export class Converter extends ChildableComponent Date: Fri, 23 Mar 2018 13:03:14 -0400 Subject: [PATCH 05/15] Don't restrict the flag array. Instead of deciding ahead of time which flags the themes may need, put all flags in the array and let the themes determine which flags matter to them. --- src/lib/models/reflections/abstract.ts | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/lib/models/reflections/abstract.ts b/src/lib/models/reflections/abstract.ts index 145edfb88..0f2115274 100644 --- a/src/lib/models/reflections/abstract.ts +++ b/src/lib/models/reflections/abstract.ts @@ -85,19 +85,6 @@ export enum ReflectionFlag { Let = 8192 } -const relevantFlags: ReflectionFlag[] = [ - ReflectionFlag.Private, - ReflectionFlag.Protected, - ReflectionFlag.Static, - ReflectionFlag.ExportAssignment, - ReflectionFlag.Optional, - ReflectionFlag.DefaultValue, - ReflectionFlag.Rest, - ReflectionFlag.Abstract, - ReflectionFlag.Let, - ReflectionFlag.Const -]; - /** * This must extend Array in order to work with Handlebar's each helper. */ @@ -221,14 +208,10 @@ export class ReflectionFlags extends Array { private setSingleFlag(flag: ReflectionFlag, set: boolean) { const name = ReflectionFlag[flag].replace(/(.)([A-Z])/g, (m, a, b) => a + ' ' + b.toLowerCase()); if (!set && this.hasFlag(flag)) { - if (relevantFlags.includes(flag)) { - this.splice(this.indexOf(name), 1); - } + this.splice(this.indexOf(name), 1); this.flags ^= flag; } else if (set && !this.hasFlag(flag)) { - if (relevantFlags.includes(flag)) { - this.push(name); - } + this.push(name); this.flags |= flag; } } From 1c786a8a129bb1938795a669dcd6f8eafeed2abd Mon Sep 17 00:00:00 2001 From: Louis-Dominique Dubeau Date: Tue, 17 Apr 2018 08:31:12 -0400 Subject: [PATCH 06/15] Add Export flag. The Export flag is used to indicate that a symbol is directly under the effect of an `export` keyword in the TS source or directly subject to an export declaration. This flag is different from the Exported flag, which indicates that a symbol is externally either directly *or* indirectly. Class members provide a good example of the distinction between the two flags. They never get the Export flag because they cannot be individuall exported. However, they have the Exported flag true if their containing class is exported. --- src/lib/converter/factories/declaration.ts | 13 +++++++---- src/lib/converter/nodes/export.ts | 1 + src/lib/models/reflections/abstract.ts | 22 +++++++++++++++++-- src/test/converter/access/specs.json | 9 ++++++-- src/test/converter/array/specs.json | 5 ++++- src/test/converter/class/specs.json | 10 ++++++--- src/test/converter/comment/specs.json | 3 ++- src/test/converter/enum/specs.json | 6 +++-- .../converter/export-assignment/specs.json | 1 + .../converter/export-with-local/specs.json | 4 +++- src/test/converter/export/specs.json | 4 +++- src/test/converter/function/specs.json | 19 +++++++++++----- src/test/converter/implicit-types/specs.json | 6 +++-- .../interface-implementation/specs.json | 6 +++-- src/test/converter/this/specs.json | 3 ++- src/test/converter/type-operator/specs.json | 6 +++-- .../union-or-intersection/specs.json | 9 +++++--- src/test/converter/variable/specs.json | 5 ++++- 18 files changed, 98 insertions(+), 34 deletions(-) diff --git a/src/lib/converter/factories/declaration.ts b/src/lib/converter/factories/declaration.ts index 9bdef5b4d..52c6d676c 100644 --- a/src/lib/converter/factories/declaration.ts +++ b/src/lib/converter/factories/declaration.ts @@ -60,13 +60,17 @@ export function createDeclaration(context: Context, node: ts.Declaration, kind: isExported = container.flags.isExported; } + let hasExport = false; if (kind === ReflectionKind.ExternalModule) { isExported = true; // Always mark external modules as exported } else if (node.parent && node.parent.kind === ts.SyntaxKind.VariableDeclarationList) { - const parentModifiers = ts.getCombinedModifierFlags(node.parent.parent as ts.Declaration); - isExported = isExported || !!(parentModifiers & ts.ModifierFlags.Export); + const parentNodeExported = !!(ts.getCombinedModifierFlags(node.parent.parent as ts.Declaration) && ts.ModifierFlags.Export); + isExported = isExported || parentNodeExported; + hasExport = parentNodeExported; } else { - isExported = isExported || !!(modifiers & ts.ModifierFlags.Export); + const nodeExported = !!(modifiers & ts.ModifierFlags.Export); + isExported = isExported || nodeExported; + hasExport = nodeExported; } // Test whether the node is private, when inheriting ignore private members @@ -104,7 +108,8 @@ export function createDeclaration(context: Context, node: ts.Declaration, kind: child.setFlag(ReflectionFlag.Static, isStatic); child.setFlag(ReflectionFlag.Private, isPrivate); child.setFlag(ReflectionFlag.ConstructorProperty, isConstructorProperty); - child.setFlag(ReflectionFlag.Exported, isExported); + child.setFlag(ReflectionFlag.Exported, isExported); + child.setFlag(ReflectionFlag.Export, hasExport); child = setupDeclaration(context, child, node); if (child) { diff --git a/src/lib/converter/nodes/export.ts b/src/lib/converter/nodes/export.ts index dab11eac2..a08794b13 100644 --- a/src/lib/converter/nodes/export.ts +++ b/src/lib/converter/nodes/export.ts @@ -37,6 +37,7 @@ export class ExportConverter extends ConverterNodeComponent const reflection = project.reflections[id]; if (node.isExportEquals && reflection instanceof DeclarationReflection) { reflection.setFlag(ReflectionFlag.ExportAssignment, true); + reflection.setFlag(ReflectionFlag.Export, true); } markAsExported(reflection); }); diff --git a/src/lib/models/reflections/abstract.ts b/src/lib/models/reflections/abstract.ts index 0f2115274..6ca5eb3a8 100644 --- a/src/lib/models/reflections/abstract.ts +++ b/src/lib/models/reflections/abstract.ts @@ -82,7 +82,8 @@ export enum ReflectionFlag { ConstructorProperty = 1024, Abstract = 2048, Const = 4096, - Let = 8192 + Let = 8192, + Export = 16384 } /** @@ -124,7 +125,15 @@ export class ReflectionFlags extends Array { } /** - * Is this member exported? + * Is this symbol exported? + * + * Note that it is possible for a symbol to have `isExported` true + * and `hasExport` false. For instance, if a class is exported, + * all its members will have `isExported` true because the members + * are "effectively exported" due to their parent class being + * exported. However, they have `hasExport` false because none of + * them directly appear in an export declaration nor are they + * prefixed with an `export` keyword. */ get isExported(): boolean { return this.hasFlag(ReflectionFlag.Exported); @@ -157,6 +166,15 @@ export class ReflectionFlags extends Array { return this.hasFlag(ReflectionFlag.ExportAssignment); } + /** + * Indicates whether this symbol is being directly exported. This + * happens through the `export` keyword (e.g. `export const foo`) + * or through an export declatation (e.g. `export { foo }`). + */ + get hasExport(): boolean { + return this.hasFlag(ReflectionFlag.Export); + } + get isConstructorProperty(): boolean { return this.hasFlag(ReflectionFlag.ConstructorProperty); } diff --git a/src/test/converter/access/specs.json b/src/test/converter/access/specs.json index 17e9a47bd..89ca99cb3 100644 --- a/src/test/converter/access/specs.json +++ b/src/test/converter/access/specs.json @@ -21,7 +21,8 @@ "kindString": "Class", "flags": { "isPrivate": true, - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "A class that is documented as being private." @@ -180,6 +181,7 @@ "flags": { "isPrivate": true, "isExported": true, + "hasExport": true, "isConst": true }, "comment": { @@ -205,6 +207,7 @@ "kindString": "Variable", "flags": { "isExported": true, + "hasExport": true, "isProtected": true, "isConst": true }, @@ -231,7 +234,8 @@ "kindString": "Function", "flags": { "isPrivate": true, - "isExported": true + "isExported": true, + "hasExport": true }, "signatures": [ { @@ -266,6 +270,7 @@ "kindString": "Function", "flags": { "isExported": true, + "hasExport": true, "isProtected": true }, "signatures": [ diff --git a/src/test/converter/array/specs.json b/src/test/converter/array/specs.json index cccc4ca4d..473bfee87 100644 --- a/src/test/converter/array/specs.json +++ b/src/test/converter/array/specs.json @@ -20,7 +20,8 @@ "kind": 256, "kindString": "Interface", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "A custom array interface." @@ -49,6 +50,7 @@ "kindString": "Variable", "flags": { "isExported": true, + "hasExport": true, "isConst": true }, "comment": { @@ -114,6 +116,7 @@ "kindString": "Variable", "flags": { "isExported": true, + "hasExport": true, "isConst": true }, "comment": { diff --git a/src/test/converter/class/specs.json b/src/test/converter/class/specs.json index 26e9b68a3..0770eb30c 100644 --- a/src/test/converter/class/specs.json +++ b/src/test/converter/class/specs.json @@ -105,6 +105,7 @@ "kindString": "Class", "flags": { "isExported": true, + "hasExport": true, "isAbstract": true }, "children": [ @@ -198,7 +199,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "children": [ { @@ -304,7 +306,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "TestClass comment short text.", @@ -611,7 +614,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "children": [ { diff --git a/src/test/converter/comment/specs.json b/src/test/converter/comment/specs.json index 7066831cc..4605b0adc 100644 --- a/src/test/converter/comment/specs.json +++ b/src/test/converter/comment/specs.json @@ -20,7 +20,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "A Comment for a class", diff --git a/src/test/converter/enum/specs.json b/src/test/converter/enum/specs.json index 418970886..5befe7eb5 100644 --- a/src/test/converter/enum/specs.json +++ b/src/test/converter/enum/specs.json @@ -20,7 +20,8 @@ "kind": 4, "kindString": "Enumeration", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "This is an enumeration extended by a module.\nThis is a module extending an enumeration." @@ -187,7 +188,8 @@ "kind": 4, "kindString": "Enumeration", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "This is a simple enumeration." diff --git a/src/test/converter/export-assignment/specs.json b/src/test/converter/export-assignment/specs.json index 11cf36c83..ef22cfd68 100644 --- a/src/test/converter/export-assignment/specs.json +++ b/src/test/converter/export-assignment/specs.json @@ -21,6 +21,7 @@ "kindString": "Function", "flags": { "isExported": true, + "hasExport": true, "hasExportAssignment": true }, "signatures": [ diff --git a/src/test/converter/export-with-local/specs.json b/src/test/converter/export-with-local/specs.json index 6b2f4c5d2..261130e50 100644 --- a/src/test/converter/export-with-local/specs.json +++ b/src/test/converter/export-with-local/specs.json @@ -42,6 +42,7 @@ "kindString": "Variable", "flags": { "isExported": true, + "hasExport": true, "isConst": true }, "sources": [ @@ -63,7 +64,8 @@ "kind": 64, "kindString": "Function", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "signatures": [ { diff --git a/src/test/converter/export/specs.json b/src/test/converter/export/specs.json index 852eff5c2..5daf6f6f8 100644 --- a/src/test/converter/export/specs.json +++ b/src/test/converter/export/specs.json @@ -21,6 +21,7 @@ "kindString": "Variable", "flags": { "isExported": true, + "hasExport": true, "isConst": true }, "sources": [ @@ -42,7 +43,8 @@ "kind": 64, "kindString": "Function", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "signatures": [ { diff --git a/src/test/converter/function/specs.json b/src/test/converter/function/specs.json index 4eb212e38..7eea20315 100644 --- a/src/test/converter/function/specs.json +++ b/src/test/converter/function/specs.json @@ -20,7 +20,8 @@ "kind": 2, "kindString": "Module", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "This is the module extending the function moduleFunction()." @@ -178,7 +179,8 @@ "kind": 64, "kindString": "Function", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "signatures": [ { @@ -210,7 +212,8 @@ "kind": 64, "kindString": "Function", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "signatures": [ { @@ -320,7 +323,8 @@ "kind": 64, "kindString": "Function", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "signatures": [ { @@ -384,7 +388,8 @@ "kind": 64, "kindString": "Function", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "signatures": [ { @@ -543,7 +548,8 @@ "kind": 64, "kindString": "Function", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "This is the actual implementation, this comment will not be visible\nin the generated documentation.", @@ -683,6 +689,7 @@ "kindString": "Function", "flags": { "isExported": true, + "hasExport": true, "isConst": true }, "comment": { diff --git a/src/test/converter/implicit-types/specs.json b/src/test/converter/implicit-types/specs.json index 893195c83..b9dc73846 100644 --- a/src/test/converter/implicit-types/specs.json +++ b/src/test/converter/implicit-types/specs.json @@ -20,7 +20,8 @@ "kind": 256, "kindString": "Interface", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "children": [ { @@ -231,7 +232,8 @@ "kind": 64, "kindString": "Function", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "signatures": [ { diff --git a/src/test/converter/interface-implementation/specs.json b/src/test/converter/interface-implementation/specs.json index c1e7b4049..43352a8e8 100644 --- a/src/test/converter/interface-implementation/specs.json +++ b/src/test/converter/interface-implementation/specs.json @@ -27,7 +27,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "Implementation of IEventDispatcher", @@ -708,7 +709,8 @@ "kind": 256, "kindString": "Interface", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "The main interface of the event system.\nAn IEventDispatcher is an object that keeps a list of listeners, and sends dispatches events of a certain type to them.\nThis might otherwise be known as a Signal." diff --git a/src/test/converter/this/specs.json b/src/test/converter/this/specs.json index 47d1ec35c..357d6c461 100644 --- a/src/test/converter/this/specs.json +++ b/src/test/converter/this/specs.json @@ -20,7 +20,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "ChainClass comment short text.", diff --git a/src/test/converter/type-operator/specs.json b/src/test/converter/type-operator/specs.json index dd6f81c4a..cd0479bc6 100644 --- a/src/test/converter/type-operator/specs.json +++ b/src/test/converter/type-operator/specs.json @@ -20,7 +20,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "typeParameter": [ { @@ -92,7 +93,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "TestClass comment short text.", diff --git a/src/test/converter/union-or-intersection/specs.json b/src/test/converter/union-or-intersection/specs.json index 2e407f988..8728c1ce2 100644 --- a/src/test/converter/union-or-intersection/specs.json +++ b/src/test/converter/union-or-intersection/specs.json @@ -20,7 +20,8 @@ "kind": 256, "kindString": "Interface", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "First type for union or intersection type tests." @@ -73,7 +74,8 @@ "kind": 256, "kindString": "Interface", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "Second type for union or intersection type tests." @@ -126,7 +128,8 @@ "kind": 256, "kindString": "Interface", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "Third type for union or intersection type tests." diff --git a/src/test/converter/variable/specs.json b/src/test/converter/variable/specs.json index 793b1c733..11653d369 100644 --- a/src/test/converter/variable/specs.json +++ b/src/test/converter/variable/specs.json @@ -21,6 +21,7 @@ "kindString": "Variable", "flags": { "isExported": true, + "hasExport": true, "isConst": true }, "sources": [ @@ -43,6 +44,7 @@ "kindString": "Variable", "flags": { "isExported": true, + "hasExport": true, "isLet": true }, "sources": [ @@ -64,7 +66,8 @@ "kind": 32, "kindString": "Variable", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "sources": [ { From a84ac0cc8d7fc57831a1d7fce526f94290aaf0ea Mon Sep 17 00:00:00 2001 From: Louis-Dominique Dubeau Date: Tue, 17 Apr 2018 18:50:39 -0400 Subject: [PATCH 07/15] Update generated HTML in light of recent logic changes. --- .../specs/classes/_access_.privateclass.html | 2 +- .../specs/classes/_classes_.baseclass.html | 2 +- .../specs/classes/_classes_.genericclass.html | 2 +- .../classes/_classes_.nongenericclass.html | 2 +- .../specs/classes/_classes_.subclassa.html | 2 +- .../specs/classes/_classes_.subclassb.html | 2 +- ..._default_export_.defaultexportedclass.html | 2 +- .../_single_export_.singleexportedclass.html | 2 +- .../enums/_enumerations_.directions.html | 2 +- .../specs/enums/_enumerations_.size.html | 2 +- .../interfaces/_classes_.inameinterface.html | 2 +- .../interfaces/_classes_.iprintinterface.html | 2 +- .../_classes_.iprintnameinterface.html | 2 +- src/test/renderer/specs/modules/_access_.html | 26 +++++---- .../specs/modules/_access_.privatemodule.html | 7 +-- .../renderer/specs/modules/_classes_.html | 24 ++++++--- .../specs/modules/_default_export_.html | 3 +- .../specs/modules/_enumerations_.html | 6 ++- .../renderer/specs/modules/_functions_.html | 53 +++++++++++-------- .../modules/_functions_.modulefunction.html | 2 +- .../renderer/specs/modules/_modules_.html | 8 +-- .../specs/modules/_modules_.mymodule.html | 15 +++--- .../_modules_.mymodule.mysubmodule.html | 2 +- .../specs/modules/_single_export_.html | 3 +- .../specs/modules/_typescript_1_4_.html | 5 +- .../renderer/specs/modules/_variables_.html | 15 +++--- 26 files changed, 116 insertions(+), 79 deletions(-) diff --git a/src/test/renderer/specs/classes/_access_.privateclass.html b/src/test/renderer/specs/classes/_access_.privateclass.html index 2193844ad..3d323ddda 100644 --- a/src/test/renderer/specs/classes/_access_.privateclass.html +++ b/src/test/renderer/specs/classes/_access_.privateclass.html @@ -62,7 +62,7 @@ PrivateClass -

Class PrivateClass

+

x Class PrivateClass

diff --git a/src/test/renderer/specs/classes/_classes_.baseclass.html b/src/test/renderer/specs/classes/_classes_.baseclass.html index 9b45dd8e6..0baf2ea5c 100644 --- a/src/test/renderer/specs/classes/_classes_.baseclass.html +++ b/src/test/renderer/specs/classes/_classes_.baseclass.html @@ -62,7 +62,7 @@ BaseClass -

Class BaseClass

+

x Class BaseClass

diff --git a/src/test/renderer/specs/classes/_classes_.genericclass.html b/src/test/renderer/specs/classes/_classes_.genericclass.html index 121cbe9f7..a73b9697e 100644 --- a/src/test/renderer/specs/classes/_classes_.genericclass.html +++ b/src/test/renderer/specs/classes/_classes_.genericclass.html @@ -62,7 +62,7 @@ GenericClass -

Class GenericClass<T>

+

x Class GenericClass<T>

diff --git a/src/test/renderer/specs/classes/_classes_.nongenericclass.html b/src/test/renderer/specs/classes/_classes_.nongenericclass.html index 7e205960b..8695ca8e7 100644 --- a/src/test/renderer/specs/classes/_classes_.nongenericclass.html +++ b/src/test/renderer/specs/classes/_classes_.nongenericclass.html @@ -62,7 +62,7 @@ NonGenericClass -

Class NonGenericClass

+

x Class NonGenericClass

diff --git a/src/test/renderer/specs/classes/_classes_.subclassa.html b/src/test/renderer/specs/classes/_classes_.subclassa.html index 23adfef6b..608858fd1 100644 --- a/src/test/renderer/specs/classes/_classes_.subclassa.html +++ b/src/test/renderer/specs/classes/_classes_.subclassa.html @@ -62,7 +62,7 @@ SubClassA -

Class SubClassA

+

x Class SubClassA

diff --git a/src/test/renderer/specs/classes/_classes_.subclassb.html b/src/test/renderer/specs/classes/_classes_.subclassb.html index 5323172ee..17a746284 100644 --- a/src/test/renderer/specs/classes/_classes_.subclassb.html +++ b/src/test/renderer/specs/classes/_classes_.subclassb.html @@ -62,7 +62,7 @@ SubClassB -

Class SubClassB

+

x Class SubClassB

diff --git a/src/test/renderer/specs/classes/_default_export_.defaultexportedclass.html b/src/test/renderer/specs/classes/_default_export_.defaultexportedclass.html index c62ff96ef..94bb2112b 100644 --- a/src/test/renderer/specs/classes/_default_export_.defaultexportedclass.html +++ b/src/test/renderer/specs/classes/_default_export_.defaultexportedclass.html @@ -62,7 +62,7 @@ DefaultExportedClass -

Class DefaultExportedClass

+

x Class DefaultExportedClass

diff --git a/src/test/renderer/specs/classes/_single_export_.singleexportedclass.html b/src/test/renderer/specs/classes/_single_export_.singleexportedclass.html index a822ee2df..843815419 100644 --- a/src/test/renderer/specs/classes/_single_export_.singleexportedclass.html +++ b/src/test/renderer/specs/classes/_single_export_.singleexportedclass.html @@ -62,7 +62,7 @@ SingleExportedClass -

Class SingleExportedClass

+

x Class SingleExportedClass

diff --git a/src/test/renderer/specs/enums/_enumerations_.directions.html b/src/test/renderer/specs/enums/_enumerations_.directions.html index 88c32986c..5308ea9d3 100644 --- a/src/test/renderer/specs/enums/_enumerations_.directions.html +++ b/src/test/renderer/specs/enums/_enumerations_.directions.html @@ -62,7 +62,7 @@ Directions -

Enumeration Directions

+

x Enumeration Directions

diff --git a/src/test/renderer/specs/enums/_enumerations_.size.html b/src/test/renderer/specs/enums/_enumerations_.size.html index 0a982fe13..9d6b5ad28 100644 --- a/src/test/renderer/specs/enums/_enumerations_.size.html +++ b/src/test/renderer/specs/enums/_enumerations_.size.html @@ -62,7 +62,7 @@ Size -

Enumeration Size

+

x Enumeration Size

diff --git a/src/test/renderer/specs/interfaces/_classes_.inameinterface.html b/src/test/renderer/specs/interfaces/_classes_.inameinterface.html index 3b8630188..6bf12222f 100644 --- a/src/test/renderer/specs/interfaces/_classes_.inameinterface.html +++ b/src/test/renderer/specs/interfaces/_classes_.inameinterface.html @@ -62,7 +62,7 @@ INameInterface -

Interface INameInterface

+

x Interface INameInterface

diff --git a/src/test/renderer/specs/interfaces/_classes_.iprintinterface.html b/src/test/renderer/specs/interfaces/_classes_.iprintinterface.html index 0ed238d9e..0f9896522 100644 --- a/src/test/renderer/specs/interfaces/_classes_.iprintinterface.html +++ b/src/test/renderer/specs/interfaces/_classes_.iprintinterface.html @@ -62,7 +62,7 @@ IPrintInterface -

Interface IPrintInterface

+

x Interface IPrintInterface

diff --git a/src/test/renderer/specs/interfaces/_classes_.iprintnameinterface.html b/src/test/renderer/specs/interfaces/_classes_.iprintnameinterface.html index f3ddb388d..b7a5c3d65 100644 --- a/src/test/renderer/specs/interfaces/_classes_.iprintnameinterface.html +++ b/src/test/renderer/specs/interfaces/_classes_.iprintnameinterface.html @@ -62,7 +62,7 @@ IPrintNameInterface -

Interface IPrintNameInterface

+

x Interface IPrintNameInterface

diff --git a/src/test/renderer/specs/modules/_access_.html b/src/test/renderer/specs/modules/_access_.html index dbfd9c594..2f9acbe74 100644 --- a/src/test/renderer/specs/modules/_access_.html +++ b/src/test/renderer/specs/modules/_access_.html @@ -73,27 +73,33 @@

Index

Modules

Classes

Variables

Functions

@@ -103,7 +109,7 @@

Functions

Variables

-

Private fakePrivateVariable

+

Export Private fakePrivateVariable

fakePrivateVariable: string = "test"
-

Protected fakeProtectedVariable

+

Export Protected fakeProtectedVariable

fakeProtectedVariable: string = "test"