feat: support modules and namespaces

closes #6 closes #7
mxsdev · Nov 3, 2022 · 670e069 · 670e069
1 parent 5848029
commit 670e069
Show file tree

Hide file tree

Showing 15 changed files with 1,161 additions and 3 deletions.
diff --git a/packages/api/src/localization.ts b/packages/api/src/localization.ts
@@ -46,6 +46,8 @@ export const KindText: Record<
     interface: "interface",
     method: "method",
     jsx_component: "component",
+    namespace: "namespace",
+    module: "module",
 }
 
 export function getKindText(

diff --git a/packages/api/src/localizedTree.ts b/packages/api/src/localizedTree.ts
@@ -311,6 +311,11 @@ function getChildren(
                 return getLocalizedTypeParameter(info, typeArgument)
             }
 
+            case "module":
+            case "namespace": {
+                return info.exports.map(localize)
+            }
+
             default: {
                 return undefined
             }

diff --git a/packages/api/src/tree.ts b/packages/api/src/tree.ts
@@ -54,6 +54,8 @@ import {
     isReadonlySymbol,
     isReadonlyArrayType,
     isReadonlyTupleType,
+    getSymbolExports,
+    isNamespace,
 } from "./util"
 
 const maxDepthExceeded: TypeInfo = { kind: "max_depth", id: getEmptyTypeId() }
@@ -96,6 +98,8 @@ function _generateTypeTree(
         type = getSymbolType(tsCtx, symbol!)
     }
 
+    const typeSymbol = type.symbol as ts.Symbol | undefined
+
     let isAnonymousSymbol = !symbol
 
     if (!symbol) {
@@ -226,6 +230,15 @@ function _generateTypeTree(
     return typeInfoId
 
     function createNode(type: ts.Type): TypeInfoNoId {
+        for (const s of [symbol, typeSymbol]) {
+            if (s && s.flags & ts.SymbolFlags.Module) {
+                return {
+                    kind: isNamespace(tsCtx, s) ? "namespace" : "module",
+                    exports: parseSymbols(getSymbolExports(s)),
+                }
+            }
+        }
+
         const flags = type.getFlags()
 
         if (flags & ts.TypeFlags.TypeParameter) {
@@ -316,7 +329,6 @@ function _generateTypeTree(
                 value: (type as ts.BigIntLiteralType).value,
             }
         } else if (flags & ts.TypeFlags.Object) {
-            const { symbol: typeSymbol } = type
             if (typeSymbol && typeSymbol.flags & SymbolFlags.Enum) {
                 return {
                     kind: "enum",
@@ -827,6 +839,11 @@ export function getTypeInfoChildren(info: TypeInfo): TypeInfo[] {
             case "string_mapping": {
                 return [info.type]
             }
+
+            case "module":
+            case "namespace": {
+                return [...info.exports]
+            }
         }
 
         return []

diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts
@@ -191,6 +191,14 @@ export type TypeInfoNoId = {
     | {
           kind: "max_depth"
       }
+    | {
+          kind: "namespace"
+          exports: TypeInfo[]
+      }
+    | {
+          kind: "module"
+          exports: TypeInfo[]
+      }
 )
 
 export type TypeId = string

diff --git a/packages/api/src/util.ts b/packages/api/src/util.ts
@@ -735,7 +735,7 @@ export function getSignatureTypeArguments(
         )
         ?.typeArguments?.map((t) =>
             getTypeFromTypeNode(ctx, t, enclosingDeclaration)
-        )
+        ) // TODO: error here...
 }
 
 export function getDescendantAtPosition(
@@ -846,7 +846,7 @@ export function getSymbolOrTypeOfNode(
     if (symbol) {
         const symbolType = getSymbolType(ctx, symbol, node)
 
-        if (isValidType(symbolType)) {
+        if (isValidType(symbolType) || symbol.flags & ts.SymbolFlags.Module) {
             return { symbol, node }
         }
     }
@@ -922,3 +922,44 @@ export function isReadonlySymbol(
         // some(symbol.declarations, isReadonlyAssignmentDeclaration)
     )
 }
+
+export function getSymbolExports(symbol: ts.Symbol): ts.Symbol[] {
+    const result: ts.Symbol[] = []
+
+    symbol.exports?.forEach((value) => result.push(value))
+    symbol.globalExports?.forEach((value) => result.push(value))
+
+    return result
+}
+
+export function isNamespace(
+    { ts }: TypescriptContext,
+    symbol: ts.Symbol
+): boolean {
+    const declaration = getDeclarationOfKind<ts.ModuleDeclaration>(
+        symbol,
+        ts.SyntaxKind.ModuleDeclaration
+    )
+    const isNamespace =
+        declaration &&
+        declaration.name &&
+        declaration.name.kind === ts.SyntaxKind.Identifier
+
+    return !!isNamespace
+}
+
+function getDeclarationOfKind<T extends ts.Declaration>(
+    symbol: ts.Symbol,
+    kind: T["kind"]
+): T | undefined {
+    const declarations = symbol.declarations
+    if (declarations) {
+        for (const declaration of declarations) {
+            if (declaration.kind === kind) {
+                return declaration as T
+            }
+        }
+    }
+
+    return undefined
+}
diff --git a/packages/typescript-explorer-vscode/src/view/typeTreeView.ts b/packages/typescript-explorer-vscode/src/view/typeTreeView.ts
@@ -436,6 +436,14 @@ function getMeta(info: LocalizedTypeInfo, depth: number): TypeTreeItemMeta {
                     return ["symbol-interface"]
                 }
 
+                case "namespace": {
+                    return ["symbol-namespace"]
+                }
+
+                case "module": {
+                    return ["symbol-module"]
+                }
+
                 case "class": {
                     return ["symbol-class"]
                 }