greybel-interpreter 2.2.4 → 2.2.6

package/dist/context.js

@@ -144,36 +144,38 @@ class FunctionState {
 exports.FunctionState = FunctionState;
 class OperationContext {
     constructor(options = {}) {
-        this.target = options.target || 'unknown';
-        this.stackTrace = options.stackTrace || [];
-        this.previous = options.previous || null;
-        this.type = options.type || ContextType.Api;
-        this.state = options.state || ContextState.Default;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        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;
+        this.type = (_d = options.type) !== null && _d !== void 0 ? _d : ContextType.Api;
+        this.state = (_e = options.state) !== null && _e !== void 0 ? _e : ContextState.Default;
         this.scope = new Scope(this);
-        this.isProtected = options.isProtected || false;
-        this.injected = options.injected || false;
-        this.debugger = options.debugger || new Debugger();
-        this.handler = options.handler || new handler_container_1.HandlerContainer();
-        this.cps = options.cps || null;
-        this.processState = options.processState || new ProcessState();
-        this.environmentVariables = options.environmentVariables || new Map();
+        this.isProtected = (_f = options.isProtected) !== null && _f !== void 0 ? _f : false;
+        this.injected = (_g = options.injected) !== null && _g !== void 0 ? _g : false;
+        this.debugger = (_h = options.debugger) !== null && _h !== void 0 ? _h : new Debugger();
+        this.handler = (_j = options.handler) !== null && _j !== void 0 ? _j : new handler_container_1.HandlerContainer();
+        this.cps = (_k = options.cps) !== null && _k !== void 0 ? _k : null;
+        this.processState = (_l = options.processState) !== null && _l !== void 0 ? _l : new ProcessState();
+        this.environmentVariables = (_m = options.environmentVariables) !== null && _m !== void 0 ? _m : new Map();
         this.functionState = new FunctionState();
         this.loopState = new LoopState();
         this.api = this.lookupApi();
         this.globals = this.lookupGlobals();
-        this.locals = this.lookupLocals() || this;
+        this.locals = (_o = this.lookupLocals()) !== null && _o !== void 0 ? _o : this;
     }
     isIgnoredInDebugging(op) {
         return op instanceof operation_1.OperationBlock || op instanceof noop_1.Noop;
     }
     step(op) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isIgnoredInDebugging(op)) {
                 return op.handle(this);
             }
             this.stackTrace.unshift(op);
             if (!this.injected) {
-                this.target = op.target || this.target;
+                this.target = (_a = op.target) !== null && _a !== void 0 ? _a : this.target;
                 this.setLastActive(this);
                 if (this.debugger.getBreakpoint(this)) {
                     this.processState.emit('breakpoint');
@@ -301,8 +303,9 @@ class OperationContext {
         return this.locals.scope.get(path);
     }
     fork(options) {
+        var _a;
         const newContext = new OperationContext({
-            target: options.target || this.target,
+            target: (_a = options.target) !== null && _a !== void 0 ? _a : this.target,
             stackTrace: this.stackTrace,
             previous: this,
             type: options.type,

package/dist/handler-container.js

@@ -6,10 +6,11 @@ const output_1 = require("./handler/output");
 const resource_1 = require("./handler/resource");
 class HandlerContainer {
     constructor(options = {}) {
+        var _a, _b, _c;
         this.resourceHandler =
-            (options === null || options === void 0 ? void 0 : options.resourceHandler) || new resource_1.DefaultResourceHandler();
-        this.outputHandler = (options === null || options === void 0 ? void 0 : options.outputHandler) || new output_1.DefaultOutputHandler();
-        this.errorHandler = (options === null || options === void 0 ? void 0 : options.errorHandler) || new error_1.DefaultErrorHandler();
+            (_a = options === null || options === void 0 ? void 0 : options.resourceHandler) !== null && _a !== void 0 ? _a : new resource_1.DefaultResourceHandler();
+        this.outputHandler = (_b = options === null || options === void 0 ? void 0 : options.outputHandler) !== null && _b !== void 0 ? _b : new output_1.DefaultOutputHandler();
+        this.errorHandler = (_c = options === null || options === void 0 ? void 0 : options.errorHandler) !== null && _c !== void 0 ? _c : new error_1.DefaultErrorHandler();
     }
 }
 exports.HandlerContainer = HandlerContainer;

package/dist/interpreter.js

@@ -27,15 +27,16 @@ const object_value_1 = require("./utils/object-value");
 exports.PARAMS_PROPERTY = new string_1.CustomString('params');
 class Interpreter extends events_1.EventEmitter {
     constructor(options) {
+        var _a, _b, _c, _d, _e, _f;
         super();
-        this.handler = options.handler || new handler_container_1.HandlerContainer();
-        this.debugger = options.debugger || new context_1.Debugger();
-        this.api = options.api || new object_value_1.ObjectValue();
-        this.params = options.params || [];
-        this.environmentVariables = options.environmentVariables || new Map();
+        this.handler = (_a = options.handler) !== null && _a !== void 0 ? _a : new handler_container_1.HandlerContainer();
+        this.debugger = (_b = options.debugger) !== null && _b !== void 0 ? _b : new context_1.Debugger();
+        this.api = (_c = options.api) !== null && _c !== void 0 ? _c : new object_value_1.ObjectValue();
+        this.params = (_d = options.params) !== null && _d !== void 0 ? _d : [];
+        this.environmentVariables = (_e = options.environmentVariables) !== null && _e !== void 0 ? _e : new Map();
         this.apiContext = null;
         this.globalContext = null;
-        this.setTarget(options.target || 'unknown');
+        this.setTarget((_f = options.target) !== null && _f !== void 0 ? _f : 'unknown');
     }
     setTarget(target) {
         if (this.apiContext !== null && this.apiContext.isPending()) {
@@ -106,7 +107,7 @@ class Interpreter extends events_1.EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const top = yield this.prepare(code);
-                const injectionCtx = (context || this.globalContext).fork({
+                const injectionCtx = (context !== null && context !== void 0 ? context : this.globalContext).fork({
                     type: context_1.ContextType.Call,
                     state: context_1.ContextState.Temporary,
                     injected: true
@@ -135,7 +136,7 @@ class Interpreter extends events_1.EventEmitter {
     }
     run(customCode) {
         return __awaiter(this, void 0, void 0, function* () {
-            const code = customCode || (yield this.handler.resourceHandler.get(this.target));
+            const code = customCode !== null && customCode !== void 0 ? customCode : (yield this.handler.resourceHandler.get(this.target));
             const top = yield this.prepare(code);
             return this.start(top);
         });

package/dist/operations/for.js

@@ -42,7 +42,6 @@ class For extends operation_1.OperationBlock {
                 return Promise.resolve(default_1.DefaultType.Void);
             }
             const loopState = new context_1.LoopState();
-            let index = 0;
             forCtx.loopState = loopState;
             return new Promise((resolve, reject) => {
                 const iterator = iteratorValue[Symbol.iterator]();
@@ -57,7 +56,7 @@ class For extends operation_1.OperationBlock {
                         }
                         const current = iteratorResult.value;
                         loopState.isContinue = false;
-                        forCtx.set(idxIdentifier, new number_1.CustomNumber(index++));
+                        forCtx.set(idxIdentifier, new number_1.CustomNumber(iterator.index - 1));
                         forCtx.set(varIdentifier, current);
                         yield this.block.handle(forCtx);
                         if (loopState.isBreak ||
@@ -66,6 +65,8 @@ class For extends operation_1.OperationBlock {
                             resolve(default_1.DefaultType.Void);
                             return;
                         }
+                        const idxValue = forCtx.get(idxIdentifier).toNumber();
+                        iterator.index += idxValue - (iterator.index - 1);
                         iteratorResult = iterator.next();
                         process.nextTick(iteration);
                     }

package/dist/types/function.js

@@ -86,7 +86,7 @@ class CustomFunction extends base_1.CustomValue {
         return v.value === CustomFunction.intrinsics;
     }
     run(self, args, callContext, next) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const fnCtx = (_a = this.scope) === null || _a === void 0 ? void 0 : _a.fork({
                 type: context_1.ContextType.Function,
@@ -113,13 +113,13 @@ class CustomFunction extends base_1.CustomValue {
                     argIndex++;
                     continue;
                 }
-                argMap.set(item.name, args[argIndex++] || (yield item.defaultValue.handle(fnCtx)));
+                argMap.set(item.name, (_b = args[argIndex++]) !== null && _b !== void 0 ? _b : (yield item.defaultValue.handle(fnCtx)));
             }
             if (!isSelfNull) {
                 argMap.set(exports.SELF_NAMESPACE, self);
             }
-            const isa = next || (self instanceof map_1.CustomMap ? self.isa : null);
-            return this.value(fnCtx || callContext, self, argMap, isa);
+            const isa = next !== null && next !== void 0 ? next : (self instanceof map_1.CustomMap ? self.isa : null);
+            return this.value(fnCtx !== null && fnCtx !== void 0 ? fnCtx : callContext, self, argMap, isa);
         });
     }
 }

package/dist/types/interface.d.ts

@@ -3,6 +3,7 @@ import { CustomValue } from './base';
 import { CustomFunction } from './function';
 import { CustomObject } from './with-intrinsics';
 export declare class CustomInterfaceIterator implements Iterator<CustomValue> {
+    index: number;
     next(): IteratorResult<CustomValue>;
 }
 export declare class CustomInterface extends CustomObject {

package/dist/types/interface.js

@@ -6,6 +6,9 @@ const base_1 = require("./base");
 const default_1 = require("./default");
 const with_intrinsics_1 = require("./with-intrinsics");
 class CustomInterfaceIterator {
+    constructor() {
+        this.index = 0;
+    }
     next() {
         return {
             value: default_1.DefaultType.Void,

package/dist/types/list.js

@@ -14,7 +14,7 @@ class CustomListIterator {
     }
     next() {
         const me = this;
-        if (me.index === me.value.length) {
+        if (me.index >= me.value.length) {
             return {
                 value: null,
                 done: true

package/dist/types/map.js

@@ -14,13 +14,13 @@ exports.CUSTOM_MAP_MAX_DEPTH_VALUE = '{...}';
 class CustomMapIterator {
     constructor(value) {
         const me = this;
-        me.value = new object_value_1.ObjectValue(value);
+        me.value = value;
         me.index = 0;
     }
     next() {
         const me = this;
         const keys = Array.from(me.value.keys());
-        if (me.index === keys.length) {
+        if (me.index >= keys.length) {
             return {
                 value: nil_1.Void,
                 done: true

package/dist/types/number.d.ts

@@ -3,6 +3,7 @@ import { Path } from '../utils/path';
 import { CustomValue } from './base';
 import { CustomValueWithIntrinsics } from './with-intrinsics';
 export declare class CustomNumberIterator implements Iterator<CustomValue> {
+    index: number;
     next(): IteratorResult<CustomValue>;
 }
 export declare class CustomNumber extends CustomValueWithIntrinsics {

package/dist/types/number.js

@@ -7,6 +7,9 @@ const base_1 = require("./base");
 const nil_1 = require("./nil");
 const with_intrinsics_1 = require("./with-intrinsics");
 class CustomNumberIterator {
+    constructor() {
+        this.index = 0;
+    }
     next() {
         return {
             value: null,

package/dist/types/string.js

@@ -15,7 +15,7 @@ class CustomStringIterator {
     }
     next() {
         const me = this;
-        if (me.index === me.value.length) {
+        if (me.index >= me.value.length) {
             return {
                 value: null,
                 done: true

package/dist/types/with-intrinsics.d.ts

@@ -6,7 +6,9 @@ export declare abstract class CustomValueWithIntrinsics extends CustomValue {
     abstract has(path: Path<CustomValue> | CustomValue): boolean;
     abstract set(path: Path<CustomValue> | CustomValue, value: CustomValue): void;
     abstract get(path: Path<CustomValue> | CustomValue): CustomValue;
-    abstract [Symbol.iterator](): Iterator<CustomValue>;
+    abstract [Symbol.iterator](): Iterator<CustomValue> & {
+        index: number;
+    };
     static readonly intrinsics: ObjectValue;
     static getIntrinsics(): ObjectValue;
     static addIntrinsic(key: CustomValue, fn: CustomFunction): void;

package/dist/utils/error.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrepareError = exports.RuntimeError = void 0;
 class RuntimeError extends Error {
     constructor(message, context, source) {
+        var _a;
         super(message);
         this.target = context.target;
-        this.stackTrace = context.stackTrace || [];
+        this.stackTrace = (_a = context.stackTrace) !== null && _a !== void 0 ? _a : [];
         this.stack = this.createTrace();
         this.source = source;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "2.2.4",
+    "version": "2.2.6",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -48,8 +48,8 @@
         "typescript": "^5.0.4"
     },
     "dependencies": {
-        "greybel-core": "^0.9.6",
-        "greyscript-core": "^0.9.9"
+        "greybel-core": "^0.9.7",
+        "greyscript-core": "^0.9.10"
     },
     "keywords": [
         "greyscript",