greybel-interpreter 3.4.2 → 3.4.4

package/dist/index.d.ts

@@ -44,3 +44,4 @@ export { PrepareError, RuntimeError } from './utils/error';
 export { ObjectValue } from './utils/object-value';
 export { Path } from './utils/path';
 export { deepEqual } from './utils/deep-equal';
+export { deepHash } from './utils/deep-hash';

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Not = exports.Noop = exports.NewInstance = exports.NegatedBinary = exports.MapOperation = exports.Literal = exports.List = exports.Include = exports.Import = exports.IfStatement = exports.Clause = exports.FunctionOperation = exports.For = exports.StringProcessorHandler = exports.NumberProcessorHandler = exports.MapProcessorHandler = exports.ListProcessorHandler = exports.handleString = exports.handleNumber = exports.handleMap = exports.handleList = exports.handle = exports.GenericProcessorHandler = exports.Evaluate = exports.DebuggerStatement = exports.Continue = exports.Chunk = exports.Call = exports.Break = exports.Block = exports.Assign = exports.Interpreter = exports.HandlerContainer = exports.ResourceHandler = exports.DefaultResourceHandler = exports.OutputHandler = exports.DefaultOutputHandler = exports.ErrorHandler = exports.DefaultErrorHandler = exports.defaultCPSVisit = exports.CPSContext = exports.CPS = exports.Scope = exports.ProcessState = exports.OperationContext = exports.LoopState = exports.FunctionState = exports.Debugger = exports.ContextType = exports.ContextState = void 0;
-exports.deepEqual = exports.Path = exports.ObjectValue = exports.RuntimeError = exports.PrepareError = exports.CustomValueWithIntrinsics = exports.CustomObject = exports.CustomStringIterator = exports.CustomString = exports.CustomNumber = exports.CustomNil = exports.CustomMapIterator = exports.CustomMap = exports.CustomListIterator = exports.CustomList = exports.CustomFunction = exports.Argument = exports.DefaultType = exports.CustomBoolean = exports.CustomValue = exports.While = exports.Return = exports.ResolveResult = exports.Resolve = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.Reference = exports.Operation = void 0;
+exports.deepHash = exports.deepEqual = exports.Path = exports.ObjectValue = exports.RuntimeError = exports.PrepareError = exports.CustomValueWithIntrinsics = exports.CustomObject = exports.CustomStringIterator = exports.CustomString = exports.CustomNumber = exports.CustomNil = exports.CustomMapIterator = exports.CustomMap = exports.CustomListIterator = exports.CustomList = exports.CustomFunction = exports.Argument = exports.DefaultType = exports.CustomBoolean = exports.CustomValue = exports.While = exports.Return = exports.ResolveResult = exports.Resolve = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.Reference = exports.Operation = void 0;
 var context_1 = require("./context");
 Object.defineProperty(exports, "ContextState", { enumerable: true, get: function () { return context_1.ContextState; } });
 Object.defineProperty(exports, "ContextType", { enumerable: true, get: function () { return context_1.ContextType; } });
@@ -127,3 +127,5 @@ var path_1 = require("./utils/path");
 Object.defineProperty(exports, "Path", { enumerable: true, get: function () { return path_1.Path; } });
 var deep_equal_1 = require("./utils/deep-equal");
 Object.defineProperty(exports, "deepEqual", { enumerable: true, get: function () { return deep_equal_1.deepEqual; } });
+var deep_hash_1 = require("./utils/deep-hash");
+Object.defineProperty(exports, "deepHash", { enumerable: true, get: function () { return deep_hash_1.deepHash; } });

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/dist/types/base.d.ts

