Skip to content

Commit be508f9

Browse files
nathancahillnathancahill
committed
format
1 parent e7a7177 commit be508f9

23 files changed

+111
-206
lines changed

‎package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
"jsdom": "^16.2.2",
1919
"prettier": "^2.0.5",
2020
"rollup": "^2.15.0",
21+
"prettier-plugin-svelte": "^1.1.0",
22+
"rollup": "^2.11.2",
2123
"rollup-plugin-svelte": "^5.2.2"
2224
},
2325
"dependencies": {
24-
"code-red": "^0.1.1",
2526
"lodash-es": "^4.0.0",
26-
"svelte": "^3.20.1"
27+
"svelte": "^3.23.0"
2728
},
2829
"keywords": [
2930
"svelte"
@@ -35,7 +36,7 @@
3536
"scripts": {
3637
"build": "rollup -c",
3738
"watch": "rollup -cw",
38-
"format": "prettier --write \"**/*.js\" \"**/*.json\"",
39+
"format": "prettier --write \"**/*.js\" \"**/*.json\" \"**/*.svelte\"",
3940
"test": "jest",
4041
"preversion": "yarn run test",
4142
"postversion": "git push && git push --tags"

‎prettier.config.js

+12
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,16 @@ module.exports = {
44
tabWidth: 4,
55
semi: false,
66
singleQuote: true,
7+
arrowParens: 'avoid',
8+
svelteSortOrder: 'styles-scripts-markup',
9+
svelteBracketNewLine: true,
10+
overrides: [
11+
{
12+
files: '*.svelte',
13+
options: {
14+
parser: 'svelte',
15+
printWidth: 120,
16+
},
17+
},
18+
],
719
}

‎src/ErrorMessage.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
function propsToString(p) {
1212
const s = reduce(
1313
omit(p, omitted),
14-
(a, v, k) => typeof v === 'boolean' ? `${a} ${k}`.trim() : `${a} ${k}="${v}"`.trim(),
15-
''
14+
(a, v, k) => (typeof v === 'boolean' ? `${a} ${k}`.trim() : `${a} ${k}="${v}"`.trim()),
15+
'',
1616
)
1717
1818
return s ? ` ${s}` : ''

‎src/Field.svelte

+12-65
Original file line numberDiff line numberDiff line change
@@ -37,37 +37,19 @@
3737
{#if multiple}
3838
<!-- select multiple does not work with spread props -->
3939
<!-- https://github.com/sveltejs/svelte/issues/4392 -->
40-
<select
41-
name={name}
42-
multiple
43-
value={$values[name]}
44-
on:blur={handleBlur}
45-
on:input={handleInput}
46-
>
47-
<slot></slot>
40+
<select {name} multiple value={$values[name]} on:blur={handleBlur} on:input={handleInput}>
41+
<slot />
4842
</select>
4943
{:else}
50-
<select
51-
name={name}
52-
value={$values[name]}
53-
{...$$restProps}
54-
on:blur={handleBlur}
55-
on:input={handleInput}
56-
>
57-
<slot></slot>
44+
<select {name} value={$values[name]} {...$$restProps} on:blur={handleBlur} on:input={handleInput}>
45+
<slot />
5846
</select>
5947
{/if}
6048
{:else if as === 'textarea'}
61-
<textarea
62-
name={name}
63-
value={$values[name]}
64-
{...$$restProps}
65-
on:blur={handleBlur}
66-
on:input={handleInput}
67-
/>
49+
<textarea {name} value={$values[name]} {...$$restProps} on:blur={handleBlur} on:input={handleInput} />
6850
{:else if as === 'checkbox'}
6951
<input
70-
name={name}
52+
{name}
7153
type="checkbox"
7254
checked={$values[name]}
7355
{...$$restProps}
@@ -77,63 +59,28 @@
7759
{:else if typeof as === 'object' || typeof as === 'function'}
7860
<svelte:component
7961
this={as}
80-
field={{
81-
name,
82-
value: $values[name],
83-
handleBlur: contextHandleBlur,
84-
handleInput: contextHandleInput,
85-
}}
62+
field={{ name, value: $values[name], handleBlur: contextHandleBlur, handleInput: contextHandleInput }}
8663
form={sveltikBag}
87-
meta={{
88-
initialError: initialErrors[name],
89-
initialTouched: initialTouched[name],
90-
initialValue: initialValues[name],
91-
initialWarning: initialWarnings[name],
92-
value: $values[name],
93-
touched: $touched[name],
94-
error: $errors[name],
95-
warning: $warnings[name],
96-
}}
64+
meta={{ initialError: initialErrors[name], initialTouched: initialTouched[name], initialValue: initialValues[name], initialWarning: initialWarnings[name], value: $values[name], touched: $touched[name], error: $errors[name], warning: $warnings[name] }}
9765
props={$$restProps}
9866
/>
9967
{:else}
10068
<slot
101-
field={{
102-
name,
103-
value: $values[name],
104-
handleBlur: contextHandleBlur,
105-
handleInput: contextHandleInput,
106-
}}
69+
field={{ name, value: $values[name], handleBlur: contextHandleBlur, handleInput: contextHandleInput }}
10770
form={sveltikBag}
108-
meta={{
109-
initialError: initialErrors[name],
110-
initialTouched: initialTouched[name],
111-
initialValue: initialValues[name],
112-
initialWarning: initialWarnings[name],
113-
value: $values[name],
114-
touched: $touched[name],
115-
error: $errors[name],
116-
warning: $warnings[name],
117-
}}
71+
meta={{ initialError: initialErrors[name], initialTouched: initialTouched[name], initialValue: initialValues[name], initialWarning: initialWarnings[name], value: $values[name], touched: $touched[name], error: $errors[name], warning: $warnings[name] }}
11872
>
11973
{#if type === 'number'}
12074
<input
121-
name={name}
75+
{name}
12276
type="number"
12377
value={$values[name]}
12478
{...$$restProps}
12579
on:blur={handleBlur}
12680
on:input={handleInput}
12781
/>
12882
{:else}
129-
<input
130-
name={name}
131-
value={$values[name]}
132-
type={type}
133-
{...$$restProps}
134-
on:blur={handleBlur}
135-
on:input={handleInput}
136-
/>
83+
<input {name} value={$values[name]} {type} {...$$restProps} on:blur={handleBlur} on:input={handleInput} />
13784
{/if}
13885
</slot>
13986
{/if}

‎src/Form.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
const handleReset = getContext('handleReset')
66
</script>
77

8-
<form
9-
on:submit|preventDefault={handleSubmit}
10-
on:reset|preventDefault={handleReset}
11-
{...$$props}
12-
>
13-
<slot></slot>
8+
<form on:submit|preventDefault={handleSubmit} on:reset|preventDefault={handleReset} {...$$props}>
9+
<slot />
1410
</form>

‎src/Sveltik.svelte

+5-42
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@
293293
touched={$touched}
294294
values={$values}
295295
warnings={$warnings}
296-
297296
{isDirty}
298297
{isSubmitting}
299298
{isValid}
@@ -302,7 +301,6 @@
302301
{submitAttemptCount}
303302
{submitFailureCount}
304303
{submitSuccessCount}
305-
306304
{resetForm}
307305
{setErrors}
308306
{setFieldError}
@@ -319,47 +317,12 @@
319317
{submitSuccess}
320318
{validateField}
321319
{validateForm}
322-
323320
{handleBlur}
324321
{handleInput}
325322
{handleReset}
326323
{handleSubmit}
327-
328-
props={{
329-
errors: $errors,
330-
touched: $touched,
331-
values: $values,
332-
warnings: $warnings,
333-
334-
isDirty,
335-
isSubmitting,
336-
isValid,
337-
isValidating,
338-
status,
339-
submitAttemptCount,
340-
submitFailureCount,
341-
submitSuccessCount,
342-
343-
resetForm,
344-
setErrors,
345-
setFieldError,
346-
setFieldTouched,
347-
setFieldValue,
348-
setFieldWarning,
349-
setStatus,
350-
setSubmitting,
351-
setTouched,
352-
setValues,
353-
setWarnings,
354-
submitFailure,
355-
submitForm,
356-
submitSuccess,
357-
validateField,
358-
validateForm,
359-
360-
handleBlur,
361-
handleInput,
362-
handleReset,
363-
handleSubmit,
364-
}}
365-
></slot>
324+
props={{ errors: $errors, touched: $touched, values: $values, warnings: $warnings,
325+
isDirty, isSubmitting, isValid, isValidating, status, submitAttemptCount, submitFailureCount, submitSuccessCount,
326+
resetForm, setErrors, setFieldError, setFieldTouched, setFieldValue, setFieldWarning, setStatus, setSubmitting, setTouched, setValues, setWarnings, submitFailure, submitForm, submitSuccess, validateField, validateForm,
327+
handleBlur, handleInput, handleReset, handleSubmit }}
328+
/>

‎tests/fixtures/as-component.svelte

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script>
2-
import { Field } from '../../src'
3-
import Input from './input-component.svelte'
2+
import { Field } from '../../src'
3+
import Input from './input-component.svelte'
44
</script>
55

6-
<Field as={Input} name="color" placeholder="Blue"></Field>
6+
<Field as={Input} name="color" placeholder="Blue" />

‎tests/fixtures/as-input-number.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
import { Field } from '../../src'
2+
import { Field } from '../../src'
33
</script>
44

5-
<Field as="input" type="number" name="color"></Field>
5+
<Field as="input" type="number" name="color" />

‎tests/fixtures/as-input.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
import { Field } from '../../src'
2+
import { Field } from '../../src'
33
</script>
44

5-
<Field as="input" name="color"></Field>
5+
<Field as="input" name="color" />

‎tests/fixtures/checkbox-rest.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
import { Field } from '../../src'
2+
import { Field } from '../../src'
33
</script>
44

5-
<Field as="checkbox" name="color" class="purple"></Field>
5+
<Field as="checkbox" name="color" class="purple" />

‎tests/fixtures/checkbox.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
import { Field } from '../../src'
2+
import { Field } from '../../src'
33
</script>
44

5-
<Field as="checkbox" name="color"></Field>
5+
<Field as="checkbox" name="color" />

‎tests/fixtures/errors-untouched.svelte

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<script>
2-
import { Sveltik, ErrorMessage } from '../../src'
3-
import MyError from './my-error.svelte'
2+
import { Sveltik, ErrorMessage } from '../../src'
3+
import MyError from './my-error.svelte'
44
5-
let initialErrors = {
6-
color: 'Required'
7-
}
5+
let initialErrors = {
6+
color: 'Required',
7+
}
88
9-
let initialTouched = {
10-
color: false,
11-
}
9+
let initialTouched = {
10+
color: false,
11+
}
1212
</script>
1313

1414
<Sveltik {initialErrors} {initialTouched}>

‎tests/fixtures/errors.svelte

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<script>
2-
import { Sveltik, ErrorMessage } from '../../src'
3-
import MyError from './my-error.svelte'
2+
import { Sveltik, ErrorMessage } from '../../src'
3+
import MyError from './my-error.svelte'
44
5-
let initialErrors = {
6-
color: 'Required'
7-
}
5+
let initialErrors = {
6+
color: 'Required',
7+
}
88
9-
let initialTouched = {
10-
color: true,
11-
}
9+
let initialTouched = {
10+
color: true,
11+
}
1212
</script>
1313

1414
<Sveltik {initialErrors} {initialTouched}>

‎tests/fixtures/hello-world.svelte

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<script>
2-
import { Sveltik } from '../../src'
2+
import { Sveltik } from '../../src'
33
4-
const initialValues = {
5-
name: 'world'
6-
}
4+
const initialValues = {
5+
name: 'world',
6+
}
77
</script>
88

99
<Sveltik {initialValues} let:values>

‎tests/fixtures/input-component.svelte

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,4 @@
33
export let props
44
</script>
55

6-
<input
7-
type="text"
8-
{...field}
9-
{...props}
10-
on:input={field.handleInput}
11-
on:blur={field.handleBlur}
12-
/>
6+
<input type="text" {...field} {...props} on:input={field.handleInput} on:blur={field.handleBlur} />

‎tests/fixtures/input-let-props.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
import { Field } from '../../src'
2+
import { Field } from '../../src'
33
</script>
44

55
<Field name="color" let:field>

‎tests/fixtures/input-slot.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
import { Field } from '../../src'
2+
import { Field } from '../../src'
33
</script>
44

55
<Field name="color">

0 commit comments

Comments
 (0)