greybel-interpreter 0.3.7 → 0.4.1

package/dist/context.d.ts

@@ -1,14 +1,11 @@
 import CustomMap from './custom-types/map';
-import { Operation } from './types/operation';
-import { Expression } from './types/expression';
 import { Callable } from './types/custom-type';
-import { ASTPosition } from 'greyscript-core';
+import { ASTBase } from 'greybel-core';
 import CPS from './cps';
 export declare enum ContextType {
     API = "API",
     GLOBAL = "GLOBAL",
     FUNCTION = "FUNCTION",
-    INJECTION = "INJECTION",
     EXTERNAL = "EXTERNAL",
     LOOP = "LOOP",
     MAP = "MAP",
@@ -36,16 +33,17 @@ export declare class Debugger {
     getBreakpoint(operationContext: OperationContext): boolean;
     next(): Debugger;
     resume(): Promise<void>;
-    interact(operationContext: OperationContext, item: Operation | Expression): void;
-    run(code: string): Promise<void>;
+    interact(operationContext: OperationContext, item: ASTBase): void;
 }
 export interface OperationContextProcessState {
     exit: boolean;
     pending: boolean;
+    last: OperationContext | null;
 }
 export interface OperationContextOptions {
     target?: string;
     isProtected?: boolean;
+    injected?: boolean;
     type?: ContextType;
     state?: ContextState;
     previous?: OperationContext;
@@ -57,27 +55,32 @@ export interface OperationContextForkOptions {
     type: ContextType;
     state: ContextState;
     target?: string;
+    injected?: boolean;
 }
 export declare class OperationContext {
     target: string;
-    line: ASTPosition;
+    stackItem: ASTBase | null;
     debugger: Debugger;
     previous: OperationContext | null;
     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;
     constructor(options: OperationContextOptions);
-    exit(): Promise<OperationContext>;
-    setPending(pending: boolean): OperationContext;
+    step(item: ASTBase): Promise<void>;
+    setLastActive(opc: OperationContext): OperationContext;
+    getLastActive(): OperationContext | null;
     isExit(): boolean;
+    exit(): Promise<OperationContext>;
     isPending(): boolean;
+    setPending(pending: boolean): OperationContext;
     lookupType(validate: (type: ContextType) => boolean): Scope;
     lookupAPI(): Scope;
     lookupGlobals(): Scope;
@@ -89,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

@@ -14,42 +14,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -81,13 +45,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationContext = exports.Debugger = exports.Scope = exports.ContextState = exports.ContextType = void 0;
 var map_1 = __importDefault(require("./custom-types/map"));
-var greybel_core_1 = require("greybel-core");
 var ContextType;
 (function (ContextType) {
     ContextType["API"] = "API";
     ContextType["GLOBAL"] = "GLOBAL";
     ContextType["FUNCTION"] = "FUNCTION";
-    ContextType["INJECTION"] = "INJECTION";
     ContextType["EXTERNAL"] = "EXTERNAL";
     ContextType["LOOP"] = "LOOP";
     ContextType["MAP"] = "MAP";
@@ -218,7 +180,7 @@ var Debugger = /** @class */ (function () {
         return me;
     };
     Debugger.prototype.getBreakpoint = function (operationContext) {
-        return operationContext.type !== ContextType.INJECTION && this.breakpoint;
+        return !operationContext.injected && this.breakpoint;
     };
     Debugger.prototype.next = function () {
         var me = this;
@@ -250,41 +212,8 @@ var Debugger = /** @class */ (function () {
         var me = this;
         console.warn("Debugger is not setup.");
         console.info(operationContext);
-        me.lastContext = operationContext;
         me.breakpoint = false;
     };
-    Debugger.prototype.run = function (code) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, parser, chunk, item, context, err_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        me = this;
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 4, , 5]);
-                        parser = new greybel_core_1.Parser(code);
-                        chunk = parser.parseChunk();
-                        return [4 /*yield*/, me.lastContext.cps.visit(chunk)];
-                    case 2:
-                        item = _a.sent();
-                        context = me.lastContext.fork({
-                            type: ContextType.INJECTION,
-                            state: ContextState.TEMPORARY
-                        });
-                        return [4 /*yield*/, item.run(context)];
-                    case 3:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 4:
-                        err_1 = _a.sent();
-                        console.error(err_1);
-                        return [3 /*break*/, 5];
-                    case 5: return [2 /*return*/];
-                }
-            });
-        });
-    };
     return Debugger;
 }());
 exports.Debugger = Debugger;
