refactor(devs-infra): rename util dir to utils dir (#1910)

jest.config.js

@@ -13,7 +13,7 @@ module.exports = {
     '!<rootDir>/src/**/*.spec.ts',
     '!<rootDir>/src/**/*.test.ts',
     '!<rootDir>/src/**/__*__/*',
-    '!<rootDir>/src/util/testing.ts',
+    '!<rootDir>/src/utils/testing.ts',
   ],
   snapshotSerializers: ['<rootDir>/src/__serializers__/processed-source.ts'],
   cacheDirectory: '<rootDir>/.cache/unit',

src/__helpers__/fakers.ts

@@ -4,7 +4,7 @@ import { resolve } from 'path'
 import { createCompilerInstance } from '../compiler/instance'
 import { ConfigSet } from '../config/config-set'
 import type { BabelConfig, TsCompiler, TsJestConfig, TsJestGlobalOptions } from '../types'
-import type { ImportReasons } from '../util/messages'
+import type { ImportReasons } from '../utils/messages'
 
 export function filePath(relPath: string): string {
   return resolve(__dirname, '..', '..', relPath)

src/__helpers__/mocks.ts

@@ -1,6 +1,6 @@
 import type { testing } from 'bs-logger'
 
-import { rootLogger } from '../util/logger'
+import { rootLogger } from '../utils/logger'
 
 export const logTargetMock = (): testing.LogTargetMock => (rootLogger as testing.LoggerMock).target
 

src/__helpers__/setup.ts

@@ -1 +1 @@
-jest.mock('../util/logger')
+jest.mock('../utils/logger')

src/cli/cli.spec.ts

@@ -1,7 +1,7 @@
 import * as _fs from 'fs'
 import { normalize, resolve } from 'path'
 
-import { mocked } from '../../utils'
+import { mocked } from '../utils'
 import { logTargetMock, mockObject, mockWriteStream } from '../__helpers__/mocks'
 
 import { processArgv } from '.'

src/cli/config/migrate.ts

@@ -7,7 +7,7 @@ import { basename, resolve } from 'path'
 import type { Arguments } from 'yargs'
 
 import type { CliCommand } from '..'
-import { backportJestConfig } from '../../util/backports'
+import { backportJestConfig } from '../../utils/backports'
 import { JestPresetNames, TsJestPresetDescriptor, allPresets, defaults } from '../helpers/presets'
 
 /**

src/cli/index.ts

@@ -2,7 +2,7 @@ import { LogContexts, Logger } from 'bs-logger'
 import type { Arguments } from 'yargs'
 import * as yargsParser from 'yargs-parser'
 
-import { rootLogger } from '../util/logger'
+import { rootLogger } from '../utils/logger'
 
 const VALID_COMMANDS = ['help', 'config:migrate', 'config:init']
 

src/compiler/instance.ts

@@ -5,7 +5,7 @@ import type { CompileFn, CompilerInstance, TsCompiler } from '../types'
 
 import { initializeLanguageServiceInstance } from './language-service'
 import { initializeTranspilerInstance } from './transpiler'
-import { stringify } from '../util/json'
+import { stringify } from '../utils/json'
 
 /**
  * Rely on TypeScript compiled output generation which contains this prefix to point to sourcemap location.

src/compiler/language-service.ts

@@ -8,10 +8,10 @@ import type * as _ts from 'typescript'
 import type { ConfigSet } from '../config/config-set'
 import { LINE_FEED } from '../constants'
 import type { CompilerInstance, SourceOutput } from '../types'
-import { Errors, interpolate } from '../util/messages'
+import { Errors, interpolate } from '../utils/messages'
 
-import { parse, stringify } from '../util/json'
-import { sha1 } from '../util/sha1'
+import { parse, stringify } from '../utils/json'
+import { sha1 } from '../utils/sha1'
 
 /** where key is filepath */
 type TSFiles = Map<string, TSFile>

src/config/config-set.spec.ts

@@ -8,19 +8,19 @@ import * as _myModule from '..'
 import { logTargetMock } from '../__helpers__/mocks'
 import { createConfigSet, defaultResolve } from '../__helpers__/fakers'
 import type { TsJestGlobalOptions } from '../types'
-import * as _backports from '../util/backports'
-import { getPackageVersion } from '../util/get-package-version'
-import { normalizeSlashes } from '../util/normalize-slashes'
-import { mocked } from '../util'
+import * as _backports from '../utils/backports'
+import { getPackageVersion } from '../utils/get-package-version'
+import { normalizeSlashes } from '../utils/normalize-slashes'
+import { mocked } from '../utils'
 
 import { IGNORE_DIAGNOSTIC_CODES, MATCH_NOTHING, TS_JEST_OUT_DIR } from './config-set'
 // eslint-disable-next-line no-duplicate-imports
 import type { ConfigSet } from './config-set'
-import { Deprecations } from '../util/messages'
+import { Deprecations } from '../utils/messages'
 
-jest.mock('../util/backports')
+jest.mock('../utils/backports')
 jest.mock('../index')
-jest.mock('../util/get-package-version')
+jest.mock('../utils/get-package-version')
 
 const backports = mocked(_backports)
 const myModule = mocked(_myModule)

src/config/config-set.ts

@@ -42,17 +42,17 @@ import type {
   TsJestHooksMap,
   TTypeScript,
 } from '../types'
-import { backportJestConfig } from '../util/backports'
-import { getPackageVersion } from '../util/get-package-version'
-import { importer } from '../util/importer'
-import { stringify } from '../util/json'
-import { JsonableValue } from '../util/jsonable-value'
-import { rootLogger } from '../util/logger'
-import { Memoize } from '../util/memoize'
-import { Deprecations, Errors, ImportReasons, interpolate } from '../util/messages'
-import { normalizeSlashes } from '../util/normalize-slashes'
-import { sha1 } from '../util/sha1'
-import { TSError } from '../util/ts-error'
+import { backportJestConfig } from '../utils/backports'
+import { getPackageVersion } from '../utils/get-package-version'
+import { importer } from '../utils/importer'
+import { stringify } from '../utils/json'
+import { JsonableValue } from '../utils/jsonable-value'
+import { rootLogger } from '../utils/logger'
+import { Memoize } from '../utils/memoize'
+import { Deprecations, Errors, ImportReasons, interpolate } from '../utils/messages'
+import { normalizeSlashes } from '../utils/normalize-slashes'
+import { sha1 } from '../utils/sha1'
+import { TSError } from '../utils/ts-error'
 
 const logger = rootLogger.child({ namespace: 'config' })
 

src/config/create-jest-preset.ts

@@ -1,6 +1,6 @@
 import type { Config } from '@jest/types'
 
-import { rootLogger } from '../util/logger'
+import { rootLogger } from '../utils/logger'
 
 const logger = rootLogger.child({ namespace: 'jest-preset' })
 

src/config/paths-to-module-name-mapper.spec.ts

@@ -3,10 +3,10 @@ import { logTargetMock } from '../__helpers__/mocks'
 import { pathsToModuleNameMapper } from './paths-to-module-name-mapper'
 
 const tsconfigMap = {
-  log: ['src/util/log'],
+  log: ['src/utils/log'],
   server: ['src/server'],
   client: ['src/client', 'src/client/index'],
-  'util/*': ['src/util/*'],
+  'util/*': ['src/utils/*'],
   'api/*': ['src/api/*'],
   'test/*': ['test/*'],
   'mocks/*': ['test/mocks/*'],
@@ -16,44 +16,44 @@ const tsconfigMap = {
 describe('pathsToModuleNameMapper', () => {
   it('should convert tsconfig mapping', () => {
     expect(pathsToModuleNameMapper(tsconfigMap)).toMatchInlineSnapshot(`
-Object {
-  "^api/(.*)$": "src/api/$1",
-  "^client$": Array [
-    "src/client",
-    "src/client/index",
-  ],
-  "^log$": "src/util/log",
-  "^mocks/(.*)$": "test/mocks/$1",
-  "^server$": "src/server",
-  "^test/(.*)$": "test/$1",
-  "^test/(.*)/mock$": Array [
-    "test/mocks/$1",
-    "test/__mocks__/$1",
-  ],
-  "^util/(.*)$": "src/util/$1",
-}
-`)
+      Object {
+        "^api/(.*)$": "src/api/$1",
+        "^client$": Array [
+          "src/client",
+          "src/client/index",
+        ],
+        "^log$": "src/utils/log",
+        "^mocks/(.*)$": "test/mocks/$1",
+        "^server$": "src/server",
+        "^test/(.*)$": "test/$1",
+        "^test/(.*)/mock$": Array [
+          "test/mocks/$1",
+          "test/__mocks__/$1",
+        ],
+        "^util/(.*)$": "src/utils/$1",
+      }
+    `)
   })
 
   it('should use the given prefix', () => {
     expect(pathsToModuleNameMapper(tsconfigMap, { prefix: '<rootDir>/' })).toMatchInlineSnapshot(`
-Object {
-  "^api/(.*)$": "<rootDir>/src/api/$1",
-  "^client$": Array [
-    "<rootDir>/src/client",
-    "<rootDir>/src/client/index",
-  ],
-  "^log$": "<rootDir>/src/util/log",
-  "^mocks/(.*)$": "<rootDir>/test/mocks/$1",
-  "^server$": "<rootDir>/src/server",
-  "^test/(.*)$": "<rootDir>/test/$1",
-  "^test/(.*)/mock$": Array [
-    "<rootDir>/test/mocks/$1",
-    "<rootDir>/test/__mocks__/$1",
-  ],
-  "^util/(.*)$": "<rootDir>/src/util/$1",
-}
-`)
+      Object {
+        "^api/(.*)$": "<rootDir>/src/api/$1",
+        "^client$": Array [
+          "<rootDir>/src/client",
+          "<rootDir>/src/client/index",
+        ],
+        "^log$": "<rootDir>/src/utils/log",
+        "^mocks/(.*)$": "<rootDir>/test/mocks/$1",
+        "^server$": "<rootDir>/src/server",
+        "^test/(.*)$": "<rootDir>/test/$1",
+        "^test/(.*)/mock$": Array [
+          "<rootDir>/test/mocks/$1",
+          "<rootDir>/test/__mocks__/$1",
+        ],
+        "^util/(.*)$": "<rootDir>/src/utils/$1",
+      }
+    `)
   })
 
   it('should warn about mapping it cannot handle', () => {
@@ -66,17 +66,17 @@ Object {
         'too/*/many/*/stars': ['to/*/many/*/stars'],
       }),
     ).toMatchInlineSnapshot(`
-Object {
-  "^kept$": "src/kept",
-}
-`)
+      Object {
+        "^kept$": "src/kept",
+      }
+    `)
     expect(log.lines.warn).toMatchInlineSnapshot(`
-Array [
-  "[level:40] Not mapping \\"no-target\\" because it has no target.
-",
-  "[level:40] Not mapping \\"too/*/many/*/stars\\" because it has more than one star (\`*\`).
-",
-]
-`)
+      Array [
+        "[level:40] Not mapping \\"no-target\\" because it has no target.
+      ",
+        "[level:40] Not mapping \\"too/*/many/*/stars\\" because it has more than one star (\`*\`).
+      ",
+      ]
+    `)
   })
 })

