Skip to content

refactor wip OmegaWrapper #288

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
jfet97 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

refactor wip OmegaWrapper #288

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ab83a0
refactor: improve type safety for excluded props in OmegaWrapper
jfet97 Aug 1, 2025
ee285f3
refactor: enhance type safety in form options handling
jfet97 Aug 1, 2025
5e6ac27
more precise?
jfet97 Aug 1, 2025
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
22 changes: 14 additions & 8 deletions packages/vue-components/src/components/OmegaForm/OmegaWrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,28 +107,36 @@ onBeforeMount(() => {
if (!props.form) return
const formOptionsKeys = Object.keys(props.form.options || {})

const excludedKeys: Set<keyof typeof props> = new Set([
const excludedKeys = new Set([
"omegaConfig",
"subscribe",
"showErrorsOn",
"asyncAlways",
"form",
"schema",
])
]) satisfies Set<keyof typeof props>
type ExcludedKeys = typeof excludedKeys extends Set<infer U> ? U : never

const filteredProps = Object.fromEntries(
Object.entries(props).filter(
([key, value]) =>
!excludedKeys.has(key as keyof typeof props) && value !== undefined,
!excludedKeys.has(key as ExcludedKeys) && value !== undefined,
),
) as Partial<typeof props>
) as typeof props extends infer TOP
? {
[K in keyof TOP as K extends ExcludedKeys ? never : K]-?: NonNullable<
TOP[K]
>
}
: never

const propsKeys = Object.keys(filteredProps)

const overlappingKeys = formOptionsKeys.filter(
key =>
propsKeys.includes(key) &&
filteredProps[key as keyof typeof props] !== undefined,
key in filteredProps &&
filteredProps[key as keyof typeof filteredProps] !== undefined,
)

if (overlappingKeys.length > 0) {
Expand All @@ -146,9 +154,7 @@ onBeforeMount(() => {

formToUse.value.options = Object.fromEntries(
// TODO
(Object.entries(mergedOptions) as any).filter(
([_, value]: any) => value !== undefined,
),
Object.entries(mergedOptions).filter(([_, value]) => value !== undefined),
)
})

Expand Down