Fix types from recent changes (#2919)

Author: CarsonF

src/common/generate-id.ts

@@ -7,7 +7,8 @@ const alphabet =
   '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 const size = 11;
 
-export const generateId = customAlphabet(alphabet, size) as () => Promise<ID>;
+export const generateId: <TID extends ID = ID>() => Promise<TID> =
+  customAlphabet(alphabet, size) as any;
 
 export const isValidId = (value: unknown): value is ID => {
   if (typeof value !== 'string') {

src/common/resource.dto.ts

@@ -244,7 +244,9 @@ export class EnhancedResource<T extends ResourceShape<any>> {
     return this.dbLabels[0];
   }
   @Once()
-  get dbPropLabels() {
+  get dbPropLabels(): {
+    readonly [K in keyof T['prototype'] & string]?: readonly string[];
+  } {
     return mapValues.fromList(this.props, (prop) =>
       getDbPropertyLabels(this.type, prop),
     ).asRecord;

src/components/budget/budget.repository.ts

@@ -26,6 +26,7 @@ import {
   requestingUser,
   sorting,
 } from '../../core/database/query';
+import { FileId } from '../file';
 import { BudgetRecordRepository } from './budget-record.repository';
 import {
   Budget,
@@ -59,7 +60,7 @@ export class BudgetRepository extends DtoRepository<
 
   async create(
     input: CreateBudget,
-    universalTemplateFileId: ID,
+    universalTemplateFileId: FileId,
     session: Session,
   ) {
     const initialProps = {

src/components/budget/budget.service.ts

@@ -16,7 +16,7 @@ import {
 import { HandleIdLookup, ILogger, Logger, ResourceResolver } from '../../core';
 import { mapListResults } from '../../core/database/results';
 import { Privileges, ScopedRole } from '../authorization';
-import { FileService } from '../file';
+import { FileId, FileService } from '../file';
 import { ProjectChangeRequest } from '../project-change-request/dto';
 import { BudgetRecordRepository } from './budget-record.repository';
 import { BudgetRepository } from './budget.repository';
@@ -65,7 +65,7 @@ export class BudgetService {
       throw new NotFoundException('project does not exist', 'budget.projectId');
     }
 
-    const universalTemplateFileId = await generateId();
+    const universalTemplateFileId = await generateId<FileId>();
 
     try {
       const budgetId = await this.budgetRepo.create(

src/components/engagement/engagement.repository.ts

@@ -162,7 +162,7 @@ export class EngagementRepository extends CommonRepository {
     input: CreateLanguageEngagement,
     changeset?: ID,
   ) {
-    const pnpId = (await generateId()) as FileId;
+    const pnpId = await generateId<FileId>();
 
     const {
       projectId,
@@ -209,7 +209,7 @@ export class EngagementRepository extends CommonRepository {
     input: CreateInternshipEngagement,
     changeset?: ID,
   ) {
-    const growthPlanId = (await generateId()) as FileId;
+    const growthPlanId = await generateId<FileId>();
 
     const {
       projectId,

src/components/location/location.repository.ts

@@ -19,6 +19,7 @@ import {
   paginate,
   sorting,
 } from '../../core/database/query';
+import { FileId } from '../file';
 import { CreateLocation, Location, LocationListInput } from './dto';
 
 @Injectable()
@@ -33,7 +34,7 @@ export class LocationRepository extends DtoRepository(Location) {
   }
 
   async create(input: CreateLocation, session: Session) {
-    const mapImageId = await generateId();
+    const mapImageId = await generateId<FileId>();
 
     const initialProps = {
       name: input.name,

src/components/partnership/partnership.repository.ts

@@ -29,6 +29,7 @@ import {
   sorting,
   whereNotDeletedInChangeset,
 } from '../../core/database/query';
+import { FileId } from '../file';
 import {
   CreatePartnership,
   Partnership,
@@ -42,8 +43,8 @@ export class PartnershipRepository extends DtoRepository<
   [session: Session, view?: ObjectView]
 >(Partnership) {
   async create(input: CreatePartnership, session: Session, changeset?: ID) {
-    const mouId = await generateId();
-    const agreementId = await generateId();
+    const mouId = await generateId<FileId>();
+    const agreementId = await generateId<FileId>();
 
     const initialProps = {
       agreementStatus:

src/core/database/database.service.ts

@@ -273,7 +273,7 @@ export class DatabaseService {
       await this.updateProperty({
         type,
         object,
-        key: prop,
+        key: prop as any,
         value: change as any,
         changeset,
         permanentAfter,

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

@@ -2,34 +2,36 @@ import { entries } from '@seedcompany/common';
 import { node, Query, relation } from 'cypher-query-builder';
 import { DateTime } from 'luxon';
 import {
-  // eslint-disable-next-line @seedcompany/no-unused-vars -- used in jsdoc
-  DbLabel,
   EnhancedResource,
   generateId,
   ID,
+  MaybeUnsecuredInstance,
+  Resource,
   ResourceShape,
-  UnsecuredDto,
-} from '../../../common';
+} from '~/common';
 import { FileId } from '../../../components/file';
 import { Variable } from '../query-augmentation/condition-variables';
 
 export interface CreateNodeOptions<TResourceStatic extends ResourceShape<any>> {
-  initialProps?: InitialPropsOf<UnsecuredDto<TResourceStatic['prototype']>>;
+  initialProps?: InitialPropsOf<
+    MaybeUnsecuredInstance<TResourceStatic> &
+      Partial<Pick<Resource, 'id' | 'createdAt'>>
+  >;
   baseNodeProps?: Record<string, any>;
 }
 
 type InitialPropsOf<T> = {
-  [K in keyof T]?: Variable | (T[K] extends FileId ? ID : T[K]);
+  [K in keyof T & string]?: Variable | (T[K] extends FileId ? ID : T[K]);
 };
 
 /**
  * This aids in composing create statements for a new base node and its initial properties.
  *
  * id & createdAt properties are generated and applied automatically.
  * BaseNode labels are pulled from the resource's class hierarchy or manually
- * defined with {@link DbLabel @DbLabel()}
+ * defined with {@link import('~/common').DbLabel @DbLabel()}
  *
- * Any unique labels for properties are pulled from {@link DbLabel @DbLabel()}
+ * Any unique labels for properties are pulled from {@link import('~/common').DbLabel @DbLabel()}
  * decoration on the resource's properties.
  *
  * Note that we need to define all properties at create even if they are null/undefined.