From 7cca8c4825c959b1b46dee1c2bf81947f339b857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= Date: Sun, 28 Dec 2025 01:24:31 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20ui:=20minor=20changes=20to=20hel?= =?UTF-8?q?pers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - rename `Like` -> `VueLike` (also `unwrap_like` -> `unwrap_vuelike`) - rename `ensure_loaded` -> `unwrap_loading` - make `unwrap_loading` throw `null` on error instead of `""` --- ui/src/components/Calendar.vue | 6 +++--- ui/src/components/calendar/CalendarDoor.vue | 4 ++-- ui/src/components/calendar/SVGRect.vue | 4 ++-- ui/src/components/editor/DoorCanvas.vue | 8 ++++---- ui/src/components/editor/DoorChooser.vue | 6 +++--- ui/src/components/editor/DoorPlacer.vue | 6 +++--- ui/src/components/editor/PreviewDoor.vue | 8 ++++---- ui/src/lib/helpers.ts | 8 ++++---- ui/src/lib/rects/door.ts | 10 +++++----- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ui/src/components/Calendar.vue b/ui/src/components/Calendar.vue index 2a1a441..5750df4 100644 --- a/ui/src/components/Calendar.vue +++ b/ui/src/components/Calendar.vue @@ -30,7 +30,7 @@
- + import { API } from "@/lib/api"; import { APIError } from "@/lib/api_error"; -import { ensure_loaded, Like, name_door } from "@/lib/helpers"; +import { VueLike, name_door, unwrap_loading } from "@/lib/helpers"; import { ImageData } from "@/lib/model"; import { Door } from "@/lib/rects/door"; import { advent22Store } from "@/lib/store"; @@ -62,7 +62,7 @@ import CalendarDoor from "./calendar/CalendarDoor.vue"; import ThouCanvas from "./calendar/ThouCanvas.vue"; defineProps<{ - doors: Like[]; + doors: VueLike[]; }>(); const store = advent22Store(); diff --git a/ui/src/components/calendar/CalendarDoor.vue b/ui/src/components/calendar/CalendarDoor.vue index 2e46ab3..3096b27 100644 --- a/ui/src/components/calendar/CalendarDoor.vue +++ b/ui/src/components/calendar/CalendarDoor.vue @@ -17,14 +17,14 @@ import { Door } from "@/lib/rects/door"; import { advent22Store } from "@/lib/store"; -import { Like } from "@/lib/helpers"; +import { VueLike } from "@/lib/helpers"; import SVGRect from "./SVGRect.vue"; const store = advent22Store(); withDefaults( defineProps<{ - door: Like; + door: VueLike; force_visible?: boolean; }>(), { diff --git a/ui/src/components/calendar/SVGRect.vue b/ui/src/components/calendar/SVGRect.vue index e47fad4..ed4f205 100644 --- a/ui/src/components/calendar/SVGRect.vue +++ b/ui/src/components/calendar/SVGRect.vue @@ -20,7 +20,7 @@ diff --git a/ui/src/components/editor/DoorPlacer.vue b/ui/src/components/editor/DoorPlacer.vue index 9836491..a9a8bcd 100644 --- a/ui/src/components/editor/DoorPlacer.vue +++ b/ui/src/components/editor/DoorPlacer.vue @@ -9,19 +9,19 @@
- +
diff --git a/ui/src/components/editor/PreviewDoor.vue b/ui/src/components/editor/PreviewDoor.vue index 01ab9d7..a74f218 100644 --- a/ui/src/components/editor/PreviewDoor.vue +++ b/ui/src/components/editor/PreviewDoor.vue @@ -26,10 +26,10 @@ import { Door } from "@/lib/rects/door"; import { ref, useTemplateRef } from "vue"; -import { Like, unwrap_like, wait_for } from "@/lib/helpers"; +import { VueLike, unwrap_vuelike, wait_for } from "@/lib/helpers"; import SVGRect from "../calendar/SVGRect.vue"; -const model = defineModel>({ required: true }); +const model = defineModel>({ required: true }); const day_input = useTemplateRef("day_input"); const day_str = ref(""); @@ -46,7 +46,7 @@ function on_click(event: MouseEvent) { } if (editing.value) { - unwrap_like(model.value).day = day_str.value; + unwrap_vuelike(model.value).day = day_str.value; } else { wait_for( () => day_input.value !== null, @@ -63,7 +63,7 @@ function on_keydown(event: KeyboardEvent) { } if (event.key === "Enter") { - unwrap_like(model.value).day = day_str.value; + unwrap_vuelike(model.value).day = day_str.value; toggle_editing(); } else if (event.key === "Delete") { model.value.day = -1; diff --git a/ui/src/lib/helpers.ts b/ui/src/lib/helpers.ts index de4b307..cd6fcf3 100644 --- a/ui/src/lib/helpers.ts +++ b/ui/src/lib/helpers.ts @@ -12,9 +12,9 @@ export function objForEach( } } -export type Like = T | UnwrapRef; +export type VueLike = T | UnwrapRef; -export function unwrap_like(value: Like): T { +export function unwrap_vuelike(value: VueLike): T { return value as T; } @@ -27,8 +27,8 @@ export function loading_success(o: Loading): o is T { return true; } -export function ensure_loaded(o: Loading): T { - if (!loading_success(o)) throw ""; +export function unwrap_loading(o: Loading): T { + if (!loading_success(o)) throw null; return o; } diff --git a/ui/src/lib/rects/door.ts b/ui/src/lib/rects/door.ts index 87759cd..a3f5f28 100644 --- a/ui/src/lib/rects/door.ts +++ b/ui/src/lib/rects/door.ts @@ -1,4 +1,4 @@ -import { Like, unwrap_like } from "../helpers"; +import { VueLike, unwrap_vuelike } from "../helpers"; import { DoorSaved } from "../model"; import { Rectangle } from "./rectangle"; import { Vector2D } from "./vector2d"; @@ -9,11 +9,11 @@ export class Door { private _day = Door.MIN_DAY; public position: Rectangle; - constructor(position: Like); - constructor(position: Like, day: number); - constructor(position: Like, day = Door.MIN_DAY) { + constructor(position: VueLike); + constructor(position: VueLike, day: number); + constructor(position: VueLike, day = Door.MIN_DAY) { this.day = day; - this.position = unwrap_like(position); + this.position = unwrap_vuelike(position); } public get day(): number {