diff --git a/chuchi-core/src/api/ApiError.ts b/chuchi-core/src/api/ApiError.ts index 6863f71..46af81e 100644 --- a/chuchi-core/src/api/ApiError.ts +++ b/chuchi-core/src/api/ApiError.ts @@ -47,11 +47,16 @@ export default class ApiError { static fromJson(obj: any): ApiError { if (typeof obj === 'string') return new ApiError(obj, null); + if (!obj || typeof obj !== 'object') + return ApiError.newOther('unexpected error response: ' + obj); + // {kind, data} if ('kind' in obj) return new ApiError(obj.kind, obj?.data ?? null); // {'kind': data} - const [kind, data] = Object.entries(obj)[0]; + const entry = Object.entries(obj)[0]; + if (!entry) return ApiError.newOther('empty error response'); + const [kind, data] = entry; return new ApiError(kind, data); } diff --git a/chuchi-legacy/src/dom/utils.ts b/chuchi-legacy/src/dom/utils.ts index a5b94c1..61f9f8b 100644 --- a/chuchi-legacy/src/dom/utils.ts +++ b/chuchi-legacy/src/dom/utils.ts @@ -74,10 +74,8 @@ export function inViewY(el: Element) { const wHeight = window.innerHeight; const { top, bottom } = el.getBoundingClientRect(); - const topInView = top >= 0 && top <= wHeight; - const bottomInView = bottom >= 0 && bottom <= wHeight; - - return topInView || bottomInView; + // also true if the element is taller than the viewport and covers it + return top <= wHeight && bottom >= 0; } // name --my-var diff --git a/chuchi-utils/src/collections/SlotArray.ts b/chuchi-utils/src/collections/SlotArray.ts index 673766e..a6039d1 100644 --- a/chuchi-utils/src/collections/SlotArray.ts +++ b/chuchi-utils/src/collections/SlotArray.ts @@ -71,7 +71,8 @@ export default class SlotArray { * @param id - The index to remove the item from. */ remove(id: number) { - if (this.inner.length <= id) return; + // removing twice would add the slot twice to free + if (this.inner.length <= id || this.inner[id] === null) return; this.inner[id] = null; this.free.push(id); diff --git a/chuchi-utils/src/index.ts b/chuchi-utils/src/index.ts index a8f3b4f..59290d1 100644 --- a/chuchi-utils/src/index.ts +++ b/chuchi-utils/src/index.ts @@ -82,14 +82,12 @@ export function randomToken(length: number = 8): string { * @param step - The step size between values, defaults to 1. * @returns The generated array. */ -// todo improve this function export function range(start: number, end: number, step: number = 1): number[] { - const len = end - start / step; + // preallocating is a lot faster than push for bigger ranges + const len = step > 0 ? Math.max(0, Math.ceil((end - start) / step)) : 0; const ar = new Array(len); - let c = 0; - for (let i = start; i < end; i += step) { - ar[c] = i; - c += 1; + for (let c = 0; c < len; c++) { + ar[c] = start + c * step; } return ar; } diff --git a/chuchi-utils/src/search.ts b/chuchi-utils/src/search.ts index 2723d62..40a1bf7 100644 --- a/chuchi-utils/src/search.ts +++ b/chuchi-utils/src/search.ts @@ -17,7 +17,7 @@ export function searchScore(search: string, val: string): number { if (i === -1) return 0; const distLeft = searchSpaceLeft(i, val); - const distRight = searchSpaceLeft(i + search.length, val); + const distRight = searchSpaceRight(i + search.length - 1, val); return 1 + distLeft + distRight; } @@ -35,9 +35,6 @@ function searchSpaceLeft(idx: number, val: string): number { } // calculate distance to space right of -// todo is this used??? -// @ts-ignore -/* eslint-disable @typescript-eslint/no-unused-vars */ function searchSpaceRight(idx: number, val: string): number { let dist = 0; while (idx < val.length - 1) { diff --git a/chuchi/src/routing/Router.ts b/chuchi/src/routing/Router.ts index ad2ae61..7e6e88b 100644 --- a/chuchi/src/routing/Router.ts +++ b/chuchi/src/routing/Router.ts @@ -165,7 +165,7 @@ export default class Router { */ pushReq(req: Request): void { this.currentRequest.setSilent(req); - window.history.pushState(req.toHistoryState(), '', req.uri); + window.history.pushState(req.toHistoryState(), '', historyUrl(req)); this.currentRequest.notify(); } @@ -174,7 +174,7 @@ export default class Router { */ replaceReq(req: Request): void { this.currentRequest.setSilent(req); - window.history.replaceState(req.toHistoryState(), '', req.uri); + window.history.replaceState(req.toHistoryState(), '', historyUrl(req)); this.currentRequest.notify(); } @@ -273,9 +273,13 @@ export default class Router { } if (history === 'replace') { - window.history.replaceState(req.toHistoryState(), '', req.uri); + window.history.replaceState( + req.toHistoryState(), + '', + historyUrl(req), + ); } else if (history === 'push') { - window.history.pushState(req.toHistoryState(), '', nUri); + window.history.pushState(req.toHistoryState(), '', historyUrl(req)); } this.currentRequest.set(req); @@ -403,6 +407,16 @@ export default class Router { } } +/** + * Returns the url to store in the history + * + * The uri alone is not enough, a path starting with // would be read as + * another host and pushState would throw + */ +function historyUrl(req: Request): string { + return window.location.origin + req.uri; +} + /** * Returns true if the click should be intercepted */