@@ -1,5 +1,6 @@
 import { ContextTypeIntrinsics } from '../context/types';
 export declare abstract class CustomValue {
+    abstract readonly id: string;
     abstract value: any;
     abstract getCustomType(): string;
     abstract toNumber(): number;

package/dist/types/function.d.ts

@@ -22,6 +22,7 @@ export declare class CustomFunction extends CustomValue {
     readonly value: Callback;
     readonly argumentDefs: Array<Argument>;
     readonly assignOuter: boolean;
+    readonly id: string;
     private _nextContext;
     static createExternalAnonymous(callback: Callback): CustomFunction;
     static createExternal(name: string, callback: Callback): CustomFunction;

package/dist/types/function.js

@@ -16,6 +16,7 @@ const operation_1 = require("../operations/operation");
 const reference_1 = require("../operations/reference");
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
+const uuid_1 = require("../utils/uuid");
 const base_1 = require("./base");
 const default_1 = require("./default");
 const nil_1 = require("./nil");
@@ -53,6 +54,7 @@ class CustomFunction extends base_1.CustomValue {
     }
     constructor(scope, name, callback, argumentDefs = [], assignOuter = false) {
         super();
+        this.id = (0, uuid_1.uuid)();
         this.scope = scope;
         this.name = name;
         this.value = callback;

package/dist/types/list.d.ts

@@ -12,6 +12,7 @@ export declare class CustomListIterator implements Iterator<CustomValue> {
 export declare class CustomList extends CustomObject {
     static readonly intrinsics: ObjectValue;
     static getItemIndex(item: CustomList, index: number): number;
+    readonly id: string;
     readonly value: Array<CustomValue>;
     constructor(value?: Array<CustomValue>);
     getCustomType(): string;
@@ -21,6 +22,7 @@ export declare class CustomList extends CustomObject {
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
+    getSize(): number;
     instanceOf(v: CustomValue, typeIntrinsics: ContextTypeIntrinsics): boolean;
     slice(a: CustomValue, b: CustomValue): CustomList;
     extend(list: CustomList | Array<CustomValue>): CustomList;

package/dist/types/list.js

@@ -4,6 +4,7 @@ exports.CustomList = exports.CustomListIterator = void 0;
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const path_1 = require("../utils/path");
+const uuid_1 = require("../utils/uuid");
 const base_1 = require("./base");
 const number_1 = require("./number");
 const with_intrinsics_1 = require("./with-intrinsics");
@@ -39,6 +40,7 @@ class CustomList extends with_intrinsics_1.CustomObject {
     }
     constructor(value = []) {
         super();
+        this.id = (0, uuid_1.uuid)();
         this.value = [...value];
     }
     getCustomType() {
@@ -62,6 +64,9 @@ class CustomList extends with_intrinsics_1.CustomObject {
     toTruthy() {
         return this.value.length > 0;
     }
+    getSize() {
+        return this.value.length;
+    }
     instanceOf(v, typeIntrinsics) {
         var _a;
         return v.value === ((_a = typeIntrinsics.list) !== null && _a !== void 0 ? _a : CustomList.intrinsics);
@@ -168,7 +173,7 @@ class CustomList extends with_intrinsics_1.CustomObject {
     }
     hash(recursionDepth = 0) {
         let result = (0, hash_1.getHashCode)(this.value.length);
-        if (recursionDepth > 16)
+        if (recursionDepth > 4)
             return result;
         this.value.forEach((value) => {
             result = (0, hash_1.rotateBits)(result) ^ value.hash(recursionDepth + 1);

package/dist/types/map.d.ts

@@ -16,6 +16,7 @@ export declare class CustomMapIterator implements Iterator<CustomValue> {
 }
 export declare class CustomMap extends CustomObject {
     static readonly intrinsics: ObjectValue;
+    readonly id: string;
     value: ObjectValue;
     private isInstance;
     static createWithInitialValue(value: ObjectValue): CustomMap;
@@ -27,6 +28,7 @@ export declare class CustomMap extends CustomObject {
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
+    getSize(): number;
     instanceOf(v: CustomValue, typeIntrinsics: ContextTypeIntrinsics): boolean;
     [Symbol.iterator](): CustomMapIterator;
     extend(map: CustomMap | ObjectValue): CustomMap;

package/dist/types/map.js

@@ -4,6 +4,7 @@ exports.CustomMap = exports.CustomMapIterator = exports.CUSTOM_MAP_MAX_DEPTH_VAL
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const path_1 = require("../utils/path");
+const uuid_1 = require("../utils/uuid");
 const base_1 = require("./base");
 const nil_1 = require("./nil");
 const string_1 = require("./string");
@@ -47,6 +48,7 @@ class CustomMap extends with_intrinsics_1.CustomObject {
     constructor(value) {
         super();
         this.isInstance = false;
+        this.id = (0, uuid_1.uuid)();
         this.value = new object_value_1.ObjectValue(value);
     }
     getCustomType() {
@@ -82,6 +84,9 @@ class CustomMap extends with_intrinsics_1.CustomObject {
     toTruthy() {
         return this.value.size > 0;
     }
+    getSize() {
+        return this.value.size;
+    }
     instanceOf(v, typeIntrinsics) {
         var _a;
         if (v instanceof CustomMap) {
@@ -228,7 +233,7 @@ class CustomMap extends with_intrinsics_1.CustomObject {
     }
     hash(recursionDepth = 0) {
         let result = (0, hash_1.getHashCode)(this.value.size);
-        if (recursionDepth > 16)
+        if (recursionDepth > 4)
             return result;
         this.value.forEach((value, key) => {
             result ^= key.hash(recursionDepth + 1);

package/dist/types/nil.d.ts

@@ -1,5 +1,6 @@
 import { CustomValue } from './base';
 export declare class CustomNil extends CustomValue {
+    readonly id: string;
     value: null;
     getCustomType(): string;
     toJSON(): string;

package/dist/types/nil.js

@@ -5,6 +5,7 @@ const base_1 = require("./base");
 class CustomNil extends base_1.CustomValue {
     constructor() {
         super(...arguments);
+        this.id = 'null';
         this.value = null;
     }
     getCustomType() {

package/dist/types/number.d.ts

@@ -9,6 +9,7 @@ export declare class CustomNumberIterator implements Iterator<CustomValue> {
 }
 export declare class CustomNumber extends CustomValueWithIntrinsics {
     static readonly intrinsics: ObjectValue;
+    readonly id: string;
     readonly value: number;
     constructor(value: number);
     getCustomType(): string;

package/dist/types/number.js

@@ -21,6 +21,7 @@ exports.CustomNumberIterator = CustomNumberIterator;
 class CustomNumber extends with_intrinsics_1.CustomValueWithIntrinsics {
     constructor(value) {
         super();
+        this.id = `n:${value.toString()}`;
         this.value = value;
     }
     getCustomType() {

package/dist/types/string.d.ts

@@ -12,6 +12,7 @@ export declare class CustomStringIterator implements Iterator<CustomValue> {
 export declare class CustomString extends CustomValueWithIntrinsics {
     static readonly intrinsics: ObjectValue;
     static getCharIndex(item: CustomString, index: number): number;
+    readonly id: string;
     readonly value: string;
     constructor(value: string);
     getCustomType(): string;

package/dist/types/string.js

@@ -39,6 +39,7 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
     }
     constructor(value) {
         super();
+        this.id = `s:${value}`;
         this.value = value;
     }
     getCustomType() {

package/dist/types/with-intrinsics.d.ts

@@ -22,4 +22,5 @@ export declare abstract class CustomValueWithIntrinsics extends CustomValue {
     getIntrinsics(): ObjectValue;
 }
 export declare abstract class CustomObject extends CustomValueWithIntrinsics {
+    abstract getSize(): number;
 }

package/dist/utils/deep-equal.d.ts

@@ -1 +1,2 @@
-export declare function deepEqual(a: any, b: any, maxDepth?: number): boolean;
+import { CustomValue } from '../types/base';
+export declare function deepEqual(a: CustomValue, b: CustomValue): boolean;

package/dist/utils/deep-equal.js

@@ -1,43 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deepEqual = void 0;
-const list_1 = require("../types/list");
-const map_1 = require("../types/map");
 const with_intrinsics_1 = require("../types/with-intrinsics");
-function equalInner(a, b, maxDepth, depth = 0) {
-    if (maxDepth <= depth)
-        return a === b;
-    if (a.value === b.value)
-        return true;
-    if (a && b && a instanceof with_intrinsics_1.CustomObject && b instanceof with_intrinsics_1.CustomObject) {
-        if (a.constructor !== b.constructor)
-            return false;
-        if (a instanceof list_1.CustomList) {
-            const length = a.value.length;
-            if (length !== b.value.length)
+function deepEqual(a, b) {
+    const stack = [];
+    const visited = new Set();
+    stack.push([a, b]);
+    while (stack.length > 0) {
+        const [a, b] = stack.pop();
+        visited.add(`${a.id}:${b.id}`);
+        if (a instanceof with_intrinsics_1.CustomObject) {
+            if (!(b instanceof with_intrinsics_1.CustomObject))
                 return false;
-            for (let i = length; i-- !== 0;)
-                if (!equalInner(a.value[i], b.value[i], maxDepth, depth + 1))
+            if (Array.isArray(a.value)) {
+                if (!Array.isArray(b.value))
                     return false;
-            return true;
-        }
-        if (a instanceof map_1.CustomMap) {
-            if (a.value.size !== b.value.size)
-                return false;
-            for (const i of a.value.keys()) {
-                if (!b.value.has(i) ||
-                    !equalInner(a.value.get(i), b.value.get(i), maxDepth, depth + 1)) {
+                if (a.value.length !== b.value.length)
                     return false;
+                for (let index = 0; index < a.value.length; index++) {
+                    const valueA = a.value[index];
+                    const valueB = b.value[index];
+                    if (!visited.has(`${valueA.id}:${valueB.id}`)) {
+                        stack.push([valueA, valueB]);
+                    }
                 }
             }
-            return true;
+            else {
+                if (a.value.size !== b.value.size)
+                    return false;
+                for (const key of a.value.keys()) {
+                    if (!b.value.has(key))
+                        return false;
+                    const valueA = a.value.get(key);
+                    const valueB = b.value.get(key);
+                    if (!visited.has(`${valueA.id}:${valueB.id}`)) {
+                        stack.push([valueA, valueB]);
+                    }
+                }
+            }
+        }
+        else if (a.value !== b.value) {
+            return false;
         }
-        return false;
     }
-    // true if both NaN, false otherwise
-    return Number.isNaN(a.value) && Number.isNaN(b.value);
-}
-function deepEqual(a, b, maxDepth = 10) {
-    return equalInner(a, b, maxDepth);
+    return true;
 }
 exports.deepEqual = deepEqual;

package/dist/utils/deep-hash.d.ts

@@ -0,0 +1,2 @@
+import { CustomValue } from '../types/base';
+export declare function deepHash(value: CustomValue): number;

package/dist/utils/deep-hash.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deepHash = void 0;
+const with_intrinsics_1 = require("../types/with-intrinsics");
+const hash_1 = require("./hash");
+function deepHash(value) {
+    let result = 0;
+    const stack = [];
+    const visited = new Set();
+    stack.push([value]);
+    while (stack.length > 0) {
+        const items = stack.pop();
+        for (const item of items) {
+            visited.add(item.id);
+            if (item instanceof with_intrinsics_1.CustomObject) {
+                if (Array.isArray(item.value)) {
+                    result ^= (0, hash_1.getHashCode)(item.value.length);
+                    for (let index = item.value.length - 1; index >= 0; index--) {
+                        const child = item.value[index];
+                        if (!(child instanceof with_intrinsics_1.CustomObject) || !visited.has(child.id))
+                            stack.push([child]);
+                    }
+                }
+                else {
+                    result ^= (0, hash_1.getHashCode)(item.value.length);
+                    const chunk = [];
+                    item.value.forEach((child, key) => {
+                        if (!(key instanceof with_intrinsics_1.CustomObject) || !visited.has(key.id))
+                            chunk.push(key);
+                        if (!(child instanceof with_intrinsics_1.CustomObject) || !visited.has(child.id))
+                            chunk.push(child);
+                    });
+                    stack.push(chunk);
+                }
+            }
+            else {
+                result ^= item.hash();
+            }
+        }
+        result ^= (0, hash_1.rotateBits)(result);
+    }
+    return result;
+}
+exports.deepHash = deepHash;

package/dist/utils/object-value.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectValue = void 0;
 const nil_1 = require("../types/nil");
+const deep_hash_1 = require("./deep-hash");
 class ObjectValue {
     constructor(entries) {
         if (entries == null) {
@@ -21,22 +22,22 @@ class ObjectValue {
         }
     }
     get(mapKey) {
-        const hash = mapKey.hash();
+        const hash = (0, deep_hash_1.deepHash)(mapKey);
         if (!this.data.has(hash))
             return nil_1.Void;
         return this.data.get(hash)[1];
     }
     has(mapKey) {
-        const hash = mapKey.hash();
+        const hash = (0, deep_hash_1.deepHash)(mapKey);
         return this.data.has(hash);
     }
     set(mapKey, mapValue) {
-        const hash = mapKey.hash();
+        const hash = (0, deep_hash_1.deepHash)(mapKey);
         this.data.set(hash, [mapKey, mapValue]);
         return this;
     }
     delete(mapKey) {
-        const hash = mapKey.hash();
+        const hash = (0, deep_hash_1.deepHash)(mapKey);
         return this.data.delete(hash);
     }
     values() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "3.4.2",
+    "version": "3.4.4",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",