Update removeTypeDuplicates

fedeci · fedeci · commit 3e5a73124d63 · 2021-08-14T13:29:40.000+02:00
diff --git a/packages/babel-types/src/modifications/flow/removeTypeDuplicates.ts b/packages/babel-types/src/modifications/flow/removeTypeDuplicates.ts
@@ -24,7 +24,7 @@ export default function removeTypeDuplicates(
   const bases = {};
 
   // store union type groups to circular references
-  const typeGroups = [];
+  const typeGroups = new Set<t.FlowType[]>();
 
   const types = [];
 
@@ -48,10 +48,10 @@ export default function removeTypeDuplicates(
     }
 
     if (isUnionTypeAnnotation(node)) {
-      if (typeGroups.indexOf(node.types) < 0) {
-        // todo(babel-8): remove type casting
-        (nodes as any).push(...node.types);
-        typeGroups.push(node.types);
+      if (!typeGroups.has(node.types)) {
+        // todo(babel-8): use .push when nodes is mutable
+        nodes = nodes.concat(node.types);
+        typeGroups.add(node.types);
       }
       continue;
     }
diff --git a/packages/babel-types/src/modifications/typescript/removeTypeDuplicates.ts b/packages/babel-types/src/modifications/typescript/removeTypeDuplicates.ts
@@ -15,7 +15,7 @@ export default function removeTypeDuplicates(
   const bases = {};
 
   // store union type groups to circular references
-  const typeGroups = [];
+  const typeGroups = new Set<t.TSType[]>();
 
   const types = [];
 
@@ -40,9 +40,9 @@ export default function removeTypeDuplicates(
     }
 
     if (isTSUnionType(node)) {
-      if (typeGroups.indexOf(node.types) < 0) {
+      if (!typeGroups.has(node.types)) {
         nodes.push(...node.types);
-        typeGroups.push(node.types);
+        typeGroups.add(node.types);
       }
       continue;
     }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export default function removeTypeDuplicates(`
`24`	`24`	`const bases = {};`
`25`	`25`
`26`	`26`	`// store union type groups to circular references`
`27`		`- const typeGroups = [];`
	`27`	`+ const typeGroups = new Set<t.FlowType[]>();`
`28`	`28`
`29`	`29`	`const types = [];`
`30`	`30`
`@@ -48,10 +48,10 @@ export default function removeTypeDuplicates(`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`if (isUnionTypeAnnotation(node)) {`
`51`		`- if (typeGroups.indexOf(node.types) < 0) {`
`52`		`- // todo(babel-8): remove type casting`
`53`		`- (nodes as any).push(...node.types);`
`54`		`- typeGroups.push(node.types);`
	`51`	`+ if (!typeGroups.has(node.types)) {`
	`52`	`+ // todo(babel-8): use .push when nodes is mutable`
	`53`	`+ nodes = nodes.concat(node.types);`
	`54`	`+ typeGroups.add(node.types);`
`55`	`55`	`}`
`56`	`56`	`continue;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export default function removeTypeDuplicates(`
`15`	`15`	`const bases = {};`
`16`	`16`
`17`	`17`	`// store union type groups to circular references`
`18`		`- const typeGroups = [];`
	`18`	`+ const typeGroups = new Set<t.TSType[]>();`
`19`	`19`
`20`	`20`	`const types = [];`
`21`	`21`
`@@ -40,9 +40,9 @@ export default function removeTypeDuplicates(`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`if (isTSUnionType(node)) {`
`43`		`- if (typeGroups.indexOf(node.types) < 0) {`
	`43`	`+ if (!typeGroups.has(node.types)) {`
`44`	`44`	`nodes.push(...node.types);`
`45`		`- typeGroups.push(node.types);`
	`45`	`+ typeGroups.add(node.types);`
`46`	`46`	`}`
`47`	`47`	`continue;`
`48`	`48`	`}`