Merge pull request #3410 from SeedCompany/ts-5.8

Author: CarsonF

package.json

@@ -148,7 +148,7 @@
     "ts-patch": "^3.0.2",
     "ts-transformer-keys": "^0.4.4",
     "type-fest": "^4.15.0",
-    "typescript": "~5.2.2",
+    "typescript": "~5.8.3",
     "typescript-transform-paths": "^3.4.6"
   },
   "resolutions": {
@@ -158,7 +158,7 @@
     "@nestjs/cli/fork-ts-checker-webpack-plugin": "npm:empty-npm-package@*",
     "@nestjs/cli/glob": "^11",
     "@nestjs/cli/webpack": "npm:empty-npm-package@*",
-    "@nestjs/cli/typescript": "~5.2.2",
+    "@nestjs/cli/typescript": "~5.8.3",
     "@whatwg-node/fetch@npm:^0.10.0": "patch:@whatwg-node/fetch@npm%3A0.10.6#~/.yarn/patches/@whatwg-node-fetch-npm-0.10.6-bca79028fb.patch",
     "@whatwg-node/fetch@npm:^0.10.1": "patch:@whatwg-node/fetch@npm%3A0.10.6#~/.yarn/patches/@whatwg-node-fetch-npm-0.10.6-bca79028fb.patch",
     "@whatwg-node/fetch@npm:^0.10.4": "patch:@whatwg-node/fetch@npm%3A0.10.6#~/.yarn/patches/@whatwg-node-fetch-npm-0.10.6-bca79028fb.patch",

src/common/db-sort.decorator.ts

@@ -1,6 +1,4 @@
-import { AbstractClassType } from './types';
-
-const DbSortSymbol = Symbol('DbSortSymbol');
+import { createMetadataDecorator } from '@seedcompany/nest';
 
 /**
  * A function given a cypher variable will output cypher to transform it for sorting.
@@ -10,11 +8,7 @@ export type SortTransformer = (value: string) => string;
 /**
  * Customize the way this field is sorted upon.
  */
-export const DbSort = (transformer: SortTransformer) =>
-  Reflect.metadata(DbSortSymbol, transformer);
-
-export const getDbSortTransformer = (
-  type: AbstractClassType<unknown>,
-  property: string,
-): SortTransformer | undefined =>
-  Reflect.getMetadata(DbSortSymbol, type.prototype, property);
+export const DbSort = createMetadataDecorator({
+  types: ['property'],
+  setter: (transformer: SortTransformer) => transformer,
+});

src/common/db-unique.decorator.ts

@@ -1,27 +1,21 @@
+import { createMetadataDecorator } from '@seedcompany/nest';
 import { startCase } from 'lodash';
 import { DbLabel } from './db-label.decorator';
-import { AbstractClassType } from './types';
-
-const DbUniqueSymbol = Symbol('DbUnique');
 
 /**
- * This property value should have a unique constraint in database.
- * The property node needs a unique label, which can be given or will based on
+ * This property value should have a unique constraint in the neo4j database.
+ * The property node needs a unique label, which can be given or will be based on
  * the resource & property name.
  */
-export const DbUnique =
-  (label?: string): PropertyDecorator =>
-  (target, propertyKey) => {
-    if (typeof propertyKey === 'symbol') {
-      throw new Error('DbUnique() cannot be used on symbol properties');
-    }
-    label ??= target.constructor.name + startCase(propertyKey);
-    Reflect.defineMetadata(DbUniqueSymbol, label, target, propertyKey);
-    DbLabel(label)(target, propertyKey);
-  };
+export const DbUnique = (label?: string) => (target: object, key: string) => {
+  label ??= target.constructor.name + startCase(key);
+  DbUniqueInner(label)(target, key);
+  DbLabel(label)(target, key);
+};
+
+const DbUniqueInner = createMetadataDecorator({
+  types: ['property'],
+  setter: (label?: string) => label,
+});
 
-export const getDbPropertyUnique = (
-  type: AbstractClassType<unknown>,
-  property: string,
-): string | undefined =>
-  Reflect.getMetadata(DbUniqueSymbol, type.prototype, property);
+DbUnique.get = DbUniqueInner.get;

src/common/disabled.decorator.ts

@@ -1,23 +1,12 @@
 /* eslint-disable @seedcompany/no-unused-vars */
 
-import { FnLike } from '@seedcompany/common';
-
-type Decorator =
-  | ClassDecorator
-  | PropertyDecorator
-  | MethodDecorator
-  | ParameterDecorator
-  | FnLike;
-
 /**
  * Mark the decorator is disabled and give a reason why.
  * Allows to keep code versioned without being enabled
  * without all wall of commented out text that can get outdated.
  */
 export const Disabled =
-  (why?: string) =>
-  <T extends Decorator>(decorator: T): T =>
-  // @ts-expect-error yeah all decorators can return void
-  () => {
+  (why: string, ...anything: unknown[]) =>
+  (...decoratorArgs: unknown[]) => {
     // noop
   };

src/components/admin/admin.gel.repository.ts

@@ -29,7 +29,8 @@ export class AdminGelRepository {
     const rootAlias = e.select(e.Alias, () => ({
       filter_single: { name: RootUserAlias },
     }));
-    const rootUser = e.select(rootAlias.target.is(e.User), (u) => ({
+    const rootUser = e.select(e.User, (u) => ({
+      filter: e.op(u, '=', rootAlias.target),
       id: true,
       email: true,
       hash: u['<user[is Auth::Identity]'].passwordHash,

src/components/authorization/policy/executor/all-permissions-view.ts

@@ -53,7 +53,7 @@ export const createAllPermissionsView = <
           propPerms[compatMap.backward[action]] = perm;
           return perm;
         },
-      }),
+      }) as any,
   });
 
 export type AllPermissionsOfEdgeView<TAction extends string> = Record<

src/components/budget/handlers/update-project-current-budget-status.handler.ts

@@ -41,7 +41,7 @@ export class UpdateProjectBudgetStatusHandler
       session,
     );
 
-    const budget = budgets.items.find((b) => b.status === change![0]);
+    const budget = budgets.items.find((b) => b.status === change[0]);
     if (!budget) {
       return;
     }

src/components/engagement/engagement.gel.repository.ts

@@ -25,10 +25,10 @@ const baseHydrate = e.shape(e.Engagement, (engagement) => ({
     step: true,
     type: true,
   },
-  parent: e.tuple({
+  parent: e.select({
     identity: engagement.project.id,
     labels: e.array_agg(e.set(engagement.project.__type__.name.slice(9, null))),
-    properties: e.tuple({
+    properties: e.select({
       id: engagement.project.id,
       createdAt: engagement.project.createdAt,
     }),

src/components/partnership/partnership.gel.repository.ts

@@ -15,12 +15,12 @@ export class PartnershipGelRepository
       partner: true,
       mou: true,
       agreement: true,
-      parent: e.tuple({
+      parent: e.select({
         identity: partnership.project.id,
         labels: e.array_agg(
           e.set(partnership.project.__type__.name.slice(9, null)),
         ),
-        properties: e.tuple({
+        properties: e.select({
           id: partnership.project.id,
           createdAt: partnership.project.createdAt,
         }),
@@ -37,16 +37,17 @@ export class PartnershipGelRepository
   private readonly readManyByProjectAndPartnerQuery = e.params(
     { input: e.array(e.tuple({ project: e.uuid, partner: e.uuid })) },
     ({ input }) =>
-      e.for(e.array_unpack(input), ({ project, partner }) =>
-        e.select(e.Partnership, (partnership) => ({
-          ...this.hydrate(partnership),
-          filter: e.op(
-            e.op(partnership.project, '=', e.cast(e.Project, project)),
-            'and',
-            e.op(partnership.partner, '=', e.cast(e.Partner, partner)),
-          ),
-        })),
-      ),
+      e.select(e.Partnership, (partnership) => ({
+        ...this.hydrate(partnership),
+        filter: e.op(
+          e.tuple({
+            project: partnership.project.id,
+            partner: partnership.partner.id,
+          }),
+          'in',
+          e.array_unpack(input),
+        ),
+      })),
   );
 
   async listAllByProjectId(project: ID) {

src/components/project/dto/project.dto.ts

@@ -197,11 +197,12 @@ class Project extends Interfaces {
    * Optimization for {@link ProjectResolver.engagements}.
    * This doesn't account for changesets or item filters.
    */
-  @Disabled(`
-    I'm not convinced this wont have unintended consequences.
-    it is still handled with the workflow condition currently and deletes are
-    restricted, so this is a super edge case effectively.
-  `)(
+  @Disabled(
+    `
+      I'm not convinced this wont have unintended consequences.
+      it is still handled with the workflow condition currently and deletes are
+      restricted, so this is a super edge case effectively.
+    `,
     RequiredWhenNotInDev({
       field: 'engagements',
       isMissing: (project) => project.engagementTotal === 0,