Skip to content

Commit 9913348

Browse files
committed
refactor: rename editable modules to edit for brevity
Rename editable modules to edit to reduce typing: - src/json/editable.ts → src/json/edit.ts - src/packages/editable.ts → src/packages/edit.ts - test/unit/packages/editable.test.ts → test/unit/packages/edit.test.ts Update all imports and exports: - package.json: ./json/editable → ./json/edit, ./packages/editable → ./packages/edit - src/packages.ts: Update import from './packages/editable' to './packages/edit' - src/packages/operations.ts: Update import from './editable' to './edit' - test/unit/json.test.ts: Update require from json/editable to json/edit - test/unit/packages/edit.test.ts: Update import from packages/editable to packages/edit Fix esm-imports.test.mjs: - Convert from node:test API to vitest for compatibility - Replace assert.strictEqual with expect().toBe() - Replace assert.ok with expect().toBe(true) All tests passing (6055 tests). refactor: reorganize constants and dlx into subdirectories Move constant files to constants/ and dlx files to dlx/ for better organization: Constants moved to constants/: - src/maintained-node-versions.ts → src/constants/maintained-node-versions.ts - src/package-default-node-range.ts → src/constants/package-default-node-range.ts - src/package-default-socket-categories.ts → src/constants/package-default-socket-categories.ts - src/lifecycle-script-names.ts → src/constants/lifecycle-script-names.ts DLX files moved to dlx/ (no index.ts): - src/dlx.ts → src/dlx/main.ts - src/dlx-binary.ts → src/dlx/binary.ts - src/dlx-manifest.ts → src/dlx/manifest.ts - src/dlx-package.ts → src/dlx/package.ts Updated all imports: - src/constants/node.ts: Import from ./maintained-node-versions - src/constants/packages.ts: Import from ./lifecycle-script-names, ./package-default-* - src/constants/package-default-node-range.ts: Import from ../external/semver.js - src/dlx/*.ts: Update all internal and external imports to use ../ Updated package.json exports: - ./maintained-node-versions → ./constants/maintained-node-versions - ./package-default-node-range → ./constants/package-default-node-range - ./package-default-socket-categories → ./constants/package-default-socket-categories - ./lifecycle-script-names → ./constants/lifecycle-script-names - ./dlx → ./dlx/main - ./dlx-binary → ./dlx/binary - ./dlx-manifest → ./dlx/manifest - ./dlx-package → ./dlx/package Moved test files to match new structure: - test/unit/maintained-node-versions.test.ts → test/unit/constants/maintained-node-versions.test.ts - test/unit/package-default-node-range.test.ts → test/unit/constants/package-default-node-range.test.ts - test/unit/package-default-socket-categories.test.ts → test/unit/constants/package-default-socket-categories.test.ts - test/unit/lifecycle-script-names.test.ts → test/unit/constants/lifecycle-script-names.test.ts - test/unit/dlx.test.ts → test/unit/dlx/main.test.ts - test/unit/dlx-binary.test.ts → test/unit/dlx/binary.test.ts - test/unit/dlx-manifest.test.ts → test/unit/dlx/manifest.test.ts - test/unit/dlx-package.test.ts → test/unit/dlx/package.test.ts Updated test imports to use new module paths. All tests passing (6060 tests). refactor(dlx): split main.ts into focused modules Split dlx/main.ts into smaller, focused modules for better organization and maintainability. Changes: - Create dlx/cache.ts for cache key generation (generateCacheKey) - Create dlx/paths.ts for path utilities (getDlxPackageDir, getDlxInstalledPackageDir, getDlxPackageJsonPath, getDlxPackageNodeModulesDir, isInSocketDlx) - Create dlx/dir.ts for directory management (clearDlx, clearDlxSync, dlxDirExists, dlxDirExistsAsync, ensureDlxDir, ensureDlxDirSync) - Create dlx/packages.ts for package management (isDlxPackageInstalled, isDlxPackageInstalledAsync, listDlxPackages, listDlxPackagesAsync, removeDlxPackage, removeDlxPackageSync) - Remove old dlx/main.ts file - Update imports in dlx/binary.ts and dlx/package.ts to use dlx/cache - Update package.json exports: - Remove ./dlx/main - Add ./dlx/cache, ./dlx/dir, ./dlx/packages, ./dlx/paths - Update test imports in test/unit/dlx/main.test.ts to use split modules - All tests passing (182 tests, 179 passed, 3 skipped)
1 parent 422b122 commit 9913348

29 files changed

+433
-381
lines changed

package.json

Lines changed: 46 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,26 @@
151151
"types": "./dist/constants/licenses.d.ts",
152152
"default": "./dist/constants/licenses.js"
153153
},
154+
"./constants/lifecycle-script-names": {
155+
"types": "./dist/constants/lifecycle-script-names.d.ts",
156+
"default": "./dist/constants/lifecycle-script-names.js"
157+
},
158+
"./constants/maintained-node-versions": {
159+
"types": "./dist/constants/maintained-node-versions.d.ts",
160+
"default": "./dist/constants/maintained-node-versions.js"
161+
},
154162
"./constants/node": {
155163
"types": "./dist/constants/node.d.ts",
156164
"default": "./dist/constants/node.js"
157165
},
166+
"./constants/package-default-node-range": {
167+
"types": "./dist/constants/package-default-node-range.d.ts",
168+
"default": "./dist/constants/package-default-node-range.js"
169+
},
170+
"./constants/package-default-socket-categories": {
171+
"types": "./dist/constants/package-default-socket-categories.d.ts",
172+
"default": "./dist/constants/package-default-socket-categories.js"
173+
},
158174
"./constants/packages": {
159175
"types": "./dist/constants/packages.d.ts",
160176
"default": "./dist/constants/packages.js"
@@ -203,21 +219,33 @@
203219
"types": "./dist/debug.d.ts",
204220
"default": "./dist/debug.js"
205221
},
206-
"./dlx": {
207-
"types": "./dist/dlx.d.ts",
208-
"default": "./dist/dlx.js"
222+
"./dlx/binary": {
223+
"types": "./dist/dlx/binary.d.ts",
224+
"default": "./dist/dlx/binary.js"
225+
},
226+
"./dlx/cache": {
227+
"types": "./dist/dlx/cache.d.ts",
228+
"default": "./dist/dlx/cache.js"
229+
},
230+
"./dlx/dir": {
231+
"types": "./dist/dlx/dir.d.ts",
232+
"default": "./dist/dlx/dir.js"
209233
},
210-
"./dlx-binary": {
211-
"types": "./dist/dlx-binary.d.ts",
212-
"default": "./dist/dlx-binary.js"
234+
"./dlx/manifest": {
235+
"types": "./dist/dlx/manifest.d.ts",
236+
"default": "./dist/dlx/manifest.js"
213237
},
214-
"./dlx-manifest": {
215-
"types": "./dist/dlx-manifest.d.ts",
216-
"default": "./dist/dlx-manifest.js"
238+
"./dlx/package": {
239+
"types": "./dist/dlx/package.d.ts",
240+
"default": "./dist/dlx/package.js"
217241
},
218-
"./dlx-package": {
219-
"types": "./dist/dlx-package.d.ts",
220-
"default": "./dist/dlx-package.js"
242+
"./dlx/packages": {
243+
"types": "./dist/dlx/packages.d.ts",
244+
"default": "./dist/dlx/packages.js"
245+
},
246+
"./dlx/paths": {
247+
"types": "./dist/dlx/paths.d.ts",
248+
"default": "./dist/dlx/paths.js"
221249
},
222250
"./effects/pulse-frames": {
223251
"types": "./dist/effects/pulse-frames.d.ts",
@@ -355,9 +383,9 @@
355383
"types": "./dist/ipc.d.ts",
356384
"default": "./dist/ipc.js"
357385
},
358-
"./json/editable": {
359-
"types": "./dist/json/editable.d.ts",
360-
"default": "./dist/json/editable.js"
386+
"./json/edit": {
387+
"types": "./dist/json/edit.d.ts",
388+
"default": "./dist/json/edit.js"
361389
},
362390
"./json/format": {
363391
"types": "./dist/json/format.d.ts",
@@ -371,10 +399,6 @@
371399
"types": "./dist/json/types.d.ts",
372400
"default": "./dist/json/types.js"
373401
},
374-
"./lifecycle-script-names": {
375-
"types": "./dist/lifecycle-script-names.d.ts",
376-
"default": "./dist/lifecycle-script-names.js"
377-
},
378402
"./links": {
379403
"types": "./dist/links/index.d.ts",
380404
"default": "./dist/links/index.js"
@@ -387,10 +411,6 @@
387411
"types": "./dist/logger.d.ts",
388412
"default": "./dist/logger.js"
389413
},
390-
"./maintained-node-versions": {
391-
"types": "./dist/maintained-node-versions.d.ts",
392-
"default": "./dist/maintained-node-versions.js"
393-
},
394414
"./memoization": {
395415
"types": "./dist/memoization.d.ts",
396416
"default": "./dist/memoization.js"
@@ -399,14 +419,6 @@
399419
"types": "./dist/objects.d.ts",
400420
"default": "./dist/objects.js"
401421
},
402-
"./package-default-node-range": {
403-
"types": "./dist/package-default-node-range.d.ts",
404-
"default": "./dist/package-default-node-range.js"
405-
},
406-
"./package-default-socket-categories": {
407-
"types": "./dist/package-default-socket-categories.d.ts",
408-
"default": "./dist/package-default-socket-categories.js"
409-
},
410422
"./package-extensions": {
411423
"types": "./dist/package-extensions.d.ts",
412424
"default": "./dist/package-extensions.js"
@@ -415,9 +427,9 @@
415427
"types": "./dist/packages.d.ts",
416428
"default": "./dist/packages.js"
417429
},
418-
"./packages/editable": {
419-
"types": "./dist/packages/editable.d.ts",
420-
"default": "./dist/packages/editable.js"
430+
"./packages/edit": {
431+
"types": "./dist/packages/edit.d.ts",
432+
"default": "./dist/packages/edit.js"
421433
},
422434
"./packages/exports": {
423435
"types": "./dist/packages/exports.d.ts",

src/constants/node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Node.js runtime: versions, features, flags, and capabilities.
33
*/
44

