greybel-interpreter 3.1.0 → 3.2.0

package/dist/interpreter.d.ts

@@ -36,9 +36,11 @@ export declare class Interpreter extends EventEmitter {
     setDebugger(dbgr: Debugger): Interpreter;
     setApi(newApi: ObjectValue): Interpreter;
     setHandler(handler: HandlerContainer): Interpreter;
+    parse(code: string): import("miniscript-core").ASTBase | import("greybel-core").ASTChunkAdvanced;
     prepare(code: string): Promise<Operation>;
     inject(code: string, context?: OperationContext): Promise<Interpreter>;
     injectInLastContext(code: string): Promise<Interpreter>;
+    createCPS(): CPS;
     private initScopes;
     private start;
     run({ customCode, ctxOptions }?: InterpreterRunOptions): Promise<Interpreter>;

package/dist/interpreter.js

@@ -68,10 +68,13 @@ class Interpreter extends events_1.EventEmitter {
         this.handler = handler;
         return this;
     }
+    parse(code) {
+        const parser = new greybel_core_1.Parser(code);
+        return parser.parseChunk();
+    }
     prepare(code) {
         try {
-            const parser = new greybel_core_1.Parser(code);
-            const chunk = parser.parseChunk();
+            const chunk = this.parse(code);
             return this.cps.visit(chunk);
         }
         catch (err) {
@@ -118,9 +121,12 @@ class Interpreter extends events_1.EventEmitter {
             throw new Error('Unable to inject into last context.');
         });
     }
-    initScopes(ctxOptions) {
+    createCPS() {
         const cpsCtx = new cps_1.CPSContext(this.target, this.handler);
-        this.cps = new cps_1.CPS(cpsCtx);
+        return new cps_1.CPS(cpsCtx);
+    }
+    initScopes(ctxOptions) {
+        this.cps = this.createCPS();
         const apiContext = new context_1.OperationContext(Object.assign({ target: this.target, isProtected: true, debugger: this.debugger, handler: this.handler, cps: this.cps, environmentVariables: this.environmentVariables, contextTypeIntrinsics: {
                 string: string_1.CustomString.getIntrinsics().fork(),
                 number: number_1.CustomNumber.getIntrinsics().fork(),

package/dist/operations/evaluate.js

@@ -11,6 +11,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 miniscript_core_1 = require("miniscript-core");
+const operators_1 = require("greybel-core/dist/types/operators");
 const boolean_1 = require("../types/boolean");
 const default_1 = require("../types/default");
 const function_1 = require("../types/function");
@@ -31,13 +32,13 @@ exports.NumberProcessorHandler = {
     [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()),
+    [operators_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()),
+    [operators_1.Operator.LeftShift]: (a, b) => new number_1.CustomNumber(a.toInt() << b.toInt()),
+    [operators_1.Operator.RightShift]: (a, b) => new number_1.CustomNumber(a.toInt() >> b.toInt()),
+    [operators_1.Operator.UnsignedRightShift]: (a, b) => new number_1.CustomNumber(a.toInt() >> b.toInt()),
+    [operators_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()),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "3.1.0",
+    "version": "3.2.0",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -49,7 +49,7 @@
     },
     "dependencies": {
         "lru-cache": "^10.0.1",
-        "greybel-core": "^1.1.0"
+        "greybel-core": "^1.2.0"
     },
     "keywords": [
         "miniscript"