@opra/core 0.16.1 → 0.17.0

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

@@ -120,10 +120,11 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
         try {
             const url = new common_1.OpraURL();
             url.searchParams.define({
-                '$pick': { codec: 'string', array: true },
-                '$omit': { codec: 'string', array: true },
-                '$include': { codec: 'string', array: true },
-                '$sort': { codec: 'string', array: true },
+                '$search': { codec: 'string' },
+                '$pick': { codec: 'string', array: 'strict' },
+                '$omit': { codec: 'string', array: 'strict' },
+                '$include': { codec: 'string', array: 'strict' },
+                '$sort': { codec: 'string', array: 'strict' },
                 '$filter': { codec: 'filter' },
                 '$limit': { codec: 'number' },
                 '$skip': { codec: 'number' },
@@ -156,6 +157,9 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                 switch (method) {
                     case 'POST': {
                         if (!p.key) {
+                            const pick = params.get('$pick');
+                            const omit = params.get('$omit');
+                            const include = params.get('$include');
                             return new http_request_host_js_1.HttpRequestHost({
                                 kind: 'CollectionCreateRequest',
                                 resource,
@@ -164,9 +168,9 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                                 many: false,
                                 args: {
                                     data: incoming.body,
-                                    pick: resource.normalizeFieldNames(params.get('$pick')),
-                                    omit: resource.normalizeFieldNames(params.get('$omit')),
-                                    include: resource.normalizeFieldNames(params.get('$include'))
+                                    pick: pick && resource.normalizeFieldPath(pick),
+                                    omit: omit && resource.normalizeFieldPath(omit),
+                                    include: include && resource.normalizeFieldPath(include)
                                 }
                             }, incoming);
                         }
@@ -185,6 +189,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                                 }
                             }, incoming);
                         }
+                        const filter = params.get('$filter');
                         return new http_request_host_js_1.HttpRequestHost({
                             kind: 'CollectionDeleteManyRequest',
                             resource,
@@ -192,11 +197,14 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                             crud: 'delete',
                             many: true,
                             args: {
-                                filter: resource.normalizeFilterFields(params.get('$filter'))
+                                filter: filter && resource.normalizeFilter(filter)
                             }
                         }, incoming);
                     }
                     case 'GET': {
+                        const pick = params.get('$pick');
+                        const omit = params.get('$omit');
+                        const include = params.get('$include');
                         if (p.key) {
                             return new http_request_host_js_1.HttpRequestHost({
                                 kind: 'CollectionGetRequest',
@@ -206,12 +214,14 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                                 many: false,
                                 args: {
                                     key: resource.parseKeyValue(p.key),
-                                    pick: resource.normalizeFieldNames(params.get('$pick')),
-                                    omit: resource.normalizeFieldNames(params.get('$omit')),
-                                    include: resource.normalizeFieldNames(params.get('$include'))
+                                    pick: pick && resource.normalizeFieldPath(pick),
+                                    omit: omit && resource.normalizeFieldPath(omit),
+                                    include: include && resource.normalizeFieldPath(include)
                                 }
                             }, incoming);
                         }
+                        const filter = params.get('$filter');
+                        const sort = params.get('$sort');
                         return new http_request_host_js_1.HttpRequestHost({
                             kind: 'CollectionFindManyRequest',
                             resource,
@@ -219,11 +229,11 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                             crud: 'read',
                             many: true,
                             args: {
-                                sort: resource.normalizeSortFields(params.get('$sort')),
-                                pick: resource.normalizeFieldNames(params.get('$pick')),
-                                omit: resource.normalizeFieldNames(params.get('$omit')),
-                                include: resource.normalizeFieldNames(params.get('$include')),
-                                filter: resource.normalizeFilterFields(params.get('$filter')),
+                                pick: pick && resource.normalizeFieldPath(pick),
+                                omit: omit && resource.normalizeFieldPath(omit),
+                                include: include && resource.normalizeFieldPath(include),
+                                sort: sort && resource.normalizeSortFields(sort),
+                                filter: filter && resource.normalizeFilter(filter),
                                 limit: params.get('$limit'),
                                 skip: params.get('$skip'),
                                 distinct: params.get('$distinct'),
@@ -233,6 +243,9 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                     }
                     case 'PATCH': {
                         if (p.key) {
+                            const pick = params.get('$pick');
+                            const omit = params.get('$omit');
+                            const include = params.get('$include');
                             return new http_request_host_js_1.HttpRequestHost({
                                 kind: 'CollectionUpdateRequest',
                                 resource,
@@ -242,12 +255,13 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                                 args: {
                                     key: resource.parseKeyValue(p.key),
                                     data: incoming.body,
-                                    pick: resource.normalizeFieldNames(params.get('$pick')),
-                                    omit: resource.normalizeFieldNames(params.get('$omit')),
-                                    include: resource.normalizeFieldNames(params.get('$include'))
+                                    pick: pick && resource.normalizeFieldPath(pick),
+                                    omit: omit && resource.normalizeFieldPath(omit),
+                                    include: include && resource.normalizeFieldPath(include),
                                 }
                             }, incoming);
                         }
+                        const filter = params.get('$filter');
                         return new http_request_host_js_1.HttpRequestHost({
                             kind: 'CollectionUpdateManyRequest',
                             resource,
@@ -256,19 +270,26 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                             many: true,
                             args: {
                                 data: incoming.body,
-                                filter: resource.normalizeFilterFields(params.get('$filter'))
+                                filter: filter && resource.normalizeFilter(filter),
                             }
                         }, incoming);
                     }
+                    default:
+                        throw new common_1.BadRequestError();
                 }
             }
             else 
             /*
              * Singleton
              */
-            if (resource instanceof common_1.Singleton && !p.key) {
+            if (resource instanceof common_1.Singleton) {
+                if (p.key)
+                    throw new common_1.BadRequestError();
                 switch (method) {
                     case 'POST': {
+                        const pick = params.get('$pick');
+                        const omit = params.get('$omit');
+                        const include = params.get('$include');
                         return new http_request_host_js_1.HttpRequestHost({
                             kind: 'SingletonCreateRequest',
                             resource,
@@ -277,9 +298,9 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                             many: false,
                             args: {
                                 data: incoming.body,
-                                pick: resource.normalizeFieldNames(params.get('$pick')),
-                                omit: resource.normalizeFieldNames(params.get('$omit')),
-                                include: resource.normalizeFieldNames(params.get('$include'))
+                                pick: pick && resource.normalizeFieldPath(pick),
+                                omit: omit && resource.normalizeFieldPath(omit),
+                                include: include && resource.normalizeFieldPath(include),
                             }
                         }, incoming);
                     }
@@ -294,6 +315,9 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                         }, incoming);
                     }
                     case 'GET': {
+                        const pick = params.get('$pick');
+                        const omit = params.get('$omit');
+                        const include = params.get('$include');
                         return new http_request_host_js_1.HttpRequestHost({
                             kind: 'SingletonGetRequest',
                             resource,
@@ -301,13 +325,16 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                             crud: 'read',
                             many: false,
                             args: {
-                                pick: resource.normalizeFieldNames(params.get('$pick')),
-                                omit: resource.normalizeFieldNames(params.get('$omit')),
-                                include: resource.normalizeFieldNames(params.get('$include'))
+                                pick: pick && resource.normalizeFieldPath(pick),
+                                omit: omit && resource.normalizeFieldPath(omit),
+                                include: include && resource.normalizeFieldPath(include),
                             }
                         }, incoming);
                     }
                     case 'PATCH': {
+                        const pick = params.get('$pick');
+                        const omit = params.get('$omit');
+                        const include = params.get('$include');
                         return new http_request_host_js_1.HttpRequestHost({
                             kind: 'SingletonUpdateRequest',
                             resource,
@@ -316,12 +343,14 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                             many: false,
                             args: {
                                 data: incoming.body,
-                                pick: resource.normalizeFieldNames(params.get('$pick')),
-                                omit: resource.normalizeFieldNames(params.get('$omit')),
-                                include: resource.normalizeFieldNames(params.get('$include'))
+                                pick: pick && resource.normalizeFieldPath(pick),
+                                omit: omit && resource.normalizeFieldPath(omit),
+                                include: include && resource.normalizeFieldPath(include),
                             }
                         }, incoming);
                     }
+                    default:
+                        throw new common_1.BadRequestError();
                 }
             }
             else

