greybel-interpreter 0.4.0 → 0.4.4

package/dist/context.d.ts

@@ -6,7 +6,6 @@ export declare enum ContextType {
     API = "API",
     GLOBAL = "GLOBAL",
     FUNCTION = "FUNCTION",
-    INJECTION = "INJECTION",
     EXTERNAL = "EXTERNAL",
     LOOP = "LOOP",
     MAP = "MAP",
@@ -44,6 +43,7 @@ export interface OperationContextProcessState {
 export interface OperationContextOptions {
     target?: string;
     isProtected?: boolean;
+    injected?: boolean;
     type?: ContextType;
     state?: ContextState;
     previous?: OperationContext;
@@ -55,6 +55,7 @@ export interface OperationContextForkOptions {
     type: ContextType;
     state: ContextState;
     target?: string;
+    injected?: boolean;
 }
 export declare class OperationContext {
     target: string;
@@ -64,10 +65,11 @@ export declare class OperationContext {
     type: ContextType;
     state: ContextState;
     scope: Scope;
-    isProtected: boolean;
     memory: Map<string, any>;
     cps: CPS | null;
     processState: OperationContextProcessState;
+    isProtected: boolean;
+    injected: boolean;
     api: Scope | null;
     locals: Scope | null;
     globals: Scope | null;
@@ -90,5 +92,5 @@ export declare class OperationContext {
     getCallable(path: string[]): Promise<Callable>;
     setMemory(key: string, value: any): OperationContext;
     getMemory(key: string): any;
-    fork({ type, state, target }: OperationContextForkOptions): OperationContext;
+    fork({ type, state, target, injected }: OperationContextForkOptions): OperationContext;
 }

package/dist/context.js

@@ -50,7 +50,6 @@ var ContextType;
     ContextType["API"] = "API";
     ContextType["GLOBAL"] = "GLOBAL";
     ContextType["FUNCTION"] = "FUNCTION";
-    ContextType["INJECTION"] = "INJECTION";
     ContextType["EXTERNAL"] = "EXTERNAL";
     ContextType["LOOP"] = "LOOP";
     ContextType["MAP"] = "MAP";
@@ -181,7 +180,7 @@ var Debugger = /** @class */ (function () {
         return me;
     };
     Debugger.prototype.getBreakpoint = function (operationContext) {
-        return operationContext.type !== ContextType.INJECTION && this.breakpoint;
+        return this.breakpoint;
     };
     Debugger.prototype.next = function () {
         var me = this;
@@ -228,6 +227,7 @@ var OperationContext = /** @class */ (function () {
         me.state = options.state || ContextState.DEFAULT;
         me.scope = new Scope(me);
         me.isProtected = options.isProtected || false;
+        me.injected = options.injected || false;
         me.memory = new Map();
         me.debugger = options.debugger || new Debugger();
         me.cps = options.cps;
@@ -243,17 +243,19 @@ var OperationContext = /** @class */ (function () {
     OperationContext.prototype.step = function (item) {
         var me = this;
         var dbgr = me.debugger;
-        me.stackItem = item;
-        me.setLastActive(me);
-        if (dbgr.getBreakpoint(me)) {
-            dbgr.interact(me, item);
-            return dbgr.resume();
+        if (!me.injected) {
+            me.stackItem = item;
+            me.setLastActive(me);
+            if (dbgr.getBreakpoint(me)) {
+                dbgr.interact(me, item);
+                return dbgr.resume();
+            }
         }
         return Promise.resolve();
     };
     OperationContext.prototype.setLastActive = function (opc) {
         var me = this;
-        if (opc.type !== ContextType.INJECTION) {
+        if (!opc.injected) {
             me.processState.last = opc;
         }
         return me;
@@ -361,7 +363,7 @@ var OperationContext = /** @class */ (function () {
         return me.memory.get(key);
     };
     OperationContext.prototype.fork = function (_a) {
-        var type = _a.type, state = _a.state, target = _a.target;
+        var type = _a.type, state = _a.state, target = _a.target, injected = _a.injected;
         var me = this;
         var opc = new OperationContext({
             target: target || me.target,
@@ -370,7 +372,8 @@ var OperationContext = /** @class */ (function () {
             state: state,
             debugger: me.debugger,
             cps: me.cps,
-            processState: me.processState
+            processState: me.processState,
+            injected: injected || me.injected
         });
         if (type !== ContextType.FUNCTION) {
             if (type !== ContextType.LOOP) {

package/dist/interpreter.js

@@ -115,10 +115,11 @@ var Interpreter = /** @class */ (function (_super) {
                     case 2:
                         body = _a.sent();
                         injectionCtx = (context || me.globalContext).fork({
-                            type: context_1.ContextType.INJECTION,
-                            state: context_1.ContextState.TEMPORARY
+                            type: context_1.ContextType.CALL,
+                            state: context_1.ContextState.TEMPORARY,
+                            injected: true
                         });
-                        return [4 /*yield*/, body.run(context)];
+                        return [4 /*yield*/, body.run(injectionCtx)];
                     case 3:
                         _a.sent();
                         return [3 /*break*/, 5];
@@ -138,7 +139,7 @@ var Interpreter = /** @class */ (function (_super) {
                 me = this;
                 last = me.apiContext.getLastActive();
                 if (me.apiContext.isPending()) {
-                    me.inject(code, last);
+                    return [2 /*return*/, me.inject(code, last)];
                 }
                 return [2 /*return*/, me];
             });

package/package.json

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