greybel-interpreter 3.4.1 → 3.4.3

package/dist/operations/evaluate.d.ts

@@ -1,7 +1,6 @@
 import { ASTEvaluationExpression } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
-import { CustomBoolean } from '../types/boolean';
 import { CustomList } from '../types/list';
 import { CustomNumber } from '../types/number';
 import { CustomString } from '../types/string';
@@ -40,7 +39,7 @@ export declare class Evaluate extends Operation {
     constructor(item: ASTEvaluationExpression, target?: string);
     build(visit: CPSVisit): Promise<Operation>;
     resolveBinaryExpression(ctx: OperationContext, expr: Evaluate): Promise<CustomValue>;
-    resolveLogicalExpression(ctx: OperationContext, expr: Evaluate): Promise<CustomValue | CustomBoolean>;
+    resolveLogicalExpression(ctx: OperationContext, expr: Evaluate): Promise<CustomValue | CustomNumber>;
     resolve(ctx: OperationContext, op: Operation): Promise<CustomValue>;
     handle(ctx: OperationContext): Promise<CustomValue>;
 }

package/dist/operations/evaluate.js

@@ -22,9 +22,24 @@ const number_1 = require("../types/number");
 const string_1 = require("../types/string");
 const deep_equal_1 = require("../utils/deep-equal");
 const operation_1 = require("./operation");
+const absClamp01 = (d) => {
+    if (d < 0)
+        d = -d;
+    if (d > 1)
+        return 1;
+    return d;
+};
 exports.GenericProcessorHandler = {
-    [miniscript_core_1.Operator.And]: (a, b) => new boolean_1.CustomBoolean(a.toTruthy() && b.toTruthy()),
-    [miniscript_core_1.Operator.Or]: (a, b) => new boolean_1.CustomBoolean(a.toTruthy() || b.toTruthy())
+    [miniscript_core_1.Operator.And]: (a, b) => {
+        const left = Number(a instanceof number_1.CustomNumber ? a.toNumber() : a.toTruthy());
+        const right = Number(b instanceof number_1.CustomNumber ? b.toNumber() : b.toTruthy());
+        return new number_1.CustomNumber(absClamp01(left * right));
+    },
+    [miniscript_core_1.Operator.Or]: (a, b) => {
+        const left = Number(a instanceof number_1.CustomNumber ? a.toNumber() : a.toTruthy());
+        const right = Number(b instanceof number_1.CustomNumber ? b.toNumber() : b.toTruthy());
+        return new number_1.CustomNumber(absClamp01(left + right - left * right));
+    }
 };
 exports.NumberProcessorHandler = {
     [miniscript_core_1.Operator.Plus]: (a, b) => new number_1.CustomNumber(a.toNumber() + b.toNumber()),
@@ -317,6 +332,9 @@ class Evaluate extends operation_1.Operation {
                 return new boolean_1.CustomBoolean(false);
             }
             else if (expr.op === miniscript_core_1.Operator.Or && left.toTruthy()) {
+                if (left instanceof number_1.CustomNumber) {
+                    return new number_1.CustomNumber(absClamp01(left.value));
+                }
                 return new boolean_1.CustomBoolean(true);
             }
             const right = yield this.resolve(ctx, expr.right);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "3.4.1",
+    "version": "3.4.3",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -49,7 +49,7 @@
     },
     "dependencies": {
         "lru-cache": "^10.0.1",
-        "greybel-core": "~1.4.1"
+        "greybel-core": "~1.4.2"
     },
     "keywords": [
         "miniscript"