greybel-interpreter 1.7.7 → 1.7.9

package/dist/context.d.ts

@@ -54,6 +54,7 @@ export declare class FunctionState {
 }
 export interface ContextOptions {
     target?: string;
+    stackTrace?: Operation[];
     previous?: OperationContext;
     type?: ContextType;
     state?: ContextState;
@@ -73,7 +74,7 @@ export interface ContextForkOptions {
 }
 export declare class OperationContext {
     target: string;
-    stackItem: ASTBase;
+    stackTrace: Operation[];
     debugger: Debugger;
     environmentVariables: Map<string, string>;
     handler: HandlerContainer;
@@ -94,7 +95,7 @@ export declare class OperationContext {
     private static readonly lookupGlobalsType;
     private static readonly lookupLocalsType;
     constructor(options?: ContextOptions);
-    step(op: Operation): Promise<void>;
+    step(op: Operation): Promise<CustomValue>;
     setLastActive(ctx: OperationContext): OperationContext;
     getLastActive(): OperationContext;
     isExit(): boolean;

package/dist/context.js

@@ -1,7 +1,17 @@
 "use strict";
+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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationContext = exports.FunctionState = exports.LoopState = exports.ProcessState = exports.Debugger = exports.Scope = exports.ContextState = exports.ContextType = void 0;
 const handler_container_1 = require("./handler-container");
+const operation_1 = require("./operations/operation");
 const base_1 = require("./types/base");
 const default_1 = require("./types/default");
 const map_1 = require("./types/map");
@@ -132,7 +142,7 @@ exports.FunctionState = FunctionState;
 class OperationContext {
     constructor(options = {}) {
         this.target = options.target || 'unknown';
-        this.stackItem = null;
+        this.stackTrace = options.stackTrace || [];
         this.previous = options.previous || null;
         this.type = options.type || ContextType.Api;
         this.state = options.state || ContextState.Default;
@@ -149,16 +159,26 @@ class OperationContext {
         this.locals = this.lookupLocals() || this;
     }
     step(op) {
-        if (!this.injected) {
-            this.stackItem = op.item;
-            this.target = op.target || this.target;
-            this.setLastActive(this);
-            if (this.debugger.getBreakpoint(this)) {
-                this.debugger.interact(this, op.item, op);
-                return this.debugger.resume();
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.injected) {
+                this.target = op.target || this.target;
+                this.setLastActive(this);
+                if (this.debugger.getBreakpoint(this)) {
+                    this.debugger.interact(this, op.item, op);
+                    yield this.debugger.resume();
+                }
             }
-        }
-        return Promise.resolve();
+            let result;
+            if (op instanceof operation_1.OperationBlock) {
+                result = yield op.handle(this);
+            }
+            else {
+                this.stackTrace.unshift(op);
+                result = yield op.handle(this);
+                this.stackTrace.shift();
+            }
+            return result;
+        });
     }
     setLastActive(ctx) {
         if (!ctx.injected) {
@@ -276,6 +296,7 @@ class OperationContext {
     fork(options) {
         const newContext = new OperationContext({
             target: options.target || this.target,
+            stackTrace: this.stackTrace,
             previous: this,
             type: options.type,
             state: options.state,

package/dist/cps.js

@@ -95,7 +95,7 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             }
             try {
                 const subVisit = visit.bind(null, context, [...stack, target]);
-                const importStatement = yield new import_1.Import(importExpr, target, code).build(subVisit);
+                const importStatement = yield new import_1.Import(importExpr, currentTarget, target, code).build(subVisit);
                 return importStatement;
             }
             catch (err) {
@@ -124,7 +124,7 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             }
             try {
                 const subVisit = visit.bind(null, context, [...stack, target]);
-                const importStatement = yield new include_1.Include(includeExpr, target, code).build(subVisit);
+                const importStatement = yield new include_1.Include(includeExpr, currentTarget, target, code).build(subVisit);
                 return importStatement;
             }
             catch (err) {
@@ -157,7 +157,7 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             }
             try {
                 const subVisit = visit.bind(null, context, [...stack, target]);
-                const importStatement = yield new include_1.Include(importExpr, target, code).build(subVisit);
+                const importStatement = yield new include_1.Include(importExpr, currentTarget, target, code).build(subVisit);
                 return importStatement;
             }
             catch (err) {

package/dist/operations/block.js

@@ -36,7 +36,6 @@ class Block extends operation_1.Operation {
                 }
                 const op = this.stack[index];
                 yield ctx.step(op);
-                yield op.handle(ctx);
             }
             return default_1.DefaultType.Void;
         });

package/dist/operations/chunk.d.ts

@@ -2,8 +2,8 @@ import { ASTChunk } from 'greyscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { Block } from './block';
-import { CPSVisit, Operation } from './operation';
-export declare class Chunk extends Operation {
+import { CPSVisit, Operation, OperationBlock } from './operation';
+export declare class Chunk extends OperationBlock {
     readonly item: ASTChunk;
     block: Block;
     constructor(item: ASTChunk, target?: string);

package/dist/operations/chunk.js

@@ -13,7 +13,7 @@ exports.Chunk = void 0;
 const string_1 = require("../types/string");
 const block_1 = require("./block");
 const operation_1 = require("./operation");
-class Chunk extends operation_1.Operation {
+class Chunk extends operation_1.OperationBlock {
     constructor(item, target) {
         super(null, target);
         this.item = item;

package/dist/operations/for.d.ts

@@ -2,8 +2,8 @@ import { ASTForGenericStatement, ASTIdentifier } from 'greyscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { Block } from './block';
-import { CPSVisit, Operation } from './operation';
-export declare class For extends Operation {
+import { CPSVisit, Operation, OperationBlock } from './operation';
+export declare class For extends OperationBlock {
     readonly item: ASTForGenericStatement;
     block: Block;
     variable: ASTIdentifier;

package/dist/operations/for.js

@@ -16,7 +16,7 @@ const number_1 = require("../types/number");
 const string_1 = require("../types/string");
 const block_1 = require("./block");
 const operation_1 = require("./operation");
-class For extends operation_1.Operation {
+class For extends operation_1.OperationBlock {
     constructor(item, target) {
         super(null, target);
         this.item = item;

package/dist/operations/if-statement.d.ts

@@ -2,13 +2,13 @@ import { ASTElseClause, ASTIfClause, ASTIfStatement } from 'greyscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { Block } from './block';
-import { CPSVisit, Operation } from './operation';
+import { CPSVisit, Operation, OperationBlock } from './operation';
 export declare class Clause {
     readonly condition: Operation;
     readonly block: Block;
     constructor(condition: Operation, block: Block);
 }
-export declare class IfStatement extends Operation {
+export declare class IfStatement extends OperationBlock {
     readonly item: ASTIfStatement;
     clauses: Array<Clause>;
     constructor(item: ASTIfStatement, target?: string);

package/dist/operations/if-statement.js

@@ -23,7 +23,7 @@ class Clause {
     }
 }
 exports.Clause = Clause;
-class IfStatement extends operation_1.Operation {
+class IfStatement extends operation_1.OperationBlock {
     constructor(item, target) {
         super(null, target);
         this.item = item;
@@ -69,7 +69,7 @@ class IfStatement extends operation_1.Operation {
         return __awaiter(this, void 0, void 0, function* () {
             for (let index = 0; index < this.clauses.length; index++) {
                 const clause = this.clauses[index];
-                const clauseResult = yield clause.condition.handle(ctx);
+                const clauseResult = yield ctx.step(clause.condition);
                 if (clauseResult.toTruthy()) {
                     yield clause.block.handle(ctx);
                     break;

package/dist/operations/import.d.ts

@@ -10,10 +10,11 @@ export declare const EXPORTS_PROPERTY: CustomString;
 export declare const EXPORTS_PATH: Path<CustomString>;
 export declare class Import extends Operation {
     readonly item: ASTFeatureImportExpression;
+    newTarget: string;
     code: string;
     chunk: ASTBase;
     top: Operation;
-    constructor(item: ASTFeatureImportExpression, target: string, code: string);
+    constructor(item: ASTFeatureImportExpression, target: string, newTarget: string, code: string);
     build(visit: CPSVisit): Promise<Operation>;
     handle(ctx: OperationContext): Promise<CustomValue>;
 }

package/dist/operations/import.js

@@ -21,8 +21,9 @@ exports.MODULE_PROPERTY = new string_1.CustomString('module');
 exports.EXPORTS_PROPERTY = new string_1.CustomString('exports');
 exports.EXPORTS_PATH = new path_1.Path([exports.MODULE_PROPERTY, exports.EXPORTS_PROPERTY]);
 class Import extends operation_1.Operation {
-    constructor(item, target, code) {
+    constructor(item, target, newTarget, code) {
         super(null, target);
+        this.newTarget = newTarget;
         this.item = item;
         this.code = code;
     }
@@ -39,7 +40,7 @@ class Import extends operation_1.Operation {
             const importCtx = ctx.fork({
                 type: context_1.ContextType.External,
                 state: context_1.ContextState.Default,
-                target: this.target
+                target: this.newTarget
             });
             importCtx.locals.scope.set(exports.MODULE_PROPERTY, new map_1.CustomMap());
             yield this.top.handle(importCtx);

package/dist/operations/include.d.ts

@@ -4,10 +4,11 @@ import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';
 export declare class Include extends Operation {
     readonly item: ASTBase;
+    newTarget: string;
     code: string;
     chunk: ASTBase;
     top: Operation;
-    constructor(item: ASTBase, target: string, code: string);
+    constructor(item: ASTBase, target: string, newTarget: string, code: string);
     build(visit: CPSVisit): Promise<Operation>;
     handle(ctx: OperationContext): Promise<CustomValue>;
 }

package/dist/operations/include.js

@@ -14,8 +14,9 @@ const greybel_core_1 = require("greybel-core");
 const context_1 = require("../context");
 const operation_1 = require("./operation");
 class Include extends operation_1.Operation {
-    constructor(item, target, code) {
+    constructor(item, target, newTarget, code) {
         super(null, target);
+        this.newTarget = newTarget;
         this.item = item;
         this.code = code;
     }
@@ -31,7 +32,7 @@ class Include extends operation_1.Operation {
         const importCtx = ctx.fork({
             type: context_1.ContextType.External,
             state: context_1.ContextState.Temporary,
-            target: this.target
+            target: this.newTarget
         });
         return this.top.handle(importCtx);
     }

package/dist/operations/operation.d.ts

@@ -11,3 +11,5 @@ export declare abstract class Operation {
     abstract build(visit: CPSVisit): Promise<Operation>;
     abstract handle(ctx: OperationContext): Promise<CustomValue>;
 }
+export declare abstract class OperationBlock extends Operation {
+}

package/dist/operations/operation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Operation = void 0;
+exports.OperationBlock = exports.Operation = void 0;
 class Operation {
     constructor(item, target = null) {
         this.item = item;
@@ -8,3 +8,6 @@ class Operation {
     }
 }
 exports.Operation = Operation;
+class OperationBlock extends Operation {
+}
+exports.OperationBlock = OperationBlock;

package/dist/operations/while.d.ts

@@ -2,8 +2,8 @@ import { ASTWhileStatement } from 'greyscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { Block } from './block';
-import { CPSVisit, Operation } from './operation';
-export declare class While extends Operation {
+import { CPSVisit, Operation, OperationBlock } from './operation';
+export declare class While extends OperationBlock {
     readonly item: ASTWhileStatement;
     block: Block;
     condition: Operation;

package/dist/operations/while.js

@@ -14,7 +14,7 @@ const context_1 = require("../context");
 const default_1 = require("../types/default");
 const block_1 = require("./block");
 const operation_1 = require("./operation");
-class While extends operation_1.Operation {
+class While extends operation_1.OperationBlock {
     constructor(item, target) {
         super(null, target);
         this.item = item;
@@ -38,7 +38,7 @@ class While extends operation_1.Operation {
             return new Promise((resolve, reject) => {
                 const iteration = () => __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const conditionResult = yield this.condition.handle(whileCtx);
+                        const conditionResult = yield whileCtx.step(this.condition);
                         if (!conditionResult.toTruthy()) {
                             resolve(default_1.DefaultType.Void);
                             return;

package/dist/utils/error.d.ts

@@ -1,12 +1,12 @@
 import { ASTBase } from 'greyscript-core';
+import { Operation } from '../operations/operation';
 interface RuntimeContext {
-    previous?: RuntimeContext;
-    stackItem?: ASTBase;
+    stackTrace?: Operation[];
     target: string;
 }
 export declare class RuntimeError extends Error {
-    relatedItem: ASTBase | null;
     relatedTarget: string;
+    stackTrace: Operation[];
     source?: Error;
     constructor(message: string, context: RuntimeContext, source?: Error);
     private createTrace;

package/dist/utils/error.js

@@ -4,24 +4,18 @@ exports.PrepareError = exports.RuntimeError = void 0;
 class RuntimeError extends Error {
     constructor(message, context, source) {
         super(message);
-        this.relatedItem = context.stackItem || null;
         this.relatedTarget = context.target;
-        this.stack = this.createTrace(context);
+        this.stackTrace = context.stackTrace || [];
+        this.stack = this.createTrace();
         this.source = source;
     }
-    createTrace(context) {
-        var _a, _b;
-        const related = new Map();
-        let item = context;
-        while (item) {
-            related.set(item.stackItem, item.target);
-            item = item.previous;
-        }
-        const lines = [];
-        for (const [item, target] of related) {
-            lines.push(`${target} at ${(_a = item === null || item === void 0 ? void 0 : item.start.line) !== null && _a !== void 0 ? _a : 0}:${(_b = item === null || item === void 0 ? void 0 : item.start.character) !== null && _b !== void 0 ? _b : 0}`);
-        }
-        return lines.join('\n');
+    createTrace() {
+        return this.stackTrace
+            .map((op) => {
+            var _a, _b, _c, _d;
+            return `${op.target} at ${(_b = (_a = op.item) === null || _a === void 0 ? void 0 : _a.start.line) !== null && _b !== void 0 ? _b : 0}:${(_d = (_c = op.item) === null || _c === void 0 ? void 0 : _c.start.character) !== null && _d !== void 0 ? _d : 0}`;
+        })
+            .join('\n');
     }
 }
 exports.RuntimeError = RuntimeError;

package/package.json

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