@opra/common 0.10.3 → 0.13.0

package/cjs/url/opra-url.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraURL = void 0;
 const fast_tokenizer_1 = require("fast-tokenizer");
@@ -10,166 +11,227 @@ const urlRegEx = /^(?:((?:[A-Z][A-Z+-.]+:)+)\/\/([^/?]+))?(.*)?$/i;
 const schemeRegEx = /^([A-Z][A-Z+-.]+:?)+$/i;
 const hostRegEx = /^([^/:]+)(?::(\d+))?$/;
 const hostnameRegEx = /^([^/:]+)$/;
-const CONTEXT_KEY = Symbol.for('opra.url.context');
-const PATH_KEY = Symbol.for('opra.url.path');
-const SEARCHPARAMS_KEY = Symbol.for('opra.url.searchparams');
+const kContext = Symbol('kContext');
+const kPath = Symbol('kPath');
+const kSearchParams = Symbol('kSearchParams');
 class OpraURL {
-    constructor(input, pathPrefix) {
-        Object.defineProperty(this, CONTEXT_KEY, {
-            writable: true,
-            configurable: true,
-            enumerable: false,
-            value: {}
-        });
-        Object.defineProperty(this, PATH_KEY, {
-            writable: true,
-            configurable: true,
-            enumerable: false,
-            value: new opra_url_path_js_1.OpraURLPath()
+    constructor(input, arg1) {
+        this[_a] = {
+            protocol: '',
+            username: '',
+            pathname: '',
+            prefix: '',
+            hostname: '',
+            port: '',
+            hash: '',
+            password: '',
+            search: '',
+            address: '',
+            needUpdate: true
+        };
+        this[kPath] = new opra_url_path_js_1.OpraURLPath('', {
+            onChange: () => this._changed()
         });
-        Object.defineProperty(this, SEARCHPARAMS_KEY, {
-            writable: true,
-            configurable: true,
-            enumerable: false,
-            value: new opra_url_search_params_js_1.OpraURLSearchParams()
+        this[kSearchParams] = new opra_url_search_params_js_1.OpraURLSearchParams('', {
+            onChange: () => this._changed()
         });
-        this.searchParams.on('change', () => this._invalidate());
-        this.path.on('change', () => this._invalidate());
-        if (pathPrefix)
-            this.setPrefix(pathPrefix);
+        const base = typeof arg1 === 'object' ? arg1.base : arg1;
+        if (typeof arg1 === 'object') {
+            const defineParams = arg1?.params;
+            if (defineParams)
+                Object.keys(defineParams).forEach(key => this.searchParams.define(key, defineParams[key]));
+        }
         if (input)
-            this.parse(input);
+            this.parse(typeof input === 'object' ? input.toString() : input);
+        if (base) {
+            const baseUrl = base instanceof OpraURL ? base : new OpraURL(base);
+            this[kContext].protocol = baseUrl.protocol;
+            this[kContext].hostname = baseUrl.hostname;
+            this[kContext].port = baseUrl.port;
+            this[kContext].prefix = baseUrl.pathname;
+        }
     }
     get address() {
         this._update();
-        let out = '';
-        if (this.hostname) {
-            out += this.protocol + '//' +
-                (this.username || this.password
-                    ? ((this.username ? encodeURIComponent(this.username) : '') +
-                        (this.password ? ':' + encodeURIComponent(this.password) : '') + '@')
-                    : '') + this.host;
-        }
-        return out + this.pathPrefix + this.pathname;
+        return this[kContext].address;
     }
-    get href() {
-        return this.address + this.search + this.hash;
+    get host() {
+        return this.hostname ? (this.hostname + (this.port ? ':' + this.port : '')) : '';
     }
-    get protocol() {
-        return this[CONTEXT_KEY].protocol || 'http:';
+    set host(v) {
+        if (v) {
+            const m = hostRegEx.exec(v);
+            if (!m)
+                throw Object.assign(new TypeError('Invalid host'), {
+                    host: v,
+                    code: 'ERR_INVALID_URL'
+                });
+            this[kContext].hostname = m[1];
+            this[kContext].port = m[2] || '';
+        }
+        else {
+            this[kContext].hostname = '';
+            this[kContext].port = '';
+        }
+        this._changed();
     }
-    set protocol(v) {
-        if (!schemeRegEx.test(v))
-            throw Object.assign(new TypeError('Invalid protocol'), {
-                protocol: v,
-                code: 'ERR_INVALID_URL'
-            });
-        this[CONTEXT_KEY].protocol = v + (v.endsWith(':') ? '' : ':');
+    get hostname() {
+        return this[kContext].hostname || '';
     }
-    get username() {
-        return this[CONTEXT_KEY].username || '';
+    set hostname(v) {
+        if (v) {
+            if (!hostnameRegEx.test(v))
+                throw Object.assign(new TypeError('Invalid hostname'), {
+                    hostname: v,
+                    code: 'ERR_INVALID_URL'
+                });
+            this[kContext].hostname = v;
+        }
+        else
+            this[kContext].hostname = '';
+        this._changed();
     }
-    set username(v) {
-        this[CONTEXT_KEY].username = v;
+    get href() {
+        return this.address + this.search + this.hash;
     }
     get password() {
-        return this[CONTEXT_KEY].password || '';
+        return this[kContext].password;
     }
     set password(v) {
-        this[CONTEXT_KEY].password = v;
+        this[kContext].password = v || '';
+        this._changed();
     }
-    get host() {
-        return this.hostname ? (this.hostname + (this.port ? ':' + this.port : '')) : '';
-    }
-    set host(v) {
-        const m = hostRegEx.exec(v);
-        if (!m)
-            throw Object.assign(new TypeError('Invalid host'), {
-                host: v,
-                code: 'ERR_INVALID_URL'
-            });
-        this[CONTEXT_KEY].hostname = m[1];
-        this[CONTEXT_KEY].port = m[2] ? parseInt(m[2], 10) : null;
+    get port() {
+        return this[kContext].port;
+    }
+    set port(value) {
+        if (value) {
+            // noinspection SuspiciousTypeOfGuard
+            const v = parseInt(value, 10);
+            if (isNaN(v) || v < 1 || v > 35535 || v % 1 > 0)
+                throw Object.assign(new TypeError('Invalid port'), {
+                    hostname: v,
+                    code: 'ERR_INVALID_URL'
+                });
+            this[kContext].port = value;
+        }
+        else
+            this[kContext].port = '';
+        this._changed();
     }
-    get hostname() {
-        return this[CONTEXT_KEY].hostname || '';
+    get prefix() {
+        return this[kContext].prefix;
     }
-    set hostname(v) {
-        if (!hostnameRegEx.test(v))
-            throw Object.assign(new TypeError('Invalid hostname'), {
-                hostname: v,
-                code: 'ERR_INVALID_URL'
-            });
-        this[CONTEXT_KEY].hostname = v;
+    set prefix(value) {
+        if (value) {
+            const url = new OpraURL(value);
+            this[kContext].prefix = url.pathname;
+        }
+        else
+            this[kContext].prefix = '';
+        this._changed();
     }
-    get port() {
-        const v = this[CONTEXT_KEY].port;
-        return v == null ? null : v;
+    get protocol() {
+        return this[kContext].protocol || 'http:';
     }
-    set port(v) {
-        if (v == null) {
-            this[CONTEXT_KEY].port = null;
-            return;
+    set protocol(v) {
+        if (v) {
+            if (!schemeRegEx.test(v))
+                throw Object.assign(new TypeError('Invalid protocol'), {
+                    protocol: v,
+                    code: 'ERR_INVALID_URL'
+                });
+            this[kContext].protocol = v + (v.endsWith(':') ? '' : ':');
         }
-        // noinspection SuspiciousTypeOfGuard
-        if (typeof v !== 'number' || isNaN(v) || v < 1 || v > 35535 || v % 1 > 0)
-            throw Object.assign(new TypeError('Invalid port'), {
-                hostname: v,
-                code: 'ERR_INVALID_URL'
-            });
-        this[CONTEXT_KEY].port = v;
+        else
+            this[kContext].protocol = '';
+        this._changed();
     }
-    get origin() {
-        return this.hostname ? (this.protocol + '//' + this.hostname) : '';
+    get username() {
+        return this[kContext].username;
     }
-    get pathPrefix() {
-        return this[CONTEXT_KEY].pathPrefix || '';
+    set username(v) {
+        this[kContext].username = v || '';
+        this._changed();
     }
-    set pathPrefix(v) {
-        if (!v) {
-            this[CONTEXT_KEY].pathPrefix = '';
-            return;
-        }
-        v = (0, path_utils_js_1.normalizePath)((0, fast_tokenizer_1.tokenize)(v, { delimiters: '#?', quotes: true, brackets: true }).next() || '', true);
-        if (v.includes('://'))
-            this[CONTEXT_KEY].pathPrefix = v;
-        else
-            this[CONTEXT_KEY].pathPrefix = v ? '/' + v : '';
+    get origin() {
+        return this.hostname ? (this.protocol + '//' + this.hostname) : '';
     }
     get path() {
-        return this[PATH_KEY];
+        return this[kPath];
     }
     get pathname() {
         this._update();
-        return this[CONTEXT_KEY].pathname || '';
+        return this[kContext].pathname || '';
     }
     set pathname(v) {
         this._setPathname(v, false);
     }
     get searchParams() {
-        return this[SEARCHPARAMS_KEY];
+        return this[kSearchParams];
     }
     get hash() {
-        return this[CONTEXT_KEY].hash || '';
+        return this[kContext].hash || '';
     }
     set hash(v) {
-        this[CONTEXT_KEY].hash = v ? (v.startsWith('#') ? v : '#' + v) : '';
+        this[kContext].hash = v ? (v.startsWith('#') ? v : '#' + v) : '';
+        this._changed();
     }
     get search() {
         this._update();
-        return this[CONTEXT_KEY].search || '';
+        return this[kContext].search || '';
     }
     set search(v) {
-        this.searchParams.parse(v);
+        this.searchParams.clear();
+        this.searchParams.appendAll(v);
+    }
+    parse(input) {
+        const m = urlRegEx.exec(input);
+        if (!m)
+            throw Object.assign(new TypeError('Invalid URL'), {
+                input,
+                code: 'ERR_INVALID_URL'
+            });
+        this.protocol = m[1];
+        const isAbsolute = !!m[2];
+        if (isAbsolute) {
+            let tokens = (0, fast_tokenizer_1.splitString)(m[2], { delimiters: '@' });
+            if (tokens.length > 1) {
+                this.host = tokens[1];
+                tokens = (0, fast_tokenizer_1.splitString)(tokens[0], { delimiters: ':' });
+                this.username = tokens[0] ? decodeURIComponent(tokens[0]) : '';
+                this.password = tokens[1] ? decodeURIComponent(tokens[1]) : '';
+            }
+            else
+                this.host = tokens[0];
+        }
+        else {
+            this.host = '';
+            this.username = '';
+            this.password = '';
+        }
+        input = m[3] || '';
+        let tokenizer = (0, fast_tokenizer_1.tokenize)(input, { delimiters: '#', quotes: true, brackets: true });
+        input = tokenizer.next() || '';
+        this.hash = tokenizer.join('#');
+        tokenizer = (0, fast_tokenizer_1.tokenize)(input, { delimiters: '?', quotes: true, brackets: true });
+        this._setPathname(tokenizer.next() || '', isAbsolute);
+        this.searchParams.clear();
+        this.searchParams.appendAll(tokenizer.join('&'));
+        this._changed();
     }
-    addPath(name, key) {
-        this.path.add(name, key);
+    join(...source) {
+        this.path.join(...source);
         return this;
     }
-    addSearchParam(name, value) {
+    addParam(name, value) {
         this.searchParams.append(name, value);
         return this;
     }
+    setParam(name, value) {
+        this.searchParams.set(name, value);
+        return this;
+    }
     setHost(v) {
         this.host = v;
         return this;
@@ -183,11 +245,11 @@ class OpraURL {
         return this;
     }
     setPort(v) {
-        this.port = v;
+        this.port = v ? String(v) : '';
         return this;
     }
     setPrefix(v) {
-        this.pathPrefix = v;
+        this.prefix = v;
         return this;
     }
     setPathname(v) {
@@ -202,46 +264,11 @@ class OpraURL {
         this.search = v;
         return this;
     }
-    setSearchParam(name, value) {
-        this.searchParams.set(name, value);
-        return this;
-    }
-    parse(input) {
-        const m = urlRegEx.exec(input);
-        if (!m)
-            throw Object.assign(new TypeError('Invalid URL'), {
-                input,
-                code: 'ERR_INVALID_URL'
-            });
-        if (m[1])
-            this.protocol = m[1];
-        if (m[2]) {
-            let tokens = (0, fast_tokenizer_1.splitString)(m[2], { delimiters: '@' });
-            if (tokens.length > 1) {
-                this.host = tokens[1];
-                tokens = (0, fast_tokenizer_1.splitString)(tokens[0], { delimiters: ':' });
-                this.username = tokens[0] ? decodeURIComponent(tokens[0]) : '';
-                this.password = tokens[1] ? decodeURIComponent(tokens[1]) : '';
-            }
-            else
-                this.host = tokens[0];
-        }
-        input = m[3] || '';
-        let tokenizer = (0, fast_tokenizer_1.tokenize)(input, { delimiters: '#', quotes: true, brackets: true });
-        input = tokenizer.next() || '';
-        this.hash = tokenizer.join('#');
-        tokenizer = (0, fast_tokenizer_1.tokenize)(input, { delimiters: '?', quotes: true, brackets: true });
-        this._setPathname(tokenizer.next() || '', true);
-        // this.path.join()
-        this.searchParams.clear();
-        this.searchParams.parse(tokenizer.join('&'));
-        return this;
-    }
     toString() {
         return this.href;
     }
     /* istanbul ignore next */
-    [nodeInspectCustom]() {
+    [(_a = kContext, nodeInspectCustom)]() {
         this._update();
         return {
             protocol: this.protocol,
@@ -250,7 +277,7 @@ class OpraURL {
             host: this.host,
             hostname: this.hostname,
             origin: this.origin,
-            pathPrefix: this.pathPrefix,
+            pathPrefix: this.prefix,
             path: this.path,
             pathname: this.pathname,
             search: this.search,
@@ -258,27 +285,34 @@ class OpraURL {
             hash: this.hash,
         };
     }
-    _invalidate() {
-        this[CONTEXT_KEY].needUpdate = true;
-    }
     _update() {
-        if (!this[CONTEXT_KEY].needUpdate)
+        if (!this[kContext].needUpdate)
             return;
-        this[CONTEXT_KEY].needUpdate = false;
+        const ctx = this[kContext];
+        ctx.needUpdate = false;
         let s = this.path.toString();
-        this[CONTEXT_KEY].pathname = s ? '/' + s : '';
+        ctx.pathname = s ? '/' + s : '';
         s = this.searchParams.toString();
-        this[CONTEXT_KEY].search = s ? '?' + s : '';
+        ctx.search = s ? '?' + s : '';
+        let address = '';
+        if (ctx.hostname) {
+            address += (ctx.protocol || 'http:') + '//' +
+                (ctx.username || ctx.password
+                    ? ((ctx.username ? encodeURIComponent(ctx.username) : '') +
+                        (ctx.password ? ':' + encodeURIComponent(ctx.password) : '') + '@')
+                    : '') + this.host;
+        }
+        ctx.address = address + ctx.prefix + ctx.pathname;
     }
-    _setPathname(v, inclSvcRoot) {
+    _setPathname(v, trimPrefix) {
         this.path.clear();
         if (!v)
             return;
         const pathTokenizer = (0, fast_tokenizer_1.tokenize)((0, path_utils_js_1.normalizePath)(v, true), {
             delimiters: '/', quotes: true, brackets: true,
         });
-        if (inclSvcRoot && this.pathPrefix) {
-            const prefixTokenizer = (0, fast_tokenizer_1.tokenize)((0, path_utils_js_1.normalizePath)(this.pathPrefix, true), {
+        if (trimPrefix && this.prefix) {
+            const prefixTokenizer = (0, fast_tokenizer_1.tokenize)((0, path_utils_js_1.normalizePath)(this.prefix, true), {
                 delimiters: '/', quotes: true, brackets: true,
             });
             for (const a of prefixTokenizer) {
@@ -289,8 +323,15 @@ class OpraURL {
         }
         for (const x of pathTokenizer) {
             const p = (0, path_utils_js_1.decodePathComponent)(x);
-            this.path.add(p);
+            this.path.join(p);
         }
+        this._changed();
+    }
+    _changed() {
+        this[kContext].needUpdate = true;
     }
 }
 exports.OpraURL = OpraURL;
+OpraURL.kContext = kContext;
+OpraURL.kPath = kPath;
+OpraURL.kSearchParams = kSearchParams;

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

@@ -1,4 +1,4 @@
-import { ATN, CharStream, DFA, Lexer } from "antlr4";
+import { ATN, CharStream, DFA, Lexer } from "@browsery/antlr4";
 export default class OpraFilterLexer extends Lexer {
     static readonly T__0 = 1;
     static readonly T__1 = 2;

package/esm/filter/antlr/OpraFilterLexer.js

@@ -1,6 +1,6 @@
 // Generated from ./src/filter/antlr/OpraFilter.g4 by ANTLR 4.11.2-SNAPSHOT
 // noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols
-import { ATNDeserializer, DFA, Lexer, LexerATNSimulator, PredictionContextCache, Token } from "antlr4";
+import { ATNDeserializer, DFA, Lexer, LexerATNSimulator, PredictionContextCache, Token } from "@browsery/antlr4";
 export default class OpraFilterLexer extends Lexer {
     constructor(input) {
         super(input);

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

@@ -1,4 +1,4 @@
-import { ParseTreeListener } from "antlr4";
+import { ParseTreeListener } from "@browsery/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 listener for a parse tree produced by

package/esm/filter/antlr/OpraFilterListener.js

@@ -1,5 +1,5 @@
 // Generated from ./src/filter/antlr/OpraFilter.g4 by ANTLR 4.11.2-SNAPSHOT
-import { ParseTreeListener } from "antlr4";
+import { ParseTreeListener } from "@browsery/antlr4";
 /**
  * This interface defines a complete listener for a parse tree produced by
  * `OpraFilterParser`.

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

@@ -1,4 +1,4 @@
-import { ATN, DFA, FailedPredicateException, Parser, ParserRuleContext, RuleContext, TerminalNode, TokenStream } from 'antlr4';
+import { ATN, DFA, FailedPredicateException, Parser, ParserRuleContext, RuleContext, TerminalNode, TokenStream } from '@browsery/antlr4';
 import type OpraFilterListener from "./OpraFilterListener.js";
 import type OpraFilterVisitor from "./OpraFilterVisitor.js";
 export default class OpraFilterParser extends Parser {

package/esm/filter/antlr/OpraFilterParser.js

@@ -2,12 +2,8 @@
 // Generated from ./src/filter/antlr/OpraFilter.g4 by ANTLR 4.11.2-SNAPSHOT
 // noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols,SpellCheckingInspection
 // @ts-nocheck
-import { ATN, ATNDeserializer, DFA, FailedPredicateException, NoViableAltException, Parser, ParserATNSimulator, ParserRuleContext, PredictionContextCache, RecognitionException, Token } from 'antlr4';
+import { ATN, ATNDeserializer, DFA, FailedPredicateException, NoViableAltException, Parser, ParserATNSimulator, ParserRuleContext, PredictionContextCache, RecognitionException, Token } from '@browsery/antlr4';
 export default class OpraFilterParser extends Parser {
-    constructor(input) {
-        super(input);
-        this._interp = new ParserATNSimulator(this, OpraFilterParser._ATN, OpraFilterParser.DecisionsToDFA, new PredictionContextCache());
-    }
     get grammarFileName() {
         return "OpraFilter.g4";
     }
@@ -26,6 +22,10 @@ export default class OpraFilterParser extends Parser {
     createFailedPredicateException(predicate, message) {
         return new FailedPredicateException(this, predicate, message);
     }
+    constructor(input) {
+        super(input);
+        this._interp = new ParserATNSimulator(this, OpraFilterParser._ATN, OpraFilterParser.DecisionsToDFA, new PredictionContextCache());
+    }
     // @RuleVersion(0)
     root() {
         let localctx = new RootContext(this, this._ctx, this.state);

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

@@ -1,4 +1,4 @@
-import { ParseTreeVisitor } from 'antlr4';
+import { ParseTreeVisitor } from '@browsery/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

package/esm/filter/antlr/OpraFilterVisitor.js

@@ -1,5 +1,5 @@
 // Generated from ./src/filter/antlr/OpraFilter.g4 by ANTLR 4.11.2-SNAPSHOT
-import { ParseTreeVisitor } from 'antlr4';
+import { ParseTreeVisitor } from '@browsery/antlr4';
 /**
  * This interface defines a complete generic visitor for a parse tree produced
  * by `OpraFilterParser`.

package/esm/filter/ast/expressions/arithmetic-expression.d.ts

@@ -1,5 +1,5 @@
 import { Expression } from '../abstract/expression.js';
-export declare type ArithmeticOperator = '+' | '-' | '*' | '/';
+export type ArithmeticOperator = '+' | '-' | '*' | '/';
 export declare class ArithmeticExpression extends Expression {
     items: ArithmeticExpressionItem[];
     constructor();

package/esm/filter/ast/expressions/comparison-expression.d.ts

@@ -1,6 +1,6 @@
 import { StrictOmit } from 'ts-gems';
 import { Expression } from '../abstract/expression.js';
-export declare type ComparisonOperator = '<=' | '<' | '>' | '>=' | '=' | '!=' | 'in' | '!in' | 'like' | '!like' | 'ilike' | '!ilike';
+export type ComparisonOperator = '<=' | '<' | '>' | '>=' | '=' | '!=' | 'in' | '!in' | 'like' | '!like' | 'ilike' | '!ilike';
 export declare class ComparisonExpression extends Expression {
     op: ComparisonOperator;
     left: Expression;

package/esm/filter/ast/expressions/logical-expression.d.ts

@@ -1,5 +1,5 @@
 import { Expression } from '../abstract/expression.js';
-export declare type LogicalOperator = 'and' | 'or';
+export type LogicalOperator = 'and' | 'or';
 export declare class LogicalExpression extends Expression {
     op: LogicalOperator;
     items: Expression[];

package/esm/filter/build.d.ts

@@ -1,6 +1,6 @@
 import { ArithmeticExpression, ArrayExpression, ComparisonExpression, DateLiteral, Expression, LogicalExpression, NumberLiteral, ParenthesesExpression, QualifiedIdentifier, TimeLiteral } from './ast/index.js';
-declare type _EntryValue = Expression | string | number | bigint | boolean | null | Date;
-export declare type EntryValue = _EntryValue | _EntryValue[];
+type _EntryValue = Expression | string | number | bigint | boolean | null | Date;
+export type EntryValue = _EntryValue | _EntryValue[];
 export declare function $or(...items: Expression[]): LogicalExpression;
 export declare function $and(...items: Expression[]): LogicalExpression;
 export declare function $date(v: string): DateLiteral;
@@ -21,7 +21,7 @@ export declare function $notLike(left: _EntryValue, right: _EntryValue): Compari
 export declare function $ilike(left: _EntryValue, right: _EntryValue): ComparisonExpression;
 export declare function $notILike(left: _EntryValue, right: _EntryValue): ComparisonExpression;
 export declare function $paren(expression: Expression): ParenthesesExpression;
-declare type MathExpression = ArithmeticExpression & {
+type MathExpression = ArithmeticExpression & {
     add(expression: EntryValue): MathExpression;
     sub(expression: EntryValue): MathExpression;
     mul(expression: EntryValue): MathExpression;

package/esm/filter/errors.d.ts

@@ -1,5 +1,5 @@
-import { RecognitionException } from 'antlr4';
-import { Recognizer } from 'antlr4/src/antlr4/Recognizer';
+import { RecognitionException } from '@browsery/antlr4';
+import { Recognizer } from '@browsery/antlr4/typings/Recognizer';
 export declare class SyntaxError extends TypeError {
 }
 export declare class ValidationError extends TypeError {
@@ -8,11 +8,13 @@ export declare class FilterParseError extends Error {
     recognizer: Recognizer<any>;
     offendingSymbol: any | undefined;
     line: number;
+    column: number;
     e: RecognitionException | undefined;
     constructor(message: string, args: {
         recognizer: Recognizer<any>;
         offendingSymbol: any | undefined;
         line: number;
+        column: number;
         e: RecognitionException | undefined;
     });
 }

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

@@ -1,4 +1,4 @@
-import type { ParseTreeVisitor as TParseTreeVisitor } from 'antlr4';
+import type { ParseTreeVisitor as TParseTreeVisitor, RuleNode } from '@browsery/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 { ArithmeticExpression, ArrayExpression, BooleanLiteral, DateLiteral, LogicalExpression, NullLiteral, NumberLiteral, ParenthesesExpression, QualifiedIdentifier, StringLiteral, TimeLiteral } from './ast/index.js';
@@ -9,6 +9,7 @@ export declare class FilterTreeVisitor extends ParseTreeVisitor<any> implements
     constructor(options?: {
         timeZone?: string;
     });
+    visitChildren(node: RuleNode): any;
     protected defaultResult(): any;
     visitRoot(ctx: RootContext): any;
     visitIdentifier(ctx: IdentifierContext): string;