@swagger-api/apidom-core 0.78.0 → 0.80.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.80.0](https://github.com/swagger-api/apidom/compare/v0.79.0...v0.80.0) (2023-10-26)
+
+### Features
+
+- **core:** support cycles in deep cloning ([#3322](https://github.com/swagger-api/apidom/issues/3322)) ([a9ba0a5](https://github.com/swagger-api/apidom/commit/a9ba0a5e2ad04395682cd9e7bb2feea2e4473fe3)), closes [#3290](https://github.com/swagger-api/apidom/issues/3290)
+
+# [0.79.0](https://github.com/swagger-api/apidom/compare/v0.78.0...v0.79.0) (2023-10-24)
+
+### Features
+
+- **predicates:** implement TypeScript type guards ([#3289](https://github.com/swagger-api/apidom/issues/3289)) ([0cae70a](https://github.com/swagger-api/apidom/commit/0cae70aa3edc17ecc628c21e30a6b2ac1e992372)), closes [#3280](https://github.com/swagger-api/apidom/issues/3280)
+
 # [0.78.0](https://github.com/swagger-api/apidom/compare/v0.77.0...v0.78.0) (2023-10-17)
 
 ### Bug Fixes

package/cjs/clone/errors/CloneError.cjs

@@ -3,5 +3,12 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _apidomError = require("@swagger-api/apidom-error");
-class CloneError extends _apidomError.ApiDOMStructuredError {}
+class CloneError extends _apidomError.ApiDOMStructuredError {
+  constructor(message, structuredOptions) {
+    super(message, structuredOptions);
+    if (typeof structuredOptions !== 'undefined') {
+      this.value = structuredOptions.source;
+    }
+  }
+}
 var _default = exports.default = CloneError;

package/cjs/clone/index.cjs

@@ -7,23 +7,63 @@ var _minim = require("minim");
 var _index = require("../predicates/index.cjs");
 var _DeepCloneError = _interopRequireDefault(require("./errors/DeepCloneError.cjs"));
 var _ShallowCloneError = _interopRequireDefault(require("./errors/ShallowCloneError.cjs"));
-const invokeClone = value => {
-  if (typeof (value == null ? void 0 : value.clone) === 'function') {
-    return value.clone();
+const cloneDeep = (value, options = {}) => {
+  const {
+    visited = new WeakMap()
+  } = options;
+  const passThroughOptions = {
+    ...options,
+    visited
+  };
+
+  // detect cycle and return memoized value
+  if (visited.has(value)) {
+    return visited.get(value);
+  }
+  if (value instanceof _minim.KeyValuePair) {
+    const {
+      key,
+      value: val
+    } = value;
+    const keyCopy = (0, _index.isElement)(key) ? cloneDeep(key, passThroughOptions) : key;
+    const valueCopy = (0, _index.isElement)(val) ? cloneDeep(val, passThroughOptions) : val;
+    const copy = new _minim.KeyValuePair(keyCopy, valueCopy);
+    visited.set(value, copy);
+    return copy;
   }
-  return value;
-};
-const cloneDeep = value => {
   if (value instanceof _minim.ObjectSlice) {
-    const items = [...value].map(invokeClone);
-    return new _minim.ObjectSlice(items);
+    const mapper = element => cloneDeep(element, passThroughOptions);
+    const items = [...value].map(mapper);
+    const copy = new _minim.ObjectSlice(items);
+    visited.set(value, copy);
+    return copy;
   }
   if (value instanceof _minim.ArraySlice) {
-    const items = [...value].map(invokeClone);
-    return new _minim.ArraySlice(items);
+    const mapper = element => cloneDeep(element, passThroughOptions);
+    const items = [...value].map(mapper);
+    const copy = new _minim.ArraySlice(items);
+    visited.set(value, copy);
+    return copy;
   }
-  if (typeof (value == null ? void 0 : value.clone) === 'function') {
-    return value.clone();
+  if ((0, _index.isElement)(value)) {
+    const copy = cloneShallow(value); // eslint-disable-line @typescript-eslint/no-use-before-define
+
+    visited.set(value, copy);
+    if (value.content) {
+      if ((0, _index.isElement)(value.content)) {
+        copy.content = cloneDeep(value.content, passThroughOptions);
+      } else if (value.content instanceof _minim.KeyValuePair) {
+        copy.content = cloneDeep(value.content, passThroughOptions);
+      } else if (Array.isArray(value.content)) {
+        const mapper = element => cloneDeep(element, passThroughOptions);
+        copy.content = value.content.map(mapper);
+      } else {
+        copy.content = value.content;
+      }
+    } else {
+      copy.content = value.content;
+    }
+    return copy;
   }
   throw new _DeepCloneError.default("Value provided to cloneDeep function couldn't be cloned", {
     value

package/cjs/deepmerge.cjs

@@ -79,7 +79,7 @@ function deepmerge(targetElement, sourceElement, options) {
 }
 deepmerge.all = (list, options) => {
   if (!Array.isArray(list)) {
-    throw new TypeError('First argument should be an array.');
+    throw new TypeError('First argument of deepmerge should be an array.');
   }
   if (list.length === 0) {
     return new _minim.ObjectElement();

package/cjs/predicates/helpers.cjs

@@ -2,17 +2,25 @@
 
 exports.__esModule = true;
 exports.isElementType = exports.default = void 0;
-const hasMethod = (name, obj) => typeof (obj == null ? void 0 : obj[name]) === 'function';
-const hasBasicElementProps = element => element != null && Object.prototype.hasOwnProperty.call(element, '_storedElement') && Object.prototype.hasOwnProperty.call(element, '_content');
-const primitiveEq = (val, obj) => (obj == null || obj.primitive == null ? void 0 : obj.primitive()) === val;
-const hasClass = (cls, obj) => {
-  var _obj$classes;
-  return (obj == null || (_obj$classes = obj.classes) == null || _obj$classes.includes == null ? void 0 : _obj$classes.includes(cls)) || false;
+var _minim = require("minim");
+const hasMethod = (name, element) => {
+  return typeof element === 'object' && element !== null && name in element && typeof element[name] === 'function';
 };
-const isElementType = (name, element) => (element == null ? void 0 : element.element) === name;
+const hasBasicElementProps = element => typeof element === 'object' && element != null && '_storedElement' in element && typeof element._storedElement === 'string' &&
+// eslint-disable-line no-underscore-dangle
+'_content' in element;
+const primitiveEq = (val, element) => {
+  if (typeof element === 'object' && element !== null && 'primitive' in element) {
+    return typeof element.primitive === 'function' && element.primitive() === val;
+  }
+  return false;
+};
+const hasClass = (cls, element) => {
+  return typeof element === 'object' && element !== null && 'classes' in element && (Array.isArray(element.classes) || element.classes instanceof _minim.ArrayElement) && element.classes.includes(cls);
+};
+const isElementType = (name, element) => typeof element === 'object' && element !== null && 'element' in element && element.element === name;
 exports.isElementType = isElementType;
 const createPredicate = predicateCreator => {
-  // @ts-ignore
   return predicateCreator({
     hasMethod,
     hasBasicElementProps,

package/cjs/predicates/index.cjs

@@ -110,8 +110,7 @@ const isPrimitiveElement = element => {
 };
 exports.isPrimitiveElement = isPrimitiveElement;
 const hasElementSourceMap = element => {
-  var _element$meta;
-  return isSourceMapElement(element == null || (_element$meta = element.meta) == null || _element$meta.get == null ? void 0 : _element$meta.get('sourceMap'));
+  return isSourceMapElement(element.meta.get('sourceMap'));
 };
 exports.hasElementSourceMap = hasElementSourceMap;
 const includesSymbols = (symbols, element) => {

package/dist/apidom-core.browser.js

@@ -21,7 +21,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9985);
 
-class CloneError extends _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__["default"] {}
+class CloneError extends _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__["default"] {
+  constructor(message, structuredOptions) {
+    super(message, structuredOptions);
+    if (typeof structuredOptions !== 'undefined') {
+      this.value = structuredOptions.source;
+    }
+  }
+}
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (CloneError);
 
 /***/ }),
@@ -66,32 +73,72 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   cloneShallow: () => (/* binding */ cloneShallow)
 /* harmony export */ });
 /* harmony import */ var minim__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7952);
-/* harmony import */ var _predicates__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4529);
-/* harmony import */ var _errors_DeepCloneError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4775);
+/* harmony import */ var _predicates__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4529);
+/* harmony import */ var _errors_DeepCloneError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4775);
 /* harmony import */ var _errors_ShallowCloneError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8872);
 
 
 
 
-const invokeClone = value => {
-  if (typeof value?.clone === 'function') {
-    return value.clone();
+const cloneDeep = (value, options = {}) => {
+  const {
+    visited = new WeakMap()
+  } = options;
+  const passThroughOptions = {
+    ...options,
+    visited
+  };
+
+  // detect cycle and return memoized value
+  if (visited.has(value)) {
+    return visited.get(value);
+  }
+  if (value instanceof minim__WEBPACK_IMPORTED_MODULE_0__.KeyValuePair) {
+    const {
+      key,
+      value: val
+    } = value;
+    const keyCopy = (0,_predicates__WEBPACK_IMPORTED_MODULE_1__.isElement)(key) ? cloneDeep(key, passThroughOptions) : key;
+    const valueCopy = (0,_predicates__WEBPACK_IMPORTED_MODULE_1__.isElement)(val) ? cloneDeep(val, passThroughOptions) : val;
+    const copy = new minim__WEBPACK_IMPORTED_MODULE_0__.KeyValuePair(keyCopy, valueCopy);
+    visited.set(value, copy);
+    return copy;
   }
-  return value;
-};
-const cloneDeep = value => {
   if (value instanceof minim__WEBPACK_IMPORTED_MODULE_0__.ObjectSlice) {
-    const items = [...value].map(invokeClone);
-    return new minim__WEBPACK_IMPORTED_MODULE_0__.ObjectSlice(items);
+    const mapper = element => cloneDeep(element, passThroughOptions);
+    const items = [...value].map(mapper);
+    const copy = new minim__WEBPACK_IMPORTED_MODULE_0__.ObjectSlice(items);
+    visited.set(value, copy);
+    return copy;
   }
   if (value instanceof minim__WEBPACK_IMPORTED_MODULE_0__.ArraySlice) {
-    const items = [...value].map(invokeClone);
-    return new minim__WEBPACK_IMPORTED_MODULE_0__.ArraySlice(items);
+    const mapper = element => cloneDeep(element, passThroughOptions);
+    const items = [...value].map(mapper);
+    const copy = new minim__WEBPACK_IMPORTED_MODULE_0__.ArraySlice(items);
+    visited.set(value, copy);
+    return copy;
   }
-  if (typeof value?.clone === 'function') {
-    return value.clone();
+  if ((0,_predicates__WEBPACK_IMPORTED_MODULE_1__.isElement)(value)) {
+    const copy = cloneShallow(value); // eslint-disable-line @typescript-eslint/no-use-before-define
+
+    visited.set(value, copy);
+    if (value.content) {
+      if ((0,_predicates__WEBPACK_IMPORTED_MODULE_1__.isElement)(value.content)) {
+        copy.content = cloneDeep(value.content, passThroughOptions);
+      } else if (value.content instanceof minim__WEBPACK_IMPORTED_MODULE_0__.KeyValuePair) {
+        copy.content = cloneDeep(value.content, passThroughOptions);
+      } else if (Array.isArray(value.content)) {
+        const mapper = element => cloneDeep(element, passThroughOptions);
+        copy.content = value.content.map(mapper);
+      } else {
+        copy.content = value.content;
+      }
+    } else {
+      copy.content = value.content;
+    }
+    return copy;
   }
-  throw new _errors_DeepCloneError__WEBPACK_IMPORTED_MODULE_1__["default"]("Value provided to cloneDeep function couldn't be cloned", {
+  throw new _errors_DeepCloneError__WEBPACK_IMPORTED_MODULE_2__["default"]("Value provided to cloneDeep function couldn't be cloned", {
     value
   });
 };
@@ -129,7 +176,7 @@ const cloneShallowElement = element => {
   if (element.attributes.length > 0) {
     copy._attributes = cloneDeep(element.attributes);
   }
-  if ((0,_predicates__WEBPACK_IMPORTED_MODULE_2__.isElement)(element.content)) {
+  if ((0,_predicates__WEBPACK_IMPORTED_MODULE_1__.isElement)(element.content)) {
     const content = element.content;
     copy.content = cloneShallowElement(content);
   } else if (Array.isArray(element.content)) {
@@ -153,7 +200,7 @@ const cloneShallow = value => {
   if (value instanceof minim__WEBPACK_IMPORTED_MODULE_0__.ArraySlice) {
     return cloneShallowArraySlice(value);
   }
-  if ((0,_predicates__WEBPACK_IMPORTED_MODULE_2__.isElement)(value)) {
+  if ((0,_predicates__WEBPACK_IMPORTED_MODULE_1__.isElement)(value)) {
     return cloneShallowElement(value);
   }
   throw new _errors_ShallowCloneError__WEBPACK_IMPORTED_MODULE_3__["default"]("Value provided to cloneShallow function couldn't be cloned", {
@@ -258,7 +305,7 @@ function deepmerge(targetElement, sourceElement, options) {
 }
 deepmerge.all = (list, options) => {
   if (!Array.isArray(list)) {
-    throw new TypeError('First argument should be an array.');
+    throw new TypeError('First argument of deepmerge should be an array.');
   }
   if (list.length === 0) {
     return new minim__WEBPACK_IMPORTED_MODULE_0__.ObjectElement();
@@ -498,13 +545,25 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__),
 /* harmony export */   isElementType: () => (/* binding */ isElementType)
 /* harmony export */ });
-const hasMethod = (name, obj) => typeof obj?.[name] === 'function';
-const hasBasicElementProps = element => element != null && Object.prototype.hasOwnProperty.call(element, '_storedElement') && Object.prototype.hasOwnProperty.call(element, '_content');
-const primitiveEq = (val, obj) => obj?.primitive?.() === val;
-const hasClass = (cls, obj) => obj?.classes?.includes?.(cls) || false;
-const isElementType = (name, element) => element?.element === name;
+/* harmony import */ var minim__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7952);
+
+const hasMethod = (name, element) => {
+  return typeof element === 'object' && element !== null && name in element && typeof element[name] === 'function';
+};
+const hasBasicElementProps = element => typeof element === 'object' && element != null && '_storedElement' in element && typeof element._storedElement === 'string' &&
+// eslint-disable-line no-underscore-dangle
+'_content' in element;
+const primitiveEq = (val, element) => {
+  if (typeof element === 'object' && element !== null && 'primitive' in element) {
+    return typeof element.primitive === 'function' && element.primitive() === val;
+  }
+  return false;
+};
+const hasClass = (cls, element) => {
+  return typeof element === 'object' && element !== null && 'classes' in element && (Array.isArray(element.classes) || element.classes instanceof minim__WEBPACK_IMPORTED_MODULE_0__.ArrayElement) && element.classes.includes(cls);
+};
+const isElementType = (name, element) => typeof element === 'object' && element !== null && 'element' in element && element.element === name;
 const createPredicate = predicateCreator => {
-  // @ts-ignore
   return predicateCreator({
     hasMethod,
     hasBasicElementProps,
@@ -655,7 +714,7 @@ const isPrimitiveElement = element => {
   return (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isElementType)('object', element) || (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isElementType)('array', element) || (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isElementType)('boolean', element) || (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isElementType)('number', element) || (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isElementType)('string', element) || (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isElementType)('null', element) || (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isElementType)('member', element);
 };
 const hasElementSourceMap = element => {
-  return isSourceMapElement(element?.meta?.get?.('sourceMap'));
+  return isSourceMapElement(element.meta.get('sourceMap'));
 };
 const includesSymbols = (symbols, element) => {
   if (symbols.length === 0) {
@@ -16438,7 +16497,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   mergeAll: () => (/* binding */ mergeAll),
 /* harmony export */   visit: () => (/* binding */ visit)
 /* harmony export */ });
-/* harmony import */ var _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7471);
+/* harmony import */ var _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9985);
 
 
 /**
@@ -16709,7 +16768,9 @@ visitor, {
     let result;
     if (!Array.isArray(node)) {
       if (!nodePredicate(node)) {
-        throw new _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__["default"](`Invalid AST Node:  ${JSON.stringify(node)}`);
+        throw new _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__["default"](`Invalid AST Node:  ${String(node)}`, {
+          node
+        });
       }
 
       // cycle detected; skipping over a sub-tree to avoid recursion
@@ -16858,7 +16919,9 @@ visitor, {
     let result;
     if (!Array.isArray(node)) {
       if (!nodePredicate(node)) {
-        throw new _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__["default"](`Invalid AST Node:  ${JSON.stringify(node)}`);
+        throw new _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__["default"](`Invalid AST Node: ${String(node)}`, {
+          node
+        });
       }
 
       // cycle detected; skipping over a sub-tree to avoid recursion