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

package/src/refractor/visitors/open-api-3-1/schema/PrefixItemsVisitor.cjs

@@ -1,38 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
-var _apidomCore = require("@swagger-api/apidom-core");
-var _apidomNsOpenapi = require("@swagger-api/apidom-ns-openapi-3-0");
-var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
+var _apidomNsJsonSchema = require("@swagger-api/apidom-ns-json-schema-2020-12");
 /**
  * @public
  */
-
-/**
- * @public
- */
-class PrefixItemsVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.SpecificationVisitor, _ParentSchemaAwareVisitor.default, _apidomNsOpenapi.FallbackVisitor) {
+class PrefixItemsVisitor extends _apidomNsJsonSchema.PrefixItemsVisitor {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ArrayElement();
-    this.element.classes.push('json-schema-prefixItems');
     this.passingOptionsNames.push('parent');
   }
-  ArrayElement(arrayElement) {
-    arrayElement.forEach(item => {
-      if ((0, _apidomCore.isObjectElement)(item)) {
-        const schemaElement = this.toRefractedElement(['document', 'objects', 'Schema'], item);
-        this.element.push(schemaElement);
-      } else {
-        const element = (0, _apidomCore.cloneDeep)(item);
-        this.element.push(element);
-      }
-    });
-    this.copyMetaAndAttributes(arrayElement, this.element);
-    return _apidomCore.BREAK;
-  }
 }
 var _default = exports.default = PrefixItemsVisitor;

package/src/refractor/visitors/open-api-3-1/schema/PrefixItemsVisitor.mjs

@@ -1,32 +1,11 @@
-import { Mixin } from 'ts-mixer';
-import { ArrayElement, isObjectElement, BREAK, cloneDeep } from '@swagger-api/apidom-core';
-import { FallbackVisitor, SpecificationVisitor } from '@swagger-api/apidom-ns-openapi-3-0';
-import ParentSchemaAwareVisitor from "./ParentSchemaAwareVisitor.mjs";
+import { PrefixItemsVisitor as PrefixItemsJSONSchema202012Visitor } from '@swagger-api/apidom-ns-json-schema-2020-12';
 /**
  * @public
  */
-/**
- * @public
- */
-class PrefixItemsVisitor extends Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class PrefixItemsVisitor extends PrefixItemsJSONSchema202012Visitor {
   constructor(options) {
     super(options);
-    this.element = new ArrayElement();
-    this.element.classes.push('json-schema-prefixItems');
     this.passingOptionsNames.push('parent');
   }
-  ArrayElement(arrayElement) {
-    arrayElement.forEach(item => {
-      if (isObjectElement(item)) {
-        const schemaElement = this.toRefractedElement(['document', 'objects', 'Schema'], item);
-        this.element.push(schemaElement);
-      } else {
-        const element = cloneDeep(item);
-        this.element.push(element);
-      }
-    });
-    this.copyMetaAndAttributes(arrayElement, this.element);
-    return BREAK;
-  }
 }
 export default PrefixItemsVisitor;

package/src/refractor/visitors/open-api-3-1/schema/PropertiesVisitor.cjs

@@ -1,26 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
-var _ramda = require("ramda");
-var _apidomCore = require("@swagger-api/apidom-core");
-var _apidomNsOpenapi = require("@swagger-api/apidom-ns-openapi-3-0");
-var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
+var _apidomNsJsonSchema = require("@swagger-api/apidom-ns-json-schema-2020-12");
 /**
  * @public
  */
-
-/**
- * @public
- */
-class PropertiesVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.MapVisitor, _ParentSchemaAwareVisitor.default, _apidomNsOpenapi.FallbackVisitor) {
+class PropertiesVisitor extends _apidomNsJsonSchema.PropertiesVisitor {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ObjectElement();
-    this.element.classes.push('json-schema-properties');
-    this.specPath = (0, _ramda.always)(['document', 'objects', 'Schema']);
     this.passingOptionsNames.push('parent');
   }
 }

package/src/refractor/visitors/open-api-3-1/schema/PropertiesVisitor.mjs

@@ -1,20 +1,10 @@
-import { Mixin } from 'ts-mixer';
-import { always } from 'ramda';
-import { ObjectElement } from '@swagger-api/apidom-core';
-import { FallbackVisitor, MapVisitor } from '@swagger-api/apidom-ns-openapi-3-0';
-import ParentSchemaAwareVisitor from "./ParentSchemaAwareVisitor.mjs";
+import { PropertiesVisitor as PropertiesJSONSchema202012Visitor } from '@swagger-api/apidom-ns-json-schema-2020-12';
 /**
  * @public
  */
