@mojir/lits 2.1.2 → 2.1.3

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.2";
+var version = "2.1.3";
 
 function getCodeMarker(sourceCodeInfo) {
     if (!sourceCodeInfo.position || !sourceCodeInfo.code)
@@ -103,9 +103,15 @@ function getCodeMarker(sourceCodeInfo) {
 }
 
 function getLitsErrorMessage(message, sourceCodeInfo) {
-    var filePathLine = (sourceCodeInfo === null || sourceCodeInfo === void 0 ? void 0 : sourceCodeInfo.filePath) ? "\n".concat(sourceCodeInfo.filePath) : '';
-    var codeLine = (sourceCodeInfo === null || sourceCodeInfo === void 0 ? void 0 : sourceCodeInfo.code) ? "\n".concat(sourceCodeInfo.code) : '';
-    var codeMarker = sourceCodeInfo && codeLine ? "\n".concat(getCodeMarker(sourceCodeInfo)) : '';
+    if (!sourceCodeInfo) {
+        return message;
+    }
+    var location = "".concat(sourceCodeInfo.position.line, ":").concat(sourceCodeInfo.position.column);
+    var filePathLine = sourceCodeInfo.filePath
+        ? "\n".concat(sourceCodeInfo.filePath, ":").concat(location)
+        : "\nLocation ".concat(location);
+    var codeLine = "\n".concat(sourceCodeInfo.code);
+    var codeMarker = "\n".concat(getCodeMarker(sourceCodeInfo));
     return "".concat(message).concat(filePathLine).concat(codeLine).concat(codeMarker);
 }
 var RecurSignal = /** @class */ (function (_super) {
@@ -240,6 +246,7 @@ var functionTypes = [
     'SomePred',
     'Fnull',
     'Builtin',
+    'SpecialBuiltin',
     'NativeJsFunction',
 ];
 var functionTypeSet = new Set(functionTypes);
@@ -411,7 +418,7 @@ function findUnresolvedSymbolsInNode(node, contextStack, builtin, evaluateNode)
             return findUnresolvedSymbolsInNode(node[1], contextStack, builtin, evaluateNode);
         /* v8 ignore next 2 */
         default:
-            throw new Error("Unhandled node type: ".concat(nodeType));
+            throw new LitsError("Unhandled node type: ".concat(nodeType), node[2]);
     }
 }
 
@@ -3791,6 +3798,26 @@ var andSpecialExpression = {
         }
         return value;
     },
