Skip to content

Commit 7483287

Browse files
JulianCataldoJulianCataldo
committed
style: bulk reformat with new imports orders
That might need fine-tuning though
1 parent 27bf8e8 commit 7483287

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+121
-108
lines changed

‎packages/carbon/src/form.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Jsf } from '@jsfe/form';
2-
import * as widgets from './widgets/index.js';
2+
33
import { styles } from './styles.js';
4+
import * as widgets from './widgets/index.js';
45

56
export class JsfCarbon extends Jsf {
67
public widgets = widgets;

‎packages/carbon/src/styles.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* STUB */
2-
32
import { css } from 'lit';
43

54
export const styles = css`

‎packages/carbon/src/widgets/object.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { nothing, html } from 'lit';
1+
import { html, nothing } from 'lit';
2+
23
import type { Widgets } from '@jsfe/types';
34

45
import '@carbon/web-components/es/components/form-group/index.js';

‎packages/form/src/json-schema-form.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
/* eslint-disable max-lines */
2+
23
/* eslint-disable class-methods-use-this */
4+
35
/* eslint-disable no-underscore-dangle */
6+
// import deepmerge from 'deepmerge';
7+
import set from 'lodash-es/set';
48

59
import {
10+
type CSSResult,
611
LitElement,
7-
html,
8-
unsafeCSS,
912
type TemplateResult,
10-
type CSSResult,
13+
html,
1114
nothing,
15+
unsafeCSS,
1216
} from 'lit';
13-
1417
import { property, state } from 'lit/decorators.js';
1518
import { createRef, ref } from 'lit/directives/ref.js';
1619

17-
// import deepmerge from 'deepmerge';
18-
import set from 'lodash-es/set';
19-
20-
// import { alternateField } from './triage/alternate.js';
21-
import { fieldArray } from './triage/array.js';
22-
import { fieldObject } from './triage/object.js';
23-
import { fieldPrimitive } from './triage/primitive.js';
24-
import { fieldArrayPrimitive } from './triage/array-primitive.js';
25-
2620
import type {
2721
DataChangeCallback,
2822
FeatureFlags,
23+
JSONSchema7,
2924
OnFormSubmit,
3025
Path,
3126
UiSchema,
3227
Widgets,
33-
JSONSchema7,
3428
} from '@jsfe/types';
3529

30+
import { fieldArrayPrimitive } from './triage/array-primitive.js';
31+
// import { alternateField } from './triage/alternate.js';
32+
import { fieldArray } from './triage/array.js';
33+
import { fieldObject } from './triage/object.js';
34+
import { fieldPrimitive } from './triage/primitive.js';
35+
3636
export class Jsf extends LitElement {
3737
@property({ type: Object }) public schema: JSONSchema7 = {};
3838

@@ -52,7 +52,7 @@ export class Jsf extends LitElement {
5252

5353
@property({ type: Boolean }) public submitButton = true;
5454

55-
@property({ type: String }) public submitButtonText = 'Submit';
55+
@property({ type: String }) public submitButtonLabel = 'Submit';
5656

5757
@state() private _uiState: unknown = {};
5858

@@ -129,7 +129,7 @@ export class Jsf extends LitElement {
129129
// return flag('allOf');
130130
}
131131

132-
const nodeParsed = node;
132+
let nodeParsed = node;
133133

134134
// if (currentNode.allOf) {
135135
// node.allOf?.forEach((subSchema) => {

‎packages/form/src/triage/array-primitive.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { html } from 'lit';
22

3+
import type { JSONSchema7, Path, UiSchema, Widgets } from '@jsfe/types';
4+
35
import type { Jsf } from '../json-schema-form.js';
4-
import type { Widgets, Path, UiSchema, JSONSchema7 } from '@jsfe/types';
56

67
export const fieldArrayPrimitive = (
78
schema: JSONSchema7,

‎packages/form/src/triage/array.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/* eslint-disable max-lines */
2+
23
/* eslint-disable arrow-body-style */
3-
import type { JSONSchema7 } from '@jsfe/types';
44
import { TemplateResult, html } from 'lit';
55

6+
import type { JSONSchema7 } from '@jsfe/types';
7+
import type { Path, UiSchema, Widgets } from '@jsfe/types';
8+
69
import type { Jsf } from '../json-schema-form.js';
7-
import type { Widgets, Path, UiSchema } from '@jsfe/types';
810

911
export const fieldArray = (
1012
schema: JSONSchema7,

‎packages/form/src/triage/object.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { html } from 'lit';
2+
23
import type { JSONSchema7 } from '@jsfe/types';
3-
import type { Widgets, Jsf, Path, UiSchema } from '../index.js';
4+
5+
import type { Jsf, Path, UiSchema, Widgets } from '../index.js';
46

57
export const fieldObject = (
68
schema: JSONSchema7,

‎packages/form/src/triage/primitive.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
// import { JsfText } from './../facades/text';
22
// import { debuggerInline } from './utils.js';
3+
34
/* eslint-disable arrow-body-style */
5+
46
/* eslint-disable max-lines */
7+
import { html } from 'lit';
58

6-
import type { Jsf } from '../json-schema-form.js';
9+
import type { JSONSchema7, Path, UiSchema, Widgets } from '@jsfe/types';
710

8-
import type { Widgets, Path, UiSchema, JSONSchema7 } from '@jsfe/types';
9-
import { html } from 'lit';
11+
import type { Jsf } from '../json-schema-form.js';
1012

1113
export const fieldPrimitive = (
1214
schema: JSONSchema7,

‎packages/material/src/form.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Jsf } from '@jsfe/form';
2-
import * as widgets from './widgets/index.js';
2+
33
import { styles } from './styles.js';
4+
import * as widgets from './widgets/index.js';
45

56
export class JsfMaterial extends Jsf {
67
public widgets = widgets;

‎packages/material/src/styles.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* STUB */
2-
32
import { css } from 'lit';
43

54
export const styles = css`

‎packages/material/src/widgets/array.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { html, nothing } from 'lit';
2+
13
import type { Widgets } from '@jsfe/types';
2-
import { nothing, html } from 'lit';
34

45
import '@material/web/button/outlined-button';
56

‎packages/material/src/widgets/object.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/* eslint-disable arrow-body-style */
2+
import { html, nothing } from 'lit';
3+
24
import type { Widgets } from '@jsfe/types';
3-
import { nothing, html } from 'lit';
5+
46
import '@material/web/elevation/elevation.js';
57

68
export const object: Widgets['object'] = (options) => {

‎packages/material/src/widgets/select.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { html } from 'lit';
33
import type { Widgets } from '@jsfe/types';
44

55
import '@material/web/select/outlined-select.js';
6-
import '@material/web/select/select-option.js';
76
import type { MdOutlinedSelect } from '@material/web/select/outlined-select.js';
7+
import '@material/web/select/select-option.js';
88

99
export const select: Widgets['select'] = (options) => html`
1010
<md-outlined-select

‎packages/shoelace/src/form.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Jsf } from '@jsfe/form';
2-
import * as widgets from './widgets/index.js';
2+
33
import { styles } from './styles.js';
4+
import * as widgets from './widgets/index.js';
45

56
export class JsfShoelace extends Jsf {
67
public widgets = widgets;

‎packages/shoelace/src/styles.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* STUB */
2-
32
import { css } from 'lit';
43

54
export const styles = css`

‎packages/shoelace/src/widgets/array.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// import '@shoelace-style/shoelace/dist/components/divider/divider.js';
66
// import '@shoelace-style/shoelace/dist/components/button-group/button-group.js';
77
// import '@shoelace-style/shoelace/dist/components/tooltip/tooltip.js';
8+
import { html, nothing } from 'lit';
89

910
import type { Widgets } from '@jsfe/types';
10-
import { nothing, html } from 'lit';
1111

1212
import '@shoelace-style/shoelace/dist/components/card/card.js';
1313
import '@shoelace-style/shoelace/dist/components/tag/tag.js';

‎packages/shoelace/src/widgets/button-group-boolean.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { html } from 'lit';
2-
// import { ifDefined } from 'lit/directives/if-defined.js';
32

3+
// import { ifDefined } from 'lit/directives/if-defined.js';
44
import type { Widgets } from '@jsfe/types';
55

6-
import '@shoelace-style/shoelace/dist/components/radio-group/radio-group.js';
7-
import '@shoelace-style/shoelace/dist/components/radio-button/radio-button.js';
86
import type { SlRadioGroup } from '@shoelace-style/shoelace';
7+
import '@shoelace-style/shoelace/dist/components/radio-button/radio-button.js';
8+
import '@shoelace-style/shoelace/dist/components/radio-group/radio-group.js';
99

1010
export const buttonGroupBoolean: Widgets['buttonGroupBoolean'] = (
1111
options,

‎packages/shoelace/src/widgets/button-group.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { html } from 'lit';
2-
// import { ifDefined } from 'lit/directives/if-defined.js';
32

3+
// import { ifDefined } from 'lit/directives/if-defined.js';
44
import type { Widgets } from '@jsfe/types';
55

6-
import '@shoelace-style/shoelace/dist/components/radio-group/radio-group.js';
7-
import '@shoelace-style/shoelace/dist/components/radio-button/radio-button.js';
86
import type { SlRadioGroup } from '@shoelace-style/shoelace';
7+
import '@shoelace-style/shoelace/dist/components/radio-button/radio-button.js';
8+
import '@shoelace-style/shoelace/dist/components/radio-group/radio-group.js';
99

1010
export const buttonGroup: Widgets['buttonGroup'] = (options) => html`
1111
<sl-radio-group

‎packages/shoelace/src/widgets/checkbox-group.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { html, nothing } from 'lit';
22

33
import type { Widgets } from '@jsfe/types';
44

5-
import '@shoelace-style/shoelace/dist/components/checkbox/checkbox.js';
65
import type { SlCheckbox } from '@shoelace-style/shoelace';
6+
import '@shoelace-style/shoelace/dist/components/checkbox/checkbox.js';
77

88
export const checkboxGroup: Widgets['checkboxGroup'] = (options) => html`
99
<fieldset

‎packages/shoelace/src/widgets/checkbox.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { ifDefined } from 'lit/directives/if-defined.js';
33

44
import type { Widgets } from '@jsfe/types';
55

6-
import '@shoelace-style/shoelace/dist/components/input/input.js';
76
import type { SlCheckbox } from '@shoelace-style/shoelace';
7+
import '@shoelace-style/shoelace/dist/components/input/input.js';
88

99
export const checkbox: Widgets['checkbox'] = (options) => html`
1010
<div class="theme-shoelace widget-checkbox">

‎packages/shoelace/src/widgets/color-picker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { html } from 'lit';
22

33
import type { Widgets } from '@jsfe/types';
44

5-
import '@shoelace-style/shoelace/dist/components/color-picker/color-picker.js';
65
import type { SlColorPicker } from '@shoelace-style/shoelace';
6+
import '@shoelace-style/shoelace/dist/components/color-picker/color-picker.js';
77

88
export const colorPicker: Widgets['colorPicker'] = (options) => html`
99
<div class="theme-shoelace widget-color-picker">

‎packages/shoelace/src/widgets/date.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { html } from 'lit';
2-
// import { ifDefined } from 'lit/directives/if-defined.js';
32

3+
// import { ifDefined } from 'lit/directives/if-defined.js';
44
import type { Widgets } from '@jsfe/types';
55

6-
import '@shoelace-style/shoelace/dist/components/input/input.js';
76
import type { SlInput } from '@shoelace-style/shoelace';
7+
import '@shoelace-style/shoelace/dist/components/input/input.js';
88

99
export const date: Widgets['date'] = (options) => html`
1010
<sl-input

‎packages/shoelace/src/widgets/number.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { ifDefined } from 'lit/directives/if-defined.js';
33

44
import type { Widgets } from '@jsfe/types';
55

6-
import '@shoelace-style/shoelace/dist/components/input/input.js';
76
import type { SlInput } from '@shoelace-style/shoelace';
7+
import '@shoelace-style/shoelace/dist/components/input/input.js';
88

99
export const number: Widgets['number'] = (options) =>
1010
html` <!-- -->

‎packages/shoelace/src/widgets/object.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { nothing, html } from 'lit';
1+
import { html, nothing } from 'lit';
22

33
import type { Widgets } from '@jsfe/types';
44

‎packages/shoelace/src/widgets/radio-group-boolean.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { html } from 'lit';
2-
// import { ifDefined } from 'lit/directives/if-defined.js';
32

3+
// import { ifDefined } from 'lit/directives/if-defined.js';
44
import type { Widgets } from '@jsfe/types';
55

6+
import type { SlRadioGroup } from '@shoelace-style/shoelace';
67
import '@shoelace-style/shoelace/dist/components/radio-group/radio-group.js';
78
import '@shoelace-style/shoelace/dist/components/radio/radio.js';
8-
import type { SlRadioGroup } from '@shoelace-style/shoelace';
99

1010
export const radioGroupBoolean: Widgets['radioGroupBoolean'] = (
1111
options,

‎packages/shoelace/src/widgets/radio-group.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { html } from 'lit';
2-
// import { ifDefined } from 'lit/directives/if-defined.js';
32

3+
// import { ifDefined } from 'lit/directives/if-defined.js';
44
import type { Widgets } from '@jsfe/types';
55

6+
import type { SlRadioGroup } from '@shoelace-style/shoelace';
67
import '@shoelace-style/shoelace/dist/components/radio-group/radio-group.js';
78
import '@shoelace-style/shoelace/dist/components/radio/radio.js';
8-
import type { SlRadioGroup } from '@shoelace-style/shoelace';
99

1010
export const radioGroup: Widgets['radioGroup'] = (options) => html`
1111
<sl-radio-group

‎packages/shoelace/src/widgets/range.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { ifDefined } from 'lit/directives/if-defined.js';
33

44
import type { Widgets } from '@jsfe/types';
55

6-
import '@shoelace-style/shoelace/dist/components/range/range.js';
76
import type { SlRange } from '@shoelace-style/shoelace';
7+
import '@shoelace-style/shoelace/dist/components/range/range.js';
88

99
export const range: Widgets['number'] = (options) =>
1010
html` <!-- -->

‎packages/shoelace/src/widgets/rating.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { ifDefined } from 'lit/directives/if-defined.js';
33

44
import type { Widgets } from '@jsfe/types';
55

6-
import '@shoelace-style/shoelace/dist/components/rating/rating.js';
76
import type { SlRating } from '@shoelace-style/shoelace';
7+
import '@shoelace-style/shoelace/dist/components/rating/rating.js';
88

99
export const rating: Widgets['number'] = (options) =>
1010
html`<!-- -->

‎packages/shoelace/src/widgets/select-multiple.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { html } from 'lit';
22

33
import type { Widgets } from '@jsfe/types';
44

5-
import '@shoelace-style/shoelace/dist/components/select/select.js';
65
import type { SlSelect, SlSelectEvent } from '@shoelace-style/shoelace';
6+
import '@shoelace-style/shoelace/dist/components/select/select.js';
77

88
export const selectMultiple: Widgets['selectMultiple'] = (options) => html`
99
<sl-select

‎packages/shoelace/src/widgets/select.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { ifDefined } from 'lit/directives/if-defined.js';
33

44
import type { Widgets } from '@jsfe/types';
55

6-
import '@shoelace-style/shoelace/dist/components/select/select.js';
7-
import '@shoelace-style/shoelace/dist/components/option/option.js';
86
import type { SlSelect } from '@shoelace-style/shoelace';
7+
import '@shoelace-style/shoelace/dist/components/option/option.js';
8+
import '@shoelace-style/shoelace/dist/components/select/select.js';
99

1010
export const select: Widgets['select'] = (options) => html`
1111
<sl-select

‎packages/shoelace/src/widgets/switch.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { html, nothing } from 'lit';
2-
// import { ifDefined } from 'lit/directives/if-defined.js';
32

3+
// import { ifDefined } from 'lit/directives/if-defined.js';
44
import type { Widgets } from '@jsfe/types';
55

6-
import '@shoelace-style/shoelace/dist/components/switch/switch.js';
76
import type { SlSwitch } from '@shoelace-style/shoelace';
7+
import '@shoelace-style/shoelace/dist/components/switch/switch.js';
88

99
export const switchh: Widgets['switch'] = (options) => html`
1010
<sl-switch

‎packages/shoelace/src/widgets/text.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { ifDefined } from 'lit/directives/if-defined.js';
33

44
import type { Widgets } from '@jsfe/types';
55

6-
import '@shoelace-style/shoelace/dist/components/input/input.js';
76
import type { SlInput } from '@shoelace-style/shoelace';
7+
import '@shoelace-style/shoelace/dist/components/input/input.js';
88

99
export const text: Widgets['text'] = (options) => html`
1010
<!-- ${options.pattern} -->

0 commit comments

Comments
 (0)