greybel-interpreter 2.1.1 → 2.1.3

package/dist/context.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import { ASTBase } from 'greyscript-core';
 import { EventEmitter } from 'events';
+import { ASTBase } from 'greyscript-core';
 import { CPS } from './cps';
 import { HandlerContainer } from './handler-container';
 import { Operation } from './operations/operation';

package/dist/cps.js

@@ -83,14 +83,15 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             const importExpr = item;
             const target = yield context.handler.resourceHandler.getTargetRelativeTo(currentTarget, importExpr.path);
             if (stack.includes(target)) {
-                console.warn(`Found circluar dependency between "${currentTarget}" and "${target}" at line ${item.start.line}. Using noop instead to prevent overflow.`);
+                console.warn(`Found circular dependency between "${currentTarget}" and "${target}" at line ${item.start.line}. Using noop instead to prevent overflow.`);
                 return new noop_1.Noop(item, target);
             }
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
-                throw new error_1.PrepareError(`Cannot find import "${currentTarget}" at line ${item.start.line}.`, {
+                const range = new greyscript_core_1.ASTRange(item.start, item.end);
+                throw new error_1.PrepareError(`Cannot find import "${currentTarget}"`, {
                     target: currentTarget,
-                    item
+                    range
                 });
             }
             try {
@@ -104,7 +105,7 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
                 }
                 throw new error_1.PrepareError(err.message, {
                     target,
-                    item
+                    range: new greyscript_core_1.ASTRange(item.start, item.end)
                 }, err);
             }
         }
@@ -112,14 +113,15 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             const includeExpr = item;
             const target = yield context.handler.resourceHandler.getTargetRelativeTo(currentTarget, includeExpr.path);
             if (stack.includes(target)) {
-                console.warn(`Found circluar dependency between "${currentTarget}" and "${target}" at line ${item.start.line}. Using noop instead to prevent overflow.`);
+                console.warn(`Found circular dependency between "${currentTarget}" and "${target}" at line ${item.start.line}. Using noop instead to prevent overflow.`);
                 return new noop_1.Noop(item, target);
             }
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
-                throw new error_1.PrepareError(`Cannot find include "${currentTarget}" at line ${item.start.line}.`, {
+                const range = new greyscript_core_1.ASTRange(item.start, item.end);
+                throw new error_1.PrepareError(`Cannot find include "${currentTarget}"`, {
                     target: currentTarget,
-                    item
+                    range
                 });
             }
             try {
@@ -133,7 +135,7 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
                 }
                 throw new error_1.PrepareError(err.message, {
                     target,
-                    item
+                    range: new greyscript_core_1.ASTRange(item.start, item.end)
                 }, err);
             }
         }
@@ -141,14 +143,15 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             const importExpr = item;
             const target = yield context.handler.resourceHandler.getTargetRelativeTo(currentTarget, importExpr.directory);
             if (stack.includes(target)) {
-                console.warn(`Found circluar dependency between "${currentTarget}" and "${target}" at line ${item.start.line}. Using noop instead to prevent overflow.`);
+                console.warn(`Found circular dependency between "${currentTarget}" and "${target}" at line ${item.start.line}. Using noop instead to prevent overflow.`);
                 return new noop_1.Noop(item, target);
             }
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
-                throw new error_1.PrepareError(`Cannot find native import "${currentTarget}" at line ${item.start.line}.`, {
+                const range = new greyscript_core_1.ASTRange(item.start, item.end);
+                throw new error_1.PrepareError(`Cannot find native import "${currentTarget}"`, {
                     target: currentTarget,
-                    item
+                    range
                 });
             }
             try {
@@ -162,7 +165,7 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
                 }
                 throw new error_1.PrepareError(err.message, {
                     target,
-                    item
+                    range: new greyscript_core_1.ASTRange(item.start, item.end)
                 }, err);
             }
         }
@@ -193,8 +196,10 @@ 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_1.RuntimeError('Unknown unary expression.', {
-                target: currentTarget
+            const range = new greyscript_core_1.ASTRange(item.start, item.end);
+            throw new error_1.PrepareError(`Unknown unary expression`, {
+                target: currentTarget,
+                range
             });
         }
         case greyscript_core_1.ASTType.Chunk:
@@ -204,8 +209,10 @@ 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_1.RuntimeError(`Unexpected AST type ${item.type}.`, {
-                target: currentTarget
+            const range = new greyscript_core_1.ASTRange(item.start, item.end);
+            throw new error_1.PrepareError(`Unexpected AST type ${item.type}`, {
+                target: currentTarget,
+                range
             });
     }
 });

package/dist/interpreter.js

@@ -94,7 +94,7 @@ class Interpreter extends events_1.EventEmitter {
             }
             else {
                 this.handler.errorHandler.raise(new error_1.PrepareError(err.message, {
-                    item: null,
+                    range: err.range,
                     target: this.target
                 }));
             }

package/dist/utils/error.d.ts

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

package/dist/utils/error.js

@@ -22,8 +22,8 @@ exports.RuntimeError = RuntimeError;
 class PrepareError extends Error {
     constructor(message, context, source) {
         super(message);
-        this.relatedItem = context.item;
-        this.relatedTarget = context.target;
+        this.range = context.range;
+        this.target = context.target;
         this.source = source;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "2.1.1",
+    "version": "2.1.3",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -48,8 +48,8 @@
         "typescript": "^5.0.4"
     },
     "dependencies": {
-        "greybel-core": "^0.9.1",
-        "greyscript-core": "^0.9.1"
+        "greybel-core": "^0.9.3",
+        "greyscript-core": "^0.9.5"
     },
     "keywords": [
         "greyscript",