greybel-interpreter 0.3.0 → 0.3.4

package/dist/context.d.ts

@@ -40,6 +40,7 @@ export declare class Debugger {
 }
 export interface OperationContextProcessState {
     exit: boolean;
+    pending: boolean;
 }
 export interface OperationContextOptions {
     target?: string;
@@ -72,6 +73,10 @@ export declare class OperationContext {
     locals: Scope | null;
     globals: Scope | null;
     constructor(options: OperationContextOptions);
+    exit(): Promise<OperationContext>;
+    setPending(pending: boolean): OperationContext;
+    isExit(): boolean;
+    isPending(): boolean;
     lookupType(validate: (type: ContextType) => boolean): Scope;
     lookupAPI(): Scope;
     lookupGlobals(): Scope;

package/dist/context.js

@@ -302,12 +302,40 @@ var OperationContext = /** @class */ (function () {
         me.debugger = options.debugger || new Debugger();
         me.cps = options.cps;
         me.processState = options.processState || {
-            exit: false
+            exit: false,
+            pending: false
         };
         me.api = me.lookupAPI();
         me.globals = me.lookupGlobals();
         me.locals = me.lookupLocals();
     }
+    OperationContext.prototype.exit = function () {
+        var me = this;
+        var state = me.processState;
+        if (state.pending) {
+            state.exit = true;
+            return new Promise(function (resolve) {
+                setImmediate(function () {
+                    if (!state.pending) {
+                        state.exit = false;
+                        resolve(me);
+                    }
+                });
+            });
+        }
+        return Promise.reject(new Error('No running process found.'));
+    };
+    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)) {

package/dist/index.d.ts

@@ -19,7 +19,6 @@ export { default as ElseOperation } from './operations/else';
 export { default as ContinueOperation } from './operations/continue';
 export { default as BreakOperation } from './operations/break';
 export { default as BodyOperation } from './operations/body';
-export { default as TopOperation } from './operations/top';
 export { default as DebuggerOperation } from './operations/debugger';
 export { default as CustomBoolean } from './custom-types/boolean';
 export { default as CustomNumber } from './custom-types/number';

package/dist/index.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toCustomValue = exports.isCustomNumber = exports.isCustomString = exports.isCustomList = exports.isCustomMap = exports.isCustomValue = exports.Interpreter = exports.CPSMap = exports.CPS = exports.CustomList = exports.CustomMap = exports.CustomNil = exports.CustomString = exports.CustomNumber = exports.CustomBoolean = exports.DebuggerOperation = exports.TopOperation = exports.BodyOperation = exports.BreakOperation = exports.ContinueOperation = exports.ElseOperation = exports.ElseIfOperation = exports.IfOperation = exports.IfStatementOperation = exports.NotOperation = exports.NewOperation = exports.ReturnOperation = exports.FunctionOperation = exports.ForOperation = exports.WhileOperation = exports.ArgumentOperation = exports.BinaryNegatedExpression = exports.PathExpression = exports.MapExpression = exports.LogicalAndBinaryExpression = exports.ListExpression = exports.CallExpression = exports.AssignExpression = void 0;
+exports.toCustomValue = exports.isCustomNumber = exports.isCustomString = exports.isCustomList = exports.isCustomMap = exports.isCustomValue = exports.Interpreter = exports.CPSMap = exports.CPS = exports.CustomList = exports.CustomMap = exports.CustomNil = exports.CustomString = exports.CustomNumber = exports.CustomBoolean = exports.DebuggerOperation = exports.BodyOperation = exports.BreakOperation = exports.ContinueOperation = exports.ElseOperation = exports.ElseIfOperation = exports.IfOperation = exports.IfStatementOperation = exports.NotOperation = exports.NewOperation = exports.ReturnOperation = exports.FunctionOperation = exports.ForOperation = exports.WhileOperation = exports.ArgumentOperation = exports.BinaryNegatedExpression = exports.PathExpression = exports.MapExpression = exports.LogicalAndBinaryExpression = exports.ListExpression = exports.CallExpression = exports.AssignExpression = void 0;
 var assign_1 = require("./expressions/assign");
 Object.defineProperty(exports, "AssignExpression", { enumerable: true, get: function () { return __importDefault(assign_1).default; } });
 var call_1 = require("./expressions/call");
@@ -56,8 +56,6 @@ var break_1 = require("./operations/break");
 Object.defineProperty(exports, "BreakOperation", { enumerable: true, get: function () { return __importDefault(break_1).default; } });
 var body_1 = require("./operations/body");
 Object.defineProperty(exports, "BodyOperation", { enumerable: true, get: function () { return __importDefault(body_1).default; } });
-var top_1 = require("./operations/top");
-Object.defineProperty(exports, "TopOperation", { enumerable: true, get: function () { return __importDefault(top_1).default; } });
 var debugger_1 = require("./operations/debugger");
 Object.defineProperty(exports, "DebuggerOperation", { enumerable: true, get: function () { return __importDefault(debugger_1).default; } });
 var boolean_1 = require("./custom-types/boolean");

package/dist/interpreter.d.ts

@@ -1,22 +1,28 @@
+/// <reference types="node" />
+import CPS from './cps';
 import { OperationContext, Debugger } from './context';
 import { ResourceHandler } from './resource';
+import EventEmitter from 'events';
 export interface InterpreterOptions {
     target?: string;
-    code?: string;
     api?: Map<string, any>;
     params?: any[];
     resourceHandler?: ResourceHandler;
     debugger?: Debugger;
 }
-export default class Interpreter {
+export default class Interpreter extends EventEmitter {
     target: string;
-    code: string | null;
     api: Map<string, any>;
     params: any[];
     resourceHandler: ResourceHandler;
     debugger: Debugger;
-    context: OperationContext | null;
+    apiContext: OperationContext;
+    globalContext: OperationContext;
+    cps: CPS;
     constructor(options: InterpreterOptions);
-    digest(): Promise<any>;
-    exit(): void;
+    setTarget(target: string): Interpreter;
+    setDebugger(dbgr: Debugger): Interpreter;
+    inject(code: string): Promise<Interpreter>;
+    digest(customCode?: string): Promise<Interpreter>;
+    exit(): Promise<OperationContext>;
 }

package/dist/interpreter.js

@@ -1,4 +1,19 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        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) {
@@ -43,80 +58,139 @@ var cps_1 = __importDefault(require("./cps"));
 var context_1 = require("./context");
 var greybel_core_1 = require("greybel-core");
 var resource_1 = require("./resource");
-var top_1 = __importDefault(require("./operations/top"));
 var typer_1 = require("./typer");
+var events_1 = __importDefault(require("events"));
 ;
-var Interpreter = /** @class */ (function () {
+var Interpreter = /** @class */ (function (_super) {
+    __extends(Interpreter, _super);
     function Interpreter(options) {
-        var me = this;
+        var _this = _super.call(this) || this;
+        var me = _this;
         me.resourceHandler = options.resourceHandler || new resource_1.ResourceProvider().getHandler();
         me.debugger = options.debugger || new context_1.Debugger();
         me.api = options.api || new Map();
         me.params = options.params || [];
-        me.context = null;
-        if (options.target) {
-            me.target = options.target;
-            me.code = null;
-        }
-        else {
-            me.target = 'unknown';
-            me.code = options.code;
-        }
+        me.setTarget(options.target || 'unknown');
+        return _this;
     }
-    Interpreter.prototype.digest = function () {
+    Interpreter.prototype.setTarget = function (target) {
+        var me = this;
+        me.target = target;
+        me.cps = new cps_1.default({
+            target: me.target,
+            resourceHandler: me.resourceHandler
+        });
+        me.apiContext = new context_1.OperationContext({
+            target: me.target,
+            isProtected: true,
+            debugger: me.debugger,
+            cps: me.cps
+        });
+        me.globalContext = me.apiContext.fork({
+            type: context_1.ContextType.GLOBAL,
+            state: context_1.ContextState.DEFAULT
+        });
+        return me;
+    };
+    Interpreter.prototype.setDebugger = function (dbgr) {
+        var me = this;
+        me.debugger = dbgr;
+        me.apiContext.debugger = dbgr;
+        me.globalContext.debugger = dbgr;
+        return me;
+    };
+    Interpreter.prototype.inject = function (code) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, code, _a, parser, chunk, cps, mainContext, topOperation, _b, _c;
-            var _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            var me, parser, chunk, body, context, err_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         me = this;
-                        _a = me.code;
+                        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
+                        });
+                        return [4 /*yield*/, body.run(context)];
+                    case 3:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_1 = _a.sent();
+                        me.debugger.raise(err_1);
+                        return [3 /*break*/, 5];
+                    case 5: 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;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        me = this;
+                        if (me.apiContext.isPending()) {
+                            return [2 /*return*/, Promise.reject(new Error('Process already running.'))];
+                        }
+                        _a = customCode;
                         if (_a) return [3 /*break*/, 2];
                         return [4 /*yield*/, me.resourceHandler.get(me.target)];
                     case 1:
-                        _a = (_e.sent());
-                        _e.label = 2;
+                        _a = (_b.sent());
+                        _b.label = 2;
                     case 2:
                         code = _a;
                         parser = new greybel_core_1.Parser(code);
                         chunk = parser.parseChunk();
-                        cps = new cps_1.default({
-                            target: me.target,
-                            resourceHandler: me.resourceHandler
-                        });
-                        mainContext = new context_1.OperationContext({
-                            target: me.target,
-                            isProtected: true,
-                            debugger: me.debugger,
-                            cps: cps
-                        });
-                        _b = top_1.default.bind;
-                        _c = [void 0, null];
-                        _d = {};
-                        return [4 /*yield*/, cps.visit(chunk)];
+                        return [4 /*yield*/, me.cps.visit(chunk)];
                     case 3:
-                        topOperation = new (_b.apply(top_1.default, _c.concat([(_d.body = _e.sent(),
-                                _d)])))();
-                        mainContext.extend(me.api);
-                        mainContext.scope.value.set('params', (0, typer_1.cast)(me.params));
-                        me.context = mainContext;
-                        return [2 /*return*/, topOperation.run(mainContext)
-                                .catch(function (err) {
-                                console.error(err);
-                                throw err;
-                            })];
+                        body = _b.sent();
+                        me.apiContext.extend(me.api);
+                        me.globalContext.scope.value.set('params', (0, typer_1.cast)(me.params));
+                        me.emit('setup', me);
+                        _b.label = 4;
+                    case 4:
+                        _b.trys.push([4, 6, 7, 8]);
+                        me.apiContext.setPending(true);
+                        process_1 = body.run(me.globalContext);
+                        me.emit('start');
+                        return [4 /*yield*/, process_1];
+                    case 5:
+                        _b.sent();
+                        return [3 /*break*/, 8];
+                    case 6:
+                        err_2 = _b.sent();
+                        me.debugger.raise(err_2);
+                        return [3 /*break*/, 8];
+                    case 7:
+                        me.apiContext.setPending(false);
+                        setImmediate(function () {
+                            me.emit('exit', me);
+                        });
+                        return [7 /*endfinally*/];
+                    case 8: return [2 /*return*/, me];
                 }
             });
         });
     };
     Interpreter.prototype.exit = function () {
         var me = this;
-        if (me.context == null) {
-            throw new Error('Unexpected exit signal.');
+        try {
+            return me.apiContext.exit();
+        }
+        catch (err) {
+            me.debugger.raise(err);
         }
-        me.context.processState.exit = true;
     };
     return Interpreter;
-}());
+}(events_1.default));
 exports.default = Interpreter;

