greybel-interpreter 0.4.4 → 0.4.8

package/dist/context.js

@@ -202,10 +202,10 @@ var Debugger = /** @class */ (function () {
                     resolve();
                 }
                 else {
-                    setImmediate(check);
+                    setTimeout(check, 10);
                 }
             };
-            setImmediate(check);
+            setTimeout(check, 10);
         });
     };
     Debugger.prototype.interact = function (operationContext, item) {
@@ -272,12 +272,16 @@ var OperationContext = /** @class */ (function () {
         if (state.pending) {
             state.exit = true;
             return new Promise(function (resolve) {
-                setImmediate(function () {
+                var check = function () {
                     if (!state.pending) {
                         state.exit = false;
                         resolve(me);
                     }
-                });
+                    else {
+                        setTimeout(check, 10);
+                    }
+                };
+                setTimeout(check, 10);
             });
         }
         return Promise.reject(new Error('No running process found.'));

package/dist/cps.js

@@ -665,7 +665,7 @@ var CPSMap = function (visit, context) {
             return new call_1.default(item).prepare(visit);
         },
         'CallStatement': function (item) {
-            return new call_1.default(item).prepare(visit);
+            return visit(item.expression);
         },
         'FeatureImportExpression': function (item) {
             return __awaiter(this, void 0, void 0, function () {
@@ -716,7 +716,7 @@ var CPSMap = function (visit, context) {
                             resourceHandler = context.resourceHandler;
                             return [4 /*yield*/, resourceHandler.getTargetRelativeTo(context.target, 
                                 // @ts-ignore: FileSystemDirectory is always a string
-                                item.fileSystemDirectory.value)];
+                                item.fileSystemDirectory)];
                         case 1:
                             target = _a.sent();
                             return [4 /*yield*/, context.resourceHandler.get(target)];

package/dist/expressions/assign.js

@@ -162,7 +162,7 @@ var AssignExpression = /** @class */ (function (_super) {
                                 });
                             });
                         };
-                        operationContext.debugger.debug('Line', me.ast.line, 'AssignExpression', 'get', 'expr', me.expr);
+                        operationContext.debugger.debug('Line', me.ast.start.line, 'AssignExpression', 'get', 'expr', me.expr);
                         return [4 /*yield*/, evaluate(me.expr)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }

package/dist/expressions/binary-negated-expression.js

@@ -123,7 +123,7 @@ var BinaryNegatedExpression = /** @class */ (function (_super) {
                 });
             });
         };
-        operationContext.debugger.debug('Line', me.ast.line, 'BinaryNegatedExpression', 'get', 'expr', me.expr);
+        operationContext.debugger.debug('Line', me.ast.start.line, 'BinaryNegatedExpression', 'get', 'expr', me.expr);
         return evaluate(me.expr);
     };
     return BinaryNegatedExpression;

package/dist/expressions/call.js

@@ -77,7 +77,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressionSegment = void 0;
-var greyscript_core_1 = require("greyscript-core");
 var expression_1 = require("../types/expression");
 var operation_1 = require("../types/operation");
 var typer_1 = require("../typer");
@@ -125,9 +124,6 @@ var CallExpression = /** @class */ (function (_super) {
                                 return __generator(this, function (_c) {
                                     switch (_c.label) {
                                         case 0:
-                                            if (greyscript_core_1.ASTType.CallStatement === node.type) {
-                                                return [2 /*return*/, buildExpression(node.expression)];
-                                            }
                                             _a = ExpressionSegment.bind;
                                             return [4 /*yield*/, visit(node.base)];
                                         case 1:
@@ -169,7 +165,7 @@ var CallExpression = /** @class */ (function (_super) {
                             return [4 /*yield*/, node.path.get(opc, me.expr)];
                         case 2:
                             pathExpr = _f.sent();
-                            operationContext.debugger.debug('Line', me.ast.line, 'CallExpression', 'pathExpr', pathExpr);
+                            operationContext.debugger.debug('Line', me.ast.start.line, 'CallExpression', 'pathExpr', pathExpr);
                             if (!pathExpr.handle) return [3 /*break*/, 8];
                             if (!(0, typer_1.isCustomMap)(pathExpr.handle)) return [3 /*break*/, 7];
                             return [4 /*yield*/, pathExpr.handle.getCallable(pathExpr.path)];
@@ -203,7 +199,7 @@ var CallExpression = /** @class */ (function (_super) {
                 });
             });
         };
-        operationContext.debugger.debug('Line', me.ast.line, 'CallExpression', 'get', 'expr', me.expr);
+        operationContext.debugger.debug('Line', me.ast.start.line, 'CallExpression', 'get', 'expr', me.expr);
         return evaluate(me.expr);
     };
     return CallExpression;

package/dist/expressions/import.js

@@ -143,7 +143,7 @@ var ImportExpression = /** @class */ (function (_super) {
                                 });
                             });
                         };
