greybel-interpreter 2.4.0 → 2.5.0

package/dist/index.d.ts

@@ -40,6 +40,7 @@ export { CustomNil } from './types/nil';
 export { CustomNumber } from './types/number';
 export { CustomString, CustomStringIterator } from './types/string';
 export { CustomObject, CustomValueWithIntrinsics } from './types/with-intrinsics';
+export { deepEqual } from './utils/deep-equal';
 export { PrepareError, RuntimeError } from './utils/error';
 export { ObjectValue } from './utils/object-value';
 export { Path } from './utils/path';

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Operation = 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.CPSContext = exports.CPS = exports.Scope = exports.ProcessState = exports.OperationContext = exports.LoopState = exports.FunctionState = exports.Debugger = exports.ContextType = exports.ContextState = void 0;
-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 = void 0;
+exports.Path = exports.ObjectValue = exports.RuntimeError = exports.PrepareError = exports.deepEqual = 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 = 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; } });
@@ -117,6 +117,8 @@ Object.defineProperty(exports, "CustomStringIterator", { enumerable: true, get:
 var with_intrinsics_1 = require("./types/with-intrinsics");
 Object.defineProperty(exports, "CustomObject", { enumerable: true, get: function () { return with_intrinsics_1.CustomObject; } });
 Object.defineProperty(exports, "CustomValueWithIntrinsics", { enumerable: true, get: function () { return with_intrinsics_1.CustomValueWithIntrinsics; } });
+var deep_equal_1 = require("./utils/deep-equal");
+Object.defineProperty(exports, "deepEqual", { enumerable: true, get: function () { return deep_equal_1.deepEqual; } });
 var error_2 = require("./utils/error");
 Object.defineProperty(exports, "PrepareError", { enumerable: true, get: function () { return error_2.PrepareError; } });
 Object.defineProperty(exports, "RuntimeError", { enumerable: true, get: function () { return error_2.RuntimeError; } });

package/dist/operations/evaluate.js

@@ -19,6 +19,7 @@ const map_1 = require("../types/map");
 const nil_1 = require("../types/nil");
 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");
 exports.GenericProcessorHandler = {
     [greyscript_core_1.Operator.And]: (a, b) => new boolean_1.CustomBoolean(a.toTruthy() && b.toTruthy()),
@@ -125,13 +126,13 @@ exports.ListProcessorHandler = {
     },
     [greyscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof list_1.CustomList) {
-            return new boolean_1.CustomBoolean(left.hash() === right.hash());
+            return new boolean_1.CustomBoolean((0, deep_equal_1.deepEqual)(left, right));
         }
         return default_1.DefaultType.Void;
     },
     [greyscript_core_1.Operator.NotEqual]: (left, right) => {
         if (right instanceof list_1.CustomList) {
-            return new boolean_1.CustomBoolean(left.hash() !== right.hash());
+            return new boolean_1.CustomBoolean(!(0, deep_equal_1.deepEqual)(left, right));
         }
         return default_1.DefaultType.Void;
     },
@@ -157,13 +158,13 @@ exports.MapProcessorHandler = {
     },
     [greyscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
-            return new boolean_1.CustomBoolean(left.hash() === right.hash());
+            return new boolean_1.CustomBoolean((0, deep_equal_1.deepEqual)(left, right));
         }
         return default_1.DefaultType.Void;
     },
     [greyscript_core_1.Operator.NotEqual]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
-            return new boolean_1.CustomBoolean(left.hash() !== right.hash());
+            return new boolean_1.CustomBoolean(!(0, deep_equal_1.deepEqual)(left, right));
         }
         return default_1.DefaultType.Void;
     }

package/dist/types/base.d.ts

@@ -8,5 +8,4 @@ export declare abstract class CustomValue {
     abstract toTruthy(): boolean;
     abstract fork(): CustomValue;
     abstract instanceOf(value: CustomValue): boolean;
-    abstract hash(recursionDepth?: number): number;
 }

package/dist/types/function.d.ts

