greybel-interpreter 2.2.19 → 3.0.0

package/dist/context.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { ASTBase } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
 import { CPS } from './cps';
 import { HandlerContainer } from './handler-container';
 import { Operation } from './operations/operation';
@@ -92,6 +92,7 @@ export declare class OperationContext {
     injected: boolean;
     readonly api: OperationContext;
     readonly locals: OperationContext;
+    readonly outer: OperationContext;
     readonly globals: OperationContext;
     private static readonly lookupApiType;
     private static readonly lookupGlobalsType;

package/dist/context.js

@@ -40,7 +40,7 @@ class Scope extends map_1.CustomMap {
         this.context = context;
     }
     get(path) {
-        var _a, _b;
+        var _a, _b, _c;
         if (path instanceof base_1.CustomValue) {
             return this.get(new path_1.Path([path]));
         }
@@ -52,10 +52,13 @@ class Scope extends map_1.CustomMap {
         if (this.has(path)) {
             return super.get(path);
         }
-        else if ((_a = this.context.globals) === null || _a === void 0 ? void 0 : _a.scope.has(path)) {
+        else if ((_a = this.context.outer) === null || _a === void 0 ? void 0 : _a.scope.has(path)) {
+            return this.context.outer.scope.get(path);
+        }
+        else if ((_b = this.context.globals) === null || _b === void 0 ? void 0 : _b.scope.has(path)) {
             return this.context.globals.scope.get(path);
         }
-        else if ((_b = this.context.api) === null || _b === void 0 ? void 0 : _b.scope.has(path)) {
+        else if ((_c = this.context.api) === null || _c === void 0 ? void 0 : _c.scope.has(path)) {
             return this.context.api.scope.get(path);
         }
         else if (path.count() === 1 && map_1.CustomMap.getIntrinsics().has(current)) {
@@ -149,7 +152,7 @@ class FunctionState {
 exports.FunctionState = FunctionState;
 class OperationContext {
     constructor(options = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         this.target = (_a = options.target) !== null && _a !== void 0 ? _a : 'unknown';
         this.stackTrace = (_b = options.stackTrace) !== null && _b !== void 0 ? _b : [];
         this.previous = (_c = options.previous) !== null && _c !== void 0 ? _c : null;
@@ -168,6 +171,7 @@ class OperationContext {
         this.api = this.lookupApi();
         this.globals = this.lookupGlobals();
         this.locals = (_o = this.lookupLocals()) !== null && _o !== void 0 ? _o : this;
+        this.outer = (_q = (_p = this.locals.previous) === null || _p === void 0 ? void 0 : _p.lookupLocals()) !== null && _q !== void 0 ? _q : null;
     }
     isIgnoredInDebugging(op) {
         return op instanceof operation_1.OperationBlock || op instanceof noop_1.Noop;

package/dist/cps.d.ts

@@ -1,4 +1,4 @@
-import { ASTBase } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
 import { HandlerContainer } from './handler-container';
 import { Operation } from './operations/operation';
 export declare class CPSContext {

package/dist/cps.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CPS = exports.CPSContext = void 0;
 const greybel_core_1 = require("greybel-core");
-const greyscript_core_1 = require("greyscript-core");
+const miniscript_core_1 = require("miniscript-core");
 const assign_1 = require("./operations/assign");
 const break_1 = require("./operations/break");
 const call_1 = require("./operations/call");
@@ -48,37 +48,37 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
     const currentTarget = stack[stack.length - 1];
     const defaultVisit = visit.bind(null, context, stack);
     switch (item.type) {
-        case greyscript_core_1.ASTType.MapConstructorExpression:
+        case miniscript_core_1.ASTType.MapConstructorExpression:
             return new map_1.MapOperation(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.ListConstructorExpression:
+        case miniscript_core_1.ASTType.ListConstructorExpression:
             return new list_1.List(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.AssignmentStatement:
+        case miniscript_core_1.ASTType.AssignmentStatement:
             return new assign_1.Assign(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.MemberExpression:
-        case greyscript_core_1.ASTType.Identifier:
-        case greyscript_core_1.ASTType.IndexExpression:
-        case greyscript_core_1.ASTType.SliceExpression:
+        case miniscript_core_1.ASTType.MemberExpression:
+        case miniscript_core_1.ASTType.Identifier:
+        case miniscript_core_1.ASTType.IndexExpression:
+        case miniscript_core_1.ASTType.SliceExpression:
             return new resolve_1.Resolve(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.FunctionDeclaration:
+        case miniscript_core_1.ASTType.FunctionDeclaration:
             return new function_1.FunctionOperation(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.InvalidCodeExpression:
+        case miniscript_core_1.ASTType.InvalidCodeExpression:
             return new noop_1.Noop(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.WhileStatement:
+        case miniscript_core_1.ASTType.WhileStatement:
             return new while_1.While(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.ForGenericStatement:
+        case miniscript_core_1.ASTType.ForGenericStatement:
             return new for_1.For(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.IfStatement:
-        case greyscript_core_1.ASTType.IfShortcutStatement:
+        case miniscript_core_1.ASTType.IfStatement:
+        case miniscript_core_1.ASTType.IfShortcutStatement:
             return new if_statement_1.IfStatement(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.ReturnStatement:
+        case miniscript_core_1.ASTType.ReturnStatement:
             return new return_1.Return(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.BreakStatement:
+        case miniscript_core_1.ASTType.BreakStatement:
             return new break_1.Break(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.ContinueStatement:
+        case miniscript_core_1.ASTType.ContinueStatement:
             return new continue_1.Continue(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.CallExpression:
+        case miniscript_core_1.ASTType.CallExpression:
             return new call_1.Call(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.CallStatement:
+        case miniscript_core_1.ASTType.CallStatement:
             return defaultVisit(item.expression);
         case greybel_core_1.ASTType.FeatureImportExpression: {
             const importExpr = item;
@@ -89,7 +89,7 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             }
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
-                const range = new greyscript_core_1.ASTRange(item.start, item.end);
+                const range = new miniscript_core_1.ASTRange(item.start, item.end);
                 throw new error_1.PrepareError(`Cannot find import "${currentTarget}"`, {
                     target: currentTarget,
                     range
@@ -106,7 +106,7 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
                 }
                 throw new error_1.PrepareError(err.message, {
                     target,
-                    range: new greyscript_core_1.ASTRange(item.start, item.end)
+                    range: new miniscript_core_1.ASTRange(item.start, item.end)
                 }, err);
             }
         }
@@ -119,7 +119,7 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             }
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
-                const range = new greyscript_core_1.ASTRange(item.start, item.end);
+                const range = new miniscript_core_1.ASTRange(item.start, item.end);
                 throw new error_1.PrepareError(`Cannot find include "${currentTarget}"`, {
                     target: currentTarget,
                     range
@@ -136,37 +136,7 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
                 }
                 throw new error_1.PrepareError(err.message, {
                     target,
-                    range: new greyscript_core_1.ASTRange(item.start, item.end)
-                }, err);
-            }
-        }
-        case greyscript_core_1.ASTType.ImportCodeExpression: {
-            const importExpr = item;
-            const target = yield context.handler.resourceHandler.getTargetRelativeTo(currentTarget, importExpr.directory);
-            if (stack.includes(target)) {
-                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) {
-                const range = new greyscript_core_1.ASTRange(item.start, item.end);
-                throw new error_1.PrepareError(`Cannot find native import "${currentTarget}"`, {
-                    target: currentTarget,
-                    range
-                });
-            }
-            try {
-                const subVisit = visit.bind(null, context, [...stack, target]);
-                const importStatement = yield new include_1.Include(importExpr, currentTarget, target, code).build(subVisit);
-                return importStatement;
-            }
-            catch (err) {
-                if (err instanceof error_1.PrepareError) {
-                    throw err;
-                }
-                throw new error_1.PrepareError(err.message, {
-                    target,
-                    range: new greyscript_core_1.ASTRange(item.start, item.end)
+                    range: new miniscript_core_1.ASTRange(item.start, item.end)
                 }, err);
             }
         }
@@ -174,22 +144,22 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
             return new debugger_statement_1.DebuggerStatement(item, currentTarget);
         case greybel_core_1.ASTType.FeatureEnvarExpression:
             return new envar_1.EnvarExpression(item, currentTarget);
-        case greyscript_core_1.ASTType.BooleanLiteral:
-        case greyscript_core_1.ASTType.StringLiteral:
-        case greyscript_core_1.ASTType.NumericLiteral:
-        case greyscript_core_1.ASTType.NilLiteral:
+        case miniscript_core_1.ASTType.BooleanLiteral:
+        case miniscript_core_1.ASTType.StringLiteral:
+        case miniscript_core_1.ASTType.NumericLiteral:
+        case miniscript_core_1.ASTType.NilLiteral:
             return new literal_1.Literal(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.EmptyExpression:
+        case miniscript_core_1.ASTType.EmptyExpression:
             return new noop_1.Noop(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.IsaExpression:
-        case greyscript_core_1.ASTType.BinaryExpression:
-        case greyscript_core_1.ASTType.LogicalExpression:
+        case miniscript_core_1.ASTType.IsaExpression:
+        case miniscript_core_1.ASTType.BinaryExpression:
+        case miniscript_core_1.ASTType.LogicalExpression:
             return new evaluate_1.Evaluate(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.NegationExpression:
+        case miniscript_core_1.ASTType.NegationExpression:
             return new not_1.Not(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.BinaryNegatedExpression:
+        case miniscript_core_1.ASTType.BinaryNegatedExpression:
             return new negated_binary_1.NegatedBinary(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.UnaryExpression: {
+        case miniscript_core_1.ASTType.UnaryExpression: {
             const unaryExpr = item;
             if (unaryExpr.operator === 'new') {
                 return new new_instance_1.NewInstance(unaryExpr).build(defaultVisit);
@@ -197,20 +167,20 @@ 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);
             }
-            const range = new greyscript_core_1.ASTRange(item.start, item.end);
+            const range = new miniscript_core_1.ASTRange(item.start, item.end);
             throw new error_1.PrepareError(`Unknown unary expression`, {
                 target: currentTarget,
                 range
             });
         }
-        case greyscript_core_1.ASTType.Chunk:
+        case miniscript_core_1.ASTType.Chunk:
             return new chunk_1.Chunk(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.Comment:
+        case miniscript_core_1.ASTType.Comment:
             return new noop_1.Noop(item, currentTarget);
-        case greyscript_core_1.ASTType.ParenthesisExpression:
+        case miniscript_core_1.ASTType.ParenthesisExpression:
             return defaultVisit(item.expression);
         default: {
-            const range = new greyscript_core_1.ASTRange(item.start, item.end);
+            const range = new miniscript_core_1.ASTRange(item.start, item.end);
             throw new error_1.PrepareError(`Unexpected AST type ${item.type}`, {
                 target: currentTarget,
                 range

package/dist/operations/assign.d.ts

@@ -1,4 +1,4 @@
-import { ASTAssignmentStatement } from 'greyscript-core';
+import { ASTAssignmentStatement } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/block.d.ts

@@ -1,4 +1,4 @@
-import { ASTBase } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/break.d.ts

@@ -1,4 +1,4 @@
-import { ASTBase } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/call.d.ts

@@ -1,4 +1,4 @@
-import { ASTCallExpression } from 'greyscript-core';
+import { ASTCallExpression } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/chunk.d.ts

@@ -1,4 +1,4 @@
-import { ASTChunk } from 'greyscript-core';
+import { ASTChunk } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { Block } from './block';

package/dist/operations/continue.d.ts

@@ -1,4 +1,4 @@
-import { ASTBase } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

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

@@ -1,4 +1,4 @@
-import { ASTBase } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/evaluate.d.ts

@@ -1,4 +1,4 @@
-import { ASTEvaluationExpression } from 'greyscript-core';
+import { ASTEvaluationExpression } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CustomBoolean } from '../types/boolean';

package/dist/operations/evaluate.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Evaluate = exports.handle = exports.handleFunction = exports.handleNil = exports.handleMap = exports.handleList = exports.handleString = exports.handleNumber = exports.FunctionProcessorHandler = exports.NilProcessorHandler = exports.MapProcessorHandler = exports.ListProcessorHandler = exports.divideList = exports.multiplyList = exports.StringProcessorHandler = exports.divideString = exports.multiplyString = exports.minusString = exports.NumberProcessorHandler = exports.GenericProcessorHandler = void 0;
-const greyscript_core_1 = require("greyscript-core");
+const miniscript_core_1 = require("miniscript-core");
 const boolean_1 = require("../types/boolean");
 const default_1 = require("../types/default");
 const function_1 = require("../types/function");
@@ -22,27 +22,27 @@ const string_1 = require("../types/string");
 const deep_equal_1 = require("../utils/deep-equal");
 const operation_1 = require("./operation");
 exports.GenericProcessorHandler = {
-    [greyscript_core_1.Operator.And]: (a, b) => new boolean_1.CustomBoolean(a.toTruthy() && b.toTruthy()),
-    [greyscript_core_1.Operator.Or]: (a, b) => new boolean_1.CustomBoolean(a.toTruthy() || b.toTruthy())
+    [miniscript_core_1.Operator.And]: (a, b) => new boolean_1.CustomBoolean(a.toTruthy() && b.toTruthy()),
+    [miniscript_core_1.Operator.Or]: (a, b) => new boolean_1.CustomBoolean(a.toTruthy() || b.toTruthy())
 };
 exports.NumberProcessorHandler = {
-    [greyscript_core_1.Operator.Plus]: (a, b) => new number_1.CustomNumber(a.toNumber() + b.toNumber()),
-    [greyscript_core_1.Operator.Minus]: (a, b) => new number_1.CustomNumber(a.toNumber() - b.toNumber()),
-    [greyscript_core_1.Operator.Slash]: (a, b) => new number_1.CustomNumber(a.toNumber() / b.toNumber()),
-    [greyscript_core_1.Operator.Asterik]: (a, b) => new number_1.CustomNumber(a.toNumber() * b.toNumber()),
-    [greyscript_core_1.Operator.Power]: (a, b) => new number_1.CustomNumber(Math.pow(a.toNumber(), b.toNumber())),
-    [greyscript_core_1.Operator.BitwiseOr]: (a, b) => new number_1.CustomNumber(a.toInt() | b.toInt()),
-    [greyscript_core_1.Operator.LessThan]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() < b.toNumber()),
-    [greyscript_core_1.Operator.GreaterThan]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() > b.toNumber()),
-    [greyscript_core_1.Operator.LeftShift]: (a, b) => new number_1.CustomNumber(a.toInt() << b.toInt()),
-    [greyscript_core_1.Operator.RightShift]: (a, b) => new number_1.CustomNumber(a.toInt() >> b.toInt()),
-    [greyscript_core_1.Operator.UnsignedRightShift]: (a, b) => new number_1.CustomNumber(a.toInt() >> b.toInt()),
-    [greyscript_core_1.Operator.BitwiseAnd]: (a, b) => new number_1.CustomNumber(a.toInt() & b.toInt()),
-    [greyscript_core_1.Operator.PercentSign]: (a, b) => new number_1.CustomNumber(a.toNumber() % b.toNumber()),
-    [greyscript_core_1.Operator.GreaterThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() >= b.toNumber()),
-    [greyscript_core_1.Operator.Equal]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() === b.toNumber()),
-    [greyscript_core_1.Operator.LessThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() <= b.toNumber()),
-    [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() !== b.toNumber())
+    [miniscript_core_1.Operator.Plus]: (a, b) => new number_1.CustomNumber(a.toNumber() + b.toNumber()),
+    [miniscript_core_1.Operator.Minus]: (a, b) => new number_1.CustomNumber(a.toNumber() - b.toNumber()),
+    [miniscript_core_1.Operator.Slash]: (a, b) => new number_1.CustomNumber(a.toNumber() / b.toNumber()),
+    [miniscript_core_1.Operator.Asterik]: (a, b) => new number_1.CustomNumber(a.toNumber() * b.toNumber()),
+    [miniscript_core_1.Operator.Power]: (a, b) => new number_1.CustomNumber(Math.pow(a.toNumber(), b.toNumber())),
+    [miniscript_core_1.Operator.BitwiseOr]: (a, b) => new number_1.CustomNumber(a.toInt() | b.toInt()),
+    [miniscript_core_1.Operator.LessThan]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() < b.toNumber()),
+    [miniscript_core_1.Operator.GreaterThan]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() > b.toNumber()),
+    [miniscript_core_1.Operator.LeftShift]: (a, b) => new number_1.CustomNumber(a.toInt() << b.toInt()),
+    [miniscript_core_1.Operator.RightShift]: (a, b) => new number_1.CustomNumber(a.toInt() >> b.toInt()),
+    [miniscript_core_1.Operator.UnsignedRightShift]: (a, b) => new number_1.CustomNumber(a.toInt() >> b.toInt()),
+    [miniscript_core_1.Operator.BitwiseAnd]: (a, b) => new number_1.CustomNumber(a.toInt() & b.toInt()),
+    [miniscript_core_1.Operator.PercentSign]: (a, b) => new number_1.CustomNumber(a.toNumber() % b.toNumber()),
+    [miniscript_core_1.Operator.GreaterThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() >= b.toNumber()),
+    [miniscript_core_1.Operator.Equal]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() === b.toNumber()),
+    [miniscript_core_1.Operator.LessThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() <= b.toNumber()),
+    [miniscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() !== b.toNumber())
 };
 const minusString = (a, b) => {
     const origin = a.toString();
@@ -80,16 +80,16 @@ const divideString = (a, b) => {
 };
 exports.divideString = divideString;
 exports.StringProcessorHandler = {
-    [greyscript_core_1.Operator.Plus]: (a, b) => new string_1.CustomString(a.toString() + b.toString()),
-    [greyscript_core_1.Operator.Minus]: (a, b) => (0, exports.minusString)(a, b),
-    [greyscript_core_1.Operator.Asterik]: (a, b) => (0, exports.multiplyString)(a, b),
-    [greyscript_core_1.Operator.Slash]: (a, b) => (0, exports.divideString)(a, b),
-    [greyscript_core_1.Operator.LessThan]: (a, b) => new boolean_1.CustomBoolean(a.toString() < b.toString()),
-    [greyscript_core_1.Operator.GreaterThan]: (a, b) => new boolean_1.CustomBoolean(a.toString() > b.toString()),
-    [greyscript_core_1.Operator.GreaterThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString() >= b.toString()),
-    [greyscript_core_1.Operator.Equal]: (a, b) => new boolean_1.CustomBoolean(a.toString() === b.toString()),
-    [greyscript_core_1.Operator.LessThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString() <= b.toString()),
-    [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString() !== b.toString())
+    [miniscript_core_1.Operator.Plus]: (a, b) => new string_1.CustomString(a.toString() + b.toString()),
+    [miniscript_core_1.Operator.Minus]: (a, b) => (0, exports.minusString)(a, b),
+    [miniscript_core_1.Operator.Asterik]: (a, b) => (0, exports.multiplyString)(a, b),
+    [miniscript_core_1.Operator.Slash]: (a, b) => (0, exports.divideString)(a, b),
+    [miniscript_core_1.Operator.LessThan]: (a, b) => new boolean_1.CustomBoolean(a.toString() < b.toString()),
+    [miniscript_core_1.Operator.GreaterThan]: (a, b) => new boolean_1.CustomBoolean(a.toString() > b.toString()),
+    [miniscript_core_1.Operator.GreaterThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString() >= b.toString()),
+    [miniscript_core_1.Operator.Equal]: (a, b) => new boolean_1.CustomBoolean(a.toString() === b.toString()),
+    [miniscript_core_1.Operator.LessThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString() <= b.toString()),
+    [miniscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString() !== b.toString())
 };
 const multiplyList = (a, b) => {
     const factor = b.toNumber();
@@ -118,31 +118,31 @@ const divideList = (a, b) => {
 };
 exports.divideList = divideList;
 exports.ListProcessorHandler = {
-    [greyscript_core_1.Operator.Plus]: (left, right) => {
+    [miniscript_core_1.Operator.Plus]: (left, right) => {
         if (right instanceof list_1.CustomList) {
             return left.fork().extend(right);
         }
         return default_1.DefaultType.Void;
     },
-    [greyscript_core_1.Operator.Equal]: (left, right) => {
+    [miniscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof list_1.CustomList) {
             return new boolean_1.CustomBoolean((0, deep_equal_1.deepEqual)(left, right));
         }
         return default_1.DefaultType.Void;
     },
-    [greyscript_core_1.Operator.NotEqual]: (left, right) => {
+    [miniscript_core_1.Operator.NotEqual]: (left, right) => {
         if (right instanceof list_1.CustomList) {
             return new boolean_1.CustomBoolean(!(0, deep_equal_1.deepEqual)(left, right));
         }
         return default_1.DefaultType.Void;
     },
-    [greyscript_core_1.Operator.Asterik]: (left, right) => {
+    [miniscript_core_1.Operator.Asterik]: (left, right) => {
         if (right instanceof number_1.CustomNumber) {
             return (0, exports.multiplyList)(left, right);
         }
         return default_1.DefaultType.Void;
     },
-    [greyscript_core_1.Operator.Slash]: (left, right) => {
+    [miniscript_core_1.Operator.Slash]: (left, right) => {
         if (right instanceof number_1.CustomNumber) {
             return (0, exports.divideList)(left, right);
         }
@@ -150,19 +150,19 @@ exports.ListProcessorHandler = {
     }
 };
 exports.MapProcessorHandler = {
-    [greyscript_core_1.Operator.Plus]: (left, right) => {
+    [miniscript_core_1.Operator.Plus]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
             return left.fork().extend(right);
         }
         return default_1.DefaultType.Void;
     },
-    [greyscript_core_1.Operator.Equal]: (left, right) => {
+    [miniscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
             return new boolean_1.CustomBoolean((0, deep_equal_1.deepEqual)(left, right));
         }
         return default_1.DefaultType.Void;
     },
-    [greyscript_core_1.Operator.NotEqual]: (left, right) => {
+    [miniscript_core_1.Operator.NotEqual]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
             return new boolean_1.CustomBoolean(!(0, deep_equal_1.deepEqual)(left, right));
         }
@@ -170,18 +170,18 @@ exports.MapProcessorHandler = {
     }
 };
 exports.NilProcessorHandler = {
-    [greyscript_core_1.Operator.Plus]: () => default_1.DefaultType.Void,
-    [greyscript_core_1.Operator.Minus]: () => default_1.DefaultType.Void,
-    [greyscript_core_1.Operator.Slash]: () => default_1.DefaultType.Void,
-    [greyscript_core_1.Operator.Asterik]: () => default_1.DefaultType.Void,
-    [greyscript_core_1.Operator.Power]: () => default_1.DefaultType.Void,
-    [greyscript_core_1.Operator.PercentSign]: () => default_1.DefaultType.Void,
-    [greyscript_core_1.Operator.Equal]: (_a, b) => new boolean_1.CustomBoolean(b instanceof nil_1.CustomNil),
-    [greyscript_core_1.Operator.NotEqual]: (_a, b) => new boolean_1.CustomBoolean(!(b instanceof nil_1.CustomNil))
+    [miniscript_core_1.Operator.Plus]: () => default_1.DefaultType.Void,
+    [miniscript_core_1.Operator.Minus]: () => default_1.DefaultType.Void,
+    [miniscript_core_1.Operator.Slash]: () => default_1.DefaultType.Void,
+    [miniscript_core_1.Operator.Asterik]: () => default_1.DefaultType.Void,
+    [miniscript_core_1.Operator.Power]: () => default_1.DefaultType.Void,
+    [miniscript_core_1.Operator.PercentSign]: () => default_1.DefaultType.Void,
+    [miniscript_core_1.Operator.Equal]: (_a, b) => new boolean_1.CustomBoolean(b instanceof nil_1.CustomNil),
+    [miniscript_core_1.Operator.NotEqual]: (_a, b) => new boolean_1.CustomBoolean(!(b instanceof nil_1.CustomNil))
 };
 exports.FunctionProcessorHandler = {
-    [greyscript_core_1.Operator.Equal]: (a, b) => new boolean_1.CustomBoolean(a === b),
-    [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a !== b)
+    [miniscript_core_1.Operator.Equal]: (a, b) => new boolean_1.CustomBoolean(a === b),
+    [miniscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a !== b)
 };
 const handleNumber = (op, a, b) => {
     if (b instanceof nil_1.CustomNil)
@@ -256,15 +256,15 @@ const handle = (op, a, b) => {
     if (b instanceof boolean_1.CustomBoolean) {
         b = new number_1.CustomNumber(b.toInt());
     }
-    if (op === greyscript_core_1.Operator.Equal && a.getCustomType() !== b.getCustomType()) {
+    if (op === miniscript_core_1.Operator.Equal && a.getCustomType() !== b.getCustomType()) {
         return default_1.DefaultType.False;
     }
-    else if (op === greyscript_core_1.Operator.NotEqual &&
+    else if (op === miniscript_core_1.Operator.NotEqual &&
         a.getCustomType() !== b.getCustomType()) {
         return default_1.DefaultType.True;
     }
     if ((a instanceof string_1.CustomString || b instanceof string_1.CustomString) &&
-        op === greyscript_core_1.Operator.Plus) {
+        op === miniscript_core_1.Operator.Plus) {
         return (0, exports.handleString)(op, a, b);
     }
     else if (a instanceof number_1.CustomNumber) {
@@ -312,10 +312,10 @@ class Evaluate extends operation_1.Operation {
     resolveLogicalExpression(ctx, expr) {
         return __awaiter(this, void 0, void 0, function* () {
             const left = yield this.resolve(ctx, expr.left);
-            if (expr.op === greyscript_core_1.Operator.And && !left.toTruthy()) {
+            if (expr.op === miniscript_core_1.Operator.And && !left.toTruthy()) {
                 return new boolean_1.CustomBoolean(false);
             }
-            else if (expr.op === greyscript_core_1.Operator.Or && left.toTruthy()) {
+            else if (expr.op === miniscript_core_1.Operator.Or && left.toTruthy()) {
                 return new boolean_1.CustomBoolean(true);
             }
             const right = yield this.resolve(ctx, expr.right);
@@ -327,14 +327,14 @@ class Evaluate extends operation_1.Operation {
             if (op instanceof Evaluate) {
                 const expr = op;
                 switch (expr.type) {
-                    case greyscript_core_1.ASTType.IsaExpression: {
+                    case miniscript_core_1.ASTType.IsaExpression: {
                         const left = yield this.resolve(ctx, expr.left);
                         const right = yield this.resolve(ctx, expr.right);
                         return new boolean_1.CustomBoolean(left.instanceOf(right));
                     }
-                    case greyscript_core_1.ASTType.BinaryExpression:
+                    case miniscript_core_1.ASTType.BinaryExpression:
                         return this.resolveBinaryExpression(ctx, expr);
-                    case greyscript_core_1.ASTType.LogicalExpression:
+                    case miniscript_core_1.ASTType.LogicalExpression:
                         return this.resolveLogicalExpression(ctx, expr);
                     default:
                         break;

package/dist/operations/for.d.ts

@@ -1,4 +1,4 @@
-import { ASTForGenericStatement, ASTIdentifier } from 'greyscript-core';
+import { ASTForGenericStatement, ASTIdentifier } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { Block } from './block';

package/dist/operations/function-reference.d.ts

@@ -1,4 +1,4 @@
-import { ASTUnaryExpression } from 'greyscript-core';
+import { ASTUnaryExpression } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/function.d.ts

@@ -1,4 +1,4 @@
-import { ASTFunctionStatement } from 'greyscript-core';
+import { ASTFunctionStatement } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CustomString } from '../types/string';

package/dist/operations/function.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionOperation = exports.SUPER_PROPERTY = exports.SELF_PROPERTY = void 0;
-const greyscript_core_1 = require("greyscript-core");
+const miniscript_core_1 = require("miniscript-core");
 const context_1 = require("../context");
 const default_1 = require("../types/default");
 const function_1 = require("../types/function");
@@ -31,7 +31,7 @@ class FunctionOperation extends operation_1.Operation {
             this.block = new block_1.Block(this.item, stack);
             this.args = yield Promise.all(this.item.parameters.map((child) => __awaiter(this, void 0, void 0, function* () {
                 switch (child.type) {
-                    case greyscript_core_1.ASTType.AssignmentStatement: {
+                    case miniscript_core_1.ASTType.AssignmentStatement: {
                         const assignStatement = child;
                         const assignKey = assignStatement.variable;
                         return {
@@ -39,7 +39,7 @@ class FunctionOperation extends operation_1.Operation {
                             op: yield visit(assignStatement.init)
                         };
                     }
-                    case greyscript_core_1.ASTType.Identifier: {
+                    case miniscript_core_1.ASTType.Identifier: {
                         const identifierKey = child;
                         return {
                             name: identifierKey.name,

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

@@ -1,4 +1,4 @@
-import { ASTElseClause, ASTIfClause, ASTIfStatement } from 'greyscript-core';
+import { ASTElseClause, ASTIfClause, ASTIfStatement } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { Block } from './block';

package/dist/operations/if-statement.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IfStatement = exports.Clause = void 0;
-const greyscript_core_1 = require("greyscript-core");
+const miniscript_core_1 = require("miniscript-core");
 const boolean_1 = require("../types/boolean");
 const default_1 = require("../types/default");
 const block_1 = require("./block");
@@ -50,14 +50,14 @@ class IfStatement extends operation_1.OperationBlock {
             for (let index = 0; index < this.item.clauses.length; index++) {
                 const child = this.item.clauses[index];
                 switch (child.type) {
-                    case greyscript_core_1.ASTType.IfClause:
-                    case greyscript_core_1.ASTType.IfShortcutClause:
-                    case greyscript_core_1.ASTType.ElseifClause:
-                    case greyscript_core_1.ASTType.ElseifShortcutClause:
+                    case miniscript_core_1.ASTType.IfClause:
+                    case miniscript_core_1.ASTType.IfShortcutClause:
+                    case miniscript_core_1.ASTType.ElseifClause:
+                    case miniscript_core_1.ASTType.ElseifShortcutClause:
                         yield this.buildIfClause(child, visit);
                         break;
-                    case greyscript_core_1.ASTType.ElseClause:
-                    case greyscript_core_1.ASTType.ElseShortcutClause:
+                    case miniscript_core_1.ASTType.ElseClause:
+                    case miniscript_core_1.ASTType.ElseShortcutClause:
                         yield this.buildElseClause(child, visit);
                         break;
                 }

package/dist/operations/import.d.ts

@@ -1,5 +1,5 @@
 import { ASTFeatureImportExpression } from 'greybel-core';
-import { ASTBase } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CustomString } from '../types/string';

package/dist/operations/include.d.ts

@@ -1,4 +1,4 @@
-import { ASTBase } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/list.d.ts

@@ -1,4 +1,4 @@
-import { ASTListConstructorExpression } from 'greyscript-core';
+import { ASTListConstructorExpression } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/literal.d.ts

@@ -1,4 +1,4 @@
-import { ASTLiteral } from 'greyscript-core';
+import { ASTLiteral } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/literal.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Literal = void 0;
-const greyscript_core_1 = require("greyscript-core");
+const miniscript_core_1 = require("miniscript-core");
 const boolean_1 = require("../types/boolean");
 const default_1 = require("../types/default");
 const number_1 = require("../types/number");
@@ -14,16 +14,16 @@ class Literal extends operation_1.Operation {
     }
     build(_visit) {
         switch (this.item.type) {
-            case greyscript_core_1.ASTType.BooleanLiteral:
+            case miniscript_core_1.ASTType.BooleanLiteral:
                 this.value = new boolean_1.CustomBoolean(this.item.value);
                 break;
-            case greyscript_core_1.ASTType.StringLiteral:
+            case miniscript_core_1.ASTType.StringLiteral:
                 this.value = new string_1.CustomString(this.item.value);
                 break;
-            case greyscript_core_1.ASTType.NumericLiteral:
+            case miniscript_core_1.ASTType.NumericLiteral:
                 this.value = new number_1.CustomNumber(this.item.value);
                 break;
-            case greyscript_core_1.ASTType.NilLiteral:
+            case miniscript_core_1.ASTType.NilLiteral:
                 this.value = default_1.DefaultType.Void;
                 break;
             default:

package/dist/operations/map.d.ts

@@ -1,4 +1,4 @@
-import { ASTMapConstructorExpression } from 'greyscript-core';
+import { ASTMapConstructorExpression } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/negated-binary.d.ts

@@ -1,4 +1,4 @@
-import { ASTUnaryExpression } from 'greyscript-core';
+import { ASTUnaryExpression } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/negated-binary.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NegatedBinary = void 0;
-const greyscript_core_1 = require("greyscript-core");
+const miniscript_core_1 = require("miniscript-core");
 const number_1 = require("../types/number");
 const operation_1 = require("./operation");
 class NegatedBinary extends operation_1.Operation {
@@ -27,9 +27,9 @@ class NegatedBinary extends operation_1.Operation {
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
             switch (this.item.operator) {
-                case greyscript_core_1.Operator.Minus:
+                case miniscript_core_1.Operator.Minus:
                     return new number_1.CustomNumber(-(yield this.arg.handle(ctx)).toNumber());
-                case greyscript_core_1.Operator.Plus:
+                case miniscript_core_1.Operator.Plus:
                     return new number_1.CustomNumber(+(yield this.arg.handle(ctx)).toNumber());
                 default:
                     throw new Error('Unexpected negation operator.');

package/dist/operations/new-instance.d.ts

@@ -1,4 +1,4 @@
-import { ASTUnaryExpression } from 'greyscript-core';
+import { ASTUnaryExpression } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/not.d.ts

@@ -1,4 +1,4 @@
-import { ASTUnaryExpression } from 'greyscript-core';
+import { ASTUnaryExpression } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/operation.d.ts

@@ -1,4 +1,4 @@
-import { ASTBase } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 export interface CPSVisit {

package/dist/operations/resolve.d.ts

@@ -1,4 +1,4 @@
-import { ASTBase } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CustomNil } from '../types/nil';

package/dist/operations/resolve.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Resolve = exports.ResolveResult = exports.ResolveNil = exports.SegmentContainer = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.PathSegment = exports.SliceSegment = void 0;
-const greyscript_core_1 = require("greyscript-core");
+const miniscript_core_1 = require("miniscript-core");
 const default_1 = require("../types/default");
 const function_1 = require("../types/function");
 const list_1 = require("../types/list");
@@ -105,20 +105,20 @@ class Resolve extends operation_1.Operation {
     buildProcessor(node, visit) {
         return __awaiter(this, void 0, void 0, function* () {
             switch (node.type) {
-                case greyscript_core_1.ASTType.MemberExpression: {
+                case miniscript_core_1.ASTType.MemberExpression: {
                     const memberExpr = node;
                     yield this.buildProcessor(memberExpr.base, visit);
                     yield this.buildProcessor(memberExpr.identifier, visit);
                     break;
                 }
-                case greyscript_core_1.ASTType.IndexExpression: {
+                case miniscript_core_1.ASTType.IndexExpression: {
                     const indexExpr = node;
                     yield this.buildProcessor(indexExpr.base, visit);
                     const indexSegment = new IndexSegment(yield visit(indexExpr.index));
                     this.path.push(indexSegment);
                     break;
                 }
-                case greyscript_core_1.ASTType.SliceExpression: {
+                case miniscript_core_1.ASTType.SliceExpression: {
                     const sliceExpr = node;
                     yield this.buildProcessor(sliceExpr.base, visit);
                     const left = yield visit(sliceExpr.left);
@@ -127,7 +127,7 @@ class Resolve extends operation_1.Operation {
                     this.path.push(sliceSegment);
                     break;
                 }
-                case greyscript_core_1.ASTType.Identifier: {
+                case miniscript_core_1.ASTType.Identifier: {
                     const identifier = node;
                     const identifierSegment = new IdentifierSegment(identifier.name);
                     this.path.push(identifierSegment);

package/dist/operations/return.d.ts

@@ -1,4 +1,4 @@
-import { ASTReturnStatement } from 'greyscript-core';
+import { ASTReturnStatement } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CPSVisit, Operation } from './operation';

package/dist/operations/while.d.ts

@@ -1,4 +1,4 @@
-import { ASTWhileStatement } from 'greyscript-core';
+import { ASTWhileStatement } from 'miniscript-core';
 import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { Block } from './block';

package/dist/utils/error.d.ts

@@ -1,4 +1,4 @@
-import { ASTRange } from 'greyscript-core';
+import { ASTRange } from 'miniscript-core';
 import { Operation } from '../operations/operation';
 interface RuntimeContext {
     stackTrace?: Operation[];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "2.2.19",
+    "version": "3.0.0",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -48,11 +48,9 @@
         "typescript": "^5.0.4"
     },
     "dependencies": {
-        "greybel-core": "^0.9.11",
-        "greyscript-core": "^0.9.12"
+        "greybel-core": "^1.0.0"
     },
     "keywords": [
-        "greyscript",
-        "greyhack"
+        "miniscript"
     ]
 }