Skip to content

Commit a50ae3c

Browse files
committed
Fix FileId type conflicting with ID
1 parent b777cc0 commit a50ae3c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/components/file/dto/node.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ import { stripIndent } from 'common-tags';
44
import { DateTime } from 'luxon';
55
import { Readable } from 'stream';
66
import { keys as keysOf } from 'ts-transformer-keys';
7-
import { MergeExclusive, Opaque } from 'type-fest';
7+
import { MergeExclusive } from 'type-fest';
88
import { BaseNode } from '~/core/database/results';
99
import { e } from '~/core/edgedb';
1010
import { RegisterResource } from '~/core/resources';
1111
import {
1212
DateTimeField,
1313
DbLabel,
1414
ID,
15+
IdOf,
1516
InputException,
1617
NameField,
1718
Resource,
@@ -177,7 +178,7 @@ export abstract class SecuredFile extends SecuredProperty(File) {}
177178
*/
178179
export type DefinedFile = Secured<FileId>;
179180

180-
export type FileId = ID & Opaque<string, 'FileId'>;
181+
export type FileId = IdOf<'File'>;
181182

182183
export const isDirectory = (node: AnyFileNode): node is Directory =>
183184
node.type === FileNodeType.Directory;

0 commit comments

Comments
 (0)