5-
import { maintainedNodeVersions } from '../maintained-node-versions'
5+
import { maintainedNodeVersions } from './maintained-node-versions'
66

77
const NODE_VERSION = process.version
88

src/package-default-node-range.ts renamed to src/constants/package-default-node-range.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44

55
import { maintainedNodeVersions } from './maintained-node-versions'
6-
import * as semver from './external/semver.js'
6+
import * as semver from '../external/semver.js'
77

88
/* c8 ignore next - External semver call */
99
const packageDefaultNodeRange = `>=${semver.parse(maintainedNodeVersions.last).major}`
File renamed without changes.

src/constants/packages.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
*/
44

55
import { getNpmLifecycleEvent as getNpmLifecycleEventEnv } from '../env/npm'
6-
import { lifecycleScriptNames as lifecycleScriptNamesImport } from '../lifecycle-script-names'
7-
import { packageDefaultNodeRange as packageDefaultNodeRangeImport } from '../package-default-node-range'
8-
import { packageDefaultSocketCategories as packageDefaultSocketCategoriesImport } from '../package-default-socket-categories'
6+
import { lifecycleScriptNames as lifecycleScriptNamesImport } from './lifecycle-script-names'
7+
import { packageDefaultNodeRange as packageDefaultNodeRangeImport } from './package-default-node-range'
8+
import { packageDefaultSocketCategories as packageDefaultSocketCategoriesImport } from './package-default-socket-categories'
99
import { packageExtensions as packageExtensionsImport } from '../package-extensions'
1010

1111
import pacote from '../external/pacote'

0 commit comments

Comments
 (0)