@opra/common 0.13.0 → 0.15.0

package/esm/url/opra-url.js

@@ -1,8 +1,9 @@
 var _a;
 import { splitString, tokenize } from 'fast-tokenizer';
+import { HttpParams } from '../http/index.js';
+import { normalizePath } from '../utils/path-utils.js';
 import { OpraURLPath } from './opra-url-path.js';
-import { OpraURLSearchParams } from './opra-url-search-params.js';
-import { decodePathComponent, normalizePath } from './utils/path-utils.js';
+import { decodePathComponent } from './utils/decode-path-component.js';
 const nodeInspectCustom = Symbol.for('nodejs.util.inspect.custom');
 const urlRegEx = /^(?:((?:[A-Z][A-Z+-.]+:)+)\/\/([^/?]+))?(.*)?$/i;
 const schemeRegEx = /^([A-Z][A-Z+-.]+:?)+$/i;
@@ -12,32 +13,27 @@ const kContext = Symbol('kContext');
 const kPath = Symbol('kPath');
 const kSearchParams = Symbol('kSearchParams');
 export class OpraURL {
-    constructor(input, arg1) {
+    constructor(input, base) {
         this[_a] = {
             protocol: '',
             username: '',
-            pathname: '',
             prefix: '',
             hostname: '',
             port: '',
             hash: '',
-            password: '',
-            search: '',
-            address: '',
-            needUpdate: true
+            password: ''
         };
         this[kPath] = new OpraURLPath('', {
-            onChange: () => this._changed()
+            onChange: () => {
+                this[kContext].pathname = undefined;
+                this[kContext].address = undefined;
+            }
         });
-        this[kSearchParams] = new OpraURLSearchParams('', {
-            onChange: () => this._changed()
+        this[kSearchParams] = new HttpParams('', {
+            onChange: () => {
+                this[kContext].search = undefined;
+            }
         });
-        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(typeof input === 'object' ? input.toString() : input);
         if (base) {
@@ -49,7 +45,19 @@ export class OpraURL {
         }
     }
     get address() {
-        this._update();
+        if (this[kContext].address == null) {
+            let address = '';
+            if (this[kContext].hostname) {
+                address += (this[kContext].protocol || 'http:') + '//' +
+                    (this[kContext].username || this[kContext].password
+                        ? ((this[kContext].username ? encodeURIComponent(this[kContext].username) : '') +
+                            (this[kContext].password ? ':' + encodeURIComponent(this[kContext].password) : '') + '@')
+                        : '') + this.host;
+            }
+            this[kContext].address = address +
+                (this.prefix !== '/' ? this.prefix : '') +
+                (this.pathname !== '/' ? this.pathname : '');
+        }
         return this[kContext].address;
     }
     get host() {
@@ -63,17 +71,16 @@ export class OpraURL {
                     host: v,
                     code: 'ERR_INVALID_URL'
                 });
-            this[kContext].hostname = m[1];
-            this[kContext].port = m[2] || '';
+            this.hostname = m[1];
+            this.port = m[2] || '';
         }
         else {
-            this[kContext].hostname = '';
-            this[kContext].port = '';
+            this.hostname = '';
+            this.port = '';
         }
-        this._changed();
     }
     get hostname() {
-        return this[kContext].hostname || '';
+        return this[kContext].hostname;
     }
     set hostname(v) {
         if (v) {
@@ -86,7 +93,7 @@ export class OpraURL {
         }
         else
             this[kContext].hostname = '';
-        this._changed();
+        this[kContext].address = undefined;
     }
     get href() {
         return this.address + this.search + this.hash;
@@ -95,8 +102,8 @@ export class OpraURL {
         return this[kContext].password;
     }
     set password(v) {
-        this[kContext].password = v || '';
-        this._changed();
+        this[kContext].password = v ?? '';
+        this[kContext].address = undefined;
     }
     get port() {
         return this[kContext].port;
@@ -104,17 +111,16 @@ export class OpraURL {
     set port(value) {
         if (value) {
             // noinspection SuspiciousTypeOfGuard
-            const v = parseInt(value, 10);
+            const v = typeof value === 'number' ? value : 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;
+            this[kContext].port = String(v);
         }
         else
             this[kContext].port = '';
-        this._changed();
     }
     get prefix() {
         return this[kContext].prefix;
@@ -126,10 +132,10 @@ export class OpraURL {
         }
         else
             this[kContext].prefix = '';
-        this._changed();
+        this[kContext].address = undefined;
     }
     get protocol() {
-        return this[kContext].protocol || 'http:';
+        return this[kContext].protocol;
     }
     set protocol(v) {
         if (v) {
@@ -142,14 +148,14 @@ export class OpraURL {
         }
         else
             this[kContext].protocol = '';
-        this._changed();
+        this[kContext].address = undefined;
     }
     get username() {
         return this[kContext].username;
     }
     set username(v) {
-        this[kContext].username = v || '';
-        this._changed();
+        this[kContext].username = v ?? '';
+        this[kContext].address = undefined;
     }
     get origin() {
         return this.hostname ? (this.protocol + '//' + this.hostname) : '';
@@ -158,29 +164,35 @@ export class OpraURL {
         return this[kPath];
     }
     get pathname() {
-        this._update();
-        return this[kContext].pathname || '';
+        if (this[kContext].pathname == null)
+            this[kContext].pathname = '/' + this[kPath].toString();
+        return this[kContext].pathname;
     }
     set pathname(v) {
         this._setPathname(v, false);
     }
-    get searchParams() {
-        return this[kSearchParams];
-    }
     get hash() {
-        return this[kContext].hash || '';
+        return this[kContext].hash;
     }
     set hash(v) {
         this[kContext].hash = v ? (v.startsWith('#') ? v : '#' + v) : '';
-        this._changed();
     }
     get search() {
-        this._update();
-        return this[kContext].search || '';
+        if (this[kContext].search == null) {
+            const s = this[kSearchParams].toString();
+            this[kContext].search = s ? ('?' + s) : '';
+        }
+        return this[kContext].search;
     }
     set search(v) {
-        this.searchParams.clear();
-        this.searchParams.appendAll(v);
+        if (v) {
+            this[kSearchParams].clear();
+            this[kSearchParams].appendAll(v);
+        }
+        this[kContext].search = undefined;
+    }
+    get searchParams() {
+        return this[kSearchParams];
     }
     parse(input) {
         const m = urlRegEx.exec(input);
@@ -213,60 +225,18 @@ export class OpraURL {
         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();
+        this.search = tokenizer.join('&');
     }
     join(...source) {
         this.path.join(...source);
         return this;
     }
-    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;
-    }
-    setHostname(v) {
-        this.hostname = v;
-        return this;
-    }
-    setProtocol(v) {
-        this.protocol = v;
-        return this;
-    }
-    setPort(v) {
-        this.port = v ? String(v) : '';
-        return this;
-    }
-    setPrefix(v) {
-        this.prefix = v;
-        return this;
-    }
-    setPathname(v) {
-        this.pathname = v;
-        return this;
-    }
-    setHash(v) {
-        this.hash = v;
-        return this;
-    }
-    setSearch(v) {
-        this.search = v;
-        return this;
-    }
     toString() {
         return this.href;
     }
     /* istanbul ignore next */
     [(_a = kContext, nodeInspectCustom)]() {
-        this._update();
+        // this._update();
         return {
             protocol: this.protocol,
             username: this.username,
@@ -278,29 +248,32 @@ export class OpraURL {
             path: this.path,
             pathname: this.pathname,
             search: this.search,
-            searchParams: this.searchParams,
             hash: this.hash,
         };
     }
-    _update() {
-        if (!this[kContext].needUpdate)
-            return;
-        const ctx = this[kContext];
-        ctx.needUpdate = false;
-        let s = this.path.toString();
-        ctx.pathname = s ? '/' + s : '';
-        s = this.searchParams.toString();
-        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;
-    }
+    //
+    // protected _update() {
+    //   if (!this[kContext].needUpdate)
+    //     return;
+    //   const ctx = this[kContext];
+    //   ctx.needUpdate = false;
+    //   let s = this.path.toString();
+    //   ctx.pathname = s ? '/' + s : '';
+    //   s = this.searchParams.toString();
+    //   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, trimPrefix) {
         this.path.clear();
         if (!v)
@@ -322,10 +295,6 @@ export class OpraURL {
             const p = decodePathComponent(x);
             this.path.join(p);
         }
-        this._changed();
-    }
-    _changed() {
-        this[kContext].needUpdate = true;
     }
 }
 OpraURL.kContext = kContext;

package/esm/url/utils/decode-path-component.d.ts

@@ -0,0 +1,5 @@
+export declare function decodePathComponent(input: string): {
+    resource: string;
+    key?: any;
+    typeCast?: string;
+};

package/esm/url/utils/{path-utils.js → decode-path-component.js}

@@ -1,24 +1,4 @@
 import { splitString } from 'fast-tokenizer';
-import isPlainObject from 'putil-isplainobject';
-export function normalizePath(p, noLeadingSlash) {
-    if (!p)
-        return '';
-    while (noLeadingSlash && p.startsWith('/'))
-        p = p.substring(1);
-    while (p.endsWith('/'))
-        p = p.substring(0, p.length - 1);
-    return p;
-}
-export function joinPath(...p) {
-    const out = [];
-    let s;
-    for (let i = 0, l = p.length; i < l; i++) {
-        s = normalizePath(p[i], i > 0);
-        if (s)
-            out.push(s);
-    }
-    return out.join('/');
-}
 const pathComponentRegEx = /^([^/?#:@]+)(?:@([^/?#:]*))?(?:::(.*))?$/;
 export function decodePathComponent(input) {
     const m = pathComponentRegEx.exec(input);
@@ -55,24 +35,3 @@ export function decodePathComponent(input) {
     }
     return { resource, key };
 }
-export function encodePathComponent(resource, key, typeCast) {
-    if (resource == null)
-        return '';
-    let keyString = '';
-    if (key !== '' && key != null) {
-        if (isPlainObject(key)) {
-            const arr = [];
-            for (const k of Object.keys(key)) {
-                arr.push(encodeURIComponent(k) + '=' + encodeURIComponent(key[k]));
-            }
-            keyString = arr.join(';');
-        }
-        else
-            keyString = encodeURIComponent('' + key);
-    }
-    if (typeCast)
-        typeCast = encodeURIComponent(typeCast);
-    return encodeURIComponent(resource).replace(/%24/, '$') +
-        (keyString ? '@' + keyString : '') +
-        (typeCast ? '::' + typeCast : '');
-}

package/esm/url/utils/encode-path-component.d.ts

@@ -0,0 +1 @@
+export declare function encodePathComponent(resource: string, key?: any, typeCast?: string): string;

package/esm/url/utils/encode-path-component.js

@@ -0,0 +1,22 @@
+import isPlainObject from 'putil-isplainobject';
+export function encodePathComponent(resource, key, typeCast) {
+    if (resource == null)
+        return '';
+    let keyString = '';
+    if (key !== '' && key != null) {
+        if (isPlainObject(key)) {
+            const arr = [];
+            for (const k of Object.keys(key)) {
+                arr.push(encodeURIComponent(k) + '=' + encodeURIComponent(key[k]));
+            }
+            keyString = arr.join(';');
+        }
+        else
+            keyString = encodeURIComponent('' + key);
+    }
+    if (typeCast)
+        typeCast = encodeURIComponent(typeCast);
+    return encodeURIComponent(resource).replace(/%24/, '$') +
+        (keyString ? '@' + keyString : '') +
+        (typeCast ? '::' + typeCast : '');
+}

package/esm/utils/path-utils.d.ts

@@ -0,0 +1,2 @@
+export declare function normalizePath(p?: string, noLeadingSlash?: boolean): string;
+export declare function joinPath(...p: string[]): string;

package/esm/utils/path-utils.js

@@ -0,0 +1,19 @@
+export function normalizePath(p, noLeadingSlash) {
+    if (!p)
+        return '';
+    while (noLeadingSlash && p.startsWith('/'))
+        p = p.substring(1);
+    while (p.endsWith('/'))
+        p = p.substring(0, p.length - 1);
+    return p;
+}
+export function joinPath(...p) {
+    const out = [];
+    let s;
+    for (let i = 0, l = p.length; i < l; i++) {
+        s = normalizePath(p[i], i > 0);
+        if (s)
+            out.push(s);
+    }
+    return out.join('/');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "Opra internationalization package",
   "author": "Panates",
   "license": "MIT",
@@ -18,8 +18,8 @@
     "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": "NODE_OPTIONS=--experimental-vm-modules npx jest",
-    "cover": "NODE_OPTIONS=--experimental-vm-modules npx jest --collect-coverage",
+    "test": "jest",
+    "cover": "jest --collect-coverage",
     "clean": "npm run clean:src && npm run clean:dist && npm run clean:cover",
     "clean:src": "ts-cleanup -s src --all && ts-cleanup -s test --all",
     "clean:dist": "rimraf ../../build/common",
@@ -28,19 +28,34 @@
   },
   "dependencies": {
     "@browsery/antlr4": "^0.2.0",
-    "fast-tokenizer": "^1.2.1",
+    "accepts": "^1.3.8",
+    "content-disposition": "^0.5.4",
+    "cookie": "^0.5.0",
+    "cookie-signature": "^1.0.7",
+    "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.9",
+    "i18next": "^22.4.14",
     "lodash.omit": "^4.5.0",
+    "mime-types": "^2.1.35",
     "putil-isplainobject": "^1.1.5",
-    "putil-merge": "^3.10.1",
+    "putil-merge": "^3.10.3",
     "putil-promisify": "^1.10.0",
     "putil-varhelpers": "^1.6.5",
     "reflect-metadata": "^0.1.13",
+    "type-is": "^1.6.18",
     "uid": "^2.0.1"
   },
   "devDependencies": {
+    "@types/accepts": "^1.3.5",
+    "@types/content-disposition": "^0.5.5",
+    "@types/cookie": "^0.5.1",
+    "@types/cookie-signature": "^1.1.0",
+    "@types/encodeurl": "^1.0.0",
+    "@types/type-is": "^1.6.3",
+    "@types/mime-types": "^2.1.1",
     "ts-gems": "^2.3.0"
   },
   "type": "module",

package/cjs/constants.js

@@ -1 +0,0 @@
-"use strict";

package/cjs/http/http-param-codec.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpParamCodec = void 0;
-class HttpParamCodec {
-}
-exports.HttpParamCodec = HttpParamCodec;

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

@@ -1,105 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpRequestNode = void 0;
-const http_parser_js_1 = require("http-parser-js");
-const stream_1 = require("stream");
-const crlfBuffer = Buffer.from('\r\n');
-const kHeaders = Symbol('kHeaders');
-const kHeadersCount = Symbol('kHeadersCount');
-const kTrailers = Symbol('kTrailers');
-const kTrailersCount = Symbol('kTrailersCount');
-// todo: Check is this class should be in common library
-class HttpRequestNode extends stream_1.Readable {
-    constructor() {
-        super(...arguments);
-        this.aborted = false;
-    }
-    get headers() {
-        if (!this[kHeaders])
-            this[kHeaders] = arrayToHeaders(this.rawHeaders);
-        return this[kHeaders];
-    }
-    get headersCount() {
-        return this[kHeadersCount];
-    }
-    get trailers() {
-        if (!this[kTrailers])
-            this[kTrailers] = arrayToHeaders(this.rawTrailers);
-        return this[kTrailers];
-    }
-    get trailersCount() {
-        return this[kTrailersCount];
-    }
-    _read() {
-        if (this.data) {
-            this.push(this.data);
-        }
-        this.push(null);
-    }
-    static parse(input) {
-        const parser = new http_parser_js_1.HTTPParser(http_parser_js_1.HTTPParser.REQUEST);
-        const out = new HttpRequestNode();
-        const bodyChunks = [];
-        parser[http_parser_js_1.HTTPParser.kOnHeadersComplete] = function (req) {
-            out.shouldKeepAlive = req.shouldKeepAlive;
-            out.upgrade = req.upgrade;
-            out.method = http_parser_js_1.HTTPParser.methods[req.method];
-            out.url = req.url;
-            out.originalUrl = req.url;
-            out.httpVersionMajor = req.versionMajor;
-            out.httpVersionMinor = req.versionMinor;
-            out.httpVersion = req.versionMajor + '.' + req.versionMinor;
-            out.rawHeaders = req.headers;
-            out[kHeadersCount] = Math.ceil(req.headers.length / 2);
-            out[kTrailersCount] = 0;
-        };
-        parser[http_parser_js_1.HTTPParser.kOnBody] = function (chunk, offset, length) {
-            bodyChunks.push(chunk.subarray(offset, offset + length));
-        };
-        // This is actually the event for trailers, go figure.
-        parser[http_parser_js_1.HTTPParser.kOnHeaders] = function (t) {
-            out.rawTrailers = t;
-            out[kTrailersCount] = Math.ceil(t.length / 2);
-        };
-        parser[http_parser_js_1.HTTPParser.kOnMessageComplete] = function () {
-            out.complete = true;
-        };
-        // Since we are sending the entire Buffer at once here all callbacks above happen synchronously.
-        // The parser does not do _anything_ asynchronous.
-        // However, you can of course call execute() multiple times with multiple chunks, e.g. from a stream.
-        // But then you have to refactor the entire logic to be async (e.g. resolve a Promise in kOnMessageComplete and add timeout logic).
-        parser.execute(input);
-        if (!out.complete)
-            parser.execute(crlfBuffer);
-        parser.finish();
-        if (!out.complete) {
-            throw new Error('Could not parse request');
-        }
-        out.rawTrailers = out.rawTrailers || [];
-        if (bodyChunks.length)
-            out.data = Buffer.concat(bodyChunks);
-        out.resume();
-        return out;
-    }
-}
-exports.HttpRequestNode = HttpRequestNode;
-function arrayToHeaders(arr) {
-    const headers = {};
-    for (let i = 0; i < arr.length; i++) {
-        const k = arr[i].toLowerCase();
-        const v = arr[++i];
-        const trgV = headers[k];
-        // Array header -- only Set-Cookie at the moment
-        if (trgV && k === 'set-cookie') {
-            const a = Array.isArray(trgV) ? trgV : [trgV];
-            a.push(v);
-            headers[k] = a;
-        }
-        else if (typeof trgV === 'string') {
-            headers[k] += (k === 'cookie' ? '; ' : ', ') + v;
-        }
-        else
-            headers[k] = v;
-    }
-    return headers;
-}