@opra/common 1.4.4 → 1.5.1

package/cjs/document/api-document.js

@@ -67,7 +67,7 @@ class ApiDocument extends document_element_js_1.DocumentElement {
     /**
      * Export as Opra schema definition object
      */
-    export() {
+    export(options) {
         const out = (0, objects_1.omitUndefined)({
             spec: index_js_2.OpraSchema.SpecVersion,
             id: this.id,
@@ -93,25 +93,29 @@ class ApiDocument extends document_element_js_1.DocumentElement {
         if (this.types.size) {
             out.types = {};
             for (const v of this.types.values()) {
-                out.types[v.name] = v.toJSON();
+                if (options?.scope && !v.inScope(options?.scope))
+                    continue;
+                out.types[v.name] = v.toJSON(options);
             }
         }
         if (this.api)
-            out.api = this.api.toJSON();
+            out.api = this.api.toJSON(options);
         return out;
     }
     invalidate() {
         /** Generate id */
-        const x = this.export();
+        const x = this.export({});
         delete x.id;
         this.id = (0, super_fast_md5_1.md5)(JSON.stringify(x));
         /** Clear [kTypeNSMap] */
         this[constants_js_1.kTypeNSMap] = new WeakMap();
     }
-    _findDataType(nameOrCtor, visitedRefs) {
+    _findDataType(nameOrCtor, scope, visitedRefs) {
         let result = this.types.get(nameOrCtor);
-        if (result || !this.references.size)
+        if (result && (!scope || result.inScope(scope)))
             return result;
+        if (!this.references.size)
+            return;
         // Lookup for references
         if (typeof nameOrCtor === 'string') {
             // If given string has namespace pattern (ns:type_name)
@@ -125,7 +129,7 @@ class ApiDocument extends document_element_js_1.DocumentElement {
                     visitedRefs = visitedRefs || new WeakMap();
                     visitedRefs.set(this, true);
                     visitedRefs.set(ref, true);
-                    return ref._findDataType(m[2], visitedRefs);
+                    return ref._findDataType(m[2], scope, visitedRefs);
                 }
                 nameOrCtor = m[2];
             }
@@ -147,7 +151,7 @@ class ApiDocument extends document_element_js_1.DocumentElement {
         for (const refNs of references) {
             const ref = this.references.get(refNs);
             visitedRefs.set(ref, true);
-            result = ref._findDataType(nameOrCtor, visitedRefs);
+            result = ref._findDataType(nameOrCtor, scope, visitedRefs);
             if (result) {
                 this[constants_js_1.kTypeNSMap].set(result, ref?.[constants_js_1.BUILTIN] ? '' : refNs);
                 return result;

package/cjs/document/common/api-base.js

@@ -11,7 +11,8 @@ class ApiBase extends document_element_js_1.DocumentElement {
         this.name = init.name;
         this.description = init.description;
     }
-    toJSON() {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    toJSON(options) {
         return (0, objects_1.omitUndefined)({
             transport: this.transport,
             name: this.name,

package/cjs/document/common/document-node.js

@@ -21,25 +21,23 @@ class DocumentNode {
         // istanbul ignore next
         throw new Error('ApiDocument not found in document tree');
     }
-    hasDataType(nameOrCtor) {
-        const result = this[constants_js_1.kDataTypeMap]?.has(nameOrCtor);
-        if (result)
-            return result;
-        return this.parent ? this.parent.hasDataType(nameOrCtor) : false;
+    hasDataType(nameOrCtor, scope) {
+        return !!this.findDataType(nameOrCtor, scope);
     }
-    findDataType(nameOrCtor) {
-        const result = this[constants_js_1.kDataTypeMap]?.get(nameOrCtor);
-        if (result)
-            return result;
-        return this.parent ? this.parent.findDataType(nameOrCtor) : undefined;
+    findDataType(nameOrCtor, scope) {
+        const dt = this[constants_js_1.kDataTypeMap]?.get(nameOrCtor);
+        if (dt && (!scope || dt.inScope(scope)))
+            return dt;
+        return this.parent
+            ? this.parent.findDataType(nameOrCtor, scope)
+            : undefined;
     }
     /**
      * Returns DataType instance by name or Constructor. Returns undefined if not found
-     * @param nameOrCtor
      */
-    getDataType(nameOrCtor) {
+    getDataType(nameOrCtor, scope) {
         const dt = this.findDataType(nameOrCtor);
-        if (dt)
+        if (dt && (!scope || dt.inScope(scope)))
             return dt;
         let name = '';
         if (typeof nameOrCtor === 'function') {
@@ -56,7 +54,9 @@ class DocumentNode {
             else if (typeof nameOrCtor === 'function')
                 name = nameOrCtor.name;
         }
-        throw new TypeError(`Unknown data type` + (name ? ' (' + name + ')' : ''));
+        if (dt)
+            throw new TypeError(`Data type${name ? ' (' + name + ')' : ''} is not in requested scope (${scope})`);
+        throw new TypeError(`Unknown data type${name ? ' (' + name + ')' : ''}`);
     }
     getDataTypeNameWithNs(dataType) {
         if (!dataType.name)
@@ -68,10 +68,9 @@ class DocumentNode {
      * Returns ComplexType instance by name or Constructor.
      * Returns undefined if not found
      * Throws error if data type is not a ComplexType
-     * @param nameOrCtor
      */
-    getComplexType(nameOrCtor) {
-        const t = this.getDataType(nameOrCtor);
+    getComplexType(nameOrCtor, scope) {
+        const t = this.getDataType(nameOrCtor, scope);
         if (t.kind === index_js_1.OpraSchema.ComplexType.Kind)
             return t;
         throw new TypeError(`Data type "${t.name}" is not a ComplexType`);
@@ -80,10 +79,9 @@ class DocumentNode {
      * Returns SimpleType instance by name or Constructor.
      * Returns undefined if not found
      * Throws error if data type is not a SimpleType
-     * @param nameOrCtor
      */
-    getSimpleType(nameOrCtor) {
-        const t = this.getDataType(nameOrCtor);
+    getSimpleType(nameOrCtor, scope) {
+        const t = this.getDataType(nameOrCtor, scope);
         if (t.kind === index_js_1.OpraSchema.SimpleType.Kind)
             return t;
         throw new TypeError(`Data type "${t.name || t}" is not a SimpleType`);
@@ -92,10 +90,9 @@ class DocumentNode {
      * Returns EnumType instance by name or Constructor.
      * Returns undefined if not found
      * Throws error if data type is not a EnumType
-     * @param nameOrCtor
      */
-    getEnumType(nameOrCtor) {
-        const t = this.getDataType(nameOrCtor);
+    getEnumType(nameOrCtor, scope) {
+        const t = this.getDataType(nameOrCtor, scope);
         if (t.kind === index_js_1.OpraSchema.EnumType.Kind)
             return t;
         throw new TypeError(`Data type "${t.name || t}" is not a EnumType`);
@@ -104,10 +101,9 @@ class DocumentNode {
      * Returns EnumType instance by name or Constructor.
      * Returns undefined if not found
      * Throws error if data type is not a MappedType
-     * @param nameOrCtor
      */
-    getMappedType(nameOrCtor) {
-        const t = this.getDataType(nameOrCtor);
+    getMappedType(nameOrCtor, scope) {
+        const t = this.getDataType(nameOrCtor, scope);
         if (t.kind === index_js_1.OpraSchema.MappedType.Kind)
             return t;
         throw new TypeError(`Data type "${t.name || t}" is not a MappedType`);
@@ -116,10 +112,9 @@ class DocumentNode {
      * Returns EnumType instance by name or Constructor.
      * Returns undefined if not found
      * Throws error if data type is not a MixinType
-     * @param nameOrCtor
      */
-    getMixinType(nameOrCtor) {
-        const t = this.getDataType(nameOrCtor);
+    getMixinType(nameOrCtor, scope) {
+        const t = this.getDataType(nameOrCtor, scope);
         if (t.kind === index_js_1.OpraSchema.MixinType.Kind)
             return t;
         throw new TypeError(`Data type "${t.name || t}" is not a MixinType`);

package/cjs/document/common/value.js

@@ -20,12 +20,16 @@ exports.Value = function (owner, initArgs) {
  * @class Value
  */
 class ValueClass extends document_element_js_1.DocumentElement {
-    toJSON() {
+    toJSON(options) {
         const typeName = this.type
             ? this.node.getDataTypeNameWithNs(this.type)
             : undefined;
         return (0, objects_1.omitUndefined)({
-            type: this.type ? (typeName ? typeName : this.type.toJSON()) : 'any',
+            type: this.type
+                ? typeName
+                    ? typeName
+                    : this.type.toJSON(options)
+                : 'any',
             description: this.description,
             isArray: this.isArray,
             examples: this.examples,

package/cjs/document/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kTypeNSMap = exports.kCtorMap = exports.kDataTypeMap = exports.EXTRACT_TYPENAME_PATTERN = exports.CLASS_NAME_PATTERN = exports.NAMESPACE_PATTERN = exports.BUILTIN = exports.DECORATOR = exports.ENCODER = exports.DECODER = exports.RPC_CONTROLLER_METADATA = exports.HTTP_CONTROLLER_METADATA = exports.DATATYPE_METADATA = void 0;
+exports.kTypeNSMap = exports.kCtorMap = exports.kDataTypeMap = exports.CLASS_NAME_PATTERN = exports.NAMESPACE_PATTERN = exports.BUILTIN = exports.DECORATOR = exports.ENCODER = exports.DECODER = exports.RPC_CONTROLLER_METADATA = exports.HTTP_CONTROLLER_METADATA = exports.DATATYPE_METADATA = void 0;
 exports.DATATYPE_METADATA = Symbol.for('opra.type.metadata');
 exports.HTTP_CONTROLLER_METADATA = Symbol('opra.http-controller.metadata');
 exports.RPC_CONTROLLER_METADATA = Symbol('opra.rpc-controller.metadata');
@@ -10,7 +10,6 @@ exports.DECORATOR = Symbol.for('DECORATOR');
 exports.BUILTIN = Symbol.for('BUILTIN');
 exports.NAMESPACE_PATTERN = /([a-z$_]\w+):(.+)/i;
 exports.CLASS_NAME_PATTERN = /^[a-z][\w_]*$/i;
-exports.EXTRACT_TYPENAME_PATTERN = /^(.*)Type(\d*)$/;
 exports.kDataTypeMap = Symbol.for('kDataTypeMap');
 exports.kCtorMap = Symbol.for('kCtorMap');
 exports.kTypeNSMap = Symbol.for('kTypeNSMap');

package/cjs/document/data-type/api-field.js

@@ -6,9 +6,9 @@ const ts_gems_1 = require("ts-gems");
 const document_element_js_1 = require("../common/document-element.js");
 const constants_js_1 = require("../constants.js");
 const api_field_decorator_js_1 = require("../decorators/api-field-decorator.js");
+const test_scope_match_js_1 = require("../utils/test-scope-match.js");
 const complex_type_base_js_1 = require("./complex-type-base.js");
 /**
- * @constructor ApiField
  * @decorator ApiField
  */
 exports.ApiField = function (...args) {
@@ -28,6 +28,7 @@ exports.ApiField = function (...args) {
         throw new Error('Field origin should be one of ComplexType, MappedType or MixinType');
     }
     _this.origin = origin;
+    _this.scopePattern = initArgs.scopePattern;
     _this.type = initArgs.type || owner.node.getDataType('any');
     _this.description = initArgs.description;
     _this.isArray = initArgs.isArray;
@@ -41,19 +42,22 @@ exports.ApiField = function (...args) {
     _this.readonly = initArgs.readonly;
     _this.writeonly = initArgs.writeonly;
     _this.examples = initArgs.examples;
-    _this.hidden = initArgs.hidden;
 };
 /**
- *
- * @class ApiField
+ * The ApiFieldClass represents a descriptive metadata structure for API fields,
+ * supporting features like data type definition, scoping, localization, and constraints.
+ * This class extends DocumentElement, inheriting base document structure capabilities.
  */
 class ApiFieldClass extends document_element_js_1.DocumentElement {
-    toJSON() {
+    inScope(scope) {
+        return (0, test_scope_match_js_1.testScopeMatch)(scope, this.scopePattern);
+    }
+    toJSON(options) {
         const typeName = this.type
             ? this.node.getDataTypeNameWithNs(this.type)
             : undefined;
         return (0, objects_1.omitUndefined)({
-            type: typeName ? typeName : this.type?.toJSON(),
+            type: typeName ? typeName : this.type?.toJSON(options),
             description: this.description,
             isArray: this.isArray || undefined,
             default: this.default,
@@ -70,5 +74,5 @@ class ApiFieldClass extends document_element_js_1.DocumentElement {
     }
 }
 exports.ApiField.prototype = ApiFieldClass.prototype;
-Object.assign(exports.ApiField, api_field_decorator_js_1.ApiFieldDecorator);
-exports.ApiField[constants_js_1.DECORATOR] = api_field_decorator_js_1.ApiFieldDecorator;
+Object.assign(exports.ApiField, api_field_decorator_js_1.ApiFieldDecoratorFactory);
+exports.ApiField[constants_js_1.DECORATOR] = api_field_decorator_js_1.ApiFieldDecoratorFactory;

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

@@ -4,7 +4,6 @@ exports.ComplexTypeBase = exports.FIELD_PATH_PATTERN = void 0;
 const ts_gems_1 = require("ts-gems");
 const valgen_1 = require("valgen");
 const index_js_1 = require("../../helpers/index.js");
-const index_js_2 = require("../../i18n/index.js");
 const data_type_js_1 = require("./data-type.js");
 exports.FIELD_PATH_PATTERN = /^([+-])?([a-z$_][\w.]*)$/i;
 /**
@@ -27,21 +26,29 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
     /**
      *
      */
-    findField(nameOrPath) {
+    findField(nameOrPath, scope) {
         if (nameOrPath.includes('.')) {
-            const fieldPath = this.parseFieldPath(nameOrPath);
+            const fieldPath = this.parseFieldPath(nameOrPath, { scope });
+            if (fieldPath.length === 0)
+                throw new Error(`Field "${nameOrPath}" does not exist in scope "${scope}"`);
             const lastItem = fieldPath.pop();
             return lastItem?.field;
         }
-        return this.fields.get(nameOrPath);
+        const field = this.fields.get(nameOrPath);
+        if (field && scope && !field.inScope(scope))
+            return;
+        return field;
     }
     /**
      *
      */
-    getField(nameOrPath) {
+    getField(nameOrPath, scope) {
         const field = this.findField(nameOrPath);
-        if (!field)
-            throw new Error((0, index_js_2.translate)('error:UNKNOWN_FIELD', { field: nameOrPath }));
+        if (field && scope && !field.inScope(scope))
+            throw new Error(`Field "${nameOrPath}" does not exist in scope "${scope}"`);
+        if (!field) {
+            throw new Error(`Field (${nameOrPath}) does not exist`);
+        }
         return field;
     }
     /**
@@ -72,7 +79,7 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
             }
             if (dataType) {
                 if (dataType instanceof exports.ComplexTypeBase) {
-                    field = dataType.fields.get(item.fieldName);
+                    field = dataType.getField(item.fieldName, options?.scope);
                     if (field) {
                         item.fieldName = field.name;
                         item.field = field;
@@ -152,9 +159,13 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
         // Process fields
         let fieldName;
         for (const field of this.fields.values()) {
-            if ((context.ignoreReadonlyFields && field.readonly) ||
-                (context.ignoreWriteonlyFields && field.writeonly) ||
-                (context.ignoreHiddenFields && field.hidden)) {
+            if (
+            /** Ignore field if required scope(s) do not match field scopes */
+            (context.scope && !field.inScope(context.scope)) ||
+                /** Ignore field if readonly and ignoreReadonlyFields option true */
+                (context.ignoreReadonlyFields && field.readonly) ||
+                /** Ignore field if writeonly and ignoreWriteonlyFields option true */
+                (context.ignoreWriteonlyFields && field.writeonly)) {
                 schema[field.name] = valgen_1.vg.isUndefined({ coerce: true });
                 continue;
             }

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

@@ -71,21 +71,26 @@ class ComplexTypeClass extends complex_type_base_js_1.ComplexTypeBase {
             return true;
         return !!this.base?.extendsFrom(baseType);
     }
-    toJSON() {
+    toJSON(options) {
+        const superJson = super.toJSON(options);
         const baseName = this.base
             ? this.node.getDataTypeNameWithNs(this.base)
             : undefined;
-        const out = (0, objects_1.omitUndefined)({
-            ...complex_type_base_js_1.ComplexTypeBase.prototype.toJSON.call(this),
+        const out = {
+            ...superJson,
             kind: this.kind,
-            base: this.base ? (baseName ? baseName : this.base.toJSON()) : undefined,
-        });
+            base: this.base
+                ? baseName
+                    ? baseName
+                    : this.base.toJSON(options)
+                : undefined,
+        };
         if (this.additionalFields) {
             if (this.additionalFields instanceof data_type_js_1.DataType) {
                 const typeName = this.node.getDataTypeNameWithNs(this.additionalFields);
                 out.additionalFields = typeName
                     ? typeName
-                    : this.additionalFields.toJSON();
+                    : this.additionalFields.toJSON(options);
             }
             else
                 out.additionalFields = this.additionalFields;
@@ -94,8 +99,9 @@ class ComplexTypeClass extends complex_type_base_js_1.ComplexTypeBase {
             const fields = {};
             let i = 0;
             for (const field of this.fields.values()) {
-                if (field.origin === this) {
-                    fields[field.name] = field.toJSON();
+                if (field.origin === this &&
+                    (!options?.scope || field.inScope(options?.scope))) {
+                    fields[field.name] = field.toJSON(options);
                     i++;
                 }
             }
@@ -104,6 +110,14 @@ class ComplexTypeClass extends complex_type_base_js_1.ComplexTypeBase {
         }
         return (0, objects_1.omitUndefined)(out);
     }
+    _locateBase(callback) {
+        if (!this.base)
+            return;
+        if (callback(this.base))
+            return this.base;
+        if (this.base._locateBase)
+            return this.base._locateBase(callback);
+    }
 }
 exports.ComplexType.prototype = ComplexTypeClass.prototype;
 Object.assign(exports.ComplexType, complex_type_decorator_js_1.ComplexTypeDecorator);

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

@@ -6,6 +6,7 @@ const ts_gems_1 = require("ts-gems");
 const document_element_js_1 = require("../common/document-element.js");
 const constants_js_1 = require("../constants.js");
 const inspect_util_js_1 = require("../utils/inspect.util.js");
+const test_scope_match_js_1 = require("../utils/test-scope-match.js");
 /**
  * DataType constructor
  */
@@ -20,6 +21,7 @@ context) {
     document_element_js_1.DocumentElement.call(this, owner);
     const _this = (0, ts_gems_1.asMutable)(this);
     _this.kind = initArgs.kind;
+    _this.scopePattern = initArgs.scopePattern;
     _this.name = initArgs.name;
     _this.description = initArgs.description;
     _this.abstract = initArgs.abstract;
@@ -33,7 +35,18 @@ class DataTypeClass extends document_element_js_1.DocumentElement {
     get embedded() {
         return !this.name;
     }
-    toJSON() {
+    inScope(scope) {
+        return (0, test_scope_match_js_1.testScopeMatch)(scope, this.scopePattern);
+    }
+    toJSON(options) {
+        if (options?.scope) {
+            /** Locate base model which is not available for given scope */
+            const outOfScope = this._locateBase(dt => !dt.inScope(options.scope));
+            if (outOfScope) {
+                const baseName = this.node.getDataTypeNameWithNs(outOfScope);
+                throw new TypeError(`"${baseName}" model is not available for "${options.scope}" scope`);
+            }
+        }
         return (0, objects_1.omitUndefined)({
             kind: this.kind,
             description: this.description,

package/cjs/document/data-type/enum-type.js

@@ -51,16 +51,26 @@ class EnumTypeClass extends data_type_js_1.DataType {
     generateCodec() {
         return valgen_1.vg.isEnum(Object.keys(this.attributes));
     }
-    toJSON() {
+    toJSON(options) {
+        const superJson = super.toJSON(options);
         const baseName = this.base
             ? this.node.getDataTypeNameWithNs(this.base)
             : undefined;
         return (0, objects_1.omitUndefined)({
-            ...data_type_js_1.DataType.prototype.toJSON.call(this),
-            base: this.base ? (baseName ? baseName : this.base.toJSON()) : undefined,
+            ...superJson,
+            kind: this.kind,
+            base: baseName,
             attributes: (0, index_js_1.cloneObject)(this.ownAttributes),
         });
     }
+    _locateBase(callback) {
+        if (!this.base)
+            return;
+        if (callback(this.base))
+            return this.base;
+        if (this.base._locateBase)
+            return this.base._locateBase(callback);
+    }
 }
 exports.EnumType.prototype = EnumTypeClass.prototype;
 Object.assign(exports.EnumType, EnumTypeClass);

package/cjs/document/data-type/extended-types/base64.type.js

@@ -20,6 +20,7 @@ let Base64Type = class Base64Type {
 exports.Base64Type = Base64Type;
 exports.Base64Type = Base64Type = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
+        name: 'base64',
         description: 'A stream of bytes, base64 encoded',
         nameMappings: {
             js: 'string',

package/cjs/document/data-type/extended-types/date-string.type.js

@@ -38,6 +38,7 @@ tslib_1.__decorate([
 ], DateStringType.prototype, "maxValue", void 0);
 exports.DateStringType = DateStringType = tslib_1.__decorate([
     ((0, simple_type_js_1.SimpleType)({
+        name: 'datestring',
         description: 'Date string value',
         nameMappings: {
             js: 'string',

package/cjs/document/data-type/extended-types/date-time-string.type.js

@@ -38,6 +38,7 @@ tslib_1.__decorate([
 ], DateTimeStringType.prototype, "maxValue", void 0);
 exports.DateTimeStringType = DateTimeStringType = tslib_1.__decorate([
     ((0, simple_type_js_1.SimpleType)({
+        name: 'datetimestring',
         description: 'DateTime string value',
         nameMappings: {
             js: 'string',

package/cjs/document/data-type/extended-types/date-time.type.js

@@ -56,6 +56,7 @@ tslib_1.__decorate([
 ], DateTimeType.prototype, "maxValue", void 0);
 exports.DateTimeType = DateTimeType = tslib_1.__decorate([
     ((0, simple_type_js_1.SimpleType)({
+        name: 'datetime',
         description: 'A full datetime value',
         nameMappings: {
             js: 'string',

package/cjs/document/data-type/extended-types/date.type.js

@@ -56,6 +56,7 @@ tslib_1.__decorate([
 ], DateType.prototype, "maxValue", void 0);
 exports.DateType = DateType = tslib_1.__decorate([
     ((0, simple_type_js_1.SimpleType)({
+        name: 'date',
         description: 'A date without time',
         nameMappings: {
             js: 'Date',

package/cjs/document/data-type/extended-types/email.type.js

@@ -84,6 +84,7 @@ tslib_1.__decorate([
 ], EmailType.prototype, "blacklistedChars", void 0);
 exports.EmailType = EmailType = tslib_1.__decorate([
     ((0, simple_type_js_1.SimpleType)({
+        name: 'email',
         description: 'An email value',
         nameMappings: {
             js: 'string',

package/cjs/document/data-type/extended-types/field-path.type.js

@@ -4,32 +4,35 @@ exports.FieldPathType = void 0;
 const tslib_1 = require("tslib");
 const valgen_1 = require("valgen");
 const constants_js_1 = require("../../constants.js");
+const data_type_js_1 = require("../data-type.js");
 const simple_type_js_1 = require("../simple-type.js");
 let FieldPathType = class FieldPathType {
     constructor(attributes) {
         if (attributes)
             Object.assign(this, attributes);
     }
-    [constants_js_1.DECODER](properties, element) {
+    [constants_js_1.DECODER](properties, element, scope) {
         const dataType = properties.dataType
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
         const allowSigns = properties.allowSigns;
-        const decodeFieldPath = (0, valgen_1.validator)('decodeFieldPath', (input) => dataType.normalizeFieldPath(input, { allowSigns }));
+        const decodeFieldPath = (0, valgen_1.validator)('decodeFieldPath', (input) => dataType.normalizeFieldPath(input, { allowSigns, scope }));
         return valgen_1.vg.pipe([valgen_1.toString, decodeFieldPath]);
     }
-    [constants_js_1.ENCODER](properties, element) {
-        return this[constants_js_1.DECODER](properties, element);
+    [constants_js_1.ENCODER](properties, element, scope) {
+        return this[constants_js_1.DECODER](properties, element, scope);
     }
-    toJSON(properties, element) {
+    toJSON(properties, element, options) {
         const dataType = properties.dataType
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
+        /** Test scope */
+        data_type_js_1.DataType.prototype.toJSON.call(dataType, options);
         const typeName = dataType
             ? element.node.getDataTypeNameWithNs(dataType)
             : undefined;
         return {
-            dataType: typeName ? typeName : dataType.toJSON(),
+            dataType: typeName ? typeName : dataType.toJSON(options),
             allowSigns: properties.allowSigns,
         };
     }
@@ -51,6 +54,7 @@ tslib_1.__decorate([
 ], FieldPathType.prototype, "allowSigns", void 0);
 exports.FieldPathType = FieldPathType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
+        name: 'fieldpath',
         description: 'Field path',
         nameMappings: {
             js: 'string',

package/cjs/document/data-type/extended-types/filter.type.js

@@ -6,6 +6,7 @@ const valgen_1 = require("valgen");
 const filter_rules_js_1 = require("../../../filter/filter-rules.js");
 const index_js_1 = require("../../../filter/index.js");
 const constants_js_1 = require("../../constants.js");
+const data_type_js_1 = require("../data-type.js");
 const simple_type_js_1 = require("../simple-type.js");
 let FilterType = class FilterType {
     constructor(attributes) {
@@ -24,12 +25,17 @@ let FilterType = class FilterType {
     [constants_js_1.ENCODER]() {
         return encodeFilter;
     }
-    toJSON(properties, element) {
+    toJSON(properties, element, options) {
         const dataType = properties.dataType
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
+        /** Test scope */
+        data_type_js_1.DataType.prototype.toJSON.call(dataType, options);
+        const typeName = dataType
+            ? element.node.getDataTypeNameWithNs(dataType)
+            : undefined;
         return {
-            dataType: dataType.name ? dataType.name : dataType.toJSON(),
+            dataType: typeName ? typeName : dataType.toJSON(options),
             rules: properties.rules,
         };
     }
@@ -50,6 +56,7 @@ tslib_1.__decorate([
 ], FilterType.prototype, "rules", void 0);
 exports.FilterType = FilterType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
+        name: 'filter',
         description: 'A query filter',
         nameMappings: {
             js: 'object',
@@ -58,12 +65,12 @@ exports.FilterType = FilterType = tslib_1.__decorate([
     }),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], FilterType);
-const decodeFilter = (dataType, rules) => (0, valgen_1.validator)('decodeFilter', (input, context, _this) => {
+const decodeFilter = (dataType, rules, scope) => (0, valgen_1.validator)('decodeFilter', (input, context, _this) => {
     if (typeof input === 'string') {
         try {
             const filter = index_js_1.OpraFilter.parse(input);
             if (rules)
-                return rules.normalizeFilter(filter, dataType);
+                return rules.normalizeFilter(filter, dataType, scope);
             return filter;
         }
         catch (e) {

package/cjs/document/data-type/extended-types/object-id.type.js

@@ -20,6 +20,7 @@ let ObjectIdType = class ObjectIdType {
 exports.ObjectIdType = ObjectIdType;
 exports.ObjectIdType = ObjectIdType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
+        name: 'ObjectId',
         description: 'A MongoDB ObjectID value',
         nameMappings: {
             js: 'object',

package/cjs/document/data-type/extended-types/operation-result.type.js

@@ -41,6 +41,7 @@ tslib_1.__decorate([
 ], OperationResult.prototype, "errors", void 0);
 exports.OperationResult = OperationResult = tslib_1.__decorate([
     (0, complex_type_js_1.ComplexType)({
+        name: 'OperationResult',
         description: 'Operation result',
     }),
     tslib_1.__metadata("design:paramtypes", [Object])

package/cjs/document/data-type/extended-types/time.type.js

@@ -42,6 +42,7 @@ tslib_1.__decorate([
 ], TimeType.prototype, "maxValue", void 0);
 exports.TimeType = TimeType = tslib_1.__decorate([
     ((0, simple_type_js_1.SimpleType)({
+        name: 'time',
         description: 'Time string in 24h format',
         nameMappings: {
             js: 'string',