chore(deps): update dependency @bjoerge/mutiny to ^0.7.0 (#7274)

* chore(deps): update dependency @bjoerge/mutiny to ^0.7.0 * fix: update code paths + tests after upgrading to mutiny 0.7.x --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Bjørge Næss <[email protected]>
sanity-io · Aug 2, 2024 · 9edbcd9 · 9edbcd9
1 parent b221828
commit 9edbcd9
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -100,7 +100,7 @@
     "@babel/preset-env": "^7.24.7",
     "@babel/preset-react": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
-    "@bjoerge/mutiny": "^0.5.3",
+    "@bjoerge/mutiny": "^0.7.0",
     "@google-cloud/storage": "^7.11.0",
     "@jest/globals": "^29.7.0",
     "@playwright/test": "1.44.1",

diff --git a/packages/@sanity/migrate/package.json b/packages/@sanity/migrate/package.json
@@ -50,7 +50,7 @@
     "watch": "pkg-utils watch"
   },
   "dependencies": {
-    "@bjoerge/mutiny": "^0.5.1",
+    "@bjoerge/mutiny": "^0.7.0",
     "@sanity/client": "^6.21.1",
     "@sanity/types": "3.52.4",
     "@sanity/util": "3.52.4",

diff --git a/packages/@sanity/migrate/src/runner/normalizeMigrateDefinition.ts b/packages/@sanity/migrate/src/runner/normalizeMigrateDefinition.ts
@@ -54,7 +54,7 @@ function normalizeMutation(
     return change.flatMap((ch) => normalizeMutation(ch))
   }
   if (isRawMutation(change)) {
-    return SanityEncoder.decode([change] as any) as Mutation[]
+    return SanityEncoder.decodeAll([change] as any) as Mutation[]
   }
   return [change]
 }
@@ -128,7 +128,7 @@ function normalizeDocumentMutation(
     return change.flatMap((ch) => normalizeDocumentMutation(documentId, ch))
   }
   if (isRawMutation(change)) {
-    return SanityEncoder.decode([change] as any)[0] as Mutation
+    return SanityEncoder.decodeAll([change] as any)[0] as Mutation
   }
   if (isTransaction(change)) {
     return change
@@ -149,7 +149,7 @@ function normalizeNodeMutation(
     return change.flatMap((ch) => normalizeNodeMutation(path, ch))
   }
   if (isRawMutation(change)) {
-    return SanityEncoder.decode([change] as any)[0] as Mutation
+    return SanityEncoder.decodeAll([change] as any)[0] as Mutation
   }
 
   if (isNodePatch(change)) {

diff --git a/packages/@sanity/migrate/src/runner/utils/__tests__/toSanityMutations.test.ts b/packages/@sanity/migrate/src/runner/utils/__tests__/toSanityMutations.test.ts
@@ -14,10 +14,10 @@ jest.mock('@bjoerge/mutiny', () => {
   return {
     ...actual,
     SanityEncoder: {
-      ...actual.SanityEncoder.encode,
-      encode: jest
-        .fn<typeof actual.SanityEncoder.encode>()
-        .mockImplementation(actual.SanityEncoder.encode),
+      ...actual.SanityEncoder,
+      encodeAll: jest
+        .fn<typeof actual.SanityEncoder.encodeAll>()
+        .mockImplementation(actual.SanityEncoder.encodeAll),
     },
   }
 })
@@ -45,8 +45,8 @@ describe('#toSanityMutations', () => {
       result.push(mutation)
     }
 
-    expect(result.flat()).toEqual(SanityEncoder.encode([mockMutation] as any))
-    expect(SanityEncoder.encode).toHaveBeenCalledWith([mockMutation])
+    expect(result.flat()).toEqual(SanityEncoder.encodeAll([mockMutation] as any[]))
+    expect(SanityEncoder.encodeAll).toHaveBeenCalledWith([mockMutation])
   })
 
   it('should handle multiple mutations', async () => {
@@ -84,8 +84,8 @@ describe('#toSanityMutations', () => {
       result.push(mutation)
     }
 
-    expect(result.flat()).toEqual(SanityEncoder.encode(mockMutations as any))
-    expect(SanityEncoder.encode).toHaveBeenCalledWith(mockMutations)
+    expect(result.flat()).toEqual(SanityEncoder.encodeAll(mockMutations as any[]))
+    expect(SanityEncoder.encodeAll).toHaveBeenCalledWith(mockMutations)
   })
 
   it('should handle transaction', async () => {
@@ -114,10 +114,10 @@ describe('#toSanityMutations', () => {
 
     const expected: TransactionPayload = {
       transactionId: mockTransaction.id,
-      mutations: SanityEncoder.encode(mockTransaction.mutations as any),
+      mutations: SanityEncoder.encodeAll(mockTransaction.mutations as any[]),
     }
 
     expect(result).toEqual([expected])
-    expect(SanityEncoder.encode).toHaveBeenCalledWith(mockTransaction.mutations)
+    expect(SanityEncoder.encodeAll).toHaveBeenCalledWith(mockTransaction.mutations)
   })
 })
diff --git a/packages/@sanity/migrate/src/runner/utils/toSanityMutations.ts b/packages/@sanity/migrate/src/runner/utils/toSanityMutations.ts
@@ -18,12 +18,12 @@ export async function* toSanityMutations(
       if (isTransaction(mut)) {
         yield {
           transactionId: mut.id,
-          mutations: SanityEncoder.encode(mut.mutations as any) as SanityMutation[],
+          mutations: SanityEncoder.encodeAll(mut.mutations as any[]) as SanityMutation[],
         }
         continue
       }
 
-      yield SanityEncoder.encode(arrify(mut) as any[]) as SanityMutation[]
+      yield SanityEncoder.encodeAll(arrify(mut) as any[]) as SanityMutation[]
     }
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/doc-report/docReportCreate.ts b/scripts/doc-report/docReportCreate.ts
@@ -220,7 +220,9 @@ studioMetricsClient.datasets.list().then(async (datasets) => {
       filter(({mutations}) => mutations.length > 0),
       mergeMap(({pkg, mutations}) => {
         console.log(`Submitting ${mutations.length} mutations for ${pkg.manifest.name}`)
-        return studioMetricsClient.observable.transaction(SanityEncoder.encode(mutations)).commit()
+        return studioMetricsClient.observable
+          .transaction(SanityEncoder.encodeAll(mutations))
+          .commit()
       }, 2),
     )
     .subscribe()