Refactor DbLabel to normalize on decorator use and to allow single null

This single null better conveys the intent of no label compared to no args given.

Author: CarsonF

src/common/db-label.decorator.ts

@@ -1,13 +1,26 @@
+import { compact, uniq } from 'lodash';
+
 export const DbLabelSymbol = Symbol('DbLabelSymbol');
 
 export const DbLabel =
-  (...labels: string[]): PropertyDecorator & ClassDecorator =>
+  (...labels: string[] | [null]): PropertyDecorator & ClassDecorator =>
   (target: any, key?: string | symbol) => {
+    const prev: string[] =
+      (key
+        ? Reflect.getMetadata(DbLabelSymbol, target, key)
+        : Reflect.getMetadata(DbLabelSymbol, target)) ?? [];
+
+    const now = uniq(
+      compact([
+        ...prev,
+        ...labels.flatMap((l) => l?.split(':').map((s) => s.trim())),
+      ]),
+    );
+
+    key
+      ? Reflect.defineMetadata(DbLabelSymbol, now, target, key)
+      : Reflect.defineMetadata(DbLabelSymbol, now, target);
     if (!key) {
-      const current = Reflect.getMetadata(DbLabelSymbol, target) ?? [];
-      Reflect.defineMetadata(DbLabelSymbol, [...current, ...labels], target);
       return target;
     }
-    const current = Reflect.getMetadata(DbLabelSymbol, target, key) ?? [];
-    Reflect.defineMetadata(DbLabelSymbol, [...current, ...labels], target, key);
   };

src/common/db-label.helpers.ts

@@ -1,37 +1,31 @@
 import { uniq } from 'lodash';
+import { AbstractClass } from 'type-fest';
 import { DbLabelSymbol } from './db-label.decorator';
 import { getParentTypes } from './parent-types';
 import { isResourceClass } from './resource.dto';
-import { AbstractClassType } from './types';
 
-export const getDbPropertyLabels = (
-  type: AbstractClassType<unknown>,
-  property: string,
-) => {
+type Class = AbstractClass<any>;
+
+export const getDbPropertyLabels = (type: Class, property: string) => {
   const labels: string[] | undefined = Reflect.getMetadata(
     DbLabelSymbol,
     type.prototype,
     property,
   );
-  const normalized = labels?.flatMap((l) => l.split(':'));
-  return uniq([...(normalized ?? []), 'Property']);
+  return uniq([...(labels ?? []), 'Property']);
 };
 
-export const getDbClassLabels = (
-  type: AbstractClassType<unknown>,
-): readonly string[] => {
+export const getDbClassLabels = (type: Class): readonly string[] => {
   const labels = getParentTypes(type)
     .filter(isResourceClass)
     .flatMap(getDbClassOwnLabels);
   return uniq([...labels, 'BaseNode']);
 };
 
-const getDbClassOwnLabels = (
-  type: AbstractClassType<unknown>,
-): readonly string[] => {
+const getDbClassOwnLabels = (type: Class): readonly string[] => {
   const decorated: string[] | null = Reflect.getOwnMetadata(
     DbLabelSymbol,
     type,
   );
-  return decorated?.flatMap((l) => l.split(':')) ?? [type.name];
+  return decorated ?? [type.name];
 };

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

@@ -35,7 +35,7 @@ export const resolveMedia = (val: Pick<AnyMedia, '__typename'>) => {
 @InputType()
 @InterfaceType({ isAbstract: true })
 @ObjectType({ isAbstract: true })
-@DbLabel(/* none */)
+@DbLabel(null)
 export class MediaUserMetadata extends DataObject {
   static readonly Props: string[] = keysOf<MediaUserMetadata>();