@mojir/lits 2.1.3 → 2.1.4

package/dist/cli/cli.js

@@ -92,7 +92,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var version = "2.1.3";
+var version = "2.1.4";
 
 function getCodeMarker(sourceCodeInfo) {
     if (!sourceCodeInfo.position || !sourceCodeInfo.code)
@@ -696,6 +696,10 @@ function isLitsFunction(value) {
         return false;
     return !!value[FUNCTION_SYMBOL];
 }
+function asLitsFunction(value, sourceCodeInfo) {
+    assertLitsFunction(value, sourceCodeInfo);
+    return value;
+}
 function assertLitsFunction(value, sourceCodeInfo) {
     if (!isLitsFunction(value))
         throw getAssertionError('LitsFunction', value, sourceCodeInfo);
@@ -1384,26 +1388,37 @@ var sequenceNormalExpression = {
         paramCount: 1,
     },
     'map': {
-        evaluate: function (_a, sourceCodeInfo, contextStack, _b) {
-            var _c = __read(_a, 2), seq = _c[0], fn = _c[1];
-            var executeFunction = _b.executeFunction;
-            assertSeq(seq, sourceCodeInfo);
-            assertLitsFunction(fn, sourceCodeInfo);
-            if (Array.isArray(seq)) {
-                return seq.map(function (elem) { return executeFunction(fn, [elem], contextStack, sourceCodeInfo); });
+        evaluate: function (params, sourceCodeInfo, contextStack, _a) {
+            var executeFunction = _a.executeFunction;
+            var fn = asLitsFunction(params.at(-1));
+            var seqs = params.slice(0, -1);
+            assertSeq(seqs[0], sourceCodeInfo);
+            var isString = typeof seqs[0] === 'string';
+            var len = seqs[0].length;
+            seqs.slice(1).forEach(function (seq) {
+                if (isString) {
+                    assertString(seq, sourceCodeInfo);
+                }
+                else {
+                    assertArray(seq, sourceCodeInfo);
+                }
+                len = Math.min(len, seq.length);
+            });
+            var paramArray = [];
+            var _loop_1 = function (i) {
+                paramArray.push(seqs.map(function (seq) { return seq[i]; }));
+            };
+            for (var i = 0; i < len; i++) {
+                _loop_1(i);
             }
-            else {
-                return seq
-                    .split('')
-                    .map(function (elem) {
-                    var newVal = executeFunction(fn, [elem], contextStack, sourceCodeInfo);
-                    assertString(newVal, sourceCodeInfo, { char: true });
-                    return newVal;
-                })
-                    .join('');
+            var mapped = paramArray.map(function (p) { return executeFunction(fn, p, contextStack, sourceCodeInfo); });
+            if (!isString) {
+                return mapped;
             }
+            mapped.forEach(function (char) { return assertString(char, sourceCodeInfo); });
+            return mapped.join('');
         },
-        paramCount: 2,
+        paramCount: { min: 2 },
     },
     'pop': {
         evaluate: function (_a, sourceCodeInfo) {
@@ -1953,7 +1968,7 @@ var sequenceNormalExpression = {
             assertSeq(input, sourceCodeInfo);
             if (Array.isArray(input)) {
                 var result = [];
-                var _loop_1 = function (item) {
+                var _loop_2 = function (item) {
                     assertAny(item, sourceCodeInfo);
                     if (!result.some(function (existingItem) { return deepEqual(existingItem, item, sourceCodeInfo); })) {
                         result.push(item);
@@ -1962,7 +1977,7 @@ var sequenceNormalExpression = {
                 try {
                     for (var input_1 = __values(input), input_1_1 = input_1.next(); !input_1_1.done; input_1_1 = input_1.next()) {
                         var item = input_1_1.value;
-                        _loop_1(item);
+                        _loop_2(item);
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -11407,19 +11422,23 @@ var sequenceReference = {
             type: 'any',
             rest: true,
         },
-        args: __assign(__assign({}, getOperatorArgs('sequence', 'function')), { seq: {
+        args: __assign(__assign({}, getOperatorArgs('sequence', 'function')), { seqs: {
                 type: 'sequence',
+                rest: true,
+                description: 'At least one.',
             }, fun: {
                 type: 'function',
             } }),
         variants: [
-            { argumentNames: ['seq', 'fun'] },
+            { argumentNames: ['seqs', 'fun'] },
         ],
-        description: 'Creates a new array populated with the results of calling $fun on every elements in $seq.',
+        description: 'Creates a new array populated with the results of calling $fun on every element in $seqs.',
         examples: [
+            '[1, 2, 3] map -',
             '[1, 2, 3] map -> -($)',
             'map(["Albert", "Mojir", 42], str)',
             'map([1, 2, 3], inc)',
+            'map([1, 2, 3], [1, 10, 100], *)',
         ],
     },
     'filter': {

package/dist/index.esm.js

@@ -1262,26 +1262,37 @@ var sequenceNormalExpression = {
         paramCount: 1,
     },
     'map': {
-        evaluate: function (_a, sourceCodeInfo, contextStack, _b) {
-            var _c = __read(_a, 2), seq = _c[0], fn = _c[1];
-            var executeFunction = _b.executeFunction;
-            assertSeq(seq, sourceCodeInfo);
-            assertLitsFunction(fn, sourceCodeInfo);
-            if (Array.isArray(seq)) {
-                return seq.map(function (elem) { return executeFunction(fn, [elem], contextStack, sourceCodeInfo); });
+        evaluate: function (params, sourceCodeInfo, contextStack, _a) {
+            var executeFunction = _a.executeFunction;
+            var fn = asLitsFunction(params.at(-1));
+            var seqs = params.slice(0, -1);
+            assertSeq(seqs[0], sourceCodeInfo);
+            var isString = typeof seqs[0] === 'string';
+            var len = seqs[0].length;
+            seqs.slice(1).forEach(function (seq) {
+                if (isString) {
+                    assertString(seq, sourceCodeInfo);
+                }
+                else {
+                    assertArray(seq, sourceCodeInfo);
+                }
+                len = Math.min(len, seq.length);
+            });
+            var paramArray = [];
+            var _loop_1 = function (i) {
+                paramArray.push(seqs.map(function (seq) { return seq[i]; }));
+            };
+            for (var i = 0; i < len; i++) {
+                _loop_1(i);
             }
-            else {
-                return seq
-                    .split('')
-                    .map(function (elem) {
-                    var newVal = executeFunction(fn, [elem], contextStack, sourceCodeInfo);
-                    assertString(newVal, sourceCodeInfo, { char: true });
-                    return newVal;
-                })
-                    .join('');
+            var mapped = paramArray.map(function (p) { return executeFunction(fn, p, contextStack, sourceCodeInfo); });
+            if (!isString) {
+                return mapped;
             }
+            mapped.forEach(function (char) { return assertString(char, sourceCodeInfo); });
+            return mapped.join('');
         },
-        paramCount: 2,
+        paramCount: { min: 2 },
     },
     'pop': {
         evaluate: function (_a, sourceCodeInfo) {
@@ -1831,7 +1842,7 @@ var sequenceNormalExpression = {
             assertSeq(input, sourceCodeInfo);
             if (Array.isArray(input)) {
                 var result = [];
-                var _loop_1 = function (item) {
+                var _loop_2 = function (item) {
                     assertAny(item, sourceCodeInfo);
                     if (!result.some(function (existingItem) { return deepEqual(existingItem, item, sourceCodeInfo); })) {
                         result.push(item);
@@ -1840,7 +1851,7 @@ var sequenceNormalExpression = {
                 try {
                     for (var input_1 = __values(input), input_1_1 = input_1.next(); !input_1_1.done; input_1_1 = input_1.next()) {
                         var item = input_1_1.value;
-                        _loop_1(item);
+                        _loop_2(item);
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -11301,19 +11312,23 @@ var sequenceReference = {
             type: 'any',
             rest: true,
         },
-        args: __assign(__assign({}, getOperatorArgs('sequence', 'function')), { seq: {
+        args: __assign(__assign({}, getOperatorArgs('sequence', 'function')), { seqs: {
                 type: 'sequence',
+                rest: true,
+                description: 'At least one.',
             }, fun: {
                 type: 'function',
             } }),
         variants: [
-            { argumentNames: ['seq', 'fun'] },
+            { argumentNames: ['seqs', 'fun'] },
         ],
-        description: 'Creates a new array populated with the results of calling $fun on every elements in $seq.',
+        description: 'Creates a new array populated with the results of calling $fun on every element in $seqs.',
         examples: [
+            '[1, 2, 3] map -',
             '[1, 2, 3] map -> -($)',
             'map(["Albert", "Mojir", 42], str)',
             'map([1, 2, 3], inc)',
+            'map([1, 2, 3], [1, 10, 100], *)',
         ],
     },
     'filter': {