refactor(ns-json-schema-draft-7): remove explicit Fallback visitors (#…

…4070)
swagger-api · Apr 30, 2024 · bdefc60 · bdefc60
1 parent ef20891
commit bdefc60
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 61 deletions.
diff --git a/packages/apidom-ns-json-schema-draft-7/src/refractor/specification.ts b/packages/apidom-ns-json-schema-draft-7/src/refractor/specification.ts
@@ -2,25 +2,14 @@ import { pipe, assocPath, dissocPath } from 'ramda';
 import { specificationObj } from '@swagger-api/apidom-ns-json-schema-draft-6';
 
 import JSONSchemaVisitor from './visitors/json-schema';
-import JSONSchema$commentVisitor from './visitors/json-schema/$commentVisitor';
-import JsonSchemaContentEncodingVisitor from './visitors/json-schema/ContentEncodingVisitor';
-import JsonSchemaContentMediaTypeVisitor from './visitors/json-schema/ContentMediaTypeVisitor';
-import JsonSchemaWriteOnlyVisitor from './visitors/json-schema/WriteOnlyVisitor';
 import LinkDescriptionVisitor from './visitors/json-schema/link-description';
-import LinkDescriptionAnchorVisitor from './visitors/json-schema/link-description/AnchorVisitor';
-import LinkDescriptionAnchorPointerVisitor from './visitors/json-schema/link-description/AnchorPointerVisitor';
-import LinkDescriptionTargetMediaTypeVisitor from './visitors/json-schema/link-description/TargetMediaTypeVisitor';
-import LinkDescriptionTargetHintsVisitor from './visitors/json-schema/link-description/TargetHintsVisitor';
-import LinkDescriptionDescriptionVisitor from './visitors/json-schema/link-description/DescriptionVisitor';
-import LinkDescription$commentVisitor from './visitors/json-schema/link-description/$commentVisitor';
-import LinkDescriptionSubmissionMediaTypeVisitor from './visitors/json-schema/link-description/SubmissionMediaTypeVisitor';
 
 const specification = pipe(
   // JSON Schema object modifications
   assocPath(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], JSONSchemaVisitor),
   assocPath(
     ['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$comment'],
-    JSONSchema$commentVisitor,
+    specificationObj.visitors.value,
   ),
   assocPath(
     ['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'],
@@ -37,15 +26,15 @@ const specification = pipe(
   dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'media']),
   assocPath(
     ['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentEncoding'],
-    JsonSchemaContentEncodingVisitor,
+    specificationObj.visitors.value,
   ),
   assocPath(
     ['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentMediaType'],
-    JsonSchemaContentMediaTypeVisitor,
+    specificationObj.visitors.value,
   ),
   assocPath(
     ['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'writeOnly'],
-    JsonSchemaWriteOnlyVisitor,
+    specificationObj.visitors.value,
   ),
   // Link Description object modifications
   assocPath(
@@ -54,28 +43,28 @@ const specification = pipe(
   ),
   assocPath(
     ['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'anchor'],
-    LinkDescriptionAnchorVisitor,
+    specificationObj.visitors.value,
   ),
   assocPath(
     ['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'anchorPointer'],
-    LinkDescriptionAnchorPointerVisitor,
+    specificationObj.visitors.value,
   ),
   dissocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'mediaType']),
   assocPath(
     ['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetMediaType'],
-    LinkDescriptionTargetMediaTypeVisitor,
+    specificationObj.visitors.value,
   ),
   assocPath(
     ['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetHints'],
-    LinkDescriptionTargetHintsVisitor,
+    specificationObj.visitors.value,
   ),
   assocPath(
     ['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'description'],
-    LinkDescriptionDescriptionVisitor,
+    specificationObj.visitors.value,
   ),
   assocPath(
     ['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', '$comment'],
-    LinkDescription$commentVisitor,
+    specificationObj.visitors.value,
   ),
   dissocPath([
     'visitors',
@@ -87,7 +76,7 @@ const specification = pipe(
   ]),
   assocPath(
     ['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionMediaType'],
-    LinkDescriptionSubmissionMediaTypeVisitor,
+    specificationObj.visitors.value,
   ),
 )(specificationObj);
 

diff --git a/packages/apidom-ns-json-schema-draft-7/src/refractor/visitors/json-schema/$commentVisitor.ts b/packages/apidom-ns-json-schema-draft-7/src/refractor/visitors/json-schema/$commentVisitor.ts
diff --git a/...pidom-ns-json-schema-draft-7/src/refractor/visitors/json-schema/ContentEncodingVisitor.ts b/...pidom-ns-json-schema-draft-7/src/refractor/visitors/json-schema/ContentEncodingVisitor.ts
diff --git a/...idom-ns-json-schema-draft-7/src/refractor/visitors/json-schema/ContentMediaTypeVisitor.ts b/...idom-ns-json-schema-draft-7/src/refractor/visitors/json-schema/ContentMediaTypeVisitor.ts
diff --git a/...ages/apidom-ns-json-schema-draft-7/src/refractor/visitors/json-schema/WriteOnlyVisitor.ts b/...ages/apidom-ns-json-schema-draft-7/src/refractor/visitors/json-schema/WriteOnlyVisitor.ts
diff --git a/...son-schema-draft-7/src/refractor/visitors/json-schema/link-description/$commentVisitor.ts b/...son-schema-draft-7/src/refractor/visitors/json-schema/link-description/$commentVisitor.ts
diff --git a/...chema-draft-7/src/refractor/visitors/json-schema/link-description/AnchorPointerVisitor.ts b/...chema-draft-7/src/refractor/visitors/json-schema/link-description/AnchorPointerVisitor.ts
diff --git a/...-json-schema-draft-7/src/refractor/visitors/json-schema/link-description/AnchorVisitor.ts b/...-json-schema-draft-7/src/refractor/visitors/json-schema/link-description/AnchorVisitor.ts
diff --git a/...-schema-draft-7/src/refractor/visitors/json-schema/link-description/DescriptionVisitor.ts b/...-schema-draft-7/src/refractor/visitors/json-schema/link-description/DescriptionVisitor.ts
diff --git a/...draft-7/src/refractor/visitors/json-schema/link-description/SubmissionMediaTypeVisitor.ts b/...draft-7/src/refractor/visitors/json-schema/link-description/SubmissionMediaTypeVisitor.ts
diff --git a/...-schema-draft-7/src/refractor/visitors/json-schema/link-description/TargetHintsVisitor.ts b/...-schema-draft-7/src/refractor/visitors/json-schema/link-description/TargetHintsVisitor.ts
diff --git a/...ema-draft-7/src/refractor/visitors/json-schema/link-description/TargetMediaTypeVisitor.ts b/...ema-draft-7/src/refractor/visitors/json-schema/link-description/TargetMediaTypeVisitor.ts
diff --git a/...ma-draft-7/src/refractor/visitors/json-schema/link-description/TemplatePointersVisitor.ts b/...ma-draft-7/src/refractor/visitors/json-schema/link-description/TemplatePointersVisitor.ts
diff --git a/...ma-draft-7/src/refractor/visitors/json-schema/link-description/TemplateRequiredVisitor.ts b/...ma-draft-7/src/refractor/visitors/json-schema/link-description/TemplateRequiredVisitor.ts