@swagger-api/apidom-ns-json-schema-draft-6 1.0.0-beta.4 → 1.0.0-beta.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-ns-json-schema-draft-6",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.41",
   "description": "JSON Schema Draft 6 namespace for ApiDOM.",
   "publishConfig": {
     "access": "public",
@@ -41,10 +41,10 @@
   "author": "Vladimir Gorej",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-core": "^1.0.0-beta.4",
-    "@swagger-api/apidom-error": "^1.0.0-beta.4",
-    "@swagger-api/apidom-ns-json-schema-draft-4": "^1.0.0-beta.4",
+    "@babel/runtime-corejs3": "^7.26.10",
+    "@swagger-api/apidom-core": "^1.0.0-beta.41",
+    "@swagger-api/apidom-error": "^1.0.0-beta.41",
+    "@swagger-api/apidom-ns-json-schema-draft-4": "^1.0.0-beta.41",
     "@types/ramda": "~0.30.0",
     "ramda": "~0.30.0",
     "ramda-adjunct": "^5.0.0",
@@ -60,5 +60,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "aca988b356e303bd9aaa900d8ba3de49b3bb80be"
+  "gitHead": "ef254d95ce2b4d25eadcae8344a61954147b7615"
 }

package/src/index.cjs

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
-exports.specificationObj = exports.refractorPluginReplaceEmptyElement = exports.refract = exports.mediaTypes = exports.keyMap = exports.isStringElement = exports.isRefElement = exports.isObjectElement = exports.isNumberElement = exports.isNullElement = exports.isMemberElement = exports.isMediaElement = exports.isLinkElement = exports.isLinkDescriptionElement = exports.isJSONSchemaElement = exports.isJSONReferenceLikeElement = exports.isJSONReferenceElement = exports.isElement = exports.isBooleanElement = exports.isArrayElement = exports.getNodeType = exports.default = exports.createRefractor = exports.Visitor = exports.SpecificationVisitor = exports.PatternedFieldsVisitor = exports.ParentSchemaAwareVisitor = exports.MediaElement = exports.MapVisitor = exports.LinkDescriptionElement = exports.JSONSchemaElement = exports.JSONSchemaDraft6MediaTypes = exports.JSONReferenceElement = exports.FixedFieldsVisitor = exports.FallbackVisitor = exports.AlternatingVisitor = void 0;
+exports.specificationObj = exports.refractorPluginReplaceEmptyElement = exports.refract = exports.mediaTypes = exports.keyMap = exports.isStringElement = exports.isRefElement = exports.isObjectElement = exports.isNumberElement = exports.isNullElement = exports.isMemberElement = exports.isMediaElement = exports.isLinkElement = exports.isLinkDescriptionElement = exports.isJSONSchemaElement = exports.isJSONReferenceLikeElement = exports.isJSONReferenceElement = exports.isElement = exports.isBooleanElement = exports.isArrayElement = exports.getNodeType = exports.default = exports.createRefractor = exports.Visitor = exports.SpecificationVisitor = exports.PatternedFieldsVisitor = exports.ParentSchemaAwareVisitor = exports.MediaElement = exports.MapVisitor = exports.LinkDescriptionVisitor = exports.LinkDescriptionElement = exports.JSONSchemaVisitor = exports.JSONSchemaElement = exports.JSONSchemaDraft6MediaTypes = exports.JSONReferenceElement = exports.ItemsVisitor = exports.FixedFieldsVisitor = exports.FallbackVisitor = exports.AlternatingVisitor = void 0;
 var _apidomCore = require("@swagger-api/apidom-core");
 exports.isRefElement = _apidomCore.isRefElement;
 exports.isLinkElement = _apidomCore.isLinkElement;
@@ -44,6 +44,12 @@ exports.ParentSchemaAwareVisitor = _apidomNsJsonSchemaDraft.ParentSchemaAwareVis
 exports.Visitor = _apidomNsJsonSchemaDraft.Visitor;
 exports.JSONReferenceElement = _apidomNsJsonSchemaDraft.JSONReferenceElement;
 exports.MediaElement = _apidomNsJsonSchemaDraft.MediaElement;
