msw: Migrate fixtures to new @msw/data API

Author: Turbo87

packages/crates-io-msw/fixtures.js

@@ -8,67 +8,77 @@ import USERS from './fixtures/users.js';
 import VERSION_DOWNLOADS from './fixtures/version-downloads.js';
 import VERSIONS from './fixtures/versions.js';
 
-export function loadFixtures(db) {
-  CATEGORIES.forEach(it => db.category.create(it));
-  let keywords = KEYWORDS.map(it => db.keyword.create(it));
+export async function loadFixtures(db) {
+  await Promise.all(structuredClone(CATEGORIES).map(it => db.category.create(it)));
+  let keywords = await Promise.all(structuredClone(KEYWORDS).map(it => db.keyword.create(it)));
 
-  let users = USERS.map(it => db.user.create(it));
-  let teams = TEAMS.map(it => db.team.create(it));
+  let users = await Promise.all(structuredClone(USERS).map(it => db.user.create(it)));
+  let teams = await Promise.all(structuredClone(TEAMS).map(it => db.team.create(it)));
 
-  let crates = CRATES.map(it => {
-    if (it.keywordIds) {
-      it.keywords = it.keywordIds.map(id => keywords.find(k => k.id === id)).filter(Boolean);
-      delete it.keywordIds;
-    }
+  let crates = await Promise.all(
+    structuredClone(CRATES).map(it => {
+      if (it.keywordIds) {
+        it.keywords = it.keywordIds.map(id => keywords.find(k => k.id === id)).filter(Boolean);
+        delete it.keywordIds;
+      }
 
-    return db.crate.create(it);
-  });
+      return db.crate.create(it);
+    }),
+  );
 
-  CRATE_OWNERSHIPS.forEach(it => {
-    if (it.crateId) {
-      it.crate = crates.find(c => c.name === it.crateId);
-      delete it.crateId;
-    }
-    if (it.teamId) {
-      it.team = teams.find(t => t.id === it.teamId);
-      delete it.teamId;
-    }
-    if (it.userId) {
-      it.user = users.find(u => u.id === it.userId);
-      delete it.userId;
-    }
+  await Promise.all(
+    structuredClone(CRATE_OWNERSHIPS).map(it => {
+      if (it.crateId) {
+        it.crate = crates.find(c => c.name === it.crateId);
+        delete it.crateId;
+      }
+      if (it.teamId) {
+        it.team = teams.find(t => t.id === it.teamId);
+        delete it.teamId;
+      }
+      if (it.userId) {
+        it.user = users.find(u => u.id === it.userId);
+        delete it.userId;
+      }
 
-    return db.crateOwnership.create(it);
-  });
+      return db.crateOwnership.create(it);
+    }),
+  );
 
-  let versions = VERSIONS.map(it => {
-    if (it.crateId) {
-      it.crate = crates.find(c => c.name === it.crateId);
-      delete it.crateId;
-    }
+  let versions = await Promise.all(
+    structuredClone(VERSIONS).map(it => {
+      if (it.crateId) {
+        it.crate = crates.find(c => c.name === it.crateId);
+        delete it.crateId;
+      }
 
-    return db.version.create(it);
-  });
+      return db.version.create(it);
+    }),
+  );
 
-  DEPENDENCIES.forEach(it => {
-    if (it.crateId) {
-      it.crate = crates.find(c => c.name === it.crateId);
-      delete it.crateId;
-    }
-    if (it.versionId) {
-      it.version = versions.find(v => v.id === it.versionId);
-      delete it.versionId;
-    }
+  await Promise.all(
+    structuredClone(DEPENDENCIES).map(it => {
+      if (it.crateId) {
+        it.crate = crates.find(c => c.name === it.crateId);
+        delete it.crateId;
+      }
+      if (it.versionId) {
+        it.version = versions.find(v => v.id === it.versionId);
+        delete it.versionId;
+      }
 
-    return db.dependency.create(it);
-  });
+      return db.dependency.create(it);
+    }),
+  );
 
-  VERSION_DOWNLOADS.forEach(it => {
-    if (it.versionId) {
-      it.version = versions.find(v => v.id === it.versionId);
-      delete it.versionId;
-    }
+  await Promise.all(
+    structuredClone(VERSION_DOWNLOADS).map(it => {
+      if (it.versionId) {
+        it.version = versions.find(v => v.id === it.versionId);
+        delete it.versionId;
+      }
 
-    return db.versionDownload.create(it);
-  });
+      return db.versionDownload.create(it);
+    }),
+  );
 }

packages/crates-io-msw/fixtures.test.js

@@ -4,5 +4,5 @@ import { loadFixtures } from './fixtures.js';
 import { db } from './index.js';
 
 test('loadFixtures() succeeds', async function () {
-  loadFixtures(db);
+  await loadFixtures(db);
 });

packages/crates-io-msw/fixtures/dependencies.js

@@ -2,7 +2,7 @@ export default [
   {
     crateId: 'libc',
     default_features: true,
-    features: '',
+    features: [],
     id: 146_231,
     kind: 'normal',
     optional: false,
@@ -13,7 +13,7 @@ export default [
   {
     crateId: 'nanomsg-sys',
     default_features: true,
-    features: '',
+    features: [],
     id: 146_232,
     kind: 'normal',
     optional: false,
@@ -24,7 +24,7 @@ export default [
   {
     crateId: 'nanomsg',
     default_features: true,
-    features: '',
+    features: [],
     id: 146_233,
     kind: 'normal',
     optional: false,
@@ -35,7 +35,7 @@ export default [
   {
     crateId: 'mock-build-deps',
     default_features: true,
-    features: '',
+    features: [],
     id: 146_234,
     kind: 'build',
     optional: false,
@@ -46,7 +46,7 @@ export default [
   {
     crateId: 'mock-dev-deps',
     default_features: true,
-    features: '',
+    features: [],
     id: 146_235,
     kind: 'dev',
     optional: true,

packages/crates-io-msw/models/crate.js

@@ -5,7 +5,8 @@ import { applyDefault } from '../utils/defaults.js';
 import { preCreateExtension } from '../utils/pre-create-extension.js';
 
 const schema = z.object({
-  id: z.number(),
+  // `z.string()` is used to support some of our old fixture that use strings here for some reason
+  id: z.number().or(z.string()),
 
   name: z.string(),
   description: z.string(),