fix(miniprogram-typescript): logic on file created/removed

Author: LastLeaf

glass-easel-miniprogram-typescript/src/project.ts

@@ -142,6 +142,8 @@ export class ProjectDirManager {
   wxmlEnvGetter: (tsFullPath: string, wxmlFullPath: string) => string | null = () => null
   onEntranceFileAdded: (fullPath: string) => void = () => {}
   onEntranceFileRemoved: (fullPath: string) => void = () => {}
+  onScriptFileAdded: (fullPath: string) => void = () => {}
+  onScriptFileRemoved: (fullPath: string) => void = () => {}
   onConvertedExprCacheUpdated: (wxmlFullPath: string) => void = () => {}
   onPendingAsyncTasksEmpty: () => void = () => {}
 
@@ -178,6 +180,9 @@ export class ProjectDirManager {
 
   private handleFileOpened(fullPath: string) {
     const compPath = possibleComponentPath(fullPath)
+    if (isTsFile(fullPath)) {
+      this.onScriptFileAdded(fullPath)
+    }
     if (compPath !== null) {
       if (isJsonFile(fullPath)) {
         const isComp = !!this.trackingComponents[compPath]
@@ -186,6 +191,11 @@ export class ProjectDirManager {
           this.asyncWxmlConvertedExprUpdate(`${compPath}.wxml`)
           this.onEntranceFileAdded(`${compPath}.wxml`)
         }
+      } else if (isTsFile(fullPath)) {
+        this.checkConvertedExprCache(`${compPath}.wxml`)
+        this.forEachDirectDependantComponents(compPath, (compPath) => {
+          this.checkConvertedExprCache(`${compPath}.wxml`)
+        })
       }
     }
   }
@@ -202,6 +212,7 @@ export class ProjectDirManager {
             this.onEntranceFileAdded(`${compPath}.wxml`)
           }
         } else if (isComp) {
+          delete this.trackingComponents[compPath]
           this.deleteConvertedExprCache(`${compPath}.wxml`)
           this.onEntranceFileRemoved(`${compPath}.wxml`)
         }
@@ -218,10 +229,14 @@ export class ProjectDirManager {
 
   private handleFileRemoved(fullPath: string) {
     const compPath = possibleComponentPath(fullPath)
+    if (isTsFile(fullPath)) {
+      this.onScriptFileRemoved(fullPath)
+    }
     if (compPath !== null) {
       if (isJsonFile(fullPath)) {
         const isComp = !!this.trackingComponents[compPath]
         if (isComp) {
+          delete this.trackingComponents[compPath]
           this.deleteConvertedExprCache(`${compPath}.wxml`)
           this.onEntranceFileRemoved(`${compPath}.wxml`)
         }
@@ -273,12 +288,21 @@ export class ProjectDirManager {
       this.convertedExpr[wxmlFullPath] = cache
     }
     const content = this.getFileContent(wxmlFullPath)
-    if (!content) return
+    if (!content) {
+      this.deleteConvertedExprCache(wxmlFullPath)
+      return
+    }
     const relPath = path.relative(this.vfs.rootPath, wxmlFullPath).split(path.sep).join('/')
-    if (relPath.startsWith('../')) return
+    if (relPath.startsWith('../')) {
+      this.deleteConvertedExprCache(wxmlFullPath)
+      return
+    }
     this.tmplGroup.addTmpl(relPath, content)
     const env = this.wxmlEnvGetter(tsFullPath, wxmlFullPath)
-    if (!env) return
+    if (!env) {
+      this.deleteConvertedExprCache(wxmlFullPath)
+      return
+    }
     this.pendingAsyncTasks += 1
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     ;(async () => {

glass-easel-miniprogram-typescript/src/server.ts

@@ -36,6 +36,29 @@ type LocationLink = {
   targetRange: PositionRange
 }
 
+class Cache<T> {
+  private cache: T
+  private dirty: boolean
+  private updater: (this: void, cache: T) => T
+
+  constructor(updater: (this: void, cache: T) => T, init: T) {
+    this.cache = init
+    this.dirty = false
+    this.updater = updater
+  }
+
+  get(): T {
+    if (this.dirty) {
+      this.cache = this.updater(this.cache)
+    }
+    return this.cache
+  }
+
+  invalidate(): void {
+    this.dirty = true
+  }
+}
+
 const getDefaultExportOfSourceFile = (
   tc: ts.TypeChecker,
   source: ts.SourceFile,
@@ -77,7 +100,8 @@ export class Server {
   private workingDirectory: string
   private tsLangService: ts.LanguageService
   private projectDirManager: ProjectDirManager
-  private rootFilePaths: string[]
+  private rootFilePaths: Cache<string[]>
+  private rootTsFileCount: number
   private rootFilePathsVersion: number
   private configErrors: ts.Diagnostic[]
   private pendingAsyncTasksListeners: (() => void)[] = []
@@ -100,17 +124,18 @@ export class Server {
       this.logVerboseMessage(`Opened component WXML: ${fullPath}`)
       const p = getWxmlConvertedTsPath(fullPath)
       if (p) {
-        this.rootFilePaths.push(p)
+        this.rootFilePaths.get().push(p)
         this.rootFilePathsVersion += 1
       }
     }
     this.projectDirManager.onEntranceFileRemoved = (fullPath) => {
       this.logVerboseMessage(`Closed component WXML: ${fullPath}`)
       const p = getWxmlConvertedTsPath(fullPath)
       if (p) {
-        const index = this.rootFilePaths.lastIndexOf(p)
+        const rootFilePaths = this.rootFilePaths.get()
+        const index = rootFilePaths.lastIndexOf(p)
         if (index >= 0) {
-          this.rootFilePaths[index] = this.rootFilePaths.pop()!
+          rootFilePaths[index] = rootFilePaths.pop()!
           this.rootFilePathsVersion += 1
         }
       }
@@ -126,6 +151,14 @@ export class Server {
       f.forEach((f) => f.call(this))
     }
 
+    // handling root ts file changes
+    const handleRootTsFileChanges = () => {
+      this.rootFilePathsVersion += 1
+      this.rootFilePaths.invalidate()
+    }
+    this.projectDirManager.onScriptFileAdded = handleRootTsFileChanges
+    this.projectDirManager.onScriptFileRemoved = handleRootTsFileChanges
+
     // initialize ts language service
     /* eslint-disable @typescript-eslint/unbound-method, arrow-body-style */
     const configPath = tsc.findConfigFile(this.projectPath, tsc.sys.fileExists, 'tsconfig.json')
@@ -134,30 +167,40 @@ export class Server {
     if (configPath !== undefined) {
       // eslint-disable-next-line @typescript-eslint/unbound-method
       const configFile = tsc.readJsonConfigFile(configPath, tsc.sys.readFile)
-      config = tsc.parseJsonSourceFileConfigFileContent(
-        configFile,
-        {
-          useCaseSensitiveFileNames: false,
-          readDirectory: tsc.sys.readDirectory,
-          fileExists: tsc.sys.fileExists,
-          readFile: tsc.sys.readFile,
-        },
-        path.dirname(configPath),
-        { noEmit: true },
-        // undefined,
-        // undefined,
-        // [{ extension: '.wxml', isMixedContent: true, scriptKind: ts.ScriptKind.TS }],
-      )
+      const getConfig = () =>
+        tsc.parseJsonSourceFileConfigFileContent(
+          configFile,
+          {
+            useCaseSensitiveFileNames: false,
+            readDirectory: tsc.sys.readDirectory,
+            fileExists: tsc.sys.fileExists,
+            readFile: tsc.sys.readFile,
+          },
+          path.dirname(configPath),
+          { noEmit: true },
+          // undefined,
+          // undefined,
+          // [{ extension: '.wxml', isMixedContent: true, scriptKind: ts.ScriptKind.TS }],
+        )
+      config = getConfig()
+      this.rootFilePaths = new Cache((old) => {
+        const extra = old.slice(this.rootTsFileCount)
+        const ret = getConfig().fileNames
+        this.rootTsFileCount = ret.length
+        return ret.concat(extra)
+      }, config.fileNames)
+      this.rootTsFileCount = config.fileNames.length
     } else {
       const compilerOptions = tsc.getDefaultCompilerOptions()
       config = {
         options: compilerOptions,
         fileNames: [],
         errors: [],
       }
+      this.rootFilePaths = new Cache((x) => x, [] as string[])
+      this.rootTsFileCount = 0
     }
     this.configErrors = config.errors
-    this.rootFilePaths = config.fileNames
     this.rootFilePathsVersion = 1
     const servicesHost: ts.LanguageServiceHost = {
       getCompilationSettings() {
@@ -167,7 +210,7 @@ export class Server {
         return String(this.rootFilePathsVersion)
       },
       getScriptFileNames: () => {
-        return this.rootFilePaths
+        return this.rootFilePaths.get()
       },
       getScriptVersion: (fullPath) => {
         return this.projectDirManager.getFileVersion(fullPath)?.toString() ?? ''