Skip to content
Closed
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
10 changes: 10 additions & 0 deletions ark/schema/__tests__/morphs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@ contextualize(() => {
attest(n.rawOut.expression).snap("number")
})

it("unions declared morphs", () => {
const morph = (value: string) => value
const n = rootSchema([
{ declaredIn: intrinsic.string, morphs: morph },
{ declaredIn: intrinsic.string, morphs: morph }
])

attest(n.rawIn.expression).equals("string")
})

contextualize.each(
"declared",
() => {
Expand Down
6 changes: 5 additions & 1 deletion ark/schema/roots/union.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,13 @@ const implementation: nodeImplementationOf<Union.Declaration> =
const matchingMorph = branches[
matchingMorphIndex
] as Morph.Node
const mergedIn =
matchingMorph.inner.in && node.inner.in ?
matchingMorph.inner.in.rawOr(node.inner.in)
: matchingMorph.rawIn.rawOr(node.rawIn)
branches[matchingMorphIndex] = ctx.$.node("morph", {
...matchingMorph.inner,
in: matchingMorph.rawIn.rawOr(node.rawIn)
in: mergedIn
})
}
} else branches.push(node)
Expand Down
21 changes: 21 additions & 0 deletions ark/type/__tests__/narrow.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,25 @@ contextualize(() => {
attest(T.t).type.toString.snap("unknown")
attest(T.json).snap({ predicate: ["$ark.unknownPredicate854"] })
})

it("preserves piped branch input narrows through an intersection", () => {
const PipedItem = type("string.numeric & string.numeric.parse").narrow(
(_data, ctx) => ctx.reject("always reject")
)
const UnpipedItem = type("string").narrow((_data, ctx) =>
ctx.reject("always reject")
)
const Variant = type({ kind: "'a'", value: PipedItem }).or({
kind: "'b'",
value: UnpipedItem
})
const Meta = type({ code: type("string.numeric.parse") }).narrow(() => true)
const Thing = Variant.and(Meta)

attest(
Thing({ kind: "a", code: "1", value: "1" })
.toString()
.includes("always reject")
).equals(true)
})
})
Loading