@opra/common 0.10.0 → 0.10.1

package/esm/filter/antlr/OpraFilterVisitor.d.ts

@@ -1,5 +1,5 @@
-import { ParseTreeVisitor } from "antlr4ts/tree/ParseTreeVisitor";
-import { ArithmeticExpressionContext, ArrayExpressionContext, ArthOpContext, BooleanContext, BooleanLiteralContext, ComparisonExpressionContext, CompOpContext, DateLiteralContext, DateTimeLiteralContext, DateTimePrecisionContext, ExpressionContext, ExternalConstantContext, ExternalConstantTermContext, FunctionContext, IdentifierContext, IndexerContext, InfinityContext, InfinityLiteralContext, InvocableContext, InvocationContext, LiteralContext, LiteralTermContext, LogicalExpressionContext, LogOpContext, MemberIndexContext, MemberInvocationContext, NullContext, NullLiteralContext, NumberIndexContext, NumberLiteralContext, ParamListContext, ParenthesizedExpressionContext, PluralDateTimePrecisionContext, PolarityExpressionContext, PolarOpContext, QualifiedIdentifierContext, QualifiedIdentifierTermContext, RootContext, StringLiteralContext, TermContext, TermExpressionContext, TimeLiteralContext, UnitContext } from "../antlr/OpraFilterParser.js";
+import { ParseTreeVisitor } from 'antlr4';
+import { ArithmeticExpressionContext, ArrayExpressionContext, ArthOpContext, BooleanContext, BooleanLiteralContext, ComparisonExpressionContext, CompOpContext, DateLiteralContext, DateTimeLiteralContext, DateTimePrecisionContext, ExternalConstantContext, ExternalConstantTermContext, FunctionContext, IdentifierContext, InfinityContext, InfinityLiteralContext, InvocableContext, LiteralTermContext, LogicalExpressionContext, LogOpContext, MemberIndexContext, MemberInvocationContext, NullContext, NullLiteralContext, NumberIndexContext, NumberLiteralContext, ParamListContext, ParenthesizedExpressionContext, PluralDateTimePrecisionContext, PolarityExpressionContext, PolarOpContext, QualifiedIdentifierContext, QualifiedIdentifierTermContext, RootContext, StringLiteralContext, TermExpressionContext, TimeLiteralContext, UnitContext } from "./OpraFilterParser.js";
 /**
  * This interface defines a complete generic visitor for a parse tree produced
  * by `OpraFilterParser`.
@@ -7,42 +7,13 @@ import { ArithmeticExpressionContext, ArrayExpressionContext, ArthOpContext, Boo
  * @param <Result> The return type of the visit operation. Use `void` for
  * operations with no return type.
  */
