@pnpm/reviewing.dependencies-hierarchy 1001.0.19 → 1001.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/DependenciesCache.d.ts +2 -2
- package/lib/DependenciesCache.js +4 -4
- package/lib/DependenciesCache.js.map +1 -1
- package/lib/PackageNode.d.ts +1 -0
- package/lib/buildDependenciesHierarchy.d.ts +3 -4
- package/lib/buildDependenciesHierarchy.js +22 -8
- package/lib/buildDependenciesHierarchy.js.map +1 -1
- package/lib/createPackagesSearcher.d.ts +2 -2
- package/lib/createPackagesSearcher.js +25 -5
- package/lib/createPackagesSearcher.js.map +1 -1
- package/lib/getPkgInfo.d.ts +5 -2
- package/lib/getPkgInfo.js +5 -1
- package/lib/getPkgInfo.js.map +1 -1
- package/lib/getTree.d.ts +4 -5
- package/lib/getTree.js +18 -11
- package/lib/getTree.js.map +1 -1
- package/lib/getTreeNodeChildId.d.ts +1 -1
- package/lib/index.d.ts +3 -4
- package/lib/index.js +4 -4
- package/lib/index.js.map +1 -1
- package/package.json +12 -12
- package/lib/types.d.ts +0 -4
- package/lib/types.js +0 -3
- package/lib/types.js.map +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type PackageNode } from './PackageNode';
|
|
2
|
-
import { type TreeNodeId } from './TreeNodeId';
|
|
1
|
+
import { type PackageNode } from './PackageNode.js';
|
|
2
|
+
import { type TreeNodeId } from './TreeNodeId.js';
|
|
3
3
|
export interface GetDependenciesCacheEntryArgs {
|
|
4
4
|
readonly parentId: TreeNodeId;
|
|
5
5
|
readonly requestedDepth: number;
|
package/lib/DependenciesCache.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DependenciesCache = void 0;
|
|
4
|
-
const
|
|
4
|
+
const TreeNodeId_js_1 = require("./TreeNodeId.js");
|
|
5
5
|
/**
|
|
6
6
|
* A cache for the dependencies of a package.
|
|
7
7
|
*
|
|
@@ -41,7 +41,7 @@ class DependenciesCache {
|
|
|
41
41
|
*/
|
|
42
42
|
partiallyVisitedCache = new Map();
|
|
43
43
|
get(args) {
|
|
44
|
-
const cacheKey = (0,
|
|
44
|
+
const cacheKey = (0, TreeNodeId_js_1.serializeTreeNodeId)(args.parentId);
|
|
45
45
|
// The fully visited cache is only usable if the height doesn't exceed the
|
|
46
46
|
// requested depth. Otherwise the final dependencies listing will print
|
|
47
47
|
// entries with a greater depth than requested.
|
|
@@ -67,11 +67,11 @@ class DependenciesCache {
|
|
|
67
67
|
return undefined;
|
|
68
68
|
}
|
|
69
69
|
addFullyVisitedResult(treeNodeId, result) {
|
|
70
|
-
const cacheKey = (0,
|
|
70
|
+
const cacheKey = (0, TreeNodeId_js_1.serializeTreeNodeId)(treeNodeId);
|
|
71
71
|
this.fullyVisitedCache.set(cacheKey, result);
|
|
72
72
|
}
|
|
73
73
|
addPartiallyVisitedResult(treeNodeId, result) {
|
|
74
|
-
const cacheKey = (0,
|
|
74
|
+
const cacheKey = (0, TreeNodeId_js_1.serializeTreeNodeId)(treeNodeId);
|
|
75
75
|
const dependenciesByDepth = this.partiallyVisitedCache.get(cacheKey) ?? new Map();
|
|
76
76
|
if (!this.partiallyVisitedCache.has(cacheKey)) {
|
|
77
77
|
this.partiallyVisitedCache.set(cacheKey, dependenciesByDepth);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DependenciesCache.js","sourceRoot":"","sources":["../src/DependenciesCache.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"DependenciesCache.js","sourceRoot":"","sources":["../src/DependenciesCache.ts"],"names":[],"mappings":";;;AACA,mDAAsE;AAyCtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAa,iBAAiB;IACX,iBAAiB,GAAG,IAAI,GAAG,EAAuC,CAAA;IAEnF;;OAEG;IACc,qBAAqB,GAAG,IAAI,GAAG,EAAsC,CAAA;IAE/E,GAAG,CAAE,IAAmC;QAC7C,MAAM,QAAQ,GAAG,IAAA,mCAAmB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAEnD,0EAA0E;QAC1E,uEAAuE;QACvE,+CAA+C;QAC/C,EAAE;QACF,4EAA4E;QAC5E,6DAA6D;QAC7D,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC9D,IAAI,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,MAAM,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACvF,OAAO;gBACL,YAAY,EAAE,iBAAiB,CAAC,YAAY;gBAC5C,MAAM,EAAE,iBAAiB,CAAC,MAAM;gBAChC,QAAQ,EAAE,KAAK;aAChB,CAAA;QACH,CAAC;QAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAChG,IAAI,qBAAqB,IAAI,IAAI,EAAE,CAAC;YAClC,OAAO;gBACL,YAAY,EAAE,qBAAqB;gBACnC,MAAM,EAAE,SAAS;gBACjB,QAAQ,EAAE,KAAK;aAChB,CAAA;QACH,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAEM,qBAAqB,CAAE,UAAsB,EAAE,MAAmC;QACvF,MAAM,QAAQ,GAAG,IAAA,mCAAmB,EAAC,UAAU,CAAC,CAAA;QAChD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC;IAEM,yBAAyB,CAAE,UAAsB,EAAE,MAAuC;QAC/F,MAAM,QAAQ,GAAG,IAAA,mCAAmB,EAAC,UAAU,CAAC,CAAA;QAChD,MAAM,mBAAmB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,GAAG,EAAE,CAAA;QACjF,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;QAC/D,CAAC;QAED,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,CAAA;IAC5D,CAAC;CACF;AApDD,8CAoDC"}
|
package/lib/PackageNode.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { type DependenciesField, type Registries } from '@pnpm/types';
|
|
2
|
-
import { type PackageNode } from './PackageNode';
|
|
3
|
-
import { type SearchFunction } from './types';
|
|
1
|
+
import { type DependenciesField, type Finder, type Registries } from '@pnpm/types';
|
|
2
|
+
import { type PackageNode } from './PackageNode.js';
|
|
4
3
|
export interface DependenciesHierarchy {
|
|
5
4
|
dependencies?: PackageNode[];
|
|
6
5
|
devDependencies?: PackageNode[];
|
|
@@ -15,7 +14,7 @@ export declare function buildDependenciesHierarchy(projectPaths: string[] | unde
|
|
|
15
14
|
};
|
|
16
15
|
registries?: Registries;
|
|
17
16
|
onlyProjects?: boolean;
|
|
18
|
-
search?:
|
|
17
|
+
search?: Finder;
|
|
19
18
|
lockfileDir: string;
|
|
20
19
|
modulesDir?: string;
|
|
21
20
|
virtualStoreDirMaxLength: number;
|
|
@@ -15,9 +15,9 @@ const types_1 = require("@pnpm/types");
|
|
|
15
15
|
const normalize_path_1 = __importDefault(require("normalize-path"));
|
|
16
16
|
const realpath_missing_1 = __importDefault(require("realpath-missing"));
|
|
17
17
|
const resolve_link_target_1 = __importDefault(require("resolve-link-target"));
|
|
18
|
-
const
|
|
19
|
-
const
|
|
20
|
-
const
|
|
18
|
+
const getTree_js_1 = require("./getTree.js");
|
|
19
|
+
const getTreeNodeChildId_js_1 = require("./getTreeNodeChildId.js");
|
|
20
|
+
const getPkgInfo_js_1 = require("./getPkgInfo.js");
|
|
21
21
|
async function buildDependenciesHierarchy(projectPaths, maybeOpts) {
|
|
22
22
|
if (!maybeOpts?.lockfileDir) {
|
|
23
23
|
throw new TypeError('opts.lockfileDir is required');
|
|
@@ -79,7 +79,7 @@ async function dependenciesHierarchyForPackage(projectPath, currentLockfile, wan
|
|
|
79
79
|
const allDirectDeps = await (0, read_modules_dir_1.readModulesDir)(modulesDir) ?? [];
|
|
80
80
|
const unsavedDeps = allDirectDeps.filter((directDep) => !savedDeps[directDep]);
|
|
81
81
|
const depTypes = (0, lockfile_detect_dep_types_1.detectDepTypes)(currentLockfile);
|
|
82
|
-
const getChildrenTree =
|
|
82
|
+
const getChildrenTree = getTree_js_1.getTree.bind(null, {
|
|
83
83
|
currentPackages: currentLockfile.packages ?? {},
|
|
84
84
|
excludePeerDependencies: opts.excludePeerDependencies,
|
|
85
85
|
importers: currentLockfile.importers,
|
|
@@ -103,7 +103,7 @@ async function dependenciesHierarchyForPackage(projectPath, currentLockfile, wan
|
|
|
103
103
|
result[dependenciesField] = [];
|
|
104
104
|
for (const alias in topDeps) {
|
|
105
105
|
const ref = topDeps[alias];
|
|
106
|
-
const packageInfo = (0,
|
|
106
|
+
const { pkgInfo: packageInfo, readManifest } = (0, getPkgInfo_js_1.getPkgInfo)({
|
|
107
107
|
alias,
|
|
108
108
|
currentPackages: currentLockfile.packages ?? {},
|
|
109
109
|
depTypes,
|
|
@@ -117,8 +117,12 @@ async function dependenciesHierarchyForPackage(projectPath, currentLockfile, wan
|
|
|
117
117
|
virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
|
|
118
118
|
});
|
|
119
119
|
let newEntry = null;
|
|
120
|
-
const matchedSearched = opts.search?.(
|
|
121
|
-
|
|
120
|
+
const matchedSearched = opts.search?.({
|
|
121
|
+
name: packageInfo.name,
|
|
122
|
+
version: packageInfo.version,
|
|
123
|
+
readManifest,
|
|
124
|
+
});
|
|
125
|
+
const nodeId = (0, getTreeNodeChildId_js_1.getTreeNodeChildId)({
|
|
122
126
|
parentId,
|
|
123
127
|
dep: { alias, ref },
|
|
124
128
|
lockfileDir: opts.lockfileDir,
|
|
@@ -147,6 +151,9 @@ async function dependenciesHierarchyForPackage(projectPath, currentLockfile, wan
|
|
|
147
151
|
if (newEntry != null) {
|
|
148
152
|
if (matchedSearched) {
|
|
149
153
|
newEntry.searched = true;
|
|
154
|
+
if (typeof matchedSearched === 'string') {
|
|
155
|
+
newEntry.searchMessage = matchedSearched;
|
|
156
|
+
}
|
|
150
157
|
}
|
|
151
158
|
result[dependenciesField].push(newEntry);
|
|
152
159
|
}
|
|
@@ -173,12 +180,19 @@ async function dependenciesHierarchyForPackage(projectPath, currentLockfile, wan
|
|
|
173
180
|
path: pkgPath,
|
|
174
181
|
version,
|
|
175
182
|
};
|
|
176
|
-
const matchedSearched = opts.search?.(
|
|
183
|
+
const matchedSearched = opts.search?.({
|
|
184
|
+
name: pkg.name,
|
|
185
|
+
version: pkg.version,
|
|
186
|
+
readManifest: () => (0, read_package_json_1.readPackageJsonFromDirSync)(pkgPath),
|
|
187
|
+
});
|
|
177
188
|
if ((opts.search != null) && !matchedSearched)
|
|
178
189
|
return;
|
|
179
190
|
const newEntry = pkg;
|
|
180
191
|
if (matchedSearched) {
|
|
181
192
|
newEntry.searched = true;
|
|
193
|
+
if (typeof matchedSearched === 'string') {
|
|
194
|
+
newEntry.searchMessage = matchedSearched;
|
|
195
|
+
}
|
|
182
196
|
}
|
|
183
197
|
result.unsavedDependencies = result.unsavedDependencies ?? [];
|
|
184
198
|
result.unsavedDependencies.push(newEntry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildDependenciesHierarchy.js","sourceRoot":"","sources":["../src/buildDependenciesHierarchy.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"buildDependenciesHierarchy.js","sourceRoot":"","sources":["../src/buildDependenciesHierarchy.ts"],"names":[],"mappings":";;;;;AA+BA,gEAmEC;AAlGD,gDAAuB;AACvB,mDAO0B;AAC1B,+EAAgE;AAChE,qDAAwD;AACxD,qEAAgE;AAChE,6DAAuD;AACvD,+DAAgG;AAChG,uCAAuG;AACvG,oEAA0C;AAC1C,wEAA8C;AAC9C,8EAAmD;AAEnD,6CAAsC;AACtC,mEAA4D;AAC5D,mDAA4C;AAUrC,KAAK,UAAU,0BAA0B,CAC9C,YAAkC,EAClC,SAUC;IAED,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC;QAC5B,MAAM,IAAI,SAAS,CAAC,8BAA8B,CAAC,CAAA;IACrD,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAe,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,CAAA;IAClH,MAAM,OAAO,GAAG,MAAM,IAAA,kCAAmB,EAAC,UAAU,CAAC,CAAA;IACrD,MAAM,UAAU,GAAG,IAAA,0CAAmB,EAAC;QACrC,GAAG,SAAS,EAAE,UAAU;QACxB,GAAG,OAAO,EAAE,UAAU;KACvB,CAAC,CAAA;IACF,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IACtD,MAAM,eAAe,GAAG,MAAM,IAAA,iCAAmB,EAAC,eAAe,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,IAAI,IAAI,CAAA;IACzG,MAAM,cAAc,GAAG,MAAM,IAAA,gCAAkB,EAAC,SAAS,CAAC,WAAW,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAA;IACrG,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,IAAI,EAAE,CAAC;aACxD,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,MAAM,MAAM,GAAG,EAAqD,CAAA;IAEpE,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,CAAA;QAC1B,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,IAAI,GAAG;QACX,KAAK,EAAE,SAAS,CAAC,KAAK,IAAI,CAAC;QAC3B,uBAAuB,EAAE,SAAS,CAAC,uBAAuB;QAC1D,OAAO,EAAE,SAAS,CAAC,OAAO,IAAI;YAC5B,YAAY,EAAE,IAAI;YAClB,eAAe,EAAE,IAAI;YACrB,oBAAoB,EAAE,IAAI;SAC3B;QACD,WAAW,EAAE,SAAS,CAAC,WAAW;QAClC,YAAY,EAAE,SAAS,CAAC,YAAY;QACpC,UAAU;QACV,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,OAAO,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC;QACxC,UAAU,EAAE,SAAS,CAAC,UAAU;QAChC,eAAe,EAAE,OAAO,EAAE,eAAe;QACzC,wBAAwB,EAAE,OAAO,EAAE,wBAAwB,IAAI,SAAS,CAAC,wBAAwB;KAClG,CAAA;IACD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;QACrE,OAAO;YACL,WAAW;YACX,MAAM,+BAA+B,CAAC,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,IAAI,CAAC;SACvD,CAAA;IACtC,CAAC,CAAC,CAAC,CAAA;IACH,KAAK,MAAM,CAAC,WAAW,EAAE,qBAAqB,CAAC,IAAI,KAAK,EAAE,CAAC;QACzD,MAAM,CAAC,WAAW,CAAC,GAAG,qBAAqB,CAAA;IAC7C,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,KAAK,UAAU,+BAA+B,CAC5C,WAAmB,EACnB,eAA+B,EAC/B,cAAqC,EACrC,IAYC;IAED,MAAM,UAAU,GAAG,IAAA,mCAAqB,EAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;IAEvE,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,UAAU,CAAC;QAAE,OAAO,EAAE,CAAA;IAErD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,IAAI,cAAc,CAAC,CAAA;IAE5E,MAAM,SAAS,GAAG,wBAAwB,CAAC,eAAe,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAA;IACjF,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAc,EAAC,UAAU,CAAC,IAAI,EAAE,CAAA;IAC5D,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAA;IAE9E,MAAM,QAAQ,GAAG,IAAA,0CAAc,EAAC,eAAe,CAAC,CAAA;IAChD,MAAM,eAAe,GAAG,oBAAO,CAAC,IAAI,CAAC,IAAI,EAAE;QACzC,eAAe,EAAE,eAAe,CAAC,QAAQ,IAAI,EAAE;QAC/C,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;QACrD,SAAS,EAAE,eAAe,CAAC,SAAS;QACpC,2BAA2B,EAAE,IAAI,CAAC,OAAO,CAAC,oBAAoB;QAC9D,QAAQ;QACR,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,qBAAqB,EAAE,WAAW;QAClC,QAAQ,EAAE,IAAI,CAAC,KAAK;QACpB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,cAAc,EAAE,cAAc,EAAE,QAAQ,IAAI,EAAE;QAC9C,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;KACxD,CAAC,CAAA;IACF,MAAM,QAAQ,GAAe,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,CAAA;IAC7D,MAAM,MAAM,GAA0B,EAAE,CAAA;IACxC,KAAK,MAAM,iBAAiB,IAAI,2BAAmB,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC;QACxH,MAAM,OAAO,GAAG,eAAe,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAA;QAC9E,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAA;QAC9B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;YAC1B,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,IAAA,0BAAU,EAAC;gBACxD,KAAK;gBACL,eAAe,EAAE,eAAe,CAAC,QAAQ,IAAI,EAAE;gBAC/C,QAAQ;gBACR,qBAAqB,EAAE,WAAW;gBAClC,iBAAiB,EAAE,WAAW;gBAC9B,GAAG;gBACH,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,cAAc,EAAE,cAAc,EAAE,QAAQ,IAAI,EAAE;gBAC9C,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;aACxD,CAAC,CAAA;YACF,IAAI,QAAQ,GAAuB,IAAI,CAAA;YACvC,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpC,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,YAAY;aACb,CAAC,CAAA;YACF,MAAM,MAAM,GAAG,IAAA,0CAAkB,EAAC;gBAChC,QAAQ;gBACR,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;gBACnB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,SAAS,EAAE,eAAe,CAAC,SAAS;aACrC,CAAC,CAAA;YACF,IAAI,IAAI,CAAC,YAAY,IAAI,MAAM,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;gBACrD,SAAQ;YACV,CAAC;iBAAM,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe;oBAAE,SAAQ;gBACvD,QAAQ,GAAG,WAAW,CAAA;YACxB,CAAC;iBAAM,CAAC;gBACN,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;gBAC5C,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5B,QAAQ,GAAG;wBACT,GAAG,WAAW;wBACd,YAAY;qBACb,CAAA;gBACH,CAAC;qBAAM,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,eAAe,EAAE,CAAC;oBACpD,QAAQ,GAAG,WAAW,CAAA;gBACxB,CAAC;YACH,CAAC;YACD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACrB,IAAI,eAAe,EAAE,CAAC;oBACpB,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAA;oBACxB,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE,CAAC;wBACxC,QAAQ,CAAC,aAAa,GAAG,eAAe,CAAA;oBAC1C,CAAC;gBACH,CAAC;gBACD,MAAM,CAAC,iBAAiB,CAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACnC,IAAI,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QAC/C,IAAI,OAAgB,CAAA;QACpB,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,IAAA,6BAAiB,EAAC,OAAO,CAAC,CAAA;YAC1C,OAAO,GAAG,QAAQ,IAAA,wBAAa,EAAC,cAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,EAAE,CAAA;QACxE,CAAC;QAAC,MAAM,CAAC;YACP,+CAA+C;YAC/C,MAAM,GAAG,GAAG,MAAM,IAAA,8CAA0B,EAAC,OAAO,CAAC,CAAA;YACrD,OAAO,GAAG,GAAG,EAAE,OAAO,IAAI,WAAW,CAAA;QACvC,CAAC;QACD,MAAM,GAAG,GAAG;YACV,KAAK,EAAE,UAAU;YACjB,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,KAAK;YAChB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,OAAO;YACb,OAAO;SACR,CAAA;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YACpC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,YAAY,EAAE,GAAG,EAAE,CAAC,IAAA,8CAA0B,EAAC,OAAO,CAAC;SACxD,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe;YAAE,OAAM;QACrD,MAAM,QAAQ,GAAgB,GAAG,CAAA;QACjC,IAAI,eAAe,EAAE,CAAC;YACpB,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAA;YACxB,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE,CAAC;gBACxC,QAAQ,CAAC,aAAa,GAAG,eAAe,CAAA;YAC1C,CAAC;QACH,CAAC;QACD,MAAM,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,IAAI,EAAE,CAAA;QAC7D,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC,CAAC,CACH,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,wBAAwB,CAAE,eAAgC;IACjE,OAAO;QACL,GAAG,eAAe,CAAC,YAAY;QAC/B,GAAG,eAAe,CAAC,eAAe;QAClC,GAAG,eAAe,CAAC,oBAAoB;KACxC,CAAA;AACH,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
export declare function createPackagesSearcher(queries: string[]):
|
|
1
|
+
import { type Finder } from '@pnpm/types';
|
|
2
|
+
export declare function createPackagesSearcher(queries: string[], finders?: Finder[]): Finder;
|
|
@@ -7,20 +7,40 @@ exports.createPackagesSearcher = createPackagesSearcher;
|
|
|
7
7
|
const matcher_1 = require("@pnpm/matcher");
|
|
8
8
|
const npm_package_arg_1 = __importDefault(require("@pnpm/npm-package-arg"));
|
|
9
9
|
const semver_1 = __importDefault(require("semver"));
|
|
10
|
-
function createPackagesSearcher(queries) {
|
|
10
|
+
function createPackagesSearcher(queries, finders) {
|
|
11
11
|
const searchers = queries
|
|
12
12
|
.map(parseSearchQuery)
|
|
13
13
|
.map((packageSelector) => search.bind(null, packageSelector));
|
|
14
|
-
return (pkg) =>
|
|
14
|
+
return (pkg) => {
|
|
15
|
+
if (searchers.length > 0 && searchers.some((search) => search(pkg))) {
|
|
16
|
+
return true;
|
|
17
|
+
}
|
|
18
|
+
if (finders == null)
|
|
19
|
+
return false;
|
|
20
|
+
const messages = [];
|
|
21
|
+
let found = false;
|
|
22
|
+
for (const finder of finders) {
|
|
23
|
+
const result = finder(pkg);
|
|
24
|
+
if (result) {
|
|
25
|
+
found = true;
|
|
26
|
+
if (typeof result === 'string') {
|
|
27
|
+
messages.push(result);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
if (messages.length)
|
|
32
|
+
return messages.join('\n');
|
|
33
|
+
return found;
|
|
34
|
+
};
|
|
15
35
|
}
|
|
16
|
-
function search(packageSelector,
|
|
17
|
-
if (!packageSelector.matchName(
|
|
36
|
+
function search(packageSelector, { name, version }) {
|
|
37
|
+
if (!packageSelector.matchName(name)) {
|
|
18
38
|
return false;
|
|
19
39
|
}
|
|
20
40
|
if (packageSelector.matchVersion == null) {
|
|
21
41
|
return true;
|
|
22
42
|
}
|
|
23
|
-
return !
|
|
43
|
+
return !version.startsWith('link:') && packageSelector.matchVersion(version);
|
|
24
44
|
}
|
|
25
45
|
function parseSearchQuery(query) {
|
|
26
46
|
const parsed = (0, npm_package_arg_1.default)(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPackagesSearcher.js","sourceRoot":"","sources":["../src/createPackagesSearcher.ts"],"names":[],"mappings":";;;;;AAKA,
|
|
1
|
+
{"version":3,"file":"createPackagesSearcher.js","sourceRoot":"","sources":["../src/createPackagesSearcher.ts"],"names":[],"mappings":";;;;;AAKA,wDAuBC;AA5BD,2CAA6C;AAC7C,4EAAuC;AAEvC,oDAA2B;AAE3B,SAAgB,sBAAsB,CAAE,OAAiB,EAAE,OAAkB;IAC3E,MAAM,SAAS,GAAa,OAAO;SAChC,GAAG,CAAC,gBAAgB,CAAC;SACrB,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAA;IAC/D,OAAO,CAAC,GAAG,EAAE,EAAE;QACb,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACpE,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,OAAO,IAAI,IAAI;YAAE,OAAO,KAAK,CAAA;QACjC,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,IAAI,KAAK,GAAG,KAAK,CAAA;QACjB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;YAC1B,IAAI,MAAM,EAAE,CAAC;gBACX,KAAK,GAAG,IAAI,CAAA;gBACZ,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;oBAC/B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM;YAAE,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC/C,OAAO,KAAK,CAAA;IACd,CAAC,CAAA;AACH,CAAC;AAID,SAAS,MAAM,CACb,eAGC,EACD,EAAE,IAAI,EAAE,OAAO,EAAiB;IAEhC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QACrC,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,eAAe,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;QACzC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;AAC9E,CAAC;AAOD,SAAS,gBAAgB,CAAE,KAAa;IACtC,MAAM,MAAM,GAAG,IAAA,yBAAG,EAAC,KAAK,CAAC,CAAA;IACzB,IAAI,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;QAC/B,OAAO,EAAE,SAAS,EAAE,IAAA,uBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAA;IAClD,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,mBAAmB,KAAK,4CAA4C,CAAC,CAAA;IACvF,CAAC;IACD,OAAO;QACL,SAAS,EAAE,IAAA,uBAAa,EAAC,MAAM,CAAC,IAAI,CAAC;QACrC,YAAY,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC;KAC/E,CAAA;AACH,CAAC"}
|
package/lib/getPkgInfo.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type PackageSnapshots } from '@pnpm/lockfile.fs';
|
|
2
2
|
import { type DepTypes } from '@pnpm/lockfile.detect-dep-types';
|
|
3
|
-
import { type Registries } from '@pnpm/types';
|
|
3
|
+
import { type DependencyManifest, type Registries } from '@pnpm/types';
|
|
4
4
|
export interface GetPkgInfoOpts {
|
|
5
5
|
readonly alias: string;
|
|
6
6
|
readonly ref: string;
|
|
@@ -25,7 +25,10 @@ export interface GetPkgInfoOpts {
|
|
|
25
25
|
*/
|
|
26
26
|
readonly rewriteLinkVersionDir?: string;
|
|
27
27
|
}
|
|
28
|
-
export declare function getPkgInfo(opts: GetPkgInfoOpts):
|
|
28
|
+
export declare function getPkgInfo(opts: GetPkgInfoOpts): {
|
|
29
|
+
pkgInfo: PackageInfo;
|
|
30
|
+
readManifest: () => DependencyManifest;
|
|
31
|
+
};
|
|
29
32
|
interface PackageInfo {
|
|
30
33
|
alias: string;
|
|
31
34
|
isMissing: boolean;
|
package/lib/getPkgInfo.js
CHANGED
|
@@ -8,6 +8,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
8
8
|
const lockfile_utils_1 = require("@pnpm/lockfile.utils");
|
|
9
9
|
const lockfile_detect_dep_types_1 = require("@pnpm/lockfile.detect-dep-types");
|
|
10
10
|
const dependency_path_1 = require("@pnpm/dependency-path");
|
|
11
|
+
const read_package_json_1 = require("@pnpm/read-package-json");
|
|
11
12
|
const normalize_path_1 = __importDefault(require("normalize-path"));
|
|
12
13
|
function getPkgInfo(opts) {
|
|
13
14
|
let name;
|
|
@@ -78,6 +79,9 @@ function getPkgInfo(opts) {
|
|
|
78
79
|
else if (depType === lockfile_detect_dep_types_1.DepType.ProdOnly) {
|
|
79
80
|
packageInfo.dev = false;
|
|
80
81
|
}
|
|
81
|
-
return
|
|
82
|
+
return {
|
|
83
|
+
pkgInfo: packageInfo,
|
|
84
|
+
readManifest: () => (0, read_package_json_1.readPackageJsonFromDirSync)(fullPackagePath),
|
|
85
|
+
};
|
|
82
86
|
}
|
|
83
87
|
//# sourceMappingURL=getPkgInfo.js.map
|
package/lib/getPkgInfo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPkgInfo.js","sourceRoot":"","sources":["../src/getPkgInfo.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"getPkgInfo.js","sourceRoot":"","sources":["../src/getPkgInfo.ts"],"names":[],"mappings":"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"}
|
package/lib/getTree.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { type PackageSnapshots, type ProjectSnapshot } from '@pnpm/lockfile.fs';
|
|
2
2
|
import { type DepTypes } from '@pnpm/lockfile.detect-dep-types';
|
|
3
|
-
import { type Registries } from '@pnpm/types';
|
|
4
|
-
import { type
|
|
5
|
-
import { type
|
|
6
|
-
import { type TreeNodeId } from './TreeNodeId';
|
|
3
|
+
import { type Finder, type Registries } from '@pnpm/types';
|
|
4
|
+
import { type PackageNode } from './PackageNode.js';
|
|
5
|
+
import { type TreeNodeId } from './TreeNodeId.js';
|
|
7
6
|
interface GetTreeOpts {
|
|
8
7
|
maxDepth: number;
|
|
9
8
|
rewriteLinkVersionDir: string;
|
|
@@ -11,7 +10,7 @@ interface GetTreeOpts {
|
|
|
11
10
|
excludePeerDependencies?: boolean;
|
|
12
11
|
lockfileDir: string;
|
|
13
12
|
onlyProjects?: boolean;
|
|
14
|
-
search?:
|
|
13
|
+
search?: Finder;
|
|
15
14
|
skipped: Set<string>;
|
|
16
15
|
registries: Registries;
|
|
17
16
|
importers: Record<string, ProjectSnapshot>;
|
package/lib/getTree.js
CHANGED
|
@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getTree = getTree;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
8
|
+
const getPkgInfo_js_1 = require("./getPkgInfo.js");
|
|
9
|
+
const getTreeNodeChildId_js_1 = require("./getTreeNodeChildId.js");
|
|
10
|
+
const DependenciesCache_js_1 = require("./DependenciesCache.js");
|
|
11
|
+
const TreeNodeId_js_1 = require("./TreeNodeId.js");
|
|
12
12
|
function getTree(opts, parentId) {
|
|
13
|
-
const dependenciesCache = new
|
|
13
|
+
const dependenciesCache = new DependenciesCache_js_1.DependenciesCache();
|
|
14
14
|
return getTreeHelper(dependenciesCache, opts, Keypath.initialize(parentId), parentId).dependencies;
|
|
15
15
|
}
|
|
16
16
|
function getTreeHelper(dependenciesCache, opts, keypath, parentId) {
|
|
@@ -72,7 +72,7 @@ function getTreeHelper(dependenciesCache, opts, keypath, parentId) {
|
|
|
72
72
|
let resultCircular = false;
|
|
73
73
|
for (const alias in deps) {
|
|
74
74
|
const ref = deps[alias];
|
|
75
|
-
const packageInfo = (0,
|
|
75
|
+
const { pkgInfo: packageInfo, readManifest } = (0, getPkgInfo_js_1.getPkgInfo)({
|
|
76
76
|
alias,
|
|
77
77
|
currentPackages: opts.currentPackages,
|
|
78
78
|
depTypes: opts.depTypes,
|
|
@@ -87,9 +87,13 @@ function getTreeHelper(dependenciesCache, opts, keypath, parentId) {
|
|
|
87
87
|
virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
|
|
88
88
|
});
|
|
89
89
|
let circular;
|
|
90
|
-
const matchedSearched = opts.search?.(
|
|
90
|
+
const matchedSearched = opts.search?.({
|
|
91
|
+
name: packageInfo.name,
|
|
92
|
+
version: packageInfo.version,
|
|
93
|
+
readManifest,
|
|
94
|
+
});
|
|
91
95
|
let newEntry = null;
|
|
92
|
-
const nodeId = (0,
|
|
96
|
+
const nodeId = (0, getTreeNodeChildId_js_1.getTreeNodeChildId)({
|
|
93
97
|
parentId,
|
|
94
98
|
dep: { alias, ref },
|
|
95
99
|
lockfileDir: opts.lockfileDir,
|
|
@@ -153,6 +157,9 @@ function getTreeHelper(dependenciesCache, opts, keypath, parentId) {
|
|
|
153
157
|
}
|
|
154
158
|
if (matchedSearched) {
|
|
155
159
|
newEntry.searched = true;
|
|
160
|
+
if (typeof matchedSearched === 'string') {
|
|
161
|
+
newEntry.searchMessage = matchedSearched;
|
|
162
|
+
}
|
|
156
163
|
}
|
|
157
164
|
if (!newEntry.isPeer || !opts.excludePeerDependencies || newEntry.dependencies?.length) {
|
|
158
165
|
resultDependencies.push(newEntry);
|
|
@@ -177,13 +184,13 @@ class Keypath {
|
|
|
177
184
|
this.keypath = keypath;
|
|
178
185
|
}
|
|
179
186
|
static initialize(treeNodeId) {
|
|
180
|
-
return new Keypath([(0,
|
|
187
|
+
return new Keypath([(0, TreeNodeId_js_1.serializeTreeNodeId)(treeNodeId)]);
|
|
181
188
|
}
|
|
182
189
|
includes(treeNodeId) {
|
|
183
|
-
return this.keypath.includes((0,
|
|
190
|
+
return this.keypath.includes((0, TreeNodeId_js_1.serializeTreeNodeId)(treeNodeId));
|
|
184
191
|
}
|
|
185
192
|
concat(treeNodeId) {
|
|
186
|
-
return new Keypath([...this.keypath, (0,
|
|
193
|
+
return new Keypath([...this.keypath, (0, TreeNodeId_js_1.serializeTreeNodeId)(treeNodeId)]);
|
|
187
194
|
}
|
|
188
195
|
}
|
|
189
196
|
//# sourceMappingURL=getTree.js.map
|
package/lib/getTree.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTree.js","sourceRoot":"","sources":["../src/getTree.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"getTree.js","sourceRoot":"","sources":["../src/getTree.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export { buildDependenciesHierarchy, type DependenciesHierarchy } from './buildDependenciesHierarchy';
|
|
2
|
-
export { type PackageNode } from './PackageNode';
|
|
3
|
-
export {
|
|
4
|
-
export { createPackagesSearcher } from './createPackagesSearcher';
|
|
1
|
+
export { buildDependenciesHierarchy, type DependenciesHierarchy } from './buildDependenciesHierarchy.js';
|
|
2
|
+
export { type PackageNode } from './PackageNode.js';
|
|
3
|
+
export { createPackagesSearcher } from './createPackagesSearcher.js';
|
package/lib/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createPackagesSearcher = exports.buildDependenciesHierarchy = void 0;
|
|
4
|
-
var
|
|
5
|
-
Object.defineProperty(exports, "buildDependenciesHierarchy", { enumerable: true, get: function () { return
|
|
6
|
-
var
|
|
7
|
-
Object.defineProperty(exports, "createPackagesSearcher", { enumerable: true, get: function () { return
|
|
4
|
+
var buildDependenciesHierarchy_js_1 = require("./buildDependenciesHierarchy.js");
|
|
5
|
+
Object.defineProperty(exports, "buildDependenciesHierarchy", { enumerable: true, get: function () { return buildDependenciesHierarchy_js_1.buildDependenciesHierarchy; } });
|
|
6
|
+
var createPackagesSearcher_js_1 = require("./createPackagesSearcher.js");
|
|
7
|
+
Object.defineProperty(exports, "createPackagesSearcher", { enumerable: true, get: function () { return createPackagesSearcher_js_1.createPackagesSearcher; } });
|
|
8
8
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iFAAwG;AAA/F,2IAAA,0BAA0B,OAAA;AAEnC,yEAAoE;AAA3D,mIAAA,sBAAsB,OAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/reviewing.dependencies-hierarchy",
|
|
3
|
-
"version": "1001.0
|
|
3
|
+
"version": "1001.1.0",
|
|
4
4
|
"description": "Creates a dependencies hierarchy for a symlinked `node_modules`",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -32,23 +32,23 @@
|
|
|
32
32
|
"realpath-missing": "^1.1.0",
|
|
33
33
|
"resolve-link-target": "^2.0.0",
|
|
34
34
|
"semver": "^7.7.1",
|
|
35
|
-
"@pnpm/
|
|
36
|
-
"@pnpm/lockfile.detect-dep-types": "1001.0.
|
|
37
|
-
"@pnpm/lockfile.fs": "1001.1.17",
|
|
35
|
+
"@pnpm/lockfile.fs": "1001.1.18",
|
|
36
|
+
"@pnpm/lockfile.detect-dep-types": "1001.0.14",
|
|
38
37
|
"@pnpm/matcher": "1000.0.0",
|
|
39
|
-
"@pnpm/
|
|
40
|
-
"@pnpm/
|
|
38
|
+
"@pnpm/lockfile.utils": "1003.0.1",
|
|
39
|
+
"@pnpm/dependency-path": "1001.1.1",
|
|
40
|
+
"@pnpm/modules-yaml": "1000.3.5",
|
|
41
|
+
"@pnpm/normalize-registries": "1000.1.3",
|
|
41
42
|
"@pnpm/read-modules-dir": "1000.0.0",
|
|
42
|
-
"@pnpm/read-package-json": "1000.0
|
|
43
|
-
"@pnpm/
|
|
44
|
-
"@pnpm/types": "1000.7.0"
|
|
43
|
+
"@pnpm/read-package-json": "1000.1.0",
|
|
44
|
+
"@pnpm/types": "1000.8.0"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@types/normalize-path": "^3.0.2",
|
|
48
48
|
"@types/semver": "7.5.3",
|
|
49
|
-
"@pnpm/
|
|
50
|
-
"@pnpm/
|
|
51
|
-
"@pnpm/
|
|
49
|
+
"@pnpm/reviewing.dependencies-hierarchy": "1001.1.0",
|
|
50
|
+
"@pnpm/test-fixtures": "1000.0.0",
|
|
51
|
+
"@pnpm/constants": "1001.3.0"
|
|
52
52
|
},
|
|
53
53
|
"engines": {
|
|
54
54
|
"node": ">=18.12"
|
package/lib/types.d.ts
DELETED
package/lib/types.js
DELETED
package/lib/types.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}
|