@opra/common 1.0.0-alpha.2 → 1.0.0-alpha.20

package/cjs/document/api-document.js

@@ -2,6 +2,8 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiDocument = void 0;
+const tslib_1 = require("tslib");
+const node_crypto_1 = tslib_1.__importDefault(require("node:crypto"));
 const index_js_1 = require("../helpers/index.js");
 const index_js_2 = require("../schema/index.js");
 const data_type_map_js_1 = require("./common/data-type-map.js");
@@ -30,18 +32,29 @@ class ApiDocument extends document_element_js_1.DocumentElement {
         if (dt)
             return this[constants_js_1.kTypeNSMap].get(dt);
     }
+    findDocument(id) {
+        if (this.id === id)
+            return this;
+        for (const doc of this.references.values()) {
+            if (doc.id === id)
+                return doc;
+            const d = doc.findDocument(id);
+            if (d)
+                return d;
+        }
+    }
     toJSON() {
         return this.export();
     }
     /**
      * Export as Opra schema definition object
      */
-    export(options) {
+    export() {
         const out = (0, index_js_1.omitUndefined)({
             spec: index_js_2.OpraSchema.SpecVersion,
+            id: this.id,
             url: this.url,
             info: (0, index_js_1.cloneObject)(this.info, true),
-            // api: this.api ? this.api.toJSON() : undefined,
         });
         if (this.references.size) {
             let i = 0;
@@ -49,16 +62,11 @@ class ApiDocument extends document_element_js_1.DocumentElement {
             for (const [ns, doc] of this.references.entries()) {
                 if (doc[constants_js_1.BUILTIN])
                     continue;
-                if (options?.references === 'external-url') {
-                    if (doc.url)
-                        references[ns] = doc.url;
-                    else
-                        references[ns] = `/$schema?ns=${ns}`;
-                }
-                else if (options?.references === 'relative-url')
-                    references[ns] = `/$schema?ns=${ns}`;
-                else
-                    references[ns] = doc.export(options);
+                references[ns] = {
+                    id: doc.id,
+                    url: doc.url,
+                    info: (0, index_js_1.cloneObject)(doc.info, true),
+                };
                 i++;
             }
             if (i)
@@ -74,6 +82,14 @@ class ApiDocument extends document_element_js_1.DocumentElement {
             out.api = this.api.toJSON();
         return out;
     }
+    invalidate() {
+        /** Generate id */
+        const x = this.export();
+        delete x.id;
+        this.id = node_crypto_1.default.createHash('md5').update(JSON.stringify(x)).digest('base64url');
+        /** Clear [kTypeNSMap] */
+        this[constants_js_1.kTypeNSMap] = new WeakMap();
+    }
     _findDataType(nameOrCtor, visitedRefs) {
         let result = this.types.get(nameOrCtor);
         if (result || !this.references.size)

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

@@ -23,7 +23,7 @@ class DataTypeMap {
     }
     get(nameOrCtor) {
         let name = typeof nameOrCtor === 'string' ? nameOrCtor : this[kCtorMap].get(nameOrCtor);
-        if (!name) {
+        if (!name && typeof nameOrCtor === 'function') {
             const metadata = Reflect.getMetadata(constants_js_1.DATATYPE_METADATA, nameOrCtor);
             name = metadata?.name;
         }

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentElement = void 0;
+const tslib_1 = require("tslib");
+const node_crypto_1 = tslib_1.__importDefault(require("node:crypto"));
 const ts_gems_1 = require("ts-gems");
 const document_node_js_1 = require("./document-node.js");
 /**
@@ -11,17 +13,19 @@ exports.DocumentElement = function (owner) {
     if (!this)
         throw new TypeError('"this" should be passed to call class constructor');
     const _this = (0, ts_gems_1.asMutable)(this);
+    _this.id = node_crypto_1.default.randomBytes(16).toString('base64url');
     Object.defineProperty(_this, 'node', {
         value: new document_node_js_1.DocumentNode(this, owner?.node),
         enumerable: false,
         writable: true,
     });
-    if (owner)
+    if (owner) {
         Object.defineProperty(_this, 'owner', {
             value: owner,
             enumerable: false,
             writable: true,
         });
+    }
 };
 /**
  * @class DocumentElement

package/cjs/document/constants.js

@@ -7,7 +7,7 @@ exports.DECODER = Symbol.for('opra.type.decoder');
 exports.ENCODER = Symbol('opra.type.encoder');
 exports.DECORATOR = Symbol.for('DECORATOR');
 exports.BUILTIN = Symbol.for('BUILTIN');
-exports.NAMESPACE_PATTERN = /([a-z$_]\w+)(:.+)/i;
+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');

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

@@ -24,8 +24,9 @@ exports.ApiField = function (...args) {
     _this.name = initArgs.name;
     const origin = initArgs.origin || owner;
     /* istanbul ignore next */
-    if (!(origin instanceof complex_type_base_js_1.ComplexTypeBase))
+    if (!(origin instanceof complex_type_base_js_1.ComplexTypeBase)) {
         throw new Error('Field origin should be one of ComplexType, MappedType or MixinType');
+    }
     _this.origin = origin;
     _this.type = initArgs.type || owner.node.getDataType('any');
     _this.description = initArgs.description;
@@ -36,6 +37,8 @@ exports.ApiField = function (...args) {
     _this.exclusive = initArgs.exclusive;
     _this.translatable = initArgs.translatable;
     _this.deprecated = initArgs.deprecated;
+    _this.readonly = initArgs.readonly;
+    _this.writeonly = initArgs.writeonly;
     _this.examples = initArgs.examples;
 };
 /**
@@ -46,7 +49,7 @@ class ApiFieldClass extends document_element_js_1.DocumentElement {
     toJSON() {
         const typeName = this.type ? this.node.getDataTypeNameWithNs(this.type) : undefined;
         return (0, index_js_1.omitUndefined)({
-            type: this.type ? (typeName ? typeName : this.type?.toJSON()) : undefined,
+            type: typeName ? typeName : this.type?.toJSON(),
             description: this.description,
             isArray: this.isArray,
             default: this.default,
@@ -55,6 +58,8 @@ class ApiFieldClass extends document_element_js_1.DocumentElement {
             exclusive: this.exclusive,
             translatable: this.translatable,
             deprecated: this.deprecated,
+            readonly: this.readonly,
+            writeonly: this.writeonly,
             examples: this.examples,
         });
     }

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

@@ -118,8 +118,9 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
             : options?.projection;
         const schema = this._generateSchema(codec, { ...options, projection, currentPath: '' });
         let additionalFields;
-        if (this.additionalFields instanceof data_type_js_1.DataType)
+        if (this.additionalFields instanceof data_type_js_1.DataType) {
             additionalFields = this.additionalFields.generateCodec(codec, options);
+        }
         else if (typeof this.additionalFields === 'boolean')
             additionalFields = this.additionalFields;
         else if (Array.isArray(this.additionalFields)) {
@@ -146,6 +147,10 @@ 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)) {
+                schema[field.name] = valgen_1.vg.isUndefined({ coerce: true });
+                continue;
+            }
             fieldName = field.name;
             let p;
             if (projection !== '*') {

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

@@ -29,11 +29,13 @@ exports.ComplexType = function (...args) {
     if (initArgs.base) {
         context.enter('.base', () => {
             // noinspection SuspiciousTypeOfGuard
-            if (!(initArgs.base instanceof complex_type_base_js_1.ComplexTypeBase))
+            if (!(initArgs.base instanceof complex_type_base_js_1.ComplexTypeBase)) {
                 throw new TypeError(`"${initArgs.base.kind}" can't be set as base for a "${this.kind}"`);
+            }
             _this.base = initArgs.base;
-            if (_this.additionalFields == null && _this.base.additionalFields)
+            if (_this.additionalFields == null && _this.base.additionalFields) {
                 _this.additionalFields = _this.base.additionalFields;
+            }
             /** Copy fields from base */
             for (const v of _this.base.fields.values()) {
                 this.fields.set(v.name, new api_field_js_1.ApiField(this, v));
@@ -60,6 +62,8 @@ exports.ComplexType = function (...args) {
  */
 class ComplexTypeClass extends complex_type_base_js_1.ComplexTypeBase {
     extendsFrom(baseType) {
+        if (!(baseType instanceof data_type_js_1.DataType))
+            baseType = this.node.getDataType(baseType);
         if (!(baseType instanceof complex_type_base_js_1.ComplexTypeBase))
             return false;
         if (baseType === this)
@@ -75,9 +79,8 @@ class ComplexTypeClass extends complex_type_base_js_1.ComplexTypeBase {
         });
         if (this.additionalFields) {
             if (this.additionalFields instanceof data_type_js_1.DataType) {
-                out.additionalFields = this.additionalFields[1].name
-                    ? this.additionalFields[1].name
-                    : this.additionalFields[1].toJSON();
+                const typeName = this.node.getDataTypeNameWithNs(this.additionalFields);
+                out.additionalFields = typeName ? typeName : this.additionalFields.toJSON();
             }
             else
                 out.additionalFields = this.additionalFields;

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

@@ -14,8 +14,9 @@ exports.DataType = function (owner, initArgs,
 context) {
     if (!this)
         throw new TypeError('"this" should be passed to call class constructor');
-    if (initArgs?.name && !constants_js_1.CLASS_NAME_PATTERN.test(initArgs.name))
+    if (initArgs?.name && !constants_js_1.CLASS_NAME_PATTERN.test(initArgs.name)) {
         throw new TypeError(`"${initArgs.name}" is not a valid DataType name`);
+    }
     document_element_js_1.DocumentElement.call(this, owner);
     const _this = (0, ts_gems_1.asMutable)(this);
     _this.kind = initArgs.kind;

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

@@ -22,8 +22,9 @@ exports.EnumType = function (...args) {
     _this.kind = index_js_2.OpraSchema.EnumType.Kind;
     if (initArgs.base) {
         // noinspection SuspiciousTypeOfGuard
-        if (!(initArgs.base instanceof exports.EnumType))
-            throw new TypeError(`"${initArgs.base.kind}" can't be set as base for a "${this.kind}"`);
+        if (!(initArgs.base instanceof exports.EnumType)) {
+            throw new TypeError(`"${initArgs.base.kind}" can't be set as base for a "${_this.kind}"`);
+        }
         _this.base = initArgs.base;
     }
     _this.instance = initArgs.instance;
@@ -38,6 +39,8 @@ exports.EnumType = function (...args) {
  */
 class EnumTypeClass extends data_type_js_1.DataType {
     extendsFrom(baseType) {
+        if (!(baseType instanceof data_type_js_1.DataType))
+            baseType = this.node.getDataType(baseType);
         if (!(baseType instanceof exports.EnumType))
             return false;
         if (baseType === this)

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

@@ -21,5 +21,10 @@ exports.Base64Type = Base64Type;
 exports.Base64Type = Base64Type = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A stream of bytes, base64 encoded',
-    })
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], Base64Type);

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

@@ -27,18 +27,25 @@ exports.DateStringType = DateStringType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateStringType.prototype, "minValue", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateStringType.prototype, "maxValue", void 0);
 exports.DateStringType = DateStringType = tslib_1.__decorate([
-    (0, simple_type_js_1.SimpleType)({
+    ((0, simple_type_js_1.SimpleType)({
         description: 'Date string value',
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
     })
         .Example('2021-04-18', 'Full date value')
         .Example('2021-04', 'Date value without day')
-        .Example('2021', 'Year only value')
+        .Example('2021', 'Year only value')),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], DateStringType);

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

@@ -27,21 +27,28 @@ exports.DateTimeStringType = DateTimeStringType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateTimeStringType.prototype, "minValue", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateTimeStringType.prototype, "maxValue", void 0);
 exports.DateTimeStringType = DateTimeStringType = tslib_1.__decorate([
-    (0, simple_type_js_1.SimpleType)({
+    ((0, simple_type_js_1.SimpleType)({
         description: 'DateTime string value',
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
     })
         .Example('2021-04-18T22:30:15+01:00', 'Full date-time value with timezone')
         .Example('2021-04-18T22:30:15', 'Full date-time value without timezone')
         .Example('2021-04-18 22:30', 'Date-time value')
         .Example('2021-04-18', 'Date value')
         .Example('2021-04', 'Date value without day')
-        .Example('2021', 'Year only value')
+        .Example('2021', 'Year only value')),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], DateTimeStringType);

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

@@ -41,18 +41,25 @@ exports.DateTimeType = DateTimeType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateTimeType.prototype, "minValue", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateTimeType.prototype, "maxValue", void 0);
 exports.DateTimeType = DateTimeType = tslib_1.__decorate([
-    (0, simple_type_js_1.SimpleType)({
+    ((0, simple_type_js_1.SimpleType)({
         description: 'A full datetime value',
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
     })
         .Example('2021-04-18T22:30:15')
         .Example('2021-04-18 22:30:15')
-        .Example('2021-04-18 22:30')
+        .Example('2021-04-18 22:30')),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], DateTimeType);

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

@@ -41,15 +41,22 @@ exports.DateType = DateType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateType.prototype, "minValue", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateType.prototype, "maxValue", void 0);
 exports.DateType = DateType = tslib_1.__decorate([
-    (0, simple_type_js_1.SimpleType)({
+    ((0, simple_type_js_1.SimpleType)({
         description: 'A date without time',
-    }).Example('2021-04-18', 'Full date value')
+        nameMappings: {
+            js: 'Date',
+            json: 'string',
+        },
+    }).Example('2021-04-18', 'Full date value')),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], DateType);

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

@@ -22,59 +22,73 @@ tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to `true`, the validator will also match `Display Name <email-address>',
         default: false,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "allowDisplayName", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to `true`, the validator will reject strings without the format `Display Name <email-address>',
         default: false,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "requireDisplayName", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: "If set to `false`, the validator will not allow any non-English UTF8 character in email address's local part",
         default: true,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "utf8LocalPart", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to `true`, the validator will not check for the standard max length of an email',
         default: false,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "ignoreMaxLength", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to `true`, the validator will allow IP addresses in the host part',
         default: false,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "allowIpDomain", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to `true`, some additional validation will be enabled, ' +
             'e.g. disallowing certain syntactically valid email addresses that are rejected by GMail.',
         default: false,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "domainSpecificValidation", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to an array of strings and the part of the email after the @ symbol ' +
             ' one of the strings defined in it, the validation fails.',
-    })
+    }),
+    tslib_1.__metadata("design:type", Array)
 ], EmailType.prototype, "hostBlacklist", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to an array of strings and the part of the email after the @ symbol ' +
             ' matches none of the strings defined in it, the validation fails.',
-    })
+    }),
+    tslib_1.__metadata("design:type", Array)
 ], EmailType.prototype, "hostWhitelist", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to a string, then the validator will reject emails that include ' +
             ' any of the characters in the string, in the name part.',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], EmailType.prototype, "blacklistedChars", void 0);
 exports.EmailType = EmailType = tslib_1.__decorate([
-    (0, simple_type_js_1.SimpleType)({
+    ((0, simple_type_js_1.SimpleType)({
         description: 'An email value',
-    }).Example('some.body@example.com')
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
+    }).Example('some.body@example.com')),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], EmailType);

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

@@ -15,9 +15,7 @@ let FieldPathType = class FieldPathType {
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
         const allowSigns = properties.allowSigns;
-        const decodeFieldPath = (0, valgen_1.validator)('decodeFieldPath', function (input) {
-            return dataType.normalizeFieldPath(input, { allowSigns });
-        });
+        const decodeFieldPath = (0, valgen_1.validator)('decodeFieldPath', (input) => dataType.normalizeFieldPath(input, { allowSigns }));
         return valgen_1.vg.pipe([valgen_1.toString, decodeFieldPath]);
     }
     [constants_js_1.ENCODER](properties, element) {
@@ -27,8 +25,9 @@ let FieldPathType = class FieldPathType {
         const dataType = properties.dataType
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
+        const typeName = dataType ? element.node.getDataTypeNameWithNs(dataType) : undefined;
         return {
-            dataType: dataType.name ? dataType.name : dataType.toJSON(),
+            dataType: typeName ? typeName : dataType.toJSON(),
             allowSigns: properties.allowSigns,
         };
     }
@@ -37,17 +36,24 @@ exports.FieldPathType = FieldPathType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Data type which field belong to',
-    })
+    }),
+    tslib_1.__metadata("design:type", Object)
 ], FieldPathType.prototype, "dataType", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Determines if signs (+,-) are allowed. ' +
             'If set "first" signs are allowed only beginning of the field path' +
             'If set "each" signs are allowed at each field in the path',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], FieldPathType.prototype, "allowSigns", void 0);
 exports.FieldPathType = FieldPathType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'Field path',
