Skip to content

Commit

Permalink
Fix incorrect usage of Js_
Browse files Browse the repository at this point in the history
  • Loading branch information
dfalling committed Apr 19, 2022
1 parent 46c97e7 commit c176abd
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ module FieldMerge = {
// FieldMergeFunction<TExisting, TIncoming, TOptions> | boolean;
module FieldMergeUnion: {
type t<'existing>
let mergeFunction: FieldMergeFunction.t<'existing> => t<'existing>
let mergeFunction: FieldMergeFunction.Js_.t<'existing> => t<'existing>
let true_: t<'existing>
} = {
@unboxed
type rec t<'existing> = Any('a): t<'existing>
let mergeFunction = (v: FieldMergeFunction.t<'existing>) => Any(v)
let mergeFunction = (v: FieldMergeFunction.Js_.t<'existing>) => Any(v)
let true_ = Any(true)
}

Expand All @@ -130,7 +130,8 @@ module FieldMerge = {

let toJs: t<'existing> => Js_.t<'existing> = x =>
switch x {
| MergeFunction(mergeFunction) => mergeFunction->Js_.FieldMergeUnion.mergeFunction
| MergeFunction(mergeFunction) =>
mergeFunction->FieldMergeFunction.toJs->Js_.FieldMergeUnion.mergeFunction
| True => Js_.FieldMergeUnion.true_
}
}
Expand Down

0 comments on commit c176abd

Please sign in to comment.