@rsconcept/domain 1.4.5 → 1.4.6

package/dist/{analyzer-BIVXNtT6.d.ts → analyzer-54lGGg13.d.ts}

@@ -1,6 +1,6 @@
 import { t as AstNode } from "./ast-C8sIpKdL.js";
 import { f as ExpressionType, g as TypeClass } from "./typification-Dk-fisgO.js";
-import { i as RSErrorDescription } from "./error-CpOz9MFT.js";
+import { i as RSErrorDescription } from "./error-CxIs0A7Y.js";
 import { t as ValueClass } from "./value-class-CNI-lqXJ.js";
 
 //#region src/rslang/semantic/analyzer.d.ts
@@ -36,4 +36,4 @@ declare class RSLangAnalyzer {
 }
 //#endregion
 export { RSLangAnalyzer as a, AnalysisOptions as i, AnalysisFast as n, AnalysisFull as r, AnalysisBase as t };
-//# sourceMappingURL=analyzer-BIVXNtT6.d.ts.map
+//# sourceMappingURL=analyzer-54lGGg13.d.ts.map

package/dist/{ast-annotations-Dfz-KtUp.d.ts → ast-annotations-C0eMySxt.d.ts}

@@ -1,6 +1,6 @@
 import { t as AstNode } from "./ast-C8sIpKdL.js";
 import { f as ExpressionType } from "./typification-Dk-fisgO.js";
-import { a as RSErrorInfo, r as RSErrorCode } from "./error-CpOz9MFT.js";
+import { a as RSErrorInfo, r as RSErrorCode } from "./error-CxIs0A7Y.js";
 
 //#region src/rslang/ast-annotations.d.ts
 /** Appends {@link ExpressionType} onto the node's `annotation.rsType`. */
