@opra/common 0.32.1 → 0.32.3

package/browser.js

@@ -17,8 +17,9 @@ import "reflect-metadata";
 var DATATYPE_METADATA = Symbol("DATATYPE_METADATA");
 var RESOURCE_METADATA = Symbol("RESOURCE_METADATA");
 var DECORATOR = Symbol("DECORATOR");
-var NAMESPACE_PATTERN = /([A-Z$_]\w+)(?::.+)?/i;
+var NAMESPACE_PATTERN = /([a-z$_]\w+)(?::.+)?/i;
 var TYPENAME_PATTERN = /^(.*)Type(\d*)$/;
+var SORT_FIELD_PATTERN = /^([+-])?([a-z$_][\w.]+)$/;
 
 // ../../build/common/esm/document/resource/container.js
 import merge3 from "putil-merge";
@@ -2336,13 +2337,19 @@ var ComplexTypeClass = class extends DataType {
       }
     };
   }
-  normalizeFieldPath(fieldPaths) {
-    const array = (Array.isArray(fieldPaths) ? fieldPaths : [fieldPaths]).map((s) => {
+  normalizeFieldNames(fieldNames, allowSortSigns) {
+    const array = (Array.isArray(fieldNames) ? fieldNames : [fieldNames]).map((s) => {
+      let sign = "";
+      if (allowSortSigns) {
+        const m = SORT_FIELD_PATTERN.exec(s);
+        sign = m && m[1] || "";
+        s = m && m[2] || s;
+      }
       let curPath = "";
       for (const [, , p] of this.iteratePath(s)) {
         curPath = p;
       }
-      return curPath;
+      return sign + curPath;
     }).flat();
     return array.length ? array : void 0;
   }
@@ -11394,17 +11401,18 @@ var CollectionClass = class extends CrudResource {
       return result;
     }
   }
-  normalizeFieldPath(path) {
-    return this.type.normalizeFieldPath(path);
+  normalizeFieldNames(fields, allowSortSigns) {
+    return this.type.normalizeFieldNames(fields, allowSortSigns);
   }
   normalizeSortFields(fields) {
-    const normalized = this.type.normalizeFieldPath(fields);
+    const normalized = this.type.normalizeFieldNames(fields, true);
     if (!normalized)
       return;
     const findManyOp = this.getOperation("findMany");
     const sortFields = findManyOp && findManyOp.options.sortFields;
     (Array.isArray(normalized) ? normalized : [normalized]).forEach((field) => {
-      if (!sortFields?.find((x) => x === field))
+      const m = SORT_FIELD_PATTERN.exec(field);
+      if (m && !sortFields?.find((x) => x === m[2]))
         throw new BadRequestError({
           message: translate("error:UNACCEPTED_SORT_FIELD", { field })
         });
@@ -11451,7 +11459,7 @@ var CollectionClass = class extends CrudResource {
       return ast;
     }
     if (ast instanceof opra_filter_ns_exports.QualifiedIdentifier) {
-      const normalizedFieldPath = this.type.normalizeFieldPath(ast.value)?.join(".");
+      const normalizedFieldPath = this.type.normalizeFieldNames(ast.value)?.join(".");
       ast.field = this.type.getField(normalizedFieldPath);
       ast.dataType = ast.field?.type || this.document.getDataType("any");
       ast.value = normalizedFieldPath;
@@ -11547,7 +11555,7 @@ Object.assign(CollectionDecorator, ResourceDecorator);
     const decorator = createOperationDecorator("deleteMany", options, list);
     decorator.Filter = (field, operators, notes) => {
       if (typeof operators === "string")
-        operators = operators.split(/\s*[,| ]\s*/);
+        operators = operators.split(/\s*[,| ]\s*/).filter((s) => s);
       list.push((operationMeta) => {
         operationMeta.options.filters = operationMeta.options.filters || [];
         operationMeta.options.filters.push(omitUndefined({ field, operators, notes }));
@@ -11777,8 +11785,8 @@ var SingletonClass = class extends CrudResource {
       type: this.type.name || "any"
     };
   }
-  normalizeFieldPath(path) {
-    return this.type.normalizeFieldPath(path);
+  normalizeFieldNames(path) {
+    return this.type.normalizeFieldNames(path);
   }
 };
 
@@ -12277,6 +12285,7 @@ export {
   ResourceConflictError,
   ResourceNotFoundError,
   ResponsiveMap,
+  SORT_FIELD_PATTERN,
   SimpleType2 as SimpleType,
   Singleton2 as Singleton,
   Storage2 as Storage,

package/cjs/document/constants.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TYPENAME_PATTERN = exports.NAMESPACE_PATTERN = exports.DECORATOR = exports.RESOURCE_METADATA = exports.DATATYPE_METADATA = void 0;
+exports.SORT_FIELD_PATTERN = exports.TYPENAME_PATTERN = exports.NAMESPACE_PATTERN = exports.DECORATOR = exports.RESOURCE_METADATA = exports.DATATYPE_METADATA = void 0;
 exports.DATATYPE_METADATA = Symbol('DATATYPE_METADATA');
 exports.RESOURCE_METADATA = Symbol('RESOURCE_METADATA');
 exports.DECORATOR = Symbol('DECORATOR');
-exports.NAMESPACE_PATTERN = /([A-Z$_]\w+)(?::.+)?/i;
+exports.NAMESPACE_PATTERN = /([a-z$_]\w+)(?::.+)?/i;
 exports.TYPENAME_PATTERN = /^(.*)Type(\d*)$/;
+exports.SORT_FIELD_PATTERN = /^([+-])?([a-z$_][\w.]+)$/;

package/cjs/document/data-type/complex-type-class.js

@@ -6,6 +6,7 @@ const vg = tslib_1.__importStar(require("valgen"));
 const index_js_1 = require("../../helpers/index.js");
 const index_js_2 = require("../../i18n/index.js");
 const index_js_3 = require("../../schema/index.js");
+const constants_js_1 = require("../constants.js");
 const data_type_js_1 = require("./data-type.js");
 const field_js_1 = require("./field.js");
 /**
@@ -119,14 +120,20 @@ class ComplexTypeClass extends data_type_js_1.DataType {
             }
         };
     }
-    normalizeFieldPath(fieldPaths) {
-        const array = (Array.isArray(fieldPaths) ? fieldPaths : [fieldPaths])
+    normalizeFieldNames(fieldNames, allowSortSigns) {
+        const array = (Array.isArray(fieldNames) ? fieldNames : [fieldNames])
             .map(s => {
+            let sign = '';
+            if (allowSortSigns) {
+                const m = constants_js_1.SORT_FIELD_PATTERN.exec(s);
+                sign = (m && m[1]) || '';
+                s = (m && m[2]) || s;
+            }
             let curPath = '';
             for (const [, , p] of this.iteratePath(s)) {
                 curPath = p;
             }
-            return curPath;
+            return sign + curPath;
         }).flat();
         return array.length ? array : undefined;
     }

package/cjs/document/resource/collection-class.js

@@ -7,6 +7,7 @@ const index_js_1 = require("../../exception/index.js");
 const index_js_2 = require("../../filter/index.js");
 const index_js_3 = require("../../i18n/index.js");
 const index_js_4 = require("../../schema/index.js");
+const constants_js_1 = require("../constants.js");
 const simple_type_js_1 = require("../data-type/simple-type.js");
 const crud_resource_js_1 = require("./crud-resource.js");
 class CollectionClass extends crud_resource_js_1.CrudResource {
@@ -183,17 +184,18 @@ class CollectionClass extends crud_resource_js_1.CrudResource {
             return result;
         }
     }
-    normalizeFieldPath(path) {
-        return this.type.normalizeFieldPath(path);
+    normalizeFieldNames(fields, allowSortSigns) {
+        return this.type.normalizeFieldNames(fields, allowSortSigns);
     }
     normalizeSortFields(fields) {
-        const normalized = this.type.normalizeFieldPath(fields);
+        const normalized = this.type.normalizeFieldNames(fields, true);
         if (!normalized)
             return;
         const findManyOp = this.getOperation('findMany');
         const sortFields = findManyOp && findManyOp.options.sortFields;
         (Array.isArray(normalized) ? normalized : [normalized]).forEach(field => {
-            if (!sortFields?.find(x => x === field))
+            const m = constants_js_1.SORT_FIELD_PATTERN.exec(field);
+            if (m && !sortFields?.find(x => x === m[2]))
                 throw new index_js_1.BadRequestError({
                     message: (0, index_js_3.translate)('error:UNACCEPTED_SORT_FIELD', { field }),
                 });
@@ -243,7 +245,7 @@ class CollectionClass extends crud_resource_js_1.CrudResource {
             return ast;
         }
         if (ast instanceof index_js_2.OpraFilter.QualifiedIdentifier) {
-            const normalizedFieldPath = this.type.normalizeFieldPath(ast.value)?.join('.');
+            const normalizedFieldPath = this.type.normalizeFieldNames(ast.value)?.join('.');
             ast.field = this.type.getField(normalizedFieldPath);
             ast.dataType = ast.field?.type || this.document.getDataType('any');
             ast.value = normalizedFieldPath;

package/cjs/document/resource/collection-decorator.js

@@ -68,7 +68,8 @@ Object.assign(CollectionDecorator, resource_decorator_js_1.ResourceDecorator);
         const decorator = (0, crud_operation_decorator_js_1.createOperationDecorator)('deleteMany', options, list);
         decorator.Filter = (field, operators, notes) => {
             if (typeof operators === 'string')
-                operators = operators.split(/\s*[,| ]\s*/);
+                operators = operators.split(/\s*[,| ]\s*/)
+                    .filter(s => s);
             list.push(operationMeta => {
                 operationMeta.options.filters = operationMeta.options.filters || [];
                 operationMeta.options.filters.push((0, index_js_1.omitUndefined)({ field, operators, notes }));

package/cjs/document/resource/singleton-class.js

@@ -76,8 +76,8 @@ class SingletonClass extends crud_resource_js_1.CrudResource {
             type: this.type.name || 'any'
         };
     }
-    normalizeFieldPath(path) {
-        return this.type.normalizeFieldPath(path);
+    normalizeFieldNames(path) {
+        return this.type.normalizeFieldNames(path);
     }
 }
 exports.SingletonClass = SingletonClass;

package/esm/document/constants.js

@@ -1,5 +1,6 @@
 export const DATATYPE_METADATA = Symbol('DATATYPE_METADATA');
 export const RESOURCE_METADATA = Symbol('RESOURCE_METADATA');
 export const DECORATOR = Symbol('DECORATOR');
-export const NAMESPACE_PATTERN = /([A-Z$_]\w+)(?::.+)?/i;
+export const NAMESPACE_PATTERN = /([a-z$_]\w+)(?::.+)?/i;
 export const TYPENAME_PATTERN = /^(.*)Type(\d*)$/;
+export const SORT_FIELD_PATTERN = /^([+-])?([a-z$_][\w.]+)$/;

package/esm/document/data-type/complex-type-class.js

@@ -2,6 +2,7 @@ import * as vg from 'valgen';
 import { omitUndefined, ResponsiveMap } from '../../helpers/index.js';
 import { translate } from '../../i18n/index.js';
 import { OpraSchema } from '../../schema/index.js';
+import { SORT_FIELD_PATTERN } from '../constants.js';
 import { DataType } from './data-type.js';
 import { ApiField } from './field.js';
 /**
@@ -115,14 +116,20 @@ export class ComplexTypeClass extends DataType {
             }
         };
     }
-    normalizeFieldPath(fieldPaths) {
-        const array = (Array.isArray(fieldPaths) ? fieldPaths : [fieldPaths])
+    normalizeFieldNames(fieldNames, allowSortSigns) {
+        const array = (Array.isArray(fieldNames) ? fieldNames : [fieldNames])
             .map(s => {
+            let sign = '';
+            if (allowSortSigns) {
+                const m = SORT_FIELD_PATTERN.exec(s);
+                sign = (m && m[1]) || '';
+                s = (m && m[2]) || s;
+            }
             let curPath = '';
             for (const [, , p] of this.iteratePath(s)) {
                 curPath = p;
             }
-            return curPath;
+            return sign + curPath;
         }).flat();
         return array.length ? array : undefined;
     }

package/esm/document/resource/collection-class.js

@@ -3,6 +3,7 @@ import { BadRequestError } from '../../exception/index.js';
 import { OpraFilter } from '../../filter/index.js';
 import { translate } from '../../i18n/index.js';
 import { OpraSchema } from '../../schema/index.js';
+import { SORT_FIELD_PATTERN } from '../constants.js';
 import { SimpleType } from '../data-type/simple-type.js';
 import { CrudResource } from './crud-resource.js';
 export class CollectionClass extends CrudResource {
@@ -179,17 +180,18 @@ export class CollectionClass extends CrudResource {
             return result;
         }
     }
-    normalizeFieldPath(path) {
-        return this.type.normalizeFieldPath(path);
+    normalizeFieldNames(fields, allowSortSigns) {
+        return this.type.normalizeFieldNames(fields, allowSortSigns);
     }
     normalizeSortFields(fields) {
-        const normalized = this.type.normalizeFieldPath(fields);
+        const normalized = this.type.normalizeFieldNames(fields, true);
         if (!normalized)
             return;
         const findManyOp = this.getOperation('findMany');
         const sortFields = findManyOp && findManyOp.options.sortFields;
         (Array.isArray(normalized) ? normalized : [normalized]).forEach(field => {
-            if (!sortFields?.find(x => x === field))
+            const m = SORT_FIELD_PATTERN.exec(field);
+            if (m && !sortFields?.find(x => x === m[2]))
                 throw new BadRequestError({
                     message: translate('error:UNACCEPTED_SORT_FIELD', { field }),
                 });
@@ -239,7 +241,7 @@ export class CollectionClass extends CrudResource {
             return ast;
         }
         if (ast instanceof OpraFilter.QualifiedIdentifier) {
-            const normalizedFieldPath = this.type.normalizeFieldPath(ast.value)?.join('.');
+            const normalizedFieldPath = this.type.normalizeFieldNames(ast.value)?.join('.');
             ast.field = this.type.getField(normalizedFieldPath);
             ast.dataType = ast.field?.type || this.document.getDataType('any');
             ast.value = normalizedFieldPath;

package/esm/document/resource/collection-decorator.js

@@ -64,7 +64,8 @@ Object.assign(CollectionDecorator, ResourceDecorator);
         const decorator = createOperationDecorator('deleteMany', options, list);
         decorator.Filter = (field, operators, notes) => {
             if (typeof operators === 'string')
-                operators = operators.split(/\s*[,| ]\s*/);
+                operators = operators.split(/\s*[,| ]\s*/)
+                    .filter(s => s);
             list.push(operationMeta => {
                 operationMeta.options.filters = operationMeta.options.filters || [];
                 operationMeta.options.filters.push(omitUndefined({ field, operators, notes }));

package/esm/document/resource/singleton-class.js

@@ -73,7 +73,7 @@ export class SingletonClass extends CrudResource {
             type: this.type.name || 'any'
         };
     }
-    normalizeFieldPath(path) {
-        return this.type.normalizeFieldPath(path);
+    normalizeFieldNames(path) {
+        return this.type.normalizeFieldNames(path);
     }
 }

package/package.json

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

package/types/document/constants.d.ts

@@ -3,3 +3,4 @@ export declare const RESOURCE_METADATA: unique symbol;
 export declare const DECORATOR: unique symbol;
 export declare const NAMESPACE_PATTERN: RegExp;
 export declare const TYPENAME_PATTERN: RegExp;
+export declare const SORT_FIELD_PATTERN: RegExp;

package/types/document/data-type/complex-type-class.d.ts

@@ -23,13 +23,13 @@ export declare class ComplexTypeClass extends DataType {
     findField(nameOrPath: string): ApiField | undefined;
     getField(nameOrPath: string): ApiField;
     iteratePath(path: string, silent?: boolean): IterableIterator<[string, ApiField | undefined, string]>;
-    normalizeFieldPath(fieldPaths: string | string[]): string[] | undefined;
+    normalizeFieldNames(fieldNames: string | string[], allowSortSigns?: boolean): string[] | undefined;
     exportSchema(options?: {
         webSafe?: boolean;
     }): any;
     isTypeOf(t: Type | Function): boolean;
     extendsFrom(t: string | Type | DataType): boolean;
-    generateCodec(codec: 'decode' | 'encode', options?: DataType.GenerateCodecOptions): vg.Validator;
+    generateCodec<T extends Object = any>(codec: 'decode' | 'encode', options?: DataType.GenerateCodecOptions): vg.ObjectValidator<T>;
     generateCodecSchema(codec: 'decode' | 'encode', options?: DataType.GenerateCodecOptions): vg.ObjectSchema;
     protected _generateCodecSchema(codec: 'decode' | 'encode', options?: RequiredSome<DataType.GenerateCodecOptions, 'pick' | 'omit'>): vg.ObjectSchema;
     protected _buildOverwriteFieldsTree(obj: Record<string, DataType.OverrideFieldsConfig>): Record<string, DataType.OverrideFieldsConfig>;

package/types/document/resource/collection-class.d.ts

@@ -14,7 +14,7 @@ export declare class CollectionClass extends CrudResource {
         webSafe?: boolean;
     }): OpraSchema.Collection;
     parseKeyValue(value: any): any;
-    normalizeFieldPath(path: string | string[]): string[] | undefined;
-    normalizeSortFields(this: Collection, fields: string | string[]): string[] | undefined;
+    normalizeFieldNames(fields: string | string[], allowSortSigns?: boolean): string[] | undefined;
+    normalizeSortFields(fields: string | string[]): string[] | undefined;
     normalizeFilter(filter: string | OpraFilter.Expression): OpraFilter.Expression | undefined;
 }

package/types/document/resource/singleton-class.d.ts

@@ -17,5 +17,5 @@ export declare class SingletonClass extends CrudResource {
     exportSchema(options?: {
         webSafe?: boolean;
     }): OpraSchema.Singleton;
-    normalizeFieldPath(path: string | string[]): string[] | undefined;
+    normalizeFieldNames(path: string | string[]): string[] | undefined;
 }