fix: some wxml typescript error reports

LastLeaf · LastLeaf · commit ee128b22d741 · 2025-11-06T20:08:40.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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.16.0"
+glass-easel-template-compiler = "0.16.1"
 itertools = "0.13.0"
 log = "0.4.22"
 lsp-server = "0.7.7"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/vscode-extension/package.json b/vscode-extension/package.json
@@ -163,11 +163,9 @@
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-promise": "^7.2.1",
-    "glass-easel": "^0.16.0",
-    "glass-easel-miniprogram-adapter": "^0.16.0",
-    "glass-easel-miniprogram-template": "^0.16.0",
-    "glass-easel-miniprogram-typescript": "^0.16.0",
-    "glass-easel-template-compiler": "^0.16.0",
+    "glass-easel": "^0.16.1",
+    "glass-easel-miniprogram-adapter": "^0.16.1",
+    "glass-easel-miniprogram-typescript": "^0.16.1",
     "prettier": "^3.6.2",
     "ts-loader": "^9.5.1",
     "typescript": "^5.5.4",
diff --git a/vscode-extension/src/test/env.ts b/vscode-extension/src/test/env.ts
@@ -34,7 +34,7 @@ const wxssCases = [
   'unknown-at-rule',
 ]
 
-const wxmlTsCases = ['basic', 'special', 'non-export', 'global-using']
+const wxmlTsCases = ['basic', 'special', 'non-export', 'global-using', 'scope']
 
 const EXTENSION_DIR = path.resolve(__dirname, '..', '..')
 const TEST_FIXTURE_DIR = path.resolve(EXTENSION_DIR, 'test-fixture')
diff --git a/vscode-extension/test-fixture/ts/non-export.ts b/vscode-extension/test-fixture/ts/non-export.ts
@@ -1,3 +1,3 @@
-Component()
+export default Component()
   .data(() => ({ abc: 123 }))
   .register()
diff --git a/vscode-extension/test-fixture/ts/non-export.wxml b/vscode-extension/test-fixture/ts/non-export.wxml
@@ -1 +1 @@
-<view>{{ def }}</view>
+<view>a {{ abc > 50 ? 'b' : 'c' }}</view>
diff --git a/vscode-extension/test-fixture/ts/scope.json b/vscode-extension/test-fixture/ts/scope.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "comp": "./comp"
+  }
+}
diff --git a/vscode-extension/test-fixture/ts/scope.ts b/vscode-extension/test-fixture/ts/scope.ts
@@ -0,0 +1,3 @@
+export default Component()
+  .data(() => ({ abc: 123, arr: [1, 2, 3] }))
+  .register()
diff --git a/vscode-extension/test-fixture/ts/scope.wxml b/vscode-extension/test-fixture/ts/scope.wxml
@@ -0,0 +1,11 @@
+<wxs module="modA">
+  exports.func = function() {
+    return 'abc'
+  }
+</wxs>
+
+<view wx:for="{{ modA.func() }}" wx:for-item="v"></view>
+
+<view wx:for="{{ arr }}">{{ item }}</view>
+
+<view let:s="{{ abc }}">{{ s }}</view>
diff --git a/vscode-extension/test-snapshot/diagnostic/wxml-ts/scope.expected b/vscode-extension/test-snapshot/diagnostic/wxml-ts/scope.expected
@@ -0,0 +1,3 @@
+// ====== SNAPSHOT 0 ======
+[Array]
+
diff --git a/vscode-extension/test-snapshot/hover/wxml-ts/non-export.expected b/vscode-extension/test-snapshot/hover/wxml-ts/non-export.expected
@@ -5,9 +5,9 @@
       [Object]
     range = [Array]
       [Object]
-        character = 9
+        character = 11
         line = 0
       [Object]
-        character = 12
+        character = 14
         line = 0
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ const wxssCases = [`
`34`	`34`	`'unknown-at-rule',`
`35`	`35`	`]`
`36`	`36`
`37`		`-const wxmlTsCases = ['basic', 'special', 'non-export', 'global-using']`
	`37`	`+const wxmlTsCases = ['basic', 'special', 'non-export', 'global-using', 'scope']`
`38`	`38`
`39`	`39`	`const EXTENSION_DIR = path.resolve(__dirname, '..', '..')`
`40`	`40`	`const TEST_FIXTURE_DIR = path.resolve(EXTENSION_DIR, 'test-fixture')`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<view>{{ def }}</view>`
	`1`	`+<view>a {{ abc > 50 ? 'b' : 'c' }}</view>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default Component()`
	`2`	`+ .data(() => ({ abc: 123, arr: [1, 2, 3] }))`
	`3`	`+ .register()`