@speclynx/apidom-ns-openapi-2 6.1.0 → 6.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speclynx/apidom-ns-openapi-2",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "OpenAPI 2.0 namespace for ApiDOM.",
   "keywords": [
     "apidom",
@@ -56,13 +56,13 @@
   "author": "Vladimir Gorej",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime-corejs3": "^8.0.5",
-    "@speclynx/apidom-core": "6.1.0",
-    "@speclynx/apidom-datamodel": "6.1.0",
-    "@speclynx/apidom-error": "6.1.0",
-    "@speclynx/apidom-json-pointer": "6.1.0",
-    "@speclynx/apidom-ns-json-schema-draft-4": "6.1.0",
-    "@speclynx/apidom-traverse": "6.1.0",
+    "@babel/runtime-corejs3": "^8.0.8",
+    "@speclynx/apidom-core": "6.1.1",
+    "@speclynx/apidom-datamodel": "6.1.1",
+    "@speclynx/apidom-error": "6.1.1",
+    "@speclynx/apidom-json-pointer": "6.1.1",
+    "@speclynx/apidom-ns-json-schema-draft-4": "6.1.1",
+    "@speclynx/apidom-traverse": "6.1.1",
     "ramda": "~0.32.0",
     "ramda-adjunct": "^6.1.0",
     "ts-mixer": "^6.0.4"
@@ -77,5 +77,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "575dbf59cb58a6c57248bf2c027a5cbc99442a63"
+  "gitHead": "c25778097fd33bf5f0d61de6843a6240571f94b3"
 }

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

@@ -71,7 +71,7 @@ var _SwaggerTags = _interopRequireDefault(require("../../elements/nces/SwaggerTa
  *      (SwaggerVersionElement))
  *    (MemberElement
  *      (StringElement)
- *      (StringElement))
+ *      (NullElement))
  *
  * Refracting result with this plugin:
  *
