@pnpm/default-reporter 12.2.8 → 12.3.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/index.d.ts +4 -0
- package/lib/index.js +4 -1
- package/lib/index.js.map +1 -1
- package/lib/reporterForClient/index.d.ts +2 -0
- package/lib/reporterForClient/index.js +3 -1
- package/lib/reporterForClient/index.js.map +1 -1
- package/lib/reporterForClient/reportBigTarballsProgress.js +6 -2
- package/lib/reporterForClient/reportBigTarballsProgress.js.map +1 -1
- package/lib/reporterForClient/reportProgress.d.ts +1 -0
- package/lib/reporterForClient/reportProgress.js +11 -9
- package/lib/reporterForClient/reportProgress.js.map +1 -1
- package/lib/reporterForClient/reportStats.d.ts +1 -0
- package/lib/reporterForClient/reportStats.js +8 -3
- package/lib/reporterForClient/reportStats.js.map +1 -1
- package/package.json +6 -6
package/lib/index.d.ts
CHANGED
|
@@ -16,6 +16,8 @@ export declare function initDefaultReporter(opts: {
|
|
|
16
16
|
throttleProgress?: number;
|
|
17
17
|
outputMaxWidth?: number;
|
|
18
18
|
hideAddedPkgsProgress?: boolean;
|
|
19
|
+
hideProgressPrefix?: boolean;
|
|
20
|
+
hideLifecycleOutput?: boolean;
|
|
19
21
|
};
|
|
20
22
|
context: {
|
|
21
23
|
argv: string[];
|
|
@@ -35,6 +37,8 @@ export declare function toOutput$(opts: {
|
|
|
35
37
|
aggregateOutput?: boolean;
|
|
36
38
|
throttleProgress?: number;
|
|
37
39
|
hideAddedPkgsProgress?: boolean;
|
|
40
|
+
hideProgressPrefix?: boolean;
|
|
41
|
+
hideLifecycleOutput?: boolean;
|
|
38
42
|
};
|
|
39
43
|
context: {
|
|
40
44
|
argv: string[];
|
package/lib/index.js
CHANGED
|
@@ -228,9 +228,10 @@ function toOutput$(opts) {
|
|
|
228
228
|
summary: Rx.from(summaryPushStream),
|
|
229
229
|
updateCheck: Rx.from(updateCheckPushStream),
|
|
230
230
|
};
|
|
231
|
+
const cmd = opts.context.argv[0];
|
|
231
232
|
const outputs = (0, reporterForClient_1.reporterForClient)(log$, {
|
|
232
233
|
appendOnly: opts.reportingOptions?.appendOnly,
|
|
233
|
-
cmd
|
|
234
|
+
cmd,
|
|
234
235
|
config: opts.context.config,
|
|
235
236
|
env: opts.context.env ?? process.env,
|
|
236
237
|
filterPkgsDiff: opts.filterPkgsDiff,
|
|
@@ -243,6 +244,8 @@ function toOutput$(opts) {
|
|
|
243
244
|
throttleProgress: opts.reportingOptions?.throttleProgress,
|
|
244
245
|
width: opts.reportingOptions?.outputMaxWidth,
|
|
245
246
|
hideAddedPkgsProgress: opts.reportingOptions?.hideAddedPkgsProgress,
|
|
247
|
+
hideProgressPrefix: opts.reportingOptions?.hideProgressPrefix ?? (cmd === 'dlx'),
|
|
248
|
+
hideLifecycleOutput: opts.reportingOptions?.hideLifecycleOutput,
|
|
246
249
|
});
|
|
247
250
|
if (opts.reportingOptions?.appendOnly) {
|
|
248
251
|
return Rx.merge(...outputs)
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,yCAA0B;AAC1B,8CAAsD;AACtD,0DAAoC;AACpC,2CAAiC;AACjC,iDAA6C;AAC7C,2DAAuD;AACvD,qEAAiE;AAIxD,2FAJA,uBAAU,OAIA;AAHnB,2DAAuD;AAKvD,SAAgB,mBAAmB,CACjC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,6 +42,8 @@ export declare function reporterForClient(log$: {
|
|
|
42
42
|
throttleProgress?: number;
|
|
43
43
|
width?: number;
|
|
44
44
|
hideAddedPkgsProgress?: boolean;
|
|
45
|
+
hideProgressPrefix?: boolean;
|
|
46
|
+
hideLifecycleOutput?: boolean;
|
|
45
47
|
}): Array<Rx.Observable<Rx.Observable<{
|
|
46
48
|
msg: string;
|
|
47
49
|
}>>>;
|
|
@@ -32,7 +32,7 @@ function reporterForClient(log$, opts) {
|
|
|
32
32
|
: undefined;
|
|
33
33
|
const outputs = [
|
|
34
34
|
(0, reportLifecycleScripts_1.reportLifecycleScripts)(log$, {
|
|
35
|
-
appendOnly: opts.appendOnly === true || opts.streamLifecycleOutput,
|
|
35
|
+
appendOnly: (opts.appendOnly === true || opts.streamLifecycleOutput) && !opts.hideLifecycleOutput,
|
|
36
36
|
aggregateOutput: opts.aggregateOutput,
|
|
37
37
|
cwd,
|
|
38
38
|
width,
|
|
@@ -66,11 +66,13 @@ function reporterForClient(log$, opts) {
|
|
|
66
66
|
cwd,
|
|
67
67
|
throttle,
|
|
68
68
|
hideAddedPkgsProgress: opts.hideAddedPkgsProgress,
|
|
69
|
+
hideProgressPrefix: opts.hideProgressPrefix,
|
|
69
70
|
}), ...(0, reportStats_1.reportStats)(log$, {
|
|
70
71
|
cmd: opts.cmd,
|
|
71
72
|
cwd,
|
|
72
73
|
isRecursive: opts.isRecursive,
|
|
73
74
|
width,
|
|
75
|
+
hideProgressPrefix: opts.hideProgressPrefix,
|
|
74
76
|
}));
|
|
75
77
|
}
|
|
76
78
|
if (!opts.appendOnly) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/reporterForClient/index.ts"],"names":[],"mappings":";;;AAIA,8CAA6C;AAC7C,2EAAsE;AACtE,mDAA+C;AAC/C,+DAA2D;AAC3D,6DAAyD;AACzD,+CAA2C;AAC3C,+DAA2D;AAC3D,qEAAiE;AACjE,6CAA2D;AAC3D,6EAAyE;AACzE,qDAAiD;AACjD,6DAAyD;AACzD,+CAA2C;AAC3C,2FAAuF;AACvF,+CAA2C;AAC3C,mDAAoE;AACpE,2DAAuD;AAEvD,MAAM,gCAAgC,GAAG;IACvC,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;IACZ,GAAG,EAAE,IAAI;IACT,MAAM,EAAE,IAAI;CACb,CAAA;AAED,SAAgB,iBAAiB,CAC/B,IAuBC,EACD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/reporterForClient/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,16 +8,20 @@ const operators_1 = require("rxjs/operators");
|
|
|
8
8
|
const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
|
|
9
9
|
const outputConstants_1 = require("./outputConstants");
|
|
10
10
|
const BIG_TARBALL_SIZE = 1024 * 1024 * 5; // 5 MB
|
|
11
|
+
const PRETTY_OPTS = {
|
|
12
|
+
minimumFractionDigits: 2,
|
|
13
|
+
maximumFractionDigits: 2,
|
|
14
|
+
};
|
|
11
15
|
function reportBigTarballProgress(log$) {
|
|
12
16
|
return log$.fetchingProgress.pipe((0, operators_1.filter)((log) => log.status === 'started' &&
|
|
13
17
|
typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE &&
|
|
14
18
|
// When retrying the download, keep the existing progress line.
|
|
15
19
|
// Fixing issue: https://github.com/pnpm/pnpm/issues/1013
|
|
16
20
|
log.attempt === 1), (0, operators_1.map)((startedLog) => {
|
|
17
|
-
const size = (0, pretty_bytes_1.default)(startedLog['size']);
|
|
21
|
+
const size = (0, pretty_bytes_1.default)(startedLog['size'], PRETTY_OPTS);
|
|
18
22
|
return log$.fetchingProgress.pipe((0, operators_1.filter)((log) => log.status === 'in_progress' && log.packageId === startedLog['packageId']), (0, operators_1.map)((log) => log['downloaded']), (0, operators_1.startWith)(0), (0, operators_1.map)((downloadedRaw) => {
|
|
19
23
|
const done = startedLog['size'] === downloadedRaw;
|
|
20
|
-
const downloaded = (0, pretty_bytes_1.default)(downloadedRaw);
|
|
24
|
+
const downloaded = (0, pretty_bytes_1.default)(downloadedRaw, PRETTY_OPTS);
|
|
21
25
|
return {
|
|
22
26
|
fixed: !done,
|
|
23
27
|
msg: `Downloading ${(0, outputConstants_1.hlPkgId)(startedLog['packageId'])}: ${(0, outputConstants_1.hlValue)(downloaded)}/${(0, outputConstants_1.hlValue)(size)}${done ? ', done' : ''}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportBigTarballsProgress.js","sourceRoot":"","sources":["../../src/reporterForClient/reportBigTarballsProgress.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAuD;AACvD,gEAAsC;AACtC,uDAG0B;AAE1B,MAAM,gBAAgB,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC,CAAA,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"reportBigTarballsProgress.js","sourceRoot":"","sources":["../../src/reporterForClient/reportBigTarballsProgress.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAuD;AACvD,gEAAsC;AACtC,uDAG0B;AAE1B,MAAM,gBAAgB,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC,CAAA,CAAC,OAAO;AAChD,MAAM,WAAW,GAAG;IAClB,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;CACzB,CAAA;AAED,SAAgB,wBAAwB,CACtC,IAEC;IAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAC/B,IAAA,kBAAM,EAAC,CAAC,GAAwB,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS;QAC3D,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,IAAI,gBAAgB;QAC5D,+DAA+D;QAC/D,yDAAyD;QACzD,GAAG,CAAC,OAAO,KAAK,CAAC,CAClB,EACD,IAAA,eAAG,EAAC,CAAC,UAA+B,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG,IAAA,sBAAW,EAAC,UAAU,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,CAAA;QACzD,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAC/B,IAAA,kBAAM,EAAC,CAAC,GAAwB,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,aAAa,IAAI,GAAG,CAAC,SAAS,KAAK,UAAU,CAAC,WAAW,CAAC,CAAC,EAC/G,IAAA,eAAG,EAAC,CAAC,GAAwB,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,EACpD,IAAA,qBAAS,EAAC,CAAC,CAAC,EACZ,IAAA,eAAG,EAAC,CAAC,aAAqB,EAAE,EAAE;YAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,aAAa,CAAA;YACjD,MAAM,UAAU,GAAG,IAAA,sBAAW,EAAC,aAAa,EAAE,WAAW,CAAC,CAAA;YAC1D,OAAO;gBACL,KAAK,EAAE,CAAC,IAAI;gBACZ,GAAG,EAAE,eAAe,IAAA,yBAAO,EAAC,UAAU,CAAC,WAAW,CAAC,CAAC,KAAK,IAAA,yBAAO,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAO,EAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE;aACvH,CAAA;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CACH,CAAA;AACH,CAAC;AA7BD,4DA6BC"}
|
|
@@ -30,16 +30,18 @@ const outputConstants_1 = require("./outputConstants");
|
|
|
30
30
|
const zooming_1 = require("./utils/zooming");
|
|
31
31
|
function reportProgress(log$, opts) {
|
|
32
32
|
const progressOutput = throttledProgressOutput.bind(null, opts);
|
|
33
|
-
return getModulesInstallProgress$(log$.stage, log$.progress).pipe((0, operators_1.map)(
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
return msg
|
|
33
|
+
return getModulesInstallProgress$(log$.stage, log$.progress).pipe((0, operators_1.map)(opts.hideProgressPrefix
|
|
34
|
+
? ({ importingDone$, progress$ }) => progressOutput(importingDone$, progress$)
|
|
35
|
+
: ({ importingDone$, progress$, requirer }) => {
|
|
36
|
+
const output$ = progressOutput(importingDone$, progress$);
|
|
37
|
+
if (requirer === opts.cwd) {
|
|
38
|
+
return output$;
|
|
39
|
+
}
|
|
40
|
+
return output$.pipe((0, operators_1.map)((msg) => {
|
|
41
|
+
msg['msg'] = (0, zooming_1.zoomOut)(opts.cwd, requirer, msg['msg']);
|
|
42
|
+
return msg;
|
|
43
|
+
}));
|
|
41
44
|
}));
|
|
42
|
-
}));
|
|
43
45
|
}
|
|
44
46
|
exports.reportProgress = reportProgress;
|
|
45
47
|
function throttledProgressOutput(opts, importingDone$, progress$) {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"reportProgress.js","sourceRoot":"","sources":["../../src/reporterForClient/reportProgress.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,12 @@ const constants_1 = require("../constants");
|
|
|
36
36
|
const outputConstants_1 = require("./outputConstants");
|
|
37
37
|
const zooming_1 = require("./utils/zooming");
|
|
38
38
|
function reportStats(log$, opts) {
|
|
39
|
+
if (opts.hideProgressPrefix) {
|
|
40
|
+
return [statsForCurrentPackage(log$.stats, {
|
|
41
|
+
cmd: opts.cmd,
|
|
42
|
+
width: opts.width,
|
|
43
|
+
})];
|
|
44
|
+
}
|
|
39
45
|
const stats$ = opts.isRecursive
|
|
40
46
|
? log$.stats
|
|
41
47
|
: log$.stats.pipe((0, operators_1.filter)((log) => log.prefix !== opts.cwd));
|
|
@@ -47,9 +53,8 @@ function reportStats(log$, opts) {
|
|
|
47
53
|
}),
|
|
48
54
|
];
|
|
49
55
|
if (!opts.isRecursive) {
|
|
50
|
-
outputs.push(statsForCurrentPackage(log$.stats, {
|
|
56
|
+
outputs.push(statsForCurrentPackage(log$.stats.pipe((0, operators_1.filter)((log) => log.prefix === opts.cwd)), {
|
|
51
57
|
cmd: opts.cmd,
|
|
52
|
-
currentPrefix: opts.cwd,
|
|
53
58
|
width: opts.width,
|
|
54
59
|
}));
|
|
55
60
|
}
|
|
@@ -57,7 +62,7 @@ function reportStats(log$, opts) {
|
|
|
57
62
|
}
|
|
58
63
|
exports.reportStats = reportStats;
|
|
59
64
|
function statsForCurrentPackage(stats$, opts) {
|
|
60
|
-
return stats$.pipe((0, operators_1.
|
|
65
|
+
return stats$.pipe((0, operators_1.take)((opts.cmd === 'install' || opts.cmd === 'install-test' || opts.cmd === 'add' || opts.cmd === 'update' || opts.cmd === 'dlx') ? 2 : 1), (0, operators_1.reduce)((acc, log) => {
|
|
61
66
|
if (typeof log['added'] === 'number') {
|
|
62
67
|
acc['added'] = log['added'];
|
|
63
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportStats.js","sourceRoot":"","sources":["../../src/reporterForClient/reportStats.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA0B;AAC1B,8CAA0D;AAC1D,kDAAyB;AACzB,8DAAqC;AACrC,kEAAwC;AACxC,4CAAkC;AAClC,uDAG0B;AAC1B,6CAAyC;AAEzC,SAAgB,WAAW,CACzB,IAEC,EACD,
|
|
1
|
+
{"version":3,"file":"reportStats.js","sourceRoot":"","sources":["../../src/reporterForClient/reportStats.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.
|
|
3
|
+
"version": "12.3.0",
|
|
4
4
|
"description": "The default reporter of pnpm",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -37,13 +37,13 @@
|
|
|
37
37
|
"semver": "^7.5.4",
|
|
38
38
|
"stacktracey": "^2.1.8",
|
|
39
39
|
"string-length": "^4.0.2",
|
|
40
|
-
"@pnpm/
|
|
40
|
+
"@pnpm/dedupe.types": "1.0.0",
|
|
41
41
|
"@pnpm/core-loggers": "9.0.2",
|
|
42
|
+
"@pnpm/config": "18.4.4",
|
|
42
43
|
"@pnpm/error": "5.0.2",
|
|
43
|
-
"@pnpm/render-peer-issues": "4.0.2",
|
|
44
|
-
"@pnpm/dedupe.types": "1.0.0",
|
|
45
44
|
"@pnpm/types": "9.2.0",
|
|
46
|
-
"@pnpm/dedupe.issues-renderer": "1.0.0"
|
|
45
|
+
"@pnpm/dedupe.issues-renderer": "1.0.0",
|
|
46
|
+
"@pnpm/render-peer-issues": "4.0.2"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
49
|
"@types/normalize-path": "^3.0.0",
|
|
@@ -53,7 +53,7 @@
|
|
|
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.
|
|
56
|
+
"@pnpm/default-reporter": "12.3.0"
|
|
57
57
|
},
|
|
58
58
|
"homepage": "https://github.com/pnpm/pnpm/blob/main/cli/default-reporter#readme",
|
|
59
59
|
"funding": "https://opencollective.com/pnpm",
|