refactor: use standard prettier formatting

src/lib/backup/backup.ts

@@ -4,33 +4,45 @@ import type {
   CharaFile,
   CharaLayoutFile,
   CharaSettingsFile,
-} from "$lib/share/chara-file.js"
-import type {Change} from "$lib/undo-redo.js"
-import {changes, ChangeType, chords, layout, settings} from "$lib/undo-redo.js"
-import {get} from "svelte/store"
-import {serialPort} from "../serial/connection"
-import {csvLayoutToJson, isCsvLayout} from "$lib/backup/compat/legacy-layout"
-import {isCsvChords, csvChordsToJson} from "./compat/legacy-chords"
+} from "$lib/share/chara-file.js";
+import type { Change } from "$lib/undo-redo.js";
+import {
+  changes,
+  ChangeType,
+  chords,
+  layout,
+  settings,
+} from "$lib/undo-redo.js";
+import { get } from "svelte/store";
+import { serialPort } from "../serial/connection";
+import { csvLayoutToJson, isCsvLayout } from "$lib/backup/compat/legacy-layout";
+import { isCsvChords, csvChordsToJson } from "./compat/legacy-chords";
 
 export function downloadFile<T extends CharaFile<string>>(contents: T) {
-  const downloadUrl = URL.createObjectURL(new Blob([JSON.stringify(contents)], {type: "application/json"}))
-  const element = document.createElement("a")
+  const downloadUrl = URL.createObjectURL(
+    new Blob([JSON.stringify(contents)], { type: "application/json" }),
+  );
+  const element = document.createElement("a");
   element.setAttribute(
     "download",
-    `${contents.type}-${get(serialPort)?.device}-${new Date().toISOString()}.json`,
-  )
-  element.href = downloadUrl
-  element.setAttribute("target", "_blank")
-  element.click()
-  URL.revokeObjectURL(downloadUrl)
+    `${contents.type}-${
+      get(serialPort)?.device
+    }-${new Date().toISOString()}.json`,
+  );
+  element.href = downloadUrl;
+  element.setAttribute("target", "_blank");
+  element.click();
+  URL.revokeObjectURL(downloadUrl);
 }
 
 export function downloadBackup() {
   downloadFile<CharaBackupFile>({
     charaVersion: 1,
     type: "backup",
-    history: [[createChordBackup(), createLayoutBackup(), createSettingsBackup()]],
-  })
+    history: [
+      [createChordBackup(), createLayoutBackup(), createSettingsBackup()],
+    ],
+  });
 }
 
 export function createLayoutBackup(): CharaLayoutFile {
@@ -38,28 +50,40 @@ export function createLayoutBackup(): CharaLayoutFile {
     charaVersion: 1,
     type: "layout",
     device: get(serialPort)?.device,
-    layout: get(layout).map(it => it.map(it => it.action)) as [number[], number[], number[]],
-  }
+    layout: get(layout).map((it) => it.map((it) => it.action)) as [
+      number[],
+      number[],
+      number[],
+    ],
+  };
 }
 
 export function createChordBackup(): CharaChordFile {
-  return {charaVersion: 1, type: "chords", chords: get(chords).map(it => [it.actions, it.phrase])}
+  return {
+    charaVersion: 1,
+    type: "chords",
+    chords: get(chords).map((it) => [it.actions, it.phrase]),
+  };
 }
 
 export function createSettingsBackup(): CharaSettingsFile {
-  return {charaVersion: 1, type: "settings", settings: get(settings).map(it => it.value)}
+  return {
+    charaVersion: 1,
+    type: "settings",
+    settings: get(settings).map((it) => it.value),
+  };
 }
 
 export async function restoreBackup(event: Event) {
-  const input = (event.target as HTMLInputElement).files![0]
-  if (!input) return
-  const text = await input.text()
+  const input = (event.target as HTMLInputElement).files![0];
+  if (!input) return;
+  const text = await input.text();
   if (input.name.endsWith(".json")) {
-    restoreFromFile(JSON.parse(text))
+    restoreFromFile(JSON.parse(text));
   } else if (isCsvLayout(text)) {
-    restoreFromFile(csvLayoutToJson(text))
+    restoreFromFile(csvLayoutToJson(text));
   } else if (isCsvChords(text)) {
-    restoreFromFile(csvChordsToJson(text))
+    restoreFromFile(csvChordsToJson(text));
   } else {
   }
 }
