@mojir/lits 2.1.21 → 2.1.22

package/dist/src/builtin/interface.d.ts

@@ -5,7 +5,7 @@ import type { Any, Arr } from '../interface';
 import type { SpecialExpressionNode } from '../parser/types';
 import type { SourceCodeInfo } from '../tokenizer/token';
 import type { SpecialExpressions } from '.';
-export type Count = number | {
+export type ParamCount = number | {
     min?: number;
     max?: number;
     even?: true;
@@ -16,7 +16,7 @@ export type NormalExpressionEvaluator<T> = (params: Arr, sourceCodeInfo: SourceC
 }) => T;
 export interface BuiltinNormalExpression<T> {
     evaluate: NormalExpressionEvaluator<T>;
-    paramCount: Count;
+    paramCount: ParamCount;
     aliases?: string[];
 }
 export type BuiltinNormalExpressions = Record<string, BuiltinNormalExpression<Any>>;
@@ -29,7 +29,7 @@ export interface EvaluateHelpers {
 export interface BuiltinSpecialExpression<T, N extends SpecialExpressionNode> {
     evaluate: (node: N, contextStack: ContextStack, helpers: EvaluateHelpers) => T;
     evaluateAsNormalExpression?: NormalExpressionEvaluator<T>;
-    paramCount: Count;
+    paramCount: ParamCount;
     getUndefinedSymbols: (node: N, contextStack: ContextStack, params: {
         getUndefinedSymbols: GetUndefinedSymbols;
         builtin: Builtin;

package/dist/src/builtin/specialExpressions/functions.d.ts

@@ -1,4 +1,4 @@
-import type { LitsFunction, SpecialExpressionNode, SymbolNode } from '../../parser/types';
+import { type LitsFunction, type SpecialExpressionNode, type SymbolNode } from '../../parser/types';
 import type { BuiltinSpecialExpression } from '../interface';
 import type { Function } from '../utils';
 import type { specialExpressionTypes } from '../specialExpressionTypes';

package/dist/src/parser/types.d.ts

@@ -1,5 +1,6 @@
 import type { JsFunction } from '../Lits/Lits';
 import type { SpecialExpressionType } from '../builtin';
+import type { ParamCount } from '../builtin/interface';
 import type { specialExpressionTypes } from '../builtin/specialExpressionTypes';
 import type { FunctionType, NodeType, NodeTypes } from '../constants/constants';
 import type { Context } from '../evaluator/interface';
@@ -15,6 +16,7 @@ interface GenericLitsFunction {
     [FUNCTION_SYMBOL]: true;
     sourceCodeInfo?: SourceCodeInfo;
     functionType: FunctionType;
+    paramCount: ParamCount;
 }
 export interface RegularExpression {
     [REGEXP_SYMBOL]: true;

package/dist/src/typeGuards/index.d.ts

@@ -1,12 +1,12 @@
-import type { Count } from '../builtin/interface';
+import type { ParamCount } from '../builtin/interface';
 import type { UnknownRecord } from '../interface';
 import type { NormalExpressionNodeWithName } from '../parser/types';
 import type { SourceCodeInfo } from '../tokenizer/token';
-export declare function assertNumberOfParams(count: Count, node: NormalExpressionNodeWithName): void;
+export declare function assertNumberOfParams(count: ParamCount, node: NormalExpressionNodeWithName): void;
 export declare function isNonUndefined<T>(value: T | undefined): value is T;
 export declare function asNonUndefined<T>(value: T | undefined, sourceCodeInfo?: SourceCodeInfo): T;
 export declare function assertNonUndefined<T>(value: T | undefined, sourceCodeInfo?: SourceCodeInfo): asserts value is T;
 export declare function isUnknownRecord(value: unknown): value is Record<string, unknown>;
 export declare function assertUnknownRecord(value: unknown, sourceCodeInfo?: SourceCodeInfo): asserts value is UnknownRecord;
 export declare function asUnknownRecord(value: unknown, sourceCodeInfo?: SourceCodeInfo): UnknownRecord;
-export declare function canBeOperator(count: Count): boolean;
+export declare function canBeOperator(count: ParamCount): boolean;

package/dist/src/utils/index.d.ts

@@ -1,6 +1,7 @@
 import type { Any, Coll } from '../interface';
-import type { NativeJsFunction } from '../parser/types';
+import type { FunctionLike, NativeJsFunction, NormalExpressionNodeWithName } from '../parser/types';
 import type { SourceCodeInfo } from '../tokenizer/token';
+import type { ParamCount } from '../builtin/interface';
 export declare function collHasKey(coll: unknown, key: string | number): boolean;
 export declare function compare<T extends string | number>(a: T, b: T, sourceCodeInfo: SourceCodeInfo | undefined): number;
 export declare function deepEqual(a: unknown, b: unknown, sourceCodeInfo?: SourceCodeInfo): boolean;
@@ -13,3 +14,9 @@ export declare function addToSet<T>(target: Set<T>, source: Set<T>): void;
 export declare const EPSILON = 1e-10;
 export declare function approxEqual(a: number, b: number, epsilon?: number): boolean;
 export declare function approxZero(value: number): boolean;
+export declare function mergeParamCounts(count: ParamCount, node: NormalExpressionNodeWithName): void;
+export declare function assertNumberOfParams(count: ParamCount, node: NormalExpressionNodeWithName): void;
+export declare function paramCountAcceptsMin(paramsCount: ParamCount, nbrOfParams: number): boolean;
+export declare function getCommonParamCount(params: FunctionLike[]): ParamCount | null;
+export declare function getParamCount(param: FunctionLike): ParamCount;
+export declare function paramCountMinus(paramCount: ParamCount, count: number): ParamCount;

package/dist/testFramework.esm.js

@@ -896,6 +896,91 @@ function approxEqual(a, b, epsilon) {
 function approxZero(value) {
     return Math.abs(value) < EPSILON;
 }
+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 getCommonParamCount(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 (min !== undefined && max !== undefined && min > max) {
+            return null;
+        }
+        if (even && odd) {
+            return null;
+        }
+        if (odd && min !== undefined && min < 1) {
+            return null;
+        }
+        return { min: min, max: max, even: even, odd: odd };
+    }, {});
+}
+function getParamCount(param) {
+    return (typeof param === 'number' || isColl(param)) ? 1 : param.paramCount;
+}
+function paramCountMinus(paramCount, count) {
+    if (typeof paramCount === 'number') {
+        return paramCount - count;
+    }
+    var min = paramCount.min === undefined ? undefined : paramCount.min - count;
+    var max = paramCount.max === undefined ? undefined : paramCount.max - count;
+    var even = paramCount.even === undefined ? undefined : count % 2 === 0 ? true : undefined;
+    var odd = paramCount.odd === undefined ? undefined : count % 2 === 0 ? true : undefined;
+    return { min: min, max: max, even: even, odd: odd };
+}
 
 // isArray not needed, use Array.isArary
 function asArray(value, sourceCodeInfo) {
@@ -4559,11 +4644,13 @@ var functionalNormalExpression = {
     '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 ? getParamCount(params.at(-1)) : 1,
                 _a;
         },
         paramCount: {},
@@ -4577,6 +4664,7 @@ var functionalNormalExpression = {
                 _b.sourceCodeInfo = sourceCodeInfo,
                 _b.functionType = 'Constantly',
                 _b.value = toAny(value),
+                _b.paramCount = {},
                 _b;
         },
         paramCount: 1,
@@ -4584,11 +4672,17 @@ var functionalNormalExpression = {
     'juxt': {
         evaluate: function (params, sourceCodeInfo) {
             var _a;
+            params.forEach(function (param) { return assertFunctionLike(param, sourceCodeInfo); });
+            var paramCount = getCommonParamCount(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 },
@@ -4597,11 +4691,13 @@ var functionalNormalExpression = {
         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 = getParamCount(fun),
                 _b;
         },
         paramCount: 1,
@@ -4614,6 +4710,7 @@ var functionalNormalExpression = {
                 _a.sourceCodeInfo = sourceCodeInfo,
                 _a.functionType = 'EveryPred',
                 _a.params = params,
+                _a.paramCount = 1,
                 _a;
         },
         paramCount: { min: 1 },
@@ -4626,6 +4723,7 @@ var functionalNormalExpression = {
                 _a.sourceCodeInfo = sourceCodeInfo,
                 _a.functionType = 'SomePred',
                 _a.params = params,
+                _a.paramCount = 1,
                 _a;
         },
         paramCount: { min: 1 },
@@ -4634,12 +4732,14 @@ var functionalNormalExpression = {
         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 = getParamCount(fun),
                 _b;
         },
         paramCount: { min: 2 },
@@ -11714,12 +11814,16 @@ var functionSpecialExpression = {
         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;
@@ -11741,13 +11845,17 @@ var defnSpecialExpression = {
         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 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 = evaluatedFunctionOverloades,
+            _b.evaluatedfunction = evaluatedFunction,
+            _b.paramCount = paramCount,
             _b);
         contextStack.exportValues((_c = {}, _c[functionSymbol[1]] = litsFunction, _c), functionSymbol[2]);
         return litsFunction;
@@ -11769,12 +11877,16 @@ var fnSpecialExpression = {
         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;
     },
@@ -12390,12 +12502,6 @@ new Set(specialExpressionKeys);
 // TODO, remove
 // console.log('builtin', [...specialExpressionKeys, ...normalExpressionKeys].length)
 
-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;
@@ -12415,7 +12521,10 @@ var functionExecutors = {
         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;
@@ -12712,6 +12821,7 @@ function evaluateNormalExpression(node, contextStack) {
                 _a.params = params,
                 _a.placeholders = placeholders,
                 _a.sourceCodeInfo = sourceCodeInfo,
+                _a.paramCount = paramCountMinus(getParamCount(fn), params.length),
                 _a);
             return partialFunction;
         }
@@ -12734,11 +12844,12 @@ function evaluateNormalExpression(node, contextStack) {
         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 = paramCountMinus(getParamCount(fn), params.length),
                 _b);
             return partialFunction;
         }
@@ -12960,11 +13071,13 @@ var ContextStackImpl = /** @class */ (function () {
         }
         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);
@@ -13001,6 +13114,7 @@ function createContextStack(params) {
                         name: name
                     },
                     _b[FUNCTION_SYMBOL] = true,
+                    _b.paramCount = {},
                     _b);
                 return acc;
             }, {}),