@swagger-api/apidom-core 0.78.0 → 0.80.0

package/es/clone/errors/CloneError.mjs

@@ -1,3 +1,10 @@
 import { ApiDOMStructuredError } from '@swagger-api/apidom-error';
-class CloneError extends ApiDOMStructuredError {}
+class CloneError extends ApiDOMStructuredError {
+  constructor(message, structuredOptions) {
+    super(message, structuredOptions);
+    if (typeof structuredOptions !== 'undefined') {
+      this.value = structuredOptions.source;
+    }
+  }
+}
 export default CloneError;

package/es/clone/index.mjs

@@ -2,23 +2,63 @@ import { ArraySlice, ObjectSlice, KeyValuePair } from 'minim';
 import { isElement } from "../predicates/index.mjs";
 import DeepCloneError from "./errors/DeepCloneError.mjs";
 import ShallowCloneError from "./errors/ShallowCloneError.mjs";
-const invokeClone = value => {
-  if (typeof (value === null || value === void 0 ? void 0 : value.clone) === 'function') {
-    return value.clone();
+export 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 KeyValuePair) {
+    const {
+      key,
+      value: val
+    } = value;
+    const keyCopy = isElement(key) ? cloneDeep(key, passThroughOptions) : key;
+    const valueCopy = isElement(val) ? cloneDeep(val, passThroughOptions) : val;
+    const copy = new KeyValuePair(keyCopy, valueCopy);
+    visited.set(value, copy);
+    return copy;
   }
-  return value;
-};
-export const cloneDeep = value => {
   if (value instanceof ObjectSlice) {
-    const items = [...value].map(invokeClone);
-    return new ObjectSlice(items);
+    const mapper = element => cloneDeep(element, passThroughOptions);
+    const items = [...value].map(mapper);
+    const copy = new ObjectSlice(items);
+    visited.set(value, copy);
+    return copy;
   }
   if (value instanceof ArraySlice) {
-    const items = [...value].map(invokeClone);
-    return new ArraySlice(items);
+    const mapper = element => cloneDeep(element, passThroughOptions);
+    const items = [...value].map(mapper);
+    const copy = new ArraySlice(items);
+    visited.set(value, copy);
+    return copy;
   }
-  if (typeof (value === null || value === void 0 ? void 0 : value.clone) === 'function') {
-    return value.clone();
+  if (isElement(value)) {
+    const copy = cloneShallow(value); // eslint-disable-line @typescript-eslint/no-use-before-define
+
+    visited.set(value, copy);
+    if (value.content) {
+      if (isElement(value.content)) {
+        copy.content = cloneDeep(value.content, passThroughOptions);
+      } else if (value.content instanceof 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("Value provided to cloneDeep function couldn't be cloned", {
     value

package/es/deepmerge.mjs

@@ -73,7 +73,7 @@ export default 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 ObjectElement();

package/es/predicates/helpers.mjs

@@ -1,16 +1,21 @@
-const hasMethod = (name, obj) => typeof (obj === null || obj === void 0 ? 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) => {
-  var _obj$primitive;
-  return (obj === null || obj === void 0 || (_obj$primitive = obj.primitive) === null || _obj$primitive === void 0 ? void 0 : _obj$primitive.call(obj)) === val;
+import { ArrayElement } from 'minim';
+const hasMethod = (name, element) => {
+  return typeof element === 'object' && element !== null && name in element && typeof element[name] === 'function';
 };
-const hasClass = (cls, obj) => {
-  var _obj$classes, _obj$classes$includes;
-  return (obj === null || obj === void 0 || (_obj$classes = obj.classes) === null || _obj$classes === void 0 || (_obj$classes$includes = _obj$classes.includes) === null || _obj$classes$includes === void 0 ? void 0 : _obj$classes$includes.call(_obj$classes, cls)) || false;
+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;
 };
-export const isElementType = (name, element) => (element === null || element === void 0 ? void 0 : element.element) === name;
+const hasClass = (cls, element) => {
+  return typeof element === 'object' && element !== null && 'classes' in element && (Array.isArray(element.classes) || element.classes instanceof ArrayElement) && element.classes.includes(cls);
+};
+export const isElementType = (name, element) => typeof element === 'object' && element !== null && 'element' in element && element.element === name;
 const createPredicate = predicateCreator => {
-  // @ts-ignore
   return predicateCreator({
     hasMethod,
     hasBasicElementProps,

package/es/predicates/index.mjs

@@ -103,8 +103,7 @@ export const isPrimitiveElement = element => {
   return isElementTypeHelper('object', element) || isElementTypeHelper('array', element) || isElementTypeHelper('boolean', element) || isElementTypeHelper('number', element) || isElementTypeHelper('string', element) || isElementTypeHelper('null', element) || isElementTypeHelper('member', element);
 };
 export const hasElementSourceMap = element => {
-  var _element$meta, _element$meta$get;
-  return isSourceMapElement(element === null || element === void 0 || (_element$meta = element.meta) === null || _element$meta === void 0 || (_element$meta$get = _element$meta.get) === null || _element$meta$get === void 0 ? void 0 : _element$meta$get.call(_element$meta, 'sourceMap'));
+  return isSourceMapElement(element.meta.get('sourceMap'));
 };
 export const includesSymbols = (symbols, element) => {
   if (symbols.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-core",
-  "version": "0.78.0",
+  "version": "0.80.0",
   "description": "Tools for manipulating ApiDOM structures.",
   "publishConfig": {
     "access": "public",
@@ -42,8 +42,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-ast": "^0.78.0",
-    "@swagger-api/apidom-error": "^0.78.0",
+    "@swagger-api/apidom-ast": "^0.80.0",
+    "@swagger-api/apidom-error": "^0.80.0",
     "@types/ramda": "~0.29.6",
     "minim": "~0.23.8",
     "ramda": "~0.29.0",
@@ -62,5 +62,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "d6587217f8a7bec5bbc49ca4dabff8d3d66e0913"
+  "gitHead": "c959dedb5900d9d6ec2ba64aebc30a999d61b696"
 }

package/types/dist.d.ts

@@ -1,8 +1,8 @@
 /// <reference path="./minim.d.ts" />
-import { Element, ArrayElement, Meta, Attributes, Namespace as Namespace$1, NamespacePlugin, StringElement, ArraySlice, KeyValuePair, ObjectSlice, ObjectElement } from 'minim';
+import { Element, ArrayElement, Meta, Attributes, Namespace as Namespace$1, NamespacePlugin, StringElement, ArraySlice, NumberElement, NullElement, BooleanElement, ObjectElement, MemberElement, LinkElement, RefElement, KeyValuePair, ObjectSlice } from 'minim';
 export { ArrayElement, ArraySlice, Attributes, BooleanElement, Element, KeyValuePair, LinkElement, MemberElement, Meta, NamespacePluginOptions, NullElement, NumberElement, ObjectElement, ObjectSlice, RefElement, StringElement, refract } from 'minim';
 import stampit from 'stampit';
-import { ApiDOMStructuredError } from '@swagger-api/apidom-error';
+import { ApiDOMStructuredError, ApiDOMErrorOptions } from '@swagger-api/apidom-error';
 export { BREAK, mergeAllVisitors } from '@swagger-api/apidom-ast';
 
 declare const dispatchPlugins: <T extends Element>(element: T, plugins: any[], options?: {}) => T;
@@ -89,29 +89,6 @@ declare class ParseResult extends ArrayElement {
     replaceResult(replacement: Element): boolean;
 }
 
-declare const isElement: (element: any) => boolean;
-declare const isStringElement: (element: any) => boolean;
-declare const isNumberElement: (element: any) => boolean;
-declare const isNullElement: (element: any) => boolean;
-declare const isBooleanElement: (element: any) => boolean;
-declare const isObjectElement: (element: any) => boolean;
-declare const isArrayElement: (element: any) => boolean;
-declare const isMemberElement: (element: any) => boolean;
-declare const isLinkElement: (element: any) => boolean;
-declare const isRefElement: (element: any) => boolean;
-declare const isAnnotationElement: (element: any) => boolean;
-declare const isParseResultElement: (element: any) => boolean;
-declare const isSourceMapElement: (element: any) => boolean;
-declare const isPrimitiveElement: (element: any) => boolean;
-declare const hasElementSourceMap: (element: any) => boolean;
-declare const includesSymbols: <T extends Element>(symbols: string[], element: T) => boolean;
-declare const includesClasses: <T extends Element>(classes: string[], element: T) => boolean;
-
-declare const hasMethod: (name: string, obj: Record<string, unknown>) => boolean;
-declare const hasBasicElementProps: (element: any) => boolean;
-declare const primitiveEq: (val: unknown, obj: any) => boolean;
-declare const hasClass: (cls: string, obj: any) => boolean;
-declare const isElementType: (name: string, element: any) => boolean;
 interface PredicateHelpers {
     hasMethod: typeof hasMethod;
     hasBasicElementProps: typeof hasBasicElementProps;
@@ -119,8 +96,46 @@ interface PredicateHelpers {
     isElementType: typeof isElementType;
     hasClass: typeof hasClass;
 }
-type PredicateCreator = (helpers: PredicateHelpers) => (element: any) => boolean;
-declare const createPredicate: (predicateCreator: PredicateCreator) => (element: any) => boolean;
+interface ElementBasicsTrait {
+    _storedElement: string;
+    _content: unknown;
+}
+interface ElementPrimitiveBehavior {
+    primitive: () => unknown;
+}
+interface ElementTypeTrait<T = string> {
+    element: T;
+}
+interface ElementClassesTrait {
+    classes: ArrayElement | Array<string>;
+}
+type PredicateCreator<T extends Element> = (helpers: PredicateHelpers) => ElementPredicate<T>;
+type ElementPredicate<T extends Element> = (element: unknown) => element is T;
+declare const hasMethod: <T extends string>(name: T, element: unknown) => element is { [key in T]: (...args: unknown[]) => unknown; };
+declare const hasBasicElementProps: (element: unknown) => element is ElementBasicsTrait;
+declare const primitiveEq: (val: unknown, element: unknown) => element is ElementPrimitiveBehavior;
+declare const hasClass: (cls: string, element: unknown) => element is ElementClassesTrait;
+declare const isElementType: (name: string, element: unknown) => element is ElementTypeTrait<string>;
+declare const createPredicate: <T extends Element>(predicateCreator: PredicateCreator<T>) => ElementPredicate<T>;
+
+declare const isElement: ElementPredicate<Element>;
+declare const isStringElement: ElementPredicate<StringElement>;
+declare const isNumberElement: ElementPredicate<NumberElement>;
+declare const isNullElement: ElementPredicate<NullElement>;
+declare const isBooleanElement: ElementPredicate<BooleanElement>;
+declare const isObjectElement: ElementPredicate<ObjectElement>;
+declare const isArrayElement: ElementPredicate<ArrayElement>;
+declare const isMemberElement: ElementPredicate<MemberElement>;
+declare const isLinkElement: ElementPredicate<LinkElement>;
+declare const isRefElement: ElementPredicate<RefElement>;
+declare const isAnnotationElement: ElementPredicate<Annotation>;
+declare const isParseResultElement: ElementPredicate<ParseResult>;
+declare const isSourceMapElement: ElementPredicate<SourceMap>;
+type PrimitiveElement = ObjectElement | ArrayElement | BooleanElement | NumberElement | StringElement | NullElement | MemberElement;
+declare const isPrimitiveElement: ElementPredicate<PrimitiveElement>;
+declare const hasElementSourceMap: <T extends Element>(element: T) => boolean;
+declare const includesSymbols: <T extends Element>(symbols: string[], element: T) => boolean;
+declare const includesClasses: <T extends Element>(classes: string[], element: T) => boolean;
 
 declare const filter: <T extends Element>(predicate: (element: any) => boolean, element: T) => ArraySlice;
 
@@ -202,8 +217,11 @@ declare const transclude: (search: Element, replace: Element, element: Element)
 declare const dereference: (object: Record<string, any>, root?: Record<string, any>) => Record<string, any>;
 
 type FinalCloneTypes = KeyValuePair | ArraySlice | ObjectSlice;
+type DeepCloneOptions<T extends Element | FinalCloneTypes> = {
+    visited?: WeakMap<T, T>;
+};
 declare const cloneDeep: {
-    <T extends Element | FinalCloneTypes>(value: T): T;
+    <T extends Element | FinalCloneTypes>(value: T, options?: DeepCloneOptions<T>): T;
     safe<T_1>(value: T_1): T_1;
 };
 declare const cloneShallow: {
@@ -211,7 +229,12 @@ declare const cloneShallow: {
     safe<T_1>(value: T_1): T_1;
 };
 
+interface CloneErrorOptions extends ApiDOMErrorOptions {
+    readonly value: unknown;
+}
 declare class CloneError extends ApiDOMStructuredError {
+    readonly value: unknown;
+    constructor(message?: string, structuredOptions?: CloneErrorOptions);
 }
 
 declare class DeepCloneError extends CloneError {
@@ -271,4 +294,4 @@ declare namespace deepmerge {
     var all: (list: ObjectOrArrayElement[], options?: DeepMergeOptions | undefined) => any;
 }
 
-export { Annotation as AnnotationElement, CloneError, Comment as CommentElement, DeepCloneError, MediaTypes, Namespace, ParseResult as ParseResultElement, type Position, type PositionRange, ShallowCloneError, SourceMap as SourceMapElement, Transcluder, cloneDeep, cloneNode, cloneShallow, createNamespace, createPredicate, deepmerge, dehydrate, dereference, dispatchPlugins as dispatchRefractorPlugins, filter, find, findAtOffset, from, getNodeType, hasElementSourceMap, includesClasses, includesSymbols, isAnnotationElement, isArrayElement, isBooleanElement, isElement, isLinkElement, isMemberElement, isNullElement, isNumberElement, isObjectElement, isParseResultElement, isPrimitiveElement, isRefElement, isSourceMapElement, isStringElement, keyMapDefault as keyMap, namespace, parents, plugin$1 as refractorPluginElementIdentity, plugin as refractorPluginSemanticElementIdentity, reject, sexprs, some, serializer$1 as toJSON, toString, serializer$2 as toValue, serializer as toYAML, transclude, traverse, visit };
+export { Annotation as AnnotationElement, CloneError, Comment as CommentElement, DeepCloneError, type ElementPredicate, MediaTypes, Namespace, ParseResult as ParseResultElement, type Position, type PositionRange, ShallowCloneError, SourceMap as SourceMapElement, Transcluder, cloneDeep, cloneNode, cloneShallow, createNamespace, createPredicate, deepmerge, dehydrate, dereference, dispatchPlugins as dispatchRefractorPlugins, filter, find, findAtOffset, from, getNodeType, hasElementSourceMap, includesClasses, includesSymbols, isAnnotationElement, isArrayElement, isBooleanElement, isElement, isLinkElement, isMemberElement, isNullElement, isNumberElement, isObjectElement, isParseResultElement, isPrimitiveElement, isRefElement, isSourceMapElement, isStringElement, keyMapDefault as keyMap, namespace, parents, plugin$1 as refractorPluginElementIdentity, plugin as refractorPluginSemanticElementIdentity, reject, sexprs, some, serializer$1 as toJSON, toString, serializer$2 as toValue, serializer as toYAML, transclude, traverse, visit };