@opra/common 1.9.0 → 1.9.2

package/cjs/document/decorators/http-operation-entity.decorator.js

@@ -120,8 +120,16 @@ function createFilterDecorator(decorator, decoratorChain, dataType) {
         const filterOptions = (Array.isArray(arg0)
             ? { operators: arg0 }
             : typeof arg0 === 'string'
-                ? { operators: [arg0] }
+                ? {
+                    operators: arg0.split(/\s*,\s*/),
+                }
                 : arg0) || {};
+        filterOptions.operators = filterOptions.operators || ['=', '!='];
+        if (field.includes(':')) {
+            const a = field.split(':');
+            field = a[0];
+            filterOptions.mappedField = a[1];
+        }
         decoratorChain.push(() => {
             filterRules.set(field, filterOptions);
             filterType.rules = filterRules.toJSON();

package/cjs/filter/filter-rules.js

@@ -69,6 +69,8 @@ class FilterRules {
                     },
                 });
             }
+            if (rule.mappedField)
+                ast.left.value = rule.mappedField;
             if (rule.prepare)
                 ast.prepare = rule.prepare;
             this.normalizeFilterAst(ast.right, stack, currentType);

package/esm/document/decorators/http-operation-entity.decorator.js

@@ -114,8 +114,16 @@ export function createFilterDecorator(decorator, decoratorChain, dataType) {
         const filterOptions = (Array.isArray(arg0)
             ? { operators: arg0 }
             : typeof arg0 === 'string'
-                ? { operators: [arg0] }
+                ? {
+                    operators: arg0.split(/\s*,\s*/),
+                }
                 : arg0) || {};
+        filterOptions.operators = filterOptions.operators || ['=', '!='];
+        if (field.includes(':')) {
+            const a = field.split(':');
+            field = a[0];
+            filterOptions.mappedField = a[1];
+        }
         decoratorChain.push(() => {
             filterRules.set(field, filterOptions);
             filterType.rules = filterRules.toJSON();

package/esm/filter/filter-rules.js

@@ -66,6 +66,8 @@ export class FilterRules {
                     },
                 });
             }
+            if (rule.mappedField)
+                ast.left.value = rule.mappedField;
             if (rule.prepare)
                 ast.prepare = rule.prepare;
             this.normalizeFilterAst(ast.right, stack, currentType);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",

package/types/document/decorators/http-operation-entity.decorator.d.ts

