@speclynx/apidom-ns-json-schema-draft-7 1.12.2 → 2.1.0

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

@@ -3,14 +3,11 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
+var _apidomTraverse = require("@speclynx/apidom-traverse");
 var _JSONSchema = _interopRequireDefault(require("../../elements/JSONSchema.cjs"));
 var _LinkDescription = _interopRequireDefault(require("../../elements/LinkDescription.cjs"));
-var _visitor = require("../../traversal/visitor.cjs");
-/**
- * JSON Schema Draft 7 specification elements.
- */
-
 /**
  * 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,
@@ -45,7 +42,7 @@ var _visitor = require("../../traversal/visitor.cjs");
  *      (JSONSchemaElement))
  */
 
-const isEmptyElement = element => (0, _apidomCore.isStringElement)(element) && (0, _apidomCore.includesClasses)(['yaml-e-node', 'yaml-e-scalar'], element);
+const isEmptyElement = element => (0, _apidomDatamodel.isStringElement)(element) && (0, _apidomDatamodel.includesClasses)(element, ['yaml-e-node', 'yaml-e-scalar']);
 const schema = {
   JSONSchemaDraft7Element: {
     additionalItems(...args) {
@@ -58,12 +55,12 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     required(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-required');
       return element;
     },
     properties(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-properties');
       return element;
     },
@@ -71,12 +68,12 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     patternProperties(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-patternProperties');
       return element;
     },
     dependencies(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-dependencies');
       return element;
     },
@@ -84,22 +81,22 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     enum(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-enum');
       return element;
     },
     allOf(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-allOf');
       return element;
     },
     anyOf(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-anyOf');
       return element;
     },
     oneOf(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-oneOf');
       return element;
     },
@@ -116,17 +113,17 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     definitions(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-definitions');
       return element;
     },
     examples(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-examples');
       return element;
     },
     links(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-links');
       return element;
     }
@@ -142,13 +139,13 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     templatePointers(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     },
     templateRequired(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     },
     targetHints(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     },
     headerSchema(...args) {
       return new _JSONSchema.default(...args);
@@ -196,7 +193,7 @@ const schema = {
   }
 };
 const findElementFactory = (ancestor, keyName) => {
-  const elementType = (0, _visitor.getNodeType)(ancestor); // @ts-ignore
+  const elementType = (0, _apidomTraverse.getNodeType)(ancestor); // @ts-ignore
   const keyMapping = schema[elementType] || schema[(0, _apidomCore.toValue)(ancestor.classes.first)];
   return typeof keyMapping === 'undefined' ? undefined : Object.hasOwn(keyMapping, '[key: *]') ? keyMapping['[key: *]'] : keyMapping[keyName];
 };
@@ -204,30 +201,33 @@ const findElementFactory = (ancestor, keyName) => {
 /**
  * @public
  */
-const plugin = () => () => {
-  return {
-    visitor: {
-      StringElement(element, key, parent, path, ancestors) {
-        if (!isEmptyElement(element)) return undefined;
-        const lineage = [...ancestors, parent].filter(_apidomCore.isElement);
-        const parentElement = lineage.at(-1);
-        let elementFactory;
-        let context;
-        if ((0, _apidomCore.isArrayElement)(parentElement)) {
-          context = element;
-          elementFactory = findElementFactory(parentElement, '<*>');
-        } else if ((0, _apidomCore.isMemberElement)(parentElement)) {
-          context = lineage.at(-2);
-          elementFactory = findElementFactory(context, (0, _apidomCore.toValue)(parentElement.key));
-        }
+const plugin = () => () => ({
+  visitor: {
+    StringElement(path) {
+      const element = path.node;
+      if (!isEmptyElement(element)) return;
 
-        // no element factory found
-        if (typeof elementFactory !== 'function') return undefined;
-        return elementFactory.call({
-          context
-        }, undefined, (0, _apidomCore.cloneDeep)(element.meta), (0, _apidomCore.cloneDeep)(element.attributes));
+      // getAncestorNodes() returns [parent, grandparent, ..., root], so reverse to get [root, ..., parent]
+      const lineage = path.getAncestorNodes().reverse().filter(_apidomDatamodel.isElement);
+      const parentElement = lineage.at(-1);
+      let elementFactory;
+      let context;
+      if ((0, _apidomDatamodel.isArrayElement)(parentElement)) {
+        context = element;
+        elementFactory = findElementFactory(parentElement, '<*>');
+      } else if ((0, _apidomDatamodel.isMemberElement)(parentElement)) {
+        context = lineage.at(-2);
+        elementFactory = findElementFactory(context, (0, _apidomCore.toValue)(parentElement.key));
       }
+
+      // no element factory found
+      if (typeof elementFactory !== 'function') return;
+      const replacement = elementFactory.call({
+        context
+      }, undefined, (0, _apidomDatamodel.cloneDeep)(element.meta), (0, _apidomDatamodel.cloneDeep)(element.attributes));
+      _apidomDatamodel.SourceMapElement.transfer(element, replacement);
+      path.replaceWith(replacement);
     }
-  };
-};
+  }
+});
 var _default = exports.default = plugin;

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

@@ -1,10 +1,8 @@
-import { ArrayElement, ObjectElement, isStringElement, isArrayElement, isElement, isMemberElement, includesClasses, cloneDeep, toValue } from '@speclynx/apidom-core';
-/**
- * JSON Schema Draft 7 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 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 +36,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 = {
   JSONSchemaDraft7Element: {
     additionalItems(...args) {
@@ -197,30 +195,33 @@ const findElementFactory = (ancestor, keyName) => {
 /**
  * @public
  */
-const plugin = () => () => {
-  return {
-    visitor: {
-      StringElement(element, key, parent, path, ancestors) {
-        if (!isEmptyElement(element)) return undefined;
-        const lineage = [...ancestors, parent].filter(isElement);
-        const parentElement = lineage.at(-1);
-        let elementFactory;
-        let context;
-        if (isArrayElement(parentElement)) {
-          context = element;
-          elementFactory = findElementFactory(parentElement, '<*>');
-        } else if (isMemberElement(parentElement)) {
-          context = lineage.at(-2);
-          elementFactory = findElementFactory(context, toValue(parentElement.key));
-        }
+const plugin = () => () => ({
+  visitor: {
+    StringElement(path) {
+      const element = path.node;
+      if (!isEmptyElement(element)) return;
 
-        // no element factory found
-        if (typeof elementFactory !== 'function') return undefined;
-        return elementFactory.call({
-          context
-        }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
+      // 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;
+      if (isArrayElement(parentElement)) {
+        context = element;
+        elementFactory = findElementFactory(parentElement, '<*>');
+      } else if (isMemberElement(parentElement)) {
+        context = lineage.at(-2);
+        elementFactory = findElementFactory(context, toValue(parentElement.key));
       }
+
+      // no element factory found
+      if (typeof elementFactory !== 'function') return;
+      const replacement = elementFactory.call({
+        context
+      }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
+      SourceMapElement.transfer(element, replacement);
+      path.replaceWith(replacement);
     }
-  };
-};
+  }
+});
 export default plugin;

package/src/refractor/specification.cjs

@@ -9,7 +9,7 @@ var _index = _interopRequireDefault(require("./visitors/json-schema/index.cjs"))
 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.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$comment'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'media']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentEncoding'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentMediaType'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'writeOnly'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value),
+(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'element'], 'jSONSchemaDraft7'), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$comment'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'media']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentEncoding'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentMediaType'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'writeOnly'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value),
 // Link Description object modifications
 (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], _index2.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'anchor'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'anchorPointer'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'mediaType']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetMediaType'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetHints'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'description'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', '$comment'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'headerSchema'], _apidomNsJsonSchemaDraft.specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionEncType']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionMediaType'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value))(_apidomNsJsonSchemaDraft.specificationObj);
 var _default = exports.default = specification;

package/src/refractor/specification.mjs

@@ -4,7 +4,7 @@ import JSONSchemaVisitor from "./visitors/json-schema/index.mjs";
 import LinkDescriptionVisitor from "./visitors/json-schema/link-description/index.mjs";
 const specification = pipe(
 // JSON Schema object modifications
-assocPath(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$comment'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'media']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentEncoding'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentMediaType'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'writeOnly'], specificationObj.visitors.value),
+assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'element'], 'jSONSchemaDraft7'), assocPath(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$comment'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'media']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentEncoding'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentMediaType'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'writeOnly'], specificationObj.visitors.value),
 // Link Description object modifications
 assocPath(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], LinkDescriptionVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'anchor'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'anchorPointer'], specificationObj.visitors.value), dissocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'mediaType']), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetMediaType'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetHints'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'description'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', '$comment'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'headerSchema'], specificationObj.visitors.JSONSchemaOrJSONReferenceVisitor), dissocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionEncType']), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionMediaType'], specificationObj.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 jsonSchemaDraft7Predicates = _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 = {
     ...jsonSchemaDraft7Predicates,
-    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 jsonSchemaDraft7Predicates from "../predicates.mjs";
 import jsonSchemaDraft7Namespace from "../namespace.mjs";
+/**
+ * @public
+ */
 const createToolbox = () => {
-  const namespace = createNamespace(jsonSchemaDraft7Namespace);
+  const namespace = new Namespace();
   const predicates = {
     ...jsonSchemaDraft7Predicates,
     isStringElement
   };
+  namespace.use(jsonSchemaDraft7Namespace);
   return {
     predicates,
     namespace