@opra/common 1.0.0-alpha.9 → 1.0.0-beta.1

package/cjs/document/factory/api-document.factory.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiDocumentFactory = 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 index_js_1 = require("../../helpers/index.js");
 const index_js_2 = require("../../schema/index.js");
 const api_document_js_1 = require("../api-document.js");
@@ -19,6 +16,9 @@ const OPRA_SPEC_URL = 'https://oprajs.com/spec/v' + index_js_2.OpraSchema.SpecVe
  * @class ApiDocumentFactory
  */
 class ApiDocumentFactory {
+    constructor() {
+        this._allDocuments = {};
+    }
     /**
      * Creates ApiDocument instance from given schema object
      */
@@ -68,9 +68,14 @@ class ApiDocumentFactory {
         else
             init = schemaOrUrl;
         // Add builtin data types if this document is the root
+        let builtinDocument;
         if (!document[constants_js_1.BUILTIN]) {
-            const builtinDocument = await this.createBuiltinDocument(context);
-            document.references.set('opra', builtinDocument);
+            const t = document.node.findDataType('string');
+            builtinDocument = t?.node.getDocument();
+            if (!builtinDocument) {
+                builtinDocument = await this.createBuiltinDocument(context);
+                document.references.set('opra', builtinDocument);
+            }
         }
         init.spec = init.spec || index_js_2.OpraSchema.SpecVersion;
         document.url = init.url;
@@ -91,8 +96,10 @@ class ApiDocumentFactory {
                             return;
                         }
                         const refDoc = new api_document_js_1.ApiDocument();
+                        if (builtinDocument)
+                            refDoc.references.set('opra', builtinDocument);
                         await this.initDocument(refDoc, context, r);
-                        document.references.set(ns, refDoc);
+                        document.references.set(ns, this._allDocuments[refDoc.id]);
                     });
                 }
             });
@@ -113,8 +120,10 @@ class ApiDocumentFactory {
                     context.addError(`Unknown service protocol (${init.api.protocol})`);
             });
         }
