Skip to content

Commit 1236078

Browse files
JulianCataldoJulianCataldo
committed
revert: "style: bulk reformat with new imports orders"
This reverts commit 7483287.
1 parent e0ecf92 commit 1236078

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

+108
-121
lines changed

‎packages/carbon/src/form.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Jsf } from '@jsfe/form';
2-
3-
import { styles } from './styles.js';
42
import * as widgets from './widgets/index.js';
3+
import { styles } from './styles.js';
54

65
export class JsfCarbon extends Jsf {
76
public widgets = widgets;

‎packages/carbon/src/styles.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* STUB */
2+
23
import { css } from 'lit';
34

45
export const styles = css`

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { html, nothing } from 'lit';
2-
1+
import { nothing, html } from 'lit';
32
import type { Widgets } from '@jsfe/types';
43

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

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
/* eslint-disable max-lines */
2-
32
/* eslint-disable class-methods-use-this */
4-
53
/* eslint-disable no-underscore-dangle */
6-
// import deepmerge from 'deepmerge';
7-
import set from 'lodash-es/set';
84

95
import {
10-
type CSSResult,
116
LitElement,
12-
type TemplateResult,
137
html,
14-
nothing,
158
unsafeCSS,
9+
type TemplateResult,
10+
type CSSResult,
11+
nothing,
1612
} from 'lit';
13+
1714
import { property, state } from 'lit/decorators.js';
1815
import { createRef, ref } from 'lit/directives/ref.js';
1916

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+
2026
import type {
2127
DataChangeCallback,
2228
FeatureFlags,
23-
JSONSchema7,
2429
OnFormSubmit,
2530
Path,
2631
UiSchema,
2732
Widgets,
33+
JSONSchema7,
2834
} from '@jsfe/types';
2935

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 submitButtonLabel = 'Submit';
55+
@property({ type: String }) public submitButtonText = 'Submit';
5656

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

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

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

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

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { html } from 'lit';
22

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

76
export const fieldArrayPrimitive = (
87
schema: JSONSchema7,

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
/* eslint-disable max-lines */
2-
32
/* eslint-disable arrow-body-style */
4-
import { TemplateResult, html } from 'lit';
5-
63
import type { JSONSchema7 } from '@jsfe/types';
7-
import type { Path, UiSchema, Widgets } from '@jsfe/types';
4+
import { TemplateResult, html } from 'lit';
85

96
import type { Jsf } from '../json-schema-form.js';
7+
import type { Widgets, Path, UiSchema } from '@jsfe/types';
108

119
export const fieldArray = (
1210
schema: JSONSchema7,

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { html } from 'lit';
2-
32
import type { JSONSchema7 } from '@jsfe/types';
4-
5-
import type { Jsf, Path, UiSchema, Widgets } from '../index.js';
3+
import type { Widgets, Jsf, Path, UiSchema } from '../index.js';
64

75
export const fieldObject = (
86
schema: JSONSchema7,

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
// import { JsfText } from './../facades/text';
22
// import { debuggerInline } from './utils.js';
3-
43
/* eslint-disable arrow-body-style */
5-
64
/* eslint-disable max-lines */
7-
import { html } from 'lit';
8-
9-
import type { JSONSchema7, Path, UiSchema, Widgets } from '@jsfe/types';
105

116
import type { Jsf } from '../json-schema-form.js';
127

8+
import type { Widgets, Path, UiSchema, JSONSchema7 } from '@jsfe/types';
9+
import { html } from 'lit';
10+
1311
export const fieldPrimitive = (
1412
schema: JSONSchema7,
1513
value: unknown,

‎packages/material/src/form.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Jsf } from '@jsfe/form';
2-
3-
import { styles } from './styles.js';
42
import * as widgets from './widgets/index.js';
3+
import { styles } from './styles.js';
54

65
export class JsfMaterial extends Jsf {
76
public widgets = widgets;

‎packages/material/src/styles.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* STUB */
2+
23
import { css } from 'lit';
34

45
export const styles = css`

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { html, nothing } from 'lit';
2-
31
import type { Widgets } from '@jsfe/types';
2+
import { nothing, html } from 'lit';
43

54
import '@material/web/button/outlined-button';
65

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/* eslint-disable arrow-body-style */
2-
import { html, nothing } from 'lit';
3-
42
import type { Widgets } from '@jsfe/types';
5-
3+
import { nothing, html } from 'lit';
64
import '@material/web/elevation/elevation.js';
75

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

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

+1-1
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 type { MdOutlinedSelect } from '@material/web/select/outlined-select.js';
76
import '@material/web/select/select-option.js';
7+
import type { MdOutlinedSelect } from '@material/web/select/outlined-select.js';
88

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

‎packages/shoelace/src/form.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Jsf } from '@jsfe/form';
2-
3-
import { styles } from './styles.js';
42
import * as widgets from './widgets/index.js';
3+
import { styles } from './styles.js';
54

