@opra/core 0.33.10 → 0.33.13

package/cjs/http/adapters/node-http-adapter.host.js

@@ -42,8 +42,8 @@ class NodeHttpAdapterHost extends http_adapter_host_js_1.HttpAdapterHost {
         const parsedUrl = new common_1.OpraURL(originalUrl);
         const relativePath = common_1.OpraURLPath.relative(parsedUrl.path, this.basePath);
         if (!relativePath) {
-            serverResponse.statusCode = common_1.HttpStatusCodes.NOT_FOUND;
-            serverResponse.statusMessage = common_1.HttpStatusMessages[common_1.HttpStatusCodes.NOT_FOUND];
+            serverResponse.statusCode = common_1.HttpStatusCode.NOT_FOUND;
+            serverResponse.statusMessage = common_1.HttpStatusMessages[common_1.HttpStatusCode.NOT_FOUND];
             serverResponse.end();
             return;
         }

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

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const promises_1 = tslib_1.__importDefault(require("fs/promises"));
 const os_1 = tslib_1.__importDefault(require("os"));
 const valgen_1 = require("valgen");
-const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const common_1 = require("@opra/common");
 const execution_context_host_js_1 = require("../execution-context.host.js");
 const platform_adapter_host_js_1 = require("../platform-adapter.host.js");
@@ -536,14 +535,9 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 response.value = value;
             // Normalize response value
             if (endpoint.kind === 'operation') {
-                if (resource instanceof common_1.Storage && endpoint.name === 'post') {
-                    // Count file parts
-                    value = context.request.parts.items.reduce((n, item) => item.file ? n + 1 : n, 0);
-                }
                 if (resource instanceof common_1.Collection || resource instanceof common_1.Singleton || resource instanceof common_1.Storage) {
                     const operationName = endpoint.name;
-                    if (operationName === 'delete' || operationName === 'deleteMany' ||
-                        operationName === 'updateMany' || operationName === 'post') {
+                    if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
                         let affected = 0;
                         if (typeof value === 'number')
                             affected = value;
@@ -555,23 +549,23 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                         response.value = affected;
                         return;
                     }
-                    if (resource instanceof common_1.Storage)
-                        return;
-                    // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
-                    if (value == null && (operationName === 'get' || operationName === 'update'))
-                        throw new common_1.ResourceNotAvailableError(resource.name, request.key);
-                    // "findMany" endpoint should return array of entity instances
-                    if (operationName === 'findMany')
-                        value = (value == null ? [] : Array.isArray(value) ? value : [value]);
-                    else
-                        value = value == null ? {} : Array.isArray(value) ? value[0] : value;
-                    value = endpoint.encodeReturning(value, { coerce: true, partial: true });
+                    if (resource instanceof common_1.Collection || resource instanceof common_1.Singleton) {
+                        // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
+                        if (value == null && (operationName === 'get' || operationName === 'update'))
+                            throw new common_1.ResourceNotAvailableError(resource.name, request.key);
+                        // "findMany" endpoint should return array of entity instances
+                        if (operationName === 'findMany')
+                            value = (value == null ? [] : Array.isArray(value) ? value : [value]);
+                        else
+                            value = value == null ? {} : Array.isArray(value) ? value[0] : value;
+                    }
+                    value = endpoint.encodeReturning(value, { coerce: true });
                     response.value = value;
                     return;
                 }
             }
             if (response.value)
-                response.value = endpoint.encodeReturning(response.value, { coerce: true, partial: true });
+                response.value = endpoint.encodeReturning(response.value, { coerce: true });
         }
         catch (error) {
             response.errors.push(error);
@@ -589,17 +583,14 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             return;
         }
         let contentType = String(outgoing.getHeader('content-type') || '');
-        const returnType = endpoint.returnType;
+        let returnType = endpoint.returnType;
         if (endpoint.kind === 'action' && !contentType && endpoint.returnMime && response.value) {
             contentType = endpoint.returnMime;
             outgoing.setHeader('Content-Type', contentType);
         }
         // OperationResult response
