@mojir/lits 2.1.22 → 2.1.24

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.22";
+var version = "2.1.24";
 
 function getCodeMarker(sourceCodeInfo) {
     if (!sourceCodeInfo.position || !sourceCodeInfo.code)
@@ -918,91 +918,6 @@ 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) {
@@ -4633,6 +4548,98 @@ function applyPlaceholders(templateString, placeholders, sourceCodeInfo) {
     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) {
@@ -4672,7 +4679,7 @@ var functionalNormalExpression = {
                 _a.sourceCodeInfo = sourceCodeInfo,
                 _a.functionType = 'Comp',
                 _a.params = params,
-                _a.paramCount = params.length > 0 ? getParamCount(params.at(-1)) : 1,
+                _a.paramCount = params.length > 0 ? getParamCountFromFunction(params.at(-1)) : 1,
                 _a;
         },
         paramCount: {},
@@ -4695,7 +4702,7 @@ var functionalNormalExpression = {
         evaluate: function (params, sourceCodeInfo) {
             var _a;
             params.forEach(function (param) { return assertFunctionLike(param, sourceCodeInfo); });
-            var paramCount = getCommonParamCount(params);
+            var paramCount = getCommonParamCountFromFunctions(params);
             if (paramCount === null) {
                 throw new LitsError('All functions must accept the same number of arguments', sourceCodeInfo);
             }
@@ -4719,7 +4726,7 @@ var functionalNormalExpression = {
                 _b.sourceCodeInfo = sourceCodeInfo,
                 _b.functionType = 'Complement',
                 _b.function = fun,
-                _b.paramCount = getParamCount(fun),
+                _b.paramCount = getParamCountFromFunction(fun),
                 _b;
         },
         paramCount: 1,
@@ -4761,7 +4768,7 @@ var functionalNormalExpression = {
                 _b.functionType = 'Fnull',
                 _b.function = fun,
                 _b.params = params,
-                _b.paramCount = getParamCount(fun),
+                _b.paramCount = getParamCountFromFunction(fun),
                 _b;
         },
         paramCount: { min: 2 },
@@ -11869,8 +11876,7 @@ var defnSpecialExpression = {
         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 paramCount = { min: min };
         var litsFunction = (_b = {},
             _b[FUNCTION_SYMBOL] = true,
             _b.sourceCodeInfo = node[2],
@@ -12843,7 +12849,7 @@ function evaluateNormalExpression(node, contextStack) {
                 _a.params = params,
                 _a.placeholders = placeholders,
                 _a.sourceCodeInfo = sourceCodeInfo,
-                _a.paramCount = paramCountMinus(getParamCount(fn), params.length),
+                _a.paramCount = placeholders.length,
                 _a);
             return partialFunction;
         }
@@ -12871,7 +12877,7 @@ function evaluateNormalExpression(node, contextStack) {
                 _b.params = params,
                 _b.placeholders = placeholders,
                 _b.sourceCodeInfo = sourceCodeInfo,
-                _b.paramCount = paramCountMinus(getParamCount(fn), params.length),
+                _b.paramCount = placeholders.length,
                 _b);
             return partialFunction;
         }
@@ -13121,7 +13127,8 @@ function createContextStack(params) {
         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;
@@ -13136,7 +13143,7 @@ function createContextStack(params) {
                         name: name
                     },
                     _b[FUNCTION_SYMBOL] = true,
-                    _b.paramCount = {},
+                    _b.paramCount = (_c = jsFunction.paramCount) !== null && _c !== void 0 ? _c : {},
                     _b);
                 return acc;
             }, {}),
@@ -13834,8 +13841,7 @@ function createNamedNormalExpressionNode(symbolNode, params, sourceCodeInfo) {
     return node;
 }
 function createAccessorNode(left, right, sourceCodeInfo) {
-    // Unnamed normal expression
-    return withSourceCodeInfo([NodeTypes.NormalExpression, [left, [right]]], sourceCodeInfo);
+    return withSourceCodeInfo([NodeTypes.NormalExpression, [[NodeTypes.NormalBuiltinSymbol, normalExpressionTypes.get], [left, right]]], sourceCodeInfo);
 }
 function fromBinaryOperatorToNode(operator, symbolNode, left, right, sourceCodeInfo) {
     var operatorName = operator[1];

package/dist/cli/src/Lits/Lits.d.ts

@@ -3,6 +3,7 @@ import type { Any } from '../interface';
 import type { Ast, LitsFunction } from '../parser/types';
 import type { TokenStream } from '../tokenizer/tokenize';
 import { AutoCompleter } from '../AutoCompleter/AutoCompleter';
+import type { ParamCount } from '../builtin/interface';
 import { Cache } from './Cache';
 export interface LitsRuntimeInfo {
     astCache: Cache | null;
@@ -11,6 +12,7 @@ export interface LitsRuntimeInfo {
 }
 export interface JsFunction {
     fn: (...args: any[]) => unknown;
+    paramCount?: ParamCount;
 }
 export interface ContextParams {
     globalContext?: Context;

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

@@ -1,22 +1,13 @@
 import type { Any, Coll } from '../interface';
-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;
 export declare function toNonNegativeInteger(num: number): number;
 export declare function toAny(value: unknown): Any;
 export declare function cloneColl<T extends Coll>(value: T): T;
-export declare function createNativeJsFunction(fn: (...args: any[]) => unknown, name?: string): NativeJsFunction;
 export declare function joinSets<T>(...results: Set<T>[]): Set<T>;
 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/cli/src/utils/paramCount.d.ts

@@ -0,0 +1,7 @@
+import type { ParamCount } from '../builtin/interface';
+import type { FunctionLike, NormalExpressionNodeWithName } from '../parser/types';
+export declare function paramCountAccepts(paramsCount: ParamCount, nbrOfParams: number): boolean;
+export declare function paramCountAcceptsMin(paramsCount: ParamCount, nbrOfParams: number): boolean;
+export declare function getCommonParamCountFromFunctions(params: FunctionLike[]): ParamCount | null;
+export declare function getParamCountFromFunction(param: FunctionLike): ParamCount;
+export declare function assertNumberOfParams(count: ParamCount, node: NormalExpressionNodeWithName): void;

package/dist/index.esm.js

@@ -745,18 +745,6 @@ function clone(value) {
 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.paramCount = {},
-        _a;
-}
 function joinSets() {
     var e_1, _a;
     var results = [];
@@ -801,91 +789,6 @@ 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) {
@@ -4516,6 +4419,98 @@ function applyPlaceholders(templateString, placeholders, sourceCodeInfo) {
     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) {
@@ -4555,7 +4550,7 @@ var functionalNormalExpression = {
                 _a.sourceCodeInfo = sourceCodeInfo,
                 _a.functionType = 'Comp',
                 _a.params = params,
-                _a.paramCount = params.length > 0 ? getParamCount(params.at(-1)) : 1,
+                _a.paramCount = params.length > 0 ? getParamCountFromFunction(params.at(-1)) : 1,
                 _a;
         },
         paramCount: {},
@@ -4578,7 +4573,7 @@ var functionalNormalExpression = {
         evaluate: function (params, sourceCodeInfo) {
             var _a;
             params.forEach(function (param) { return assertFunctionLike(param, sourceCodeInfo); });
-            var paramCount = getCommonParamCount(params);
+            var paramCount = getCommonParamCountFromFunctions(params);
             if (paramCount === null) {
                 throw new LitsError('All functions must accept the same number of arguments', sourceCodeInfo);
             }
@@ -4602,7 +4597,7 @@ var functionalNormalExpression = {
                 _b.sourceCodeInfo = sourceCodeInfo,
                 _b.functionType = 'Complement',
                 _b.function = fun,
-                _b.paramCount = getParamCount(fun),
+                _b.paramCount = getParamCountFromFunction(fun),
                 _b;
         },
         paramCount: 1,
@@ -4644,7 +4639,7 @@ var functionalNormalExpression = {
                 _b.functionType = 'Fnull',
                 _b.function = fun,
                 _b.params = params,
-                _b.paramCount = getParamCount(fun),
+                _b.paramCount = getParamCountFromFunction(fun),
                 _b;
         },
         paramCount: { min: 2 },
@@ -11817,8 +11812,7 @@ var defnSpecialExpression = {
         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 paramCount = { min: min };
         var litsFunction = (_b = {},
             _b[FUNCTION_SYMBOL] = true,
             _b.sourceCodeInfo = node[2],
@@ -12881,7 +12875,7 @@ function evaluateNormalExpression(node, contextStack) {
                 _a.params = params,
                 _a.placeholders = placeholders,
                 _a.sourceCodeInfo = sourceCodeInfo,
-                _a.paramCount = paramCountMinus(getParamCount(fn), params.length),
+                _a.paramCount = placeholders.length,
                 _a);
             return partialFunction;
         }
@@ -12909,7 +12903,7 @@ function evaluateNormalExpression(node, contextStack) {
                 _b.params = params,
                 _b.placeholders = placeholders,
                 _b.sourceCodeInfo = sourceCodeInfo,
-                _b.paramCount = paramCountMinus(getParamCount(fn), params.length),
+                _b.paramCount = placeholders.length,
                 _b);
             return partialFunction;
         }
@@ -13159,7 +13153,8 @@ function createContextStack(params) {
         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;
@@ -13174,7 +13169,7 @@ function createContextStack(params) {
                         name: name
                     },
                     _b[FUNCTION_SYMBOL] = true,
-                    _b.paramCount = {},
+                    _b.paramCount = (_c = jsFunction.paramCount) !== null && _c !== void 0 ? _c : {},
                     _b);
                 return acc;
             }, {}),
@@ -13872,8 +13867,7 @@ function createNamedNormalExpressionNode(symbolNode, params, sourceCodeInfo) {
     return node;
 }
 function createAccessorNode(left, right, sourceCodeInfo) {
-    // Unnamed normal expression
-    return withSourceCodeInfo([NodeTypes.NormalExpression, [left, [right]]], sourceCodeInfo);
+    return withSourceCodeInfo([NodeTypes.NormalExpression, [[NodeTypes.NormalBuiltinSymbol, normalExpressionTypes.get], [left, right]]], sourceCodeInfo);
 }
 function fromBinaryOperatorToNode(operator, symbolNode, left, right, sourceCodeInfo) {
     var operatorName = operator[1];
@@ -31199,5 +31193,5 @@ Object.values(apiReference).forEach(function (ref) {
     ref.title = ref.title.replace(/"/g, '&quot;');
 });
 
-export { Lits, apiReference, asLitsFunction, asNativeJsFunction, asUserDefinedFunction, assertLitsFunction, assertNativeJsFunction, assertUserDefinedFunction, createNativeJsFunction, isApiName, isBuiltinFunction, isDataType, isDatatypeReference, isFunctionReference, isGrid, isLitsError, isLitsFunction, isMatrix, isNativeJsFunction, isShorthandReference, isUserDefinedFunction, isVector, normalExpressionKeys, specialExpressionKeys };
+export { Lits, apiReference, asLitsFunction, asNativeJsFunction, asUserDefinedFunction, assertLitsFunction, assertNativeJsFunction, assertUserDefinedFunction, isApiName, isBuiltinFunction, isDataType, isDatatypeReference, isFunctionReference, isGrid, isLitsError, isLitsFunction, isMatrix, isNativeJsFunction, isShorthandReference, isUserDefinedFunction, isVector, normalExpressionKeys, specialExpressionKeys };
 //# sourceMappingURL=index.esm.js.map