@@ -67,86 +91,90 @@ export async function restoreBackup(event: Event) {
 export function restoreFromFile(
   file: CharaBackupFile | CharaSettingsFile | CharaLayoutFile | CharaChordFile,
 ) {
-  if (file.charaVersion !== 1) throw new Error("Incompatible backup")
+  if (file.charaVersion !== 1) throw new Error("Incompatible backup");
   switch (file.type) {
     case "backup": {
-      const recent = file.history[0]
+      const recent = file.history[0];
       if (recent[1].device !== get(serialPort)?.device) {
-        alert("Backup is incompatible with this device")
-        throw new Error("Backup is incompatible with this device")
+        alert("Backup is incompatible with this device");
+        throw new Error("Backup is incompatible with this device");
       }
 
-      changes.update(changes => {
+      changes.update((changes) => {
         changes.push(
           ...getChangesFromChordFile(recent[0]),
           ...getChangesFromLayoutFile(recent[1]),
           ...getChangesFromSettingsFile(recent[2]),
-        )
-        return changes
-      })
-      break
+        );
+        return changes;
+      });
+      break;
     }
     case "chords": {
-      changes.update(changes => {
-        changes.push(...getChangesFromChordFile(file))
-        return changes
-      })
-      break
+      changes.update((changes) => {
+        changes.push(...getChangesFromChordFile(file));
+        return changes;
+      });
+      break;
     }
     case "layout": {
-      changes.update(changes => {
-        changes.push(...getChangesFromLayoutFile(file))
-        return changes
-      })
-      break
+      changes.update((changes) => {
+        changes.push(...getChangesFromLayoutFile(file));
+        return changes;
+      });
+      break;
     }
     case "settings": {
-      changes.update(changes => {
-        changes.push(...getChangesFromSettingsFile(file))
-        return changes
-      })
-      break
+      changes.update((changes) => {
+        changes.push(...getChangesFromSettingsFile(file));
+        return changes;
+      });
+      break;
     }
     default: {
-      throw new Error(`Unknown backup type "${(file as CharaFile<string>).type}"`)
+      throw new Error(
+        `Unknown backup type "${(file as CharaFile<string>).type}"`,
+      );
     }
   }
 }
 
 export function getChangesFromChordFile(file: CharaChordFile) {
-  const changes: Change[] = []
-  const existingChords = new Set(get(chords).map(({phrase, actions}) => JSON.stringify([actions, phrase])))
+  const changes: Change[] = [];
+  const existingChords = new Set(
+    get(chords).map(({ phrase, actions }) => JSON.stringify([actions, phrase])),
+  );
   for (const [input, output] of file.chords) {
     if (existingChords.has(JSON.stringify([input, output]))) {
-      continue
+      continue;
     }
     changes.push({
       type: ChangeType.Chord,
       actions: input,
       phrase: output,
       id: input,
-    })
+    });
   }
-  return changes
+  return changes;
 }
 
 export function getChangesFromSettingsFile(file: CharaSettingsFile) {
-  const changes: Change[] = []
+  const changes: Change[] = [];
   for (const [id, value] of file.settings.entries()) {
-    const setting = get(settings)[id]
+    const setting = get(settings)[id];
     if (setting !== undefined && setting.value !== value) {
       changes.push({
         type: ChangeType.Setting,
         id,
         setting: value,
-      })
+      });
     }
   }
-  return changes
+  return changes;
 }
 
 export function getChangesFromLayoutFile(file: CharaLayoutFile) {
-  const changes: Change[] = []
+  const changes: Change[] = [];
   for (const [layer, keys] of file.layout.entries()) {
     for (const [id, action] of keys.entries()) {
       if (get(layout)[layer][id].action !== action) {
@@ -155,9 +183,9 @@ export function getChangesFromLayoutFile(file: CharaLayoutFile) {
           layer,
           id,
           action,
-        })
+        });
       }
     }
   }
-  return changes
+  return changes;
 }

src/lib/backup/compat/legacy-chords.ts

@@ -1,7 +1,7 @@
-import {KEYMAP_IDS} from "$lib/serial/keymap-codes"
-import type {CharaChordFile} from "$lib/share/chara-file"
+import { KEYMAP_IDS } from "$lib/serial/keymap-codes";
+import type { CharaChordFile } from "$lib/share/chara-file";
 
