refactor(forms): provide control components directly

Blocked by runtime error: ReferenceError: Cannot access 'DynControl' before initialization
myndpm · Aug 27, 2022 · afd045f · afd045f
1 parent bf11c77
commit afd045f
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 7 deletions.
diff --git a/libs/forms/core/src/dyn-control-wrapper.class.ts b/libs/forms/core/src/dyn-control-wrapper.class.ts
@@ -15,6 +15,13 @@ export interface DynWrapperProvider extends DynBaseProvider {
   component: Type<AbstractDynWrapper>;
 }
 
+export type DynWrapperArg = Type<AbstractDynWrapper> | DynWrapperProvider;
+
+export function isWrapperProvider(obj: any): obj is DynWrapperProvider {
+  return Object.prototype.hasOwnProperty.call(obj, 'wrapper')
+    && Object.prototype.hasOwnProperty.call(obj, 'component');
+}
+
 @Directive()
 export abstract class DynWrapper<
   TParams extends DynParams = DynParams,

diff --git a/libs/forms/core/src/dyn-control.class.ts b/libs/forms/core/src/dyn-control.class.ts
@@ -33,6 +33,14 @@ export interface DynControlProvider extends DynBaseProvider {
   component: Type<AbstractDynControl>;
 }
 
+export type DynControlArg = Type<AbstractDynControl> | DynControlProvider;
+
+export function isControlProvider(obj: any): obj is DynControlProvider {
+  return Object.prototype.hasOwnProperty.call(obj, 'component')
+    && Object.prototype.hasOwnProperty.call(obj, 'control')
+    && Object.prototype.hasOwnProperty.call(obj, 'instance');
+}
+
 @Directive()
 export abstract class DynControl<
   TMode extends DynMode = DynMode,

diff --git a/libs/forms/core/src/dyn-providers.ts b/libs/forms/core/src/dyn-providers.ts
@@ -22,6 +22,33 @@ import {
   DynValidator,
 } from './types/validation.types';
 import { isPlainObject } from './utils/merge.util';
+import { DynControlArg, DynControlProvider, isControlProvider } from './dyn-control.class';
+import { DynWrapperArg, DynWrapperProvider, isWrapperProvider } from './dyn-control-wrapper.class';
+
+/**
+ * Mapper from plain Type<T> to DynControlProvider
+ */
+export function mapControls<T extends DynControlArg>() {
+  return (control: T): DynControlProvider => !isControlProvider(control)
+    ? {
+        component: control,
+        control: (control as any).dynControl,
+        instance: (control as any).dynInstance,
+      }
+    : control;
+}
+
+/**
+ * Mapper from plain Type<T> to DynWrapperProvider
+ */
+export function mapWrappers<T extends DynWrapperArg>() {
+  return (wrapper: T): DynWrapperProvider => !isWrapperProvider(wrapper)
+    ? {
+        component: wrapper,
+        wrapper: (wrapper as any).dynWrapper,
+      }
+    : wrapper;
+}
 
 /**
  * Mapper to add the incoming priority

diff --git a/libs/forms/core/src/module.providers.ts b/libs/forms/core/src/module.providers.ts
@@ -3,9 +3,9 @@ import { DynLogDriver, DynLogger, DynLogLevel, DYN_LOG_LEVEL } from '@myndpm/dyn
 import { DynCondition, DynMatcher } from './types/matcher.types';
 import { DynFunction } from './types/params.types';
 import { DynAsyncValidator, DynErrorHandler, DynValidator } from './types/validation.types';
-import { DynControlProvider } from './dyn-control.class';
-import { DynWrapperProvider } from './dyn-control-wrapper.class';
-import { mapPriority } from './dyn-providers';
+import { DynControlArg } from './dyn-control.class';
+import { DynWrapperArg } from './dyn-control-wrapper.class';
+import { mapControls, mapPriority, mapWrappers } from './dyn-providers';
 import { DynFormFactory } from './form-factory.service';
 import { DynFormHandlers } from './form-handlers.service';
 import { DynFormRegistry } from './form-registry.service';
@@ -22,8 +22,8 @@ import {
 
 export interface DynModuleProviders {
   providers?: Provider[];
-  controls?: DynControlProvider[];
-  wrappers?: DynWrapperProvider[];
+  controls?: DynControlArg[];
+  wrappers?: DynWrapperArg[];
   errorHandlers?: DynErrorHandler[];
   functions?: DynFunction[];
   validators?: DynValidator[];
@@ -47,12 +47,12 @@ export function getModuleProviders(args?: DynModuleProviders): Provider[] {
     DynFormHandlers,
     DynFormFactory,
     ...args?.providers ?? [],
-    ...args?.controls?.map(mapPriority(args?.priority)).map((control) => ({
+    ...args?.controls?.map(mapControls()).map(mapPriority(args?.priority)).map((control) => ({
       provide: DYN_CONTROLS_TOKEN,
       useValue: control,
       multi: true,
     })) ?? [],
-    ...args?.wrappers?.map(mapPriority(args?.priority)).map((wrapper) => ({
+    ...args?.wrappers?.map(mapWrappers()).map(mapPriority(args?.priority)).map((wrapper) => ({
       provide: DYN_WRAPPERS_TOKEN,
       useValue: wrapper,
       multi: true,