@eventra_dev/eventra-cli 0.1.5 → 0.1.6

package/dist/engine/exportResolver.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveExportedSymbol = resolveExportedSymbol;
+const typescript_1 = __importDefault(require("typescript"));
+function resolveExportedSymbol(symbol, checker, visited = new Set()) {
+    if (visited.has(symbol))
+        return null;
+    visited.add(symbol);
+    if (symbol.flags & typescript_1.default.SymbolFlags.Alias) {
+        const aliased = checker.getAliasedSymbol(symbol);
+        return resolveExportedSymbol(aliased, checker, visited);
+    }
+    if (symbol.getDeclarations()?.length) {
+        return symbol;
+    }
+    const declarations = symbol.getDeclarations() ?? [];
+    for (const decl of declarations) {
+        const source = decl.getSourceFile();
+        const moduleSymbol = checker.getSymbolAtLocation(source);
+        if (!moduleSymbol)
+            continue;
+        const exports = checker.getExportsOfModule(moduleSymbol);
+        for (const exp of exports) {
+            const resolved = resolveExportedSymbol(exp, checker, visited);
+            if (resolved?.getDeclarations()?.length) {
+                return resolved;
+            }
+        }
+    }
+    return symbol;
+}

package/dist/engine/languageService.js

@@ -43,7 +43,9 @@ class TSService {
         }
         this.compilerOptions = compilerOptions;
         const host = {
-            getScriptFileNames: () => [...this.fileNames],
+            getScriptFileNames: () => {
+                return [...new Set(this.fileNames)].sort((a, b) => a.localeCompare(b));
+            },
             getScriptVersion: (file) => this.files.get(file)?.version.toString() ?? "0",
             getScriptSnapshot: (file) => {
                 const f = this.files.get(file);

package/dist/engine/resolver.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveNodeValue = resolveNodeValue;
 const typescript_1 = __importDefault(require("typescript"));
+const exportResolver_1 = require("./exportResolver");
 function resolveNodeValue(node, checker, paramMap, seen = new Set()) {
     if (seen.has(node))
         return null;
@@ -36,6 +37,7 @@ function resolveNodeValue(node, checker, paramMap, seen = new Set()) {
         let symbol = checker.getSymbolAtLocation(node);
         if (!symbol)
             return null;
+        symbol = (0, exportResolver_1.resolveExportedSymbol)(symbol, checker) ?? symbol;
         if (symbol.flags & typescript_1.default.SymbolFlags.Alias) {
             symbol = checker.getAliasedSymbol(symbol);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eventra_dev/eventra-cli",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Eventra CLI",
   "type": "commonjs",
   "bin": {

package/src/engine/exportResolver.ts

@@ -0,0 +1,39 @@
+import ts from "typescript";
+
+export function resolveExportedSymbol(
+  symbol: ts.Symbol,
+  checker: ts.TypeChecker,
+  visited = new Set<ts.Symbol>()
+): ts.Symbol | null {
+
+  if (visited.has(symbol)) return null;
+  visited.add(symbol);
+  if (symbol.flags & ts.SymbolFlags.Alias) {
+    const aliased = checker.getAliasedSymbol(symbol);
+    return resolveExportedSymbol(aliased, checker, visited);
+  }
+
+  if (symbol.getDeclarations()?.length) {
+    return symbol;
+  }
+
+  const declarations = symbol.getDeclarations() ?? [];
+
+  for (const decl of declarations) {
+    const source = decl.getSourceFile();
+    const moduleSymbol = checker.getSymbolAtLocation(source);
+
+    if (!moduleSymbol) continue;
+
+    const exports = checker.getExportsOfModule(moduleSymbol);
+
+    for (const exp of exports) {
+      const resolved = resolveExportedSymbol(exp, checker, visited);
+      if (resolved?.getDeclarations()?.length) {
+        return resolved;
+      }
+    }
+  }
+
+  return symbol;
+}

package/src/engine/languageService.ts

@@ -52,7 +52,11 @@ export class TSService {
     this.compilerOptions = compilerOptions;
 
     const host: ts.LanguageServiceHost = {
-      getScriptFileNames: () => [...this.fileNames],
+      getScriptFileNames: () => {
+        return [...new Set(this.fileNames)].sort((a, b) =>
+          a.localeCompare(b)
+        );
+      },
 
       getScriptVersion: (file) =>
         this.files.get(file)?.version.toString() ?? "0",

package/src/engine/resolver.ts

@@ -1,4 +1,5 @@
 import ts from "typescript";
+import {resolveExportedSymbol} from "./exportResolver";
 
 export type ResolveResult = {
   values: string[];
@@ -53,6 +54,8 @@ export function resolveNodeValue(
     let symbol = checker.getSymbolAtLocation(node);
     if (!symbol) return null;
 
+    symbol = resolveExportedSymbol(symbol, checker) ?? symbol;
+
     if (symbol.flags & ts.SymbolFlags.Alias) {
       symbol = checker.getAliasedSymbol(symbol);
     }