@@ -35,5 +35,4 @@ export declare class CustomFunction extends CustomValue {
     toTruthy(): boolean;
     instanceOf(v: CustomValue): boolean;
     run(self: CustomValue, args: Array<CustomValue>, callContext: OperationContext, next?: CustomMap): Promise<CustomValue>;
-    hash(): number;
 }

package/dist/types/function.js

@@ -14,7 +14,6 @@ const context_1 = require("../context");
 const literal_1 = require("../operations/literal");
 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 base_1 = require("./base");
 const default_1 = require("./default");
@@ -135,9 +134,6 @@ class CustomFunction extends base_1.CustomValue {
             return this.value(fnCtx !== null && fnCtx !== void 0 ? fnCtx : callContext, selfValue, argMap, isa);
         });
     }
-    hash() {
-        return (0, hash_1.getStringHashCode)(this.toString());
-    }
 }
 CustomFunction.intrinsics = new object_value_1.ObjectValue();
 exports.CustomFunction = CustomFunction;

package/dist/types/list.d.ts

@@ -28,5 +28,4 @@ export declare class CustomList extends CustomObject {
     has(path: Path<CustomValue> | CustomValue): boolean;
     set(path: Path<CustomValue> | CustomValue, newValue: CustomValue): void;
     get(path: Path<CustomValue> | CustomValue): CustomValue;
-    hash(recursionDepth?: number): number;
 }

package/dist/types/list.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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 base_1 = require("./base");
@@ -157,15 +156,6 @@ class CustomList extends with_intrinsics_1.CustomObject {
         }
         throw new Error(`Unknown path in list ${path.toString()}.`);
     }
-    hash(recursionDepth = 0) {
-        let result = (0, hash_1.getHashCode)(this.value.length);
-        if (recursionDepth > 16)
-            return result;
-        this.value.forEach((value) => {
-            result = (0, hash_1.rotateBits)(result) ^ value.hash(recursionDepth + 1);
-        });
-        return result;
-    }
 }
 CustomList.intrinsics = new object_value_1.ObjectValue();
 exports.CustomList = CustomList;

package/dist/types/map.d.ts

@@ -34,5 +34,4 @@ export declare class CustomMap extends CustomObject {
     get(path: Path<CustomValue> | CustomValue): CustomValue;
     createInstance(): CustomMap;
     getIsa(): CustomMap | null;
-    hash(recursionDepth?: number): number;
 }

package/dist/types/map.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomMap = exports.CustomMapIterator = exports.CUSTOM_MAP_MAX_DEPTH_VALUE = exports.CUSTOM_MAP_MAX_DEPTH = exports.ISA_PROPERTY = exports.CLASS_ID_PROPERTY = void 0;
-const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const path_1 = require("../utils/path");
 const base_1 = require("./base");
@@ -182,16 +181,6 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         const isa = this.value.get(exports.ISA_PROPERTY);
         return isa instanceof CustomMap ? isa : null;
     }
-    hash(recursionDepth = 0) {
-        let result = (0, hash_1.getHashCode)(this.value.size);
-        if (recursionDepth > 16)
-            return result;
-        this.value.forEach((value, key) => {
-            result ^= key.hash(recursionDepth + 1);
-            result ^= value.hash(recursionDepth + 1);
-        });
-        return result;
-    }
 }
 CustomMap.intrinsics = new object_value_1.ObjectValue();
 exports.CustomMap = CustomMap;

package/dist/types/nil.d.ts

@@ -9,6 +9,5 @@ export declare class CustomNil extends CustomValue {
     toInt(): number;
     toTruthy(): boolean;
     instanceOf(v: CustomValue): boolean;
-    hash(): number;
 }
 export declare const Void: CustomNil;

package/dist/types/nil.js

@@ -31,9 +31,6 @@ class CustomNil extends base_1.CustomValue {
     instanceOf(v) {
         return v instanceof CustomNil;
     }
-    hash() {
-        return 0;
-    }
 }
 exports.CustomNil = CustomNil;
 exports.Void = new CustomNil();

package/dist/types/number.d.ts

