@pnpm/default-reporter 12.4.2 → 12.4.4
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.
|
@@ -56,24 +56,24 @@ function throttledProgressOutput(opts, importingDone$, progress$) {
|
|
|
56
56
|
}
|
|
57
57
|
function getModulesInstallProgress$(stage$, progress$) {
|
|
58
58
|
const modulesInstallProgressPushStream = new Rx.Subject();
|
|
59
|
-
const
|
|
59
|
+
const progressStatsPushStreamByRequirer = getProgressStatsPushStreamByRequirer(progress$);
|
|
60
60
|
const stagePushStreamByRequirer = {};
|
|
61
61
|
stage$
|
|
62
62
|
.forEach((log) => {
|
|
63
63
|
if (!stagePushStreamByRequirer[log.prefix]) {
|
|
64
64
|
stagePushStreamByRequirer[log.prefix] = new Rx.Subject();
|
|
65
|
-
if (!
|
|
66
|
-
|
|
65
|
+
if (!progressStatsPushStreamByRequirer[log.prefix]) {
|
|
66
|
+
progressStatsPushStreamByRequirer[log.prefix] = new Rx.Subject();
|
|
67
67
|
}
|
|
68
68
|
modulesInstallProgressPushStream.next({
|
|
69
69
|
importingDone$: stage$ToImportingDone$(Rx.from(stagePushStreamByRequirer[log.prefix])),
|
|
70
|
-
progress$: Rx.from(
|
|
70
|
+
progress$: Rx.from(progressStatsPushStreamByRequirer[log.prefix]),
|
|
71
71
|
requirer: log.prefix,
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
stagePushStreamByRequirer[log.prefix].next(log);
|
|
75
75
|
if (log.stage === 'importing_done') {
|
|
76
|
-
|
|
76
|
+
progressStatsPushStreamByRequirer[log.prefix].complete();
|
|
77
77
|
stagePushStreamByRequirer[log.prefix].complete();
|
|
78
78
|
}
|
|
79
79
|
})
|
|
@@ -85,7 +85,7 @@ function stage$ToImportingDone$(stage$) {
|
|
|
85
85
|
.pipe((0, operators_1.filter)((log) => log.stage === 'importing_done'), (0, operators_1.mapTo)(true), (0, operators_1.take)(1), (0, operators_1.startWith)(false));
|
|
86
86
|
}
|
|
87
87
|
function getProgressStatsPushStreamByRequirer(progress$) {
|
|
88
|
-
const
|
|
88
|
+
const progressStatsPushStreamByRequirer = {};
|
|
89
89
|
const previousProgressStatsByRequirer = {};
|
|
90
90
|
progress$
|
|
91
91
|
.forEach((log) => {
|
|
@@ -111,13 +111,13 @@ function getProgressStatsPushStreamByRequirer(progress$) {
|
|
|
111
111
|
previousProgressStatsByRequirer[log.requester].imported++;
|
|
112
112
|
break;
|
|
113
113
|
}
|
|
114
|
-
if (!
|
|
115
|
-
|
|
114
|
+
if (!progressStatsPushStreamByRequirer[log.requester]) {
|
|
115
|
+
progressStatsPushStreamByRequirer[log.requester] = new Rx.Subject();
|
|
116
116
|
}
|
|
117
|
-
|
|
117
|
+
progressStatsPushStreamByRequirer[log.requester].next(previousProgressStatsByRequirer[log.requester]);
|
|
118
118
|
})
|
|
119
119
|
.catch(() => { });
|
|
120
|
-
return
|
|
120
|
+
return progressStatsPushStreamByRequirer;
|
|
121
121
|
}
|
|
122
122
|
function createStatusMessage([progress, importingDone]) {
|
|
123
123
|
const msg = `Progress: resolved ${(0, outputConstants_1.hlValue)(progress.resolved.toString())}, reused ${(0, outputConstants_1.hlValue)(progress.reused.toString())}, downloaded ${(0, outputConstants_1.hlValue)(progress.fetched.toString())}, added ${(0, outputConstants_1.hlValue)(progress.imported.toString())}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportProgress.js","sourceRoot":"","sources":["../../src/reporterForClient/reportProgress.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA0B;AAC1B,8CAA+E;AAC/E,uDAA2C;AAC3C,6CAAyC;AAezC,SAAgB,cAAc,CAC5B,IAGC,EACD,IAMC;IAED,MAAM,cAAc,GAAG,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE/D,OAAO,0BAA0B,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC/D,IAAA,eAAG,EAAC,IAAI,CAAC,kBAAkB;QACzB,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,cAAc,EAAE,SAAS,CAAC;QAC9E,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;YAC5C,MAAM,OAAO,GAAG,cAAc,CAAC,cAAc,EAAE,SAAS,CAAC,CAAA;YAEzD,IAAI,QAAQ,KAAK,IAAI,CAAC,GAAG,EAAE;gBACzB,OAAO,OAAO,CAAA;aACf;YACD,OAAO,OAAO,CAAC,IAAI,CACjB,IAAA,eAAG,EAAC,CAAC,GAAQ,EAAE,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,GAAG,IAAA,iBAAO,EAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;gBACpD,OAAO,GAAG,CAAA;YACZ,CAAC,CAAC,CACH,CAAA;QACH,CAAC,CAAC,CACL,CAAA;AACH,CAAC;AAhCD,wCAgCC;AAED,SAAS,uBAAuB,CAC9B,IAIC,EACD,cAAsC,EACtC,SAAuC;IAEvC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE;QACzB,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;KAC1C;IACD,MAAM,gBAAgB,GAAG,EAAE,CAAC,aAAa,CACvC,SAAS,EACT,cAAc,CACf;QACC,0DAA0D;QAC1D,gFAAgF;SAC/E,IAAI,CAAC,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAA;IAC/D,OAAO,gBAAgB,CAAC,IAAI,CAAC,IAAA,eAAG,EAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAA;AACvH,CAAC;AAED,SAAS,0BAA0B,CACjC,MAA+B,EAC/B,SAAqC;IAErC,MAAM,gCAAgC,GAAG,IAAI,EAAE,CAAC,OAAO,EAA0B,CAAA;IACjF,MAAM,
|
|
1
|
+
{"version":3,"file":"reportProgress.js","sourceRoot":"","sources":["../../src/reporterForClient/reportProgress.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/default-reporter",
|
|
3
|
-
"version": "12.4.
|
|
3
|
+
"version": "12.4.4",
|
|
4
4
|
"description": "The default reporter of pnpm",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -37,23 +37,23 @@
|
|
|
37
37
|
"semver": "^7.5.4",
|
|
38
38
|
"stacktracey": "^2.1.8",
|
|
39
39
|
"string-length": "^4.0.2",
|
|
40
|
-
"@pnpm/config": "
|
|
41
|
-
"@pnpm/core-loggers": "9.0.3",
|
|
40
|
+
"@pnpm/config": "20.1.0",
|
|
42
41
|
"@pnpm/dedupe.issues-renderer": "1.0.0",
|
|
43
42
|
"@pnpm/dedupe.types": "1.0.0",
|
|
43
|
+
"@pnpm/core-loggers": "9.0.4",
|
|
44
44
|
"@pnpm/error": "5.0.2",
|
|
45
|
-
"@pnpm/render-peer-issues": "4.0.
|
|
46
|
-
"@pnpm/types": "9.
|
|
45
|
+
"@pnpm/render-peer-issues": "4.0.4",
|
|
46
|
+
"@pnpm/types": "9.4.0"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
49
|
"@types/normalize-path": "^3.0.0",
|
|
50
50
|
"@types/ramda": "0.28.20",
|
|
51
|
-
"@types/semver": "7.3
|
|
51
|
+
"@types/semver": "7.5.3",
|
|
52
52
|
"ghooks": "2.0.4",
|
|
53
53
|
"load-json-file": "^6.2.0",
|
|
54
54
|
"normalize-newline": "3.0.0",
|
|
55
55
|
"strip-ansi": "^6.0.1",
|
|
56
|
-
"@pnpm/default-reporter": "12.4.
|
|
56
|
+
"@pnpm/default-reporter": "12.4.4"
|
|
57
57
|
},
|
|
58
58
|
"homepage": "https://github.com/pnpm/pnpm/blob/main/cli/default-reporter#readme",
|
|
59
59
|
"funding": "https://opencollective.com/pnpm",
|