@opra/common 0.17.1 → 0.17.2

package/cjs/filter/antlr/OpraFilterVisitor.js

@@ -1,6 +1,6 @@
 "use strict";
+// Generated from ./src/filter/antlr/OpraFilter.g4 by ANTLR 4.12.0
 Object.defineProperty(exports, "__esModule", { value: true });
-// Generated from ./src/filter/antlr/OpraFilter.g4 by ANTLR 4.11.2-SNAPSHOT
 const antlr4_1 = require("@browsery/antlr4");
 /**
  * This interface defines a complete generic visitor for a parse tree produced

package/cjs/filter/ast/expressions/logical-expression.js

@@ -6,6 +6,10 @@ class LogicalExpression extends expression_js_1.Expression {
     constructor(o) {
         super();
         Object.assign(this, o);
+        if (this.op === '&&')
+            this.op = 'and';
+        if (this.op === '||')
+            this.op = 'or';
     }
     toString() {
         return this.items

package/cjs/filter/ast/expressions/{parentheses-expression.js → negative-expression.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParenthesesExpression = void 0;
+exports.NegativeExpression = void 0;
 const expression_js_1 = require("../abstract/expression.js");
-class ParenthesesExpression extends expression_js_1.Expression {
+class NegativeExpression extends expression_js_1.Expression {
     constructor(expression) {
         super();
         this.expression = expression;
@@ -11,4 +11,4 @@ class ParenthesesExpression extends expression_js_1.Expression {
         return `(${this.expression})`;
     }
 }
-exports.ParenthesesExpression = ParenthesesExpression;
+exports.NegativeExpression = NegativeExpression;

package/cjs/filter/ast/expressions/parenthesized-expression.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ParenthesizedExpression = void 0;
+const expression_js_1 = require("../abstract/expression.js");
+class ParenthesizedExpression extends expression_js_1.Expression {
+    constructor(expression) {
+        super();
+        this.expression = expression;
+    }
+    toString() {
+        return `(${this.expression})`;
+    }
+}
+exports.ParenthesizedExpression = ParenthesizedExpression;

package/cjs/filter/ast/index.js

@@ -9,7 +9,8 @@ tslib_1.__exportStar(require("./expressions/arithmetic-expression.js"), exports)
 tslib_1.__exportStar(require("./expressions/array-expression.js"), exports);
 tslib_1.__exportStar(require("./expressions/comparison-expression.js"), exports);
 tslib_1.__exportStar(require("./expressions/logical-expression.js"), exports);
-tslib_1.__exportStar(require("./expressions/parentheses-expression.js"), exports);
+tslib_1.__exportStar(require("./expressions/parenthesized-expression.js"), exports);
+tslib_1.__exportStar(require("./expressions/negative-expression.js"), exports);
 tslib_1.__exportStar(require("./terms/boolean-literal.js"), exports);
 tslib_1.__exportStar(require("./terms/date-literal.js"), exports);
 tslib_1.__exportStar(require("./terms/null-literal.js"), exports);

package/cjs/filter/build.js

@@ -79,7 +79,7 @@ function $notILike(left, right) {
 }
 exports.$notILike = $notILike;
 function $paren(expression) {
-    return new index_js_1.ParenthesesExpression(expression);
+    return new index_js_1.ParenthesizedExpression(expression);
 }
 exports.$paren = $paren;
 function $arithmetic(n) {

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

@@ -6,7 +6,6 @@ const antlr4_1 = tslib_1.__importDefault(require("@browsery/antlr4"));
 const OpraFilterParser_js_1 = require("./antlr/OpraFilterParser.js");
 const index_js_1 = require("./ast/index.js");
 const external_constant_js_1 = require("./ast/terms/external-constant.js");
-const errors_js_1 = require("./errors.js");
 const utils_js_1 = require("./utils.js");
 // Fix: antlr4 d.ts files are invalid
 const ParseTreeVisitor = antlr4_1.default.tree.ParseTreeVisitor;
@@ -19,7 +18,7 @@ class FilterTreeVisitor extends ParseTreeVisitor {
         const result = super.visitChildren(node);
         if (Array.isArray(result) && result.length < 2)
             return result[0];
-        return result;
+        return result ?? node.getText();
     }
     defaultResult() {
         return undefined;
@@ -27,8 +26,47 @@ class FilterTreeVisitor extends ParseTreeVisitor {
     visitRoot(ctx) {
         return this.visit(ctx.expression());
     }
-    visitIdentifier(ctx) {
-        return ctx.getText();
+    visitParenthesizedExpression(ctx) {
+        const expression = this.visit(ctx.parenthesizedItem());
+        return new index_js_1.ParenthesizedExpression(expression);
+    }
+    visitParenthesizedItem(ctx) {
+        return this.visit(ctx.expression());
+    }
+    visitNegativeExpression(ctx) {
+        const expression = this.visit(ctx.expression());
+        return new index_js_1.NegativeExpression(expression);
+    }
+    visitComparisonExpression(ctx) {
+        return new index_js_1.ComparisonExpression({
+            op: ctx.comparisonOperator().getText(),
+            left: this.visit(ctx.comparisonLeft()),
+            right: this.visit(ctx.comparisonRight())
+        });
+    }
+    visitLogicalExpression(ctx) {
+        const items = [];
+        const wrapChildren = (arr, op) => {
+            for (const c of arr) {
+                if (c instanceof OpraFilterParser_js_1.LogicalExpressionContext && c.logicalOperator().getText() === op) {
+                    wrapChildren(c.expression_list(), c.logicalOperator().getText());
+                    continue;
+                }
+                const o = this.visit(c);
+                items.push(o);
+            }
+        };
+        wrapChildren(ctx.expression_list(), ctx.logicalOperator().getText());
+        return new index_js_1.LogicalExpression({
+            op: ctx.logicalOperator().getText(),
+            items
+        });
+    }
+    visitQualifiedIdentifier(ctx) {
+        return new index_js_1.QualifiedIdentifier(ctx.getText());
+    }
+    visitExternalConstant(ctx) {
+        return new external_constant_js_1.ExternalConstant(ctx.identifier().getText());
     }
     visitNullLiteral() {
         return new index_js_1.NullLiteral();
@@ -54,68 +92,8 @@ class FilterTreeVisitor extends ParseTreeVisitor {
     visitTimeLiteral(ctx) {
         return new index_js_1.TimeLiteral((0, utils_js_1.unquoteFilterString)(ctx.getText()));
     }
-    visitQualifiedIdentifierTerm(ctx) {
-        return new index_js_1.QualifiedIdentifier(ctx.getText());
-    }
-    visitPolarityExpression(ctx) {
-        const x = this.visit(ctx.expression());
-        if (x.kind === 'NumberLiteral') {
-            if (ctx.polarOp().getText() === '-')
-                x.value *= -1;
-            return x;
-        }
-        throw new errors_js_1.SyntaxError('Unexpected token "' + ctx.getText() + '"');
-    }
-    visitExternalConstantTerm(ctx) {
-        return new external_constant_js_1.ExternalConstant(ctx.externalConstant().getText().substring(1));
-    }
-    visitParenthesizedExpression(ctx) {
-        const expression = this.visit(ctx.expression());
-        return new index_js_1.ParenthesesExpression(expression);
-    }
-    visitArrayExpression(ctx) {
-        return new index_js_1.ArrayExpression(ctx.expression_list().map(child => this.visit(child)));
-    }
-    visitComparisonExpression(ctx) {
-        return new index_js_1.ComparisonExpression({
-            op: ctx.compOp().getText(),
-            left: this.visit(ctx.expression(0)),
-            right: this.visit(ctx.expression(1))
-        });
-    }
-    visitLogicalExpression(ctx) {
-        const items = [];
-        const wrapChildren = (arr, op) => {
-            for (const c of arr) {
-                if (c instanceof OpraFilterParser_js_1.LogicalExpressionContext && c.logOp().getText() === op) {
-                    wrapChildren(c.expression_list(), c.logOp().getText());
-                    continue;
-                }
-                const o = this.visit(c);
-                items.push(o);
-            }
-        };
-        wrapChildren(ctx.expression_list(), ctx.logOp().getText());
-        return new index_js_1.LogicalExpression({
-            op: ctx.logOp().getText(),
-            items
-        });
-    }
-    visitArithmeticExpression(ctx) {
-        const exp = new index_js_1.ArithmeticExpression();
-        const wrapChildren = (children, op) => {
-            for (let i = 0, len = children.length; i < len; i++) {
-                const child = children[i];
-                if (child instanceof OpraFilterParser_js_1.ArithmeticExpressionContext) {
-                    wrapChildren(child.expression_list(), child.arthOp().getText());
-                    continue;
-                }
-                const value = this.visit(child);
-                exp.append(op || '+', value);
-            }
-        };
-        wrapChildren(ctx.expression_list(), ctx.arthOp().getText());
-        return exp;
+    visitArrayValue(ctx) {
+        return new index_js_1.ArrayExpression(ctx.value_list().map(child => this.visit(child)));
     }
 }
 exports.FilterTreeVisitor = FilterTreeVisitor;

package/cjs/filter/index.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpraFilter = void 0;
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./ast/index.js"), exports);
-tslib_1.__exportStar(require("./parse.js"), exports);
-tslib_1.__exportStar(require("./build.js"), exports);
-tslib_1.__exportStar(require("./opra-error-listener.js"), exports);
-tslib_1.__exportStar(require("./filter-tree-visitor.js"), exports);
+exports.OpraFilter = tslib_1.__importStar(require("./opra-filter.ns.js"));

package/cjs/filter/opra-filter.ns.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./ast/index.js"), exports);
+tslib_1.__exportStar(require("./parse.js"), exports);
+tslib_1.__exportStar(require("./build.js"), exports);
+tslib_1.__exportStar(require("./opra-error-listener.js"), exports);
+tslib_1.__exportStar(require("./filter-tree-visitor.js"), exports);

package/cjs/filter/parse.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFilter = void 0;
+exports.parse = void 0;
 const tslib_1 = require("tslib");
 const antlr4_1 = require("@browsery/antlr4");
 const OpraFilterLexer_js_1 = tslib_1.__importDefault(require("./antlr/OpraFilterLexer.js"));
@@ -8,7 +8,7 @@ const OpraFilterParser_js_1 = tslib_1.__importDefault(require("./antlr/OpraFilte
 const errors_js_1 = require("./errors.js");
 const filter_tree_visitor_js_1 = require("./filter-tree-visitor.js");
 const opra_error_listener_js_1 = require("./opra-error-listener.js");
-function parseFilter(text, visitor) {
+function parse(text, visitor) {
     const chars = new antlr4_1.CharStream(text);
     const lexer = new OpraFilterLexer_js_1.default(chars);
     const tokenStream = new antlr4_1.CommonTokenStream(lexer);
@@ -21,8 +21,6 @@ function parseFilter(text, visitor) {
     parser.removeErrorListeners();
     parser.addErrorListener(errorListener);
     const tree = parser.root();
-    visitor = visitor || new filter_tree_visitor_js_1.FilterTreeVisitor();
-    const result = visitor.visit(tree);
     if (errors.length) {
         const errMsgs = [];
         for (const err of errors) {
@@ -35,6 +33,7 @@ function parseFilter(text, visitor) {
         e.errors = errors;
         throw e;
     }
-    return result;
+    visitor = visitor || new filter_tree_visitor_js_1.FilterTreeVisitor();
+    return visitor.visit(tree);
 }
-exports.parseFilter = parseFilter;
+exports.parse = parse;

package/cjs/http/codecs/filter-codec.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterCodec = void 0;
 const index_js_1 = require("../../filter/ast/index.js");
-const parse_js_1 = require("../../filter/parse.js");
+const index_js_2 = require("../../filter/index.js");
 class FilterCodec {
     decode(value) {
         if (value instanceof index_js_1.Expression)
             return value;
-        return (0, parse_js_1.parseFilter)(value);
+        return index_js_2.OpraFilter.parse(value);
     }
     encode(value) {
         // @ts-ignore

package/cjs/http/http-message.host.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpMessageHost = void 0;
 const tslib_1 = require("tslib");
-const http_parser_js_1 = require("http-parser-js");
 const stream_1 = tslib_1.__importDefault(require("stream"));
+const http_parser_1 = require("@browsery/http-parser");
 const http_headers_js_1 = require("./http-headers.js");
 const kHeaders = Symbol('kHeaders');
 const kHeadersProxy = Symbol('kHeadersProxy');
@@ -148,11 +148,11 @@ class HttpMessageHost {
         this.body = args.body;
     }
     _parseBuffer(buf, parserType) {
-        const parser = new http_parser_js_1.HTTPParser(parserType);
-        parser[http_parser_js_1.HTTPParser.kOnHeadersComplete] = this[kOnHeaderReceived].bind(this);
-        parser[http_parser_js_1.HTTPParser.kOnBody] = this[kOnBodyChunk].bind(this);
-        parser[http_parser_js_1.HTTPParser.kOnHeaders] = this[kOnTrailersReceived].bind(this);
-        parser[http_parser_js_1.HTTPParser.kOnMessageComplete] = this[kOnReadComplete].bind(this);
+        const parser = new http_parser_1.HTTPParser(parserType);
+        parser[http_parser_1.HTTPParser.kOnHeadersComplete] = this[kOnHeaderReceived].bind(this);
+        parser[http_parser_1.HTTPParser.kOnBody] = this[kOnBodyChunk].bind(this);
+        parser[http_parser_1.HTTPParser.kOnHeaders] = this[kOnTrailersReceived].bind(this);
+        parser[http_parser_1.HTTPParser.kOnMessageComplete] = this[kOnReadComplete].bind(this);
         const buffer = Buffer.from(buf);
         let x = parser.execute(buffer);
         if (typeof x === 'object')

package/cjs/http/http-request-message.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpRequestMessage = void 0;
 const tslib_1 = require("tslib");
 const accepts_1 = tslib_1.__importDefault(require("accepts"));
-const http_parser_js_1 = require("http-parser-js");
 const type_is_1 = tslib_1.__importDefault(require("type-is"));
+const http_parser_1 = require("@browsery/http-parser");
 const http_message_host_js_1 = require("./http-message.host.js");
 const http_params_js_1 = require("./http-params.js");
 const HTTP_VERSION_PATTERN = /^(\d)\.(\d)$/;
@@ -130,7 +130,7 @@ class HttpRequestMessageHost extends http_message_host_js_1.HttpMessageHost {
     }
     [http_message_host_js_1.HttpMessageHost.kOnHeaderReceived](info) {
         super[http_message_host_js_1.HttpMessageHost.kOnHeaderReceived](info);
-        this.method = http_parser_js_1.HTTPParser.methods[info.method];
+        this.method = http_parser_1.HTTPParser.methods[info.method];
         this.url = info.url;
         this.baseUrl = info.url;
     }
@@ -141,7 +141,7 @@ class HttpRequestMessageHost extends http_message_host_js_1.HttpMessageHost {
     }
     static fromBuffer(buffer) {
         const msg = new HttpRequestMessageHost();
-        msg._parseBuffer(buffer, http_parser_js_1.HTTPParser.REQUEST);
+        msg._parseBuffer(buffer, http_parser_1.HTTPParser.REQUEST);
         return msg;
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/cjs/http/http-response-message.js

@@ -6,9 +6,9 @@ const content_disposition_1 = tslib_1.__importDefault(require("content-dispositi
 const cookie_1 = tslib_1.__importDefault(require("cookie"));
 const cookie_signature_1 = tslib_1.__importDefault(require("cookie-signature"));
 const encodeurl_1 = tslib_1.__importDefault(require("encodeurl"));
-const http_parser_js_1 = require("http-parser-js");
 const mime_types_1 = tslib_1.__importDefault(require("mime-types"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const http_parser_1 = require("@browsery/http-parser");
 const http_status_messages_js_1 = require("./enums/http-status-messages.js");
 const http_message_host_js_1 = require("./http-message.host.js");
 /**
@@ -227,7 +227,7 @@ class HttpResponseMessageHost extends http_message_host_js_1.HttpMessageHost {
     }
     static fromBuffer(buffer) {
         const msg = new HttpResponseMessageHost();
-        msg._parseBuffer(buffer, http_parser_js_1.HTTPParser.RESPONSE);
+        msg._parseBuffer(buffer, http_parser_1.HTTPParser.RESPONSE);
         return msg;
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/cjs/http/multipart/batch-multipart.js

@@ -1,5 +1,5 @@
 "use strict";
-// import Highland from 'highland';
+// import Highland from '@browsery/highland';
 // import { Readable } from 'stream';
 // import { uid } from 'uid';
 // import { isReadable } from '../../helpers/index.js';

package/cjs/i18n/i18n.js

@@ -4,8 +4,8 @@ exports.I18n = exports.BaseI18n = void 0;
 const tslib_1 = require("tslib");
 const fast_tokenizer_1 = require("fast-tokenizer");
 const fs_1 = tslib_1.__importDefault(require("fs"));
-const i18next_1 = tslib_1.__importDefault(require("i18next"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const i18next_1 = tslib_1.__importDefault(require("@browsery/i18next"));
 const index_js_1 = require("../helpers/index.js");
 const string_utils_js_1 = require("./string-utils.js");
 exports.BaseI18n = Object.getPrototypeOf(i18next_1.default).constructor;

package/esm/document/data-type/complex-type.js

@@ -138,7 +138,7 @@ const proto = {
                         if (dataType && !dataType.additionalFields) {
                             if (silent)
                                 return { done: true, value: [] };
-                            throw new Error(`Invalid field definition "${curPath}"`);
+                            throw new Error(`Unknown or Invalid field (${curPath})`);
                         }
                     }
                 }

package/esm/document/resource/collection.js

@@ -1,7 +1,7 @@
 import omit from 'lodash.omit';
 import merge from 'putil-merge';
 import { BadRequestError } from '../../exception/index.js';
-import { ArithmeticExpression, ArrayExpression, ComparisonExpression, LogicalExpression, ParenthesesExpression, QualifiedIdentifier } from '../../filter/index.js';
+import { OpraFilter } from '../../filter/index.js';
 import { omitUndefined } from '../../helpers/index.js';
 import { translate } from '../../i18n/index.js';
 import { OpraSchema } from '../../schema/index.js';
@@ -133,23 +133,29 @@ const proto = {
         });
         return normalized;
     },
-    normalizeFilter(ast) {
-        if (ast instanceof ComparisonExpression) {
+    normalizeFilter(filter) {
+        if (!filter)
+            return;
+        const ast = typeof filter === 'string' ? OpraFilter.parse(filter) : filter;
+        if (ast instanceof OpraFilter.ComparisonExpression) {
             this.normalizeFilter(ast.left);
+            if (!(ast.left instanceof OpraFilter.QualifiedIdentifier && ast.left.field))
+                throw new TypeError(`Invalid filter query. Left side should be a data field.`);
+            this.normalizeFilter(ast.right);
         }
-        else if (ast instanceof LogicalExpression) {
+        else if (ast instanceof OpraFilter.LogicalExpression) {
             ast.items.forEach(item => this.normalizeFilter(item));
         }
-        else if (ast instanceof ArithmeticExpression) {
+        else if (ast instanceof OpraFilter.ArithmeticExpression) {
             ast.items.forEach(item => this.normalizeFilter(item.expression));
         }
-        else if (ast instanceof ArrayExpression) {
+        else if (ast instanceof OpraFilter.ArrayExpression) {
             ast.items.forEach(item => this.normalizeFilter(item));
         }
-        else if (ast instanceof ParenthesesExpression) {
+        else if (ast instanceof OpraFilter.ParenthesizedExpression) {
             this.normalizeFilter(ast.expression);
         }
-        else if (ast instanceof QualifiedIdentifier) {
+        else if (ast instanceof OpraFilter.QualifiedIdentifier) {
             ast.field = this.type.findField(ast.value);
             ast.dataType = ast.field?.type || this.document.getDataType('any');
             ast.value = this.type.normalizeFieldPath(ast.value);