-        if ((endpoint.kind === 'operation' &&
-            (resource instanceof common_1.Collection || resource instanceof common_1.Singleton ||
-                (resource instanceof common_1.Storage && endpoint.name !== 'get'))) ||
-            (endpoint.kind === 'action' &&
-                (!contentType || type_is_1.default.is(contentType, ['application/opra+json'])))) {
+        if ((returnType || endpoint.kind === 'operation') &&
+            !(resource instanceof common_1.Storage && endpoint.name === 'get')) {
             const incoming = context.switchToHttp().incoming;
             const apiUrl = new common_1.OpraURL(incoming.baseUrl, incoming.protocol + '://' + incoming.get('host')).toString();
             const body = new common_1.OperationResult({
@@ -607,40 +598,42 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 contextUrl: ''
             });
             const operationName = endpoint.kind === 'operation' ? endpoint.name : '';
-            if (operationName === 'delete' || operationName === 'deleteMany' ||
-                operationName === 'updateMany' || operationName === 'post')
+            if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
                 body.affected = response.value;
+                returnType = undefined;
+            }
             else {
-                outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCodes.OK;
+                outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCode.OK;
                 if (operationName === 'create')
                     outgoing.statusCode = 201;
-                if (operationName === 'update' || operationName === 'create')
+                if (operationName === 'update' || operationName === 'create') {
                     body.affected = response.value ? 1 : 0;
+                }
                 if (operationName === 'findMany') {
                     body.count = response.value.length;
                     body.totalMatches = response.totalMatches;
                 }
-                if (returnType) {
-                    if (response.value == null)
-                        throw new common_1.InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
-                    if (!returnType.isEmbedded) {
-                        const ns = this.api.getDataTypeNs(returnType);
-                        // const isOpraSpec = returnType.document.url?.startsWith('https://oprajs.com/spec/v1.0')
-                        body.type = (ns ? ns + ':' : '') + returnType.name;
-                        body.typeUrl =
-                            (ns
-                                ? new common_1.OpraURL('/#/types/' + returnType.name, returnType.document.url || 'http://tempuri.org').toString()
-                                : apiUrl + '/#/types/' + returnType.name);
-                    }
-                    else
-                        body.typeUrl = body.contextUrl + '/type';
-                    if (response.value instanceof common_1.OperationResult) {
-                        Object.assign(body, response.value);
-                    }
-                    else
-                        body.payload = response.value;
-                    body.payload = this.i18n.deep(body.payload);
+            }
+            if (returnType) {
+                if (response.value == null)
+                    throw new common_1.InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
+                if (!returnType.isEmbedded) {
+                    const ns = this.api.getDataTypeNs(returnType);
+                    // const isOpraSpec = returnType.document.url?.startsWith('https://oprajs.com/spec/v1.0')
+                    body.type = (ns ? ns + ':' : '') + returnType.name;
+                    body.typeUrl =
+                        (ns
+                            ? new common_1.OpraURL('/#/types/' + returnType.name, returnType.document.url || 'http://tempuri.org').toString()
+                            : apiUrl + '/#/types/' + returnType.name);
                 }
+                else
+                    body.typeUrl = body.contextUrl + '/type';
+                if (response.value instanceof common_1.OperationResult) {
+                    Object.assign(body, response.value);
+                }
+                else
+                    body.payload = response.value;
+                body.payload = this.i18n.deep(body.payload);
             }
             body.context = endpoint.getFullPath(false);
             body.contextUrl = apiUrl + '/#' + endpoint.getFullPath(true);
@@ -649,7 +642,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             outgoing.end();
             return;
         }
-        outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCodes.OK;
+        outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCode.OK;
         if (response.value != null) {
             if (typeof response.value === 'string') {
                 if (!contentType)
@@ -701,10 +694,10 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             return i;
         });
         let status = outgoing.statusCode || 0;
-        if (!status || status < Number(common_1.HttpStatusCodes.BAD_REQUEST)) {
+        if (!status || status < Number(common_1.HttpStatusCode.BAD_REQUEST)) {
             status = wrappedErrors[0].status;
-            if (status < Number(common_1.HttpStatusCodes.BAD_REQUEST))
-                status = common_1.HttpStatusCodes.INTERNAL_SERVER_ERROR;
+            if (status < Number(common_1.HttpStatusCode.BAD_REQUEST))
+                status = common_1.HttpStatusCode.INTERNAL_SERVER_ERROR;
         }
         outgoing.statusCode = status;
         const body = new common_1.OperationResult({

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

@@ -107,7 +107,7 @@ class HttpServerResponseHost {
         return this;
     }
     sendStatus(statusCode) {
-        const body = common_1.HttpStatusCodes[statusCode] || String(statusCode);
+        const body = common_1.HttpStatusCode[statusCode] || String(statusCode);
         this.statusCode = statusCode;
         this.contentType('txt');
         return this.send(body);

package/esm/http/adapters/node-http-adapter.host.js

@@ -1,5 +1,5 @@
 import http from 'http';
-import { HttpStatusCodes, HttpStatusMessages, OpraURL, OpraURLPath, } from '@opra/common';
+import { HttpStatusCode, HttpStatusMessages, OpraURL, OpraURLPath, } from '@opra/common';
 import { HttpAdapterHost } from '../http-adapter-host.js';
 import { HttpServerRequest } from '../http-server-request.js';
 import { HttpServerResponse } from '../http-server-response.js';
@@ -38,8 +38,8 @@ export class NodeHttpAdapterHost extends HttpAdapterHost {
         const parsedUrl = new OpraURL(originalUrl);
         const relativePath = OpraURLPath.relative(parsedUrl.path, this.basePath);
         if (!relativePath) {
-            serverResponse.statusCode = HttpStatusCodes.NOT_FOUND;
-            serverResponse.statusMessage = HttpStatusMessages[HttpStatusCodes.NOT_FOUND];
+            serverResponse.statusCode = HttpStatusCode.NOT_FOUND;
+            serverResponse.statusMessage = HttpStatusMessages[HttpStatusCode.NOT_FOUND];
             serverResponse.end();
             return;
         }

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

@@ -1,8 +1,7 @@
 import fs from 'fs/promises';
 import os from 'os';
 import { ValidationError } from 'valgen';
-import typeIs from '@browsery/type-is';
-import { BadRequestError, Collection, Container, HttpHeaderCodes, HttpStatusCodes, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, OperationResult, OpraException, OpraSchema, OpraURL, ResourceNotAvailableError, Singleton, Storage, translate, uid, wrapException } from '@opra/common';
+import { BadRequestError, Collection, Container, HttpHeaderCodes, HttpStatusCode, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, OperationResult, OpraException, OpraSchema, OpraURL, ResourceNotAvailableError, Singleton, Storage, translate, uid, wrapException } from '@opra/common';
 import { ExecutionContextHost } from '../execution-context.host.js';
 import { PlatformAdapterHost } from '../platform-adapter.host.js';
 import { RequestHost } from '../request.host.js';
@@ -532,14 +531,9 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 response.value = value;
             // Normalize response value
             if (endpoint.kind === 'operation') {
-                if (resource instanceof Storage && endpoint.name === 'post') {
-                    // Count file parts
-                    value = context.request.parts.items.reduce((n, item) => item.file ? n + 1 : n, 0);
-                }
                 if (resource instanceof Collection || resource instanceof Singleton || resource instanceof Storage) {
                     const operationName = endpoint.name;
-                    if (operationName === 'delete' || operationName === 'deleteMany' ||
-                        operationName === 'updateMany' || operationName === 'post') {
+                    if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
                         let affected = 0;
                         if (typeof value === 'number')
                             affected = value;
@@ -551,23 +545,23 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                         response.value = affected;
                         return;
                     }
-                    if (resource instanceof Storage)
-                        return;
-                    // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
-                    if (value == null && (operationName === 'get' || operationName === 'update'))
-                        throw new ResourceNotAvailableError(resource.name, request.key);
-                    // "findMany" endpoint should return array of entity instances
-                    if (operationName === 'findMany')
-                        value = (value == null ? [] : Array.isArray(value) ? value : [value]);
-                    else
-                        value = value == null ? {} : Array.isArray(value) ? value[0] : value;
-                    value = endpoint.encodeReturning(value, { coerce: true, partial: true });
+                    if (resource instanceof Collection || resource instanceof Singleton) {
+                        // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
+                        if (value == null && (operationName === 'get' || operationName === 'update'))
+                            throw new ResourceNotAvailableError(resource.name, request.key);
+                        // "findMany" endpoint should return array of entity instances
+                        if (operationName === 'findMany')
+                            value = (value == null ? [] : Array.isArray(value) ? value : [value]);
+                        else
+                            value = value == null ? {} : Array.isArray(value) ? value[0] : value;
+                    }
+                    value = endpoint.encodeReturning(value, { coerce: true });
                     response.value = value;
                     return;
                 }
             }
             if (response.value)
-                response.value = endpoint.encodeReturning(response.value, { coerce: true, partial: true });
+                response.value = endpoint.encodeReturning(response.value, { coerce: true });
         }
         catch (error) {
             response.errors.push(error);
@@ -585,17 +579,14 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             return;
         }
         let contentType = String(outgoing.getHeader('content-type') || '');
-        const returnType = endpoint.returnType;
+        let returnType = endpoint.returnType;
         if (endpoint.kind === 'action' && !contentType && endpoint.returnMime && response.value) {
             contentType = endpoint.returnMime;
             outgoing.setHeader('Content-Type', contentType);
         }
         // OperationResult response
-        if ((endpoint.kind === 'operation' &&
-            (resource instanceof Collection || resource instanceof Singleton ||
-                (resource instanceof Storage && endpoint.name !== 'get'))) ||
-            (endpoint.kind === 'action' &&
-                (!contentType || typeIs.is(contentType, ['application/opra+json'])))) {
+        if ((returnType || endpoint.kind === 'operation') &&
+            !(resource instanceof Storage && endpoint.name === 'get')) {
             const incoming = context.switchToHttp().incoming;
             const apiUrl = new OpraURL(incoming.baseUrl, incoming.protocol + '://' + incoming.get('host')).toString();
             const body = new OperationResult({
@@ -603,40 +594,42 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 contextUrl: ''
             });
             const operationName = endpoint.kind === 'operation' ? endpoint.name : '';
-            if (operationName === 'delete' || operationName === 'deleteMany' ||
-                operationName === 'updateMany' || operationName === 'post')
+            if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
                 body.affected = response.value;
+                returnType = undefined;
+            }
             else {
-                outgoing.statusCode = outgoing.statusCode || HttpStatusCodes.OK;
+                outgoing.statusCode = outgoing.statusCode || HttpStatusCode.OK;
                 if (operationName === 'create')
                     outgoing.statusCode = 201;
-                if (operationName === 'update' || operationName === 'create')
+                if (operationName === 'update' || operationName === 'create') {
                     body.affected = response.value ? 1 : 0;
+                }
                 if (operationName === 'findMany') {
                     body.count = response.value.length;
                     body.totalMatches = response.totalMatches;
                 }
-                if (returnType) {
-                    if (response.value == null)
-                        throw new InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
-                    if (!returnType.isEmbedded) {
-                        const ns = this.api.getDataTypeNs(returnType);
-                        // const isOpraSpec = returnType.document.url?.startsWith('https://oprajs.com/spec/v1.0')
-                        body.type = (ns ? ns + ':' : '') + returnType.name;
-                        body.typeUrl =
-                            (ns
-                                ? new OpraURL('/#/types/' + returnType.name, returnType.document.url || 'http://tempuri.org').toString()
-                                : apiUrl + '/#/types/' + returnType.name);
-                    }
-                    else
-                        body.typeUrl = body.contextUrl + '/type';
-                    if (response.value instanceof OperationResult) {
-                        Object.assign(body, response.value);
-                    }
-                    else
-                        body.payload = response.value;
-                    body.payload = this.i18n.deep(body.payload);
+            }
+            if (returnType) {
+                if (response.value == null)
+                    throw new InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
+                if (!returnType.isEmbedded) {
+                    const ns = this.api.getDataTypeNs(returnType);
+                    // const isOpraSpec = returnType.document.url?.startsWith('https://oprajs.com/spec/v1.0')
+                    body.type = (ns ? ns + ':' : '') + returnType.name;
+                    body.typeUrl =
+                        (ns
+                            ? new OpraURL('/#/types/' + returnType.name, returnType.document.url || 'http://tempuri.org').toString()
+                            : apiUrl + '/#/types/' + returnType.name);
                 }
+                else
+                    body.typeUrl = body.contextUrl + '/type';
+                if (response.value instanceof OperationResult) {
+                    Object.assign(body, response.value);
+                }
+                else
+                    body.payload = response.value;
+                body.payload = this.i18n.deep(body.payload);
             }
             body.context = endpoint.getFullPath(false);
             body.contextUrl = apiUrl + '/#' + endpoint.getFullPath(true);
@@ -645,7 +638,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             outgoing.end();
             return;
         }
-        outgoing.statusCode = outgoing.statusCode || HttpStatusCodes.OK;
+        outgoing.statusCode = outgoing.statusCode || HttpStatusCode.OK;
         if (response.value != null) {
             if (typeof response.value === 'string') {
                 if (!contentType)
@@ -697,10 +690,10 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             return i;
         });
         let status = outgoing.statusCode || 0;
-        if (!status || status < Number(HttpStatusCodes.BAD_REQUEST)) {
+        if (!status || status < Number(HttpStatusCode.BAD_REQUEST)) {
             status = wrappedErrors[0].status;
-            if (status < Number(HttpStatusCodes.BAD_REQUEST))
-                status = HttpStatusCodes.INTERNAL_SERVER_ERROR;
+            if (status < Number(HttpStatusCode.BAD_REQUEST))
+                status = HttpStatusCode.INTERNAL_SERVER_ERROR;
         }
         outgoing.statusCode = status;
         const body = new OperationResult({

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

@@ -11,7 +11,7 @@ import mime from 'mime-types';
 import path from 'path';
 import { toString } from 'putil-varhelpers';
 import vary from 'vary';
-import { HttpStatusCodes, isStream, mergePrototype } from '@opra/common';
+import { HttpStatusCode, isStream, mergePrototype } from '@opra/common';
 import { HttpOutgoingMessageHost } from './impl/http-outgoing-message.host.js';
 const charsetRegExp = /;\s*charset\s*=/;
 function isHttpIncomingMessage(v) {
@@ -103,7 +103,7 @@ class HttpServerResponseHost {
         return this;
     }
     sendStatus(statusCode) {
-        const body = HttpStatusCodes[statusCode] || String(statusCode);
+        const body = HttpStatusCode[statusCode] || String(statusCode);
         this.statusCode = statusCode;
         this.contentType('txt');
         return this.send(body);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.33.10",
+  "version": "0.33.13",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -29,7 +29,8 @@
   },
   "dependencies": {
     "@browsery/type-is": "^0.6.3",
-    "@opra/common": "^0.33.10",
+    "@opra/common": "^0.33.13",
+    "@types/formidable": "^3.4.5",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",
@@ -39,18 +40,18 @@
     "formidable": "^3.5.1",
     "fresh": "^0.5.2",
     "mime-types": "^2.1.35",
-    "power-tasks": "^1.7.2",
+    "power-tasks": "^1.7.3",
     "putil-isplainobject": "^1.1.5",
     "putil-varhelpers": "^1.6.5",
     "range-parser": "^1.2.1",
-    "strict-typed-events": "^2.3.2",
+    "strict-typed-events": "^2.3.3",
     "vary": "^1.1.2"
   },
   "peerDependencies": {
     "express": "^4.x.x || ^5.x.x"
   },
   "devDependencies": {
-    "@faker-js/faker": "^8.3.1",
+    "@faker-js/faker": "^8.4.0",
     "@types/accepts": "^1.3.7",
     "@types/content-disposition": "^0.5.8",
     "@types/content-type": "^1.1.8",
@@ -58,7 +59,6 @@
     "@types/cookie-signature": "^1.1.2",
     "@types/encodeurl": "^1.0.2",
     "@types/express": "^4.17.21",
-    "@types/formidable": "^3.4.5",
     "@types/fresh": "^0.5.2",
     "@types/mime-types": "^2.1.4",
     "@types/range-parser": "^1.2.7",
@@ -66,7 +66,7 @@
     "@types/vary": "^1.1.3",
     "crypto-browserify": "^3.12.0",
     "path-browserify": "^1.0.1",
-    "ts-gems": "^3.1.0"
+    "ts-gems": "^3.1.1"
   },
   "type": "module",
   "module": "./esm/index.js",