@mojir/lits 2.1.21 → 2.1.23

package/dist/lits.iife.js

@@ -748,17 +748,6 @@ var Lits = (function (exports) {
     function cloneColl(value) {
         return clone(value);
     }
-    function createNativeJsFunction(fn, name) {
-        var _a;
-        return _a = {},
-            _a[FUNCTION_SYMBOL] = true,
-            _a.nativeFn = {
-                fn: fn,
-            },
-            _a.name = name,
-            _a.functionType = 'NativeJsFunction',
-            _a;
-    }
     function joinSets() {
         var e_1, _a;
         var results = [];
@@ -4433,6 +4422,98 @@ var Lits = (function (exports) {
         return templateString;
     }
 
+    function paramCountAccepts(paramsCount, nbrOfParams) {
+        if (typeof paramsCount === 'number') {
+            return paramsCount === nbrOfParams;
+        }
+        var min = paramsCount.min, max = paramsCount.max, even = paramsCount.even, odd = paramsCount.odd;
+        if (even && nbrOfParams % 2 !== 0) {
+            return false;
+        }
+        if (odd && nbrOfParams % 2 !== 1) {
+            return false;
+        }
+        if (typeof min === 'number' && nbrOfParams < min) {
+            return false;
+        }
+        if (typeof max === 'number' && nbrOfParams > max) {
+            return false;
+        }
+        return true;
+    }
+    function paramCountAcceptsMin(paramsCount, nbrOfParams) {
+        if (typeof paramsCount === 'number') {
+            return nbrOfParams >= paramsCount;
+        }
+        var min = paramsCount.min;
+        if (typeof min === 'number' && nbrOfParams < min) {
+            return false;
+        }
+        return true;
+    }
+    function getCommonParamCountFromFunctions(params) {
+        return params.reduce(function (acc, param) {
+            if (acc === null) {
+                return null;
+            }
+            var paramCount = (typeof param === 'number' || isColl(param)) ? 1 : param.paramCount;
+            if (typeof acc === 'number' && typeof paramCount === 'number') {
+                return acc === paramCount ? acc : null;
+            }
+            if (typeof paramCount === 'number') {
+                if (paramCountAccepts(acc, paramCount)) {
+                    return paramCount;
+                }
+                return null;
+            }
+            if (typeof acc === 'number') {
+                if (paramCountAccepts(paramCount, acc)) {
+                    return acc;
+                }
+                return null;
+            }
+            var aMin = paramCount.min, aMax = paramCount.max, aEven = paramCount.even, aOdd = paramCount.odd;
+            var bMin = acc.min, bMax = acc.max, bEven = acc.even, bOdd = acc.odd;
+            var min = typeof aMin === 'number' && typeof bMin === 'number'
+                ? Math.max(aMin, bMin)
+                : typeof aMin === 'number' ? aMin : typeof bMin === 'number' ? bMin : undefined;
+            var max = typeof aMax === 'number' && typeof bMax === 'number'
+                ? Math.min(aMax, bMax)
+                : typeof aMax === 'number' ? aMax : typeof bMax === 'number' ? bMax : undefined;
+            var even = aEven !== null && aEven !== void 0 ? aEven : bEven;
+            var odd = aOdd !== null && aOdd !== void 0 ? aOdd : bOdd;
+            if (even && odd) {
+                return null;
+            }
+            if (even) {
+                if (typeof min === 'number' && min % 2 !== 0) {
+                    min += 1;
+                }
+                if (typeof max === 'number' && max % 2 !== 0) {
+                    max -= 1;
+                }
+            }
+            if (odd) {
+                if (typeof min === 'number' && min % 2 === 0) {
+                    min += 1;
+                }
+                if (typeof max === 'number' && max % 2 === 0) {
+                    max -= 1;
+                }
+            }
+            if (typeof min === 'number' && typeof max === 'number' && min > max) {
+                return null;
+            }
+            if (typeof min === 'number' && min === max) {
+                return min;
+            }
+            return { min: min, max: max, even: even, odd: odd };
+        }, {});
+    }
+    function getParamCountFromFunction(param) {
+        return (typeof param === 'number' || isColl(param)) ? 1 : param.paramCount;
+    }
+
     var functionalNormalExpression = {
         '|>': {
             evaluate: function (_a, sourceCodeInfo, contextStack, _b) {
@@ -4466,11 +4547,13 @@ var Lits = (function (exports) {
         'comp': {
             evaluate: function (params, sourceCodeInfo) {
                 var _a;
+                params.forEach(function (param) { return assertFunctionLike(param, sourceCodeInfo); });
                 return _a = {},
                     _a[FUNCTION_SYMBOL] = true,
                     _a.sourceCodeInfo = sourceCodeInfo,
                     _a.functionType = 'Comp',
                     _a.params = params,
+                    _a.paramCount = params.length > 0 ? getParamCountFromFunction(params.at(-1)) : 1,
                     _a;
             },
             paramCount: {},
@@ -4484,6 +4567,7 @@ var Lits = (function (exports) {
                     _b.sourceCodeInfo = sourceCodeInfo,
                     _b.functionType = 'Constantly',
                     _b.value = toAny(value),
+                    _b.paramCount = {},
                     _b;
             },
             paramCount: 1,
@@ -4491,11 +4575,17 @@ var Lits = (function (exports) {
         'juxt': {
             evaluate: function (params, sourceCodeInfo) {
                 var _a;
+                params.forEach(function (param) { return assertFunctionLike(param, sourceCodeInfo); });
+                var paramCount = getCommonParamCountFromFunctions(params);
+                if (paramCount === null) {
+                    throw new LitsError('All functions must accept the same number of arguments', sourceCodeInfo);
+                }
                 return _a = {},
                     _a[FUNCTION_SYMBOL] = true,
                     _a.sourceCodeInfo = sourceCodeInfo,
                     _a.functionType = 'Juxt',
                     _a.params = params,
+                    _a.paramCount = paramCount,
                     _a;
             },
             paramCount: { min: 1 },
@@ -4504,11 +4594,13 @@ var Lits = (function (exports) {
             evaluate: function (_a, sourceCodeInfo) {
                 var _b;
                 var _c = __read(_a, 1), fn = _c[0];
+                var fun = asFunctionLike(fn, sourceCodeInfo);
                 return _b = {},
                     _b[FUNCTION_SYMBOL] = true,
                     _b.sourceCodeInfo = sourceCodeInfo,
                     _b.functionType = 'Complement',
-                    _b.function = asFunctionLike(fn, sourceCodeInfo),
+                    _b.function = fun,
+                    _b.paramCount = getParamCountFromFunction(fun),
                     _b;
             },
             paramCount: 1,
@@ -4521,6 +4613,7 @@ var Lits = (function (exports) {
                     _a.sourceCodeInfo = sourceCodeInfo,
                     _a.functionType = 'EveryPred',
                     _a.params = params,
+                    _a.paramCount = 1,
                     _a;
             },
             paramCount: { min: 1 },
@@ -4533,6 +4626,7 @@ var Lits = (function (exports) {
                     _a.sourceCodeInfo = sourceCodeInfo,
                     _a.functionType = 'SomePred',
                     _a.params = params,
+                    _a.paramCount = 1,
                     _a;
             },
             paramCount: { min: 1 },
@@ -4541,12 +4635,14 @@ var Lits = (function (exports) {
             evaluate: function (_a, sourceCodeInfo) {
                 var _b;
                 var _c = __read(_a), fn = _c[0], params = _c.slice(1);
+                var fun = asFunctionLike(fn, sourceCodeInfo);
                 return _b = {},
                     _b[FUNCTION_SYMBOL] = true,
                     _b.sourceCodeInfo = sourceCodeInfo,
                     _b.functionType = 'Fnull',
-                    _b.function = asFunctionLike(fn, sourceCodeInfo),
+                    _b.function = fun,
                     _b.params = params,
+                    _b.paramCount = getParamCountFromFunction(fun),
                     _b;
             },
             paramCount: { min: 2 },
@@ -11686,12 +11782,16 @@ var Lits = (function (exports) {
             assertUserDefinedSymbolNode(functionSymbol, node[2]);
             assertNameNotDefined(functionSymbol[1], contextStack, builtin, node[2]);
             var evaluatedFunction = evaluateFunction(fn, contextStack, builtin, getUndefinedSymbols, evaluateNode);
+            var min = evaluatedFunction[0].filter(function (arg) { return arg[0] !== bindingTargetTypes.rest && arg[1][1] === undefined; }).length;
+            var max = evaluatedFunction[0].some(function (arg) { return arg[0] === bindingTargetTypes.rest; }) ? undefined : evaluatedFunction[0].length;
+            var paramCount = min === max ? min : { min: min, max: max };
             var litsFunction = (_b = {},
                 _b[FUNCTION_SYMBOL] = true,
                 _b.sourceCodeInfo = node[2],
                 _b.functionType = 'UserDefined',
                 _b.name = functionSymbol[1],
                 _b.evaluatedfunction = evaluatedFunction,
+                _b.paramCount = paramCount,
                 _b);
             contextStack.addValues((_c = {}, _c[functionSymbol[1]] = litsFunction, _c), functionSymbol[2]);
             return litsFunction;
@@ -11713,13 +11813,16 @@ var Lits = (function (exports) {
             var _d = __read(node[1], 3), functionSymbol = _d[1], fn = _d[2];
             assertUserDefinedSymbolNode(functionSymbol, node[2]);
             assertNameNotDefined(functionSymbol[1], contextStack, builtin, node[2]);
-            var evaluatedFunctionOverloades = evaluateFunction(fn, contextStack, builtin, getUndefinedSymbols, evaluateNode);
+            var evaluatedFunction = evaluateFunction(fn, contextStack, builtin, getUndefinedSymbols, evaluateNode);
+            var min = evaluatedFunction[0].filter(function (arg) { return arg[0] !== bindingTargetTypes.rest && arg[1][1] === undefined; }).length;
+            var paramCount = { min: min };
             var litsFunction = (_b = {},
                 _b[FUNCTION_SYMBOL] = true,
                 _b.sourceCodeInfo = node[2],
                 _b.functionType = 'UserDefined',
                 _b.name = functionSymbol[1],
-                _b.evaluatedfunction = evaluatedFunctionOverloades,
+                _b.evaluatedfunction = evaluatedFunction,
+                _b.paramCount = paramCount,
                 _b);
             contextStack.exportValues((_c = {}, _c[functionSymbol[1]] = litsFunction, _c), functionSymbol[2]);
             return litsFunction;
@@ -11741,12 +11844,16 @@ var Lits = (function (exports) {
             var builtin = _a.builtin, getUndefinedSymbols = _a.getUndefinedSymbols, evaluateNode = _a.evaluateNode;
             var fn = node[1][1];
             var evaluatedFunction = evaluateFunction(fn, contextStack, builtin, getUndefinedSymbols, evaluateNode);
+            var min = evaluatedFunction[0].filter(function (arg) { return arg[0] !== bindingTargetTypes.rest && arg[1][1] === undefined; }).length;
+            var max = evaluatedFunction[0].some(function (arg) { return arg[0] === bindingTargetTypes.rest; }) ? undefined : evaluatedFunction[0].length;
+            var paramCount = min === max ? min : { min: min, max: max };
             var litsFunction = (_b = {},
                 _b[FUNCTION_SYMBOL] = true,
                 _b.sourceCodeInfo = node[2],
                 _b.functionType = 'UserDefined',
                 _b.name = undefined,
                 _b.evaluatedfunction = evaluatedFunction,
+                _b.paramCount = paramCount,
                 _b);
             return litsFunction;
         },
@@ -12452,12 +12559,6 @@ var Lits = (function (exports) {
         }
     }
 
-    function checkParams(evaluatedFunction, nbrOfParams, sourceCodeInfo) {
-        var minArity = evaluatedFunction[0].filter(function (arg) { return arg[0] !== bindingTargetTypes.rest && arg[1][1] === undefined; }).length;
-        if (nbrOfParams < minArity) {
-            throw new LitsError("Unexpected number of arguments. Expected at least ".concat(minArity, ", got ").concat(nbrOfParams, "."), sourceCodeInfo);
-        }
-    }
     var functionExecutors = {
         NativeJsFunction: function (fn, params, sourceCodeInfo) {
             var _a;
@@ -12477,7 +12578,10 @@ var Lits = (function (exports) {
             var evaluateNode = _a.evaluateNode;
             var _loop_1 = function () {
                 var e_1, _b;
-                checkParams(fn.evaluatedfunction, params.length, sourceCodeInfo);
+                if (!paramCountAcceptsMin(fn.paramCount, params.length)) {
+                    throw new LitsError("Expected ".concat(fn.paramCount, " arguments, got ").concat(params.length, "."), sourceCodeInfo);
+                }
+                // checkParams(fn.evaluatedfunction, params.length, sourceCodeInfo)
                 var evaluatedFunction = fn.evaluatedfunction;
                 var args = evaluatedFunction[0];
                 var nbrOfNonRestArgs = args.filter(function (arg) { return arg[0] !== bindingTargetTypes.rest; }).length;
@@ -12774,6 +12878,7 @@ var Lits = (function (exports) {
                     _a.params = params,
                     _a.placeholders = placeholders,
                     _a.sourceCodeInfo = sourceCodeInfo,
+                    _a.paramCount = placeholders.length,
                     _a);
                 return partialFunction;
             }
@@ -12796,11 +12901,12 @@ var Lits = (function (exports) {
             if (placeholders.length > 0) {
                 var partialFunction = (_b = {},
                     _b[FUNCTION_SYMBOL] = true,
-                    _b.function = asFunctionLike(fn, sourceCodeInfo),
+                    _b.function = fn,
                     _b.functionType = 'Partial',
                     _b.params = params,
                     _b.placeholders = placeholders,
                     _b.sourceCodeInfo = sourceCodeInfo,
+                    _b.paramCount = placeholders.length,
                     _b);
                 return partialFunction;
             }
@@ -13022,11 +13128,13 @@ var Lits = (function (exports) {
             }
             if (isNormalBuiltinSymbolNode(node)) {
                 var type = node[1];
+                var normalExpression = allNormalExpressions[type];
                 return _b = {},
                     _b[FUNCTION_SYMBOL] = true,
                     _b.functionType = 'Builtin',
                     _b.normalBuitinSymbolType = type,
                     _b.sourceCodeInfo = node[2],
+                    _b.paramCount = normalExpression.paramCount,
                     _b;
             }
             var lookUpResult = this.lookUp(node);
@@ -13048,7 +13156,8 @@ var Lits = (function (exports) {
             nativeJsFunctions: params.jsFunctions
                 && Object.entries(params.jsFunctions).reduce(function (acc, _a) {
                     var _b;
-                    var _c = __read(_a, 2), name = _c[0], jsFunction = _c[1];
+                    var _c;
+                    var _d = __read(_a, 2), name = _d[0], jsFunction = _d[1];
                     if (specialExpressionKeys.includes(name)) {
                         console.warn("Cannot shadow special expression \"".concat(name, "\", ignoring."));
                         return acc;
@@ -13063,6 +13172,7 @@ var Lits = (function (exports) {
                             name: name
                         },
                         _b[FUNCTION_SYMBOL] = true,
+                        _b.paramCount = (_c = jsFunction.paramCount) !== null && _c !== void 0 ? _c : {},
                         _b);
                     return acc;
                 }, {}),
@@ -31095,7 +31205,6 @@ var Lits = (function (exports) {
     exports.assertLitsFunction = assertLitsFunction;
     exports.assertNativeJsFunction = assertNativeJsFunction;
     exports.assertUserDefinedFunction = assertUserDefinedFunction;
-    exports.createNativeJsFunction = createNativeJsFunction;
     exports.isApiName = isApiName;
     exports.isBuiltinFunction = isBuiltinFunction;
     exports.isDataType = isDataType;