greybel-interpreter 2.8.1 → 2.8.3

package/dist/interpreter.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { Debugger, OperationContext } from './context';
+import { ContextOptions, Debugger, OperationContext } from './context';
 import { CPS } from './cps';
 import { HandlerContainer } from './handler-container';
 import { Operation } from './operations/operation';
@@ -17,6 +17,10 @@ export interface InterpreterOptions {
     debugger?: Debugger;
     environmentVariables?: Map<string, string>;
 }
+export interface InterpreterRunOptions {
+    customCode?: string;
+    ctxOptions?: ContextOptions;
+}
 export declare class Interpreter extends EventEmitter {
     target: string;
     api: ObjectValue;
@@ -36,8 +40,8 @@ export declare class Interpreter extends EventEmitter {
     inject(code: string, context?: OperationContext): Promise<Interpreter>;
     injectInLastContext(code: string): Promise<Interpreter>;
     private initScopes;
-    run(customCode?: string): Promise<Interpreter>;
-    start(top: Operation): Promise<Interpreter>;
+    private start;
+    run({ customCode, ctxOptions }?: InterpreterRunOptions): Promise<Interpreter>;
     resume(): Interpreter;
     pause(): Interpreter;
     exit(): Promise<OperationContext>;

package/dist/interpreter.js

@@ -52,8 +52,6 @@ class Interpreter extends events_1.EventEmitter {
             throw new Error('You cannot set a debugger while a process is running.');
         }
         this.debugger = dbgr;
-        this.apiContext.debugger = dbgr;
-        this.globalContext.debugger = dbgr;
         return this;
     }
     setApi(newApi) {
@@ -68,8 +66,6 @@ class Interpreter extends events_1.EventEmitter {
             throw new Error('You cannot set a handler while a process is running.');
         }
         this.handler = handler;
-        this.apiContext.handler = handler;
-        this.globalContext.handler = handler;
         return this;
     }
     prepare(code) {
@@ -122,27 +118,21 @@ class Interpreter extends events_1.EventEmitter {
             throw new Error('Unable to inject into last context.');
         });
     }
-    initScopes() {
+    initScopes(ctxOptions) {
         const cpsCtx = new cps_1.CPSContext(this.target, this.handler);
         this.cps = new cps_1.CPS(cpsCtx);
-        const apiContext = new context_1.OperationContext({
-            target: this.target,
-            isProtected: true,
-            debugger: this.debugger,
-            handler: this.handler,
-            cps: this.cps,
-            environmentVariables: this.environmentVariables
-        });
-        const stringIntrinsics = new map_1.CustomMap(string_1.CustomString.intrinsics);
-        const numberIntrinsics = new map_1.CustomMap(number_1.CustomNumber.intrinsics);
-        const listIntrinsics = new map_1.CustomMap(list_1.CustomList.intrinsics);
-        const mapIntrinsics = new map_1.CustomMap(map_1.CustomMap.intrinsics);
-        const funcRefIntrinsics = new map_1.CustomMap(function_1.CustomFunction.intrinsics);
-        apiContext.contextTypeIntrinsics.string = stringIntrinsics.value;
-        apiContext.contextTypeIntrinsics.number = numberIntrinsics.value;
-        apiContext.contextTypeIntrinsics.list = listIntrinsics.value;
-        apiContext.contextTypeIntrinsics.map = mapIntrinsics.value;
-        apiContext.contextTypeIntrinsics.function = funcRefIntrinsics.value;
+        const apiContext = new context_1.OperationContext(Object.assign({ target: this.target, isProtected: true, debugger: this.debugger, handler: this.handler, cps: this.cps, 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()
+            } }, ctxOptions));
+        const stringIntrinsics = map_1.CustomMap.createWithInitialValue(apiContext.contextTypeIntrinsics.string);
+        const numberIntrinsics = map_1.CustomMap.createWithInitialValue(apiContext.contextTypeIntrinsics.number);
+        const listIntrinsics = map_1.CustomMap.createWithInitialValue(apiContext.contextTypeIntrinsics.list);
+        const mapIntrinsics = map_1.CustomMap.createWithInitialValue(apiContext.contextTypeIntrinsics.map);
+        const funcRefIntrinsics = map_1.CustomMap.createWithInitialValue(apiContext.contextTypeIntrinsics.function);
         apiContext.scope.set(new string_1.CustomString('string'), stringIntrinsics);
         apiContext.scope.set(new string_1.CustomString('number'), numberIntrinsics);
         apiContext.scope.set(new string_1.CustomString('list'), listIntrinsics);
@@ -159,19 +149,8 @@ class Interpreter extends events_1.EventEmitter {
         this.apiContext = apiContext;
         this.globalContext = globalContext;
     }
-    run(customCode) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.initScopes();
-            const code = customCode !== null && customCode !== void 0 ? customCode : (yield this.handler.resourceHandler.get(this.target));
-            const top = yield this.prepare(code);
-            return this.start(top);
-        });
-    }
     start(top) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.apiContext !== null && this.apiContext.isPending()) {
-                throw new Error('Process already running.');
-            }
             try {
                 this.apiContext.setPending(true);
                 const process = top.handle(this.globalContext);
@@ -193,6 +172,17 @@ class Interpreter extends events_1.EventEmitter {
             return this;
         });
     }
