@eventra_dev/eventra-cli 0.2.1 → 0.2.2

package/dist/engine/languageService.js

@@ -21,7 +21,7 @@ class TSService {
         let compilerOptions = {
             allowJs: true,
             allowNonTsExtensions: true,
-            jsx: typescript_1.default.JsxEmit.React,
+            jsx: typescript_1.default.JsxEmit.Preserve,
             jsxImportSource: "react",
             moduleResolution: typescript_1.default.ModuleResolutionKind.Node16,
             target: typescript_1.default.ScriptTarget.ESNext,
@@ -46,7 +46,15 @@ class TSService {
         this.compilerOptions = compilerOptions;
         this.baseUrl = baseUrl;
         this.paths = paths;
-        const allFiles = typescript_1.default.sys.readDirectory(root, [".ts", ".tsx", ".js", ".jsx"], undefined, undefined);
+        const allFiles = typescript_1.default.sys.readDirectory(root, [
+            ".ts",
+            ".tsx",
+            ".js",
+            ".jsx",
+            ".vue",
+            ".svelte",
+            ".astro"
+        ], undefined, undefined);
         for (const f of allFiles) {
             this.fileNames.add(this.normalize(f));
         }
@@ -58,26 +66,31 @@ class TSService {
                 file = this.normalize(file);
                 return this.files.get(file)?.version.toString() ?? "0";
             },
+            getScriptKind: (fileName) => {
+                fileName = this.normalize(fileName);
+                if (fileName.endsWith(".tsx") ||
+                    fileName.endsWith(".vue") ||
+                    fileName.endsWith(".svelte") ||
+                    fileName.endsWith(".astro")) {
+                    return typescript_1.default.ScriptKind.TSX;
+                }
+                if (fileName.endsWith(".ts")) {
+                    return typescript_1.default.ScriptKind.TS;
+                }
+                if (fileName.endsWith(".jsx")) {
+                    return typescript_1.default.ScriptKind.JSX;
+                }
+                if (fileName.endsWith(".js")) {
+                    return typescript_1.default.ScriptKind.JS;
+                }
+                return typescript_1.default.ScriptKind.Unknown;
+            },
             getScriptSnapshot: (file) => {
                 file = this.normalize(file);
-                // из памяти
                 const f = this.files.get(file);
                 if (f) {
                     return typescript_1.default.ScriptSnapshot.fromString(f.content);
                 }
-                // virtual TSX (vue/svelte/astro)
-                if (file.endsWith(".tsx")) {
-                    const original = file.replace(/\.tsx$/, "");
-                    if (fs_1.default.existsSync(original)) {
-                        const content = fs_1.default.readFileSync(original, "utf-8");
-                        this.files.set(file, {
-                            content,
-                            version: 1,
-                        });
-                        this.fileNames.add(file);
-                        return typescript_1.default.ScriptSnapshot.fromString(content);
-                    }
-                }
                 try {
                     if (fs_1.default.existsSync(file)) {
                         const content = fs_1.default.readFileSync(file, "utf-8");
@@ -110,12 +123,6 @@ class TSService {
     normalize(file) {
         return path_1.default.resolve(file).replace(/\\/g, "/");
     }
-    ensureProgram() {
-        try {
-            this.service.getProgram();
-        }
-        catch { }
-    }
     // PUBLIC API
     updateFile(file, content) {
         file = this.normalize(file);
@@ -125,13 +132,11 @@ class TSService {
             version: prev ? prev.version + 1 : 1,
         });
         this.fileNames.add(file);
-        this.ensureProgram();
     }
     removeFile(file) {
         file = this.normalize(file);
         this.files.delete(file);
         this.fileNames.delete(file);
-        this.ensureProgram();
     }
     getProgram() {
         return this.service.getProgram();

package/dist/utils/processFile.js

@@ -1,8 +1,25 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processFile = processFile;
+const path_1 = __importDefault(require("path"));
 const universal_1 = require("./universal");
+function extractImports(content, file) {
+    return (0, universal_1.parseUniversal)(content, file).deps;
+}
 function processFile(file, content) {
+    const ext = path_1.default.extname(file);
+    if (ext === ".ts" ||
+        ext === ".tsx" ||
+        ext === ".js" ||
+        ext === ".jsx") {
+        return {
+            content,
+            deps: extractImports(content, file),
+        };
+    }
     const parsed = (0, universal_1.parseUniversal)(content, file);
     return {
         content: parsed.code || "",

package/dist/utils/universal.js

@@ -184,7 +184,7 @@ function parseUniversal(content, file) {
     deps.push(...dyn.deps);
     parts.push(...dyn.calls);
     return {
-        code: content,
+        code: parts.length ? parts.join("\n") : content,
         deps: [...new Set(deps.filter(Boolean))],
     };
 }

package/package.json

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

package/src/engine/languageService.ts

@@ -21,7 +21,7 @@ export class TSService {
     let compilerOptions: ts.CompilerOptions = {
       allowJs: true,
       allowNonTsExtensions: true,
-      jsx: ts.JsxEmit.React,
+      jsx: ts.JsxEmit.Preserve,
       jsxImportSource: "react",
       moduleResolution: ts.ModuleResolutionKind.Node16,
       target: ts.ScriptTarget.ESNext,
@@ -59,7 +59,15 @@ export class TSService {
 
     const allFiles = ts.sys.readDirectory(
       root,
-      [".ts", ".tsx", ".js", ".jsx"],
+      [
+        ".ts",
+        ".tsx",
+        ".js",
+        ".jsx",
+        ".vue",
+        ".svelte",
+        ".astro"
+      ],
       undefined,
       undefined
     );
@@ -77,34 +85,39 @@ export class TSService {
         file = this.normalize(file);
         return this.files.get(file)?.version.toString() ?? "0";
       },
+      getScriptKind: (fileName) => {
+        fileName = this.normalize(fileName);
+
+        if (
+          fileName.endsWith(".tsx") ||
+          fileName.endsWith(".vue") ||
+          fileName.endsWith(".svelte") ||
+          fileName.endsWith(".astro")
+        ) {
+          return ts.ScriptKind.TSX;
+        }
+
+        if (fileName.endsWith(".ts")) {
+          return ts.ScriptKind.TS;
+        }
+
+        if (fileName.endsWith(".jsx")) {
+          return ts.ScriptKind.JSX;
+        }
+
+        if (fileName.endsWith(".js")) {
+          return ts.ScriptKind.JS;
+        }
 
+        return ts.ScriptKind.Unknown;
+      },
       getScriptSnapshot: (file) => {
         file = this.normalize(file);
-
-        // из памяти
         const f = this.files.get(file);
         if (f) {
           return ts.ScriptSnapshot.fromString(f.content);
         }
 
-        // virtual TSX (vue/svelte/astro)
-        if (file.endsWith(".tsx")) {
-          const original = file.replace(/\.tsx$/, "");
-
-          if (fs.existsSync(original)) {
-            const content = fs.readFileSync(original, "utf-8");
-
-            this.files.set(file, {
-              content,
-              version: 1,
-            });
-
-            this.fileNames.add(file);
-
-            return ts.ScriptSnapshot.fromString(content);
-          }
-        }
-
         try {
           if (fs.existsSync(file)) {
             const content = fs.readFileSync(file, "utf-8");
@@ -148,12 +161,6 @@ export class TSService {
     return path.resolve(file).replace(/\\/g, "/");
   }
 
-  private ensureProgram() {
-    try {
-      this.service.getProgram();
-    } catch {}
-  }
-
   // PUBLIC API
   updateFile(file: string, content: string) {
     file = this.normalize(file);
@@ -166,8 +173,6 @@ export class TSService {
     });
 
     this.fileNames.add(file);
-
-    this.ensureProgram();
   }
 
   removeFile(file: string) {
@@ -175,8 +180,6 @@ export class TSService {
 
     this.files.delete(file);
     this.fileNames.delete(file);
-
-    this.ensureProgram();
   }
 
   getProgram() {

package/src/utils/processFile.ts

@@ -1,6 +1,25 @@
+import path from "path";
 import { parseUniversal } from "./universal";
 
+function extractImports(content: string, file: string) {
+  return parseUniversal(content, file).deps;
+}
+
 export function processFile(file: string, content: string) {
+  const ext = path.extname(file);
+
+  if (
+    ext === ".ts" ||
+    ext === ".tsx" ||
+    ext === ".js" ||
+    ext === ".jsx"
+  ) {
+    return {
+      content,
+      deps: extractImports(content, file),
+    };
+  }
+
   const parsed = parseUniversal(content, file);
 
   return {

package/src/utils/universal.ts

@@ -243,7 +243,7 @@ export function parseUniversal(
   parts.push(...dyn.calls);
 
   return {
-    code: content,
+    code: parts.length ? parts.join("\n") : content,
     deps: [...new Set(deps.filter(Boolean))],
   };
 }