greybel-interpreter 2.6.10 → 2.6.12

package/dist/context.js

@@ -211,6 +211,9 @@ class OperationContext {
     }
     setPending(pending) {
         this.processState.isPending = pending;
+        if (!this.processState.isPending && this.processState.isExit) {
+            this.processState.isExit = false;
+        }
         return this;
     }
     lookupAllOfType(validate) {
@@ -235,7 +238,6 @@ class OperationContext {
             return new Promise((resolve) => {
                 const check = () => {
                     if (!this.processState.isPending) {
-                        this.processState.isExit = false;
                         resolve(this);
                     }
                     else {

package/dist/index.d.ts

@@ -43,3 +43,4 @@ export { CustomObject, CustomValueWithIntrinsics } from './types/with-intrinsics
 export { PrepareError, RuntimeError } from './utils/error';
 export { ObjectValue } from './utils/object-value';
 export { Path } from './utils/path';
+export { deepEqual } from './utils/deep-equal';

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.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 = 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; } });
@@ -124,3 +124,5 @@ var object_value_1 = require("./utils/object-value");
 Object.defineProperty(exports, "ObjectValue", { enumerable: true, get: function () { return object_value_1.ObjectValue; } });
 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; } });

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 === right || 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 === right || 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/nil.js

@@ -32,7 +32,7 @@ class CustomNil extends base_1.CustomValue {
         return v instanceof CustomNil;
     }
     hash() {
-        return 0;
+        return -1;
     }
 }
 exports.CustomNil = CustomNil;

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,43 @@
+"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)
+                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 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)) {
+                    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/next-tick.d.ts

@@ -0,0 +1 @@
+export declare const nextTick: () => Promise<void>;

package/dist/utils/next-tick.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nextTick = void 0;
+const set_immediate_1 = require("./set-immediate");
+const nextTick = () => {
+    return new Promise((resolve) => {
+        (0, set_immediate_1.setImmediate)(resolve);
+    });
+};
+exports.nextTick = nextTick;

package/package.json

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