greybel-interpreter 4.0.4 → 4.0.5

package/dist/interpreter.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { ContextOptions, OperationContext } from './context';
+import { OperationContext } from './context';
 import { HandlerContainer } from './handler-container';
 import { CustomValue } from './types/base';
 import { CustomString } from './types/string';
 import { ObjectValue } from './utils/object-value';
-import { Debugger, VM } from './vm';
+import { Debugger, VM, VMOptions } from './vm';
 import { BytecodeCompileResult } from './bytecode-generator';
 export declare const PARAMS_PROPERTY: CustomString;
 export declare const IS_GREYBEL_PROPERTY: CustomString;
@@ -20,7 +20,7 @@ export interface InterpreterOptions {
 }
 export interface InterpreterRunOptions {
     customCode?: string;
-    ctxOptions?: ContextOptions;
+    vmOptions?: VMOptions;
 }
 export declare class Interpreter extends EventEmitter {
     target: string;
@@ -40,9 +40,9 @@ export declare class Interpreter extends EventEmitter {
     setHandler(handler: HandlerContainer): Interpreter;
     inject(code: string, context?: OperationContext): Promise<Interpreter>;
     injectInLastContext(code: string): Promise<Interpreter>;
-    protected initVM(result: BytecodeCompileResult): void;
+    protected initVM(result: BytecodeCompileResult, options?: VMOptions): void;
     protected start(): Promise<Interpreter>;
-    run({ customCode }?: InterpreterRunOptions): Promise<Interpreter>;
+    run({ customCode, vmOptions }?: InterpreterRunOptions): Promise<Interpreter>;
     resume(): Interpreter;
     pause(): Interpreter;
     exit(): void;

package/dist/interpreter.js

@@ -111,7 +111,7 @@ class Interpreter extends events_1.EventEmitter {
             throw new Error('Unable to inject into last context.');
         });
     }
-    initVM(result) {
+    initVM(result, options) {
         const apiContext = new context_1.OperationContext({
             isProtected: true,
             code: [],
@@ -120,21 +120,13 @@ class Interpreter extends events_1.EventEmitter {
             type: context_1.ContextType.Global,
             code: result.code
         });
-        const vm = new vm_1.VM({
-            target: this.target,
-            debugger: this.debugger,
-            handler: this.handler,
-            environmentVariables: this.environmentVariables,
-            contextTypeIntrinsics: {
+        const vm = new vm_1.VM(Object.assign({ target: this.target, debugger: this.debugger, handler: this.handler, environmentVariables: this.environmentVariables, contextTypeIntrinsics: {
                 string: string_1.CustomString.getIntrinsics().fork(),
                 number: number_1.CustomNumber.getIntrinsics().fork(),
                 list: list_1.CustomList.getIntrinsics().fork(),
                 map: map_1.CustomMap.getIntrinsics().fork(),
                 function: function_1.CustomFunction.intrinsics.fork()
-            },
-            globals: globalContext,
-            imports: result.imports
-        });
+            }, globals: globalContext, imports: result.imports }, options));
         const stringIntrinsics = map_1.CustomMap.createWithInitialValue(vm.contextTypeIntrinsics.string);
         const numberIntrinsics = map_1.CustomMap.createWithInitialValue(vm.contextTypeIntrinsics.number);
         const listIntrinsics = map_1.CustomMap.createWithInitialValue(vm.contextTypeIntrinsics.list);
@@ -174,7 +166,7 @@ class Interpreter extends events_1.EventEmitter {
             return this;
         });
     }
-    run({ customCode } = {}) {
+    run({ customCode, vmOptions } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const code = customCode !== null && customCode !== void 0 ? customCode : (yield this.handler.resourceHandler.get(this.target));
             const bytecodeConverter = new bytecode_generator_1.BytecodeGenerator({
@@ -183,7 +175,7 @@ class Interpreter extends events_1.EventEmitter {
                 debugMode: this.debugMode
             });
             const bytecode = yield bytecodeConverter.compile(code);
-            this.initVM(bytecode);
+            this.initVM(bytecode, vmOptions);
             return this.start();
         });
     }

package/dist/vm.d.ts

@@ -1,8 +1,11 @@
+/// <reference types="node" />
 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 { Stack } from "./utils/stack";
+import EventEmitter from "events";
 export declare class Debugger {
     private breakpoint;
     private nextStep;
@@ -33,6 +36,7 @@ export interface VMOptions {
     debugger: Debugger;
     environmentVariables?: Map<string, string>;
     imports?: Map<string, Instruction[]>;
+    frames?: Stack<OperationContext>;
 }
 export declare class VM {
     private readonly ACTIONS_PER_LOOP;
@@ -56,8 +60,10 @@ export declare class VM {
     isPending(): boolean;
     getStacktrace(): Instruction[];
     getOpenHandles(): number;
+    getSignal(): EventEmitter;
     exit(): void;
     getFrame(): OperationContext;
+    getFrames(): Stack<OperationContext>;
     private pushStack;
     private popStack;
     private createFrame;

package/dist/vm.js

@@ -86,7 +86,7 @@ var VMState;
 })(VMState = exports.VMState || (exports.VMState = {}));
 class VM {
     constructor(options) {
-        var _a, _b;
+        var _a, _b, _c;
         this.ACTIONS_PER_LOOP = 120;
         this.STACK_LIMIT = 512;
         this.stack = new Array(this.STACK_LIMIT);
@@ -96,13 +96,13 @@ class VM {
         this.sp = 0;
         this.time = -1;
         this.target = options.target;
-        this.frames = new stack_1.Stack(options.globals);
+        this.frames = (_a = options.frames) !== null && _a !== void 0 ? _a : new stack_1.Stack(options.globals);
         this.contextTypeIntrinsics = options.contextTypeIntrinsics;
         this.handler = options.handler;
         this.debugger = options.debugger;
-        this.environmentVariables = (_a = options.environmentVariables) !== null && _a !== void 0 ? _a : new Map();
+        this.environmentVariables = (_b = options.environmentVariables) !== null && _b !== void 0 ? _b : new Map();
         this.iterators = new stack_1.Stack();
-        this.imports = (_b = options.imports) !== null && _b !== void 0 ? _b : new Map();
+        this.imports = (_c = options.imports) !== null && _c !== void 0 ? _c : new Map();
     }
     getTime() {
         return this.time;
@@ -121,12 +121,18 @@ class VM {
     getOpenHandles() {
         return this.sp;
     }
+    getSignal() {
+        return this.signal;
+    }
     exit() {
         this.signal.emit('exit');
     }
     getFrame() {
         return this.frames.peek();
     }
+    getFrames() {
+        return this.frames;
+    }
     pushStack(value) {
         this.stack[this.sp++] = value;
     }

package/package.json

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