Skip to content

Commit b7e3ffc

Browse files
swissspidyswissspidy
authored
Use shorter column names (#230)
1 parent 4213bd1 commit b7e3ffc

4 files changed

Lines changed: 109 additions & 80 deletions

File tree

‎env/blueprints/setup.json‎

Lines changed: 57 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,59 @@
11
{
2-
"$schema": "https://playground.wordpress.net/blueprint-schema.json",
3-
"landingPage": "/wp-admin/",
4-
"preferredVersions": {
5-
"php": "8.0",
6-
"wp": "latest"
7-
},
8-
"phpExtensionBundles": [
9-
"kitchen-sink"
10-
],
11-
"features": {
12-
"networking": false
13-
},
14-
"plugins": [
15-
"performance-lab"
16-
],
17-
"constants": {
18-
"WP_HTTP_BLOCK_EXTERNAL": "true"
19-
},
20-
"login": true,
21-
"siteOptions": {
22-
"permalink_structure": "/%postname%/"
23-
},
24-
"steps": [
25-
{
26-
"step": "defineWpConfigConsts",
27-
"consts": {
28-
"DISABLE_WP_CRON": true
29-
}
30-
},
31-
{
32-
"step": "installTheme",
33-
"themeData": {
34-
"resource": "wordpress.org/themes",
35-
"slug": "twentytwentyone"
36-
},
37-
"ifAlreadyInstalled": "skip",
38-
"options": {
39-
"activate": true,
40-
"importStarterContent": false
41-
}
42-
},
43-
{
44-
"step": "installTheme",
45-
"themeData": {
46-
"resource": "wordpress.org/themes",
47-
"slug": "twentytwentythree"
48-
},
49-
"ifAlreadyInstalled": "skip",
50-
"options": {
51-
"activate": false,
52-
"importStarterContent": false
53-
}
54-
},
55-
{
56-
"step": "importWxr",
57-
"file": {
58-
"resource": "url",
59-
"url": "https://raw.githubusercontent.com/WordPress/theme-test-data/b47acf980696897936265182cb684dca648476c7/themeunittestdata.wordpress.xml"
60-
}
61-
}
62-
]
2+
"$schema": "https://playground.wordpress.net/blueprint-schema.json",
3+
"landingPage": "/wp-admin/",
4+
"preferredVersions": {
5+
"php": "8.0",
6+
"wp": "latest"
7+
},
8+
"phpExtensionBundles": [ "kitchen-sink" ],
9+
"features": {
10+
"networking": false
11+
},
12+
"plugins": [ "performance-lab" ],
13+
"constants": {
14+
"WP_HTTP_BLOCK_EXTERNAL": "true"
15+
},
16+
"login": true,
17+
"siteOptions": {
18+
"permalink_structure": "/%postname%/"
19+
},
20+
"steps": [
21+
{
22+
"step": "defineWpConfigConsts",
23+
"consts": {
24+
"DISABLE_WP_CRON": true
25+
}
26+
},
27+
{
28+
"step": "installTheme",
29+
"themeData": {
30+
"resource": "wordpress.org/themes",
31+
"slug": "twentytwentyone"
32+
},
33+
"ifAlreadyInstalled": "skip",
34+
"options": {
35+
"activate": true,
36+
"importStarterContent": false
37+
}
38+
},
39+
{
40+
"step": "installTheme",
41+
"themeData": {
42+
"resource": "wordpress.org/themes",
43+
"slug": "twentytwentythree"
44+
},
45+
"ifAlreadyInstalled": "skip",
46+
"options": {
47+
"activate": false,
48+
"importStarterContent": false
49+
}
50+
},
51+
{
52+
"step": "importWxr",
53+
"file": {
54+
"resource": "url",
55+
"url": "https://raw.githubusercontent.com/WordPress/theme-test-data/b47acf980696897936265182cb684dca648476c7/themeunittestdata.wordpress.xml"
56+
}
57+
}
58+
]
6359
}

‎env/tests/performance/cli/results.js‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,41 @@ function formatValue( value, key ) {
201201
return `${ value.toFixed( 2 ) } ms`;
202202
}
203203

204+
/**
205+
* Format key for readability.
206+
*
207+
* @param {string} key Key.
208+
* @return {string} Formatted key.
209+
*/
210+
function formatKey( key ) {
211+
switch ( key ) {
212+
// Server-Timing.
213+
214+
case 'wpDbQueries':
215+
return 'DB Queries';
216+
case 'wpMemoryUsage':
217+
return 'Memory';
218+
case 'wpBeforeTemplate':
219+
return 'Before Template';
220+
case 'wpTemplate':
221+
return 'Template';
222+
case 'wpTotal':
223+
return 'WP Total';
224+
225+
// Web vitals.
226+
227+
case 'timeToFirstByte':
228+
return 'TTFB';
229+
case 'lcpMinusTtfb':
230+
return 'LCP - TTFB';
231+
case 'largestContentfulPaint':
232+
return 'LCP';
233+
234+
default:
235+
return key;
236+
}
237+
}
238+
204239
for ( const [ url, results ] of Object.entries( afterStats ) ) {
205240
const prevStat = beforeStats[ url ];
206241

@@ -239,7 +274,7 @@ for ( const [ url, results ] of Object.entries( afterStats ) ) {
239274
! delta ||
240275
Math.abs( delta ) <= DELTA_VARIANCE
241276
) {
242-
diffResult[ key ] = formatValue(
277+
diffResult[ formatKey( key ) ] = formatValue(
243278
/** @type {number} */ ( value ),
244279
key
245280
);
@@ -248,7 +283,7 @@ for ( const [ url, results ] of Object.entries( afterStats ) ) {
248283

249284
const prefix = delta > 0 ? '+' : '';
250285

251-
diffResult[ key ] = `${ formatValue(
286+
diffResult[ formatKey( key ) ] = `${ formatValue(
252287
value,
253288
key
254289
) } (${ prefix }${ formatValue(

‎env/tests/performance/config/performance-reporter.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ class PerformanceReporter implements Reporter {
3636
);
3737

3838
if ( performanceResults?.body ) {
39-
const resultsByUrl = JSON.parse( performanceResults.body.toString( 'utf-8' ) ) as Record< string, Record< string, number[] > >;
39+
const resultsByUrl = JSON.parse(
40+
performanceResults.body.toString( 'utf-8' )
41+
) as Record< string, Record< string, number[] > >;
4042

41-
for ( const [url, results ] of Object.entries(resultsByUrl)) {
43+
for ( const [ url, results ] of Object.entries( resultsByUrl ) ) {
4244
this.allResults[ url ] ??= [];
4345

44-
this.allResults[ url ].push(
45-
results
46-
);
46+
this.allResults[ url ].push( results );
4747
}
4848
}
4949
}
@@ -68,9 +68,7 @@ class PerformanceReporter implements Reporter {
6868
console.log( `Status: ${ result.status }` );
6969
}
7070

71-
for ( const [ url, results ] of Object.entries(
72-
this.allResults
73-
) ) {
71+
for ( const [ url, results ] of Object.entries( this.allResults ) ) {
7472
console.log( `\nURL: \`${ url }\`\n` );
7573
console.table(
7674
results.map( ( r ) =>

‎env/tests/performance/specs/main.spec.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@ test.describe( 'Tests', () => {
4343

4444
const serverTiming = await metrics.getServerTiming();
4545

46-
results[url] ??= {};
46+
results[ url ] ??= {};
4747

4848
for ( const [ key, value ] of Object.entries( serverTiming ) ) {
49-
results[url][ camelCaseDashes( key ) ] ??= [];
50-
results[url][ camelCaseDashes( key ) ].push( value );
49+
results[ url ][ camelCaseDashes( key ) ] ??= [];
50+
results[ url ][ camelCaseDashes( key ) ].push( value );
5151
}
5252

5353
const ttfb = await metrics.getTimeToFirstByte();
5454
const lcp = await metrics.getLargestContentfulPaint();
5555

56-
results[url].largestContentfulPaint ??= [];
57-
results[url].largestContentfulPaint.push( lcp );
58-
results[url].timeToFirstByte ??= [];
59-
results[url].timeToFirstByte.push( ttfb );
60-
results[url].lcpMinusTtfb ??= [];
61-
results[url].lcpMinusTtfb.push( lcp - ttfb );
56+
results[ url ].largestContentfulPaint ??= [];
57+
results[ url ].largestContentfulPaint.push( lcp );
58+
results[ url ].timeToFirstByte ??= [];
59+
results[ url ].timeToFirstByte.push( ttfb );
60+
results[ url ].lcpMinusTtfb ??= [];
61+
results[ url ].lcpMinusTtfb.push( lcp - ttfb );
6262
} );
6363
}
6464
}

0 commit comments

Comments
 (0)