@swagger-api/apidom-ns-openapi-3-1 1.0.0-beta.9 → 1.0.0-rc.0

package/src/refractor/plugins/normalize-discriminator-mapping.mjs

@@ -0,0 +1,167 @@
+import { cloneShallow, isArrayElement, ObjectElement, StringElement, MemberElement, toValue, visit, isMemberElement, isStringElement } from '@swagger-api/apidom-core';
+import { isReferenceLikeElement, isDiscriminatorElement } from '@swagger-api/apidom-ns-openapi-3-0';
+import NormalizeStorage from "./normalize-header-examples/NormalizeStorage.mjs";
+import { isSchemaElement } from "../../predicates.mjs";
+import DiscriminatorElement from "../../elements/Discriminator.mjs";
+/**
+ * Normalization of Discriminator.mapping field.
+ *
+ * Discriminator.mapping fields are normalized by adding missing mappings from oneOf/anyOf items
+ * of the parent Schema Object and transforming existing mappings to Schema Objects.
+ *
+ * In case of allOf discriminator, the plugin will add missing mappings based on
+ * allOf items of other Schema Objects.
+ *
+ * The normalized mapping is stored in the Schema.discriminator field as `x-normalized-mapping`.
+ *
+ * This plugin is designed to be used on dereferenced OpenAPI 3.1 documents.
+ *
+ * NOTE: this plugin is idempotent
+ * @public
+ */
+/**
+ * @public
+ */
+const plugin = ({
+  storageField = 'x-normalized',
+  baseURI = ''
+} = {}) => toolbox => {
+  const {
+    ancestorLineageToJSONPointer
+  } = toolbox;
+  let storage;
+  let allOfDiscriminatorMapping;
+  return {
+    visitor: {
+      OpenApi3_1Element: {
+        enter(element) {
+          var _element$getMetaPrope;
+          storage = new NormalizeStorage(element, storageField, 'discriminator-mapping');
+          allOfDiscriminatorMapping = (_element$getMetaPrope = element.getMetaProperty('allOfDiscriminatorMapping')) !== null && _element$getMetaPrope !== void 0 ? _element$getMetaPrope : new ObjectElement();
+        },
+        leave() {
+          storage = undefined;
+        }
+      },
+      SchemaElement: {
+        leave(schemaElement, key, parent, path, ancestors) {
+          var _parentElement$classe, _schemaElement$discri;
+          // no Schema.discriminator field present
+          if (!isDiscriminatorElement(schemaElement.discriminator)) {
+            return;
+          }
+          const schemaJSONPointer = ancestorLineageToJSONPointer([...ancestors, parent, schemaElement]);
+
+          // skip visiting this Schema Object if it's already normalized
+          if (storage.includes(schemaJSONPointer)) {
+            return;
+          }
+
+          // skip if both oneOf and anyOf are present
+          if (isArrayElement(schemaElement.oneOf) && isArrayElement(schemaElement.anyOf)) {
+            return;
+          }
+          const parentElement = ancestors[ancestors.length - 1];
+          const schemaName = schemaElement.getMetaProperty('schemaName');
+          const allOfMapping = allOfDiscriminatorMapping.getMember(toValue(schemaName));
+          const hasAllOfMapping =
+          // @ts-ignore
+          allOfMapping && !(parentElement !== null && parentElement !== void 0 && (_parentElement$classe = parentElement.classes) !== null && _parentElement$classe !== void 0 && _parentElement$classe.contains('json-schema-allOf'));
+
+          // skip if neither oneOf, anyOf nor allOf is present
+          if (!isArrayElement(schemaElement.oneOf) && !isArrayElement(schemaElement.anyOf) && !hasAllOfMapping) {
+            return;
+          }
+          const mapping = (_schemaElement$discri = schemaElement.discriminator.get('mapping')) !== null && _schemaElement$discri !== void 0 ? _schemaElement$discri : new ObjectElement();
+          const normalizedMapping = new ObjectElement();
+          let isNormalized = true;
+          const items = isArrayElement(schemaElement.oneOf) ? schemaElement.oneOf : isArrayElement(schemaElement.anyOf) ? schemaElement.anyOf : allOfMapping.value;
+          items.forEach(item => {
+            if (!isSchemaElement(item)) {
+              return;
+            }
+            if (isReferenceLikeElement(item)) {
+              isNormalized = false;
+              return;
+            }
+            const metaRefFields = toValue(item.getMetaProperty('ref-fields'));
+            const metaRefOrigin = toValue(item.getMetaProperty('ref-origin'));
+            const metaSchemaName = toValue(item.getMetaProperty('schemaName'));
+
+            /**
+             * handle external references and internal references
+             * that don't point to components/schemas/<SchemaName>
+             */
+            if (!hasAllOfMapping && (metaRefOrigin !== baseURI || !metaSchemaName && metaRefFields)) {
+              let hasMatchingMapping = false;
+              mapping.forEach((mappingValue, mappingKey) => {
+                var _mappingValueSchema$g;
+                const mappingValueSchema = mappingValue.getMetaProperty('ref-schema');
+                const mappingValueSchemaRefBaseURI = mappingValueSchema === null || mappingValueSchema === void 0 || (_mappingValueSchema$g = mappingValueSchema.getMetaProperty('ref-fields')) === null || _mappingValueSchema$g === void 0 ? void 0 : _mappingValueSchema$g.get('$refBaseURI');
+                if (mappingValueSchemaRefBaseURI !== null && mappingValueSchemaRefBaseURI !== void 0 && mappingValueSchemaRefBaseURI.equals(metaRefFields === null || metaRefFields === void 0 ? void 0 : metaRefFields.$refBaseURI)) {
+                  normalizedMapping.set(toValue(mappingKey), cloneShallow(item));
+                  hasMatchingMapping = true;
+                }
+              });
+              if (!hasMatchingMapping) {
+                isNormalized = false;
+              }
+              return;
+            }
+
+            // handle internal references that point to components/schemas/<SchemaName>
+            if (metaSchemaName) {
+              let hasMatchingMapping = false;
+              mapping.forEach((mappingValue, mappingKey) => {
+                var _mappingValueSchema$g2;
+                const mappingValueSchema = mappingValue.getMetaProperty('ref-schema');
+                const mappingValueSchemaName = mappingValueSchema === null || mappingValueSchema === void 0 ? void 0 : mappingValueSchema.getMetaProperty('schemaName');
+                const mappingValueSchemaRefBaseURI = mappingValueSchema === null || mappingValueSchema === void 0 || (_mappingValueSchema$g2 = mappingValueSchema.getMetaProperty('ref-fields')) === null || _mappingValueSchema$g2 === void 0 ? void 0 : _mappingValueSchema$g2.get('$refBaseURI');
+                if (mappingValueSchemaName !== null && mappingValueSchemaName !== void 0 && mappingValueSchemaName.equals(metaSchemaName) && (!hasAllOfMapping || mappingValueSchemaRefBaseURI !== null && mappingValueSchemaRefBaseURI !== void 0 && mappingValueSchemaRefBaseURI.equals(metaRefFields === null || metaRefFields === void 0 ? void 0 : metaRefFields.$refBaseURI))) {
+                  normalizedMapping.set(toValue(mappingKey), cloneShallow(item));
+                  hasMatchingMapping = true;
+                }
+              });
+
+              // add a new mapping if no matching mapping was found
+              if (!hasMatchingMapping) {
+                normalizedMapping.set(metaSchemaName, cloneShallow(item));
+              }
+            }
+          });
+
+          // check if any mapping is not a Schema Object or if any mapping was not normalized
+          const mappingKeys = mapping.keys();
+          const normalizedMappingKeys = normalizedMapping.keys();
+          isNormalized = isNormalized && normalizedMapping.filter(mappingValue => !isSchemaElement(mappingValue)).length === 0 && mappingKeys.every(mappingKey => normalizedMappingKeys.includes(mappingKey));
+          if (isNormalized) {
+            schemaElement.discriminator.set('x-normalized-mapping', normalizedMapping);
+
+            // dive in and eliminate cycles that might be created by normalization
+            visit(schemaElement, {}, {
+              // @ts-ignore
+              detectCyclesCallback: (node, nodeKey, nodeParent) => {
+                if (!nodeParent || !isMemberElement(node) || !isStringElement(node.key) || !node.key.equals('discriminator') || !isDiscriminatorElement(node.value)) {
+                  return;
+                }
+                const discriminator = cloneShallow(node.value);
+                const discriminatorCopy = new DiscriminatorElement();
+                if (discriminator.get('mapping')) {
+                  discriminatorCopy.mapping = discriminator.get('mapping');
+                }
+                if (discriminator.get('propertyName')) {
+                  discriminatorCopy.propertyName = discriminator.get('propertyName');
+                }
+
+                // eslint-disable-next-line no-param-reassign
+                nodeParent[nodeKey] = new MemberElement(new StringElement('discriminator'), discriminatorCopy);
+              }
+            });
+            storage.append(schemaJSONPointer);
+          }
+        }
+      }
+    }
+  };
+};
+export default plugin;

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

