@oclif/core 2.5.2 → 2.6.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/lib/config/config.d.ts +2 -1
- package/lib/config/config.js +12 -0
- package/lib/interfaces/config.d.ts +13 -0
- package/lib/performance.js +9 -2
- package/package.json +1 -1
package/lib/config/config.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Options, Plugin as IPlugin } from '../interfaces/plugin';
|
|
2
|
-
import { Config as IConfig, ArchTypes, PlatformTypes, LoadOptions } from '../interfaces/config';
|
|
2
|
+
import { Config as IConfig, ArchTypes, PlatformTypes, LoadOptions, VersionDetails } from '../interfaces/config';
|
|
3
3
|
import { Hook, Hooks, PJSON, Topic } from '../interfaces';
|
|
4
4
|
import * as Plugin from './plugin';
|
|
5
5
|
import { Command } from '../command';
|
|
@@ -89,6 +89,7 @@ export declare class Config implements IConfig {
|
|
|
89
89
|
get commands(): Command.Loadable[];
|
|
90
90
|
get commandIDs(): string[];
|
|
91
91
|
get topics(): Topic[];
|
|
92
|
+
get versionDetails(): VersionDetails;
|
|
92
93
|
s3Key(type: keyof PJSON.S3.Templates, ext?: '.tar.gz' | '.tar.xz' | IConfig.s3Key.Options, options?: IConfig.s3Key.Options): string;
|
|
93
94
|
s3Url(key: string): string;
|
|
94
95
|
protected dir(category: 'cache' | 'data' | 'config'): string;
|
package/lib/config/config.js
CHANGED
|
@@ -416,6 +416,18 @@ class Config {
|
|
|
416
416
|
get topics() {
|
|
417
417
|
return [...this._topics.values()];
|
|
418
418
|
}
|
|
419
|
+
get versionDetails() {
|
|
420
|
+
const [cliVersion, architecture, nodeVersion] = this.userAgent.split(' ');
|
|
421
|
+
return {
|
|
422
|
+
cliVersion,
|
|
423
|
+
architecture,
|
|
424
|
+
nodeVersion,
|
|
425
|
+
pluginVersions: Object.fromEntries(this.plugins.map(p => [p.name, { version: p.version, type: p.type, root: p.root }])),
|
|
426
|
+
osVersion: `${os.type()} ${os.release()}`,
|
|
427
|
+
shell: this.shell,
|
|
428
|
+
rootPath: this.root,
|
|
429
|
+
};
|
|
430
|
+
}
|
|
419
431
|
s3Key(type, ext, options = {}) {
|
|
420
432
|
if (typeof ext === 'object')
|
|
421
433
|
options = ext;
|
|
@@ -6,6 +6,19 @@ import { Command } from '../command';
|
|
|
6
6
|
export type LoadOptions = Options | string | Config | undefined;
|
|
7
7
|
export type PlatformTypes = 'darwin' | 'linux' | 'win32' | 'aix' | 'freebsd' | 'openbsd' | 'sunos' | 'wsl';
|
|
8
8
|
export type ArchTypes = 'arm' | 'arm64' | 'mips' | 'mipsel' | 'ppc' | 'ppc64' | 's390' | 's390x' | 'x32' | 'x64' | 'x86';
|
|
9
|
+
export type VersionDetails = {
|
|
10
|
+
cliVersion: string;
|
|
11
|
+
architecture: string;
|
|
12
|
+
nodeVersion: string;
|
|
13
|
+
pluginVersions?: Record<string, {
|
|
14
|
+
version: string;
|
|
15
|
+
type: string;
|
|
16
|
+
root: string;
|
|
17
|
+
}>;
|
|
18
|
+
osVersion?: string;
|
|
19
|
+
shell?: string;
|
|
20
|
+
rootPath?: string;
|
|
21
|
+
};
|
|
9
22
|
export interface Config {
|
|
10
23
|
name: string;
|
|
11
24
|
version: string;
|
package/lib/performance.js
CHANGED
|
@@ -33,6 +33,8 @@ class Performance {
|
|
|
33
33
|
return settings_1.settings.performanceEnabled ?? false;
|
|
34
34
|
}
|
|
35
35
|
static get results() {
|
|
36
|
+
if (!Performance.enabled)
|
|
37
|
+
return [];
|
|
36
38
|
if (Performance._results.length > 0)
|
|
37
39
|
return Performance._results;
|
|
38
40
|
throw new Error('Perf results not available. Did you forget to call await Performance.collect()?');
|
|
@@ -41,6 +43,8 @@ class Performance {
|
|
|
41
43
|
return Performance.results.find(r => r.name === name);
|
|
42
44
|
}
|
|
43
45
|
static get highlights() {
|
|
46
|
+
if (!Performance.enabled)
|
|
47
|
+
return {};
|
|
44
48
|
if (Performance._highlights)
|
|
45
49
|
return Performance._highlights;
|
|
46
50
|
throw new Error('Perf results not available. Did you forget to call await Performance.collect()?');
|
|
@@ -69,7 +73,10 @@ class Performance {
|
|
|
69
73
|
return;
|
|
70
74
|
if (Performance._results.length > 0)
|
|
71
75
|
return;
|
|
72
|
-
|
|
76
|
+
const markers = Object.values(Performance.markers);
|
|
77
|
+
if (markers.length === 0)
|
|
78
|
+
return;
|
|
79
|
+
for (const marker of markers.filter(m => !m.stopped)) {
|
|
73
80
|
marker.stop();
|
|
74
81
|
}
|
|
75
82
|
return new Promise(resolve => {
|
|
@@ -128,7 +135,7 @@ class Performance {
|
|
|
128
135
|
resolve();
|
|
129
136
|
});
|
|
130
137
|
perfObserver.observe({ entryTypes: ['measure'], buffered: true });
|
|
131
|
-
for (const marker of
|
|
138
|
+
for (const marker of markers) {
|
|
132
139
|
try {
|
|
133
140
|
marker.measure();
|
|
134
141
|
}
|