@opra/core 0.10.0 → 0.13.0

package/cjs/adapter/adapter.js

@@ -14,6 +14,17 @@ class OpraAdapter {
         this.document = document;
         this._internalResources = new common_1.ResponsiveMap();
     }
+    async close() {
+        const promises = [];
+        for (const r of this.document.resources.values()) {
+            if (r.instance) {
+                const shutDown = r.instance.shutDown;
+                if (shutDown)
+                    promises.push((async () => shutDown.call(r.instance))());
+            }
+        }
+        await Promise.allSettled(promises);
+    }
     async handler(executionContext) {
         let requestContext;
         let failed = false;
@@ -29,6 +40,13 @@ class OpraAdapter {
             failed = true;
             const error = (0, common_1.wrapException)(e);
             await this.sendError(executionContext, error);
+            if (this.logger)
+                try {
+                    this.logger.error(e);
+                }
+                catch {
+                    // noop
+                }
         }
         finally {
             if (executionContext instanceof strict_typed_events_1.AsyncEventEmitter) {
@@ -70,6 +88,13 @@ class OpraAdapter {
                         requestContext.errors.push(new common_1.FailedDependencyError());
                     else
                         requestContext.errors.push((0, common_1.wrapException)(task.error));
+                    if (this.logger)
+                        try {
+                            this.logger.error(task.error);
+                        }
+                        catch {
+                            // noop
+                        }
                     return;
                 }
             });
@@ -79,6 +104,7 @@ class OpraAdapter {
         throw new TypeError('Invalid request context instance');
     }
     async _init(options) {
+        this.logger = options?.logger;
         if (options?.i18n instanceof common_1.I18n)
             this.i18n = options.i18n;
         else if (typeof options?.i18n === 'function')
@@ -124,7 +150,7 @@ class OpraAdapter {
                     Object.setPrototypeOf(ctx, context);
                     promises.push(this._executeCollectionResource(document, resource, ctx)
                         .then(r => {
-                        context.responseHeaders[common_1.HttpHeaders.X_Opra_Count] = r;
+                        context.responseHeaders[common_1.HttpHeaderCodes.X_Opra_Count] = r;
                     }));
                 }
                 await Promise.all(promises);
@@ -142,8 +168,8 @@ class OpraAdapter {
     }
     async _executeCollectionResource(document, resource, context) {
         const method = context.query.method;
-        const resolverInfo = resource.metadata[method];
-        if (!(resolverInfo && resolverInfo.handler))
+        const handler = resource.getHandler(method);
+        if (!handler)
             throw new common_1.ForbiddenError({
                 message: (0, common_1.translate)('RESOLVER_FORBIDDEN', { method }, `The resource endpoint does not accept '{{method}}' operations`),
                 severity: 'error',
@@ -153,21 +179,21 @@ class OpraAdapter {
         switch (method) {
             case 'create': {
                 const query = context.query;
-                result = await resolverInfo.handler(context, query.data, query);
+                result = await handler(context, query.data, query);
                 result = Array.isArray(result) ? result[0] : result;
                 if (result)
                     context.status = 201;
-                context.responseHeaders[common_1.HttpHeaders.X_Opra_DataType] = resource.dataType.name;
+                context.responseHeaders[common_1.HttpHeaderCodes.X_Opra_DataType] = resource.dataType.name;
                 return result;
             }
             case 'count': {
                 const query = context.query;
-                result = await resolverInfo.handler(context, query);
+                result = await handler(context, query);
                 return result;
             }
             case 'get': {
                 const query = context.query;
-                result = await resolverInfo.handler(context, query.keyValue, query);
+                result = await handler(context, query.keyValue, query);
                 result = Array.isArray(result) ? result[0] : result;
                 if (!result)
                     throw new common_1.ResourceNotFoundError(resource.name, query.keyValue);
@@ -175,23 +201,23 @@ class OpraAdapter {
                 if (v.value === undefined)
                     throw new common_1.ResourceNotFoundError(v.path);
                 if (v.dataType)
-                    context.responseHeaders[common_1.HttpHeaders.X_Opra_DataType] = v.dataType.name;
+                    context.responseHeaders[common_1.HttpHeaderCodes.X_Opra_DataType] = v.dataType.name;
                 return v.value;
             }
             case 'search': {
                 const query = context.query;
-                result = await resolverInfo.handler(context, query);
+                result = await handler(context, query);
                 const items = Array.isArray(result) ? result : (context.response ? [result] : []);
-                context.responseHeaders[common_1.HttpHeaders.X_Opra_DataType] = resource.dataType.name;
+                context.responseHeaders[common_1.HttpHeaderCodes.X_Opra_DataType] = resource.dataType.name;
                 return items;
             }
             case 'update': {
                 const query = context.query;
-                result = await resolverInfo.handler(context, query.keyValue, query.data, query);
+                result = await handler(context, query.keyValue, query.data, query);
                 result = Array.isArray(result) ? result[0] : result;
                 if (!result)
                     throw new common_1.ResourceNotFoundError(resource.name, query.keyValue);
-                context.responseHeaders[common_1.HttpHeaders.X_Opra_DataType] = resource.dataType.name;
+                context.responseHeaders[common_1.HttpHeaderCodes.X_Opra_DataType] = resource.dataType.name;
                 return result;
             }
             case 'delete':
@@ -200,17 +226,17 @@ class OpraAdapter {
                 switch (method) {
                     case 'delete': {
                         const query = context.query;
-                        result = await resolverInfo.handler(context, query.keyValue, query);
+                        result = await handler(context, query.keyValue, query);
                         break;
                     }
                     case 'deleteMany': {
                         const query = context.query;
-                        result = await resolverInfo.handler(context, query);
+                        result = await handler(context, query);
                         break;
                     }
                     case 'updateMany': {
                         const query = context.query;
-                        result = await resolverInfo.handler(context, query.data, query);
+                        result = await handler(context, query.data, query);
                         break;
                     }
                 }
@@ -249,7 +275,7 @@ class OpraAdapter {
                 if (v.value === undefined)
                     throw new common_1.ResourceNotFoundError(v.path);
                 if (v.dataType)
-                    context.responseHeaders[common_1.HttpHeaders.X_Opra_DataType] = v.dataType.name;
+                    context.responseHeaders[common_1.HttpHeaderCodes.X_Opra_DataType] = v.dataType.name;
                 return v.value;
             }
         }
@@ -267,7 +293,7 @@ class OpraAdapter {
         }
         if (method === 'create')
             context.status = 201;
-        context.responseHeaders[common_1.HttpHeaders.X_Opra_DataType] = resource.dataType.name;
+        context.responseHeaders[common_1.HttpHeaderCodes.X_Opra_DataType] = resource.dataType.name;
         return result;
     }
     async _pathWalkThrough(query, dataType, value, parentPath) {

package/cjs/adapter/http-adapter.js

@@ -261,9 +261,9 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
     // protected async sendBatchResponse(executionContext: TExecutionContext, requestContext: BatchRequestContext) {
     //   const resp = executionContext.getResponse();
     //   resp.setStatus(HttpStatus.OK);
-    //   resp.setHeader(HttpHeaders.Cache_Control, 'no-cache');
-    //   resp.setHeader(HttpHeaders.Pragma, 'no-cache');
-    //   resp.setHeader(HttpHeaders.Expires, '-1');
+    //   resp.setHeader(HttpHeaderCodes.Cache_Control, 'no-cache');
+    //   resp.setHeader(HttpHeaderCodes.Pragma, 'no-cache');
+    //   resp.setHeader(HttpHeaderCodes.Expires, '-1');
     //   if (requestContext.headers) {
     //     for (const [k, v] of Object.entries(requestContext.headers)) {
     //       if (v)
@@ -271,8 +271,8 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
     //     }
     //   }
     //   const boundary = 'batch_' + uuid();
-    //   resp.setHeader(HttpHeaders.Content_Type, 'multipart/mixed;boundary=' + boundary);
-    //   resp.setHeader(HttpHeaders.X_Opra_Version, OpraSchema.Version);
+    //   resp.setHeader(HttpHeaderCodes.Content_Type, 'multipart/mixed;boundary=' + boundary);
+    //   resp.setHeader(HttpHeaderCodes.X_Opra_Version, OpraSchema.Version);
     //
     //   const bodyBuilder = new HttpMultipartData();
     //
@@ -352,16 +352,16 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
         const out = this.createOutput(requestContext);
         const resp = executionContext.getResponse();
         resp.setStatus(out.status);
-        resp.setHeader(common_1.HttpHeaders.Cache_Control, 'no-cache');
-        resp.setHeader(common_1.HttpHeaders.Pragma, 'no-cache');
-        resp.setHeader(common_1.HttpHeaders.Expires, '-1');
+        resp.setHeader(common_1.HttpHeaderCodes.Cache_Control, 'no-cache');
+        resp.setHeader(common_1.HttpHeaderCodes.Pragma, 'no-cache');
+        resp.setHeader(common_1.HttpHeaderCodes.Expires, '-1');
         if (out.headers) {
             for (const [k, v] of Object.entries(out.headers)) {
                 if (v)
                     resp.setHeader(k, v);
             }
         }
-        resp.setHeader(common_1.HttpHeaders.X_Opra_Version, common_1.OpraSchema.Version);
+        resp.setHeader(common_1.HttpHeaderCodes.X_Opra_Version, common_1.OpraSchema.Version);
         if (out.body)
             resp.send(out.body);
         resp.end();
@@ -379,10 +379,10 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                     return b.status - a.status;
                 return i;
             });
-            if (!status || status < common_1.HttpStatus.BAD_REQUEST) {
+            if (!status || status < common_1.HttpStatusCodes.BAD_REQUEST) {
                 status = errors[0].status;
-                if (status < common_1.HttpStatus.BAD_REQUEST)
-                    status = common_1.HttpStatus.INTERNAL_SERVER_ERROR;
+                if (status < common_1.HttpStatusCodes.BAD_REQUEST)
+                    status = common_1.HttpStatusCodes.INTERNAL_SERVER_ERROR;
             }
             body = this.i18n.deep({
                 operation: ctx.query.method,
@@ -397,7 +397,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                 body = JSON.stringify(body);
                 ctx.responseHeaders['content-type'] = 'application/json; charset=utf-8';
             }
-            status = status || (query.operation === 'create' ? common_1.HttpStatus.CREATED : common_1.HttpStatus.OK);
+            status = status || (query.operation === 'create' ? common_1.HttpStatusCodes.CREATED : common_1.HttpStatusCodes.OK);
         }
         return {
             status,
@@ -408,11 +408,11 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
     async sendError(executionContext, error) {
         const resp = executionContext.getResponse();
         resp.setStatus(error.status || 500);
-        resp.setHeader(common_1.HttpHeaders.Content_Type, 'application/json');
-        resp.setHeader(common_1.HttpHeaders.Cache_Control, 'no-cache');
-        resp.setHeader(common_1.HttpHeaders.Pragma, 'no-cache');
-        resp.setHeader(common_1.HttpHeaders.Expires, '-1');
-        resp.setHeader(common_1.HttpHeaders.X_Opra_Version, common_1.OpraSchema.Version);
+        resp.setHeader(common_1.HttpHeaderCodes.Content_Type, 'application/json');
+        resp.setHeader(common_1.HttpHeaderCodes.Cache_Control, 'no-cache');
+        resp.setHeader(common_1.HttpHeaderCodes.Pragma, 'no-cache');
+        resp.setHeader(common_1.HttpHeaderCodes.Expires, '-1');
+        resp.setHeader(common_1.HttpHeaderCodes.X_Opra_Version, common_1.OpraSchema.Version);
         const issue = this.i18n.deep(error.issue);
         const body = {
             operation: 'unknown',

package/cjs/index.js

@@ -11,5 +11,4 @@ tslib_1.__exportStar(require("./adapter/adapter.js"), exports);
 tslib_1.__exportStar(require("./adapter/http-adapter.js"), exports);
 tslib_1.__exportStar(require("./adapter/express-adapter.js"), exports);
 tslib_1.__exportStar(require("./services/data-service.js"), exports);
-tslib_1.__exportStar(require("./services/json-collection-service.js"), exports);
 tslib_1.__exportStar(require("./services/json-singleton-service.js"), exports);

package/cjs/interfaces/logger.interface.js

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

package/cjs/services/json-singleton-service.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonSingletonService = void 0;
-const lodash_1 = require("lodash");
+const tslib_1 = require("tslib");
+const lodash_isnil_1 = tslib_1.__importDefault(require("lodash.isnil"));
+const lodash_omitby_1 = tslib_1.__importDefault(require("lodash.omitby"));
 const common_1 = require("@opra/common");
 class JsonSingletonService {
     constructor(dataType, options) {
@@ -28,11 +30,11 @@ class JsonSingletonService {
         }
         switch (query.method) {
             case 'create': {
-                const options = (0, lodash_1.omitBy)({
+                const options = (0, lodash_omitby_1.default)({
                     pick: query.pick,
                     omit: query.omit,
                     include: query.include
-                }, lodash_1.isNil);
+                }, lodash_isnil_1.default);
                 const { data } = query;
                 return {
                     method: query.method,
@@ -43,11 +45,11 @@ class JsonSingletonService {
             }
             case 'get': {
                 if (query.kind === 'CollectionGetQuery') {
-                    const options = (0, lodash_1.omitBy)({
+                    const options = (0, lodash_omitby_1.default)({
                         pick: query.pick,
                         omit: query.omit,
                         include: query.include
-                    }, lodash_1.isNil);
+                    }, lodash_isnil_1.default);
                     const keyValue = query.keyValue;
                     return {
                         method: query.method,
@@ -62,11 +64,11 @@ class JsonSingletonService {
                 break;
             }
             case 'update': {
-                const options = (0, lodash_1.omitBy)({
+                const options = (0, lodash_omitby_1.default)({
                     pick: query.pick,
                     omit: query.omit,
                     include: query.include
-                }, lodash_1.isNil);
+                }, lodash_isnil_1.default);
                 const { data } = query;
                 const keyValue = query.keyValue;
                 return {

package/esm/adapter/adapter.d.ts

@@ -2,6 +2,7 @@ import { Task } from 'power-tasks';
 import { CollectionGetQuery, CollectionResourceInfo, ComplexType, DataType, FieldGetQuery, I18n, OpraDocument, OpraException, ResourceInfo, ResponsiveMap, SingletonGetQuery, SingletonResourceInfo } from '@opra/common';
 import { IExecutionContext } from '../interfaces/execution-context.interface.js';
 import { I18nOptions } from '../interfaces/i18n-options.interface.js';
+import { ILogger } from '../interfaces/logger.interface.js';
 import { RequestContext } from './request-contexts/request-context.js';
 import { SingleRequestContext } from './request-contexts/single-request-context.js';
 export declare namespace OpraAdapter {
@@ -9,6 +10,7 @@ export declare namespace OpraAdapter {
     interface Options {
         i18n?: I18n | I18nOptions | (() => Promise<I18n>);
         userContext?: UserContextResolver;
+        logger?: ILogger;
     }
 }
 export declare abstract class OpraAdapter<TExecutionContext extends IExecutionContext> {
@@ -16,7 +18,9 @@ export declare abstract class OpraAdapter<TExecutionContext extends IExecutionCo
     protected userContextResolver?: OpraAdapter.UserContextResolver;
     protected _internalResources: ResponsiveMap<string, ResourceInfo>;
     i18n: I18n;
+    logger?: ILogger;
     constructor(document: OpraDocument);
+    close(): Promise<void>;
     protected abstract parse(executionContext: TExecutionContext): Promise<RequestContext>;
     protected abstract sendResponse(executionContext: TExecutionContext, requestContext: RequestContext): Promise<void>;
     protected abstract sendError(executionContext: TExecutionContext, error: OpraException): Promise<void>;

package/esm/adapter/adapter.js

@@ -1,6 +1,6 @@
 import { Task } from 'power-tasks';
 import { AsyncEventEmitter } from 'strict-typed-events';
-import { CollectionCountQuery, CollectionResourceInfo, CollectionSearchQuery, ComplexType, FailedDependencyError, ForbiddenError, HttpHeaders, I18n, InternalServerError, ResourceNotFoundError, ResponsiveMap, SingletonResourceInfo, translate, wrapException } from '@opra/common';
+import { CollectionCountQuery, CollectionResourceInfo, CollectionSearchQuery, ComplexType, FailedDependencyError, ForbiddenError, HttpHeaderCodes, I18n, InternalServerError, ResourceNotFoundError, ResponsiveMap, SingletonResourceInfo, translate, wrapException } from '@opra/common';
 import { createI18n } from '../utils/create-i18n.js';
 import { MetadataResource } from './classes/metadata.resource.js';
 import { BatchRequestContext } from './request-contexts/batch-request-context.js';
@@ -11,6 +11,17 @@ export class OpraAdapter {
         this.document = document;
         this._internalResources = new ResponsiveMap();
     }
+    async close() {
+        const promises = [];
+        for (const r of this.document.resources.values()) {
+            if (r.instance) {
+                const shutDown = r.instance.shutDown;
+                if (shutDown)
+                    promises.push((async () => shutDown.call(r.instance))());
+            }
+        }
+        await Promise.allSettled(promises);
+    }
     async handler(executionContext) {
         let requestContext;
         let failed = false;
@@ -26,6 +37,13 @@ export class OpraAdapter {
             failed = true;
             const error = wrapException(e);
             await this.sendError(executionContext, error);
+            if (this.logger)
+                try {
+                    this.logger.error(e);
+                }
+                catch {
+                    // noop
+                }
         }
         finally {
             if (executionContext instanceof AsyncEventEmitter) {
@@ -67,6 +85,13 @@ export class OpraAdapter {
                         requestContext.errors.push(new FailedDependencyError());
                     else
                         requestContext.errors.push(wrapException(task.error));
+                    if (this.logger)
+                        try {
+                            this.logger.error(task.error);
+                        }
+                        catch {
+                            // noop
+                        }
                     return;
                 }
             });
@@ -76,6 +101,7 @@ export class OpraAdapter {
         throw new TypeError('Invalid request context instance');
     }
     async _init(options) {
+        this.logger = options?.logger;
         if (options?.i18n instanceof I18n)
             this.i18n = options.i18n;
         else if (typeof options?.i18n === 'function')
@@ -121,7 +147,7 @@ export class OpraAdapter {
                     Object.setPrototypeOf(ctx, context);
                     promises.push(this._executeCollectionResource(document, resource, ctx)
                         .then(r => {
-                        context.responseHeaders[HttpHeaders.X_Opra_Count] = r;
+                        context.responseHeaders[HttpHeaderCodes.X_Opra_Count] = r;
                     }));
                 }
                 await Promise.all(promises);
@@ -139,8 +165,8 @@ export class OpraAdapter {
     }
     async _executeCollectionResource(document, resource, context) {
         const method = context.query.method;
-        const resolverInfo = resource.metadata[method];
-        if (!(resolverInfo && resolverInfo.handler))
+        const handler = resource.getHandler(method);
+        if (!handler)
             throw new ForbiddenError({
                 message: translate('RESOLVER_FORBIDDEN', { method }, `The resource endpoint does not accept '{{method}}' operations`),
                 severity: 'error',
@@ -150,21 +176,21 @@ export class OpraAdapter {
         switch (method) {
             case 'create': {
                 const query = context.query;
-                result = await resolverInfo.handler(context, query.data, query);
+                result = await handler(context, query.data, query);
                 result = Array.isArray(result) ? result[0] : result;
                 if (result)
                     context.status = 201;
-                context.responseHeaders[HttpHeaders.X_Opra_DataType] = resource.dataType.name;
+                context.responseHeaders[HttpHeaderCodes.X_Opra_DataType] = resource.dataType.name;
                 return result;
             }
             case 'count': {
                 const query = context.query;
-                result = await resolverInfo.handler(context, query);
+                result = await handler(context, query);
                 return result;
             }
             case 'get': {
                 const query = context.query;
-                result = await resolverInfo.handler(context, query.keyValue, query);
+                result = await handler(context, query.keyValue, query);
                 result = Array.isArray(result) ? result[0] : result;
                 if (!result)
                     throw new ResourceNotFoundError(resource.name, query.keyValue);
@@ -172,23 +198,23 @@ export class OpraAdapter {
                 if (v.value === undefined)
                     throw new ResourceNotFoundError(v.path);
                 if (v.dataType)
-                    context.responseHeaders[HttpHeaders.X_Opra_DataType] = v.dataType.name;
+                    context.responseHeaders[HttpHeaderCodes.X_Opra_DataType] = v.dataType.name;
                 return v.value;
             }
             case 'search': {
                 const query = context.query;
-                result = await resolverInfo.handler(context, query);
+                result = await handler(context, query);
                 const items = Array.isArray(result) ? result : (context.response ? [result] : []);
-                context.responseHeaders[HttpHeaders.X_Opra_DataType] = resource.dataType.name;
+                context.responseHeaders[HttpHeaderCodes.X_Opra_DataType] = resource.dataType.name;
                 return items;
             }
             case 'update': {
                 const query = context.query;
-                result = await resolverInfo.handler(context, query.keyValue, query.data, query);
+                result = await handler(context, query.keyValue, query.data, query);
                 result = Array.isArray(result) ? result[0] : result;
                 if (!result)
                     throw new ResourceNotFoundError(resource.name, query.keyValue);
-                context.responseHeaders[HttpHeaders.X_Opra_DataType] = resource.dataType.name;
+                context.responseHeaders[HttpHeaderCodes.X_Opra_DataType] = resource.dataType.name;
                 return result;
             }
             case 'delete':
@@ -197,17 +223,17 @@ export class OpraAdapter {
                 switch (method) {
                     case 'delete': {
                         const query = context.query;
-                        result = await resolverInfo.handler(context, query.keyValue, query);
+                        result = await handler(context, query.keyValue, query);
                         break;
                     }
                     case 'deleteMany': {
                         const query = context.query;
-                        result = await resolverInfo.handler(context, query);
+                        result = await handler(context, query);
                         break;
                     }
                     case 'updateMany': {
                         const query = context.query;
-                        result = await resolverInfo.handler(context, query.data, query);
+                        result = await handler(context, query.data, query);
                         break;
                     }
                 }
@@ -246,7 +272,7 @@ export class OpraAdapter {
                 if (v.value === undefined)
                     throw new ResourceNotFoundError(v.path);
                 if (v.dataType)
-                    context.responseHeaders[HttpHeaders.X_Opra_DataType] = v.dataType.name;
+                    context.responseHeaders[HttpHeaderCodes.X_Opra_DataType] = v.dataType.name;
                 return v.value;
             }
         }
@@ -264,7 +290,7 @@ export class OpraAdapter {
         }
         if (method === 'create')
             context.status = 201;
-        context.responseHeaders[HttpHeaders.X_Opra_DataType] = resource.dataType.name;
+        context.responseHeaders[HttpHeaderCodes.X_Opra_DataType] = resource.dataType.name;
         return result;
     }
     async _pathWalkThrough(query, dataType, value, parentPath) {

package/esm/adapter/http-adapter.js

@@ -1,4 +1,4 @@
-import { BadRequestError, CollectionCreateQuery, CollectionDeleteManyQuery, CollectionDeleteQuery, CollectionGetQuery, CollectionResourceInfo, CollectionSearchQuery, CollectionUpdateManyQuery, CollectionUpdateQuery, ComplexType, ContainerResourceInfo, FieldGetQuery, HttpHeaders, HttpStatus, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, normalizeHeaders, OpraException, OpraSchema, OpraURL, SingletonGetQuery, SingletonResourceInfo, UnionType, wrapException } from '@opra/common';
+import { BadRequestError, CollectionCreateQuery, CollectionDeleteManyQuery, CollectionDeleteQuery, CollectionGetQuery, CollectionResourceInfo, CollectionSearchQuery, CollectionUpdateManyQuery, CollectionUpdateQuery, ComplexType, ContainerResourceInfo, FieldGetQuery, HttpHeaderCodes, HttpStatusCodes, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, normalizeHeaders, OpraException, OpraSchema, OpraURL, SingletonGetQuery, SingletonResourceInfo, UnionType, wrapException } from '@opra/common';
 import { OpraAdapter } from './adapter.js';
 import { SingleRequestContext } from './request-contexts/single-request-context.js';
 export class OpraHttpAdapter extends OpraAdapter {
@@ -258,9 +258,9 @@ export class OpraHttpAdapter extends OpraAdapter {
     // protected async sendBatchResponse(executionContext: TExecutionContext, requestContext: BatchRequestContext) {
     //   const resp = executionContext.getResponse();
     //   resp.setStatus(HttpStatus.OK);
-    //   resp.setHeader(HttpHeaders.Cache_Control, 'no-cache');
-    //   resp.setHeader(HttpHeaders.Pragma, 'no-cache');
-    //   resp.setHeader(HttpHeaders.Expires, '-1');
+    //   resp.setHeader(HttpHeaderCodes.Cache_Control, 'no-cache');
+    //   resp.setHeader(HttpHeaderCodes.Pragma, 'no-cache');
+    //   resp.setHeader(HttpHeaderCodes.Expires, '-1');
     //   if (requestContext.headers) {
     //     for (const [k, v] of Object.entries(requestContext.headers)) {
     //       if (v)
@@ -268,8 +268,8 @@ export class OpraHttpAdapter extends OpraAdapter {
     //     }
     //   }
     //   const boundary = 'batch_' + uuid();
-    //   resp.setHeader(HttpHeaders.Content_Type, 'multipart/mixed;boundary=' + boundary);
-    //   resp.setHeader(HttpHeaders.X_Opra_Version, OpraSchema.Version);
+    //   resp.setHeader(HttpHeaderCodes.Content_Type, 'multipart/mixed;boundary=' + boundary);
+    //   resp.setHeader(HttpHeaderCodes.X_Opra_Version, OpraSchema.Version);
     //
     //   const bodyBuilder = new HttpMultipartData();
     //
@@ -349,16 +349,16 @@ export class OpraHttpAdapter extends OpraAdapter {
         const out = this.createOutput(requestContext);
         const resp = executionContext.getResponse();
         resp.setStatus(out.status);
-        resp.setHeader(HttpHeaders.Cache_Control, 'no-cache');
-        resp.setHeader(HttpHeaders.Pragma, 'no-cache');
-        resp.setHeader(HttpHeaders.Expires, '-1');
+        resp.setHeader(HttpHeaderCodes.Cache_Control, 'no-cache');
+        resp.setHeader(HttpHeaderCodes.Pragma, 'no-cache');
+        resp.setHeader(HttpHeaderCodes.Expires, '-1');
         if (out.headers) {
             for (const [k, v] of Object.entries(out.headers)) {
                 if (v)
                     resp.setHeader(k, v);
             }
         }
-        resp.setHeader(HttpHeaders.X_Opra_Version, OpraSchema.Version);
+        resp.setHeader(HttpHeaderCodes.X_Opra_Version, OpraSchema.Version);
         if (out.body)
             resp.send(out.body);
         resp.end();
@@ -376,10 +376,10 @@ export class OpraHttpAdapter extends OpraAdapter {
                     return b.status - a.status;
                 return i;
             });
-            if (!status || status < HttpStatus.BAD_REQUEST) {
+            if (!status || status < HttpStatusCodes.BAD_REQUEST) {
                 status = errors[0].status;
-                if (status < HttpStatus.BAD_REQUEST)
-                    status = HttpStatus.INTERNAL_SERVER_ERROR;
+                if (status < HttpStatusCodes.BAD_REQUEST)
+                    status = HttpStatusCodes.INTERNAL_SERVER_ERROR;
             }
             body = this.i18n.deep({
                 operation: ctx.query.method,
@@ -394,7 +394,7 @@ export class OpraHttpAdapter extends OpraAdapter {
                 body = JSON.stringify(body);
                 ctx.responseHeaders['content-type'] = 'application/json; charset=utf-8';
             }
-            status = status || (query.operation === 'create' ? HttpStatus.CREATED : HttpStatus.OK);
+            status = status || (query.operation === 'create' ? HttpStatusCodes.CREATED : HttpStatusCodes.OK);
         }
         return {
             status,
@@ -405,11 +405,11 @@ export class OpraHttpAdapter extends OpraAdapter {
     async sendError(executionContext, error) {
         const resp = executionContext.getResponse();
         resp.setStatus(error.status || 500);
-        resp.setHeader(HttpHeaders.Content_Type, 'application/json');
-        resp.setHeader(HttpHeaders.Cache_Control, 'no-cache');
-        resp.setHeader(HttpHeaders.Pragma, 'no-cache');
-        resp.setHeader(HttpHeaders.Expires, '-1');
-        resp.setHeader(HttpHeaders.X_Opra_Version, OpraSchema.Version);
+        resp.setHeader(HttpHeaderCodes.Content_Type, 'application/json');
+        resp.setHeader(HttpHeaderCodes.Cache_Control, 'no-cache');
+        resp.setHeader(HttpHeaderCodes.Pragma, 'no-cache');
+        resp.setHeader(HttpHeaderCodes.Expires, '-1');
+        resp.setHeader(HttpHeaderCodes.X_Opra_Version, OpraSchema.Version);
         const issue = this.i18n.deep(error.issue);
         const body = {
             operation: 'unknown',

package/esm/adapter/request-contexts/batch-request-context.d.ts

@@ -1,6 +1,6 @@
 import { RequestContext, RequestContextArgs } from './request-context.js';
 import { SingleRequestContext } from './single-request-context.js';
-export declare type BatchContextArgs = RequestContextArgs & Pick<BatchRequestContext, 'queries'>;
+export type BatchContextArgs = RequestContextArgs & Pick<BatchRequestContext, 'queries'>;
 export declare class BatchRequestContext extends RequestContext {
     readonly queries: SingleRequestContext[];
     constructor(args: BatchContextArgs);

package/esm/adapter/request-contexts/request-context.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { IncomingHttpHeaders } from 'http';
-import { HttpStatus, OpraDocument, OpraException, OpraURLSearchParams } from '@opra/common';
+import { HttpStatusCodes, OpraDocument, OpraException, OpraURLSearchParams } from '@opra/common';
 import { ContextType, IExecutionContext, IHttpExecutionContext } from '../../interfaces/execution-context.interface.js';
-export declare type RequestContextArgs = Pick<RequestContext, 'contentId' | 'service' | 'executionContext' | 'params' | 'headers' | 'parentValue' | 'continueOnError'>;
+export type RequestContextArgs = Pick<RequestContext, 'contentId' | 'service' | 'executionContext' | 'params' | 'headers' | 'parentValue' | 'continueOnError'>;
 export declare class RequestContext {
     readonly service: OpraDocument;
     readonly executionContext: IExecutionContext;
@@ -14,7 +14,7 @@ export declare class RequestContext {
     readonly responseHeaders: IncomingHttpHeaders;
     response?: any;
     errors: OpraException[];
-    status?: HttpStatus;
+    status?: HttpStatusCodes;
     continueOnError?: boolean;
     constructor(args: RequestContextArgs);
     get type(): ContextType;

package/esm/adapter/request-contexts/single-request-context.d.ts

@@ -1,6 +1,6 @@
 import { OpraQuery } from '@opra/common';
 import { RequestContext, RequestContextArgs } from './request-context.js';
-export declare type QueryRequestContextArgs = RequestContextArgs & {
+export type QueryRequestContextArgs = RequestContextArgs & {
     readonly query: OpraQuery;
 };
 export declare class SingleRequestContext extends RequestContext {

package/esm/enums/issue-severity.enum.d.ts

@@ -1 +1 @@
-export declare type IssueSeverity = 'error' | 'fatal' | 'warning' | 'info';
+export type IssueSeverity = 'error' | 'fatal' | 'warning' | 'info';