Skip to content

Commit ac46b5b

Browse files
author
Michael Mrowetz
committed
add object-literal-key-quotes rule and fix lint issues
1 parent 289570a commit ac46b5b

File tree

13 files changed

+119
-123
lines changed

13 files changed

+119
-123
lines changed

src/ts/helpers/svg.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ interface SvgElementOptions {
4545
className?: string;
4646
}
4747

48-
function newElement<T extends StylableSVGElement>(tagName: string,
49-
{
48+
function newElement<T extends StylableSVGElement>(tagName: string, {
5049
attributes = {},
51-
css = {},
52-
text = "",
53-
className = "",
50+
css = {},
51+
text = "",
52+
className = "",
5453
}: SvgElementOptions = {}): T {
5554
const element = document.createElementNS(svgNamespaceUri, tagName) as T;
5655
if (className) {
@@ -125,8 +124,8 @@ const getTestSVGEl = (() => {
125124
// lazy init svgTestEl
126125
if (svgTestEl === undefined) {
127126
const attributes = {
128-
"className": "water-fall-chart temp",
129-
"width": "9999px",
127+
className: "water-fall-chart temp",
128+
width: "9999px",
130129
};
131130
const css = {
132131
"left": "0px",

src/ts/transformers/extract-details-keys.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,11 @@ export function getKeys(entry: Entry, requestID: number, startRelative: number,
169169
const headerToKvTuple = (header: Header): KvTuple => [header.name, header.value];
170170

171171
return {
172-
"general": parseGeneralDetails(entry, startRelative, requestID),
173-
"request": parseRequestDetails(entry),
174-
"requestHeaders": requestHeaders.map(headerToKvTuple),
175-
"response": parseResponseDetails(entry),
176-
"responseHeaders": responseHeaders.map(headerToKvTuple),
177-
"timings": parseTimings(entry, startRelative, endRelative),
172+
general: parseGeneralDetails(entry, startRelative, requestID),
173+
request: parseRequestDetails(entry),
174+
requestHeaders: requestHeaders.map(headerToKvTuple),
175+
response: parseResponseDetails(entry),
176+
responseHeaders: responseHeaders.map(headerToKvTuple),
177+
timings: parseTimings(entry, startRelative, endRelative),
178178
};
179179
}

src/ts/transformers/har.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ const getTimePair = (key: string, harEntry: Entry, collect: WaterfallEntryTiming
272272
const end = isNaN(preciseEnd) ? (start + harEntry.timings[key]) : preciseEnd;
273273

274274
return {
275-
"end": Math.round(end),
276-
"start": Math.round(start),
275+
end: Math.round(end),
276+
start: Math.round(start),
277277
};
278278
};
279279

src/ts/waterfall/details-overlay/overlay-manager.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,22 @@ class OverlayManager {
6666
}
6767
const self = this;
6868
const newOverlay: OpenOverlay = {
69-
"defaultY": y,
70-
"entry": entry,
71-
"index": index,
72-
"onClose": () => {
69+
defaultY: y,
70+
entry,
71+
index,
72+
onClose: () => {
7373
self.closeOverlay(index, detailsHeight, rowItems);
7474
},
75-
"openTabIndex": 0,
75+
openTabIndex: 0,
7676
};
7777
this.openOverlays.push(newOverlay);
7878
this.openOverlays = this.openOverlays.sort((a, b) => a.index > b.index ? 1 : -1);
7979

8080
this.renderOverlays(detailsHeight, rowItems);
8181
this.context.pubSub.publishToOverlayChanges({
82-
"changedIndex": index,
83-
"combinedOverlayHeight": self.getCombinedOverlayHeight(),
84-
"type": "open",
82+
changedIndex: index,
83+
combinedOverlayHeight: self.getCombinedOverlayHeight(),
84+
type: "open",
8585
} as OverlayChangeEvent);
8686
}
8787

@@ -108,9 +108,9 @@ class OverlayManager {
108108

109109
this.renderOverlays(detailsHeight, rowItems);
110110
this.context.pubSub.publishToOverlayChanges({
111-
"changedIndex": index,
112-
"combinedOverlayHeight": self.getCombinedOverlayHeight(),
113-
"type": "closed",
111+
changedIndex: index,
112+
combinedOverlayHeight: self.getCombinedOverlayHeight(),
113+
type: "closed",
114114
} as OverlayChangeEvent);
115115
}
116116

src/ts/waterfall/details-overlay/svg-details-overlay.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ function createCloseButtonSvg(y: number): SVGGElement {
77
const closeBtn = svg.newA("info-overlay-close-btn");
88

99
closeBtn.appendChild(svg.newRect({
10-
"height": 23,
11-
"width": 23,
12-
"x": "100%",
13-
"y": y,
10+
height: 23,
11+
width: 23,
12+
x: "100%",
13+
y,
1414
}));
1515

1616
closeBtn.appendChild(svg.newTextEl("✕", {
@@ -28,12 +28,12 @@ function createCloseButtonSvg(y: number): SVGGElement {
2828
function createHolder(y: number, detailsHeight: number) {
2929
const holder = svg.newG("info-overlay-holder");
3030
const bg = svg.newRect({
31-
"height": detailsHeight,
32-
"rx": 2,
33-
"ry": 2,
34-
"width": "100%",
35-
"x": "0",
36-
"y": y,
31+
height: detailsHeight,
32+
rx: 2,
33+
ry: 2,
34+
width: "100%",
35+
x: "0",
36+
y,
3737
}, "info-overlay-bg");
3838

3939
holder.appendChild(bg);
@@ -45,10 +45,10 @@ export function createRowInfoOverlay(overlay: OpenOverlay, y: number, detailsHei
4545
const holder = createHolder(y, detailsHeight);
4646

4747
const foreignObject = svg.newForeignObject({
48-
"height": detailsHeight,
49-
"width": "100%",
50-
"x": "0",
51-
"y": y,
48+
height: detailsHeight,
49+
width: "100%",
50+
x: "0",
51+
y,
5252
});
5353

5454
const closeBtn = createCloseButtonSvg(y);

src/ts/waterfall/row/svg-indicators.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
* _Width of icons is fixed_
1111
*/
1212
export function makeIcon(type: string, title: string): Icon {
13-
return { "type": type, "title": title, "width": 20 };
13+
return { type, title, width: 20 };
1414
}
1515

1616
/**

src/ts/waterfall/row/svg-row-subcomponents.ts

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import { WaterfallEntryTiming } from "../../typing/waterfall";
1616
function makeBlock(rectData: RectData, className: string) {
1717
const blockHeight = rectData.height - 1;
1818
const rect = svg.newRect({
19-
"height": blockHeight,
20-
"width": misc.roundNumber(rectData.width / rectData.unit) + "%",
21-
"x": misc.roundNumber(rectData.x / rectData.unit) + "%",
22-
"y": rectData.y,
19+
height: blockHeight,
20+
width: misc.roundNumber(rectData.width / rectData.unit) + "%",
21+
x: misc.roundNumber(rectData.x / rectData.unit) + "%",
22+
y: rectData.y,
2323
}, className);
2424
if (rectData.label) {
2525
rect.appendChild(svg.newTitle(rectData.label)); // Add tile to wedge path
@@ -40,16 +40,16 @@ function makeBlock(rectData: RectData, className: string) {
4040
*/
4141
function segmentToRectData(segment: WaterfallEntryTiming, rectData: RectData): RectData {
4242
return {
43-
"cssClass": timingTypeToCssClass(segment.type),
44-
"height": (rectData.height - 6),
45-
"hideOverlay": rectData.hideOverlay,
46-
"label": segment.type + " (" + Math.round(segment.start) + "ms - "
43+
cssClass: timingTypeToCssClass(segment.type),
44+
height: (rectData.height - 6),
45+
hideOverlay: rectData.hideOverlay,
46+
label: segment.type + " (" + Math.round(segment.start) + "ms - "
4747
+ Math.round(segment.end) + "ms | total: " + Math.round(segment.total) + "ms)",
48-
"showOverlay": rectData.showOverlay,
49-
"unit": rectData.unit,
50-
"width": segment.total,
51-
"x": segment.start || 0.001,
52-
"y": rectData.y,
48+
showOverlay: rectData.showOverlay,
49+
unit: rectData.unit,
50+
width: segment.total,
51+
x: segment.start || 0.001,
52+
y: rectData.y,
5353
} as RectData;
5454
}
5555

@@ -73,7 +73,7 @@ function createTimingLabel(rectData: RectData, timeTotal: number, firstX: number
7373

7474
if (percStart + (roughTxtWidth / minWidth * 100) > 100) {
7575
percStart = firstX / rectData.unit - spacingPerc;
76-
txtEl = svg.newTextEl(totalLabel, { x: `${misc.roundNumber(percStart)}%`, y }, { "textAnchor": "end" });
76+
txtEl = svg.newTextEl(totalLabel, { x: `${misc.roundNumber(percStart)}%`, y }, { textAnchor: "end" });
7777
}
7878

7979
return txtEl;
@@ -152,14 +152,14 @@ export function createRequestLabelFull(x: number, y: number, name: string, heigh
152152
clipPath: `url(#titleFullClipPath)`,
153153
});
154154
labelHolder.appendChild(svg.newRect({
155-
"height": height - 4,
156-
"rx": 5,
157-
"ry": 5,
155+
height: height - 4,
156+
rx: 5,
157+
ry: 5,
158158
// for initial load performance use 500px as base width
159159
// it's updated one by one on hover
160-
"width": 500,
161-
"x": x - 3,
162-
"y": y + 3,
160+
width: 500,
161+
x: x - 3,
162+
y: y + 3,
163163
}, "label-full-bg"));
164164
labelHolder.appendChild(blockLabel);
165165
return labelHolder;
@@ -243,24 +243,24 @@ export function appendRequestLabels(rowFixed: SVGGElement, requestNumberLabel: S
243243
export function createBgStripe(y: number, height: number, isEven: boolean): SVGRectElement {
244244
const className = isEven ? "even" : "odd";
245245
return svg.newRect({
246-
"height": height,
247-
"width": "100%", // make up for the spacing
248-
"x": 0,
249-
"y": y,
246+
height,
247+
width: "100%", // make up for the spacing
248+
x: 0,
249+
y,
250250
}, className);
251251
}
252252

253253
export function createNameRowBg(y: number, rowHeight: number): SVGGElement {
254254
const rowFixed = svg.newG("row row-fixed");
255255

256256
rowFixed.appendChild(svg.newRect({
257-
"height": rowHeight,
258-
"width": "100%",
259-
"x": "0",
260-
"y": y,
257+
height: rowHeight,
258+
width: "100%",
259+
x: "0",
260+
y,
261261
}, "",
262262
{
263-
"opacity": 0,
263+
opacity: 0,
264264
}));
265265

266266
return rowFixed;
@@ -270,13 +270,13 @@ export function createRowBg(y: number, rowHeight: number): SVGGElement {
270270
const rowFixed = svg.newG("row row-flex");
271271

272272
rowFixed.appendChild(svg.newRect({
273-
"height": rowHeight,
274-
"width": "100%",
275-
"x": "0",
276-
"y": y,
273+
height: rowHeight,
274+
width: "100%",
275+
x: "0",
276+
y,
277277
}, "",
278278
{
279-
"opacity": 0,
279+
opacity: 0,
280280
}));
281281

282282
return rowFixed;

src/ts/waterfall/row/svg-row.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import * as rowSubComponents from "./svg-row-subcomponents";
1414
// initial clip path
1515
const clipPathElProto = svg.newClipPath("titleClipPath");
1616
clipPathElProto.appendChild(svg.newRect({
17-
"height": "100%",
18-
"width": "100%",
17+
height: "100%",
18+
width: "100%",
1919
}));
2020

2121
const clipPathElFullProto = svg.newClipPath("titleFullClipPath");
2222
clipPathElFullProto.appendChild(svg.newRect({
23-
"height": "100%",
24-
"width": "100%",
23+
height: "100%",
24+
width: "100%",
2525
}));
2626

2727
const ROW_LEFT_MARGIN = 3;
@@ -39,12 +39,12 @@ export function createRow(context: Context, index: number,
3939
rowItem.setAttribute("tabindex", "0");
4040
rowItem.setAttribute("xlink:href", "javascript:void(0)");
4141
const leftFixedHolder = svg.newSvg("left-fixed-holder", {
42-
"width": `${leftColumnWith}%`,
43-
"x": "0",
42+
width: `${leftColumnWith}%`,
43+
x: "0",
4444
});
4545
const flexScaleHolder = svg.newSvg("flex-scale-waterfall", {
46-
"width": `${100 - leftColumnWith}%`,
47-
"x": `${leftColumnWith}%`,
46+
width: `${100 - leftColumnWith}%`,
47+
x: `${leftColumnWith}%`,
4848
});
4949

5050
const rect = rowSubComponents.createRect(rectData, entry.segments, entry.total);

src/ts/waterfall/sub-components/svg-alignment-helper.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ import { HoverElements, HoverEvtListeners } from "../../typing/svg-alignment-hel
1313
export function createAlignmentLines(diagramHeight: number): HoverElements {
1414
return {
1515
endline: svg.newLine({
16-
"x1": "0",
17-
"x2": "0",
18-
"y1": "0",
19-
"y2": diagramHeight,
16+
x1: "0",
17+
x2: "0",
18+
y1: "0",
19+
y2: diagramHeight,
2020
}, "line-end"),
2121

2222
startline: svg.newLine({
23-
"x1": "0",
24-
"x2": "0",
25-
"y1": "0",
26-
"y2": diagramHeight,
23+
x1: "0",
24+
x2: "0",
25+
y1: "0",
26+
y2: diagramHeight,
2727
}, "line-start"),
2828
};
2929
}

src/ts/waterfall/sub-components/svg-general-components.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ const appendSecond = (context: Context, timeHolder: SVGGElement,
3939

4040
const x = roundNumber(secPerc * sec) + "%";
4141
const lineEl = svg.newLine({
42-
"x1": x,
43-
"x2": x,
44-
"y1": 0,
45-
"y2": diagramHeight,
42+
x1: x,
43+
x2: x,
44+
y1: 0,
45+
y2: diagramHeight,
4646
}, lineClass);
4747

4848
context.pubSub.subscribeToOverlayChanges((change: OverlayChangeEvent) => {

0 commit comments

Comments
 (0)