-                        operationContext.debugger.debug('Line', me.ast.line, 'ImportExpression', 'get', 'expr', me.expr);
+                        operationContext.debugger.debug('Line', me.ast.start.line, 'ImportExpression', 'get', 'expr', me.expr);
                         return [4 /*yield*/, evaluate(me.expr)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }

package/dist/expressions/include.js

@@ -120,7 +120,7 @@ var IncludeExpression = /** @class */ (function (_super) {
                                 });
                             });
                         };
-                        operationContext.debugger.debug('Line', me.ast.line, 'IncludeExpression', 'get', 'expr', me.expr);
+                        operationContext.debugger.debug('Line', me.ast.start.line, 'IncludeExpression', 'get', 'expr', me.expr);
                         return [4 /*yield*/, evaluate(me.expr)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }

package/dist/expressions/list.js

@@ -126,7 +126,7 @@ var ListExpression = /** @class */ (function (_super) {
                 });
             });
         };
-        operationContext.debugger.debug('Line', me.ast.line, 'ListExpression', 'get', 'expr', me.expr);
+        operationContext.debugger.debug('Line', me.ast.start.line, 'ListExpression', 'get', 'expr', me.expr);
         return evaluate(me.expr.values);
     };
     return ListExpression;

package/dist/expressions/logical-and-binary.js

@@ -204,7 +204,7 @@ var LogicalAndBinaryExpression = /** @class */ (function (_super) {
                 }
             });
         }); };
-        operationContext.debugger.debug('Line', me.ast.line, 'LogicalAndBinaryExpression', 'get', 'expr', me.expr);
+        operationContext.debugger.debug('Line', me.ast.start.line, 'LogicalAndBinaryExpression', 'get', 'expr', me.expr);
         return evaluate(me.expr);
     };
     return LogicalAndBinaryExpression;

package/dist/expressions/map.js

@@ -110,12 +110,11 @@ var MapExpression = /** @class */ (function (_super) {
                                 return __generator(this, function (_b) {
                                     switch (_b.label) {
                                         case 0:
-                                            _a = {};
-                                            return [4 /*yield*/, visit(item.key)];
-                                        case 1:
-                                            _a.key = _b.sent();
+                                            _a = {
+                                                key: item.key
+                                            };
                                             return [4 /*yield*/, visit(item.value)];
-                                        case 2: return [2 /*return*/, (_a.value = _b.sent(),
+                                        case 1: return [2 /*return*/, (_a.value = _b.sent(),
                                                 _a)];
                                     }
                                 });
@@ -147,12 +146,7 @@ var MapExpression = /** @class */ (function (_super) {
                             current = values_1_1.value;
                             key = void 0;
                             value = void 0;
-                            if ((0, typer_1.isCustomValue)(current.key)) {
-                                key = current.key.valueOf();
-                            }
-                            else {
-                                operationContext.debugger.raise('Unexpected key', me, current.key);
-                            }
+                            key = current.key;
                             if (!(0, typer_1.isCustomValue)(current.value)) return [3 /*break*/, 3];
                             value = current.value;
                             return [3 /*break*/, 6];
@@ -188,7 +182,7 @@ var MapExpression = /** @class */ (function (_super) {
                 });
             });
         };
-        operationContext.debugger.debug('Line', me.ast.line, 'MapExpression', 'get', 'expr', me.expr);
+        operationContext.debugger.debug('Line', me.ast.start.line, 'MapExpression', 'get', 'expr', me.expr);
         return evaluate(me.expr.values);
     };
     return MapExpression;

package/dist/expressions/path.js

@@ -315,7 +315,7 @@ var PathExpression = /** @class */ (function (_super) {
                                 });
                             });
                         };
-                        operationContext.debugger.debug('Line', me.ast.line, 'PathExpression', 'get', 'expr', me.expr);
+                        operationContext.debugger.debug('Line', me.ast.start.line, 'PathExpression', 'get', 'expr', me.expr);
                         return [4 /*yield*/, evaluate(me.expr)];
                     case 1:
                         resultExpr = _c.sent();

package/dist/interpreter.js

@@ -186,10 +186,10 @@ var Interpreter = /** @class */ (function (_super) {
                         me.debugger.raise(err_2);
                         return [3 /*break*/, 8];
                     case 7:
-                        me.apiContext.setPending(false);
-                        setImmediate(function () {
+                        setTimeout(function () {
+                            me.apiContext.setPending(false);
                             me.emit('exit', me);
-                        });
+                        }, 100);
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/, me];
                 }

