Skip to content

Commit 2ba1171

Browse files
wraithgarlukekarrys
authored andcommitted
fix: streamline workspace loading code
1 parent 35c94e0 commit 2ba1171

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

workspaces/arborist/lib/arborist/load-virtual.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// mixin providing the loadVirtual method
22
const localeCompare = require('@isaacs/string-locale-compare')('en')
3+
const mapWorkspaces = require('@npmcli/map-workspaces')
34

45
const { resolve } = require('path')
56

@@ -21,7 +22,6 @@ const loadRoot = Symbol('loadRoot')
2122
const loadNode = Symbol('loadVirtualNode')
2223
const loadLink = Symbol('loadVirtualLink')
2324
const loadWorkspaces = Symbol.for('loadWorkspaces')
24-
const loadWorkspacesVirtual = Symbol.for('loadWorkspacesVirtual')
2525
const flagsSuspect = Symbol.for('flagsSuspect')
2626
const reCalcDepFlags = Symbol('reCalcDepFlags')
2727
const checkRootEdges = Symbol('checkRootEdges')
@@ -157,7 +157,7 @@ module.exports = cls => class VirtualLoader extends cls {
157157
}
158158

159159
const lockWS = []
160-
const workspaces = this[loadWorkspacesVirtual]({
160+
const workspaces = mapWorkspaces.virtual({
161161
cwd: this.path,
162162
lockfile: s.data,
163163
})
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,19 @@
11
const mapWorkspaces = require('@npmcli/map-workspaces')
22

3-
const _appendWorkspaces = Symbol('appendWorkspaces')
43
// shared ref used by other mixins/Arborist
54
const _loadWorkspaces = Symbol.for('loadWorkspaces')
6-
const _loadWorkspacesVirtual = Symbol.for('loadWorkspacesVirtual')
75

86
module.exports = cls => class MapWorkspaces extends cls {
9-
[_appendWorkspaces] (node, workspaces) {
10-
if (node && workspaces.size) {
11-
node.workspaces = workspaces
12-
}
13-
14-
return node
15-
}
16-
177
async [_loadWorkspaces] (node) {
18-
if (node.workspaces) {
19-
return node
20-
}
21-
228
const workspaces = await mapWorkspaces({
239
cwd: node.path,
2410
pkg: node.package,
2511
})
2612

27-
return this[_appendWorkspaces](node, workspaces)
28-
}
13+
if (node && workspaces.size) {
14+
node.workspaces = workspaces
15+
}
2916

30-
[_loadWorkspacesVirtual] (opts) {
31-
return mapWorkspaces.virtual(opts)
17+
return node
3218
}
3319
}

0 commit comments

Comments
 (0)