@@ -655,9 +655,10 @@ const plugin = () => ({
 
         // no element factory found
         if (typeof elementFactory !== 'function') return undefined;
-        return elementFactory.call({
+        const result = elementFactory.call({
           context
         }, undefined, (0, _apidomCore.cloneDeep)(element.meta), (0, _apidomCore.cloneDeep)(element.attributes));
+        return (0, _apidomCore.assignSourceMap)(result, element);
       }
     }
   };

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

@@ -1,4 +1,4 @@
-import { ArrayElement, ObjectElement, cloneDeep, toValue } from '@swagger-api/apidom-core';
+import { ArrayElement, ObjectElement, assignSourceMap, cloneDeep, toValue } from '@swagger-api/apidom-core';
 import { ServersElement, SecurityElement, TagsElement, ServerVariablesElement, ComponentsSchemasElement, ComponentsResponsesElement, ComponentsParametersElement, ComponentsExamplesElement, ComponentsRequestBodiesElement, ComponentsHeadersElement, ComponentsSecuritySchemesElement, ComponentsLinksElement, ComponentsCallbacksElement, PathItemServersElement, PathItemParametersElement, OperationParametersElement, ParameterExamplesElement, ParameterContentElement, HeaderExamplesElement, HeaderContentElement, OperationTagsElement, OperationCallbacksElement, OperationSecurityElement, OperationServersElement, RequestBodyContentElement, MediaTypeExamplesElement, MediaTypeEncodingElement, EncodingHeadersElement, ResponseHeadersElement, ResponseContentElement, ResponseLinksElement, DiscriminatorMappingElement, OAuthFlowScopesElement } from '@swagger-api/apidom-ns-openapi-3-0';
 
 /**
@@ -648,9 +648,10 @@ const plugin = () => ({
 
         // no element factory found
         if (typeof elementFactory !== 'function') return undefined;
-        return elementFactory.call({
+        const result = elementFactory.call({
           context
         }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
+        return assignSourceMap(result, element);
       }
     }
   };

package/src/refractor/specification.cjs

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.default = void 0;
 var _apidomNsOpenapi = require("@swagger-api/apidom-ns-openapi-3-0");
+var _apidomNsJsonSchema = require("@swagger-api/apidom-ns-json-schema-2020-12");
 var _index = _interopRequireDefault(require("./visitors/open-api-3-1/index.cjs"));
 var _index2 = _interopRequireDefault(require("./visitors/open-api-3-1/info/index.cjs"));
 var _index3 = _interopRequireDefault(require("./visitors/open-api-3-1/contact/index.cjs"));
@@ -14,14 +15,12 @@ var _index6 = _interopRequireDefault(require("./visitors/open-api-3-1/server/ind
 var _index7 = _interopRequireDefault(require("./visitors/open-api-3-1/server-variable/index.cjs"));
 var _index8 = _interopRequireDefault(require("./visitors/open-api-3-1/media-type/index.cjs"));
 var _index9 = _interopRequireDefault(require("./visitors/open-api-3-1/security-requirement/index.cjs"));
-var _index10 = _interopRequireDefault(require("./visitors/open-api-3-1/components/index.cjs"));
-var _index11 = _interopRequireDefault(require("./visitors/open-api-3-1/tag/index.cjs"));
-var _index12 = _interopRequireDefault(require("./visitors/open-api-3-1/reference/index.cjs"));
-var _index13 = _interopRequireDefault(require("./visitors/open-api-3-1/parameter/index.cjs"));
-var _index14 = _interopRequireDefault(require("./visitors/open-api-3-1/header/index.cjs"));
-var _index15 = _interopRequireDefault(require("./visitors/open-api-3-1/schema/index.cjs"));
-var _$vocabularyVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/$vocabularyVisitor.cjs"));
-var _$refVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/$refVisitor.cjs"));
+var _index0 = _interopRequireDefault(require("./visitors/open-api-3-1/components/index.cjs"));
+var _index1 = _interopRequireDefault(require("./visitors/open-api-3-1/tag/index.cjs"));
+var _index10 = _interopRequireDefault(require("./visitors/open-api-3-1/reference/index.cjs"));
+var _index11 = _interopRequireDefault(require("./visitors/open-api-3-1/parameter/index.cjs"));
+var _index12 = _interopRequireDefault(require("./visitors/open-api-3-1/header/index.cjs"));
+var _index13 = _interopRequireDefault(require("./visitors/open-api-3-1/schema/index.cjs"));
 var _$defsVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/$defsVisitor.cjs"));
 var _AllOfVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/AllOfVisitor.cjs"));
 var _AnyOfVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/AnyOfVisitor.cjs"));
@@ -30,28 +29,29 @@ var _DependentSchemasVisitor = _interopRequireDefault(require("./visitors/open-a
 var _PrefixItemsVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/PrefixItemsVisitor.cjs"));
 var _PropertiesVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/PropertiesVisitor.cjs"));
 var _PatternPropertiesVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/PatternPropertiesVisitor.cjs"));
-var _TypeVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/TypeVisitor.cjs"));
-var _EnumVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/EnumVisitor.cjs"));
-var _DependentRequiredVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/DependentRequiredVisitor.cjs"));
-var _ExamplesVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/schema/ExamplesVisitor.cjs"));
-var _index16 = _interopRequireDefault(require("./visitors/open-api-3-1/distriminator/index.cjs"));
-var _index17 = _interopRequireDefault(require("./visitors/open-api-3-1/xml/index.cjs"));
+var _index14 = _interopRequireDefault(require("./visitors/open-api-3-1/distriminator/index.cjs"));
+var _index15 = _interopRequireDefault(require("./visitors/open-api-3-1/xml/index.cjs"));
 var _SchemasVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/components/SchemasVisitor.cjs"));
 var _PathItemsVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/components/PathItemsVisitor.cjs"));
-var _index18 = _interopRequireDefault(require("./visitors/open-api-3-1/example/index.cjs"));
-var _index19 = _interopRequireDefault(require("./visitors/open-api-3-1/external-documentation/index.cjs"));
-var _index20 = _interopRequireDefault(require("./visitors/open-api-3-1/encoding/index.cjs"));
-var _index21 = _interopRequireDefault(require("./visitors/open-api-3-1/paths/index.cjs"));
-var _index22 = _interopRequireDefault(require("./visitors/open-api-3-1/request-body/index.cjs"));
-var _index23 = _interopRequireDefault(require("./visitors/open-api-3-1/callback/index.cjs"));
-var _index24 = _interopRequireDefault(require("./visitors/open-api-3-1/response/index.cjs"));
-var _index25 = _interopRequireDefault(require("./visitors/open-api-3-1/responses/index.cjs"));
-var _index26 = _interopRequireDefault(require("./visitors/open-api-3-1/operation/index.cjs"));
-var _index27 = _interopRequireDefault(require("./visitors/open-api-3-1/path-item/index.cjs"));
-var _index28 = _interopRequireDefault(require("./visitors/open-api-3-1/security-scheme/index.cjs"));
-var _index29 = _interopRequireDefault(require("./visitors/open-api-3-1/oauth-flows/index.cjs"));
-var _index30 = _interopRequireDefault(require("./visitors/open-api-3-1/oauth-flow/index.cjs"));
+var _index16 = _interopRequireDefault(require("./visitors/open-api-3-1/example/index.cjs"));
+var _index17 = _interopRequireDefault(require("./visitors/open-api-3-1/external-documentation/index.cjs"));
+var _index18 = _interopRequireDefault(require("./visitors/open-api-3-1/encoding/index.cjs"));
+var _index19 = _interopRequireDefault(require("./visitors/open-api-3-1/paths/index.cjs"));
+var _index20 = _interopRequireDefault(require("./visitors/open-api-3-1/request-body/index.cjs"));
+var _index21 = _interopRequireDefault(require("./visitors/open-api-3-1/callback/index.cjs"));
+var _index22 = _interopRequireDefault(require("./visitors/open-api-3-1/response/index.cjs"));
+var _index23 = _interopRequireDefault(require("./visitors/open-api-3-1/responses/index.cjs"));
+var _index24 = _interopRequireDefault(require("./visitors/open-api-3-1/operation/index.cjs"));
+var _index25 = _interopRequireDefault(require("./visitors/open-api-3-1/path-item/index.cjs"));
+var _index26 = _interopRequireDefault(require("./visitors/open-api-3-1/security-scheme/index.cjs"));
+var _index27 = _interopRequireDefault(require("./visitors/open-api-3-1/oauth-flows/index.cjs"));
+var _index28 = _interopRequireDefault(require("./visitors/open-api-3-1/oauth-flow/index.cjs"));
 var _WebhooksVisitor = _interopRequireDefault(require("./visitors/open-api-3-1/WebhooksVisitor.cjs"));
+const {
+  JSONSchema: JSONSchemaVisitor,
+  LinkDescription: LinkDescriptionVisitor
+} = _apidomNsJsonSchema.specificationObj.visitors.document.objects;
+
 /**
  * Specification object allows us to have complete control over visitors
  * when traversing the ApiDOM.
@@ -142,7 +142,7 @@ const specification = {
           }
         },
         Components: {
-          $visitor: _index10.default,
+          $visitor: _index0.default,
           fixedFields: {
             schemas: _SchemasVisitor.default,
             responses: _apidomNsOpenapi.specificationObj.visitors.document.objects.Components.fixedFields.responses,
@@ -157,10 +157,10 @@ const specification = {
           }
         },
         Paths: {
-          $visitor: _index21.default
+          $visitor: _index19.default
         },
         PathItem: {
-          $visitor: _index27.default,
+          $visitor: _index25.default,
           fixedFields: {
             $ref: _apidomNsOpenapi.specificationObj.visitors.document.objects.PathItem.fixedFields.$ref,
             summary: _apidomNsOpenapi.specificationObj.visitors.document.objects.PathItem.fixedFields.summary,
@@ -194,7 +194,7 @@ const specification = {
           }
         },
         Operation: {
-          $visitor: _index26.default,
+          $visitor: _index24.default,
           fixedFields: {
             tags: _apidomNsOpenapi.specificationObj.visitors.document.objects.Operation.fixedFields.tags,
             summary: _apidomNsOpenapi.specificationObj.visitors.document.objects.Operation.fixedFields.summary,
@@ -215,14 +215,14 @@ const specification = {
           }
         },
         ExternalDocumentation: {
-          $visitor: _index19.default,
+          $visitor: _index17.default,
           fixedFields: {
             description: _apidomNsOpenapi.specificationObj.visitors.document.objects.ExternalDocumentation.fixedFields.description,
             url: _apidomNsOpenapi.specificationObj.visitors.document.objects.ExternalDocumentation.fixedFields.url
           }
         },
         Parameter: {
-          $visitor: _index13.default,
+          $visitor: _index11.default,
           fixedFields: {
             name: _apidomNsOpenapi.specificationObj.visitors.document.objects.Parameter.fixedFields.name,
             in: _apidomNsOpenapi.specificationObj.visitors.document.objects.Parameter.fixedFields.in,
@@ -242,7 +242,7 @@ const specification = {
           }
         },
         RequestBody: {
-          $visitor: _index22.default,
+          $visitor: _index20.default,
           fixedFields: {
             description: _apidomNsOpenapi.specificationObj.visitors.document.objects.RequestBody.fixedFields.description,
             content: _apidomNsOpenapi.specificationObj.visitors.document.objects.RequestBody.fixedFields.content,
@@ -261,7 +261,7 @@ const specification = {
           }
         },
         Encoding: {
-          $visitor: _index20.default,
+          $visitor: _index18.default,
           fixedFields: {
             contentType: _apidomNsOpenapi.specificationObj.visitors.document.objects.Encoding.fixedFields.contentType,
             headers: _apidomNsOpenapi.specificationObj.visitors.document.objects.Encoding.fixedFields.headers,
@@ -271,13 +271,13 @@ const specification = {
           }
         },
         Responses: {
-          $visitor: _index25.default,
+          $visitor: _index23.default,
           fixedFields: {
             default: _apidomNsOpenapi.specificationObj.visitors.document.objects.Responses.fixedFields.default
           }
         },
         Response: {
-          $visitor: _index24.default,
+          $visitor: _index22.default,
           fixedFields: {
             description: _apidomNsOpenapi.specificationObj.visitors.document.objects.Response.fixedFields.description,
             headers: _apidomNsOpenapi.specificationObj.visitors.document.objects.Response.fixedFields.headers,
@@ -286,10 +286,10 @@ const specification = {
           }
         },
         Callback: {
-          $visitor: _index23.default
+          $visitor: _index21.default
         },
         Example: {
-          $visitor: _index18.default,
+          $visitor: _index16.default,
           fixedFields: {
             summary: _apidomNsOpenapi.specificationObj.visitors.document.objects.Example.fixedFields.summary,
             description: _apidomNsOpenapi.specificationObj.visitors.document.objects.Example.fixedFields.description,
@@ -311,7 +311,7 @@ const specification = {
           }
         },
         Header: {
-          $visitor: _index14.default,
+          $visitor: _index12.default,
           fixedFields: {
             description: _apidomNsOpenapi.specificationObj.visitors.document.objects.Header.fixedFields.description,
             required: _apidomNsOpenapi.specificationObj.visitors.document.objects.Header.fixedFields.required,
@@ -329,7 +329,7 @@ const specification = {
           }
         },
         Tag: {
-          $visitor: _index11.default,
+          $visitor: _index1.default,
           fixedFields: {
             name: _apidomNsOpenapi.specificationObj.visitors.document.objects.Tag.fixedFields.name,
             description: _apidomNsOpenapi.specificationObj.visitors.document.objects.Tag.fixedFields.description,
@@ -339,7 +339,7 @@ const specification = {
           }
         },
         Reference: {
-          $visitor: _index12.default,
+          $visitor: _index10.default,
           fixedFields: {
             $ref: _apidomNsOpenapi.specificationObj.visitors.document.objects.Reference.fixedFields.$ref,
             summary: {
@@ -350,31 +350,18 @@ const specification = {
             }
           }
         },
+        JSONSchema: {
+          $ref: '#/visitors/document/objects/Schema'
+        },
+        LinkDescription: {
+          ...LinkDescriptionVisitor
+        },
         Schema: {
-          $visitor: _index15.default,
+          $visitor: _index13.default,
           fixedFields: {
+            ...JSONSchemaVisitor.fixedFields,
             // core vocabulary
-            $schema: {
-              $ref: '#/visitors/value'
-            },
-            $vocabulary: _$vocabularyVisitor.default,
-            $id: {
-              $ref: '#/visitors/value'
-            },
-            $anchor: {
-              $ref: '#/visitors/value'
-            },
-            $dynamicAnchor: {
-              $ref: '#/visitors/value'
-            },
-            $dynamicRef: {
-              $ref: '#/visitors/value'
-            },
-            $ref: _$refVisitor.default,
             $defs: _$defsVisitor.default,
-            $comment: {
-              $ref: '#/visitors/value'
-            },
             // applicator vocabulary
             allOf: _AllOfVisitor.default,
             anyOf: _AnyOfVisitor.default,
@@ -415,96 +402,7 @@ const specification = {
               $ref: '#/visitors/document/objects/Schema'
             },
             // validation vocabulary
-            // validation Keywords for Any Instance Type
-            type: _TypeVisitor.default,
-            enum: _EnumVisitor.default,
-            const: {
-              $ref: '#/visitors/value'
-            },
-            // validation Keywords for Numeric Instances (number and integer)
-            multipleOf: {
-              $ref: '#/visitors/value'
-            },
-            maximum: {
-              $ref: '#/visitors/value'
-            },
-            exclusiveMaximum: {
-              $ref: '#/visitors/value'
-            },
-            minimum: {
-              $ref: '#/visitors/value'
-            },
-            exclusiveMinimum: {
-              $ref: '#/visitors/value'
-            },
-            // validation Keywords for Strings
-            maxLength: {
-              $ref: '#/visitors/value'
-            },
-            minLength: {
-              $ref: '#/visitors/value'
-            },
-            pattern: {
-              $ref: '#/visitors/value'
-            },
-            // validation Keywords for Arrays
-            maxItems: {
-              $ref: '#/visitors/value'
-            },
-            minItems: {
-              $ref: '#/visitors/value'
-            },
-            uniqueItems: {
-              $ref: '#/visitors/value'
-            },
-            maxContains: {
-              $ref: '#/visitors/value'
-            },
-            minContains: {
-              $ref: '#/visitors/value'
-            },
-            // validation Keywords for Objects
-            maxProperties: {
-              $ref: '#/visitors/value'
-            },
-            minProperties: {
-              $ref: '#/visitors/value'
-            },
-            required: {
-              $ref: '#/visitors/value'
-            },
-            dependentRequired: _DependentRequiredVisitor.default,
-            // basic Meta-Data Annotations vocabulary
-            title: {
-              $ref: '#/visitors/value'
-            },
-            description: {
-              $ref: '#/visitors/value'
-            },
-            default: {
-              $ref: '#/visitors/value'
-            },
-            deprecated: {
-              $ref: '#/visitors/value'
-            },
-            readOnly: {
-              $ref: '#/visitors/value'
-            },
-            writeOnly: {
-              $ref: '#/visitors/value'
-            },
-            examples: _ExamplesVisitor.default,
-            // semantic Content With "format" vocabulary
-            format: {
-              $ref: '#/visitors/value'
-            },
             // contents of String-Encoded Data vocabulary
-            contentEncoding: {
-              $ref: '#/visitors/value'
-            },
-            contentMediaType: {
-              $ref: '#/visitors/value'
-            },
             contentSchema: {
               $ref: '#/visitors/document/objects/Schema'
             },
@@ -524,14 +422,14 @@ const specification = {
           }
         },
         Discriminator: {
-          $visitor: _index16.default,
+          $visitor: _index14.default,
           fixedFields: {
             propertyName: _apidomNsOpenapi.specificationObj.visitors.document.objects.Discriminator.fixedFields.propertyName,
             mapping: _apidomNsOpenapi.specificationObj.visitors.document.objects.Discriminator.fixedFields.mapping
           }
         },
         XML: {
-          $visitor: _index17.default,
+          $visitor: _index15.default,
           fixedFields: {
             name: _apidomNsOpenapi.specificationObj.visitors.document.objects.XML.fixedFields.name,
             namespace: _apidomNsOpenapi.specificationObj.visitors.document.objects.XML.fixedFields.namespace,
@@ -541,7 +439,7 @@ const specification = {
           }
         },
         SecurityScheme: {
-          $visitor: _index28.default,
+          $visitor: _index26.default,
           fixedFields: {
             type: _apidomNsOpenapi.specificationObj.visitors.document.objects.SecurityScheme.fixedFields.type,
             description: _apidomNsOpenapi.specificationObj.visitors.document.objects.SecurityScheme.fixedFields.description,
@@ -556,7 +454,7 @@ const specification = {
           }
         },
         OAuthFlows: {
-          $visitor: _index29.default,
+          $visitor: _index27.default,
           fixedFields: {
             implicit: {
               $ref: '#/visitors/document/objects/OAuthFlow'
@@ -573,7 +471,7 @@ const specification = {
           }
         },
         OAuthFlow: {
-          $visitor: _index30.default,
+          $visitor: _index28.default,
           fixedFields: {
             authorizationUrl: _apidomNsOpenapi.specificationObj.visitors.document.objects.OAuthFlow.fixedFields.authorizationUrl,
             tokenUrl: _apidomNsOpenapi.specificationObj.visitors.document.objects.OAuthFlow.fixedFields.tokenUrl,