@speclynx/apidom-ns-openapi-2 5.0.2 → 5.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speclynx/apidom-ns-openapi-2",
-  "version": "5.0.2",
+  "version": "5.1.1",
   "description": "OpenAPI 2.0 namespace for ApiDOM.",
   "keywords": [
     "apidom",
@@ -56,12 +56,12 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^8.0.0",
-    "@speclynx/apidom-core": "5.0.2",
-    "@speclynx/apidom-datamodel": "5.0.2",
-    "@speclynx/apidom-error": "5.0.2",
-    "@speclynx/apidom-json-pointer": "5.0.2",
-    "@speclynx/apidom-ns-json-schema-draft-4": "5.0.2",
-    "@speclynx/apidom-traverse": "5.0.2",
+    "@speclynx/apidom-core": "5.1.1",
+    "@speclynx/apidom-datamodel": "5.1.1",
+    "@speclynx/apidom-error": "5.1.1",
+    "@speclynx/apidom-json-pointer": "5.1.1",
+    "@speclynx/apidom-ns-json-schema-draft-4": "5.1.1",
+    "@speclynx/apidom-traverse": "5.1.1",
     "ramda": "~0.32.0",
     "ramda-adjunct": "^6.1.0",
     "ts-mixer": "^6.0.4"
@@ -76,5 +76,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "01792b567baea3a47cb08d09e478178aa04afda9"
+  "gitHead": "b661f6f038953d118ad09eec0d7da7927db46f5c"
 }

package/src/refractor/plugins/normalize-parameters.cjs

