Skip to content

Commit c4ee42b

Browse files
committed
Change DBType<any> to return e.Resource instead of never
1 parent 3dbaeef commit c4ee42b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/common/resource.dto.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { DateTime } from 'luxon';
55
import { keys as keysOf } from 'ts-transformer-keys';
66
import { inspect } from 'util';
77
import type { ResourceDBMap, ResourceMap } from '~/core';
8-
import { $ } from '~/core/edgedb/reexports';
8+
import { $, e } from '~/core/edgedb/reexports';
99
import { ScopedRole } from '../components/authorization';
1010
import { CalculatedSymbol } from './calculated.decorator';
1111
import { DataObject } from './data-object';
@@ -297,7 +297,9 @@ export type ResourceName<TResourceStatic extends ResourceShape<any>> =
297297
string;
298298

299299
export type DBType<TResourceStatic extends ResourceShape<any>> =
300-
ResourceName<TResourceStatic> extends keyof ResourceDBMap
300+
ResourceShape<any> extends TResourceStatic
301+
? typeof e.Resource // short-circuit non-specific types
302+
: ResourceName<TResourceStatic> extends keyof ResourceDBMap
301303
? ResourceDBMap[ResourceName<TResourceStatic>] extends infer T extends $.$expr_PathNode
302304
? T
303305
: never

0 commit comments

Comments
 (0)