@xaendar/vscode-client 0.9.29 → 0.9.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaendar/vscode-client",
-  "version": "0.9.29",
+  "version": "0.9.31",
   "description": "",
   "author": "Kaitenjo",
   "license": "MIT",

package/server/server.cjs

@@ -228271,12 +228271,16 @@ function resolveExpression(expression, compilerContext, options) {
 function emitNode(node, parent, compilerContext, options) {
   if ((0, import_typescript3.isIdentifier)(node) && needsResolution(node, parent)) {
     const text = node.text;
+    if (options.skipResolution) {
+      return { expression: text };
+    }
     if (compilerContext.hasUnresolvableIdentifier(text)) {
       return { expression: text, reactive: compilerContext.getUnresolvableIdentifierKind(text) === "signal" };
     }
-    const resolvedValue = resolveIdentifierAccess(text, compilerContext);
-    if (resolvedValue) {
-      return resolvedValue;
+    if (compilerContext.hasIdentifier(text)) {
+      const kind = compilerContext.getIdentifierKind(text);
+      const access = `context.get('${text}')`;
+      return kind === "signal" ? { expression: `${access}()`, reactive: true } : { expression: access, reactive: false };
     }
     if (options.resolver) {
       return { expression: `${options.resolver}.${text}` };
@@ -228296,14 +228300,6 @@ function emitNode(node, parent, compilerContext, options) {
   });
   return { expression: `${result.expression}${slice(sourceText, lastEnd, node.getEnd())}`, reactive: result.reactive };
 }
-function resolveIdentifierAccess(text, compilerContext) {
-  if (compilerContext.hasIdentifier(text)) {
-    const kind = compilerContext.getIdentifierKind(text);
-    const access = `context.get('${text}')`;
-    return kind === "signal" ? { expression: `${access}()`, reactive: true } : { expression: access, reactive: false };
-  }
-  return void 0;
-}
 function containsResolvableIdentifier(node, parent) {
   if ((0, import_typescript3.isIdentifier)(node) && needsResolution(node, parent)) {
     return true;
@@ -228335,7 +228331,7 @@ function getIdentifier(prefix, parentNode, index) {
 function mapDefaultOptions(options) {
   return {
     resolver: options?.resolver ?? "this",
-    emitReactive: options?.emitReactive ?? false
+    skipResolution: options?.skipResolution ?? false
   };
 }
 
@@ -228466,7 +228462,7 @@ function generateFor(node, parentNode, index, compilerContext) {
   const evenName = resolveImplicit(node, "$even");
   const oddName = resolveImplicit(node, "$odd");
   const forContext = new CompilerContext(compilerContext);
-  forContext.addUnresolvableIdentifier(node.itemAlias);
+  forContext.addIdentifier(node.itemAlias);
   const identifiers = [indexName, firstName, lastName, evenName, oddName];
   for (let i2 = 0; i2 < identifiers.length; i2++) {
     forContext.addUnresolvableIdentifier(identifiers[i2], "signal");
@@ -228490,7 +228486,7 @@ function generateFor(node, parentNode, index, compilerContext) {
     },
     args: [forKey, "parentContext", itemsName, counterName, "anchor"]
   });
-  retVal.code.push(`_for(${parentNode}, context, () => ${iterableExpr}, ${node.itemAlias} => ${resolveExpression(node.trackExpression, forContext).expression}, this.${forKey}.bind(this));`);
+  retVal.code.push(`_for(${parentNode}, context, () => ${iterableExpr}, (${node.itemAlias}, ${indexName}) => ${resolveExpression(node.trackExpression, forContext, { skipResolution: true }).expression}, this.${forKey}.bind(this));`);
   return retVal;
 }
 function resolveImplicit(node, implicit) {
@@ -228630,7 +228626,7 @@ var Generator = class {
       this._nodeToProcess.clear();
       const compilerContext = new CompilerContext();
       for (let i2 = 0; i2 < signals.length; i2++) {
-        compilerContext.addUnresolvableIdentifier(signals[i2], "signal");
+        compilerContext.addUnresolvableIdentifier(`this.${signals[i2]}`, "signal");
       }
       const generatedCode = [
         "_render() {",