@@ -54,7 +54,22 @@ const inheritParametersToOperation = (operationElement, pathItemElement) => {
 
   // prefers the first item if two items compare equal based on the predicate
   const mergedParameters = (0, _ramda.uniqWith)(parameterEquals, [...operationParams, ...pathItemParams]);
-  operationElement.parameters = new _OperationParameters.default(mergedParameters);
+  const originalParameters = operationElement.parameters;
+  const mergedElement = new _OperationParameters.default(mergedParameters);
+
+  // the merged container may replace an existing source container — carry over
+  // its meta, attributes, source map and style
+  if ((0, _apidomDatamodel.isArrayElement)(originalParameters)) {
+    if (!originalParameters.isMetaEmpty) {
+      mergedElement.meta = (0, _apidomDatamodel.cloneDeep)(originalParameters.meta);
+    }
+    if (!originalParameters.isAttributesEmpty) {
+      mergedElement.attributes = (0, _apidomDatamodel.cloneDeep)(originalParameters.attributes);
+    }
+    _apidomDatamodel.SourceMapElement.transfer(originalParameters, mergedElement);
+    _apidomDatamodel.StyleElement.transfer(originalParameters, mergedElement);
+  }
+  operationElement.parameters = mergedElement;
 };
 
 /**

package/src/refractor/plugins/normalize-parameters.mjs

@@ -1,6 +1,6 @@
 import { uniqWith } from 'ramda';
 import { toValue } from '@speclynx/apidom-core';
-import { isStringElement, isArrayElement } from '@speclynx/apidom-datamodel';
+import { SourceMapElement, StyleElement, cloneDeep, isStringElement, isArrayElement } from '@speclynx/apidom-datamodel';
 import OperationParametersElement from "../../elements/nces/OperationParameters.mjs";
 import NormalizeStorage from "./normalize-storage/index.mjs";
 import { isParameterElement } from "../../predicates.mjs";
@@ -46,7 +46,22 @@ const inheritParametersToOperation = (operationElement, pathItemElement) => {
 
   // prefers the first item if two items compare equal based on the predicate
   const mergedParameters = uniqWith(parameterEquals, [...operationParams, ...pathItemParams]);
-  operationElement.parameters = new OperationParametersElement(mergedParameters);
+  const originalParameters = operationElement.parameters;
+  const mergedElement = new OperationParametersElement(mergedParameters);
+
+  // the merged container may replace an existing source container — carry over
+  // its meta, attributes, source map and style
+  if (isArrayElement(originalParameters)) {
+    if (!originalParameters.isMetaEmpty) {
+      mergedElement.meta = cloneDeep(originalParameters.meta);
+    }
+    if (!originalParameters.isAttributesEmpty) {
+      mergedElement.attributes = cloneDeep(originalParameters.attributes);
+    }
+    SourceMapElement.transfer(originalParameters, mergedElement);
+    StyleElement.transfer(originalParameters, mergedElement);
+  }
+  operationElement.parameters = mergedElement;
 };
 
 /**

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

@@ -358,7 +358,7 @@ const plugin = () => () => ({
       if (typeof elementFactory !== 'function') return;
       const replacement = elementFactory.call({
         context
-      }, undefined, element.isMetaEmpty ? undefined : element.meta.cloneDeep(), element.isAttributesEmpty ? undefined : (0, _apidomDatamodel.cloneDeep)(element.attributes));
+      }, undefined, element.isMetaEmpty ? undefined : (0, _apidomDatamodel.cloneDeep)(element.meta), element.isAttributesEmpty ? undefined : (0, _apidomDatamodel.cloneDeep)(element.attributes));
       _apidomDatamodel.SourceMapElement.transfer(element, replacement);
       _apidomDatamodel.StyleElement.transfer(element, replacement);
       path.replaceWith(replacement);

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

@@ -348,7 +348,7 @@ const plugin = () => () => ({
       if (typeof elementFactory !== 'function') return;
       const replacement = elementFactory.call({
         context
-      }, undefined, element.isMetaEmpty ? undefined : element.meta.cloneDeep(), element.isAttributesEmpty ? undefined : cloneDeep(element.attributes));
+      }, undefined, element.isMetaEmpty ? undefined : cloneDeep(element.meta), element.isAttributesEmpty ? undefined : cloneDeep(element.attributes));
       SourceMapElement.transfer(element, replacement);
       StyleElement.transfer(element, replacement);
       path.replaceWith(replacement);

package/src/refractor/visitors/Visitor.cjs

@@ -24,7 +24,7 @@ class Visitor {
     if (!from.isMetaEmpty && !to.isMetaEmpty) {
       to.meta = to.meta.merge(from.meta);
     } else if (!from.isMetaEmpty) {
-      to.meta = from.meta.cloneDeep();
+      to.meta = (0, _apidomDatamodel.cloneDeep)(from.meta);
     }
     if (!from.isAttributesEmpty && !to.isAttributesEmpty) {
       to.attributes = (0, _apidomCore.deepmerge)(to.attributes, from.attributes);

package/src/refractor/visitors/Visitor.mjs

@@ -19,7 +19,7 @@ class Visitor {
     if (!from.isMetaEmpty && !to.isMetaEmpty) {
       to.meta = to.meta.merge(from.meta);
     } else if (!from.isMetaEmpty) {
-      to.meta = from.meta.cloneDeep();
+      to.meta = cloneDeep(from.meta);
     }
     if (!from.isAttributesEmpty && !to.isAttributesEmpty) {
       to.attributes = deepmerge(to.attributes, from.attributes);

package/src/refractor/visitors/open-api-2/ConsumesVisitor.cjs

@@ -19,6 +19,7 @@ class ConsumesVisitor extends _FallbackVisitor.default {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat((0, _apidomDatamodel.cloneDeep)(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/ConsumesVisitor.mjs

@@ -12,6 +12,7 @@ class ConsumesVisitor extends FallbackVisitor {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat(cloneDeep(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/ProducesVisitor.cjs

@@ -19,6 +19,7 @@ class ProducesVisitor extends _FallbackVisitor.default {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat((0, _apidomDatamodel.cloneDeep)(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/ProducesVisitor.mjs

@@ -12,6 +12,7 @@ class ProducesVisitor extends FallbackVisitor {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat(cloneDeep(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/SchemesVisitor.cjs

@@ -19,6 +19,7 @@ class SchemesVisitor extends _FallbackVisitor.default {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat((0, _apidomDatamodel.cloneDeep)(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/SchemesVisitor.mjs

@@ -12,6 +12,7 @@ class SchemesVisitor extends FallbackVisitor {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat(cloneDeep(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/operation/ConsumesVisitor.cjs

@@ -19,6 +19,7 @@ class ConsumesVisitor extends _FallbackVisitor.default {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat((0, _apidomDatamodel.cloneDeep)(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/operation/ConsumesVisitor.mjs

@@ -12,6 +12,7 @@ class ConsumesVisitor extends FallbackVisitor {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat(cloneDeep(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/operation/ProducesVisitor.cjs

@@ -19,6 +19,7 @@ class ProducesVisitor extends _FallbackVisitor.default {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat((0, _apidomDatamodel.cloneDeep)(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/operation/ProducesVisitor.mjs

@@ -12,6 +12,7 @@ class ProducesVisitor extends FallbackVisitor {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat(cloneDeep(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/operation/SchemesVisitor.cjs

@@ -19,6 +19,7 @@ class SchemesVisitor extends _FallbackVisitor.default {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat((0, _apidomDatamodel.cloneDeep)(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/operation/SchemesVisitor.mjs

@@ -12,6 +12,7 @@ class SchemesVisitor extends FallbackVisitor {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat(cloneDeep(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/operation/TagsVisitor.cjs

@@ -19,6 +19,7 @@ class TagsVisitor extends _FallbackVisitor.default {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat((0, _apidomDatamodel.cloneDeep)(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }

package/src/refractor/visitors/open-api-2/operation/TagsVisitor.mjs

@@ -12,6 +12,7 @@ class TagsVisitor extends FallbackVisitor {
   ArrayElement(path) {
     const arrayElement = path.node;
     this.element = this.element.concat(cloneDeep(arrayElement));
+    this.copyMetaAndAttributes(arrayElement, this.element);
     path.stop();
   }
 }