-        const x = document.export();
-        (0, ts_gems_1.asMutable)(document).id = node_crypto_1.default.createHash('md5').update(JSON.stringify(x)).digest('base64url');
+        document.invalidate();
+        /** Add document to global registry */
+        if (!this._allDocuments[document.id])
+            this._allDocuments[document.id] = document;
     }
     /**
      *

package/cjs/document/http/http-api.js

@@ -10,7 +10,6 @@ const http_controller_js_1 = require("./http-controller.js");
 class HttpApi extends api_base_js_1.ApiBase {
     constructor(owner) {
         super(owner);
-        this.owner = owner;
         // noinspection JSUnusedGlobalSymbols
         this._controllerReverseMap = new WeakMap();
         this.protocol = 'http';

package/cjs/document/http/http-controller.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpController = void 0;
+const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const ts_gems_1 = require("ts-gems");
 const index_js_1 = require("../../helpers/index.js");
 const index_js_2 = require("../../schema/index.js");
@@ -29,7 +31,7 @@ exports.HttpController = function (...args) {
     _this.parameters = [];
     _this.name = initArgs.name;
     _this.description = initArgs.description;
-    _this.path = initArgs.path || initArgs.name;
+    _this.path = initArgs.path ?? initArgs.name;
     _this.instance = initArgs.instance;
     _this.ctor = initArgs.ctor;
     _this._controllerReverseMap = new WeakMap();
@@ -100,7 +102,7 @@ class HttpControllerClass extends document_element_js_1.DocumentElement {
         }
     }
     getFullUrl() {
-        return (this.owner instanceof exports.HttpController ? this.owner.getFullUrl() : '/') + this.path;
+        return node_path_1.default.posix.join(this.owner instanceof exports.HttpController ? this.owner.getFullUrl() : '/', this.path);
     }
     /**
      *

package/cjs/document/http/http-media-type.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpMediaType = void 0;
+const tslib_1 = require("tslib");
+const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const ts_gems_1 = require("ts-gems");
+const valgen_1 = require("valgen");
 const index_js_1 = require("../../helpers/index.js");
 const document_element_js_1 = require("../common/document-element.js");
 const data_type_js_1 = require("../data-type/data-type.js");
@@ -24,7 +27,6 @@ exports.HttpMediaType = function (owner, initArgs) {
     _this.maxFiles = initArgs.maxFiles;
     _this.maxFileSize = initArgs.maxFileSize;
     _this.maxTotalFileSize = initArgs.maxTotalFileSize;
-    _this.minFileSize = initArgs.minFileSize;
     if (initArgs?.type) {
         _this.type = initArgs?.type instanceof data_type_js_1.DataType ? initArgs.type : _this.owner.node.getDataType(initArgs.type);
     }
@@ -59,12 +61,25 @@ class HttpMediaTypeClass extends document_element_js_1.DocumentElement {
             maxFiles: this.maxFiles,
             maxFileSize: this.maxFileSize,
             maxTotalFileSize: this.maxTotalFileSize,
-            minFileSize: this.minFileSize,
         });
         if (this.multipartFields?.length) {
             out.multipartFields = this.multipartFields.map(x => x.toJSON());
         }
         return out;
     }
+    generateCodec(codec, options) {
+        let fn;
+        if (this.type) {
+            fn = this.type.generateCodec(codec, options);
+        }
+        else if (this.contentType) {
+            const arr = Array.isArray(this.contentType) ? this.contentType : [this.contentType];
+            if (arr.find(ct => type_is_1.default.is(ct, ['json']))) {
+                fn = this.node.findDataType('object').generateCodec(codec);
+            }
+        }
+        fn = fn || valgen_1.isAny;
+        return this.isArray ? valgen_1.vg.isArray(fn) : fn;
+    }
 }
 exports.HttpMediaType.prototype = HttpMediaTypeClass.prototype;

package/cjs/document/http/http-multipart-field.js

@@ -11,7 +11,6 @@ const http_media_type_js_1 = require("./http-media-type.js");
 class HttpMultipartField extends http_media_type_js_1.HttpMediaType {
     constructor(owner, initArgs) {
         super(owner, initArgs);
-        this.owner = owner;
         this.fieldName =
             initArgs.fieldName instanceof RegExp
                 ? initArgs.fieldName

package/cjs/document/http/http-operation-response.js

@@ -10,7 +10,6 @@ const http_status_range_js_1 = require("./http-status-range.js");
 class HttpOperationResponse extends http_media_type_js_1.HttpMediaType {
     constructor(owner, init) {
         super(owner, init);
-        this.owner = owner;
         this.parameters = [];
         this.statusCode = (Array.isArray(init.statusCode) ? init.statusCode : [init.statusCode]).map(x => typeof x === 'object' ? new http_status_range_js_1.HttpStatusRange(x.start, x.end) : new http_status_range_js_1.HttpStatusRange(x));
         this.partial = init.partial;

package/cjs/document/http/http-operation.js

@@ -31,6 +31,7 @@ exports.HttpOperation = function (...args) {
     _this.types = _this.node[constants_js_1.kDataTypeMap] = new data_type_map_js_1.DataTypeMap();
     _this.name = initArgs.name;
     _this.path = initArgs.path;
+    _this.mergePath = initArgs.mergePath;
     _this.method = initArgs.method || 'GET';
     _this.description = initArgs.description;
     _this.composition = initArgs.composition;
@@ -57,13 +58,23 @@ class HttpOperationClass extends document_element_js_1.DocumentElement {
     }
     getFullUrl() {
         const out = this.owner.getFullUrl();
-        return out ? (this.path ? node_path_1.default.posix.join(out, this.path) : out) : this.path || '/';
+        if (out) {
+            if (this.path) {
+                if (this.mergePath)
+                    return out + this.path;
+                return node_path_1.default.posix.join(out, this.path);
+            }
+            return out;
+        }
+        return this.path || '/';
     }
     toJSON() {
         const out = (0, index_js_1.omitUndefined)({
             kind: index_js_2.OpraSchema.HttpOperation.Kind,
             description: this.description,
             method: this.method,
+            path: this.path,
+            mergePath: this.mergePath,
             composition: this.composition,
             requestBody: this.requestBody?.toJSON(),
         });

package/cjs/document/http/http-parameter.js

@@ -24,6 +24,8 @@ exports.HttpParameter = function (owner, initArgs) {
     _this.location = initArgs.location;
     _this.deprecated = initArgs.deprecated;
     _this.required = initArgs.required;
+    if (_this.required == null && initArgs.location === 'path')
+        _this.required = true;
     _this.arraySeparator = initArgs.arraySeparator;
     _this.keyParam = initArgs.keyParam;
 };

package/cjs/document/http/http-request-body.js

@@ -9,7 +9,6 @@ const document_element_js_1 = require("../common/document-element.js");
 class HttpRequestBody extends document_element_js_1.DocumentElement {
     constructor(owner) {
         super(owner);
-        this.owner = owner;
         this.content = [];
     }
     toJSON() {

package/cjs/document/http/http-status-range.js

@@ -25,8 +25,11 @@ class HttpStatusRange {
             this.end = m[2] ? parseInt(m[2], 10) : this.start;
         }
     }
-    get distance() {
-        return this.end - this.start;
+    includes(statusCode) {
+        return statusCode >= this.start && statusCode <= this.end;
+    }
+    intersects(start, end) {
+        return end >= this.start && start <= this.end;
     }
     toString() {
         if (this.start === this.end)

package/cjs/document/utils/parse-regexp.util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseRegExp = void 0;
+exports.parseRegExp = parseRegExp;
 function parseRegExp(str, options) {
     const i = str.lastIndexOf('/');
     if (str.startsWith('/') && i) {
@@ -19,4 +19,3 @@ function parseRegExp(str, options) {
     }
     throw new TypeError(`"${str}" is not a valid RegExp string`);
 }
-exports.parseRegExp = parseRegExp;

package/cjs/document/utils/string-compare.util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringCompare = void 0;
+exports.stringCompare = stringCompare;
 function stringCompare(a, b) {
     if (a < b)
         return -1;
@@ -8,4 +8,3 @@ function stringCompare(a, b) {
         return 1;
     return 0;
 }
-exports.stringCompare = stringCompare;

package/cjs/exception/opra-exception.js

@@ -9,6 +9,7 @@ const index_js_2 = require("../i18n/index.js");
 class OpraException extends Error {
     constructor(issue, cause) {
         super('Unknown error');
+        this.severity = 'error';
         cause = cause || (issue instanceof Error ? issue : undefined);
         if (issue instanceof Error)
             cause = issue;

package/cjs/filter/build.js

@@ -1,87 +1,87 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.$arithmetic = exports.$paren = exports.$notILike = exports.$ilike = exports.$notLike = exports.$like = exports.$notIn = exports.$in = exports.$lte = exports.$lt = exports.$gte = exports.$gt = exports.$ne = exports.$eq = exports.$field = exports.$array = exports.$number = exports.$time = exports.$date = exports.$and = exports.$or = void 0;
+exports.$or = $or;
+exports.$and = $and;
+exports.$date = $date;
+exports.$time = $time;
+exports.$number = $number;
+exports.$array = $array;
+exports.$field = $field;
+exports.$eq = $eq;
+exports.$ne = $ne;
+exports.$gt = $gt;
+exports.$gte = $gte;
+exports.$lt = $lt;
+exports.$lte = $lte;
+exports.$in = $in;
+exports.$notIn = $notIn;
+exports.$like = $like;
+exports.$notLike = $notLike;
+exports.$ilike = $ilike;
+exports.$notILike = $notILike;
+exports.$paren = $paren;
+exports.$arithmetic = $arithmetic;
 const index_js_1 = require("./ast/index.js");
 function $or(...items) {
     return new index_js_1.LogicalExpression({ op: 'or', items });
 }
-exports.$or = $or;
 function $and(...items) {
     return new index_js_1.LogicalExpression({ op: 'and', items });
 }
-exports.$and = $and;
 function $date(v) {
     return new index_js_1.DateLiteral(v);
 }
-exports.$date = $date;
 function $time(v) {
     return new index_js_1.TimeLiteral(v);
 }
-exports.$time = $time;
 function $number(v) {
     return new index_js_1.NumberLiteral(v);
 }
-exports.$number = $number;
 function $array(...items) {
     return new index_js_1.ArrayExpression(items.map(wrapEntryValue));
 }
-exports.$array = $array;
 function $field(v) {
     return new index_js_1.QualifiedIdentifier(v);
 }
-exports.$field = $field;
 function $eq(left, right) {
     return comparisonExpression('=', left, right);
 }
-exports.$eq = $eq;
 function $ne(left, right) {
     return comparisonExpression('!=', left, right);
 }
-exports.$ne = $ne;
 function $gt(left, right) {
     return comparisonExpression('>', left, right);
 }
-exports.$gt = $gt;
 function $gte(left, right) {
     return comparisonExpression('>=', left, right);
 }
-exports.$gte = $gte;
 function $lt(left, right) {
     return comparisonExpression('<', left, right);
 }
-exports.$lt = $lt;
 function $lte(left, right) {
     return comparisonExpression('<=', left, right);
 }
-exports.$lte = $lte;
 function $in(left, right) {
     return comparisonExpression('in', left, right);
 }
-exports.$in = $in;
 function $notIn(left, right) {
     return comparisonExpression('!in', left, right);
 }
-exports.$notIn = $notIn;
 function $like(left, right) {
     return comparisonExpression('like', left, right);
 }
-exports.$like = $like;
 function $notLike(left, right) {
     return comparisonExpression('!like', left, right);
 }
-exports.$notLike = $notLike;
 function $ilike(left, right) {
     return comparisonExpression('ilike', left, right);
 }
-exports.$ilike = $ilike;
 function $notILike(left, right) {
     return comparisonExpression('!ilike', left, right);
 }
-exports.$notILike = $notILike;
 function $paren(expression) {
     return new index_js_1.ParenthesizedExpression(expression);
 }
-exports.$paren = $paren;
 function $arithmetic(n) {
     const exp = new index_js_1.ArithmeticExpression();
     exp.add = (expression) => {
@@ -103,7 +103,6 @@ function $arithmetic(n) {
     exp.append('+', wrapEntryValue(n));
     return exp;
 }
-exports.$arithmetic = $arithmetic;
 function comparisonExpression(op, left, right) {
     const lex = wrapEntryValue(left);
     const rex = wrapEntryValue(right);

package/cjs/filter/filter-rules.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterRules = void 0;
 const index_js_1 = require("../exception/index.js");
-const index_js_2 = require("../filter/index.js");
-const index_js_3 = require("../helpers/index.js");
-const index_js_4 = require("../i18n/index.js");
+const index_js_2 = require("../helpers/index.js");
+const index_js_3 = require("../i18n/index.js");
+const index_js_4 = require("./ast/index.js");
+const parse_js_1 = require("./parse.js");
 class FilterRules {
     constructor(rules, options) {
-        this._rules = new index_js_3.ResponsiveMap();
+        this._rules = new index_js_2.ResponsiveMap();
         Object.defineProperty(this, '_rules', {
-            value: new index_js_3.ResponsiveMap(null, { caseSensitive: options?.caseSensitive }),
+            value: new index_js_2.ResponsiveMap(null, { caseSensitive: options?.caseSensitive }),
             enumerable: false,
         });
         if (rules) {
@@ -22,7 +23,7 @@ class FilterRules {
         const operators = typeof options?.operators === 'string'
             ? options.operators.split(/\s*[,| ]\s*/)
             : options?.operators;
