@opra/core 0.15.0 → 0.16.1

package/cjs/adapter/adapter.js

@@ -3,13 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraAdapter = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
+const strict_typed_events_1 = require("strict-typed-events");
 const common_1 = require("@opra/common");
 const metadata_resource_js_1 = require("./internal/metadata.resource.js");
 /**
  * @class OpraAdapter
  */
-class OpraAdapter {
+class OpraAdapter extends strict_typed_events_1.AsyncEventEmitter {
     constructor(api) {
+        super();
         this.api = api;
     }
     /**
@@ -28,6 +30,8 @@ class OpraAdapter {
         this.i18n = this.i18n || common_1.I18n.defaultInstance;
         if (!this.i18n.isInitialized)
             await this.i18n.init();
+        if (options?.onRequest)
+            this.on('request', options.onRequest);
         this._internalDoc = await common_1.DocumentFactory.createDocument({
             version: common_1.OpraSchema.SpecVersion,
             info: {
@@ -58,6 +62,7 @@ class OpraAdapter {
         await Promise.allSettled(promises);
     }
     async executeRequest(context) {
+        await this.emitAsync('request', context);
         const { request, response } = context;
         const { resource, operation } = request;
         if (resource instanceof common_1.Collection || resource instanceof common_1.Singleton) {
@@ -69,36 +74,33 @@ class OpraAdapter {
                     code: 'RESOLVER_FORBIDDEN'
                 });
             const value = await endpoint.handler(context);
+            // if (value == null)
             if (value != null)
                 response.value = value;
-            await this.afterExecuteRequest(context);
+            const { crud, many } = request;
+            if (crud === 'delete' || (crud === 'update' && many)) {
+                let affected = 0;
+                if (typeof response.value === 'number')
+                    affected = response.value;
+                if (typeof response.value === 'boolean')
+                    affected = response.value ? 1 : 0;
+                if (typeof response.value === 'object')
+                    affected = response.value.affectedRows || response.value.affected;
+                response.value = {
+                    operation: request.operation,
+                    affected
+                };
+            }
+            else if (response.value != null) {
+                if (!request.many)
+                    response.value = Array.isArray(response.value) ? response.value[0] : response.value;
+                else
+                    response.value = Array.isArray(response.value) ? response.value : [response.value];
+            }
+            if ((request.operation === 'get' || request.operation === 'update') && response.value == null)
+                throw new common_1.ResourceNotFoundError(resource.name, request.args.key);
         }
     }
-    async afterExecuteRequest(context) {
-        const { request, response } = context;
-        const { resource, crud, many } = request;
-        if (crud === 'delete' || (crud === 'update' && many)) {
-            let affected = 0;
-            if (typeof response.value === 'number')
-                affected = response.value;
-            if (typeof response.value === 'boolean')
-                affected = response.value ? 1 : 0;
-            if (typeof response.value === 'object')
-                affected = response.value.affectedRows || response.value.affected;
-            response.value = {
-                operation: request.operation,
-                affected
-            };
-        }
-        else if (response.value != null) {
-            if (!request.many)
-                response.value = Array.isArray(response.value) ? response.value[0] : response.value;
-            else
-                response.value = Array.isArray(response.value) ? response.value : [response.value];
-        }
-        if ((request.operation === 'get' || request.operation === 'update') && response.value == null)
-            throw new common_1.ResourceNotFoundError(resource.name, request.args.key);
-    }
     async _createI18n(options) {
         const opts = {
             ...options,

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

@@ -31,7 +31,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                 const task = new power_tasks_1.Task(async () => {
                     try {
                         await this.executeRequest(context);
-                        if (request.operation === 'search' && request.args.count && response.count != null) {
+                        if (request.operation === 'findMany' && request.args.count && response.count != null) {
                             response.switchToHttp().header(common_1.HttpHeaderCodes.X_Opra_Total_Matches, String(response.count));
                         }
                     }
@@ -47,6 +47,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                     this.logger?.error?.(e);
                     outgoing.sendStatus(500);
                 });
+                await this.emitAsync('request-finish', context);
                 return;
             }
             throw new common_1.BadRequestError({ message: 'Unsupported Content-Type' });
@@ -93,8 +94,8 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
             return;
         logFn.apply(this.logger, [String(message), ...optionalParams]);
     }
-    async afterExecuteRequest(context) {
-        await super.afterExecuteRequest(context);
+    async executeRequest(context) {
+        await super.executeRequest(context);
         const { request } = context;
         const response = context.response;
         const { crud } = request;
@@ -212,9 +213,9 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                             }, incoming);
                         }
                         return new http_request_host_js_1.HttpRequestHost({
-                            kind: 'CollectionSearchRequest',
+                            kind: 'CollectionFindManyRequest',
                             resource,
-                            operation: 'search',
+                            operation: 'findMany',
                             crud: 'read',
                             many: true,
                             args: {

package/cjs/adapter/internal/metadata.resource.js

@@ -13,7 +13,7 @@ let MetadataResource = class MetadataResource {
     }
 };
 tslib_1.__decorate([
-    common_1.Singleton.GetOperation(),
+    common_1.Singleton.Get(),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", []),
     tslib_1.__metadata("design:returntype", void 0)

package/esm/adapter/adapter.js

@@ -1,11 +1,17 @@
-import path from 'path';
-import { Collection, DocumentFactory, ForbiddenError, getStackFileName, I18n, OpraSchema, ResourceNotFoundError, Singleton, translate, } from '@opra/common';
-import { MetadataResource } from './internal/metadata.resource.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpraAdapter = void 0;
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const strict_typed_events_1 = require("strict-typed-events");
+const common_1 = require("@opra/common");
+const metadata_resource_js_1 = require("./internal/metadata.resource.js");
 /**
  * @class OpraAdapter
  */
-export class OpraAdapter {
+class OpraAdapter extends strict_typed_events_1.AsyncEventEmitter {
     constructor(api) {
+        super();
         this.api = api;
     }
     /**
@@ -15,23 +21,25 @@ export class OpraAdapter {
      */
     async init(options) {
         this.logger = options?.logger;
-        if (options?.i18n instanceof I18n)
+        if (options?.i18n instanceof common_1.I18n)
             this.i18n = options.i18n;
         else if (typeof options?.i18n === 'function')
             this.i18n = await options.i18n();
         else
             this.i18n = await this._createI18n(options?.i18n);
-        this.i18n = this.i18n || I18n.defaultInstance;
+        this.i18n = this.i18n || common_1.I18n.defaultInstance;
         if (!this.i18n.isInitialized)
             await this.i18n.init();
-        this._internalDoc = await DocumentFactory.createDocument({
-            version: OpraSchema.SpecVersion,
+        if (options?.onRequest)
+            this.on('request', options.onRequest);
+        this._internalDoc = await common_1.DocumentFactory.createDocument({
+            version: common_1.OpraSchema.SpecVersion,
             info: {
-                version: OpraSchema.SpecVersion,
+                version: common_1.OpraSchema.SpecVersion,
                 title: 'Internal resources',
             },
             references: { 'api': this.api },
-            resources: [new MetadataResource(this.api)]
+            resources: [new metadata_resource_js_1.MetadataResource(this.api)]
         });
         const promises = [];
         for (const r of this.api.resources.values()) {
@@ -54,58 +62,57 @@ export class OpraAdapter {
         await Promise.allSettled(promises);
     }
     async executeRequest(context) {
+        await this.emitAsync('request', context);
         const { request, response } = context;
         const { resource, operation } = request;
-        if (resource instanceof Collection || resource instanceof Singleton) {
+        if (resource instanceof common_1.Collection || resource instanceof common_1.Singleton) {
             const endpoint = resource.operations[operation];
             if (!endpoint?.handler)
-                throw new ForbiddenError({
-                    message: translate('RESOLVER_FORBIDDEN', { operation }, `The resource endpoint does not accept '{{operation}}' operations`),
+                throw new common_1.ForbiddenError({
+                    message: (0, common_1.translate)('RESOLVER_FORBIDDEN', { operation }, `The resource endpoint does not accept '{{operation}}' operations`),
                     severity: 'error',
                     code: 'RESOLVER_FORBIDDEN'
                 });
             const value = await endpoint.handler(context);
+            // if (value == null)
             if (value != null)
                 response.value = value;
-            await this.afterExecuteRequest(context);
+            const { crud, many } = request;
+            if (crud === 'delete' || (crud === 'update' && many)) {
+                let affected = 0;
+                if (typeof response.value === 'number')
+                    affected = response.value;
+                if (typeof response.value === 'boolean')
+                    affected = response.value ? 1 : 0;
+                if (typeof response.value === 'object')
+                    affected = response.value.affectedRows || response.value.affected;
+                response.value = {
+                    operation: request.operation,
+                    affected
+                };
+            }
+            else if (response.value != null) {
+                if (!request.many)
+                    response.value = Array.isArray(response.value) ? response.value[0] : response.value;
+                else
+                    response.value = Array.isArray(response.value) ? response.value : [response.value];
+            }
+            if ((request.operation === 'get' || request.operation === 'update') && response.value == null)
+                throw new common_1.ResourceNotFoundError(resource.name, request.args.key);
         }
     }
-    async afterExecuteRequest(context) {
-        const { request, response } = context;
-        const { resource, crud, many } = request;
-        if (crud === 'delete' || (crud === 'update' && many)) {
-            let affected = 0;
-            if (typeof response.value === 'number')
-                affected = response.value;
-            if (typeof response.value === 'boolean')
-                affected = response.value ? 1 : 0;
-            if (typeof response.value === 'object')
-                affected = response.value.affectedRows || response.value.affected;
-            response.value = {
-                operation: request.operation,
-                affected
-            };
-        }
-        else if (response.value != null) {
-            if (!request.many)
-                response.value = Array.isArray(response.value) ? response.value[0] : response.value;
-            else
-                response.value = Array.isArray(response.value) ? response.value : [response.value];
-        }
-        if ((request.operation === 'get' || request.operation === 'update') && response.value == null)
-            throw new ResourceNotFoundError(resource.name, request.args.key);
-    }
     async _createI18n(options) {
         const opts = {
             ...options,
         };
         delete opts.resourceDirs;
-        const instance = I18n.createInstance(opts);
+        const instance = common_1.I18n.createInstance(opts);
         await instance.init();
-        await instance.loadResourceDir(path.resolve(getStackFileName(), '../../../i18n'));
+        await instance.loadResourceDir(path_1.default.resolve((0, common_1.getStackFileName)(), '../../../i18n'));
         if (options?.resourceDirs)
             for (const dir of options.resourceDirs)
                 await instance.loadResourceDir(dir);
         return instance;
     }
 }
+exports.OpraAdapter = OpraAdapter;

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

@@ -1,8 +1,12 @@
-import bodyParser from 'body-parser';
-import { normalizePath } from '@opra/common';
-import { OpraHttpAdapter } from './http-adapter.js';
+"use strict";
+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;
-export class OpraExpressAdapter extends OpraHttpAdapter {
+class OpraExpressAdapter extends http_adapter_js_1.OpraHttpAdapter {
     constructor() {
         super(...arguments);
         this.platform = 'express';
@@ -10,8 +14,8 @@ export class OpraExpressAdapter extends OpraHttpAdapter {
     static async create(app, document, options) {
         const adapter = new OpraExpressAdapter(document);
         await adapter.init(options);
-        const prefix = '/' + normalizePath(options?.prefix, true);
-        app.use(prefix, bodyParser.json());
+        const prefix = '/' + (0, common_1.normalizePath)(options?.prefix, true);
+        app.use(prefix, body_parser_1.default.json());
         app.use(prefix, (req, res, next) => {
             req.end = noOp;
             req.send = noOp;
@@ -20,3 +24,4 @@ export class OpraExpressAdapter extends OpraHttpAdapter {
         return adapter;
     }
 }
+exports.OpraExpressAdapter = OpraExpressAdapter;

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

@@ -1,14 +1,17 @@
-import { Task } from 'power-tasks';
-import { BadRequestError, Collection, HttpHeaderCodes, HttpStatusCodes, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, OpraException, OpraSchema, OpraURL, Singleton, wrapException } from '@opra/common';
-import { OpraAdapter } from '../adapter.js';
-import { HttpRequestHost } from './http-request.host.js';
-import { HttpRequestContextHost } from './http-request-context.host.js';
-import { HttpResponseHost } from './http-response.host.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpraHttpAdapter = void 0;
+const power_tasks_1 = require("power-tasks");
+const common_1 = require("@opra/common");
+const adapter_js_1 = require("../adapter.js");
+const http_request_host_js_1 = require("./http-request.host.js");
+const http_request_context_host_js_1 = require("./http-request-context.host.js");
+const http_response_host_js_1 = require("./http-response.host.js");
 /**
  *
  * @class OpraHttpAdapter
  */
-export class OpraHttpAdapter extends OpraAdapter {
+class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
     /**
      * Main http request handler
      * @param incoming
@@ -19,17 +22,17 @@ export class OpraHttpAdapter extends OpraAdapter {
         try {
             // Batch
             if (incoming.is('multipart/mixed')) {
-                throw new BadRequestError({ message: 'Not implemented yet' });
+                throw new common_1.BadRequestError({ message: 'Not implemented yet' });
             }
             if (!(incoming.method === 'POST' || incoming.method === 'PATCH') || incoming.is('json')) {
                 const request = await this.parseRequest(incoming);
-                const response = new HttpResponseHost({}, outgoing);
-                const context = new HttpRequestContextHost(this.platform, this.api, request, response);
-                const task = new Task(async () => {
+                const response = new http_response_host_js_1.HttpResponseHost({}, outgoing);
+                const context = new http_request_context_host_js_1.HttpRequestContextHost(this.platform, this.api, request, response);
+                const task = new power_tasks_1.Task(async () => {
                     try {
                         await this.executeRequest(context);
-                        if (request.operation === 'search' && request.args.count && response.count != null) {
-                            response.switchToHttp().header(HttpHeaderCodes.X_Opra_Total_Matches, String(response.count));
+                        if (request.operation === 'findMany' && request.args.count && response.count != null) {
+                            response.switchToHttp().header(common_1.HttpHeaderCodes.X_Opra_Total_Matches, String(response.count));
                         }
                     }
                     catch (error) {
@@ -44,9 +47,10 @@ export class OpraHttpAdapter extends OpraAdapter {
                     this.logger?.error?.(e);
                     outgoing.sendStatus(500);
                 });
+                await this.emitAsync('request-finish', context);
                 return;
             }
-            throw new BadRequestError({ message: 'Unsupported Content-Type' });
+            throw new common_1.BadRequestError({ message: 'Unsupported Content-Type' });
         }
         catch (error) {
             await this.errorHandler(incoming, outgoing, [error]);
@@ -54,30 +58,30 @@ export class OpraHttpAdapter extends OpraAdapter {
     }
     async errorHandler(incoming, outgoing, errors) {
         errors.forEach(e => {
-            this.log((e instanceof OpraException) ? 'error' : 'fatal', incoming, e); // todo. implement a better logger
+            this.log((e instanceof common_1.OpraException) ? 'error' : 'fatal', incoming, e); // todo. implement a better logger
         });
-        errors = errors.map(wrapException);
+        errors = errors.map(common_1.wrapException);
         let status = outgoing.statusCode || 0;
         // Sort errors from fatal to info
         errors.sort((a, b) => {
-            const i = IssueSeverity.Keys.indexOf(a.issue.severity) - IssueSeverity.Keys.indexOf(b.issue.severity);
+            const i = common_1.IssueSeverity.Keys.indexOf(a.issue.severity) - common_1.IssueSeverity.Keys.indexOf(b.issue.severity);
             if (i === 0)
                 return b.status - a.status;
             return i;
         });
-        if (!status || status < HttpStatusCodes.BAD_REQUEST) {
+        if (!status || status < common_1.HttpStatusCodes.BAD_REQUEST) {
             status = errors[0].status;
-            if (status < HttpStatusCodes.BAD_REQUEST)
-                status = HttpStatusCodes.INTERNAL_SERVER_ERROR;
+            if (status < common_1.HttpStatusCodes.BAD_REQUEST)
+                status = common_1.HttpStatusCodes.INTERNAL_SERVER_ERROR;
         }
         const body = this.i18n.deep({
             errors: errors.map(e => e.issue)
         });
-        outgoing.set(HttpHeaderCodes.Content_Type, 'application/json; charset=utf-8');
-        outgoing.set(HttpHeaderCodes.Cache_Control, 'no-cache');
-        outgoing.set(HttpHeaderCodes.Pragma, 'no-cache');
-        outgoing.set(HttpHeaderCodes.Expires, '-1');
-        outgoing.set(HttpHeaderCodes.X_Opra_Version, OpraSchema.SpecVersion);
+        outgoing.set(common_1.HttpHeaderCodes.Content_Type, 'application/json; charset=utf-8');
+        outgoing.set(common_1.HttpHeaderCodes.Cache_Control, 'no-cache');
+        outgoing.set(common_1.HttpHeaderCodes.Pragma, 'no-cache');
+        outgoing.set(common_1.HttpHeaderCodes.Expires, '-1');
+        outgoing.set(common_1.HttpHeaderCodes.X_Opra_Version, common_1.OpraSchema.SpecVersion);
         outgoing.status(status);
         outgoing.send(JSON.stringify(body));
         outgoing.end();
@@ -90,19 +94,19 @@ export class OpraHttpAdapter extends OpraAdapter {
             return;
         logFn.apply(this.logger, [String(message), ...optionalParams]);
     }
-    async afterExecuteRequest(context) {
-        await super.afterExecuteRequest(context);
+    async executeRequest(context) {
+        await super.executeRequest(context);
         const { request } = context;
         const response = context.response;
         const { crud } = request;
         const httpResponse = response.switchToHttp();
-        if (request.resource instanceof Singleton || request.resource instanceof Collection) {
-            httpResponse.set(HttpHeaderCodes.X_Opra_Data_Type, request.resource.type.name);
-            httpResponse.set(HttpHeaderCodes.X_Opra_Operation, request.operation);
+        if (request.resource instanceof common_1.Singleton || request.resource instanceof common_1.Collection) {
+            httpResponse.set(common_1.HttpHeaderCodes.X_Opra_Data_Type, request.resource.type.name);
+            httpResponse.set(common_1.HttpHeaderCodes.X_Opra_Operation, request.operation);
         }
         if (crud === 'create') {
             if (!response.value)
-                throw new InternalServerError();
+                throw new common_1.InternalServerError();
             // todo validate
             httpResponse.status(201);
         }
@@ -114,7 +118,7 @@ export class OpraHttpAdapter extends OpraAdapter {
      */
     async parseRequest(incoming) {
         try {
-            const url = new OpraURL();
+            const url = new common_1.OpraURL();
             url.searchParams.define({
                 '$pick': { codec: 'string', array: true },
                 '$omit': { codec: 'string', array: true },
@@ -129,10 +133,10 @@ export class OpraHttpAdapter extends OpraAdapter {
             url.parse(incoming.url);
             // const {context, url, method, headers, body, contentId} = args;
             if (!url.path.size)
-                throw new BadRequestError();
+                throw new common_1.BadRequestError();
             const method = incoming.method;
             if (method !== 'GET' && url.path.size > 1)
-                throw new BadRequestError();
+                throw new common_1.BadRequestError();
             // const pathLen = url.path.size;
             // let pathIndex = 0;
             const params = url.searchParams;
@@ -148,11 +152,11 @@ export class OpraHttpAdapter extends OpraAdapter {
             /*
              * Collection
              */
-            if (resource instanceof Collection) {
+            if (resource instanceof common_1.Collection) {
                 switch (method) {
                     case 'POST': {
                         if (!p.key) {
-                            return new HttpRequestHost({
+                            return new http_request_host_js_1.HttpRequestHost({
                                 kind: 'CollectionCreateRequest',
                                 resource,
                                 operation: 'create',
@@ -170,7 +174,7 @@ export class OpraHttpAdapter extends OpraAdapter {
                     }
                     case 'DELETE': {
                         if (p.key) {
-                            return new HttpRequestHost({
+                            return new http_request_host_js_1.HttpRequestHost({
                                 kind: 'CollectionDeleteRequest',
                                 resource,
                                 operation: 'delete',
@@ -181,7 +185,7 @@ export class OpraHttpAdapter extends OpraAdapter {
                                 }
                             }, incoming);
                         }
-                        return new HttpRequestHost({
+                        return new http_request_host_js_1.HttpRequestHost({
                             kind: 'CollectionDeleteManyRequest',
                             resource,
                             operation: 'deleteMany',
@@ -194,7 +198,7 @@ export class OpraHttpAdapter extends OpraAdapter {
                     }
                     case 'GET': {
                         if (p.key) {
-                            return new HttpRequestHost({
+                            return new http_request_host_js_1.HttpRequestHost({
                                 kind: 'CollectionGetRequest',
                                 resource,
                                 operation: 'get',
@@ -208,10 +212,10 @@ export class OpraHttpAdapter extends OpraAdapter {
                                 }
                             }, incoming);
                         }
-                        return new HttpRequestHost({
-                            kind: 'CollectionSearchRequest',
+                        return new http_request_host_js_1.HttpRequestHost({
+                            kind: 'CollectionFindManyRequest',
                             resource,
-                            operation: 'search',
+                            operation: 'findMany',
                             crud: 'read',
                             many: true,
                             args: {
@@ -229,7 +233,7 @@ export class OpraHttpAdapter extends OpraAdapter {
                     }
                     case 'PATCH': {
                         if (p.key) {
-                            return new HttpRequestHost({
+                            return new http_request_host_js_1.HttpRequestHost({
                                 kind: 'CollectionUpdateRequest',
                                 resource,
                                 operation: 'update',
@@ -244,7 +248,7 @@ export class OpraHttpAdapter extends OpraAdapter {
                                 }
                             }, incoming);
                         }
-                        return new HttpRequestHost({
+                        return new http_request_host_js_1.HttpRequestHost({
                             kind: 'CollectionUpdateManyRequest',
                             resource,
                             operation: 'updateMany',
@@ -262,10 +266,10 @@ export class OpraHttpAdapter extends OpraAdapter {
             /*
              * Singleton
              */
-            if (resource instanceof Singleton && !p.key) {
+            if (resource instanceof common_1.Singleton && !p.key) {
                 switch (method) {
                     case 'POST': {
-                        return new HttpRequestHost({
+                        return new http_request_host_js_1.HttpRequestHost({
                             kind: 'SingletonCreateRequest',
                             resource,
                             operation: 'create',
@@ -280,7 +284,7 @@ export class OpraHttpAdapter extends OpraAdapter {
                         }, incoming);
                     }
                     case 'DELETE': {
-                        return new HttpRequestHost({
+                        return new http_request_host_js_1.HttpRequestHost({
                             kind: 'SingletonDeleteRequest',
                             resource,
                             operation: 'delete',
@@ -290,7 +294,7 @@ export class OpraHttpAdapter extends OpraAdapter {
                         }, incoming);
                     }
                     case 'GET': {
-                        return new HttpRequestHost({
+                        return new http_request_host_js_1.HttpRequestHost({
                             kind: 'SingletonGetRequest',
                             resource,
                             operation: 'get',
@@ -304,7 +308,7 @@ export class OpraHttpAdapter extends OpraAdapter {
                         }, incoming);
                     }
                     case 'PATCH': {
-                        return new HttpRequestHost({
+                        return new http_request_host_js_1.HttpRequestHost({
                             kind: 'SingletonUpdateRequest',
                             resource,
                             operation: 'update',
@@ -321,7 +325,7 @@ export class OpraHttpAdapter extends OpraAdapter {
                 }
             }
             else
-                throw new InternalServerError();
+                throw new common_1.InternalServerError();
             // if (query instanceof SingletonGetQuery || query instanceof CollectionGetQuery || query instanceof ElementReadQuery) {
             //   // Move through properties
             //   let parentType: DataType;
@@ -343,14 +347,14 @@ export class OpraHttpAdapter extends OpraAdapter {
             //     parent = parent.child;
             //   }
             // }
-            throw new MethodNotAllowedError({
+            throw new common_1.MethodNotAllowedError({
                 message: `Method "${method}" is not allowed by target endpoint`
             });
         }
         catch (e) {
-            if (e instanceof OpraException)
+            if (e instanceof common_1.OpraException)
                 throw e;
-            throw new BadRequestError(e);
+            throw new common_1.BadRequestError(e);
         }
     }
     // async parseMultiPart(
@@ -434,23 +438,23 @@ export class OpraHttpAdapter extends OpraAdapter {
     async sendResponse(context) {
         const { request, response } = context;
         const outgoing = response.switchToHttp();
-        const errors = response.errors?.map(e => wrapException(e));
+        const errors = response.errors?.map(e => (0, common_1.wrapException)(e));
         if (errors && errors.length) {
             await this.errorHandler(request.switchToHttp(), outgoing, errors);
             return;
         }
-        outgoing.set(HttpHeaderCodes.Cache_Control, 'no-cache');
-        outgoing.set(HttpHeaderCodes.Pragma, 'no-cache');
-        outgoing.set(HttpHeaderCodes.Expires, '-1');
-        outgoing.set(HttpHeaderCodes.X_Opra_Version, OpraSchema.SpecVersion);
-        outgoing.status(outgoing.statusCode || HttpStatusCodes.OK);
+        outgoing.set(common_1.HttpHeaderCodes.Cache_Control, 'no-cache');
+        outgoing.set(common_1.HttpHeaderCodes.Pragma, 'no-cache');
+        outgoing.set(common_1.HttpHeaderCodes.Expires, '-1');
+        outgoing.set(common_1.HttpHeaderCodes.X_Opra_Version, common_1.OpraSchema.SpecVersion);
+        outgoing.status(outgoing.statusCode || common_1.HttpStatusCodes.OK);
         if (response.value) {
             if (typeof response.value === 'object') {
-                if (isReadable(response.value) || Buffer.isBuffer(response.value))
+                if ((0, common_1.isReadable)(response.value) || Buffer.isBuffer(response.value))
                     outgoing.send(response.value);
                 else {
                     const body = this.i18n.deep(response.value);
-                    outgoing.set(HttpHeaderCodes.Content_Type, 'application/json; charset=utf-8');
+                    outgoing.set(common_1.HttpHeaderCodes.Content_Type, 'application/json; charset=utf-8');
                     outgoing.send(JSON.stringify(body));
                 }
             }
@@ -460,3 +464,4 @@ export class OpraHttpAdapter extends OpraAdapter {
         outgoing.end();
     }
 }
+exports.OpraHttpAdapter = OpraHttpAdapter;

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

@@ -1,5 +1,8 @@
-import { RequestContextHost } from '../request-context.host.js';
-export class HttpRequestContextHost extends RequestContextHost {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpRequestContextHost = void 0;
+const request_context_host_js_1 = require("../request-context.host.js");
+class HttpRequestContextHost extends request_context_host_js_1.RequestContextHost {
     constructor(platform, api, _request, _response) {
         super('http', platform, api, _request, _response);
         this.platform = platform;
@@ -22,3 +25,4 @@ export class HttpRequestContextHost extends RequestContextHost {
         throw new TypeError('Not executing in an "RPC" protocol');
     }
 }
+exports.HttpRequestContextHost = HttpRequestContextHost;

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

@@ -1,5 +1,8 @@
-import { RequestHost } from '../request.host.js';
-export class HttpRequestHost extends RequestHost {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpRequestHost = void 0;
+const request_host_js_1 = require("../request.host.js");
+class HttpRequestHost extends request_host_js_1.RequestHost {
     constructor(init, _incoming) {
         super(init);
         this._incoming = _incoming;
@@ -8,3 +11,4 @@ export class HttpRequestHost extends RequestHost {
         return this._incoming;
     }
 }
+exports.HttpRequestHost = HttpRequestHost;

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

@@ -1,5 +1,8 @@
-import { ResponseHost } from '../response.host.js';
-export class HttpResponseHost extends ResponseHost {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpResponseHost = void 0;
+const response_host_js_1 = require("../response.host.js");
+class HttpResponseHost extends response_host_js_1.ResponseHost {
     constructor(init, _outgoing) {
         super(init);
         this._outgoing = _outgoing;
@@ -8,3 +11,4 @@ export class HttpResponseHost extends ResponseHost {
         return this._outgoing;
     }
 }
+exports.HttpResponseHost = HttpResponseHost;

package/esm/adapter/interfaces/logger.interface.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/esm/adapter/interfaces/request-context.interface.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/esm/adapter/interfaces/request.interface.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/esm/adapter/interfaces/response.interface.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/esm/adapter/internal/metadata.resource.js

@@ -1,24 +1,27 @@
-import { __decorate, __metadata } from "tslib";
-import { ApiDocument, cloneObject, Singleton } from '@opra/common';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetadataResource = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@opra/common");
 let MetadataResource = class MetadataResource {
     constructor(document) {
         this.document = document;
         this._schema = document.exportSchema();
     }
     get() {
-        return cloneObject(this.document.exportSchema(), true);
+        return (0, common_1.cloneObject)(this.document.exportSchema(), true);
     }
 };
-__decorate([
-    Singleton.GetOperation(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
+tslib_1.__decorate([
+    common_1.Singleton.Get(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", void 0)
 ], MetadataResource.prototype, "get", null);
-MetadataResource = __decorate([
-    Singleton(Object, {
+MetadataResource = tslib_1.__decorate([
+    (0, common_1.Singleton)(Object, {
         name: '$metadata',
     }),
-    __metadata("design:paramtypes", [ApiDocument])
+    tslib_1.__metadata("design:paramtypes", [common_1.ApiDocument])
 ], MetadataResource);
-export { MetadataResource };
+exports.MetadataResource = MetadataResource;

package/esm/adapter/request-context.host.js

@@ -1,5 +1,8 @@
-import { AsyncEventEmitter } from 'strict-typed-events';
-export class RequestContextHost extends AsyncEventEmitter {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestContextHost = void 0;
+const strict_typed_events_1 = require("strict-typed-events");
+class RequestContextHost extends strict_typed_events_1.AsyncEventEmitter {
     constructor(protocol, platform, api, _request, _response) {
         super();
         this.protocol = protocol;
@@ -24,3 +27,4 @@ export class RequestContextHost extends AsyncEventEmitter {
         throw new TypeError('Not executing in an "RPC" protocol');
     }
 }
+exports.RequestContextHost = RequestContextHost;

package/esm/adapter/request.host.js

@@ -1,4 +1,7 @@
-export class RequestHost {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestHost = void 0;
+class RequestHost {
     constructor(init) {
         Object.assign(this, init);
         this.resourceKind = this.resource.kind;
@@ -13,3 +16,4 @@ export class RequestHost {
         throw new TypeError('Not executing in an "RPC" protocol');
     }
 }
+exports.RequestHost = RequestHost;

package/esm/adapter/response.host.js

@@ -1,4 +1,7 @@
-export class ResponseHost {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResponseHost = void 0;
+class ResponseHost {
     constructor(init) {
         if (init)
             Object.assign(this, init);
@@ -14,3 +17,4 @@ export class ResponseHost {
         throw new TypeError('Not executing in an "RPC" protocol');
     }
 }
+exports.ResponseHost = ResponseHost;

package/esm/augmentation/resource.augmentation.js

@@ -1,24 +1,26 @@
-import { Collection, METADATA_KEY, Resource, Singleton } from "@opra/common";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_1 = require("@opra/common");
 // @ts-ignore
-const oldConstruct = Resource.prototype._construct;
+const oldConstruct = common_1.Resource.prototype._construct;
 // @ts-ignore
-Resource.prototype._construct = function (init) {
+common_1.Resource.prototype._construct = function (init) {
     oldConstruct.call(this, init);
     const _this = this;
     _this.onInit = init.onInit;
     _this.onShutdown = init.onShutdown;
 };
-Collection.OnInit = Singleton.OnInit = function () {
+common_1.Collection.OnInit = common_1.Singleton.OnInit = function () {
     return (target, propertyKey) => {
-        const resourceMetadata = (Reflect.getOwnMetadata(METADATA_KEY, target.constructor) || {});
+        const resourceMetadata = (Reflect.getOwnMetadata(common_1.METADATA_KEY, target.constructor) || {});
         resourceMetadata.onInit = target[propertyKey];
-        Reflect.defineMetadata(METADATA_KEY, target.constructor, resourceMetadata);
+        Reflect.defineMetadata(common_1.METADATA_KEY, target.constructor, resourceMetadata);
     };
 };
-Collection.OnShutdown = Singleton.OnShutdown = function () {
+common_1.Collection.OnShutdown = common_1.Singleton.OnShutdown = function () {
     return (target, propertyKey) => {
-        const resourceMetadata = (Reflect.getOwnMetadata(METADATA_KEY, target.constructor) || {});
+        const resourceMetadata = (Reflect.getOwnMetadata(common_1.METADATA_KEY, target.constructor) || {});
         resourceMetadata.onShutdown = target[propertyKey];
-        Reflect.defineMetadata(METADATA_KEY, target.constructor, resourceMetadata);
+        Reflect.defineMetadata(common_1.METADATA_KEY, target.constructor, resourceMetadata);
     };
 };

package/esm/index.js

@@ -1,10 +1,13 @@
-import "reflect-metadata";
-import './augmentation/resource.augmentation.js';
-export * from './types.js';
-export * from './adapter/adapter.js';
-export * from './adapter/http/express-adapter.js';
-export * from './adapter/http/http-adapter.js';
-export * from './adapter/interfaces/request-context.interface.js';
-export * from './adapter/interfaces/logger.interface.js';
-export * from './adapter/interfaces/request.interface.js';
-export * from './adapter/interfaces/response.interface.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+require("reflect-metadata");
+require("./augmentation/resource.augmentation.js");
+tslib_1.__exportStar(require("./types.js"), exports);
+tslib_1.__exportStar(require("./adapter/adapter.js"), exports);
+tslib_1.__exportStar(require("./adapter/http/express-adapter.js"), exports);
+tslib_1.__exportStar(require("./adapter/http/http-adapter.js"), exports);
+tslib_1.__exportStar(require("./adapter/interfaces/request-context.interface.js"), exports);
+tslib_1.__exportStar(require("./adapter/interfaces/logger.interface.js"), exports);
+tslib_1.__exportStar(require("./adapter/interfaces/request.interface.js"), exports);
+tslib_1.__exportStar(require("./adapter/interfaces/response.interface.js"), exports);

package/esm/types.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/i18n/en/error.json

@@ -8,7 +8,7 @@
   "NOT_FOUND": "Not found",
   "UNAUTHORIZED": "You have not been authenticated to perform this action",
   "UNPROCESSABLE_ENTITY": "Unprocessable entity",
-  "RESOURCE_NOT_FOUND": "The resource '{{resource}}' could not be found",
+  "RESOURCE_NOT_FOUND": "Resource not found: '{{resource}}'",
   "RESOURCE_CONFLICT": "There is already an other {{resource}} resource with same field values ({{fields}})",
   "RESOLVER_FORBIDDEN": "The resource endpoint does not accept '{{operation}}' operations",
   "UNACCEPTED_SORT_FIELD": "Field '{{field}}' is not available for sort operation"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.15.0",
+  "version": "0.16.1",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "clean:cover": "rimraf ../../coverage/core"
   },
   "dependencies": {
-    "@opra/common": "^0.15.0",
+    "@opra/common": "^0.16.1",
     "content-type": "^1.0.5",
     "lodash.isnil": "^4.0.0",
     "lodash.omitby": "^4.6.0",
@@ -43,14 +43,14 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^7.6.0",
+    "@types/content-type": "^1.1.5",
     "@types/dicer": "^0.2.2",
     "@types/express": "^4.17.17",
-    "@types/content-type": "^1.1.5",
     "cors": "^2.8.5",
     "ts-gems": "^2.3.0"
   },
   "type": "module",
-  "types": "esm/index.d.ts",
+  "types": "types/index.d.ts",
   "exports": {
     ".": {
       "require": "./cjs/index.js",
@@ -68,6 +68,7 @@
     "cjs/",
     "esm/",
     "i18n/",
+    "types/",
     "LICENSE",
     "README.md"
   ],

package/{esm → types}/adapter/adapter.d.ts

@@ -1,3 +1,4 @@
+import { AsyncEventEmitter } from 'strict-typed-events';
 import { ApiDocument, FallbackLng, I18n, LanguageResource } from '@opra/common';
 import { ILogger } from './interfaces/logger.interface.js';
 import { RequestContext } from './interfaces/request-context.interface.js';
@@ -8,6 +9,7 @@ export declare namespace OpraAdapter {
     interface Options {
         i18n?: I18n | I18nOptions | (() => Promise<I18n>);
         logger?: ILogger;
+        onRequest?: (ctx: RequestContext) => void | Promise<void>;
     }
     interface I18nOptions {
         /**
@@ -40,7 +42,7 @@ export declare namespace OpraAdapter {
 /**
  * @class OpraAdapter
  */
-export declare abstract class OpraAdapter {
+export declare abstract class OpraAdapter extends AsyncEventEmitter {
     readonly api: ApiDocument;
     protected _internalDoc: ApiDocument;
     i18n: I18n;
@@ -57,6 +59,5 @@ export declare abstract class OpraAdapter {
      */
     close(): Promise<void>;
     protected executeRequest(context: RequestContext): Promise<void>;
-    protected afterExecuteRequest(context: RequestContext): Promise<void>;
     protected _createI18n(options?: OpraAdapter.I18nOptions): Promise<I18n>;
 }

package/{esm → types}/adapter/http/http-adapter.d.ts

@@ -26,7 +26,7 @@ export declare abstract class OpraHttpAdapter extends OpraAdapter {
     protected handler(incoming: HttpRequestMessage, outgoing: HttpResponseMessage): Promise<void>;
     protected errorHandler(incoming: HttpRequestMessage, outgoing: HttpResponseMessage, errors: any[]): Promise<void>;
     protected log(logType: keyof ILogger, incoming: HttpRequestMessage, message: string, ...optionalParams: any[]): void;
-    protected afterExecuteRequest(context: RequestContext): Promise<void>;
+    protected executeRequest(context: RequestContext): Promise<void>;
     /**
      *
      * @param incoming

package/{esm → types}/adapter/internal/metadata.resource.d.ts

@@ -3,5 +3,5 @@ export declare class MetadataResource {
     readonly document: ApiDocument;
     private _schema;
     constructor(document: ApiDocument);
-    get(): import("../../build/common/esm/schema/document.interface").ApiDocument;
+    get(): import("@opra/common/types/schema/document.interface").ApiDocument;
 }