@speclynx/apidom-ns-json-schema-draft-6 1.12.1 → 2.0.1

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

@@ -1,11 +1,9 @@
-import { ArrayElement, ObjectElement, isStringElement, isArrayElement, isElement, isMemberElement, includesClasses, cloneDeep, toValue } from '@speclynx/apidom-core';
-/**
- * JSON Schema Draft 6 specification elements.
- */
+import { ArrayElement, ObjectElement, isArrayElement, isElement, isMemberElement, isStringElement, includesClasses, cloneDeep, SourceMapElement } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
+import { getNodeType } from '@speclynx/apidom-traverse';
 import { MediaElement } from '@speclynx/apidom-ns-json-schema-draft-4';
 import JSONSchemaElement from "../../elements/JSONSchema.mjs";
 import LinkDescriptionElement from "../../elements/LinkDescription.mjs";
-import { getNodeType } from "../../traversal/visitor.mjs";
 /**
  * This plugin is specific to YAML 1.2 format, which allows defining key-value pairs
  * with empty key, empty value, or both. If the value is not provided in YAML format,
@@ -39,7 +37,7 @@ import { getNodeType } from "../../traversal/visitor.mjs";
  *      (StringElement)
  *      (JSONSchemaElement))
  */
-const isEmptyElement = element => isStringElement(element) && includesClasses(['yaml-e-node', 'yaml-e-scalar'], element);
+const isEmptyElement = element => isStringElement(element) && includesClasses(element, ['yaml-e-node', 'yaml-e-scalar']);
 const schema = {
   JSONSchemaDraft6Element: {
     additionalItems(...args) {
@@ -182,9 +180,12 @@ const findElementFactory = (ancestor, keyName) => {
  */
 const plugin = () => () => ({
   visitor: {
-    StringElement(element, key, parent, path, ancestors) {
-      if (!isEmptyElement(element)) return undefined;
-      const lineage = [...ancestors, parent].filter(isElement);
+    StringElement(path) {
+      const element = path.node;
+      if (!isEmptyElement(element)) return;
+
+      // getAncestorNodes() returns [parent, grandparent, ..., root], so reverse to get [root, ..., parent]
+      const lineage = path.getAncestorNodes().reverse().filter(isElement);
       const parentElement = lineage.at(-1);
       let elementFactory;
       let context;
@@ -197,10 +198,12 @@ const plugin = () => () => ({
       }
 
       // no element factory found
-      if (typeof elementFactory !== 'function') return undefined;
-      return elementFactory.call({
+      if (typeof elementFactory !== 'function') return;
+      const replacement = elementFactory.call({
         context
       }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
+      SourceMapElement.transfer(element, replacement);
+      path.replaceWith(replacement);
     }
   }
 });

package/src/refractor/specification.cjs

@@ -11,7 +11,19 @@ var _ExamplesVisitor = _interopRequireDefault(require("./visitors/json-schema/Ex
 var _index2 = _interopRequireDefault(require("./visitors/json-schema/link-description/index.cjs"));
 const specification = (0, _ramda.pipe)(
 // JSON Schema object modifications
-(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], _index.default), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'id']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$id'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], _ItemsVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'const'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'examples'], _ExamplesVisitor.default),
+(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'element'], 'jSONSchemaDraft6'), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], _index.default), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'id']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$id'], {
+  $ref: '#/visitors/value'
+}), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], {
+  $visitor: _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor,
+  alias: 'containsField'
+}), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], {
+  $visitor: _ItemsVisitor.default,
+  alias: 'itemsField'
+}), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'const'], {
+  $ref: '#/visitors/value'
+}), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'examples'], _ExamplesVisitor.default),
 // Link Description object modifications
-(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], _index2.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'schema']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'method']), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'encType']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionEncType'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value))(_apidomNsJsonSchemaDraft.specificationObj);
+(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], _index2.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'schema']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'method']), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'encType']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionEncType'], {
+  $ref: '#/visitors/value'
+}))(_apidomNsJsonSchemaDraft.specificationObj);
 var _default = exports.default = specification;