65
export class JsfShoelace extends Jsf {
76
public widgets = widgets;

‎packages/shoelace/src/styles.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* STUB */
2+
23
import { css } from 'lit';
34

45
export const styles = css`

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

+1-1
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';
98

109
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { html } from 'lit';
2-
32
// import { ifDefined } from 'lit/directives/if-defined.js';
3+
44
import type { Widgets } from '@jsfe/types';
55

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

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

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { html } from 'lit';
2-
32
// import { ifDefined } from 'lit/directives/if-defined.js';
3+
44
import type { Widgets } from '@jsfe/types';
55

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

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

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

+1-1
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 type { SlCheckbox } from '@shoelace-style/shoelace';
65
import '@shoelace-style/shoelace/dist/components/checkbox/checkbox.js';
6+
import type { SlCheckbox } from '@shoelace-style/shoelace';
77

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

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

+1-1
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 type { SlCheckbox } from '@shoelace-style/shoelace';
76
import '@shoelace-style/shoelace/dist/components/input/input.js';
7+
import type { SlCheckbox } from '@shoelace-style/shoelace';
88

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

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

+1-1
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 type { SlColorPicker } from '@shoelace-style/shoelace';
65
import '@shoelace-style/shoelace/dist/components/color-picker/color-picker.js';
6+
import type { SlColorPicker } from '@shoelace-style/shoelace';
77

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { html } from 'lit';
2-
32
// import { ifDefined } from 'lit/directives/if-defined.js';
3+
44
import type { Widgets } from '@jsfe/types';
55

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

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

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

+1-1
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 type { SlInput } from '@shoelace-style/shoelace';
76
import '@shoelace-style/shoelace/dist/components/input/input.js';
7+
import type { SlInput } from '@shoelace-style/shoelace';
88

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { html, nothing } from 'lit';
1+
import { nothing, html } from 'lit';
22

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { html } from 'lit';
2-
32
// import { ifDefined } from 'lit/directives/if-defined.js';
3+
44
import type { Widgets } from '@jsfe/types';
55

6-
import type { SlRadioGroup } from '@shoelace-style/shoelace';
76
import '@shoelace-style/shoelace/dist/components/radio-group/radio-group.js';
87
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { html } from 'lit';
2-
32
// import { ifDefined } from 'lit/directives/if-defined.js';
3+
44
import type { Widgets } from '@jsfe/types';
55

6-
import type { SlRadioGroup } from '@shoelace-style/shoelace';
76
import '@shoelace-style/shoelace/dist/components/radio-group/radio-group.js';
87
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

+1-1
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 type { SlRange } from '@shoelace-style/shoelace';
76
import '@shoelace-style/shoelace/dist/components/range/range.js';
7+
import type { SlRange } from '@shoelace-style/shoelace';
88

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

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

+1-1
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 type { SlRating } from '@shoelace-style/shoelace';
76
import '@shoelace-style/shoelace/dist/components/rating/rating.js';
7+
import type { SlRating } from '@shoelace-style/shoelace';
88

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

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

+1-1
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 type { SlSelect, SlSelectEvent } from '@shoelace-style/shoelace';
65
import '@shoelace-style/shoelace/dist/components/select/select.js';
6+
import type { SlSelect, SlSelectEvent } from '@shoelace-style/shoelace';
77

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

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

+2-2
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 type { SlSelect } from '@shoelace-style/shoelace';
7-
import '@shoelace-style/shoelace/dist/components/option/option.js';
86
import '@shoelace-style/shoelace/dist/components/select/select.js';
7+
import '@shoelace-style/shoelace/dist/components/option/option.js';
8+
import type { SlSelect } from '@shoelace-style/shoelace';
99

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { html, nothing } from 'lit';
2-
32
// import { ifDefined } from 'lit/directives/if-defined.js';
3+
44
import type { Widgets } from '@jsfe/types';
55

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

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

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

+1-1
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 type { SlInput } from '@shoelace-style/shoelace';
76
import '@shoelace-style/shoelace/dist/components/input/input.js';
7+
import type { SlInput } from '@shoelace-style/shoelace';
88

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

0 commit comments

Comments
 (0)