@speclynx/apidom-ns-asyncapi-2 1.12.2 → 2.1.0

package/src/refractor/plugins/replace-empty-element.cjs

@@ -4,7 +4,9 @@ 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 _apidomTraverse = require("@speclynx/apidom-traverse");
 var _mediaTypes = _interopRequireDefault(require("../../media-types.cjs"));
 var _AsyncApiVersion = _interopRequireDefault(require("../../elements/AsyncApiVersion.cjs"));
 var _Identifier = _interopRequireDefault(require("../../elements/Identifier.cjs"));
@@ -138,7 +140,6 @@ var _OperationTraitSecurity = _interopRequireDefault(require("../../elements/nce
 var _MessageExamples = _interopRequireDefault(require("../../elements/nces/MessageExamples.cjs"));
 var _MessageTraits = _interopRequireDefault(require("../../elements/nces/MessageTraits.cjs"));
 var _MessageTraitExamples = _interopRequireDefault(require("../../elements/nces/MessageTraitExamples.cjs"));
-var _visitor = require("../../traversal/visitor.cjs");
 /**
  * AsyncApi >= 2.0.0 <=2.6.0 specification elements.
  */
@@ -220,7 +221,7 @@ var _visitor = require("../../traversal/visitor.cjs");
  *      (InfoElement))
  */
 
-const isEmptyElement = element => (0, _apidomCore.isStringElement)(element) && (0, _apidomCore.includesClasses)(['yaml-e-node', 'yaml-e-scalar'], element);
+const isEmptyElement = element => (0, _apidomDatamodel.isStringElement)(element) && (0, _apidomDatamodel.includesClasses)(element, ['yaml-e-node', 'yaml-e-scalar']);
 const schema = {
   // concrete types handling (CTs)
   AsyncApi2Element: {
@@ -281,15 +282,15 @@ const schema = {
   },
   ServerVariableElement: {
     enum(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     },
     examples(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     }
   },
   SecurityRequirementElement: {
     '[key: *]': function key(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     }
   },
   ChannelsElement: {
@@ -394,10 +395,10 @@ const schema = {
       return new _MessageBindings.default(...args);
     },
     examples(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     },
     traits(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     },
     payload(...args) {
       // @ts-ignore
@@ -408,7 +409,7 @@ const schema = {
       if (_mediaTypes.default.includes(schemaFormat)) {
         return new _Schema.default(...args);
       }
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     }
   },
   SecuritySchemeElement: {
@@ -473,12 +474,12 @@ const schema = {
       return new _MessageBindings.default(...args);
     },
     examples(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     }
   },
   MessageExampleElement: {
     headers(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     }
   },
   OperationBindingsElement: {
@@ -719,17 +720,17 @@ const schema = {
   },
   SchemaElement: {
     allOf(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-allOf');
       return element;
     },
     anyOf(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-anyOf');
       return element;
     },
     oneOf(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-oneOf');
       return element;
     },
@@ -746,7 +747,7 @@ const schema = {
       return new _Schema.default(...args);
     },
     enum(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     },
     items(...args) {
       return new _Schema.default(...args);
@@ -758,17 +759,17 @@ const schema = {
       return new _Schema.default(...args);
     },
     required(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-required');
       return element;
     },
     properties(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-properties');
       return element;
     },
     patternProperties(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-patternProperties');
       return element;
     },
@@ -776,7 +777,7 @@ const schema = {
       return new _Schema.default(...args);
     },
     dependencies(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-dependencies');
       return element;
     },
@@ -784,12 +785,12 @@ const schema = {
       return new _Schema.default(...args);
     },
     examples(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-examples');
       return element;
     },
     definitions(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-definitions');
       return element;
     },
@@ -835,63 +836,63 @@ const schema = {
   },
   AmqpChannelBindingElement: {
     exchange(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     },
     queue(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     }
   },
   AmqpOperationBindingElement: {
     cc(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     },
     bcc(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     }
   },
   IbmmqChannelBindingElement: {
     queue(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     },
     topic(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     }
   },
   MqttServerBindingElement: {
     lastWill(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     }
   },
   SolaceOperationBindingElement: {
     destinations(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     }
   },
   GooglepubsubChannelBindingElement: {
     labels(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     },
     messageStoragePolicy(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     },
     schemaSettings(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     }
   },
   GooglepubsubMessageBindingElement: {
     attributes(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     },
     schema(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     }
   },
   PulsarChannelBindingElement: {
     'geo-replication': function (...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     },
     retention(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     }
   },
   TagsElement: {
@@ -1037,7 +1038,7 @@ const schema = {
   }
 };
 const findElementFactory = (ancestor, keyName) => {
-  const elementType = (0, _visitor.getNodeType)(ancestor); // @ts-ignore
+  const elementType = (0, _apidomTraverse.getNodeType)(ancestor); // @ts-ignore
   const keyMapping = schema[elementType] || schema[(0, _apidomCore.toValue)(ancestor.classes.first)];
   return typeof keyMapping === 'undefined' ? undefined : Object.hasOwn(keyMapping, '[key: *]') ? keyMapping['[key: *]'] : keyMapping[keyName];
 };
@@ -1047,25 +1048,30 @@ const findElementFactory = (ancestor, keyName) => {
  */
 const plugin = () => () => ({
   visitor: {
-    StringElement(element, key, parent, path, ancestors) {
-      if (!isEmptyElement(element)) return undefined;
-      const lineage = [...ancestors, parent].filter(_apidomCore.isElement);
+    StringElement(path) {
+      const element = path.node;
+      if (!isEmptyElement(element)) return;
+
+      // getAncestorNodes() returns [parent, grandparent, ..., root], so reverse to get [root, ..., parent]
+      const lineage = path.getAncestorNodes().reverse().filter(_apidomDatamodel.isElement);
       const parentElement = lineage.at(-1);
       let elementFactory;
       let context;
-      if ((0, _apidomCore.isArrayElement)(parentElement)) {
+      if ((0, _apidomDatamodel.isArrayElement)(parentElement)) {
         context = element;
         elementFactory = findElementFactory(parentElement, '<*>');
-      } else if ((0, _apidomCore.isMemberElement)(parentElement)) {
+      } else if ((0, _apidomDatamodel.isMemberElement)(parentElement)) {
         context = lineage.at(-2);
         elementFactory = findElementFactory(context, (0, _apidomCore.toValue)(parentElement.key));
       }
 
       // no element factory found
-      if (typeof elementFactory !== 'function') return undefined;
-      return elementFactory.call({
+      if (typeof elementFactory !== 'function') return;
+      const replacement = elementFactory.call({
         context
-      }, undefined, (0, _apidomCore.cloneDeep)(element.meta), (0, _apidomCore.cloneDeep)(element.attributes));
+      }, undefined, (0, _apidomDatamodel.cloneDeep)(element.meta), (0, _apidomDatamodel.cloneDeep)(element.attributes));
+      _apidomDatamodel.SourceMapElement.transfer(element, replacement);
+      path.replaceWith(replacement);
     }
   }
 });

package/src/refractor/plugins/replace-empty-element.mjs

@@ -1,5 +1,7 @@
 import { defaultTo } from 'ramda';
-import { ObjectElement, ArrayElement, isStringElement, isArrayElement, isMemberElement, isElement, includesClasses, cloneDeep, toValue } from '@speclynx/apidom-core';
+import { ObjectElement, ArrayElement, isStringElement, isArrayElement, isMemberElement, isElement, includesClasses, cloneDeep, SourceMapElement } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
+import { getNodeType } from '@speclynx/apidom-traverse';
 import mediaTypes from "../../media-types.mjs";
 /**
  * AsyncApi >= 2.0.0 <=2.6.0 specification elements.
@@ -140,7 +142,6 @@ import OperationTraitSecurityElement from "../../elements/nces/OperationTraitSec
 import MessageExamplesElement from "../../elements/nces/MessageExamples.mjs";
 import MessageTraitsElement from "../../elements/nces/MessageTraits.mjs";
 import MessageTraitExamplesElement from "../../elements/nces/MessageTraitExamples.mjs";
-import { getNodeType } from "../../traversal/visitor.mjs";
 /**
  * This plugin is specific to YAML 1.2 format, which allows defining key-value pairs
  * with empty key, empty value, or both. If the value is not provided in YAML format,
@@ -174,7 +175,7 @@ import { getNodeType } from "../../traversal/visitor.mjs";
  *      (StringElement)
  *      (InfoElement))
  */
-const isEmptyElement = element => isStringElement(element) && includesClasses(['yaml-e-node', 'yaml-e-scalar'], element);
+const isEmptyElement = element => isStringElement(element) && includesClasses(element, ['yaml-e-node', 'yaml-e-scalar']);
 const schema = {
   // concrete types handling (CTs)
   AsyncApi2Element: {
@@ -1001,9 +1002,12 @@ const findElementFactory = (ancestor, keyName) => {
  */
 const plugin = () => () => ({
   visitor: {
-    StringElement(element, key, parent, path, ancestors) {
-      if (!isEmptyElement(element)) return undefined;
-      const lineage = [...ancestors, parent].filter(isElement);
+    StringElement(path) {
+      const element = path.node;
+      if (!isEmptyElement(element)) return;
+
+      // getAncestorNodes() returns [parent, grandparent, ..., root], so reverse to get [root, ..., parent]
+      const lineage = path.getAncestorNodes().reverse().filter(isElement);
       const parentElement = lineage.at(-1);
       let elementFactory;
       let context;
@@ -1016,10 +1020,12 @@ const plugin = () => () => ({
       }
 
       // no element factory found
-      if (typeof elementFactory !== 'function') return undefined;
-      return elementFactory.call({
+      if (typeof elementFactory !== 'function') return;
+      const replacement = elementFactory.call({
         context
       }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
+      SourceMapElement.transfer(element, replacement);
+      path.replaceWith(replacement);
     }
   }
 });

package/src/refractor/predicates.cjs

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.isReferenceLikeElement = exports.isAsyncApiExtension = void 0;
 var _ramda = require("ramda");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
 /**
  * @public
@@ -12,7 +13,7 @@ var _apidomCore = require("@speclynx/apidom-core");
  * @public
  */
 const isReferenceLikeElement = element => {
-  return (0, _apidomCore.isObjectElement)(element) && element.hasKey('$ref');
+  return (0, _apidomDatamodel.isObjectElement)(element) && element.hasKey('$ref');
 };
 
 /**
@@ -20,6 +21,6 @@ const isReferenceLikeElement = element => {
  */
 exports.isReferenceLikeElement = isReferenceLikeElement;
 const isAsyncApiExtension = element => {
-  return (0, _apidomCore.isStringElement)(element.key) && (0, _ramda.startsWith)('x-', (0, _apidomCore.toValue)(element.key));
+  return (0, _apidomDatamodel.isStringElement)(element.key) && (0, _ramda.startsWith)('x-', (0, _apidomCore.toValue)(element.key));
 };
 exports.isAsyncApiExtension = isAsyncApiExtension;

package/src/refractor/predicates.mjs

@@ -1,5 +1,6 @@
 import { startsWith } from 'ramda';
-import { isStringElement, isObjectElement, toValue } from '@speclynx/apidom-core';
+import { isStringElement, isObjectElement } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
 
 /**
  * @public