+    evaluateAsNormalExpression: function (params, sourceCodeInfo) {
+        var e_2, _a;
+        var value = true;
+        try {
+            for (var params_1 = __values(params), params_1_1 = params_1.next(); !params_1_1.done; params_1_1 = params_1.next()) {
+                var param = params_1_1.value;
+                value = asAny(param, sourceCodeInfo);
+                if (!value)
+                    break;
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (params_1_1 && !params_1_1.done && (_a = params_1.return)) _a.call(params_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return value;
+    },
     getUndefinedSymbols: function (node, contextStack, _a) {
         var getUndefinedSymbols = _a.getUndefinedSymbols, builtin = _a.builtin, evaluateNode = _a.evaluateNode;
         return getUndefinedSymbols(node[1][1], contextStack, builtin, evaluateNode);
@@ -4035,7 +4062,7 @@ var defSpecialExpression = {
         var value = bindingNode[1][1];
         var bindingValue = evaluateNode(value, contextStack);
         var values = evalueateBindingNodeValues(target, bindingValue, function (Node) { return evaluateNode(Node, contextStack); });
-        contextStack.exportValues(values);
+        contextStack.exportValues(values, target[2]);
         return null;
     },
     getUndefinedSymbols: function (node, contextStack, _a) {
@@ -4047,7 +4074,7 @@ var defSpecialExpression = {
         walkDefaults(target, function (defaultNode) {
             addToSet(bindingResult, getUndefinedSymbols([defaultNode], contextStack, builtin, evaluateNode));
         });
-        contextStack.addValues(getAllBindingTargetNames(target));
+        contextStack.addValues(getAllBindingTargetNames(target), target[2]);
         return bindingResult;
     },
 };
@@ -4165,14 +4192,14 @@ var functionSpecialExpression = {
             _b.name = functionSymbol[1],
             _b.evaluatedfunction = evaluatedFunction,
             _b);
-        contextStack.addValues((_c = {}, _c[functionSymbol[1]] = litsFunction, _c));
+        contextStack.addValues((_c = {}, _c[functionSymbol[1]] = litsFunction, _c), functionSymbol[2]);
         return null;
     },
     getUndefinedSymbols: function (node, contextStack, _a) {
         var _b, _c;
         var getUndefinedSymbols = _a.getUndefinedSymbols, builtin = _a.builtin, evaluateNode = _a.evaluateNode;
         var functionName = node[1][1][1];
-        contextStack.addValues((_b = {}, _b[functionName] = true, _b));
+        contextStack.addValues((_b = {}, _b[functionName] = true, _b), node[1][1][2]);
         var newContext = (_c = {}, _c[functionName] = { value: true }, _c);
         return getFunctionUnresolvedSymbols(node[1][2], contextStack, getUndefinedSymbols, builtin, evaluateNode, newContext);
     },
@@ -4193,7 +4220,7 @@ var defnSpecialExpression = {
             _b.name = functionSymbol[1],
             _b.evaluatedfunction = evaluatedFunctionOverloades,
             _b);
-        contextStack.exportValues((_c = {}, _c[functionSymbol[1]] = litsFunction, _c));
+        contextStack.exportValues((_c = {}, _c[functionSymbol[1]] = litsFunction, _c), functionSymbol[2]);
         return null;
     },
     getUndefinedSymbols: function (node, contextStack, _a) {
@@ -4201,7 +4228,7 @@ var defnSpecialExpression = {
         var getUndefinedSymbols = _a.getUndefinedSymbols, builtin = _a.builtin, evaluateNode = _a.evaluateNode;
         var functionName = node[1][1][1];
         var fn = node[1][2];
-        contextStack.exportValues((_b = {}, _b[functionName] = true, _b));
+        contextStack.exportValues((_b = {}, _b[functionName] = true, _b), node[1][1][2]);
         var newContext = (_c = {}, _c[functionName] = { value: true }, _c);
         return getFunctionUnresolvedSymbols(fn, contextStack, getUndefinedSymbols, builtin, evaluateNode, newContext);
     },
@@ -4313,7 +4340,7 @@ var letSpecialExpression = {
         var value = bindingNode[1][1];
         var bindingValue = evaluateNode(value, contextStack);
         var values = evalueateBindingNodeValues(target, bindingValue, function (Node) { return evaluateNode(Node, contextStack); });
-        contextStack.addValues(values);
+        contextStack.addValues(values, target[2]);
         return null;
     },
     getUndefinedSymbols: function (node, contextStack, _a) {
@@ -4325,7 +4352,7 @@ var letSpecialExpression = {
         walkDefaults(target, function (defaultNode) {
             addToSet(bindingResult, getUndefinedSymbols([defaultNode], contextStack, builtin, evaluateNode));
         });
-        contextStack.addValues(getAllBindingTargetNames(target));
+        contextStack.addValues(getAllBindingTargetNames(target), target[2]);
         return bindingResult;
     },
 };
@@ -4596,6 +4623,26 @@ var orSpecialExpression = {
         }
         return value;
     },
+    evaluateAsNormalExpression: function (params, sourceCodeInfo) {
+        var e_2, _a;
+        var value = false;
+        try {
+            for (var params_1 = __values(params), params_1_1 = params_1.next(); !params_1_1.done; params_1_1 = params_1.next()) {
+                var param = params_1_1.value;
+                value = asAny(param, sourceCodeInfo);
+                if (value)
+                    break;
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (params_1_1 && !params_1_1.done && (_a = params_1.return)) _a.call(params_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return value;
+    },
     getUndefinedSymbols: function (node, contextStack, _a) {
         var getUndefinedSymbols = _a.getUndefinedSymbols, builtin = _a.builtin, evaluateNode = _a.evaluateNode;
         return getUndefinedSymbols(node[1][1], contextStack, builtin, evaluateNode);
@@ -4614,6 +4661,11 @@ var qqSpecialExpression = {
         var firstResult = evaluateNode(firstNode, contextStack);
         return firstResult !== null && firstResult !== void 0 ? firstResult : (secondNode ? evaluateNode(secondNode, contextStack) : null);
     },
+    evaluateAsNormalExpression: function (params, sourceCodeInfo) {
+        var firstParam = asAny(params[0], sourceCodeInfo);
+        var secondParam = params[1] !== undefined ? asAny(params[1], sourceCodeInfo) : null;
+        return firstParam !== null && firstParam !== void 0 ? firstParam : secondParam;
+    },
     getUndefinedSymbols: function (node, contextStack, _a) {
         var getUndefinedSymbols = _a.getUndefinedSymbols, builtin = _a.builtin, evaluateNode = _a.evaluateNode;
         return getUndefinedSymbols(node[1][1].filter(function (n) { return !!n; }), contextStack, builtin, evaluateNode);
@@ -4628,6 +4680,9 @@ var recurSpecialExpression = {
         var evaluatedParams = params.map(function (paramNode) { return evaluateNode(paramNode, contextStack); });
         throw new RecurSignal(evaluatedParams);
     },
+    evaluateAsNormalExpression: function (params) {
+        throw new RecurSignal(params);
+    },
     getUndefinedSymbols: function (node, contextStack, _a) {
         var getUndefinedSymbols = _a.getUndefinedSymbols, builtin = _a.builtin, evaluateNode = _a.evaluateNode;
         return getUndefinedSymbols(node[1][1], contextStack, builtin, evaluateNode);
@@ -4643,6 +4698,12 @@ var throwSpecialExpression = {
         });
         throw new UserDefinedError(message, node[2]);
     },
+    evaluateAsNormalExpression: function (params, sourceCodeInfo) {
+        var message = asString(params[0], sourceCodeInfo, {
+            nonEmpty: true,
+        });
+        throw new UserDefinedError(message, undefined);
+    },
     getUndefinedSymbols: function (node, contextStack, _a) {
         var getUndefinedSymbols = _a.getUndefinedSymbols, builtin = _a.builtin, evaluateNode = _a.evaluateNode;
         return getUndefinedSymbols([node[1][1]], contextStack, builtin, evaluateNode);
@@ -4710,6 +4771,24 @@ var arraySpecialExpression = {
         }
         return result;
     },
+    evaluateAsNormalExpression: function (params, sourceCodeInfo) {
+        var e_2, _a;
+        var result = [];
+        try {
+            for (var params_1 = __values(params), params_1_1 = params_1.next(); !params_1_1.done; params_1_1 = params_1.next()) {
+                var param = params_1_1.value;
+                result.push(asAny(param, sourceCodeInfo));
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (params_1_1 && !params_1_1.done && (_a = params_1.return)) _a.call(params_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return result;
+    },
     getUndefinedSymbols: function (node, contextStack, _a) {
         var getUndefinedSymbols = _a.getUndefinedSymbols, builtin = _a.builtin, evaluateNode = _a.evaluateNode;
         return getUndefinedSymbols(node[1][1], contextStack, builtin, evaluateNode);
@@ -4741,6 +4820,16 @@ var objectSpecialExpression = {
         }
         return result;
     },
+    evaluateAsNormalExpression: function (params, sourceCodeInfo) {
+        var result = {};
+        for (var i = 0; i < params.length; i += 2) {
+            var key = params[i];
+            var value = params[i + 1];
+            assertString(key, sourceCodeInfo);
+            result[key] = value !== null && value !== void 0 ? value : null;
+        }
+        return result;
+    },
     getUndefinedSymbols: function (node, contextStack, _a) {
         var getUndefinedSymbols = _a.getUndefinedSymbols, builtin = _a.builtin, evaluateNode = _a.evaluateNode;
         return getUndefinedSymbols(node[1][1], contextStack, builtin, evaluateNode);
@@ -4984,6 +5073,16 @@ var functionExecutors = {
         var normalExpression = asNonUndefined(allNormalExpressions[fn.normalBuitinSymbolType], sourceCodeInfo);
         return normalExpression.evaluate(params, sourceCodeInfo, contextStack, { executeFunction: executeFunction });
     },
+    SpecialBuiltin: function (fn, params, sourceCodeInfo, contextStack, _a) {
+        var executeFunction = _a.executeFunction;
+        var specialExpression = asNonUndefined(specialExpressions[fn.specialBuiltinSymbolType], sourceCodeInfo);
+        if (specialExpression.evaluateAsNormalExpression) {
+            return specialExpression.evaluateAsNormalExpression(params, sourceCodeInfo, contextStack, { executeFunction: executeFunction });
+        }
+        else {
+            throw new LitsError("Special builtin function ".concat(fn.specialBuiltinSymbolType, " is not supported as normal expression."), sourceCodeInfo);
+        }
+    },
 };
 
 function evaluate(ast, contextStack) {
@@ -5039,7 +5138,21 @@ function evaluateReservedSymbol(node) {
 function evaluateNormalExpression(node, contextStack) {
     var sourceCodeInfo = node[2];
     var paramNodes = node[1][1];
-    var params = paramNodes.map(function (paramNode) { return evaluateNode(paramNode, contextStack); });
+    var params = [];
+    paramNodes.forEach(function (paramNode) {
+        if (isSpreadNode(paramNode)) {
+            var spreadValue = evaluateNode(paramNode[1], contextStack);
+            if (Array.isArray(spreadValue)) {
+                params.push.apply(params, __spreadArray([], __read(spreadValue), false));
+            }
+            else {
+                throw new LitsError("Spread operator requires an array, got ".concat(valueToString(paramNode)), paramNode[2]);
+            }
+        }
+        else {
+            params.push(evaluateNode(paramNode, contextStack));
+        }
+    });
     if (isNormalExpressionNodeWithName(node)) {
         var nameSymbol = node[1][0];
         if (isNormalBuiltinSymbolNode(nameSymbol)) {
@@ -5141,19 +5254,19 @@ var ContextStackImpl = /** @class */ (function () {
         var contexts = [{}, context];
         return new ContextStackImpl({ contexts: contexts });
     };
-    ContextStackImpl.prototype.exportValues = function (values) {
+    ContextStackImpl.prototype.exportValues = function (values, sourceCodeInfo) {
         var e_1, _a;
         try {
             for (var _b = __values(Object.entries(values)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), name_1 = _d[0], value = _d[1];
                 if (this.globalContext[name_1]) {
-                    throw new Error("Cannot redefine exported value \"".concat(name_1, "\""));
+                    throw new LitsError("Cannot redefine exported value \"".concat(name_1, "\""), sourceCodeInfo);
                 }
                 if (specialExpressionKeys.includes(name_1)) {
-                    throw new Error("Cannot shadow special expression \"".concat(name_1, "\""));
+                    throw new LitsError("Cannot shadow special expression \"".concat(name_1, "\""), sourceCodeInfo);
                 }
                 if (normalExpressionKeys.includes(name_1)) {
-                    throw new Error("Cannot shadow builtin function \"".concat(name_1, "\""));
+                    throw new LitsError("Cannot shadow builtin function \"".concat(name_1, "\""), sourceCodeInfo);
                 }
                 this.globalContext[name_1] = { value: value };
             }
@@ -5165,22 +5278,22 @@ var ContextStackImpl = /** @class */ (function () {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        this.addValues(values);
+        this.addValues(values, sourceCodeInfo);
     };
-    ContextStackImpl.prototype.addValues = function (values) {
+    ContextStackImpl.prototype.addValues = function (values, sourceCodeInfo) {
         var e_2, _a;
         var currentContext = this.contexts[0];
         try {
             for (var _b = __values(Object.entries(values)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), name_2 = _d[0], value = _d[1];
                 if (currentContext[name_2]) {
-                    throw new Error("Cannot redefine value \"".concat(name_2, "\""));
+                    throw new LitsError("Cannot redefine value \"".concat(name_2, "\""), sourceCodeInfo);
                 }
                 if (specialExpressionKeys.includes(name_2)) {
-                    throw new Error("Cannot shadow special expression \"".concat(name_2, "\""));
+                    throw new LitsError("Cannot shadow special expression \"".concat(name_2, "\""), sourceCodeInfo);
                 }
                 if (normalExpressionKeys.includes(name_2)) {
-                    throw new Error("Cannot shadow builtin function \"".concat(name_2, "\""));
+                    throw new LitsError("Cannot shadow builtin function \"".concat(name_2, "\""), sourceCodeInfo);
                 }
                 currentContext[name_2] = { value: toAny(value) };
             }
@@ -5260,18 +5373,36 @@ var ContextStackImpl = /** @class */ (function () {
         return null;
     };
     ContextStackImpl.prototype.evaluateSymbol = function (node) {
-        var _a;
+        var _a, _b;
         if (isSpecialBuiltinSymbolNode(node)) {
-            throw new Error('Special builtin symbols should not be evaluated');
+            var functionType = node[1];
+            switch (functionType) {
+                case specialExpressionTypes['&&']:
+                case specialExpressionTypes['||']:
+                case specialExpressionTypes.array:
+                case specialExpressionTypes.object:
+                case specialExpressionTypes['defined?']:
+                case specialExpressionTypes.recur:
+                case specialExpressionTypes.throw:
+                case specialExpressionTypes['??']:
+                    return _a = {},
+                        _a[FUNCTION_SYMBOL] = true,
+                        _a.functionType = 'SpecialBuiltin',
+                        _a.specialBuiltinSymbolType = functionType,
+                        _a.sourceCodeInfo = node[2],
+                        _a;
+                default:
+                    throw new LitsError("Unknown special builtin symbol type: ".concat(functionType), node[2]);
+            }
         }
         if (isNormalBuiltinSymbolNode(node)) {
             var type = node[1];
-            return _a = {},
-                _a[FUNCTION_SYMBOL] = true,
-                _a.functionType = 'Builtin',
-                _a.normalBuitinSymbolType = type,
-                _a.sourceCodeInfo = node[2],
-                _a;
+            return _b = {},
+                _b[FUNCTION_SYMBOL] = true,
+                _b.functionType = 'Builtin',
+                _b.normalBuitinSymbolType = type,
+                _b.sourceCodeInfo = node[2],
+                _b;
         }
         var lookUpResult = this.lookUp(node);
         if (isContextEntry(lookUpResult))
@@ -5943,7 +6074,7 @@ function withSourceCodeInfo(node, sourceCodeInfo) {
     }
     return node;
 }
-function getPrecedence(operatorSign) {
+function getPrecedence(operatorSign, sourceCodeInfo) {
     switch (operatorSign) {
         case '**': // exponentiation
             return exponentiationPrecedence;
@@ -5982,7 +6113,7 @@ function getPrecedence(operatorSign) {
         // leave room for binaryFunctionalOperatorPrecedence = 1
         /* v8 ignore next 2 */
         default:
-            throw new Error("Unknown binary operator: ".concat(operatorSign));
+            throw new LitsError("Unknown binary operator: ".concat(operatorSign), sourceCodeInfo);
     }
 }
 function createNamedNormalExpressionNode(symbolNode, params, sourceCodeInfo) {
@@ -6115,7 +6246,7 @@ var Parser = /** @class */ (function () {
         while (!this.isAtExpressionEnd()) {
             if (isA_BinaryOperatorToken(operator)) {
                 var name_1 = operator[1];
-                var newPrecedece = getPrecedence(name_1);
+                var newPrecedece = getPrecedence(name_1, operator[2]);
                 if (newPrecedece <= precedence
                     // ** (exponentiation) is right associative
                     && !(newPrecedece === exponentiationPrecedence && precedence === exponentiationPrecedence)) {
@@ -6195,7 +6326,7 @@ var Parser = /** @class */ (function () {
             this.advance();
             var expression = this.parseExpression();
             if (!isRParenToken(this.peek())) {
-                throw new Error('Expected closing parenthesis');
+                throw new LitsError('Expected closing parenthesis', this.peek()[2]);
             }
             this.advance();
             return expression;
@@ -6317,7 +6448,13 @@ var Parser = /** @class */ (function () {
         this.advance();
         var params = [];
         while (!this.isAtEnd() && !isRParenToken(this.peek())) {
-            params.push(this.parseExpression());
+            if (isOperatorToken(this.peek(), '...')) {
+                this.advance();
+                params.push(withSourceCodeInfo([NodeTypes.Spread, this.parseExpression()], this.peek()[2]));
+            }
+            else {
+                params.push(this.parseExpression());
+            }
             var nextToken = this.peek();
             if (!isOperatorToken(nextToken, ',') && !isRParenToken(nextToken)) {
                 throw new LitsError('Expected comma or closing parenthesis', this.peek()[2]);
@@ -6373,7 +6510,7 @@ var Parser = /** @class */ (function () {
                     throw new LitsError("".concat(type, " is not allowed"), symbol[2]);
                 /* v8 ignore next 2 */
                 default:
-                    throw new Error("Unknown special expression: ".concat(type));
+                    throw new LitsError("Unknown special expression: ".concat(type), symbol[2]);
             }
         }
         else if (isNormalBuiltinSymbolNode(symbol) || isNormalBuiltinSymbolNode(symbol)) {

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

@@ -28,6 +28,7 @@ export interface EvaluateHelpers {
 }
 export interface BuiltinSpecialExpression<T, N extends SpecialExpressionNode> {
     evaluate: (node: N, contextStack: ContextStack, helpers: EvaluateHelpers) => T;
+    evaluateAsNormalExpression?: NormalExpressionEvaluator<T>;
     paramCount: Count;
     getUndefinedSymbols: (node: N, contextStack: ContextStack, params: {
         getUndefinedSymbols: GetUndefinedSymbols;

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

@@ -13,7 +13,7 @@ export declare const NodeTypes: {
 export type NodeType = typeof NodeTypes[keyof typeof NodeTypes];
 export declare function getNodeTypeName(type: NodeType): keyof typeof NodeTypes;
 export declare function isNodeType(type: unknown): type is NodeType;
-declare const functionTypes: readonly ["UserDefined", "Partial", "Comp", "Constantly", "Juxt", "Complement", "EveryPred", "SomePred", "Fnull", "Builtin", "NativeJsFunction"];
+declare const functionTypes: readonly ["UserDefined", "Partial", "Comp", "Constantly", "Juxt", "Complement", "EveryPred", "SomePred", "Fnull", "Builtin", "SpecialBuiltin", "NativeJsFunction"];
 export type FunctionType = typeof functionTypes[number];
 export declare function isFunctionType(type: unknown): type is FunctionType;
 export {};

package/dist/cli/src/evaluator/ContextStack.d.ts

@@ -1,6 +1,7 @@
 import type { Any } from '../interface';
 import type { ContextParams, LazyValue } from '../Lits/Lits';
 import type { NativeJsFunction, SymbolNode, UserDefinedSymbolNode } from '../parser/types';
+import type { SourceCodeInfo } from '../tokenizer/token';
 import type { Context, LookUpResult } from './interface';
 export type ContextStack = ContextStackImpl;
 export declare class ContextStackImpl {
@@ -17,8 +18,8 @@ export declare class ContextStackImpl {
     });
     create(context: Context): ContextStack;
     new(context: Context): ContextStack;
-    exportValues(values: Record<string, Any>): void;
-    addValues(values: Record<string, Any>): void;
+    exportValues(values: Record<string, Any>, sourceCodeInfo: SourceCodeInfo | undefined): void;
+    addValues(values: Record<string, Any>, sourceCodeInfo: SourceCodeInfo | undefined): void;
     getValue(name: string): unknown;
     lookUp(node: UserDefinedSymbolNode): LookUpResult;
     evaluateSymbol(node: SymbolNode): Any;

package/dist/cli/src/evaluator/functionExecutors.d.ts

@@ -1,5 +1,5 @@
 import type { Any, Arr } from '../interface';
-import { type LitsFunctionType } from '../parser/types';
+import type { LitsFunctionType } from '../parser/types';
 import type { SourceCodeInfo } from '../tokenizer/token';
 import type { ContextStack } from './ContextStack';
 import type { EvaluateNode, ExecuteFunction } from './interface';

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

@@ -1,5 +1,6 @@
 import type { JsFunction } from '../Lits/Lits';
 import type { SpecialExpressionType } from '../builtin';
+import type { specialExpressionTypes } from '../builtin/specialExpressionTypes';
 import type { FunctionType, NodeType, NodeTypes } from '../constants/constants';
 import type { Context } from '../evaluator/interface';
 import type { Any, Arr } from '../interface';
@@ -69,7 +70,11 @@ export interface NormalBuiltinFunction extends GenericLitsFunction {
     functionType: 'Builtin';
     normalBuitinSymbolType: number;
 }
-export type LitsFunction = NativeJsFunction | UserDefinedFunction | NormalBuiltinFunction | PartialFunction | CompFunction | ConstantlyFunction | JuxtFunction | ComplementFunction | EveryPredFunction | SomePredFunction | FNullFunction;
+export interface SpecialBuiltinFunction extends GenericLitsFunction {
+    functionType: 'SpecialBuiltin';
+    specialBuiltinSymbolType: typeof specialExpressionTypes['&&'] | typeof specialExpressionTypes['||'] | typeof specialExpressionTypes['array'] | typeof specialExpressionTypes['object'] | typeof specialExpressionTypes['defined?'] | typeof specialExpressionTypes['recur'] | typeof specialExpressionTypes['throw'] | typeof specialExpressionTypes['??'];
+}
+export type LitsFunction = NativeJsFunction | UserDefinedFunction | NormalBuiltinFunction | SpecialBuiltinFunction | PartialFunction | CompFunction | ConstantlyFunction | JuxtFunction | ComplementFunction | EveryPredFunction | SomePredFunction | FNullFunction;
 export type LitsFunctionType = LitsFunction['functionType'];
 export type DebugData = {
     token: Token;

package/dist/cli/src/tokenizer/token.d.ts

@@ -24,11 +24,11 @@ export type WhitespaceToken = GenericToken<'Whitespace'>;
 export type Token = LBraceToken | LBracketToken | LParenToken | RBraceToken | RBracketToken | RParenToken | BasePrefixedNumberToken | MultiLineCommentToken | NumberToken | OperatorToken | RegexpShorthandToken | ReservedSymbolToken | SingleLineCommentToken | StringToken | SymbolToken | WhitespaceToken;
 export type TokenDescriptor<T extends Token> = [length: number, token?: T];
 export interface SourceCodeInfo {
-    position?: {
+    position: {
         line: number;
         column: number;
     };
-    code?: string;
+    code: string;
     filePath?: string;
 }
 export declare function isSymbolToken<T extends string>(token: Token, symbolName?: T): token is SymbolToken<T>;