Merge pull request #3076 from SeedCompany/bugfix/types

Author: CarsonF

src/components/file/dto/node.ts

@@ -4,14 +4,15 @@ import { stripIndent } from 'common-tags';
 import { DateTime } from 'luxon';
 import { Readable } from 'stream';
 import { keys as keysOf } from 'ts-transformer-keys';
-import { MergeExclusive, Opaque } from 'type-fest';
+import { MergeExclusive } from 'type-fest';
 import { BaseNode } from '~/core/database/results';
 import { e } from '~/core/edgedb';
 import { RegisterResource } from '~/core/resources';
 import {
   DateTimeField,
   DbLabel,
   ID,
+  IdOf,
   InputException,
   NameField,
   Resource,
@@ -177,7 +178,7 @@ export abstract class SecuredFile extends SecuredProperty(File) {}
  */
 export type DefinedFile = Secured<FileId>;
 
-export type FileId = ID & Opaque<string, 'FileId'>;
+export type FileId = IdOf<'File'>;
 
 export const isDirectory = (node: AnyFileNode): node is Directory =>
   node.type === FileNodeType.Directory;

src/core/database/changes.ts

@@ -65,11 +65,15 @@ type ChangeKey<Key extends keyof T & string, T> = T[Key] extends SetChangeType<
 
 type ChangeOf<Val> = Val extends SetChangeType<any, infer Override>
   ? Override
-  : UnwrapSecured<Val> extends FileId
+  :
+      | RawChangeOf<UnwrapSecured<Val> & {}>
+      | (UnwrapSecured<Val> extends null ? null : unknown);
+
+type RawChangeOf<Val> = Val extends FileId
   ? CreateDefinedFileVersionInput
-  : UnwrapSecured<Val> extends LinkTo<any>
+  : Val extends LinkTo<any>
   ? ID
-  : UnwrapSecured<Val>;
+  : Val;
 
 /**
  * Only props of T that can be written directly to DB