@opra/core 0.0.13 → 0.1.1

package/cjs/enums/http-headers.enum.js

@@ -8,7 +8,8 @@ exports.HttpHeaders = void 0;
 var HttpHeaders;
 (function (HttpHeaders) {
     /* *** Custom Headers *** */
-    HttpHeaders["X_Opra_Version"] = "X-Opra-Version";
+    HttpHeaders["X_Opra_Version"] = "X-OPRA-Version";
+    HttpHeaders["X_Opra_Schema"] = "X-OPRA-Schema";
     /* *** Authentication *** */
     /**
      * Defines the authentication method that should be used to access a resource.

package/cjs/implementation/adapter-utils/entity-resource-execute.util.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.entityResourceExecute = void 0;
+const i18n_1 = require("@opra/i18n");
+const schema_1 = require("@opra/schema");
+const index_js_1 = require("../../enums/index.js");
+const index_js_2 = require("../../exception/index.js");
+const query_interface_js_1 = require("../../interfaces/query.interface.js");
+async function entityResourceExecute(service, resource, context) {
+    const { query } = context;
+    if (query_interface_js_1.OpraQuery.isSearchQuery(query)) {
+        const promises = [];
+        let search;
+        let count;
+        promises.push(executeFn(service, resource, context, query.queryType)
+            .then(v => search = v));
+        if (query.count) {
+            promises.push(executeFn(service, resource, context, 'count')
+                .then(v => count = v));
+        }
+        await Promise.all(promises);
+        context.response.value = {
+            ...search,
+            ...count
+        };
+        return;
+    }
+    context.response.value = await executeFn(service, resource, context, query.queryType);
+}
+exports.entityResourceExecute = entityResourceExecute;
+async function executeFn(service, resource, context, queryType) {
+    const resolverInfo = resource.metadata.methods?.[queryType];
+    if (!resolverInfo.handler)
+        throw new index_js_2.ForbiddenError({
+            message: (0, i18n_1.translate)('RESOLVER_FORBIDDEN', { queryType }),
+            severity: 'error',
+            code: 'RESOLVER_FORBIDDEN'
+        });
+    let result = await resolverInfo.handler(context);
+    switch (queryType) {
+        case 'search':
+            context.response.headers.set(index_js_1.HttpHeaders.X_Opra_Schema, '/$schema/types/' + resource.dataType.name);
+            return {
+                items: Array.isArray(result) ? result : (context.response.value ? [result] : [])
+            };
+        case 'get':
+        case 'update':
+            if (!result) {
+                const query = context.query;
+                throw new index_js_2.ResourceNotFoundError(resource.name, query.keyValue);
+            }
+            break;
+        case 'count':
+            return { count: result || 0 };
+        case 'delete':
+        case 'deleteMany':
+        case 'updateMany':
+            let affectedRecords;
+            if (typeof result === 'number')
+                affectedRecords = result;
+            if (typeof result === 'boolean')
+                affectedRecords = result ? 1 : 0;
+            if (typeof result === 'object')
+                affectedRecords = result.affectedRows || result.affectedRecords;
+            return { affectedRecords };
+    }
+    if (!result)
+        return;
+    result = Array.isArray(result) ? result[0] : result;
+    let dataType = resource.dataType;
+    if (context.resultPath) {
+        const pathArray = context.resultPath.split('.');
+        for (const field of pathArray) {
+            const prop = dataType instanceof schema_1.ComplexType ? dataType.fields.get(field) : undefined;
+            dataType = prop && prop.type ? service.types.get(prop.type) : undefined;
+            result = result && typeof result === 'object' && result[field];
+        }
+    }
+    if (queryType === 'create')
+        context.response.status = 201;
+    if (dataType)
+        context.response.headers.set(index_js_1.HttpHeaders.X_Opra_Schema, '/$schema/types/' + dataType.name);
+    return result;
+}

package/cjs/implementation/adapter-utils/resource-execute.util.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resourceExecute = void 0;
+const schema_1 = require("@opra/schema");
+const entity_resource_execute_util_js_1 = require("./entity-resource-execute.util.js");
+async function resourceExecute(service, resource, context) {
+    if (resource instanceof schema_1.EntityResource)
+        return await (0, entity_resource_execute_util_js_1.entityResourceExecute)(service, resource, context);
+    throw new Error(`Executing "${resource.kind}" has not been implemented yet`);
+}
+exports.resourceExecute = resourceExecute;

package/cjs/implementation/adapter-utils/resource-prepare.util.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resourcePrepare = void 0;
+async function resourcePrepare(resource, context) {
+    const { query } = context;
+    const fn = resource.metadata['pre_' + query.queryType];
+    if (fn && typeof fn === 'function') {
+        await fn(context);
+    }
+}
+exports.resourcePrepare = resourcePrepare;

package/cjs/implementation/{adapter/adapter.js → adapter.js}

@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraAdapter = void 0;
 const strict_typed_events_1 = require("strict-typed-events");
 const i18n_1 = require("@opra/i18n");
-const index_js_1 = require("../../exception/index.js");
-const wrap_error_js_1 = require("../../exception/wrap-error.js");
-const create_i18n_js_1 = require("../../utils/create-i18n.js");
+const index_js_1 = require("../enums/index.js");
+const index_js_2 = require("../exception/index.js");
+const wrap_error_js_1 = require("../exception/wrap-error.js");
+const create_i18n_js_1 = require("../utils/create-i18n.js");
+const resource_execute_util_js_1 = require("./adapter-utils/resource-execute.util.js");
+const resource_prepare_util_js_1 = require("./adapter-utils/resource-prepare.util.js");
 class OpraAdapter {
     service;
     i18n;
@@ -37,24 +40,24 @@ class OpraAdapter {
                 // If previous request in bucket had an error and executed an update
                 // we do not execute next requests
                 if (stop) {
-                    context.response.errors.push(new index_js_1.FailedDependencyError());
+                    context.response.errors.push(new index_js_2.FailedDependencyError());
                     continue;
                 }
                 try {
                     const promise = (async () => {
-                        if (context.query.queryType === 'metadata') {
-                            await this._metadataExecute(context);
+                        if (context.query.queryType === 'schema') {
+                            await this._getSchemaExecute(context);
                             return;
                         }
                         const resource = context.query.resource;
-                        await resource.prepare(context);
+                        await (0, resource_prepare_util_js_1.resourcePrepare)(resource, context);
                         if (this.userContextResolver && !userContext)
                             userContext = this.userContextResolver({
                                 executionContext,
                                 isBatch: this.isBatch(executionContext)
                             });
                         context.userContext = userContext;
-                        await resource.execute(context);
+                        await (0, resource_execute_util_js_1.resourceExecute)(this.service, resource, context);
                     })().catch(e => {
                         context.response.errors.push(e);
                     });
@@ -95,31 +98,31 @@ class OpraAdapter {
             }
         }
     }
-    async _metadataExecute(ctx) {
+    async _getSchemaExecute(ctx) {
         const query = ctx.query;
         let out;
         if (query.resourcePath.length > 2)
-            throw new index_js_1.BadRequestError();
+            throw new index_js_2.BadRequestError();
         if (query.resourcePath?.length) {
             if (query.resourcePath[0] === 'resources') {
                 const resource = this.service.getResource(query.resourcePath[1]);
-                out = resource.getMetadata();
+                out = resource.getSchema(true);
                 query.resourcePath[1] = resource.name;
+                ctx.response.headers.set(index_js_1.HttpHeaders.X_Opra_Schema, 'http://www.oprajs.com/reference/v1/schema#' + resource.kind);
             }
             else if (query.resourcePath[0] === 'types') {
                 const dataType = this.service.getDataType(query.resourcePath[1]);
-                out = dataType.getMetadata();
+                out = dataType.getSchema(true);
                 query.resourcePath[1] = dataType.name;
+                ctx.response.headers.set(index_js_1.HttpHeaders.X_Opra_Schema, 'http://www.oprajs.com/reference/v1/schema#' + dataType.kind);
             }
             else
-                throw new index_js_1.BadRequestError();
-            ctx.response.value = {
-                '@opra:metadata': '/$metadata/' + query.resourcePath.join('/'),
-                ...out
-            };
+                throw new index_js_2.BadRequestError();
+            ctx.response.value = out;
             return;
         }
-        ctx.response.value = this.service.getMetadata();
+        ctx.response.headers.set(index_js_1.HttpHeaders.X_Opra_Schema, 'http://www.oprajs.com/reference/v1/schema');
+        ctx.response.value = this.service.getSchema(true);
     }
     static async initI18n(options) {
         if (options?.i18n instanceof i18n_1.I18n)

package/cjs/implementation/{adapter/http-adapter.js → http-adapter.js}

@@ -1,18 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraHttpAdapter = void 0;
+const schema_1 = require("@opra/schema");
 const url_1 = require("@opra/url");
-const constants_js_1 = require("../../constants.js");
-const index_js_1 = require("../../enums/index.js");
-const index_js_2 = require("../../exception/index.js");
-const wrap_error_js_1 = require("../../exception/wrap-error.js");
-const query_interface_js_1 = require("../../interfaces/query.interface.js");
-const headers_js_1 = require("../../utils/headers.js");
-const complex_type_js_1 = require("../data-type/complex-type.js");
-const query_context_js_1 = require("../query-context.js");
-const container_resource_handler_js_1 = require("../resource/container-resource-handler.js");
-const entity_resource_handler_js_1 = require("../resource/entity-resource-handler.js");
+const index_js_1 = require("../enums/index.js");
+const index_js_2 = require("../exception/index.js");
+const wrap_error_js_1 = require("../exception/wrap-error.js");
+const query_interface_js_1 = require("../interfaces/query.interface.js");
 const adapter_js_1 = require("./adapter.js");
+const query_context_js_1 = require("./query-context.js");
 class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
     prepareRequests(executionContext) {
         const req = executionContext.getRequestWrapper();
@@ -22,7 +18,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
         }
         const url = new url_1.OpraURL(req.getUrl());
         return [
-            this.prepareRequest(executionContext, url, req.getMethod(), headers_js_1.Headers.from(req.getHeaders()), req.getBody())
+            this.prepareRequest(executionContext, url, req.getMethod(), new schema_1.ResponsiveMap(req.getHeaders()), req.getBody())
         ];
     }
     prepareRequest(executionContext, url, method, headers, body) {
@@ -44,7 +40,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
             continueOnError: query.operation === 'read'
         });
     }
-    buildMetadataQuery(url) {
+    buildGetSchemaQuery(url) {
         const pathLen = url.path.size;
         const resourcePath = [];
         let pathIndex = 0;
@@ -52,7 +48,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
             const p = url.path.get(pathIndex++);
             if (p.key)
                 throw new index_js_2.BadRequestError();
-            if (p.resource !== '$metadata') {
+            if (p.resource !== '$schema') {
                 if (pathIndex === 1)
                     resourcePath.push('resources');
                 resourcePath.push(p.resource);
@@ -63,7 +59,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
             omit: url.searchParams.get('$omit'),
             include: url.searchParams.get('$include'),
         };
-        return query_interface_js_1.OpraQuery.forGetMetadata(resourcePath, opts);
+        return query_interface_js_1.OpraQuery.forGetSchema(resourcePath, opts);
     }
     buildQuery(url, method, body) {
         let container = this.service;
@@ -72,10 +68,10 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
             // Check if requesting metadata
             for (let i = 0; i < pathLen; i++) {
                 const p = url.path.get(i);
-                if (p.resource === '$metadata') {
+                if (p.resource === '$schema') {
                     if (method !== 'GET')
                         return;
-                    return this.buildMetadataQuery(url);
+                    return this.buildGetSchemaQuery(url);
                 }
             }
             let pathIndex = 0;
@@ -83,12 +79,12 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                 let p = url.path.get(pathIndex++);
                 const resource = container.getResource(p.resource);
                 // Move through path directories (containers)
-                if (resource instanceof container_resource_handler_js_1.ContainerResourceHandler) {
+                if (resource instanceof schema_1.ContainerResource) {
                     container = resource;
                     continue;
                 }
                 method = method.toUpperCase();
-                if (resource instanceof entity_resource_handler_js_1.EntityResourceHandler) {
+                if (resource instanceof schema_1.EntityResource) {
                     const scope = p.key ? 'instance' : 'collection';
                     if (pathIndex < pathLen && !(method === 'GET' && scope === 'instance'))
                         return;
@@ -121,11 +117,11 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                                     const dataType = nested
                                         ? this.service.getDataType(nested.property.type || 'string')
                                         : query.resource.dataType;
-                                    if (!(dataType instanceof complex_type_js_1.ComplexType))
-                                        throw new Error(`"${path}" is not a ComplexType and has no properties.`);
+                                    if (!(dataType instanceof schema_1.ComplexType))
+                                        throw new Error(`"${path}" is not a ComplexType and has no fields.`);
                                     p = url.path.get(pathIndex++);
                                     path += '.' + p.resource;
-                                    const prop = dataType.properties?.[p.resource];
+                                    const prop = dataType.fields.get(p.resource);
                                     if (!prop)
                                         throw new index_js_2.NotFoundError({ message: `Invalid or unknown resource path (${path})` });
                                     const q = query_interface_js_1.OpraQuery.forGetProperty(prop);
@@ -212,7 +208,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
         resp.setHeader(index_js_1.HttpHeaders.Cache_Control, 'no-cache');
         resp.setHeader(index_js_1.HttpHeaders.Pragma, 'no-cache');
         resp.setHeader(index_js_1.HttpHeaders.Expires, '-1');
-        resp.setHeader(index_js_1.HttpHeaders.X_Opra_Version, constants_js_1.OpraVersion);
+        resp.setHeader(index_js_1.HttpHeaders.X_Opra_Version, schema_1.OpraSchema.Version);
         if (out.headers) {
             for (const [k, v] of Object.entries(out.headers)) {
                 resp.setHeader(k, v);
@@ -244,10 +240,16 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
             delete body.errors;
             status = status || (query.operation === 'create' ? index_js_1.HttpStatus.CREATED : index_js_1.HttpStatus.OK);
         }
+        // Convert headers map to object
+        const headers = Array.from(ctx.response.headers.keys()).map(k => k.toLowerCase()).sort()
+            .reduce((a, k) => {
+            a[k] = ctx.response.headers.get(k);
+            return a;
+        }, {});
         body = this.i18n.deep(body);
         return {
             status,
-            headers: ctx.response.headers,
+            headers,
             body
         };
     }
@@ -258,7 +260,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
         resp.setHeader(index_js_1.HttpHeaders.Cache_Control, 'no-cache');
         resp.setHeader(index_js_1.HttpHeaders.Pragma, 'no-cache');
         resp.setHeader(index_js_1.HttpHeaders.Expires, '-1');
-        resp.setHeader(index_js_1.HttpHeaders.X_Opra_Version, constants_js_1.OpraVersion);
+        resp.setHeader(index_js_1.HttpHeaders.X_Opra_Version, schema_1.OpraSchema.Version);
         resp.send(JSON.stringify(error.response));
     }
 }

package/cjs/implementation/query-context.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryResponse = exports.QueryContext = void 0;
+const schema_1 = require("@opra/schema");
 const url_1 = require("@opra/url");
-const headers_js_1 = require("../utils/headers.js");
+const index_js_1 = require("../enums/index.js");
 class QueryContext {
     service;
     executionContext;
@@ -18,7 +19,7 @@ class QueryContext {
         Object.assign(this, args);
         this.response = new QueryResponse();
         this.params = this.params || new url_1.OpraURLSearchParams();
-        this.headers = this.headers || headers_js_1.Headers.create();
+        this.headers = this.headers || new schema_1.ResponsiveMap();
         this.resultPath = this.resultPath || '';
     }
     get type() {
@@ -32,7 +33,7 @@ class QueryContext {
 }
 exports.QueryContext = QueryContext;
 class QueryResponse {
-    headers = headers_js_1.Headers.create();
+    headers;
     errors = [];
     status;
     value;
@@ -40,6 +41,7 @@ class QueryResponse {
     constructor(args) {
         if (args)
             Object.assign(this, args);
+        this.headers = new schema_1.ResponsiveMap(undefined, Array.from(Object.values(index_js_1.HttpHeaders)));
     }
 }
 exports.QueryResponse = QueryResponse;

package/cjs/index.js

@@ -2,25 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 require("reflect-metadata");
-tslib_1.__exportStar(require("./constants.js"), exports);
 tslib_1.__exportStar(require("./types.js"), exports);
 tslib_1.__exportStar(require("./enums/index.js"), exports);
 tslib_1.__exportStar(require("./exception/index.js"), exports);
-tslib_1.__exportStar(require("./decorators/api-entity-resource.decorator.js"), exports);
 tslib_1.__exportStar(require("./interfaces/execution-context.interface.js"), exports);
 tslib_1.__exportStar(require("./interfaces/query.interface.js"), exports);
-tslib_1.__exportStar(require("./interfaces/resource-container.interface.js"), exports);
+tslib_1.__exportStar(require("./interfaces/entity-service.interface.js"), exports);
 tslib_1.__exportStar(require("./implementation/query-context.js"), exports);
-tslib_1.__exportStar(require("./implementation/opra-document.js"), exports);
-tslib_1.__exportStar(require("./implementation/opra-service.js"), exports);
-tslib_1.__exportStar(require("./implementation/schema-generator.js"), exports);
-tslib_1.__exportStar(require("./implementation/adapter/adapter.js"), exports);
-tslib_1.__exportStar(require("./implementation/adapter/http-adapter.js"), exports);
-tslib_1.__exportStar(require("./implementation/adapter/express-adapter.js"), exports);
-tslib_1.__exportStar(require("./implementation/data-type/data-type.js"), exports);
-tslib_1.__exportStar(require("./implementation/data-type/complex-type.js"), exports);
-tslib_1.__exportStar(require("./implementation/data-type/simple-type.js"), exports);
-tslib_1.__exportStar(require("./implementation/resource/resource-handler.js"), exports);
-tslib_1.__exportStar(require("./implementation/resource/entity-resource-handler.js"), exports);
-tslib_1.__exportStar(require("./services/entity-resource-controller.js"), exports);
+tslib_1.__exportStar(require("./implementation/adapter.js"), exports);
+tslib_1.__exportStar(require("./implementation/http-adapter.js"), exports);
+tslib_1.__exportStar(require("./implementation/express-adapter.js"), exports);
+tslib_1.__exportStar(require("./services/data-service.js"), exports);
 tslib_1.__exportStar(require("./services/json-data-service.js"), exports);

package/cjs/interfaces/query.interface.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraQuery = void 0;
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
-const complex_type_js_1 = require("../implementation/data-type/complex-type.js");
-const string_path_to_object_tree_js_1 = require("../utils/string-path-to-object-tree.js");
+const schema_1 = require("@opra/schema");
+const path_to_tree_js_1 = require("../utils/path-to-tree.js");
 var OpraQuery;
 (function (OpraQuery) {
     function forCreate(resource, values, options) {
@@ -25,7 +25,7 @@ var OpraQuery;
         return out;
     }
     OpraQuery.forCreate = forCreate;
-    function forGetMetadata(resourcePath, options) {
+    function forGetSchema(resourcePath, options) {
         // if (options?.pick)
         //   options.pick = normalizePick(resource, options.pick);
         // if (options?.omit)
@@ -33,7 +33,7 @@ var OpraQuery;
         // if (options?.include)
         //   options.include = normalizePick(resource, options.include);
         const out = {
-            queryType: 'metadata',
+            queryType: 'schema',
             scope: 'instance',
             resourcePath,
             operation: 'read',
@@ -41,7 +41,7 @@ var OpraQuery;
         Object.assign(out, lodash_1.default.omit(options, Object.keys(out)));
         return out;
     }
-    OpraQuery.forGetMetadata = forGetMetadata;
+    OpraQuery.forGetSchema = forGetSchema;
     function forGetEntity(resource, key, options) {
         if (options?.pick)
             options.pick = normalizePick(resource, options.pick);
@@ -168,19 +168,19 @@ function checkKeyFields(resource, key) {
         throw new Error(`"${resource.name}" has no primary key`);
 }
 function normalizePick(resource, fields) {
-    const fieldsTree = (0, string_path_to_object_tree_js_1.stringPathToObjectTree)(fields) || {};
+    const fieldsTree = (0, path_to_tree_js_1.pathToTree)(fields) || {};
     return _normalizeFieldsList([], resource.service, resource, resource.dataType, fieldsTree, '', {
-        additionalProperties: true
+        additionalFields: true
     });
 }
 function _normalizeFieldsList(target, service, resource, dataType, node, parentPath = '', options) {
     let curPath = '';
     for (const k of Object.keys(node)) {
         const nodeVal = node[k];
-        const prop = dataType?.properties?.[k];
+        const prop = dataType?.fields.get(k);
         if (!prop) {
             curPath = parentPath ? parentPath + '.' + k : k;
-            if (!options?.additionalProperties || (dataType && !dataType.additionalProperties))
+            if (!options?.additionalFields || (dataType && !dataType.additionalFields))
                 throw new TypeError(`Unknown field path "${resource.name + '.' + curPath}"`);
             if (typeof nodeVal === 'object')
                 _normalizeFieldsList(target, service, resource, undefined, nodeVal, curPath, options);
@@ -191,7 +191,7 @@ function _normalizeFieldsList(target, service, resource, dataType, node, parentP
         curPath = parentPath ? parentPath + '.' + prop.name : prop.name;
         const propType = service.getDataType(prop.type || 'string');
         if (typeof nodeVal === 'object') {
-            if (!(propType instanceof complex_type_js_1.ComplexType))
+            if (!(propType && propType instanceof schema_1.ComplexType))
                 throw new TypeError(`"${curPath}" is not a complex type and has no sub fields`);
             if (target.findIndex(x => x === parentPath) >= 0)
                 continue;

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

@@ -29,7 +29,7 @@ class JsonDataService {
     get(keyValue, options) {
         const primaryKey = this.primaryKey;
         let v = this.data.find(x => '' + x[primaryKey] === '' + keyValue);
-        v = JsonDataService.filterProperties(v, options?.pick, options?.omit, options?.include);
+        v = JsonDataService.filterFields(v, options?.pick, options?.omit, options?.include);
         return v;
     }
     count(options) {
@@ -44,20 +44,20 @@ class JsonDataService {
         }
         else
             out = this.data;
-        return out.map(v => JsonDataService.filterProperties(v, options?.pick, options?.omit, options?.include));
+        return out.map(v => JsonDataService.filterFields(v, options?.pick, options?.omit, options?.include));
     }
     create(data, options) {
         if (this.get(data[this.primaryKey]))
             throw new index_js_1.ResourceConflictError(this.resourceName, this.primaryKey);
         this.data.push(data);
-        return JsonDataService.filterProperties(data, options?.pick, options?.omit, options?.include);
+        return JsonDataService.filterFields(data, options?.pick, options?.omit, options?.include);
     }
     update(keyValue, data, options) {
         const primaryKey = this.primaryKey;
         const i = this.data.findIndex(x => '' + x[primaryKey] === '' + keyValue);
         if (i >= 0) {
             data = Object.assign(this.data[i], data);
-            return JsonDataService.filterProperties(data, options?.pick, options?.omit, options?.include);
+            return JsonDataService.filterFields(data, options?.pick, options?.omit, options?.include);
         }
     }
     updateMany(data, options) {
@@ -81,7 +81,13 @@ class JsonDataService {
         this.data = this.data.filter(x => !items.includes(x));
         return items.length;
     }
-    static filterProperties(obj, pick, omit, include) {
+    static filterFields(obj, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    pick, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    omit, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    include) {
         if (!obj)
             return;
         return obj;

package/cjs/utils/{string-path-to-object-tree.js → path-to-tree.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringPathToObjectTree = void 0;
+exports.pathToTree = void 0;
 const dotPattern = /^([^.]+)\.(.*)$/;
-function stringPathToObjectTree(arr) {
+function pathToTree(arr) {
     if (!arr.length)
         return;
     return _stringPathToObjectTree(arr, {});
 }
-exports.stringPathToObjectTree = stringPathToObjectTree;
+exports.pathToTree = pathToTree;
 function _stringPathToObjectTree(arr, target) {
     for (const k of arr) {
         const m = dotPattern.exec(k);

package/esm/enums/http-headers.enum.d.ts

@@ -2,7 +2,8 @@
  * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers#controls
  */
 export declare enum HttpHeaders {
-    X_Opra_Version = "X-Opra-Version",
+    X_Opra_Version = "X-OPRA-Version",
+    X_Opra_Schema = "X-OPRA-Schema",
     /**
      * Defines the authentication method that should be used to access a resource.
      */

package/esm/enums/http-headers.enum.js

@@ -5,7 +5,8 @@
 export var HttpHeaders;
 (function (HttpHeaders) {
     /* *** Custom Headers *** */
-    HttpHeaders["X_Opra_Version"] = "X-Opra-Version";
+    HttpHeaders["X_Opra_Version"] = "X-OPRA-Version";
+    HttpHeaders["X_Opra_Schema"] = "X-OPRA-Schema";
     /* *** Authentication *** */
     /**
      * Defines the authentication method that should be used to access a resource.

package/esm/implementation/adapter-utils/entity-resource-execute.util.d.ts

@@ -0,0 +1,3 @@
+import { EntityResource, OpraService } from '@opra/schema';
+import { QueryContext } from '../query-context.js';
+export declare function entityResourceExecute(service: OpraService, resource: EntityResource, context: QueryContext): Promise<void>;