@opra/sqb 0.16.2 → 0.17.0

package/cjs/sqb-adapter.js

@@ -33,8 +33,8 @@ var SQBAdapter;
                 options.omit = args.omit?.length ? args.omit : undefined;
                 options.include = args.include?.length ? args.include : undefined;
             }
-            if (args.filter) {
-                options.filter = SQBAdapter.transformFilter(args.filter);
+            if (resource instanceof common_1.Collection && args.filter) {
+                options.filter = (0, transform_filter_js_1.default)(resource, args.filter);
             }
             if (operation === 'findMany') {
                 options.sort = args.sort?.length ? args.sort : undefined;

package/cjs/sqb-collection-resource.js

@@ -35,7 +35,7 @@ class SqbCollectionResource {
         const service = await this.getService(ctx);
         return service.with(ctx).updateMany(prepared.data, prepared.options);
     }
-    async search(ctx) {
+    async findMany(ctx) {
         const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         if (prepared.options.count) {
@@ -91,5 +91,5 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "search", null);
+], SqbCollectionResource.prototype, "findMany", null);
 exports.SqbCollectionResource = SqbCollectionResource;

package/cjs/transform-filter.js

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const common_1 = require("@opra/common");
 const sqb = tslib_1.__importStar(require("@sqb/builder"));
-function transformFilter(str) {
+function transformFilter(resource, str) {
     const ast = typeof str === 'string' ? (0, common_1.parseFilter)(str) : str;
     if (!ast)
         return;
+    resource.normalizeFilter(ast);
     if (ast instanceof common_1.ComparisonExpression) {
-        const left = ast.left instanceof common_1.QualifiedIdentifier
-            ? sqb.Field(ast.left.value)
-            : transformFilter(ast.left);
-        const right = transformFilter(ast.right);
+        if (!(ast.left instanceof common_1.QualifiedIdentifier && ast.left.field))
+            throw new TypeError(`Unsupported filter query. Left side should be a data field.`);
+        const left = sqb.Field(ast.left.value);
+        const right = transformFilter(resource, ast.right);
         switch (ast.op) {
             case '=':
                 return sqb.Eq(left, right);
@@ -53,15 +54,15 @@ function transformFilter(str) {
         return ast.value;
     }
     if (ast instanceof common_1.ArrayExpression) {
-        return ast.items.map(transformFilter);
+        return ast.items.map(i => transformFilter(resource, i));
     }
     if (ast instanceof common_1.LogicalExpression) {
         if (ast.op === 'or')
-            return sqb.Or(...ast.items.map(transformFilter));
-        return sqb.And(...ast.items.map(transformFilter));
+            return sqb.Or(...ast.items.map((i => transformFilter(resource, i))));
+        return sqb.And(...ast.items.map((i => transformFilter(resource, i))));
     }
     if (ast instanceof common_1.ParenthesesExpression) {
-        return transformFilter(ast.expression);
+        return transformFilter(resource, ast.expression);
     }
     throw new Error(`${ast.type} is not implemented yet`);
 }

package/esm/augmentation/document-factory.augmentation.js

@@ -1,18 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("@opra/common");
-const connect_1 = require("@sqb/connect");
+import { DocumentFactory, METADATA_KEY } from "@opra/common";
+import { DataType as SqbDataType, EntityMetadata, isAssociationField } from '@sqb/connect';
 // @ts-ignore
-const _extractFieldSchema = common_1.DocumentFactory.prototype.extractFieldSchema;
+const _extractFieldSchema = DocumentFactory.prototype.extractFieldSchema;
 // @ts-ignore
-common_1.DocumentFactory.prototype.extractFieldSchema = async function (target, ctor, metadata, name) {
+DocumentFactory.prototype.extractFieldSchema = async function (target, ctor, metadata, name) {
     await _extractFieldSchema.call(this, target, ctor, metadata, name);
-    const sqbMeta = connect_1.EntityMetadata.get(ctor);
-    const sqbField = sqbMeta && connect_1.EntityMetadata.getField(sqbMeta, name);
+    const sqbMeta = EntityMetadata.get(ctor);
+    const sqbField = sqbMeta && EntityMetadata.getField(sqbMeta, name);
     if (!sqbField)
         return;
     const detectType = !metadata.type;
-    if ((0, connect_1.isAssociationField)(sqbField)) {
+    if (isAssociationField(sqbField)) {
         if (!sqbField.association.returnsMany())
             delete target.isArray;
         if (!target.type) {
@@ -26,60 +24,60 @@ common_1.DocumentFactory.prototype.extractFieldSchema = async function (target,
     else if (sqbField.kind === 'column') {
         if (typeof sqbField.enum === 'object')
             metadata.enum = sqbField.enum;
-        if (sqbField.type && Reflect.hasMetadata(common_1.METADATA_KEY, sqbField.type)) {
+        if (sqbField.type && Reflect.hasMetadata(METADATA_KEY, sqbField.type)) {
             target.type = sqbField.type;
         }
         switch (sqbField.dataType) {
-            case connect_1.DataType.GUID:
+            case SqbDataType.GUID:
                 if (!target.type || (detectType && target.type === 'string'))
                     target.type = 'guid';
                 break;
-            case connect_1.DataType.JSON:
+            case SqbDataType.JSON:
                 if (!target.type || (detectType && target.type === 'any'))
                     target.type = 'object';
                 break;
-            case connect_1.DataType.INTEGER:
-            case connect_1.DataType.SMALLINT:
+            case SqbDataType.INTEGER:
+            case SqbDataType.SMALLINT:
                 if (!target.type || (detectType && target.type === 'number'))
                     target.type = 'integer';
                 break;
-            case connect_1.DataType.BIGINT:
+            case SqbDataType.BIGINT:
                 if (!target.type || (detectType && target.type === 'number'))
                     target.type = 'bigint';
                 break;
-            case connect_1.DataType.DATE:
+            case SqbDataType.DATE:
                 if (!target.type || (detectType && (target.type === 'timestamp' || target.type === 'string')))
                     target.type = 'date';
                 break;
-            case connect_1.DataType.TIMESTAMPTZ:
+            case SqbDataType.TIMESTAMPTZ:
                 if (!target.type || (detectType && (target.type === 'timestamp' || target.type === 'string')))
                     target.type = 'timestamptz';
                 break;
-            case connect_1.DataType.TIME:
+            case SqbDataType.TIME:
                 if (!target.type || (detectType && (target.type === 'timestamp' || target.type === 'string')))
                     target.type = 'time';
                 break;
-            case connect_1.DataType.BINARY:
+            case SqbDataType.BINARY:
                 if (!target.type || (detectType && target.type === 'string'))
                     target.type = 'base64';
                 break;
         }
         if (!target.type) {
             switch (sqbField.dataType) {
-                case connect_1.DataType.BOOL:
+                case SqbDataType.BOOL:
                     target.type = 'boolean';
                     break;
-                case connect_1.DataType.CHAR:
-                case connect_1.DataType.VARCHAR:
-                case connect_1.DataType.TEXT:
+                case SqbDataType.CHAR:
+                case SqbDataType.VARCHAR:
+                case SqbDataType.TEXT:
                     target.type = 'string';
                     break;
-                case connect_1.DataType.FLOAT:
-                case connect_1.DataType.DOUBLE:
-                case connect_1.DataType.NUMBER:
+                case SqbDataType.FLOAT:
+                case SqbDataType.DOUBLE:
+                case SqbDataType.NUMBER:
                     target.type = 'number';
                     break;
-                case connect_1.DataType.TIMESTAMP:
+                case SqbDataType.TIMESTAMP:
                     target.type = 'timestamp';
                     break;
             }
@@ -95,14 +93,14 @@ common_1.DocumentFactory.prototype.extractFieldSchema = async function (target,
         target.exclusive = sqbField.exclusive;
 };
 // @ts-ignore
-const _createCollection = common_1.DocumentFactory.prototype.createCollection;
+const _createCollection = DocumentFactory.prototype.createCollection;
 // @ts-ignore
-common_1.DocumentFactory.prototype.createCollection = async function (name, schema) {
+DocumentFactory.prototype.createCollection = async function (name, schema) {
     const { document } = this;
     const dataType = document.getComplexType(schema.type);
     // Determine primaryKey if not defined
     if (!schema.primaryKey && dataType.ctor) {
-        const entityMetadata = connect_1.EntityMetadata.get(dataType.ctor);
+        const entityMetadata = EntityMetadata.get(dataType.ctor);
         if (entityMetadata?.indexes) {
             const primaryIndex = entityMetadata.indexes.find(x => x.primary);
             if (primaryIndex) {

package/esm/augmentation/mapped-type.augmentation.js

@@ -1,14 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("@opra/common");
-const connect_1 = require("@sqb/connect");
-const _applyMixin = common_1.MappedType._applyMixin;
-common_1.MappedType._applyMixin = function (target, source, options) {
+import { MappedType } from "@opra/common";
+import { Entity, EntityMetadata } from '@sqb/connect';
+const _applyMixin = MappedType._applyMixin;
+MappedType._applyMixin = function (target, source, options) {
     _applyMixin.call(null, target, source, options);
-    const srcMeta = connect_1.Entity.getMetadata(source);
+    const srcMeta = Entity.getMetadata(source);
     if (srcMeta) {
-        const trgMeta = connect_1.EntityMetadata.define(target);
+        const trgMeta = EntityMetadata.define(target);
         const { isInheritedPredicate } = options;
-        connect_1.EntityMetadata.mixin(trgMeta, srcMeta, k => isInheritedPredicate(k));
+        EntityMetadata.mixin(trgMeta, srcMeta, k => isInheritedPredicate(k));
     }
 };

package/esm/augmentation/union-type.augmentation.js

@@ -1,9 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("@opra/common");
-const connect_1 = require("@sqb/connect");
-const _applyMixin = common_1.UnionType._applyMixin;
-common_1.UnionType._applyMixin = function (target, ...sources) {
+import { UnionType } from "@opra/common";
+import { Entity } from '@sqb/connect';
+const _applyMixin = UnionType._applyMixin;
+UnionType._applyMixin = function (target, ...sources) {
     _applyMixin.call(null, target, ...sources);
-    connect_1.Entity.mixin(target, ...sources);
+    Entity.mixin(target, ...sources);
 };

package/esm/index.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-require("./augmentation/document-factory.augmentation.js");
-require("./augmentation/mapped-type.augmentation.js");
-require("./augmentation/union-type.augmentation.js");
-tslib_1.__exportStar(require("./sqb-adapter.js"), exports);
-tslib_1.__exportStar(require("./sqb-collection-resource.js"), exports);
-tslib_1.__exportStar(require("./sqb-entity-service.js"), exports);
-tslib_1.__exportStar(require("./sqb-singleton-resource.js"), exports);
+import './augmentation/document-factory.augmentation.js';
+import './augmentation/mapped-type.augmentation.js';
+import './augmentation/union-type.augmentation.js';
+export * from './sqb-adapter.js';
+export * from './sqb-collection-resource.js';
+export * from './sqb-entity-service.js';
+export * from './sqb-singleton-resource.js';

package/esm/sqb-adapter.js

@@ -1,26 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQBAdapter = void 0;
-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");
-const connect_1 = require("@sqb/connect");
-const transform_filter_js_1 = tslib_1.__importDefault(require("./transform-filter.js"));
-const transform_key_values_js_1 = tslib_1.__importDefault(require("./transform-key-values.js"));
-var SQBAdapter;
+import isNil from 'lodash.isnil';
+import omitBy from 'lodash.omitby';
+import { Collection, Singleton } from '@opra/common';
+import { EntityMetadata } from '@sqb/connect';
+import _transformFilter from './transform-filter.js';
+import _transformKeyValues from './transform-key-values.js';
+export var SQBAdapter;
 (function (SQBAdapter) {
-    SQBAdapter.transformFilter = transform_filter_js_1.default;
-    SQBAdapter.transformKeyValues = transform_key_values_js_1.default;
+    SQBAdapter.transformFilter = _transformFilter;
+    SQBAdapter.transformKeyValues = _transformKeyValues;
     function transformRequest(request) {
         const { resource } = request;
-        if (resource instanceof common_1.Collection || resource instanceof common_1.Singleton) {
+        if (resource instanceof Collection || resource instanceof Singleton) {
             const { args, operation } = request;
             let options = {};
-            const entityMetadata = connect_1.EntityMetadata.get(resource.type.ctor);
+            const entityMetadata = EntityMetadata.get(resource.type.ctor);
             if (!entityMetadata)
                 throw new Error(`Type class "${resource.type.ctor}" is not an SQB entity`);
-            if (resource instanceof common_1.Collection) {
+            if (resource instanceof Collection) {
                 const primaryIndex = entityMetadata.indexes.find(x => x.primary);
                 // Check if resource primary keys are same with entity
                 const primaryKeys = [...(primaryIndex && primaryIndex.columns) || []];
@@ -33,8 +29,8 @@ var SQBAdapter;
                 options.omit = args.omit?.length ? args.omit : undefined;
                 options.include = args.include?.length ? args.include : undefined;
             }
-            if (args.filter) {
-                options.filter = SQBAdapter.transformFilter(args.filter);
+            if (resource instanceof Collection && args.filter) {
+                options.filter = _transformFilter(resource, args.filter);
             }
             if (operation === 'findMany') {
                 options.sort = args.sort?.length ? args.sort : undefined;
@@ -43,7 +39,7 @@ var SQBAdapter;
                 options.distinct = args.distinct;
                 options.count = args.count;
             }
-            options = (0, lodash_omitby_1.default)(options, lodash_isnil_1.default);
+            options = omitBy(options, isNil);
             if (operation === 'create') {
                 return {
                     method: 'create',
@@ -52,7 +48,7 @@ var SQBAdapter;
                     args: [args.data, options]
                 };
             }
-            if (operation === 'deleteMany' || (operation === 'delete' && resource instanceof common_1.Singleton)) {
+            if (operation === 'deleteMany' || (operation === 'delete' && resource instanceof Singleton)) {
                 return {
                     method: 'deleteMany',
                     options,
@@ -68,7 +64,7 @@ var SQBAdapter;
                 };
             }
             if (operation === 'get') {
-                if (resource instanceof common_1.Singleton)
+                if (resource instanceof Singleton)
                     return {
                         method: 'findOne',
                         options,
@@ -91,7 +87,7 @@ var SQBAdapter;
                     out.count = args.count;
                 return out;
             }
-            if (operation === 'updateMany' || (operation === 'update' && resource instanceof common_1.Singleton)) {
+            if (operation === 'updateMany' || (operation === 'update' && resource instanceof Singleton)) {
                 return {
                     method: 'updateMany',
                     data: args.data,
@@ -112,4 +108,4 @@ var SQBAdapter;
         throw new Error(`Unimplemented request method "${request.operation}"`);
     }
     SQBAdapter.transformRequest = transformRequest;
-})(SQBAdapter = exports.SQBAdapter || (exports.SQBAdapter = {}));
+})(SQBAdapter || (SQBAdapter = {}));

package/esm/sqb-collection-resource.js

@@ -1,42 +1,39 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqbCollectionResource = void 0;
-const tslib_1 = require("tslib");
-const common_1 = require("@opra/common");
-const sqb_adapter_js_1 = require("./sqb-adapter.js");
-class SqbCollectionResource {
+import { __decorate, __metadata } from "tslib";
+import { Collection } from '@opra/common';
+import { SQBAdapter } from './sqb-adapter.js';
+export class SqbCollectionResource {
     async create(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return service.with(ctx).create(prepared.data, prepared.options);
     }
     async delete(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return service.with(ctx).delete(prepared.key, prepared.options);
     }
     async deleteMany(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return service.with(ctx).deleteMany(prepared.options);
     }
     async find(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return service.with(ctx).find(prepared.key, prepared.options);
     }
     async update(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return service.with(ctx).update(prepared.key, prepared.data, prepared.options);
     }
     async updateMany(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return service.with(ctx).updateMany(prepared.data, prepared.options);
     }
-    async search(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+    async findMany(ctx) {
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         if (prepared.options.count) {
             const [items, count] = await Promise.all([
@@ -50,46 +47,45 @@ class SqbCollectionResource {
             return service.with(ctx).findAll(prepared.options);
     }
 }
-tslib_1.__decorate([
-    common_1.Collection.Create(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
+__decorate([
+    Collection.Create(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
 ], SqbCollectionResource.prototype, "create", null);
-tslib_1.__decorate([
-    common_1.Collection.Delete(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
+__decorate([
+    Collection.Delete(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
 ], SqbCollectionResource.prototype, "delete", null);
-tslib_1.__decorate([
-    common_1.Collection.DeleteMany(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
+__decorate([
+    Collection.DeleteMany(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
 ], SqbCollectionResource.prototype, "deleteMany", null);
-tslib_1.__decorate([
-    common_1.Collection.Get(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
+__decorate([
+    Collection.Get(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
 ], SqbCollectionResource.prototype, "find", null);
-tslib_1.__decorate([
-    common_1.Collection.Update(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
+__decorate([
+    Collection.Update(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
 ], SqbCollectionResource.prototype, "update", null);
-tslib_1.__decorate([
-    common_1.Collection.UpdateMany(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
+__decorate([
+    Collection.UpdateMany(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
 ], SqbCollectionResource.prototype, "updateMany", null);
-tslib_1.__decorate([
-    common_1.Collection.FindMany(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "search", null);
-exports.SqbCollectionResource = SqbCollectionResource;
+__decorate([
+    Collection.FindMany(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], SqbCollectionResource.prototype, "findMany", null);

package/esm/sqb-entity-service.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqbEntityService = void 0;
-const connect_1 = require("@sqb/connect");
-class SqbEntityService {
+import { EntityMetadata } from '@sqb/connect';
+export class SqbEntityService {
     constructor(typeClass, options) {
         this.typeClass = typeClass;
-        const metadata = connect_1.EntityMetadata.get(typeClass);
+        const metadata = EntityMetadata.get(typeClass);
         if (!metadata)
             throw new TypeError(`Class ${typeClass} is not decorated with $Entity() decorator`);
         this.db = options?.db;
@@ -173,4 +170,3 @@ class SqbEntityService {
         return this.db;
     }
 }
-exports.SqbEntityService = SqbEntityService;

package/esm/sqb-singleton-resource.js

@@ -1,54 +1,50 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqbSingletonResource = void 0;
-const tslib_1 = require("tslib");
-const common_1 = require("@opra/common");
-const sqb_adapter_js_1 = require("./sqb-adapter.js");
-class SqbSingletonResource {
+import { __decorate, __metadata } from "tslib";
+import { Singleton } from '@opra/common';
+import { SQBAdapter } from './sqb-adapter.js';
+export class SqbSingletonResource {
     async create(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return service.with(ctx).create(prepared.data, prepared.options);
     }
     async delete(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return !!(await service.with(ctx).deleteMany(prepared.options));
     }
     async get(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return service.with(ctx).findOne(prepared.options);
     }
     async update(ctx) {
-        const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
+        const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         await service.with(ctx).updateMany(prepared.data, prepared.options);
         return service.with(ctx).findOne(prepared.options);
     }
 }
-tslib_1.__decorate([
-    common_1.Singleton.Create(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
+__decorate([
+    Singleton.Create(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
 ], SqbSingletonResource.prototype, "create", null);
-tslib_1.__decorate([
-    common_1.Singleton.Delete(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
+__decorate([
+    Singleton.Delete(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
 ], SqbSingletonResource.prototype, "delete", null);
-tslib_1.__decorate([
-    common_1.Singleton.Get(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
+__decorate([
+    Singleton.Get(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
 ], SqbSingletonResource.prototype, "get", null);
-tslib_1.__decorate([
-    common_1.Singleton.Update(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
+__decorate([
+    Singleton.Update(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
 ], SqbSingletonResource.prototype, "update", null);
-exports.SqbSingletonResource = SqbSingletonResource;

package/esm/transform-filter.js

@@ -1,17 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const common_1 = require("@opra/common");
-const sqb = tslib_1.__importStar(require("@sqb/builder"));
-function transformFilter(str) {
-    const ast = typeof str === 'string' ? (0, common_1.parseFilter)(str) : str;
+import { ArrayExpression, BooleanLiteral, ComparisonExpression, DateLiteral, LogicalExpression, NullLiteral, NumberLiteral, ParenthesesExpression, parseFilter, QualifiedIdentifier, StringLiteral, TimeLiteral } from '@opra/common';
+import * as sqb from '@sqb/builder';
+export default function transformFilter(resource, str) {
+    const ast = typeof str === 'string' ? parseFilter(str) : str;
     if (!ast)
         return;
-    if (ast instanceof common_1.ComparisonExpression) {
-        const left = ast.left instanceof common_1.QualifiedIdentifier
-            ? sqb.Field(ast.left.value)
-            : transformFilter(ast.left);
-        const right = transformFilter(ast.right);
+    resource.normalizeFilter(ast);
+    if (ast instanceof ComparisonExpression) {
+        if (!(ast.left instanceof QualifiedIdentifier && ast.left.field))
+            throw new TypeError(`Unsupported filter query. Left side should be a data field.`);
+        const left = sqb.Field(ast.left.value);
+        const right = transformFilter(resource, ast.right);
         switch (ast.op) {
             case '=':
                 return sqb.Eq(left, right);
@@ -41,28 +39,27 @@ function transformFilter(str) {
                 throw new Error(`ComparisonExpression operator (${ast.op}) not implemented yet`);
         }
     }
-    if (ast instanceof common_1.QualifiedIdentifier) {
+    if (ast instanceof QualifiedIdentifier) {
         return ast.value;
     }
-    if (ast instanceof common_1.NumberLiteral ||
-        ast instanceof common_1.StringLiteral ||
-        ast instanceof common_1.BooleanLiteral ||
-        ast instanceof common_1.NullLiteral ||
-        ast instanceof common_1.DateLiteral ||
-        ast instanceof common_1.TimeLiteral) {
+    if (ast instanceof NumberLiteral ||
+        ast instanceof StringLiteral ||
+        ast instanceof BooleanLiteral ||
+        ast instanceof NullLiteral ||
+        ast instanceof DateLiteral ||
+        ast instanceof TimeLiteral) {
         return ast.value;
     }
-    if (ast instanceof common_1.ArrayExpression) {
-        return ast.items.map(transformFilter);
+    if (ast instanceof ArrayExpression) {
+        return ast.items.map(i => transformFilter(resource, i));
     }
-    if (ast instanceof common_1.LogicalExpression) {
+    if (ast instanceof LogicalExpression) {
         if (ast.op === 'or')
-            return sqb.Or(...ast.items.map(transformFilter));
-        return sqb.And(...ast.items.map(transformFilter));
+            return sqb.Or(...ast.items.map((i => transformFilter(resource, i))));
+        return sqb.And(...ast.items.map((i => transformFilter(resource, i))));
     }
-    if (ast instanceof common_1.ParenthesesExpression) {
-        return transformFilter(ast.expression);
+    if (ast instanceof ParenthesesExpression) {
+        return transformFilter(resource, ast.expression);
     }
     throw new Error(`${ast.type} is not implemented yet`);
 }
-exports.default = transformFilter;

package/esm/transform-key-values.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function transformKeyValues(resource, keyValues) {
+export default function transformKeyValues(resource, keyValues) {
     const { primaryKey } = resource;
     if (primaryKey.length > 1) {
         const query = {};
@@ -11,4 +9,3 @@ function transformKeyValues(resource, keyValues) {
     }
     return { [primaryKey[0]]: keyValues };
 }
-exports.default = transformKeyValues;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/sqb",
-  "version": "0.16.2",
+  "version": "0.17.0",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "ts-gems": "^2.3.0"
   },
   "peerDependencies": {
-    "@opra/core": "^0.16.2",
+    "@opra/core": "^0.17.0",
     "@sqb/connect": ">= 4.8.2"
   },
   "type": "module",

package/types/sqb-collection-resource.d.ts

@@ -9,6 +9,6 @@ export declare abstract class SqbCollectionResource<T> {
     find(ctx: RequestContext): Promise<Maybe<PartialOutput<T>>>;
     update(ctx: RequestContext): Promise<Maybe<PartialOutput<T>>>;
     updateMany(ctx: RequestContext): Promise<number>;
-    search(ctx: RequestContext): Promise<PartialOutput<T>[]>;
+    findMany(ctx: RequestContext): Promise<PartialOutput<T>[]>;
     abstract getService(ctx: RequestContext): SqbEntityService<T> | Promise<SqbEntityService<T>>;
 }

package/types/transform-filter.d.ts

@@ -1,2 +1,2 @@
-import { Expression } from '@opra/common';
-export default function transformFilter(str: string | Expression | undefined): any;
+import { Collection, Expression } from '@opra/common';
+export default function transformFilter(resource: Collection, str: string | Expression | undefined): any;