Skip to content

Commit 971dd88

Browse files
web-padawanweb-padawan
committed
Reformat .ts files using Prettier 2.0
1 parent c70a11c commit 971dd88

24 files changed

+81
-114
lines changed

‎.eslintrc.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
"plugin:prettier/recommended",
1010
"prettier/@typescript-eslint"
1111
],
12-
"plugins": [
13-
"@typescript-eslint",
14-
"wc",
15-
"prettier"
16-
],
12+
"plugins": ["@typescript-eslint", "wc", "prettier"],
1713
"parser": "@typescript-eslint/parser",
1814
"parserOptions": {
1915
"sourceType": "module",
@@ -42,7 +38,7 @@
4238
},
4339
"overrides": [
4440
{
45-
"files": [ "src/@types/*.d.ts" ],
41+
"files": ["src/@types/*.d.ts"],
4642
"rules": {
4743
"@typescript-eslint/no-explicit-any": "off"
4844
}

‎.prettierrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"singleQuote": true
2+
"singleQuote": true,
3+
"trailingComma": "none"
34
}

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"es-dev-server": "^1.45.2",
6161
"eslint": "^6.8.0",
6262
"eslint-config-airbnb-base": "^14.1.0",
63-
"eslint-config-prettier": "^6.10.0",
63+
"eslint-config-prettier": "^6.10.1",
6464
"eslint-plugin-import": "^2.20.1",
6565
"eslint-plugin-lit": "^1.2.0",
6666
"eslint-plugin-prettier": "^3.1.2",
@@ -69,7 +69,7 @@
6969
"lint-staged": "^10.0.8",
7070
"lit-analyzer": "^1.1.10",
7171
"npm-run-all": "^4.1.5",
72-
"prettier": "^1.19.1",
72+
"prettier": "^2.0.2",
7373
"rimraf": "^3.0.2",
7474
"rollup": "^1.29.0",
7575
"rollup-plugin-cpy": "^2.0.1",

‎src/api-demo-base.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ async function renderDemo(
1212
): Promise<TemplateResult> {
1313
const elements = await jsonFetched;
1414

15-
const index = elements.findIndex(el => el.name === selected);
15+
const index = elements.findIndex((el) => el.name === selected);
1616

1717
return elements.length
1818
? html`

‎src/api-demo-content.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@ export class ApiDemoContent extends LitElement {
4141
?hidden="${elements.length === 1}"
4242
part="select"
4343
>
44-
${elements.map((tag, idx) => {
45-
return html`
46-
<option value="${idx}">${tag.name}</option>
47-
`;
48-
})}
44+
${elements.map(
45+
(tag, idx) => html`<option value="${idx}">${tag.name}</option>`
46+
)}
4947
</select>
5048
</label>
5149
</nav>

‎src/api-docs-base.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ async function renderDocs(
1010
): Promise<TemplateResult> {
1111
const elements = await jsonFetched;
1212

13-
const index = elements.findIndex(el => el.name === selected);
13+
const index = elements.findIndex((el) => el.name === selected);
1414

1515
return elements.length
1616
? html`
@@ -24,8 +24,6 @@ async function renderDocs(
2424

2525
export class ApiDocsBase extends ApiViewerMixin(LitElement) {
2626
protected render() {
27-
return html`
28-
${until(renderDocs(this.jsonFetched, this.selected))}
29-
`;
27+
return html`${until(renderDocs(this.jsonFetched, this.selected))}`;
3028
}
3129
}

‎src/api-docs-content.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,9 @@ export class ApiDocsContent extends LitElement {
4444
?hidden="${elements.length === 1}"
4545
part="select"
4646
>
47-
${elements.map((tag, idx) => {
48-
return html`
49-
<option value="${idx}">${tag.name}</option>
50-
`;
51-
})}
47+
${elements.map(
48+
(tag, idx) => html`<option value="${idx}">${tag.name}</option>`
49+
)}
5250
</select>
5351
</label>
5452
</nav>

‎src/api-viewer-base.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ async function renderDocs(
1414
): Promise<TemplateResult> {
1515
const elements = await jsonFetched;
1616

17-
const index = elements.findIndex(el => el.name === selected);
17+
const index = elements.findIndex((el) => el.name === selected);
1818

1919
return elements.length
2020
? html`

‎src/api-viewer-content.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,9 @@ export class ApiViewerContent extends LitElement {
7272
?hidden="${elements.length === 1}"
7373
part="select"
7474
>
75-
${elements.map((tag, idx) => {
76-
return html`
77-
<option value="${idx}">${tag.name}</option>
78-
`;
79-
})}
75+
${elements.map(
76+
(tag, idx) => html`<option value="${idx}">${tag.name}</option>`
77+
)}
8078
</select>
8179
</label>
8280
</nav>

‎src/api-viewer-demo-events.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const renderDetail = (detail: EventDetail): string => {
2323

2424
const renderEvents = (log: CustomEvent[]): TemplateResult => {
2525
return html`
26-
${log.map(e => {
26+
${log.map((e) => {
2727
const { type, detail } = e;
2828
return html`
2929
<p part="event-record">

‎src/api-viewer-demo-layout.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export class ApiViewerDemoLayout extends LitElement {
125125
this.slots,
126126
this.customKnobs,
127127
this.props
128-
].map(arr => arr.length === 0);
128+
].map((arr) => arr.length === 0);
129129

130130
const id = this.vid as number;
131131
const slots = this.processedSlots;
@@ -253,7 +253,7 @@ export class ApiViewerDemoLayout extends LitElement {
253253

254254
private _getCustomKnobs() {
255255
return getTemplates(this.vid as number, this.tag, KNOB)
256-
.map(template => {
256+
.map((template) => {
257257
const { attr, type } = template.dataset;
258258
let result = null;
259259
if (attr) {
@@ -265,7 +265,7 @@ export class ApiViewerDemoLayout extends LitElement {
265265
(c): c is HTMLOptionElement =>
266266
c instanceof HTMLOptionElement
267267
)
268-
.map(option => option.value)
268+
.map((option) => option.value)
269269
: [];
270270
if (node instanceof HTMLSelectElement && options.length > 1) {
271271
result = {
@@ -353,7 +353,7 @@ export class ApiViewerDemoLayout extends LitElement {
353353
const { value, dataset } = target;
354354
const { name } = dataset;
355355

356-
this.processedCss = this.processedCss.map(prop => {
356+
this.processedCss = this.processedCss.map((prop) => {
357357
return prop.name === name
358358
? {
359359
...prop,
@@ -393,7 +393,7 @@ export class ApiViewerDemoLayout extends LitElement {
393393
const name = target.dataset.slot;
394394
const content = target.value;
395395

396-
this.processedSlots = this.processedSlots.map(slot => {
396+
this.processedSlots = this.processedSlots.map((slot) => {
397397
return slot.name === name
398398
? {
399399
...slot,
@@ -409,27 +409,27 @@ export class ApiViewerDemoLayout extends LitElement {
409409
if (hasTemplate(this.vid as number, this.tag, HOST)) {
410410
// Apply property values from template
411411
this.props
412-
.filter(prop => {
412+
.filter((prop) => {
413413
const { name, type } = prop;
414414
const defaultValue = getDefault(prop);
415415
return (
416416
component[name] !== defaultValue ||
417417
(normalizeType(type) === 'boolean' && defaultValue)
418418
);
419419
})
420-
.forEach(prop => {
420+
.forEach((prop) => {
421421
this._syncKnob(component, prop);
422422
});
423423
}
424424

425-
this.events.forEach(event => {
425+
this.events.forEach((event) => {
426426
this._listen(component, event.name);
427427
});
428428

429429
if (this.cssProps.length) {
430430
const style = getComputedStyle(component);
431431

432-
this.processedCss = this.cssProps.map(cssProp => {
432+
this.processedCss = this.cssProps.map((cssProp) => {
433433
let value = cssProp.default
434434
? unquote(cssProp.default)
435435
: style.getPropertyValue(cssProp.name);
@@ -468,7 +468,7 @@ export class ApiViewerDemoLayout extends LitElement {
468468
[name]: { type, value, attribute }
469469
};
470470

471-
this.props = this.props.map(prop => {
471+
this.props = this.props.map((prop) => {
472472
return prop.name === name
473473
? {
474474
...prop,

‎src/api-viewer-demo-snippet.ts

+4-6
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const unindent = (text: string, prepend: string) => {
4646
return (lineIndent as number) < prev ? lineIndent : prev;
4747
}, null);
4848

49-
return lines.map(l => prepend + l.substr(indent as number)).join('\n');
49+
return lines.map((l) => prepend + l.substr(indent as number)).join('\n');
5050
};
5151

5252
const getTplContent = (
@@ -132,10 +132,10 @@ const renderSnippet = (
132132
markup += `\n${getTplContent(suffix, '').trim()}\n`;
133133
}
134134

135-
const cssValues = cssProps.filter(p => p.value !== p.default);
135+
const cssValues = cssProps.filter((p) => p.value !== p.default);
136136
if (cssValues.length) {
137137
markup += `\n<style>\n${INDENT}${tag} {\n`;
138-
cssValues.forEach(prop => {
138+
cssValues.forEach((prop) => {
139139
if (prop.value) {
140140
markup += `${INDENT}${INDENT}${prop.name}: ${prop.value};\n`;
141141
}
@@ -145,9 +145,7 @@ const renderSnippet = (
145145

146146
const { value } = process(highlighter, markup, ['xml', 'css']);
147147

148-
return html`
149-
<pre><code>${unsafeHTML(value)}</code></pre>
150-
`;
148+
return html`<pre><code>${unsafeHTML(value)}</code></pre>`;
151149
};
152150

153151
@customElement('api-viewer-demo-snippet')

‎src/api-viewer-docs.ts

+5-7
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,10 @@ const renderItem = (
5555
<div part="docs-label">Type</div>
5656
<div part="docs-value">
5757
${valueType ||
58-
(Number.isNaN(Number(value)) ? typeof value : 'number')}
58+
(Number.isNaN(Number(value)) ? typeof value : 'number')}
5959
${value === undefined
6060
? nothing
61-
: html`
62-
= <span class="accent">${value}</span>
63-
`}
61+
: html` = <span class="accent">${value}</span> `}
6462
</div>
6563
</div>
6664
`}
@@ -133,7 +131,7 @@ export class ApiViewerDocs extends LitElement {
133131
events,
134132
cssProps,
135133
cssParts
136-
].every(arr => arr.length === 0);
134+
].every((arr) => arr.length === 0);
137135

138136
return emptyDocs
139137
? html`
@@ -148,7 +146,7 @@ export class ApiViewerDocs extends LitElement {
148146
'Properties',
149147
properties,
150148
html`
151-
${properties.map(prop => {
149+
${properties.map((prop) => {
152150
const { name, description, type, attribute } = prop;
153151
return renderItem(
154152
'prop',
@@ -192,7 +190,7 @@ export class ApiViewerDocs extends LitElement {
192190
'CSS Custom Properties',
193191
cssProps,
194192
html`
195-
${cssProps.map(prop => {
193+
${cssProps.map((prop) => {
196194
const { name, description, type } = prop;
197195
return renderItem(
198196
'css',

‎src/api-viewer-panel.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ export class ApiViewerPanel extends LitElement {
2020
}
2121

2222
protected render() {
23-
return html`
24-
<slot></slot>
25-
`;
23+
return html`<slot></slot>`;
2624
}
2725

2826
protected firstUpdated() {

‎src/api-viewer-tab.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,7 @@ export class ApiViewerTab extends LitElement {
108108
}
109109

110110
protected render() {
111-
return html`
112-
${this.heading}
113-
`;
111+
return html`${this.heading}`;
114112
}
115113

116114
protected firstUpdated() {

‎src/api-viewer-tabs.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class ApiViewerTabs extends LitElement {
6666
}
6767

6868
Promise.all(
69-
[...this._allTabs(), ...this._allPanels()].map(el => el.updateComplete)
69+
[...this._allTabs(), ...this._allPanels()].map((el) => el.updateComplete)
7070
).then(() => {
7171
this._linkPanels();
7272
});
@@ -78,13 +78,13 @@ export class ApiViewerTabs extends LitElement {
7878

7979
private _linkPanels() {
8080
const tabs = this._allTabs();
81-
tabs.forEach(tab => {
81+
tabs.forEach((tab) => {
8282
const panel = tab.nextElementSibling as ApiViewerPanel;
8383
tab.setAttribute('aria-controls', panel.id);
8484
panel.setAttribute('aria-labelledby', tab.id);
8585
});
8686

87-
const selectedTab = tabs.find(tab => tab.selected) || tabs[0];
87+
const selectedTab = tabs.find((tab) => tab.selected) || tabs[0];
8888

8989
this._selectTab(selectedTab);
9090
}
@@ -126,7 +126,7 @@ export class ApiViewerTabs extends LitElement {
126126
private _prevTab() {
127127
const tabs = this._allTabs();
128128
const newIdx = this._getAvailableIndex(
129-
tabs.findIndex(tab => tab.selected) - 1,
129+
tabs.findIndex((tab) => tab.selected) - 1,
130130
-1
131131
);
132132
return tabs[(newIdx + tabs.length) % tabs.length];
@@ -145,7 +145,7 @@ export class ApiViewerTabs extends LitElement {
145145
private _nextTab() {
146146
const tabs = this._allTabs();
147147
const newIdx = this._getAvailableIndex(
148-
tabs.findIndex(tab => tab.selected) + 1,
148+
tabs.findIndex((tab) => tab.selected) + 1,
149149
1
150150
);
151151
return tabs[newIdx % tabs.length];
@@ -158,11 +158,11 @@ export class ApiViewerTabs extends LitElement {
158158
const tabs = this._allTabs();
159159
const panels = this._allPanels();
160160

161-
tabs.forEach(tab => {
161+
tabs.forEach((tab) => {
162162
tab.selected = false;
163163
});
164164

165-
panels.forEach(panel => {
165+
panels.forEach((panel) => {
166166
panel.hidden = true;
167167
});
168168
}

‎src/fixtures/expansion-panel.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ export class ExpansionPanel extends LitElement {
220220

221221
protected firstUpdated() {
222222
this.setAttribute('tabindex', '0');
223-
this.addEventListener('focusin', e => {
223+
this.addEventListener('focusin', (e) => {
224224
if (e.composedPath()[0] === this) {
225225
if (this._isShiftTabbing) {
226226
return;
@@ -238,7 +238,7 @@ export class ExpansionPanel extends LitElement {
238238

239239
this.addEventListener('focusout', () => this._setFocused(false));
240240

241-
this.addEventListener('keydown', e => {
241+
this.addEventListener('keydown', (e) => {
242242
if (e.shiftKey && e.keyCode === 9) {
243243
this._isShiftTabbing = true;
244244
HTMLElement.prototype.focus.apply(this);

0 commit comments

Comments
 (0)