Merge branch 'develop'

Author: CarsonF

.eslintrc.cjs

@@ -124,6 +124,11 @@ const namingConvention = [
     format: ['camelCase'],
     leadingUnderscore: 'allow',
   },
+  {
+    selector: 'parameter',
+    modifiers: ['destructured'],
+    format: ['camelCase', 'UPPER_CASE'],
+  },
 ];
 
 /** @type {import('@typescript-eslint/utils').TSESLint.Linter.Config} */

docker-compose.yml

@@ -1,24 +1,5 @@
 version: '3.7'
 services:
-  api:
-    # Use dev target locally since there's no need to save space and contains everything
-    image: cord-api-v3:dev
-    build:
-      context: .
-      target: dev
-    command: yarn start:prod
-    ports:
-      - 3000:80
-    networks:
-      - cord
-    depends_on:
-      - db
-      - pg
-    environment:
-      NEO4J_URL: bolt://db:7687
-      NEO4J_USERNAME: neo4j
-      NEO4J_PASSWORD: admin
-
   db:
     image: neo4j:5.10-enterprise
     ports:
@@ -34,29 +15,5 @@ services:
       NEO4J_dbms_security_auth__enabled: 'false'
       NEO4J_dbms_security_auth__minimum__password__length: 1
 
-  pg:
-    image: postgres
-    ports:
-      - 5432:5432
-    networks:
-      - cord
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: cord
-
-  pgadmin:
-    image: dpage/pgadmin4
-    restart: always
-    networks:
-      - cord
-    environment:
-      PGADMIN_DEFAULT_EMAIL: [email protected]
-      PGADMIN_DEFAULT_PASSWORD: postgres
-    ports:
-      - '5050:80'
-    depends_on:
-      - pg
-
 networks:
   cord:

package.json

@@ -42,7 +42,7 @@
     "@nestjs/graphql": "^12.0.8",
     "@nestjs/platform-express": "^10.2.1",
     "@patarapolw/prettyprint": "^1.0.3",
-    "@seedcompany/common": ">=0.11 <1",
+    "@seedcompany/common": ">=0.13.1 <1",
     "@seedcompany/data-loader": "^0.5.4",
     "@seedcompany/nest": ">=0.1 <1",
     "@seedcompany/nestjs-email": "^3.3.2",

src/common/db-label.decorator.ts

@@ -1,4 +1,5 @@
-import { compact, uniq } from 'lodash';
+import { cleanSplit, isNotFalsy } from '@seedcompany/common';
+import { uniq } from 'lodash';
 
 export const DbLabelSymbol = Symbol('DbLabelSymbol');
 
@@ -11,10 +12,11 @@ export const DbLabel =
         : Reflect.getMetadata(DbLabelSymbol, target)) ?? [];
 
     const now = uniq(
-      compact([
+      [
         ...prev,
-        ...labels.flatMap((l) => l?.split(':').map((s) => s.trim())),
-      ]),
+        // Add labels split by `:`
+        ...labels.flatMap((l) => cleanSplit(l ?? '', ':')),
+      ].filter(isNotFalsy),
     );
 
     key

src/common/exceptions/exception.ts

