@fairfox/polly 0.13.2 → 0.14.0

package/dist/tools/analysis/src/extract/handlers.d.ts

@@ -92,13 +92,24 @@ export declare class HandlerExtractor {
      */
     private extractSimpleOrElementAccessAssignment;
     /**
-     * Extract property access assignment (state.field = value)
+     * Extract property access assignment (state.field = value or someState.value.field = value)
      */
     private extractPropertyAccessAssignment;
+    /**
+     * Extract assignments from object literal properties
+     * Used for: someState.value = { field1: value1, field2: value2 }
+     */
+    private extractObjectLiteralAssignments;
     /**
      * Extract element access assignment (state.items[index] = value)
      */
     private extractElementAccessAssignment;
+    /**
+     * Check if field path is a state mutation pattern and extract field name
+     * Supports: state.field, someState.value.field
+     * Returns: field name or null if not a state pattern
+     */
+    private extractFieldFromStatePath;
     /**
      * Extract compound assignments (+=, -=, *=, /=, %=)
      */

package/dist/tools/teach/src/cli.js

@@ -5747,6 +5747,39 @@ class HandlerExtractor {
       if (value !== undefined) {
         assignments.push({ field, value });
       }
+      return;
+    }
+    const valueMatch = fieldPath.match(/\.value\.(.+)$/);
+    if (valueMatch && valueMatch[1]) {
+      const field = valueMatch[1];
+      const value = this.extractValue(right);
+      if (value !== undefined) {
+        assignments.push({ field, value });
+      }
+      return;
+    }
+    if (fieldPath.endsWith(".value") && Node4.isObjectLiteralExpression(right)) {
+      this.extractObjectLiteralAssignments(right, assignments);
+    }
+  }
+  extractObjectLiteralAssignments(objectLiteral, assignments) {
+    if (!Node4.isObjectLiteralExpression(objectLiteral))
+      return;
+    for (const prop of objectLiteral.getProperties()) {
+      if (Node4.isPropertyAssignment(prop)) {
+        const name = prop.getName();
+        const initializer = prop.getInitializer();
+        if (!name || !initializer)
+          continue;
+        const value = this.extractValue(initializer);
+        if (value !== undefined) {
+          assignments.push({ field: name, value });
+        }
+      }
+      if (Node4.isShorthandPropertyAssignment(prop)) {
+        const name = prop.getName();
+        assignments.push({ field: name, value: "@" });
+      }
     }
   }
   extractElementAccessAssignment(left, right, assignments) {
@@ -5756,9 +5789,9 @@ class HandlerExtractor {
     if (!Node4.isPropertyAccessExpression(expr))
       return;
     const fieldPath = this.getPropertyPath(expr);
-    if (!fieldPath.startsWith("state."))
+    const field = this.extractFieldFromStatePath(fieldPath);
+    if (!field)
       return;
-    const field = fieldPath.substring(6);
     const indexExpr = left.getArgumentExpression();
     const index = indexExpr ? indexExpr.getText() : "0";
     const value = this.extractValue(right);
@@ -5770,6 +5803,16 @@ class HandlerExtractor {
       });
     }
   }
+  extractFieldFromStatePath(fieldPath) {
+    if (fieldPath.startsWith("state.")) {
+      return fieldPath.substring(6);
+    }
+    const valueMatch = fieldPath.match(/\.value\.(.+)$/);
+    if (valueMatch && valueMatch[1]) {
+      return valueMatch[1];
+    }
+    return null;
+  }
   extractCompoundAssignment(node, assignments) {
     if (!Node4.isBinaryExpression(node))
       return;
@@ -5778,8 +5821,8 @@ class HandlerExtractor {
     const right = node.getRight();
     if (Node4.isPropertyAccessExpression(left)) {
       const fieldPath = this.getPropertyPath(left);
-      if (fieldPath.startsWith("state.")) {
-        const field = fieldPath.substring(6);
+      const field = this.extractFieldFromStatePath(fieldPath);
+      if (field) {
         const rightValue = right.getText();
         const tlaOp = operator.slice(0, -1);
         assignments.push({
@@ -5813,8 +5856,8 @@ class HandlerExtractor {
     if (!Node4.isPropertyAccessExpression(operand))
       return;
     const fieldPath = this.getPropertyPath(operand);
-    if (fieldPath.startsWith("state.")) {
-      const field = fieldPath.substring(6);
+    const field = this.extractFieldFromStatePath(fieldPath);
+    if (field) {
       const value = operatorText === "++" ? "@ + 1" : "@ - 1";
       assignments.push({ field, value });
     }
@@ -5829,8 +5872,8 @@ class HandlerExtractor {
     const object = expr.getExpression();
     if (Node4.isPropertyAccessExpression(object)) {
       const fieldPath = this.getPropertyPath(object);
-      if (fieldPath.startsWith("state.")) {
-        const field = fieldPath.substring(6);
+      const field = this.extractFieldFromStatePath(fieldPath);
+      if (field) {
         const args = node.getArguments().map((arg) => arg.getText());
         const tlaValue = this.translateArrayMethod(methodName, args, fieldPath);
         if (tlaValue) {
@@ -6470,8 +6513,8 @@ class HandlerExtractor {
     if (!Node4.isPropertyAccessExpression(left) && !Node4.isElementAccessExpression(left))
       return;
     const fieldPath = Node4.isPropertyAccessExpression(left) ? this.getPropertyPath(left) : this.getPropertyPath(left.getExpression());
-    if (fieldPath.startsWith("state.")) {
-      const field = fieldPath.substring(6);
+    const field = this.extractFieldFromStatePath(fieldPath);
+    if (field) {
       const line = node.getStartLineNumber();
       const afterAwait = node.getStart() > firstAwaitPos;
       mutations.push({ field, line, afterAwait });
@@ -6488,10 +6531,8 @@ class HandlerExtractor {
     if (!Node4.isPropertyAccessExpression(object))
       return;
     const fieldPath = this.getPropertyPath(object);
-    if (!fieldPath.startsWith("state."))
-      return;
-    if (["push", "pop", "shift", "unshift", "splice"].includes(methodName)) {
-      const field = fieldPath.substring(6);
+    const field = this.extractFieldFromStatePath(fieldPath);
+    if (field && ["push", "pop", "shift", "unshift", "splice"].includes(methodName)) {
       const line = node.getStartLineNumber();
       const afterAwait = node.getStart() > firstAwaitPos;
       mutations.push({ field, line, afterAwait });
@@ -9806,4 +9847,4 @@ Goodbye!`);
 }
 main();
 
-//# debugId=53EFCFE442D6558B64756E2164756E21
+//# debugId=20A98BE870D3CEDD64756E2164756E21