@opra/core 0.26.3 → 0.26.5

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

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpAdapterHost = void 0;
 const tslib_1 = require("tslib");
+const assert_1 = tslib_1.__importDefault(require("assert"));
 const promises_1 = tslib_1.__importDefault(require("fs/promises"));
 const os_1 = tslib_1.__importDefault(require("os"));
-const valgen = tslib_1.__importStar(require("valgen"));
+const vg = tslib_1.__importStar(require("valgen"));
 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");
@@ -102,7 +103,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
         catch (e) {
             if (e instanceof common_1.OpraException)
                 throw e;
-            if (e instanceof valgen.ValidationError) {
+            if (e instanceof vg.ValidationError) {
                 throw new common_1.InternalServerError({
                     message: (0, common_1.translate)('error:RESPONSE_VALIDATION,', 'Response validation failed'),
                     code: 'RESPONSE_VALIDATION',
@@ -120,7 +121,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
         let resource = this.api.root;
         let request;
         // Walk through container
-        while (resource instanceof common_1.Container) {
+        while (resource instanceof common_1.Container && i < parsedUrl.path.length) {
             p = parsedUrl.path[i];
             const r = resource.resources.get(p.resource);
             if (r) {
@@ -167,14 +168,12 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
     }
     async _parseRequestAction(executionContext, resource, urlPath, searchParams) {
         const p = urlPath[0];
-        const { controller, endpoint, handler } = await this.getOperationHandler(resource, p.resource);
+        const { controller, endpoint, handler } = await this.getActionHandler(resource, p.resource);
         const { incoming } = executionContext.switchToHttp();
         const contentId = incoming.headers['content-id'];
         const params = this.parseParameters(endpoint.parameters, p, searchParams);
         return new request_host_js_1.RequestHost({
             endpoint,
-            operation: 'action',
-            action: endpoint.name,
             controller,
             handler,
             http: incoming,
@@ -194,11 +193,10 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'create');
                     const jsonReader = (0, json_body_loader_js_1.jsonBodyLoader)({ limit: endpoint.inputMaxContentSize }, endpoint);
                     let data = await jsonReader(incoming);
-                    data = endpoint.decode(data, { coerce: true });
+                    data = endpoint.decodeInput(data, { coerce: true });
                     const params = this.parseParameters(endpoint.parameters, p, searchParams);
                     return new request_host_js_1.RequestHost({
                         endpoint,
-                        operation: 'create',
                         controller,
                         handler,
                         http: incoming,
@@ -220,7 +218,6 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     const params = this.parseParameters(endpoint.parameters, p, searchParams);
                     return new request_host_js_1.RequestHost({
                         endpoint,
-                        operation: 'delete',
                         controller,
                         handler,
                         http: incoming,
@@ -233,7 +230,6 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
-                    operation: 'deleteMany',
                     controller,
                     handler,
                     http: incoming,
@@ -250,7 +246,6 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     const params = this.parseParameters(endpoint.parameters, p, searchParams);
                     return new request_host_js_1.RequestHost({
                         endpoint,
-                        operation: 'get',
                         controller,
                         handler,
                         http: incoming,
@@ -268,7 +263,6 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
-                    operation: 'findMany',
                     controller,
                     handler,
                     http: incoming,
@@ -288,11 +282,10 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'update');
                     const jsonReader = (0, json_body_loader_js_1.jsonBodyLoader)({ limit: endpoint.inputMaxContentSize }, endpoint);
                     let data = await jsonReader(incoming);
-                    data = endpoint.decode(data, { coerce: true });
+                    data = endpoint.decodeInput(data, { coerce: true });
                     const params = this.parseParameters(endpoint.parameters, p, searchParams);
                     return new request_host_js_1.RequestHost({
                         endpoint,
-                        operation: 'update',
                         controller,
                         handler,
                         http: incoming,
@@ -310,11 +303,10 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'updateMany');
                 const jsonReader = (0, json_body_loader_js_1.jsonBodyLoader)({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
-                data = endpoint.decode(data, { coerce: true });
+                data = endpoint.decodeInput(data, { coerce: true });
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
-                    operation: 'updateMany',
                     controller,
                     handler,
                     http: incoming,
@@ -342,11 +334,10 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'create');
                 const jsonReader = (0, json_body_loader_js_1.jsonBodyLoader)({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
-                data = endpoint.decode(data, { coerce: true });
+                data = endpoint.decodeInput(data, { coerce: true });
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
-                    operation: 'create',
                     controller,
                     handler,
                     http: incoming,
@@ -365,7 +356,6 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
-                    operation: 'delete',
                     controller,
                     handler,
                     http: incoming,
@@ -378,7 +368,6 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
-                    operation: 'get',
                     controller,
                     handler,
                     http: incoming,
@@ -395,11 +384,10 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'update');
                 const jsonReader = (0, json_body_loader_js_1.jsonBodyLoader)({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
-                data = endpoint.decode(data, { coerce: true });
+                data = endpoint.decodeInput(data, { coerce: true });
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
-                    operation: 'update',
                     controller,
                     handler,
                     http: incoming,
@@ -428,7 +416,6 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
-                    operation: 'get',
                     controller,
                     handler,
                     http: incoming,
@@ -442,7 +429,6 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
-                    operation: 'delete',
                     controller,
                     handler,
                     http: incoming,
@@ -468,7 +454,6 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 });
                 return new request_host_js_1.RequestHost({
                     endpoint,
-                    operation: 'post',
                     controller,
                     handler,
                     http: incoming,
@@ -529,9 +514,12 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             value = await handler.call(request.controller, context);
             if (response.value == null)
                 response.value = value;
-            if (request.resource instanceof common_1.Collection || request.resource instanceof common_1.Singleton) {
-                const { operation } = request;
-                if (operation === 'delete' || operation === 'deleteMany' || operation === 'updateMany') {
+            // Normalize response value
+            if (request.endpoint.kind === 'operation' &&
+                (resource instanceof common_1.Collection || resource instanceof common_1.Singleton || resource instanceof common_1.Storage)) {
+                const { endpoint } = request;
+                const operationName = endpoint.name;
+                if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
                     let affected = 0;
                     if (typeof value === 'number')
                         affected = value;
@@ -539,21 +527,27 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                         affected = value ? 1 : 0;
                     if (typeof value === 'object')
                         affected = value.affected || value.affectedRows ||
-                            (operation === 'updateMany' ? value.updated : value.deleted);
+                            (operationName === 'updateMany' ? value.updated : value.deleted);
                     response.value = affected;
+                    return;
                 }
-                else {
-                    // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
-                    if (value == null && (request.operation === 'get' || request.operation === 'update'))
-                        throw new common_1.ResourceNotFoundError(resource.name, request.key);
-                    // "findMany" endpoint should return array of entity instances
-                    if (request.operation === 'findMany')
-                        value = value == null ? [] : Array.isArray(value) ? value : [value];
-                    else
-                        value = value == null ? {} : Array.isArray(value) ? value[0] : value;
-                    response.value = value;
-                }
+                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.ResourceNotFoundError(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;
             }
+            const { endpoint } = request;
+            if (response.value)
+                response.value = endpoint.encodeReturning(response.value, { coerce: true });
         }
         catch (error) {
             response.errors.push(error);
@@ -561,68 +555,62 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
     }
     async sendResponse(context) {
         const { request, response } = context;
+        const { endpoint, resource } = request;
         const outgoing = response.switchToHttp();
-        if (request.resource instanceof common_1.Storage) {
-            outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCodes.OK;
-            if (response.value != null) {
-                if (typeof response.value === 'string') {
-                    if (!outgoing.hasHeader('content-type'))
-                        outgoing.setHeader('content-type', 'text/plain');
-                    outgoing.send(response.value);
-                }
-                else if (Buffer.isBuffer(response.value) || (0, common_1.isReadable)(response.value)) {
-                    if (!outgoing.hasHeader('content-type'))
-                        outgoing.setHeader('content-type', 'application/octet-stream');
-                    outgoing.send(response.value);
-                }
-                else {
-                    outgoing.setHeader('content-type', 'application/json; charset=utf-8');
-                    outgoing.send(JSON.stringify(response.value));
-                }
+        if (endpoint.kind === 'operation' &&
+            (resource instanceof common_1.Collection || resource instanceof common_1.Singleton ||
+                (resource instanceof common_1.Storage && endpoint.name !== 'get'))) {
+            const returnType = endpoint.returnType;
+            const operationName = endpoint.name;
+            const body = {
+                context: resource.getFullPath(),
+                operation: operationName
+            };
+            if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
+                body.affected = response.value;
+            }
+            else {
+                if (!response.value)
+                    throw new common_1.InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
+                (0, assert_1.default)(returnType instanceof common_1.ComplexType);
+                body.type = returnType.name || '#anonymous';
+                body.data = this.i18n.deep(response.value);
+                if (operationName === 'create')
+                    outgoing.statusCode = 201;
+                if (operationName === 'create' || operationName === 'update')
+                    body.affected = 1;
+                else if (operationName === 'get' || operationName === 'update')
+                    body.key = request.key;
+                if (operationName === 'findMany' && response.count != null && response.count >= 0)
+                    body.totalCount = response.count;
             }
+            outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCodes.OK;
+            outgoing.setHeader(common_1.HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
+            outgoing.send(JSON.stringify(body));
             outgoing.end();
             return;
         }
-        const responseObject = {
-            context: request.resource.getFullPath()
-        };
-        if (request.operation === 'action')
-            responseObject.action = request.action;
-        else
-            responseObject.operation = request.operation;
-        const returnType = request.endpoint.returnType;
-        let responseValue = response.value;
-        if (returnType) {
-            responseObject.type = returnType.name || '#anonymous';
-            if (response.value != null)
-                responseValue = responseObject.data = request.endpoint.encode(response.value, { coerce: true });
-        }
-        if (request.operation === 'action') {
-            if (responseValue != null)
-                responseObject.data = responseValue;
+        // Storage "get" resource
+        if (endpoint.kind === 'action') {
+            //
         }
-        else if (request.resource instanceof common_1.Collection || request.resource instanceof common_1.Singleton) {
-            if (request.operation === 'delete' || request.operation === 'deleteMany' ||
-                request.operation === 'updateMany') {
-                responseObject.affected = responseValue || 0;
+        outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCodes.OK;
+        if (response.value != null) {
+            if (typeof response.value === 'string') {
+                if (!outgoing.hasHeader('content-type'))
+                    outgoing.setHeader('content-type', 'text/plain');
+                outgoing.send(response.value);
+            }
+            else if (Buffer.isBuffer(response.value) || (0, common_1.isReadable)(response.value)) {
+                if (!outgoing.hasHeader('content-type'))
+                    outgoing.setHeader('content-type', 'application/octet-stream');
+                outgoing.send(response.value);
             }
             else {
-                if (!responseValue)
-                    throw new common_1.InternalServerError(`"${request.operation}" endpoint should return value`);
-                if (request.operation === 'create')
-                    outgoing.statusCode = 201;
-                if (request.operation === 'create' || request.operation === 'update')
-                    responseObject.affected = 1;
-                else if (request.operation === 'get' || request.operation === 'update')
-                    responseObject.key = request.key;
-                if (request.operation === 'findMany' && response.count != null && response.count >= 0)
-                    responseObject.totalCount = response.count;
+                outgoing.setHeader('content-type', 'application/json; charset=utf-8');
+                outgoing.send(JSON.stringify(response.value));
             }
-            outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCodes.OK;
         }
-        const body = this.i18n.deep(responseObject);
-        outgoing.setHeader(common_1.HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
-        outgoing.send(JSON.stringify(body));
         outgoing.end();
     }
     async handleError(context) {

package/cjs/index.js

@@ -24,3 +24,4 @@ tslib_1.__exportStar(require("./interfaces/interceptor.interface.js"), exports);
 tslib_1.__exportStar(require("./interfaces/logger.interface.js"), exports);
 tslib_1.__exportStar(require("./interfaces/request-handler.interface.js"), exports);
 tslib_1.__exportStar(require("./services/logger.js"), exports);
+tslib_1.__exportStar(require("./services/api-service.js"), exports);

package/cjs/platform-adapter.host.js

@@ -102,20 +102,36 @@ class PlatformAdapterHost extends strict_typed_events_1.AsyncEventEmitter {
         }
         return controller;
     }
-    async getOperationHandler(resource, operationOrAction) {
+    async getActionHandler(resource, name) {
         resource = typeof resource === 'object' && resource instanceof common_1.Resource
             ? resource
             : this.api.getResource(resource);
         const controller = await this.getController(resource);
-        const endpoint = (resource instanceof common_1.CrudResource && resource.operations.get(operationOrAction)) ||
-            resource.actions.get(operationOrAction);
+        const endpoint = resource.actions.get(name);
+        if (endpoint) {
+            const handler = typeof controller[endpoint.name] === 'function' ? controller[endpoint.name] : undefined;
+            if (handler)
+                return { controller, endpoint, handler };
+        }
+        throw new common_1.BadRequestError({
+            message: (0, common_1.translate)('ACTION_NOT_FOUND', { resource: resource.name, action: name }, `The {{resource}} resource doesn't have an action named '{{action}}'`),
+            severity: 'error',
+            code: 'ACTION_NOT_FOUND'
+        });
+    }
+    async getOperationHandler(resource, name) {
+        resource = typeof resource === 'object' && resource instanceof common_1.Resource
+            ? resource
+            : this.api.getResource(resource);
+        const controller = await this.getController(resource);
+        const endpoint = resource instanceof common_1.CrudResource && resource.operations.get(name);
         if (endpoint) {
             const handler = typeof controller[endpoint.name] === 'function' ? controller[endpoint.name] : undefined;
             if (handler)
                 return { controller, endpoint, handler };
         }
         throw new common_1.ForbiddenError({
-            message: (0, common_1.translate)('OPERATION_FORBIDDEN', { resource: resource.name, endpoint: operationOrAction }, `'{{resource}}' does not accept '{{endpoint}}' operations`),
+            message: (0, common_1.translate)('OPERATION_FORBIDDEN', { resource: resource.name, operation: name }, `'The {{resource}} resource does not accept '{{operation}}' operations`),
             severity: 'error',
             code: 'OPERATION_FORBIDDEN'
         });

package/cjs/services/api-service.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiService = void 0;
+class ApiService {
+    get context() {
+        if (!this._context)
+            throw new Error(`No context assigned for ${Object.getPrototypeOf(this).name}`);
+        return this._context;
+    }
+    forContext(context) {
+        const instance = { context };
+        Object.setPrototypeOf(instance, this);
+        return instance;
+    }
+}
+exports.ApiService = ApiService;

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

@@ -1,7 +1,8 @@
+import assert from 'assert';
 import fs from 'fs/promises';
 import os from 'os';
-import * as valgen from 'valgen';
-import { BadRequestError, Collection, Container, HttpHeaderCodes, HttpStatusCodes, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, OpraException, OpraSchema, OpraURL, ResourceNotFoundError, Singleton, Storage, translate, uid, wrapException } from '@opra/common';
+import * as vg from 'valgen';
+import { BadRequestError, Collection, ComplexType, Container, HttpHeaderCodes, HttpStatusCodes, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, OpraException, OpraSchema, OpraURL, ResourceNotFoundError, 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';
@@ -98,7 +99,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
         catch (e) {
             if (e instanceof OpraException)
                 throw e;
-            if (e instanceof valgen.ValidationError) {
+            if (e instanceof vg.ValidationError) {
                 throw new InternalServerError({
                     message: translate('error:RESPONSE_VALIDATION,', 'Response validation failed'),
                     code: 'RESPONSE_VALIDATION',
@@ -116,7 +117,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
         let resource = this.api.root;
         let request;
         // Walk through container
-        while (resource instanceof Container) {
+        while (resource instanceof Container && i < parsedUrl.path.length) {
             p = parsedUrl.path[i];
             const r = resource.resources.get(p.resource);
             if (r) {
@@ -163,14 +164,12 @@ export class HttpAdapterHost extends PlatformAdapterHost {
     }
     async _parseRequestAction(executionContext, resource, urlPath, searchParams) {
         const p = urlPath[0];
-        const { controller, endpoint, handler } = await this.getOperationHandler(resource, p.resource);
+        const { controller, endpoint, handler } = await this.getActionHandler(resource, p.resource);
         const { incoming } = executionContext.switchToHttp();
         const contentId = incoming.headers['content-id'];
         const params = this.parseParameters(endpoint.parameters, p, searchParams);
         return new RequestHost({
             endpoint,
-            operation: 'action',
-            action: endpoint.name,
             controller,
             handler,
             http: incoming,
@@ -190,11 +189,10 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'create');
                     const jsonReader = jsonBodyLoader({ limit: endpoint.inputMaxContentSize }, endpoint);
                     let data = await jsonReader(incoming);
-                    data = endpoint.decode(data, { coerce: true });
+                    data = endpoint.decodeInput(data, { coerce: true });
                     const params = this.parseParameters(endpoint.parameters, p, searchParams);
                     return new RequestHost({
                         endpoint,
-                        operation: 'create',
                         controller,
                         handler,
                         http: incoming,
@@ -216,7 +214,6 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     const params = this.parseParameters(endpoint.parameters, p, searchParams);
                     return new RequestHost({
                         endpoint,
-                        operation: 'delete',
                         controller,
                         handler,
                         http: incoming,
@@ -229,7 +226,6 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new RequestHost({
                     endpoint,
-                    operation: 'deleteMany',
                     controller,
                     handler,
                     http: incoming,
@@ -246,7 +242,6 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     const params = this.parseParameters(endpoint.parameters, p, searchParams);
                     return new RequestHost({
                         endpoint,
-                        operation: 'get',
                         controller,
                         handler,
                         http: incoming,
@@ -264,7 +259,6 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new RequestHost({
                     endpoint,
-                    operation: 'findMany',
                     controller,
                     handler,
                     http: incoming,
@@ -284,11 +278,10 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'update');
                     const jsonReader = jsonBodyLoader({ limit: endpoint.inputMaxContentSize }, endpoint);
                     let data = await jsonReader(incoming);
-                    data = endpoint.decode(data, { coerce: true });
+                    data = endpoint.decodeInput(data, { coerce: true });
                     const params = this.parseParameters(endpoint.parameters, p, searchParams);
                     return new RequestHost({
                         endpoint,
-                        operation: 'update',
                         controller,
                         handler,
                         http: incoming,
@@ -306,11 +299,10 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'updateMany');
                 const jsonReader = jsonBodyLoader({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
-                data = endpoint.decode(data, { coerce: true });
+                data = endpoint.decodeInput(data, { coerce: true });
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new RequestHost({
                     endpoint,
-                    operation: 'updateMany',
                     controller,
                     handler,
                     http: incoming,
@@ -338,11 +330,10 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'create');
                 const jsonReader = jsonBodyLoader({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
-                data = endpoint.decode(data, { coerce: true });
+                data = endpoint.decodeInput(data, { coerce: true });
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new RequestHost({
                     endpoint,
-                    operation: 'create',
                     controller,
                     handler,
                     http: incoming,
@@ -361,7 +352,6 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new RequestHost({
                     endpoint,
-                    operation: 'delete',
                     controller,
                     handler,
                     http: incoming,
@@ -374,7 +364,6 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new RequestHost({
                     endpoint,
-                    operation: 'get',
                     controller,
                     handler,
                     http: incoming,
@@ -391,11 +380,10 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'update');
                 const jsonReader = jsonBodyLoader({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
-                data = endpoint.decode(data, { coerce: true });
+                data = endpoint.decodeInput(data, { coerce: true });
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new RequestHost({
                     endpoint,
-                    operation: 'update',
                     controller,
                     handler,
                     http: incoming,
@@ -424,7 +412,6 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new RequestHost({
                     endpoint,
-                    operation: 'get',
                     controller,
                     handler,
                     http: incoming,
@@ -438,7 +425,6 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const params = this.parseParameters(endpoint.parameters, p, searchParams);
                 return new RequestHost({
                     endpoint,
-                    operation: 'delete',
                     controller,
                     handler,
                     http: incoming,
@@ -464,7 +450,6 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 });
                 return new RequestHost({
                     endpoint,
-                    operation: 'post',
                     controller,
                     handler,
                     http: incoming,
@@ -525,9 +510,12 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             value = await handler.call(request.controller, context);
             if (response.value == null)
                 response.value = value;
-            if (request.resource instanceof Collection || request.resource instanceof Singleton) {
-                const { operation } = request;
-                if (operation === 'delete' || operation === 'deleteMany' || operation === 'updateMany') {
+            // Normalize response value
+            if (request.endpoint.kind === 'operation' &&
+                (resource instanceof Collection || resource instanceof Singleton || resource instanceof Storage)) {
+                const { endpoint } = request;
+                const operationName = endpoint.name;
+                if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
                     let affected = 0;
                     if (typeof value === 'number')
                         affected = value;
@@ -535,21 +523,27 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                         affected = value ? 1 : 0;
                     if (typeof value === 'object')
                         affected = value.affected || value.affectedRows ||
-                            (operation === 'updateMany' ? value.updated : value.deleted);
+                            (operationName === 'updateMany' ? value.updated : value.deleted);
                     response.value = affected;
+                    return;
                 }
-                else {
-                    // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
-                    if (value == null && (request.operation === 'get' || request.operation === 'update'))
-                        throw new ResourceNotFoundError(resource.name, request.key);
-                    // "findMany" endpoint should return array of entity instances
-                    if (request.operation === 'findMany')
-                        value = value == null ? [] : Array.isArray(value) ? value : [value];
-                    else
-                        value = value == null ? {} : Array.isArray(value) ? value[0] : value;
-                    response.value = value;
-                }
+                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 ResourceNotFoundError(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;
             }
+            const { endpoint } = request;
+            if (response.value)
+                response.value = endpoint.encodeReturning(response.value, { coerce: true });
         }
         catch (error) {
             response.errors.push(error);
@@ -557,68 +551,62 @@ export class HttpAdapterHost extends PlatformAdapterHost {
     }
     async sendResponse(context) {
         const { request, response } = context;
+        const { endpoint, resource } = request;
         const outgoing = response.switchToHttp();
-        if (request.resource instanceof Storage) {
-            outgoing.statusCode = outgoing.statusCode || HttpStatusCodes.OK;
-            if (response.value != null) {
-                if (typeof response.value === 'string') {
-                    if (!outgoing.hasHeader('content-type'))
-                        outgoing.setHeader('content-type', 'text/plain');
-                    outgoing.send(response.value);
-                }
-                else if (Buffer.isBuffer(response.value) || isReadable(response.value)) {
-                    if (!outgoing.hasHeader('content-type'))
-                        outgoing.setHeader('content-type', 'application/octet-stream');
-                    outgoing.send(response.value);
-                }
-                else {
-                    outgoing.setHeader('content-type', 'application/json; charset=utf-8');
-                    outgoing.send(JSON.stringify(response.value));
-                }
+        if (endpoint.kind === 'operation' &&
+            (resource instanceof Collection || resource instanceof Singleton ||
+                (resource instanceof Storage && endpoint.name !== 'get'))) {
+            const returnType = endpoint.returnType;
+            const operationName = endpoint.name;
+            const body = {
+                context: resource.getFullPath(),
+                operation: operationName
+            };
+            if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
+                body.affected = response.value;
+            }
+            else {
+                if (!response.value)
+                    throw new InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
+                assert(returnType instanceof ComplexType);
+                body.type = returnType.name || '#anonymous';
+                body.data = this.i18n.deep(response.value);
+                if (operationName === 'create')
+                    outgoing.statusCode = 201;
+                if (operationName === 'create' || operationName === 'update')
+                    body.affected = 1;
+                else if (operationName === 'get' || operationName === 'update')
+                    body.key = request.key;
+                if (operationName === 'findMany' && response.count != null && response.count >= 0)
+                    body.totalCount = response.count;
             }
+            outgoing.statusCode = outgoing.statusCode || HttpStatusCodes.OK;
+            outgoing.setHeader(HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
+            outgoing.send(JSON.stringify(body));
             outgoing.end();
             return;
         }
-        const responseObject = {
-            context: request.resource.getFullPath()
-        };
-        if (request.operation === 'action')
-            responseObject.action = request.action;
-        else
-            responseObject.operation = request.operation;
-        const returnType = request.endpoint.returnType;
-        let responseValue = response.value;
-        if (returnType) {
-            responseObject.type = returnType.name || '#anonymous';
-            if (response.value != null)
-                responseValue = responseObject.data = request.endpoint.encode(response.value, { coerce: true });
-        }
-        if (request.operation === 'action') {
-            if (responseValue != null)
-                responseObject.data = responseValue;
+        // Storage "get" resource
+        if (endpoint.kind === 'action') {
+            //
         }
-        else if (request.resource instanceof Collection || request.resource instanceof Singleton) {
-            if (request.operation === 'delete' || request.operation === 'deleteMany' ||
-                request.operation === 'updateMany') {
-                responseObject.affected = responseValue || 0;
+        outgoing.statusCode = outgoing.statusCode || HttpStatusCodes.OK;
+        if (response.value != null) {
+            if (typeof response.value === 'string') {
+                if (!outgoing.hasHeader('content-type'))
+                    outgoing.setHeader('content-type', 'text/plain');
+                outgoing.send(response.value);
+            }
+            else if (Buffer.isBuffer(response.value) || isReadable(response.value)) {
+                if (!outgoing.hasHeader('content-type'))
+                    outgoing.setHeader('content-type', 'application/octet-stream');
+                outgoing.send(response.value);
             }
             else {
-                if (!responseValue)
-                    throw new InternalServerError(`"${request.operation}" endpoint should return value`);
-                if (request.operation === 'create')
-                    outgoing.statusCode = 201;
-                if (request.operation === 'create' || request.operation === 'update')
-                    responseObject.affected = 1;
-                else if (request.operation === 'get' || request.operation === 'update')
-                    responseObject.key = request.key;
-                if (request.operation === 'findMany' && response.count != null && response.count >= 0)
-                    responseObject.totalCount = response.count;
+                outgoing.setHeader('content-type', 'application/json; charset=utf-8');
+                outgoing.send(JSON.stringify(response.value));
             }
-            outgoing.statusCode = outgoing.statusCode || HttpStatusCodes.OK;
         }
-        const body = this.i18n.deep(responseObject);
-        outgoing.setHeader(HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
-        outgoing.send(JSON.stringify(body));
         outgoing.end();
     }
     async handleError(context) {

package/esm/index.js

@@ -21,3 +21,4 @@ export * from './interfaces/interceptor.interface.js';
 export * from './interfaces/logger.interface.js';
 export * from './interfaces/request-handler.interface.js';
 export * from './services/logger.js';
+export * from './services/api-service.js';

package/esm/platform-adapter.host.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import { pascalCase } from 'putil-varhelpers';
 import { AsyncEventEmitter } from 'strict-typed-events';
-import { Container, CrudResource, ForbiddenError, getStackFileName, I18n, Resource, translate } from '@opra/common';
+import { BadRequestError, Container, CrudResource, ForbiddenError, getStackFileName, I18n, Resource, translate } from '@opra/common';
 import { Logger } from './services/logger.js';
 const resourceInitialized = Symbol.for('opra.resource.initialized');
 /**
@@ -98,20 +98,36 @@ export class PlatformAdapterHost extends AsyncEventEmitter {
         }
         return controller;
     }
-    async getOperationHandler(resource, operationOrAction) {
+    async getActionHandler(resource, name) {
         resource = typeof resource === 'object' && resource instanceof Resource
             ? resource
             : this.api.getResource(resource);
         const controller = await this.getController(resource);
-        const endpoint = (resource instanceof CrudResource && resource.operations.get(operationOrAction)) ||
-            resource.actions.get(operationOrAction);
+        const endpoint = resource.actions.get(name);
+        if (endpoint) {
+            const handler = typeof controller[endpoint.name] === 'function' ? controller[endpoint.name] : undefined;
+            if (handler)
+                return { controller, endpoint, handler };
+        }
+        throw new BadRequestError({
+            message: translate('ACTION_NOT_FOUND', { resource: resource.name, action: name }, `The {{resource}} resource doesn't have an action named '{{action}}'`),
+            severity: 'error',
+            code: 'ACTION_NOT_FOUND'
+        });
+    }
+    async getOperationHandler(resource, name) {
+        resource = typeof resource === 'object' && resource instanceof Resource
+            ? resource
+            : this.api.getResource(resource);
+        const controller = await this.getController(resource);
+        const endpoint = resource instanceof CrudResource && resource.operations.get(name);
         if (endpoint) {
             const handler = typeof controller[endpoint.name] === 'function' ? controller[endpoint.name] : undefined;
             if (handler)
                 return { controller, endpoint, handler };
         }
         throw new ForbiddenError({
-            message: translate('OPERATION_FORBIDDEN', { resource: resource.name, endpoint: operationOrAction }, `'{{resource}}' does not accept '{{endpoint}}' operations`),
+            message: translate('OPERATION_FORBIDDEN', { resource: resource.name, operation: name }, `'The {{resource}} resource does not accept '{{operation}}' operations`),
             severity: 'error',
             code: 'OPERATION_FORBIDDEN'
         });

package/esm/services/api-service.js

@@ -0,0 +1,12 @@
+export class ApiService {
+    get context() {
+        if (!this._context)
+            throw new Error(`No context assigned for ${Object.getPrototypeOf(this).name}`);
+        return this._context;
+    }
+    forContext(context) {
+        const instance = { context };
+        Object.setPrototypeOf(instance, this);
+        return instance;
+    }
+}

package/i18n/en/error.json

@@ -12,7 +12,8 @@
   "RESPONSE_VALIDATION": "Response validation failed",
   "RESOURCE_NOT_FOUND": "Resource not found",
   "RESOURCE_CONFLICT": "There is already an other {{resource}} resource with same field values ({{fields}})",
-  "OPERATION_FORBIDDEN": "The {{resource}} endpoint does not accept '{{endpoint}}' operations",
+  "OPERATION_FORBIDDEN": "The {{resource}} resource does not accept '{{operation}}' operations",
+  "ACTION_NOT_FOUND": "The {{resource}} resource doesn't have an action named '{{action}}'",
   "UNKNOWN_FIELD": "Unknown field '{{field}}'",
   "UNACCEPTED_SORT_FIELD": "Field '{{field}}' is not available for sort operation",
   "UNACCEPTED_FILTER_FIELD": "Field '{{field}}' is not available for filter operation",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.26.3",
+  "version": "0.26.5",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -27,14 +27,14 @@
     "clean:cover": "rimraf ../../coverage/core"
   },
   "dependencies": {
-    "@opra/common": "^0.26.3",
+    "@opra/common": "^0.26.5",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",
     "cookie": "^0.5.0",
     "cookie-signature": "^1.2.1",
     "encodeurl": "^1.0.2",
-    "formidable": "^3.5.0",
+    "formidable": "^3.5.1",
     "fresh": "^0.5.2",
     "mime-types": "^2.1.35",
     "power-tasks": "^1.7.2",
@@ -56,7 +56,7 @@
     "@types/cookie": "^0.5.2",
     "@types/cookie-signature": "^1.1.0",
     "@types/encodeurl": "^1.0.0",
-    "@types/express": "^4.17.18",
+    "@types/express": "^4.17.19",
     "@types/formidable": "^3.4.3",
     "@types/fresh": "^0.5.0",
     "@types/mime-types": "^2.1.2",
@@ -94,4 +94,4 @@
     "swagger",
     "raml"
   ]
-}
+}

package/types/augmentation/collection.augmentation.d.ts

@@ -1,19 +1,21 @@
-import type { PartialOutput } from '@opra/common';
+import { StrictOmit } from 'ts-gems';
+import type { Action as _Action, Operation as _Operation, PartialOutput } from '@opra/common';
 import type { Request as _Request } from '../request.js';
 import type { RequestContext } from '../request-context';
 declare module "@opra/common" {
     namespace Collection {
         namespace Action {
-            interface Request extends _Request {
-                operation: 'action';
-                action: string;
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Action;
             }
             interface Context extends Resource.Context {
             }
         }
         namespace Create {
-            interface Request extends _Request {
-                operation: 'create';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'create';
+                };
                 data: any;
                 params: {
                     pick?: string[];
@@ -27,8 +29,10 @@ declare module "@opra/common" {
             }
         }
         namespace Delete {
-            interface Request extends _Request {
-                operation: 'delete';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'delete';
+                };
                 key: any;
             }
             interface Context extends RequestContext {
@@ -36,8 +40,10 @@ declare module "@opra/common" {
             }
         }
         namespace DeleteMany {
-            interface Request extends _Request {
-                operation: 'deleteMany';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'deleteMany';
+                };
                 params: {
                     filter?: any;
                     [key: string]: any;
@@ -48,8 +54,10 @@ declare module "@opra/common" {
             }
         }
         namespace FindMany {
-            interface Request extends _Request {
-                operation: 'findMany';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'findMany';
+                };
                 params: {
                     filter?: any;
                     pick?: string[];
@@ -68,8 +76,10 @@ declare module "@opra/common" {
             }
         }
         namespace Get {
-            interface Request extends _Request {
-                operation: 'get';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'get';
+                };
                 key: any;
                 params: {
                     pick?: string[];
@@ -83,8 +93,10 @@ declare module "@opra/common" {
             }
         }
         namespace Update {
-            interface Request extends _Request {
-                operation: 'update';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'update';
+                };
                 key: any;
                 data: any;
                 params: {
@@ -99,8 +111,10 @@ declare module "@opra/common" {
             }
         }
         namespace UpdateMany {
-            interface Request extends _Request {
-                operation: 'updateMany';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'updateMany';
+                };
                 data: any;
                 params: {
                     filter?: any;

package/types/augmentation/container.augmentation.d.ts

@@ -1,10 +1,11 @@
+import { StrictOmit } from 'ts-gems';
+import { Action as _Action } from '@opra/common';
 import type { Request as _Request } from '../request.js';
 declare module "@opra/common" {
     namespace Container {
         namespace Action {
-            interface Request extends _Request {
-                operation: 'action';
-                action: string;
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Action;
             }
             interface Context extends Resource.Context {
             }

package/types/augmentation/singleton.augmentation.d.ts

@@ -1,19 +1,21 @@
-import type { PartialOutput } from '@opra/common';
+import { StrictOmit } from 'ts-gems';
+import type { Action as _Action, Operation as _Operation, PartialOutput } from '@opra/common';
 import type { Request as _Request } from '../request.js';
 import type { RequestContext } from '../request-context.js';
 declare module "@opra/common" {
     namespace Singleton {
         namespace Action {
-            interface Request extends _Request {
-                operation: 'action';
-                action: string;
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Action;
             }
             interface Context extends Resource.Context {
             }
         }
         namespace Create {
-            interface Request extends _Request {
-                operation: 'create';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'create';
+                };
                 data: any;
                 params: {
                     pick?: string[];
@@ -26,16 +28,20 @@ declare module "@opra/common" {
             }
         }
         namespace Delete {
-            interface Request extends _Request {
-                operation: 'delete';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'delete';
+                };
             }
             interface Context extends RequestContext {
                 request: Request;
             }
         }
         namespace Get {
-            interface Request extends _Request {
-                operation: 'get';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'get';
+                };
                 params: {
                     pick?: string[];
                     omit?: string[];
@@ -47,8 +53,10 @@ declare module "@opra/common" {
             }
         }
         namespace Update {
-            interface Request extends _Request {
-                operation: 'update';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'update';
+                };
                 data: any;
                 params: {
                     pick?: string[];

package/types/augmentation/storage.augmentation.d.ts

@@ -1,19 +1,22 @@
+import { StrictOmit } from 'ts-gems';
+import type { Action as _Action, Operation as _Operation } from '@opra/common';
 import type { MultipartIterator } from '../http/helpers/multipart-helper';
 import type { Request as _Request } from '../request.js';
 import type { RequestContext } from '../request-context.js';
 declare module "@opra/common" {
     namespace Storage {
         namespace Action {
-            interface Request extends _Request {
-                operation: 'action';
-                action: string;
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Action;
             }
             interface Context extends Resource.Context {
             }
         }
         namespace Delete {
-            interface Request extends _Request {
-                operation: 'delete';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'delete';
+                };
                 path?: string;
             }
             interface Context extends RequestContext {
@@ -21,8 +24,10 @@ declare module "@opra/common" {
             }
         }
         namespace Get {
-            interface Request extends _Request {
-                operation: 'get';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'get';
+                };
                 path?: string;
             }
             interface Context extends RequestContext {
@@ -30,8 +35,10 @@ declare module "@opra/common" {
             }
         }
         namespace Post {
-            interface Request extends _Request {
-                operation: 'post';
+            interface Request extends StrictOmit<_Request, 'endpoint'> {
+                endpoint: _Operation & {
+                    name: 'post';
+                };
                 path?: string;
                 parts: MultipartIterator;
             }

package/types/index.d.ts

@@ -21,3 +21,4 @@ export * from './interfaces/interceptor.interface.js';
 export * from './interfaces/logger.interface.js';
 export * from './interfaces/request-handler.interface.js';
 export * from './services/logger.js';
+export * from './services/api-service.js';

package/types/platform-adapter.host.d.ts

@@ -1,5 +1,5 @@
 import { AsyncEventEmitter } from 'strict-typed-events';
-import { ApiDocument, Endpoint, I18n, Resource } from '@opra/common';
+import { Action, ApiDocument, I18n, Operation, Resource } from '@opra/common';
 import { ExecutionContext } from './execution-context.js';
 import { Interceptor } from './interfaces/interceptor.interface.js';
 import type { PlatformAdapter, Protocol } from './platform-adapter.js';
@@ -27,8 +27,13 @@ export declare abstract class PlatformAdapterHost extends AsyncEventEmitter impl
      */
     protected init(api: ApiDocument, options?: PlatformAdapter.Options): Promise<void>;
     getController(resource: Resource | string): Promise<any>;
-    getOperationHandler(resource: Resource | string, operationOrAction: string): Promise<{
-        endpoint: Endpoint;
+    getActionHandler(resource: Resource | string, name: string): Promise<{
+        endpoint: Action;
+        controller: any;
+        handler: Function;
+    }>;
+    getOperationHandler(resource: Resource | string, name: string): Promise<{
+        endpoint: Operation;
         controller: any;
         handler: Function;
     }>;

package/types/request.d.ts

@@ -1,11 +1,9 @@
-import { Endpoint, Resource } from '@opra/common';
+import { Action, Operation, Resource } from '@opra/common';
 import { HttpServerRequest } from './http/http-server-request.js';
 export interface Request {
     resource: Resource;
-    endpoint: Endpoint;
-    operation: string;
+    endpoint: Action | Operation;
     key?: any;
-    action?: string;
     controller: Object;
     handler: Function;
     contentId?: string;

package/types/request.host.d.ts

@@ -1,5 +1,6 @@
 import type { PartialSome, StrictOmit } from 'ts-gems';
 import type { Resource } from '@opra/common';
+import { Action, Operation } from '@opra/common';
 import type { HttpServerRequest } from './http/http-server-request.js';
 import type { Request } from './request.js';
 export declare namespace RequestHost {
@@ -14,6 +15,7 @@ export interface RequestHost extends Request {
 }
 export declare class RequestHost implements Request {
     controller: any;
+    endpoint: Action | Operation;
     http?: HttpServerRequest;
     key?: any;
     params: Record<string, any>;

package/types/services/api-service.d.ts

@@ -0,0 +1,6 @@
+import { RequestContext } from '../request-context.js';
+export declare abstract class ApiService {
+    protected _context: RequestContext;
+    get context(): RequestContext;
+    forContext(context: RequestContext): typeof this;
+}