Merge branch 'develop'

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/dto/node.ts

@@ -7,6 +7,7 @@ import { MergeExclusive, Opaque } from 'type-fest';
 import { RegisterResource } from '~/core/resources';
 import {
   DateTimeField,
+  DbLabel,
   ID,
   InputException,
   NameField,
@@ -77,6 +78,7 @@ export { FileNode as IFileNode, AnyFileNode as FileNode };
 @ObjectType({
   isAbstract: true,
 })
+@DbLabel(null)
 /**
  * Both file and file version have these properties
  */

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>();
 

src/components/file/media/media.repository.ts

@@ -115,6 +115,7 @@ export class MediaRepository extends CommonRepository {
         },
         true,
       )
+      .with('node, fv')
       .apply(this.hydrate());
 
     const result = await query.first();

src/core/database/query/create-node.ts

@@ -3,10 +3,9 @@ import { DateTime } from 'luxon';
 import {
   // eslint-disable-next-line @seedcompany/no-unused-vars -- used in jsdoc
   DbLabel,
+  EnhancedResource,
   entries,
   generateId,
-  getDbClassLabels,
-  getDbPropertyLabels,
   ID,
   ResourceShape,
   UnsecuredDto,
@@ -47,9 +46,10 @@ type InitialPropsOf<T> = {
  * })
  */
 export const createNode = async <TResourceStatic extends ResourceShape<any>>(
-  resource: TResourceStatic,
+  resource: TResourceStatic | EnhancedResource<TResourceStatic>,
   { initialProps = {}, baseNodeProps = {} }: CreateNodeOptions<TResourceStatic>,
 ) => {
+  const res = EnhancedResource.of(resource);
   const {
     id = baseNodeProps.id ?? (await generateId()),
     createdAt = baseNodeProps.createdAt ?? DateTime.local(),
@@ -65,7 +65,7 @@ export const createNode = async <TResourceStatic extends ResourceShape<any>>(
       sub
         .create([
           [
-            node('node', getDbClassLabels(resource), {
+            node('node', res.dbLabels, {
               ...baseNodeProps,
               createdAt,
               id,
@@ -74,7 +74,7 @@ export const createNode = async <TResourceStatic extends ResourceShape<any>>(
           ...entries(restInitialProps).map(([prop, value]) => [
             node('node'),
             relation('out', '', prop, { active: true, createdAt }),
-            node('', getDbPropertyLabels(resource, prop), {
+            node('', res.dbPropLabels[prop] ?? ['Property'], {
               createdAt,
               value,
             }),

src/core/database/query/create-relationships.ts

@@ -3,7 +3,7 @@ import { node, Query, relation } from 'cypher-query-builder';
 import { RelationDirection } from 'cypher-query-builder/dist/typings/clauses/relation-pattern';
 import { Maybe as Nullable } from 'graphql/jsutils/Maybe';
 import { DateTime } from 'luxon';
-import { ID, many, ResourceShape } from '~/common';
+import { EnhancedResource, ID, many, ResourceShape } from '~/common';
 import { ResourceMap } from '~/core';
 import { Variable } from '../query-augmentation/condition-variables';
 
@@ -74,19 +74,20 @@ type AnyDirectionalDefinition = Partial<
  * // Note how `user` is imported, not matched, and not returned.
  */
 export function createRelationships<TResourceStatic extends ResourceShape<any>>(
-  resource: TResourceStatic,
+  resource: TResourceStatic | EnhancedResource<TResourceStatic>,
   direction: RelationDirection,
   labelsToRelationships: RelationshipDefinition,
 ): (query: Query) => Query;
 export function createRelationships<TResourceStatic extends ResourceShape<any>>(
-  resource: TResourceStatic,
+  resource: TResourceStatic | EnhancedResource<TResourceStatic>,
   definition: AnyDirectionalDefinition,
 ): (query: Query) => Query;
 export function createRelationships<TResourceStatic extends ResourceShape<any>>(
-  resource: TResourceStatic,
+  resource: TResourceStatic | EnhancedResource<TResourceStatic>,
   directionOrDefinition: RelationDirection | AnyDirectionalDefinition,
   maybeLabelsToRelationships?: RelationshipDefinition,
 ) {
+  resource = EnhancedResource.of(resource);
   const normalizedArgs =
     typeof directionOrDefinition === 'string'
       ? { [directionOrDefinition]: maybeLabelsToRelationships }