@@ -13,4 +13,4 @@ declare function annotateError(node: AstNode, code: RSErrorCode, params?: readon
 declare function readErrorAnnotation(node: AstNode): RSErrorInfo | null;
 //#endregion
 export { readTypeAnnotation as i, annotateType as n, readErrorAnnotation as r, annotateError as t };
-//# sourceMappingURL=ast-annotations-Dfz-KtUp.d.ts.map
+//# sourceMappingURL=ast-annotations-C0eMySxt.d.ts.map

package/dist/{calculator-KRU6RIzZ.d.ts → calculator-BQnE2gws.d.ts}

@@ -1,6 +1,6 @@
 import { t as AstNode } from "./ast-C8sIpKdL.js";
 import { f as ExpressionType } from "./typification-Dk-fisgO.js";
-import { i as RSErrorDescription } from "./error-CpOz9MFT.js";
+import { i as RSErrorDescription } from "./error-CxIs0A7Y.js";
 import { l as Value } from "./value-BduA_ZGp.js";
 
 //#region src/rslang/eval/calculator.d.ts
@@ -36,4 +36,4 @@ declare class RSCalculator {
 }
 //#endregion
 export { CalculatorResult as n, RSCalculator as r, CalculatorEvaluateOptions as t };
-//# sourceMappingURL=calculator-KRU6RIzZ.d.ts.map
+//# sourceMappingURL=calculator-BQnE2gws.d.ts.map

package/dist/{error-CpOz9MFT.d.ts → error-CxIs0A7Y.d.ts}

@@ -28,6 +28,7 @@ declare const RSErrorCode: {
   readonly doubleParenthesis: 33802;
   readonly missingOpenBracket: 33803;
   readonly missingCloseBracket: 33804;
+  readonly invalidFilterSyntax: 33815;
   readonly expectedLocal: 33813;
   readonly expectedType: 33814;
   readonly localDoubleDeclare: 10241;
@@ -64,6 +65,8 @@ declare const RSErrorCode: {
   readonly invalidArgumentCortegeDeclare: 34857;
   readonly invalidQuantifierDomain: 34858;
   readonly invalidFilterParameterType: 34859;
+  readonly invalidFilterIndex: 34860;
+  readonly invalidFilterBooleanEchelon: 34861;
   readonly globalNoValue: 34880;
   readonly invalidPropertyUsage: 34881;
   readonly calcUnknownError: 33024;
@@ -85,4 +88,4 @@ declare function getRSErrorPrefix(code: RSErrorCode): string;
 declare function isCritical(code: RSErrorCode): boolean;
 //#endregion
 export { RSErrorInfo as a, RSErrorDescription as i, RSErrorClass as n, getRSErrorPrefix as o, RSErrorCode as r, isCritical as s, ErrorReporter as t };
-//# sourceMappingURL=error-CpOz9MFT.d.ts.map
+//# sourceMappingURL=error-CxIs0A7Y.d.ts.map

package/dist/index.d.ts

@@ -9,15 +9,15 @@ import { a as TOKEN_ERROR, c as flattenAst, d as printAst, f as visitAstDFS, i a
 import { t as Branded } from "./branded-ZlzIcxzu.js";
 import { n as generateStub, t as applyHash_fnv1a } from "./hash-Y8I4c6Al.js";
 import { O as makeTypePath, b as Typification, d as EmptySetT, f as ExpressionType, g as TypeClass, m as LogicT, t as AnyTypificationT, v as TypeID, y as TypePath } from "./typification-Dk-fisgO.js";
-import { i as RSErrorDescription, r as RSErrorCode } from "./error-CpOz9MFT.js";
-import { i as readTypeAnnotation, r as readErrorAnnotation } from "./ast-annotations-Dfz-KtUp.js";
+import { i as RSErrorDescription, r as RSErrorCode } from "./error-CxIs0A7Y.js";
+import { i as readTypeAnnotation, r as readErrorAnnotation } from "./ast-annotations-C0eMySxt.js";
 import { d as ValuePath, l as Value, o as TUPLE_ID, p as makeValuePath } from "./value-BduA_ZGp.js";
-import { n as CalculatorResult, r as RSCalculator, t as CalculatorEvaluateOptions } from "./calculator-KRU6RIzZ.js";
+import { n as CalculatorResult, r as RSCalculator, t as CalculatorEvaluateOptions } from "./calculator-BQnE2gws.js";
 import { d as printValue } from "./value-api-B6T6f4Ia.js";
 import { t as parser } from "./parser-Bwd8LxJ1.js";
 import { t as TokenID } from "./token-DeXAmzwr.js";
 import { t as ValueClass } from "./value-class-CNI-lqXJ.js";
-import { a as RSLangAnalyzer, n as AnalysisFast, r as AnalysisFull, t as AnalysisBase } from "./analyzer-BIVXNtT6.js";
+import { a as RSLangAnalyzer, n as AnalysisFast, r as AnalysisFull, t as AnalysisBase } from "./analyzer-54lGGg13.js";
 import { n as ArgumentsType } from "./arguments-extractor-1acwjQNc.js";
 import { n as applyAsciiTypeSubstitutions, r as parseTypeText } from "./typification-parser-BBVx1RxP.js";
 import { n as TypificationNodeData, t as TypificationGraph } from "./typification-graph-6HcZ-rKH.js";

package/dist/library/rsengine.d.ts

@@ -1,6 +1,6 @@
 import { t as AstNode } from "../ast-C8sIpKdL.js";
 import { l as Value } from "../value-BduA_ZGp.js";
-import { n as CalculatorResult, r as RSCalculator, t as CalculatorEvaluateOptions } from "../calculator-KRU6RIzZ.js";
+import { n as CalculatorResult, r as RSCalculator, t as CalculatorEvaluateOptions } from "../calculator-BQnE2gws.js";
 import { CstType, RSForm } from "./rsform.js";
 import { BasicBinding, BasicsContext, EvalStatus, RSModel } from "./rsmodel.js";
 

package/dist/library/rsform-api.d.ts

@@ -1,7 +1,7 @@
 import { r as LibraryItem } from "../library-CYun28Xz.js";
 import { g as TypeClass, y as TypePath } from "../typification-Dk-fisgO.js";
 import { t as ValueClass } from "../value-class-CNI-lqXJ.js";
-import { r as AnalysisFull } from "../analyzer-BIVXNtT6.js";
+import { r as AnalysisFull } from "../analyzer-54lGGg13.js";
 import { ArgumentValue, Constituenta, CstClass, CstStatus, CstType, RSForm, RSFormStats } from "./rsform.js";
 
 //#region src/library/rsform-api.d.ts

package/dist/library/rsform.d.ts

@@ -1,7 +1,7 @@
 import { t as Graph } from "../graph-DR8rL2o3.js";
 import { i as LibraryItemReference, n as CurrentVersion, r as LibraryItem, s as VersionInfo } from "../library-CYun28Xz.js";
 import { f as ExpressionType, y as TypePath } from "../typification-Dk-fisgO.js";
-import { a as RSLangAnalyzer, t as AnalysisBase } from "../analyzer-BIVXNtT6.js";
+import { a as RSLangAnalyzer, t as AnalysisBase } from "../analyzer-54lGGg13.js";
 //#region src/library/rsform.d.ts
 /** Represents {@link Constituenta} type. */
 declare const CstType: {

package/dist/rslang/ast-annotations.d.ts

@@ -1,2 +1,2 @@
-import { i as readTypeAnnotation, n as annotateType, r as readErrorAnnotation, t as annotateError } from "../ast-annotations-Dfz-KtUp.js";
+import { i as readTypeAnnotation, n as annotateType, r as readErrorAnnotation, t as annotateError } from "../ast-annotations-C0eMySxt.js";
 export { annotateError, annotateType, readErrorAnnotation, readTypeAnnotation };

package/dist/rslang/error.d.ts

@@ -1,2 +1,2 @@
-import { a as RSErrorInfo, i as RSErrorDescription, n as RSErrorClass, o as getRSErrorPrefix, r as RSErrorCode, s as isCritical, t as ErrorReporter } from "../error-CpOz9MFT.js";
+import { a as RSErrorInfo, i as RSErrorDescription, n as RSErrorClass, o as getRSErrorPrefix, r as RSErrorCode, s as isCritical, t as ErrorReporter } from "../error-CxIs0A7Y.js";
 export { ErrorReporter, RSErrorClass, RSErrorCode, RSErrorDescription, RSErrorInfo, getRSErrorPrefix, isCritical };

package/dist/rslang/error.js

@@ -15,6 +15,7 @@ const RSErrorCode = {
 	doubleParenthesis: 33802,
 	missingOpenBracket: 33803,
 	missingCloseBracket: 33804,
+	invalidFilterSyntax: 33815,
 	expectedLocal: 33813,
 	expectedType: 33814,
 	localDoubleDeclare: 10241,
@@ -51,6 +52,8 @@ const RSErrorCode = {
 	invalidArgumentCortegeDeclare: 34857,
 	invalidQuantifierDomain: 34858,
 	invalidFilterParameterType: 34859,
+	invalidFilterIndex: 34860,
+	invalidFilterBooleanEchelon: 34861,
 	globalNoValue: 34880,
 	invalidPropertyUsage: 34881,
 	calcUnknownError: 33024,

package/dist/rslang/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","names":[],"sources":["../../src/rslang/error.ts"],"sourcesContent":["/** Module: Error types and functions. */\n\n/** Represents error class. */\nexport const RSErrorClass = {\n  LEXER: 0,\n  PARSER: 1,\n  SEMANTIC: 2,\n  EVALUATION: 3,\n  UNKNOWN: 4\n} as const;\nexport type RSErrorClass = (typeof RSErrorClass)[keyof typeof RSErrorClass];\n\n/** Represents RSLang expression error information. */\nexport interface RSErrorInfo {\n  code: RSErrorCode;\n  params?: readonly string[];\n}\n\n/** Represents RSLang expression error description. */\nexport interface RSErrorDescription extends RSErrorInfo {\n  from: number;\n  to: number;\n}\n\n/** Error reporter function type. */\nexport type ErrorReporter = (error: RSErrorDescription) => void;\n\n/** Represents RSLang expression error types. */\nexport const RSErrorCode = {\n  unknownSyntax: 0x8400, // 33792\n  bracketMismatch: 0x8409, // 33801\n  doubleParenthesis: 0x840a, // 33802\n  missingOpenBracket: 0x840b, // 33803\n  missingCloseBracket: 0x840c, // 33804\n  expectedLocal: 0x8415, // 33813\n  expectedType: 0x8416, // 33814\n\n  localDoubleDeclare: 0x2801, // 10241\n  localNotUsed: 0x2802, // 10242\n\n  localUndeclared: 0x8801, // 34817\n  localShadowing: 0x8802, // 34818\n\n  typesNotEqual: 0x8803, // 34819\n  globalNotTyped: 0x8804, // 34820\n  invalidDecart: 0x8805, // 34821\n  invalidBoolean: 0x8806, // 34822\n  invalidTypeOperation: 0x8807, // 34823\n  invalidCard: 0x8808, // 34824\n  invalidDebool: 0x8809, // 34825\n  globalFuncWithoutArgs: 0x880b, // 34827\n  invalidReduce: 0x8810, // 34832\n  invalidProjectionTuple: 0x8811, // 34833\n  invalidProjectionSet: 0x8812, // 34834\n  invalidEnumeration: 0x8813, // 34835\n  invalidCortegeDeclare: 0x8814, // 34836\n  localOutOfScope: 0x8815, // 34837\n  invalidElementPredicate: 0x8816, // 34838\n  invalidEmptySetUsage: 0x8817, // 34839\n  invalidArgsArity: 0x8818, // 34840\n  invalidArgumentType: 0x8819, // 34841\n  globalStructure: 0x881c, // 34844\n  radicalUsage: 0x8821, // 34849\n  invalidFilterArgumentType: 0x8822, // 34850\n  invalidFilterArity: 0x8823, // 34851\n  arithmeticNotSupported: 0x8824, // 34852\n  typesNotCompatible: 0x8825, // 34853\n  orderingNotSupported: 0x8826, // 34854\n  expectedLogic: 0x8827, // 34855\n  expectedSetexpr: 0x8828, // 34856\n  invalidArgumentCortegeDeclare: 0x8829, // 34857\n  invalidQuantifierDomain: 0x882a, // 34858\n  invalidFilterParameterType: 0x882b, // 34859\n\n  globalNoValue: 0x8840, // 34880\n  invalidPropertyUsage: 0x8841, // 34881\n\n  // Value evaluation (runtime)\n  calcUnknownError: 0x8100, // 35328\n  setOverflow: 0x8101, // 35329\n  booleanBaseLimit: 0x8102, // 35330\n  calcGlobalMissing: 0x8103, // 35331\n  iterationsLimit: 0x8104, // 35332\n  calcInvalidDebool: 0x8105, // 35333\n  iterateInfinity: 0x8106, // 35334\n  calculationNotSupported: 0x8107, // 35335\n  calcInvalidData: 0x8108, // 35336\n\n  cstEmptyDerived: 0x8861, // 34913\n  definitionNotAllowed: 0x8862 // 34914\n} as const;\nexport type RSErrorCode = (typeof RSErrorCode)[keyof typeof RSErrorCode];\n\nconst ERROR_EVALUATION_MASK = 0x0100;\nconst ERROR_LEXER_MASK = 0x0200;\nconst ERROR_PARSER_MASK = 0x0400;\nconst ERROR_SEMANTIC_MASK = 0x0800;\n\n/** Infers error class from error type (code). */\nfunction inferErrorClass(error: RSErrorCode): RSErrorClass {\n  if ((error & ERROR_EVALUATION_MASK) !== 0) {\n    return RSErrorClass.EVALUATION;\n  } else if ((error & ERROR_LEXER_MASK) !== 0) {\n    return RSErrorClass.LEXER;\n  } else if ((error & ERROR_PARSER_MASK) !== 0) {\n    return RSErrorClass.PARSER;\n  } else if ((error & ERROR_SEMANTIC_MASK) !== 0) {\n    return RSErrorClass.SEMANTIC;\n  } else {\n    return RSErrorClass.UNKNOWN;\n  }\n}\n\n/** Generate ErrorID label. */\nexport function getRSErrorPrefix(code: RSErrorCode): string {\n  const id = code.toString(16).toUpperCase();\n  // prettier-ignore\n  switch (inferErrorClass(code)) {\n    case RSErrorClass.LEXER: return 'L' + id;\n    case RSErrorClass.PARSER: return 'P' + id;\n    case RSErrorClass.SEMANTIC: return 'S' + id;\n    case RSErrorClass.EVALUATION: return 'E' + id;\n    case RSErrorClass.UNKNOWN: return 'U' + id;\n  }\n}\n\n/** Checks if error is critical. */\nexport function isCritical(code: RSErrorCode): boolean {\n  return code !== RSErrorCode.localDoubleDeclare && code !== RSErrorCode.localNotUsed;\n}\n"],"mappings":";;;AAGA,MAAa,eAAe;CAC1B,OAAO;CACP,QAAQ;CACR,UAAU;CACV,YAAY;CACZ,SAAS;AACX;;AAmBA,MAAa,cAAc;CACzB,eAAe;CACf,iBAAiB;CACjB,mBAAmB;CACnB,oBAAoB;CACpB,qBAAqB;CACrB,eAAe;CACf,cAAc;CAEd,oBAAoB;CACpB,cAAc;CAEd,iBAAiB;CACjB,gBAAgB;CAEhB,eAAe;CACf,gBAAgB;CAChB,eAAe;CACf,gBAAgB;CAChB,sBAAsB;CACtB,aAAa;CACb,eAAe;CACf,uBAAuB;CACvB,eAAe;CACf,wBAAwB;CACxB,sBAAsB;CACtB,oBAAoB;CACpB,uBAAuB;CACvB,iBAAiB;CACjB,yBAAyB;CACzB,sBAAsB;CACtB,kBAAkB;CAClB,qBAAqB;CACrB,iBAAiB;CACjB,cAAc;CACd,2BAA2B;CAC3B,oBAAoB;CACpB,wBAAwB;CACxB,oBAAoB;CACpB,sBAAsB;CACtB,eAAe;CACf,iBAAiB;CACjB,+BAA+B;CAC/B,yBAAyB;CACzB,4BAA4B;CAE5B,eAAe;CACf,sBAAsB;CAGtB,kBAAkB;CAClB,aAAa;CACb,kBAAkB;CAClB,mBAAmB;CACnB,iBAAiB;CACjB,mBAAmB;CACnB,iBAAiB;CACjB,yBAAyB;CACzB,iBAAiB;CAEjB,iBAAiB;CACjB,sBAAsB;AACxB;AAGA,MAAM,wBAAwB;AAC9B,MAAM,mBAAmB;AACzB,MAAM,oBAAoB;AAC1B,MAAM,sBAAsB;;AAG5B,SAAS,gBAAgB,OAAkC;CACzD,KAAK,QAAQ,2BAA2B,GACtC,OAAO,aAAa;MACf,KAAK,QAAQ,sBAAsB,GACxC,OAAO,aAAa;MACf,KAAK,QAAQ,uBAAuB,GACzC,OAAO,aAAa;MACf,KAAK,QAAQ,yBAAyB,GAC3C,OAAO,aAAa;MAEpB,OAAO,aAAa;AAExB;;AAGA,SAAgB,iBAAiB,MAA2B;CAC1D,MAAM,KAAK,KAAK,SAAS,EAAE,CAAC,CAAC,YAAY;CAEzC,QAAQ,gBAAgB,IAAI,GAA5B;EACE,KAAK,aAAa,OAAO,OAAO,MAAM;EACtC,KAAK,aAAa,QAAQ,OAAO,MAAM;EACvC,KAAK,aAAa,UAAU,OAAO,MAAM;EACzC,KAAK,aAAa,YAAY,OAAO,MAAM;EAC3C,KAAK,aAAa,SAAS,OAAO,MAAM;CAC1C;AACF;;AAGA,SAAgB,WAAW,MAA4B;CACrD,OAAO,SAAS,YAAY,sBAAsB,SAAS,YAAY;AACzE"}
+{"version":3,"file":"error.js","names":[],"sources":["../../src/rslang/error.ts"],"sourcesContent":["/** Module: Error types and functions. */\n\n/** Represents error class. */\nexport const RSErrorClass = {\n  LEXER: 0,\n  PARSER: 1,\n  SEMANTIC: 2,\n  EVALUATION: 3,\n  UNKNOWN: 4\n} as const;\nexport type RSErrorClass = (typeof RSErrorClass)[keyof typeof RSErrorClass];\n\n/** Represents RSLang expression error information. */\nexport interface RSErrorInfo {\n  code: RSErrorCode;\n  params?: readonly string[];\n}\n\n/** Represents RSLang expression error description. */\nexport interface RSErrorDescription extends RSErrorInfo {\n  from: number;\n  to: number;\n}\n\n/** Error reporter function type. */\nexport type ErrorReporter = (error: RSErrorDescription) => void;\n\n/** Represents RSLang expression error types. */\nexport const RSErrorCode = {\n  unknownSyntax: 0x8400, // 33792\n  bracketMismatch: 0x8409, // 33801\n  doubleParenthesis: 0x840a, // 33802\n  missingOpenBracket: 0x840b, // 33803\n  missingCloseBracket: 0x840c, // 33804\n  invalidFilterSyntax: 0x8417, // 33815\n  expectedLocal: 0x8415, // 33813\n  expectedType: 0x8416, // 33814\n\n  localDoubleDeclare: 0x2801, // 10241\n  localNotUsed: 0x2802, // 10242\n\n  localUndeclared: 0x8801, // 34817\n  localShadowing: 0x8802, // 34818\n\n  typesNotEqual: 0x8803, // 34819\n  globalNotTyped: 0x8804, // 34820\n  invalidDecart: 0x8805, // 34821\n  invalidBoolean: 0x8806, // 34822\n  invalidTypeOperation: 0x8807, // 34823\n  invalidCard: 0x8808, // 34824\n  invalidDebool: 0x8809, // 34825\n  globalFuncWithoutArgs: 0x880b, // 34827\n  invalidReduce: 0x8810, // 34832\n  invalidProjectionTuple: 0x8811, // 34833\n  invalidProjectionSet: 0x8812, // 34834\n  invalidEnumeration: 0x8813, // 34835\n  invalidCortegeDeclare: 0x8814, // 34836\n  localOutOfScope: 0x8815, // 34837\n  invalidElementPredicate: 0x8816, // 34838\n  invalidEmptySetUsage: 0x8817, // 34839\n  invalidArgsArity: 0x8818, // 34840\n  invalidArgumentType: 0x8819, // 34841\n  globalStructure: 0x881c, // 34844\n  radicalUsage: 0x8821, // 34849\n  invalidFilterArgumentType: 0x8822, // 34850\n  invalidFilterArity: 0x8823, // 34851\n  arithmeticNotSupported: 0x8824, // 34852\n  typesNotCompatible: 0x8825, // 34853\n  orderingNotSupported: 0x8826, // 34854\n  expectedLogic: 0x8827, // 34855\n  expectedSetexpr: 0x8828, // 34856\n  invalidArgumentCortegeDeclare: 0x8829, // 34857\n  invalidQuantifierDomain: 0x882a, // 34858\n  invalidFilterParameterType: 0x882b, // 34859\n  invalidFilterIndex: 0x882c, // 34860\n  invalidFilterBooleanEchelon: 0x882d, // 34861\n\n  globalNoValue: 0x8840, // 34880\n  invalidPropertyUsage: 0x8841, // 34881\n\n  // Value evaluation (runtime)\n  calcUnknownError: 0x8100, // 35328\n  setOverflow: 0x8101, // 35329\n  booleanBaseLimit: 0x8102, // 35330\n  calcGlobalMissing: 0x8103, // 35331\n  iterationsLimit: 0x8104, // 35332\n  calcInvalidDebool: 0x8105, // 35333\n  iterateInfinity: 0x8106, // 35334\n  calculationNotSupported: 0x8107, // 35335\n  calcInvalidData: 0x8108, // 35336\n\n  cstEmptyDerived: 0x8861, // 34913\n  definitionNotAllowed: 0x8862 // 34914\n} as const;\nexport type RSErrorCode = (typeof RSErrorCode)[keyof typeof RSErrorCode];\n\nconst ERROR_EVALUATION_MASK = 0x0100;\nconst ERROR_LEXER_MASK = 0x0200;\nconst ERROR_PARSER_MASK = 0x0400;\nconst ERROR_SEMANTIC_MASK = 0x0800;\n\n/** Infers error class from error type (code). */\nfunction inferErrorClass(error: RSErrorCode): RSErrorClass {\n  if ((error & ERROR_EVALUATION_MASK) !== 0) {\n    return RSErrorClass.EVALUATION;\n  } else if ((error & ERROR_LEXER_MASK) !== 0) {\n    return RSErrorClass.LEXER;\n  } else if ((error & ERROR_PARSER_MASK) !== 0) {\n    return RSErrorClass.PARSER;\n  } else if ((error & ERROR_SEMANTIC_MASK) !== 0) {\n    return RSErrorClass.SEMANTIC;\n  } else {\n    return RSErrorClass.UNKNOWN;\n  }\n}\n\n/** Generate ErrorID label. */\nexport function getRSErrorPrefix(code: RSErrorCode): string {\n  const id = code.toString(16).toUpperCase();\n  // prettier-ignore\n  switch (inferErrorClass(code)) {\n    case RSErrorClass.LEXER: return 'L' + id;\n    case RSErrorClass.PARSER: return 'P' + id;\n    case RSErrorClass.SEMANTIC: return 'S' + id;\n    case RSErrorClass.EVALUATION: return 'E' + id;\n    case RSErrorClass.UNKNOWN: return 'U' + id;\n  }\n}\n\n/** Checks if error is critical. */\nexport function isCritical(code: RSErrorCode): boolean {\n  return code !== RSErrorCode.localDoubleDeclare && code !== RSErrorCode.localNotUsed;\n}\n"],"mappings":";;;AAGA,MAAa,eAAe;CAC1B,OAAO;CACP,QAAQ;CACR,UAAU;CACV,YAAY;CACZ,SAAS;AACX;;AAmBA,MAAa,cAAc;CACzB,eAAe;CACf,iBAAiB;CACjB,mBAAmB;CACnB,oBAAoB;CACpB,qBAAqB;CACrB,qBAAqB;CACrB,eAAe;CACf,cAAc;CAEd,oBAAoB;CACpB,cAAc;CAEd,iBAAiB;CACjB,gBAAgB;CAEhB,eAAe;CACf,gBAAgB;CAChB,eAAe;CACf,gBAAgB;CAChB,sBAAsB;CACtB,aAAa;CACb,eAAe;CACf,uBAAuB;CACvB,eAAe;CACf,wBAAwB;CACxB,sBAAsB;CACtB,oBAAoB;CACpB,uBAAuB;CACvB,iBAAiB;CACjB,yBAAyB;CACzB,sBAAsB;CACtB,kBAAkB;CAClB,qBAAqB;CACrB,iBAAiB;CACjB,cAAc;CACd,2BAA2B;CAC3B,oBAAoB;CACpB,wBAAwB;CACxB,oBAAoB;CACpB,sBAAsB;CACtB,eAAe;CACf,iBAAiB;CACjB,+BAA+B;CAC/B,yBAAyB;CACzB,4BAA4B;CAC5B,oBAAoB;CACpB,6BAA6B;CAE7B,eAAe;CACf,sBAAsB;CAGtB,kBAAkB;CAClB,aAAa;CACb,kBAAkB;CAClB,mBAAmB;CACnB,iBAAiB;CACjB,mBAAmB;CACnB,iBAAiB;CACjB,yBAAyB;CACzB,iBAAiB;CAEjB,iBAAiB;CACjB,sBAAsB;AACxB;AAGA,MAAM,wBAAwB;AAC9B,MAAM,mBAAmB;AACzB,MAAM,oBAAoB;AAC1B,MAAM,sBAAsB;;AAG5B,SAAS,gBAAgB,OAAkC;CACzD,KAAK,QAAQ,2BAA2B,GACtC,OAAO,aAAa;MACf,KAAK,QAAQ,sBAAsB,GACxC,OAAO,aAAa;MACf,KAAK,QAAQ,uBAAuB,GACzC,OAAO,aAAa;MACf,KAAK,QAAQ,yBAAyB,GAC3C,OAAO,aAAa;MAEpB,OAAO,aAAa;AAExB;;AAGA,SAAgB,iBAAiB,MAA2B;CAC1D,MAAM,KAAK,KAAK,SAAS,EAAE,CAAC,CAAC,YAAY;CAEzC,QAAQ,gBAAgB,IAAI,GAA5B;EACE,KAAK,aAAa,OAAO,OAAO,MAAM;EACtC,KAAK,aAAa,QAAQ,OAAO,MAAM;EACvC,KAAK,aAAa,UAAU,OAAO,MAAM;EACzC,KAAK,aAAa,YAAY,OAAO,MAAM;EAC3C,KAAK,aAAa,SAAS,OAAO,MAAM;CAC1C;AACF;;AAGA,SAAgB,WAAW,MAA4B;CACrD,OAAO,SAAS,YAAY,sBAAsB,SAAS,YAAY;AACzE"}

package/dist/rslang/eval/calculator.d.ts

@@ -1,2 +1,2 @@
-import { n as CalculatorResult, r as RSCalculator, t as CalculatorEvaluateOptions } from "../../calculator-KRU6RIzZ.js";
+import { n as CalculatorResult, r as RSCalculator, t as CalculatorEvaluateOptions } from "../../calculator-BQnE2gws.js";
 export { CalculatorEvaluateOptions, CalculatorResult, RSCalculator };

package/dist/rslang/eval/evaluator.d.ts

@@ -1,5 +1,5 @@
 import { t as AstNode } from "../../ast-C8sIpKdL.js";
-import { t as ErrorReporter } from "../../error-CpOz9MFT.js";
+import { t as ErrorReporter } from "../../error-CxIs0A7Y.js";
 import { l as Value, u as ValueContext } from "../../value-BduA_ZGp.js";
 
 //#region src/rslang/eval/evaluator.d.ts

package/dist/rslang/index.d.ts

@@ -1,13 +1,13 @@
 import { O as makeTypePath, b as Typification, d as EmptySetT, f as ExpressionType, g as TypeClass, m as LogicT, t as AnyTypificationT, v as TypeID, y as TypePath } from "../typification-Dk-fisgO.js";
-import { i as RSErrorDescription, r as RSErrorCode } from "../error-CpOz9MFT.js";
-import { i as readTypeAnnotation, r as readErrorAnnotation } from "../ast-annotations-Dfz-KtUp.js";
+import { i as RSErrorDescription, r as RSErrorCode } from "../error-CxIs0A7Y.js";
+import { i as readTypeAnnotation, r as readErrorAnnotation } from "../ast-annotations-C0eMySxt.js";
 import { d as ValuePath, l as Value, p as makeValuePath } from "../value-BduA_ZGp.js";
-import { n as CalculatorResult, r as RSCalculator, t as CalculatorEvaluateOptions } from "../calculator-KRU6RIzZ.js";
+import { n as CalculatorResult, r as RSCalculator, t as CalculatorEvaluateOptions } from "../calculator-BQnE2gws.js";
 import { d as printValue } from "../value-api-B6T6f4Ia.js";
 import { t as parser } from "../parser-Bwd8LxJ1.js";
 import { t as TokenID } from "../token-DeXAmzwr.js";
 import { t as ValueClass } from "../value-class-CNI-lqXJ.js";
-import { a as RSLangAnalyzer, n as AnalysisFast, r as AnalysisFull, t as AnalysisBase } from "../analyzer-BIVXNtT6.js";
+import { a as RSLangAnalyzer, n as AnalysisFast, r as AnalysisFull, t as AnalysisBase } from "../analyzer-54lGGg13.js";
 import { n as ArgumentsType } from "../arguments-extractor-1acwjQNc.js";
 import { n as applyAsciiTypeSubstitutions, r as parseTypeText } from "../typification-parser-BBVx1RxP.js";
 import { n as TypificationNodeData, t as TypificationGraph } from "../typification-graph-6HcZ-rKH.js";

package/dist/rslang/parser/syntax-errors.d.ts

@@ -1,5 +1,5 @@
 import { t as AstNode } from "../../ast-C8sIpKdL.js";
-import { t as ErrorReporter } from "../../error-CpOz9MFT.js";
+import { t as ErrorReporter } from "../../error-CxIs0A7Y.js";
 
 //#region src/rslang/parser/syntax-errors.d.ts
 declare function extractSyntaxErrors(ast: AstNode, expression: string, reporter: ErrorReporter, annotateErrors?: boolean): void;

package/dist/rslang/parser/syntax-errors.js

@@ -9,23 +9,35 @@ import "./parser.terms.js";
 * Module: Syntactic errors reporting.
 */
 function extractSyntaxErrors(ast, expression, reporter, annotateErrors = false) {
+	const collected = [];
+	const collect = (error) => {
+		collected.push(error);
+	};
 	const bracketError = extractBracketErrors(expression);
 	if (bracketError !== null) {
-		reporter(bracketError);
+		collect(bracketError);
 		if (annotateErrors) annotateError(ast, bracketError.code, bracketError.params);
 	}
 	const hasBracketErrors = bracketError !== null;
-	visitAstDFS(ast, (node) => extractInternal(node, reporter, annotateErrors, hasBracketErrors));
+	visitAstDFS(ast, (node) => extractInternal(node, expression, collect, annotateErrors, hasBracketErrors));
+	for (const error of deduplicateErrors(collected)) reporter(error);
 }
-function extractInternal(node, reporter, annotateErrors, ignoreUnknownErrors) {
+function extractInternal(node, expression, reporter, annotateErrors, ignoreUnknownErrors) {
 	if (node.typeID !== TokenID.ERROR) return;
-	function emit(target, code) {
+	function emit(target, code, params) {
 		reporter({
 			code,
 			from: target.from,
-			to: target.to
+			to: target.to,
+			params
 		});
-		if (annotateErrors) annotateError(target, code);
+		if (annotateErrors) annotateError(target, code, params);
+	}
+	const classified = classifyParseError(node, expression);
+	if (classified !== null) {
+		reporter(classified);
+		if (annotateErrors) annotateError(node, classified.code, classified.params);
+		return;
 	}
 	const parent = node.parent;
 	if (parent === null) {
@@ -35,6 +47,108 @@ function extractInternal(node, reporter, annotateErrors, ignoreUnknownErrors) {
 	if (parent.typeID === 4) return emit(parent, RSErrorCode.expectedLocal);
 	if (!ignoreUnknownErrors) emit(node.from === node.to ? parent : node, RSErrorCode.unknownSyntax);
 }
+function classifyParseError(node, expression) {
+	const filterParen = detectFilterParenMismatch(node, expression);
+	if (filterParen !== null) return filterParen;
+	return detectGlobalFuncWithoutArgs(node, expression);
+}
+function detectFilterParenMismatch(node, expression) {
+	const filterNode = findAncestor(node, isFilterNode) ?? findRelatedNode(node, isFilterNode);
+	if (filterNode === null) return null;
+	if (expression[filterNode.to] === "(") return {
+		code: RSErrorCode.invalidFilterSyntax,
+		from: filterNode.from,
+		to: filterNode.to + 1
+	};
+	return null;
+}
+function detectGlobalFuncWithoutArgs(node, expression) {
+	const funcNode = findAncestor(node, (n) => isFunctionNode(n) || isPredicateNode(n)) ?? findRelatedNode(node, (n) => isFunctionNode(n) || isPredicateNode(n));
+	if (funcNode === null) return null;
+	return classifyFuncWithoutArgs(funcNode, expression);
+}
+function findRelatedNode(node, predicate) {
+	let current = node.parent;
+	while (current !== null) {
+		for (const child of current.children) if (predicate(child)) return child;
+		current = current.parent;
+	}
+	return null;
+}
+function classifyFuncWithoutArgs(funcNode, expression) {
+	const name = expression.slice(funcNode.from, funcNode.to);
+	const rest = expression.slice(funcNode.to);
+	if (!/^\s*\[/.test(rest)) return {
+		code: RSErrorCode.globalFuncWithoutArgs,
+		from: funcNode.from,
+		to: funcNode.to,
+		params: [name]
+	};
+	if (/^\s*\[\s*\]/.test(rest)) return {
+		code: RSErrorCode.globalFuncWithoutArgs,
+		from: funcNode.from,
+		to: funcNode.to,
+		params: [name]
+	};
+	const openBracket = /^\s*\[/.exec(rest);
+	if (openBracket !== null) {
+		const closeIdx = findMatchingCloseBracket(rest, openBracket[0].length - 1);
+		if (closeIdx >= 0) {
+			if (rest.slice(openBracket[0].length, closeIdx).trim().length === 0) return {
+				code: RSErrorCode.globalFuncWithoutArgs,
+				from: funcNode.from,
+				to: funcNode.to,
+				params: [name]
+			};
+		}
+	}
+	return null;
+}
+function findAncestor(node, predicate) {
+	let current = node;
+	while (current !== null) {
+		if (predicate(current)) return current;
+		current = current.parent;
+	}
+	return null;
+}
+function isFunctionNode(node) {
+	return node.typeID === 69 || node.typeID === TokenID.ID_FUNCTION;
+}
+function isPredicateNode(node) {
+	return node.typeID === 26 || node.typeID === TokenID.ID_PREDICATE;
+}
+function isFilterNode(node) {
+	return node.typeID === 59 || node.typeID === TokenID.FILTER;
+}
+function findMatchingCloseBracket(expression, openPos) {
+	if (expression[openPos] !== "[") return -1;
+	let depth = 0;
+	for (let index = openPos; index < expression.length; index++) {
+		const symbol = expression[index];
+		if (symbol === "[") depth++;
+		else if (symbol === "]") {
+			depth--;
+			if (depth === 0) return index;
+		}
+	}
+	return -1;
+}
+function deduplicateErrors(errors) {
+	const result = [];
+	for (const error of errors) {
+		if (result.some((existing) => existing.code === error.code && existing.from === error.from && existing.to === error.to)) continue;
+		if (error.code !== RSErrorCode.unknownSyntax) {
+			for (let index = result.length - 1; index >= 0; index--) if (result[index].code === RSErrorCode.unknownSyntax && rangesOverlap(error, result[index])) result.splice(index, 1);
+		}
+		result.push(error);
+	}
+	const specific = result.filter((error) => error.code !== RSErrorCode.unknownSyntax);
+	return result.filter((error) => error.code !== RSErrorCode.unknownSyntax || !specific.some((item) => rangesOverlap(error, item)));
+}
+function rangesOverlap(a, b) {
+	return a.from < b.to && b.from < a.to;
+}
 function extractBracketErrors(expression) {
 	const stack = [];
 	for (let pos = 0; pos < expression.length; pos++) {
@@ -101,12 +215,12 @@ function closeToOpen(symbol) {
 }
 function isDoubleParenthesis(expression, pos) {
 	if (!(expression[pos] === "(" && expression[pos + 1] === "(")) return false;
-	const outerClose = findMatchingCloseBracket(expression, pos);
-	const innerClose = findMatchingCloseBracket(expression, pos + 1);
+	const outerClose = findMatchingCloseParen(expression, pos);
+	const innerClose = findMatchingCloseParen(expression, pos + 1);
 	if (outerClose < 0 || innerClose < 0) return false;
 	return outerClose === innerClose + 1;
 }
-function findMatchingCloseBracket(expression, openPos) {
+function findMatchingCloseParen(expression, openPos) {
 	if (expression[openPos] !== "(") return -1;
 	const stack = [];
 	for (let index = openPos; index < expression.length; index++) {

package/dist/rslang/parser/syntax-errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"syntax-errors.js","names":[],"sources":["../../../src/rslang/parser/syntax-errors.ts"],"sourcesContent":["/**\n * Module: Syntactic errors reporting.\n */\n\nimport { type AstNode, visitAstDFS } from '../../parsing';\nimport { annotateError } from '../ast-annotations';\nimport { type ErrorReporter, RSErrorCode, type RSErrorDescription } from '../error';\n\nimport { Variable } from './parser.terms';\nimport { TokenID } from './token';\n\nexport function extractSyntaxErrors(\n  ast: AstNode,\n  expression: string,\n  reporter: ErrorReporter,\n  annotateErrors: boolean = false\n) {\n  const bracketError = extractBracketErrors(expression);\n  if (bracketError !== null) {\n    reporter(bracketError);\n    if (annotateErrors) {\n      annotateError(ast, bracketError.code, bracketError.params);\n    }\n  }\n  const hasBracketErrors = bracketError !== null;\n  visitAstDFS(ast, node => extractInternal(node, reporter, annotateErrors, hasBracketErrors));\n}\n\n// ====== Internals =========\nfunction extractInternal(\n  node: AstNode,\n  reporter: ErrorReporter,\n  annotateErrors: boolean,\n  ignoreUnknownErrors: boolean\n) {\n  if (node.typeID !== TokenID.ERROR) {\n    return;\n  }\n\n  function emit(target: AstNode, code: RSErrorCode) {\n    reporter({ code: code, from: target.from, to: target.to });\n    if (annotateErrors) {\n      annotateError(target, code);\n    }\n  }\n\n  const parent = node.parent;\n  if (parent === null) {\n    if (!ignoreUnknownErrors) {\n      return emit(node, RSErrorCode.unknownSyntax);\n    }\n    return;\n  }\n\n  if (parent.typeID === Variable) {\n    return emit(parent, RSErrorCode.expectedLocal);\n  }\n\n  if (!ignoreUnknownErrors) {\n    emit(node.from === node.to ? parent : node, RSErrorCode.unknownSyntax);\n  }\n}\n\ntype OpenBracket = '(' | '[' | '{';\ntype CloseBracket = ')' | ']' | '}';\n\ninterface BracketFrame {\n  bracket: OpenBracket;\n  index: number;\n}\n\nfunction extractBracketErrors(expression: string): RSErrorDescription | null {\n  const stack: BracketFrame[] = [];\n\n  for (let pos = 0; pos < expression.length; pos++) {\n    const symbol = expression[pos];\n    if (isOpenBracket(symbol)) {\n      if (isDoubleParenthesis(expression, pos)) {\n        return {\n          code: RSErrorCode.doubleParenthesis,\n          from: pos,\n          to: pos + 2\n        };\n      }\n      stack.push({ bracket: symbol, index: pos });\n      continue;\n    }\n    if (!isCloseBracket(symbol)) {\n      continue;\n    }\n\n    const expectedOpen = closeToOpen(symbol);\n    const top = stack[stack.length - 1];\n    if (top === undefined) {\n      return {\n        code: RSErrorCode.missingOpenBracket,\n        from: pos,\n        to: pos + 1,\n        params: [symbol]\n      };\n    }\n\n    if (top.bracket !== expectedOpen) {\n      return {\n        code: RSErrorCode.bracketMismatch,\n        from: pos,\n        to: pos + 1,\n        params: [openToClose(top.bracket), symbol]\n      };\n    }\n\n    stack.pop();\n  }\n\n  if (stack.length > 0) {\n    const unclosed = stack[0];\n    return {\n      code: RSErrorCode.missingCloseBracket,\n      from: unclosed.index,\n      to: unclosed.index + 1,\n      params: [unclosed.bracket]\n    };\n  }\n\n  return null;\n}\n\nfunction isOpenBracket(symbol: string): symbol is OpenBracket {\n  return symbol === '(' || symbol === '[' || symbol === '{';\n}\n\nfunction isCloseBracket(symbol: string): symbol is CloseBracket {\n  return symbol === ')' || symbol === ']' || symbol === '}';\n}\n\nfunction openToClose(symbol: OpenBracket): CloseBracket {\n  switch (symbol) {\n    case '(':\n      return ')';\n    case '[':\n      return ']';\n    case '{':\n      return '}';\n  }\n}\n\nfunction closeToOpen(symbol: CloseBracket): OpenBracket {\n  switch (symbol) {\n    case ')':\n      return '(';\n    case ']':\n      return '[';\n    case '}':\n      return '{';\n  }\n}\n\nfunction isDoubleParenthesis(expression: string, pos: number): boolean {\n  const isOpenDoubleParenthesis = expression[pos] === '(' && expression[pos + 1] === '(';\n  if (!isOpenDoubleParenthesis) {\n    return false;\n  }\n\n  const outerClose = findMatchingCloseBracket(expression, pos);\n  const innerClose = findMatchingCloseBracket(expression, pos + 1);\n  if (outerClose < 0 || innerClose < 0) {\n    return false;\n  }\n\n  return outerClose === innerClose + 1;\n}\n\nfunction findMatchingCloseBracket(expression: string, openPos: number): number {\n  if (expression[openPos] !== '(') {\n    return -1;\n  }\n\n  const stack: OpenBracket[] = [];\n  for (let index = openPos; index < expression.length; index++) {\n    const symbol = expression[index];\n    if (isOpenBracket(symbol)) {\n      stack.push(symbol);\n      continue;\n    }\n    if (!isCloseBracket(symbol)) {\n      continue;\n    }\n    const top = stack.pop();\n    if (top === undefined || top !== closeToOpen(symbol)) {\n      return -1;\n    }\n    if (stack.length === 0) {\n      return index;\n    }\n  }\n\n  return -1;\n}\n"],"mappings":"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"}
+{"version":3,"file":"syntax-errors.js","names":[],"sources":["../../../src/rslang/parser/syntax-errors.ts"],"sourcesContent":["/**\n * Module: Syntactic errors reporting.\n */\n\nimport { type AstNode, visitAstDFS } from '../../parsing';\nimport { annotateError } from '../ast-annotations';\nimport { type ErrorReporter, RSErrorCode, type RSErrorDescription } from '../error';\n\nimport { Filter, Function, Predicate, Variable } from './parser.terms';\nimport { TokenID } from './token';\n\nexport function extractSyntaxErrors(\n  ast: AstNode,\n  expression: string,\n  reporter: ErrorReporter,\n  annotateErrors: boolean = false\n) {\n  const collected: RSErrorDescription[] = [];\n  const collect = (error: RSErrorDescription) => {\n    collected.push(error);\n  };\n\n  const bracketError = extractBracketErrors(expression);\n  if (bracketError !== null) {\n    collect(bracketError);\n    if (annotateErrors) {\n      annotateError(ast, bracketError.code, bracketError.params);\n    }\n  }\n  const hasBracketErrors = bracketError !== null;\n  visitAstDFS(ast, node => extractInternal(node, expression, collect, annotateErrors, hasBracketErrors));\n\n  for (const error of deduplicateErrors(collected)) {\n    reporter(error);\n  }\n}\n\n// ====== Internals =========\nfunction extractInternal(\n  node: AstNode,\n  expression: string,\n  reporter: ErrorReporter,\n  annotateErrors: boolean,\n  ignoreUnknownErrors: boolean\n) {\n  if (node.typeID !== TokenID.ERROR) {\n    return;\n  }\n\n  function emit(target: AstNode, code: RSErrorCode, params?: readonly string[]) {\n    reporter({ code: code, from: target.from, to: target.to, params });\n    if (annotateErrors) {\n      annotateError(target, code, params);\n    }\n  }\n\n  const classified = classifyParseError(node, expression);\n  if (classified !== null) {\n    reporter(classified);\n    if (annotateErrors) {\n      annotateError(node, classified.code, classified.params);\n    }\n    return;\n  }\n\n  const parent = node.parent;\n  if (parent === null) {\n    if (!ignoreUnknownErrors) {\n      return emit(node, RSErrorCode.unknownSyntax);\n    }\n    return;\n  }\n\n  if (parent.typeID === Variable) {\n    return emit(parent, RSErrorCode.expectedLocal);\n  }\n\n  if (!ignoreUnknownErrors) {\n    emit(node.from === node.to ? parent : node, RSErrorCode.unknownSyntax);\n  }\n}\n\nfunction classifyParseError(node: AstNode, expression: string): RSErrorDescription | null {\n  const filterParen = detectFilterParenMismatch(node, expression);\n  if (filterParen !== null) {\n    return filterParen;\n  }\n\n  return detectGlobalFuncWithoutArgs(node, expression);\n}\n\nfunction detectFilterParenMismatch(node: AstNode, expression: string): RSErrorDescription | null {\n  const filterNode = findAncestor(node, isFilterNode) ?? findRelatedNode(node, isFilterNode);\n  if (filterNode === null) {\n    return null;\n  }\n\n  const nextChar = expression[filterNode.to];\n  if (nextChar === '(') {\n    return {\n      code: RSErrorCode.invalidFilterSyntax,\n      from: filterNode.from,\n      to: filterNode.to + 1\n    };\n  }\n  return null;\n}\n\nfunction detectGlobalFuncWithoutArgs(node: AstNode, expression: string): RSErrorDescription | null {\n  const funcNode =\n    findAncestor(node, n => isFunctionNode(n) || isPredicateNode(n)) ??\n    findRelatedNode(node, n => isFunctionNode(n) || isPredicateNode(n));\n  if (funcNode === null) {\n    return null;\n  }\n  return classifyFuncWithoutArgs(funcNode, expression);\n}\n\nfunction findRelatedNode(node: AstNode, predicate: (target: AstNode) => boolean): AstNode | null {\n  let current: AstNode | null = node.parent;\n  while (current !== null) {\n    for (const child of current.children) {\n      if (predicate(child)) {\n        return child;\n      }\n    }\n    current = current.parent;\n  }\n  return null;\n}\n\nfunction classifyFuncWithoutArgs(funcNode: AstNode, expression: string): RSErrorDescription | null {\n  const name = expression.slice(funcNode.from, funcNode.to);\n  const rest = expression.slice(funcNode.to);\n\n  if (!/^\\s*\\[/.test(rest)) {\n    return {\n      code: RSErrorCode.globalFuncWithoutArgs,\n      from: funcNode.from,\n      to: funcNode.to,\n      params: [name]\n    };\n  }\n\n  if (/^\\s*\\[\\s*\\]/.test(rest)) {\n    return {\n      code: RSErrorCode.globalFuncWithoutArgs,\n      from: funcNode.from,\n      to: funcNode.to,\n      params: [name]\n    };\n  }\n\n  const openBracket = /^\\s*\\[/.exec(rest);\n  if (openBracket !== null) {\n    const closeIdx = findMatchingCloseBracket(rest, openBracket[0].length - 1);\n    if (closeIdx >= 0) {\n      const inner = rest.slice(openBracket[0].length, closeIdx).trim();\n      if (inner.length === 0) {\n        return {\n          code: RSErrorCode.globalFuncWithoutArgs,\n          from: funcNode.from,\n          to: funcNode.to,\n          params: [name]\n        };\n      }\n    }\n  }\n\n  return null;\n}\n\nfunction findAncestor(node: AstNode, predicate: (node: AstNode) => boolean): AstNode | null {\n  let current: AstNode | null = node;\n  while (current !== null) {\n    if (predicate(current)) {\n      return current;\n    }\n    current = current.parent;\n  }\n  return null;\n}\n\nfunction isFunctionNode(node: AstNode): boolean {\n  return node.typeID === Function || node.typeID === TokenID.ID_FUNCTION;\n}\n\nfunction isPredicateNode(node: AstNode): boolean {\n  return node.typeID === Predicate || node.typeID === TokenID.ID_PREDICATE;\n}\n\nfunction isFilterNode(node: AstNode): boolean {\n  return node.typeID === Filter || node.typeID === TokenID.FILTER;\n}\n\nfunction findMatchingCloseBracket(expression: string, openPos: number): number {\n  const open = expression[openPos];\n  if (open !== '[') {\n    return -1;\n  }\n\n  let depth = 0;\n  for (let index = openPos; index < expression.length; index++) {\n    const symbol = expression[index];\n    if (symbol === '[') {\n      depth++;\n    } else if (symbol === ']') {\n      depth--;\n      if (depth === 0) {\n        return index;\n      }\n    }\n  }\n  return -1;\n}\n\nfunction deduplicateErrors(errors: RSErrorDescription[]): RSErrorDescription[] {\n  const result: RSErrorDescription[] = [];\n\n  for (const error of errors) {\n    const duplicate = result.some(\n      existing => existing.code === error.code && existing.from === error.from && existing.to === error.to\n    );\n    if (duplicate) {\n      continue;\n    }\n\n    if (error.code !== RSErrorCode.unknownSyntax) {\n      for (let index = result.length - 1; index >= 0; index--) {\n        if (result[index].code === RSErrorCode.unknownSyntax && rangesOverlap(error, result[index])) {\n          result.splice(index, 1);\n        }\n      }\n    }\n\n    result.push(error);\n  }\n\n  const specific = result.filter(error => error.code !== RSErrorCode.unknownSyntax);\n  return result.filter(\n    error => error.code !== RSErrorCode.unknownSyntax || !specific.some(item => rangesOverlap(error, item))\n  );\n}\n\nfunction rangesOverlap(a: RSErrorDescription, b: RSErrorDescription): boolean {\n  return a.from < b.to && b.from < a.to;\n}\n\ntype OpenBracket = '(' | '[' | '{';\ntype CloseBracket = ')' | ']' | '}';\n\ninterface BracketFrame {\n  bracket: OpenBracket;\n  index: number;\n}\n\nfunction extractBracketErrors(expression: string): RSErrorDescription | null {\n  const stack: BracketFrame[] = [];\n\n  for (let pos = 0; pos < expression.length; pos++) {\n    const symbol = expression[pos];\n    if (isOpenBracket(symbol)) {\n      if (isDoubleParenthesis(expression, pos)) {\n        return {\n          code: RSErrorCode.doubleParenthesis,\n          from: pos,\n          to: pos + 2\n        };\n      }\n      stack.push({ bracket: symbol, index: pos });\n      continue;\n    }\n    if (!isCloseBracket(symbol)) {\n      continue;\n    }\n\n    const expectedOpen = closeToOpen(symbol);\n    const top = stack[stack.length - 1];\n    if (top === undefined) {\n      return {\n        code: RSErrorCode.missingOpenBracket,\n        from: pos,\n        to: pos + 1,\n        params: [symbol]\n      };\n    }\n\n    if (top.bracket !== expectedOpen) {\n      return {\n        code: RSErrorCode.bracketMismatch,\n        from: pos,\n        to: pos + 1,\n        params: [openToClose(top.bracket), symbol]\n      };\n    }\n\n    stack.pop();\n  }\n\n  if (stack.length > 0) {\n    const unclosed = stack[0];\n    return {\n      code: RSErrorCode.missingCloseBracket,\n      from: unclosed.index,\n      to: unclosed.index + 1,\n      params: [unclosed.bracket]\n    };\n  }\n\n  return null;\n}\n\nfunction isOpenBracket(symbol: string): symbol is OpenBracket {\n  return symbol === '(' || symbol === '[' || symbol === '{';\n}\n\nfunction isCloseBracket(symbol: string): symbol is CloseBracket {\n  return symbol === ')' || symbol === ']' || symbol === '}';\n}\n\nfunction openToClose(symbol: OpenBracket): CloseBracket {\n  switch (symbol) {\n    case '(':\n      return ')';\n    case '[':\n      return ']';\n    case '{':\n      return '}';\n  }\n}\n\nfunction closeToOpen(symbol: CloseBracket): OpenBracket {\n  switch (symbol) {\n    case ')':\n      return '(';\n    case ']':\n      return '[';\n    case '}':\n      return '{';\n  }\n}\n\nfunction isDoubleParenthesis(expression: string, pos: number): boolean {\n  const isOpenDoubleParenthesis = expression[pos] === '(' && expression[pos + 1] === '(';\n  if (!isOpenDoubleParenthesis) {\n    return false;\n  }\n\n  const outerClose = findMatchingCloseParen(expression, pos);\n  const innerClose = findMatchingCloseParen(expression, pos + 1);\n  if (outerClose < 0 || innerClose < 0) {\n    return false;\n  }\n\n  return outerClose === innerClose + 1;\n}\n\nfunction findMatchingCloseParen(expression: string, openPos: number): number {\n  if (expression[openPos] !== '(') {\n    return -1;\n  }\n\n  const stack: OpenBracket[] = [];\n  for (let index = openPos; index < expression.length; index++) {\n    const symbol = expression[index];\n    if (isOpenBracket(symbol)) {\n      stack.push(symbol);\n      continue;\n    }\n    if (!isCloseBracket(symbol)) {\n      continue;\n    }\n    const top = stack.pop();\n    if (top === undefined || top !== closeToOpen(symbol)) {\n      return -1;\n    }\n    if (stack.length === 0) {\n      return index;\n    }\n  }\n\n  return -1;\n}\n"],"mappings":"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"}

package/dist/rslang/semantic/analyzer.d.ts

@@ -1,2 +1,2 @@
-import { a as RSLangAnalyzer, i as AnalysisOptions, n as AnalysisFast, r as AnalysisFull, t as AnalysisBase } from "../../analyzer-BIVXNtT6.js";
+import { a as RSLangAnalyzer, i as AnalysisOptions, n as AnalysisFast, r as AnalysisFull, t as AnalysisBase } from "../../analyzer-54lGGg13.js";
 export { AnalysisBase, AnalysisFast, AnalysisFull, AnalysisOptions, RSLangAnalyzer };

package/dist/rslang/semantic/type-auditor.d.ts

@@ -1,6 +1,6 @@
 import { t as AstNode } from "../../ast-C8sIpKdL.js";
 import { _ as TypeContext, f as ExpressionType } from "../../typification-Dk-fisgO.js";
-import { t as ErrorReporter } from "../../error-CpOz9MFT.js";
+import { t as ErrorReporter } from "../../error-CxIs0A7Y.js";
 
 //#region src/rslang/semantic/type-auditor.d.ts
 /** Type auditor for AST type checking. */
@@ -54,6 +54,8 @@ declare class TypeAuditor {
   private visitProjectSet;
   private visitProjectTuple;
   private visitFilter;
+  private expectedFilterArgumentLabel;
+  private reportFilterParameterError;
   private visitReduce;
   private visitArgumentsEnum;
   private visitDeclarative;

package/dist/rslang/semantic/type-auditor.js

@@ -200,6 +200,7 @@ var TypeAuditor = class TypeAuditor {
 		const alias = getNodeText(node);
 		const type = this.context.get(alias);
 		if (!type) return this.onError(RSErrorCode.globalNotTyped, node, [alias]);
+		if (type.typeID === TypeID.function || type.typeID === TypeID.predicate) return this.onError(RSErrorCode.globalFuncWithoutArgs, node, [alias]);
 		return type;
 	}
 	visitFunctionDefinition(node) {
@@ -443,40 +444,70 @@ var TypeAuditor = class TypeAuditor {
 		const operator = labelRSLangNode(node);
 		const indices = getNodeIndices(node);
 		const tupleParam = indices.length === node.children.length - 1;
-		if (!tupleParam && node.children.length > 2) return this.onError(RSErrorCode.invalidFilterArity, node);
+		if (!tupleParam && node.children.length > 2) {
+			const extraParam = node.children[indices.length];
+			return this.onError(RSErrorCode.invalidFilterArity, extraParam ?? node, [
+				String(indices.length),
+				String(node.children.length - 1),
+				operator
+			]);
+		}
 		const argument = this.childTypification(node, node.children.length - 1);
 		if (argument === null) return null;
 		if (argument.typeID === TypeID.anyTypification || argument.typeID === TypeID.collection && argument.base.typeID === TypeID.anyTypification) return EmptySetT;
-		if (argument.typeID !== TypeID.collection || argument.base.typeID !== TypeID.tuple) return this.onError(RSErrorCode.invalidFilterArgumentType, node.children[node.children.length - 1], [labelRSLangNode(node), labelType(argument)]);
+		const expectedArgument = this.expectedFilterArgumentLabel(indices);
+		if (argument.typeID !== TypeID.collection || argument.base.typeID !== TypeID.tuple) return this.onError(RSErrorCode.invalidFilterArgumentType, node.children[node.children.length - 1], [
+			operator,
+			labelType(argument),
+			expectedArgument
+		]);
 		const argBase = debool(argument);
 		const bases = [];
 		for (const index of indices) {
 			const newBase = component(argBase, index);
-			if (newBase === null) return this.onError(RSErrorCode.invalidFilterArgumentType, node.children[node.children.length - 1], [labelRSLangNode(node), labelType(argument)]);
+			if (newBase === null) return this.onError(RSErrorCode.invalidFilterIndex, node.children[node.children.length - 1], [
+				operator,
+				labelType(argument),
+				String(index),
+				String(argBase.factors.length)
+			]);
 			bases.push(newBase);
 		}
 		if (tupleParam) for (let child = 0; child + 1 < node.children.length; child++) {
 			const param = this.childTypification(node, child);
 			if (param === null) return null;
-			if (param.typeID !== TypeID.collection || !checkCompatibility(bases[child], debool(param))) return this.onError(RSErrorCode.invalidFilterParameterType, node.children[child], [
-				labelType(param),
-				labelType(bool(bases[child])),
-				operator
-			]);
+			const expectedParam = bool(bases[child]);
+			if (param.typeID !== TypeID.collection || !checkCompatibility(bases[child], debool(param))) return this.reportFilterParameterError(node, child, param, expectedParam, operator);
 		}
 		else {
 			const param = this.childTypification(node, 0);
 			if (param === null) return null;
 			const paramType = param;
 			const expected = bool(tuple(bases));
-			if (paramType.typeID !== TypeID.collection || !checkCompatibility(expected, paramType)) return this.onError(RSErrorCode.invalidFilterParameterType, node.children[0], [
-				labelType(paramType),
-				labelType(expected),
-				operator
-			]);
+			if (paramType.typeID !== TypeID.collection || !checkCompatibility(expected, paramType)) return this.reportFilterParameterError(node, 0, paramType, expected, operator);
 		}
 		return argument;
 	}
+	expectedFilterArgumentLabel(indices) {
+		const maxIndex = Math.max(...indices, 0);
+		if (maxIndex <= 1) return labelType(bool({ typeID: TypeID.anyTypification }));
+		const factors = [];
+		for (let index = 1; index <= maxIndex; index++) factors.push({ typeID: TypeID.anyTypification });
+		return labelType(bool(tuple(factors)));
+	}
+	reportFilterParameterError(node, childIndex, param, expected, operator) {
+		const wrapped = bool(param);
+		if (checkEquality(wrapped, expected) || checkCompatibility(wrapped, expected)) return this.onError(RSErrorCode.invalidFilterBooleanEchelon, node.children[childIndex], [
+			operator,
+			labelType(param),
+			labelType(expected)
+		]);
+		return this.onError(RSErrorCode.invalidFilterParameterType, node.children[childIndex], [
+			labelType(param),
+			labelType(expected),
+			operator
+		]);
+	}
 	visitReduce(node) {
 		const argument = this.childTypification(node, 0);
 		if (argument === null) return null;