@pnpm/default-reporter 10.1.1 → 11.0.1
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/README.md +2 -2
- package/lib/index.d.ts +2 -2
- package/lib/index.js +11 -11
- package/lib/index.js.map +1 -1
- package/lib/mergeOutputs.d.ts +1 -1
- package/lib/mergeOutputs.js +2 -1
- package/lib/mergeOutputs.js.map +1 -1
- package/lib/reportError.d.ts +1 -1
- package/lib/reportError.js +4 -3
- package/lib/reportError.js.map +1 -1
- package/lib/reporterForClient/index.d.ts +1 -1
- package/lib/reporterForClient/index.js +31 -56
- package/lib/reporterForClient/index.js.map +1 -1
- package/lib/reporterForClient/pkgsDiff.d.ts +1 -1
- package/lib/reporterForClient/pkgsDiff.js +3 -3
- package/lib/reporterForClient/pkgsDiff.js.map +1 -1
- package/lib/reporterForClient/reportBigTarballsProgress.d.ts +2 -3
- package/lib/reporterForClient/reportBigTarballsProgress.js +4 -2
- package/lib/reporterForClient/reportBigTarballsProgress.js.map +1 -1
- package/lib/reporterForClient/reportContext.d.ts +2 -3
- package/lib/reporterForClient/reportContext.js +4 -2
- package/lib/reporterForClient/reportContext.js.map +1 -1
- package/lib/reporterForClient/reportDeprecations.d.ts +2 -3
- package/lib/reporterForClient/reportDeprecations.js +7 -5
- package/lib/reporterForClient/reportDeprecations.js.map +1 -1
- package/lib/reporterForClient/reportHooks.d.ts +2 -3
- package/lib/reporterForClient/reportHooks.js +4 -2
- package/lib/reporterForClient/reportHooks.js.map +1 -1
- package/lib/reporterForClient/reportInstallChecks.d.ts +2 -3
- package/lib/reporterForClient/reportInstallChecks.js +6 -7
- package/lib/reporterForClient/reportInstallChecks.js.map +1 -1
- package/lib/reporterForClient/reportLifecycleScripts.d.ts +2 -4
- package/lib/reporterForClient/reportLifecycleScripts.js +7 -5
- package/lib/reporterForClient/reportLifecycleScripts.js.map +1 -1
- package/lib/reporterForClient/reportMisc.d.ts +2 -3
- package/lib/reporterForClient/reportMisc.js +10 -9
- package/lib/reporterForClient/reportMisc.js.map +1 -1
- package/lib/reporterForClient/reportPeerDependencyIssues.d.ts +2 -3
- package/lib/reporterForClient/reportPeerDependencyIssues.js +7 -8
- package/lib/reporterForClient/reportPeerDependencyIssues.js.map +1 -1
- package/lib/reporterForClient/reportProgress.d.ts +2 -3
- package/lib/reporterForClient/reportProgress.js +4 -2
- package/lib/reporterForClient/reportProgress.js.map +1 -1
- package/lib/reporterForClient/reportRequestRetry.d.ts +1 -2
- package/lib/reporterForClient/reportRequestRetry.js +6 -4
- package/lib/reporterForClient/reportRequestRetry.js.map +1 -1
- package/lib/reporterForClient/reportScope.d.ts +2 -3
- package/lib/reporterForClient/reportScope.js +4 -2
- package/lib/reporterForClient/reportScope.js.map +1 -1
- package/lib/reporterForClient/reportSkippedOptionalDependencies.d.ts +2 -3
- package/lib/reporterForClient/reportSkippedOptionalDependencies.js +4 -2
- package/lib/reporterForClient/reportSkippedOptionalDependencies.js.map +1 -1
- package/lib/reporterForClient/reportStats.d.ts +2 -3
- package/lib/reporterForClient/reportStats.js +4 -2
- package/lib/reporterForClient/reportStats.js.map +1 -1
- package/lib/reporterForClient/reportSummary.d.ts +3 -3
- package/lib/reporterForClient/reportSummary.js +6 -4
- package/lib/reporterForClient/reportSummary.js.map +1 -1
- package/lib/reporterForClient/reportUpdateCheck.d.ts +3 -3
- package/lib/reporterForClient/reportUpdateCheck.js +4 -2
- package/lib/reporterForClient/reportUpdateCheck.js.map +1 -1
- package/lib/reporterForClient/utils/formatPrefix.d.ts +1 -1
- package/lib/reporterForClient/utils/formatPrefix.js +2 -2
- package/lib/reporterForClient/utils/formatPrefix.js.map +1 -1
- package/lib/reporterForClient/utils/formatWarn.d.ts +1 -1
- package/lib/reporterForClient/utils/formatWarn.js +2 -1
- package/lib/reporterForClient/utils/formatWarn.js.map +1 -1
- package/lib/reporterForClient/utils/zooming.js +2 -2
- package/lib/reporterForClient/utils/zooming.js.map +1 -1
- package/lib/reporterForServer.d.ts +1 -1
- package/lib/reporterForServer.js +5 -4
- package/lib/reporterForServer.js.map +1 -1
- package/package.json +8 -8
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { HookLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportHooks(hook$: Rx.Observable<HookLog>, opts: {
|
|
4
4
|
cwd: string;
|
|
5
5
|
isRecursive: boolean;
|
|
6
|
-
})
|
|
6
|
+
}): Rx.Observable<Rx.Observable<{
|
|
7
7
|
msg: string;
|
|
8
8
|
}>>;
|
|
9
|
-
export default _default;
|
|
@@ -26,15 +26,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.reportHooks = void 0;
|
|
29
30
|
const Rx = __importStar(require("rxjs"));
|
|
30
31
|
const operators_1 = require("rxjs/operators");
|
|
31
32
|
const chalk_1 = __importDefault(require("chalk"));
|
|
32
33
|
const zooming_1 = require("./utils/zooming");
|
|
33
|
-
|
|
34
|
+
function reportHooks(hook$, opts) {
|
|
34
35
|
return hook$.pipe((0, operators_1.map)((log) => Rx.of({
|
|
35
36
|
msg: (0, zooming_1.autozoom)(opts.cwd, log.prefix, `${chalk_1.default.magentaBright(log.hook)}: ${log.message}`, {
|
|
36
37
|
zoomOutCurrent: opts.isRecursive,
|
|
37
38
|
}),
|
|
38
39
|
})));
|
|
39
|
-
}
|
|
40
|
+
}
|
|
41
|
+
exports.reportHooks = reportHooks;
|
|
40
42
|
//# sourceMappingURL=reportHooks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportHooks.js","sourceRoot":"","sources":["../../src/reporterForClient/reportHooks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportHooks.js","sourceRoot":"","sources":["../../src/reporterForClient/reportHooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA0B;AAC1B,8CAAoC;AACpC,kDAAyB;AACzB,6CAA0C;AAE1C,SAAgB,WAAW,CACzB,KAA6B,EAC7B,IAGC;IAED,OAAO,KAAK,CAAC,IAAI,CACf,IAAA,eAAG,EAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACjB,GAAG,EAAE,IAAA,kBAAQ,EACX,IAAI,CAAC,GAAG,EACR,GAAG,CAAC,MAAM,EACV,GAAG,eAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,OAAO,EAAE,EAClD;YACE,cAAc,EAAE,IAAI,CAAC,WAAW;SACjC,CACF;KACF,CAAC,CAAC,CACJ,CAAA;AACH,CAAC;AAnBD,kCAmBC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { InstallCheckLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportInstallChecks(installCheck$: Rx.Observable<InstallCheckLog>, opts: {
|
|
4
4
|
cwd: string;
|
|
5
|
-
})
|
|
5
|
+
}): Rx.Observable<Rx.Observable<{
|
|
6
6
|
msg: string;
|
|
7
7
|
}>>;
|
|
8
|
-
export default _default;
|
|
@@ -22,22 +22,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.reportInstallChecks = void 0;
|
|
29
27
|
const Rx = __importStar(require("rxjs"));
|
|
30
28
|
const operators_1 = require("rxjs/operators");
|
|
31
|
-
const formatWarn_1 =
|
|
29
|
+
const formatWarn_1 = require("./utils/formatWarn");
|
|
32
30
|
const zooming_1 = require("./utils/zooming");
|
|
33
|
-
|
|
31
|
+
function reportInstallChecks(installCheck$, opts) {
|
|
34
32
|
return installCheck$.pipe((0, operators_1.map)((log) => formatInstallCheck(opts.cwd, log)), (0, operators_1.filter)(Boolean), (0, operators_1.map)((msg) => Rx.of({ msg })));
|
|
35
|
-
}
|
|
33
|
+
}
|
|
34
|
+
exports.reportInstallChecks = reportInstallChecks;
|
|
36
35
|
function formatInstallCheck(currentPrefix, logObj, opts) {
|
|
37
36
|
const zoomOutCurrent = opts?.zoomOutCurrent ?? false;
|
|
38
37
|
switch (logObj.code) {
|
|
39
38
|
case 'EBADPLATFORM':
|
|
40
|
-
return (0, zooming_1.autozoom)(currentPrefix, logObj['prefix'], (0, formatWarn_1.
|
|
39
|
+
return (0, zooming_1.autozoom)(currentPrefix, logObj['prefix'], (0, formatWarn_1.formatWarn)(`Unsupported system. Skipping dependency ${logObj.pkgId}`), { zoomOutCurrent });
|
|
41
40
|
case 'ENOTSUP':
|
|
42
41
|
return (0, zooming_1.autozoom)(currentPrefix, logObj['prefix'], logObj.toString(), { zoomOutCurrent });
|
|
43
42
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportInstallChecks.js","sourceRoot":"","sources":["../../src/reporterForClient/reportInstallChecks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportInstallChecks.js","sourceRoot":"","sources":["../../src/reporterForClient/reportInstallChecks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA0B;AAC1B,8CAA4C;AAC5C,mDAA+C;AAC/C,6CAA0C;AAE1C,SAAgB,mBAAmB,CACjC,aAA6C,EAC7C,IAEC;IAED,OAAO,aAAa,CAAC,IAAI,CACvB,IAAA,eAAG,EAAC,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAC/C,IAAA,kBAAM,EAAC,OAAO,CAAC,EACf,IAAA,eAAG,EAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAC7B,CAAA;AACH,CAAC;AAXD,kDAWC;AAED,SAAS,kBAAkB,CACzB,aAAqB,EACrB,MAAuB,EACvB,IAEC;IAED,MAAM,cAAc,GAAG,IAAI,EAAE,cAAc,IAAI,KAAK,CAAA;IACpD,QAAQ,MAAM,CAAC,IAAI,EAAE;QACrB,KAAK,cAAc;YACjB,OAAO,IAAA,kBAAQ,EACb,aAAa,EACb,MAAM,CAAC,QAAQ,CAAC,EAChB,IAAA,uBAAU,EAAC,2CAA2C,MAAM,CAAC,KAAK,EAAE,CAAC,EACrE,EAAE,cAAc,EAAE,CACnB,CAAA;QACH,KAAK,SAAS;YACZ,OAAO,IAAA,kBAAQ,EAAC,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,cAAc,EAAE,CAAC,CAAA;QACzF;YACE,OAAO,SAAS,CAAA;KACjB;AACH,CAAC"}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import { LifecycleLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportLifecycleScripts(log$: {
|
|
4
4
|
lifecycle: Rx.Observable<LifecycleLog>;
|
|
5
5
|
}, opts: {
|
|
6
6
|
appendOnly?: boolean;
|
|
7
7
|
aggregateOutput?: boolean;
|
|
8
8
|
cwd: string;
|
|
9
9
|
width: number;
|
|
10
|
-
})
|
|
10
|
+
}): Rx.Observable<Rx.Observable<{
|
|
11
11
|
msg: string;
|
|
12
12
|
}>>;
|
|
13
|
-
export default _default;
|
|
14
|
-
declare function aggregateOutput(source: Rx.Observable<LifecycleLog>): Rx.Observable<LifecycleLog>;
|
|
@@ -26,6 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.reportLifecycleScripts = void 0;
|
|
29
30
|
const path_1 = __importDefault(require("path"));
|
|
30
31
|
const Rx = __importStar(require("rxjs"));
|
|
31
32
|
const operators_1 = require("rxjs/operators");
|
|
@@ -33,7 +34,7 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
33
34
|
const pretty_ms_1 = __importDefault(require("pretty-ms"));
|
|
34
35
|
const strip_ansi_1 = __importDefault(require("strip-ansi"));
|
|
35
36
|
const constants_1 = require("../constants");
|
|
36
|
-
const formatPrefix_1 =
|
|
37
|
+
const formatPrefix_1 = require("./utils/formatPrefix");
|
|
37
38
|
const outputConstants_1 = require("./outputConstants");
|
|
38
39
|
const NODE_MODULES = `${path_1.default.sep}node_modules${path_1.default.sep}`;
|
|
39
40
|
// When streaming processes are spawned, use this color for prefix
|
|
@@ -41,7 +42,7 @@ const colorWheel = ['cyan', 'magenta', 'blue', 'yellow', 'green', 'red'];
|
|
|
41
42
|
const NUM_COLORS = colorWheel.length;
|
|
42
43
|
// Ever-increasing index ensures colors are always sequential
|
|
43
44
|
let currentColor = 0;
|
|
44
|
-
|
|
45
|
+
function reportLifecycleScripts(log$, opts) {
|
|
45
46
|
// When the reporter is not append-only, the length of output is limited
|
|
46
47
|
// in order to reduce flickering
|
|
47
48
|
if (opts.appendOnly) {
|
|
@@ -88,7 +89,8 @@ exports.default = (log$, opts) => {
|
|
|
88
89
|
}
|
|
89
90
|
});
|
|
90
91
|
return Rx.from(lifecyclePushStream);
|
|
91
|
-
}
|
|
92
|
+
}
|
|
93
|
+
exports.reportLifecycleScripts = reportLifecycleScripts;
|
|
92
94
|
function toNano(time) {
|
|
93
95
|
return (time[0] + (time[1] / 1e9)) * 1e3;
|
|
94
96
|
}
|
|
@@ -133,7 +135,7 @@ function renderScriptOutput(log, messageCache, opts) {
|
|
|
133
135
|
}
|
|
134
136
|
function updateMessageCache(log, messageCache, opts) {
|
|
135
137
|
if (log['script']) {
|
|
136
|
-
const prefix = `${(0, formatPrefix_1.
|
|
138
|
+
const prefix = `${(0, formatPrefix_1.formatPrefix)(opts.cwd, log.wd)} ${(0, outputConstants_1.hlValue)(log.stage)}`;
|
|
137
139
|
const maxLineWidth = opts.maxWidth - prefix.length - 2 + ANSI_ESCAPES_LENGTH_OF_PREFIX;
|
|
138
140
|
messageCache.script = `${prefix}$ ${cutLine(log['script'], maxLineWidth)}`;
|
|
139
141
|
}
|
|
@@ -189,7 +191,7 @@ function formatLifecycleScriptPrefix(colorByPkg, cwd, wd, stage) {
|
|
|
189
191
|
currentColor += 1;
|
|
190
192
|
}
|
|
191
193
|
const color = colorByPkg.get(wd);
|
|
192
|
-
return `${color((0, formatPrefix_1.
|
|
194
|
+
return `${color((0, formatPrefix_1.formatPrefix)(cwd, wd))} ${(0, outputConstants_1.hlValue)(stage)}`;
|
|
193
195
|
}
|
|
194
196
|
function formatLine(maxWidth, logObj) {
|
|
195
197
|
const line = cutLine(logObj['line'], maxWidth);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportLifecycleScripts.js","sourceRoot":"","sources":["../../src/reporterForClient/reportLifecycleScripts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportLifecycleScripts.js","sourceRoot":"","sources":["../../src/reporterForClient/reportLifecycleScripts.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { Log, RegistryLog } from '@pnpm/core-loggers';
|
|
|
3
3
|
import { LogLevel } from '@pnpm/logger';
|
|
4
4
|
import * as Rx from 'rxjs';
|
|
5
5
|
export declare const LOG_LEVEL_NUMBER: Record<LogLevel, number>;
|
|
6
|
-
declare
|
|
6
|
+
export declare function reportMisc(log$: {
|
|
7
7
|
registry: Rx.Observable<RegistryLog>;
|
|
8
8
|
other: Rx.Observable<Log>;
|
|
9
9
|
}, opts: {
|
|
@@ -12,7 +12,6 @@ declare const _default: (log$: {
|
|
|
12
12
|
logLevel?: LogLevel;
|
|
13
13
|
config?: Config;
|
|
14
14
|
zoomOutCurrent: boolean;
|
|
15
|
-
})
|
|
15
|
+
}): Rx.Observable<Rx.Observable<{
|
|
16
16
|
msg: any;
|
|
17
17
|
}>>;
|
|
18
|
-
export default _default;
|
|
@@ -26,12 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.LOG_LEVEL_NUMBER = void 0;
|
|
29
|
+
exports.reportMisc = exports.LOG_LEVEL_NUMBER = void 0;
|
|
30
30
|
const os_1 = __importDefault(require("os"));
|
|
31
31
|
const Rx = __importStar(require("rxjs"));
|
|
32
32
|
const operators_1 = require("rxjs/operators");
|
|
33
|
-
const reportError_1 =
|
|
34
|
-
const formatWarn_1 =
|
|
33
|
+
const reportError_1 = require("../reportError");
|
|
34
|
+
const formatWarn_1 = require("./utils/formatWarn");
|
|
35
35
|
const zooming_1 = require("./utils/zooming");
|
|
36
36
|
// eslint-disable:object-literal-sort-keys
|
|
37
37
|
exports.LOG_LEVEL_NUMBER = {
|
|
@@ -42,7 +42,7 @@ exports.LOG_LEVEL_NUMBER = {
|
|
|
42
42
|
};
|
|
43
43
|
// eslint-enable:object-literal-sort-keys
|
|
44
44
|
const MAX_SHOWN_WARNINGS = 5;
|
|
45
|
-
|
|
45
|
+
function reportMisc(log$, opts) {
|
|
46
46
|
const maxLogLevel = exports.LOG_LEVEL_NUMBER[opts.logLevel ?? 'info'] ?? exports.LOG_LEVEL_NUMBER['info'];
|
|
47
47
|
const reportWarning = makeWarningReporter(opts);
|
|
48
48
|
return Rx.merge(log$.registry, log$.other).pipe((0, operators_1.filter)((obj) => exports.LOG_LEVEL_NUMBER[obj.level] <= maxLogLevel &&
|
|
@@ -54,15 +54,16 @@ exports.default = (log$, opts) => {
|
|
|
54
54
|
case 'error':
|
|
55
55
|
if (obj['prefix'] && obj['prefix'] !== opts.cwd) {
|
|
56
56
|
return Rx.of({
|
|
57
|
-
msg: `${obj['prefix']}:` + os_1.default.EOL + (0, reportError_1.
|
|
57
|
+
msg: `${obj['prefix']}:` + os_1.default.EOL + (0, reportError_1.reportError)(obj, opts.config),
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
|
-
return Rx.of({ msg: (0, reportError_1.
|
|
60
|
+
return Rx.of({ msg: (0, reportError_1.reportError)(obj, opts.config) });
|
|
61
61
|
default:
|
|
62
62
|
return Rx.of({ msg: obj['message'] });
|
|
63
63
|
}
|
|
64
64
|
}));
|
|
65
|
-
}
|
|
65
|
+
}
|
|
66
|
+
exports.reportMisc = reportMisc;
|
|
66
67
|
// Sometimes, when installing new dependencies that rely on many peer dependencies,
|
|
67
68
|
// or when running installation on a huge monorepo, there will be hundreds or thousands of warnings.
|
|
68
69
|
// Printing many messages to the terminal is expensive and reduces speed,
|
|
@@ -73,9 +74,9 @@ function makeWarningReporter(opts) {
|
|
|
73
74
|
return (obj) => {
|
|
74
75
|
warningsCounter++;
|
|
75
76
|
if (opts.appendOnly || warningsCounter <= MAX_SHOWN_WARNINGS) {
|
|
76
|
-
return Rx.of({ msg: (0, zooming_1.autozoom)(opts.cwd, obj.prefix, (0, formatWarn_1.
|
|
77
|
+
return Rx.of({ msg: (0, zooming_1.autozoom)(opts.cwd, obj.prefix, (0, formatWarn_1.formatWarn)(obj.message), opts) });
|
|
77
78
|
}
|
|
78
|
-
const warningMsg = (0, formatWarn_1.
|
|
79
|
+
const warningMsg = (0, formatWarn_1.formatWarn)(`${warningsCounter - MAX_SHOWN_WARNINGS} other warnings`);
|
|
79
80
|
if (!collapsedWarnings) {
|
|
80
81
|
collapsedWarnings = new Rx.Subject();
|
|
81
82
|
// For some reason, without using setTimeout, the warning summary is printed above the rest of the warnings
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportMisc.js","sourceRoot":"","sources":["../../src/reporterForClient/reportMisc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAmB;AAInB,yCAA0B;AAC1B,8CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"reportMisc.js","sourceRoot":"","sources":["../../src/reporterForClient/reportMisc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAmB;AAInB,yCAA0B;AAC1B,8CAA4C;AAC5C,gDAA4C;AAC5C,mDAA+C;AAC/C,6CAA0C;AAE1C,0CAA0C;AAC7B,QAAA,gBAAgB,GAA6B;IACxD,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;CACT,CAAA;AACD,yCAAyC;AAEzC,MAAM,kBAAkB,GAAG,CAAC,CAAA;AAE5B,SAAgB,UAAU,CACxB,IAGC,EACD,IAMC;IAED,MAAM,WAAW,GAAG,wBAAgB,CAAC,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,wBAAgB,CAAC,MAAM,CAAC,CAAA;IACzF,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;IAC/C,OAAO,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAC7C,IAAA,kBAAM,EAAC,CAAC,GAAG,EAAE,EAAE,CAAC,wBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,WAAW;QACxD,CAAC,GAAG,CAAC,KAAK,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC,EACzE,IAAA,eAAG,EAAC,CAAC,GAAG,EAAE,EAAE;QACV,QAAQ,GAAG,CAAC,KAAK,EAAE;YACnB,KAAK,MAAM,CAAC,CAAC;gBACX,OAAO,aAAa,CAAC,GAAG,CAAC,CAAA;aAC1B;YACD,KAAK,OAAO;gBACV,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE;oBAC/C,OAAO,EAAE,CAAC,EAAE,CAAC;wBACX,GAAG,EAAE,GAAG,GAAG,CAAC,QAAQ,CAAW,GAAG,GAAG,YAAE,CAAC,GAAG,GAAG,IAAA,yBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;qBAC5E,CAAC,CAAA;iBACH;gBACD,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,IAAA,yBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACtD;gBACE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;SACtC;IACH,CAAC,CAAC,CACH,CAAA;AACH,CAAC;AAnCD,gCAmCC;AAED,mFAAmF;AACnF,oGAAoG;AACpG,yEAAyE;AACzE,gGAAgG;AAChG,SAAS,mBAAmB,CAC1B,IAIC;IAED,IAAI,eAAe,GAAG,CAAC,CAAA;IACvB,IAAI,iBAA8C,CAAA;IAClD,OAAO,CAAC,GAAwC,EAAE,EAAE;QAClD,eAAe,EAAE,CAAA;QACjB,IAAI,IAAI,CAAC,UAAU,IAAI,eAAe,IAAI,kBAAkB,EAAE;YAC5D,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,IAAA,kBAAQ,EAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,IAAA,uBAAU,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;SACrF;QACD,MAAM,UAAU,GAAG,IAAA,uBAAU,EAAC,GAAG,eAAe,GAAG,kBAAkB,iBAAiB,CAAC,CAAA;QACvF,IAAI,CAAC,iBAAiB,EAAE;YACtB,iBAAiB,GAAG,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;YACpC,2GAA2G;YAC3G,wEAAwE;YACxE,UAAU,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;YAChE,OAAO,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;SAClC;QACD,UAAU,CAAC,GAAG,EAAE,CAAC,iBAAkB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QACjE,OAAO,EAAE,CAAC,KAAK,CAAA;IACjB,CAAC,CAAA;AACH,CAAC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { PeerDependencyIssuesLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportPeerDependencyIssues(log$: {
|
|
4
4
|
peerDependencyIssues: Rx.Observable<PeerDependencyIssuesLog>;
|
|
5
|
-
})
|
|
5
|
+
}): Rx.Observable<Rx.Observable<{
|
|
6
6
|
msg: string;
|
|
7
7
|
}>>;
|
|
8
|
-
export default _default;
|
|
@@ -22,17 +22,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
|
|
26
|
+
exports.reportPeerDependencyIssues = void 0;
|
|
27
|
+
const render_peer_issues_1 = require("@pnpm/render-peer-issues");
|
|
30
28
|
const Rx = __importStar(require("rxjs"));
|
|
31
29
|
const operators_1 = require("rxjs/operators");
|
|
32
|
-
const formatWarn_1 =
|
|
33
|
-
|
|
30
|
+
const formatWarn_1 = require("./utils/formatWarn");
|
|
31
|
+
function reportPeerDependencyIssues(log$) {
|
|
34
32
|
return log$.peerDependencyIssues.pipe((0, operators_1.take)(1), (0, operators_1.map)((log) => Rx.of({
|
|
35
|
-
msg: `${(0, formatWarn_1.
|
|
33
|
+
msg: `${(0, formatWarn_1.formatWarn)('Issues with peer dependencies found')}\n${(0, render_peer_issues_1.renderPeerIssues)(log.issuesByProjects)}`,
|
|
36
34
|
})));
|
|
37
|
-
}
|
|
35
|
+
}
|
|
36
|
+
exports.reportPeerDependencyIssues = reportPeerDependencyIssues;
|
|
38
37
|
//# sourceMappingURL=reportPeerDependencyIssues.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportPeerDependencyIssues.js","sourceRoot":"","sources":["../../src/reporterForClient/reportPeerDependencyIssues.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportPeerDependencyIssues.js","sourceRoot":"","sources":["../../src/reporterForClient/reportPeerDependencyIssues.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iEAA2D;AAC3D,yCAA0B;AAC1B,8CAA0C;AAC1C,mDAA+C;AAE/C,SAAgB,0BAA0B,CACxC,IAEC;IAED,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CACnC,IAAA,gBAAI,EAAC,CAAC,CAAC,EACP,IAAA,eAAG,EAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACjB,GAAG,EAAE,GAAG,IAAA,uBAAU,EAAC,qCAAqC,CAAC,KAAK,IAAA,qCAAgB,EAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;KACvG,CAAC,CAAC,CACJ,CAAA;AACH,CAAC;AAXD,gEAWC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { ProgressLog, StageLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportProgress(log$: {
|
|
4
4
|
progress: Rx.Observable<ProgressLog>;
|
|
5
5
|
stage: Rx.Observable<StageLog>;
|
|
6
6
|
}, opts: {
|
|
7
7
|
cwd: string;
|
|
8
8
|
throttle?: Rx.OperatorFunction<any, any>;
|
|
9
|
-
})
|
|
10
|
-
export default _default;
|
|
9
|
+
}): Rx.Observable<Rx.Observable<any>>;
|
|
@@ -23,11 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.reportProgress = void 0;
|
|
26
27
|
const Rx = __importStar(require("rxjs"));
|
|
27
28
|
const operators_1 = require("rxjs/operators");
|
|
28
29
|
const outputConstants_1 = require("./outputConstants");
|
|
29
30
|
const zooming_1 = require("./utils/zooming");
|
|
30
|
-
|
|
31
|
+
function reportProgress(log$, opts) {
|
|
31
32
|
const progressOutput = throttledProgressOutput.bind(null, opts.throttle);
|
|
32
33
|
return getModulesInstallProgress$(log$.stage, log$.progress).pipe((0, operators_1.map)(({ importingDone$, progress$, requirer }) => {
|
|
33
34
|
const output$ = progressOutput(importingDone$, progress$);
|
|
@@ -39,7 +40,8 @@ exports.default = (log$, opts) => {
|
|
|
39
40
|
return msg;
|
|
40
41
|
}));
|
|
41
42
|
}));
|
|
42
|
-
}
|
|
43
|
+
}
|
|
44
|
+
exports.reportProgress = reportProgress;
|
|
43
45
|
function throttledProgressOutput(
|
|
44
46
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
45
47
|
throttle, importingDone$, progress$) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportProgress.js","sourceRoot":"","sources":["../../src/reporterForClient/reportProgress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportProgress.js","sourceRoot":"","sources":["../../src/reporterForClient/reportProgress.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { RequestRetryLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportRequestRetry(requestRetry$: Rx.Observable<RequestRetryLog>): Rx.Observable<Rx.Observable<{
|
|
4
4
|
msg: string;
|
|
5
5
|
}>>;
|
|
6
|
-
export default _default;
|
|
@@ -26,11 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.reportRequestRetry = void 0;
|
|
29
30
|
const Rx = __importStar(require("rxjs"));
|
|
30
31
|
const operators_1 = require("rxjs/operators");
|
|
31
32
|
const pretty_ms_1 = __importDefault(require("pretty-ms"));
|
|
32
|
-
const formatWarn_1 =
|
|
33
|
-
|
|
33
|
+
const formatWarn_1 = require("./utils/formatWarn");
|
|
34
|
+
function reportRequestRetry(requestRetry$) {
|
|
34
35
|
return requestRetry$.pipe((0, operators_1.map)((log) => {
|
|
35
36
|
const retriesLeft = log.maxRetries - log.attempt + 1;
|
|
36
37
|
const errorCode = log.error['httpStatusCode'] || log.error['status'] || log.error['errno'] || log.error['code'];
|
|
@@ -38,7 +39,8 @@ exports.default = (requestRetry$) => {
|
|
|
38
39
|
const msg = `${log.method} ${log.url} error (${errorCode}). \
|
|
39
40
|
Will retry in ${(0, pretty_ms_1.default)(log.timeout, { verbose: true })}. \
|
|
40
41
|
${retriesLeft} retries left.`;
|
|
41
|
-
return Rx.of({ msg: (0, formatWarn_1.
|
|
42
|
+
return Rx.of({ msg: (0, formatWarn_1.formatWarn)(msg) });
|
|
42
43
|
}));
|
|
43
|
-
}
|
|
44
|
+
}
|
|
45
|
+
exports.reportRequestRetry = reportRequestRetry;
|
|
44
46
|
//# sourceMappingURL=reportRequestRetry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportRequestRetry.js","sourceRoot":"","sources":["../../src/reporterForClient/reportRequestRetry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportRequestRetry.js","sourceRoot":"","sources":["../../src/reporterForClient/reportRequestRetry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA0B;AAC1B,8CAAoC;AACpC,0DAA0C;AAC1C,mDAA+C;AAE/C,SAAgB,kBAAkB,CAChC,aAA6C;IAE7C,OAAO,aAAa,CAAC,IAAI,CACvB,IAAA,eAAG,EAAC,CAAC,GAAG,EAAE,EAAE;QACV,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,OAAO,GAAG,CAAC,CAAA;QACpD,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAC/G,4EAA4E;QAC5E,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,WAAW,SAAS;gBAC9C,IAAA,mBAAkB,EAAC,GAAG,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;EAChE,WAAW,gBAAgB,CAAA;QACvB,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,IAAA,uBAAU,EAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACxC,CAAC,CAAC,CACH,CAAA;AACH,CAAC;AAdD,gDAcC"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { ScopeLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportScope(scope$: Rx.Observable<ScopeLog>, opts: {
|
|
4
4
|
isRecursive: boolean;
|
|
5
5
|
cmd: string;
|
|
6
|
-
})
|
|
6
|
+
}): Rx.Observable<Rx.Observable<{
|
|
7
7
|
msg: string;
|
|
8
8
|
}>>;
|
|
9
|
-
export default _default;
|
|
@@ -23,6 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.reportScope = void 0;
|
|
26
27
|
const Rx = __importStar(require("rxjs"));
|
|
27
28
|
const operators_1 = require("rxjs/operators");
|
|
28
29
|
const COMMANDS_THAT_REPORT_SCOPE = new Set([
|
|
@@ -36,7 +37,7 @@ const COMMANDS_THAT_REPORT_SCOPE = new Set([
|
|
|
36
37
|
'run',
|
|
37
38
|
'test',
|
|
38
39
|
]);
|
|
39
|
-
|
|
40
|
+
function reportScope(scope$, opts) {
|
|
40
41
|
if (!COMMANDS_THAT_REPORT_SCOPE.has(opts.cmd)) {
|
|
41
42
|
return Rx.NEVER;
|
|
42
43
|
}
|
|
@@ -62,5 +63,6 @@ exports.default = (scope$, opts) => {
|
|
|
62
63
|
}
|
|
63
64
|
return Rx.of({ msg });
|
|
64
65
|
}));
|
|
65
|
-
}
|
|
66
|
+
}
|
|
67
|
+
exports.reportScope = reportScope;
|
|
66
68
|
//# sourceMappingURL=reportScope.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportScope.js","sourceRoot":"","sources":["../../src/reporterForClient/reportScope.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportScope.js","sourceRoot":"","sources":["../../src/reporterForClient/reportScope.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA0B;AAC1B,8CAA0C;AAE1C,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC;IACzC,SAAS;IACT,MAAM;IACN,OAAO;IACP,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,KAAK;IACL,MAAM;CACP,CAAC,CAAA;AAEF,SAAgB,WAAW,CACzB,MAA+B,EAC/B,IAGC;IAED,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC7C,OAAO,EAAE,CAAC,KAAK,CAAA;KAChB;IACD,OAAO,MAAM,CAAC,IAAI,CAChB,IAAA,gBAAI,EAAC,CAAC,CAAC,EACP,IAAA,eAAG,EAAC,CAAC,GAAG,EAAE,EAAE;QACV,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE;YACtB,OAAO,EAAE,CAAC,KAAK,CAAA;SAChB;QACD,IAAI,GAAG,GAAG,SAAS,CAAA;QAEnB,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,KAAK,EAAE;YAC9B,GAAG,IAAI,OAAO,GAAG,CAAC,KAAK,EAAE,CAAA;SAC1B;aAAM;YACL,GAAG,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAA;YACxB,IAAI,GAAG,CAAC,KAAK,EAAE;gBACb,GAAG,IAAI,OAAO,GAAG,CAAC,KAAK,EAAE,CAAA;aAC1B;SACF;QAED,IAAI,GAAG,CAAC,eAAe,EAAE;YACvB,GAAG,IAAI,qBAAqB,CAAA;SAC7B;aAAM;YACL,GAAG,IAAI,WAAW,CAAA;SACnB;QAED,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;IACvB,CAAC,CAAC,CACH,CAAA;AACH,CAAC;AApCD,kCAoCC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { SkippedOptionalDependencyLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportSkippedOptionalDependencies(skippedOptionalDependency$: Rx.Observable<SkippedOptionalDependencyLog>, opts: {
|
|
4
4
|
cwd: string;
|
|
5
|
-
})
|
|
5
|
+
}): Rx.Observable<Rx.Observable<{
|
|
6
6
|
msg: string;
|
|
7
7
|
}>>;
|
|
8
|
-
export default _default;
|
|
@@ -23,13 +23,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.reportSkippedOptionalDependencies = void 0;
|
|
26
27
|
const Rx = __importStar(require("rxjs"));
|
|
27
28
|
const operators_1 = require("rxjs/operators");
|
|
28
|
-
|
|
29
|
+
function reportSkippedOptionalDependencies(skippedOptionalDependency$, opts) {
|
|
29
30
|
return skippedOptionalDependency$.pipe((0, operators_1.filter)((log) => Boolean(log['prefix'] === opts.cwd && log.parents && log.parents.length === 0)), (0, operators_1.map)((log) => Rx.of({
|
|
30
31
|
msg: `info: ${
|
|
31
32
|
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
32
33
|
log.package['id'] || log.package.name && (`${log.package.name}@${log.package.version}`) || log.package['pref']} is an optional dependency and failed compatibility check. Excluding it from installation.`,
|
|
33
34
|
})));
|
|
34
|
-
}
|
|
35
|
+
}
|
|
36
|
+
exports.reportSkippedOptionalDependencies = reportSkippedOptionalDependencies;
|
|
35
37
|
//# sourceMappingURL=reportSkippedOptionalDependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportSkippedOptionalDependencies.js","sourceRoot":"","sources":["../../src/reporterForClient/reportSkippedOptionalDependencies.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportSkippedOptionalDependencies.js","sourceRoot":"","sources":["../../src/reporterForClient/reportSkippedOptionalDependencies.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA0B;AAC1B,8CAA4C;AAE5C,SAAgB,iCAAiC,CAC/C,0BAAuE,EACvE,IAEC;IAED,OAAO,0BAA0B,CAAC,IAAI,CACpC,IAAA,kBAAM,EAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,EAC/F,IAAA,eAAG,EAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACjB,GAAG,EAAE,SAAS;QACZ,4EAA4E;QAC5E,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAC/G,4FAA4F;KAC7F,CAAC,CAAC,CACJ,CAAA;AACH,CAAC;AAfD,8EAeC"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { StatsLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportStats(log$: {
|
|
4
4
|
stats: Rx.Observable<StatsLog>;
|
|
5
5
|
}, opts: {
|
|
6
6
|
cmd: string;
|
|
7
7
|
cwd: string;
|
|
8
8
|
isRecursive: boolean;
|
|
9
9
|
width: number;
|
|
10
|
-
})
|
|
10
|
+
}): Rx.Observable<Rx.Observable<{
|
|
11
11
|
msg: string;
|
|
12
12
|
}>>[];
|
|
13
|
-
export default _default;
|
|
@@ -26,6 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.reportStats = void 0;
|
|
29
30
|
const Rx = __importStar(require("rxjs"));
|
|
30
31
|
const operators_1 = require("rxjs/operators");
|
|
31
32
|
const chalk_1 = __importDefault(require("chalk"));
|
|
@@ -34,7 +35,7 @@ const string_length_1 = __importDefault(require("string-length"));
|
|
|
34
35
|
const constants_1 = require("../constants");
|
|
35
36
|
const outputConstants_1 = require("./outputConstants");
|
|
36
37
|
const zooming_1 = require("./utils/zooming");
|
|
37
|
-
|
|
38
|
+
function reportStats(log$, opts) {
|
|
38
39
|
const stats$ = opts.isRecursive
|
|
39
40
|
? log$.stats
|
|
40
41
|
: log$.stats.pipe((0, operators_1.filter)((log) => log.prefix !== opts.cwd));
|
|
@@ -53,7 +54,8 @@ exports.default = (log$, opts) => {
|
|
|
53
54
|
}));
|
|
54
55
|
}
|
|
55
56
|
return outputs;
|
|
56
|
-
}
|
|
57
|
+
}
|
|
58
|
+
exports.reportStats = reportStats;
|
|
57
59
|
function statsForCurrentPackage(stats$, opts) {
|
|
58
60
|
return stats$.pipe((0, operators_1.filter)((log) => log.prefix === opts.currentPrefix), (0, operators_1.take)((opts.cmd === 'install' || opts.cmd === 'install-test' || opts.cmd === 'add' || opts.cmd === 'update') ? 2 : 1), (0, operators_1.reduce)((acc, log) => {
|
|
59
61
|
if (typeof log['added'] === 'number') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportStats.js","sourceRoot":"","sources":["../../src/reporterForClient/reportStats.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportStats.js","sourceRoot":"","sources":["../../src/reporterForClient/reportStats.ts"],"names":[],"mappings":"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"}
|