-        this._rules.set(fieldName, (0, index_js_3.omitUndefined)({
+        this._rules.set(fieldName, (0, index_js_2.omitUndefined)({
             ...options,
             operators,
         }));
@@ -30,10 +31,10 @@ class FilterRules {
     normalizeFilter(filter, dataType) {
         if (!filter)
             return;
-        const ast = typeof filter === 'string' ? index_js_2.OpraFilter.parse(filter) : filter;
-        if (ast instanceof index_js_2.OpraFilter.ComparisonExpression) {
+        const ast = typeof filter === 'string' ? (0, parse_js_1.parse)(filter) : filter;
+        if (ast instanceof index_js_4.ComparisonExpression) {
             this.normalizeFilter(ast.left, dataType);
-            if (!(ast.left instanceof index_js_2.OpraFilter.QualifiedIdentifier && ast.left.field)) {
+            if (!(ast.left instanceof index_js_4.QualifiedIdentifier && ast.left.field)) {
                 throw new TypeError(`Invalid filter query. Left side should be a data field.`);
             }
             // Check if filtering accepted for given field
@@ -41,7 +42,7 @@ class FilterRules {
             const rule = this._rules.get(ast.left.value);
             if (!rule) {
                 throw new index_js_1.OpraException({
-                    message: (0, index_js_4.translate)('error:UNACCEPTED_FILTER_FIELD', { field: ast.left.value }),
+                    message: (0, index_js_3.translate)('error:UNACCEPTED_FILTER_FIELD', { field: ast.left.value }),
                     code: 'UNACCEPTED_FILTER_FIELD',
                     details: {
                         field: ast.left.value,
@@ -51,7 +52,7 @@ class FilterRules {
             // Check if filtering endpoint accepted for given field
             if (rule.operators && !rule.operators.includes(ast.op)) {
                 throw new index_js_1.OpraException({
-                    message: (0, index_js_4.translate)('error:UNACCEPTED_FILTER_OPERATION', { field: ast.left.value }),
+                    message: (0, index_js_3.translate)('error:UNACCEPTED_FILTER_OPERATION', { field: ast.left.value }),
                     code: 'UNACCEPTED_FILTER_OPERATION',
                     details: {
                         field: ast.left.value,
@@ -62,23 +63,23 @@ class FilterRules {
             this.normalizeFilter(ast.right, dataType);
             return ast;
         }
-        if (ast instanceof index_js_2.OpraFilter.LogicalExpression) {
+        if (ast instanceof index_js_4.LogicalExpression) {
             ast.items.forEach(item => this.normalizeFilter(item, dataType));
             return ast;
         }
-        if (ast instanceof index_js_2.OpraFilter.ArithmeticExpression) {
+        if (ast instanceof index_js_4.ArithmeticExpression) {
             ast.items.forEach(item => this.normalizeFilter(item.expression, dataType));
             return ast;
         }
-        if (ast instanceof index_js_2.OpraFilter.ArrayExpression) {
+        if (ast instanceof index_js_4.ArrayExpression) {
             ast.items.forEach(item => this.normalizeFilter(item, dataType));
             return ast;
         }
-        if (ast instanceof index_js_2.OpraFilter.ParenthesizedExpression) {
+        if (ast instanceof index_js_4.ParenthesizedExpression) {
             this.normalizeFilter(ast.expression, dataType);
             return ast;
         }
-        if (ast instanceof index_js_2.OpraFilter.QualifiedIdentifier && dataType) {
+        if (ast instanceof index_js_4.QualifiedIdentifier && dataType) {
             ast.value = dataType.normalizeFieldPath(ast.value);
             ast.field = dataType.getField(ast.value);
             ast.dataType = ast.field.type;

package/cjs/filter/parse.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = void 0;
+exports.parse = parse;
 const tslib_1 = require("tslib");
 const antlr4_1 = require("@browsery/antlr4");
 const OpraFilterLexer_js_1 = tslib_1.__importDefault(require("./antlr/OpraFilterLexer.js"));
@@ -34,4 +34,3 @@ function parse(text, visitor) {
     visitor = visitor || new filter_tree_visitor_js_1.FilterTreeVisitor();
     return visitor.visit(tree);
 }
-exports.parse = parse;

package/cjs/filter/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unquoteFilterString = exports.quoteFilterString = void 0;
+exports.quoteFilterString = quoteFilterString;
+exports.unquoteFilterString = unquoteFilterString;
 const quotesRegEx = /'/g;
 const escapeRegEx = /(\\)/g;
 const unescapeRegEx = /\\(.)/g;
@@ -13,7 +14,6 @@ function unescapeString(s) {
 function quoteFilterString(s) {
     return "'" + escapeString(s).replace(quotesRegEx, "\\'") + "'";
 }
-exports.quoteFilterString = quoteFilterString;
 function unquoteFilterString(s) {
     if (s && (s.startsWith("'") || s.startsWith('"')) && s.endsWith(s.charAt(0))) {
         return unescapeString(s.substring(1, s.length - 1));
@@ -21,4 +21,3 @@ function unquoteFilterString(s) {
     /* istanbul ignore next */
     return s;
 }
-exports.unquoteFilterString = unquoteFilterString;

package/cjs/helpers/function-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveThunk = void 0;
+exports.resolveThunk = resolveThunk;
 const tslib_1 = require("tslib");
 const putil_promisify_1 = tslib_1.__importDefault(require("putil-promisify"));
 const type_guards_js_1 = require("./type-guards.js");
@@ -13,4 +13,3 @@ async function resolveThunk(thunk) {
     }
     return thunk;
 }
-exports.resolveThunk = resolveThunk;

package/cjs/helpers/get-stack-filename.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getErrorStack = exports.getStackFileName = void 0;
+exports.getStackFileName = getStackFileName;
+exports.getErrorStack = getErrorStack;
 const PATH_PATTERN = /^(?:file:\/\/)?(.+)$/;
 function getStackFileName(position = 1) {
     if (position >= Error.stackTraceLimit) {
@@ -23,7 +24,6 @@ function getStackFileName(position = 1) {
     }
     return '';
 }
-exports.getStackFileName = getStackFileName;
 function getErrorStack(position = 1) {
     if (position >= Error.stackTraceLimit) {
         throw new TypeError('getCallerFile(position) requires position be less then Error.stackTraceLimit but position was: `' +
@@ -45,4 +45,3 @@ function getErrorStack(position = 1) {
     }
     return '';
 }
-exports.getErrorStack = getErrorStack;

package/cjs/helpers/index.js

@@ -8,4 +8,5 @@ tslib_1.__exportStar(require("./mixin-utils.js"), exports);
 tslib_1.__exportStar(require("./object-utils.js"), exports);
 tslib_1.__exportStar(require("./parse-fields-projection.js"), exports);
 tslib_1.__exportStar(require("./responsive-map.js"), exports);
+tslib_1.__exportStar(require("./safe-json-stringify.js"), exports);
 tslib_1.__exportStar(require("./type-guards.js"), exports);

package/cjs/helpers/mixin-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inheritPropertyInitializers = exports.mergePrototype = void 0;
+exports.mergePrototype = mergePrototype;
+exports.inheritPropertyInitializers = inheritPropertyInitializers;
 function mergePrototype(targetProto, baseProto, filter) {
     for (const k of Object.getOwnPropertyNames(baseProto)) {
         if (k === 'constructor' || k === '__proto__' || k === 'toJSON' || k === 'toString' || (filter && !filter(k))) {
@@ -9,7 +10,6 @@ function mergePrototype(targetProto, baseProto, filter) {
         Object.defineProperty(targetProto, k, Object.getOwnPropertyDescriptor(baseProto, k) || Object.create(null));
     }
 }
-exports.mergePrototype = mergePrototype;
 // noinspection JSUnusedLocalSymbols
 function inheritPropertyInitializers(target, clazz, 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -28,4 +28,3 @@ isPropertyInherited = (key) => true) {
         //
     }
 }
-exports.inheritPropertyInitializers = inheritPropertyInitializers;

package/cjs/helpers/object-utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.omitNullish = exports.omitUndefined = exports.cloneObject = void 0;
+exports.cloneObject = cloneObject;
+exports.omitUndefined = omitUndefined;
+exports.omitNullish = omitNullish;
 const tslib_1 = require("tslib");
 const putil_isplainobject_1 = tslib_1.__importDefault(require("putil-isplainobject"));
 const putil_merge_1 = tslib_1.__importDefault(require("putil-merge"));
@@ -8,14 +10,13 @@ const constants_js_1 = require("../document/constants.js");
 function cloneObject(obj, jsonOnly) {
     return (0, putil_merge_1.default)({}, obj, {
         deep: v => (0, putil_isplainobject_1.default)(v) && !v[constants_js_1.DATATYPE_METADATA],
+        descriptor: true,
         filter: (source, key) => {
             const v = source[key];
-            return ((v != null && !jsonOnly) ||
-                (typeof v !== 'function' && (typeof v !== 'object' || (0, putil_isplainobject_1.default)(v) || Array.isArray(v))));
+            return !jsonOnly || (typeof v !== 'function' && (typeof v !== 'object' || (0, putil_isplainobject_1.default)(v) || Array.isArray(v)));
         },
     });
 }
-exports.cloneObject = cloneObject;
 function omitUndefined(obj, recursive) {
     if (!(obj && typeof obj === 'object'))
         return obj;
@@ -27,7 +28,6 @@ function omitUndefined(obj, recursive) {
     }
     return obj;
 }
-exports.omitUndefined = omitUndefined;
 function omitNullish(obj, recursive) {
     if (!(obj && typeof obj === 'object'))
         return obj;
@@ -39,4 +39,3 @@ function omitNullish(obj, recursive) {
     }
     return obj;
 }
-exports.omitNullish = omitNullish;

package/cjs/helpers/parse-fields-projection.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = exports.parseFieldsProjection = exports.FieldsProjection = void 0;
+exports.FieldsProjection = void 0;
+exports.parseFieldsProjection = parseFieldsProjection;
+exports.parse = parse;
 const fast_tokenizer_1 = require("fast-tokenizer");
 const FIELD_PATTERN = /^([+-])?([a-z_$]\w*)$/i;
 const NO_DOT_BRACKET_PATTERN = /[^.]\(/g;
@@ -24,7 +26,6 @@ function parseFieldsProjection(projection, keepCase) {
     }
     return out;
 }
-exports.parseFieldsProjection = parseFieldsProjection;
 function parse(input, target) {
     /** Add dot before brackets which is required to split fields */
     input = input.replace(NO_DOT_BRACKET_PATTERN, s => s.charAt(0) + '.' + s.substring(1));
@@ -62,4 +63,3 @@ function parse(input, target) {
         }
     }
 }
-exports.parse = parse;

package/cjs/helpers/safe-json-stringify.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safeJsonStringify = safeJsonStringify;
+function safeJsonStringify(value, replacer, space) {
+    const seen = new WeakSet();
+    return JSON.stringify(value, (k, v) => {
+        if (v !== null && typeof v === 'object') {
+            if (seen.has(v))
+                return;
+            seen.add(v);
+        }
+        if (replacer)
+            return replacer(k, v);
+        return v;
+    }, space);
+}