Merge pull request #3411 from SeedCompany/ts-plugin-resources

Author: CarsonF

package.json

@@ -144,7 +144,6 @@
     "ts-morph": "^25.0.1",
     "ts-node": "^10.9.1",
     "ts-patch": "^3.0.2",
-    "ts-transformer-keys": "^0.4.4",
     "type-fest": "^4.15.0",
     "typescript": "~5.8.3",
     "typescript-transform-paths": "^3.4.6"

src/app.module.ts

@@ -1,7 +1,5 @@
 import { Module } from '@nestjs/common';
 import process from 'node:process';
-import { assert } from 'ts-essentials';
-import { keys } from 'ts-transformer-keys';
 import { AdminModule } from './components/admin/admin.module';
 import { AuthenticationModule } from './components/authentication/authentication.module';
 import { AuthorizationModule } from './components/authorization/authorization.module';
@@ -45,11 +43,6 @@ import { CoreModule, LoggerModule } from './core';
 
 import '@seedcompany/nest/patches';
 
-assert(
-  keys<{ foo: string }>().length === 1,
-  'Sanity check for key transformer failed',
-);
-
 if (process.env.NODE_ENV !== 'production') {
   Error.stackTraceLimit = Infinity;
 }

src/common/keysOf.spec.ts

@@ -10,7 +10,6 @@ import {
 import { createMetadataDecorator } from '@seedcompany/nest';
 import { LazyGetter as Once } from 'lazy-get-decorator';
 import { DateTime } from 'luxon';
-import { keys as keysOf } from 'ts-transformer-keys';
 import type {
   ResourceDBMap,
   ResourceLike,
@@ -53,9 +52,6 @@ export const resolveByTypename =
 })
 @DbLabel('BaseNode')
 export abstract class Resource extends DataObject {
-  static readonly Props: string[] = keysOf<Resource>();
-  static readonly SecuredProps: string[] = [];
-
   readonly __typename?: string;
 
   @IdField()
@@ -77,8 +73,8 @@ export abstract class Resource extends DataObject {
 type Thunk<T> = T | (() => T);
 
 export type ResourceShape<T> = AbstractClassType<T> & {
-  Props: string[];
-  SecuredProps: string[];
+  Props?: string[];
+  SecuredProps?: string[];
   // An optional list of props that exist on the BaseNode in the DB.
   // Default should probably be considered the props on Resource class.
   BaseNodeProps?: string[];
@@ -195,12 +191,24 @@ export class EnhancedResource<T extends ResourceShape<any>> {
 
   @Once()
   get props(): ReadonlySet<keyof T['prototype'] & string> {
-    return new Set<keyof T['prototype'] & string>(this.type.Props as any);
+    const props = this.type.Props;
+    if (!props) {
+      throw new Error(
+        `${this.name} has no props declared.\n\nDecorate with @RegisterResource or a GraphQL type decorator and move it to a file named: *.dto.ts.`,
+      );
+    }
+    return new Set<keyof T['prototype'] & string>(props);
   }
 
   @Once()
   get securedProps(): ReadonlySet<SecuredResourceKey<T, false>> {
-    return new Set<SecuredResourceKey<T, false>>(this.type.SecuredProps as any);
+    const props = this.type.SecuredProps;
+    if (!props) {
+      throw new Error(
+        `${this.name} has no props declared.\n\nDecorate with @RegisterResource or a GraphQL type decorator and move it to a file named: *.dto.ts.`,
+      );
+    }
+    return new Set<SecuredResourceKey<T, false>>(props as any);
   }
 
   @Once()

src/common/resource.dto.ts

@@ -22,7 +22,7 @@ import { ForgotPassword } from '~/core/email/templates';
 import { disableAccessPolicies, Gel } from '~/core/gel';
 import { Privileges } from '../authorization';
 import { rolesForScope, withoutScope } from '../authorization/dto';
-import { AssignableRoles } from '../authorization/dto/assignable-roles';
+import { AssignableRoles } from '../authorization/dto/assignable-roles.dto';
 import { SystemAgentRepository } from '../user/system-agent.repository';
 import { AuthenticationRepository } from './authentication.repository';
 import { CryptoService } from './crypto.service';

src/components/authentication/authentication.service.ts

@@ -1,5 +1,5 @@
 import { type Role } from '~/common';
-import { AssignableRoles } from './dto/assignable-roles';
+import { AssignableRoles } from './dto/assignable-roles.dto';
 import { Granter, ResourceGranter } from './policy';
 
 @Granter(AssignableRoles)

src/components/authorization/assignable-roles.granter.ts

@@ -17,8 +17,6 @@ import { RegisterResource } from '~/core/resources';
 @RegisterResource()
 @Calculated()
 export class AssignableRoles {
-  static Props = [];
-  static SecuredProps = [];
   static Relations = mapValues.fromList(Role, () => undefined)
     .asRecord satisfies ResourceRelationsShape;
 }

src/components/authorization/dto/assignable-roles.ts renamed to src/components/authorization/dto/assignable-roles.dto.ts

@@ -1,5 +1,4 @@
 import { Field, ObjectType } from '@nestjs/graphql';
-import { keys as keysOf } from 'ts-transformer-keys';
 import { Calculated, type ResourceRelationsShape } from '~/common';
 import { RegisterResource } from '~/core/resources';
 import { Granter, ResourceGranter } from '../policy';
@@ -10,9 +9,6 @@ import { Granter, ResourceGranter } from '../policy';
 @Calculated()
 @ObjectType()
 export class BetaFeatures {
-  static readonly Props = keysOf<BetaFeatures>();
-  static readonly SecuredProps = [];
-
   // Declaring as relations as well so privileges can use.
   static readonly Relations = {
     projectChangeRequests: undefined,

src/components/authorization/dto/beta-features.dto.ts

@@ -1,5 +1,4 @@
 import { Field, ObjectType } from '@nestjs/graphql';
-import { keys as keysOf } from 'ts-transformer-keys';
 import {
   Calculated,
   type ID,
@@ -8,7 +7,6 @@ import {
   type Secured,
   SecuredFloatNullable,
   SecuredInt,
-  type SecuredProps,
   Sensitivity,
   SensitivityField,
 } from '~/common';
@@ -27,8 +25,6 @@ const Interfaces = IntersectTypes(Resource, ChangesetAware);
   implements: Interfaces.members,
 })
 export class BudgetRecord extends Interfaces {
-  static readonly Props = keysOf<BudgetRecord>();
-  static readonly SecuredProps = keysOf<SecuredProps<BudgetRecord>>();
   static readonly Parent = () => import('./budget.dto').then((m) => m.Budget);
 
   @Field(() => Budget)

src/components/budget/dto/budget-record.dto.ts

@@ -1,13 +1,11 @@
 import { Field, ObjectType } from '@nestjs/graphql';
-import { keys as keysOf } from 'ts-transformer-keys';
 import {
   Calculated,
   DbLabel,
   IntersectTypes,
   Resource,
   type ResourceRelationsShape,
   SecuredProperty,
-  type SecuredProps,
   Sensitivity,
   SensitivityField,
 } from '~/common';
@@ -28,8 +26,6 @@ const Interfaces = IntersectTypes(Resource, ChangesetAware);
   implements: Interfaces.members,
 })
 export class Budget extends Interfaces {
-  static readonly Props = keysOf<Budget>();
-  static readonly SecuredProps = keysOf<SecuredProps<Budget>>();
   static readonly Relations = (() => ({
     records: [BudgetRecord],
   })) satisfies ResourceRelationsShape;