Accept LinkTo<File> anywhere FileId is used

Author: CarsonF

src/components/file/file.service.ts

@@ -16,7 +16,9 @@ import {
   generateId,
   ID,
   InputException,
+  isIdLike,
   NotFoundException,
+  Secured,
   ServerException,
   Session,
   UnauthorizedException,
@@ -26,17 +28,18 @@ import {
   ConfigService,
   IEventBus,
   ILogger,
+  LinkTo,
   Logger,
   RollbackManager,
 } from '~/core';
 import { FileBucket } from './bucket';
 import {
   CreateDefinedFileVersionInput,
   CreateFileVersionInput,
-  DefinedFile,
   Directory,
   Downloadable,
   File,
+  FileId,
   FileListInput,
   FileListOutput,
   FileNode,
@@ -528,7 +531,7 @@ export class FileService {
   async updateDefinedFile<
     Input extends CreateDefinedFileVersionInput | undefined,
   >(
-    file: DefinedFile,
+    file: Secured<FileId | LinkTo<'File'>>,
     field: string,
     input: Input,
     session: Session,
@@ -545,10 +548,11 @@ export class FileService {
         field,
       );
     }
+    const fileId = isIdLike(file.value) ? file.value : file.value.id;
     try {
       return await this.createFileVersion(
         {
-          parentId: file.value,
+          parentId: fileId,
           ...input,
         },
         session,

src/components/file/resolve-defined-file.ts

@@ -1,13 +1,21 @@
 import { LoaderOf } from '@seedcompany/data-loader';
-import { mapSecuredValue, NotFoundException, ServerException } from '~/common';
-import { DefinedFile, isFile, SecuredFile } from './dto';
+import {
+  isIdLike,
+  mapSecuredValue,
+  NotFoundException,
+  Secured,
+  ServerException,
+} from '~/common';
+import { LinkTo } from '~/core';
+import { FileId, isFile, SecuredFile } from './dto';
 import { FileNodeLoader } from './file-node.loader';
 
 export async function resolveDefinedFile(
   loader: LoaderOf<FileNodeLoader>,
-  input: DefinedFile,
+  input: Secured<FileId | LinkTo<'File'>>,
 ): Promise<SecuredFile> {
-  return await mapSecuredValue(input, async (fileId) => {
+  return await mapSecuredValue(input, async (file) => {
+    const fileId = isIdLike(file) ? file : file.id;
     try {
       const file = await loader.load(fileId);
       if (!isFile(file)) {

src/core/database/changes.ts

@@ -57,7 +57,7 @@ type ChangeKey<Key extends keyof T & string, T> = T[Key] extends SetChangeType<
   ? Override extends string
     ? Override
     : never
-  : UnwrapSecured<T[Key]> extends FileId
+  : UnwrapSecured<T[Key]> extends FileId | LinkTo<'File'>
   ? Key
   : NonNullable<UnwrapSecured<T[Key]>> extends ID | LinkTo<any>
   ? `${Key}Id` // our convention for single relationships
@@ -69,7 +69,7 @@ type ChangeOf<Val> = Val extends SetChangeType<any, infer Override>
       | RawChangeOf<UnwrapSecured<Val> & {}>
       | (UnwrapSecured<Val> extends null ? null : unknown);
 
-type RawChangeOf<Val> = Val extends FileId
+type RawChangeOf<Val> = Val extends FileId | LinkTo<'File'>
   ? CreateDefinedFileVersionInput
   : Val extends LinkTo<any>
   ? ID

src/core/database/query/create-node.ts

@@ -9,6 +9,7 @@ import {
   ResourceShape,
   UnsecuredDto,
 } from '~/common';
+import { LinkTo } from '~/core';
 import { FileId } from '../../../components/file';
 import { Variable } from '../query-augmentation/condition-variables';
 
@@ -21,7 +22,9 @@ export interface CreateNodeOptions<TResourceStatic extends ResourceShape<any>> {
 }
 
 type InitialPropsOf<T> = {
-  [K in keyof T & string]?: Variable | (T[K] extends FileId ? ID : T[K]);
+  [K in keyof T & string]?:
+    | Variable
+    | (T[K] extends FileId | LinkTo<'File'> ? ID : T[K]);
 };
 
 /**