@speclynx/apidom-ns-json-schema-2020-12 1.12.1 → 2.0.1

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

@@ -1,10 +1,11 @@
-import { ArrayElement, ObjectElement, isStringElement, isArrayElement, isElement, isMemberElement, includesClasses, cloneDeep, toValue } from '@speclynx/apidom-core';
+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';
 /**
  * JSON Schema 2020-12 specification elements.
  */
 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,
@@ -38,7 +39,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 = {
   JSONSchema202012Element: {
     prefixItems(...args) {
@@ -231,9 +232,12 @@ const findElementFactory = (ancestor, keyName) => {
 const plugin = () => () => {
   return {
     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;
@@ -246,10 +250,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

@@ -10,7 +10,7 @@ var _PrefixItemsVisitor = _interopRequireDefault(require("./visitors/json-schema
 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', '$recursiveAnchor']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$dynamicAnchor'], _apidomNsJsonSchema.specificationObj.visitors.value), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveRef']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$dynamicRef'], _apidomNsJsonSchema.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'not'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'prefixItems'], _PrefixItemsVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalProperties'], _index.default), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalItems']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedItems'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedProperties'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentSchema'], _index.default),
+(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'element'], 'jSONSchema202012'), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], _index.default), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveAnchor']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$dynamicAnchor'], _apidomNsJsonSchema.specificationObj.visitors.value), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveRef']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$dynamicRef'], _apidomNsJsonSchema.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'not'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'prefixItems'], _PrefixItemsVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalProperties'], _index.default), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalItems']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedItems'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedProperties'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentSchema'], _index.default),
 // Link Description object modifications
-(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], _index2.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'headerSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], _index.default))(_apidomNsJsonSchema.specificationObj);
+(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'element'], 'linkDescription'), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], _index2.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'headerSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], _index.default))(_apidomNsJsonSchema.specificationObj);
 var _default = exports.default = specification;

package/src/refractor/specification.mjs

@@ -5,7 +5,7 @@ import JSONSchemaPrefixItemsVisitor from "./visitors/json-schema/PrefixItemsVisi
 import JSONSchemaLinkDescriptionVisitor 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', '$recursiveAnchor']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$dynamicAnchor'], specificationObj.visitors.value), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveRef']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$dynamicRef'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'not'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'prefixItems'], JSONSchemaPrefixItemsVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalProperties'], JSONSchemaVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalItems']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedItems'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedProperties'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentSchema'], JSONSchemaVisitor),
+assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'element'], 'jSONSchema202012'), assocPath(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], JSONSchemaVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveAnchor']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$dynamicAnchor'], specificationObj.visitors.value), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveRef']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$dynamicRef'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'not'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'prefixItems'], JSONSchemaPrefixItemsVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalProperties'], JSONSchemaVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalItems']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedItems'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedProperties'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentSchema'], JSONSchemaVisitor),
 // Link Description object modifications
-assocPath(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], JSONSchemaLinkDescriptionVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'headerSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], JSONSchemaVisitor))(specificationObj);
+assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'element'], 'linkDescription'), assocPath(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], JSONSchemaLinkDescriptionVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'headerSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], JSONSchemaVisitor))(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 jsonSchema202012Predicates = _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 = {
     ...jsonSchema202012Predicates,
-    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 jsonSchema202012Predicates from "../predicates.mjs";
 import jsonSchema202012Namespace from "../namespace.mjs";
+/**
+ * @public
+ */
 const createToolbox = () => {
-  const namespace = createNamespace(jsonSchema202012Namespace);
+  const namespace = new Namespace();
   const predicates = {
     ...jsonSchema202012Predicates,
     isStringElement
   };
+  namespace.use(jsonSchema202012Namespace);
   return {
     predicates,
     namespace

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

@@ -2,8 +2,7 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomNsJsonSchema = require("@speclynx/apidom-ns-json-schema-2019-09");
 /**
  * @public
@@ -12,19 +11,20 @@ var _apidomNsJsonSchema = require("@speclynx/apidom-ns-json-schema-2019-09");
 /**
  * @public
  */
-class PrefixItemsVisitor extends (0, _tsMixer.Mixin)(_apidomNsJsonSchema.SpecificationVisitor, _apidomNsJsonSchema.ParentSchemaAwareVisitor, _apidomNsJsonSchema.FallbackVisitor) {
+class PrefixItemsVisitor extends _apidomNsJsonSchema.BaseSchemaArrayVisitor {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ArrayElement();
+    this.element = new _apidomDatamodel.ArrayElement();
     this.element.classes.push('json-schema-prefixItems');
   }
-  ArrayElement(arrayElement) {
+  ArrayElement(path) {
+    const arrayElement = path.node;
     arrayElement.forEach(item => {
       const element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], item);
       this.element.push(element);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = PrefixItemsVisitor;

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

@@ -1,6 +1,5 @@
-import { Mixin } from 'ts-mixer';
-import { ArrayElement, BREAK } from '@speclynx/apidom-core';
-import { SpecificationVisitor, FallbackVisitor, ParentSchemaAwareVisitor } from '@speclynx/apidom-ns-json-schema-2019-09';
+import { ArrayElement } from '@speclynx/apidom-datamodel';
+import { BaseSchemaArrayVisitor } from '@speclynx/apidom-ns-json-schema-2019-09';
 
 /**
  * @public
@@ -9,19 +8,20 @@ import { SpecificationVisitor, FallbackVisitor, ParentSchemaAwareVisitor } from
 /**
  * @public
  */
-class PrefixItemsVisitor extends Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class PrefixItemsVisitor extends BaseSchemaArrayVisitor {
   constructor(options) {
     super(options);
     this.element = new ArrayElement();
     this.element.classes.push('json-schema-prefixItems');
   }
-  ArrayElement(arrayElement) {
+  ArrayElement(path) {
+    const arrayElement = path.node;
     arrayElement.forEach(item => {
       const element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], item);
       this.element.push(element);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return BREAK;
+    path.stop();
   }
 }
 export default PrefixItemsVisitor;