-/**
- * @public
- */
-class PropertiesVisitor extends Mixin(MapVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class PropertiesVisitor extends PropertiesJSONSchema202012Visitor {
   constructor(options) {
     super(options);
-    this.element = new ObjectElement();
-    this.element.classes.push('json-schema-properties');
-    this.specPath = always(['document', 'objects', 'Schema']);
     this.passingOptionsNames.push('parent');
   }
 }

package/src/refractor/visitors/open-api-3-1/schema/index.cjs

@@ -5,13 +5,12 @@ exports.__esModule = true;
 exports.default = void 0;
 var _tsMixer = require("ts-mixer");
 var _ramda = require("ramda");
-var _ramdaAdjunct = require("ramda-adjunct");
 var _apidomCore = require("@swagger-api/apidom-core");
 var _apidomNsOpenapi = require("@swagger-api/apidom-ns-openapi-3-0");
+var _apidomNsJsonSchema = require("@swagger-api/apidom-ns-json-schema-2020-12");
 var _predicates = require("../../../../predicates.cjs");
 var _Schema = _interopRequireDefault(require("../../../../elements/Schema.cjs"));
 var _JsonSchemaDialect = _interopRequireDefault(require("../../../../elements/JsonSchemaDialect.cjs"));
-var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
 /**
  * @public
  */
@@ -19,7 +18,7 @@ var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAw
 /**
  * @public
  */
-class SchemaVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisitor, _ParentSchemaAwareVisitor.default, _apidomNsOpenapi.FallbackVisitor) {
+class SchemaVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisitor, _apidomNsJsonSchema.ParentSchemaAwareVisitor, _apidomNsOpenapi.FallbackVisitor) {
   constructor(options) {
     super(options);
     this.element = new _Schema.default();
@@ -29,8 +28,8 @@ class SchemaVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisi
     this.passingOptionsNames.push('parent');
   }
   ObjectElement(objectElement) {
-    this.handle$schema(objectElement);
-    this.handle$id(objectElement);
+    this.handleDialectIdentifier(objectElement);
+    this.handleSchemaIdentifier(objectElement);
 
     // for further processing consider this Schema Element as parent for all embedded Schema Elements
     this.parent = this.element;
@@ -44,9 +43,7 @@ class SchemaVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisi
     return result;
   }
   BooleanElement(booleanElement) {
-    const result = super.enter(booleanElement);
-    this.element.classes.push('boolean-json-schema');
-    return result;
+    return _apidomNsJsonSchema.JSONSchemaVisitor.prototype.BooleanElement.call(this, booleanElement);
   }
 
   /**
@@ -54,7 +51,7 @@ class SchemaVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisi
    * works even when no context is provided like when directly refracting generic Object Element
    * into Schema Element: `SchemaElement.refract(new ObjectElement({ type: 'object' });`
    */
-  getJsonSchemaDialect() {
+  get defaultDialectIdentifier() {
     let jsonSchemaDialect;
     if (this.openApiSemanticElement !== undefined &&
     // @ts-ignore
@@ -68,29 +65,11 @@ class SchemaVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisi
     }
     return jsonSchemaDialect;
   }
-  handle$schema(objectElement) {
-    // handle $schema keyword in embedded resources
-    if ((0, _ramdaAdjunct.isUndefined)(this.parent) && !(0, _apidomCore.isStringElement)(objectElement.get('$schema'))) {
-      // no parent available and no $schema is defined, set default jsonSchemaDialect
-      this.element.setMetaProperty('inherited$schema', this.getJsonSchemaDialect());
-    } else if ((0, _predicates.isSchemaElement)(this.parent) && !(0, _apidomCore.isStringElement)(objectElement.get('$schema'))) {
-      // parent is available and no $schema is defined, set parent $schema
-      const inherited$schema = (0, _ramda.defaultTo)((0, _apidomCore.toValue)(this.parent.meta.get('inherited$schema')), (0, _apidomCore.toValue)(this.parent.$schema));
-      this.element.setMetaProperty('inherited$schema', inherited$schema);
-    }
+  handleDialectIdentifier(objectElement) {
+    return _apidomNsJsonSchema.JSONSchemaVisitor.prototype.handleDialectIdentifier.call(this, objectElement);
   }
-  handle$id(objectElement) {
-    // handle $id keyword in embedded resources
-    // fetch parent's inherited$id
-    const inherited$id = this.parent !== undefined ? (0, _apidomCore.cloneDeep)(this.parent.getMetaProperty('inherited$id', [])) : new _apidomCore.ArrayElement();
-    // get current $id keyword
-    const $id = (0, _apidomCore.toValue)(objectElement.get('$id'));
-
-    // remember $id keyword if it's a non-empty strings
-    if ((0, _ramdaAdjunct.isNonEmptyString)($id)) {
-      inherited$id.push($id);
-    }
-    this.element.setMetaProperty('inherited$id', inherited$id);
+  handleSchemaIdentifier(objectElement) {
+    return _apidomNsJsonSchema.JSONSchemaVisitor.prototype.handleSchemaIdentifier.call(this, objectElement);
   }
 }
 var _default = exports.default = SchemaVisitor;

package/src/refractor/visitors/open-api-3-1/schema/index.mjs

@@ -1,12 +1,11 @@
 import { Mixin } from 'ts-mixer';
-import { always, defaultTo } from 'ramda';
-import { isNonEmptyString, isUndefined } from 'ramda-adjunct';
-import { ArrayElement, isStringElement, cloneDeep, toValue } from '@swagger-api/apidom-core';
+import { always } from 'ramda';
+import { isStringElement, toValue } from '@swagger-api/apidom-core';
 import { FallbackVisitor, FixedFieldsVisitor } from '@swagger-api/apidom-ns-openapi-3-0';
-import { isSchemaElement, isJsonSchemaDialectElement } from "../../../../predicates.mjs";
+import { JSONSchemaVisitor, ParentSchemaAwareVisitor } from '@swagger-api/apidom-ns-json-schema-2020-12';
+import { isJsonSchemaDialectElement } from "../../../../predicates.mjs";
 import SchemaElement from "../../../../elements/Schema.mjs";
 import JsonSchemaDialectElement from "../../../../elements/JsonSchemaDialect.mjs";
-import ParentSchemaAwareVisitor from "./ParentSchemaAwareVisitor.mjs";
 /**
  * @public
  */
@@ -23,8 +22,8 @@ class SchemaVisitor extends Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor,
     this.passingOptionsNames.push('parent');
   }
   ObjectElement(objectElement) {
-    this.handle$schema(objectElement);
-    this.handle$id(objectElement);
+    this.handleDialectIdentifier(objectElement);
+    this.handleSchemaIdentifier(objectElement);
 
     // for further processing consider this Schema Element as parent for all embedded Schema Elements
     this.parent = this.element;
@@ -38,9 +37,7 @@ class SchemaVisitor extends Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor,
     return result;
   }
   BooleanElement(booleanElement) {
-    const result = super.enter(booleanElement);
-    this.element.classes.push('boolean-json-schema');
-    return result;
+    return JSONSchemaVisitor.prototype.BooleanElement.call(this, booleanElement);
   }
 
   /**
@@ -48,7 +45,7 @@ class SchemaVisitor extends Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor,
    * works even when no context is provided like when directly refracting generic Object Element
    * into Schema Element: `SchemaElement.refract(new ObjectElement({ type: 'object' });`
    */
-  getJsonSchemaDialect() {
+  get defaultDialectIdentifier() {
     let jsonSchemaDialect;
     if (this.openApiSemanticElement !== undefined &&
     // @ts-ignore
@@ -62,29 +59,11 @@ class SchemaVisitor extends Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor,
     }
     return jsonSchemaDialect;
   }
-  handle$schema(objectElement) {
-    // handle $schema keyword in embedded resources
-    if (isUndefined(this.parent) && !isStringElement(objectElement.get('$schema'))) {
-      // no parent available and no $schema is defined, set default jsonSchemaDialect
-      this.element.setMetaProperty('inherited$schema', this.getJsonSchemaDialect());
-    } else if (isSchemaElement(this.parent) && !isStringElement(objectElement.get('$schema'))) {
-      // parent is available and no $schema is defined, set parent $schema
-      const inherited$schema = defaultTo(toValue(this.parent.meta.get('inherited$schema')), toValue(this.parent.$schema));
-      this.element.setMetaProperty('inherited$schema', inherited$schema);
-    }
+  handleDialectIdentifier(objectElement) {
+    return JSONSchemaVisitor.prototype.handleDialectIdentifier.call(this, objectElement);
   }
-  handle$id(objectElement) {
-    // handle $id keyword in embedded resources
-    // fetch parent's inherited$id
-    const inherited$id = this.parent !== undefined ? cloneDeep(this.parent.getMetaProperty('inherited$id', [])) : new ArrayElement();
-    // get current $id keyword
-    const $id = toValue(objectElement.get('$id'));
-
-    // remember $id keyword if it's a non-empty strings
-    if (isNonEmptyString($id)) {
-      inherited$id.push($id);
-    }
-    this.element.setMetaProperty('inherited$id', inherited$id);
+  handleSchemaIdentifier(objectElement) {
+    return JSONSchemaVisitor.prototype.handleSchemaIdentifier.call(this, objectElement);
   }
 }
 export default SchemaVisitor;