@sofit/view-locale 0.2.4 → 0.3.1

package/coverage/jest/results.xml

@@ -1,22 +1,22 @@
-<testsuites name="Sofit view locale tests" tests="8" failures="0" time="2.554">
-  <testsuite name="Joi tests" errors="0" failures="0" skipped="0" timestamp="2018-07-30T21:21:03" time="1.377" tests="4">
-    <testcase classname="Joi tests should return default message" name="Joi tests should return default message" time="0.006">
+<testsuites name="Sofit view locale tests" tests="8" failures="0" time="2.569">
+  <testsuite name="Joi tests" errors="0" failures="0" skipped="0" timestamp="2018-08-13T13:48:05" time="1.416" tests="4">
+    <testcase classname="Joi tests should return default message" name="Joi tests should return default message" time="0.007">
     </testcase>
-    <testcase classname="Joi tests should return non label message" name="Joi tests should return non label message" time="0">
+    <testcase classname="Joi tests should return non label message" name="Joi tests should return non label message" time="0.001">
     </testcase>
-    <testcase classname="Joi tests should return translated label message" name="Joi tests should return translated label message" time="0.001">
+    <testcase classname="Joi tests should return translated label message" name="Joi tests should return translated label message" time="0">
     </testcase>
     <testcase classname="Joi tests should return translated label index" name="Joi tests should return translated label index" time="0.001">
     </testcase>
   </testsuite>
-  <testsuite name="Vehicle locale test" errors="0" failures="0" skipped="0" timestamp="2018-07-30T21:21:03" time="1.443" tests="4">
+  <testsuite name="Vehicle locale test" errors="0" failures="0" skipped="0" timestamp="2018-08-13T13:48:05" time="1.479" tests="4">
     <testcase classname="Vehicle locale test Should get translations with reach" name="Vehicle locale test Should get translations with reach" time="0.006">
     </testcase>
     <testcase classname="Vehicle locale test Should replace correctly with reach" name="Vehicle locale test Should replace correctly with reach" time="0.001">
     </testcase>
-    <testcase classname="Vehicle locale test Should get translations with raw" name="Vehicle locale test Should get translations with raw" time="0.001">
+    <testcase classname="Vehicle locale test Should get translations with raw" name="Vehicle locale test Should get translations with raw" time="0">
     </testcase>
-    <testcase classname="Vehicle locale test Should replace correctly with raw" name="Vehicle locale test Should replace correctly with raw" time="0">
+    <testcase classname="Vehicle locale test Should replace correctly with raw" name="Vehicle locale test Should replace correctly with raw" time="0.001">
     </testcase>
   </testsuite>
 </testsuites>

package/dist/runner.d.ts

@@ -1,12 +1,13 @@
 import { IValidationErrorItem } from './joi/joi.interface';
-import { IAccessKey, LANGUAGES } from './languages';
+import { IAccessKey } from './languages';
 export interface IReplaces {
     [key: string]: string;
 }
 export declare class Locale {
     private readonly language;
-    constructor(language: LANGUAGES);
+    constructor(language: string);
     reach(accessKey: IAccessKey, replaces?: IReplaces): string;
     raw(path: string, replaces?: IReplaces): string;
     joi(detail: IValidationErrorItem): string;
+    private setJoiLabel;
 }

package/dist/runner.js

