@speclynx/apidom-ns-asyncapi-2 1.12.1 → 2.0.1

package/src/refractor/visitors/async-api-2/servers/index.mjs

@@ -1,7 +1,5 @@
-import { Mixin } from 'ts-mixer';
 import { test } from 'ramda';
-import PatternedFieldsVisitor from "../../generics/PatternedFieldsVisitor.mjs";
-import FallbackVisitor from "../../FallbackVisitor.mjs";
+import { BasePatternedFieldsVisitor } from "../bases.mjs";
 import ServersElement from "../../../../elements/Servers.mjs";
 import { isReferenceLikeElement } from "../../../predicates.mjs";
 import { isReferenceElement } from "../../../../predicates.mjs";
@@ -11,7 +9,7 @@ import { isReferenceElement } from "../../../../predicates.mjs";
 /**
  * @public
  */
-class ServersVisitor extends Mixin(PatternedFieldsVisitor, FallbackVisitor) {
+class ServersVisitor extends BasePatternedFieldsVisitor {
   constructor(options) {
     super(options);
     this.element = new ServersElement();
@@ -23,14 +21,13 @@ class ServersVisitor extends Mixin(PatternedFieldsVisitor, FallbackVisitor) {
     // @ts-ignore
     this.fieldPatternPredicate = test(/^[A-Za-z0-9_-]+$/);
   }
-  ObjectElement(objectElement) {
-    const result = PatternedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+  ObjectElement(path) {
+    BasePatternedFieldsVisitor.prototype.ObjectElement.call(this, path);
 
     // @ts-ignore
     this.element.filter(isReferenceElement).forEach(referenceElement => {
-      referenceElement.setMetaProperty('referenced-element', 'server');
+      referenceElement.meta.set('referenced-element', 'server');
     });
-    return result;
   }
 }
 export default ServersVisitor;

package/src/refractor/visitors/async-api-2/tag/index.cjs

@@ -3,11 +3,9 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
 var _ramda = require("ramda");
 var _Tag = _interopRequireDefault(require("../../../../elements/Tag.cjs"));
-var _FallbackVisitor = _interopRequireDefault(require("../../FallbackVisitor.cjs"));
-var _FixedFieldsVisitor = _interopRequireDefault(require("../../generics/FixedFieldsVisitor.cjs"));
+var _bases = require("../bases.cjs");
 /**
  * @public
  */
@@ -15,7 +13,7 @@ var _FixedFieldsVisitor = _interopRequireDefault(require("../../generics/FixedFi
 /**
  * @public
  */
-class TagVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _FallbackVisitor.default) {
+class TagVisitor extends _bases.BaseFixedFieldsVisitor {
   constructor(options) {
     super(options);
     this.element = new _Tag.default();

package/src/refractor/visitors/async-api-2/tag/index.mjs

@@ -1,15 +1,13 @@
-import { Mixin } from 'ts-mixer';
 import { always } from 'ramda';
 import TagElement from "../../../../elements/Tag.mjs";
-import FallbackVisitor from "../../FallbackVisitor.mjs";
-import FixedFieldsVisitor from "../../generics/FixedFieldsVisitor.mjs";
+import { BaseFixedFieldsVisitor } from "../bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class TagVisitor extends Mixin(FixedFieldsVisitor, FallbackVisitor) {
+class TagVisitor extends BaseFixedFieldsVisitor {
   constructor(options) {
     super(options);
     this.element = new TagElement();

package/src/refractor/visitors/async-api-2/tags/index.cjs

@@ -3,11 +3,8 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
-var _apidomCore = require("@speclynx/apidom-core");
 var _Tags = _interopRequireDefault(require("../../../../elements/Tags.cjs"));
-var _SpecificationVisitor = _interopRequireDefault(require("../../SpecificationVisitor.cjs"));
-var _FallbackVisitor = _interopRequireDefault(require("../../FallbackVisitor.cjs"));
+var _bases = require("../bases.cjs");
 /**
  * @public
  */
@@ -15,18 +12,19 @@ var _FallbackVisitor = _interopRequireDefault(require("../../FallbackVisitor.cjs
 /**
  * @public
  */
-class TagsVisitor extends (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _FallbackVisitor.default) {
+class TagsVisitor extends _bases.BaseSpecificationVisitor {
   constructor(options) {
     super(options);
     this.element = new _Tags.default();
   }
-  ArrayElement(arrayElement) {
+  ArrayElement(path) {
+    const arrayElement = path.node;
     arrayElement.forEach(item => {
       const tagElement = this.toRefractedElement(['document', 'objects', 'Tag'], item);
       this.element.push(tagElement);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = TagsVisitor;

package/src/refractor/visitors/async-api-2/tags/index.mjs

@@ -1,26 +1,24 @@
-import { Mixin } from 'ts-mixer';
-import { BREAK } from '@speclynx/apidom-core';
 import TagsElement from "../../../../elements/Tags.mjs";
-import SpecificationVisitor from "../../SpecificationVisitor.mjs";
-import FallbackVisitor from "../../FallbackVisitor.mjs";
+import { BaseSpecificationVisitor } from "../bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class TagsVisitor extends Mixin(SpecificationVisitor, FallbackVisitor) {
+class TagsVisitor extends BaseSpecificationVisitor {
   constructor(options) {
     super(options);
     this.element = new TagsElement();
   }
-  ArrayElement(arrayElement) {
+  ArrayElement(path) {
+    const arrayElement = path.node;
     arrayElement.forEach(item => {
       const tagElement = this.toRefractedElement(['document', 'objects', 'Tag'], item);
       this.element.push(tagElement);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return BREAK;
+    path.stop();
   }
 }
 export default TagsVisitor;

package/src/refractor/visitors/generics/AlternatingVisitor.cjs

@@ -5,7 +5,6 @@ exports.__esModule = true;
 exports.default = void 0;
 var _ramda = require("ramda");
 var _ramdaAdjunct = require("ramda-adjunct");
-var _apidomCore = require("@speclynx/apidom-core");
 var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
 /**
  * @public
@@ -29,14 +28,15 @@ class AlternatingVisitor extends _SpecificationVisitor.default {
     });
     this.alternator = alternator;
   }
-  enter(element) {
+  enter(path) {
+    const element = path.node;
     const functions = this.alternator.map(({
       predicate,
       specPath
     }) => (0, _ramda.ifElse)(predicate, (0, _ramda.always)(specPath), _ramdaAdjunct.stubUndefined));
     const specPath = (0, _ramdaAdjunct.dispatch)(functions)(element);
     this.element = this.toRefractedElement(specPath, element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = AlternatingVisitor;

package/src/refractor/visitors/generics/AlternatingVisitor.mjs

@@ -1,6 +1,5 @@
 import { ifElse, always } from 'ramda';
 import { dispatch, stubUndefined } from 'ramda-adjunct';
-import { BREAK } from '@speclynx/apidom-core';
 import SpecificationVisitor from "../SpecificationVisitor.mjs";
 /**
  * @public
@@ -22,14 +21,15 @@ class AlternatingVisitor extends SpecificationVisitor {
     });
     this.alternator = alternator;
   }
-  enter(element) {
+  enter(path) {
+    const element = path.node;
     const functions = this.alternator.map(({
       predicate,
       specPath
     }) => ifElse(predicate, always(specPath), stubUndefined));
     const specPath = dispatch(functions)(element);
     this.element = this.toRefractedElement(specPath, element);
-    return BREAK;
+    path.stop();
   }
 }
 export default AlternatingVisitor;

package/src/refractor/visitors/generics/FixedFieldsVisitor.cjs

@@ -3,6 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
 var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
 var _predicates = require("../../predicates.cjs");
@@ -41,27 +42,29 @@ class FixedFieldsVisitor extends _SpecificationVisitor.default {
       this.specificationExtensionPredicate = specificationExtensionPredicate;
     }
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const specPath = this.specPath(objectElement);
     const fields = this.retrieveFixedFields(specPath);
 
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
-      if ((0, _apidomCore.isStringElement)(key) && fields.includes((0, _apidomCore.toValue)(key)) && !this.ignoredFields.includes((0, _apidomCore.toValue)(key))) {
-        const fixedFieldElement = this.toRefractedElement([...specPath, 'fixedFields', (0, _apidomCore.toValue)(key)], value);
-        const newMemberElement = new _apidomCore.MemberElement((0, _apidomCore.cloneDeep)(key), fixedFieldElement);
+      const keyValue = (0, _apidomCore.toValue)(key);
+      if ((0, _apidomDatamodel.isStringElement)(key) && fields.includes(keyValue) && !this.ignoredFields.includes(keyValue)) {
+        const fixedFieldElement = this.toRefractedElement([...specPath, 'fixedFields', keyValue], value);
+        const newMemberElement = new _apidomDatamodel.MemberElement((0, _apidomDatamodel.cloneDeep)(key), fixedFieldElement);
         newMemberElement.classes.push('fixed-field');
         this.copyMetaAndAttributes(memberElement, newMemberElement);
         this.element.content.push(newMemberElement);
       } else if (this.canSupportSpecificationExtensions && this.specificationExtensionPredicate(memberElement)) {
         const extensionElement = this.toRefractedElement(['document', 'extension'], memberElement);
         this.element.content.push(extensionElement);
-      } else if (!this.ignoredFields.includes((0, _apidomCore.toValue)(key))) {
-        this.element.content.push((0, _apidomCore.cloneDeep)(memberElement));
+      } else if (!this.ignoredFields.includes(keyValue)) {
+        this.element.content.push((0, _apidomDatamodel.cloneDeep)(memberElement));
       }
     });
     this.copyMetaAndAttributes(objectElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = FixedFieldsVisitor;

package/src/refractor/visitors/generics/FixedFieldsVisitor.mjs

@@ -1,4 +1,5 @@
-import { BREAK, isStringElement, MemberElement, cloneDeep, toValue } from '@speclynx/apidom-core';
+import { isStringElement, MemberElement, cloneDeep } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
 import SpecificationVisitor from "../SpecificationVisitor.mjs";
 import { isAsyncApiExtension } from "../../predicates.mjs";
 /**
@@ -34,14 +35,16 @@ class FixedFieldsVisitor extends SpecificationVisitor {
       this.specificationExtensionPredicate = specificationExtensionPredicate;
     }
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const specPath = this.specPath(objectElement);
     const fields = this.retrieveFixedFields(specPath);
 
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
-      if (isStringElement(key) && fields.includes(toValue(key)) && !this.ignoredFields.includes(toValue(key))) {
-        const fixedFieldElement = this.toRefractedElement([...specPath, 'fixedFields', toValue(key)], value);
+      const keyValue = toValue(key);
+      if (isStringElement(key) && fields.includes(keyValue) && !this.ignoredFields.includes(keyValue)) {
+        const fixedFieldElement = this.toRefractedElement([...specPath, 'fixedFields', keyValue], value);
         const newMemberElement = new MemberElement(cloneDeep(key), fixedFieldElement);
         newMemberElement.classes.push('fixed-field');
         this.copyMetaAndAttributes(memberElement, newMemberElement);
@@ -49,12 +52,12 @@ class FixedFieldsVisitor extends SpecificationVisitor {
       } else if (this.canSupportSpecificationExtensions && this.specificationExtensionPredicate(memberElement)) {
         const extensionElement = this.toRefractedElement(['document', 'extension'], memberElement);
         this.element.content.push(extensionElement);
-      } else if (!this.ignoredFields.includes(toValue(key))) {
+      } else if (!this.ignoredFields.includes(keyValue)) {
         this.element.content.push(cloneDeep(memberElement));
       }
     });
     this.copyMetaAndAttributes(objectElement, this.element);
-    return BREAK;
+    path.stop();
   }
 }
 export default FixedFieldsVisitor;

package/src/refractor/visitors/generics/MixedFieldsVisitor.cjs

@@ -3,11 +3,11 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
 var _ramda = require("ramda");
 var _apidomCore = require("@speclynx/apidom-core");
 var _FixedFieldsVisitor = _interopRequireDefault(require("./FixedFieldsVisitor.cjs"));
 var _PatternedFieldsVisitor = _interopRequireDefault(require("./PatternedFieldsVisitor.cjs"));
+var _bases = require("../async-api-2/bases.cjs");
 /**
  * @public
  */
@@ -15,7 +15,7 @@ var _PatternedFieldsVisitor = _interopRequireDefault(require("./PatternedFieldsV
 /**
  * @public
  */
-class MixedFieldsVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _PatternedFieldsVisitor.default) {
+class MixedFieldsVisitor extends _bases.BaseMixedFieldsVisitor {
   specPathFixedFields;
   specPathPatternedFields;
   constructor({
@@ -29,7 +29,8 @@ class MixedFieldsVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default
     this.specPathFixedFields = specPathFixedFields;
     this.specPathPatternedFields = specPathPatternedFields;
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const {
       specPath,
       ignoredFields
@@ -40,10 +41,10 @@ class MixedFieldsVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default
       // let FixedFieldsVisitor only process fixed fields and leave rest to PatternedFieldsVisitor
       // @ts-ignore
       this.ignoredFields = [...ignoredFields, ...(0, _ramda.difference)(objectElement.keys(), fixedFields)];
-      _FixedFieldsVisitor.default.prototype.ObjectElement.call(this, objectElement);
+      _FixedFieldsVisitor.default.prototype.ObjectElement.call(this, path);
       this.specPath = this.specPathPatternedFields;
       this.ignoredFields = fixedFields;
-      _PatternedFieldsVisitor.default.prototype.ObjectElement.call(this, objectElement);
+      _PatternedFieldsVisitor.default.prototype.ObjectElement.call(this, path);
 
       // reorder this.element members by original objectElement keys
       const objectElementKeys = objectElement.keys();
@@ -54,7 +55,7 @@ class MixedFieldsVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default
       this.specPath = specPath;
       throw e;
     }
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = MixedFieldsVisitor;

package/src/refractor/visitors/generics/MixedFieldsVisitor.mjs

@@ -1,15 +1,15 @@
-import { Mixin } from 'ts-mixer';
 import { difference } from 'ramda';
-import { BREAK, toValue } from '@speclynx/apidom-core';
+import { toValue } from '@speclynx/apidom-core';
 import FixedFieldsVisitor from "./FixedFieldsVisitor.mjs";
 import PatternedFieldsVisitor from "./PatternedFieldsVisitor.mjs";
+import { BaseMixedFieldsVisitor } from "../async-api-2/bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class MixedFieldsVisitor extends Mixin(FixedFieldsVisitor, PatternedFieldsVisitor) {
+class MixedFieldsVisitor extends BaseMixedFieldsVisitor {
   specPathFixedFields;
   specPathPatternedFields;
   constructor({
@@ -23,7 +23,8 @@ class MixedFieldsVisitor extends Mixin(FixedFieldsVisitor, PatternedFieldsVisito
     this.specPathFixedFields = specPathFixedFields;
     this.specPathPatternedFields = specPathPatternedFields;
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const {
       specPath,
       ignoredFields
@@ -34,10 +35,10 @@ class MixedFieldsVisitor extends Mixin(FixedFieldsVisitor, PatternedFieldsVisito
       // let FixedFieldsVisitor only process fixed fields and leave rest to PatternedFieldsVisitor
       // @ts-ignore
       this.ignoredFields = [...ignoredFields, ...difference(objectElement.keys(), fixedFields)];
-      FixedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+      FixedFieldsVisitor.prototype.ObjectElement.call(this, path);
       this.specPath = this.specPathPatternedFields;
       this.ignoredFields = fixedFields;
-      PatternedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+      PatternedFieldsVisitor.prototype.ObjectElement.call(this, path);
 
       // reorder this.element members by original objectElement keys
       const objectElementKeys = objectElement.keys();
@@ -48,7 +49,7 @@ class MixedFieldsVisitor extends Mixin(FixedFieldsVisitor, PatternedFieldsVisito
       this.specPath = specPath;
       throw e;
     }
-    return BREAK;
+    path.stop();
   }
 }
 export default MixedFieldsVisitor;

package/src/refractor/visitors/generics/PatternedFieldsVisitor.cjs

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.default = void 0;
 var _ramda = require("ramda");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
 var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
 var _predicates = require("../../predicates.cjs");
@@ -43,25 +44,27 @@ class PatternedFieldsVisitor extends _SpecificationVisitor.default {
       this.specificationExtensionPredicate = specificationExtensionPredicate;
     }
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
+      const keyValue = (0, _apidomCore.toValue)(key);
       if (this.canSupportSpecificationExtensions && this.specificationExtensionPredicate(memberElement)) {
         const extensionElement = this.toRefractedElement(['document', 'extension'], memberElement);
         this.element.content.push(extensionElement);
-      } else if (!this.ignoredFields.includes((0, _apidomCore.toValue)(key)) && this.fieldPatternPredicate((0, _apidomCore.toValue)(key))) {
+      } else if (!this.ignoredFields.includes(keyValue) && this.fieldPatternPredicate(keyValue)) {
         const specPath = this.specPath(value);
         const patternedFieldElement = this.toRefractedElement(specPath, value);
-        const newMemberElement = new _apidomCore.MemberElement((0, _apidomCore.cloneDeep)(key), patternedFieldElement);
+        const newMemberElement = new _apidomDatamodel.MemberElement((0, _apidomDatamodel.cloneDeep)(key), patternedFieldElement);
         this.copyMetaAndAttributes(memberElement, newMemberElement);
         newMemberElement.classes.push('patterned-field');
         this.element.content.push(newMemberElement);
-      } else if (!this.ignoredFields.includes((0, _apidomCore.toValue)(key))) {
-        this.element.content.push((0, _apidomCore.cloneDeep)(memberElement));
+      } else if (!this.ignoredFields.includes(keyValue)) {
+        this.element.content.push((0, _apidomDatamodel.cloneDeep)(memberElement));
       }
     });
     this.copyMetaAndAttributes(objectElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = PatternedFieldsVisitor;

package/src/refractor/visitors/generics/PatternedFieldsVisitor.mjs

@@ -1,5 +1,6 @@
 import { F as stubFalse } from 'ramda';
-import { MemberElement, BREAK, cloneDeep, toValue } from '@speclynx/apidom-core';
+import { MemberElement, cloneDeep } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
 import SpecificationVisitor from "../SpecificationVisitor.mjs";
 import { isAsyncApiExtension } from "../../predicates.mjs";
 /**
@@ -37,25 +38,27 @@ class PatternedFieldsVisitor extends SpecificationVisitor {
       this.specificationExtensionPredicate = specificationExtensionPredicate;
     }
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
+      const keyValue = toValue(key);
       if (this.canSupportSpecificationExtensions && this.specificationExtensionPredicate(memberElement)) {
         const extensionElement = this.toRefractedElement(['document', 'extension'], memberElement);
         this.element.content.push(extensionElement);
-      } else if (!this.ignoredFields.includes(toValue(key)) && this.fieldPatternPredicate(toValue(key))) {
+      } else if (!this.ignoredFields.includes(keyValue) && this.fieldPatternPredicate(keyValue)) {
         const specPath = this.specPath(value);
         const patternedFieldElement = this.toRefractedElement(specPath, value);
         const newMemberElement = new MemberElement(cloneDeep(key), patternedFieldElement);
         this.copyMetaAndAttributes(memberElement, newMemberElement);
         newMemberElement.classes.push('patterned-field');
         this.element.content.push(newMemberElement);
-      } else if (!this.ignoredFields.includes(toValue(key))) {
+      } else if (!this.ignoredFields.includes(keyValue)) {
         this.element.content.push(cloneDeep(memberElement));
       }
     });
     this.copyMetaAndAttributes(objectElement, this.element);
-    return BREAK;
+    path.stop();
   }
 }
 export default PatternedFieldsVisitor;