package/esm/adapter/adapter.js

@@ -1,15 +1,11 @@
-"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");
+import path from 'path';
+import { AsyncEventEmitter } from 'strict-typed-events';
+import { Collection, DocumentFactory, ForbiddenError, getStackFileName, I18n, OpraSchema, ResourceNotFoundError, Singleton, translate, } from '@opra/common';
+import { MetadataResource } from './internal/metadata.resource.js';
 /**
  * @class OpraAdapter
  */
-class OpraAdapter extends strict_typed_events_1.AsyncEventEmitter {
+export class OpraAdapter extends AsyncEventEmitter {
     constructor(api) {
         super();
         this.api = api;
@@ -21,25 +17,25 @@ class OpraAdapter extends strict_typed_events_1.AsyncEventEmitter {
      */
     async init(options) {
         this.logger = options?.logger;
-        if (options?.i18n instanceof common_1.I18n)
+        if (options?.i18n instanceof 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 || common_1.I18n.defaultInstance;
+        this.i18n = this.i18n || 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,
+        this._internalDoc = await DocumentFactory.createDocument({
+            version: OpraSchema.SpecVersion,
             info: {
-                version: common_1.OpraSchema.SpecVersion,
+                version: OpraSchema.SpecVersion,
                 title: 'Internal resources',
             },
             references: { 'api': this.api },
-            resources: [new metadata_resource_js_1.MetadataResource(this.api)]
+            resources: [new MetadataResource(this.api)]
         });
         const promises = [];
         for (const r of this.api.resources.values()) {
@@ -65,11 +61,11 @@ class OpraAdapter extends strict_typed_events_1.AsyncEventEmitter {
         await this.emitAsync('request', context);
         const { request, response } = context;
         const { resource, operation } = request;
-        if (resource instanceof common_1.Collection || resource instanceof common_1.Singleton) {
+        if (resource instanceof Collection || resource instanceof Singleton) {
             const endpoint = resource.operations[operation];
             if (!endpoint?.handler)
-                throw new common_1.ForbiddenError({
-                    message: (0, common_1.translate)('RESOLVER_FORBIDDEN', { operation }, `The resource endpoint does not accept '{{operation}}' operations`),
+                throw new ForbiddenError({
+                    message: translate('RESOLVER_FORBIDDEN', { operation }, `The resource endpoint does not accept '{{operation}}' operations`),
                     severity: 'error',
                     code: 'RESOLVER_FORBIDDEN'
                 });
@@ -98,7 +94,7 @@ class OpraAdapter extends strict_typed_events_1.AsyncEventEmitter {
                     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);
+                throw new ResourceNotFoundError(resource.name, request.args.key);
         }
     }
     async _createI18n(options) {
@@ -106,13 +102,12 @@ class OpraAdapter extends strict_typed_events_1.AsyncEventEmitter {
             ...options,
         };
         delete opts.resourceDirs;
-        const instance = common_1.I18n.createInstance(opts);
+        const instance = I18n.createInstance(opts);
         await instance.init();
-        await instance.loadResourceDir(path_1.default.resolve((0, common_1.getStackFileName)(), '../../../i18n'));
+        await instance.loadResourceDir(path.resolve(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,12 +1,8 @@
-"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");
+import bodyParser from 'body-parser';
+import { normalizePath } from '@opra/common';
+import { OpraHttpAdapter } from './http-adapter.js';
 const noOp = () => void 0;
-class OpraExpressAdapter extends http_adapter_js_1.OpraHttpAdapter {
+export class OpraExpressAdapter extends OpraHttpAdapter {
     constructor() {
         super(...arguments);
         this.platform = 'express';
@@ -14,8 +10,8 @@ class OpraExpressAdapter extends http_adapter_js_1.OpraHttpAdapter {
     static async create(app, document, options) {
         const adapter = new OpraExpressAdapter(document);
         await adapter.init(options);
-        const prefix = '/' + (0, common_1.normalizePath)(options?.prefix, true);
-        app.use(prefix, body_parser_1.default.json());
+        const prefix = '/' + normalizePath(options?.prefix, true);
+        app.use(prefix, bodyParser.json());
         app.use(prefix, (req, res, next) => {
             req.end = noOp;
             req.send = noOp;
@@ -24,4 +20,3 @@ class OpraExpressAdapter extends http_adapter_js_1.OpraHttpAdapter {
         return adapter;
     }
 }
-exports.OpraExpressAdapter = OpraExpressAdapter;

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

@@ -1,17 +1,14 @@
-"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");
+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';
 /**
  *
  * @class OpraHttpAdapter
  */
-class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
+export class OpraHttpAdapter extends OpraAdapter {
     /**
      * Main http request handler
      * @param incoming
@@ -22,17 +19,17 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
         try {
             // Batch
             if (incoming.is('multipart/mixed')) {
-                throw new common_1.BadRequestError({ message: 'Not implemented yet' });
+                throw new BadRequestError({ message: 'Not implemented yet' });
             }
             if (!(incoming.method === 'POST' || incoming.method === 'PATCH') || incoming.is('json')) {
                 const request = await this.parseRequest(incoming);
-                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 () => {
+                const response = new HttpResponseHost({}, outgoing);
+                const context = new HttpRequestContextHost(this.platform, this.api, request, response);
+                const task = new Task(async () => {
                     try {
                         await this.executeRequest(context);
                         if (request.operation === 'findMany' && request.args.count && response.count != null) {
-                            response.switchToHttp().header(common_1.HttpHeaderCodes.X_Opra_Total_Matches, String(response.count));
+                            response.switchToHttp().header(HttpHeaderCodes.X_Opra_Total_Matches, String(response.count));
                         }
                     }
                     catch (error) {
@@ -50,7 +47,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                 await this.emitAsync('request-finish', context);
                 return;
             }
-            throw new common_1.BadRequestError({ message: 'Unsupported Content-Type' });
+            throw new BadRequestError({ message: 'Unsupported Content-Type' });
         }
         catch (error) {
             await this.errorHandler(incoming, outgoing, [error]);
@@ -58,30 +55,30 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
     }
     async errorHandler(incoming, outgoing, errors) {
         errors.forEach(e => {
-            this.log((e instanceof common_1.OpraException) ? 'error' : 'fatal', incoming, e); // todo. implement a better logger
+            this.log((e instanceof OpraException) ? 'error' : 'fatal', incoming, e); // todo. implement a better logger
         });
-        errors = errors.map(common_1.wrapException);
+        errors = errors.map(wrapException);
         let status = outgoing.statusCode || 0;
         // Sort errors from fatal to info
         errors.sort((a, b) => {
-            const i = common_1.IssueSeverity.Keys.indexOf(a.issue.severity) - common_1.IssueSeverity.Keys.indexOf(b.issue.severity);
+            const i = IssueSeverity.Keys.indexOf(a.issue.severity) - IssueSeverity.Keys.indexOf(b.issue.severity);
             if (i === 0)
                 return b.status - a.status;
             return i;
         });
-        if (!status || status < common_1.HttpStatusCodes.BAD_REQUEST) {
+        if (!status || status < HttpStatusCodes.BAD_REQUEST) {
             status = errors[0].status;
-            if (status < common_1.HttpStatusCodes.BAD_REQUEST)
-                status = common_1.HttpStatusCodes.INTERNAL_SERVER_ERROR;
+            if (status < HttpStatusCodes.BAD_REQUEST)
+                status = HttpStatusCodes.INTERNAL_SERVER_ERROR;
         }
         const body = this.i18n.deep({
             errors: errors.map(e => e.issue)
         });
-        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.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.status(status);
         outgoing.send(JSON.stringify(body));
         outgoing.end();
@@ -100,13 +97,13 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
         const response = context.response;
         const { crud } = request;
         const httpResponse = response.switchToHttp();
-        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 (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 (crud === 'create') {
             if (!response.value)
-                throw new common_1.InternalServerError();
+                throw new InternalServerError();
             // todo validate
             httpResponse.status(201);
         }
@@ -118,12 +115,13 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
      */
     async parseRequest(incoming) {
         try {
-            const url = new common_1.OpraURL();
+            const url = new OpraURL();
             url.searchParams.define({
-                '$pick': { codec: 'string', array: true },
-                '$omit': { codec: 'string', array: true },
-                '$include': { codec: 'string', array: true },
-                '$sort': { codec: 'string', array: true },
+                '$search': { codec: 'string' },
+                '$pick': { codec: 'string', array: 'strict' },
+                '$omit': { codec: 'string', array: 'strict' },
+                '$include': { codec: 'string', array: 'strict' },
+                '$sort': { codec: 'string', array: 'strict' },
                 '$filter': { codec: 'filter' },
                 '$limit': { codec: 'number' },
                 '$skip': { codec: 'number' },
@@ -133,10 +131,10 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
             url.parse(incoming.url);
             // const {context, url, method, headers, body, contentId} = args;
             if (!url.path.size)
-                throw new common_1.BadRequestError();
+                throw new BadRequestError();
             const method = incoming.method;
             if (method !== 'GET' && url.path.size > 1)
-                throw new common_1.BadRequestError();
+                throw new BadRequestError();
             // const pathLen = url.path.size;
             // let pathIndex = 0;
             const params = url.searchParams;
@@ -152,11 +150,14 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
             /*
              * Collection
              */
-            if (resource instanceof common_1.Collection) {
+            if (resource instanceof Collection) {
                 switch (method) {
                     case 'POST': {
                         if (!p.key) {
-                            return new http_request_host_js_1.HttpRequestHost({
+                            const pick = params.get('$pick');
+                            const omit = params.get('$omit');
+                            const include = params.get('$include');
+                            return new HttpRequestHost({
                                 kind: 'CollectionCreateRequest',
                                 resource,
                                 operation: 'create',
@@ -164,9 +165,9 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                                 many: false,
                                 args: {
                                     data: incoming.body,
-                                    pick: resource.normalizeFieldNames(params.get('$pick')),
-                                    omit: resource.normalizeFieldNames(params.get('$omit')),
-                                    include: resource.normalizeFieldNames(params.get('$include'))
+                                    pick: pick && resource.normalizeFieldPath(pick),
+                                    omit: omit && resource.normalizeFieldPath(omit),
+                                    include: include && resource.normalizeFieldPath(include)
                                 }
                             }, incoming);
                         }
@@ -174,7 +175,7 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                     }
                     case 'DELETE': {
                         if (p.key) {
-                            return new http_request_host_js_1.HttpRequestHost({
+                            return new HttpRequestHost({
                                 kind: 'CollectionDeleteRequest',
                                 resource,
                                 operation: 'delete',
@@ -185,20 +186,24 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                                 }
                             }, incoming);
                         }
-                        return new http_request_host_js_1.HttpRequestHost({
+                        const filter = params.get('$filter');
+                        return new HttpRequestHost({
                             kind: 'CollectionDeleteManyRequest',
                             resource,
                             operation: 'deleteMany',
                             crud: 'delete',
                             many: true,
                             args: {
-                                filter: resource.normalizeFilterFields(params.get('$filter'))
+                                filter: filter && resource.normalizeFilter(filter)
                             }
                         }, incoming);
                     }
                     case 'GET': {
+                        const pick = params.get('$pick');
+                        const omit = params.get('$omit');
+                        const include = params.get('$include');
                         if (p.key) {
-                            return new http_request_host_js_1.HttpRequestHost({
+                            return new HttpRequestHost({
                                 kind: 'CollectionGetRequest',
                                 resource,
                                 operation: 'get',
@@ -206,24 +211,26 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                                 many: false,
                                 args: {
                                     key: resource.parseKeyValue(p.key),
-                                    pick: resource.normalizeFieldNames(params.get('$pick')),
-                                    omit: resource.normalizeFieldNames(params.get('$omit')),
-                                    include: resource.normalizeFieldNames(params.get('$include'))
+                                    pick: pick && resource.normalizeFieldPath(pick),
+                                    omit: omit && resource.normalizeFieldPath(omit),
+                                    include: include && resource.normalizeFieldPath(include)
                                 }
                             }, incoming);
                         }
-                        return new http_request_host_js_1.HttpRequestHost({
+                        const filter = params.get('$filter');
+                        const sort = params.get('$sort');
+                        return new HttpRequestHost({
                             kind: 'CollectionFindManyRequest',
                             resource,
                             operation: 'findMany',
                             crud: 'read',
                             many: true,
                             args: {
-                                sort: resource.normalizeSortFields(params.get('$sort')),
-                                pick: resource.normalizeFieldNames(params.get('$pick')),
-                                omit: resource.normalizeFieldNames(params.get('$omit')),
-                                include: resource.normalizeFieldNames(params.get('$include')),
-                                filter: resource.normalizeFilterFields(params.get('$filter')),
+                                pick: pick && resource.normalizeFieldPath(pick),
+                                omit: omit && resource.normalizeFieldPath(omit),
+                                include: include && resource.normalizeFieldPath(include),
+                                sort: sort && resource.normalizeSortFields(sort),
+                                filter: filter && resource.normalizeFilter(filter),
                                 limit: params.get('$limit'),
                                 skip: params.get('$skip'),
                                 distinct: params.get('$distinct'),
@@ -233,7 +240,10 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                     }
                     case 'PATCH': {
                         if (p.key) {
-                            return new http_request_host_js_1.HttpRequestHost({
+                            const pick = params.get('$pick');
+                            const omit = params.get('$omit');
+                            const include = params.get('$include');
+                            return new HttpRequestHost({
                                 kind: 'CollectionUpdateRequest',
                                 resource,
                                 operation: 'update',
@@ -242,13 +252,14 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                                 args: {
                                     key: resource.parseKeyValue(p.key),
                                     data: incoming.body,
-                                    pick: resource.normalizeFieldNames(params.get('$pick')),
-                                    omit: resource.normalizeFieldNames(params.get('$omit')),
-                                    include: resource.normalizeFieldNames(params.get('$include'))
+                                    pick: pick && resource.normalizeFieldPath(pick),
+                                    omit: omit && resource.normalizeFieldPath(omit),
+                                    include: include && resource.normalizeFieldPath(include),
                                 }
                             }, incoming);
                         }
-                        return new http_request_host_js_1.HttpRequestHost({
+                        const filter = params.get('$filter');
+                        return new HttpRequestHost({
                             kind: 'CollectionUpdateManyRequest',
                             resource,
                             operation: 'updateMany',
@@ -256,20 +267,27 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                             many: true,
                             args: {
                                 data: incoming.body,
-                                filter: resource.normalizeFilterFields(params.get('$filter'))
+                                filter: filter && resource.normalizeFilter(filter),
                             }
                         }, incoming);
                     }
+                    default:
+                        throw new BadRequestError();
                 }
             }
             else 
             /*
              * Singleton
              */
-            if (resource instanceof common_1.Singleton && !p.key) {
+            if (resource instanceof Singleton) {
+                if (p.key)
+                    throw new BadRequestError();
                 switch (method) {
                     case 'POST': {
-                        return new http_request_host_js_1.HttpRequestHost({
+                        const pick = params.get('$pick');
+                        const omit = params.get('$omit');
+                        const include = params.get('$include');
+                        return new HttpRequestHost({
                             kind: 'SingletonCreateRequest',
                             resource,
                             operation: 'create',
@@ -277,14 +295,14 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                             many: false,
                             args: {
                                 data: incoming.body,
-                                pick: resource.normalizeFieldNames(params.get('$pick')),
-                                omit: resource.normalizeFieldNames(params.get('$omit')),
-                                include: resource.normalizeFieldNames(params.get('$include'))
+                                pick: pick && resource.normalizeFieldPath(pick),
+                                omit: omit && resource.normalizeFieldPath(omit),
+                                include: include && resource.normalizeFieldPath(include),
                             }
                         }, incoming);
                     }
                     case 'DELETE': {
-                        return new http_request_host_js_1.HttpRequestHost({
+                        return new HttpRequestHost({
                             kind: 'SingletonDeleteRequest',
                             resource,
                             operation: 'delete',
@@ -294,21 +312,27 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                         }, incoming);
                     }
                     case 'GET': {
-                        return new http_request_host_js_1.HttpRequestHost({
+                        const pick = params.get('$pick');
+                        const omit = params.get('$omit');
+                        const include = params.get('$include');
+                        return new HttpRequestHost({
                             kind: 'SingletonGetRequest',
                             resource,
                             operation: 'get',
                             crud: 'read',
                             many: false,
                             args: {
-                                pick: resource.normalizeFieldNames(params.get('$pick')),
-                                omit: resource.normalizeFieldNames(params.get('$omit')),
-                                include: resource.normalizeFieldNames(params.get('$include'))
+                                pick: pick && resource.normalizeFieldPath(pick),
+                                omit: omit && resource.normalizeFieldPath(omit),
+                                include: include && resource.normalizeFieldPath(include),
                             }
                         }, incoming);
                     }
                     case 'PATCH': {
-                        return new http_request_host_js_1.HttpRequestHost({
+                        const pick = params.get('$pick');
+                        const omit = params.get('$omit');
+                        const include = params.get('$include');
+                        return new HttpRequestHost({
                             kind: 'SingletonUpdateRequest',
                             resource,
                             operation: 'update',
@@ -316,16 +340,18 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
                             many: false,
                             args: {
                                 data: incoming.body,
-                                pick: resource.normalizeFieldNames(params.get('$pick')),
-                                omit: resource.normalizeFieldNames(params.get('$omit')),
-                                include: resource.normalizeFieldNames(params.get('$include'))
+                                pick: pick && resource.normalizeFieldPath(pick),
+                                omit: omit && resource.normalizeFieldPath(omit),
+                                include: include && resource.normalizeFieldPath(include),
                             }
                         }, incoming);
                     }
+                    default:
+                        throw new BadRequestError();
                 }
             }
             else
-                throw new common_1.InternalServerError();
+                throw new InternalServerError();
             // if (query instanceof SingletonGetQuery || query instanceof CollectionGetQuery || query instanceof ElementReadQuery) {
             //   // Move through properties
             //   let parentType: DataType;
@@ -347,14 +373,14 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
             //     parent = parent.child;
             //   }
             // }
-            throw new common_1.MethodNotAllowedError({
+            throw new MethodNotAllowedError({
                 message: `Method "${method}" is not allowed by target endpoint`
             });
         }
         catch (e) {
-            if (e instanceof common_1.OpraException)
+            if (e instanceof OpraException)
                 throw e;
-            throw new common_1.BadRequestError(e);
+            throw new BadRequestError(e);
         }
     }
     // async parseMultiPart(
@@ -438,23 +464,23 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
     async sendResponse(context) {
         const { request, response } = context;
         const outgoing = response.switchToHttp();
-        const errors = response.errors?.map(e => (0, common_1.wrapException)(e));
+        const errors = response.errors?.map(e => wrapException(e));
         if (errors && errors.length) {
             await this.errorHandler(request.switchToHttp(), outgoing, errors);
             return;
         }
-        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);
+        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);
         if (response.value) {
             if (typeof response.value === 'object') {
-                if ((0, common_1.isReadable)(response.value) || Buffer.isBuffer(response.value))
+                if (isReadable(response.value) || Buffer.isBuffer(response.value))
                     outgoing.send(response.value);
                 else {
                     const body = this.i18n.deep(response.value);
-                    outgoing.set(common_1.HttpHeaderCodes.Content_Type, 'application/json; charset=utf-8');
+                    outgoing.set(HttpHeaderCodes.Content_Type, 'application/json; charset=utf-8');
                     outgoing.send(JSON.stringify(body));
                 }
             }
@@ -464,4 +490,3 @@ class OpraHttpAdapter extends adapter_js_1.OpraAdapter {
         outgoing.end();
     }
 }
-exports.OpraHttpAdapter = OpraHttpAdapter;

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

@@ -1,8 +1,5 @@
-"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 {
+import { RequestContextHost } from '../request-context.host.js';
+export class HttpRequestContextHost extends RequestContextHost {
     constructor(platform, api, _request, _response) {
         super('http', platform, api, _request, _response);
         this.platform = platform;
@@ -25,4 +22,3 @@ class HttpRequestContextHost extends request_context_host_js_1.RequestContextHos
         throw new TypeError('Not executing in an "RPC" protocol');
     }
 }
-exports.HttpRequestContextHost = HttpRequestContextHost;

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

@@ -1,8 +1,5 @@
-"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 {
+import { RequestHost } from '../request.host.js';
+export class HttpRequestHost extends RequestHost {
     constructor(init, _incoming) {
         super(init);
         this._incoming = _incoming;
@@ -11,4 +8,3 @@ class HttpRequestHost extends request_host_js_1.RequestHost {
         return this._incoming;
     }
 }
-exports.HttpRequestHost = HttpRequestHost;

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

@@ -1,8 +1,5 @@
-"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 {
+import { ResponseHost } from '../response.host.js';
+export class HttpResponseHost extends ResponseHost {
     constructor(init, _outgoing) {
         super(init);
         this._outgoing = _outgoing;
@@ -11,4 +8,3 @@ class HttpResponseHost extends response_host_js_1.ResponseHost {
         return this._outgoing;
     }
 }
-exports.HttpResponseHost = HttpResponseHost;

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,5 @@
-"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 {
+import { AsyncEventEmitter } from 'strict-typed-events';
+export class RequestContextHost extends AsyncEventEmitter {
     constructor(protocol, platform, api, _request, _response) {
         super();
         this.protocol = protocol;
@@ -27,4 +24,3 @@ class RequestContextHost extends strict_typed_events_1.AsyncEventEmitter {
         throw new TypeError('Not executing in an "RPC" protocol');
     }
 }
-exports.RequestContextHost = RequestContextHost;

package/esm/adapter/request.host.js

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

package/esm/adapter/response.host.js

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

package/esm/augmentation/resource.augmentation.js

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

package/esm/index.js

@@ -1,13 +1,10 @@
-"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);
+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';

package/esm/types.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.16.1",
+  "version": "0.17.0",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "clean:cover": "rimraf ../../coverage/core"
   },
   "dependencies": {
-    "@opra/common": "^0.16.1",
+    "@opra/common": "^0.17.0",
     "content-type": "^1.0.5",
     "lodash.isnil": "^4.0.0",
     "lodash.omitby": "^4.6.0",