@@ -8,9 +8,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const TRANSLATIONS = __importStar(require("./translations"));
+const TRANSLATION_NOT_FOUND = 'Translation not found';
 class Locale {
     constructor(language) {
-        this.language = language;
+        switch (language) {
+            case 'es':
+                this.language = 'es';
+                break;
+            case 'pt-br':
+                this.language = 'ptBR';
+                break;
+        }
     }
     reach(accessKey, replaces) {
         let text = accessKey[this.language];
@@ -25,7 +33,7 @@ class Locale {
             }
             return text;
         }
-        return 'Translation not found';
+        return TRANSLATION_NOT_FOUND;
     }
     raw(path, replaces) {
         const paths = path.split('.');
@@ -40,24 +48,31 @@ class Locale {
         if (target) {
             return this.reach(target, replaces);
         }
-        return 'Translation not found';
+        return TRANSLATION_NOT_FOUND;
     }
     joi(detail) {
         const accessKey = TRANSLATIONS.joi[detail.type];
         if (accessKey) {
-            if (detail.context && (!(detail.context.key || '').startsWith('cf_'))) {
-                if (typeof detail.context.label === 'number') {
-                    detail.context.label = this.reach(TRANSLATIONS.joi.index, {
-                        index: (detail.context.label + 1).toString()
-                    });
-                }
-                else {
-                    detail.context.label = this.raw(detail.context.label);
-                }
-            }
+            this.setJoiLabel(detail);
             return this.reach(TRANSLATIONS.joi[detail.type], detail.context);
         }
         return `There is no translation for joi type '${detail.type}'`;
     }
+    setJoiLabel(detail) {
+        if (detail.context && (!(detail.context.key || '').startsWith('cf_'))) {
+            if (typeof detail.context.label === 'number') {
+                detail.context.label = this.reach(TRANSLATIONS.joi.index, {
+                    index: (detail.context.label + 1).toString(),
+                    path: detail.path[0]
+                });
+            }
+            else {
+                detail.context.label = this.raw(detail.context.label);
+            }
+            if (detail.context.label === TRANSLATION_NOT_FOUND) {
+                detail.context.label = detail.context.key;
+            }
+        }
+    }
 }
 exports.Locale = Locale;

package/dist/translations/common/joi.js

