@speclynx/apidom-ns-openapi-3-1 1.12.2 → 2.1.0

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

@@ -3,14 +3,15 @@
 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 _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
 var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-0");
 var _apidomNsJsonSchema = require("@speclynx/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 _bases = require("../bases.cjs");
 /**
  * @public
  */
@@ -18,7 +19,7 @@ var _JsonSchemaDialect = _interopRequireDefault(require("../../../../elements/Js
 /**
  * @public
  */
-class SchemaVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisitor, _apidomNsJsonSchema.ParentSchemaAwareVisitor, _apidomNsOpenapi.FallbackVisitor) {
+class SchemaVisitor extends _bases.BaseSchemaVisitor {
   constructor(options) {
     super(options);
     this.element = new _Schema.default();
@@ -27,23 +28,23 @@ class SchemaVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisi
     this.jsonSchemaDefaultDialect = _JsonSchemaDialect.default.default;
     this.passingOptionsNames.push('parent');
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     this.handleDialectIdentifier(objectElement);
     this.handleSchemaIdentifier(objectElement);
 
     // for further processing consider this Schema Element as parent for all embedded Schema Elements
     this.parent = this.element;
-    const result = _apidomNsOpenapi.FixedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+    _apidomNsOpenapi.FixedFieldsVisitor.prototype.ObjectElement.call(this, path);
 
     // mark this SchemaElement with reference metadata
-    if ((0, _apidomCore.isStringElement)(this.element.$ref)) {
+    if ((0, _apidomDatamodel.isStringElement)(this.element.$ref)) {
       this.element.classes.push('reference-element');
-      this.element.setMetaProperty('referenced-element', 'schema');
+      this.element.meta.set('referenced-element', 'schema');
     }
-    return result;
   }
-  BooleanElement(booleanElement) {
-    return _apidomNsJsonSchema.JSONSchemaVisitor.prototype.BooleanElement.call(this, booleanElement);
+  BooleanElement(path) {
+    _apidomNsJsonSchema.JSONSchemaVisitor.prototype.BooleanElement.call(this, path);
   }
 
   /**
@@ -58,7 +59,7 @@ class SchemaVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisi
     (0, _predicates.isJsonSchemaDialectElement)(this.openApiSemanticElement.jsonSchemaDialect)) {
       // @ts-ignore
       jsonSchemaDialect = (0, _apidomCore.toValue)(this.openApiSemanticElement.jsonSchemaDialect);
-    } else if (this.openApiGenericElement !== undefined && (0, _apidomCore.isStringElement)(this.openApiGenericElement.get('jsonSchemaDialect'))) {
+    } else if (this.openApiGenericElement !== undefined && (0, _apidomDatamodel.isStringElement)(this.openApiGenericElement.get('jsonSchemaDialect'))) {
       jsonSchemaDialect = (0, _apidomCore.toValue)(this.openApiGenericElement.get('jsonSchemaDialect'));
     } else {
       jsonSchemaDialect = (0, _apidomCore.toValue)(this.jsonSchemaDefaultDialect);

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

@@ -1,18 +1,19 @@
-import { Mixin } from 'ts-mixer';
 import { always } from 'ramda';
-import { isStringElement, toValue } from '@speclynx/apidom-core';
-import { FallbackVisitor, FixedFieldsVisitor } from '@speclynx/apidom-ns-openapi-3-0';
-import { JSONSchemaVisitor, ParentSchemaAwareVisitor } from '@speclynx/apidom-ns-json-schema-2020-12';
+import { isStringElement } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
+import { FixedFieldsVisitor } from '@speclynx/apidom-ns-openapi-3-0';
+import { JSONSchemaVisitor } from '@speclynx/apidom-ns-json-schema-2020-12';
 import { isJsonSchemaDialectElement } from "../../../../predicates.mjs";
 import SchemaElement from "../../../../elements/Schema.mjs";
 import JsonSchemaDialectElement from "../../../../elements/JsonSchemaDialect.mjs";
+import { BaseSchemaVisitor } from "../bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class SchemaVisitor extends Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class SchemaVisitor extends BaseSchemaVisitor {
   constructor(options) {
     super(options);
     this.element = new SchemaElement();
@@ -21,23 +22,23 @@ class SchemaVisitor extends Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor,
     this.jsonSchemaDefaultDialect = JsonSchemaDialectElement.default;
     this.passingOptionsNames.push('parent');
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     this.handleDialectIdentifier(objectElement);
     this.handleSchemaIdentifier(objectElement);
 
     // for further processing consider this Schema Element as parent for all embedded Schema Elements
     this.parent = this.element;
-    const result = FixedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+    FixedFieldsVisitor.prototype.ObjectElement.call(this, path);
 
     // mark this SchemaElement with reference metadata
     if (isStringElement(this.element.$ref)) {
       this.element.classes.push('reference-element');
-      this.element.setMetaProperty('referenced-element', 'schema');
+      this.element.meta.set('referenced-element', 'schema');
     }
-    return result;
   }
-  BooleanElement(booleanElement) {
-    return JSONSchemaVisitor.prototype.BooleanElement.call(this, booleanElement);
+  BooleanElement(path) {
+    JSONSchemaVisitor.prototype.BooleanElement.call(this, path);
   }
 
   /**