@@ -292,26 +221,49 @@ var OperationContext = /** @class */ (function () {
     function OperationContext(options) {
         var me = this;
         me.target = options.target || 'unknown';
-        me.line = {
-            line: 0,
-            character: 0
-        };
+        me.stackItem = null;
         me.previous = options.previous || null;
         me.type = options.type || ContextType.API;
         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;
         me.processState = options.processState || {
             exit: false,
-            pending: false
+            pending: false,
+            last: null
         };
         me.api = me.lookupAPI();
         me.globals = me.lookupGlobals();
         me.locals = me.lookupLocals();
     }
+    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();
+        }
+        return Promise.resolve();
+    };
+    OperationContext.prototype.setLastActive = function (opc) {
+        var me = this;
+        if (!opc.injected) {
+            me.processState.last = opc;
+        }
+        return me;
+    };
+    OperationContext.prototype.getLastActive = function () {
+        return this.processState.last;
+    };
+    OperationContext.prototype.isExit = function () {
+        return this.processState.exit;
+    };
     OperationContext.prototype.exit = function () {
         var me = this;
         var state = me.processState;
@@ -328,17 +280,14 @@ var OperationContext = /** @class */ (function () {
         }
         return Promise.reject(new Error('No running process found.'));
     };
+    OperationContext.prototype.isPending = function () {
+        return this.processState.pending;
+    };
     OperationContext.prototype.setPending = function (pending) {
         var me = this;
         me.processState.pending = pending;
         return me;
     };
-    OperationContext.prototype.isExit = function () {
-        return this.processState.exit;
-    };
-    OperationContext.prototype.isPending = function () {
-        return this.processState.exit;
-    };
     OperationContext.prototype.lookupType = function (validate) {
         var me = this;
         if (validate(me.type)) {
@@ -412,7 +361,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,
@@ -421,7 +370,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.d.ts

@@ -22,7 +22,8 @@ export default class Interpreter extends EventEmitter {
     constructor(options: InterpreterOptions);
     setTarget(target: string): Interpreter;
     setDebugger(dbgr: Debugger): Interpreter;
-    inject(code: string): Promise<Interpreter>;
+    inject(code: string, context?: OperationContext): Promise<Interpreter>;
+    injectInLastContext(code: string): Promise<Interpreter>;
     digest(customCode?: string): Promise<Interpreter>;
     exit(): Promise<OperationContext>;
 }

package/dist/interpreter.js

@@ -99,24 +99,25 @@ var Interpreter = /** @class */ (function (_super) {
         me.globalContext.debugger = dbgr;
         return me;
     };
-    Interpreter.prototype.inject = function (code) {
+    Interpreter.prototype.inject = function (code, context) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, parser, chunk, body, context, err_1;
+            var me, parser, chunk, body, injectionCtx, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         me = this;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
                         parser = new greybel_core_1.Parser(code);
                         chunk = parser.parseChunk();
                         return [4 /*yield*/, me.cps.visit(chunk)];
-                    case 1:
-                        body = _a.sent();
-                        _a.label = 2;
                     case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        context = me.globalContext.fork({
-                            type: context_1.ContextType.INJECTION,
-                            state: context_1.ContextState.TEMPORARY
+                        body = _a.sent();
+                        injectionCtx = (context || me.globalContext).fork({
+                            type: context_1.ContextType.CALL,
+                            state: context_1.ContextState.TEMPORARY,
+                            injected: true
                         });
                         return [4 /*yield*/, body.run(context)];
                     case 3:
@@ -131,6 +132,19 @@ var Interpreter = /** @class */ (function (_super) {
             });
         });
     };
+    Interpreter.prototype.injectInLastContext = function (code) {
+        return __awaiter(this, void 0, void 0, function () {
+            var me, last;
+            return __generator(this, function (_a) {
+                me = this;
+                last = me.apiContext.getLastActive();
+                if (me.apiContext.isPending()) {
+                    me.inject(code, last);
+                }
+                return [2 /*return*/, me];
+            });
+        });
+    };
     Interpreter.prototype.digest = function (customCode) {
         return __awaiter(this, void 0, void 0, function () {
             var me, code, _a, parser, chunk, body, process_1, err_2;

package/dist/operations/body.js

@@ -94,48 +94,43 @@ var BodyOperation = /** @class */ (function (_super) {
                         }
                         _d.label = 1;
                     case 1:
-                        _d.trys.push([1, 11, 12, 13]);
+                        _d.trys.push([1, 10, 11, 12]);
                         _a = __values(me.stack), _b = _a.next();
                         _d.label = 2;
                     case 2:
-                        if (!!_b.done) return [3 /*break*/, 10];
+                        if (!!_b.done) return [3 /*break*/, 9];
                         entity = _b.value;
-                        operationContext.line = entity.ast.line;
-                        if (!dbgr.getBreakpoint(operationContext)) return [3 /*break*/, 4];
-                        dbgr.interact(operationContext, entity);
-                        return [4 /*yield*/, dbgr.resume()];
+                        return [4 /*yield*/, operationContext.step(entity.ast)];
                     case 3:
                         _d.sent();
-                        _d.label = 4;
-                    case 4:
-                        if (!(entity instanceof expression_1.Expression)) return [3 /*break*/, 6];
+                        if (!(entity instanceof expression_1.Expression)) return [3 /*break*/, 5];
                         return [4 /*yield*/, entity.get(operationContext)];
-                    case 5:
+                    case 4:
                         _d.sent();
-                        return [3 /*break*/, 8];
-                    case 6: return [4 /*yield*/, entity.run(operationContext)];
-                    case 7:
+                        return [3 /*break*/, 7];
+                    case 5: return [4 /*yield*/, entity.run(operationContext)];
+                    case 6:
                         _d.sent();
+                        _d.label = 7;
+                    case 7:
+                        if (isEOL() || operationContext.isExit())
+                            return [3 /*break*/, 9];
                         _d.label = 8;
                     case 8:
-                        if (isEOL() || operationContext.isExit())
-                            return [3 /*break*/, 10];
-                        _d.label = 9;
-                    case 9:
                         _b = _a.next();
                         return [3 /*break*/, 2];
-                    case 10: return [3 /*break*/, 13];
-                    case 11:
+                    case 9: return [3 /*break*/, 12];
+                    case 10:
                         e_1_1 = _d.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 13];
-                    case 12:
+                        return [3 /*break*/, 12];
+                    case 11:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 13: return [2 /*return*/];
+                    case 12: return [2 /*return*/];
                 }
             });
         });

package/package.json

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