@eventra_dev/eventra-cli 0.1.4 → 0.1.6

package/dist/engine/engine.js

@@ -7,14 +7,17 @@ const graph_1 = require("./graph");
 const hash_1 = require("./hash");
 class EventraEngine {
     ts;
-    graph = new graph_1.DependencyGraph();
+    graph;
     fileEvents = new Map();
     fileHash = new Map();
     constructor(root) {
         this.ts = new languageService_1.TSService(root);
+        const { baseUrl, paths } = this.ts.getModuleResolutionConfig();
+        this.graph = new graph_1.DependencyGraph(baseUrl, paths);
     }
     scanFile(file, content) {
         const h = (0, hash_1.hash)(content);
+        // cache
         if (this.fileHash.get(file) === h) {
             return this.fileEvents.get(file) ?? new Set();
         }
@@ -24,6 +27,7 @@ class EventraEngine {
         const checker = this.ts.getChecker();
         if (!source || !checker)
             return new Set();
+        // обновляем graph
         this.graph.update(file, source);
         const events = (0, scanner_1.scanSource)(source, checker);
         this.fileEvents.set(file, events);

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/graph.js

@@ -8,15 +8,48 @@ const typescript_1 = __importDefault(require("typescript"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 class DependencyGraph {
+    baseUrl;
+    paths;
     reverse = new Map();
     exports = new Map();
+    constructor(baseUrl, paths) {
+        this.baseUrl = baseUrl;
+        this.paths = paths;
+    }
     normalize(file) {
         return path_1.default.resolve(file);
     }
-    resolveImport(from, module) {
-        if (!module.startsWith("."))
-            return null;
-        const base = path_1.default.resolve(path_1.default.dirname(from), module);
+    // TS-like resolver
+    resolveModule(module, from) {
+        // relative
+        if (module.startsWith(".")) {
+            const abs = path_1.default.resolve(path_1.default.dirname(from), module);
+            return this.resolveFile(abs);
+        }
+        // paths mapping
+        for (const key in this.paths) {
+            const pattern = key.replace("*", "(.*)");
+            const regex = new RegExp("^" + pattern + "$");
+            const match = module.match(regex);
+            if (!match)
+                continue;
+            const wildcard = match[1] || "";
+            for (const target of this.paths[key]) {
+                const replaced = target.replace("*", wildcard);
+                const abs = path_1.default.resolve(this.baseUrl, replaced);
+                const resolved = this.resolveFile(abs);
+                if (resolved)
+                    return resolved;
+            }
+        }
+        // baseUrl fallback
+        const abs = path_1.default.resolve(this.baseUrl, module);
+        const resolved = this.resolveFile(abs);
+        if (resolved)
+            return resolved;
+        return null;
+    }
+    resolveFile(base) {
         const tryFiles = [
             base,
             base + ".ts",
@@ -32,7 +65,7 @@ class DependencyGraph {
                 return this.normalize(f);
             }
         }
-        return this.normalize(base);
+        return null;
     }
     update(file, source) {
         const normalizedFile = this.normalize(file);
@@ -41,7 +74,7 @@ class DependencyGraph {
             // IMPORT
             if (typescript_1.default.isImportDeclaration(stmt)) {
                 const module = stmt.moduleSpecifier.getText().replace(/['"]/g, "");
-                const resolved = this.resolveImport(normalizedFile, module);
+                const resolved = this.resolveModule(module, normalizedFile);
                 if (!resolved)
                     continue;
                 if (!this.reverse.has(resolved)) {
@@ -49,10 +82,10 @@ class DependencyGraph {
                 }
                 this.reverse.get(resolved).add(normalizedFile);
             }
-            // EXPORT
+            // EXPORT *
             if (typescript_1.default.isExportDeclaration(stmt) && stmt.moduleSpecifier) {
                 const module = stmt.moduleSpecifier.getText().replace(/['"]/g, "");
-                const resolved = this.resolveImport(normalizedFile, module);
+                const resolved = this.resolveModule(module, normalizedFile);
                 if (!resolved)
                     continue;
                 if (!this.exports.has(normalizedFile)) {
@@ -66,19 +99,6 @@ class DependencyGraph {
             }
         }
     }
-    getAllRelated(file, visited = new Set()) {
-        const normalized = this.normalize(file);
-        if (visited.has(normalized))
-            return visited;
-        visited.add(normalized);
-        const deps = this.exports.get(normalized);
-        if (!deps)
-            return visited;
-        for (const dep of deps) {
-            this.getAllRelated(dep, visited);
-        }
-        return visited;
-    }
     getDependents(file) {
         return [...(this.reverse.get(this.normalize(file)) ?? [])];
     }

package/dist/engine/languageService.js

@@ -6,11 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TSService = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 class TSService {
     root;
     files = new Map();
     fileNames = new Set();
     service;
+    compilerOptions = {};
+    baseUrl = "";
+    paths = {};
     constructor(root) {
         this.root = root;
         const configPath = typescript_1.default.findConfigFile(root, typescript_1.default.sys.fileExists, "tsconfig.json");
@@ -29,9 +33,19 @@ class TSService {
                 ...compilerOptions,
                 ...parsed.options,
             };
+            this.paths = parsed.options.paths || {};
+            this.baseUrl = parsed.options.baseUrl
+                ? path_1.default.resolve(root, parsed.options.baseUrl)
+                : root;
         }
+        else {
+            this.baseUrl = root;
+        }
+        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);
@@ -44,7 +58,7 @@ class TSService {
                 return undefined;
             },
             getCurrentDirectory: () => this.root,
-            getCompilationSettings: () => compilerOptions,
+            getCompilationSettings: () => this.compilerOptions,
             getDefaultLibFileName: (opts) => typescript_1.default.getDefaultLibFilePath(opts),
             readFile: typescript_1.default.sys.readFile,
             fileExists: typescript_1.default.sys.fileExists,
@@ -69,5 +83,11 @@ class TSService {
     getSourceFile(file) {
         return this.getProgram()?.getSourceFile(file);
     }
+    getModuleResolutionConfig() {
+        return {
+            baseUrl: this.baseUrl,
+            paths: this.paths,
+        };
+    }
 }
 exports.TSService = TSService;

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.4",
+  "version": "0.1.6",
   "description": "Eventra CLI",
   "type": "commonjs",
   "bin": {

package/src/engine/engine.ts

@@ -5,23 +5,28 @@ import { hash } from "./hash";
 
 export class EventraEngine {
   private ts: TSService;
-  private graph = new DependencyGraph();
+  private graph: DependencyGraph;
 
   private fileEvents = new Map<string, Set<string>>();
   private fileHash = new Map<string, string>();
 
   constructor(root: string) {
     this.ts = new TSService(root);
+
+    const { baseUrl, paths } = this.ts.getModuleResolutionConfig();
+    this.graph = new DependencyGraph(baseUrl, paths);
   }
 
   scanFile(file: string, content: string) {
     const h = hash(content);
 
+    // cache
     if (this.fileHash.get(file) === h) {
       return this.fileEvents.get(file) ?? new Set();
     }
 
     this.fileHash.set(file, h);
+
     this.ts.updateFile(file, content);
 
     const source = this.ts.getSourceFile(file);
@@ -29,7 +34,9 @@ export class EventraEngine {
 
     if (!source || !checker) return new Set();
 
+    // обновляем graph
     this.graph.update(file, source);
+
     const events = scanSource(source, checker);
 
     this.fileEvents.set(file, events);
@@ -39,6 +46,7 @@ export class EventraEngine {
 
   updateFile(file: string, content: string) {
     const events = this.scanFile(file, content);
+
     const dependents = this.graph.getDependents(file);
 
     for (const dep of dependents) {
@@ -48,6 +56,7 @@ export class EventraEngine {
       if (!source || !checker) continue;
 
       const ev = scanSource(source, checker);
+
       this.fileEvents.set(dep, ev);
     }
 

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/graph.ts

@@ -6,15 +6,51 @@ export class DependencyGraph {
   private reverse = new Map<string, Set<string>>();
   private exports = new Map<string, Set<string>>();
 
+  constructor(
+    private baseUrl: string,
+    private paths: Record<string, string[]>
+  ) {}
+
   private normalize(file: string) {
     return path.resolve(file);
   }
 
-  private resolveImport(from: string, module: string): string | null {
-    if (!module.startsWith(".")) return null;
+  // TS-like resolver
+  private resolveModule(module: string, from: string): string | null {
+    // relative
+    if (module.startsWith(".")) {
+      const abs = path.resolve(path.dirname(from), module);
+      return this.resolveFile(abs);
+    }
+
+    // paths mapping
+    for (const key in this.paths) {
+      const pattern = key.replace("*", "(.*)");
+      const regex = new RegExp("^" + pattern + "$");
+      const match = module.match(regex);
+
+      if (!match) continue;
+
+      const wildcard = match[1] || "";
+
+      for (const target of this.paths[key]) {
+        const replaced = target.replace("*", wildcard);
+        const abs = path.resolve(this.baseUrl, replaced);
+
+        const resolved = this.resolveFile(abs);
+        if (resolved) return resolved;
+      }
+    }
+
+    // baseUrl fallback
+    const abs = path.resolve(this.baseUrl, module);
+    const resolved = this.resolveFile(abs);
+    if (resolved) return resolved;
 
-    const base = path.resolve(path.dirname(from), module);
+    return null;
+  }
 
+  private resolveFile(base: string): string | null {
     const tryFiles = [
       base,
       base + ".ts",
@@ -32,7 +68,7 @@ export class DependencyGraph {
       }
     }
 
-    return this.normalize(base);
+    return null;
   }
 
   update(file: string, source: ts.SourceFile) {
@@ -44,8 +80,8 @@ export class DependencyGraph {
       // IMPORT
       if (ts.isImportDeclaration(stmt)) {
         const module = stmt.moduleSpecifier.getText().replace(/['"]/g, "");
-        const resolved = this.resolveImport(normalizedFile, module);
 
+        const resolved = this.resolveModule(module, normalizedFile);
         if (!resolved) continue;
 
         if (!this.reverse.has(resolved)) {
@@ -55,11 +91,11 @@ export class DependencyGraph {
         this.reverse.get(resolved)!.add(normalizedFile);
       }
 
-      // EXPORT
+      // EXPORT *
       if (ts.isExportDeclaration(stmt) && stmt.moduleSpecifier) {
         const module = stmt.moduleSpecifier.getText().replace(/['"]/g, "");
-        const resolved = this.resolveImport(normalizedFile, module);
 
+        const resolved = this.resolveModule(module, normalizedFile);
         if (!resolved) continue;
 
         if (!this.exports.has(normalizedFile)) {
@@ -77,23 +113,6 @@ export class DependencyGraph {
     }
   }
 
-  getAllRelated(file: string, visited = new Set<string>()): Set<string> {
-    const normalized = this.normalize(file);
-
-    if (visited.has(normalized)) return visited;
-    visited.add(normalized);
-
-    const deps = this.exports.get(normalized);
-
-    if (!deps) return visited;
-
-    for (const dep of deps) {
-      this.getAllRelated(dep, visited);
-    }
-
-    return visited;
-  }
-
   getDependents(file: string) {
     return [...(this.reverse.get(this.normalize(file)) ?? [])];
   }

package/src/engine/languageService.ts

@@ -1,11 +1,16 @@
 import ts from "typescript";
 import fs from "fs";
+import path from "path";
 
 export class TSService {
   private files = new Map<string, { version: number; content: string }>();
   private fileNames = new Set<string>();
   private service: ts.LanguageService;
 
+  private readonly compilerOptions: ts.CompilerOptions = {};
+  private readonly baseUrl: string = "";
+  private readonly paths: Record<string, string[]> = {};
+
   constructor(private root: string) {
     const configPath = ts.findConfigFile(
       root,
@@ -23,10 +28,7 @@ export class TSService {
     };
 
     if (configPath) {
-      const configFile = ts.readConfigFile(
-        configPath,
-        ts.sys.readFile
-      );
+      const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
 
       const parsed = ts.parseJsonConfigFileContent(
         configFile.config,
@@ -38,10 +40,23 @@ export class TSService {
         ...compilerOptions,
         ...parsed.options,
       };
+
+      this.paths = parsed.options.paths || {};
+      this.baseUrl = parsed.options.baseUrl
+        ? path.resolve(root, parsed.options.baseUrl)
+        : root;
+    } else {
+      this.baseUrl = root;
     }
 
+    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",
@@ -63,7 +78,7 @@ export class TSService {
       },
 
       getCurrentDirectory: () => this.root,
-      getCompilationSettings: () => compilerOptions,
+      getCompilationSettings: () => this.compilerOptions,
       getDefaultLibFileName: (opts) =>
         ts.getDefaultLibFilePath(opts),
 
@@ -97,4 +112,11 @@ export class TSService {
   getSourceFile(file: string) {
     return this.getProgram()?.getSourceFile(file);
   }
+
+  getModuleResolutionConfig() {
+    return {
+      baseUrl: this.baseUrl,
+      paths: this.paths,
+    };
+  }
 }

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);
     }