greybel-interpreter 1.7.2 → 1.7.4

package/dist/cps.js

@@ -36,6 +36,7 @@ const not_1 = require("./operations/not");
 const resolve_1 = require("./operations/resolve");
 const return_1 = require("./operations/return");
 const while_1 = require("./operations/while");
+const error_1 = require("./utils/error");
 class CPSContext {
     constructor(target, handler) {
         this.target = target;
@@ -87,11 +88,25 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             }
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
-                throw new Error(`Cannot find import ${currentTarget}.`);
+                throw new error_1.PrepareError(`Cannot find import ${currentTarget}.`, {
+                    target: currentTarget,
+                    item
+                });
+            }
+            try {
+                const subVisit = visit.bind(null, context, [...stack, target]);
+                const importStatement = yield new import_1.Import(importExpr, target, code).build(subVisit);
+                return importStatement;
+            }
+            catch (err) {
+                if (err instanceof error_1.PrepareError) {
+                    throw err;
+                }
+                throw new error_1.PrepareError(err.message, {
+                    target,
+                    item
+                }, err);
             }
-            const subVisit = visit.bind(null, context, [...stack, target]);
-            const importStatement = yield new import_1.Import(importExpr, target, code).build(subVisit);
-            return importStatement;
         }
         case greybel_core_1.ASTType.FeatureIncludeExpression: {
             const includeExpr = item;
@@ -102,26 +117,58 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             }
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
-                throw new Error(`Cannot find include ${currentTarget}.`);
+                throw new error_1.PrepareError(`Cannot find include ${currentTarget}.`, {
+                    target: currentTarget,
+                    item
+                });
+            }
+            try {
+                const subVisit = visit.bind(null, context, [...stack, target]);
+                const importStatement = yield new include_1.Include(includeExpr, target, code).build(subVisit);
+                return importStatement;
+            }
+            catch (err) {
+                if (err instanceof error_1.PrepareError) {
+                    throw err;
+                }
+                throw new error_1.PrepareError(err.message, {
+                    target,
+                    item
+                }, err);
             }
-            const subVisit = visit.bind(null, context, [...stack, target]);
-            const importStatement = yield new include_1.Include(includeExpr, target, code).build(subVisit);
-            return importStatement;
         }
         case greyscript_core_1.ASTType.ImportCodeExpression: {
             const importExpr = item;
+            if (importExpr.fileSystemDirectory === null) {
+                console.warn(`Ignoring dependency in ${currentTarget}. Using noop operation.`);
+                return new noop_1.Noop(item, currentTarget);
+            }
             const target = yield context.handler.resourceHandler.getTargetRelativeTo(currentTarget, importExpr.fileSystemDirectory);
             if (stack.includes(target)) {
-                console.warn('Found circluar dependency. Using noop operation.');
+                console.warn(`Found circluar dependency in ${currentTarget}. Using noop operation.`);
                 return new noop_1.Noop(item, target);
             }
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
-                throw new Error(`Cannot find native import ${currentTarget}.`);
+                throw new error_1.PrepareError(`Cannot find native import ${currentTarget}.`, {
+                    target: currentTarget,
+                    item
+                });
+            }
+            try {
+                const subVisit = visit.bind(null, context, [...stack, target]);
+                const importStatement = yield new include_1.Include(importExpr, target, code).build(subVisit);
+                return importStatement;
+            }
+            catch (err) {
+                if (err instanceof error_1.PrepareError) {
+                    throw err;
+                }
+                throw new error_1.PrepareError(err.message, {
+                    target,
+                    item
+                }, err);
             }
-            const subVisit = visit.bind(null, context, [...stack, target]);
-            const importStatement = yield new include_1.Include(importExpr, target, code).build(subVisit);
-            return importStatement;
         }
         case greybel_core_1.ASTType.FeatureDebuggerExpression:
             return new debugger_statement_1.DebuggerStatement(item, currentTarget);
@@ -150,7 +197,9 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             else if (unaryExpr.operator === '@') {
                 return new function_reference_1.FunctionReference(unaryExpr).build(defaultVisit);
             }
-            throw new Error('Unknown unary expression.');
+            throw new error_1.RuntimeError('Unknown unary expression.', {
+                target: currentTarget
+            });
         }
         case greyscript_core_1.ASTType.Chunk:
             return new chunk_1.Chunk(item, currentTarget).build(defaultVisit);
