@opra/common 0.10.3 → 0.13.0

package/esm/url/opra-url.js

@@ -1,3 +1,4 @@
+var _a;
 import { splitString, tokenize } from 'fast-tokenizer';
 import { OpraURLPath } from './opra-url-path.js';
 import { OpraURLSearchParams } from './opra-url-search-params.js';
@@ -7,166 +8,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');
 export 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 OpraURLPath()
+    constructor(input, arg1) {
+        this[_a] = {
+            protocol: '',
+            username: '',
+            pathname: '',
+            prefix: '',
+            hostname: '',
+            port: '',
+            hash: '',
+            password: '',
+            search: '',
+            address: '',
+            needUpdate: true
+        };
+        this[kPath] = new OpraURLPath('', {
+            onChange: () => this._changed()
         });
-        Object.defineProperty(this, SEARCHPARAMS_KEY, {
-            writable: true,
-            configurable: true,
-            enumerable: false,
-            value: new OpraURLSearchParams()
+        this[kSearchParams] = new 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 = normalizePath(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 = splitString(m[2], { delimiters: '@' });
+            if (tokens.length > 1) {
+                this.host = tokens[1];
+                tokens = 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 = tokenize(input, { delimiters: '#', quotes: true, brackets: true });
+        input = tokenizer.next() || '';
+        this.hash = tokenizer.join('#');
+        tokenizer = 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;
@@ -180,11 +242,11 @@ export 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) {
@@ -199,46 +261,11 @@ export 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 = splitString(m[2], { delimiters: '@' });
-            if (tokens.length > 1) {
-                this.host = tokens[1];
-                tokens = 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 = tokenize(input, { delimiters: '#', quotes: true, brackets: true });
-        input = tokenizer.next() || '';
-        this.hash = tokenizer.join('#');
-        tokenizer = 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,
@@ -247,7 +274,7 @@ export 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,
@@ -255,27 +282,34 @@ export 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 = tokenize(normalizePath(v, true), {
             delimiters: '/', quotes: true, brackets: true,
         });
-        if (inclSvcRoot && this.pathPrefix) {
-            const prefixTokenizer = tokenize(normalizePath(this.pathPrefix, true), {
+        if (trimPrefix && this.prefix) {
+            const prefixTokenizer = tokenize(normalizePath(this.prefix, true), {
                 delimiters: '/', quotes: true, brackets: true,
             });
             for (const a of prefixTokenizer) {
@@ -286,7 +320,14 @@ export class OpraURL {
         }
         for (const x of pathTokenizer) {
             const p = decodePathComponent(x);
-            this.path.add(p);
+            this.path.join(p);
         }
+        this._changed();
+    }
+    _changed() {
+        this[kContext].needUpdate = true;
     }
 }
+OpraURL.kContext = kContext;
+OpraURL.kPath = kPath;
+OpraURL.kSearchParams = kSearchParams;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "0.10.3",
+  "version": "0.13.0",
   "description": "Opra internationalization package",
   "author": "Panates",
   "license": "MIT",
@@ -18,25 +18,25 @@
     "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/**",
-    "test": "jest --runInBand --detectOpenHandles",
-    "cover": "jest --collect-coverage",
+    "test": "NODE_OPTIONS=--experimental-vm-modules npx jest",
+    "cover": "NODE_OPTIONS=--experimental-vm-modules npx jest --collect-coverage",
     "clean": "npm run clean:src && npm run clean:dist && npm run clean:cover",
-    "clean:src": "ts-cleanup -s src --all",
+    "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"
   },
   "dependencies": {
-    "antlr4": "^4.12.0-beta.3",
-    "fast-tokenizer": "^1.2.0",
+    "@browsery/antlr4": "^0.2.0",
+    "fast-tokenizer": "^1.2.1",
     "highland": "^2.13.5",
     "http-parser-js": "^0.5.8",
-    "i18next": "^22.4.6",
+    "i18next": "^22.4.9",
     "lodash.omit": "^4.5.0",
-    "putil-isplainobject": "^1.1.4",
-    "putil-merge": "^3.9.0",
+    "putil-isplainobject": "^1.1.5",
+    "putil-merge": "^3.10.1",
     "putil-promisify": "^1.10.0",
-    "putil-varhelpers": "^1.6.4",
+    "putil-varhelpers": "^1.6.5",
     "reflect-metadata": "^0.1.13",
     "uid": "^2.0.1"
   },
@@ -67,4 +67,4 @@
     "opra",
     "common"
   ]
-}
+}