-export interface OpraFilterVisitor<Result> extends ParseTreeVisitor<Result> {
+export default class OpraFilterVisitor<Result> extends ParseTreeVisitor<Result> {
     /**
-     * Visit a parse tree produced by the `termExpression`
-     * labeled alternative in `OpraFilterParser.expression`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitTermExpression?: (ctx: TermExpressionContext) => Result;
-    /**
-     * Visit a parse tree produced by the `polarityExpression`
-     * labeled alternative in `OpraFilterParser.expression`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitPolarityExpression?: (ctx: PolarityExpressionContext) => Result;
-    /**
-     * Visit a parse tree produced by the `arithmeticExpression`
-     * labeled alternative in `OpraFilterParser.expression`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitArithmeticExpression?: (ctx: ArithmeticExpressionContext) => Result;
-    /**
-     * Visit a parse tree produced by the `comparisonExpression`
-     * labeled alternative in `OpraFilterParser.expression`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitComparisonExpression?: (ctx: ComparisonExpressionContext) => Result;
-    /**
-     * Visit a parse tree produced by the `logicalExpression`
-     * labeled alternative in `OpraFilterParser.expression`.
+     * Visit a parse tree produced by `OpraFilterParser.root`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitLogicalExpression?: (ctx: LogicalExpressionContext) => Result;
+    visitRoot?: (ctx: RootContext) => Result;
     /**
      * Visit a parse tree produced by the `parenthesizedExpression`
      * labeled alternative in `OpraFilterParser.expression`.
@@ -58,75 +29,67 @@ export interface OpraFilterVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitArrayExpression?: (ctx: ArrayExpressionContext) => Result;
     /**
-     * Visit a parse tree produced by the `memberIndex`
-     * labeled alternative in `OpraFilterParser.indexer`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitMemberIndex?: (ctx: MemberIndexContext) => Result;
-    /**
-     * Visit a parse tree produced by the `numberIndex`
-     * labeled alternative in `OpraFilterParser.indexer`.
+     * Visit a parse tree produced by the `polarityExpression`
+     * labeled alternative in `OpraFilterParser.expression`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitNumberIndex?: (ctx: NumberIndexContext) => Result;
+    visitPolarityExpression?: (ctx: PolarityExpressionContext) => Result;
     /**
-     * Visit a parse tree produced by the `numberLiteral`
-     * labeled alternative in `OpraFilterParser.literal`.
+     * Visit a parse tree produced by the `comparisonExpression`
+     * labeled alternative in `OpraFilterParser.expression`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitNumberLiteral?: (ctx: NumberLiteralContext) => Result;
+    visitComparisonExpression?: (ctx: ComparisonExpressionContext) => Result;
     /**
-     * Visit a parse tree produced by the `infinityLiteral`
-     * labeled alternative in `OpraFilterParser.literal`.
+     * Visit a parse tree produced by the `arithmeticExpression`
+     * labeled alternative in `OpraFilterParser.expression`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitInfinityLiteral?: (ctx: InfinityLiteralContext) => Result;
+    visitArithmeticExpression?: (ctx: ArithmeticExpressionContext) => Result;
     /**
-     * Visit a parse tree produced by the `booleanLiteral`
-     * labeled alternative in `OpraFilterParser.literal`.
+     * Visit a parse tree produced by the `logicalExpression`
+     * labeled alternative in `OpraFilterParser.expression`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitBooleanLiteral?: (ctx: BooleanLiteralContext) => Result;
+    visitLogicalExpression?: (ctx: LogicalExpressionContext) => Result;
     /**
-     * Visit a parse tree produced by the `nullLiteral`
-     * labeled alternative in `OpraFilterParser.literal`.
+     * Visit a parse tree produced by the `termExpression`
+     * labeled alternative in `OpraFilterParser.expression`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitNullLiteral?: (ctx: NullLiteralContext) => Result;
+    visitTermExpression?: (ctx: TermExpressionContext) => Result;
     /**
-     * Visit a parse tree produced by the `dateLiteral`
-     * labeled alternative in `OpraFilterParser.literal`.
+     * Visit a parse tree produced by the `literalTerm`
+     * labeled alternative in `OpraFilterParser.term`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitDateLiteral?: (ctx: DateLiteralContext) => Result;
+    visitLiteralTerm?: (ctx: LiteralTermContext) => Result;
     /**
-     * Visit a parse tree produced by the `dateTimeLiteral`
-     * labeled alternative in `OpraFilterParser.literal`.
+     * Visit a parse tree produced by the `qualifiedIdentifierTerm`
+     * labeled alternative in `OpraFilterParser.term`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitDateTimeLiteral?: (ctx: DateTimeLiteralContext) => Result;
+    visitQualifiedIdentifierTerm?: (ctx: QualifiedIdentifierTermContext) => Result;
     /**
-     * Visit a parse tree produced by the `timeLiteral`
-     * labeled alternative in `OpraFilterParser.literal`.
+     * Visit a parse tree produced by the `externalConstantTerm`
+     * labeled alternative in `OpraFilterParser.term`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitTimeLiteral?: (ctx: TimeLiteralContext) => Result;
+    visitExternalConstantTerm?: (ctx: ExternalConstantTermContext) => Result;
     /**
-     * Visit a parse tree produced by the `stringLiteral`
-     * labeled alternative in `OpraFilterParser.literal`.
+     * Visit a parse tree produced by `OpraFilterParser.invocable`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitStringLiteral?: (ctx: StringLiteralContext) => Result;
+    visitInvocable?: (ctx: InvocableContext) => Result;
     /**
      * Visit a parse tree produced by the `memberInvocation`
      * labeled alternative in `OpraFilterParser.invocation`.
@@ -135,116 +98,123 @@ export interface OpraFilterVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitMemberInvocation?: (ctx: MemberInvocationContext) => Result;
     /**
-     * Visit a parse tree produced by the `literalTerm`
-     * labeled alternative in `OpraFilterParser.term`.
+     * Visit a parse tree produced by the `memberIndex`
+     * labeled alternative in `OpraFilterParser.indexer`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitLiteralTerm?: (ctx: LiteralTermContext) => Result;
+    visitMemberIndex?: (ctx: MemberIndexContext) => Result;
     /**
-     * Visit a parse tree produced by the `qualifiedIdentifierTerm`
-     * labeled alternative in `OpraFilterParser.term`.
+     * Visit a parse tree produced by the `numberIndex`
+     * labeled alternative in `OpraFilterParser.indexer`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitQualifiedIdentifierTerm?: (ctx: QualifiedIdentifierTermContext) => Result;
+    visitNumberIndex?: (ctx: NumberIndexContext) => Result;
     /**
-     * Visit a parse tree produced by the `externalConstantTerm`
-     * labeled alternative in `OpraFilterParser.term`.
+     * Visit a parse tree produced by `OpraFilterParser.function`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExternalConstantTerm?: (ctx: ExternalConstantTermContext) => Result;
+    visitFunction?: (ctx: FunctionContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.root`.
+     * Visit a parse tree produced by `OpraFilterParser.paramList`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitRoot?: (ctx: RootContext) => Result;
+    visitParamList?: (ctx: ParamListContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.expression`.
+     * Visit a parse tree produced by `OpraFilterParser.unit`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExpression?: (ctx: ExpressionContext) => Result;
+    visitUnit?: (ctx: UnitContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.term`.
+     * Visit a parse tree produced by `OpraFilterParser.dateTimePrecision`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitTerm?: (ctx: TermContext) => Result;
+    visitDateTimePrecision?: (ctx: DateTimePrecisionContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.invocable`.
+     * Visit a parse tree produced by `OpraFilterParser.pluralDateTimePrecision`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitInvocable?: (ctx: InvocableContext) => Result;
+    visitPluralDateTimePrecision?: (ctx: PluralDateTimePrecisionContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.invocation`.
+     * Visit a parse tree produced by `OpraFilterParser.qualifiedIdentifier`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitInvocation?: (ctx: InvocationContext) => Result;
+    visitQualifiedIdentifier?: (ctx: QualifiedIdentifierContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.indexer`.
+     * Visit a parse tree produced by `OpraFilterParser.externalConstant`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitIndexer?: (ctx: IndexerContext) => Result;
+    visitExternalConstant?: (ctx: ExternalConstantContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.function`.
+     * Visit a parse tree produced by `OpraFilterParser.identifier`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitFunction?: (ctx: FunctionContext) => Result;
+    visitIdentifier?: (ctx: IdentifierContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.paramList`.
+     * Visit a parse tree produced by the `numberLiteral`
+     * labeled alternative in `OpraFilterParser.literal`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitParamList?: (ctx: ParamListContext) => Result;
+    visitNumberLiteral?: (ctx: NumberLiteralContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.unit`.
+     * Visit a parse tree produced by the `infinityLiteral`
+     * labeled alternative in `OpraFilterParser.literal`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitUnit?: (ctx: UnitContext) => Result;
+    visitInfinityLiteral?: (ctx: InfinityLiteralContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.dateTimePrecision`.
+     * Visit a parse tree produced by the `booleanLiteral`
+     * labeled alternative in `OpraFilterParser.literal`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitDateTimePrecision?: (ctx: DateTimePrecisionContext) => Result;
+    visitBooleanLiteral?: (ctx: BooleanLiteralContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.pluralDateTimePrecision`.
+     * Visit a parse tree produced by the `nullLiteral`
+     * labeled alternative in `OpraFilterParser.literal`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitPluralDateTimePrecision?: (ctx: PluralDateTimePrecisionContext) => Result;
+    visitNullLiteral?: (ctx: NullLiteralContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.qualifiedIdentifier`.
+     * Visit a parse tree produced by the `dateLiteral`
+     * labeled alternative in `OpraFilterParser.literal`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitQualifiedIdentifier?: (ctx: QualifiedIdentifierContext) => Result;
+    visitDateLiteral?: (ctx: DateLiteralContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.externalConstant`.
+     * Visit a parse tree produced by the `dateTimeLiteral`
+     * labeled alternative in `OpraFilterParser.literal`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExternalConstant?: (ctx: ExternalConstantContext) => Result;
+    visitDateTimeLiteral?: (ctx: DateTimeLiteralContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.identifier`.
+     * Visit a parse tree produced by the `timeLiteral`
+     * labeled alternative in `OpraFilterParser.literal`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitIdentifier?: (ctx: IdentifierContext) => Result;
+    visitTimeLiteral?: (ctx: TimeLiteralContext) => Result;
     /**
-     * Visit a parse tree produced by `OpraFilterParser.literal`.
+     * Visit a parse tree produced by the `stringLiteral`
+     * labeled alternative in `OpraFilterParser.literal`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitLiteral?: (ctx: LiteralContext) => Result;
+    visitStringLiteral?: (ctx: StringLiteralContext) => Result;
     /**
      * Visit a parse tree produced by `OpraFilterParser.compOp`.
      * @param ctx the parse tree

package/esm/filter/antlr/OpraFilterVisitor.js

@@ -1,2 +1,11 @@
-// Generated from ../antlr/OpraFilter.g4 by ANTLR 4.9.0-SNAPSHOT
-export {};
+// Generated from ./src/filter/antlr/OpraFilter.g4 by ANTLR 4.11.2-SNAPSHOT
+import { ParseTreeVisitor } from 'antlr4';
+/**
+ * This interface defines a complete generic visitor for a parse tree produced
+ * by `OpraFilterParser`.
+ *
+ * @param <Result> The return type of the visit operation. Use `void` for
+ * operations with no return type.
+ */
+export default class OpraFilterVisitor extends ParseTreeVisitor {
+}

package/esm/filter/ast/terms/date-literal.js

@@ -1,8 +1,9 @@
-import { DateTime } from 'luxon'; // todo dont use luxon. it has circular deps!
+import { toDateDef } from 'putil-varhelpers';
 import { ValidationError } from '../../errors.js';
 import { quoteFilterString } from '../../utils.js';
 import { Literal } from '../abstract/literal.js';
-const DATE_PATTERN = /^(\d{4})-(0[1-9]|1[012])-([123]0|[012][1-9]|31)/;
+// const DATE_PATTERN = /^(\d{4})-(0[1-9]|1[012])-([123]0|[012][1-9]|31)/;
+const NullDate = new Date(0);
 export class DateLiteral extends Literal {
     constructor(value) {
         super('');
@@ -11,7 +12,7 @@ export class DateLiteral extends Literal {
             return;
         }
         // noinspection SuspiciousTypeOfGuard
-        if (typeof value === 'string' && DATE_PATTERN.test(value) && DateTime.fromISO(value).isValid) {
+        if (typeof value === 'string' && toDateDef(value, NullDate) !== NullDate) {
             this.value = value;
             return;
         }

package/esm/filter/errors.d.ts

@@ -1,20 +1,18 @@
-import { Recognizer } from 'antlr4ts';
-import { RecognitionException } from 'antlr4ts/RecognitionException';
+import { RecognitionException } from 'antlr4';
+import { Recognizer } from 'antlr4/src/antlr4/Recognizer';
 export declare class SyntaxError extends TypeError {
 }
 export declare class ValidationError extends TypeError {
 }
 export declare class FilterParseError extends Error {
-    recognizer: Recognizer<any, any>;
+    recognizer: Recognizer<any>;
     offendingSymbol: any | undefined;
     line: number;
-    charPositionInLine: number;
     e: RecognitionException | undefined;
     constructor(message: string, args: {
-        recognizer: Recognizer<any, any>;
+        recognizer: Recognizer<any>;
         offendingSymbol: any | undefined;
         line: number;
-        charPositionInLine: number;
         e: RecognitionException | undefined;
     });
 }

package/esm/filter/filter-tree-visitor.d.ts

@@ -1,9 +1,10 @@
-import { AbstractParseTreeVisitor } from 'antlr4ts/tree/index.js';
+import type { ParseTreeVisitor as TParseTreeVisitor } from 'antlr4';
 import { ArithmeticExpressionContext, ArrayExpressionContext, BooleanLiteralContext, ComparisonExpressionContext, DateLiteralContext, DateTimeLiteralContext, ExternalConstantTermContext, IdentifierContext, LogicalExpressionContext, NumberLiteralContext, ParenthesizedExpressionContext, PolarityExpressionContext, QualifiedIdentifierTermContext, RootContext, StringLiteralContext, TimeLiteralContext } from './antlr/OpraFilterParser.js';
-import { OpraFilterVisitor } from './antlr/OpraFilterVisitor.js';
+import OpraFilterVisitor from './antlr/OpraFilterVisitor.js';
 import { ArithmeticExpression, ArrayExpression, BooleanLiteral, DateLiteral, LogicalExpression, NullLiteral, NumberLiteral, ParenthesesExpression, QualifiedIdentifier, StringLiteral, TimeLiteral } from './ast/index.js';
 import { ExternalConstant } from './ast/terms/external-constant.js';
-export declare class FilterTreeVisitor extends AbstractParseTreeVisitor<any> implements OpraFilterVisitor<any> {
+declare const ParseTreeVisitor: typeof TParseTreeVisitor;
+export declare class FilterTreeVisitor extends ParseTreeVisitor<any> implements OpraFilterVisitor<any> {
     private _timeZone?;
     constructor(options?: {
         timeZone?: string;
@@ -28,3 +29,4 @@ export declare class FilterTreeVisitor extends AbstractParseTreeVisitor<any> imp
     visitLogicalExpression(ctx: LogicalExpressionContext): LogicalExpression;
     visitArithmeticExpression(ctx: ArithmeticExpressionContext): ArithmeticExpression;
 }
+export {};

package/esm/filter/filter-tree-visitor.js

@@ -1,10 +1,12 @@
-import { AbstractParseTreeVisitor } from 'antlr4ts/tree/index.js';
+import antlr4 from 'antlr4';
 import { ArithmeticExpressionContext, LogicalExpressionContext, } from './antlr/OpraFilterParser.js';
 import { ArithmeticExpression, ArrayExpression, BooleanLiteral, ComparisonExpression, DateLiteral, LogicalExpression, NullLiteral, NumberLiteral, ParenthesesExpression, QualifiedIdentifier, StringLiteral, TimeLiteral } from './ast/index.js';
 import { ExternalConstant } from './ast/terms/external-constant.js';
 import { SyntaxError } from './errors.js';
 import { unquoteFilterString } from './utils.js';
-export class FilterTreeVisitor extends AbstractParseTreeVisitor {
+// Fix: antlr4 d.ts files is invalid
+const ParseTreeVisitor = antlr4.tree.ParseTreeVisitor;
+export class FilterTreeVisitor extends ParseTreeVisitor {
     constructor(options) {
         super();
         this._timeZone = options?.timeZone;
@@ -16,57 +18,57 @@ export class FilterTreeVisitor extends AbstractParseTreeVisitor {
         return this.visit(ctx.expression());
     }
     visitIdentifier(ctx) {
-        return ctx.text;
+        return ctx.getText();
     }
     visitNullLiteral() {
         return new NullLiteral();
     }
     visitBooleanLiteral(ctx) {
-        return new BooleanLiteral(ctx.text === 'true');
+        return new BooleanLiteral(ctx.getText() === 'true');
     }
     visitNumberLiteral(ctx) {
-        return new NumberLiteral(ctx.text);
+        return new NumberLiteral(ctx.getText());
     }
     visitStringLiteral(ctx) {
-        return new StringLiteral(unquoteFilterString(ctx.text));
+        return new StringLiteral(unquoteFilterString(ctx.getText()));
     }
     visitInfinityLiteral() {
         return new NumberLiteral(Infinity);
     }
     visitDateLiteral(ctx) {
-        return new DateLiteral(unquoteFilterString(ctx.text));
+        return new DateLiteral(unquoteFilterString(ctx.getText()));
     }
     visitDateTimeLiteral(ctx) {
-        return new DateLiteral(unquoteFilterString(ctx.text));
+        return new DateLiteral(unquoteFilterString(ctx.getText()));
     }
     visitTimeLiteral(ctx) {
-        return new TimeLiteral(unquoteFilterString(ctx.text));
+        return new TimeLiteral(unquoteFilterString(ctx.getText()));
     }
     visitQualifiedIdentifierTerm(ctx) {
-        return new QualifiedIdentifier(ctx.text);
+        return new QualifiedIdentifier(ctx.getText());
     }
     visitPolarityExpression(ctx) {
         const x = this.visit(ctx.expression());
         if (x.kind === 'NumberLiteral') {
-            if (ctx.polarOp().text === '-')
+            if (ctx.polarOp().getText() === '-')
                 x.value *= -1;
             return x;
         }
-        throw new SyntaxError('Unexpected token "' + ctx.text + '"');
+        throw new SyntaxError('Unexpected token "' + ctx.getText() + '"');
     }
     visitExternalConstantTerm(ctx) {
-        return new ExternalConstant(ctx.externalConstant().text.substring(1));
+        return new ExternalConstant(ctx.externalConstant().getText().substring(1));
     }
     visitParenthesizedExpression(ctx) {
         const expression = this.visit(ctx.expression());
         return new ParenthesesExpression(expression);
     }
     visitArrayExpression(ctx) {
-        return new ArrayExpression(ctx.expression().map(child => this.visit(child)));
+        return new ArrayExpression(ctx.expression_list().map(child => this.visit(child)));
     }
     visitComparisonExpression(ctx) {
         return new ComparisonExpression({
-            op: ctx.compOp().text,
+            op: ctx.compOp().getText(),
             left: this.visit(ctx.expression(0)),
             right: this.visit(ctx.expression(1))
         });
@@ -75,17 +77,17 @@ export class FilterTreeVisitor extends AbstractParseTreeVisitor {
         const items = [];
         const wrapChildren = (arr, op) => {
             for (const c of arr) {
-                if (c instanceof LogicalExpressionContext && c.logOp().text === op) {
-                    wrapChildren(c.expression(), c.logOp().text);
+                if (c instanceof LogicalExpressionContext && c.logOp().getText() === op) {
+                    wrapChildren(c.expression_list(), c.logOp().getText());
                     continue;
                 }
                 const o = this.visit(c);
                 items.push(o);
             }
         };
-        wrapChildren(ctx.expression(), ctx.logOp().text);
+        wrapChildren(ctx.expression_list(), ctx.logOp().getText());
         return new LogicalExpression({
-            op: ctx.logOp().text,
+            op: ctx.logOp().getText(),
             items
         });
     }
@@ -95,14 +97,14 @@ export class FilterTreeVisitor extends AbstractParseTreeVisitor {
             for (let i = 0, len = children.length; i < len; i++) {
                 const child = children[i];
                 if (child instanceof ArithmeticExpressionContext) {
-                    wrapChildren(child.expression(), child.arthOp().text);
+                    wrapChildren(child.expression_list(), child.arthOp().getText());
                     continue;
                 }
                 const value = this.visit(child);
                 exp.append(op || '+', value);
             }
         };
-        wrapChildren(ctx.expression(), ctx.arthOp().text);
+        wrapChildren(ctx.expression_list(), ctx.arthOp().getText());
         return exp;
     }
 }

package/esm/filter/index.d.ts

@@ -1,5 +1,5 @@
 export * from './ast/index.js';
 export * from './parse.js';
 export * from './build.js';
-export * from './error-listener.js';
+export * from './opra-error-listener.js';
 export * from './filter-tree-visitor.js';

package/esm/filter/index.js

@@ -1,5 +1,5 @@
 export * from './ast/index.js';
 export * from './parse.js';
 export * from './build.js';
-export * from './error-listener.js';
+export * from './opra-error-listener.js';
 export * from './filter-tree-visitor.js';

package/esm/filter/opra-error-listener.d.ts

@@ -0,0 +1,8 @@
+import { ErrorListener, RecognitionException } from 'antlr4';
+import { Recognizer } from 'antlr4/src/antlr4/Recognizer';
+import { FilterParseError } from './errors.js';
+export declare class OpraErrorListener extends ErrorListener<any> {
+    errors: FilterParseError[];
+    constructor(errors: FilterParseError[]);
+    syntaxError(recognizer: Recognizer<any>, offendingSymbol: any, line: number, column: number, msg: string, e: RecognitionException): void;
+}

package/esm/filter/opra-error-listener.js

@@ -0,0 +1,11 @@
+import { ErrorListener } from 'antlr4';
+import { FilterParseError } from './errors.js';
+export class OpraErrorListener extends ErrorListener {
+    constructor(errors) {
+        super();
+        this.errors = errors;
+    }
+    syntaxError(recognizer, offendingSymbol, line, column, msg, e) {
+        this.errors.push(new FilterParseError(msg, { recognizer, offendingSymbol, line, e }));
+    }
+}

package/esm/filter/parse.d.ts

@@ -1,2 +1,2 @@
-import { AbstractParseTreeVisitor } from 'antlr4ts/tree';
-export declare function parseFilter(text: string, visitor?: AbstractParseTreeVisitor<any>): any;
+import type { ParseTreeVisitor } from 'antlr4';
+export declare function parseFilter(text: string, visitor?: ParseTreeVisitor<any>): any;

package/esm/filter/parse.js

@@ -1,17 +1,17 @@
-import { CharStreams, CommonTokenStream } from 'antlr4ts';
-import { OpraFilterLexer } from './antlr/OpraFilterLexer.js';
-import { OpraFilterParser } from './antlr/OpraFilterParser.js';
-import { ErrorListener } from './error-listener.js';
+import { CharStream, CommonTokenStream } from 'antlr4';
+import OpraFilterLexer from './antlr/OpraFilterLexer.js';
+import OpraFilterParser from './antlr/OpraFilterParser.js';
 import { SyntaxError } from './errors.js';
 import { FilterTreeVisitor } from './filter-tree-visitor.js';
+import { OpraErrorListener } from './opra-error-listener.js';
 export function parseFilter(text, visitor) {
-    const inputStream = CharStreams.fromString(text);
-    const lexer = new OpraFilterLexer(inputStream);
+    const chars = new CharStream(text);
+    const lexer = new OpraFilterLexer(chars);
     const tokenStream = new CommonTokenStream(lexer);
     const parser = new OpraFilterParser(tokenStream);
-    parser.buildParseTree = true;
+    parser.buildParseTrees = true;
     const errors = [];
-    const errorListener = new ErrorListener(errors);
+    const errorListener = new OpraErrorListener(errors);
     lexer.removeErrorListeners();
     lexer.addErrorListener(errorListener);
     parser.removeErrorListeners();

package/esm/i18n/i18n.d.ts

@@ -10,7 +10,7 @@ export declare type InitCallback = I18next.Callback;
 export declare type TranslateFunction = I18nextTFunction;
 export declare type Formatter = I18nextFormatter;
 export declare type LanguageResource = I18nextResource;
-export { FallbackLng };
+export type { FallbackLng };
 export interface InitOptions extends I18nextInitOptions {
     resourceDirs?: string[];
 }