oas-toolkit 0.7.5 → 0.7.7

package/components.js

@@ -2,6 +2,7 @@ const traverse = require("traverse");
 const isEqual = require("lodash.isequal");
 const difference = require("lodash.difference");
 const intersection = require("lodash.intersection");
+const uniqWith = require("lodash.uniqwith");
 
 function removeUnusedComponents(oas) {
   const used = getReferencedComponents(oas);
@@ -114,6 +115,16 @@ function getUnusedComponents(all, referenced, oas) {
     // If there's a circular dependency and nothing else, it can be removed
     for (let ref of references) {
       referencesTo[ref] = getRecursiveReferencesToComponent(oas, ref);
+      // Add all the references for each reference to build a complete list
+      referencesTo[ref] = referencesTo[ref].concat(
+        referencesTo[ref].flatMap((r) => {
+          if (!referencesTo[r]) {
+            return [];
+          }
+          return referencesTo[r];
+        })
+      );
+      referencesTo[ref] = uniqWith(referencesTo[ref], isEqual);
     }
 
     let shouldRemove = true;
@@ -129,7 +140,17 @@ function getUnusedComponents(all, referenced, oas) {
   return unused;
 }
 
+let recursiveCache = {};
+
+function resetReferenceCache() {
+  recursiveCache = {};
+}
+
 function getRecursiveReferencesToComponent(oas, component, originalComponents) {
+  if (recursiveCache[component]) {
+    return recursiveCache[component];
+  }
+
   if (!originalComponents) {
     originalComponents = [];
   }
@@ -144,6 +165,7 @@ function getRecursiveReferencesToComponent(oas, component, originalComponents) {
   }
   refs.sort();
 
+  recursiveCache[component] = refs;
   return refs;
 }
 
@@ -153,4 +175,5 @@ module.exports = {
   getUnusedComponents,
   removeSpecifiedComponents,
   removeUnusedComponents,
+  resetReferenceCache,
 };

package/merger.test.js

@@ -491,7 +491,7 @@ describe("returns unique items for:", () => {
     });
   });
 
-  fit("handles keys that don't exist in both specs", () => {
+  it("handles keys that don't exist in both specs", () => {
     expect(
       merger([
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oas-toolkit",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "",
   "main": "index.js",
   "bin": {