@swagger-api/apidom-ast 0.82.2 → 0.84.0

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.84.0](https://github.com/swagger-api/apidom/compare/v0.83.0...v0.84.0) (2023-11-24)
+
+### Bug Fixes
+
+- **ast:** remove redundant cycle detection ([#3411](https://github.com/swagger-api/apidom/issues/3411)) ([a8106de](https://github.com/swagger-api/apidom/commit/a8106deef0d70e23daa878437a47e58eebd89e3f))
+
+### Features
+
+- **ast:** see edits by the following merged visitors ([#3412](https://github.com/swagger-api/apidom/issues/3412)) ([6499557](https://github.com/swagger-api/apidom/commit/64995573f5df1f7f291c20833cf274173f6a7bac))
+
+# [0.83.0](https://github.com/swagger-api/apidom/compare/v0.82.2...v0.83.0) (2023-11-07)
+
+**Note:** Version bump only for package @swagger-api/apidom-ast
+
 ## [0.82.2](https://github.com/swagger-api/apidom/compare/v0.82.1...v0.82.2) (2023-11-03)
 
 ### Bug Fixes

package/cjs/traversal/visitor.cjs

@@ -57,46 +57,61 @@ const cloneNode = node => Object.create(Object.getPrototypeOf(node), Object.getO
  * parallel. Each visitor will be visited for each node before moving on.
  *
  * If a prior visitor edits a node, no following visitors will see that node.
+ * `exposeEdits=true` can be used to exoise the edited node from the previous visitors.
  */
 exports.cloneNode = cloneNode;
 const mergeAll = (visitors, {
   visitFnGetter = getVisitFn,
-  nodeTypeGetter = getNodeType
+  nodeTypeGetter = getNodeType,
+  breakSymbol = BREAK,
+  deleteNodeSymbol = null,
+  skipVisitingNodeSymbol = false,
+  exposeEdits = false
 } = {}) => {
-  const skipping = new Array(visitors.length).fill(null);
+  const skipSymbol = Symbol('skip');
+  const skipping = new Array(visitors.length).fill(skipSymbol);
   return {
     enter(node, ...rest) {
+      let currentNode = node;
+      let hasChanged = false;
       for (let i = 0; i < visitors.length; i += 1) {
-        if (skipping[i] === null) {
-          const fn = visitFnGetter(visitors[i], nodeTypeGetter(node), /* isLeaving */false);
-          if (typeof fn === 'function') {
-            const result = fn.call(visitors[i], node, ...rest);
-            if (result === false) {
+        if (skipping[i] === skipSymbol) {
+          const visitFn = visitFnGetter(visitors[i], nodeTypeGetter(currentNode), false);
+          if (typeof visitFn === 'function') {
+            const result = visitFn.call(visitors[i], currentNode, ...rest);
+            if (result === skipVisitingNodeSymbol) {
               skipping[i] = node;
-            } else if (result === BREAK) {
-              skipping[i] = BREAK;
-            } else if (result !== undefined) {
+            } else if (result === breakSymbol) {
+              skipping[i] = breakSymbol;
+            } else if (result === deleteNodeSymbol) {
               return result;
+            } else if (result !== undefined) {
+              if (exposeEdits) {
+                currentNode = result;
+                hasChanged = true;
+              } else {
+                return result;
+              }
             }
           }
         }
       }
-      return undefined;
+      return hasChanged ? currentNode : undefined;
     },
     leave(node, ...rest) {
       for (let i = 0; i < visitors.length; i += 1) {
-        if (skipping[i] === null) {
-          const fn = visitFnGetter(visitors[i], nodeTypeGetter(node), /* isLeaving */true);
-          if (typeof fn === 'function') {
-            const result = fn.call(visitors[i], node, ...rest);
-            if (result === BREAK) {
-              skipping[i] = BREAK;
-            } else if (result !== undefined && result !== false) {
+        if (skipping[i] === skipSymbol) {
+          const visitFn = visitFnGetter(visitors[i], nodeTypeGetter(node), true);
+          if (typeof visitFn === 'function') {
+            const result = visitFn.call(visitors[i], node, ...rest);
+            if (result === breakSymbol) {
+              skipping[i] = breakSymbol;
+            } else if (result !== undefined && result !== skipVisitingNodeSymbol) {
               return result;
             }
           }
         } else if (skipping[i] === node) {
-          skipping[i] = null;
+          skipping[i] = skipSymbol;
         }
       }
       return undefined;
@@ -104,7 +119,7 @@ const mergeAll = (visitors, {
   };
 };
 
-/* eslint-disable no-continue, no-nested-ternary, no-param-reassign */
+/* eslint-disable no-continue, no-param-reassign */
 /**
  * visit() will walk through an AST using a preorder depth first traversal, calling
  * the visitor's enter function at each node in the traversal, and calling the
@@ -270,9 +285,6 @@ visitor, {
       }
       path.push(key);
     }
-    if (ancestors.includes(node)) {
-      continue;
-    }
     let result;
     if (!Array.isArray(node)) {
       if (!nodePredicate(node)) {