+var _index2 = _interopRequireDefault(require("./refractor/visitors/json-schema/link-description/index.cjs"));
+exports.LinkDescriptionVisitor = _index2.default;
+var _index3 = _interopRequireDefault(require("./refractor/visitors/json-schema/index.cjs"));
+exports.JSONSchemaVisitor = _index3.default;
+var _ItemsVisitor = _interopRequireDefault(require("./refractor/visitors/json-schema/ItemsVisitor.cjs"));
+exports.ItemsVisitor = _ItemsVisitor.default;
 var _visitor = require("./traversal/visitor.cjs");
 exports.keyMap = _visitor.keyMap;
 exports.getNodeType = _visitor.getNodeType;

package/src/index.mjs

@@ -7,6 +7,9 @@ export { default as refract, createRefractor } from "./refractor/index.mjs";
 export { default as specificationObj } from "./refractor/specification.mjs";
 export { isJSONReferenceElement, isJSONSchemaElement, isLinkDescriptionElement, isMediaElement } from "./predicates.mjs";
 export { isJSONReferenceLikeElement, SpecificationVisitor, FallbackVisitor, FixedFieldsVisitor, PatternedFieldsVisitor, MapVisitor, AlternatingVisitor, ParentSchemaAwareVisitor, Visitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
+export { default as LinkDescriptionVisitor } from "./refractor/visitors/json-schema/link-description/index.mjs";
+export { default as JSONSchemaVisitor } from "./refractor/visitors/json-schema/index.mjs";
+export { default as ItemsVisitor } from "./refractor/visitors/json-schema/ItemsVisitor.mjs";
 export { keyMap, getNodeType } from "./traversal/visitor.mjs";
 /**
  * JSON Schema Draft 6 specification elements.

package/src/refractor/visitors/json-schema/ItemsVisitor.cjs

@@ -2,33 +2,12 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
 var _apidomCore = require("@swagger-api/apidom-core");
 var _apidomNsJsonSchemaDraft = require("@swagger-api/apidom-ns-json-schema-draft-4");
 /**
  * @public
  */
-
-/**
- * @public
- */
-class ItemsVisitor extends (0, _tsMixer.Mixin)(_apidomNsJsonSchemaDraft.SpecificationVisitor, _apidomNsJsonSchemaDraft.ParentSchemaAwareVisitor, _apidomNsJsonSchemaDraft.FallbackVisitor) {
-  ObjectElement(objectElement) {
-    const specPath = (0, _apidomNsJsonSchemaDraft.isJSONReferenceLikeElement)(objectElement) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
-    this.element = this.toRefractedElement(specPath, objectElement);
-    return _apidomCore.BREAK;
-  }
-  ArrayElement(arrayElement) {
-    this.element = new _apidomCore.ArrayElement();
-    this.element.classes.push('json-schema-items');
-    arrayElement.forEach(item => {
-      const specPath = (0, _apidomNsJsonSchemaDraft.isJSONReferenceLikeElement)(item) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
-      const element = this.toRefractedElement(specPath, item);
-      this.element.push(element);
-    });
-    this.copyMetaAndAttributes(arrayElement, this.element);
-    return _apidomCore.BREAK;
-  }
+class ItemsVisitor extends _apidomNsJsonSchemaDraft.ItemsVisitor {
   BooleanElement(booleanElement) {
     this.element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], booleanElement);
     return _apidomCore.BREAK;

package/src/refractor/visitors/json-schema/ItemsVisitor.mjs

@@ -1,31 +1,9 @@
-import { Mixin } from 'ts-mixer';
-import { ArrayElement, BREAK } from '@swagger-api/apidom-core';
-import { SpecificationVisitor, FallbackVisitor, ParentSchemaAwareVisitor, isJSONReferenceLikeElement } from '@swagger-api/apidom-ns-json-schema-draft-4';
-
+import { BREAK } from '@swagger-api/apidom-core';
+import { ItemsVisitor as JSONSchemaDraft4ItemsVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 /**
  * @public
  */
-
-/**
- * @public
- */
-class ItemsVisitor extends Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
-  ObjectElement(objectElement) {
-    const specPath = isJSONReferenceLikeElement(objectElement) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
-    this.element = this.toRefractedElement(specPath, objectElement);
-    return BREAK;
-  }
-  ArrayElement(arrayElement) {
-    this.element = new ArrayElement();
-    this.element.classes.push('json-schema-items');
-    arrayElement.forEach(item => {
-      const specPath = isJSONReferenceLikeElement(item) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
-      const element = this.toRefractedElement(specPath, item);
-      this.element.push(element);
-    });
-    this.copyMetaAndAttributes(arrayElement, this.element);
-    return BREAK;
-  }
+class ItemsVisitor extends JSONSchemaDraft4ItemsVisitor {
   BooleanElement(booleanElement) {
     this.element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], booleanElement);
     return BREAK;

package/src/refractor/visitors/json-schema/index.cjs

@@ -3,30 +3,28 @@
 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 _apidomNsJsonSchemaDraft = require("@swagger-api/apidom-ns-json-schema-draft-4");
 var _JSONSchema = _interopRequireDefault(require("../../../elements/JSONSchema.cjs"));
 /**
  * @public
  */
-
-/**
- * @public
- */
-class JSONSchemaVisitor extends (0, _tsMixer.Mixin)(_apidomNsJsonSchemaDraft.FixedFieldsVisitor, _apidomNsJsonSchemaDraft.FallbackVisitor) {
+class JSONSchemaVisitor extends _apidomNsJsonSchemaDraft.JSONSchemaVisitor {
   constructor(options) {
     super(options);
-    this.specPath = (0, _ramda.always)(['document', 'objects', 'JSONSchema']);
-  }
-  ObjectElement(objectElement) {
     this.element = new _JSONSchema.default();
-    return _apidomNsJsonSchemaDraft.FixedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  get defaultDialectIdentifier() {
+    return 'http://json-schema.org/draft-06/schema#';
   }
   BooleanElement(booleanElement) {
     const result = this.enter(booleanElement);
     this.element.classes.push('boolean-json-schema');
     return result;
   }
+  handleSchemaIdentifier(objectElement, identifierKeyword = '$id') {
+    return super.handleSchemaIdentifier(objectElement, identifierKeyword);
+  }
 }
 var _default = exports.default = JSONSchemaVisitor;

package/src/refractor/visitors/json-schema/index.mjs

@@ -1,26 +1,25 @@
-import { Mixin } from 'ts-mixer';
-import { always } from 'ramda';
-import { FixedFieldsVisitor, FallbackVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
+import { JSONSchemaVisitor as JSONSchemaDraft4Visitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import JSONSchemaElement from "../../../elements/JSONSchema.mjs";
 /**
  * @public
  */
-/**
- * @public
- */
-class JSONSchemaVisitor extends Mixin(FixedFieldsVisitor, FallbackVisitor) {
+class JSONSchemaVisitor extends JSONSchemaDraft4Visitor {
   constructor(options) {
     super(options);
-    this.specPath = always(['document', 'objects', 'JSONSchema']);
-  }
-  ObjectElement(objectElement) {
     this.element = new JSONSchemaElement();
-    return FixedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  get defaultDialectIdentifier() {
+    return 'http://json-schema.org/draft-06/schema#';
   }
   BooleanElement(booleanElement) {
     const result = this.enter(booleanElement);
     this.element.classes.push('boolean-json-schema');
     return result;
   }
+  handleSchemaIdentifier(objectElement, identifierKeyword = '$id') {
+    return super.handleSchemaIdentifier(objectElement, identifierKeyword);
+  }
 }
 export default JSONSchemaVisitor;

package/src/refractor/visitors/json-schema/link-description/index.cjs

@@ -3,22 +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 _apidomNsJsonSchemaDraft = require("@swagger-api/apidom-ns-json-schema-draft-4");
 var _LinkDescription = _interopRequireDefault(require("../../../../elements/LinkDescription.cjs"));
 /**
  * @public
  */
-
-/**
- * @public
- */
-class LinkDescriptionVisitor extends (0, _tsMixer.Mixin)(_apidomNsJsonSchemaDraft.FixedFieldsVisitor, _apidomNsJsonSchemaDraft.FallbackVisitor) {
+class LinkDescriptionVisitor extends _apidomNsJsonSchemaDraft.LinkDescriptionVisitor {
   constructor(options) {
     super(options);
     this.element = new _LinkDescription.default();
-    this.specPath = (0, _ramda.always)(['document', 'objects', 'LinkDescription']);
   }
 }
 var _default = exports.default = LinkDescriptionVisitor;

package/src/refractor/visitors/json-schema/link-description/index.mjs

@@ -1,18 +1,12 @@
-import { Mixin } from 'ts-mixer';
-import { always } from 'ramda';
-import { FixedFieldsVisitor, FallbackVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
+import { LinkDescriptionVisitor as JSONSchemaDraft4LinkDescriptionVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import LinkDescriptionElement from "../../../../elements/LinkDescription.mjs";
 /**
  * @public
  */
-/**
- * @public
- */
-class LinkDescriptionVisitor extends Mixin(FixedFieldsVisitor, FallbackVisitor) {
+class LinkDescriptionVisitor extends JSONSchemaDraft4LinkDescriptionVisitor {
   constructor(options) {
     super(options);
     this.element = new LinkDescriptionElement();
-    this.specPath = always(['document', 'objects', 'LinkDescription']);
   }
 }
 export default LinkDescriptionVisitor;

package/src/traversal/visitor.cjs

@@ -3,20 +3,11 @@
 exports.__esModule = true;
 exports.keyMap = exports.getNodeType = void 0;
 var _apidomCore = require("@swagger-api/apidom-core");
+var _apidomNsJsonSchemaDraft = require("@swagger-api/apidom-ns-json-schema-draft-4");
+exports.getNodeType = _apidomNsJsonSchemaDraft.getNodeType;
 /**
  * @public
  */
-const getNodeType = element => {
-  if (!(0, _apidomCore.isElement)(element)) {
-    return undefined;
-  }
-  return `${element.element.charAt(0).toUpperCase() + element.element.slice(1)}Element`;
-};
-
-/**
- * @public
- */
-exports.getNodeType = getNodeType;
 const keyMap = exports.keyMap = {
   JSONSchemaDraft6Element: ['content'],
   JSONReferenceElement: ['content'],

package/src/traversal/visitor.mjs

@@ -1,14 +1,5 @@
-import { keyMap as keyMapBase, isElement } from '@swagger-api/apidom-core';
-
-/**
- * @public
- */
-export const getNodeType = element => {
-  if (!isElement(element)) {
-    return undefined;
-  }
-  return `${element.element.charAt(0).toUpperCase() + element.element.slice(1)}Element`;
-};
+import { keyMap as keyMapBase } from '@swagger-api/apidom-core';
+export { getNodeType } from '@swagger-api/apidom-ns-json-schema-draft-4';
 
 /**
  * @public

package/types/apidom-ns-json-schema-draft-6.d.ts

@@ -7,7 +7,6 @@ import { AnyOfVisitorOptions } from '@swagger-api/apidom-ns-json-schema-draft-4'
 import { ArrayElement } from '@swagger-api/apidom-core';
 import { Attributes } from '@swagger-api/apidom-core';
 import { BooleanElement } from '@swagger-api/apidom-core';
-import { Class } from 'ts-mixer/dist/types/types.js';
 import { DefinitionsVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { DefinitionsVisitorOptions } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { DependenciesVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
@@ -19,6 +18,7 @@ import { FallbackVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { FallbackVisitorOptions } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { FixedFieldsVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { FixedFieldsVisitorOptions } from '@swagger-api/apidom-ns-json-schema-draft-4';
+import { getNodeType } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { isArrayElement } from '@swagger-api/apidom-core';
 import { isBooleanElement } from '@swagger-api/apidom-core';
 import { isElement } from '@swagger-api/apidom-core';
@@ -32,14 +32,17 @@ import { isNumberElement } from '@swagger-api/apidom-core';
 import { isObjectElement } from '@swagger-api/apidom-core';
 import { isRefElement } from '@swagger-api/apidom-core';
 import { isStringElement } from '@swagger-api/apidom-core';
+import { ItemsVisitorOptions } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { JSONReference$RefVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { JSONReferenceElement } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { JSONReferenceVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { ItemsVisitor as JSONSchemaDraft4ItemsVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { JSONSchemaElement as JSONSchemaElement_2 } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { JSONSchemaVisitor as JSONSchemaVisitor_2 } from '@swagger-api/apidom-ns-json-schema-draft-4';
+import { JSONSchemaVisitorOptions } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { LinkDescriptionElement as LinkDescriptionElement_2 } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { LinkDescriptionVisitor as LinkDescriptionVisitor_2 } from '@swagger-api/apidom-ns-json-schema-draft-4';
+import { LinkDescriptionVisitorOptions } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { LinksVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { MapVisitor } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import { MapVisitorOptions } from '@swagger-api/apidom-ns-json-schema-draft-4';
@@ -120,10 +123,7 @@ export { FixedFieldsVisitorOptions }
  */
 export declare type Format = 'generic' | 'json' | 'yaml';
 
-/**
- * @public
- */
-export declare const getNodeType: <T extends Element_2>(element: T) => string | undefined;
+export { getNodeType }
 
 export { isArrayElement }
 
@@ -164,20 +164,11 @@ export { isStringElement }
 /**
  * @public
  */
-export declare class ItemsVisitor extends ItemsVisitor_base {
-    element: ObjectElement | ArrayElement;
-    ObjectElement(objectElement: ObjectElement): {};
-    ArrayElement(arrayElement: ArrayElement): {};
+export declare class ItemsVisitor extends JSONSchemaDraft4ItemsVisitor {
     BooleanElement(booleanElement: BooleanElement): {};
 }
 
-declare const ItemsVisitor_base: Class<any[], SpecificationVisitor & ParentSchemaAwareVisitor & FallbackVisitor, typeof SpecificationVisitor & typeof ParentSchemaAwareVisitor & typeof FallbackVisitor>;
-
-/**
- * @public
- */
-export declare interface ItemsVisitorOptions extends SpecificationVisitorOptions, ParentSchemaAwareVisitorOptions, FallbackVisitorOptions {
-}
+export { ItemsVisitorOptions }
 
 export { JSONReferenceElement }
 
@@ -257,21 +248,15 @@ export declare class JSONSchemaElement extends JSONSchemaElement_2 {
 /**
  * @public
  */
-export declare class JSONSchemaVisitor extends JSONSchemaVisitor_base {
+export declare class JSONSchemaVisitor extends JSONSchemaVisitor_2 {
     element: JSONSchemaElement;
-    protected readonly specPath: SpecPath<['document', 'objects', 'JSONSchema']>;
     constructor(options: JSONSchemaVisitorOptions);
-    ObjectElement(objectElement: ObjectElement): {};
+    get defaultDialectIdentifier(): string;
     BooleanElement(booleanElement: BooleanElement): {};
+    handleSchemaIdentifier(objectElement: ObjectElement, identifierKeyword?: string): void;
 }
 
-declare const JSONSchemaVisitor_base: Class<any[], FixedFieldsVisitor & FallbackVisitor, typeof FixedFieldsVisitor & typeof FallbackVisitor>;
-
-/**
- * @public
- */
-export declare interface JSONSchemaVisitorOptions extends FixedFieldsVisitorOptions, FallbackVisitorOptions {
-}
+export { JSONSchemaVisitorOptions }
 
 /**
  * @public
@@ -320,19 +305,12 @@ export declare class LinkDescriptionElement extends LinkDescriptionElement_2 {
 /**
  * @public
  */
-export declare class LinkDescriptionVisitor extends LinkDescriptionVisitor_base {
+export declare class LinkDescriptionVisitor extends LinkDescriptionVisitor_2 {
     readonly element: LinkDescriptionElement;
-    protected readonly specPath: SpecPath<['document', 'objects', 'LinkDescription']>;
     constructor(options: LinkDescriptionVisitorOptions);
 }
 
-declare const LinkDescriptionVisitor_base: Class<any[], FixedFieldsVisitor & FallbackVisitor, typeof FixedFieldsVisitor & typeof FallbackVisitor>;
-
-/**
- * @public
- */
-export declare interface LinkDescriptionVisitorOptions extends FixedFieldsVisitorOptions, FallbackVisitorOptions {
-}
+export { LinkDescriptionVisitorOptions }
 
 export { MapVisitor }