Drop IdOf

Author: CarsonF

src/common/types/id.ts

@@ -7,9 +7,6 @@ export const isIdLike = (value: unknown): value is ID =>
 export type ID<Kind extends IDKindLike = any> = Tagged<string, 'ID'> &
   IDTo<IDTag<Kind>>;
 
-/** @deprecated Use {@link ID} */
-export type IdOf<Kind extends IDKindLike> = ID<Kind>;
-
 declare const IDTo: unique symbol;
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 type IDTo<T> = { readonly [IDTo]: T };

src/components/file/dto/file.dto.ts

@@ -8,7 +8,6 @@ import {
   DateTimeField,
   DbLabel,
   type ID,
-  type IdOf,
   InputException,
   NameField,
   Resource,
@@ -169,7 +168,7 @@ export abstract class SecuredFileVersion extends SecuredProperty(FileVersion) {}
  */
 export type DefinedFile = Secured<FileId>;
 
-export type FileId = IdOf<'File'>;
+export type FileId = ID<'File'>;
 
 export const isDirectory = (node: AnyFileNode): node is Directory =>
   node.type === FileNodeType.Directory;

src/components/file/media/media.dto.ts

@@ -13,7 +13,6 @@ import {
   DbLabel,
   type ID,
   IdField,
-  type IdOf,
   IntersectTypes,
   NameField,
   ServerException,
@@ -73,7 +72,7 @@ export class Media extends MediaUserMetadata {
   @IdField()
   readonly id: ID;
 
-  readonly file: IdOf<FileVersion>;
+  readonly file: ID<FileVersion>;
 
   /** The resource that holds the root file node that this media is attached to */
   readonly attachedTo: [resource: BaseNode, relation: string];

src/components/file/media/media.service.ts

@@ -3,7 +3,7 @@ import { ModuleRef } from '@nestjs/core';
 import type { RequireAtLeastOne } from 'type-fest';
 import {
   createAndInject,
-  type IdOf,
+  type ID,
   NotFoundException,
   Polls,
   ServerException,
@@ -31,7 +31,7 @@ export class MediaService {
       return null;
     }
     return await this.repo.save({
-      file: file.id as IdOf<FileVersion>,
+      file: file.id as ID<FileVersion>,
       mimeType: file.mimeType,
       ...media,
       ...metadata,

src/components/location/migrations/default-marketing-region.migration.ts

@@ -1,7 +1,7 @@
 import { mapEntries } from '@seedcompany/common';
 import { node, relation } from 'cypher-query-builder';
 import { type ValueOf } from 'type-fest';
-import { type ID, type IdOf } from '~/common';
+import { type ID } from '~/common';
 import { BaseMigration, Migration } from '~/core/database';
 import { ACTIVE } from '~/core/database/query';
 import { type Location } from '../dto';
@@ -40,7 +40,7 @@ export class DefaultMarketingRegionMigration extends BaseMigration {
         node('locName', 'LocationName'),
       ])
       .return<{
-        id: IdOf<Location>;
+        id: ID<Location>;
         name: ValueOf<typeof fieldRegionNameToMarketingRegionName>;
       }>(['location.id as id', 'locName.value as name'])
       .run();

src/components/progress-report/community-stories/progress-report-community-story.resolver.ts

@@ -5,7 +5,7 @@ import {
   ResolveField,
   Resolver,
 } from '@nestjs/graphql';
-import { IdArg, type IdOf } from '~/common';
+import { type ID, IdArg } from '~/common';
 import { Loader, type LoaderOf } from '~/core';
 import { PeriodicReportLoader } from '../../periodic-report';
 import { type PeriodicReport } from '../../periodic-report/dto';
@@ -55,7 +55,7 @@ export class ProgressReportCommunityStoryResolver {
 
   @Mutation(() => ProgressReport)
   async deleteProgressReportCommunityStory(
-    @IdArg() id: IdOf<PromptVariantResponse>,
+    @IdArg() id: ID<PromptVariantResponse>,
     @Loader(PeriodicReportLoader) reports: LoaderOf<PeriodicReportLoader>,
   ): Promise<PeriodicReport> {
     const response = await this.service.delete(id);

src/components/progress-report/highlights/progress-report-highlights.resolver.ts

@@ -5,7 +5,7 @@ import {
   ResolveField,
   Resolver,
 } from '@nestjs/graphql';
-import { IdArg, type IdOf } from '~/common';
+import { type ID, IdArg } from '~/common';
 import { Loader, type LoaderOf } from '~/core';
 import { PeriodicReportLoader } from '../../periodic-report';
 import { type PeriodicReport } from '../../periodic-report/dto';
@@ -55,7 +55,7 @@ export class ProgressReportHighlightsResolver {
 
   @Mutation(() => ProgressReport)
   async deleteProgressReportHighlight(
-    @IdArg() id: IdOf<PromptVariantResponse>,
+    @IdArg() id: ID<PromptVariantResponse>,
     @Loader(PeriodicReportLoader) reports: LoaderOf<PeriodicReportLoader>,
   ): Promise<PeriodicReport> {
     const response = await this.service.delete(id);

src/components/progress-report/media/dto/media.dto.ts

@@ -2,8 +2,8 @@ import { Field, InputType, ObjectType } from '@nestjs/graphql';
 import { setOf } from '@seedcompany/common';
 import {
   EnhancedResource,
+  type ID,
   IdField,
-  type IdOf,
   Resource,
   Variant,
   type VariantOf,
@@ -18,7 +18,7 @@ import { type ProgressReport } from '../../dto';
 import { ProgressReportHighlight } from '../../dto/highlights.dto';
 import { MediaCategory } from '../media-category.enum';
 
-export type VariantGroup = IdOf<'ProgressReportMediaVariantGroup'>;
+export type VariantGroup = ID<'ProgressReportMediaVariantGroup'>;
 
 @RegisterResource({ db: e.ProgressReport.Media })
 @InputType({ isAbstract: true })
@@ -41,15 +41,15 @@ export class ProgressReportMedia extends Resource {
     ProgressReportHighlight.Variants.slice(-1).map((v) => v.key),
   );
 
-  readonly report: IdOf<ProgressReport>;
+  readonly report: ID<ProgressReport>;
 
   @Field(() => Variant)
   readonly variant: Variant<MediaVariant> & SetDbType<MediaVariant>;
 
   @Field(() => MediaCategory, { nullable: true })
   readonly category?: MediaCategory | null;
 
-  readonly media: IdOf<Media>;
+  readonly media: ID<Media>;
   readonly file: FileId;
 
   @IdField()

src/components/progress-report/media/progress-report-media.repository.ts

@@ -4,7 +4,6 @@ import {
   CreationFailed,
   generateId,
   type ID,
-  type IdOf,
   InputException,
   NotFoundException,
 } from '~/common';
@@ -84,7 +83,7 @@ export class ProgressReportMediaRepository extends DtoRepository(ReportMedia) {
       .run();
   }
 
-  async readFeaturedOfReport(ids: ReadonlyArray<IdOf<Report>>) {
+  async readFeaturedOfReport(ids: ReadonlyArray<ID<Report>>) {
     return await this.db
       .query()
       .matchNode('report', 'ProgressReport')

src/components/progress-report/media/progress-report-media.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import {
   generateId,
-  type IdOf,
+  type ID,
   NotImplementedException,
   type UnsecuredDto,
 } from '~/common';
@@ -49,14 +49,14 @@ export class ProgressReportMediaService {
     throw new NotImplementedException().with(media);
   }
 
-  async readMany(ids: ReadonlyArray<IdOf<ReportMedia>>) {
+  async readMany(ids: ReadonlyArray<ID<ReportMedia>>) {
     const row = await this.repo.readMany(ids);
     return row.map((row) =>
       this.privileges.for(ReportMedia).secure(this.dbRowToDto(row)),
     );
   }
 
-  async readFeaturedOfReport(ids: ReadonlyArray<IdOf<Report>>) {
+  async readFeaturedOfReport(ids: ReadonlyArray<ID<Report>>) {
     const rows = await this.repo.readFeaturedOfReport(ids);
     return rows.map((row) =>
       this.privileges.for(ReportMedia).secure(this.dbRowToDto(row)),
@@ -109,7 +109,7 @@ export class ProgressReportMediaService {
     return updated;
   }
 
-  async delete(id: IdOf<ReportMedia>) {
+  async delete(id: ID<ReportMedia>) {
     const media = await this.repo.readOne(id);
     this.privileges
       .for(ReportMedia, this.dbRowToDto(media))