-const SPECIAL_KEYS = new Map<string, string>([[" ", "SPACE"]])
+const SPECIAL_KEYS = new Map<string, string>([[" ", "SPACE"]]);
 
 export function csvChordsToJson(csv: string): CharaChordFile {
   return {
@@ -10,22 +10,22 @@ export function csvChordsToJson(csv: string): CharaChordFile {
     chords: csv
       .trim()
       .split("\n")
-      .map(line => {
-        const [input, output] = line.split(/,(?=[^,]*$)/, 2)
+      .map((line) => {
+        const [input, output] = line.split(/,(?=[^,]*$)/, 2);
         return [
           input
             .split("+")
-            .map(it => KEYMAP_IDS.get(it.trim())?.code ?? 0)
+            .map((it) => KEYMAP_IDS.get(it.trim())?.code ?? 0)
             .sort((a, b) => a - b),
           output
             .trim()
             .split("")
-            .map(it => KEYMAP_IDS.get(SPECIAL_KEYS.get(it) ?? it)?.code ?? 0),
-        ]
+            .map((it) => KEYMAP_IDS.get(SPECIAL_KEYS.get(it) ?? it)?.code ?? 0),
+        ];
       }),
-  }
+  };
 }
 
 export function isCsvChords(csv: string): boolean {
-  return /^([^+]+( *\+ *[^+]+)* *, *[^+, ]+ *(\n|(?=$)))+$/.test(csv)
+  return /^([^+]+( *\+ *[^+]+)* *, *[^+, ]+ *(\n|(?=$)))+$/.test(csv);
 }

src/lib/backup/compat/legacy-layout-converted.sample.json

@@ -4,21 +4,24 @@
   "device": "one",
   "layout": [
     [
-      309, 304, 312, 303, 306, 290, 282, 301, 266, 285, 289, 270, 281, 272, 262, 288, 277, 298, 307, 264, 287,
-      268, 332, 311, 274, 286, 308, 329, 310, 280, 358, 512, 515, 513, 514, 313, 319, 318, 321, 320, 326, 315,
-      314, 317, 316, 312, 330, 331, 333, 334, 291, 261, 283, 536, 276, 292, 265, 275, 267, 263, 293, 260, 296,
-      544, 279, 294, 271, 299, 269, 273, 295, 284, 297, 302, 278, 357, 516, 519, 517, 518, 327, 336, 338, 335,
-      337, 328, 325, 322, 323, 324
+      309, 304, 312, 303, 306, 290, 282, 301, 266, 285, 289, 270, 281, 272, 262,
+      288, 277, 298, 307, 264, 287, 268, 332, 311, 274, 286, 308, 329, 310, 280,
+      358, 512, 515, 513, 514, 313, 319, 318, 321, 320, 326, 315, 314, 317, 316,
+      312, 330, 331, 333, 334, 291, 261, 283, 536, 276, 292, 265, 275, 267, 263,
+      293, 260, 296, 544, 279, 294, 271, 299, 269, 273, 295, 284, 297, 302, 278,
+      357, 516, 519, 517, 518, 327, 336, 338, 335, 337, 328, 325, 322, 323, 324
     ],
     [
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     ],
     [
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     ]
   ]
 }

src/lib/backup/compat/legacy-layout.spec.ts

@@ -1,18 +1,18 @@
-import {describe, expect, it} from "vitest"
-import legacyLayout from "./legacy-layout.sample.csv?raw"
-import legacyLayoutConverted from "./legacy-layout-converted.sample.json"
-import {csvLayoutToJson, isCsvLayout} from "./legacy-layout"
+import { describe, expect, it } from "vitest";
+import legacyLayout from "./legacy-layout.sample.csv?raw";
+import legacyLayoutConverted from "./legacy-layout-converted.sample.json";
+import { csvLayoutToJson, isCsvLayout } from "./legacy-layout";
 
 describe("legacy layout", () => {
   it("should detect a legacy layout", () => {
-    expect(isCsvLayout(legacyLayout)).to.be.true
-  })
+    expect(isCsvLayout(legacyLayout)).to.be.true;
+  });
 
   it("should not detect chord maps as layouts", () => {
-    expect(isCsvLayout("e + h + t,the")).to.be.false
-  })
+    expect(isCsvLayout("e + h + t,the")).to.be.false;
+  });
 
   it("should convert legacy layouts", () => {
-    expect(csvLayoutToJson(legacyLayout)).to.deep.equal(legacyLayoutConverted)
-  })
-})
+    expect(csvLayoutToJson(legacyLayout)).to.deep.equal(legacyLayoutConverted);
+  });
+});

src/lib/backup/compat/legacy-layout.ts

@@ -1,25 +1,28 @@
-import type {CharaLayoutFile} from "$lib/share/chara-file"
+import type { CharaLayoutFile } from "$lib/share/chara-file";
 
 /**
  * Converts a legacy CSV-based layout to the modern JSON-based format
  */
-export function csvLayoutToJson(csv: string, device: CharaLayoutFile["device"] = "one"): CharaLayoutFile {
+export function csvLayoutToJson(
+  csv: string,
+  device: CharaLayoutFile["device"] = "one",
+): CharaLayoutFile {
   const layout: CharaLayoutFile = {
     charaVersion: 1,
     type: "layout",
     device,
     layout: [[], [], []],
-  }
+  };
 
   for (const layer of csv.trim().split("\n")) {
-    const [layerId, key, action] = layer.substring(1).split(",").map(Number)
+    const [layerId, key, action] = layer.substring(1).split(",").map(Number);
 
-    layout.layout[Number(layerId) - 1][Number(key)] = Number(action)
+    layout.layout[Number(layerId) - 1][Number(key)] = Number(action);
   }
 
-  return layout
+  return layout;
 }
 
 export function isCsvLayout(csv: string): boolean {
-  return /^(A[123],\d+,\d+\n?)+$/.test(csv)
+  return /^(A[123],\d+,\d+\n?)+$/.test(csv);
 }