@swagger-api/apidom-core 0.91.0 → 0.93.0

package/es/elements/SourceMap.mjs

@@ -11,7 +11,7 @@ class SourceMap extends ArrayElement {
     return this.children.filter(item => item.classes.contains('position')).get(1);
   }
   set position(position) {
-    if (position === null) {
+    if (typeof position === 'undefined') {
       return;
     }
     const start = new ArrayElement([position.start.row, position.start.column, position.start.char]);

package/es/identity/index.mjs

@@ -3,6 +3,7 @@ import stampit from 'stampit';
 import ShortUniqueId from 'short-unique-id';
 import ElementIdentityError from "./errors/ElementIdentityError.mjs";
 import { isElement, isStringElement } from "../predicates/index.mjs";
+// @TODO(oliwia.rogala@smartbear.com): transforming this stamp to class will break backward compatibility
 export const IdentityManager = stampit({
   props: {
     uuid: null,

package/es/transcluder/Transcluder.mjs

@@ -1,4 +1,3 @@
-import stampit from 'stampit';
 import { isUndefined } from 'ramda-adjunct';
 import { isObjectElement, isArrayElement, isMemberElement } from "../predicates/index.mjs";
 const computeEdges = (element, edges = new WeakMap()) => {
@@ -69,18 +68,20 @@ const transcludeChildOfArrayElement = (search, replace, edges) => {
  * clone in before passing it to initializer of this stamp.
  */
 
-const Transcluder = stampit.init(function TranscluderConstructor({
-  element
-}) {
-  let edges;
-  this.transclude = function transclude(search, replace) {
-    var _edges;
+class Transcluder {
+  constructor({
+    element
+  }) {
+    this.element = element;
+  }
+  transclude(search, replace) {
+    var _this$edges;
     // shortcut 1. - replacing entire ApiDOM tree
-    if (search === element) return replace;
+    if (search === this.element) return replace;
     // shortcut 2. - replacing nothing
-    if (search === replace) return element;
-    edges = (_edges = edges) !== null && _edges !== void 0 ? _edges : computeEdges(element);
-    const parent = edges.get(search);
+    if (search === replace) return this.element;
+    this.edges = (_this$edges = this.edges) !== null && _this$edges !== void 0 ? _this$edges : computeEdges(this.element);
+    const parent = this.edges.get(search);
     if (isUndefined(parent)) {
       return undefined;
     }
@@ -92,13 +93,13 @@ const Transcluder = stampit.init(function TranscluderConstructor({
      */
     if (isObjectElement(parent)) {
       // @ts-ignore
-      transcludeChildOfObjectElement(search, replace, edges);
+      transcludeChildOfObjectElement(search, replace, this.edges);
     } else if (isArrayElement(parent)) {
-      transcludeChildOfArrayElement(search, replace, edges);
+      transcludeChildOfArrayElement(search, replace, this.edges);
     } else if (isMemberElement(parent)) {
-      transcludeChildOfMemberElement(search, replace, edges);
+      transcludeChildOfMemberElement(search, replace, this.edges);
     }
-    return element;
-  };
-});
+    return this.element;
+  }
+}
 export default Transcluder;

package/es/transcluder/index.mjs

@@ -4,7 +4,7 @@ import Transcluder from "./Transcluder.mjs";
  * clone in before passing it to this function.
  */
 export const transclude = (search, replace, element) => {
-  const transcluder = Transcluder({
+  const transcluder = new Transcluder({
     element
   });
   return transcluder.transclude(search, replace);

package/es/transformers/serializers/value/index.mjs

@@ -1,61 +1,58 @@
-import stampit from 'stampit';
 import { visit } from "./visitor.mjs";
 import EphemeralArray from "./ast/ephemeral-array.mjs";
 import EphemeralObject from "./ast/ephemeral-object.mjs";
 import { isElement, isBooleanElement, isNumberElement, isStringElement, isNullElement } from "../../../predicates/index.mjs";
-/* eslint-disable @typescript-eslint/naming-convention */
-const Visitor = stampit.init(function _Visitor() {
-  const references = new WeakMap();
-  this.BooleanElement = function _BooleanElement(element) {
-    return element.toValue();
-  };
-  this.NumberElement = function _NumberElement(element) {
-    return element.toValue();
-  };
-  this.StringElement = function _StringElement(element) {
-    return element.toValue();
-  };
-  this.NullElement = function _NullElement() {
-    return null;
-  };
-  this.ObjectElement = {
-    enter(element) {
-      if (references.has(element)) {
-        return references.get(element).toReference();
+/* eslint-disable class-methods-use-this */
+class Visitor {
+  ObjectElement = {
+    enter: element => {
+      if (this.references.has(element)) {
+        return this.references.get(element).toReference();
       }
       const ephemeral = new EphemeralObject(element.content);
-      references.set(element, ephemeral);
+      this.references.set(element, ephemeral);
       return ephemeral;
     }
   };
-  this.EphemeralObject = {
-    leave(ephemeral) {
+  EphemeralObject = {
+    leave: ephemeral => {
       return ephemeral.toObject();
     }
   };
-  this.MemberElement = {
-    enter(element) {
+  MemberElement = {
+    enter: element => {
       return [element.key, element.value];
     }
   };
-  this.ArrayElement = {
-    enter(element) {
-      if (references.has(element)) {
-        return references.get(element).toReference();
+  ArrayElement = {
+    enter: element => {
+      if (this.references.has(element)) {
+        return this.references.get(element).toReference();
       }
       const ephemeral = new EphemeralArray(element.content);
-      references.set(element, ephemeral);
+      this.references.set(element, ephemeral);
       return ephemeral;
     }
   };
-  this.EphemeralArray = {
-    leave(ephemeral) {
+  EphemeralArray = {
+    leave: ephemeral => {
       return ephemeral.toArray();
     }
   };
-});
-/* eslint-enable */
-
+  references = new WeakMap();
+  BooleanElement(element) {
+    return element.toValue();
+  }
+  NumberElement(element) {
+    return element.toValue();
+  }
+  StringElement(element) {
+    return element.toValue();
+  }
+  NullElement() {
+    return null;
+  }
+}
 const serializer = element => {
   if (!isElement(element)) return element;
 
@@ -63,6 +60,6 @@ const serializer = element => {
   if (isStringElement(element) || isNumberElement(element) || isBooleanElement(element) || isNullElement(element)) {
     return element.toValue();
   }
-  return visit(element, Visitor());
+  return visit(element, new Visitor());
 };
 export default serializer;

package/es/transformers/serializers/yaml-1-2.mjs

@@ -1,83 +1,76 @@
-import stampit from 'stampit';
 import { visit } from "../../traversal/visitor.mjs";
 import serializeValue from "./value/index.mjs";
-const YamlVisitor = stampit({
-  props: {
-    result: '',
-    indent: 0,
-    indentChar: '  '
-  },
-  init({
+class YamlVisitor {
+  static indentChar = '  ';
+  constructor({
     directive = false,
     indent = 0
   } = {}) {
     this.result = directive ? '%YAML 1.2\n---\n' : '';
     this.indent = indent;
-  },
-  methods: {
-    NumberElement(element) {
-      this.result += serializeValue(element);
-    },
-    BooleanElement(element) {
-      const value = serializeValue(element);
-      this.result += value ? 'true' : 'false';
-    },
-    StringElement(element) {
-      // for simplicity and avoiding ambiguity we always wrap strings in quotes
-      this.result += JSON.stringify(serializeValue(element));
-    },
-    NullElement() {
-      this.result += 'null';
-    },
-    ArrayElement(element) {
-      if (element.length === 0) {
-        this.result += '[]';
-        return false;
-      }
-      element.forEach(item => {
-        const visitor = YamlVisitor({
-          indent: this.indent + 1
-        });
-        const indent = this.indentChar.repeat(this.indent);
-        visit(item, visitor);
-        const {
-          result
-        } = visitor;
-        this.result += result.startsWith('\n') ? `\n${indent}-${result}` : `\n${indent}- ${result}`;
-      });
+  }
+  NumberElement(element) {
+    this.result += serializeValue(element);
+  }
+  BooleanElement(element) {
+    const value = serializeValue(element);
+    this.result += value ? 'true' : 'false';
+  }
+  StringElement(element) {
+    // for simplicity and avoiding ambiguity we always wrap strings in quotes
+    this.result += JSON.stringify(serializeValue(element));
+  }
+  NullElement() {
+    this.result += 'null';
+  }
+  ArrayElement(element) {
+    if (element.length === 0) {
+      this.result += '[]';
       return false;
-    },
-    ObjectElement(element) {
-      if (element.length === 0) {
-        this.result += '{}';
-        return false;
-      }
-      element.forEach((value, key) => {
-        const keyVisitor = YamlVisitor({
-          indent: this.indent + 1
-        });
-        const valueVisitor = YamlVisitor({
-          indent: this.indent + 1
-        });
-        const indent = this.indentChar.repeat(this.indent);
-        visit(key, keyVisitor);
-        visit(value, valueVisitor);
-        const {
-          result: keyResult
-        } = keyVisitor;
-        const {
-          result: valueResult
-        } = valueVisitor;
-        this.result += valueResult.startsWith('\n') ? `\n${indent}${keyResult}:${valueResult}` : `\n${indent}${keyResult}: ${valueResult}`;
+    }
+    element.forEach(item => {
+      const visitor = new YamlVisitor({
+        indent: this.indent + 1
       });
+      const indent = YamlVisitor.indentChar.repeat(this.indent);
+      visit(item, visitor);
+      const {
+        result
+      } = visitor;
+      this.result += result.startsWith('\n') ? `\n${indent}-${result}` : `\n${indent}- ${result}`;
+    });
+    return false;
+  }
+  ObjectElement(element) {
+    if (element.length === 0) {
+      this.result += '{}';
       return false;
     }
+    element.forEach((value, key) => {
+      const keyVisitor = new YamlVisitor({
+        indent: this.indent + 1
+      });
+      const valueVisitor = new YamlVisitor({
+        indent: this.indent + 1
+      });
+      const indent = YamlVisitor.indentChar.repeat(this.indent);
+      visit(key, keyVisitor);
+      visit(value, valueVisitor);
+      const {
+        result: keyResult
+      } = keyVisitor;
+      const {
+        result: valueResult
+      } = valueVisitor;
+      this.result += valueResult.startsWith('\n') ? `\n${indent}${keyResult}:${valueResult}` : `\n${indent}${keyResult}: ${valueResult}`;
+    });
+    return false;
   }
-});
+}
 const serializer = (element, {
   directive = false
 } = {}) => {
-  const visitor = YamlVisitor({
+  const visitor = new YamlVisitor({
     directive
   });
   visit(element, visitor);

package/es/transformers/sexprs.mjs

@@ -1,31 +1,26 @@
-import stampit from 'stampit';
 import { visit } from "../traversal/visitor.mjs";
-const SymbolicExpressionsVisitor = stampit({
-  props: {
-    nestingLevel: 0,
-    result: ''
-  },
-  methods: {
-    enter(element) {
-      const {
-        element: elementName
-      } = element;
-      const capitalizedElementName = elementName.charAt(0).toUpperCase() + elementName.slice(1);
-      const indent = '  '.repeat(this.nestingLevel);
-      this.result += this.nestingLevel > 0 ? '\n' : '';
-      this.result += `${indent}(${capitalizedElementName}Element`;
-      this.nestingLevel += 1;
-    },
-    leave() {
-      this.nestingLevel -= 1;
-      this.result += ')';
-    }
+class SymbolicExpressionsVisitor {
+  result = '';
+  nestingLevel = 0;
+  enter(element) {
+    const {
+      element: elementName
+    } = element;
+    const capitalizedElementName = elementName.charAt(0).toUpperCase() + elementName.slice(1);
+    const indent = '  '.repeat(this.nestingLevel);
+    this.result += this.nestingLevel > 0 ? '\n' : '';
+    this.result += `${indent}(${capitalizedElementName}Element`;
+    this.nestingLevel += 1;
   }
-});
+  leave() {
+    this.nestingLevel -= 1;
+    this.result += ')';
+  }
+}
 
 // transforms ApiDOM into S-expressions (Symbolic Expressions)
 const sexprs = element => {
-  const visitor = SymbolicExpressionsVisitor();
+  const visitor = new SymbolicExpressionsVisitor();
   visit(element, visitor);
   return visitor.result;
 };

package/es/traversal/filter.mjs

@@ -1,7 +1,7 @@
 import { ArraySlice } from 'minim';
 import { PredicateVisitor, visit } from "./visitor.mjs"; // finds all elements matching the predicate
 const filter = (predicate, element) => {
-  const visitor = PredicateVisitor({
+  const visitor = new PredicateVisitor({
     predicate
   });
   visit(element, visitor);

package/es/traversal/find.mjs

@@ -1,7 +1,7 @@
 import { pathOr } from 'ramda';
 import { PredicateVisitor, BREAK, visit } from "./visitor.mjs"; // find first element that satisfies the provided predicate
 const find = (predicate, element) => {
-  const visitor = PredicateVisitor({
+  const visitor = new PredicateVisitor({
     predicate,
     returnOnTrue: BREAK
   });

package/es/traversal/findAtOffset.mjs

@@ -1,41 +1,32 @@
-import stampit from 'stampit';
 import { last, pathOr } from 'ramda';
 import { isNumber } from 'ramda-adjunct';
 import { hasElementSourceMap } from "../predicates/index.mjs";
 import { visit } from "./visitor.mjs";
 import toValue from "../transformers/serializers/value/index.mjs";
-const Visitor = stampit({
-  props: {
-    result: [],
-    offset: 0,
-    includeRightBound: false
-  },
-  // @ts-ignore
-  init({
-    offset = this.offset,
-    includeRightBound = this.includeRightBound
-  }) {
+class Visitor {
+  constructor({
+    offset = 0,
+    includeRightBound = false
+  } = {}) {
     this.result = [];
     this.offset = offset;
     this.includeRightBound = includeRightBound;
-  },
-  methods: {
-    enter(element) {
-      if (!hasElementSourceMap(element)) {
-        return undefined; // dive in
-      }
-      const sourceMapElement = element.getMetaProperty('sourceMap');
-      const charStart = toValue(sourceMapElement.positionStart.get(2));
-      const charEnd = toValue(sourceMapElement.positionEnd.get(2));
-      const isWithinOffsetRange = this.offset >= charStart && (this.offset < charEnd || this.includeRightBound && this.offset <= charEnd);
-      if (isWithinOffsetRange) {
-        this.result.push(element);
-        return undefined; // push to stack and dive in
-      }
-      return false; // skip entire sub-tree
+  }
+  enter(element) {
+    if (!hasElementSourceMap(element)) {
+      return undefined; // dive in
+    }
+    const sourceMapElement = element.getMetaProperty('sourceMap');
+    const charStart = toValue(sourceMapElement.positionStart.get(2));
+    const charEnd = toValue(sourceMapElement.positionEnd.get(2));
+    const isWithinOffsetRange = this.offset >= charStart && (this.offset < charEnd || this.includeRightBound && this.offset <= charEnd);
+    if (isWithinOffsetRange) {
+      this.result.push(element);
+      return undefined; // push to stack and dive in
     }
+    return false; // skip entire sub-tree
   }
-});
+}
 // Finds the most inner node at the given offset.
 // If includeRightBound is set, also finds nodes that end at the given offset.
 // findAtOffset :: Number -> Element -> Element | Undefined
@@ -49,7 +40,7 @@ const findAtOffset = (options, element) => {
     offset = pathOr(0, ['offset'], options);
     includeRightBound = pathOr(false, ['includeRightBound'], options);
   }
-  const visitor = Visitor({
+  const visitor = new Visitor({
     offset,
     includeRightBound
   });

package/es/traversal/parents.mjs

@@ -1,38 +1,28 @@
-import stampit from 'stampit';
 import { visit } from "./visitor.mjs";
-/* eslint-disable no-param-reassign */
-const Visitor = stampit({
-  props: {
-    parent: null,
-    parentEdges: null
-  },
-  init() {
+class Visitor {
+  constructor() {
     this.parentEdges = new WeakMap();
-  },
-  methods: {
-    ObjectElement(objectElement) {
-      this.parentEdges.set(objectElement, this.parent);
-      this.parent = objectElement;
-    },
-    ArrayElement(arrayElement) {
-      this.parentEdges.set(arrayElement, this.parent);
-      this.parent = arrayElement;
-    },
-    MemberElement(memberElement) {
-      this.parentEdges.set(memberElement, this.parent);
-      this.parent = memberElement;
-    },
-    enter(element) {
-      this.parentEdges.set(element, this.parent);
-    }
   }
-});
-
-/* eslint-enable */
+  ObjectElement(objectElement) {
+    this.parentEdges.set(objectElement, this.parent);
+    this.parent = objectElement;
+  }
+  ArrayElement(arrayElement) {
+    this.parentEdges.set(arrayElement, this.parent);
+    this.parent = arrayElement;
+  }
+  MemberElement(memberElement) {
+    this.parentEdges.set(memberElement, this.parent);
+    this.parent = memberElement;
+  }
+  enter(element) {
+    this.parentEdges.set(element, this.parent);
+  }
+}
 
 // computes upwards edges from every child to its parent
 const parents = element => {
-  const visitor = Visitor();
+  const visitor = new Visitor();
   visit(element, visitor);
   return visitor.parentEdges;
 };

package/es/traversal/traverse.mjs

@@ -1,28 +1,25 @@
-import stampit from 'stampit';
 import { pathOr } from 'ramda';
 import { isFunction, noop } from 'ramda-adjunct';
 import { visit, PredicateVisitor } from "./visitor.mjs";
 import { isElement } from "../predicates/index.mjs";
-export const CallbackVisitor = stampit(PredicateVisitor, {
-  props: {
-    callback: noop
-  },
-  // @ts-ignore
-  init({
-    callback = this.callback
+export class CallbackVisitor extends PredicateVisitor {
+  constructor({
+    callback = noop,
+    ...rest
   } = {}) {
+    super({
+      ...rest
+    });
     this.callback = callback;
-  },
-  methods: {
-    enter(element) {
-      if (this.predicate(element)) {
-        this.callback(element);
-        return this.returnOnTrue;
-      }
-      return this.returnOnFalse;
+  }
+  enter(element) {
+    if (this.predicate(element)) {
+      this.callback(element);
+      return this.returnOnTrue;
     }
+    return this.returnOnFalse;
   }
-});
+}
 
 // executes the callback on this element and all descendants
 const traverse = (options, element) => {
@@ -35,7 +32,7 @@ const traverse = (options, element) => {
     callback = pathOr(noop, ['callback'], options);
     predicate = pathOr(isElement, ['predicate'], options);
   }
-  const visitor = CallbackVisitor({
+  const visitor = new CallbackVisitor({
     callback,
     predicate
   });

package/es/traversal/visitor.mjs

@@ -1,4 +1,3 @@
-import stampit from 'stampit';
 import { F as stubFalse, pipe } from 'ramda';
 import { isString } from 'ramda-adjunct';
 import { visit as astVisit, BREAK, mergeAllVisitors, cloneNode as cloneNodeDefault } from '@swagger-api/apidom-ast';
@@ -43,38 +42,25 @@ export const keyMapDefault = {
   ParseResultElement: ['content'],
   SourceMap: ['content']
 };
-export const PredicateVisitor = stampit({
-  props: {
-    result: [],
-    predicate: stubFalse,
-    returnOnTrue: undefined,
-    returnOnFalse: undefined
-  },
-  init({
-    // @ts-ignore
-    predicate = this.predicate,
-    // @ts-ignore
-    returnOnTrue = this.returnOnTrue,
-    // @ts-ignore
-    returnOnFalse = this.returnOnFalse
+export class PredicateVisitor {
+  constructor({
+    predicate = stubFalse,
+    returnOnTrue,
+    returnOnFalse
   } = {}) {
     this.result = [];
     this.predicate = predicate;
     this.returnOnTrue = returnOnTrue;
     this.returnOnFalse = returnOnFalse;
-  },
-  methods: {
-    enter(element) {
-      if (this.predicate(element)) {
-        this.result.push(element);
-        return this.returnOnTrue;
-      }
-      return this.returnOnFalse;
+  }
+  enter(element) {
+    if (this.predicate(element)) {
+      this.result.push(element);
+      return this.returnOnTrue;
     }
+    return this.returnOnFalse;
   }
-});
-
-// @ts-ignore
+}
 export const visit = (root,
 // @ts-ignore
 visitor, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-core",
-  "version": "0.91.0",
+  "version": "0.93.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.91.0",
-    "@swagger-api/apidom-error": "^0.91.0",
+    "@swagger-api/apidom-ast": "^0.93.0",
+    "@swagger-api/apidom-error": "^0.93.0",
     "@types/ramda": "~0.29.6",
     "minim": "~0.23.8",
     "ramda": "~0.29.1",
@@ -62,5 +62,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "a3b88484e7a38bbf82b04458cda81e4dc0b53519"
+  "gitHead": "65ea9068f5d8b144293c2f91eb5fe5ebacfd947c"
 }