Refactor DbLabel to new metadata decorator & inline getters into EnhancedResource

Author: CarsonF

src/common/db-label.decorator.ts

@@ -1,28 +1,9 @@
-import { cleanSplit, isNotFalsy } from '@seedcompany/common';
-import { uniq } from 'lodash';
-
-export const DbLabelSymbol = Symbol('DbLabelSymbol');
-
-export const DbLabel =
-  (...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(
-      [
-        ...prev,
-        // Add labels split by `:`
-        ...labels.flatMap((l) => cleanSplit(l ?? '', ':')),
-      ].filter(isNotFalsy),
-    );
-
-    key
-      ? Reflect.defineMetadata(DbLabelSymbol, now, target, key)
-      : Reflect.defineMetadata(DbLabelSymbol, now, target);
-    if (!key) {
-      return target;
-    }
-  };
+import { cleanSplit, setOf } from '@seedcompany/common';
+import { createMetadataDecorator } from '@seedcompany/nest';
+
+export const DbLabel = createMetadataDecorator({
+  types: ['class', 'property'],
+  setter: (...labels: string[] | [null]) =>
+    setOf(labels.flatMap((label) => cleanSplit(label ?? '', ':'))),
+  merge: ({ previous, next }) => previous?.union(next) ?? next,
+});

src/common/db-label.helpers.ts

@@ -15,7 +15,6 @@ export * from './create-and-inject';
 export * from './data-object';
 export * from './date-filter.input';
 export { DbLabel } from './db-label.decorator';
-export * from './db-label.helpers';
 export { DbSort } from './db-sort.decorator';
 export * from './db-unique.decorator';
 export * from './disabled.decorator';

src/common/index.ts

@@ -20,7 +20,6 @@ import { type ScopedRole } from '../components/authorization/dto';
 import { CalculatedSymbol } from './calculated.decorator';
 import { DataObject } from './data-object';
 import { DbLabel } from './db-label.decorator';
-import { getDbClassLabels, getDbPropertyLabels } from './db-label.helpers';
 import { ServerException } from './exceptions';
 import { type ID, IdField } from './id-field';
 import { DateTimeField } from './luxon.graphql';
@@ -282,7 +281,14 @@ export class EnhancedResource<T extends ResourceShape<any>> {
 
   @Once()
   get dbLabels() {
-    return getDbClassLabels(this.type);
+    const labels = getParentTypes(this.type).flatMap((cls) => {
+      if (!isResourceClass(cls)) {
+        return [];
+      }
+      const declared = DbLabel.getOwn(cls);
+      return declared ? [...declared] : [cls.name];
+    });
+    return [...new Set([...labels, 'BaseNode'])];
   }
   get dbLabel() {
     return this.dbLabels[0];
@@ -291,9 +297,10 @@ export class EnhancedResource<T extends ResourceShape<any>> {
   get dbPropLabels(): {
     readonly [K in keyof T['prototype'] & string]?: readonly string[];
   } {
-    return mapValues.fromList(this.props, (prop) =>
-      getDbPropertyLabels(this.type, prop),
-    ).asRecord;
+    return mapValues.fromList(this.props, (prop) => {
+      const declared = DbLabel.get(this.type, prop as unknown as string);
+      return [...new Set([...(declared ?? []), 'Property'])];
+    }).asRecord;
   }
 }
 setInspectOnClass(EnhancedResource, (res) => ({ collapsed }) => {