@speclynx/apidom-ns-json-schema-draft-4 1.12.2 → 2.0.1

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

@@ -3,11 +3,12 @@
 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 _Media = _interopRequireDefault(require("../../elements/Media.cjs"));
-var _visitor = require("../../traversal/visitor.cjs");
 /**
  * JSON Schema Draft 4 specification elements.
  */
@@ -46,7 +47,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 = {
   JSONSchemaDraft4Element: {
     additionalItems(...args) {
@@ -56,12 +57,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;
     },
@@ -69,32 +70,32 @@ 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;
     },
     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;
     },
@@ -102,12 +103,12 @@ 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;
     },
     links(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-links');
       return element;
     },
@@ -165,7 +166,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];
 };
@@ -175,25 +176,30 @@ const findElementFactory = (ancestor, keyName) => {
  */
 const plugin = () => () => ({
   visitor: {
-    StringElement(element, key, parent, path, ancestors) {
-      if (!isEmptyElement(element)) return undefined;
-      const lineage = [...ancestors, parent].filter(_apidomCore.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(_apidomDatamodel.isElement);
       const parentElement = lineage.at(-1);
       let elementFactory;
       let context;
-      if ((0, _apidomCore.isArrayElement)(parentElement)) {
+      if ((0, _apidomDatamodel.isArrayElement)(parentElement)) {
         context = element;
         elementFactory = findElementFactory(parentElement, '<*>');
-      } else if ((0, _apidomCore.isMemberElement)(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 undefined;
-      return elementFactory.call({
+      if (typeof elementFactory !== 'function') return;
+      const replacement = elementFactory.call({
         context
-      }, undefined, (0, _apidomCore.cloneDeep)(element.meta), (0, _apidomCore.cloneDeep)(element.attributes));
+      }, undefined, (0, _apidomDatamodel.cloneDeep)(element.meta), (0, _apidomDatamodel.cloneDeep)(element.attributes));
+      _apidomDatamodel.SourceMapElement.transfer(element, replacement);
+      path.replaceWith(replacement);
     }
   }
 });

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

@@ -1,4 +1,6 @@
-import { ArrayElement, ObjectElement, isArrayElement, isElement, isMemberElement, isStringElement, 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 Draft 4 specification elements.
@@ -6,7 +8,6 @@ import { ArrayElement, ObjectElement, isArrayElement, isElement, isMemberElement
 import JSONSchemaElement from "../../elements/JSONSchema.mjs";
 import LinkDescriptionElement from "../../elements/LinkDescription.mjs";
 import MediaElement from "../../elements/Media.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,
@@ -40,7 +41,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 = {
   JSONSchemaDraft4Element: {
     additionalItems(...args) {
@@ -169,9 +170,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;
@@ -184,10 +188,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/predicates.cjs

@@ -2,7 +2,7 @@
 
 exports.__esModule = true;
 exports.isJSONReferenceLikeElement = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 /**
  * @public
  */
@@ -11,6 +11,6 @@ var _apidomCore = require("@speclynx/apidom-core");
  * @public
  */
 const isJSONReferenceLikeElement = element => {
-  return (0, _apidomCore.isObjectElement)(element) && element.hasKey('$ref');
+  return (0, _apidomDatamodel.isObjectElement)(element) && element.hasKey('$ref');
 };
 exports.isJSONReferenceLikeElement = isJSONReferenceLikeElement;

package/src/refractor/predicates.mjs

@@ -1,4 +1,4 @@
-import { isObjectElement } from '@speclynx/apidom-core';
+import { isObjectElement } from '@speclynx/apidom-datamodel';
 
 /**
  * @public

package/src/refractor/specification.cjs

@@ -38,11 +38,13 @@ const specification = {
     document: {
       objects: {
         JSONSchema: {
+          element: 'jSONSchemaDraft4',
           $visitor: _index.default,
           fixedFields: {
             // core vocabulary
             id: {
-              $ref: '#/visitors/value'
+              $visitor: _FallbackVisitor.default,
+              alias: 'idField'
             },
             $schema: {
               $ref: '#/visitors/value'
@@ -76,7 +78,10 @@ const specification = {
             },
             // validation keywords for arrays
             additionalItems: _JSONSchemaOrJSONReferenceVisitor.default,
-            items: _ItemsVisitor.default,
+            items: {
+              $visitor: _ItemsVisitor.default,
+              alias: 'itemsField'
+            },
             maxItems: {
               $ref: '#/visitors/value'
             },
@@ -124,7 +129,10 @@ const specification = {
             base: {
               $ref: '#/visitors/value'
             },
-            links: _LinksVisitor.default,
+            links: {
+              $visitor: _LinksVisitor.default,
+              alias: 'linksField'
+            },
             media: {
               $ref: '#/visitors/document/objects/Media'
             },
@@ -134,12 +142,14 @@ const specification = {
           }
         },
         JSONReference: {
+          element: 'jSONReference',
           $visitor: _index2.default,
           fixedFields: {
             $ref: _$RefVisitor.default
           }
         },
         Media: {
+          element: 'media',
           $visitor: _index3.default,
           fixedFields: {
             binaryEncoding: {
@@ -151,6 +161,7 @@ const specification = {
           }
         },
         LinkDescription: {
+          element: 'linkDescription',
           $visitor: _index4.default,
           fixedFields: {
             href: {

package/src/refractor/specification.mjs

@@ -33,11 +33,13 @@ const specification = {
     document: {
       objects: {
         JSONSchema: {
+          element: 'jSONSchemaDraft4',
           $visitor: JSONSchemaVisitor,
           fixedFields: {
             // core vocabulary
             id: {
-              $ref: '#/visitors/value'
+              $visitor: FallbackVisitor,
+              alias: 'idField'
             },
             $schema: {
               $ref: '#/visitors/value'
@@ -71,7 +73,10 @@ const specification = {
             },
             // validation keywords for arrays
             additionalItems: JSONSchemaOrJSONReferenceVisitor,
-            items: JSONSchemaItemsVisitor,
+            items: {
+              $visitor: JSONSchemaItemsVisitor,
+              alias: 'itemsField'
+            },
             maxItems: {
               $ref: '#/visitors/value'
             },
@@ -119,7 +124,10 @@ const specification = {
             base: {
               $ref: '#/visitors/value'
             },
-            links: JSONSchemaLinksVisitor,
+            links: {
+              $visitor: JSONSchemaLinksVisitor,
+              alias: 'linksField'
+            },
             media: {
               $ref: '#/visitors/document/objects/Media'
             },
@@ -129,12 +137,14 @@ const specification = {
           }
         },
         JSONReference: {
+          element: 'jSONReference',
           $visitor: JSONReferenceVisitor,
           fixedFields: {
             $ref: JSONReference$RefVisitor
           }
         },
         Media: {
+          element: 'media',
           $visitor: MediaVisitor,
           fixedFields: {
             binaryEncoding: {
@@ -146,6 +156,7 @@ const specification = {
           }
         },
         LinkDescription: {
+          element: 'linkDescription',
           $visitor: LinkDescriptionVisitor,
           fixedFields: {
             href: {

package/src/refractor/toolbox.cjs

@@ -4,15 +4,22 @@ 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 jsonSchemaDraft4Predicates = _interopRequireWildcard(require("../predicates.cjs"));
+var refractorPredicates = _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 = {
+    ...refractorPredicates,
     ...jsonSchemaDraft4Predicates,
-    isStringElement: _apidomCore.isStringElement
+    isStringElement: _apidomDatamodel.isStringElement
   };
+  namespace.use(_namespace.default);
   return {
     predicates,
     namespace

package/src/refractor/toolbox.mjs

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

package/src/refractor/visitors/FallbackVisitor.cjs

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _Visitor = _interopRequireDefault(require("./Visitor.cjs"));
 /**
  * This visitor is responsible for falling back to current traversed element
@@ -17,9 +17,9 @@ var _Visitor = _interopRequireDefault(require("./Visitor.cjs"));
  * @public
  */
 class FallbackVisitor extends _Visitor.default {
-  enter(element) {
-    this.element = (0, _apidomCore.cloneDeep)(element);
-    return _apidomCore.BREAK;
+  enter(path) {
+    this.element = (0, _apidomDatamodel.cloneDeep)(path.node);
+    path.stop();
   }
 }
 var _default = exports.default = FallbackVisitor;

package/src/refractor/visitors/FallbackVisitor.mjs

@@ -1,4 +1,4 @@
-import { BREAK, cloneDeep } from '@speclynx/apidom-core';
+import { cloneDeep } from '@speclynx/apidom-datamodel';
 import Visitor from "./Visitor.mjs";
 /**
  * This visitor is responsible for falling back to current traversed element
@@ -11,9 +11,9 @@ import Visitor from "./Visitor.mjs";
  * @public
  */
 class FallbackVisitor extends Visitor {
-  enter(element) {
-    this.element = cloneDeep(element);
-    return BREAK;
+  enter(path) {
+    this.element = cloneDeep(path.node);
+    path.stop();
   }
 }
 export default FallbackVisitor;

package/src/refractor/visitors/SpecificationVisitor.cjs

@@ -5,7 +5,8 @@ exports.__esModule = true;
 exports.default = void 0;
 var _ramda = require("ramda");
 var _ramdaAdjunct = require("ramda-adjunct");
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _apidomTraverse = require("@speclynx/apidom-traverse");
 var _Visitor = _interopRequireDefault(require("./Visitor.cjs"));
 var _FallbackVisitor = _interopRequireDefault(require("./FallbackVisitor.cjs"));
 /**
@@ -65,9 +66,9 @@ class SpecificationVisitor extends _Visitor.default {
      */
     const visitor = this.retrieveVisitorInstance(specPath, options);
     if (visitor instanceof _FallbackVisitor.default && visitor?.constructor === _FallbackVisitor.default) {
-      return (0, _apidomCore.cloneDeep)(element);
+      return (0, _apidomDatamodel.cloneDeep)(element);
     }
-    (0, _apidomCore.visit)(element, visitor, options);
+    (0, _apidomTraverse.traverse)(element, visitor, options);
     return visitor.element;
   }
 }

package/src/refractor/visitors/SpecificationVisitor.mjs

@@ -1,6 +1,7 @@
 import { pathSatisfies, path, pick } from 'ramda';
 import { isFunction } from 'ramda-adjunct';
-import { visit, cloneDeep } from '@speclynx/apidom-core';
+import { cloneDeep } from '@speclynx/apidom-datamodel';
+import { traverse } from '@speclynx/apidom-traverse';
 import Visitor from "./Visitor.mjs";
 import FallbackVisitor from "./FallbackVisitor.mjs";
 /**
@@ -61,7 +62,7 @@ class SpecificationVisitor extends Visitor {
     if (visitor instanceof FallbackVisitor && visitor?.constructor === FallbackVisitor) {
       return cloneDeep(element);
     }
-    visit(element, visitor, options);
+    traverse(element, visitor, options);
     return visitor.element;
   }
 }

package/src/refractor/visitors/Visitor.cjs

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 /**
  * @public
  */
@@ -16,16 +17,17 @@ class Visitor {
     Object.assign(this, options);
   }
   copyMetaAndAttributes(from, to) {
-    if (from.meta.length > 0 || to.meta.length > 0) {
-      to.meta = (0, _apidomCore.deepmerge)(to.meta, from.meta);
-      if ((0, _apidomCore.hasElementSourceMap)(from)) {
-        // avoid deep merging of source maps
-        to.meta.set('sourceMap', from.meta.get('sourceMap'));
-      }
+    if (!from.isMetaEmpty || !to.isMetaEmpty) {
+      const target = to.isMetaEmpty ? new _apidomDatamodel.ObjectElement() : to.meta;
+      const source = from.isMetaEmpty ? new _apidomDatamodel.ObjectElement() : from.meta;
+      to.meta = (0, _apidomCore.deepmerge)(target, source);
     }
-    if (from.attributes.length > 0 || from.meta.length > 0) {
-      to.attributes = (0, _apidomCore.deepmerge)(to.attributes, from.attributes);
+    if (!from.isAttributesEmpty || !to.isAttributesEmpty) {
+      const target = to.isAttributesEmpty ? new _apidomDatamodel.ObjectElement() : to.attributes;
+      const source = from.isAttributesEmpty ? new _apidomDatamodel.ObjectElement() : from.attributes;
+      to.attributes = (0, _apidomCore.deepmerge)(target, source);
     }
+    _apidomDatamodel.SourceMapElement.transfer(from, to);
   }
 }
 var _default = exports.default = Visitor;

package/src/refractor/visitors/Visitor.mjs

@@ -1,4 +1,5 @@
-import { hasElementSourceMap, deepmerge } from '@speclynx/apidom-core';
+import { deepmerge } from '@speclynx/apidom-core';
+import { ObjectElement, SourceMapElement } from '@speclynx/apidom-datamodel';
 
 /**
  * @public
@@ -13,16 +14,17 @@ class Visitor {
     Object.assign(this, options);
   }
   copyMetaAndAttributes(from, to) {
-    if (from.meta.length > 0 || to.meta.length > 0) {
-      to.meta = deepmerge(to.meta, from.meta);
-      if (hasElementSourceMap(from)) {
-        // avoid deep merging of source maps
-        to.meta.set('sourceMap', from.meta.get('sourceMap'));
-      }
+    if (!from.isMetaEmpty || !to.isMetaEmpty) {
+      const target = to.isMetaEmpty ? new ObjectElement() : to.meta;
+      const source = from.isMetaEmpty ? new ObjectElement() : from.meta;
+      to.meta = deepmerge(target, source);
     }
-    if (from.attributes.length > 0 || from.meta.length > 0) {
-      to.attributes = deepmerge(to.attributes, from.attributes);
+    if (!from.isAttributesEmpty || !to.isAttributesEmpty) {
+      const target = to.isAttributesEmpty ? new ObjectElement() : to.attributes;
+      const source = from.isAttributesEmpty ? new ObjectElement() : from.attributes;
+      to.attributes = deepmerge(target, source);
     }
+    SourceMapElement.transfer(from, to);
   }
 }
 export default Visitor;

package/src/refractor/visitors/generics/AlternatingVisitor.cjs

@@ -5,7 +5,6 @@ exports.__esModule = true;
 exports.default = void 0;
 var _ramda = require("ramda");
 var _ramdaAdjunct = require("ramda-adjunct");
-var _apidomCore = require("@speclynx/apidom-core");
 var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
 /**
  * @public
@@ -29,14 +28,15 @@ class AlternatingVisitor extends _SpecificationVisitor.default {
     });
     this.alternator = alternator;
   }
-  enter(element) {
+  enter(path) {
+    const element = path.node;
     const functions = this.alternator.map(({
       predicate,
       specPath
     }) => (0, _ramda.ifElse)(predicate, (0, _ramda.always)(specPath), _ramdaAdjunct.stubUndefined));
     const specPath = (0, _ramdaAdjunct.dispatch)(functions)(element);
     this.element = this.toRefractedElement(specPath, element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = AlternatingVisitor;

package/src/refractor/visitors/generics/AlternatingVisitor.mjs

@@ -1,6 +1,5 @@
 import { ifElse, always } from 'ramda';
 import { dispatch, stubUndefined } from 'ramda-adjunct';
-import { BREAK } from '@speclynx/apidom-core';
 import SpecificationVisitor from "../SpecificationVisitor.mjs";
 /**
  * @public
@@ -22,14 +21,15 @@ class AlternatingVisitor extends SpecificationVisitor {
     });
     this.alternator = alternator;
   }
-  enter(element) {
+  enter(path) {
+    const element = path.node;
     const functions = this.alternator.map(({
       predicate,
       specPath
     }) => ifElse(predicate, always(specPath), stubUndefined));
     const specPath = dispatch(functions)(element);
     this.element = this.toRefractedElement(specPath, element);
-    return BREAK;
+    path.stop();
   }
 }
 export default AlternatingVisitor;

package/src/refractor/visitors/generics/FixedFieldsVisitor.cjs

@@ -3,6 +3,7 @@
 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 _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
 /**
@@ -30,24 +31,26 @@ class FixedFieldsVisitor extends _SpecificationVisitor.default {
     this.specPath = specPath;
     this.ignoredFields = ignoredFields || [];
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const specPath = this.specPath(objectElement);
     const fields = this.retrieveFixedFields(specPath);
 
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
-      if ((0, _apidomCore.isStringElement)(key) && fields.includes((0, _apidomCore.toValue)(key)) && !this.ignoredFields.includes((0, _apidomCore.toValue)(key))) {
-        const fixedFieldElement = this.toRefractedElement([...specPath, 'fixedFields', (0, _apidomCore.toValue)(key)], value);
-        const newMemberElement = new _apidomCore.MemberElement((0, _apidomCore.cloneDeep)(key), fixedFieldElement);
+      const keyValue = (0, _apidomCore.toValue)(key);
+      if ((0, _apidomDatamodel.isStringElement)(key) && fields.includes(keyValue) && !this.ignoredFields.includes(keyValue)) {
+        const fixedFieldElement = this.toRefractedElement([...specPath, 'fixedFields', keyValue], value);
+        const newMemberElement = new _apidomDatamodel.MemberElement((0, _apidomDatamodel.cloneDeep)(key), fixedFieldElement);
         this.copyMetaAndAttributes(memberElement, newMemberElement);
         newMemberElement.classes.push('fixed-field');
         this.element.content.push(newMemberElement);
-      } else if (!this.ignoredFields.includes((0, _apidomCore.toValue)(key))) {
-        this.element.content.push((0, _apidomCore.cloneDeep)(memberElement));
+      } else if (!this.ignoredFields.includes(keyValue)) {
+        this.element.content.push((0, _apidomDatamodel.cloneDeep)(memberElement));
       }
     });
     this.copyMetaAndAttributes(objectElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = FixedFieldsVisitor;