greybel-interpreter 0.6.3 → 0.6.7

package/dist/context.d.ts

@@ -1,4 +1,6 @@
 import CustomMap from './custom-types/map';
+import { Operation } from './types/operation';
+import { Expression } from './types/expression';
 import { Callable } from './types/custom-type';
 import { ASTBase } from 'greybel-core';
 import CPS from './cps';
@@ -32,7 +34,7 @@ export declare class Debugger {
     getBreakpoint(operationContext: OperationContext): boolean;
     next(): Debugger;
     resume(): Promise<void>;
-    interact(operationContext: OperationContext, item: ASTBase): void;
+    interact(operationContext: OperationContext, item: ASTBase, entity: Operation | Expression): void;
 }
 export interface OperationContextProcessState {
     exit: boolean;
@@ -73,7 +75,7 @@ export declare class OperationContext {
     locals: OperationContext | null;
     globals: OperationContext | null;
     constructor(options: OperationContextOptions);
-    step(item: ASTBase): Promise<void>;
+    step(entity: Operation | Expression): Promise<void>;
     setLastActive(opc: OperationContext): OperationContext;
     getLastActive(): OperationContext | null;
     isExit(): boolean;

package/dist/context.js

@@ -238,7 +238,7 @@ var Debugger = /** @class */ (function () {
             setTimeout(check, 10);
         });
     };
-    Debugger.prototype.interact = function (operationContext, item) {
+    Debugger.prototype.interact = function (operationContext, item, entity) {
         var me = this;
         console.warn("Debugger is not setup.");
         console.info(operationContext);
@@ -270,14 +270,15 @@ var OperationContext = /** @class */ (function () {
         me.globals = me.lookupGlobals();
         me.locals = me.lookupLocals() || me;
     }
-    OperationContext.prototype.step = function (item) {
+    OperationContext.prototype.step = function (entity) {
         var me = this;
         var dbgr = me.debugger;
         if (!me.injected) {
-            me.stackItem = item;
+            me.stackItem = entity.ast;
+            me.target = entity.target || me.target;
             me.setLastActive(me);
             if (dbgr.getBreakpoint(me)) {
-                dbgr.interact(me, item);
+                dbgr.interact(me, entity.ast, entity);
                 return dbgr.resume();
             }
         }

package/dist/cps.d.ts

@@ -6,10 +6,12 @@ export interface CPSMapType {
 export interface CPSMapContext {
     target: string;
     resourceHandler: ResourceHandler;
+    currentTarget?: string;
 }
 export declare const CPSMap: (visit: (o: ASTBase) => any, context: CPSMapContext) => CPSMapType;
 export default class CPS {
     cpsMap: CPSMapType;
+    context: CPSMapContext;
     constructor(context: CPSMapContext);
     visit(o: ASTBase): Promise<any>;
 }

package/dist/cps.js

@@ -80,6 +80,8 @@ var boolean_1 = __importDefault(require("./custom-types/boolean"));
 var number_1 = __importDefault(require("./custom-types/number"));
 var string_1 = __importDefault(require("./custom-types/string"));
 var nil_1 = __importDefault(require("./custom-types/nil"));
+var expression_1 = require("./types/expression");
+var operation_1 = require("./types/operation");
 var CPSMap = function (visit, context) {
     return {
         'AssignmentStatement': function (item) {
@@ -669,7 +671,7 @@ var CPSMap = function (visit, context) {
         },
         'FeatureImportExpression': function (item) {
             return __awaiter(this, void 0, void 0, function () {
-                var resourceHandler, target, code;
+                var resourceHandler, target, code, chunk;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -682,14 +684,19 @@ var CPSMap = function (visit, context) {
                             return [4 /*yield*/, context.resourceHandler.get(target)];
                         case 2:
                             code = _a.sent();
-                            return [2 /*return*/, new import_1.default(item, target, code).prepare(visit)];
+                            context.currentTarget = target;
+                            return [4 /*yield*/, (new import_1.default(item, target, code).prepare(visit))];
+                        case 3:
+                            chunk = _a.sent();
+                            context.currentTarget = context.target;
+                            return [2 /*return*/, chunk];
                     }
                 });
             });
         },
         'FeatureIncludeExpression': function (item) {
             return __awaiter(this, void 0, void 0, function () {
-                var resourceHandler, target, code;
+                var resourceHandler, target, code, chunk;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -702,14 +709,19 @@ var CPSMap = function (visit, context) {
                             return [4 /*yield*/, context.resourceHandler.get(target)];
                         case 2:
                             code = _a.sent();
-                            return [2 /*return*/, new include_1.default(item, target, code).prepare(visit)];
+                            context.currentTarget = target;
+                            return [4 /*yield*/, (new include_1.default(item, target, code).prepare(visit))];
+                        case 3:
+                            chunk = _a.sent();
+                            context.currentTarget = context.target;
+                            return [2 /*return*/, chunk];
                     }
                 });
             });
         },
         'ImportCodeExpression': function (item) {
             return __awaiter(this, void 0, void 0, function () {
-                var resourceHandler, target, code;
+                var resourceHandler, target, code, chunk;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -722,7 +734,12 @@ var CPSMap = function (visit, context) {
                             return [4 /*yield*/, context.resourceHandler.get(target)];
                         case 2:
                             code = _a.sent();
-                            return [2 /*return*/, new include_1.default(item, target, code).prepare(visit)];
+                            context.currentTarget = target;
+                            return [4 /*yield*/, (new include_1.default(item, target, code).prepare(visit))];
+                        case 3:
+                            chunk = _a.sent();
+                            context.currentTarget = context.target;
+                            return [2 /*return*/, chunk];
                     }
                 });
             });
@@ -817,6 +834,8 @@ var CPS = /** @class */ (function () {
     function CPS(context) {
         var me = this;
         me.cpsMap = (0, exports.CPSMap)(me.visit.bind(me), context);
+        me.context = context;
+        context.currentTarget = context.target;
     }
     CPS.prototype.visit = function (o) {
         return __awaiter(this, void 0, void 0, function () {
@@ -839,6 +858,9 @@ var CPS = /** @class */ (function () {
                         return [4 /*yield*/, fn.call(me, o)];
                     case 1:
                         result = _a.sent();
+                        if (result instanceof operation_1.Operation || result instanceof expression_1.Expression) {
+                            result.target = me.context.currentTarget;
+                        }
                         return [2 /*return*/, result];
                 }
             });

package/dist/custom-types/list.js

@@ -96,7 +96,7 @@ var CustomList = /** @class */ (function (_super) {
     function CustomList(value) {
         var _this = _super.call(this) || this;
         _this.slice = function (a, b) {
-            return new CustomList(this.value.slice(a.toNumber(), b.toNumber()));
+            return new CustomList(this.value.slice(a === null || a === void 0 ? void 0 : a.toNumber(), b === null || b === void 0 ? void 0 : b.toNumber()));
         };
         _this.value = value;
         return _this;

package/dist/operations/body.js

@@ -100,7 +100,7 @@ var BodyOperation = /** @class */ (function (_super) {
                     case 2:
                         if (!!_b.done) return [3 /*break*/, 9];
                         entity = _b.value;
-                        return [4 /*yield*/, operationContext.step(entity.ast)];
+                        return [4 /*yield*/, operationContext.step(entity)];
                     case 3:
                         _d.sent();
                         if (!(entity instanceof expression_1.Expression)) return [3 /*break*/, 5];

package/dist/types/expression.d.ts

@@ -2,5 +2,6 @@ import { OperationContext } from '../context';
 export declare abstract class Expression {
     ast: any;
     expr: any;
+    target?: string;
     abstract get(operationContext: OperationContext, parentExpr?: any): any;
 }

package/dist/types/operation.d.ts

@@ -1,6 +1,7 @@
 import { OperationContext } from '../context';
 export declare abstract class Operation {
     ast: any;
+    target?: string;
     get(operationContext: OperationContext): any;
     run(operationContext: OperationContext): any | void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "0.6.3",
+    "version": "0.6.7",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -34,8 +34,8 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
-        "greybel-core": "^0.2.4",
-        "greyscript-core": "^0.2.5",
+        "greybel-core": "^0.2.5",
+        "greyscript-core": "^0.2.6",
         "uuid": "^8.3.2"
     },
     "keywords": [