vsn 1.0.1 → 1.0.2

package/dist/index.d.cts

@@ -183,6 +183,9 @@ declare class AssignmentNode extends BaseNode {
     constructor(target: AssignmentTarget, value: ExpressionNode, operator?: "=" | "+=" | "-=" | "*=" | "/=");
     evaluate(context: ExecutionContext): Promise<any>;
     private applyCompoundAssignment;
+    private resolveAssignmentTarget;
+    private resolveIndexPath;
+    private resolveTargetPath;
     private assignTarget;
 }
 declare class ReturnNode extends BaseNode {
@@ -254,7 +257,7 @@ declare class DeclarationNode extends BaseNode {
 }
 type ExpressionNode = IdentifierExpression | LiteralExpression | TemplateExpression | UnaryExpression | BinaryExpression | MemberExpression | CallExpression | ArrayExpression | ObjectExpression | IndexExpression | FunctionExpression | AwaitExpression | TernaryExpression | DirectiveExpression | QueryExpression;
 type DeclarationTarget = IdentifierExpression | DirectiveExpression;
-type AssignmentTarget = IdentifierExpression | DirectiveExpression | ArrayPattern | ObjectPattern;
+type AssignmentTarget = IdentifierExpression | MemberExpression | IndexExpression | DirectiveExpression | ArrayPattern | ObjectPattern;
 type FunctionParam = {
     name: string;
     defaultValue?: ExpressionNode;

package/dist/index.d.ts

@@ -183,6 +183,9 @@ declare class AssignmentNode extends BaseNode {
     constructor(target: AssignmentTarget, value: ExpressionNode, operator?: "=" | "+=" | "-=" | "*=" | "/=");
     evaluate(context: ExecutionContext): Promise<any>;
     private applyCompoundAssignment;
+    private resolveAssignmentTarget;
+    private resolveIndexPath;
+    private resolveTargetPath;
     private assignTarget;
 }
 declare class ReturnNode extends BaseNode {
@@ -254,7 +257,7 @@ declare class DeclarationNode extends BaseNode {
 }
 type ExpressionNode = IdentifierExpression | LiteralExpression | TemplateExpression | UnaryExpression | BinaryExpression | MemberExpression | CallExpression | ArrayExpression | ObjectExpression | IndexExpression | FunctionExpression | AwaitExpression | TernaryExpression | DirectiveExpression | QueryExpression;
 type DeclarationTarget = IdentifierExpression | DirectiveExpression;
-type AssignmentTarget = IdentifierExpression | DirectiveExpression | ArrayPattern | ObjectPattern;
+type AssignmentTarget = IdentifierExpression | MemberExpression | IndexExpression | DirectiveExpression | ArrayPattern | ObjectPattern;
 type FunctionParam = {
     name: string;
     defaultValue?: ExpressionNode;

package/dist/index.js

@@ -518,27 +518,32 @@ var AssignmentNode = class extends BaseNode {
     }
     const value = await this.value.evaluate(context);
     if (this.operator !== "=") {
-      return this.applyCompoundAssignment(context, value);
+      return await this.applyCompoundAssignment(context, value);
     }
     if (this.target instanceof IdentifierExpression && this.target.name.startsWith("root.") && context.rootScope) {
       const path = this.target.name.slice("root.".length);
-      context.rootScope.setPath?.(`self.${path}`, value);
+      context.rootScope.setPath?.(path, value);
       return value;
     }
+    if (this.target instanceof MemberExpression || this.target instanceof IndexExpression) {
+      const resolved = await this.resolveAssignmentTarget(context);
+      if (resolved?.scope?.setPath) {
+        resolved.scope.setPath(resolved.path, value);
+        return value;
+      }
+    }
     this.assignTarget(context, this.target, value);
     return value;
   }
-  applyCompoundAssignment(context, value) {
+  async applyCompoundAssignment(context, value) {
     if (!context.scope || !context.scope.setPath) {
       return void 0;
     }
-    if (!(this.target instanceof IdentifierExpression)) {
-      throw new Error("Compound assignment requires a simple identifier");
+    const resolved = await this.resolveAssignmentTarget(context);
+    if (!resolved) {
+      throw new Error("Compound assignment requires a simple identifier or member path");
     }
-    const isRoot = this.target.name.startsWith("root.");
-    const scope = isRoot && context.rootScope ? context.rootScope : context.scope;
-    const rawPath = isRoot ? this.target.name.slice("root.".length) : this.target.name;
-    const path = isRoot ? `self.${rawPath}` : rawPath;
+    const { scope, path } = resolved;
     const current = scope?.getPath ? scope.getPath(path) : void 0;
     let result;
     if (this.operator === "+=") {
@@ -553,6 +558,65 @@ var AssignmentNode = class extends BaseNode {
     scope?.setPath?.(path, result);
     return result;
   }
+  async resolveAssignmentTarget(context) {
+    if (this.target instanceof IdentifierExpression) {
+      const isRoot = this.target.name.startsWith("root.");
+      const rawPath = isRoot ? this.target.name.slice("root.".length) : this.target.name;
+      if (isRoot) {
+        return { scope: context.scope, path: `root.${rawPath}` };
+      }
+      return { scope: context.scope, path: rawPath };
+    }
+    if (this.target instanceof MemberExpression) {
+      const resolvedPath = this.target.getIdentifierPath();
+      if (!resolvedPath) {
+        return null;
+      }
+      const path = resolvedPath.path;
+      const isRoot = path.startsWith("root.");
+      const rawPath = isRoot ? path.slice("root.".length) : path;
+      if (isRoot) {
+        return { scope: context.scope, path: `root.${rawPath}` };
+      }
+      return { scope: context.scope, path: rawPath };
+    }
+    if (this.target instanceof IndexExpression) {
+      const path = await this.resolveIndexPath(context, this.target);
+      if (!path) {
+        return null;
+      }
+      const isRoot = path.startsWith("root.");
+      const rawPath = isRoot ? path.slice("root.".length) : path;
+      if (isRoot) {
+        return { scope: context.scope, path: `root.${rawPath}` };
+      }
+      return { scope: context.scope, path: rawPath };
+    }
+    return null;
+  }
+  async resolveIndexPath(context, expr) {
+    const base = await this.resolveTargetPath(context, expr.target);
+    if (!base) {
+      return null;
+    }
+    const indexValue = await expr.index.evaluate(context);
+    if (indexValue == null) {
+      return null;
+    }
+    return `${base}.${indexValue}`;
+  }
+  async resolveTargetPath(context, target) {
+    if (target instanceof IdentifierExpression) {
+      return target.name;
+    }
+    if (target instanceof MemberExpression) {
+      return target.getIdentifierPath()?.path ?? null;
+    }
+    if (target instanceof IndexExpression) {
+      return this.resolveIndexPath(context, target);
+    }
+    return null;
+  }
   assignTarget(context, target, value) {
     if (!context.scope || !context.scope.setPath) {
       return;
@@ -2279,7 +2343,14 @@ ${caret}`;
       return this.parseObjectPattern();
     }
     if (token.type === "Identifier" /* Identifier */) {
-      return new IdentifierExpression(this.parseIdentifierPath());
+      const expr = this.parseCallExpression();
+      if (expr instanceof CallExpression) {
+        throw new Error("Invalid assignment target CallExpression");
+      }
+      if (expr instanceof IdentifierExpression || expr instanceof MemberExpression || expr instanceof IndexExpression) {
+        return expr;
+      }
+      throw new Error("Invalid assignment target");
     }
     throw new Error(`Invalid assignment target ${token.type}`);
   }
@@ -2558,6 +2629,25 @@ ${caret}`;
       while (this.stream.peekNonWhitespace(index)?.type === "Dot" /* Dot */ && this.stream.peekNonWhitespace(index + 1)?.type === "Identifier" /* Identifier */) {
         index += 2;
       }
+      while (this.stream.peekNonWhitespace(index)?.type === "LBracket" /* LBracket */) {
+        let depth = 0;
+        while (true) {
+          const token = this.stream.peekNonWhitespace(index);
+          if (!token) {
+            return false;
+          }
+          if (token.type === "LBracket" /* LBracket */) {
+            depth += 1;
+          } else if (token.type === "RBracket" /* RBracket */) {
+            depth -= 1;
+            if (depth === 0) {
+              index += 1;
+              break;
+            }
+          }
+          index += 1;
+        }
+      }
       return this.isAssignmentOperatorStart(index);
     }
     if (first.type === "At" /* At */ || first.type === "Dollar" /* Dollar */) {