simple-graph-query 2.8.1 → 2.8.2

package/dist/simple-graph-query.bundle.js

@@ -49502,25 +49502,21 @@ class ForgeExprEvaluator extends AbstractParseTreeVisitor_1.AbstractParseTreeVis
                     break;
                 case "in":
                 case "ni": {
-                    let membershipResult;
-                    // this should be true if the left value is equal to the right value,
-                    // or a subset of it
-                    if (isTupleArray(leftChildValue) && isTupleArray(rightChildValue)) {
-                        if (areTupleArraysEqual(leftChildValue, rightChildValue)) {
-                            membershipResult = true;
-                        }
-                        else {
-                            // check if left is subset of right
-                            membershipResult = isTupleArraySubset(leftChildValue, rightChildValue);
-                        }
-                    }
-                    else if (isTupleArray(rightChildValue)) {
-                        membershipResult = rightChildValue.some((tuple) => tuple.length === 1 && tuple[0] === leftChildValue);
-                    }
-                    else {
-                        // left is a tuple array but right is a single value, so false
-                        membershipResult = false;
-                    }
+                    // In Alloy/Forge everything is a relation, and a scalar is just a
+                    // singleton set. Lift any scalar operand to a singleton tuple so `in`
+                    // is uniformly subset:
+                    //   a in b     ({a} ⊆ {b})  -> equality when both are scalars
+                    //   a in {..}  ({a} ⊆ set)  -> membership
+                    //   {..} in b  (set ⊆ {b})  -> subset of a singleton
+                    // isTupleArraySubset already returns true for equal sets and for an
+                    // empty left-hand set, so a single subset check covers every case.
+                    const leftSet = isSingleValue(leftChildValue)
+                        ? [[leftChildValue]]
+                        : leftChildValue;
+                    const rightSet = isSingleValue(rightChildValue)
+                        ? [[rightChildValue]]
+                        : rightChildValue;
+                    const membershipResult = isTupleArraySubset(leftSet, rightSet);
                     results = ctx.compareOp()?.text === "ni" ? !membershipResult : membershipResult;
                     break;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-graph-query",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "TypeScript evaluator for Forge expressions with browser-compatible UMD bundle",
   "main": "dist/simple-graph-query.bundle.js",
   "types": "dist/index.d.ts",