package/src/refractor/specification.mjs

@@ -6,7 +6,19 @@ import JSONSchemaExamplesVisitor from "./visitors/json-schema/ExamplesVisitor.mj
 import LinkDescriptionVisitor from "./visitors/json-schema/link-description/index.mjs";
 const specification = pipe(
 // JSON Schema object modifications
-assocPath(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], JSONSchemaVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'id']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$id'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], JSONSchemaItemsVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'const'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'examples'], JSONSchemaExamplesVisitor),
+assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'element'], 'jSONSchemaDraft6'), assocPath(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], JSONSchemaVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'id']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$id'], {
+  $ref: '#/visitors/value'
+}), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], {
+  $visitor: specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor,
+  alias: 'containsField'
+}), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], {
+  $visitor: JSONSchemaItemsVisitor,
+  alias: 'itemsField'
+}), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'const'], {
+  $ref: '#/visitors/value'
+}), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'examples'], JSONSchemaExamplesVisitor),
 // Link Description object modifications
-assocPath(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], LinkDescriptionVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), dissocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'schema']), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), dissocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'method']), dissocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'encType']), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionEncType'], specificationObj.visitors.value))(specificationObj);
+assocPath(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], LinkDescriptionVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), dissocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'schema']), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), dissocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'method']), dissocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'encType']), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionEncType'], {
+  $ref: '#/visitors/value'
+}))(specificationObj);
 export default specification;

package/src/refractor/toolbox.cjs

@@ -4,15 +4,20 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var jsonSchemaDraft6Predicates = _interopRequireWildcard(require("../predicates.cjs"));
 var _namespace = _interopRequireDefault(require("../namespace.cjs"));
+/**
+ * @public
+ */
+
 const createToolbox = () => {
-  const namespace = (0, _apidomCore.createNamespace)(_namespace.default);
+  const namespace = new _apidomDatamodel.Namespace();
   const predicates = {
     ...jsonSchemaDraft6Predicates,
-    isStringElement: _apidomCore.isStringElement
+    isStringElement: _apidomDatamodel.isStringElement
   };
+  namespace.use(_namespace.default);
   return {
     predicates,
     namespace

package/src/refractor/toolbox.mjs

@@ -1,12 +1,16 @@
-import { createNamespace, isStringElement } from '@speclynx/apidom-core';
+import { isStringElement, Namespace } from '@speclynx/apidom-datamodel';
 import * as jsonSchemaDraft6Predicates from "../predicates.mjs";
 import jsonSchemaDraft6Namespace from "../namespace.mjs";
+/**
+ * @public
+ */
 const createToolbox = () => {
-  const namespace = createNamespace(jsonSchemaDraft6Namespace);
+  const namespace = new Namespace();
   const predicates = {
     ...jsonSchemaDraft6Predicates,
     isStringElement
   };
+  namespace.use(jsonSchemaDraft6Namespace);
   return {
     predicates,
     namespace

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

@@ -7,10 +7,9 @@ var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-4"
  * @public
  */
 class ExamplesVisitor extends _apidomNsJsonSchemaDraft.FallbackVisitor {
-  ArrayElement(arrayElement) {
-    const result = this.enter(arrayElement);
+  ArrayElement(path) {
+    this.enter(path);
     this.element.classes.push('json-schema-examples');
-    return result;
   }
 }
 var _default = exports.default = ExamplesVisitor;

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

@@ -3,10 +3,9 @@ import { FallbackVisitor } from '@speclynx/apidom-ns-json-schema-draft-4';
  * @public
  */
 class ExamplesVisitor extends FallbackVisitor {
-  ArrayElement(arrayElement) {
-    const result = this.enter(arrayElement);
+  ArrayElement(path) {
+    this.enter(path);
     this.element.classes.push('json-schema-examples');
-    return result;
   }
 }
 export default ExamplesVisitor;

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

@@ -2,15 +2,14 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
 var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-4");
 /**
  * @public
  */
 class ItemsVisitor extends _apidomNsJsonSchemaDraft.ItemsVisitor {
-  BooleanElement(booleanElement) {
-    this.element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], booleanElement);
-    return _apidomCore.BREAK;
+  BooleanElement(path) {
+    this.element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], path.node);
+    path.stop();
   }
 }
 var _default = exports.default = ItemsVisitor;

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

@@ -1,12 +1,11 @@
-import { BREAK } from '@speclynx/apidom-core';
 import { ItemsVisitor as JSONSchemaDraft4ItemsVisitor } from '@speclynx/apidom-ns-json-schema-draft-4';
 /**
  * @public
  */
 class ItemsVisitor extends JSONSchemaDraft4ItemsVisitor {
-  BooleanElement(booleanElement) {
-    this.element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], booleanElement);
-    return BREAK;
+  BooleanElement(path) {
+    this.element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], path.node);
+    path.stop();
   }
 }
 export default ItemsVisitor;

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

