Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions packages/nanoviews/src/flow/if.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import {
boolean
} from 'kida'
import type {
TruthyValueOrSignal,
FalsyValueOrSignal,
TruthySignalish,
FalsySignalish,
Child
} from '../internals/index.js'
import { swap_ } from './swap.js'
Expand All @@ -22,14 +22,14 @@ export function if_<T>($value: T) {
* @returns Block that renders decided child
*/
return (
then_: (value: TruthyValueOrSignal<T>) => Child,
else_?: (value: FalsyValueOrSignal<T>) => Child
then_: (value: TruthySignalish<T>) => Child,
else_?: (value: FalsySignalish<T>) => Child
) => swap_(
isAccessor($value) ? boolean($value) : $value as boolean,
confition => (
confition
? then_($value as TruthyValueOrSignal<T>)
: else_?.($value as FalsyValueOrSignal<T>)
? then_($value as TruthySignalish<T>)
: else_?.($value as FalsySignalish<T>)
)
)
}
8 changes: 4 additions & 4 deletions packages/nanoviews/src/internals/types/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@ export type AccessibleProps<T> = {
[K in keyof T]?: Signalish<T[K]>
}

export type TruthySignal<T> = T extends Accessor<infer U>
export type TruthyAccessor<T> = T extends Accessor<infer U>
? U extends FalsyValue
? never
: T
: never

export type TruthyValueOrSignal<T> = T extends Accessor<infer U>
export type TruthySignalish<T> = T extends Accessor<infer U>
? U extends FalsyValue
? never
: T
: T extends FalsyValue
? never
: T

export type FalsySignal<T> = T extends Accessor<infer U>
export type FalsyAccessor<T> = T extends Accessor<infer U>
? U extends FalsyValue
? T
: never
: never

export type FalsyValueOrSignal<T> = T extends Accessor<infer U>
export type FalsySignalish<T> = T extends Accessor<infer U>
? U extends FalsyValue
? T
: never
Expand Down