greybel-interpreter 4.5.13 → 4.6.0

package/dist/context.d.ts

@@ -2,7 +2,7 @@ import { CustomValue } from './types/base';
 import { CustomMap } from './types/map';
 import { ObjectValue } from './utils/object-value';
 import { ContextTypeIntrinsics } from './context/types';
-import { Instruction } from './byte-compiler/instruction';
+import { Instruction } from './bytecode-generator/instruction';
 import { CustomValueWithIntrinsicsResult } from './types/with-intrinsics';
 import { Stack } from './utils/stack';
 export declare enum ContextType {
@@ -24,6 +24,7 @@ export interface ContextOptions {
     self?: CustomValue;
     super?: CustomValue;
     isProtected?: boolean;
+    isCalledByCommand?: boolean;
     outer?: OperationContext;
 }
 export interface ContextForkOptions {
@@ -32,6 +33,7 @@ export interface ContextForkOptions {
     self?: CustomValue;
     super?: CustomValue;
     target?: string;
+    isCalledByCommand?: boolean;
     outer?: OperationContext;
 }
 export declare class OperationContext {
@@ -42,6 +44,7 @@ export declare class OperationContext {
     readonly type: ContextType;
     readonly scope: Scope;
     isProtected: boolean;
+    isCalledByCommand: boolean;
     injected: boolean;
     cp: null | number;
     ip: number;
@@ -57,7 +60,7 @@ export declare class OperationContext {
     private static readonly lookupLocalsType;
     constructor(options: ContextOptions);
     lookupAllOfType(validate: (type: ContextType) => boolean): OperationContext[];
-    lookupType(allowedTypes: Array<ContextType>): OperationContext;
+    lookupType(allowedTypes: Set<ContextType>): OperationContext;
     lookupAllScopes(): OperationContext[];
     lookupApi(): OperationContext;
     lookupGlobals(): OperationContext;

package/dist/context.js

@@ -63,7 +63,7 @@ class Scope extends map_1.CustomMap {
 exports.Scope = Scope;
 class OperationContext {
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         this.iterators = new stack_1.Stack();
         this.code = options.code;
         this.cp = null;
@@ -74,10 +74,11 @@ class OperationContext {
         this.self = (_c = options.self) !== null && _c !== void 0 ? _c : null;
         this.super = (_d = options.super) !== null && _d !== void 0 ? _d : null;
         this.isProtected = (_e = options.isProtected) !== null && _e !== void 0 ? _e : false;
-        this.api = this.lookupApi();
-        this.globals = this.lookupGlobals();
-        this.locals = (_f = this.lookupLocals()) !== null && _f !== void 0 ? _f : this;
-        this.outer = (_g = options.outer) !== null && _g !== void 0 ? _g : this.lookupOuter();
+        this.isCalledByCommand = (_f = options.isCalledByCommand) !== null && _f !== void 0 ? _f : false;
+        this.api = (_h = (_g = this.previous) === null || _g === void 0 ? void 0 : _g.api) !== null && _h !== void 0 ? _h : this.lookupApi();
+        this.globals = (_k = (_j = this.previous) === null || _j === void 0 ? void 0 : _j.globals) !== null && _k !== void 0 ? _k : this.lookupGlobals();
+        this.locals = (_l = this.lookupLocals()) !== null && _l !== void 0 ? _l : this;
+        this.outer = (_m = options.outer) !== null && _m !== void 0 ? _m : this.lookupOuter();
     }
     lookupAllOfType(validate) {
         const me = this;
@@ -95,12 +96,12 @@ class OperationContext {
         return result;
     }
     lookupType(allowedTypes) {
-        if (allowedTypes.includes(this.type)) {
+        if (allowedTypes.has(this.type)) {
             return this;
         }
         let current = this.previous;
         while (current !== null) {
-            if (allowedTypes.includes(current.type)) {
+            if (allowedTypes.has(current.type)) {
                 return current;
             }
             current = current.previous;
@@ -152,16 +153,17 @@ class OperationContext {
             code: options.code,
             self: options.self,
             super: options.super,
-            outer: options.outer
+            outer: options.outer,
+            isCalledByCommand: options.isCalledByCommand
         });
     }
 }
-OperationContext.lookupApiType = [ContextType.Api];
-OperationContext.lookupGlobalsType = [
+OperationContext.lookupApiType = new Set([ContextType.Api]);
+OperationContext.lookupGlobalsType = new Set([
     ContextType.Global
-];
-OperationContext.lookupLocalsType = [
+]);
+OperationContext.lookupLocalsType = new Set([
     ContextType.Global,
     ContextType.Function
-];
+]);
 exports.OperationContext = OperationContext;

package/dist/index.d.ts

@@ -19,6 +19,10 @@ export { ObjectValue } from './utils/object-value';
 export { deepEqual } from './utils/deep-equal';
 export { deepHash } from './utils/deep-hash';
 export { Debugger, VM, VMOptions } from './vm';
-export { Instruction, OpCode } from './byte-compiler/instruction';
-export { BytecodeGenerator, BytecodeCompileResult, BytecodeConverterOptions, BytecodeGeneratorContext } from './bytecode-generator';
+export { Instruction, OpCode } from './bytecode-generator/instruction';
+export { Module as BytecodeGeneratorModule } from './bytecode-generator/module';
+export { Context as BytecodeGeneratorContext } from './bytecode-generator/context';
+export { BytecodeStatementGenerator } from './bytecode-generator/statement';
+export { BytecodeExpressionGenerator } from './bytecode-generator/expression';
+export { BytecodeGenerator, BytecodeCompileResult, BytecodeConverterOptions } from './bytecode-generator';
 export { Stack } from './utils/stack';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Stack = exports.BytecodeGenerator = exports.OpCode = exports.VM = exports.Debugger = exports.deepHash = exports.deepEqual = 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.DefaultType = exports.CustomBoolean = exports.CustomValue = exports.Interpreter = exports.HandlerContainer = exports.ResourceHandler = exports.DefaultResourceHandler = exports.OutputHandler = exports.DefaultOutputHandler = exports.ErrorHandler = exports.DefaultErrorHandler = exports.Scope = exports.OperationContext = exports.ContextType = void 0;
+exports.Stack = exports.BytecodeGenerator = exports.BytecodeExpressionGenerator = exports.BytecodeStatementGenerator = exports.BytecodeGeneratorContext = exports.BytecodeGeneratorModule = exports.OpCode = exports.VM = exports.Debugger = exports.deepHash = exports.deepEqual = 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.DefaultType = exports.CustomBoolean = exports.CustomValue = exports.Interpreter = exports.HandlerContainer = exports.ResourceHandler = exports.DefaultResourceHandler = exports.OutputHandler = exports.DefaultOutputHandler = exports.ErrorHandler = exports.DefaultErrorHandler = exports.Scope = exports.OperationContext = exports.ContextType = void 0;
 var context_1 = require("./context");
 Object.defineProperty(exports, "ContextType", { enumerable: true, get: function () { return context_1.ContextType; } });
 Object.defineProperty(exports, "OperationContext", { enumerable: true, get: function () { return context_1.OperationContext; } });
@@ -54,8 +54,16 @@ Object.defineProperty(exports, "deepHash", { enumerable: true, get: function ()
 var vm_1 = require("./vm");
 Object.defineProperty(exports, "Debugger", { enumerable: true, get: function () { return vm_1.Debugger; } });
 Object.defineProperty(exports, "VM", { enumerable: true, get: function () { return vm_1.VM; } });
-var instruction_1 = require("./byte-compiler/instruction");
+var instruction_1 = require("./bytecode-generator/instruction");
 Object.defineProperty(exports, "OpCode", { enumerable: true, get: function () { return instruction_1.OpCode; } });
+var module_1 = require("./bytecode-generator/module");
+Object.defineProperty(exports, "BytecodeGeneratorModule", { enumerable: true, get: function () { return module_1.Module; } });
+var context_2 = require("./bytecode-generator/context");
+Object.defineProperty(exports, "BytecodeGeneratorContext", { enumerable: true, get: function () { return context_2.Context; } });
+var statement_1 = require("./bytecode-generator/statement");
+Object.defineProperty(exports, "BytecodeStatementGenerator", { enumerable: true, get: function () { return statement_1.BytecodeStatementGenerator; } });
+var expression_1 = require("./bytecode-generator/expression");
+Object.defineProperty(exports, "BytecodeExpressionGenerator", { enumerable: true, get: function () { return expression_1.BytecodeExpressionGenerator; } });
 var bytecode_generator_1 = require("./bytecode-generator");
 Object.defineProperty(exports, "BytecodeGenerator", { enumerable: true, get: function () { return bytecode_generator_1.BytecodeGenerator; } });
 var stack_1 = require("./utils/stack");

package/dist/types/function.d.ts

@@ -1,4 +1,4 @@
-import { FunctionDefinitionInstructionArgument, Instruction } from '../byte-compiler/instruction';
+import { FunctionDefinitionInstructionArgument, Instruction } from '../bytecode-generator/instruction';
 import { OperationContext } from '../context';
 import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';

package/dist/types/function.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomFunction = void 0;
-const instruction_1 = require("../byte-compiler/instruction");
-const keywords_1 = require("../byte-compiler/keywords");
+const instruction_1 = require("../bytecode-generator/instruction");
+const keywords_1 = require("../bytecode-generator/keywords");
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const uuid_1 = require("../utils/uuid");

package/dist/types/map.js

@@ -118,12 +118,12 @@ class CustomMap extends with_intrinsics_1.CustomObject {
     }
     get(current, typeIntrinsics) {
         var _a;
-        const isa = this.getIsa();
         if (current !== null) {
-            if (this.value.has(current)) {
-                return this.value.get(current);
-            }
-            else if (isa === null || isa === void 0 ? void 0 : isa.has(current)) {
+            const item = this.value.get(current);
+            if (item)
+                return item;
+            const isa = this.getIsa();
+            if (isa === null || isa === void 0 ? void 0 : isa.has(current)) {
                 return isa.get(current, typeIntrinsics);
             }
             const intrinsics = (_a = typeIntrinsics.map) !== null && _a !== void 0 ? _a : CustomMap.getIntrinsics();
@@ -135,16 +135,16 @@ class CustomMap extends with_intrinsics_1.CustomObject {
     }
     getWithOrigin(current, typeIntrinsics) {
         var _a;
-        const isa = this.getIsa();
         if (current !== null) {
-            if (this.value.has(current)) {
-                const sub = this.value.get(current);
+            const item = this.value.get(current);
+            if (item) {
                 return {
-                    value: sub,
+                    value: item,
                     origin: this
                 };
             }
-            else if (isa === null || isa === void 0 ? void 0 : isa.has(current)) {
+            const isa = this.getIsa();
+            if (isa === null || isa === void 0 ? void 0 : isa.has(current)) {
                 return isa.getWithOrigin(current, typeIntrinsics);
             }
             const intrinsics = (_a = typeIntrinsics.map) !== null && _a !== void 0 ? _a : CustomMap.getIntrinsics();

package/dist/types/string.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Outer = exports.Locals = exports.Globals = exports.Super = exports.Isa = exports.Self = exports.CustomString = exports.CustomStringIterator = void 0;
-const keywords_1 = require("../byte-compiler/keywords");
+const keywords_1 = require("../bytecode-generator/keywords");
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const number_1 = require("./number");

package/dist/utils/error.d.ts

@@ -1,5 +1,5 @@
 import { ASTRange } from 'miniscript-core';
-import { Instruction } from '../byte-compiler/instruction';
+import { Instruction } from '../bytecode-generator/instruction';
 interface RuntimeVM {
     getFrame(): {
         getCurrentInstruction: () => Instruction;

package/dist/utils/hash.js

@@ -1,7 +1,6 @@
 "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);
 }
@@ -15,24 +14,19 @@ function getHashCode(value, offset = 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;
+    const cache = new Map();
+    const generateHash = (s) => {
+        for (var i = 0, h = 0; i < s.length; i++)
+            h = (Math.imul(31, h) + s.charCodeAt(i)) | 0;
+        return h;
     };
     return (value) => {
         if (value.length === 0) {
             return 0;
         }
-        if (cache.has(value)) {
-            return cache.get(value);
+        const cachedHash = cache.get(value);
+        if (cachedHash !== undefined) {
+            return cachedHash;
         }
         const hash = generateHash(value);
         cache.set(value, hash);

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

@@ -3,7 +3,7 @@ export type ObjectValueKeyPair = [CustomValue, CustomValue];
 export declare class ObjectValue {
     private data;
     constructor(entries?: ObjectValue | ObjectValueKeyPair[] | null);
-    get(mapKey: CustomValue): CustomValue;
+    get(mapKey: CustomValue): CustomValue | null;
     has(mapKey: CustomValue): boolean;
     set(mapKey: CustomValue, mapValue: CustomValue): this;
     delete(mapKey: CustomValue): boolean;

package/dist/utils/object-value.js

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

package/dist/utils/stack.d.ts

@@ -5,6 +5,7 @@ export declare class Stack<T> {
     push(value: T): number;
     pop(): T;
     peek(): T;
+    some(callback: (value: T) => boolean): boolean;
     includes(value: T): boolean;
     values(): T[];
     get length(): number;

package/dist/utils/stack.js

@@ -20,6 +20,9 @@ class Stack {
     peek() {
         return this.last;
     }
+    some(callback) {
+        return this.stack.some(callback);
+    }
     includes(value) {
         return this.stack.includes(value);
     }

package/dist/utils/uuid.d.ts

@@ -1 +1,2 @@
-export declare const uuid: () => string;
+import hyperid from 'hyperid';
+export declare const uuid: hyperid.Instance;

package/dist/utils/uuid.js

@@ -1,36 +1,8 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uuid = void 0;
-// Source: https://gist.github.com/alemures/ba4cd1b37a4b11346d7f54f05c826d24
-function createUUIDFactory() {
-    const lut = [];
-    for (let i = 0; i < 256; i++)
-        lut[i] = (i < 16 ? '0' : '') + i.toString(16);
-    return function () {
-        const d0 = (Math.random() * 0xffffffff) | 0;
-        const d1 = (Math.random() * 0xffffffff) | 0;
-        const d2 = (Math.random() * 0xffffffff) | 0;
-        const d3 = (Math.random() * 0xffffffff) | 0;
-        return (lut[d0 & 0xff] +
-            lut[(d0 >> 8) & 0xff] +
-            lut[(d0 >> 16) & 0xff] +
-            lut[(d0 >> 24) & 0xff] +
-            '-' +
-            lut[d1 & 0xff] +
-            lut[(d1 >> 8) & 0xff] +
-            '-' +
-            lut[((d1 >> 16) & 0x0f) | 0x40] +
-            lut[(d1 >> 24) & 0xff] +
-            '-' +
-            lut[(d2 & 0x3f) | 0x80] +
-            lut[(d2 >> 8) & 0xff] +
-            '-' +
-            lut[(d2 >> 16) & 0xff] +
-            lut[(d2 >> 24) & 0xff] +
-            lut[d3 & 0xff] +
-            lut[(d3 >> 8) & 0xff] +
-            lut[(d3 >> 16) & 0xff] +
-            lut[(d3 >> 24) & 0xff]);
-    };
-}
-exports.uuid = createUUIDFactory();
+const hyperid_1 = __importDefault(require("hyperid"));
+exports.uuid = (0, hyperid_1.default)();

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

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

package/dist/utils/value-hash.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.valueHash = void 0;
+const deep_hash_1 = require("./deep-hash");
+function valueHash(value) {
+    const valueType = typeof value.value;
+    switch (valueType) {
+        case 'string':
+        case 'number':
+        case 'boolean':
+            return value.hash();
+    }
+    return (0, deep_hash_1.deepHash)(value);
+}
+exports.valueHash = valueHash;

package/dist/vm/call.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callWithContext = exports.call = void 0;
-const keywords_1 = require("../byte-compiler/keywords");
+const keywords_1 = require("../bytecode-generator/keywords");
 const map_1 = require("../types/map");
 function call(frame, fn, args) {
     var _a;

package/dist/vm.d.ts

@@ -3,7 +3,7 @@ import { OperationContext } from "./context";
 import { ContextTypeIntrinsics } from "./context/types";
 import { HandlerContainer } from "./handler-container";
 import { CustomValue } from "./types/base";
-import { Instruction, SourceLocation } from "./byte-compiler/instruction";
+import { Instruction, SourceLocation } from "./bytecode-generator/instruction";
 import { Stack } from "./utils/stack";
 import EventEmitter from "events";
 export declare class Debugger {

package/dist/vm.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VM = exports.VMState = exports.Debugger = void 0;
 const context_1 = require("./context");
-const instruction_1 = require("./byte-compiler/instruction");
+const instruction_1 = require("./bytecode-generator/instruction");
 const default_1 = require("./types/default");
 const stack_1 = require("./utils/stack");
 const error_1 = require("./utils/error");
@@ -270,7 +270,8 @@ class VM {
                             const newFrame = this.getFrame().fork({
                                 code: fn.value,
                                 type: context_1.ContextType.Function,
-                                outer: fn.outer
+                                outer: fn.outer,
+                                isCalledByCommand: !!instruction.command
                             });
                             (0, call_1.call)(newFrame, fn, args);
                             this.frames.push(newFrame);
@@ -293,7 +294,8 @@ class VM {
                                 code: fn.value,
                                 self: context,
                                 super: ret.origin instanceof map_1.CustomMap ? ((_b = ret.origin.getIsa()) !== null && _b !== void 0 ? _b : default_1.DefaultType.Void) : null,
-                                outer: fn.outer
+                                outer: fn.outer,
+                                isCalledByCommand: !!instruction.command
                             });
                             (0, call_1.callWithContext)(newFrame, fn, args);
                             this.frames.push(newFrame);
@@ -316,7 +318,8 @@ class VM {
                                 code: fn.value,
                                 self: frame.self,
                                 super: ret.origin instanceof map_1.CustomMap ? ((_c = ret.origin.getIsa()) !== null && _c !== void 0 ? _c : default_1.DefaultType.Void) : null,
-                                outer: fn.outer
+                                outer: fn.outer,
+                                isCalledByCommand: !!instruction.command
                             });
                             (0, call_1.callWithContext)(newFrame, fn, args);
                             this.frames.push(newFrame);
@@ -331,7 +334,8 @@ class VM {
                             const key = this.popStack();
                             map.unshift([key, value]);
                         }
-                        this.pushStack(new map_1.CustomMap(new object_value_1.ObjectValue(map)));
+                        if (!instruction.command)
+                            this.pushStack(new map_1.CustomMap(new object_value_1.ObjectValue(map)));
                         break;
                     }
                     case instruction_1.OpCode.CONSTRUCT_LIST: {
@@ -341,7 +345,8 @@ class VM {
                             const value = this.popStack();
                             list.unshift(value);
                         }
-                        this.pushStack(new list_1.CustomList(list));
+                        if (!instruction.command)
+                            this.pushStack(new list_1.CustomList(list));
                         break;
                     }
                     case instruction_1.OpCode.GOTO_A_IF_FALSE: {
@@ -364,6 +369,15 @@ class VM {
                         frame.ip = gotoAInstruction.goto.ip;
                         break;
                     }
+                    case instruction_1.OpCode.GOTO_A_IF_TRUE: {
+                        const condition = this.popStack();
+                        if (!condition.toTruthy()) {
+                            break;
+                        }
+                        const gotoAInstruction = instruction;
+                        frame.ip = gotoAInstruction.goto.ip;
+                        break;
+                    }
                     case instruction_1.OpCode.GOTO_A_IF_TRUE_AND_PUSH: {
                         const condition = this.popStack();
                         const value = condition instanceof number_1.CustomNumber ? (0, evaluation_1.absClamp01)(condition.value) : +condition.toTruthy();
@@ -419,7 +433,8 @@ class VM {
                             const newFrame = this.getFrame().fork({
                                 code: ret.value,
                                 type: context_1.ContextType.Function,
-                                outer: ret.outer
+                                outer: ret.outer,
+                                isCalledByCommand: !!instruction.command
                             });
                             (0, call_1.call)(newFrame, ret, []);
                             this.frames.push(newFrame);
@@ -442,7 +457,8 @@ class VM {
                                 code: ret.value.value,
                                 self: context,
                                 super: ret.origin instanceof map_1.CustomMap ? ((_d = ret.origin.getIsa()) !== null && _d !== void 0 ? _d : default_1.DefaultType.Void) : null,
-                                outer: ret.value.outer
+                                outer: ret.value.outer,
+                                isCalledByCommand: !!instruction.command
                             });
                             (0, call_1.callWithContext)(newFrame, ret.value, []);
                             this.frames.push(newFrame);
@@ -462,7 +478,8 @@ class VM {
                                 code: ret.value.value,
                                 self: frame.self,
                                 super: ret.origin instanceof map_1.CustomMap ? ((_e = ret.origin.getIsa()) !== null && _e !== void 0 ? _e : default_1.DefaultType.Void) : null,
-                                outer: ret.value.outer
+                                outer: ret.value.outer,
+                                isCalledByCommand: !!instruction.command
                             });
                             (0, call_1.callWithContext)(newFrame, ret.value, []);
                             this.frames.push(newFrame);
@@ -504,23 +521,23 @@ class VM {
                         break;
                     }
                     case instruction_1.OpCode.NEW: {
-                        const value = this.popStack();
-                        if (value instanceof map_1.CustomMap) {
-                            this.pushStack(value.createInstance());
-                        }
-                        else {
+                        let value = this.popStack();
+                        if (value instanceof map_1.CustomMap)
+                            value = value.createInstance();
+                        if (!instruction.command)
                             this.pushStack(value);
-                        }
                         break;
                     }
                     case instruction_1.OpCode.NEGATE: {
                         const value = this.popStack();
-                        this.pushStack(new number_1.CustomNumber(-value.toNumber()));
+                        if (!instruction.command)
+                            this.pushStack(new number_1.CustomNumber(-value.toNumber()));
                         break;
                     }
                     case instruction_1.OpCode.FALSIFY: {
                         const value = this.popStack();
-                        this.pushStack(new boolean_1.CustomBoolean(!value.toTruthy()));
+                        if (!instruction.command)
+                            this.pushStack(new boolean_1.CustomBoolean(!value.toTruthy()));
                         break;
                     }
                     case instruction_1.OpCode.ISA: {
@@ -647,7 +664,8 @@ class VM {
                         const value = this.popStack();
                         frame.iterators.clear();
                         this.popFrame();
-                        this.pushStack(value !== null && value !== void 0 ? value : default_1.DefaultType.Void);
+                        if (!frame.isCalledByCommand)
+                            this.pushStack(value !== null && value !== void 0 ? value : default_1.DefaultType.Void);
                         break;
                     }
                     case instruction_1.OpCode.GET_ENVAR: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "4.5.13",
+    "version": "4.6.0",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -9,7 +9,7 @@
         "build": "npm run clean && tsc -p .",
         "watch": "tsc -w -p .",
         "clean": "rm -rf dist",
-        "test": "jest ./tests",
+        "test": "jest ./tests --testTimeout 10000",
         "lint": "eslint ./src/**/*.ts",
         "lint:fix": "eslint --fix ./src/**/*.ts"
     },
@@ -48,8 +48,8 @@
         "typescript": "^5.0.4"
     },
     "dependencies": {
-        "lru-cache": "^10.0.1",
-        "greybel-core": "~1.5.13"
+        "greybel-core": "~1.5.13",
+        "hyperid": "^3.2.0"
     },
     "keywords": [
         "miniscript"