DRY the 'if exist' functions to a module

isaacs · Jun 6, 2024 · c8e0a5e · c8e0a5e
1 parent c34c3da
commit c8e0a5e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 18 deletions.
diff --git a/src/build-commonjs.ts b/src/build-commonjs.ts
@@ -1,10 +1,10 @@
 import chalk from 'chalk'
 import { spawnSync } from 'node:child_process'
-import { existsSync, renameSync, unlinkSync } from 'node:fs'
 import { relative, resolve } from 'node:path/posix'
 import buildFail from './build-fail.js'
 import config from './config.js'
 import * as console from './console.js'
+import ifExist from './if-exist.js'
 import polyfills from './polyfills.js'
 import setFolderDialect from './set-folder-dialect.js'
 import './tsconfig.js'
@@ -13,10 +13,6 @@ import tsc from './which-tsc.js'
 const node = process.execPath
 const { commonjsDialects = [] } = config
 
-const unlinkIfExist = (f: string) => existsSync(f) && unlinkSync(f)
-const renameIfExist = (f: string, to: string) =>
-  existsSync(f) && renameSync(f, to)
-
 export const buildCommonJS = () => {
   setFolderDialect('src', 'commonjs')
   for (const d of ['commonjs', ...commonjsDialects]) {
@@ -41,10 +37,10 @@ export const buildCommonJS = () => {
       ).replace(/\.tsx?$/, '')
       const stemToPath = `${stemTo}.js.map`
       const stemToDtsPath = `${stemTo}.d.ts.map`
-      unlinkIfExist(stemToPath)
-      unlinkIfExist(stemToDtsPath)
-      renameIfExist(`${stemFrom}.cjs`, `${stemTo}.js`)
-      renameIfExist(`${stemFrom}.d.cts`, `${stemTo}.d.ts`)
+      ifExist.unlink(stemToPath)
+      ifExist.unlink(stemToDtsPath)
+      ifExist.rename(`${stemFrom}.cjs`, `${stemTo}.js`)
+      ifExist.rename(`${stemFrom}.d.cts`, `${stemTo}.d.ts`)
     }
     console.error(chalk.cyan.bold('built commonjs'))
   }

diff --git a/src/build-esm.ts b/src/build-esm.ts
@@ -1,19 +1,15 @@
 import chalk from 'chalk'
 import { spawnSync } from 'node:child_process'
-import { existsSync, renameSync, unlinkSync } from 'node:fs'
 import { relative, resolve } from 'node:path'
 import buildFail from './build-fail.js'
 import config from './config.js'
 import * as console from './console.js'
+import ifExist from './if-exist.js'
 import polyfills from './polyfills.js'
 import setFolderDialect from './set-folder-dialect.js'
 import './tsconfig.js'
 import tsc from './which-tsc.js'
 
-const unlinkIfExist = (f: string) => existsSync(f) && unlinkSync(f)
-const renameIfExist = (f: string, to: string) =>
-  existsSync(f) && renameSync(f, to)
-
 const node = process.execPath
 const { esmDialects = [] } = config
 
@@ -39,10 +35,10 @@ export const buildESM = () => {
         `.tshy-build/${d}`,
         relative(resolve('src'), resolve(orig))
       ).replace(/\.tsx?$/, '')
-      unlinkIfExist(`${stemTo}.js.map`)
-      unlinkIfExist(`${stemTo}.d.ts.map`)
-      renameIfExist(`${stemFrom}.mjs`, `${stemTo}.js`)
-      renameIfExist(`${stemFrom}.d.mts`, `${stemTo}.d.ts`)
+      ifExist.unlink(`${stemTo}.js.map`)
+      ifExist.unlink(`${stemTo}.d.ts.map`)
+      ifExist.rename(`${stemFrom}.mjs`, `${stemTo}.js`)
+      ifExist.rename(`${stemFrom}.d.mts`, `${stemTo}.d.ts`)
     }
     console.error(chalk.cyan.bold('built ' + d))
   }

diff --git a/src/if-exist.ts b/src/if-exist.ts
@@ -0,0 +1,10 @@
+import { existsSync, renameSync, unlinkSync } from 'fs'
+
+const unlink = (f: string) => existsSync(f) && unlinkSync(f)
+const rename = (f: string, to: string) =>
+  existsSync(f) && renameSync(f, to)
+
+export default {
+  unlink,
+  rename,
+}
diff --git a/test/if-exist.ts b/test/if-exist.ts
@@ -0,0 +1,18 @@
+import { readdirSync } from 'fs'
+import t from 'tap'
+import ifExist from '../src/if-exist.js'
+
+const dir = t.testdir({
+  a: 'a',
+  b: 'b',
+})
+
+ifExist.unlink(dir + '/x')
+ifExist.rename(dir + '/x', dir + '/z')
+
+t.strictSame(new Set(readdirSync(dir)), new Set(['a', 'b']))
+
+ifExist.unlink(dir + '/a')
+ifExist.rename(dir + '/b', dir + '/c')
+
+t.strictSame(readdirSync(dir), ['c'])