new config builder and lang support

Signed-off-by: danieloprado <[email protected]>

Author: danieloprado

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
-  "tslint.enable": false,
   "files.exclude": {
     "**/.git": true,
     "**/.svn": true,
@@ -10,6 +9,9 @@
     "**/*.js": {
       "when": "$(basename).ts"
     },
+    "**/*.d.ts": {
+      "when": "$(basename).ts"
+    },
     "**/*?.js": {
       "when": "$(basename).tsx"
     },

components/FieldCoreBase.tsx

@@ -52,7 +52,7 @@ export default abstract class FieldCoreBase<
 
     if (!mask) {
       mask = { apply: (v: string) => v, clean: v => v };
-      this.props.mask && console.warn(`@react-form-fields/core: Mask '${this.props.mask}' not found`)
+      this.props.mask && console.warn(`@react-form-fields/core: Mask '${this.props.mask}' not found`);
     }
 
     return mask;

components/ValidationContext.tsx

@@ -37,6 +37,6 @@ export default class ValidationContext extends React.PureComponent<{}> {
       <FieldValidation.Provider value={this.registerFields}>
         {this.props.children}
       </FieldValidation.Provider>
-    )
+    );
   }
 }

components/ValidationContextRegister.tsx

@@ -32,6 +32,6 @@ export default class ValidationContextRegister extends React.PureComponent<IProp
       <FieldValidation.Consumer>
         {this.setContext}
       </FieldValidation.Consumer>
-    )
+    );
   }
 }

config/builder.ts

@@ -0,0 +1,36 @@
+import { ErrorMessages } from 'validatorjs';
+
+import { IConfig } from '.';
+import { IMask } from '../mask';
+
+export default class ConfigBuilder {
+  protected config: IConfig;
+
+  constructor() {
+    this.clean();
+  }
+
+  public addMask(name: string, apply: IMask['apply'], clean: IMask['clean']) {
+    this.config.masks = [...this.config.masks, { name, apply, clean }];
+    return this;
+  }
+
+  public addMasks(masks: IMask[]) {
+    this.config.masks = [...this.config.masks, ...masks];
+    return this;
+  }
+
+  public addCustomMessages(lang: string, customMessages: ErrorMessages) {
+    this.config.validation = { lang, customMessages };
+    return this;
+  }
+
+  public build() {
+    return this.config;
+  }
+
+  public clean() {
+    this.config = { masks: [], validation: null };
+    return this;
+  }
+}

config.ts renamed to config/index.ts

@@ -1,16 +1,16 @@
 import { ErrorMessages } from 'validatorjs';
 
-import { IMask, register as registerMasks } from './mask';
-import * as validator from './validator';
+import { IMask, register as registerMasks } from '../mask';
+import * as validator from '../validator';
 
 let config: IConfig = {};
 
 export interface IConfig {
-  masks?: IMask[],
+  masks?: IMask[];
   validation?: {
     lang: string;
     customMessages?: ErrorMessages;
-  }
+  };
 }
 
 export function getConfig(): IConfig {

lang/pt-br/index.ts

@@ -0,0 +1,10 @@
+import { IConfig } from '../../config';
+import masks from './masks';
+import validation from './validation';
+
+const langPTBR: IConfig = {
+  masks,
+  validation
+};
+
+export default langPTBR;

mask/common/pt-br.ts renamed to lang/pt-br/masks.ts

@@ -1,4 +1,4 @@
-import { IMask, IMaskFunction } from '..';
+import { IMask, IMaskFunction } from '../../mask';
 
 const cpf: IMaskFunction = {
   apply: (value: string) => {
@@ -30,13 +30,13 @@ const cnpj: IMaskFunction = {
       .replace(/[-.\\]$/, '');
   },
   clean: (value: string) => value.replace(/\D/gi, '').substr(0, 14)
-}
+};
 
 const masks: IMask[] = [{
   name: 'zipcode',
   apply: (value: string) => {
     if (!value) return '';
-    return value.replace(/^(\d{0,5})(\d{0,3}).*/, '$1-$2').replace(/-$/, '')
+    return value.replace(/^(\d{0,5})(\d{0,3}).*/, '$1-$2').replace(/-$/, '');
   },
   clean: (value: string) => value.replace(/\D/gi, '').substr(0, 8)
 }, {

validator/custom-languages/pt-br.ts renamed to lang/pt-br/validation.ts

@@ -2,7 +2,7 @@ import 'validatorjs/dist/lang/pt';
 
 import { IConfig } from '../../config';
 
-const language: IConfig['validation'] = {
+const validation: IConfig['validation'] = {
   lang: 'custom-pt-br',
   customMessages: {
     same: 'Não coincide.',
@@ -45,4 +45,4 @@ const language: IConfig['validation'] = {
   }
 };
 
-export default language;
+export default validation;

package.json

@@ -9,7 +9,7 @@
     "validation",
     "material"
   ],
-  "version": "1.4.3",
+  "version": "1.4.4",
   "main": "./index.js",
   "types": "./index.d.ts",
   "license": "MIT",
@@ -27,22 +27,31 @@
   "scripts": {
     "docs:dev": "(cd docs/project && yarn && yarn start)",
     "docs:build": "sh docs/build.sh",
-    "precommit": "yarn tsc --noEmit",
     "prepare": "yarn tsc"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "concurrently -r \"yarn tslint -p tsconfig.json\" \"yarn tsc --noEmit\"",
+      "post-merge": "yarn"
+    }
+  },
   "dependencies": {
     "react": ">=16.3.0",
-    "tslib": ">=1.9.0",
-    "validatorjs": ">=3.0.0"
+    "tslib": ">=1.9.3",
+    "validatorjs": "^3.15.1"
   },
   "peerDependencies": {
     "react": ">=16.3.0"
   },
   "devDependencies": {
-    "@types/node": "10.9.3",
-    "@types/react": "16.4.12",
-    "@types/validatorjs": "3.7.1",
-    "husky": "0.14.3",
-    "typescript": "3.0.1"
+    "@types/node": "10.12.18",
+    "@types/react": "16.7.20",
+    "@types/validatorjs": "3.15.0",
+    "concurrently": "4.1.0",
+    "husky": "1.3.1",
+    "tslint": "5.12.1",
+    "tslint-eslint-rules": "5.4.0",
+    "tslint-react": "3.6.0",
+    "typescript": "3.2.4"
   }
-}
+}