@@ -9,6 +9,8 @@ var _JSONSchema = _interopRequireDefault(require("../../../elements/JSONSchema.c
  * @public
  */
 class JSONSchemaVisitor extends _apidomNsJsonSchemaDraft.JSONSchemaVisitor {
+  // @ts-expect-error - element can be BooleanElement (boolean schemas introduced in draft-6)
+
   constructor(options) {
     super(options);
     this.element = new _JSONSchema.default();
@@ -16,10 +18,9 @@ class JSONSchemaVisitor extends _apidomNsJsonSchemaDraft.JSONSchemaVisitor {
   get defaultDialectIdentifier() {
     return 'http://json-schema.org/draft-06/schema#';
   }
-  BooleanElement(booleanElement) {
-    const result = this.enter(booleanElement);
+  BooleanElement(path) {
+    this.enter(path);
     this.element.classes.push('boolean-json-schema');
-    return result;
   }
   handleSchemaIdentifier(objectElement, identifierKeyword = '$id') {
     return super.handleSchemaIdentifier(objectElement, identifierKeyword);

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

@@ -4,6 +4,8 @@ import JSONSchemaElement from "../../../elements/JSONSchema.mjs";
  * @public
  */
 class JSONSchemaVisitor extends JSONSchemaDraft4Visitor {
+  // @ts-expect-error - element can be BooleanElement (boolean schemas introduced in draft-6)
+
   constructor(options) {
     super(options);
     this.element = new JSONSchemaElement();
@@ -11,10 +13,9 @@ class JSONSchemaVisitor extends JSONSchemaDraft4Visitor {
   get defaultDialectIdentifier() {
     return 'http://json-schema.org/draft-06/schema#';
   }
-  BooleanElement(booleanElement) {
-    const result = this.enter(booleanElement);
+  BooleanElement(path) {
+    this.enter(path);
     this.element.classes.push('boolean-json-schema');
-    return result;
   }
   handleSchemaIdentifier(objectElement, identifierKeyword = '$id') {
     return super.handleSchemaIdentifier(objectElement, identifierKeyword);

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

@@ -9,6 +9,8 @@ var _LinkDescription = _interopRequireDefault(require("../../../../elements/Link
  * @public
  */
 class LinkDescriptionVisitor extends _apidomNsJsonSchemaDraft.LinkDescriptionVisitor {
+  // @ts-expect-error - widening type to include BooleanElement (boolean schemas introduced in draft-6)
+
   constructor(options) {
     super(options);
     this.element = new _LinkDescription.default();

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

@@ -4,6 +4,8 @@ import LinkDescriptionElement from "../../../../elements/LinkDescription.mjs";
  * @public
  */
 class LinkDescriptionVisitor extends JSONSchemaDraft4LinkDescriptionVisitor {
+  // @ts-expect-error - widening type to include BooleanElement (boolean schemas introduced in draft-6)
+
   constructor(options) {
     super(options);
     this.element = new LinkDescriptionElement();