greybel-interpreter 0.1.3 → 0.1.4

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

@@ -71,7 +71,10 @@ var multiplyString = function (a, b) {
 exports.multiplyString = multiplyString;
 exports.OPERATIONS = (_a = {},
     _a[greybel_core_1.Operator.Plus] = function (a, b) {
-        if ((0, typer_1.isCustomList)(a) || (0, typer_1.isCustomList)(b)) {
+        if ((0, typer_1.isCustomMap)(a) && (0, typer_1.isCustomMap)(b)) {
+            return a.extend(b.value);
+        }
+        else if ((0, typer_1.isCustomList)(a) && (0, typer_1.isCustomList)(b)) {
             return a.concat(b);
         }
         var aVal = (0, typer_1.isCustomString)(a) ? (a.valueOf() || '') : (0, exports.toPrimitive)(a);
@@ -140,7 +143,7 @@ var LogicalAndBinaryExpression = /** @class */ (function (_super) {
             return value.get(operationContext);
         };
         var evaluate = function (node) { return __awaiter(_this, void 0, void 0, function () {
-            var left, right, _a;
+            var left, right, _a, result;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -156,7 +159,8 @@ var LogicalAndBinaryExpression = /** @class */ (function (_super) {
                         return [4 /*yield*/, resolve(node.right)];
                     case 3:
                         right = _b.sent();
-                        return [2 /*return*/, (0, typer_1.cast)(exports.OPERATIONS[node.operator](left, right))];
+                        result = exports.OPERATIONS[node.operator](left, right);
+                        return [2 /*return*/, (0, typer_1.cast)(Number.isNaN(result) ? null : result)];
                     case 4: return [4 /*yield*/, resolve(node.left)];
                     case 5:
                         left = _b.sent();

package/dist/typer.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -84,12 +73,15 @@ var cast = function (value) {
             value = value.map(exports.cast);
             return new list_1.default(value);
         }
-        value = Object.entries(value).reduce(function (result, _a) {
-            var _b;
-            var _c = __read(_a, 2), key = _c[0], item = _c[1];
-            return __assign(__assign({}, result), (_b = {}, _b[key] = (0, exports.cast)(item), _b));
-        }, {});
-        return new map_1.default(value);
+        else if (value instanceof Map) {
+            return new map_1.default(value);
+        }
+        var result_1 = new Map();
+        Object.entries(value).forEach(function (_a) {
+            var _b = __read(_a, 2), key = _b[0], item = _b[1];
+            result_1.set(key, (0, exports.cast)(item));
+        });
+        return new map_1.default(result_1);
     }
     else if (type === 'function') {
         return value;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",