feat: Move TypeScript to a peer dependency

Closes #880
TypeStrong · Mar 15, 2020 · 49b1c4f · 49b1c4f
1 parent 3dadcde
commit 49b1c4f
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 85 deletions.
diff --git a/UPDATING.md b/UPDATING.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,10 @@
     "progress": "^2.0.3",
     "shelljs": "^0.8.3",
     "typedoc-default-themes": "^0.8.0",
-    "typescript": "3.7.x"
+    "typescript": "^3.8.3"
+  },
+  "peerDependencies": {
+    "typescript": ">=3.8.3"
   },
   "devDependencies": {
     "@types/minimatch": "3.0.3",

diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts
@@ -154,6 +154,14 @@ export class Context {
         return symbol;
     }
 
+    expectSymbolAtLocation(node: ts.Node): ts.Symbol {
+        const symbol = this.getSymbolAtLocation(node);
+        if (!symbol) {
+            throw new Error(`Expected a symbol for node with kind ${ts.SyntaxKind[node.kind]}`);
+        }
+        return symbol;
+    }
+
     resolveAliasedSymbol(symbol: ts.Symbol): ts.Symbol;
     resolveAliasedSymbol(symbol: ts.Symbol | undefined): ts.Symbol | undefined;
     resolveAliasedSymbol(symbol: ts.Symbol | undefined) {

diff --git a/src/lib/converter/nodes/export.ts b/src/lib/converter/nodes/export.ts
@@ -69,23 +69,29 @@ export class ExportDeclarationConverter extends ConverterNodeComponent<ts.Export
             throw new Error('Expected to be within a container');
         }
 
-        if (node.exportClause) { // export { a, a as b }
+        if (node.exportClause && node.exportClause.kind === ts.SyntaxKind.NamedExports) { // export { a, a as b }
             node.exportClause.elements.forEach(specifier => {
-                const source = context.getSymbolAtLocation(specifier.name);
-                const target = context.resolveAliasedSymbol(context.getSymbolAtLocation(specifier.propertyName ?? specifier.name));
-                if (source && target) {
-                    // If the original declaration is in this file, export {} was used with something
-                    // defined in this file and we don't need to create a reference unless the name is different.
-                    if (!node.moduleSpecifier && !specifier.propertyName) {
-                        return;
-                    }
-
-                    createReferenceReflection(context, source, target);
+                const source = context.expectSymbolAtLocation(specifier.name);
+                const target = context.resolveAliasedSymbol(context.expectSymbolAtLocation(specifier.propertyName ?? specifier.name));
+                // If the original declaration is in this file, export {} was used with something
+                // defined in this file and we don't need to create a reference unless the name is different.
+                if (!node.moduleSpecifier && !specifier.propertyName) {
+                    return;
                 }
+
+                createReferenceReflection(context, source, target);
             });
+        } else if (node.exportClause && node.exportClause.kind === ts.SyntaxKind.NamespaceExport) { // export * as ns
+            const source = context.expectSymbolAtLocation(node.exportClause.name);
+            if (!node.moduleSpecifier) {
+                throw new Error('Namespace export is missing a module specifier.');
+            }
+            const target = context.resolveAliasedSymbol(context.expectSymbolAtLocation(node.moduleSpecifier));
+            createReferenceReflection(context, source, target);
+
         } else if (node.moduleSpecifier) { // export * from ...
-            const sourceFileSymbol = context.getSymbolAtLocation(node.moduleSpecifier);
-            for (const symbol of context.checker.getExportsOfModule(sourceFileSymbol!)) {
+            const sourceFileSymbol = context.expectSymbolAtLocation(node.moduleSpecifier);
+            for (const symbol of context.checker.getExportsOfModule(sourceFileSymbol)) {
                 if (symbol.name === 'default') { // Default exports are not re-exported with export *
                     continue;
                 }

diff --git a/src/test/converter/exports/mod.ts b/src/test/converter/exports/mod.ts
@@ -33,3 +33,6 @@ export const hidden = true;
  * No reference should be created.
  */
 export { Node } from 'typescript';
+
+// TS 3.8 namespace exports
+export * as ThisModule from './mod';
diff --git 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": 15,
       "name": "\"export\"",
       "kind": 1,
       "kindString": "External module",
@@ -15,7 +15,17 @@
       "originalName": "%BASE%/exports/export.ts",
       "children": [
         {
-          "id": 15,
+          "id": 20,
+          "name": "ThisModule",
+          "kind": 16777216,
+          "kindString": "Reference",
+          "flags": {
+            "isExported": true
+          },
+          "target": 9
+        },
+        {
+          "id": 16,
           "name": "a",
           "kind": 16777216,
           "kindString": "Reference",
@@ -25,7 +35,7 @@
           "target": 10
         },
         {
-          "id": 16,
+          "id": 17,
           "name": "b",
           "kind": 16777216,
           "kindString": "Reference",
@@ -35,7 +45,7 @@
           "target": 10
         },
         {
-          "id": 17,
+          "id": 18,
           "name": "c",
           "kind": 16777216,
           "kindString": "Reference",
@@ -45,7 +55,7 @@
           "target": 10
         },
         {
-          "id": 19,
+          "id": 21,
           "name": "c",
           "kind": 16777216,
           "kindString": "Reference",
@@ -55,7 +65,7 @@
           "target": 10
         },
         {
-          "id": 20,
+          "id": 22,
           "name": "add",
           "kind": 64,
           "kindString": "Function",
@@ -64,7 +74,7 @@
           },
           "signatures": [
             {
-              "id": 21,
+              "id": 23,
               "name": "add",
               "kind": 4096,
               "kindString": "Call signature",
@@ -73,7 +83,7 @@
               },
               "parameters": [
                 {
-                  "id": 22,
+                  "id": 24,
                   "name": "x",
                   "kind": 32768,
                   "kindString": "Parameter",
@@ -86,7 +96,7 @@
                   }
                 },
                 {
-                  "id": 23,
+                  "id": 25,
                   "name": "y",
                   "kind": 32768,
                   "kindString": "Parameter",
@@ -119,17 +129,18 @@
           "title": "References",
           "kind": 16777216,
           "children": [
-            15,
+            20,
             16,
             17,
-            19
+            18,
+            21
           ]
         },
         {
           "title": "Functions",
           "kind": 64,
           "children": [
-            20
+            22
           ]
         }
       ],
@@ -301,6 +312,16 @@
       },
       "originalName": "%BASE%/exports/mod.ts",
       "children": [
+        {
+          "id": 14,
+          "name": "ThisModule",
+          "kind": 16777216,
+          "kindString": "Reference",
+          "flags": {
+            "isExported": true
+          },
+          "target": 9
+        },
         {
           "id": 11,
           "name": "b",
@@ -352,6 +373,7 @@
           "title": "References",
           "kind": 16777216,
           "children": [
+            14,
             11,
             12
           ]
@@ -378,7 +400,7 @@
       "title": "External modules",
       "kind": 1,
       "children": [
-        14,
+        15,
         1,
         2,
         3,