@swagger-api/apidom-ns-openapi-3-0 0.82.2 → 0.84.0

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

@@ -1,4 +1,4 @@
-import { MemberElement, ArrayElement, ObjectElement, isStringElement, includesClasses, isArrayElement, cloneDeep, toValue } from '@swagger-api/apidom-core';
+import { ArrayElement, ObjectElement, isStringElement, isArrayElement, isElement, isMemberElement, includesClasses, cloneDeep, toValue } from '@swagger-api/apidom-core';
 
 /**
  * OpenAPI 3.0.3 specification elements.
@@ -588,39 +588,28 @@ const findElementFactory = (ancestor, keyName) => {
   const keyMapping = schema[elementType] || schema[toValue(ancestor.classes.first)];
   return typeof keyMapping === 'undefined' ? undefined : Object.prototype.hasOwnProperty.call(keyMapping, '[key: *]') ? keyMapping['[key: *]'] : keyMapping[keyName];
 };
-const plugin = () => () => {
-  return {
-    visitor: {
-      MemberElement(element, ...rest) {
-        // no empty Element, continue with next one
-        if (!isEmptyElement(element.value)) return undefined;
-        const [,,, ancestors] = rest;
-        const ancestor = ancestors[ancestors.length - 1]; // @TODO(vladimir.gorej@gmail.com): can be replaced by Array.prototype.at in future
-        const elementFactory = findElementFactory(ancestor, toValue(element.key));
-
-        // no element factory found
-        if (typeof elementFactory === 'undefined') return undefined;
-        const originalValue = element.value;
-        return new MemberElement(element.key, elementFactory.call({
-          context: ancestor
-        }, undefined, cloneDeep(originalValue.meta), cloneDeep(originalValue.attributes)), cloneDeep(element.meta), cloneDeep(element.attributes));
-      },
-      StringElement(element, ...rest) {
-        if (!isEmptyElement(element)) return undefined;
-        const [,,, ancestors] = rest;
-        const ancestor = ancestors[ancestors.length - 1]; // @TODO(vladimir.gorej@gmail.com): can be replaced by Array.prototype.at in future
-
-        // we're only interested in empty elements in ArrayElements
-        if (!isArrayElement(ancestor)) return undefined;
-        const elementFactory = findElementFactory(ancestor, '<*>');
-
-        // no element factory found
-        if (typeof elementFactory === 'undefined') return undefined;
-        return elementFactory.call({
-          context: element
-        }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
+const plugin = () => () => ({
+  visitor: {
+    StringElement(element, key, parent, path, ancestors) {
+      if (!isEmptyElement(element)) return undefined;
+      const lineage = [...ancestors, parent].filter(isElement);
+      const parentElement = lineage[lineage.length - 1]; // @TODO(vladimir.gorej@gmail.com): can be replaced by Array.prototype.at in future
+      let elementFactory;
+      let context;
+      if (isArrayElement(parentElement)) {
+        context = element;
+        elementFactory = findElementFactory(parentElement, '<*>');
+      } else if (isMemberElement(parentElement)) {
+        context = lineage[lineage.length - 2]; // @TODO(vladimir.gorej@gmail.com): can be replaced by Array.prototype.at in future
+        elementFactory = findElementFactory(context, toValue(parentElement.key));
       }
+
+      // no element factory found
+      if (typeof elementFactory !== 'function') return undefined;
+      return elementFactory.call({
+        context
+      }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
     }
-  };
-};
+  }
+});
 export default plugin;

package/es/refractor/visitors/open-api-3-0/components/CallbacksVisitor.mjs

@@ -7,7 +7,6 @@ import { isReferenceElement } from "../../../../predicates.mjs";
 const CallbacksElement = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'Callback'];
     }
   },

package/es/refractor/visitors/open-api-3-0/components/ExamplesVisitor.mjs

@@ -7,7 +7,6 @@ import { isReferenceElement } from "../../../../predicates.mjs";
 const ExamplesVisitor = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'Example'];
     }
   },

package/es/refractor/visitors/open-api-3-0/components/HeadersVisitor.mjs

@@ -8,7 +8,6 @@ import { isReferenceElement, isHeaderElement } from "../../../../predicates.mjs"
 const HeadersVisitor = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'Header'];
     }
   },

package/es/refractor/visitors/open-api-3-0/components/LinksVisitor.mjs

@@ -7,7 +7,6 @@ import { isReferenceElement } from "../../../../predicates.mjs";
 const LinksVisitor = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'Link'];
     }
   },

package/es/refractor/visitors/open-api-3-0/components/ParametersVisitor.mjs

@@ -7,7 +7,6 @@ import { isReferenceElement } from "../../../../predicates.mjs";
 const ParametersVisitor = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'Parameter'];
     }
   },

package/es/refractor/visitors/open-api-3-0/components/RequestBodiesVisitor.mjs

@@ -7,7 +7,6 @@ import { isReferenceElement } from "../../../../predicates.mjs";
 const RequestBodiesVisitor = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'RequestBody'];
     }
   },

package/es/refractor/visitors/open-api-3-0/components/ResponsesVisitor.mjs

@@ -8,7 +8,6 @@ import { isReferenceElement, isResponseElement } from "../../../../predicates.mj
 const ResponsesVisitor = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'Response'];
     }
   },

package/es/refractor/visitors/open-api-3-0/components/SchemasVisitor.mjs

@@ -7,7 +7,6 @@ import { isReferenceElement } from "../../../../predicates.mjs";
 const SchemasVisitor = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'Schema'];
     }
   },

package/es/refractor/visitors/open-api-3-0/components/SecuritySchemesVisitor.mjs

@@ -7,7 +7,6 @@ import { isReferenceElement } from "../../../../predicates.mjs";
 const ParametersVisitor = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'SecurityScheme'];
     }
   },

package/es/refractor/visitors/open-api-3-0/response/HeadersVisitor.mjs

@@ -8,7 +8,6 @@ import { isHeaderElement, isReferenceElement } from "../../../../predicates.mjs"
 const HeadersVisitor = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'Header'];
     }
   },

package/es/refractor/visitors/open-api-3-0/response/LinksVisitor.mjs

@@ -7,7 +7,6 @@ import { isReferenceElement } from "../../../../predicates.mjs";
 const HeadersVisitor = stampit(MapVisitor, FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'Link'];
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-ns-openapi-3-0",
-  "version": "0.82.2",
+  "version": "0.84.0",
   "description": "OpenAPI 3.0.x namespace for ApiDOM.",
   "publishConfig": {
     "access": "public",
@@ -42,11 +42,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-core": "^0.82.2",
-    "@swagger-api/apidom-error": "^0.82.1",
-    "@swagger-api/apidom-ns-json-schema-draft-4": "^0.82.2",
+    "@swagger-api/apidom-core": "^0.84.0",
+    "@swagger-api/apidom-error": "^0.84.0",
+    "@swagger-api/apidom-ns-json-schema-draft-4": "^0.84.0",
     "@types/ramda": "~0.29.6",
-    "ramda": "~0.29.0",
+    "ramda": "~0.29.1",
     "ramda-adjunct": "^4.1.1",
     "stampit": "^4.3.2"
   },
@@ -60,5 +60,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "4d2a5697cba7abcab32abfdbea6ba946b4fd262f"
+  "gitHead": "6dbd9983371b63b56cab3983e478ef29e9e1525f"
 }

package/types/dist.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="@swagger-api/apidom-core/types/minim" />
 import * as _swagger_api_apidom_core from '@swagger-api/apidom-core';
-import { MediaTypes, NamespacePluginOptions, MemberElement, StringElement, Element, ObjectElement, Meta, Attributes, BooleanElement, ArrayElement, ElementPredicate } from '@swagger-api/apidom-core';
+import { MediaTypes, NamespacePluginOptions, StringElement, Element, ObjectElement, Meta, Attributes, BooleanElement, ArrayElement, ElementPredicate, MemberElement } from '@swagger-api/apidom-core';
 export { isArrayElement, isBooleanElement, isElement, isLinkElement as isLinkPrimitiveElement, isMemberElement, isNullElement, isNumberElement, isObjectElement, isRefElement, isStringElement } from '@swagger-api/apidom-core';
 import * as minim from 'minim';
 import * as stampit from 'stampit';
@@ -21,8 +21,7 @@ declare const openApi3_0: {
 
 declare const plugin: () => () => {
     visitor: {
-        MemberElement(element: MemberElement, ...rest: any): MemberElement | undefined;
-        StringElement(element: StringElement, ...rest: any): any;
+        StringElement(element: StringElement, key: any, parent: any, path: any, ancestors: any[]): any;
     };
 };