Skip to content

renderer-three, ui: drop 'as unknown as' double-casts by widening signatures #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TSchonleber wants to merge 1 commit into
base: main
Choose a base branch
from
Open

renderer-three, ui: drop 'as unknown as' double-casts by widening signatures #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/renderer-three/src/three-scene-basics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ function isPlainCameraPosition(value: unknown): value is THREE.Vector3Tuple {
)
}

function isPlainGeometraThreeSceneBasicsOptionsRecord(o: Record<string, unknown>): boolean {
function isPlainGeometraThreeSceneBasicsOptionsRecord(value: unknown): boolean {
if (value === null || typeof value !== 'object') return false
const o = value as Record<string, unknown>
if (typeof o.threeBackgroundHex !== 'number' || !Number.isFinite(o.threeBackgroundHex)) {
return false
}
Expand All @@ -192,8 +194,7 @@ function isPlainGeometraThreeSceneBasicsOptionsRecord(o: Record<string, unknown>
export function isPlainGeometraThreeSceneBasicsOptions(
value: unknown,
): value is PlainGeometraThreeSceneBasicsOptions {
if (value === null || typeof value !== 'object') return false
return isPlainGeometraThreeSceneBasicsOptionsRecord(value as Record<string, unknown>)
return isPlainGeometraThreeSceneBasicsOptionsRecord(value)
}

/**
Expand All @@ -204,7 +205,7 @@ export function isPlainGeometraThreeSceneBasicsOptions(
*/
export function isPlainGeometraThreeHostSnapshot(value: unknown): value is PlainGeometraThreeHostSnapshot {
if (!isPlainGeometraThreeViewSizingState(value)) return false
return isPlainGeometraThreeSceneBasicsOptionsRecord(value as unknown as Record<string, unknown>)
return isPlainGeometraThreeSceneBasicsOptionsRecord(value)
}

/**
Expand Down
19 changes: 9 additions & 10 deletions packages/ui/src/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,25 +223,24 @@ export type DeepPartial<T> = {
[K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K]
}

function deepMerge(base: Record<string, unknown>, partial: Record<string, unknown>): Record<string, unknown> {
const result = { ...base }
for (const key of Object.keys(partial)) {
const val = partial[key]
function deepMerge<T extends object>(base: T, partial: DeepPartial<T>): T {
const result = { ...base } as Record<string, unknown>
const src = partial as Record<string, unknown>
for (const key of Object.keys(src)) {
const val = src[key]
if (val !== undefined && typeof val === 'object' && val !== null && !Array.isArray(val)) {
result[key] = deepMerge(
(base[key] ?? {}) as Record<string, unknown>,
val as Record<string, unknown>,
)
const existing = (result[key] ?? {}) as object
result[key] = deepMerge(existing, val as DeepPartial<object>)
} else if (val !== undefined) {
result[key] = val
}
}
return result
return result as T
}

/** Deep-merge a partial override onto the current theme. Returns a new `Theme`. */
export function mergeTheme(partial: DeepPartial<Theme>): Theme {
return deepMerge(peekTheme() as unknown as Record<string, unknown>, partial as unknown as Record<string, unknown>) as unknown as Theme
return deepMerge(peekTheme(), partial)
}

// ---------------------------------------------------------------------------
Expand Down