package/dist/operations/body.js

@@ -118,7 +118,7 @@ var BodyOperation = /** @class */ (function (_super) {
                         _d.sent();
                         _d.label = 8;
                     case 8:
-                        if (isEOL() || operationContext.processState.exit)
+                        if (isEOL() || operationContext.isExit())
                             return [3 /*break*/, 10];
                         _d.label = 9;
                     case 9:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "0.3.0",
+    "version": "0.3.4",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -35,6 +35,8 @@
     },
     "dependencies": {
         "greybel-core": "^0.1.9",
+        "greybel-interpreter": "^0.3.1",
+        "greybel-intrinsics": "^0.2.1",
         "greyscript-core": "^0.1.7",
         "uuid": "^8.3.2"
     },

package/dist/operations/top.d.ts

@@ -1,12 +0,0 @@
-import { Operation } from '../types/operation';
-import { OperationContext } from '../context';
-import { ASTBase } from 'greybel-core';
-import BodyOperation from './body';
-export interface ReturnOperationOptions {
-    body: BodyOperation;
-}
-export default class TopOperation extends Operation {
-    body: BodyOperation;
-    constructor(ast: ASTBase, options: ReturnOperationOptions);
-    run(operationContext: OperationContext): Promise<void>;
-}

package/dist/operations/top.js

@@ -1,86 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        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 };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var operation_1 = require("../types/operation");
-var context_1 = require("../context");
-var TopOperation = /** @class */ (function (_super) {
-    __extends(TopOperation, _super);
-    function TopOperation(ast, options) {
-        var _this = _super.call(this) || this;
-        var me = _this;
-        me.ast = ast;
-        me.body = options.body;
-        return _this;
-    }
-    TopOperation.prototype.run = function (operationContext) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, opc;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        me = this;
-                        opc = operationContext.fork({
-                            type: context_1.ContextType.GLOBAL,
-                            state: context_1.ContextState.DEFAULT
-                        });
-                        return [4 /*yield*/, me.body.run(opc)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    return TopOperation;
-}(operation_1.Operation));
-exports.default = TopOperation;