refactor: reorganize helper modules

assisrafael · assisrafael · commit 640aa7fcaa02 · 2017-09-24T11:17:17.000-03:00
diff --git a/src/br/boleto-bancario/boleto-bancario.js b/src/br/boleto-bancario/boleto-bancario.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var StringMask = require('string-mask');
-var maskFactory = require('../../libs/mask-factory');
+var maskFactory = require('../../helpers/mask-factory');
 
 var boletoBancarioMask = new StringMask('00000.00000 00000.000000 00000.000000 0 00000000000000');
 
diff --git a/src/br/br-masks.js b/src/br/br-masks.js
@@ -1,8 +1,6 @@
 'use strict';
 
-var m = angular.module('ui.utils.masks.br', [
-	require('../helpers'),
-])
+var m = angular.module('ui.utils.masks.br', [])
 	.directive('uiBrBoletoBancarioMask', require('./boleto-bancario/boleto-bancario'))
 	.directive('uiBrCarPlateMask', require('./car-plate/car-plate'))
 	.directive('uiBrCepMask', require('./cep/cep'))
diff --git a/src/br/car-plate/car-plate.js b/src/br/car-plate/car-plate.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var StringMask = require('string-mask');
-var maskFactory = require('../../libs/mask-factory');
+var maskFactory = require('../../helpers/mask-factory');
 
 var carPlateMask = new StringMask('UUU-0000');
 
diff --git a/src/br/cep/cep.js b/src/br/cep/cep.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var StringMask = require('string-mask');
-var maskFactory = require('../../libs/mask-factory');
+var maskFactory = require('../../helpers/mask-factory');
 
 var cepMask = new StringMask('00000-000');
 
diff --git a/src/br/cnpj/cnpj.js b/src/br/cnpj/cnpj.js
@@ -2,7 +2,8 @@
 
 var StringMask = require('string-mask');
 var BrV = require('br-validations');
-var maskFactory = require('../../libs/mask-factory');
+
+var maskFactory = require('../../helpers/mask-factory');
 
 var cnpjPattern = new StringMask('00.000.000\/0000-00');
 
diff --git a/src/br/cpf-cnpj/cpf-cnpj.js b/src/br/cpf-cnpj/cpf-cnpj.js
@@ -2,7 +2,7 @@
 
 var StringMask = require('string-mask');
 var BrV = require('br-validations');
-var maskFactory = require('../../libs/mask-factory');
+var maskFactory = require('../../helpers/mask-factory');
 
 var cnpjPattern = new StringMask('00.000.000\/0000-00');
 var cpfPattern = new StringMask('000.000.000-00');
diff --git a/src/br/cpf/cpf.js b/src/br/cpf/cpf.js
@@ -2,7 +2,8 @@
 
 var StringMask = require('string-mask');
 var BrV = require('br-validations');
-var maskFactory = require('../../libs/mask-factory');
+
+var maskFactory = require('../../helpers/mask-factory');
 
 var cpfPattern = new StringMask('000.000.000-00');
 
diff --git a/src/br/inscricao-estadual/ie.js b/src/br/inscricao-estadual/ie.js
@@ -3,37 +3,37 @@
 var StringMask = require('string-mask');
 var BrV = require('br-validations');
 