+    run({ customCode, ctxOptions } = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.apiContext !== null && this.apiContext.isPending()) {
+                throw new Error('Process already running.');
+            }
+            this.initScopes(ctxOptions);
+            const code = customCode !== null && customCode !== void 0 ? customCode : (yield this.handler.resourceHandler.get(this.target));
+            const top = yield this.prepare(code);
+            return this.start(top);
+        });
+    }
     resume() {
         if (this.apiContext !== null && this.apiContext.isPending()) {
             this.debugger.setBreakpoint(false);

package/dist/operations/function.js

@@ -74,7 +74,7 @@ class FunctionOperation extends operation_1.Operation {
             fnCtx.functionState = functionState;
             yield this.block.handle(fnCtx);
             return functionState.value;
-        }), assignOuter);
+        }), [], assignOuter);
         for (const item of this.args) {
             func.addArgument(item.name, item.op);
         }

package/dist/types/function.d.ts

@@ -26,7 +26,7 @@ export declare class CustomFunction extends CustomValue {
     static createExternalAnonymous(callback: Callback): CustomFunction;
     static createExternal(name: string, callback: Callback): CustomFunction;
     static createExternalWithSelf(name: string, callback: Callback): CustomFunction;
-    constructor(scope: OperationContext, name: string, callback: Callback, assignOuter?: boolean);
+    constructor(scope: OperationContext, name: string, callback: Callback, argumentDefs?: Array<Argument>, assignOuter?: boolean);
     addArgument(name: string, defaultValue?: Operation | CustomValue): CustomFunction;
     fork(): CustomFunction;
     forkAs(name: string): CustomFunction;

package/dist/types/function.js

@@ -51,12 +51,12 @@ class CustomFunction extends base_1.CustomValue {
     static createExternalWithSelf(name, callback) {
         return new CustomFunction(null, name, callback).addArgument(exports.SELF_NAMESPACE);
     }
-    constructor(scope, name, callback, assignOuter = false) {
+    constructor(scope, name, callback, argumentDefs = [], assignOuter = false) {
         super();
         this.scope = scope;
         this.name = name;
         this.value = callback;
-        this.argumentDefs = [];
+        this.argumentDefs = argumentDefs;
         this.assignOuter = assignOuter;
         this._nextContext = null;
     }
@@ -65,10 +65,10 @@ class CustomFunction extends base_1.CustomValue {
         return this;
     }
     fork() {
-        return new CustomFunction(this.scope, this.name, this.value);
+        return new CustomFunction(this.scope, this.name, this.value, this.argumentDefs);
     }
     forkAs(name) {
-        return new CustomFunction(this.scope, name, this.value);
+        return new CustomFunction(this.scope, name, this.value, this.argumentDefs);
     }
     getCustomType() {
         return 'function';

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

@@ -12,6 +12,7 @@ export declare class ObjectValue {
     entries(): ObjectValueKeyPair[];
     get size(): number;
     forEach(callback: (value: CustomValue, key: CustomValue, map: ObjectValue) => any): void;
+    fork(): ObjectValue;
     extend(objVal: ObjectValue): this;
     clear(): void;
 }

package/dist/utils/object-value.js

@@ -56,6 +56,13 @@ class ObjectValue {
             callback(value, key, this);
         }
     }
+    fork() {
+        const newObject = new ObjectValue();
+        for (const [key, value] of this.entries()) {
+            newObject.set(key.fork(), value.fork());
+        }
+        return newObject;
+    }
     extend(objVal) {
         for (const [key, value] of objVal.entries()) {
             this.set(key, value);

package/package.json

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