@@ -22,7 +22,6 @@ export declare class CustomNumber extends CustomValueWithIntrinsics {
     has(_path: Path<CustomValue> | CustomValue): boolean;
     set(_path: Path<CustomValue> | CustomValue, _newValue: CustomValue): void;
     get(path: Path<CustomValue> | CustomValue): CustomValue;
-    hash(): number;
 }
 export declare const NegativeOne: CustomNumber;
 export declare const PositiveOne: CustomNumber;

package/dist/types/number.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Zero = exports.PositiveOne = exports.NegativeOne = exports.CustomNumber = exports.CustomNumberIterator = void 0;
-const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const path_1 = require("../utils/path");
 const base_1 = require("./base");
@@ -68,9 +67,6 @@ class CustomNumber extends with_intrinsics_1.CustomValueWithIntrinsics {
         }
         throw new Error(`Unknown path in number ${path.toString()}.`);
     }
-    hash() {
-        return (0, hash_1.getHashCode)(this.value);
-    }
 }
 CustomNumber.intrinsics = new object_value_1.ObjectValue();
 exports.CustomNumber = CustomNumber;

package/dist/types/string.d.ts

@@ -30,5 +30,4 @@ export declare class CustomString extends CustomValueWithIntrinsics {
     has(path: Path<CustomValue> | CustomValue): boolean;
     set(_path: Path<CustomValue> | CustomValue, _newValue: CustomValue): void;
     get(path: Path<CustomValue> | CustomValue): CustomValue;
-    hash(): number;
 }

package/dist/types/string.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomString = exports.CustomStringIterator = void 0;
-const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const path_1 = require("../utils/path");
 const base_1 = require("./base");
@@ -119,9 +118,6 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
         }
         throw new Error(`Unknown path in string ${path.toString()}.`);
     }
-    hash() {
-        return (0, hash_1.getStringHashCode)(this.value);
-    }
 }
 CustomString.intrinsics = new object_value_1.ObjectValue();
 exports.CustomString = CustomString;

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

@@ -0,0 +1 @@
+export declare function deepEqual(a: any, b: any, maxDepth?: number): boolean;

package/dist/utils/deep-equal.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deepEqual = void 0;
+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 (Array.isArray(a.value)) {
+            const length = a.value.length;
+            if (length !== b.value.length)
+                return false;
+            for (let i = length; i-- !== 0;)
+                if (!equalInner(a.value[i], b.value[i], maxDepth, depth + 1))
+                    return false;
+            return true;
+        }
+        if (a.value instanceof Map) {
+            if (a.value.size !== b.value.size)
+                return false;
+            for (const i of a.value.keys())
+                if (!b.has(i) || !equalInner(a.get(i), b.get(i), maxDepth, depth + 1))
+                    return false;
+            return true;
+        }
+        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);
+}
+exports.deepEqual = deepEqual;

package/dist/utils/object-value.d.ts

@@ -1,16 +1,8 @@
 import { CustomValue } from '../types/base';
