Merge branch 'master' into alert-autofix-30

ardatan · web-flow · commit a3d061232db9 · 2025-03-13T15:40:32.000+03:00
diff --git a/.changeset/tame-papayas-fetch.md b/.changeset/tame-papayas-fetch.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/mock': patch
+---
+
+Prevent prototype polluting assignment
diff --git a/.changeset/whole-hands-smell.md b/.changeset/whole-hands-smell.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/utils': patch
+---
+
+Better handling for field name handling in `buildOperationForField`
diff --git a/packages/mock/src/MockStore.ts b/packages/mock/src/MockStore.ts
@@ -266,9 +266,11 @@ export class MockStore implements IMockStore {
     if (typeName === '__proto__' || typeName === 'constructor' || typeName === 'prototype') {
       throw new Error(`Invalid typeName: ${typeName}`);
     }
+
     if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
       throw new Error(`Invalid key: ${key}`);
     }
+
     if (this.store[typeName] === undefined) {
       this.store[typeName] = {};
     }
diff --git a/packages/utils/src/build-operation-for-field.ts b/packages/utils/src/build-operation-for-field.ts
@@ -479,9 +479,9 @@ function resolveField({
   if (fieldTypeMap.has(fieldPathStr) && fieldTypeMap.get(fieldPathStr) !== field.type.toString()) {
     fieldName += (field.type as any)
       .toString()
-      .replace('!', 'NonNull')
-      .replace('[', 'List')
-      .replace(']', '');
+      .replace(/!/g, 'NonNull')
+      .replace(/\[/g, 'List')
+      .replace(/\]/g, '');
   }
   fieldTypeMap.set(fieldPathStr, field.type.toString());
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@graphql-tools/mock': patch
 +---
++
 +Prevent prototype polluting assignment
Original file line number	Diff line number	Diff line change
`@@ -266,9 +266,11 @@ export class MockStore implements IMockStore {`
`266`	`266`	`if (typeName === '__proto__' \|\| typeName === 'constructor' \|\| typeName === 'prototype') {`
`267`	`267`	throw new Error(`Invalid typeName: ${typeName}`);
`268`	`268`	`}`
	`269`	`+`
`269`	`270`	`if (key === '__proto__' \|\| key === 'constructor' \|\| key === 'prototype') {`
`270`	`271`	throw new Error(`Invalid key: ${key}`);
`271`	`272`	`}`
	`273`	`+`
`272`	`274`	`if (this.store[typeName] === undefined) {`
`273`	`275`	`this.store[typeName] = {};`
`274`	`276`	`}`