@analogjs/language-server 0.1.5 → 0.1.7

package/out/languagePlugin.js

@@ -106,6 +106,45 @@ function createAnalogCode(snapshot) {
         embeddedCodes: [...createEmbeddedCodes()],
         htmlDocument,
     };
+    function extractAnalogImports(code) {
+        const importRegex = /import\s*{(.*?)}\s+from\s+['"](.*?)['"];?/g;
+        const symbolMap = new Map();
+        const lines = code.split('\n');
+        lines.forEach(line => {
+            if (line.includes('analog:')) {
+                let match;
+                while ((match = importRegex.exec(line)) !== null) {
+                    const symbols = match[1].split(',').map(symbol => symbol.trim());
+                    const modulePath = match[2];
+                    symbols.forEach(symbol => {
+                        if (!symbolMap.has(symbol)) {
+                            symbolMap.set(symbol, new Set());
+                        }
+                        symbolMap.get(symbol).add(modulePath);
+                    });
+                }
+            }
+        });
+        let symbols = [];
+        symbolMap.forEach((_, symbol) => {
+            symbols.push(symbol);
+        });
+        return symbols;
+    }
+    function extractTemplateVariables(code) {
+        const regex = /^(?!export\s)(let|const)\s+(\w+)\s*=\s*(.+?);|^(?!export\s)function\s+(\w+)\s*\(\s*\)\s*{/gm;
+        const matches = code.matchAll(regex);
+        let vars = [];
+        for (const match of matches) {
+            if (match[1]) {
+                vars.push(`${match[2]}`);
+            }
+            else if (match[4]) {
+                vars.push(`${match[4]}`);
+            }
+        }
+        return vars;
+    }
     function* createEmbeddedCodes() {
         let styles = 0;
         let scripts = 0;
@@ -144,11 +183,14 @@ function createAnalogCode(snapshot) {
             if (root.tag === "script" &&
                 root.startTagEnd !== undefined &&
                 root.endTagStart !== undefined) {
-                const text = snapshot.getText(root.startTagEnd, root.endTagStart).replace(/(with(((\n|\s)*).*)})/gm, function (_, _$1, $2) {
+                const originalText = snapshot.getText(root.startTagEnd, root.endTagStart);
+                const text = originalText.replace(/(with(((\n|\s)*).*)})/gm, function (_, _$1, $2) {
                     // replace "with { analog: 'imports' }" with "/**with { analog: 'imports' }*/"
                     // so its not evaluated inside the script tag
                     return `/**${$2}*/`;
                 });
+                const imports = extractAnalogImports(originalText);
+                const templateVars = extractTemplateVariables(originalText);
                 const lang = root.attributes?.lang;
                 const isTs = lang === "ts" || lang === '"ts"' || lang === "'ts'";
                 yield {
@@ -162,7 +204,7 @@ type AnalogComponentMetadata = Omit<import('@angular/core').Component, "template
   "changeDetection" |
   "styles" |
   "outputs" |
-  "inputs"> & { exposes: any[] };
+  "inputs"> & { exposes?: any[] };
 
 /**
  * Defines additional metadata for the component such as the
@@ -180,7 +222,13 @@ declare function onInit(initFn: () => void): void;
  * Defines the lifecycle hook(ngOnDestroy) that is called when the
  * component is destroyed.
  */
-declare function onDestroy(destroyFn: () => void): void;`,
+declare function onDestroy(destroyFn: () => void): void;
+
+// @ts-ignore
+[${templateVars.join(',')}];
+
+// @ts-ignore
+[${imports.join(',')}];`,
                         getLength: () => text.length,
                         getChangeRange: () => undefined,
                     },
@@ -231,18 +279,7 @@ declare function onDestroy(destroyFn: () => void): void;`,
                             },
                         },
                     ],
-                    embeddedCodes: [
-                        {
-                            id: "lang_" + langs + "_ts",
-                            languageId: "typescript",
-                            snapshot: {
-                                getText: (_start, _end) => `increment();`,
-                                getLength: () => `void increment;`.length,
-                                getChangeRange: () => undefined,
-                            },
-                            mappings: []
-                        }
-                    ],
+                    embeddedCodes: [],
                 };
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@analogjs/language-server",
 	"description": "LSP server for AnalogJS Language Service",
-	"version": "0.1.5",
+	"version": "0.1.7",
 	"main": "out/index.js",
 	"license": "MIT",
 	"scripts": {