-export type ObjectValueKeyPair = [CustomValue, CustomValue];
-export declare class ObjectValue {
-    private data;
-    constructor(entries?: ObjectValue | ObjectValueKeyPair[] | null);
+export declare class ObjectValue extends Map<CustomValue, CustomValue> {
     get(mapKey: CustomValue): CustomValue;
     has(mapKey: CustomValue): boolean;
     set(mapKey: CustomValue, mapValue: CustomValue): this;
     delete(mapKey: CustomValue): boolean;
-    values(): CustomValue[];
-    keys(): CustomValue[];
-    entries(): ObjectValueKeyPair[];
-    get size(): number;
-    forEach(callback: (value: CustomValue, key: CustomValue, map: ObjectValue) => any): void;
     extend(objVal: ObjectValue): this;
 }

package/dist/utils/object-value.js

@@ -2,62 +2,45 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectValue = void 0;
 const nil_1 = require("../types/nil");
-class ObjectValue {
-    constructor(entries) {
-        if (entries == null) {
-            this.data = new Map();
-        }
-        else if (entries instanceof ObjectValue) {
-            this.data = new Map(entries.data);
-        }
-        else if (Array.isArray(entries)) {
-            this.data = new Map();
-            for (const [key, value] of entries) {
-                this.set(key, value);
+const deep_equal_1 = require("./deep-equal");
+class ObjectValue extends Map {
+    get(mapKey) {
+        for (const [key, value] of this.entries()) {
+            if ((0, deep_equal_1.deepEqual)(key, mapKey)) {
+                return value;
             }
         }
-        if (this.data == null) {
-            throw new Error('Unknown entries type.');
-        }
-    }
-    get(mapKey) {
-        const hash = mapKey.hash();
-        if (!this.data.has(hash))
-            return nil_1.Void;
-        return this.data.get(hash)[1];
+        return nil_1.Void;
     }
     has(mapKey) {
-        const hash = mapKey.hash();
-        return this.data.has(hash);
+        for (const key of this.keys()) {
+            if ((0, deep_equal_1.deepEqual)(key, mapKey)) {
+                return true;
+            }
+        }
+        return false;
     }
     set(mapKey, mapValue) {
-        const hash = mapKey.hash();
-        this.data.set(hash, [mapKey, mapValue]);
+        for (const key of this.keys()) {
+            if ((0, deep_equal_1.deepEqual)(key, mapKey)) {
+                super.set(key, mapValue);
+                return;
+            }
+        }
+        super.set(mapKey, mapValue);
         return this;
     }
     delete(mapKey) {
-        const hash = mapKey.hash();
-        return this.data.delete(hash);
-    }
-    values() {
-        return [...this.data.values()].map(([_, v]) => v);
-    }
-    keys() {
-        return [...this.data.values()].map(([k]) => k);
-    }
-    entries() {
-        return [...this.data.values()];
-    }
-    get size() {
-        return this.data.size;
-    }
-    forEach(callback) {
-        for (const [key, value] of this.data.values()) {
-            callback(value, key, this);
+        for (const key of this.keys()) {
+            if ((0, deep_equal_1.deepEqual)(key, mapKey)) {
+                super.delete(key);
+                return true;
+            }
         }
+        return false;
     }
     extend(objVal) {
-        for (const [key, value] of objVal.entries()) {
+        for (const [key, value] of objVal) {
             this.set(key, value);
         }
         return this;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "2.4.0",
+    "version": "2.5.0",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -49,8 +49,7 @@
     },
     "dependencies": {
         "greybel-core": "^0.9.12",
-        "greyscript-core": "^0.9.13",
-        "lru-cache": "^10.0.1"
+        "greyscript-core": "^0.9.13"
     },
     "keywords": [
         "greyscript",

package/dist/utils/hash.d.ts

@@ -1,3 +0,0 @@
-export declare function rotateBits(n: number): number;
-export declare function getHashCode(value: number, offset?: number): number;
-export declare const getStringHashCode: (value: string) => number;

package/dist/utils/hash.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStringHashCode = exports.getHashCode = exports.rotateBits = void 0;
-const lru_cache_1 = require("lru-cache");
-function rotateBits(n) {
-    return (n >> 1) | (n << 31);
-}
-exports.rotateBits = rotateBits;
-function getHashCode(value, offset = 0) {
-    let unsigned = value >>> 0;
-    unsigned = ((unsigned >> 16) ^ unsigned) * 0x45d9f3b;
-    unsigned = ((unsigned >> 16) ^ unsigned) * 0x45d9f3b;
-    unsigned = (unsigned >> 16) ^ unsigned;
-    return ((offset << 5) - offset + unsigned) | 0;
-}
-exports.getHashCode = getHashCode;
-exports.getStringHashCode = (function () {
-    const cache = new lru_cache_1.LRUCache({
-        ttl: 1000 * 60 * 5,
-        max: 500
-    });
-    const generateHash = (value) => {
-        let hash = 0;
-        for (let i = 0; i < value.length; i++) {
-            const chr = value.charCodeAt(i);
-            hash = getHashCode(chr, hash);
-        }
-        return hash;
-    };
-    return (value) => {
-        if (value.length === 0) {
-            return 0;
-        }
-        if (cache.has(value)) {
-            return cache.get(value);
-        }
-        const hash = generateHash(value);
-        cache.set(value, hash);
-        return hash;
-    };
-})();