move msw handlers out of mock-api barrel file

Author: david-crespo

app/api/__tests__/safety.spec.ts

@@ -32,17 +32,26 @@ const grepFiles = (s: string) =>
     .split('\n')
     .filter((f) => !/safety\.spec\.ts/.test(f)) // this file doesn't count
 
-it('@oxide/api-mocks is only referenced in test files', () => {
+it('mock-api is only referenced in test files', () => {
   expect(grepFiles('api-mocks')).toMatchInlineSnapshot(`
     [
       "app/api/__tests__/hooks.spec.tsx",
-      "app/msw-mock-api.ts",
       "mock-api/msw/db.ts",
       "test/e2e/instance-create.e2e.ts",
       "test/e2e/inventory.e2e.ts",
       "test/e2e/profile.e2e.ts",
       "test/e2e/project-access.e2e.ts",
       "test/e2e/silo-access.e2e.ts",
+      "tsconfig.json",
+    ]
+  `)
+  expect(grepFiles('mock-api')).toMatchInlineSnapshot(`
+    [
+      "README.md",
+      "app/main.tsx",
+      "app/msw-mock-api.ts",
+      "docs/mock-api-differences.md",
+      "package.json",
       "test/e2e/utils.ts",
       "test/unit/server.ts",
       "test/unit/setup.ts",

app/msw-mock-api.ts

@@ -56,7 +56,7 @@ const sleep = async (ms: number) => new Promise((res) => setTimeout(res, ms))
 
 export async function startMockAPI() {
   // dynamic imports to make extremely sure none of this code ends up in the prod bundle
-  const { handlers } = await import('@oxide/api-mocks')
+  const { handlers } = await import('../mock-api/msw/handlers')
   const { http, HttpResponse } = await import('msw')
   const { setupWorker } = await import('msw/browser')
 

mock-api/index.ts

@@ -25,7 +25,3 @@ export * from './user'
 export * from './user-group'
 export * from './user'
 export * from './vpc'
-
-export { handlers } from './msw/handlers'
-export { json, MSW_USER_COOKIE } from './msw/util'
-export { resetDb } from './msw/db'

mock-api/msw/db.ts

@@ -11,7 +11,6 @@ import { validate as isUuid } from 'uuid'
 
 import type { ApiTypes as Api, PathParams as PP } from '@oxide/api'
 import * as mock from '@oxide/api-mocks'
-import { user1 } from '@oxide/api-mocks'
 import { pick } from '@oxide/util'
 
 import type { Json } from '../json-type'
@@ -223,7 +222,7 @@ export const lookup = {
   },
   sshKey({ sshKey: id }: PP.SshKey): Json<Api.SshKey> {
     // we don't have a concept of mock session. assume the user is user1
-    const userSshKeys = db.sshKeys.filter((key) => key.silo_user_id === user1.id)
+    const userSshKeys = db.sshKeys.filter((key) => key.silo_user_id === mock.user1.id)
 
     if (isUuid(id)) return lookupById(userSshKeys, id)
 

test/e2e/utils.ts

@@ -7,9 +7,10 @@
  */
 import { expect, type Browser, type Locator, type Page } from '@playwright/test'
 
-import { MSW_USER_COOKIE } from '@oxide/api-mocks'
 import { MiB } from '@oxide/util'
 
+import { MSW_USER_COOKIE } from '../../mock-api/msw/util'
+
 export * from '@playwright/test'
 
 export async function forEach(loc: Locator, fn: (loc0: Locator, i: number) => void) {

test/unit/server.ts

@@ -8,7 +8,7 @@
 import { http, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
 
-import { handlers } from '@oxide/api-mocks'
+import { handlers } from '../../mock-api/msw/handlers'
 
 export const server = setupServer(
   ...handlers.map((h) => {

test/unit/setup.ts

@@ -15,8 +15,7 @@ import '@testing-library/jest-dom/vitest'
 import { cleanup } from '@testing-library/react'
 import { afterAll, afterEach, beforeAll } from 'vitest'
 
-import { resetDb } from '@oxide/api-mocks'
-
+import { resetDb } from '../../mock-api/msw/db'
 import { server } from './server'
 
 beforeAll(() => server.listen())

tools/start_mock_api.ts

@@ -7,7 +7,7 @@
  */
 import { createServer } from '@mswjs/http-middleware'
 
-import { handlers } from '@oxide/api-mocks'
+import { handlers } from '../mock-api/msw/handlers'
 
 // TODO: take port argument
 createServer(...handlers).listen(12220)