Skip to content

Commit 2b0f671

Browse files
committed
1 parent 6dbd304 commit 2b0f671

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@
4444
"typescript": "^3.5.1"
4545
},
4646
"dependencies": {
47-
"type-mapping": "^1.17.0"
47+
"type-mapping": "^1.19.3"
4848
}
4949
}

src/column-map/util/predicate/assert-is-null-safe-comparable.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {ColumnMap} from "../../column-map";
22
import {IsNullSafeComparable, isNullSafeComparable} from "./is-null-safe-comparable";
33
import {CompileError} from "../../../compile-error";
44
import {TypeMapUtil} from "../../../type-map";
5-
import * as TypeUtil from "../../../type-util";
65
import {tableAlias} from "../query";
76
import {Writable} from "../../../type-util";
87

src/raw-expr/util/operation/intersect-used-ref.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {AnyRawExpr} from "../../raw-expr";
22
import {usedRef, UsedRef} from "../query";
3-
import {UsedRefUtil} from "../../../used-ref";
3+
import {UsedRefUtil, IUsedRef} from "../../../used-ref";
44

55
/**
66
* Assumes `U` is a union
@@ -12,6 +12,8 @@ import {UsedRefUtil} from "../../../used-ref";
1212
export type IntersectUsedRef<
1313
U extends AnyRawExpr
1414
> = (
15+
UsedRef<U> extends never ?
16+
IUsedRef<{}> :
1517
UsedRefUtil.Intersect<
1618
UsedRef<U>
1719
>
@@ -26,6 +28,6 @@ export function intersectUsedRef<
2628
) {
2729
const result : IntersectUsedRef<ArrT[number]> = UsedRefUtil.intersect(...arr.map(
2830
u => usedRef<ArrT[number]>(u)
29-
));
31+
)) as IntersectUsedRef<ArrT[number]>;
3032
return result;
3133
}

0 commit comments

Comments
 (0)