refactor(types): apiCheck as a function. Fix #40

Author: benoror

src/types/checkbox.js

@@ -1,18 +1,16 @@
 export default ngModule => {
   ngModule.config(addCheckboxType);
 
-  function addCheckboxType(formlyConfigProvider, formlyBootstrapApiCheck) {
-    const c = formlyBootstrapApiCheck;
+  function addCheckboxType(formlyConfigProvider) {
     formlyConfigProvider.setType({
       name: 'checkbox',
       template: require('./checkbox.html'),
       wrapper: ['bootstrapHasError'],
-      apiCheck: {
-        templateOptions: c.shape({
-          label: c.string
-        })
-      },
-      apiCheckInstance: c
+      apiCheck: check => ({
+        templateOptions: {
+        	label: check.string
+        }
+      })
     });
   }
 };

src/types/multiCheckbox.js

@@ -1,19 +1,18 @@
 export default ngModule => {
   ngModule.config(addCheckboxType);
 
-  function addCheckboxType(formlyConfigProvider, formlyBootstrapApiCheck) {
-    const c = formlyBootstrapApiCheck;
+  function addCheckboxType(formlyConfigProvider) {
     formlyConfigProvider.setType({
       name: 'multiCheckbox',
       template: require('./multiCheckbox.html'),
       wrapper: ['bootstrapLabel', 'bootstrapHasError'],
-      apiCheck: {
-        templateOptions: c.shape({
-          options: c.arrayOf(c.object),
-          labelProp: c.string.optional,
-          valueProp: c.string.optional
-        })
-      },
+      apiCheck: check => ({
+        templateOptions: {
+          options: check.arrayOf(check.object),
+          labelProp: check.string.optional,
+          valueProp: check.string.optional
+        }
+      }),
       defaultOptions: {
         noFormControl: false,
         ngModelAttrs: {
@@ -23,7 +22,6 @@ export default ngModule => {
           }
         }
       },
-      apiCheckInstance: c,
       controller: /* @ngInject */ function($scope) {
         const to = $scope.to;
         const opts = $scope.options;

src/types/radio.js

@@ -1,23 +1,21 @@
 export default ngModule => {
   ngModule.config(addRadioType);
 
-  function addRadioType(formlyConfigProvider, formlyBootstrapApiCheck) {
-    const c = formlyBootstrapApiCheck;
+  function addRadioType(formlyConfigProvider) {
     formlyConfigProvider.setType({
       name: 'radio',
       template: require('./radio.html'),
       wrapper: ['bootstrapLabel', 'bootstrapHasError'],
       defaultOptions: {
         noFormControl: false
       },
-      apiCheck: {
-        templateOptions: c.shape({
-          options: c.arrayOf(c.object),
-          labelProp: c.string.optional,
-          valueProp: c.string.optional
-        })
-      },
-      apiCheckInstance: c
+      apiCheck: check => ({
+        templateOptions: {
+          options: check.arrayOf(check.object),
+          labelProp: check.string.optional,
+          valueProp: check.string.optional
+        }
+      })
     });
   }
 };

src/types/select.js

@@ -3,8 +3,7 @@ export default  ngModule => {
 
   const template = `<select class="form-control" ng-model="model[options.key]"></select>`;
 
-  function addSelectType(formlyConfigProvider, formlyBootstrapApiCheck) {
-    const c = formlyBootstrapApiCheck;
+  function addSelectType(formlyConfigProvider) {
     formlyConfigProvider.setType({
       name: 'select',
       template,
@@ -20,15 +19,14 @@ export default  ngModule => {
           }
         };
       },
-      apiCheck: {
-        templateOptions: c.shape({
-          options: c.arrayOf(c.object),
-          labelProp: c.string.optional,
-          valueProp: c.string.optional,
-          groupProp: c.string.optional
-        })
-      },
-      apiCheckInstance: c
+      apiCheck: check => ({
+        templateOptions: {
+          options: check.arrayOf(check.object),
+          labelProp: check.string.optional,
+          valueProp: check.string.optional,
+          groupProp: check.string.optional
+        }
+      })
     });
   }
 };

src/types/textarea.js

@@ -1,8 +1,7 @@
 export default  ngModule => {
   ngModule.config(addTextareaType);
 
-  function addTextareaType(formlyConfigProvider, formlyBootstrapApiCheck) {
-    const c = formlyBootstrapApiCheck;
+  function addTextareaType(formlyConfigProvider) {
     formlyConfigProvider.setType({
       name: 'textarea',
       template: '<textarea class="form-control" ng-model="model[options.key]"></textarea>',
@@ -13,13 +12,12 @@ export default  ngModule => {
           cols: {attribute: 'cols'}
         }
       },
-      apiCheck: {
-        templateOptions: c.shape({
-          rows: c.number.optional,
-          cols: c.number.optional
-        })
-      },
-      apiCheckInstance: c
+      apiCheck: check => ({
+        templateOptions: {
+          rows: check.number.optional,
+          cols: check.number.optional
+        }
+      })
     });
   }
 };

src/wrappers/index.js

@@ -1,19 +1,17 @@
 export default ngModule => {
   ngModule.config(addWrappers);
 
-  function addWrappers(formlyConfigProvider, formlyBootstrapApiCheck) {
-    const c = formlyBootstrapApiCheck;
+  function addWrappers(formlyConfigProvider) {
     formlyConfigProvider.setWrapper([
       {
         name: 'bootstrapLabel',
         template: require('./label.html'),
-        apiCheck: {
-          templateOptions: c.shape({
-            label: c.string,
-            required: c.bool.optional
-          })
-        },
-        apiCheckInstance: c
+	      apiCheck: check => ({
+	        templateOptions: {
+            label: check.string,
+            required: check.bool.optional
+	        }
+	      })
       },
       {name: 'bootstrapHasError', template: require('./has-error.html')}
     ]);