feat: allow external typescript compiler

Author: LastLeaf

Cargo.lock

@@ -16,7 +16,7 @@ compact_str = "0.8.0"
 cssparser = "0.34.0"
 cssparser-color = "0.2.0"
 futures = "0.3.31"
-glass-easel-template-compiler = "0.15.1"
+glass-easel-template-compiler = "0.15.2"
 itertools = "0.13.0"
 log = "0.4.22"
 lsp-server = "0.7.7"

Cargo.toml

@@ -1,2 +1,3 @@
 packages:
   - 'vscode-extension'
+  - 'ts-server-bundled'

pnpm-lock.yaml

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "devDependencies": {
+    "typescript": "latest"
+  }
+}

pnpm-workspace.yaml

@@ -108,6 +108,23 @@
           "type": "boolean",
           "default": false,
           "description": "Also analyze any CSS/LESS/SCSS file inside a project if corresponding WXML file can be found."
+        },
+        "glass-easel-analyzer.preferredTypescriptVersion": {
+          "scope": "window",
+          "type": "string",
+          "enum": [
+            "local",
+            "built-in",
+            "disabled"
+          ],
+          "default": "local",
+          "description": "The TypeScript compiler module to use. Set to `disabled` will disable TypeScript-related features."
+        },
+        "glass-easel-analyzer.localTypescriptNodeModulePath": {
+          "scope": "window",
+          "type": "string",
+          "default": "",
+          "description": "The path to the `typescript` node module, used to find the TypeScript compiler (default to auto-detect)."
         }
       }
     },
@@ -146,11 +163,11 @@
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-promise": "^7.2.1",
-    "glass-easel": "^0.15.1",
-    "glass-easel-miniprogram-adapter": "^0.15.1",
-    "glass-easel-miniprogram-template": "^0.15.1",
-    "glass-easel-miniprogram-typescript": "^0.15.1",
-    "glass-easel-template-compiler": "^0.15.1",
+    "glass-easel": "^0.15.2",
+    "glass-easel-miniprogram-adapter": "^0.15.2",
+    "glass-easel-miniprogram-template": "^0.15.2",
+    "glass-easel-miniprogram-typescript": "^0.15.2",
+    "glass-easel-template-compiler": "^0.15.2",
     "prettier": "^3.6.2",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",

ts-server-bundled/package.json

@@ -1,24 +1,27 @@
 import fs from 'node:fs'
-import path from 'node:path'
 import * as vscode from 'vscode'
 import {
   type Executable,
   LanguageClient,
   type LanguageClientOptions,
 } from 'vscode-languageclient/node'
 import { middleware, updateInlineWxsScripts } from './middleware'
-import { TsService } from './typescript'
+import { TsServiceHost } from './typescript'
+import { resolveRelativePath } from './utils'
 
 export type ClientOptions = {
   serverPath: string
   backendConfigPath: string
   ignorePaths: string[]
   analyzeOtherStylesheets: boolean
+  preferredTypescriptVersion: string
+  localTypescriptNodeModulePath: string
 }
 
 export class Client {
-  options: ClientOptions
-  client: LanguageClient | null = null
+  private options: ClientOptions
+  private client: LanguageClient | null = null
+  private tsServerHost: TsServiceHost | null = null
 
   constructor(options: ClientOptions) {
     this.options = options
@@ -45,17 +48,12 @@ export class Client {
       : (vscode.workspace.workspaceFolders?.[0]?.uri ?? vscode.Uri.file(process.cwd()))
   }
 
-  private resolveRelativePath(homeUri: vscode.Uri, p: string): vscode.Uri {
-    const uri = path.isAbsolute(p) ? vscode.Uri.file(p) : vscode.Uri.joinPath(homeUri, p)
-    return uri
-  }
-
   async start() {
     let backendConfig = ''
     const homeUri = this.getHomeUri()
     const backendConfigPath = this.getBackendConfigPath()
     const backendConfigUrl = backendConfigPath
-      ? this.resolveRelativePath(homeUri, backendConfigPath)
+      ? resolveRelativePath(homeUri, backendConfigPath)
       : vscode.Uri.file(`${__dirname}/web.toml`)
     try {
       backendConfig = new TextDecoder().decode(await vscode.workspace.fs.readFile(backendConfigUrl))
@@ -67,7 +65,7 @@ export class Client {
     }
     const workspaceFolders = vscode.workspace.workspaceFolders?.map((x) => x.uri.toString()) ?? []
     const ignorePaths = this.options.ignorePaths.map((x) =>
-      this.resolveRelativePath(homeUri, x).toString(),
+      resolveRelativePath(homeUri, x).toString(),
     )
     const command = this.getServerPath()
     const args: string[] = []
@@ -126,13 +124,16 @@ export class Client {
     this.client.onNotification('glassEaselAnalyzer/inlineWxsScripts', (msg) => {
       updateInlineWxsScripts(msg)
     })
+    this.tsServerHost = new TsServiceHost(homeUri, this.options)
     this.client.onNotification('glassEaselAnalyzer/discoveredProject', (msg: { path: string }) => {
-      TsService.initTsService(msg.path)
+      this.tsServerHost?.initTsService(msg.path)
     })
     await this.client.start()
   }
 
   async stop() {
+    this.tsServerHost?.destroy()
+    this.tsServerHost = null
     await this.client?.stop()
   }
 }

vscode-extension/package.json

@@ -16,7 +16,20 @@ const startLanguageServer = async () => {
   const analyzeOtherStylesheets = vscode.workspace
     .getConfiguration('glass-easel-analyzer')
     .get('analyzeOtherStylesheets') as boolean
-  const options = { serverPath, backendConfigPath, ignorePaths, analyzeOtherStylesheets }
+  const preferredTypescriptVersion = vscode.workspace
+    .getConfiguration('glass-easel-analyzer')
+    .get('preferredTypescriptVersion') as string
+  const localTypescriptNodeModulePath = vscode.workspace
+    .getConfiguration('glass-easel-analyzer')
+    .get('localTypescriptNodeModulePath') as string
+  const options = {
+    serverPath,
+    backendConfigPath,
+    ignorePaths,
+    analyzeOtherStylesheets,
+    preferredTypescriptVersion,
+    localTypescriptNodeModulePath,
+  }
   languageServer = new Client(options)
   await languageServer.start()
 }
@@ -41,7 +54,9 @@ export async function activate(context: vscode.ExtensionContext) {
       ev.affectsConfiguration('glass-easel-analyzer.serverPath') ||
       ev.affectsConfiguration('glass-easel-analyzer.backendConfigurationPath') ||
       ev.affectsConfiguration('glass-easel-analyzer.ignorePaths') ||
-      ev.affectsConfiguration('glass-easel-analyzer.analyzeOtherStylesheets')
+      ev.affectsConfiguration('glass-easel-analyzer.analyzeOtherStylesheets') ||
+      ev.affectsConfiguration('glass-easel-analyzer.preferredTypescriptVersion') ||
+      ev.affectsConfiguration('glass-easel-analyzer.localTypescriptNodeModulePath')
     if (changed) {
       // eslint-disable-next-line promise/catch-or-return
       vscode.window