-    })
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], FieldPathType);

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

@@ -36,37 +36,42 @@ exports.FilterType = FilterType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Data type which filtering fields belong to',
-    })
+    }),
+    tslib_1.__metadata("design:type", Object)
 ], FilterType.prototype, "dataType", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Stringified JSON object defines filtering rules',
         format: 'string',
-    })
+    }),
+    tslib_1.__metadata("design:type", Object)
 ], FilterType.prototype, "rules", void 0);
 exports.FilterType = FilterType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A query filter',
-    })
+        nameMappings: {
+            js: 'object',
+            json: 'string',
+        },
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], FilterType);
-const decodeFilter = (dataType, rules) => {
-    return (0, valgen_1.validator)('decodeFilter', function (input, context, _this) {
-        if (typeof input === 'string') {
-            try {
-                const filter = index_js_1.OpraFilter.parse(input);
-                if (rules)
-                    return rules.normalizeFilter(filter, dataType);
-                return filter;
-            }
-            catch (e) {
-                context.fail(_this, `Not a valid filter expression. ${e.message}`, input, e.errors);
-                return;
-            }
+const decodeFilter = (dataType, rules) => (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 filter;
         }
-        context.fail(_this, `Nt a valid filter expression string`, input);
-    });
-};
-const encodeFilter = (0, valgen_1.validator)('encodeFilter', function (input, context, _this) {
+        catch (e) {
+            context.fail(_this, `Not a valid filter expression. ${e.message}`, input, e.errors);
+            return;
+        }
+    }
+    context.fail(_this, `Nt a valid filter expression string`, input);
+});
+const encodeFilter = (0, valgen_1.validator)('encodeFilter', (input, context, _this) => {
     if (input instanceof index_js_1.OpraFilter.Ast) {
         return input.toString();
     }

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

@@ -21,5 +21,10 @@ exports.ObjectIdType = ObjectIdType;
 exports.ObjectIdType = ObjectIdType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A MongoDB ObjectID value',
-    })
+        nameMappings: {
+            js: 'object',
+            json: 'string',
+        },
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], ObjectIdType);