Skip to content

Commit 85eafc0

Browse files
committed
Add comprehensive tests for dependencies modules
- Add tests for all dependency injection modules (build-tools, file-system, logging, npm-tools, prompts, system, validation) - Fix incorrect require paths in validation.ts and npm-tools.ts (../../external/ not ../../../external/) - Fix module export handling for package-json, read-package, and sort functions - Test both getter/setter pairs and reset functionality for all modules - Verify lazy loading and dependency injection patterns work correctly
1 parent a2617de commit 85eafc0

File tree

3 files changed

+763
-15
lines changed

3 files changed

+763
-15
lines changed

registry/src/lib/dependencies/npm-tools.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const dependencies: NpmToolsDependencies = {
130130
*/
131131
export function getLibnpmpack(): Libnpmpack {
132132
if (!dependencies.libnpmpack) {
133-
dependencies.libnpmpack = require('../../../external/libnpmpack')
133+
dependencies.libnpmpack = require('../../external/libnpmpack')
134134
}
135135
return dependencies.libnpmpack!
136136
}
@@ -140,7 +140,7 @@ export function getLibnpmpack(): Libnpmpack {
140140
*/
141141
export function getMakeFetchHappen(): MakeFetchHappen {
142142
if (!dependencies.makeFetchHappen) {
143-
dependencies.makeFetchHappen = require('../../../external/make-fetch-happen')
143+
dependencies.makeFetchHappen = require('../../external/make-fetch-happen')
144144
}
145145
return dependencies.makeFetchHappen!
146146
}
@@ -150,7 +150,7 @@ export function getMakeFetchHappen(): MakeFetchHappen {
150150
*/
151151
export function getNormalizePackageData(): NormalizePackageData {
152152
if (!dependencies.normalizePackageData) {
153-
dependencies.normalizePackageData = require('../../../external/normalize-package-data')
153+
dependencies.normalizePackageData = require('../../external/normalize-package-data')
154154
}
155155
return dependencies.normalizePackageData!
156156
}
@@ -160,7 +160,7 @@ export function getNormalizePackageData(): NormalizePackageData {
160160
*/
161161
export function getNpmPackageArg(): NpmPackageArg {
162162
if (!dependencies.npmPackageArg) {
163-
dependencies.npmPackageArg = require('../../../external/npm-package-arg')
163+
dependencies.npmPackageArg = require('../../external/npm-package-arg')
164164
}
165165
return dependencies.npmPackageArg!
166166
}
@@ -170,9 +170,7 @@ export function getNpmPackageArg(): NpmPackageArg {
170170
*/
171171
export function getPackageJson(): PackageJsonConstructor {
172172
if (!dependencies.packageJson) {
173-
const pkgJsonExport = require('../../../external/@npmcli/package-json')
174-
dependencies.packageJson =
175-
pkgJsonExport.default || pkgJsonExport.PackageJson
173+
dependencies.packageJson = require('../../external/@npmcli/package-json')
176174
}
177175
return dependencies.packageJson!
178176
}
@@ -193,7 +191,7 @@ export function getPackageUrl(): PackageUrl {
193191
*/
194192
export function getPacote(): Pacote {
195193
if (!dependencies.pacote) {
196-
dependencies.pacote = require('../../../external/pacote')
194+
dependencies.pacote = require('../../external/pacote')
197195
}
198196
return dependencies.pacote!
199197
}
@@ -203,8 +201,8 @@ export function getPacote(): Pacote {
203201
*/
204202
export function getReadPackageJson(): ReadPackageJson {
205203
if (!dependencies.readPackageJson) {
206-
const readExport = require('../../../external/@npmcli/package-json/lib/read-package')
207-
dependencies.readPackageJson = readExport.default || readExport.readPackage
204+
const readExport = require('../../external/@npmcli/package-json/lib/read-package')
205+
dependencies.readPackageJson = readExport.readPackage
208206
}
209207
return dependencies.readPackageJson!
210208
}
@@ -214,8 +212,8 @@ export function getReadPackageJson(): ReadPackageJson {
214212
*/
215213
export function getSortPackageJson(): SortPackageJson {
216214
if (!dependencies.sortPackageJson) {
217-
const sortExport = require('../../../external/@npmcli/package-json/lib/sort')
218-
dependencies.sortPackageJson = sortExport.default || sortExport.sort
215+
const sortExport = require('../../external/@npmcli/package-json/lib/sort')
216+
dependencies.sortPackageJson = sortExport.packageSort
219217
}
220218
return dependencies.sortPackageJson!
221219
}

registry/src/lib/dependencies/validation.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const dependencies: ValidationDependencies = {
4343
*/
4444
export function getSpdxCorrect(): SpdxCorrect {
4545
if (!dependencies.spdxCorrect) {
46-
dependencies.spdxCorrect = require('../../../external/spdx-correct')
46+
dependencies.spdxCorrect = require('../../external/spdx-correct')
4747
}
4848
return dependencies.spdxCorrect!
4949
}
@@ -53,7 +53,7 @@ export function getSpdxCorrect(): SpdxCorrect {
5353
*/
5454
export function getSpdxExpressionParse(): SpdxExpressionParse {
5555
if (!dependencies.spdxExpressionParse) {
56-
dependencies.spdxExpressionParse = require('../../../external/spdx-expression-parse')
56+
dependencies.spdxExpressionParse = require('../../external/spdx-expression-parse')
5757
}
5858
return dependencies.spdxExpressionParse!
5959
}
@@ -63,7 +63,7 @@ export function getSpdxExpressionParse(): SpdxExpressionParse {
6363
*/
6464
export function getValidateNpmPackageName(): ValidateNpmPackageName {
6565
if (!dependencies.validateNpmPackageName) {
66-
dependencies.validateNpmPackageName = require('../../../external/validate-npm-package-name')
66+
dependencies.validateNpmPackageName = require('../../external/validate-npm-package-name')
6767
}
6868
return dependencies.validateNpmPackageName!
6969
}

0 commit comments

Comments
 (0)