@opra/core 0.20.1 → 0.21.0

package/cjs/adapter/adapter.js

@@ -32,7 +32,7 @@ class OpraAdapter extends strict_typed_events_1.AsyncEventEmitter {
             await this.i18n.init();
         if (options?.onRequest)
             this.on('request', options.onRequest);
-        this._internalDoc = await common_1.DocumentFactory.createDocument({
+        this._apiRoot = await common_1.DocumentFactory.createDocument({
             version: common_1.OpraSchema.SpecVersion,
             info: {
                 version: common_1.OpraSchema.SpecVersion,
@@ -87,7 +87,7 @@ class OpraAdapter extends strict_typed_events_1.AsyncEventEmitter {
                 if (typeof response.value === 'object')
                     affected = response.value.affectedRows || response.value.affected;
                 response.value = {
-                    operation: request.operation,
+                    operation: request.crud,
                     affected
                 };
             }

package/cjs/adapter/http/express-adapter.js

@@ -1,25 +1,47 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraExpressAdapter = void 0;
-const tslib_1 = require("tslib");
-const body_parser_1 = tslib_1.__importDefault(require("body-parser"));
 const common_1 = require("@opra/common");
 const http_adapter_js_1 = require("./http-adapter.js");
-const noOp = () => void 0;
+const http_server_request_js_1 = require("./impl/http-server-request.js");
+const http_server_response_js_1 = require("./impl/http-server-response.js");
 class OpraExpressAdapter extends http_adapter_js_1.OpraHttpAdapter {
     constructor() {
         super(...arguments);
         this.platform = 'express';
     }
     static async create(app, document, options) {
+        const express = await Promise.resolve().then(() => __importStar(require('express')));
         const adapter = new OpraExpressAdapter(document);
         await adapter.init(options);
         const prefix = '/' + (0, common_1.normalizePath)(options?.prefix, true);
-        app.use(prefix, body_parser_1.default.json());
+        app.use(prefix, express.json());
         app.use(prefix, (req, res, next) => {
-            req.end = noOp;
-            req.send = noOp;
-            adapter.handler(req, res).catch(e => next(e));
+            adapter.handler(http_server_request_js_1.HttpServerRequest.create(req), http_server_response_js_1.HttpServerResponse.create(res))
+                .catch(e => next(e));
         });
         return adapter;
     }

package/cjs/adapter/http/helpers/common.js

@@ -0,0 +1,66 @@
+"use strict";
+/*
+  This file contains code blocks from open source NodeJs project
+  https://github.com/nodejs/
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateString = exports.validateHeaderValue = exports.validateHeaderName = exports.hideStackFrames = exports.checkIsHttpToken = void 0;
+const tokenRegExp = /^[\^_`a-zA-Z\-0-9!#$%&'*+.|~]+$/;
+const nodeInternalPrefix = '__node_internal_';
+/**
+ * Verifies that the given val is a valid HTTP token
+ * per the rules defined in RFC 7230
+ * See https://tools.ietf.org/html/rfc7230#section-3.2.6
+ *
+ * https://github.com/nodejs/node/blob/main/lib/_http_common.js
+ */
+function checkIsHttpToken(val) {
+    return typeof val === 'string' && tokenRegExp.exec(val) !== null;
+}
+exports.checkIsHttpToken = checkIsHttpToken;
+const headerCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
+/**
+ * True if val contains an invalid field-vchar
+ *  field-value    = *( field-content / obs-fold )
+ *  field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
+ *  field-vchar    = VCHAR / obs-text
+ *
+ *  https://github.com/nodejs/node/blob/main/lib/_http_common.js
+ */
+function checkInvalidHeaderChar(val) {
+    // noinspection SuspiciousTypeOfGuard
+    return typeof val === 'string' && headerCharRegex.exec(val) !== null;
+}
+/**
+ * This function removes unnecessary frames from Node.js core errors.
+ *
+ * https://github.com/nodejs/node/blob/main/lib/internal/errors.js
+ */
+function hideStackFrames(fn) {
+    // We rename the functions that will be hidden to cut off the stacktrace
+    // at the outermost one
+    const hidden = nodeInternalPrefix + fn.name;
+    // @ts-ignore
+    Object.defineProperty(fn, 'name', { __proto__: null, value: hidden });
+    return fn;
+}
+exports.hideStackFrames = hideStackFrames;
+exports.validateHeaderName = hideStackFrames((name, label) => {
+    // noinspection SuspiciousTypeOfGuard
+    if (typeof name !== 'string' || !name || !checkIsHttpToken(name)) {
+        throw new TypeError(`${label || 'Header name'} must be a valid HTTP token ["${name}"]`);
+    }
+});
+exports.validateHeaderValue = hideStackFrames((name, value) => {
+    if (value === undefined) {
+        throw new TypeError(`Invalid value "${value}" for header "${name}"`);
+    }
+    if (checkInvalidHeaderChar(value)) {
+        throw new TypeError(`Invalid character in header content ["${name}"]`);
+    }
+});
+function validateString(value, name) {
+    if (typeof value !== 'string')
+        throw new TypeError(`Invalid ${name ? name + ' ' : ''}argument. Value must be a string`);
+}
+exports.validateString = validateString;

package/cjs/adapter/http/helpers/convert-to-headers.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToHeadersDistinct = exports.convertToHeaders = void 0;
+const match_known_fields_js_1 = require("./match-known-fields.js");
+function convertToHeaders(src, dst, joinDuplicateHeaders) {
+    for (let n = 0; n < src.length; n += 2) {
+        addHeaderLine(src[n], src[n + 1], dst, joinDuplicateHeaders);
+    }
+    return dst;
+}
+exports.convertToHeaders = convertToHeaders;
+function convertToHeadersDistinct(src, dst) {
+    const count = src.length % 2;
+    for (let n = 0; n < count; n += 2) {
+        addHeaderLineDistinct(src[n], src[n + 1], dst);
+    }
+    return dst;
+}
+exports.convertToHeadersDistinct = convertToHeadersDistinct;
+function addHeaderLine(field, value, dest, joinDuplicateHeaders) {
+    if (value == null)
+        return;
+    field = field.toLowerCase();
+    const [, flag] = (0, match_known_fields_js_1.matchKnownFields)(field);
+    // comma(0) or semicolon(2) delimited field
+    if (flag === match_known_fields_js_1.COMMA_DELIMITED_FIELD || flag === match_known_fields_js_1.SEMICOLON_DELIMITED_FIELD) {
+        // Make a delimited list
+        if (typeof dest[field] === 'string') {
+            dest[field] += (flag === match_known_fields_js_1.COMMA_DELIMITED_FIELD ? ', ' : '; ') + value;
+        }
+        else {
+            dest[field] = value;
+        }
+    }
+    else if (flag === match_known_fields_js_1.ARRAY_FIELD) {
+        // Array header -- only Set-Cookie at the moment
+        if (dest['set-cookie'] !== undefined) {
+            dest['set-cookie'].push(value);
+        }
+        else {
+            dest['set-cookie'] = [value];
+        }
+    }
+    else if (joinDuplicateHeaders) {
+        if (dest[field] === undefined) {
+            dest[field] = value;
+        }
+        else {
+            dest[field] += ', ' + value;
+        }
+    }
+    else if (dest[field] === undefined) {
+        // Drop duplicates
+        dest[field] = value;
+    }
+}
+function addHeaderLineDistinct(field, value, dest) {
+    field = field.toLowerCase();
+    if (!dest[field]) {
+        dest[field] = [value];
+    }
+    else {
+        dest[field].push(value);
+    }
+}

package/cjs/adapter/http/helpers/convert-to-raw-headers.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToRawHeaders = void 0;
+const match_known_fields_js_1 = require("./match-known-fields.js");
+function convertToRawHeaders(src) {
+    return Object.entries(src)
+        .reduce((a, [field, v]) => {
+        const [name, flag] = (0, match_known_fields_js_1.matchKnownFields)(field);
+        if (flag === match_known_fields_js_1.ARRAY_FIELD) {
+            if (Array.isArray(v))
+                v.forEach(x => a.push(name, String(x)));
+            else
+                a.push(name, String(v));
+            return a;
+        }
+        if (flag === match_known_fields_js_1.COMMA_DELIMITED_FIELD || flag === match_known_fields_js_1.SEMICOLON_DELIMITED_FIELD) {
+            v = Array.isArray(v) ? v.join(flag === match_known_fields_js_1.COMMA_DELIMITED_FIELD ? ', ' : '; ') : String(v);
+        }
+        else
+            v = Array.isArray(v) ? String(v[0]) : String(v);
+        a.push(name, v);
+        return a;
+    }, []);
+}
+exports.convertToRawHeaders = convertToRawHeaders;

package/cjs/adapter/http/helpers/match-known-fields.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchKnownFields = exports.ARRAY_FIELD = exports.SEMICOLON_DELIMITED_FIELD = exports.COMMA_DELIMITED_FIELD = exports.NO_DUPLICATES_FIELD = void 0;
+const common_1 = require("@opra/common");
+exports.NO_DUPLICATES_FIELD = 0;
+exports.COMMA_DELIMITED_FIELD = 1;
+exports.SEMICOLON_DELIMITED_FIELD = 2;
+exports.ARRAY_FIELD = 3;
+const ARRAY_HEADERS = [
+    'set-cookie'
+];
+const NO_DUPLICATES_HEADERS = [
+    'age',
+    'from',
+    'etag',
+    'server',
+    'referer',
+    'referrer',
+    'expires',
+    'location',
+    'user-agent',
+    'retry-after',
+    'content-type',
+    'content-length',
+    'max-forwards',
+    'last-modified',
+    'authorization',
+    'proxy-authorization',
+    'if-modified-since',
+    'if-unmodified-since',
+];
+const SEMICOLON_DELIMITED_HEADERS = ['cookie'];
+const KNOWN_FIELDS = Object.values(common_1.HttpHeaderCodes)
+    .reduce((o, k) => {
+    const n = k.toLowerCase();
+    o[n] = [k,
+        (NO_DUPLICATES_HEADERS.includes(n) ? exports.NO_DUPLICATES_FIELD :
+            (ARRAY_HEADERS.includes(n) ? exports.ARRAY_FIELD :
+                (SEMICOLON_DELIMITED_HEADERS.includes(n) ? exports.SEMICOLON_DELIMITED_FIELD : exports.COMMA_DELIMITED_FIELD)))
+    ];
+    return o;
+}, {});
+function matchKnownFields(field) {
+    const x = KNOWN_FIELDS[field.toLowerCase()];
+    return x ? x : [field, exports.COMMA_DELIMITED_FIELD];
+}
+exports.matchKnownFields = matchKnownFields;