feat(createentityfeature): make entity names optional

gabrielguerrero · Mar 29, 2022 · 2952bf1 · 2952bf1
1 parent 2af3771
commit 2952bf1
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/libs/ngrx-traits/src/lib/create-entity-feature.spec.ts b/libs/ngrx-traits/src/lib/create-entity-feature.spec.ts
@@ -38,12 +38,6 @@ export interface ProductFilter {
   search: string;
 }
 
-export interface ProductDetail extends Product {
-  maker: string;
-  releaseDate: string;
-  image: string;
-}
-
 const clientsFeatureFactory = createEntityFeatureFactory(
   { entityName: 'client', entitiesName: 'clients' },
   addLoadEntitiesTrait<Client>(),

diff --git a/libs/ngrx-traits/src/lib/create-entity-feature.ts b/libs/ngrx-traits/src/lib/create-entity-feature.ts
@@ -54,7 +54,15 @@ export function createTraitFactory<
 }): TraitFactory<State, A, S, M, KEY, C, KC> {
   return f as TraitFactory<State, A, S, M, KEY, C, KC>;
 }
-
+export function createEntityFeatureFactory<F extends readonly TraitFactory[]>(
+  ...traits: F
+): EntityFeatureFactory<
+  'Entity',
+  'Entities',
+  ExtractStateType<F>,
+  ExtractActionsType<F>,
+  ExtractSelectorsType<F>
+>;
 export function createEntityFeatureFactory<
   F extends readonly TraitFactory[],
   EntityName extends string,
@@ -71,14 +79,40 @@ export function createEntityFeatureFactory<
   ExtractStateType<F>,
   ExtractActionsType<F>,
   ExtractSelectorsType<F>
+>;
+export function createEntityFeatureFactory<
+  F extends readonly TraitFactory[],
+  EntityName extends string,
+  EntitiesName extends string = `${EntityName}s`
+>(
+  namesOrFactory:
+    | { entityName: EntityName; entitiesName?: EntitiesName }
+    | TraitFactory,
+  ...traits: F
+): EntityFeatureFactory<
+  EntityName,
+  EntitiesName,
+  ExtractStateType<F>,
+  ExtractActionsType<F>,
+  ExtractSelectorsType<F>
 > {
   return ((config: Config<any, any>) => {
+    const { entityName, entitiesName } =
+      'entityName' in namesOrFactory
+        ? (namesOrFactory as {
+            entityName: EntityName;
+            entitiesName?: EntitiesName;
+          })
+        : { entityName: 'Entity', entitiesName: 'Entities' };
+
     const singular = capitalize(entityName);
     const plural = entitiesName
       ? capitalize(entitiesName)
       : capitalize(entityName + 's');
 
-    const sortedTraits = sortTraits([...traits]);
+    const sortedTraits = sortTraits(
+      'entityName' in namesOrFactory ? [...traits] : [namesOrFactory, ...traits]
+    );
 
     const allConfigs = buildAllConfigs(sortedTraits);