refactor(): refactor metadata storage collections

Author: kamilmysliwiec

packages/graphql/lib/schema-builder/collections/array-with-global-cache.collection.ts

@@ -1,24 +1,24 @@
 export class ArrayWithGlobalCacheCollection<T> {
-  private readonly array: T[] = [];
+  private readonly internalArray: T[] = [];
 
   constructor(private globalArray: Array<T>) {}
 
   getAll() {
-    return this.array;
+    return this.internalArray;
   }
 
-  push(...items): number {
+  push(...items: T[]): number {
     this.globalArray.push(...items);
-    return this.array.push(...items);
+    return this.internalArray.push(...items);
   }
 
-  unshift(...items): number {
+  unshift(...items: T[]): number {
     this.globalArray.unshift(...items);
-    return this.array.unshift(...items);
+    return this.internalArray.unshift(...items);
   }
 
   reverse() {
-    return this.array.reverse();
+    return this.internalArray.reverse();
   }
 
   reduce<U>(
@@ -30,6 +30,6 @@ export class ArrayWithGlobalCacheCollection<T> {
     ) => U,
     initialValue: U,
   ): U {
-    return this.array.reduce(callbackfn, initialValue);
+    return this.internalArray.reduce(callbackfn, initialValue);
   }
 }

packages/graphql/lib/schema-builder/collections/field-directive.collection.ts

@@ -1,5 +1,5 @@
-import { MetadataListByNameCollection } from './metadata-list-by-name.collection';
 import { PropertyDirectiveMetadata } from '../metadata';
+import { MetadataListByNameCollection } from './metadata-list-by-name.collection';
 
 export class FieldDirectiveCollection extends MetadataListByNameCollection<PropertyDirectiveMetadata> {
   sdls = new Set<string>();

packages/graphql/lib/schema-builder/collections/index.ts

@@ -1,7 +1,7 @@
-export * from './metadata.storage.collection.list';
-export * from './field-directive.collection';
 export * from './array-with-global-cache.collection';
-export * from './metada.collection.model.interface';
+export * from './field-directive.collection';
+export * from './metada-collection-model.interface';
 export * from './metadata-by-name.collection';
+export * from './metadata-by-target.collection';
 export * from './metadata-list-by-name.collection';
-export * from './metadata.storage.collection';
+export * from './target-metadata.collection';

packages/graphql/lib/schema-builder/collections/metada-collection-model.interface.ts

@@ -0,0 +1,21 @@
+import {
+  ClassDirectiveMetadata,
+  ClassExtensionsMetadata,
+  ClassMetadata,
+  PropertyDirectiveMetadata,
+  PropertyExtensionsMetadata,
+  ResolverClassMetadata,
+} from '../metadata';
+import { ObjectTypeMetadata } from '../metadata/object-type.metadata';
+
+export interface MetadataCollectionModel {
+  argumentType: ClassMetadata[];
+  interface: ClassMetadata[];
+  inputType: ClassMetadata[];
+  objectType: ObjectTypeMetadata[];
+  resolver: ResolverClassMetadata[];
+  classDirectives: ClassDirectiveMetadata[];
+  classExtensions: ClassExtensionsMetadata[];
+  fieldDirectives: PropertyDirectiveMetadata[];
+  fieldExtensions: PropertyExtensionsMetadata[];
+}

packages/graphql/lib/schema-builder/collections/metada.collection.model.interface.ts

@@ -1,26 +1,29 @@
 export class MetadataByNameCollection<T> {
-  protected map = new Map<string, T>();
+  protected internalCollection = new Map<string, T>();
   protected all: (T extends any[] ? T[number] : T)[] = [];
 
   getAll() {
     return this.all;
   }
 
   getByName(name: string) {
-    return this.map.get(name);
+    return this.internalCollection.get(name);
   }
 
   add(value: T extends any[] ? T[number] : T, name: string) {
-    if (this.map.has(name)) return;
+    if (this.internalCollection.has(name)) {
+      return;
+    }
 
-    this.map.set(name, value);
+    this.internalCollection.set(name, value);
     this.all.push(value);
   }
 
   unshift(value: T extends any[] ? T[number] : T, name: string) {
-    if (this.map.has(name)) return;
-
-    this.map.set(name, value);
+    if (this.internalCollection.has(name)) {
+      return;
+    }
+    this.internalCollection.set(name, value);
     this.all.unshift(value);
   }
 }

packages/graphql/lib/schema-builder/collections/metadata-by-name.collection.ts

@@ -1,11 +1,8 @@
-import { MetadataStorageCollection } from './metadata.storage.collection';
-import { MetadataCollectionModelInterface } from './metada.collection.model.interface';
+import { MetadataCollectionModel } from './metada-collection-model.interface';
+import { TargetMetadataCollection } from './target-metadata.collection';
 
-export class MetadataStorageCollectionList {
-  private storageMap = new Map<Function, MetadataStorageCollection>();
-  private storageList = new Array<MetadataStorageCollection>();
-
-  public all: MetadataCollectionModelInterface = {
+export class MetadataByTargetCollection {
+  public readonly all: MetadataCollectionModel = {
     argumentType: [],
     interface: [],
     inputType: [],
@@ -17,11 +14,14 @@ export class MetadataStorageCollectionList {
     fieldExtensions: [],
   };
 
+  private readonly storageMap = new Map<Function, TargetMetadataCollection>();
+  private readonly storageList = new Array<TargetMetadataCollection>();
+
   get(target: Function) {
     let metadata = this.storageMap.get(target);
 
     if (!metadata) {
-      metadata = new MetadataStorageCollection(this.all);
+      metadata = new TargetMetadataCollection(this.all);
       this.storageMap.set(target, metadata);
       this.storageList.push(metadata);
     }
@@ -37,7 +37,7 @@ export class MetadataStorageCollectionList {
   }
 
   private reversePredicate<V>(
-    predicate: (t: MetadataStorageCollection) => Array<V>,
+    predicate: (t: TargetMetadataCollection) => Array<V>,
   ) {
     this.storageList.forEach((t) => predicate(t).reverse());
   }

packages/graphql/lib/schema-builder/collections/metadata.storage.collection.list.ts renamed to packages/graphql/lib/schema-builder/collections/metadata-by-target.collection.ts

@@ -15,7 +15,7 @@ export class MetadataListByNameCollection<T> extends MetadataByNameCollection<
     let arrayResult = super.getByName(name);
     if (!arrayResult) {
       arrayResult = [];
-      this.map.set(name, arrayResult);
+      this.internalCollection.set(name, arrayResult);
     }
 
     arrayResult.push(value);
@@ -27,7 +27,7 @@ export class MetadataListByNameCollection<T> extends MetadataByNameCollection<
     let arrayResult = super.getByName(name);
     if (!arrayResult) {
       arrayResult = [];
-      this.map.set(name, arrayResult);
+      this.internalCollection.set(name, arrayResult);
     }
 
     arrayResult.unshift(value);

packages/graphql/lib/schema-builder/collections/metadata-list-by-name.collection.ts

@@ -1,4 +1,3 @@
-import { MetadataByNameCollection } from './metadata-by-name.collection';
 import {
   ClassDirectiveMetadata,
   ClassExtensionsMetadata,
@@ -8,14 +7,15 @@ import {
   PropertyMetadata,
   ResolverClassMetadata,
 } from '../metadata';
-import { MetadataListByNameCollection } from './metadata-list-by-name.collection';
-import { FieldDirectiveCollection } from './field-directive.collection';
 import { ObjectTypeMetadata } from '../metadata/object-type.metadata';
 import { ArrayWithGlobalCacheCollection } from './array-with-global-cache.collection';
-import { MetadataCollectionModelInterface } from './metada.collection.model.interface';
+import { FieldDirectiveCollection } from './field-directive.collection';
+import { MetadataCollectionModel } from './metada-collection-model.interface';
+import { MetadataByNameCollection } from './metadata-by-name.collection';
+import { MetadataListByNameCollection } from './metadata-list-by-name.collection';
 
-export class MetadataStorageCollection {
-  constructor(private all: MetadataCollectionModelInterface) {}
+export class TargetMetadataCollection {
+  constructor(private readonly all: MetadataCollectionModel) {}
 
   fields = new MetadataByNameCollection<PropertyMetadata>();
   params = new MetadataListByNameCollection<MethodArgsMetadata>();
@@ -31,6 +31,12 @@ export class MetadataStorageCollection {
     this.all.classExtensions,
   );
 
+  private _argumentType: ClassMetadata;
+  private _interface: ClassMetadata;
+  private _inputType: ClassMetadata;
+  private _objectType: ObjectTypeMetadata;
+  private _resolver: ResolverClassMetadata;
+
   set argumentType(val: ClassMetadata) {
     this._argumentType = val;
     this.all.argumentType.push(val);
@@ -75,10 +81,4 @@ export class MetadataStorageCollection {
   get resolver() {
     return this._resolver;
   }
-
-  _argumentType: ClassMetadata;
-  _interface: ClassMetadata;
-  _inputType: ClassMetadata;
-  _objectType: ObjectTypeMetadata;
-  _resolver: ResolverClassMetadata;
 }