@fairfox/polly 0.12.2 → 0.12.4

package/dist/tools/verify/Dockerfile

@@ -1,18 +1,22 @@
 FROM eclipse-temurin:11-jre
 
-# Install TLA+ tools v1.7.4 (latest stable)
+# Install TLA+ tools v1.7.4 (latest stable, includes TLC 2.19 from August 2024)
 RUN apt-get update && apt-get install -y curl && \
     curl -L https://github.com/tlaplus/tlaplus/releases/download/v1.7.4/tla2tools.jar \
          -o /opt/tla2tools.jar && \
     apt-get remove -y curl && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
 
-# Create wrapper script for TLC
-RUN echo '#!/bin/sh' > /usr/local/bin/tlc && \
-    echo 'java -jar /opt/tla2tools.jar "$@"' >> /usr/local/bin/tlc && \
-    chmod +x /usr/local/bin/tlc
+# Create entrypoint wrapper that handles "tlc" command
+RUN echo '#!/bin/sh' > /usr/local/bin/docker-entrypoint.sh && \
+    echo '# Strip "tlc" command if passed as first argument' >> /usr/local/bin/docker-entrypoint.sh && \
+    echo 'if [ "$1" = "tlc" ]; then' >> /usr/local/bin/docker-entrypoint.sh && \
+    echo '  shift' >> /usr/local/bin/docker-entrypoint.sh && \
+    echo 'fi' >> /usr/local/bin/docker-entrypoint.sh && \
+    echo 'exec java -jar /opt/tla2tools.jar "$@"' >> /usr/local/bin/docker-entrypoint.sh && \
+    chmod +x /usr/local/bin/docker-entrypoint.sh
 
 # Set working directory
 WORKDIR /work
 
-# Default command runs TLC
-ENTRYPOINT ["java", "-jar", "/opt/tla2tools.jar"]
+# Use wrapper script as entrypoint
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

package/dist/tools/verify/specs/Dockerfile

@@ -1,13 +1,29 @@
-FROM tlaplus/tla:latest
+# Development environment for working with TLA+ specifications
+# This is separate from the main Dockerfile used by the CLI - this one includes
+# additional tools for interactive development and editing of specs.
 
-# Install additional tools for better DX
-RUN apk add --no-cache \
+FROM eclipse-temurin:11-jre
+
+# Install TLA+ tools v1.7.4 (matches main Dockerfile)
+RUN apt-get update && apt-get install -y curl && \
+    curl -L https://github.com/tlaplus/tlaplus/releases/download/v1.7.4/tla2tools.jar \
+         -o /opt/tla2tools.jar && \
+    apt-get remove -y curl && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
+
+# Install development tools for better DX
+RUN apt-get update && apt-get install -y \
     bash \
     vim \
     less \
-    tree
+    tree \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create tlc wrapper script
+RUN echo '#!/bin/bash' > /usr/local/bin/tlc && \
+    echo 'java -jar /opt/tla2tools.jar "$@"' >> /usr/local/bin/tlc && \
+    chmod +x /usr/local/bin/tlc
 
 WORKDIR /specs
 
-# Default command: keep container alive for exec commands
+# Default command: keep container alive for interactive use
 CMD ["tail", "-f", "/dev/null"]

package/dist/tools/verify/specs/README.md

@@ -14,20 +14,27 @@ TLA+ specifications for formal verification:
 - `README.md` - Documentation for running TLA+ verification
 
 ### Docker Setup
-- `Dockerfile` - Container setup for TLA+ toolchain
-- `docker-compose.yml` - Docker Compose configuration for running verification
+- `Dockerfile` - Development container with TLA+ tools and editing utilities (vim, less, tree)
+- `docker-compose.yml` - Docker Compose configuration for interactive development
+
+**Note:** This is separate from the main `/tools/verify/Dockerfile` which is used by the Polly CLI for automated verification. Use this Dockerfile for interactive development and manual spec editing.
 
 ## Running Verification
 
-### With Docker (Recommended)
+### With Docker Compose (Interactive Development)
+Start a container with TLA+ tools and development utilities:
 ```bash
-cd packages/verify/specs
-docker-compose up
+cd tools/verify/specs
+docker-compose up -d
+docker-compose exec tla bash
+# Inside container:
+cd tla
+tlc MessageRouter.tla -config MessageRouter.cfg
 ```
 
 ### With TLC Directly
 ```bash
-cd packages/verify/specs/tla
+cd tools/verify/specs/tla
 tlc MessageRouter.tla -config MessageRouter.cfg
 ```
 

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

@@ -1835,6 +1835,12 @@ class TLAGenerator {
       if (fieldConfig.type === "enum" && fieldConfig.values && fieldConfig.values.length > 0) {
         return `"${fieldConfig.values[0]}"`;
       }
+      if (fieldConfig.type === "array") {
+        return "<<>>";
+      }
+      if (fieldConfig.type === "string") {
+        return '""';
+      }
     }
     if ("maxLength" in fieldConfig) {
       return "<<>>";
@@ -1943,6 +1949,7 @@ class DockerRunner {
       "-v",
       `${specDir}:/work`,
       this.IMAGE_NAME,
+      "tlc",
       "-workers",
       `${options?.workers || 1}`,
       `${specName}.tla`
@@ -3608,6 +3615,9 @@ class HandlerExtractor {
       if (Node2.isCallExpression(node)) {
         this.extractArrayMutationAssignment(node, assignments);
       }
+      if (Node2.isPostfixUnaryExpression(node) || Node2.isPrefixUnaryExpression(node)) {
+        this.extractUnaryExpressionAssignment(node, assignments);
+      }
     });
   }
   extractBinaryExpressionAssignment(node, assignments) {
@@ -3683,6 +3693,23 @@ class HandlerExtractor {
       }
     }
   }
+  extractUnaryExpressionAssignment(node, assignments) {
+    if (!Node2.isPostfixUnaryExpression(node) && !Node2.isPrefixUnaryExpression(node))
+      return;
+    const operator = node.getOperatorToken();
+    const operatorText = operator.toString();
+    if (operatorText !== "++" && operatorText !== "--")
+      return;
+    const operand = node.getOperand();
+    if (!Node2.isPropertyAccessExpression(operand))
+      return;
+    const fieldPath = this.getPropertyPath(operand);
+    if (fieldPath.startsWith("state.")) {
+      const field = fieldPath.substring(6);
+      const value = operatorText === "++" ? "@ + 1" : "@ - 1";
+      assignments.push({ field, value });
+    }
+  }
   extractArrayMutationAssignment(node, assignments) {
     if (!Node2.isCallExpression(node))
       return;
@@ -5296,4 +5323,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=1B51E02C2E7CEC9764756E2164756E21
+//# debugId=7CAD4356DD5A25CD64756E2164756E21