package/dist/operations/argument.js

@@ -67,8 +67,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var typer_1 = require("../typer");
 var operation_1 = require("../types/operation");
-var expression_1 = require("../types/expression");
+var path_1 = __importDefault(require("../expressions/path"));
 var assign_1 = __importDefault(require("../expressions/assign"));
+var nil_1 = __importDefault(require("../custom-types/nil"));
 var ArgumentOperation = /** @class */ (function (_super) {
     __extends(ArgumentOperation, _super);
     function ArgumentOperation(ast) {
@@ -80,19 +81,19 @@ var ArgumentOperation = /** @class */ (function (_super) {
     }
     ArgumentOperation.prototype.get = function (operationContext) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, stack, args, stack_1, stack_1_1, entity, _a, _b, _c, _d, e_1_1;
-            var e_1, _e;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            var me, stack, args, stack_1, stack_1_1, entity, _a, _b, arg, e_1_1;
+            var e_1, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         me = this;
                         stack = me.stack;
                         args = [];
-                        _f.label = 1;
+                        _d.label = 1;
                     case 1:
-                        _f.trys.push([1, 11, 12, 13]);
+                        _d.trys.push([1, 11, 12, 13]);
                         stack_1 = __values(stack), stack_1_1 = stack_1.next();
-                        _f.label = 2;
+                        _d.label = 2;
                     case 2:
                         if (!!stack_1_1.done) return [3 /*break*/, 10];
                         entity = stack_1_1.value;
@@ -103,33 +104,34 @@ var ArgumentOperation = /** @class */ (function (_super) {
                         if (!(entity instanceof assign_1.default)) return [3 /*break*/, 6];
                         return [4 /*yield*/, entity.get(operationContext, me)];
                     case 4:
-                        _f.sent();
+                        _d.sent();
                         _b = (_a = args).push;
                         return [4 /*yield*/, entity.expr.left.get(operationContext)];
                     case 5:
-                        _b.apply(_a, [_f.sent()]);
+                        _b.apply(_a, [_d.sent()]);
                         return [3 /*break*/, 9];
                     case 6:
-                        if (!(entity instanceof expression_1.Expression)) return [3 /*break*/, 8];
-                        _d = (_c = args).push;
+                        if (!(entity instanceof path_1.default)) return [3 /*break*/, 8];
                         return [4 /*yield*/, entity.get(operationContext, me)];
                     case 7:
-                        _d.apply(_c, [_f.sent()]);
+                        arg = _d.sent();
+                        operationContext.set(arg.path, new nil_1.default());
+                        args.push(arg);
                         return [3 /*break*/, 9];
                     case 8:
                         operationContext.debugger.raise('Unexpected argument', me, entity);
-                        _f.label = 9;
+                        _d.label = 9;
                     case 9:
                         stack_1_1 = stack_1.next();
                         return [3 /*break*/, 2];
                     case 10: return [3 /*break*/, 13];
                     case 11:
-                        e_1_1 = _f.sent();
+                        e_1_1 = _d.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 13];
                     case 12:
                         try {
-                            if (stack_1_1 && !stack_1_1.done && (_e = stack_1.return)) _e.call(stack_1);
+                            if (stack_1_1 && !stack_1_1.done && (_c = stack_1.return)) _c.call(stack_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];

package/dist/operations/function.js

@@ -54,6 +54,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var operation_1 = require("../types/operation");
 var uuid_1 = require("uuid");
 var context_1 = require("../context");
+var typer_1 = require("../typer");
 var FunctionOperation = /** @class */ (function (_super) {
     __extends(FunctionOperation, _super);
     function FunctionOperation(ast, options) {
@@ -111,7 +112,7 @@ var FunctionOperation = /** @class */ (function (_super) {
                         _a.label = 2;
                     case 2:
                         if (!(index < max)) return [3 /*break*/, 5];
-                        if (!incArgs[index]) return [3 /*break*/, 4];
+                        if (!(incArgs === null || incArgs === void 0 ? void 0 : incArgs[index])) return [3 /*break*/, 4];
                         return [4 /*yield*/, opc.set(args[index].path, incArgs[index])];
                     case 3:
                         _a.sent();
@@ -122,7 +123,7 @@ var FunctionOperation = /** @class */ (function (_super) {
                     case 5: return [4 /*yield*/, me.body.run(opc)];
                     case 6:
                         _a.sent();
-                        return [2 /*return*/, functionContext.value];
+                        return [2 /*return*/, (0, typer_1.cast)(functionContext.value)];
                 }
             });
         });

package/dist/operations/if-statement.js

@@ -66,9 +66,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var operation_1 = require("../types/operation");
+var expression_1 = require("../types/expression");
 var if_1 = __importDefault(require("./if"));
 var else_if_1 = __importDefault(require("./else-if"));
 var else_1 = __importDefault(require("./else"));
+var typer_1 = require("../typer");
 var IfStatementOperation = /** @class */ (function (_super) {
     __extends(IfStatementOperation, _super);
     function IfStatementOperation(ast) {
@@ -80,7 +82,7 @@ var IfStatementOperation = /** @class */ (function (_super) {
     }
     IfStatementOperation.prototype.run = function (operationContext) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, clauses, clauses_1, clauses_1_1, clause, isValid, e_1_1;
+            var me, clauses, clauses_1, clauses_1_1, clause, condition, isValid, e_1_1;
             var e_1, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -89,46 +91,59 @@ var IfStatementOperation = /** @class */ (function (_super) {
                         clauses = me.clauses;
                         _b.label = 1;
                     case 1:
-                        _b.trys.push([1, 11, 12, 13]);
+                        _b.trys.push([1, 14, 15, 16]);
                         clauses_1 = __values(clauses), clauses_1_1 = clauses_1.next();
                         _b.label = 2;
                     case 2:
-                        if (!!clauses_1_1.done) return [3 /*break*/, 10];
+                        if (!!clauses_1_1.done) return [3 /*break*/, 13];
                         clause = clauses_1_1.value;
-                        if (!(clause instanceof if_1.default || clause instanceof else_if_1.default)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, clause.condition.get(operationContext)];
+                        if (!(clause instanceof if_1.default || clause instanceof else_if_1.default)) return [3 /*break*/, 9];
+                        condition = clause.condition;
+                        isValid = void 0;
+                        if (!(0, typer_1.isCustomValue)(condition)) return [3 /*break*/, 3];
+                        isValid = condition.valueOf();
+                        return [3 /*break*/, 6];
                     case 3:
-                        isValid = _b.sent();
-                        if (!isValid.valueOf()) return [3 /*break*/, 5];
-                        return [4 /*yield*/, clause.body.run(operationContext)];
+                        if (!(condition instanceof expression_1.Expression ||
+                            condition instanceof operation_1.Operation)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, condition.get(operationContext)];
                     case 4:
-                        _b.sent();
-                        return [3 /*break*/, 10];
-                    case 5: return [3 /*break*/, 9];
+                        isValid = _b.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
+                        operationContext.debugger.raise('Unexpected condition in clause', me, clause.condition);
+                        _b.label = 6;
                     case 6:
-                        if (!(clause instanceof else_1.default)) return [3 /*break*/, 8];
+                        if (!isValid.valueOf()) return [3 /*break*/, 8];
                         return [4 /*yield*/, clause.body.run(operationContext)];
                     case 7:
                         _b.sent();
-                        return [3 /*break*/, 10];
-                    case 8:
-                        operationContext.debugger.raise('Invalid operation in if statement.', me, clause);
-                        _b.label = 9;
+                        return [3 /*break*/, 13];
+                    case 8: return [3 /*break*/, 12];
                     case 9:
+                        if (!(clause instanceof else_1.default)) return [3 /*break*/, 11];
+                        return [4 /*yield*/, clause.body.run(operationContext)];
+                    case 10:
+                        _b.sent();
+                        return [3 /*break*/, 13];
+                    case 11:
+                        operationContext.debugger.raise('Invalid operation in if statement.', me, clause);
+                        _b.label = 12;
+                    case 12:
                         clauses_1_1 = clauses_1.next();
                         return [3 /*break*/, 2];
-                    case 10: return [3 /*break*/, 13];
-                    case 11:
+                    case 13: return [3 /*break*/, 16];
+                    case 14:
                         e_1_1 = _b.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 13];
-                    case 12:
+                        return [3 /*break*/, 16];
+                    case 15:
                         try {
                             if (clauses_1_1 && !clauses_1_1.done && (_a = clauses_1.return)) _a.call(clauses_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 13: return [2 /*return*/];
+                    case 16: return [2 /*return*/];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "0.4.4",
+    "version": "0.4.8",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -34,8 +34,8 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
-        "greybel-core": "^0.1.9",
-        "greyscript-core": "^0.1.7",
+        "greybel-core": "^0.2.1",
+        "greyscript-core": "^0.2.1",
         "uuid": "^8.3.2"
     },
     "keywords": [