@@ -84,7 +84,6 @@ var _SwaggerTags = _interopRequireDefault(require("../../elements/nces/SwaggerTa
  *      (InfoElement))
  */
 
-const isEmptyElement = element => (0, _apidomDatamodel.isStringElement)(element) && (0, _apidomDatamodel.includesClasses)(element, ['yaml-e-node', 'yaml-e-scalar']);
 const schema = {
   // concrete types handling (CTs)
   SwaggerElement: {
@@ -337,9 +336,9 @@ const findElementFactory = (ancestor, keyName) => {
  */
 const plugin = () => () => ({
   visitor: {
-    StringElement(path) {
+    NullElement(path) {
       const element = path.node;
-      if (!isEmptyElement(element)) return;
+      if (!(0, _apidomDatamodel.includesClasses)(element, ['yaml-e-node', 'yaml-e-scalar'])) return;
 
       // getAncestorNodes() returns [parent, grandparent, ..., root], so reverse to get [root, ..., parent]
       const lineage = path.getAncestorNodes().reverse().filter(_apidomDatamodel.isElement);
@@ -349,7 +348,8 @@ const plugin = () => () => ({
       if ((0, _apidomDatamodel.isArrayElement)(parentElement)) {
         context = element;
         elementFactory = findElementFactory(parentElement, '<*>');
-      } else if ((0, _apidomDatamodel.isMemberElement)(parentElement)) {
+      } else if ((0, _apidomDatamodel.isMemberElement)(parentElement) && parentElement.value === element) {
+        // an empty key is the name of its member; only an empty value stands for a missing element
         context = lineage.at(-2);
         elementFactory = findElementFactory(context, (0, _apidomCore.toValue)(parentElement.key));
       }
@@ -358,7 +358,7 @@ const plugin = () => () => ({
       if (typeof elementFactory !== 'function') return;
       const replacement = elementFactory.call({
         context
-      }, undefined, element.isMetaEmpty ? undefined : (0, _apidomDatamodel.cloneDeep)(element.meta), element.isAttributesEmpty ? undefined : (0, _apidomDatamodel.cloneDeep)(element.attributes));
+      }, null, 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

@@ -1,4 +1,4 @@
-import { ArrayElement, ObjectElement, isStringElement, isElement, isMemberElement, isArrayElement, includesClasses, cloneDeep, SourceMapElement, StyleElement } from '@speclynx/apidom-datamodel';
+import { ArrayElement, ObjectElement, isElement, isMemberElement, isArrayElement, includesClasses, cloneDeep, SourceMapElement, StyleElement } from '@speclynx/apidom-datamodel';
 import { toValue } from '@speclynx/apidom-core';
 import { getNodeType } from '@speclynx/apidom-traverse';
 
@@ -62,7 +62,7 @@ import SwaggerTagsElement from "../../elements/nces/SwaggerTags.mjs";
  *      (SwaggerVersionElement))
  *    (MemberElement
  *      (StringElement)
- *      (StringElement))
+ *      (NullElement))
  *
  * Refracting result with this plugin:
  *
@@ -74,7 +74,6 @@ import SwaggerTagsElement from "../../elements/nces/SwaggerTags.mjs";
  *      (StringElement)
  *      (InfoElement))
  */
-const isEmptyElement = element => isStringElement(element) && includesClasses(element, ['yaml-e-node', 'yaml-e-scalar']);
 const schema = {
   // concrete types handling (CTs)
   SwaggerElement: {
@@ -327,9 +326,9 @@ const findElementFactory = (ancestor, keyName) => {
  */
 const plugin = () => () => ({
   visitor: {
-    StringElement(path) {
+    NullElement(path) {
       const element = path.node;
-      if (!isEmptyElement(element)) return;
+      if (!includesClasses(element, ['yaml-e-node', 'yaml-e-scalar'])) return;
 
       // getAncestorNodes() returns [parent, grandparent, ..., root], so reverse to get [root, ..., parent]
       const lineage = path.getAncestorNodes().reverse().filter(isElement);
@@ -339,7 +338,8 @@ const plugin = () => () => ({
       if (isArrayElement(parentElement)) {
         context = element;
         elementFactory = findElementFactory(parentElement, '<*>');
-      } else if (isMemberElement(parentElement)) {
+      } else if (isMemberElement(parentElement) && parentElement.value === element) {
+        // an empty key is the name of its member; only an empty value stands for a missing element
         context = lineage.at(-2);
         elementFactory = findElementFactory(context, toValue(parentElement.key));
       }
@@ -348,7 +348,7 @@ const plugin = () => () => ({
       if (typeof elementFactory !== 'function') return;
       const replacement = elementFactory.call({
         context
-      }, undefined, element.isMetaEmpty ? undefined : cloneDeep(element.meta), element.isAttributesEmpty ? undefined : cloneDeep(element.attributes));
+      }, null, element.isMetaEmpty ? undefined : cloneDeep(element.meta), element.isAttributesEmpty ? undefined : cloneDeep(element.attributes));
       SourceMapElement.transfer(element, replacement);
       StyleElement.transfer(element, replacement);
       path.replaceWith(replacement);

package/types/apidom-ns-openapi-2.d.ts

@@ -19,6 +19,7 @@ import { MemberElement } from '@speclynx/apidom-datamodel';
 import { Meta } from '@speclynx/apidom-datamodel';
 import { Namespace } from '@speclynx/apidom-datamodel';
 import { NamespacePlugin } from '@speclynx/apidom-datamodel';
+import { NullElement } from '@speclynx/apidom-datamodel';
 import { NumberElement } from '@speclynx/apidom-datamodel';
 import { ObjectElement } from '@speclynx/apidom-datamodel';
 import { Path } from '@speclynx/apidom-traverse';
@@ -1348,7 +1349,7 @@ export declare interface RefractorPluginNormalizeSecurityRequirementsOptions {
  */
 export declare const refractorPluginReplaceEmptyElement: () => () => {
     visitor: {
-        StringElement(path: Path<StringElement>): void;
+        NullElement(path: Path<NullElement>): void;
     };
 };