Test/offical msw plugin

app/src/lib/commands/notes.svelte.ts

@@ -395,6 +395,7 @@ export class TauriWebsocketProvider extends ObservableV2<TauriWebsocketProviderE
         encoder,
         awarenessProtocol.encodeAwarenessUpdate(
           provider.awareness,
+          // oxlint-disable-next-line max-nested-calls
           Array.from(provider.awareness.getStates().keys())
         )
       );

devenv.lock

@@ -3,11 +3,11 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1780935506,
-        "narHash": "sha256-pVCEeeppdluV6ys7jAlG0mH5x5HiXBdxVM7jcLhY81c=",
+        "lastModified": 1783461239,
+        "narHash": "sha256-O+rwg3jreOAOrYd0YrNoOsRu+8is6TCPCIBN3qJTJpM=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "e94869e8a32e95f498b520ac24e8f24938ab1915",
+        "rev": "6222c499fe28b87665af2bb6c626da64179cee00",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
         "nixpkgs-src": "nixpkgs-src"
       },
       "locked": {
-        "lastModified": 1778507786,
-        "narHash": "sha256-HzSQCKMsMr8r55LwM1JuzIOB+8bzk0FEv6sItKvsfoY=",
+        "lastModified": 1783345554,
+        "narHash": "sha256-LZhOm4kqjHUnwP4CNHpaqqEVcumGNd1PvOEOad8LkS0=",
         "owner": "cachix",
         "repo": "devenv-nixpkgs",
-        "rev": "8f24a228a782e24576b155d1e39f0d914b380691",
+        "rev": "6004ea8c229fe9d41b21c6f4c76bf6c2e10771dd",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     "nixpkgs-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1778274207,
-        "narHash": "sha256-I4puXmX1iovcCHZlRmztO3vW0mAbbRvq4F8wgIMQ1MM=",
+        "lastModified": 1783279667,
+        "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b3da656039dc7a6240f27b2ef8cc6a3ef3bccae7",
+        "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b",
         "type": "github"
       },
       "original": {

devenv.nix

@@ -46,8 +46,6 @@ in
   '';
 
   env = {
-    RUSTC_WRAPPER = "";
-    __NV_DISABLE_EXPLICIT_SYNC = "1";
     PLAYWRIGHT_BROWSERS_PATH = "${pkgs.playwright.browsers}";
     PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS = true;
     PLAYWRIGHT_NODEJS_PATH = "${pkgs.nodejs}/bin/node";

frontend/openapi-ts.config.ts

@@ -1,5 +1,4 @@
 import { defineConfig } from '@hey-api/openapi-ts';
-import { defineConfig as msw } from './src/tests/mocks/msw-plugin';
 
 export default defineConfig({
   input: 'http://localhost:5175/openapi.json',
@@ -25,6 +24,8 @@ export default defineConfig({
       name: '@hey-api/client-fetch',
       runtimeConfigPath: '$lib/backend/config'
     },
-    msw()
+    {
+      name: 'msw'
+    }
   ]
 });

frontend/package.json

@@ -46,7 +46,7 @@
     "@hey-api/openapi-ts": "0.99.0",
     "@lucide/svelte": "1.22.0",
     "@msw/playwright": "0.6.7",
-    "@playwright/test": "=1.59.1",
+    "@playwright/test": "=1.60.0",
     "@sveltejs/adapter-node": "5.5.7",
     "@sveltejs/kit": "2.68.0",
     "@sveltejs/vite-plugin-svelte": "7.1.2",

frontend/src/lib/client/core/params.gen.ts

@@ -88,16 +88,15 @@ function buildKeyMap(fields: FieldsConfig, map?: KeyMap): KeyMap {
 }
 
 interface Params {
-  body: unknown;
+  body?: unknown;
   headers: Record<string, unknown>;
   path: Record<string, unknown>;
   query: Record<string, unknown>;
 }
 
-type ParamsSlotMap = Record<Slot, unknown>;
-
-function stripEmptySlots(params: ParamsSlotMap): void {
+function stripEmptySlots(params: Params): void {
   for (const [slot, value] of Object.entries(params)) {
+    if (slot === 'body') continue;
     if (
       value &&
       typeof value === 'object' &&
@@ -113,15 +112,23 @@ export function buildClientParams(
   args: ReadonlyArray<unknown>,
   fields: FieldsConfig
 ): Params {
-  const params: ParamsSlotMap = {
-    body: Object.create(null),
+  const params: Params = {
     headers: Object.create(null),
     path: Object.create(null),
     query: Object.create(null)
   };
 
   const map = buildKeyMap(fields);
 
+  function writeSlot(slot: Slot, key: string, value: unknown): void {
+    let record = params[slot] as Record<string, unknown> | undefined;
+    if (record === undefined) {
+      record = Object.create(null) as Record<string, unknown>;
+      params[slot] = record;
+    }
+    record[key] = value;
+  }
+
   let config: FieldsConfig[number] | undefined;
 
   for (const [index, arg] of args.entries()) {
@@ -138,7 +145,7 @@ export function buildClientParams(
         const field = map.get(config.key)!;
         const name = field.map || config.key;
         if (field.in) {
-          (params[field.in] as Record<string, unknown>)[name] = arg;
+          writeSlot(field.in, name, arg);
         }
       } else {
         params.body = arg;
@@ -150,7 +157,7 @@ export function buildClientParams(
         if (field) {
           if (field.in) {
             const name = field.map || key;
-            (params[field.in] as Record<string, unknown>)[name] = value;
+            writeSlot(field.in, name, value);
           } else {
             params[field.map] = value;
           }
@@ -161,13 +168,11 @@ export function buildClientParams(
 
           if (extra) {
             const [prefix, slot] = extra;
-            (params[slot] as Record<string, unknown>)[
-              key.slice(prefix.length)
-            ] = value;
+            writeSlot(slot, key.slice(prefix.length), value);
           } else if ('allowExtra' in config && config.allowExtra) {
             for (const [slot, allowed] of Object.entries(config.allowExtra)) {
               if (allowed) {
-                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                writeSlot(slot as Slot, key, value);
                 break;
               }
             }
@@ -179,5 +184,5 @@ export function buildClientParams(
 
   stripEmptySlots(params);
 
-  return params as Params;
+  return params;
 }

frontend/src/lib/client/index.ts

@@ -1,113 +1,5 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-export {
-  accountSettingsMswHandler,
-  applyNoteEditMswHandler,
-  authConfigMswHandler,
-  authorizeConfirmMswHandler,
-  avatarByIdMswHandler,
-  changePasswordMswHandler,
-  changeUserEmailMswHandler,
-  completeSetupMswHandler,
-  confirmEmailChangeMswHandler,
-  convertOidcUserMswHandler,
-  createGroupMswHandler,
-  createNoteMswHandler,
-  createOauthClientMswHandler,
-  createOAuthPolicyMswHandler,
-  createOAuthScopeMswHandler,
-  createUserMswHandler,
-  deleteGroupMswHandler,
-  deleteNoteMswHandler,
-  deleteNoteSnapshotMswHandler,
-  deleteOauthClientMswHandler,
-  deleteOAuthPolicyMswHandler,
-  deleteOAuthScopeMswHandler,
-  deleteUserMswHandler,
-  editGroupMswHandler,
-  editNoteMswHandler,
-  editOauthClientMswHandler,
-  editOAuthPolicyMswHandler,
-  editOAuthScopeMswHandler,
-  editPasskeyNameMswHandler,
-  editUserMswHandler,
-  exchangeAppCodeMswHandler,
-  finishAuthenticationMswHandler,
-  finishRegistrationMswHandler,
-  finishSpecialAccessMswHandler,
-  getApodImageInfoMswHandler,
-  getApodImageMswHandler,
-  getMailSettingsMswHandler,
-  getNoteSnapshotContentMswHandler,
-  getOidcSettingsMswHandler,
-  groupInfoMswHandler,
-  infoMswHandler,
-  infoNoteMswHandler,
-  infoNoteShareMswHandler,
-  infoNoteSnapshotMswHandler,
-  infoOauthClientMswHandler,
-  infoOAuthPolicyMswHandler,
-  infoOAuthScopeMswHandler,
-  initOidcMswHandler,
-  isSetupMswHandler,
-  keyMswHandler,
-  listApodMswHandler,
-  listGroupsMswHandler,
-  listGroupsOAuthClientMswHandler,
-  listGroupsOAuthPolicyMswHandler,
-  listGroupsSimpleMswHandler,
-  listNotesMswHandler,
-  listNoteSnapshotsMswHandler,
-  listOauthClientsMswHandler,
-  listOAuthPoliciesMswHandler,
-  listOAuthScopesMswHandler,
-  listPasskeysMswHandler,
-  listPoliciesOAuthScopeMswHandler,
-  listScopesOAuthClientMswHandler,
-  listSessionsMswHandler,
-  listUsersMswHandler,
-  listUsersNoteMswHandler,
-  listUsersOAuthClientMswHandler,
-  listUsersSimpleMswHandler,
-  logoutMswHandler,
-  mailActiveMswHandler,
-  noteContentMswHandler,
-  notesConfigMswHandler,
-  passwordAuthenticateMswHandler,
-  passwordSpecialAccessMswHandler,
-  refreshTokenMswHandler,
-  regenerateSecretOauthClientMswHandler,
-  removePasskeyMswHandler,
-  requestAppCodeMswHandler,
-  resetPasswordMswHandler,
-  resetUserAvatarMswHandler,
-  resetUserPasswordMswHandler,
-  restoreNoteSnapshotMswHandler,
-  retrieveAppTokenMswHandler,
-  revokeSessionMswHandler,
-  saveAccountSettingsMswHandler,
-  saveMailSettingsMswHandler,
-  sendResetLinkMswHandler,
-  setGoodApodMswHandler,
-  shareNoteMswHandler,
-  shareNotePublicMswHandler,
-  siteUrlMswHandler,
-  startAuthenticationMswHandler,
-  startEmailChangeMswHandler,
-  startRegistrationMswHandler,
-  startSpecialAccessMswHandler,
-  testMailMswHandler,
-  testTokenMswHandler,
-  totpConfirmMswHandler,
-  totpFinishSetupMswHandler,
-  totpRemoveMswHandler,
-  totpStartSetupMswHandler,
-  transferNoteMswHandler,
-  updateAccountMswHandler,
-  updateAvatarMswHandler,
-  updatePasswordMswHandler,
-  userInfoMswHandler
-} from './msw.gen';
 export {
   accountSettings,
   applyNoteEdit,