fix: randomNIE & randomNIF return uppper case

singuerinc · May 31, 2018 · dced6f7 · dced6f7
1 parent 77dda45
commit dced6f7
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 33 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "better-dni",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "The fastest Spanish DNI (NIE / NIF) validation",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/src/ctrlChar.js b/src/ctrlChar.js
@@ -1,4 +1,4 @@
-import { _char } from './internal/_char';
+import { _letter } from './internal/_utils';
 
 /**
  * Returns the control letter in upper case
@@ -12,6 +12,14 @@ import { _char } from './internal/_char';
  * ctrlChar("03118880B"); // => 'B'
  * ctrlChar("03118880"); // => 'B'
  */
-const ctrlChar = x => _char(x).toUpperCase();
+const ctrlChar = y => {
+  // Get a number from 0 - 2 when `y` is a NIE
+  let f = 'xyzXYZ'.indexOf(y[0]) % 3;
+  // Otherwise default to the number (NIF case only)
+  if (f === -1) f = y[0];
+  // Strip the letters
+  const i = `${f}${y.slice(1, 8)}`;
+  return _letter(i).toUpperCase();
+};
 
 export { ctrlChar };
diff --git a/src/internal/_char.js b/src/internal/_char.js
diff --git a/src/randomNIE.js b/src/randomNIE.js
@@ -10,7 +10,7 @@ import { _randStrLimit, _letter } from './internal/_utils';
 const randomNIE = () => {
   const r = Math.floor(Math.random() * 3);
   const nn = _randStrLimit(7);
-  const l = _letter(+`${r}${nn}`);
+  const l = _letter(+`${r}${nn}`).toUpperCase();
   return `${'XYZ'[r]}${nn}${l}`;
 };
 

diff --git a/src/randomNIF.js b/src/randomNIF.js
@@ -9,7 +9,7 @@ import { _randStrLimit, _letter } from './internal/_utils';
  */
 const randomNIF = () => {
   const nn = _randStrLimit(8);
-  return nn + _letter(nn);
+  return nn + _letter(nn).toUpperCase();
 };
 
 export { randomNIF };