@opra/common 0.17.1 → 0.17.2

package/esm/filter/antlr/OpraFilterVisitor.js

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

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

@@ -3,6 +3,10 @@ export class LogicalExpression extends 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/esm/filter/ast/expressions/{parentheses-expression.js → negative-expression.js}

@@ -1,5 +1,5 @@
 import { Expression } from '../abstract/expression.js';
-export class ParenthesesExpression extends Expression {
+export class NegativeExpression extends Expression {
     constructor(expression) {
         super();
         this.expression = expression;

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

@@ -0,0 +1,10 @@
+import { Expression } from '../abstract/expression.js';
+export class ParenthesizedExpression extends Expression {
+    constructor(expression) {
+        super();
+        this.expression = expression;
+    }
+    toString() {
+        return `(${this.expression})`;
+    }
+}

package/esm/filter/ast/index.js

@@ -6,7 +6,8 @@ export * from './expressions/arithmetic-expression.js';
 export * from './expressions/array-expression.js';
 export * from './expressions/comparison-expression.js';
 export * from './expressions/logical-expression.js';
-export * from './expressions/parentheses-expression.js';
+export * from './expressions/parenthesized-expression.js';
+export * from './expressions/negative-expression.js';
 export * from './terms/boolean-literal.js';
 export * from './terms/date-literal.js';
 export * from './terms/null-literal.js';

package/esm/filter/build.js

@@ -1,4 +1,4 @@
-import { ArithmeticExpression, ArrayExpression, BooleanLiteral, ComparisonExpression, DateLiteral, Expression, LogicalExpression, NullLiteral, NumberLiteral, ParenthesesExpression, QualifiedIdentifier, StringLiteral, TimeLiteral } from './ast/index.js';
+import { ArithmeticExpression, ArrayExpression, BooleanLiteral, ComparisonExpression, DateLiteral, Expression, LogicalExpression, NullLiteral, NumberLiteral, ParenthesizedExpression, QualifiedIdentifier, StringLiteral, TimeLiteral } from './ast/index.js';
 export function $or(...items) {
     return new LogicalExpression({ op: 'or', items });
 }
@@ -57,7 +57,7 @@ export function $notILike(left, right) {
     return comparisonExpression('!ilike', left, right);
 }
 export function $paren(expression) {
-    return new ParenthesesExpression(expression);
+    return new ParenthesizedExpression(expression);
 }
 export function $arithmetic(n) {
     const exp = new ArithmeticExpression();

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

@@ -1,8 +1,7 @@
 import antlr4 from '@browsery/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 { LogicalExpressionContext, } from './antlr/OpraFilterParser.js';
+import { ArrayExpression, BooleanLiteral, ComparisonExpression, DateLiteral, LogicalExpression, NegativeExpression, NullLiteral, NumberLiteral, ParenthesizedExpression, 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';
 // Fix: antlr4 d.ts files are invalid
 const ParseTreeVisitor = antlr4.tree.ParseTreeVisitor;
@@ -15,7 +14,7 @@ export 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;
@@ -23,8 +22,47 @@ export 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 ParenthesizedExpression(expression);
+    }
+    visitParenthesizedItem(ctx) {
+        return this.visit(ctx.expression());
+    }
+    visitNegativeExpression(ctx) {
+        const expression = this.visit(ctx.expression());
+        return new NegativeExpression(expression);
+    }
+    visitComparisonExpression(ctx) {
+        return new 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 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 LogicalExpression({
+            op: ctx.logicalOperator().getText(),
+            items
+        });
+    }
+    visitQualifiedIdentifier(ctx) {
+        return new QualifiedIdentifier(ctx.getText());
+    }
+    visitExternalConstant(ctx) {
+        return new ExternalConstant(ctx.identifier().getText());
     }
     visitNullLiteral() {
         return new NullLiteral();
@@ -50,67 +88,7 @@ export class FilterTreeVisitor extends ParseTreeVisitor {
     visitTimeLiteral(ctx) {
         return new TimeLiteral(unquoteFilterString(ctx.getText()));
     }
-    visitQualifiedIdentifierTerm(ctx) {
-        return new 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 SyntaxError('Unexpected token "' + ctx.getText() + '"');
-    }
-    visitExternalConstantTerm(ctx) {
-        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_list().map(child => this.visit(child)));
-    }
-    visitComparisonExpression(ctx) {
-        return new 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 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 LogicalExpression({
-            op: ctx.logOp().getText(),
-            items
-        });
-    }
-    visitArithmeticExpression(ctx) {
-        const exp = new ArithmeticExpression();
-        const wrapChildren = (children, op) => {
-            for (let i = 0, len = children.length; i < len; i++) {
-                const child = children[i];
-                if (child instanceof 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 ArrayExpression(ctx.value_list().map(child => this.visit(child)));
     }
 }

package/esm/filter/index.js

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

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

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

package/esm/filter/parse.js

@@ -4,7 +4,7 @@ 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) {
+export function parse(text, visitor) {
     const chars = new CharStream(text);
     const lexer = new OpraFilterLexer(chars);
     const tokenStream = new CommonTokenStream(lexer);
@@ -17,8 +17,6 @@ export function parseFilter(text, visitor) {
     parser.removeErrorListeners();
     parser.addErrorListener(errorListener);
     const tree = parser.root();
-    visitor = visitor || new FilterTreeVisitor();
-    const result = visitor.visit(tree);
     if (errors.length) {
         const errMsgs = [];
         for (const err of errors) {
@@ -31,5 +29,6 @@ export function parseFilter(text, visitor) {
         e.errors = errors;
         throw e;
     }
-    return result;
+    visitor = visitor || new FilterTreeVisitor();
+    return visitor.visit(tree);
 }

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

@@ -1,10 +1,10 @@
 import { Expression } from '../../filter/ast/index.js';
-import { parseFilter } from '../../filter/parse.js';
+import { OpraFilter } from '../../filter/index.js';
 export class FilterCodec {
     decode(value) {
         if (value instanceof Expression)
             return value;
-        return parseFilter(value);
+        return OpraFilter.parse(value);
     }
     encode(value) {
         // @ts-ignore

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

@@ -1,5 +1,5 @@
-import { HTTPParser } from 'http-parser-js';
 import stream from 'stream';
+import { HTTPParser } from '@browsery/http-parser';
 import { HttpHeaders } from './http-headers.js';
 const kHeaders = Symbol('kHeaders');
 const kHeadersProxy = Symbol('kHeadersProxy');

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

@@ -1,6 +1,6 @@
 import accepts from 'accepts';
-import { HTTPParser } from 'http-parser-js';
 import typeIs from 'type-is';
+import { HTTPParser } from '@browsery/http-parser';
 import { HttpMessageHost } from './http-message.host.js';
 import { HttpParams } from './http-params.js';
 const HTTP_VERSION_PATTERN = /^(\d)\.(\d)$/;

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

@@ -2,9 +2,9 @@ import contentDisposition from 'content-disposition';
 import cookie from 'cookie';
 import cookieSignature from 'cookie-signature';
 import encodeUrl from 'encodeurl';
-import { HTTPParser } from 'http-parser-js';
 import mime from 'mime-types';
 import path from 'path';
+import { HTTPParser } from '@browsery/http-parser';
 import { HttpStatusMessages } from './enums/http-status-messages.js';
 import { HttpMessageHost } from './http-message.host.js';
 /**

package/esm/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/esm/i18n/i18n.js

@@ -1,7 +1,7 @@
 import { splitString, tokenize } from 'fast-tokenizer';
 import fs from 'fs';
-import i18next from 'i18next';
 import path from 'path';
+import i18next from '@browsery/i18next';
 import { isUrl } from '../helpers/index.js';
 import { unescapeString } from './string-utils.js';
 export const BaseI18n = Object.getPrototypeOf(i18next).constructor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "Opra internationalization package",
   "author": "Panates",
   "license": "MIT",
@@ -9,12 +9,26 @@
     "url": "https://github.com/panates/opra.git",
     "directory": "packages/common"
   },
+  "type": "module",
+  "module": "./esm/index.mjs",
+  "main": "./cjs/index.cjs",
+  "browser": "./browser.js",
+  "types": "./types/index.d.ts",
+  "typings": "./types/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./cjs/index.js",
+      "default": "./esm/index.js",
+      "browser": "./browser.js"
+    }
+  },
   "scripts": {
     "compile": "tsc",
     "prebuild": "npm run check && npm run lint && npm run clean",
-    "build": "npm run build:cjs && npm run build:esm",
+    "build": "npm run build:cjs && npm run build:esm && npm run build:browser",
     "build:cjs": "tsc -b tsconfig-build-cjs.json",
     "build:esm": "tsc -b tsconfig-build-esm.json",
+    "build:browser": "node esbuild.mjs",
     "postbuild": "cp package.json ../../LICENSE ../../build/common && cp ../../package.cjs.json ../../build/common/cjs/package.json",
     "lint": "eslint . --max-warnings=0",
     "check": "madge --circular src/**",
@@ -24,10 +38,13 @@
     "clean:src": "ts-cleanup -s src --all && ts-cleanup -s test --all",
     "clean:dist": "rimraf ../../build/common",
     "clean:cover": "rimraf ../../coverage/common",
-    "antlr4": "java -jar ./tools/antlr4-4.11.2-SNAPSHOT-complete.jar -Dlanguage=TypeScript ./src/filter/antlr/OpraFilter.g4 -visitor"
+    "antlr4": "java -jar ./tools/antlr4-4.12.1-SNAPSHOT-complete.jar -Dlanguage=TypeScript ./src/filter/antlr/OpraFilter.g4 -visitor"
   },
   "dependencies": {
-    "@browsery/antlr4": "^0.2.0",
+    "@browsery/antlr4": "^0.5.0",
+    "@browsery/highland": "^0.3.0",
+    "@browsery/http-parser": "^0.3.2",
+    "@browsery/i18next": "^0.4.0",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "cookie": "^0.5.0",
@@ -35,9 +52,6 @@
     "dayjs": "^1.11.7",
     "encodeurl": "^1.0.2",
     "fast-tokenizer": "^1.2.2",
-    "highland": "^2.13.5",
-    "http-parser-js": "^0.5.8",
-    "i18next": "^22.4.15",
     "lodash.omit": "^4.5.0",
     "mime-types": "^2.1.35",
     "putil-isplainobject": "^1.1.5",
@@ -56,15 +70,12 @@
     "@types/encodeurl": "^1.0.0",
     "@types/mime-types": "^2.1.1",
     "@types/type-is": "^1.6.3",
-    "ts-gems": "^2.3.0"
-  },
-  "type": "module",
-  "types": "types/index.d.ts",
-  "exports": {
-    ".": {
-      "require": "./cjs/index.js",
-      "default": "./esm/index.js"
-    }
+    "@browsery/fs": "^0.3.0",
+    "@browsery/stream": "^0.3.0",
+    "@browsery/util": "^0.3.0",
+    "crypto-browserify": "^3.12.0",
+    "path-browserify": "^1.0.1",
+    "ts-gems": "^2.4.0"
   },
   "engines": {
     "node": ">=16.0",
@@ -77,7 +88,8 @@
     "umd/",
     "types/",
     "LICENSE",
-    "README.md"
+    "README.md",
+    "browser.js"
   ],
   "keywords": [
     "opra",

package/types/document/resource/collection.d.ts

@@ -1,5 +1,5 @@
 import { StrictOmit } from 'ts-gems';
-import { Expression } from '../../filter/index.js';
+import { OpraFilter } from '../../filter/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import type { TypeThunkAsync } from '../../types.js';
 import type { ApiDocument } from '../api-document.js';
@@ -48,7 +48,7 @@ export interface Collection extends StrictOmit<Resource, 'exportSchema' | '_cons
     normalizeFieldPath(fields: string[]): string[];
     normalizeFieldPath(fields: string | string[]): string | string[];
     normalizeSortFields(fields: string | string[]): string[];
-    normalizeFilter(ast: Expression): Expression;
+    normalizeFilter(ast: string | OpraFilter.Expression): OpraFilter.Expression | undefined;
     _construct(init: Collection.InitArguments): void;
 }
 export interface CollectionConstructor {

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

@@ -34,28 +34,15 @@ export default class OpraFilterLexer extends Lexer {
     static readonly T__31 = 32;
     static readonly T__32 = 33;
     static readonly T__33 = 34;
-    static readonly T__34 = 35;
-    static readonly T__35 = 36;
-    static readonly T__36 = 37;
-    static readonly T__37 = 38;
-    static readonly T__38 = 39;
-    static readonly T__39 = 40;
-    static readonly T__40 = 41;
-    static readonly T__41 = 42;
-    static readonly T__42 = 43;
-    static readonly T__43 = 44;
-    static readonly T__44 = 45;
-    static readonly T__45 = 46;
-    static readonly DATE = 47;
-    static readonly DATETIME = 48;
-    static readonly TIME = 49;
-    static readonly IDENTIFIER = 50;
-    static readonly STRING = 51;
-    static readonly NUMBER = 52;
-    static readonly INTEGER = 53;
-    static readonly WHITESPACE = 54;
-    static readonly COMMENT = 55;
-    static readonly LINE_COMMENT = 56;
+    static readonly IDENTIFIER = 35;
+    static readonly POLAR_OP = 36;
+    static readonly DATE = 37;
+    static readonly DATETIME = 38;
+    static readonly TIME = 39;
+    static readonly NUMBER = 40;
+    static readonly INTEGER = 41;
+    static readonly STRING = 42;
+    static readonly WHITESPACE = 43;
     static readonly EOF: number;
     static readonly channelNames: string[];
     static readonly literalNames: (string | null)[];