url,tools,benchmark: replace deprecated substr()

Jungku Lee · marco-ippolito · commit be9d6f21761d · 2024-06-17T16:25:22.000+02:00
PR-URL: #51546 Refs: https://developer.mozilla.org/ko/docs/Web/JavaScript/Reference/Global_Objects/String/substr Reviewed-By: Jithil P Ponnan <jithil@outlook.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -210,6 +210,10 @@ module.exports = {
         selector: 'ThrowStatement > CallExpression[callee.name=/Error$/]',
         message: 'Use `new` keyword when throwing an `Error`.',
       },
+      {
+        selector: "CallExpression[callee.property.name='substr']",
+        message: 'Use String.prototype.slice() or String.prototype.substring() instead of String.prototype.substr()',
+      },
       {
         selector: "CallExpression[callee.name='isNaN']",
         message: 'Use Number.isNaN() instead of the global isNaN() function.',
diff --git a/benchmark/http/bench-parser.js b/benchmark/http/bench-parser.js
@@ -46,7 +46,7 @@ function main({ len, n }) {
   let header = `GET /hello HTTP/1.1${CRLF}Content-Type: text/plain${CRLF}`;
 
   for (let i = 0; i < len; i++) {
-    header += `X-Filler${i}: ${Math.random().toString(36).substr(2)}${CRLF}`;
+    header += `X-Filler${i}: ${Math.random().toString(36).substring(2)}${CRLF}`;
   }
   header += CRLF;
 
diff --git a/lib/url.js b/lib/url.js
@@ -958,7 +958,7 @@ Url.prototype.resolveObject = function resolveObject(relative) {
     srcPath.unshift('');
   }
 
-  if (hasTrailingSlash && (srcPath.join('/').substr(-1) !== '/')) {
+  if (hasTrailingSlash && (srcPath.join('/').slice(-1) !== '/')) {
     srcPath.push('');
   }
 
diff --git a/tools/doc/html.mjs b/tools/doc/html.mjs
@@ -394,8 +394,8 @@ function versionSort(a, b) {
   b = minVersion(b).trim();
   let i = 0; // Common prefix length.
   while (i < a.length && i < b.length && a[i] === b[i]) i++;
-  a = a.substr(i);
-  b = b.substr(i);
+  a = a.substring(i);
+  b = b.substring(i);
   return +b.match(numberRe)[0] - +a.match(numberRe)[0];
 }
 
diff --git a/tools/doc/json.mjs b/tools/doc/json.mjs
@@ -320,8 +320,8 @@ function parseSignature(text, sig) {
 
     const eq = sigParam.indexOf('=');
     if (eq !== -1) {
-      defaultValue = sigParam.substr(eq + 1);
-      sigParam = sigParam.substr(0, eq);
+      defaultValue = sigParam.substring(eq + 1);
+      sigParam = sigParam.substring(0, eq);
     }
 
     // At this point, the name should match. If it doesn't find one that does.

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ function main({ len, n }) {`
`46`	`46`	let header = `GET /hello HTTP/1.1${CRLF}Content-Type: text/plain${CRLF}`;
`47`	`47`
`48`	`48`	`for (let i = 0; i < len; i++) {`
`49`		- header += `X-Filler${i}: ${Math.random().toString(36).substr(2)}${CRLF}`;
	`49`	+ header += `X-Filler${i}: ${Math.random().toString(36).substring(2)}${CRLF}`;
`50`	`50`	`}`
`51`	`51`	`header += CRLF;`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -958,7 +958,7 @@ Url.prototype.resolveObject = function resolveObject(relative) {`
`958`	`958`	`srcPath.unshift('');`
`959`	`959`	`}`
`960`	`960`
`961`		`- if (hasTrailingSlash && (srcPath.join('/').substr(-1) !== '/')) {`
	`961`	`+ if (hasTrailingSlash && (srcPath.join('/').slice(-1) !== '/')) {`
`962`	`962`	`srcPath.push('');`
`963`	`963`	`}`
`964`	`964`
Original file line number	Diff line number	Diff line change
`@@ -320,8 +320,8 @@ function parseSignature(text, sig) {`
`320`	`320`
`321`	`321`	`const eq = sigParam.indexOf('=');`
`322`	`322`	`if (eq !== -1) {`
`323`		`- defaultValue = sigParam.substr(eq + 1);`
`324`		`- sigParam = sigParam.substr(0, eq);`
	`323`	`+ defaultValue = sigParam.substring(eq + 1);`
	`324`	`+ sigParam = sigParam.substring(0, eq);`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`// At this point, the name should match. If it doesn't find one that does.`