@@ -1,5 +1,3 @@
-import { has } from '../util';
-
 /**
  * The base of all of our exceptions.
  * Don't throw this, but rather a sub-class instead.
@@ -26,7 +24,7 @@ export class ClientException extends Exception {
 }
 
 export const hasPrevious = (e: Error): e is Error & { previous: Error } =>
-  has('previous', e) && e.previous instanceof Error;
+  'previous' in e && e.previous instanceof Error;
 
 export function getPreviousList(ex: Error, includeSelf: boolean) {
   const previous: Error[] = includeSelf ? [ex] : [];

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/mask-secrets.ts

@@ -1,29 +1,29 @@
 import { isPlainObject } from '@nestjs/common/utils/shared.utils.js';
-import { mapValues } from 'lodash';
+import { mapValues } from '@seedcompany/common';
 
 export const maskSecrets = (
   obj: Record<string, any>,
   depth = 3,
 ): Record<string, any> =>
-  mapValues(obj, (val, key) =>
+  mapValues(obj, (key, val) =>
     isSecret(key, val)
       ? maskSecret(val)
       : isPlainObject(val) && depth > 0
       ? maskSecrets(val, depth - 1)
       : val,
-  );
+  ).asRecord;
 
 export const dropSecrets = (
   obj: Record<string, any>,
   depth = 3,
 ): Record<string, any> =>
-  mapValues(obj, (val, key) =>
+  mapValues(obj, (key, val) =>
     isSecret(key, val)
       ? undefined
       : isPlainObject(val) && depth > 0
       ? dropSecrets(val, depth - 1)
       : val,
-  );
+  ).asRecord;
 
 const isSecret = (key: string, val: unknown): val is string =>
   typeof val === 'string' && /(password|token|key)/i.test(key);

src/common/resource.dto.ts

@@ -1,5 +1,5 @@
 import { Field, InterfaceType } from '@nestjs/graphql';
-import { cached, FnLike } from '@seedcompany/common';
+import { cached, FnLike, mapValues } from '@seedcompany/common';
 import { LazyGetter as Once } from 'lazy-get-decorator';
 import { DateTime } from 'luxon';
 import { keys as keysOf } from 'ts-transformer-keys';
@@ -15,12 +15,11 @@ import { DateTimeField } from './luxon.graphql';
 import { getParentTypes } from './parent-types';
 import { MaybeSecured, SecuredProps } from './secured-property';
 import { AbstractClassType } from './types';
-import { has, mapFromList } from './util';
 
 const hasTypename = (value: unknown): value is { __typename: string } =>
   value != null &&
   typeof value === 'object' &&
-  has('__typename', value) &&
+  '__typename' in value &&
   typeof value.__typename === 'string';
 
 export const resolveByTypename =
@@ -245,11 +244,12 @@ export class EnhancedResource<T extends ResourceShape<any>> {
     return this.dbLabels[0];
   }
   @Once()
-  get dbPropLabels() {
-    return mapFromList(this.props, (prop) => {
-      const labels = getDbPropertyLabels(this.type, prop);
-      return [prop, labels];
-    });
+  get dbPropLabels(): {
+    readonly [K in keyof T['prototype'] & string]?: readonly string[];
+  } {
+    return mapValues.fromList(this.props, (prop) =>
+      getDbPropertyLabels(this.type, prop),
+    ).asRecord;
   }
 }
 
@@ -265,7 +265,7 @@ export interface EnhancedRelation<TResourceStatic extends ResourceShape<any>> {
 export const isResourceClass = <T>(
   cls: AbstractClassType<T>,
 ): cls is ResourceShape<T> =>
-  has('Props', cls) && Array.isArray(cls.Props) && cls.Props.length > 0;
+  'Props' in cls && Array.isArray(cls.Props) && cls.Props.length > 0;
 
 export type MaybeUnsecuredInstance<TResourceStatic extends ResourceShape<any>> =
   MaybeSecured<InstanceType<TResourceStatic>>;

src/common/util.ts

@@ -1,64 +1,3 @@
-import { compact } from 'lodash';
-
-export const simpleSwitch = <T, K extends string = string>(
-  key: K | null | undefined,
-  options: Record<K, T>,
-): T | undefined => (key ? options[key] : undefined);
-
-/** Converts list to map given a function that returns a [key, value] tuple. */
-export const mapFromList = <T, S = T, K extends string | number = string>(
-  list: readonly T[] | ReadonlySet<T>,
-  mapper: (item: T) => readonly [K, S] | null,
-): Record<K, S> => {
-  const out: Partial<Record<K, S>> = {};
-  list = list instanceof Set ? [...list] : (list as T[]);
-  return list.reduce((acc, item) => {
-    const res = mapper(item);
-    if (!res) {
-      return acc;
-    }
-    const [key, value] = res;
-    acc[key] = value;
-    return acc;
-  }, out as Record<K, S>);
-};
-
-/**
- * Just like Object.entries except keys are strict
- */
-export const entries: <K extends string, V>(o: Record<K, V>) => Array<[K, V]> =
-  Object.entries as any;
-
-/**
- * Just like Object.keys except keys are strict
- */
-export const keys: <K extends string>(o: Record<K, unknown>) => K[] =
-  Object.keys as any;
-
-export const iterate = <T>(
-  iterator: Iterable<T> | IterableIterator<T>,
-): readonly T[] => {
-  const res: T[] = [];
-  for (const item of iterator) {
-    res.push(item);
-  }
-  return res;
-};
-
-/**
- * Work around `in` operator not narrowing type
- * https://github.com/microsoft/TypeScript/issues/21732
- */
-export function has<K extends string | number | symbol, T>(
-  key: K,
-  obj: T,
-): obj is T & Record<K, unknown> {
-  return key in (obj as any);
-}
-
-export const csv = (str: string): readonly string[] =>
-  compact(str.split(',').map((s) => s.trim()));
-
 /**
  * This is logically very simple.
  * The usefulness is to allow this logic within an expression.

src/common/variant.dto.ts

@@ -1,5 +1,6 @@
 import { applyDecorators } from '@nestjs/common';
 import { Field, FieldOptions, ObjectType } from '@nestjs/graphql';
+import { entries } from '@seedcompany/common';
 import { Transform } from 'class-transformer';
 import { IsIn } from 'class-validator';
 import { stripIndent } from 'common-tags';
@@ -8,7 +9,6 @@ import { ResourceShape } from '~/common/resource.dto';
 import { InputException } from './exceptions';
 import { IdField } from './id-field';
 import { Role } from './role.dto';
-import { entries } from './util';
 
 @ObjectType()
 export class Variant<Key extends string = string> {