feat(ns-openapi-3-1): finish Calback Object

Refs #386
swagger-api · May 21, 2021 · b11a5c8 · b11a5c8
1 parent 382fccf
commit b11a5c8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/apidom/packages/apidom-ns-openapi-3-1/README.md b/apidom/packages/apidom-ns-openapi-3-1/README.md
@@ -152,7 +152,7 @@ Only fully implemented specification objects should be checked here.
 - [ ] [Media Type Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#mediaTypeObject) (partial)
 - [ ] [Encoding Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#encodingObject)
 - [x] [Responses Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#responsesObject)
-- [ ] [Callback Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#callbackObject) (partial)
+- [x] [Callback Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#callbackObject)
 - [x] [Example Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#exampleObject)
 - [x] [Link Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#linkObject)
 - [x] [Header Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#headerObject)

diff --git a/apidom/packages/apidom-ns-openapi-3-1/src/refractor/predicates.ts b/apidom/packages/apidom-ns-openapi-3-1/src/refractor/predicates.ts
@@ -43,6 +43,8 @@ export const isServerLikeElement = <T extends Element>(element: T): boolean => {
   return isObjectElement(element) && element.hasKey('url');
 };
 
+export const isPathItemLikeElement = isObjectElement;
+
 export const isOpenApiExtension = (element: MemberElement): boolean => {
   // @ts-ignore
   return isStringElement(element.key) && startsWith('x-', element.key.toValue());

diff --git a/apidom/packages/apidom-ns-openapi-3-1/src/refractor/visitors/open-api-3-1/callback/index.ts b/apidom/packages/apidom-ns-openapi-3-1/src/refractor/visitors/open-api-3-1/callback/index.ts
@@ -1,13 +1,24 @@
 import stampit from 'stampit';
-import { always } from 'ramda';
+import { test } from 'ramda';
+import { Element } from 'apidom';
 
 import CallbackElement from '../../../../elements/Callback';
-import FixedFieldsVisitor from '../../generics/FixedFieldsVisitor';
+import PatternedFieldsJsonObjectVisitor from '../../generics/PatternedFieldsVisitor';
 import FallbackVisitor from '../../FallbackVisitor';
+import { isReferenceLikeElement, isPathItemLikeElement } from '../../../predicates';
 
-const CallbackVisitor = stampit(FixedFieldsVisitor, FallbackVisitor, {
+const CallbackVisitor = stampit(PatternedFieldsJsonObjectVisitor, FallbackVisitor, {
   props: {
-    specPath: always(['document', 'objects', 'Callback']),
+    fieldPatternPredicate: test(/^{(?<expression>.*)}$/),
+    specPath: (element: Element) => {
+      // eslint-disable-next-line no-nested-ternary
+      return isReferenceLikeElement(element)
+        ? ['document', 'objects', 'Reference']
+        : isPathItemLikeElement(element)
+        ? ['document', 'objects', 'PathItem']
+        : ['value'];
+    },
+    canSupportSpecificationExtensions: true,
   },
   init() {
     this.element = new CallbackElement();