From afcbb5dca626e3d93b9f730c962105e94d3ddd50 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Mon, 15 May 2023 23:13:50 +0100 Subject: [PATCH] refactor: one-liner registers --- src/lib/helpers/commandCenter.ts | 56 ++++++------ src/lib/helpers/platform.ts | 1 + src/routes/console/+layout.svelte | 5 +- .../account/organizations/+page.svelte | 2 - src/routes/console/commandCenter.svelte | 15 +-- .../organization-[organization]/+page.svelte | 13 ++- .../project-[project]/auth/+page.svelte | 3 +- .../project-[project]/databases/+page.svelte | 3 +- .../project-[project]/functions/+page.svelte | 23 +++-- .../overview/platforms/+page.svelte | 15 ++- .../project-[project]/storage/+page.svelte | 21 ++--- src/routes/console/project-[project]/store.ts | 91 ++++++++++--------- 12 files changed, 122 insertions(+), 126 deletions(-) diff --git a/src/lib/helpers/commandCenter.ts b/src/lib/helpers/commandCenter.ts index 90a9fb775..9e6b729f5 100644 --- a/src/lib/helpers/commandCenter.ts +++ b/src/lib/helpers/commandCenter.ts @@ -1,4 +1,3 @@ -import { onDestroy } from 'svelte'; import { derived, writable } from 'svelte/store'; // type Key = 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' @@ -7,7 +6,7 @@ import { derived, writable } from 'svelte/store'; // | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' // | 'Y' | 'Z' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' -type Command = { +export type Command = { keys: string[]; /* Ctrl on Windows/Linux, Meta on Mac */ meta?: boolean; @@ -20,7 +19,7 @@ type Command = { }; type CommandCenterState = { - commandMap: Map; + commandMap: Map; enabled: boolean; }; @@ -39,37 +38,38 @@ export const commands = derived(commandCenter, ($commandCenter) => { return Array.from($commandCenter.commandMap.values()).flat(); }); -export function CommandRegistrant() { - const uuid = crypto.randomUUID(); +function createRegisterProxy() { + return new Proxy( + {}, + { + get(_obj, field, receiver) { + if (field !== 'register') return; + return (newCommands: Command[]) => { + commandCenter.update((curr) => { + curr.commandMap.set(receiver, newCommands); + return curr; + }); + }; + } + } + ) as { register: (newCommands: Command[]) => void }; +} - onDestroy(() => { - commandCenter.update((curr) => { - curr.commandMap.delete(uuid); - return curr; - }); - }); +export type RegisterProxy = ReturnType; - return { - register(newCommands: Command[]) { +export const cmdRegistrant = { + subscribe(runner: (proxy: RegisterProxy) => void) { + const proxy = createRegisterProxy(); + runner(proxy); + + return () => { commandCenter.update((curr) => { - curr.commandMap.set(uuid, newCommands); + curr.commandMap.delete(proxy); return curr; }); - } - }; -} - -export function ExtendCommandRegistrant(baseCommands: Command[]) { - return () => { - const registrant = CommandRegistrant(); - - return { - register: (newCommands?: Command[]) => { - registrant.register([...baseCommands, ...(newCommands ?? [])]); - } }; - }; -} + } +}; const debounce = (fn: () => void, ms: number) => { let timeout: NodeJS.Timeout; diff --git a/src/lib/helpers/platform.ts b/src/lib/helpers/platform.ts index 98920c7c6..e03708a01 100644 --- a/src/lib/helpers/platform.ts +++ b/src/lib/helpers/platform.ts @@ -1,3 +1,4 @@ export function isMac(): boolean { + console.log('isMac()', window.navigator.platform.toUpperCase().indexOf('MAC') >= 0); return window.navigator.platform.toUpperCase().indexOf('MAC') >= 0; } diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte index df65ef6e0..60e25c92f 100644 --- a/src/routes/console/+layout.svelte +++ b/src/routes/console/+layout.svelte @@ -16,11 +16,10 @@ import Create from './createOrganization.svelte'; import { goto } from '$app/navigation'; - import { commandCenterKeyDownHandler, CommandRegistrant } from '$lib/helpers/commandCenter'; + import { cmdRegistrant, commandCenterKeyDownHandler } from '$lib/helpers/commandCenter'; import CommandCenter from './commandCenter.svelte'; - const { register } = CommandRegistrant(); - $: register([ + $: $cmdRegistrant.register([ { label: 'Go to Account', callback: () => { diff --git a/src/routes/console/account/organizations/+page.svelte b/src/routes/console/account/organizations/+page.svelte index a2435cdf8..f43f7c46c 100644 --- a/src/routes/console/account/organizations/+page.svelte +++ b/src/routes/console/account/organizations/+page.svelte @@ -13,8 +13,6 @@ import CreateOrganization from '../../createOrganization.svelte'; import { sdk } from '$lib/stores/sdk'; import type { PageData } from './$types'; - import { CommandRegistrant } from '$lib/helpers/commandCenter'; - import { goto } from '$app/navigation'; export let data: PageData; diff --git a/src/routes/console/commandCenter.svelte b/src/routes/console/commandCenter.svelte index cb7a25cff..d40373f47 100644 --- a/src/routes/console/commandCenter.svelte +++ b/src/routes/console/commandCenter.svelte @@ -1,14 +1,13 @@
diff --git a/src/routes/console/project-[project]/storage/+page.svelte b/src/routes/console/project-[project]/storage/+page.svelte index ed3d7c4ac..4c01b8ad7 100644 --- a/src/routes/console/project-[project]/storage/+page.svelte +++ b/src/routes/console/project-[project]/storage/+page.svelte @@ -1,23 +1,23 @@