From fb20e55b631653a92794a63f3076fcf98fbb2394 Mon Sep 17 00:00:00 2001 From: isaacs Date: Sat, 4 Nov 2023 10:41:34 -0700 Subject: [PATCH] internal: consistent naming self-dep -> self-link PR-URL: https://github.com/isaacs/tshy/pull/30 Credit: @isaacs Close: #30 Reviewed-by: @isaacs --- src/build-fail.ts | 2 +- src/build.ts | 2 +- src/{self-dep.ts => self-link.ts} | 0 tap-snapshots/test/build.ts.test.cjs | 168 +++++++++++++-------------- test/build-fail.ts | 2 +- test/build.ts | 6 +- test/self-dep.ts | 8 +- 7 files changed, 94 insertions(+), 94 deletions(-) rename src/{self-dep.ts => self-link.ts} (100%) diff --git a/src/build-fail.ts b/src/build-fail.ts index 5a99b6d..011819c 100644 --- a/src/build-fail.ts +++ b/src/build-fail.ts @@ -4,7 +4,7 @@ import fail from './fail.js' import setFolderDialect from './set-folder-dialect.js' import './tsconfig.js' import { unlink as unlinkImports } from './unbuilt-imports.js' -import { unlink as unlinkSelfDep } from './self-dep.js' +import { unlink as unlinkSelfDep } from './self-link.js' import pkg from './package.js' export default (res: SpawnSyncReturns) => { diff --git a/src/build.ts b/src/build.ts index 8b038fb..a655aca 100644 --- a/src/build.ts +++ b/src/build.ts @@ -10,7 +10,7 @@ import pkg from './package.js' import { link as linkSelfDep, unlink as unlinkSelfDep, -} from './self-dep.js' +} from './self-link.js' import './tsconfig.js' import { link as linkImports, diff --git a/src/self-dep.ts b/src/self-link.ts similarity index 100% rename from src/self-dep.ts rename to src/self-link.ts diff --git a/tap-snapshots/test/build.ts.test.cjs b/tap-snapshots/test/build.ts.test.cjs index 0a5526c..95d6063 100644 --- a/tap-snapshots/test/build.ts.test.cjs +++ b/tap-snapshots/test/build.ts.test.cjs @@ -8,7 +8,7 @@ exports[`test/build.ts > TAP > build both > must match snapshot 1`] = ` Array [ Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -62,7 +62,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -80,7 +80,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -98,7 +98,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -152,7 +152,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -170,7 +170,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -188,7 +188,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -242,7 +242,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -260,7 +260,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -278,7 +278,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -332,7 +332,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -350,7 +350,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -373,7 +373,7 @@ Array [ exports[`test/build.ts > TAP > build commonjs only > must match snapshot 1`] = ` Array [ Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -424,7 +424,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -441,7 +441,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -458,7 +458,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -509,7 +509,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -526,7 +526,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -548,7 +548,7 @@ Array [ exports[`test/build.ts > TAP > build esm only > must match snapshot 1`] = ` Array [ Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -599,7 +599,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -616,7 +616,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -633,7 +633,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -684,7 +684,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -701,7 +701,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -718,7 +718,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -769,7 +769,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -786,7 +786,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -808,7 +808,7 @@ Array [ exports[`test/build.ts > TAP > default settings > must match snapshot 1`] = ` Array [ Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -850,7 +850,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -864,7 +864,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -883,7 +883,7 @@ Array [ exports[`test/build.ts > TAP > imports linking > basic > must match snapshot 1`] = ` Array [ Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -937,7 +937,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -955,7 +955,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -973,7 +973,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -1027,7 +1027,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -1045,7 +1045,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -1063,7 +1063,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -1117,7 +1117,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -1135,7 +1135,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -1153,7 +1153,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -1207,7 +1207,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -1225,7 +1225,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -1243,7 +1243,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "imports": Object { @@ -1498,7 +1498,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "imports": Object { @@ -1583,7 +1583,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "imports": Object { @@ -1846,7 +1846,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "exports": Object { @@ -2239,7 +2239,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "exports": Object { @@ -2370,7 +2370,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "exports": Object { @@ -2771,7 +2771,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "name": "@my/package", @@ -2819,7 +2819,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "name": "@my/package", @@ -2835,7 +2835,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "name": "@my/package", @@ -2856,7 +2856,7 @@ Array [ exports[`test/build.ts > TAP > imports linking > imports > must match snapshot 1`] = ` Array [ Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -2910,7 +2910,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -2928,7 +2928,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -2946,7 +2946,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -3000,7 +3000,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -3018,7 +3018,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -3036,7 +3036,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -3090,7 +3090,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -3108,7 +3108,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -3126,7 +3126,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -3180,7 +3180,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -3198,7 +3198,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -3216,7 +3216,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "imports": Object { @@ -3471,7 +3471,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "imports": Object { @@ -3556,7 +3556,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "imports": Object { @@ -3824,7 +3824,7 @@ Array [ exports[`test/build.ts > TAP > imports linking > imports-with-star > must match snapshot 1`] = ` Array [ Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -3878,7 +3878,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -3896,7 +3896,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -3914,7 +3914,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -3968,7 +3968,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -3986,7 +3986,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -4004,7 +4004,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -4058,7 +4058,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -4076,7 +4076,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -4094,7 +4094,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -4148,7 +4148,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "tshy": Object { @@ -4166,7 +4166,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "tshy": Object { @@ -4184,7 +4184,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "imports": Object { @@ -4439,7 +4439,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "imports": Object { @@ -4524,7 +4524,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "imports": Object { @@ -4787,7 +4787,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "exports": Object { @@ -5180,7 +5180,7 @@ Array [ ], ], Array [ - "self-dep.unlink", + "self-link.unlink", Array [ Object { "exports": Object { @@ -5311,7 +5311,7 @@ Array [ ], ], Array [ - "self-dep.link", + "self-link.link", Array [ Object { "exports": Object { diff --git a/test/build-fail.ts b/test/build-fail.ts index 52c7e61..d73cd27 100644 --- a/test/build-fail.ts +++ b/test/build-fail.ts @@ -12,7 +12,7 @@ const { default: buildFail } = (await t.mockImport( '../dist/esm/unbuilt-imports.js': { unlink: (...a: any[]) => calls.push(['unlinkImports', a]), }, - '../dist/esm/self-dep.js': { + '../dist/esm/self-link.js': { unlink: (...a: any[]) => calls.push(['unlinkSelfDep', a]), }, '../dist/esm/set-folder-dialect.js': { diff --git a/test/build.ts b/test/build.ts index 667bbe6..612b0c5 100644 --- a/test/build.ts +++ b/test/build.ts @@ -21,9 +21,9 @@ const mocks = { unlink: async (...a: any[]) => logCall('imports.unlink', a), save: (...a: any[]) => logCall('imports.save', a), }, - '../dist/esm/self-dep.js': { - link: (...a: any[]) => logCall('self-dep.link', a), - unlink: (...a: any[]) => logCall('self-dep.unlink', a), + '../dist/esm/self-link.js': { + link: (...a: any[]) => logCall('self-link.link', a), + unlink: (...a: any[]) => logCall('self-link.unlink', a), }, '../dist/esm/package.js': { default: pkg }, '../dist/esm/bins.js': { default: () => {} }, diff --git a/test/self-dep.ts b/test/self-dep.ts index a38aa98..6990bd3 100644 --- a/test/self-dep.ts +++ b/test/self-dep.ts @@ -40,9 +40,9 @@ const rimrafCalls = t.capture( ).args const { link, unlink } = (await t.mockImport( - '../dist/esm/self-dep.js', + '../dist/esm/self-link.js', { mkdirp, fs, rimraf, path } -)) as typeof import('../dist/esm/self-dep.js') +)) as typeof import('../dist/esm/self-link.js') t.test('no pkg name, nothing to do', t => { link({} as Package, 'some/path') @@ -161,9 +161,9 @@ t.test('already in node_modules, do not create link', t => { // need a separate import for each test, because this gets cached // to save extra readlink and walkUp calls. const { link, unlink } = (await t.mockImport( - '../dist/esm/self-dep.js', + '../dist/esm/self-link.js', { mkdirp, fs, rimraf } - )) as typeof import('../dist/esm/self-dep.js') + )) as typeof import('../dist/esm/self-link.js') process.chdir(resolve(dir, d)) link({ name, version: '1.2.3' }, 'src') unlink({ name, version: '1.2.3' }, 'src')