refactor: replace deprecated String.prototype.substr()

CommanderRoot · CommanderRoot · commit 3cf0f847d1b1 · 2022-03-20T06:28:59.000+01:00
.substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated
Signed-off-by: Tobias Speicher &lt;rootcommander@gmail.com&gt;
diff --git a/src/lib/isDataURI.js b/src/lib/isDataURI.js
@@ -14,10 +14,10 @@ export default function isDataURI(str) {
   }
   const attributes = data.shift().trim().split(';');
   const schemeAndMediaType = attributes.shift();
-  if (schemeAndMediaType.substr(0, 5) !== 'data:') {
+  if (schemeAndMediaType.slice(0, 5) !== 'data:') {
     return false;
   }
-  const mediaType = schemeAndMediaType.substr(5);
+  const mediaType = schemeAndMediaType.slice(5);
   if (mediaType !== '' && !validMediaType.test(mediaType)) {
     return false;
   }
diff --git a/src/lib/isEmail.js b/src/lib/isEmail.js
@@ -77,7 +77,7 @@ export default function isEmail(str, options) {
       // eg. myname <address@gmail.com>
       // the display name is `myname` instead of `myname `, so need to trim the last space
       if (display_name.endsWith(' ')) {
-        display_name = display_name.substr(0, display_name.length - 1);
+        display_name = display_name.slice(0, -1);
       }
 
       if (!validateDisplayName(display_name)) {
@@ -144,7 +144,7 @@ export default function isEmail(str, options) {
         return false;
       }
 
-      let noBracketdomain = domain.substr(1, domain.length - 2);
+      let noBracketdomain = domain.slice(1, -1);
 
       if (noBracketdomain.length === 0 || !isIP(noBracketdomain)) {
         return false;
diff --git a/src/lib/isIdentityCard.js b/src/lib/isIdentityCard.js
@@ -130,15 +130,15 @@ const validators = {
   },
   IR: (str) => {
     if (!str.match(/^\d{10}$/)) return false;
-    str = (`0000${str}`).substr(str.length - 6);
+    str = (`0000${str}`).slice(str.length - 6);
 
-    if (parseInt(str.substr(3, 6), 10) === 0) return false;
+    if (parseInt(str.slice(3, 9), 10) === 0) return false;
 
-    const lastNumber = parseInt(str.substr(9, 1), 10);
+    const lastNumber = parseInt(str.slice(9, 10), 10);
     let sum = 0;
 
     for (let i = 0; i < 9; i++) {
-      sum += parseInt(str.substr(i, 1), 10) * (10 - i);
+      sum += parseInt(str.slice(i, i + 1), 10) * (10 - i);
     }
 
     sum %= 11;
diff --git a/src/lib/isTaxID.js b/src/lib/isTaxID.js
@@ -373,7 +373,7 @@ function enUsGetPrefixes() {
  * Verify that the TIN starts with a valid IRS campus prefix
  */
 function enUsCheck(tin) {
-  return enUsGetPrefixes().indexOf(tin.substr(0, 2)) !== -1;
+  return enUsGetPrefixes().indexOf(tin.slice(0, 2)) !== -1;
 }
 
 /*
diff --git a/src/lib/isURL.js b/src/lib/isURL.js
@@ -87,11 +87,11 @@ export default function isURL(url, options) {
     }
   } else if (options.require_protocol) {
     return false;
-  } else if (url.substr(0, 2) === '//') {
+  } else if (url.slice(0, 2) === '//') {
     if (!options.allow_protocol_relative_urls) {
       return false;
     }
-    split[0] = url.substr(2);
+    split[0] = url.slice(2);
   }
   url = split.join('://');
 

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@ export default function isDataURI(str) {`
`14`	`14`	`}`
`15`	`15`	`const attributes = data.shift().trim().split(';');`
`16`	`16`	`const schemeAndMediaType = attributes.shift();`
`17`		`- if (schemeAndMediaType.substr(0, 5) !== 'data:') {`
	`17`	`+ if (schemeAndMediaType.slice(0, 5) !== 'data:') {`
`18`	`18`	`return false;`
`19`	`19`	`}`
`20`		`- const mediaType = schemeAndMediaType.substr(5);`
	`20`	`+ const mediaType = schemeAndMediaType.slice(5);`
`21`	`21`	`if (mediaType !== '' && !validMediaType.test(mediaType)) {`
`22`	`22`	`return false;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ export default function isEmail(str, options) {`
`77`	`77`	`// eg. myname <[email protected]>`
`78`	`78`	// the display name is `myname` instead of `myname `, so need to trim the last space
`79`	`79`	`if (display_name.endsWith(' ')) {`
`80`		`- display_name = display_name.substr(0, display_name.length - 1);`
	`80`	`+ display_name = display_name.slice(0, -1);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`if (!validateDisplayName(display_name)) {`
`@@ -144,7 +144,7 @@ export default function isEmail(str, options) {`
`144`	`144`	`return false;`
`145`	`145`	`}`
`146`	`146`
`147`		`- let noBracketdomain = domain.substr(1, domain.length - 2);`
	`147`	`+ let noBracketdomain = domain.slice(1, -1);`
`148`	`148`
`149`	`149`	`if (noBracketdomain.length === 0 \|\| !isIP(noBracketdomain)) {`
`150`	`150`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ function enUsGetPrefixes() {`
`373`	`373`	`* Verify that the TIN starts with a valid IRS campus prefix`
`374`	`374`	`*/`
`375`	`375`	`function enUsCheck(tin) {`
`376`		`- return enUsGetPrefixes().indexOf(tin.substr(0, 2)) !== -1;`
	`376`	`+ return enUsGetPrefixes().indexOf(tin.slice(0, 2)) !== -1;`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,11 @@ export default function isURL(url, options) {`
`87`	`87`	`}`
`88`	`88`	`} else if (options.require_protocol) {`
`89`	`89`	`return false;`
`90`		`- } else if (url.substr(0, 2) === '//') {`
	`90`	`+ } else if (url.slice(0, 2) === '//') {`
`91`	`91`	`if (!options.allow_protocol_relative_urls) {`
`92`	`92`	`return false;`
`93`	`93`	`}`
`94`		`- split[0] = url.substr(2);`
	`94`	`+ split[0] = url.slice(2);`
`95`	`95`	`}`
`96`	`96`	`url = split.join('://');`
`97`	`97`