@opra/common 1.4.3 → 1.5.0

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

@@ -1,6 +1,6 @@
 import { asMutable } from 'ts-gems';
 import { validator, vg } from 'valgen';
-import { parseFieldsProjection, ResponsiveMap } from '../../helpers/index.js';
+import { parseFieldsProjection, ResponsiveMap, } from '../../helpers/index.js';
 import { translate } from '../../i18n/index.js';
 import { DataType } from './data-type.js';
 export const FIELD_PATH_PATTERN = /^([+-])?([a-z$_][\w.]*)$/i;
@@ -83,7 +83,8 @@ class ComplexTypeBaseClass extends DataType {
                         dataType = undefined;
                         continue;
                     }
-                    if (dataType.additionalFields?.[0] === 'type' && dataType.additionalFields?.[1] instanceof DataType) {
+                    if (dataType.additionalFields?.[0] === 'type' &&
+                        dataType.additionalFields?.[1] instanceof DataType) {
                         item.additionalField = true;
                         item.dataType = dataType.additionalFields[1];
                         dataType = dataType.additionalFields[1];
@@ -113,7 +114,11 @@ class ComplexTypeBaseClass extends DataType {
         const projection = Array.isArray(options?.projection)
             ? parseFieldsProjection(options.projection)
             : options?.projection;
-        const schema = this._generateSchema(codec, { ...options, projection, currentPath: '' });
+        const schema = this._generateSchema(codec, {
+            ...options,
+            projection,
+            currentPath: '',
+        });
         let additionalFields;
         if (this.additionalFields instanceof DataType) {
             additionalFields = this.additionalFields.generateCodec(codec, options);
@@ -141,12 +146,21 @@ class ComplexTypeBaseClass extends DataType {
         const schema = {};
         const { currentPath, projection } = context;
         const pickList = !!(projection && Object.values(projection).find(p => !p.sign));
+        const scope = context.scope
+            ? Array.isArray(context.scope)
+                ? context.scope
+                : [context.scope]
+            : undefined;
         // 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 */
+            (scope && !field.inScope(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] = vg.isUndefined({ coerce: true });
                 continue;
             }
@@ -168,10 +182,13 @@ class ComplexTypeBaseClass extends DataType {
             const fn = this._generateFieldCodec(codec, field, {
                 ...context,
                 partial: context.partial === 'deep' ? context.partial : undefined,
-                projection: typeof projection === 'object' ? projection[fieldName]?.projection || '*' : projection,
+                projection: typeof projection === 'object'
+                    ? projection[fieldName]?.projection || '*'
+                    : projection,
                 currentPath: currentPath + (currentPath ? '.' : '') + fieldName,
             });
-            schema[fieldName] = context.partial || !field.required ? vg.optional(fn) : vg.required(fn);
+            schema[fieldName] =
+                context.partial || !field.required ? vg.optional(fn) : vg.required(fn);
         }
         if (context.allowPatchOperators) {
             schema._$pull = vg.optional(vg.isAny());

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

@@ -68,17 +68,28 @@ class ComplexTypeClass extends ComplexTypeBase {
             return true;
         return !!this.base?.extendsFrom(baseType);
     }
-    toJSON() {
-        const baseName = this.base ? this.node.getDataTypeNameWithNs(this.base) : undefined;
+    toJSON(options) {
+        const baseName = this.base
+            ? this.node.getDataTypeNameWithNs(this.base)
+            : undefined;
+        if (options?.scopes && !this.base?.inScope(options?.scopes))
+            throw new TypeError(`Base type ${baseName ? '(' + baseName + ')' : ''} of ${this.name ? +this.name : 'embedded'} type ` +
+                `is not in required scope(s) [${options.scopes}`);
         const out = omitUndefined({
             ...ComplexTypeBase.prototype.toJSON.call(this),
             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 DataType) {
                 const typeName = this.node.getDataTypeNameWithNs(this.additionalFields);
-                out.additionalFields = typeName ? typeName : this.additionalFields.toJSON();
+                out.additionalFields = typeName
+                    ? typeName
+                    : this.additionalFields.toJSON(options);
             }
             else
                 out.additionalFields = this.additionalFields;
@@ -87,8 +98,8 @@ class ComplexTypeClass extends 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 && field.inScope(options?.scopes)) {
+                    fields[field.name] = field.toJSON(options);
                     i++;
                 }
             }

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

@@ -2,7 +2,7 @@ import { omitUndefined } from '@jsopen/objects';
 import { asMutable } from 'ts-gems';
 import { DocumentElement } from '../common/document-element.js';
 import { CLASS_NAME_PATTERN } from '../constants.js';
-import { colorFgMagenta, colorFgYellow, colorReset, nodeInspectCustom } from '../utils/inspect.util.js';
+import { colorFgMagenta, colorFgYellow, colorReset, nodeInspectCustom, } from '../utils/inspect.util.js';
 /**
  * DataType constructor
  */
@@ -17,6 +17,7 @@ context) {
     DocumentElement.call(this, owner);
     const _this = asMutable(this);
     _this.kind = initArgs.kind;
+    _this.scopes = initArgs.scopes;
     _this.name = initArgs.name;
     _this.description = initArgs.description;
     _this.abstract = initArgs.abstract;
@@ -30,7 +31,21 @@ class DataTypeClass extends DocumentElement {
     get embedded() {
         return !this.name;
     }
-    toJSON() {
+    inScope(scopes) {
+        if (!this.scopes?.length || !scopes)
+            return true;
+        /** this.scope should match all required scopes */
+        scopes = Array.isArray(scopes) ? scopes : [scopes];
+        for (const scope of scopes) {
+            if (!this.scopes.some(s => {
+                return typeof s === 'string' ? scope === s : s.test(scope);
+            }))
+                return false;
+        }
+        return true;
+    }
+    // eslint-disable-next-line
+    toJSON(options) {
         return omitUndefined({
             kind: this.kind,
             description: this.description,

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

@@ -48,11 +48,20 @@ class EnumTypeClass extends DataType {
     generateCodec() {
         return vg.isEnum(Object.keys(this.attributes));
     }
-    toJSON() {
-        const baseName = this.base ? this.node.getDataTypeNameWithNs(this.base) : undefined;
+    toJSON(options) {
+        const baseName = this.base
+            ? this.node.getDataTypeNameWithNs(this.base)
+            : undefined;
+        if (options?.scopes && !this.base?.inScope(options?.scopes))
+            throw new TypeError(`Base type ${baseName ? '(' + baseName + ')' : ''} of ${this.name ? +this.name : 'embedded'} type ` +
+                `is not in required scope(s) [${options.scopes}`);
         return omitUndefined({
             ...DataType.prototype.toJSON.call(this),
-            base: this.base ? (baseName ? baseName : this.base.toJSON()) : undefined,
+            base: this.base
+                ? baseName
+                    ? baseName
+                    : this.base.toJSON(options)
+                : undefined,
             attributes: cloneObject(this.ownAttributes),
         });
     }

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

@@ -16,6 +16,7 @@ let Base64Type = class Base64Type {
 };
 Base64Type = __decorate([
     SimpleType({
+        name: 'base64',
         description: 'A stream of bytes, base64 encoded',
         nameMappings: {
             js: 'string',

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

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

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

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

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

@@ -21,7 +21,11 @@ let DateTimeType = class DateTimeType {
         return x.length > 0 ? vg.pipe([fn, ...x], { returnIndex: 0 }) : fn;
     }
     [ENCODER](properties) {
-        const fn = vg.isDateString({ precision: 'time', trim: 'time', coerce: true });
+        const fn = vg.isDateString({
+            precision: 'time',
+            trim: 'time',
+            coerce: true,
+        });
         const x = [];
         if (properties.minValue) {
             isDateString(properties.minValue);
@@ -48,6 +52,7 @@ __decorate([
 ], DateTimeType.prototype, "maxValue", void 0);
 DateTimeType = __decorate([
     (SimpleType({
+        name: 'datetime',
         description: 'A full datetime value',
         nameMappings: {
             js: 'string',

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

@@ -21,7 +21,11 @@ let DateType = class DateType {
         return x.length > 0 ? vg.pipe([fn, ...x], { returnIndex: 0 }) : fn;
     }
     [ENCODER](properties) {
-        const fn = vg.isDateString({ precision: 'date', trim: 'date', coerce: true });
+        const fn = vg.isDateString({
+            precision: 'date',
+            trim: 'date',
+            coerce: true,
+        });
         const x = [];
         if (properties.minValue) {
             isDateString(properties.minValue);
@@ -48,6 +52,7 @@ __decorate([
 ], DateType.prototype, "maxValue", void 0);
 DateType = __decorate([
     (SimpleType({
+        name: 'date',
         description: 'A date without time',
         nameMappings: {
             js: 'Date',

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

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

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

@@ -18,13 +18,18 @@ let FieldPathType = class FieldPathType {
     [ENCODER](properties, element) {
         return this[DECODER](properties, element);
     }
-    toJSON(properties, element) {
+    toJSON(properties, element, options) {
         const dataType = properties.dataType
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
-        const typeName = dataType ? element.node.getDataTypeNameWithNs(dataType) : undefined;
+        const typeName = dataType
+            ? element.node.getDataTypeNameWithNs(dataType)
+            : undefined;
+        if (options?.scopes && !dataType.inScope(options?.scopes))
+            throw new TypeError(`Data type ${typeName ? '(' + typeName + ')' : ''} ` +
+                `is not in required scope(s) [${options.scopes}`);
         return {
-            dataType: typeName ? typeName : dataType.toJSON(),
+            dataType: typeName ? typeName : dataType.toJSON(options),
             allowSigns: properties.allowSigns,
         };
     }
@@ -45,6 +50,7 @@ __decorate([
 ], FieldPathType.prototype, "allowSigns", void 0);
 FieldPathType = __decorate([
     SimpleType({
+        name: 'fieldpath',
         description: 'Field path',
         nameMappings: {
             js: 'string',

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

@@ -13,18 +13,26 @@ let FilterType = class FilterType {
         const dataType = properties.dataType
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
-        const rules = properties.rules ? new FilterRules(properties.rules) : undefined;
+        const rules = properties.rules
+            ? new FilterRules(properties.rules)
+            : undefined;
         return decodeFilter(dataType, rules);
     }
     [ENCODER]() {
         return encodeFilter;
     }
-    toJSON(properties, element) {
+    toJSON(properties, element, options) {
         const dataType = properties.dataType
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
+        const typeName = dataType
+            ? element.node.getDataTypeNameWithNs(dataType)
+            : undefined;
+        if (options?.scopes && !dataType.inScope(options?.scopes))
+            throw new TypeError(`Data type ${typeName ? '(' + typeName + ')' : ''} ` +
+                `is not in required scope(s) [${options.scopes}`);
         return {
-            dataType: dataType.name ? dataType.name : dataType.toJSON(),
+            dataType: typeName ? typeName : dataType.toJSON(options),
             rules: properties.rules,
         };
     }
@@ -44,6 +52,7 @@ __decorate([
 ], FilterType.prototype, "rules", void 0);
 FilterType = __decorate([
     SimpleType({
+        name: 'filter',
         description: 'A query filter',
         nameMappings: {
             js: 'object',
@@ -53,12 +62,12 @@ FilterType = __decorate([
     __metadata("design:paramtypes", [Object])
 ], FilterType);
 export { FilterType };
-const decodeFilter = (dataType, rules) => validator('decodeFilter', (input, context, _this) => {
+const decodeFilter = (dataType, rules, element) => validator('decodeFilter', (input, context, _this) => {
     if (typeof input === 'string') {
         try {
             const filter = OpraFilter.parse(input);
             if (rules)
-                return rules.normalizeFilter(filter, dataType);
+                return rules.normalizeFilter(filter, dataType, element);
             return filter;
         }
         catch (e) {

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

@@ -16,6 +16,7 @@ let ObjectIdType = class ObjectIdType {
 };
 ObjectIdType = __decorate([
     SimpleType({
+        name: 'ObjectId',
         description: 'A MongoDB ObjectID value',
         nameMappings: {
             js: 'object',

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

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

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

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

package/esm/document/data-type/extended-types/url.type.js

@@ -16,6 +16,7 @@ let UrlType = class UrlType {
 };
 UrlType = __decorate([
     (SimpleType({
+        name: 'url',
         description: 'A Uniform Resource Identifier Reference (RFC 3986 icon) value',
         nameMappings: {
             js: 'string',

package/esm/document/data-type/extended-types/uuid.type.js

@@ -22,6 +22,7 @@ __decorate([
 ], UuidType.prototype, "version", void 0);
 UuidType = __decorate([
     SimpleType({
+        name: 'uuid',
         description: 'A Universal Unique Identifier (UUID) value',
         nameMappings: {
             js: 'string',

package/esm/document/data-type/mapped-type.js

@@ -40,16 +40,22 @@ export const MappedType = function (...args) {
         }
         /** Copy fields from base */
         const isInheritedPredicate = getIsInheritedPredicateFn(_this.pick, _this.omit);
-        const partial = Array.isArray(_this.partial) ? _this.partial.map(x => x.toLowerCase()) : _this.partial;
-        const required = Array.isArray(_this.required) ? _this.required.map(x => x.toLowerCase()) : _this.required;
+        const partial = Array.isArray(_this.partial)
+            ? _this.partial.map(x => x.toLowerCase())
+            : _this.partial;
+        const required = Array.isArray(_this.required)
+            ? _this.required.map(x => x.toLowerCase())
+            : _this.required;
         for (const [k, v] of _this.base.fields.entries()) {
             if (!isInheritedPredicate(k))
                 continue;
             const meta = { ...v };
-            if (partial === true || (Array.isArray(partial) && partial.includes(v.name.toLowerCase()))) {
+            if (partial === true ||
+                (Array.isArray(partial) && partial.includes(v.name.toLowerCase()))) {
                 meta.required = false;
             }
-            else if (required === true || (Array.isArray(required) && required.includes(v.name.toLowerCase()))) {
+            else if (required === true ||
+                (Array.isArray(required) && required.includes(v.name.toLowerCase()))) {
                 meta.required = true;
             }
             const field = new ApiField(this, meta);
@@ -57,7 +63,8 @@ export const MappedType = function (...args) {
         }
         if (!_this.pick ||
             _this.base.additionalFields === false ||
-            (Array.isArray(_this.base.additionalFields) && _this.base.additionalFields?.[0] === 'error')) {
+            (Array.isArray(_this.base.additionalFields) &&
+                _this.base.additionalFields?.[0] === 'error')) {
             _this.additionalFields = _this.base.additionalFields;
         }
         if (initArgs.base.keyField && isInheritedPredicate(initArgs.base.keyField))
@@ -78,11 +85,16 @@ class MappedTypeClass extends ComplexTypeBase {
             return true;
         return !!this.base?.extendsFrom(baseType);
     }
-    toJSON() {
-        const baseName = this.base ? this.node.getDataTypeNameWithNs(this.base) : undefined;
+    toJSON(options) {
+        const baseName = this.base
+            ? this.node.getDataTypeNameWithNs(this.base)
+            : undefined;
+        if (options?.scopes && !this.base?.inScope(options?.scopes))
+            throw new TypeError(`Base type ${baseName ? '(' + baseName + ')' : ''} of ${this.name ? +this.name : 'embedded'} type ` +
+                `is not in required scope(s) [${options.scopes}`);
         return omitUndefined({
-            ...ComplexTypeBase.prototype.toJSON.call(this),
-            base: baseName ? baseName : this.base.toJSON(),
+            ...ComplexTypeBase.prototype.toJSON.call(this, options),
+            base: baseName ? baseName : this.base.toJSON(options),
             kind: this.kind,
             pick: this.pick,
             omit: this.omit,

package/esm/document/data-type/mixin-type.js

@@ -1,7 +1,7 @@
 import 'reflect-metadata';
 import { omitUndefined } from '@jsopen/objects';
 import { asMutable } from 'ts-gems';
-import { inheritPropertyInitializers, mergePrototype } from '../../helpers/index.js';
+import { inheritPropertyInitializers, mergePrototype, } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import { DATATYPE_METADATA, DECORATOR } from '../constants.js';
 import { ApiField } from './api-field.js';
@@ -54,13 +54,16 @@ class MixinTypeClass extends ComplexTypeBase {
         }
         return false;
     }
-    toJSON() {
+    toJSON(options) {
         return omitUndefined({
             ...ComplexTypeBase.prototype.toJSON.call(this),
             kind: this.kind,
-            types: this.types.map(t => {
-                const baseName = this.node.getDataTypeNameWithNs(t);
-                return baseName ? baseName : t.toJSON();
+            types: this.types.map(base => {
+                const baseName = this.node.getDataTypeNameWithNs(base);
+                if (options?.scopes && !base?.inScope(options?.scopes))
+                    throw new TypeError(`Base type ${baseName ? '(' + baseName + ')' : ''} of ${this.name ? +this.name : 'embedded'} type ` +
+                        `is not in required scope(s) [${options.scopes}`);
+                return baseName ? baseName : base.toJSON(options);
             }),
         });
     }
@@ -73,7 +76,9 @@ MixinType[DECORATOR] = MixinTypeFactory;
 function MixinTypeFactory(...args) {
     // Filter undefined items
     const clasRefs = args.filter(x => typeof x === 'function');
-    const options = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : undefined;
+    const options = typeof args[args.length - 1] === 'object'
+        ? args[args.length - 1]
+        : undefined;
     if (!clasRefs.length)
         throw new TypeError('No Class has been provided');
     if (clasRefs.length === 1)

package/esm/document/data-type/primitive-types/any.type.js

@@ -16,6 +16,7 @@ let AnyType = class AnyType {
 };
 AnyType = __decorate([
     SimpleType({
+        name: 'any',
         description: 'Represents any value',
     }),
     __metadata("design:paramtypes", [Object])

package/esm/document/data-type/primitive-types/bigint.type.js

@@ -13,7 +13,9 @@ let BigintType = class BigintType extends NumberType {
             x.push(vg.isGte(properties.minValue));
         if (properties.maxValue)
             x.push(vg.isLte(properties.maxValue));
-        return x.length > 0 ? vg.pipe([toBigint, ...x], { returnIndex: 0 }) : toBigint;
+        return x.length > 0
+            ? vg.pipe([toBigint, ...x], { returnIndex: 0 })
+            : toBigint;
     }
     [ENCODER](properties) {
         return this[DECODER](properties);
@@ -21,6 +23,7 @@ let BigintType = class BigintType extends NumberType {
 };
 BigintType = __decorate([
     SimpleType({
+        name: 'bigint',
         description: 'BigInt number',
         nameMappings: {
             js: 'bigint',

package/esm/document/data-type/primitive-types/boolean.type.js

@@ -16,6 +16,7 @@ let BooleanType = class BooleanType {
 };
 BooleanType = __decorate([
     SimpleType({
+        name: 'boolean',
         description: 'Simple true/false value',
         nameMappings: {
             js: 'boolean',

package/esm/document/data-type/primitive-types/integer.type.js

@@ -13,7 +13,9 @@ let IntegerType = class IntegerType extends NumberType {
             x.push(vg.isGte(properties.minValue));
         if (properties.maxValue)
             x.push(vg.isLte(properties.maxValue));
-        return x.length > 0 ? vg.pipe([toInteger, ...x], { returnIndex: 0 }) : toInteger;
+        return x.length > 0
+            ? vg.pipe([toInteger, ...x], { returnIndex: 0 })
+            : toInteger;
     }
     [ENCODER](properties) {
         return this[DECODER](properties);
@@ -21,6 +23,7 @@ let IntegerType = class IntegerType extends NumberType {
 };
 IntegerType = __decorate([
     SimpleType({
+        name: 'integer',
         description: 'An integer number',
         nameMappings: {
             js: 'number',

package/esm/document/data-type/primitive-types/null.type.js

@@ -16,6 +16,7 @@ let NullType = class NullType {
 };
 NullType = __decorate([
     SimpleType({
+        name: 'null',
         description: 'A Null value',
         nameMappings: {
             js: 'null',

package/esm/document/data-type/primitive-types/number.type.js

@@ -13,7 +13,9 @@ let NumberType = class NumberType {
             x.push(vg.isGte(properties.minValue));
         if (properties.maxValue)
             x.push(vg.isLte(properties.maxValue));
-        return x.length > 0 ? vg.pipe([toNumber, ...x], { returnIndex: 0 }) : toNumber;
+        return x.length > 0
+            ? vg.pipe([toNumber, ...x], { returnIndex: 0 })
+            : toNumber;
     }
     [ENCODER](properties) {
         return this[DECODER](properties);
@@ -33,6 +35,7 @@ __decorate([
 ], NumberType.prototype, "maxValue", void 0);
 NumberType = __decorate([
     SimpleType({
+        name: 'number',
         description: 'Both Integer as well as Floating-Point numbers',
         nameMappings: {
             js: 'number',

package/esm/document/data-type/primitive-types/string.type.js

@@ -21,7 +21,9 @@ let StringType = class StringType {
             x.push(vg.lengthMin(properties.minLength));
         if (properties.maxLength)
             x.push(vg.lengthMax(properties.maxLength));
-        return x.length > 0 ? vg.pipe([toString, ...x], { returnIndex: 0 }) : toString;
+        return x.length > 0
+            ? vg.pipe([toString, ...x], { returnIndex: 0 })
+            : toString;
     }
     [ENCODER](properties) {
         return this[DECODER](properties);
@@ -53,6 +55,7 @@ __decorate([
 ], StringType.prototype, "maxLength", void 0);
 StringType = __decorate([
     SimpleType({
+        name: 'string',
         description: 'A sequence of characters',
         nameMappings: {
             js: 'string',

package/esm/document/data-type/simple-type.js

@@ -5,7 +5,7 @@ import { isAny } from 'valgen';
 import { cloneObject } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import { DECORATOR } from '../constants.js';
-import { AttributeDecoratorFactory, SimpleTypeDecoratorFactory } from '../decorators/simple-type.decorator.js';
+import { AttributeDecoratorFactory, SimpleTypeDecoratorFactory, } from '../decorators/simple-type.decorator.js';
 import { DataType } from './data-type.js';
 /**
  * SimpleType constructor
@@ -28,7 +28,10 @@ export const SimpleType = function (...args) {
     }
     _this.properties = initArgs.properties;
     _this.ownNameMappings = { ...initArgs.nameMappings };
-    _this.nameMappings = { ..._this.base?.nameMappings, ...initArgs.nameMappings };
+    _this.nameMappings = {
+        ..._this.base?.nameMappings,
+        ...initArgs.nameMappings,
+    };
     _this.ownAttributes = cloneObject(initArgs.attributes || {});
     _this.attributes = _this.base ? cloneObject(_this.base.attributes) : {};
     if (_this.ownAttributes) {
@@ -77,18 +80,27 @@ class SimpleTypeClass extends DataType {
         }
         return isAny;
     }
-    toJSON() {
+    toJSON(options) {
         const attributes = omitUndefined(this.ownAttributes);
         let properties;
         if (this.properties && typeof this.properties.toJSON === 'function') {
-            properties = this.properties.toJSON(this.properties, this.owner);
+            properties = this.properties.toJSON(this.properties, this.owner, options);
         }
         else
             properties = this.properties ? cloneObject(this.properties) : {};
-        const baseName = this.base ? this.node.getDataTypeNameWithNs(this.base) : undefined;
+        const baseName = this.base
+            ? this.node.getDataTypeNameWithNs(this.base)
+            : undefined;
+        if (options?.scopes && !this.base?.inScope(options?.scopes))
+            throw new TypeError(`Base type ${baseName ? '(' + baseName + ')' : ''} of ${this.name ? +this.name : 'embedded'} type ` +
+                `is not in required scope(s) [${options.scopes}`);
         const out = omitUndefined({
             ...DataType.prototype.toJSON.apply(this),
-            base: this.base ? (baseName ? baseName : this.base.toJSON()) : undefined,
+            base: this.base
+                ? baseName
+                    ? baseName
+                    : this.base.toJSON(options)
+                : undefined,
             attributes: attributes && Object.keys(attributes).length ? attributes : undefined,
             properties: Object.keys(properties).length ? properties : undefined,
         });