Theaninova/DeviceManager
1
0
Fork 0
mirror of https://github.com/CharaChorder/DeviceManager.git synced 2026-01-21 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use standard prettier formatting

Browse Source
This commit is contained in:
Thea Schöbl
2024-04-06 13:15:35 +02:00
parent 86ec8651b6
commit 854ab6d3be
106 changed files with 2703 additions and 2046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/lib/undo-redo.ts
View File

@@ -1,8 +1,12 @@
import {persistentWritable} from "$lib/storage"
import {derived} from "svelte/store"
import type {Chord} from "$lib/serial/chord"
import {deviceChords, deviceLayout, deviceSettings} from "$lib/serial/connection"
import {KEYMAP_CODES} from "$lib/serial/keymap-codes"
import { persistentWritable } from "$lib/storage";
import { derived } from "svelte/store";
import type { Chord } from "$lib/serial/chord";
import {
deviceChords,
deviceLayout,
deviceSettings,
} from "$lib/serial/connection";
import { KEYMAP_CODES } from "$lib/serial/keymap-codes";
export enum ChangeType {
Layout,
@@ -11,77 +15,79 @@ export enum ChangeType {
}
export interface LayoutChange {
type: ChangeType.Layout
id: number
layer: number
action: number
type: ChangeType.Layout;
id: number;
layer: number;
action: number;
}
export interface ChordChange {
type: ChangeType.Chord
deleted?: true
id: number[]
actions: number[]
phrase: number[]
type: ChangeType.Chord;
deleted?: true;
id: number[];
actions: number[];
phrase: number[];
}
export interface SettingChange {
type: ChangeType.Setting
id: number
setting: number
type: ChangeType.Setting;
id: number;
setting: number;
}
export interface ChangeInfo {
isApplied: boolean
isCommitted?: boolean
isApplied: boolean;
isCommitted?: boolean;
}
export type Change = LayoutChange | ChordChange | SettingChange
export type Change = LayoutChange | ChordChange | SettingChange;
export const changes = persistentWritable<Change[]>("changes", [])
export const changes = persistentWritable<Change[]>("changes", []);
export interface Overlay {
layout: [Map<number, number>, Map<number, number>, Map<number, number>]
chords: Map<string, Chord & {deleted: boolean}>
settings: Map<number, number>
layout: [Map<number, number>, Map<number, number>, Map<number, number>];
chords: Map<string, Chord & { deleted: boolean }>;
settings: Map<number, number>;
}
export const overlay = derived(changes, changes => {
export const overlay = derived(changes, (changes) => {
const overlay: Overlay = {
layout: [new Map(), new Map(), new Map()],
chords: new Map(),
settings: new Map(),
}
};
for (const change of changes) {
switch (change.type) {
case ChangeType.Layout:
overlay.layout[change.layer].set(change.id, change.action)
break
overlay.layout[change.layer].set(change.id, change.action);
break;
case ChangeType.Chord:
overlay.chords.set(JSON.stringify(change.id), {
actions: change.actions,
phrase: change.phrase,
deleted: change.deleted ?? false,
})
break
});
break;
case ChangeType.Setting:
overlay.settings.set(change.id, change.setting)
break
overlay.settings.set(change.id, change.setting);
break;
}
}
return overlay
})
return overlay;
});
export const settings = derived([overlay, deviceSettings], ([overlay, settings]) =>
settings.map<{value: number} & ChangeInfo>((value, id) => ({
value: overlay.settings.get(id) ?? value,
isApplied: !overlay.settings.has(id),
})),
)
export const settings = derived(
[overlay, deviceSettings],
([overlay, settings]) =>
settings.map<{ value: number } & ChangeInfo>((value, id) => ({
value: overlay.settings.get(id) ?? value,
isApplied: !overlay.settings.has(id),
})),
);
export type KeyInfo = {action: number} & ChangeInfo
export type KeyInfo = { action: number } & ChangeInfo;
export const layout = derived([overlay, deviceLayout], ([overlay, layout]) =>
layout.map(
(actions, layer) =>
@@ -90,47 +96,52 @@ export const layout = derived([overlay, deviceLayout], ([overlay, layout]) =>
isApplied: !overlay.layout[layer].has(id),
})) as [KeyInfo, KeyInfo, KeyInfo],
),
)
);
export type ChordInfo = Chord &
ChangeInfo & {phraseChanged: boolean; actionsChanged: boolean; sortBy: string} & {
id: number[]
deleted: boolean
}
ChangeInfo & {
phraseChanged: boolean;
actionsChanged: boolean;
sortBy: string;
} & {
id: number[];
deleted: boolean;
};
export const chords = derived([overlay, deviceChords], ([overlay, chords]) => {
const newChords = new Set(overlay.chords.keys())
const newChords = new Set(overlay.chords.keys());
const changedChords = chords.map<ChordInfo>(chord => {
const id = JSON.stringify(chord.actions)
const changedChords = chords.map<ChordInfo>((chord) => {
const id = JSON.stringify(chord.actions);
if (overlay.chords.has(id)) {
newChords.delete(id)
const changedChord = overlay.chords.get(id)!
newChords.delete(id);
const changedChord = overlay.chords.get(id)!;
return {
id: chord.actions,
// use the old phrase for stable editing
sortBy: chord.phrase.map(it => KEYMAP_CODES[it]?.id ?? it).join(),
sortBy: chord.phrase.map((it) => KEYMAP_CODES[it]?.id ?? it).join(),
actions: changedChord.actions,
phrase: changedChord.phrase,
actionsChanged: id !== JSON.stringify(changedChord.actions),
phraseChanged: JSON.stringify(chord.phrase) !== JSON.stringify(changedChord.phrase),
phraseChanged:
JSON.stringify(chord.phrase) !== JSON.stringify(changedChord.phrase),
isApplied: false,
deleted: changedChord.deleted,
}
};
} else {
return {
id: chord.actions,
sortBy: chord.phrase.map(it => KEYMAP_CODES[it]?.id ?? it).join(),
sortBy: chord.phrase.map((it) => KEYMAP_CODES[it]?.id ?? it).join(),
actions: chord.actions,
phrase: chord.phrase,
phraseChanged: false,
actionsChanged: false,
isApplied: true,
deleted: false,
}
};
}
})
});
for (const id of newChords) {
const chord = overlay.chords.get(id)!
const chord = overlay.chords.get(id)!;
changedChords.push({
sortBy: "",
isApplied: false,
@@ -140,8 +151,10 @@ export const chords = derived([overlay, deviceChords], ([overlay, chords]) => {
id: JSON.parse(id),
phrase: chord.phrase,
actions: chord.actions,
})
});
}
return changedChords.sort(({sortBy: a}, {sortBy: b}) => a.localeCompare(b))
})
return changedChords.sort(({ sortBy: a }, { sortBy: b }) =>
a.localeCompare(b),
);
});