@@ -2,13 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.joi = {
     'index': {
-        ptBR: '{{index}}º valor',
-        es: '{{index}}er valor'
+        ptBR: '{{index}}º valor de {{path}}',
+        es: '{{index}}er valor de {{path}}'
     },
     'string.base': {
         ptBR: '{{label}} precisa ser um texto.',
         es: '{{label}} debe se uno texto.'
     },
+    'string.email': {
+        ptBR: '{{label}} precisa ser um email válido.',
+        es: '{{label}}'
+    },
     'number.base': {
         ptBR: '{{label}} precisa ser numérico.',
         es: '{{label}} debe ser numérico.'

package/dist/translations/index.d.ts

@@ -2,3 +2,4 @@ export { gate } from './modules/gate/gate';
 export { button } from './common/buttons';
 export { joi } from './common/joi';
 export { databaseErrors } from './common/database-errors';
+export { company } from './modules/company/company';

package/dist/translations/index.js

@@ -8,3 +8,5 @@ var joi_1 = require("./common/joi");
 exports.joi = joi_1.joi;
 var database_errors_1 = require("./common/database-errors");
 exports.databaseErrors = database_errors_1.databaseErrors;
+var company_1 = require("./modules/company/company");
+exports.company = company_1.company;

package/dist/translations/modules/company/company.d.ts

@@ -0,0 +1,66 @@
+export declare const company: {
+    name: {
+        ptBR: string;
+        es: string;
+    };
+    cnpj: {
+        ptBR: string;
+        es: string;
+    };
+    address: {
+        ptBR: string;
+        es: string;
+    };
+    address_num: {
+        ptBR: string;
+        es: string;
+    };
+    address_neighborhood: {
+        ptBR: string;
+        es: string;
+    };
+    address_state_id: {
+        ptBR: string;
+        es: string;
+    };
+    address_city_id: {
+        ptBR: string;
+        es: string;
+    };
+    address_complementary: {
+        ptBR: string;
+        es: string;
+    };
+    postal_code: {
+        ptBR: string;
+        es: string;
+    };
+    responsible: {
+        ptBR: string;
+        es: string;
+    };
+    cnae: {
+        ptBR: string;
+        es: string;
+    };
+    cnae_description: {
+        ptBR: string;
+        es: string;
+    };
+    secondary_cnae: {
+        ptBR: string;
+        es: string;
+    };
+    external_id: {
+        ptBR: string;
+        es: string;
+    };
+    alert_emails: {
+        ptBR: string;
+        es: string;
+    };
+    alert_users: {
+        ptBR: string;
+        es: string;
+    };
+};

package/dist/translations/modules/company/company.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.company = {
+    name: {
+        ptBR: 'Nome',
+        es: 'Nombre'
+    },
+    cnpj: {
+        ptBR: 'CNPJ/CPF',
+        es: 'CNPJ/CPF'
+    },
+    address: {
+        ptBR: 'Endereço',
+        es: 'Dirección'
+    },
+    address_num: {
+        ptBR: 'Nº',
+        es: 'Nº'
+    },
+    address_neighborhood: {
+        ptBR: 'Bairro',
+        es: 'Bario'
+    },
+    address_state_id: {
+        ptBR: 'UF',
+        es: 'Provincia'
+    },
+    address_city_id: {
+        ptBR: 'Cidade',
+        es: 'Ciudad'
+    },
+    address_complementary: {
+        ptBR: 'Complemento',
+        es: 'Complemento'
+    },
+    postal_code: {
+        ptBR: 'CEP',
+        es: 'Codico postal'
+    },
+    responsible: {
+        ptBR: 'Responsável',
+        es: 'Responsable'
+    },
+    cnae: {
+        ptBR: 'CNAE',
+        es: 'CNAE'
+    },
+    cnae_description: {
+        ptBR: 'Descrição do CNAE',
+        es: 'Descrición del CNAE'
+    },
+    secondary_cnae: {
+        ptBR: 'CNAE Secundário',
+        es: 'CNAE Segundario'
+    },
+    external_id: {
+        ptBR: 'Chave externa',
+        es: 'Clave externa'
+    },
+    alert_emails: {
+        ptBR: 'Emails para recebimento de alerta',
+        es: 'Emails para recebimiento de alerta'
+    },
+    alert_users: {
+        ptBR: 'Usuários para recebimento de alertas',
+        es: 'Usuarios para recebimento de alertas'
+    }
+};

package/lib/runner.ts

@@ -2,15 +2,29 @@ import { IValidationErrorItem } from './joi/joi.interface';
 import { IAccessKey, LANGUAGES } from './languages';
 import * as TRANSLATIONS from './translations';
 
+const TRANSLATION_NOT_FOUND = 'Translation not found';
+
 export interface IReplaces {
 	[key: string]: string;
 }
 
 export class Locale {
 
-	constructor(
-		private readonly language: LANGUAGES
-	) { }
+	private readonly language: LANGUAGES;
+
+	constructor(language: string) {
+
+		switch (language) {
+
+			case 'es':
+				this.language = 'es';
+				break;
+
+			case 'pt-br':
+				this.language = 'ptBR';
+				break;
+		}
+	}
 
 	public reach(accessKey: IAccessKey, replaces?: IReplaces): string {
 
@@ -34,7 +48,7 @@ export class Locale {
 			return text;
 		}
 
-		return 'Translation not found';
+		return TRANSLATION_NOT_FOUND;
 	}
 
 	public raw(path: string, replaces?: IReplaces): string {
@@ -59,7 +73,7 @@ export class Locale {
 			return this.reach(target, replaces);
 		}
 
-		return 'Translation not found';
+		return TRANSLATION_NOT_FOUND;
 	}
 
 	public joi(detail: IValidationErrorItem) {
@@ -68,22 +82,33 @@ export class Locale {
 
 		if (accessKey) {
 
-			if (detail.context && (!(detail.context.key || '').startsWith('cf_'))) {
+			this.setJoiLabel(detail);
 
-				if (typeof detail.context.label === 'number') {
+			return this.reach(TRANSLATIONS.joi[detail.type], detail.context as IReplaces);
+		}
 
-					detail.context.label = this.reach(TRANSLATIONS.joi.index, {
-						index: (detail.context.label as number + 1).toString()
-					});
-				} else {
+		return `There is no translation for joi type '${detail.type}'`;
+	}
 
-					detail.context.label = this.raw(detail.context.label as string);
-				}
+	private setJoiLabel(detail: IValidationErrorItem) {
+
+		if (detail.context && (!(detail.context.key || '').startsWith('cf_'))) {
+
+			if (typeof detail.context.label === 'number') {
+
+				detail.context.label = this.reach(TRANSLATIONS.joi.index, {
+					index: (detail.context.label as number + 1).toString(),
+					path: detail.path[0]
+				});
+			} else {
+
+				detail.context.label = this.raw(detail.context.label as string);
 			}
 
-			return this.reach(TRANSLATIONS.joi[detail.type], detail.context as IReplaces);
-		}
+			if (detail.context.label === TRANSLATION_NOT_FOUND) {
 
-		return `There is no translation for joi type '${detail.type}'`;
+				detail.context.label = detail.context.key;
+			}
+		}
 	}
 }

package/lib/tests/basic.spec.ts

@@ -2,7 +2,7 @@ import { i18n, Locale } from '../index';
 
 describe('Vehicle locale test', () => {
 
-	const localeptBR = new Locale('ptBR');
+	const localeptBR = new Locale('pt-br');
 	const localeES = new Locale('es');
 
 	it('Should get translations with reach', () => {

package/lib/tests/joi.spec.ts

@@ -4,7 +4,7 @@ import { Locale } from '../runner';
 
 describe('Joi tests', () => {
 
-	const localeptBR = new Locale('ptBR');
+	const localeptBR = new Locale('pt-br');
 	const localeptES = new Locale('es');
 
 	it('should return default message', () => {
@@ -57,17 +57,19 @@ describe('Joi tests', () => {
 
 		expect(localeptBR.joi({
 			type: 'string.base',
+			path: ['path'],
 			context: {
 				key: 0,
 				label: 0
 			}
-		} as any)).toEqual('1º valor precisa ser um texto.');
+		} as any)).toEqual('1º valor de path precisa ser um texto.');
 		expect(localeptES.joi({
 			type: 'string.base',
+			path: ['path'],
 			context: {
 				key: 0,
 				label: 0
 			}
-		} as any)).toEqual('1er valor debe se uno texto.');
+		} as any)).toEqual('1er valor de path debe se uno texto.');
 	});
 });

package/lib/translations/common/joi.ts

@@ -2,13 +2,17 @@ import { ITranslation } from '../translation.interface';
 
 export const joi: ITranslation = {
 	'index': {
-		ptBR: '{{index}}º valor',
-		es: '{{index}}er valor'
+		ptBR: '{{index}}º valor de {{path}}',
+		es: '{{index}}er valor de {{path}}'
 	},
 	'string.base': {
 		ptBR: '{{label}} precisa ser um texto.',
 		es: '{{label}} debe se uno texto.'
 	},
+	'string.email': {
+		ptBR: '{{label}} precisa ser um email válido.',
+		es: '{{label}}'
+	},
 	'number.base': {
 		ptBR: '{{label}} precisa ser numérico.',
 		es: '{{label}} debe ser numérico.'

package/lib/translations/index.ts

@@ -1,4 +1,5 @@
 export { gate } from './modules/gate/gate';
 export { button } from './common/buttons';
 export { joi } from './common/joi';
-export { databaseErrors } from './common/database-errors';
+export { databaseErrors } from './common/database-errors';
+export { company } from './modules/company/company';

package/lib/translations/modules/company/company.ts

@@ -0,0 +1,66 @@
+export const company = {
+	name: {
+		ptBR: 'Nome',
+		es: 'Nombre'
+	},
+	cnpj: {
+		ptBR: 'CNPJ/CPF',
+		es: 'CNPJ/CPF'
+	},
+	address: {
+		ptBR: 'Endereço',
+		es: 'Dirección'
+	},
+	address_num: {
+		ptBR: 'Nº',
+		es: 'Nº'
+	},
+	address_neighborhood: {
+		ptBR: 'Bairro',
+		es: 'Bario'
+	},
+	address_state_id: {
+		ptBR: 'UF',
+		es: 'Provincia'
+	},
+	address_city_id: {
+		ptBR: 'Cidade',
+		es: 'Ciudad'
+	},
+	address_complementary: {
+		ptBR: 'Complemento',
+		es: 'Complemento'
+	},
+	postal_code: {
+		ptBR: 'CEP',
+		es: 'Codico postal'
+	},
+	responsible: {
+		ptBR: 'Responsável',
+		es: 'Responsable'
+	},
+	cnae: {
+		ptBR: 'CNAE',
+		es: 'CNAE'
+	},
+	cnae_description: {
+		ptBR: 'Descrição do CNAE',
+		es: 'Descrición del CNAE'
+	},
+	secondary_cnae: {
+		ptBR: 'CNAE Secundário',
+		es: 'CNAE Segundario'
+	},
+	external_id: {
+		ptBR: 'Chave externa',
+		es: 'Clave externa'
+	},
+	alert_emails: {
+		ptBR: 'Emails para recebimento de alerta',
+		es: 'Emails para recebimiento de alerta'
+	},
+	alert_users: {
+		ptBR: 'Usuários para recebimento de alertas',
+		es: 'Usuarios para recebimento de alertas'
+	}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sofit/view-locale",
-	"version": "0.2.4",
+	"version": "0.3.1",
 	"description": "Traduções do Sofit View",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",