-function BrIeMaskDirective($parse) {
-	var ieMasks = {
-		'AC': [{mask: new StringMask('00.000.000/000-00')}],
-		'AL': [{mask: new StringMask('000000000')}],
-		'AM': [{mask: new StringMask('00.000.000-0')}],
-		'AP': [{mask: new StringMask('000000000')}],
-		'BA': [{chars: 8, mask: new StringMask('000000-00')}, {mask: new StringMask('0000000-00')}],
-		'CE': [{mask: new StringMask('00000000-0')}],
-		'DF': [{mask: new StringMask('00000000000-00')}],
-		'ES': [{mask: new StringMask('00000000-0')}],
-		'GO': [{mask: new StringMask('00.000.000-0')}],
-		'MA': [{mask: new StringMask('000000000')}],
-		'MG': [{mask: new StringMask('000.000.000/0000')}],
-		'MS': [{mask: new StringMask('000000000')}],
-		'MT': [{mask: new StringMask('0000000000-0')}],
-		'PA': [{mask: new StringMask('00-000000-0')}],
-		'PB': [{mask: new StringMask('00000000-0')}],
-		'PE': [{chars: 9, mask: new StringMask('0000000-00')}, {mask: new StringMask('00.0.000.0000000-0')}],
-		'PI': [{mask: new StringMask('000000000')}],
-		'PR': [{mask: new StringMask('000.00000-00')}],
-		'RJ': [{mask: new StringMask('00.000.00-0')}],
-		'RN': [{chars: 9, mask: new StringMask('00.000.000-0')}, {mask: new StringMask('00.0.000.000-0')}],
-		'RO': [{mask: new StringMask('0000000000000-0')}],
-		'RR': [{mask: new StringMask('00000000-0')}],
-		'RS': [{mask: new StringMask('000/0000000')}],
-		'SC': [{mask: new StringMask('000.000.000')}],
-		'SE': [{mask: new StringMask('00000000-0')}],
-		'SP': [{mask: new StringMask('000.000.000.000')}, {mask: new StringMask('-00000000.0/000')}],
-		'TO': [{mask: new StringMask('00000000000')}]
-	};
+var ieMasks = {
+	'AC': [{mask: new StringMask('00.000.000/000-00')}],
+	'AL': [{mask: new StringMask('000000000')}],
+	'AM': [{mask: new StringMask('00.000.000-0')}],
+	'AP': [{mask: new StringMask('000000000')}],
+	'BA': [{chars: 8, mask: new StringMask('000000-00')}, {mask: new StringMask('0000000-00')}],
+	'CE': [{mask: new StringMask('00000000-0')}],
+	'DF': [{mask: new StringMask('00000000000-00')}],
+	'ES': [{mask: new StringMask('00000000-0')}],
+	'GO': [{mask: new StringMask('00.000.000-0')}],
+	'MA': [{mask: new StringMask('000000000')}],
+	'MG': [{mask: new StringMask('000.000.000/0000')}],
+	'MS': [{mask: new StringMask('000000000')}],
+	'MT': [{mask: new StringMask('0000000000-0')}],
+	'PA': [{mask: new StringMask('00-000000-0')}],
+	'PB': [{mask: new StringMask('00000000-0')}],
+	'PE': [{chars: 9, mask: new StringMask('0000000-00')}, {mask: new StringMask('00.0.000.0000000-0')}],
+	'PI': [{mask: new StringMask('000000000')}],
+	'PR': [{mask: new StringMask('000.00000-00')}],
+	'RJ': [{mask: new StringMask('00.000.00-0')}],
+	'RN': [{chars: 9, mask: new StringMask('00.000.000-0')}, {mask: new StringMask('00.0.000.000-0')}],
+	'RO': [{mask: new StringMask('0000000000000-0')}],
+	'RR': [{mask: new StringMask('00000000-0')}],
+	'RS': [{mask: new StringMask('000/0000000')}],
+	'SC': [{mask: new StringMask('000.000.000')}],
+	'SE': [{mask: new StringMask('00000000-0')}],
+	'SP': [{mask: new StringMask('000.000.000.000')}, {mask: new StringMask('-00000000.0/000')}],
+	'TO': [{mask: new StringMask('00000000000')}]
+};
 
+function BrIeMaskDirective($parse) {
 	function clearValue(value) {
 		if (!value) {
 			return value;
diff --git a/src/br/nfe/nfe.js b/src/br/nfe/nfe.js
@@ -1,10 +1,10 @@
 'use strict';
 
 var StringMask = require('string-mask');
-var maskFactory = require('../../libs/mask-factory');
 
-var nfeAccessKeyMask = new StringMask('0000 0000 0000 0000 0000' +
-	' 0000 0000 0000 0000 0000 0000');
+var maskFactory = require('../../helpers/mask-factory');
+
+var nfeAccessKeyMask = new StringMask('0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000');
 
 module.exports = maskFactory({
 	clearValue: function(rawValue) {
diff --git a/src/br/phone/br-phone.js b/src/br/phone/br-phone.js
@@ -1,7 +1,8 @@
 'use strict';
 
 var StringMask = require('string-mask');
-var maskFactory = require('../../libs/mask-factory');
+
+var maskFactory = require('../../helpers/mask-factory');
 
 /**
  * FIXME: all numbers will have 9 digits after 2016.
diff --git a/src/ch/ch-masks.js b/src/ch/ch-masks.js
@@ -1,8 +1,6 @@
 'use strict';
 
-var m = angular.module('ui.utils.masks.ch', [
-	require('../helpers'),
-])
+var m = angular.module('ui.utils.masks.ch', [])
 	.directive('uiChPhoneNumber', require('./phone/ch-phone'));
 
 module.exports = m.name;
diff --git a/src/ch/phone/ch-phone.js b/src/ch/phone/ch-phone.js
@@ -1,7 +1,8 @@
 'use strict';
 
 var StringMask = require('string-mask');
-var maskFactory = require('../../libs/mask-factory');
+
+var maskFactory = require('../../helpers/mask-factory');
 
 var phoneMask = new StringMask('+00 00 000 00 00');
 
diff --git a/src/fr/fr-masks.js b/src/fr/fr-masks.js
@@ -1,8 +1,6 @@
 'use strict';
 
-var m = angular.module('ui.utils.masks.fr', [
-	require('../helpers')
-])
+var m = angular.module('ui.utils.masks.fr', [])
 	.directive('uiFrPhoneNumber', require('./phone/fr-phone'));
 
 module.exports = m.name;
diff --git a/src/fr/phone/fr-phone.js b/src/fr/phone/fr-phone.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var StringMask = require('string-mask');
-var maskFactory = require('../../libs/mask-factory');
+var maskFactory = require('../../helpers/mask-factory');
 
 var phoneMaskFR = new StringMask('00 00 00 00 00');
 
diff --git a/src/global/credit-card/credit-card.js b/src/global/credit-card/credit-card.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var StringMask = require('string-mask');
-var maskFactory = require('../../libs/mask-factory');
+var maskFactory = require('../../helpers/mask-factory');
 
 var ccSize = 16;
 
diff --git a/src/global/global-masks.js b/src/global/global-masks.js
@@ -1,8 +1,6 @@
 'use strict';
 
-var m = angular.module('ui.utils.masks.global', [
-	require('../helpers'),
-])
+var m = angular.module('ui.utils.masks.global', [])
 	.directive('uiCreditCard', require('./credit-card/credit-card'))
 	.directive('uiDateMask', require('./date/date'))
 	.directive('uiMoneyMask', require('./money/money'))
diff --git a/src/global/money/money.js b/src/global/money/money.js
@@ -1,9 +1,10 @@
 'use strict';
 
 var StringMask = require('string-mask');
-var validators = require('../../libs/validators');
+var validators = require('../../helpers/validators');
+var PreFormatters = require('../../helpers/pre-formatters');
 
-function MoneyMaskDirective($locale, $parse, PreFormatters) {
+function MoneyMaskDirective($locale, $parse) {
 	return {
 		restrict: 'A',
 		require: 'ngModel',
@@ -160,6 +161,6 @@ function MoneyMaskDirective($locale, $parse, PreFormatters) {
 		}
 	};
 }
-MoneyMaskDirective.$inject = ['$locale', '$parse', 'PreFormatters'];
+MoneyMaskDirective.$inject = ['$locale', '$parse'];
 
 module.exports = MoneyMaskDirective;
diff --git a/src/global/number/number.js b/src/global/number/number.js
@@ -1,8 +1,10 @@
 'use strict';
 
-var validators = require('../../libs/validators');
+var validators = require('../../helpers/validators');
+var NumberMasks = require('../../helpers/number-mask-builder');
+var PreFormatters = require('../../helpers/pre-formatters');
 
-function NumberMaskDirective($locale, $parse, PreFormatters, NumberMasks) {
+function NumberMaskDirective($locale, $parse) {
 	return {
 		restrict: 'A',
 		require: 'ngModel',
@@ -111,6 +113,6 @@ function NumberMaskDirective($locale, $parse, PreFormatters, NumberMasks) {
 		}
 	};
 }
-NumberMaskDirective.$inject = ['$locale', '$parse', 'PreFormatters', 'NumberMasks'];
+NumberMaskDirective.$inject = ['$locale', '$parse'];
 
 module.exports = NumberMaskDirective;
diff --git a/src/global/percentage/percentage.js b/src/global/percentage/percentage.js
@@ -1,8 +1,10 @@
 'use strict';
 
-var validators = require('../../libs/validators');
+var validators = require('../../helpers/validators');
+var NumberMasks = require('../../helpers/number-mask-builder');
+var PreFormatters = require('../../helpers/pre-formatters');
 
-function PercentageMaskDirective($locale, $parse, PreFormatters, NumberMasks) {
+function PercentageMaskDirective($locale) {
 	function preparePercentageToFormatter(value, decimals, modelMultiplier) {
 		return PreFormatters.clearDelimitersAndLeadingZeros((parseFloat(value)*modelMultiplier).toFixed(decimals));
 	}
@@ -147,6 +149,6 @@ function PercentageMaskDirective($locale, $parse, PreFormatters, NumberMasks) {
 		}
 	};
 }
-PercentageMaskDirective.$inject = ['$locale', '$parse', 'PreFormatters', 'NumberMasks'];
+PercentageMaskDirective.$inject = ['$locale'];
 
 module.exports = PercentageMaskDirective;
diff --git a/src/global/time/time.js b/src/global/time/time.js
@@ -2,6 +2,7 @@
 
 var StringMask = require('string-mask');
 
+//TODO: refactor to use the mask factory
 module.exports = function TimeMaskDirective() {
 	return {
 		restrict: 'A',
diff --git a/src/helpers.js b/src/helpers.js
diff --git a/src/helpers/mask-factory.js b/src/helpers/mask-factory.js
diff --git a/src/helpers/number-mask-builder.js b/src/helpers/number-mask-builder.js
@@ -0,0 +1,38 @@
+'use strict';
+
+var StringMask = require('string-mask');
+
+function viewMask(decimals, decimalDelimiter, thousandsDelimiter) {
+	var mask = '#' + thousandsDelimiter + '##0';
+
+	if (decimals > 0) {
+		mask += decimalDelimiter;
+		for (var i = 0; i < decimals; i++) {
+			mask += '0';
+		}
+	}
+
+	return new StringMask(mask, {
+		reverse: true
+	});
+}
+
+function modelMask(decimals) {
+	var mask = '###0';
+
+	if (decimals > 0) {
+		mask += '.';
+		for (var i = 0; i < decimals; i++) {
+			mask += '0';
+		}
+	}
+
+	return new StringMask(mask, {
+		reverse: true
+	});
+}
+
+module.exports = {
+	viewMask: viewMask,
+	modelMask: modelMask
+};
diff --git a/src/helpers/pre-formatters.js b/src/helpers/pre-formatters.js
diff --git a/src/helpers/validators.js b/src/helpers/validators.js
diff --git a/src/us/phone/us-phone.js b/src/us/phone/us-phone.js
diff --git a/src/us/us-masks.js b/src/us/us-masks.js