src/config/paths-to-module-name-mapper.ts

@@ -2,8 +2,8 @@ import type { Config } from '@jest/types'
 import { LogContexts } from 'bs-logger'
 import type { CompilerOptions } from 'typescript'
 
-import { rootLogger } from '../util/logger'
-import { Errors, interpolate } from '../util/messages'
+import { rootLogger } from '../utils/logger'
+import { Errors, interpolate } from '../utils/messages'
 
 type TsPathMapping = Exclude<CompilerOptions['paths'], undefined>
 type JestPathMapping = Config.InitialOptions['moduleNameMapper']

src/index.ts

@@ -6,10 +6,10 @@ import { createJestPreset as createJestPresetCore } from './config/create-jest-p
 import { pathsToModuleNameMapper as pathsToModuleNameMapperCore } from './config/paths-to-module-name-mapper'
 import { TsJestTransformer } from './ts-jest-transformer'
 import type { TsJestGlobalOptions } from './types'
-import { rootLogger } from './util/logger'
-import { Deprecations, interpolate } from './util/messages'
-import { mocked as mockedCore } from './util/testing'
-import { VersionCheckers } from './util/version-checkers'
+import { rootLogger } from './utils/logger'
+import { Deprecations, interpolate } from './utils/messages'
+import { mocked as mockedCore } from './utils/testing'
+import { VersionCheckers } from './utils/version-checkers'
 
 declare module '@jest/types' {
   // eslint-disable-next-line @typescript-eslint/no-namespace

src/ts-jest-transformer.ts

@@ -6,11 +6,11 @@ import { inspect } from 'util'
 import { ConfigSet } from './config/config-set'
 import { JS_JSX_REGEX, TS_TSX_REGEX } from './constants'
 import type { TsJestGlobalOptions } from './types'
-import { stringify } from './util/json'
-import { JsonableValue } from './util/jsonable-value'
-import { rootLogger } from './util/logger'
-import { Errors, interpolate } from './util/messages'
-import { sha1 } from './util/sha1'
+import { stringify } from './utils/json'
+import { JsonableValue } from './utils/jsonable-value'
+import { rootLogger } from './utils/logger'
+import { Errors, interpolate } from './utils/messages'
+import { sha1 } from './utils/sha1'
 
 const INSPECT_CUSTOM = inspect.custom || 'inspect'
 

src/util/jsonable-value.spec.ts → src/utils/jsonable-value.spec.ts

@@ -1,4 +1,4 @@
-import { mocked } from '../../utils'
+import { mocked } from './'
 
 import * as _json from './json'
 import { JsonableValue } from './jsonable-value'

src/util/version-checkers.spec.ts → src/utils/version-checkers.spec.ts

@@ -1,4 +1,4 @@
-import { mocked } from '../../utils'
+import { mocked } from './'
 import { logTargetMock } from '../__helpers__/mocks'
 
 import * as _pv from './get-package-version'

utils/index.d.ts

@@ -1 +1 @@
-export * from '../dist/util'
+export * from '../dist/utils'

utils/index.js

@@ -1 +1 @@
-module.exports = require('../dist/util')
+module.exports = require('../dist/utils')