From cb58fb0eeb6a51e2d22f589b263a7dc6f511ce06 Mon Sep 17 00:00:00 2001
From: Alice Jonsson <10475857+AllieJonsson@users.noreply.github.com>
Date: Fri, 10 Jan 2025 13:53:53 +0100
Subject: [PATCH] fix(msw): make sure to not double import value and type
 (#1799)

* fix(msw): make sure to not double import value and type

* fix: filter instead of splice

* fix: don't overwrite variable

* fix: lockfile
---
 packages/core/src/generators/imports.ts |  6 ++-
 yarn.lock                               | 58 ++++++++++++-------------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/packages/core/src/generators/imports.ts b/packages/core/src/generators/imports.ts
index 9bb361ea4..053988c27 100644
--- a/packages/core/src/generators/imports.ts
+++ b/packages/core/src/generators/imports.ts
@@ -233,11 +233,15 @@ export const addDependency = ({
       }
 
       if (types) {
+        let uniqueTypes = types;
         if (values) {
+          uniqueTypes = types.filter(
+            (t) => !values.some((v) => v.name === t.name),
+          );
           dep += '\n';
         }
         dep += generateDependency({
-          deps: types,
+          deps: uniqueTypes,
           isAllowSyntheticDefaultImports,
           dependency,
           specsName,
diff --git a/yarn.lock b/yarn.lock
index 767babbbb..c4ae9440e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1253,23 +1253,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@orval/angular@npm:7.4.0, @orval/angular@workspace:packages/angular":
+"@orval/angular@npm:7.4.1, @orval/angular@workspace:packages/angular":
   version: 0.0.0-use.local
   resolution: "@orval/angular@workspace:packages/angular"
   dependencies:
-    "@orval/core": "npm:7.4.0"
+    "@orval/core": "npm:7.4.1"
   languageName: unknown
   linkType: soft
 
-"@orval/axios@npm:7.4.0, @orval/axios@workspace:packages/axios":
+"@orval/axios@npm:7.4.1, @orval/axios@workspace:packages/axios":
   version: 0.0.0-use.local
   resolution: "@orval/axios@workspace:packages/axios"
   dependencies:
-    "@orval/core": "npm:7.4.0"
+    "@orval/core": "npm:7.4.1"
   languageName: unknown
   linkType: soft
 
-"@orval/core@npm:7.4.0, @orval/core@workspace:packages/core":
+"@orval/core@npm:7.4.1, @orval/core@workspace:packages/core":
   version: 0.0.0-use.local
   resolution: "@orval/core@workspace:packages/core"
   dependencies:
@@ -1308,62 +1308,62 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@orval/fetch@npm:7.4.0, @orval/fetch@workspace:packages/fetch":
+"@orval/fetch@npm:7.4.1, @orval/fetch@workspace:packages/fetch":
   version: 0.0.0-use.local
   resolution: "@orval/fetch@workspace:packages/fetch"
   dependencies:
-    "@orval/core": "npm:7.4.0"
+    "@orval/core": "npm:7.4.1"
   languageName: unknown
   linkType: soft
 
-"@orval/hono@npm:7.4.0, @orval/hono@workspace:packages/hono":
+"@orval/hono@npm:7.4.1, @orval/hono@workspace:packages/hono":
   version: 0.0.0-use.local
   resolution: "@orval/hono@workspace:packages/hono"
   dependencies:
-    "@orval/core": "npm:7.4.0"
-    "@orval/zod": "npm:7.4.0"
+    "@orval/core": "npm:7.4.1"
+    "@orval/zod": "npm:7.4.1"
     "@types/lodash.uniq": "npm:^4.5.7"
     lodash.uniq: "npm:^4.5.0"
   languageName: unknown
   linkType: soft
 
-"@orval/mock@npm:7.4.0, @orval/mock@workspace:packages/mock":
+"@orval/mock@npm:7.4.1, @orval/mock@workspace:packages/mock":
   version: 0.0.0-use.local
   resolution: "@orval/mock@workspace:packages/mock"
   dependencies:
-    "@orval/core": "npm:7.4.0"
+    "@orval/core": "npm:7.4.1"
     lodash.get: "npm:^4.4.2"
     lodash.omit: "npm:^4.5.0"
     openapi3-ts: "npm:^4.2.2"
   languageName: unknown
   linkType: soft
 
-"@orval/query@npm:7.4.0, @orval/query@workspace:packages/query":
+"@orval/query@npm:7.4.1, @orval/query@workspace:packages/query":
   version: 0.0.0-use.local
   resolution: "@orval/query@workspace:packages/query"
   dependencies:
-    "@orval/core": "npm:7.4.0"
-    "@orval/fetch": "npm:7.4.0"
+    "@orval/core": "npm:7.4.1"
+    "@orval/fetch": "npm:7.4.1"
     "@types/lodash.omitby": "npm:^4.6.7"
     lodash.omitby: "npm:^4.6.0"
     vitest: "npm:^0.34.6"
   languageName: unknown
   linkType: soft
 
-"@orval/swr@npm:7.4.0, @orval/swr@workspace:packages/swr":
+"@orval/swr@npm:7.4.1, @orval/swr@workspace:packages/swr":
   version: 0.0.0-use.local
   resolution: "@orval/swr@workspace:packages/swr"
   dependencies:
-    "@orval/core": "npm:7.4.0"
-    "@orval/fetch": "npm:7.4.0"
+    "@orval/core": "npm:7.4.1"
+    "@orval/fetch": "npm:7.4.1"
   languageName: unknown
   linkType: soft
 
-"@orval/zod@npm:7.4.0, @orval/zod@workspace:packages/zod":
+"@orval/zod@npm:7.4.1, @orval/zod@workspace:packages/zod":
   version: 0.0.0-use.local
   resolution: "@orval/zod@workspace:packages/zod"
   dependencies:
-    "@orval/core": "npm:7.4.0"
+    "@orval/core": "npm:7.4.1"
     "@types/lodash.uniq": "npm:^4.5.7"
     lodash.uniq: "npm:^4.5.0"
   languageName: unknown
@@ -7578,15 +7578,15 @@ __metadata:
   resolution: "orval@workspace:packages/orval"
   dependencies:
     "@apidevtools/swagger-parser": "npm:^10.1.0"
-    "@orval/angular": "npm:7.4.0"
-    "@orval/axios": "npm:7.4.0"
-    "@orval/core": "npm:7.4.0"
-    "@orval/fetch": "npm:7.4.0"
-    "@orval/hono": "npm:7.4.0"
-    "@orval/mock": "npm:7.4.0"
-    "@orval/query": "npm:7.4.0"
-    "@orval/swr": "npm:7.4.0"
-    "@orval/zod": "npm:7.4.0"
+    "@orval/angular": "npm:7.4.1"
+    "@orval/axios": "npm:7.4.1"
+    "@orval/core": "npm:7.4.1"
+    "@orval/fetch": "npm:7.4.1"
+    "@orval/hono": "npm:7.4.1"
+    "@orval/mock": "npm:7.4.1"
+    "@orval/query": "npm:7.4.1"
+    "@orval/swr": "npm:7.4.1"
+    "@orval/zod": "npm:7.4.1"
     "@types/inquirer": "npm:^9.0.6"
     "@types/js-yaml": "npm:^4.0.8"
     "@types/lodash.uniq": "npm:^4.5.8"