react-server-actions 1.0.9 → 1.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/__tests__/helpers.test.d.ts +2 -0
- package/dist/client/__tests__/helpers.test.d.ts.map +1 -0
- package/dist/client/__tests__/helpers.test.js +440 -0
- package/dist/client/__tests__/helpers.test.js.map +1 -0
- package/dist/client/helpers.d.ts.map +1 -1
- package/dist/client/helpers.js +41 -22
- package/dist/client/helpers.js.map +1 -1
- package/dist/client/index.d.ts +2 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +2 -2
- package/dist/client/index.js.map +1 -1
- package/package.json +3 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers.test.d.ts","sourceRoot":"","sources":["../../../src/client/__tests__/helpers.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,440 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
import { getZodValidationAttributes } from '../helpers.js';
|
|
4
|
+
describe('getZodValidationAttributes', () => {
|
|
5
|
+
describe('String validation', () => {
|
|
6
|
+
it('should handle basic string field', () => {
|
|
7
|
+
const schema = z.object({ name: z.string() });
|
|
8
|
+
const result = getZodValidationAttributes(schema, ['name']);
|
|
9
|
+
expect(result).toEqual({
|
|
10
|
+
type: 'string',
|
|
11
|
+
attrs: { required: true },
|
|
12
|
+
});
|
|
13
|
+
});
|
|
14
|
+
it('should handle string with min/max length', () => {
|
|
15
|
+
const schema = z.object({
|
|
16
|
+
username: z.string().min(3).max(20),
|
|
17
|
+
});
|
|
18
|
+
const result = getZodValidationAttributes(schema, ['username']);
|
|
19
|
+
expect(result).toEqual({
|
|
20
|
+
type: 'string',
|
|
21
|
+
attrs: {
|
|
22
|
+
required: true,
|
|
23
|
+
minLength: 3,
|
|
24
|
+
maxLength: 20,
|
|
25
|
+
},
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
it('should handle email validation with type inference', () => {
|
|
29
|
+
const schema = z.object({
|
|
30
|
+
email: z.string().email(),
|
|
31
|
+
});
|
|
32
|
+
const result = getZodValidationAttributes(schema, ['email'], {
|
|
33
|
+
inferTypeAttr: true,
|
|
34
|
+
});
|
|
35
|
+
expect(result).toEqual({
|
|
36
|
+
type: 'string',
|
|
37
|
+
attrs: {
|
|
38
|
+
required: true,
|
|
39
|
+
type: 'email',
|
|
40
|
+
},
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
it('should handle URL validation with type inference', () => {
|
|
44
|
+
const schema = z.object({
|
|
45
|
+
website: z.string().url(),
|
|
46
|
+
});
|
|
47
|
+
const result = getZodValidationAttributes(schema, ['website'], {
|
|
48
|
+
inferTypeAttr: true,
|
|
49
|
+
});
|
|
50
|
+
expect(result).toEqual({
|
|
51
|
+
type: 'string',
|
|
52
|
+
attrs: {
|
|
53
|
+
required: true,
|
|
54
|
+
type: 'url',
|
|
55
|
+
},
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
describe('Number validation', () => {
|
|
60
|
+
it('should handle basic number', () => {
|
|
61
|
+
const schema = z.object({
|
|
62
|
+
age: z.number(),
|
|
63
|
+
});
|
|
64
|
+
const result = getZodValidationAttributes(schema, ['age'], {
|
|
65
|
+
inferTypeAttr: true,
|
|
66
|
+
});
|
|
67
|
+
expect(result).toEqual({
|
|
68
|
+
type: 'number',
|
|
69
|
+
attrs: {
|
|
70
|
+
required: true,
|
|
71
|
+
type: 'number',
|
|
72
|
+
},
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
it('should handle number with min/max/int', () => {
|
|
76
|
+
const schema = z.object({
|
|
77
|
+
rating: z.number().min(1).max(5).int(),
|
|
78
|
+
});
|
|
79
|
+
const result = getZodValidationAttributes(schema, ['rating'], {
|
|
80
|
+
inferTypeAttr: true,
|
|
81
|
+
});
|
|
82
|
+
expect(result).toEqual({
|
|
83
|
+
type: 'number',
|
|
84
|
+
attrs: {
|
|
85
|
+
required: true,
|
|
86
|
+
type: 'number',
|
|
87
|
+
min: 1,
|
|
88
|
+
max: 5,
|
|
89
|
+
step: 1,
|
|
90
|
+
},
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
it('should handle coerced number', () => {
|
|
94
|
+
const schema = z.object({
|
|
95
|
+
quantity: z.coerce.number().positive(),
|
|
96
|
+
});
|
|
97
|
+
const result = getZodValidationAttributes(schema, ['quantity'], {
|
|
98
|
+
inferTypeAttr: true,
|
|
99
|
+
});
|
|
100
|
+
expect(result).toEqual({
|
|
101
|
+
type: 'number',
|
|
102
|
+
attrs: {
|
|
103
|
+
required: true,
|
|
104
|
+
type: 'number',
|
|
105
|
+
min: 0,
|
|
106
|
+
},
|
|
107
|
+
});
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
describe('Date validation', () => {
|
|
111
|
+
it('should handle basic date', () => {
|
|
112
|
+
const schema = z.object({
|
|
113
|
+
birthdate: z.date(),
|
|
114
|
+
});
|
|
115
|
+
const result = getZodValidationAttributes(schema, ['birthdate'], {
|
|
116
|
+
inferTypeAttr: true,
|
|
117
|
+
});
|
|
118
|
+
expect(result).toEqual({
|
|
119
|
+
type: 'date',
|
|
120
|
+
attrs: {
|
|
121
|
+
required: true,
|
|
122
|
+
type: 'date',
|
|
123
|
+
},
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
it('should handle date with min/max', () => {
|
|
127
|
+
const minDate = new Date('2023-01-01');
|
|
128
|
+
const maxDate = new Date('2023-12-31');
|
|
129
|
+
const schema = z.object({
|
|
130
|
+
eventDate: z.date().min(minDate).max(maxDate),
|
|
131
|
+
});
|
|
132
|
+
const result = getZodValidationAttributes(schema, ['eventDate'], {
|
|
133
|
+
inferTypeAttr: true,
|
|
134
|
+
});
|
|
135
|
+
expect(result).toEqual({
|
|
136
|
+
type: 'date',
|
|
137
|
+
attrs: {
|
|
138
|
+
required: true,
|
|
139
|
+
type: 'date',
|
|
140
|
+
min: '2023-01-01',
|
|
141
|
+
max: '2023-12-31',
|
|
142
|
+
},
|
|
143
|
+
});
|
|
144
|
+
});
|
|
145
|
+
it('should handle coerced date', () => {
|
|
146
|
+
const schema = z.object({
|
|
147
|
+
timestamp: z.coerce.date(),
|
|
148
|
+
});
|
|
149
|
+
const result = getZodValidationAttributes(schema, ['timestamp'], {
|
|
150
|
+
inferTypeAttr: true,
|
|
151
|
+
});
|
|
152
|
+
expect(result).toEqual({
|
|
153
|
+
type: 'date',
|
|
154
|
+
attrs: {
|
|
155
|
+
required: true,
|
|
156
|
+
type: 'date',
|
|
157
|
+
},
|
|
158
|
+
});
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
describe('Boolean validation', () => {
|
|
162
|
+
it('should handle boolean', () => {
|
|
163
|
+
const schema = z.object({
|
|
164
|
+
isActive: z.boolean(),
|
|
165
|
+
});
|
|
166
|
+
const result = getZodValidationAttributes(schema, ['isActive'], {
|
|
167
|
+
inferTypeAttr: true,
|
|
168
|
+
});
|
|
169
|
+
expect(result).toEqual({
|
|
170
|
+
type: 'boolean',
|
|
171
|
+
attrs: {
|
|
172
|
+
required: true,
|
|
173
|
+
type: 'checkbox',
|
|
174
|
+
},
|
|
175
|
+
});
|
|
176
|
+
});
|
|
177
|
+
it('should handle coerced boolean', () => {
|
|
178
|
+
const schema = z.object({
|
|
179
|
+
subscribe: z.coerce.boolean(),
|
|
180
|
+
});
|
|
181
|
+
const result = getZodValidationAttributes(schema, ['subscribe'], {
|
|
182
|
+
inferTypeAttr: true,
|
|
183
|
+
});
|
|
184
|
+
expect(result).toEqual({
|
|
185
|
+
type: 'boolean',
|
|
186
|
+
attrs: {
|
|
187
|
+
required: true,
|
|
188
|
+
type: 'checkbox',
|
|
189
|
+
},
|
|
190
|
+
});
|
|
191
|
+
});
|
|
192
|
+
it('should handle optional boolean', () => {
|
|
193
|
+
const schema = z.object({
|
|
194
|
+
subscribe: z.boolean().optional(),
|
|
195
|
+
});
|
|
196
|
+
const result = getZodValidationAttributes(schema, ['subscribe']);
|
|
197
|
+
expect(result).toEqual({
|
|
198
|
+
type: 'boolean',
|
|
199
|
+
attrs: {},
|
|
200
|
+
});
|
|
201
|
+
});
|
|
202
|
+
});
|
|
203
|
+
describe('Enum validation', () => {
|
|
204
|
+
it('should handle string enum', () => {
|
|
205
|
+
const schema = z.object({
|
|
206
|
+
role: z.enum(['admin', 'user', 'guest']),
|
|
207
|
+
});
|
|
208
|
+
const result = getZodValidationAttributes(schema, ['role'], {
|
|
209
|
+
inferTypeAttr: true,
|
|
210
|
+
});
|
|
211
|
+
expect(result).toEqual({
|
|
212
|
+
type: 'enum',
|
|
213
|
+
attrs: {
|
|
214
|
+
required: true,
|
|
215
|
+
type: 'radio',
|
|
216
|
+
},
|
|
217
|
+
});
|
|
218
|
+
});
|
|
219
|
+
it('should handle coerced enum', () => {
|
|
220
|
+
const schema = z.object({
|
|
221
|
+
status: z.enum(['active', 'inactive']),
|
|
222
|
+
});
|
|
223
|
+
const result = getZodValidationAttributes(schema, ['status'], {
|
|
224
|
+
inferTypeAttr: true,
|
|
225
|
+
});
|
|
226
|
+
expect(result).toEqual({
|
|
227
|
+
type: 'enum',
|
|
228
|
+
attrs: {
|
|
229
|
+
required: true,
|
|
230
|
+
type: 'radio',
|
|
231
|
+
},
|
|
232
|
+
});
|
|
233
|
+
});
|
|
234
|
+
});
|
|
235
|
+
describe('Optional and nullable fields', () => {
|
|
236
|
+
it('should handle optional string', () => {
|
|
237
|
+
const schema = z.object({
|
|
238
|
+
nickname: z.string().optional(),
|
|
239
|
+
});
|
|
240
|
+
const result = getZodValidationAttributes(schema, ['nickname']);
|
|
241
|
+
expect(result).toEqual({
|
|
242
|
+
type: 'string',
|
|
243
|
+
attrs: {},
|
|
244
|
+
});
|
|
245
|
+
});
|
|
246
|
+
it('should handle nullable number', () => {
|
|
247
|
+
const schema = z.object({
|
|
248
|
+
score: z.number().nullable(),
|
|
249
|
+
});
|
|
250
|
+
const result = getZodValidationAttributes(schema, ['score']);
|
|
251
|
+
expect(result).toEqual({
|
|
252
|
+
type: 'number',
|
|
253
|
+
attrs: {},
|
|
254
|
+
});
|
|
255
|
+
});
|
|
256
|
+
it('should handle optional and nullable date', () => {
|
|
257
|
+
const schema = z.object({
|
|
258
|
+
completedAt: z.date().optional().nullable(),
|
|
259
|
+
});
|
|
260
|
+
const result = getZodValidationAttributes(schema, ['completedAt']);
|
|
261
|
+
expect(result).toEqual({
|
|
262
|
+
type: 'date',
|
|
263
|
+
attrs: {},
|
|
264
|
+
});
|
|
265
|
+
});
|
|
266
|
+
});
|
|
267
|
+
describe('Nested objects and arrays', () => {
|
|
268
|
+
it('should handle nested object fields', () => {
|
|
269
|
+
const schema = z.object({
|
|
270
|
+
user: z.object({
|
|
271
|
+
profile: z.object({
|
|
272
|
+
displayName: z.string().min(2),
|
|
273
|
+
}),
|
|
274
|
+
}),
|
|
275
|
+
});
|
|
276
|
+
const result = getZodValidationAttributes(schema, [
|
|
277
|
+
'user',
|
|
278
|
+
'profile',
|
|
279
|
+
'displayName',
|
|
280
|
+
]);
|
|
281
|
+
expect(result).toEqual({
|
|
282
|
+
type: 'string',
|
|
283
|
+
attrs: {
|
|
284
|
+
required: true,
|
|
285
|
+
minLength: 2,
|
|
286
|
+
},
|
|
287
|
+
});
|
|
288
|
+
});
|
|
289
|
+
it('should handle non-existent nested path', () => {
|
|
290
|
+
const schema = z.object({
|
|
291
|
+
user: z.object({
|
|
292
|
+
name: z.string(),
|
|
293
|
+
}),
|
|
294
|
+
});
|
|
295
|
+
const result = getZodValidationAttributes(schema, [
|
|
296
|
+
'user',
|
|
297
|
+
'nonexistent',
|
|
298
|
+
'field',
|
|
299
|
+
]);
|
|
300
|
+
expect(result).toEqual({
|
|
301
|
+
type: 'string',
|
|
302
|
+
attrs: {},
|
|
303
|
+
});
|
|
304
|
+
});
|
|
305
|
+
});
|
|
306
|
+
describe('Type inference behavior', () => {
|
|
307
|
+
it('should not include type attribute when inferTypeAttr is false', () => {
|
|
308
|
+
const schema = z.object({
|
|
309
|
+
email: z.string().email(),
|
|
310
|
+
});
|
|
311
|
+
const result = getZodValidationAttributes(schema, ['email'], {
|
|
312
|
+
inferTypeAttr: false,
|
|
313
|
+
});
|
|
314
|
+
expect(result).toEqual({
|
|
315
|
+
type: 'string',
|
|
316
|
+
attrs: {
|
|
317
|
+
required: true,
|
|
318
|
+
},
|
|
319
|
+
});
|
|
320
|
+
});
|
|
321
|
+
it('should not include type attribute by default', () => {
|
|
322
|
+
const schema = z.object({
|
|
323
|
+
url: z.string().url(),
|
|
324
|
+
});
|
|
325
|
+
const result = getZodValidationAttributes(schema, ['url']);
|
|
326
|
+
expect(result).toEqual({
|
|
327
|
+
type: 'string',
|
|
328
|
+
attrs: {
|
|
329
|
+
required: true,
|
|
330
|
+
},
|
|
331
|
+
});
|
|
332
|
+
});
|
|
333
|
+
});
|
|
334
|
+
describe('Fields with default values', () => {
|
|
335
|
+
it('should not mark string with default as required', () => {
|
|
336
|
+
const schema = z.object({
|
|
337
|
+
name: z.string().default('Anonymous'),
|
|
338
|
+
});
|
|
339
|
+
const result = getZodValidationAttributes(schema, ['name']);
|
|
340
|
+
expect(result).toEqual({
|
|
341
|
+
type: 'string',
|
|
342
|
+
attrs: {},
|
|
343
|
+
});
|
|
344
|
+
});
|
|
345
|
+
it('should not mark number with default as required', () => {
|
|
346
|
+
const schema = z.object({
|
|
347
|
+
count: z.number().default(0),
|
|
348
|
+
});
|
|
349
|
+
const result = getZodValidationAttributes(schema, ['count'], {
|
|
350
|
+
inferTypeAttr: true,
|
|
351
|
+
});
|
|
352
|
+
expect(result).toEqual({
|
|
353
|
+
type: 'number',
|
|
354
|
+
attrs: {
|
|
355
|
+
type: 'number',
|
|
356
|
+
},
|
|
357
|
+
});
|
|
358
|
+
});
|
|
359
|
+
it('should not mark boolean with default as required', () => {
|
|
360
|
+
const schema = z.object({
|
|
361
|
+
isEnabled: z.boolean().default(false),
|
|
362
|
+
});
|
|
363
|
+
const result = getZodValidationAttributes(schema, ['isEnabled'], {
|
|
364
|
+
inferTypeAttr: true,
|
|
365
|
+
});
|
|
366
|
+
expect(result).toEqual({
|
|
367
|
+
type: 'boolean',
|
|
368
|
+
attrs: {
|
|
369
|
+
type: 'checkbox',
|
|
370
|
+
},
|
|
371
|
+
});
|
|
372
|
+
});
|
|
373
|
+
it('should handle default value with other validations', () => {
|
|
374
|
+
const schema = z.object({
|
|
375
|
+
age: z.number().min(0).max(120).default(18),
|
|
376
|
+
});
|
|
377
|
+
const result = getZodValidationAttributes(schema, ['age'], {
|
|
378
|
+
inferTypeAttr: true,
|
|
379
|
+
});
|
|
380
|
+
expect(result).toEqual({
|
|
381
|
+
type: 'number',
|
|
382
|
+
attrs: {
|
|
383
|
+
type: 'number',
|
|
384
|
+
min: 0,
|
|
385
|
+
max: 120,
|
|
386
|
+
},
|
|
387
|
+
});
|
|
388
|
+
});
|
|
389
|
+
it('should handle string with default and validation', () => {
|
|
390
|
+
const schema = z.object({
|
|
391
|
+
username: z.string().min(3).max(20).default('user123'),
|
|
392
|
+
});
|
|
393
|
+
const result = getZodValidationAttributes(schema, ['username']);
|
|
394
|
+
expect(result).toEqual({
|
|
395
|
+
type: 'string',
|
|
396
|
+
attrs: {
|
|
397
|
+
minLength: 3,
|
|
398
|
+
maxLength: 20,
|
|
399
|
+
},
|
|
400
|
+
});
|
|
401
|
+
});
|
|
402
|
+
it('should handle date with default and validation', () => {
|
|
403
|
+
const minDate = new Date('2023-01-01');
|
|
404
|
+
const maxDate = new Date('2023-12-31');
|
|
405
|
+
const schema = z.object({
|
|
406
|
+
eventDate: z
|
|
407
|
+
.date()
|
|
408
|
+
.min(minDate)
|
|
409
|
+
.max(maxDate)
|
|
410
|
+
.default(new Date('2023-06-15')),
|
|
411
|
+
});
|
|
412
|
+
const result = getZodValidationAttributes(schema, ['eventDate'], {
|
|
413
|
+
inferTypeAttr: true,
|
|
414
|
+
});
|
|
415
|
+
expect(result).toEqual({
|
|
416
|
+
type: 'date',
|
|
417
|
+
attrs: {
|
|
418
|
+
type: 'date',
|
|
419
|
+
min: '2023-01-01',
|
|
420
|
+
max: '2023-12-31',
|
|
421
|
+
},
|
|
422
|
+
});
|
|
423
|
+
});
|
|
424
|
+
it('should handle enum with default', () => {
|
|
425
|
+
const schema = z.object({
|
|
426
|
+
role: z.enum(['admin', 'user', 'guest']).default('user'),
|
|
427
|
+
});
|
|
428
|
+
const result = getZodValidationAttributes(schema, ['role'], {
|
|
429
|
+
inferTypeAttr: true,
|
|
430
|
+
});
|
|
431
|
+
expect(result).toEqual({
|
|
432
|
+
type: 'enum',
|
|
433
|
+
attrs: {
|
|
434
|
+
type: 'radio',
|
|
435
|
+
},
|
|
436
|
+
});
|
|
437
|
+
});
|
|
438
|
+
});
|
|
439
|
+
});
|
|
440
|
+
//# sourceMappingURL=helpers.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers.test.js","sourceRoot":"","sources":["../../../src/client/__tests__/helpers.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/client/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,CAAC,CAAC,UAAU,EACpB,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE;IACR,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACA;IACD,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IACxD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;CAClD,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/client/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,CAAC,CAAC,UAAU,EACpB,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE;IACR,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACA;IACD,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IACxD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;CAClD,CAwHA;AAED;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,SAAU,IAAI,uBAKjD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,SAAU,IAAI,WAKrD,CAAC"}
|
package/dist/client/helpers.js
CHANGED
|
@@ -18,7 +18,7 @@ export function getZodValidationAttributes(schema, path, options) {
|
|
|
18
18
|
const shape = def.shape();
|
|
19
19
|
const field = shape[path[0]];
|
|
20
20
|
return field
|
|
21
|
-
? getZodValidationAttributes(field, path.slice(1))
|
|
21
|
+
? getZodValidationAttributes(field, path.slice(1), options)
|
|
22
22
|
: { type, attrs };
|
|
23
23
|
}
|
|
24
24
|
// Now we're at the actual field, check if it's optional/nullable
|
|
@@ -26,21 +26,30 @@ export function getZodValidationAttributes(schema, path, options) {
|
|
|
26
26
|
const isNullableType = schema instanceof z.ZodNullable;
|
|
27
27
|
// If it's an optional/nullable type, get attributes from the inner type but don't set required
|
|
28
28
|
if (isOptionalType || isNullableType) {
|
|
29
|
-
const innerAttrs = getZodValidationAttributes(def.innerType, path);
|
|
29
|
+
const innerAttrs = getZodValidationAttributes(def.innerType, path, options);
|
|
30
30
|
delete innerAttrs.attrs.required;
|
|
31
31
|
return innerAttrs;
|
|
32
32
|
}
|
|
33
33
|
// Set required by default for non-optional/nullable fields
|
|
34
|
-
|
|
35
|
-
if (def.
|
|
34
|
+
// Skip required attribute if the field has a default value
|
|
35
|
+
if (!def.defaultValue) {
|
|
36
|
+
attrs.required = true;
|
|
37
|
+
}
|
|
38
|
+
const typeName = def.typeName === 'ZodDefault'
|
|
39
|
+
? def.innerType._def.typeName
|
|
40
|
+
: def.typeName === 'ZodCoerce'
|
|
41
|
+
? def.schema._def.typeName
|
|
42
|
+
: def.typeName;
|
|
43
|
+
if (typeName === 'ZodString') {
|
|
36
44
|
type = 'string';
|
|
37
45
|
attrs.type = 'text';
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
46
|
+
const checks = def.typeName === 'ZodDefault' ? def.innerType._def.checks : def.checks;
|
|
47
|
+
if (checks) {
|
|
48
|
+
for (const check of checks) {
|
|
49
|
+
if (check.kind === 'minlength' || check.kind === 'min') {
|
|
41
50
|
attrs.minLength = check.value;
|
|
42
51
|
}
|
|
43
|
-
if (check.kind === 'maxlength') {
|
|
52
|
+
if (check.kind === 'maxlength' || check.kind === 'max') {
|
|
44
53
|
attrs.maxLength = check.value;
|
|
45
54
|
}
|
|
46
55
|
if (check.kind === 'email') {
|
|
@@ -52,12 +61,15 @@ export function getZodValidationAttributes(schema, path, options) {
|
|
|
52
61
|
}
|
|
53
62
|
}
|
|
54
63
|
}
|
|
55
|
-
if (
|
|
56
|
-
(def.typeName === 'ZodCoerce' && def.schema._def.typeName === 'ZodNumber')) {
|
|
64
|
+
else if (typeName === 'ZodNumber') {
|
|
57
65
|
type = 'number';
|
|
58
66
|
attrs.type = 'number';
|
|
59
|
-
|
|
60
|
-
|
|
67
|
+
const checks = def.typeName === 'ZodDefault'
|
|
68
|
+
? def.innerType._def.checks
|
|
69
|
+
: def.typeName === 'ZodCoerce'
|
|
70
|
+
? def.schema._def.checks
|
|
71
|
+
: def.checks;
|
|
72
|
+
if (checks) {
|
|
61
73
|
for (const check of checks) {
|
|
62
74
|
if (check.kind === 'min') {
|
|
63
75
|
attrs.min = check.value;
|
|
@@ -71,29 +83,36 @@ export function getZodValidationAttributes(schema, path, options) {
|
|
|
71
83
|
}
|
|
72
84
|
}
|
|
73
85
|
}
|
|
74
|
-
if (
|
|
75
|
-
(def.typeName === 'ZodCoerce' && def.schema._def.typeName === 'ZodDate')) {
|
|
86
|
+
else if (typeName === 'ZodDate') {
|
|
76
87
|
type = 'date';
|
|
77
88
|
attrs.type = 'date';
|
|
78
|
-
|
|
79
|
-
|
|
89
|
+
const checks = def.typeName === 'ZodDefault'
|
|
90
|
+
? def.innerType._def.checks
|
|
91
|
+
: def.typeName === 'ZodCoerce'
|
|
92
|
+
? def.schema._def.checks
|
|
93
|
+
: def.checks;
|
|
94
|
+
if (checks) {
|
|
80
95
|
for (const check of checks) {
|
|
81
96
|
if (check.kind === 'min') {
|
|
82
|
-
|
|
97
|
+
const minDate = new Date(check.value).toISOString().split('T')[0];
|
|
98
|
+
if (minDate) {
|
|
99
|
+
attrs.min = minDate;
|
|
100
|
+
}
|
|
83
101
|
}
|
|
84
102
|
if (check.kind === 'max') {
|
|
85
|
-
|
|
103
|
+
const maxDate = new Date(check.value).toISOString().split('T')[0];
|
|
104
|
+
if (maxDate) {
|
|
105
|
+
attrs.max = maxDate;
|
|
106
|
+
}
|
|
86
107
|
}
|
|
87
108
|
}
|
|
88
109
|
}
|
|
89
110
|
}
|
|
90
|
-
if (
|
|
91
|
-
(def.typeName === 'ZodCoerce' && def.schema._def.typeName === 'ZodBoolean')) {
|
|
111
|
+
else if (typeName === 'ZodBoolean') {
|
|
92
112
|
type = 'boolean';
|
|
93
113
|
attrs.type = 'checkbox';
|
|
94
114
|
}
|
|
95
|
-
if (
|
|
96
|
-
(def.typeName === 'ZodCoerce' && def.schema._def.typeName === 'ZodEnum')) {
|
|
115
|
+
else if (typeName === 'ZodEnum') {
|
|
97
116
|
type = 'enum';
|
|
98
117
|
attrs.type = 'radio';
|
|
99
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/client/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;;GASG;AACH,MAAM,UAAU,0BAA0B,CACxC,MAAoB,EACpB,IAAc,EACd,OAEC;IAKD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC;IACxB,IAAI,IAAI,GAAsD,QAAQ,CAAC;IACvE,MAAM,KAAK,GAA8C,EAAE,CAAC;IAE5D,sDAAsD;IACtD,IAAI,GAAG,CAAC,QAAQ,KAAK,WAAW,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAuB,CAAC,CAAC;QACnD,OAAO,KAAK;YACV,CAAC,CAAC,0BAA0B,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/client/helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/client/index.d.ts
CHANGED
|
@@ -23,7 +23,7 @@ type UseFieldReturn = {
|
|
|
23
23
|
};
|
|
24
24
|
};
|
|
25
25
|
export declare const useField: <Schema extends z.AnyZodObject>() => UseFieldReturn;
|
|
26
|
-
export declare function Form<Schema extends z.AnyZodObject>({ children, action, state, schema, className, reset, onSuccess, onError, debug, }: {
|
|
26
|
+
export declare function Form<Schema extends z.AnyZodObject>({ children, action, state, schema, className, reset, onSuccess, onError, debug, ...props }: {
|
|
27
27
|
children: React.ReactNode;
|
|
28
28
|
action: (payload: FormData) => void;
|
|
29
29
|
state: ActionResult<Schema>;
|
|
@@ -33,6 +33,7 @@ export declare function Form<Schema extends z.AnyZodObject>({ children, action,
|
|
|
33
33
|
onSuccess?: (successData: any, formData: z.TypeOf<Schema> | undefined) => void;
|
|
34
34
|
onError?: (error: string) => void;
|
|
35
35
|
debug?: boolean;
|
|
36
|
+
props?: React.HTMLAttributes<HTMLFormElement>;
|
|
36
37
|
}): React.JSX.Element;
|
|
37
38
|
export declare function FormField<Schema extends z.AnyZodObject>({ render, name, }: {
|
|
38
39
|
render: (field: ReturnType<typeof useField>) => React.ReactNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAYhD,eAAO,MAAM,OAAO,GAAI,MAAM,SAAS,CAAC,CAAC,YAAY;;;;;WAKzB,YAAY,CAAC,MAAM,CAAC;YAClB,MAAM;;CAGnC,CAAC;AAOF,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE;QACL,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QAEb,cAAc,EAAE,OAAO,CAAC;QACxB,YAAY,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS,CAAC;QACvC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,cAAc,CAAC,EAAE,OAAO,CAAC;KAC1B,CAAC;CACH,CAAC;AACF,eAAO,MAAM,QAAQ,GAAI,MAAM,SAAS,CAAC,CAAC,YAAY,OAAK,cAkD1D,CAAC;AAEF,wBAAgB,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,YAAY,EAAE,EAClD,QAAQ,EACR,MAAM,EACN,KAAK,EACL,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,OAAO,EACP,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAYhD,eAAO,MAAM,OAAO,GAAI,MAAM,SAAS,CAAC,CAAC,YAAY;;;;;WAKzB,YAAY,CAAC,MAAM,CAAC;YAClB,MAAM;;CAGnC,CAAC;AAOF,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE;QACL,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QAEb,cAAc,EAAE,OAAO,CAAC;QACxB,YAAY,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS,CAAC;QACvC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,cAAc,CAAC,EAAE,OAAO,CAAC;KAC1B,CAAC;CACH,CAAC;AACF,eAAO,MAAM,QAAQ,GAAI,MAAM,SAAS,CAAC,CAAC,YAAY,OAAK,cAkD1D,CAAC;AAEF,wBAAgB,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,YAAY,EAAE,EAClD,QAAQ,EACR,MAAM,EACN,KAAK,EACL,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,OAAO,EACP,KAAK,EACL,GAAG,KAAK,EACT,EAAE;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,MAAM,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,CACV,WAAW,EAAE,GAAG,EAChB,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,KACnC,IAAI,CAAC;IACV,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;CAC/C,qBAsBA;AAED,wBAAgB,SAAS,CAAC,MAAM,SAAS,CAAC,CAAC,YAAY,EAAE,EACvD,MAAM,EACN,IAAI,GACL,EAAE;IACD,MAAM,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,KAAK,KAAK,CAAC,SAAS,CAAC;IAChE,IAAI,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;CAC9B,qBAOA"}
|
package/dist/client/index.js
CHANGED
|
@@ -67,7 +67,7 @@ export const useField = () => {
|
|
|
67
67
|
}
|
|
68
68
|
return field;
|
|
69
69
|
};
|
|
70
|
-
export function Form({ children, action, state, schema, className, reset, onSuccess, onError, debug, }) {
|
|
70
|
+
export function Form({ children, action, state, schema, className, reset, onSuccess, onError, debug, ...props }) {
|
|
71
71
|
const formRef = useRef(null);
|
|
72
72
|
if (reset !== false) {
|
|
73
73
|
if (formRef.current && state.success) {
|
|
@@ -83,7 +83,7 @@ export function Form({ children, action, state, schema, className, reset, onSucc
|
|
|
83
83
|
}
|
|
84
84
|
}, [state, onSuccess, onError]);
|
|
85
85
|
return (React.createElement(FormContext.Provider, { value: { state, schema, debug } },
|
|
86
|
-
React.createElement("form", { action: action, ref: formRef, className: className }, children)));
|
|
86
|
+
React.createElement("form", { action: action, ref: formRef, className: className, ...props }, children)));
|
|
87
87
|
}
|
|
88
88
|
export function FormField({ render, name, }) {
|
|
89
89
|
const id = React.useId();
|
package/dist/client/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,uBAAuB,EACvB,0BAA0B,GAC3B,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAIpC,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AAE1D,MAAM,CAAC,MAAM,OAAO,GAAG,GAAkC,EAAE;IACzD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM;QACnC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC/D,OAAO;QACL,KAAK,EAAE,OAAO,CAAC,KAA6B;QAC5C,MAAM,EAAE,OAAO,CAAC,MAAgB;QAChC,KAAK,EAAE,OAAO,CAAC,KAAK;KACrB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa,CAA+B;IACrE,IAAI,EAAE,EAAE;IACR,EAAE,EAAE,EAAE;CACP,CAAC,CAAC;AAeH,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAkD,EAAE;IAC1E,aAAa,CAAC,CAAC,yEAAyE;IACxF,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACpD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAU,CAAC;IAEnD,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM;QACnB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAE9D,wCAAwC;IACxC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,0BAA0B,CAAC,MAAM,EAAE,CAAC,IAAc,CAAC,CAAC,CAAC;IAE7E,0BAA0B;IAC1B,MAAM,KAAK,GAAmB;QAC5B,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC;QAC9B,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC;QAC7B,KAAK,EAAE;YACL,EAAE,EAAE,EAAE;YACN,IAAI,EAAE,IAAc;YACpB,cAAc,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC;YACvC,YAAY,EAAE,SAAS;YACvB,GAAG,KAAK;SACT;KACF,CAAC;IAEF,oEAAoE;IACpE,IAAI,YAAY,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;IAC1C,IAAI,YAAY,IAAI,YAAY,YAAY,IAAI,EAAE,CAAC;QACjD,YAAY,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;IACvD,CAAC;IACD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,KAAK,CAAC,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;QACxC,oDAAoD;QACpD,yEAAyE;IAC3E,CAAC;SAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAC9B,IAAI,YAAY,EAAE,CAAC;YACjB,KAAK,CAAC,KAAK,CAAC,cAAc,GAAG,YAAY,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;QACrC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;IAC1C,CAAC;IACD,qCAAqC;IACrC,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,KAAK,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;IAClC,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,UAAU,IAAI,CAAgC,EAClD,QAAQ,EACR,MAAM,EACN,KAAK,EACL,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,OAAO,EACP,KAAK,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-server-actions",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.11",
|
|
4
4
|
"description": "A package for working with actions in React and Next.js",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"next",
|
|
@@ -27,7 +27,8 @@
|
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@arethetypeswrong/cli": "^0.17.4",
|
|
29
29
|
"prettier": "^3.3.3",
|
|
30
|
-
"typescript": "^5.7.3"
|
|
30
|
+
"typescript": "^5.7.3",
|
|
31
|
+
"vitest": "^3.1.1"
|
|
31
32
|
},
|
|
32
33
|
"peerDependencies": {
|
|
33
34
|
"@types/react": ">=18.0.0",
|