@@ -52,12 +52,13 @@ declare module '../http/http-operation.js' {
             }
             /** DeleteMany */
             interface FilterOptions {
+                mappedField?: string;
                 operators?: OpraFilter.ComparisonOperator[];
                 notes?: string;
-                prepare?: (value: any, op: OpraFilter.ComparisonOperator) => any;
+                prepare?: (args: OpraFilter.ComparisonExpression.PrepareArgs) => any;
             }
             interface DeleteManyDecorator extends HttpOperationDecorator {
-                Filter(field: string, operators?: OpraFilter.ComparisonOperator[]): this;
+                Filter(field: string, operators?: OpraFilter.ComparisonOperator[] | string): this;
                 Filter(field: string, options?: FilterOptions): this;
             }
             interface DeleteManyArgs extends StrictOmit<HttpOperation.Options, 'method' | 'requestBody'> {
@@ -68,7 +69,7 @@ declare module '../http/http-operation.js' {
                 SortFields(...fields: OpraSchema.Field.QualifiedName[]): FindManyDecorator;
                 SortFields(fieldsMap: Record<OpraSchema.Field.QualifiedName, OpraSchema.Field.QualifiedName>): FindManyDecorator;
                 DefaultSort(...fields: OpraSchema.Field.QualifiedName[]): FindManyDecorator;
-                Filter(field: OpraSchema.Field.QualifiedName, operators?: OpraFilter.ComparisonOperator[]): this;
+                Filter(field: OpraSchema.Field.QualifiedName, operators?: OpraFilter.ComparisonOperator[] | string): this;
                 Filter(field: string, options?: FilterOptions): this;
             }
             interface FindManyArgs extends StrictOmit<HttpOperation.Options, 'method' | 'requestBody'> {
@@ -94,7 +95,7 @@ declare module '../http/http-operation.js' {
             /** Update */
             interface UpdateDecorator extends HttpOperationDecorator {
                 KeyParam(name: string, optionsOrType?: StrictOmit<HttpParameter.Options, 'location'> | string | TypeThunkAsync): this;
-                Filter(field: OpraSchema.Field.QualifiedName, operators?: OpraFilter.ComparisonOperator[]): this;
+                Filter(field: OpraSchema.Field.QualifiedName, operators?: OpraFilter.ComparisonOperator[] | string): this;
                 Filter(field: string, options?: FilterOptions): this;
             }
             interface UpdateArgs extends StrictOmit<HttpOperation.Options, 'method' | 'requestBody'> {
@@ -107,7 +108,7 @@ declare module '../http/http-operation.js' {
             }
             /** UpdateMany */
             interface UpdateManyDecorator extends HttpOperationDecorator {
-                Filter(field: OpraSchema.Field.QualifiedName, operators?: OpraFilter.ComparisonOperator[]): this;
+                Filter(field: OpraSchema.Field.QualifiedName, operators?: OpraFilter.ComparisonOperator[] | string): this;
                 Filter(field: string, options?: FilterOptions): this;
             }
             interface UpdateManyArgs extends StrictOmit<HttpOperation.Options, 'method' | 'requestBody'> {
@@ -137,4 +138,4 @@ export declare function createSortFieldsDecorator<T extends HttpOperationDecorat
 /**
  *
  */
-export declare function createFilterDecorator<T extends HttpOperationDecorator>(decorator: T, decoratorChain: Function[], dataType: string | Type): (field: string, arg0?: OpraFilter.ComparisonOperator[] | HttpOperation.Entity.FilterOptions) => T;
+export declare function createFilterDecorator<T extends HttpOperationDecorator>(decorator: T, decoratorChain: Function[], dataType: string | Type): (field: string, arg0?: OpraFilter.ComparisonOperator[] | string | HttpOperation.Entity.FilterOptions) => T;

package/types/filter/ast/expressions/comparison-expression.d.ts

@@ -5,7 +5,15 @@ export declare class ComparisonExpression extends Expression {
     op: ComparisonOperator;
     left: Expression;
     right: Expression;
-    prepare?: (value: any, op: ComparisonOperator) => any;
+    prepare?: (args: ComparisonExpression.PrepareArgs) => any;
     constructor(o: StrictOmit<ComparisonExpression, 'kind'>);
     toString(): string;
 }
+export declare namespace ComparisonExpression {
+    interface PrepareArgs {
+        left: string;
+        right: any;
+        op: ComparisonOperator;
+        adapter: string;
+    }
+}

package/types/filter/filter-rules.d.ts

@@ -4,7 +4,7 @@ import { Validator } from 'valgen';
 import type { ComplexType } from '../document/index.js';
 import { ResponsiveMap } from '../helpers/index.js';
 import { OpraSchema } from '../schema/index.js';
-import { type ComparisonOperator, Expression } from './ast/index.js';
+import { ComparisonExpression, type ComparisonOperator, Expression } from './ast/index.js';
 export declare namespace FilterRules {
     interface Options {
         caseSensitive?: boolean;
@@ -12,7 +12,8 @@ export declare namespace FilterRules {
     interface Rule {
         operators?: ComparisonOperator[];
         description?: string;
-        prepare?: (value: any, op: ComparisonOperator) => any;
+        prepare?: (args: ComparisonExpression.PrepareArgs) => any;
+        mappedField?: string;
     }
 }
 export declare class FilterRules {