@@ -159,7 +208,9 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
         case greyscript_core_1.ASTType.ParenthesisExpression:
             return defaultVisit(item.expression);
         default:
-            throw new Error(`Unexpected AST type ${item.type}.`);
+            throw new error_1.RuntimeError(`Unexpected AST type ${item.type}.`, {
+                target: currentTarget
+            });
     }
 });
 class CPS {

package/dist/index.d.ts

@@ -42,5 +42,6 @@ export { CustomNumber } from './types/number';
 export { CustomString, CustomStringIterator } from './types/string';
 export { CustomObject, CustomValueWithIntrinsics } from './types/with-intrinsics';
 export { deepEqual } from './utils/deep-equal';
+export { PrepareError, RuntimeError } from './utils/error';
 export { ObjectValue } from './utils/object-value';
 export { Path } from './utils/path';

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Not = exports.Noop = exports.NewInstance = exports.NegatedBinary = exports.MapOperation = exports.Literal = exports.List = exports.Include = exports.Import = exports.IfStatement = exports.Clause = exports.FunctionOperation = exports.For = exports.StringProcessorHandler = exports.NumberProcessorHandler = exports.MapProcessorHandler = exports.ListProcessorHandler = exports.handleString = exports.handleNumber = exports.handleMap = exports.handleList = exports.handleInterface = exports.handle = exports.GenericProcessorHandler = exports.Evaluate = exports.DebuggerStatement = exports.Continue = exports.Chunk = exports.Call = exports.Break = exports.Block = exports.Assign = exports.Interpreter = exports.HandlerContainer = exports.ResourceHandler = exports.DefaultResourceHandler = exports.OutputHandler = exports.DefaultOutputHandler = exports.ErrorHandler = exports.DefaultErrorHandler = exports.CPSContext = exports.CPS = exports.Scope = exports.ProcessState = exports.OperationContext = exports.LoopState = exports.FunctionState = exports.Debugger = exports.ContextType = exports.ContextState = void 0;
-exports.Path = exports.ObjectValue = exports.deepEqual = exports.CustomValueWithIntrinsics = exports.CustomObject = exports.CustomStringIterator = exports.CustomString = exports.CustomNumber = exports.CustomNil = exports.CustomMapIterator = exports.CustomMap = exports.CustomListIterator = exports.CustomList = exports.CustomInterfaceIterator = exports.CustomInterface = exports.CustomFunction = exports.Argument = exports.DefaultType = exports.CustomBoolean = exports.CustomValue = exports.While = exports.Return = exports.ResolveResult = exports.Resolve = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.Reference = exports.Operation = void 0;
+exports.Path = exports.ObjectValue = exports.RuntimeError = exports.PrepareError = exports.deepEqual = exports.CustomValueWithIntrinsics = exports.CustomObject = exports.CustomStringIterator = exports.CustomString = exports.CustomNumber = exports.CustomNil = exports.CustomMapIterator = exports.CustomMap = exports.CustomListIterator = exports.CustomList = exports.CustomInterfaceIterator = exports.CustomInterface = exports.CustomFunction = exports.Argument = exports.DefaultType = exports.CustomBoolean = exports.CustomValue = exports.While = exports.Return = exports.ResolveResult = exports.Resolve = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.Reference = exports.Operation = void 0;
 var context_1 = require("./context");
 Object.defineProperty(exports, "ContextState", { enumerable: true, get: function () { return context_1.ContextState; } });
 Object.defineProperty(exports, "ContextType", { enumerable: true, get: function () { return context_1.ContextType; } });
@@ -123,6 +123,9 @@ Object.defineProperty(exports, "CustomObject", { enumerable: true, get: function
 Object.defineProperty(exports, "CustomValueWithIntrinsics", { enumerable: true, get: function () { return with_intrinsics_1.CustomValueWithIntrinsics; } });
 var deep_equal_1 = require("./utils/deep-equal");
 Object.defineProperty(exports, "deepEqual", { enumerable: true, get: function () { return deep_equal_1.deepEqual; } });
+var error_2 = require("./utils/error");
+Object.defineProperty(exports, "PrepareError", { enumerable: true, get: function () { return error_2.PrepareError; } });
+Object.defineProperty(exports, "RuntimeError", { enumerable: true, get: function () { return error_2.RuntimeError; } });
 var object_value_1 = require("./utils/object-value");
 Object.defineProperty(exports, "ObjectValue", { enumerable: true, get: function () { return object_value_1.ObjectValue; } });
 var path_1 = require("./utils/path");

package/dist/interpreter.js

@@ -21,6 +21,7 @@ const list_1 = require("./types/list");
 const map_1 = require("./types/map");
 const number_1 = require("./types/number");
 const string_1 = require("./types/string");
+const error_1 = require("./utils/error");
 const object_value_1 = require("./utils/object-value");
 exports.PARAMS_PROPERTY = new string_1.CustomString('params');
 class Interpreter extends events_1.EventEmitter {
@@ -88,7 +89,15 @@ class Interpreter extends events_1.EventEmitter {
             return this.cps.visit(chunk);
         }
         catch (err) {
-            this.handler.errorHandler.raise(err);
+            if (err instanceof error_1.PrepareError) {
+                this.handler.errorHandler.raise(err);
+            }
+            else {
+                this.handler.errorHandler.raise(new error_1.PrepareError(err.message, {
+                    item: null,
+                    target: this.target
+                }));
+            }
         }
         return Promise.resolve(new noop_1.Noop(null));
     }
@@ -104,7 +113,12 @@ class Interpreter extends events_1.EventEmitter {
                 yield top.handle(injectionCtx);
             }
             catch (err) {
-                this.handler.errorHandler.raise(err);
+                if (err instanceof error_1.PrepareError || err instanceof error_1.RuntimeError) {
+                    this.handler.errorHandler.raise(err);
+                }
+                else {
+                    this.handler.errorHandler.raise(new error_1.RuntimeError(err.message, this.apiContext.getLastActive(), err));
+                }
             }
             return this;
         });
@@ -149,7 +163,12 @@ class Interpreter extends events_1.EventEmitter {
                 yield process;
             }
             catch (err) {
-                this.handler.errorHandler.raise(err);
+                if (err instanceof error_1.PrepareError || err instanceof error_1.RuntimeError) {
+                    this.handler.errorHandler.raise(err);
+                }
+                else {
+                    this.handler.errorHandler.raise(new error_1.RuntimeError(err.message, this.apiContext.getLastActive(), err));
+                }
             }
             finally {
                 this.apiContext.setPending(false);
@@ -175,7 +194,12 @@ class Interpreter extends events_1.EventEmitter {
             return this.apiContext.exit();
         }
         catch (err) {
-            this.handler.errorHandler.raise(err);
+            if (err instanceof error_1.PrepareError || err instanceof error_1.RuntimeError) {
+                this.handler.errorHandler.raise(err);
+            }
+            else {
+                this.handler.errorHandler.raise(new error_1.RuntimeError(err.message, this.apiContext.getLastActive(), err));
+            }
         }
     }
     setGlobalVariable(path, value) {

package/dist/utils/error.d.ts

@@ -0,0 +1,25 @@
+import { ASTBase } from 'greyscript-core';
+interface RuntimeContext {
+    previous?: RuntimeContext;
+    stackItem?: ASTBase;
+    target: string;
+}
+export declare class RuntimeError extends Error {
+    relatedItem: ASTBase | null;
+    relatedTarget: string;
+    stackTrace: Set<ASTBase>;
+    source?: Error;
+    constructor(message: string, context: RuntimeContext, source?: Error);
+    private createTrace;
+}
+interface PrepareContext {
+    item: ASTBase;
+    target: string;
+}
+export declare class PrepareError extends Error {
+    relatedItem: ASTBase | null;
+    relatedTarget: string;
+    source?: Error;
+    constructor(message: string, context: PrepareContext, source?: Error);
+}
+export {};

package/dist/utils/error.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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.stackTrace = this.createTrace(context);
+        this.source = source;
+    }
+    createTrace(context) {
+        const result = new Set();
+        let item = context;
+        while (item) {
+            result.add(item.stackItem);
+            item = item.previous;
+        }
+        return result;
+    }
+}
+exports.RuntimeError = RuntimeError;
+class PrepareError extends Error {
+    constructor(message, context, source) {
+        super(message);
+        this.relatedItem = context.item;
+        this.relatedTarget = context.target;
+        this.source = source;
+    }
+}
+exports.PrepareError = PrepareError;

package/package.json

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