chore: simpler string trimming (#14798)

SimenB · web-flow · commit 14cfdae1e193 · 2023-12-28T18:22:15.000Z
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -712,9 +712,6 @@ module.exports = {
     'unicorn/prefer-set-has': 'off',
     'unicorn/prefer-spread': 'off',
     'unicorn/prefer-string-replace-all': 'off',
-    'unicorn/prefer-string-slice': 'off',
-    'unicorn/prefer-string-starts-ends-with': 'off',
-    'unicorn/prefer-string-trim-start-end': 'off',
     'unicorn/prefer-type-error': 'off',
     'unicorn/prevent-abbreviations': 'off',
     'unicorn/text-encoding-identifier-case': 'off',
diff --git a/docs/ExpectAPI.md b/docs/ExpectAPI.md
@@ -1642,7 +1642,7 @@ expect.extend({
   toMatchTrimmedSnapshot(received, length) {
     return toMatchSnapshot.call(
       this,
-      received.substring(0, length),
+      received.slice(0, length),
       'toMatchTrimmedSnapshot',
     );
   },
@@ -1666,7 +1666,7 @@ const {toMatchInlineSnapshot} = require('jest-snapshot');
 
 expect.extend({
   toMatchTrimmedInlineSnapshot(received, ...rest) {
-    return toMatchInlineSnapshot.call(this, received.substring(0, 10), ...rest);
+    return toMatchInlineSnapshot.call(this, received.slice(0, 10), ...rest);
   },
 });
 
diff --git a/docs/TutorialAsync.md b/docs/TutorialAsync.md
@@ -46,7 +46,7 @@ const users = {
 
 export default function request(url) {
   return new Promise((resolve, reject) => {
-    const userID = parseInt(url.substr('/users/'.length), 10);
+    const userID = parseInt(url.slice('/users/'.length), 10);
     process.nextTick(() =>
       users[userID]
         ? resolve(users[userID])
diff --git a/e2e/Utils.ts b/e2e/Utils.ts
@@ -273,7 +273,7 @@ const sortTests = (stdout: string) =>
     }, [])
     .sort(([a], [b]) => (a > b ? 1 : -1))
     .map(strings =>
-      strings.length > 1 ? `${strings.join('\n').trimRight()}\n` : strings[0],
+      strings.length > 1 ? `${strings.join('\n').trimEnd()}\n` : strings[0],
     )
     .join('\n')
     .trim();
diff --git a/e2e/__tests__/each.test.ts b/e2e/__tests__/each.test.ts
@@ -28,7 +28,7 @@ test('shows the correct errors in stderr when failing tests', () => {
   expect(result.exitCode).toBe(1);
   const output = extractSummary(result.stderr)
     .rest.split('\n')
-    .map(line => line.trimRight())
+    .map(line => line.trimEnd())
     .join('\n');
   expect(output).toMatchSnapshot();
 });
diff --git a/e2e/__tests__/failures.test.ts b/e2e/__tests__/failures.test.ts
@@ -78,19 +78,15 @@ test('works with snapshot failures', () => {
 
   const result = normalizeDots(cleanStderr(stderr));
 
-  expect(
-    result.substring(0, result.indexOf('Snapshot Summary')),
-  ).toMatchSnapshot();
+  expect(result.slice(0, result.indexOf('Snapshot Summary'))).toMatchSnapshot();
 });
 
 test('works with snapshot failures with hint', () => {
   const {stderr} = runJest(dir, ['snapshotWithHint.test.js']);
 
   const result = normalizeDots(cleanStderr(stderr));
 
-  expect(
-    result.substring(0, result.indexOf('Snapshot Summary')),
-  ).toMatchSnapshot();
+  expect(result.slice(0, result.indexOf('Snapshot Summary'))).toMatchSnapshot();
 });
 
 test('works with error with cause', () => {
@@ -113,7 +109,7 @@ test('works with error with cause thrown outside tests', () => {
   expect(
     // jasmine runner differ from circus one in this case, we just start
     // the comparison when the stack starts to be reported
-    sanitizedSummary.substring(sanitizedSummary.indexOf('error during f')),
+    sanitizedSummary.slice(sanitizedSummary.indexOf('error during f')),
   ).toMatchSnapshot();
 });
 
diff --git a/examples/async/__mocks__/request.js b/examples/async/__mocks__/request.js
@@ -9,7 +9,7 @@ const users = {
 
 export default function request(url) {
   return new Promise((resolve, reject) => {
-    const userID = parseInt(url.substr('/users/'.length), 10);
+    const userID = parseInt(url.slice('/users/'.length), 10);
     process.nextTick(() =>
       users[userID]
         ? resolve(users[userID])
diff --git a/packages/babel-jest/src/index.ts b/packages/babel-jest/src/index.ts
@@ -99,7 +99,7 @@ function getCacheKeyFromConfig(
     .update('\0', 'utf8')
     .update(process.version)
     .digest('hex')
-    .substring(0, 32);
+    .slice(0, 32);
 }
 
 function loadBabelConfig(
diff --git a/packages/create-jest/src/__tests__/init.test.ts b/packages/create-jest/src/__tests__/init.test.ts
@@ -205,7 +205,7 @@ describe('init', () => {
     });
   });
 
-  describe.each(JEST_CONFIG_EXT_ORDER.map(e => e.substring(1)))(
+  describe.each(JEST_CONFIG_EXT_ORDER.map(e => e.slice(1)))(
     'has-jest-config-file-%s',
     extension => {
       describe('ask the user whether to override config or not', () => {
diff --git a/packages/jest-cli/src/__tests__/args.test.ts b/packages/jest-cli/src/__tests__/args.test.ts
@@ -65,7 +65,7 @@ describe('check', () => {
     expect(() => check(argv({maxWorkers: '50%'}))).not.toThrow();
   });
 
-  test.each(constants.JEST_CONFIG_EXT_ORDER.map(e => e.substring(1)))(
+  test.each(constants.JEST_CONFIG_EXT_ORDER.map(e => e.slice(1)))(
     'allows using "%s" file for --config option',
     ext => {
       expect(() => check(argv({config: `jest.config.${ext}`}))).not.toThrow();
diff --git a/packages/jest-cli/src/args.ts b/packages/jest-cli/src/args.ts
@@ -79,7 +79,7 @@ export function check(argv: Config.Argv): true {
     !isJSONString(argv.config) &&
     !argv.config.match(
       new RegExp(
-        `\\.(${constants.JEST_CONFIG_EXT_ORDER.map(e => e.substring(1)).join(
+        `\\.(${constants.JEST_CONFIG_EXT_ORDER.map(e => e.slice(1)).join(
           '|',
         )})$`,
         'i',
diff --git a/packages/jest-config/src/__tests__/normalize.test.ts b/packages/jest-config/src/__tests__/normalize.test.ts
@@ -76,7 +76,7 @@ it('picks an id based on the rootDir', async () => {
     .update('/root/path/foo')
     .update(String(Infinity))
     .digest('hex')
-    .substring(0, 32);
+    .slice(0, 32);
   const {options} = await normalize(
     {
       rootDir,
diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts
@@ -313,7 +313,7 @@ const normalizeMissingOptions = (
       .update(configPath || '')
       .update(String(projectIndex))
       .digest('hex')
-      .substring(0, 32);
+      .slice(0, 32);
   }
 
   if (!options.setupFiles) {
diff --git a/packages/jest-config/src/utils.ts b/packages/jest-config/src/utils.ts
@@ -58,13 +58,13 @@ export const replaceRootDirInPath = (
   rootDir: string,
   filePath: string,
 ): string => {
-  if (!/^<rootDir>/.test(filePath)) {
+  if (!filePath.startsWith('<rootDir>')) {
     return filePath;
   }
 
   return path.resolve(
     rootDir,
-    path.normalize(`./${filePath.substring('<rootDir>'.length)}`),
+    path.normalize(`./${filePath.slice('<rootDir>'.length)}`),
   );
 };
 
diff --git a/packages/jest-console/src/getConsoleOutput.ts b/packages/jest-console/src/getConsoleOutput.ts
@@ -54,10 +54,8 @@ export default function getConsoleOutput(
 
     return `${
       output + TITLE_INDENT + chalk.dim(typeMessage)
-    }\n${message.trimRight()}\n${chalk.dim(
-      formattedStackTrace.trimRight(),
-    )}\n\n`;
+    }\n${message.trimEnd()}\n${chalk.dim(formattedStackTrace.trimEnd())}\n\n`;
   }, '');
 
-  return `${logEntries.trimRight()}\n`;
+  return `${logEntries.trimEnd()}\n`;
 }
diff --git a/packages/jest-create-cache-key-function/src/index.ts b/packages/jest-create-cache-key-function/src/index.ts
@@ -58,7 +58,7 @@ function getGlobalCacheKey(
       createHash('sha1'),
     )
     .digest('hex')
-    .substring(0, length);
+    .slice(0, length);
 }
 
 function getCacheKeyFunction(
@@ -80,7 +80,7 @@ function getCacheKeyFunction(
       .update('\0', 'utf8')
       .update(instrument ? 'instrument' : '')
       .digest('hex')
-      .substring(0, length);
+      .slice(0, length);
   };
 }
 
diff --git a/packages/jest-docblock/src/index.ts b/packages/jest-docblock/src/index.ts
@@ -23,12 +23,12 @@ const STRING_ARRAY: ReadonlyArray<string> = [];
 
 export function extract(contents: string): string {
   const match = contents.match(docblockRe);
-  return match ? match[0].trimLeft() : '';
+  return match ? match[0].trimStart() : '';
 }
 
 export function strip(contents: string): string {
   const match = contents.match(docblockRe);
-  return match && match[0] ? contents.substring(match[0].length) : contents;
+  return match && match[0] ? contents.slice(match[0].length) : contents;
 }
 
 export function parse(docblock: string): Pragmas {
@@ -52,13 +52,13 @@ export function parseWithComments(docblock: string): {
     prev = docblock;
     docblock = docblock.replace(multilineRe, `${line}$1 $2${line}`);
   }
-  docblock = docblock.replace(ltrimNewlineRe, '').trimRight();
+  docblock = docblock.replace(ltrimNewlineRe, '').trimEnd();
 
   const result = Object.create(null) as Pragmas;
   const comments = docblock
     .replace(propertyRe, '')
     .replace(ltrimNewlineRe, '')
-    .trimRight();
+    .trimEnd();
 
   let match;
   while ((match = propertyRe.exec(docblock))) {
diff --git a/packages/jest-haste-map/src/__tests__/haste_impl.js b/packages/jest-haste-map/src/__tests__/haste_impl.js
@@ -25,7 +25,7 @@ module.exports = {
     }
 
     return filename
-      .substr(filename.lastIndexOf(path.sep) + 1)
+      .slice(filename.lastIndexOf(path.sep) + 1)
       .replace(/(\.(android|ios|native))?\.js$/, '');
   },
 
diff --git a/packages/jest-haste-map/src/crawlers/node.ts b/packages/jest-haste-map/src/crawlers/node.ts
@@ -104,7 +104,7 @@ function find(
             if (stat.isDirectory()) {
               search(file);
             } else {
-              const ext = path.extname(file).substr(1);
+              const ext = path.extname(file).slice(1);
               if (extensions.includes(ext)) {
                 result.push([file, stat.mtime.getTime(), stat.size]);
               }
diff --git a/packages/jest-haste-map/src/getMockName.ts b/packages/jest-haste-map/src/getMockName.ts
@@ -12,7 +12,7 @@ const MOCKS_PATTERN = `${path.sep}__mocks__${path.sep}`;
 const getMockName = (filePath: string): string => {
   const mockPath = filePath.split(MOCKS_PATTERN)[1];
   return mockPath
-    .substring(0, mockPath.lastIndexOf(path.extname(mockPath)))
+    .slice(0, mockPath.lastIndexOf(path.extname(mockPath)))
     .replace(/\\/g, '/');
 };
 
diff --git a/packages/jest-haste-map/src/index.ts b/packages/jest-haste-map/src/index.ts
@@ -295,7 +295,7 @@ class HasteMap extends EventEmitter implements IHasteMap {
     const rootDirHash = createHash('sha1')
       .update(options.rootDir)
       .digest('hex')
-      .substring(0, 32);
+      .slice(0, 32);
     let hasteImplHash = '';
     let dependencyExtractorHash = '';
 
@@ -344,7 +344,7 @@ class HasteMap extends EventEmitter implements IHasteMap {
     const hash = createHash('sha1').update(extra.join(''));
     return path.join(
       tmpdir,
-      `${id.replace(/\W/g, '-')}-${hash.digest('hex').substring(0, 32)}`,
+      `${id.replace(/\W/g, '-')}-${hash.digest('hex').slice(0, 32)}`,
     );
   }
 
diff --git a/packages/jest-haste-map/src/lib/fast_path.ts b/packages/jest-haste-map/src/lib/fast_path.ts
@@ -10,7 +10,7 @@ import * as path from 'path';
 // rootDir and filename must be absolute paths (resolved)
 export function relative(rootDir: string, filename: string): string {
   return filename.indexOf(rootDir + path.sep) === 0
-    ? filename.substring(rootDir.length + 1)
+    ? filename.slice(rootDir.length + 1)
     : path.relative(rootDir, filename);
 }
 
diff --git a/packages/jest-haste-map/src/lib/getPlatformExtension.ts b/packages/jest-haste-map/src/lib/getPlatformExtension.ts
@@ -17,7 +17,7 @@ export default function getPlatformExtension(
   if (secondToLast === -1) {
     return null;
   }
-  const platform = file.substring(secondToLast + 1, last);
+  const platform = file.slice(secondToLast + 1, last);
   // If an overriding platform array is passed, check that first
 
   if (platforms && platforms.includes(platform)) {
diff --git a/packages/jest-haste-map/src/worker.ts b/packages/jest-haste-map/src/worker.ts
@@ -69,7 +69,7 @@ export async function worker(data: WorkerMessage): Promise<WorkerMetadata> {
     } catch (err: any) {
       throw new Error(`Cannot parse ${filePath} as JSON: ${err.message}`);
     }
-  } else if (!blacklist.has(filePath.substring(filePath.lastIndexOf('.')))) {
+  } else if (!blacklist.has(filePath.slice(filePath.lastIndexOf('.')))) {
     // Process a random file that is returned as a MODULE.
     if (hasteImpl) {
       id = hasteImpl.getHasteName(filePath);
diff --git a/packages/jest-jasmine2/src/expectationResultFactory.ts b/packages/jest-jasmine2/src/expectationResultFactory.ts
@@ -53,7 +53,7 @@ function stackFormatter(
   }
 
   if (initError) {
-    return `${errorMessage.trimRight()}\n\n${initError.stack}`;
+    return `${errorMessage.trimEnd()}\n\n${initError.stack}`;
   }
 
   return new Error(errorMessage).stack;
diff --git a/packages/jest-jasmine2/src/jasmine/Spec.ts b/packages/jest-jasmine2/src/jasmine/Spec.ts
@@ -312,5 +312,5 @@ const extractCustomPendingMessage = function (e: Error) {
   const boilerplateEnd =
     boilerplateStart + Spec.pendingSpecExceptionMessage.length;
 
-  return fullMessage.substr(boilerplateEnd);
+  return fullMessage.slice(boilerplateEnd);
 };
diff --git a/packages/jest-message-util/src/index.ts b/packages/jest-message-util/src/index.ts
@@ -511,7 +511,7 @@ const removeBlankErrorLine = (str: string) =>
     // Lines saying just `Error:` are useless
     .filter(line => !errorRegexp.test(line))
     .join('\n')
-    .trimRight();
+    .trimEnd();
 
 // jasmine and worker farm sometimes don't give us access to the actual
 // Error object, so we have to regexp out the message from the stack string
diff --git a/packages/jest-mock/src/index.ts b/packages/jest-mock/src/index.ts
@@ -885,7 +885,7 @@ export class ModuleMocker {
     // if-do-while for perf reasons. The common case is for the if to fail.
     if (name.startsWith(boundFunctionPrefix)) {
       do {
-        name = name.substring(boundFunctionPrefix.length);
+        name = name.slice(boundFunctionPrefix.length);
         // Call bind() just to alter the function name.
         bindCall = '.bind(null)';
       } while (name && name.startsWith(boundFunctionPrefix));
diff --git a/packages/jest-resolve/src/utils.ts b/packages/jest-resolve/src/utils.ts
@@ -19,13 +19,13 @@ const createValidationError = (message: string) =>
   new ValidationError(`${BULLET}Validation Error`, message, DOCUMENTATION_NOTE);
 
 const replaceRootDirInPath = (rootDir: string, filePath: string): string => {
-  if (!/^<rootDir>/.test(filePath)) {
+  if (!filePath.startsWith('<rootDir>')) {
     return filePath;
   }
 
   return path.resolve(
     rootDir,
-    path.normalize(`./${filePath.substr('<rootDir>'.length)}`),
+    path.normalize(`./${filePath.slice('<rootDir>'.length)}`),
   );
 };
 
diff --git a/packages/jest-runtime/src/__tests__/runtime_node_path.test.js b/packages/jest-runtime/src/__tests__/runtime_node_path.test.js
@@ -56,7 +56,7 @@ describe('Runtime', () => {
   });
 
   it('does not find modules if NODE_PATH is relative', async () => {
-    const nodePath = `${cwd.substr(
+    const nodePath = `${cwd.slice(
       path.sep.length,
     )}src/Runtime/__tests__/NODE_PATH_dir`;
     const runtime = await createLocalRuntime(nodePath);
diff --git a/packages/jest-snapshot/src/index.ts b/packages/jest-snapshot/src/index.ts
@@ -97,7 +97,7 @@ function stripAddedIndentation(inlineSnapshot: string) {
         return inlineSnapshot;
       }
 
-      lines[i] = lines[i].substring(indentation.length);
+      lines[i] = lines[i].slice(indentation.length);
     }
   }
 
diff --git a/packages/jest-transform/src/ScriptTransformer.ts b/packages/jest-transform/src/ScriptTransformer.ts
diff --git a/packages/jest-transform/src/enhanceUnexpectedTokenMessage.ts b/packages/jest-transform/src/enhanceUnexpectedTokenMessage.ts
diff --git a/website/versioned_docs/version-29.4/ExpectAPI.md b/website/versioned_docs/version-29.4/ExpectAPI.md
diff --git a/website/versioned_docs/version-29.4/TutorialAsync.md b/website/versioned_docs/version-29.4/TutorialAsync.md
diff --git a/website/versioned_docs/version-29.5/ExpectAPI.md b/website/versioned_docs/version-29.5/ExpectAPI.md
diff --git a/website/versioned_docs/version-29.5/TutorialAsync.md b/website/versioned_docs/version-29.5/TutorialAsync.md
diff --git a/website/versioned_docs/version-29.6/ExpectAPI.md b/website/versioned_docs/version-29.6/ExpectAPI.md
diff --git a/website/versioned_docs/version-29.6/TutorialAsync.md b/website/versioned_docs/version-29.6/TutorialAsync.md
diff --git a/website/versioned_docs/version-29.7/ExpectAPI.md b/website/versioned_docs/version-29.7/ExpectAPI.md
diff --git a/website/versioned_docs/version-29.7/TutorialAsync.md b/website/versioned_docs/version-29.7/TutorialAsync.md

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ const sortTests = (stdout: string) =>`
`273`	`273`	`}, [])`
`274`	`274`	`.sort(([a], [b]) => (a > b ? 1 : -1))`
`275`	`275`	`.map(strings =>`
`276`		- strings.length > 1 ? `${strings.join('\n').trimRight()}\n` : strings[0],
	`276`	+ strings.length > 1 ? `${strings.join('\n').trimEnd()}\n` : strings[0],
`277`	`277`	`)`
`278`	`278`	`.join('\n')`
`279`	`279`	`.trim();`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ function getCacheKeyFromConfig(`
`99`	`99`	`.update('\0', 'utf8')`
`100`	`100`	`.update(process.version)`
`101`	`101`	`.digest('hex')`
`102`		`- .substring(0, 32);`
	`102`	`+ .slice(0, 32);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`function loadBabelConfig(`