sushi 5.0.10 → 5.0.12

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/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # sushi
2
2
 
3
+ ## 5.0.12
4
+
5
+ ### Patch Changes
6
+
7
+ - [#107](https://github.com/sushi-labs/sushi/pull/107) [`136f2e1`](https://github.com/sushi-labs/sushi/commit/136f2e1ca253d9921d6610606688c132f8811ace) Thanks [@LufyCZ](https://github.com/LufyCZ)! - SwapResponse default generic, make value in tx optional
8
+
9
+ ## 5.0.11
10
+
11
+ ### Patch Changes
12
+
13
+ - [#105](https://github.com/sushi-labs/sushi/pull/105) [`d0f4cc9`](https://github.com/sushi-labs/sushi/commit/d0f4cc9cc4f6e46903c4e811866a82fb8e765a05) Thanks [@LufyCZ](https://github.com/LufyCZ)! - Fix getSwap types
14
+
3
15
  ## 5.0.10
4
16
 
5
17
  ### Patch Changes
package/_cjs/api/swap.js CHANGED
@@ -6,21 +6,28 @@ const package_json_1 = require("../package.json");
6
6
  const route_status_js_1 = require("../router/route-status.js");
7
7
  const zod_js_1 = require("../validate/zod.js");
8
8
  function swapResponseSchema(includeTransaction) {
9
- const baseSuccessPartial = zod_1.z.object({
9
+ const tokenSchema = zod_1.z.object({
10
+ address: zod_js_1.sz.address(),
11
+ decimals: zod_1.z.number(),
12
+ symbol: zod_1.z.string(),
13
+ name: zod_1.z.string(),
14
+ });
15
+ const baseSuccessPartial = zod_1.z
16
+ .object({
10
17
  status: zod_1.z.literal(route_status_js_1.RouteStatus.Success).or(zod_1.z.literal(route_status_js_1.RouteStatus.Partial)),
11
- tokens: zod_1.z.array(zod_1.z.object({
12
- address: zod_js_1.sz.address(),
13
- decimals: zod_1.z.number(),
14
- symbol: zod_1.z.string(),
15
- name: zod_1.z.string(),
16
- })),
18
+ tokens: zod_1.z.array(tokenSchema),
17
19
  tokenFrom: zod_1.z.number(),
18
20
  tokenTo: zod_1.z.number(),
19
21
  swapPrice: zod_1.z.number(),
20
22
  priceImpact: zod_1.z.number(),
21
23
  amountIn: zod_1.z.string(),
22
24
  assumedAmountOut: zod_1.z.string(),
23
- });
25
+ })
26
+ .transform((data) => ({
27
+ ...data,
28
+ tokenFrom: data.tokens[data.tokenFrom],
29
+ tokenTo: data.tokens[data.tokenTo],
30
+ }));
24
31
  const baseNoWay = zod_1.z.object({
25
32
  status: zod_1.z.literal(route_status_js_1.RouteStatus.NoWay),
26
33
  });
@@ -28,21 +35,11 @@ function swapResponseSchema(includeTransaction) {
28
35
  from: zod_js_1.sz.address(),
29
36
  to: zod_js_1.sz.address(),
30
37
  data: zod_js_1.sz.hex(),
31
- value: zod_1.z.string(),
38
+ value: zod_1.z.string().optional(),
32
39
  });
33
40
  const baseSchema = baseSuccessPartial.or(baseNoWay);
34
- const baseTxSchema = baseSuccessPartial.extend({ tx: txSchema }).or(baseNoWay);
35
- const schema = includeTransaction ? baseTxSchema : baseSchema;
36
- return schema.transform((data) => {
37
- if (data.status === route_status_js_1.RouteStatus.NoWay) {
38
- return data;
39
- }
40
- return {
41
- ...data,
42
- tokenFrom: data.tokens[data.tokenFrom],
43
- tokenTo: data.tokens[data.tokenTo],
44
- };
45
- });
41
+ const baseTxSchema = baseSchema.and(zod_1.z.object({ tx: txSchema })).or(baseNoWay);
42
+ return (includeTransaction ? baseTxSchema : baseSchema);
46
43
  }
47
44
  async function getSwap(params, options) {
48
45
  const url = new URL(`swap/v5/${params.chainId}`, 'https://api.sushi.com');
@@ -1 +1 @@
1
- {"version":3,"file":"swap.js","sourceRoot":"","sources":["../../api/swap.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"swap.js","sourceRoot":"","sources":["../../api/swap.ts"],"names":[],"mappings":"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"}
package/_esm/api/swap.js CHANGED
@@ -4,21 +4,28 @@ import { RouteStatus } from '../router/route-status.js';
4
4
  import { TransferValue } from '../router/transfer-value.js';
5
5
  import { sz } from '../validate/zod.js';
6
6
  function swapResponseSchema(includeTransaction) {
7
- const baseSuccessPartial = z.object({
7
+ const tokenSchema = z.object({
8
+ address: sz.address(),
9
+ decimals: z.number(),
10
+ symbol: z.string(),
11
+ name: z.string(),
12
+ });
13
+ const baseSuccessPartial = z
14
+ .object({
8
15
  status: z.literal(RouteStatus.Success).or(z.literal(RouteStatus.Partial)),
9
- tokens: z.array(z.object({
10
- address: sz.address(),
11
- decimals: z.number(),
12
- symbol: z.string(),
13
- name: z.string(),
14
- })),
16
+ tokens: z.array(tokenSchema),
15
17
  tokenFrom: z.number(),
16
18
  tokenTo: z.number(),
17
19
  swapPrice: z.number(),
18
20
  priceImpact: z.number(),
19
21
  amountIn: z.string(),
20
22
  assumedAmountOut: z.string(),
21
- });
23
+ })
24
+ .transform((data) => ({
25
+ ...data,
26
+ tokenFrom: data.tokens[data.tokenFrom],
27
+ tokenTo: data.tokens[data.tokenTo],
28
+ }));
22
29
  const baseNoWay = z.object({
23
30
  status: z.literal(RouteStatus.NoWay),
24
31
  });
@@ -26,21 +33,11 @@ function swapResponseSchema(includeTransaction) {
26
33
  from: sz.address(),
27
34
  to: sz.address(),
28
35
  data: sz.hex(),
29
- value: z.string(),
36
+ value: z.string().optional(),
30
37
  });
31
38
  const baseSchema = baseSuccessPartial.or(baseNoWay);
32
- const baseTxSchema = baseSuccessPartial.extend({ tx: txSchema }).or(baseNoWay);
33
- const schema = includeTransaction ? baseTxSchema : baseSchema;
34
- return schema.transform((data) => {
35
- if (data.status === RouteStatus.NoWay) {
36
- return data;
37
- }
38
- return {
39
- ...data,
40
- tokenFrom: data.tokens[data.tokenFrom],
41
- tokenTo: data.tokens[data.tokenTo],
42
- };
43
- });
39
+ const baseTxSchema = baseSchema.and(z.object({ tx: txSchema })).or(baseNoWay);
40
+ return (includeTransaction ? baseTxSchema : baseSchema);
44
41
  }
45
42
  export async function getSwap(params, options) {
46
43
  // TODO: VALIDATE PARAMS
@@ -1 +1 @@
1
- {"version":3,"file":"swap.js","sourceRoot":"","sources":["../../api/swap.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"swap.js","sourceRoot":"","sources":["../../api/swap.ts"],"names":[],"mappings":"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"}
@@ -30,7 +30,7 @@ export type SwapRequest<IncludeTransaction extends boolean, EnableFee extends bo
30
30
  fee?: Fee<EnableFee>;
31
31
  referrer?: string;
32
32
  } & To<IncludeTransaction>;
33
- declare function swapResponseSchema<IncludeTransaction extends boolean>(includeTransaction?: IncludeTransaction): z.ZodEffects<z.ZodUnion<[z.ZodObject<{
33
+ declare function swapResponseSchema<IncludeTransaction extends boolean>(includeTransaction?: IncludeTransaction): IncludeTransaction extends true ? z.ZodUnion<[z.ZodIntersection<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
34
34
  status: z.ZodUnion<[z.ZodLiteral<RouteStatus.Success>, z.ZodLiteral<RouteStatus.Partial>]>;
35
35
  tokens: z.ZodArray<z.ZodObject<{
36
36
  address: z.ZodEffects<z.ZodString, `0x${string}`, string>;
@@ -82,71 +82,19 @@ declare function swapResponseSchema<IncludeTransaction extends boolean>(includeT
82
82
  priceImpact: number;
83
83
  amountIn: string;
84
84
  assumedAmountOut: string;
85
- }>, z.ZodObject<{
86
- status: z.ZodLiteral<RouteStatus.NoWay>;
87
- }, "strip", z.ZodTypeAny, {
88
- status: RouteStatus.NoWay;
89
- }, {
90
- status: RouteStatus.NoWay;
91
- }>]>, {
92
- status: RouteStatus.NoWay;
93
- } | {
94
- tokenFrom: {
95
- symbol: string;
96
- name: string;
97
- address: `0x${string}`;
98
- decimals: number;
99
- } | {
100
- symbol: string;
101
- name: string;
102
- address: `0x${string}`;
103
- decimals: number;
104
- } | undefined;
105
- tokenTo: {
106
- symbol: string;
107
- name: string;
108
- address: `0x${string}`;
109
- decimals: number;
110
- } | {
111
- symbol: string;
112
- name: string;
113
- address: `0x${string}`;
114
- decimals: number;
115
- } | undefined;
116
- status: RouteStatus.Success | RouteStatus.Partial;
117
- tokens: {
118
- symbol: string;
119
- name: string;
120
- address: `0x${string}`;
121
- decimals: number;
122
- }[];
123
- swapPrice: number;
124
- priceImpact: number;
125
- amountIn: string;
126
- assumedAmountOut: string;
127
- } | {
85
+ }>, {
128
86
  tokenFrom: {
129
87
  symbol: string;
130
88
  name: string;
131
89
  address: `0x${string}`;
132
90
  decimals: number;
133
- } | {
134
- symbol: string;
135
- name: string;
136
- address: `0x${string}`;
137
- decimals: number;
138
- } | undefined;
91
+ };
139
92
  tokenTo: {
140
93
  symbol: string;
141
94
  name: string;
142
95
  address: `0x${string}`;
143
96
  decimals: number;
144
- } | {
145
- symbol: string;
146
- name: string;
147
- address: `0x${string}`;
148
- decimals: number;
149
- } | undefined;
97
+ };
150
98
  status: RouteStatus.Success | RouteStatus.Partial;
151
99
  tokens: {
152
100
  symbol: string;
@@ -158,12 +106,6 @@ declare function swapResponseSchema<IncludeTransaction extends boolean>(includeT
158
106
  priceImpact: number;
159
107
  amountIn: string;
160
108
  assumedAmountOut: string;
161
- tx: {
162
- value: string;
163
- from: `0x${string}`;
164
- to: `0x${string}`;
165
- data: `0x${string}`;
166
- };
167
109
  }, {
168
110
  status: RouteStatus.Success | RouteStatus.Partial;
169
111
  tokens: {
@@ -178,194 +120,50 @@ declare function swapResponseSchema<IncludeTransaction extends boolean>(includeT
178
120
  priceImpact: number;
179
121
  amountIn: string;
180
122
  assumedAmountOut: string;
181
- } | {
123
+ }>, z.ZodObject<{
124
+ status: z.ZodLiteral<RouteStatus.NoWay>;
125
+ }, "strip", z.ZodTypeAny, {
182
126
  status: RouteStatus.NoWay;
183
- }> | z.ZodEffects<z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<{
184
- status: z.ZodUnion<[z.ZodLiteral<RouteStatus.Success>, z.ZodLiteral<RouteStatus.Partial>]>;
185
- tokens: z.ZodArray<z.ZodObject<{
186
- address: z.ZodEffects<z.ZodString, `0x${string}`, string>;
187
- decimals: z.ZodNumber;
188
- symbol: z.ZodString;
189
- name: z.ZodString;
190
- }, "strip", z.ZodTypeAny, {
191
- symbol: string;
192
- name: string;
193
- address: `0x${string}`;
194
- decimals: number;
195
- }, {
196
- symbol: string;
197
- name: string;
198
- address: string;
199
- decimals: number;
200
- }>, "many">;
201
- tokenFrom: z.ZodNumber;
202
- tokenTo: z.ZodNumber;
203
- swapPrice: z.ZodNumber;
204
- priceImpact: z.ZodNumber;
205
- amountIn: z.ZodString;
206
- assumedAmountOut: z.ZodString;
207
127
  }, {
128
+ status: RouteStatus.NoWay;
129
+ }>]>, z.ZodObject<{
208
130
  tx: z.ZodObject<{
209
131
  from: z.ZodEffects<z.ZodString, `0x${string}`, string>;
210
132
  to: z.ZodEffects<z.ZodString, `0x${string}`, string>;
211
133
  data: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, `0x${string}`, string>;
212
- value: z.ZodString;
134
+ value: z.ZodOptional<z.ZodString>;
213
135
  }, "strip", z.ZodTypeAny, {
214
- value: string;
215
136
  from: `0x${string}`;
216
137
  to: `0x${string}`;
217
138
  data: `0x${string}`;
139
+ value?: string | undefined;
218
140
  }, {
219
- value: string;
220
141
  from: string;
221
142
  to: string;
222
143
  data: string;
144
+ value?: string | undefined;
223
145
  }>;
224
- }>, "strip", z.ZodTypeAny, {
225
- status: RouteStatus.Success | RouteStatus.Partial;
226
- tokens: {
227
- symbol: string;
228
- name: string;
229
- address: `0x${string}`;
230
- decimals: number;
231
- }[];
232
- tokenFrom: number;
233
- tokenTo: number;
234
- swapPrice: number;
235
- priceImpact: number;
236
- amountIn: string;
237
- assumedAmountOut: string;
146
+ }, "strip", z.ZodTypeAny, {
238
147
  tx: {
239
- value: string;
240
148
  from: `0x${string}`;
241
149
  to: `0x${string}`;
242
150
  data: `0x${string}`;
151
+ value?: string | undefined;
243
152
  };
244
153
  }, {
245
- status: RouteStatus.Success | RouteStatus.Partial;
246
- tokens: {
247
- symbol: string;
248
- name: string;
249
- address: string;
250
- decimals: number;
251
- }[];
252
- tokenFrom: number;
253
- tokenTo: number;
254
- swapPrice: number;
255
- priceImpact: number;
256
- amountIn: string;
257
- assumedAmountOut: string;
258
154
  tx: {
259
- value: string;
260
155
  from: string;
261
156
  to: string;
262
157
  data: string;
158
+ value?: string | undefined;
263
159
  };
264
- }>, z.ZodObject<{
160
+ }>>, z.ZodObject<{
265
161
  status: z.ZodLiteral<RouteStatus.NoWay>;
266
162
  }, "strip", z.ZodTypeAny, {
267
163
  status: RouteStatus.NoWay;
268
164
  }, {
269
165
  status: RouteStatus.NoWay;
270
- }>]>, {
271
- status: RouteStatus.NoWay;
272
- } | {
273
- tokenFrom: {
274
- symbol: string;
275
- name: string;
276
- address: `0x${string}`;
277
- decimals: number;
278
- } | {
279
- symbol: string;
280
- name: string;
281
- address: `0x${string}`;
282
- decimals: number;
283
- } | undefined;
284
- tokenTo: {
285
- symbol: string;
286
- name: string;
287
- address: `0x${string}`;
288
- decimals: number;
289
- } | {
290
- symbol: string;
291
- name: string;
292
- address: `0x${string}`;
293
- decimals: number;
294
- } | undefined;
295
- status: RouteStatus.Success | RouteStatus.Partial;
296
- tokens: {
297
- symbol: string;
298
- name: string;
299
- address: `0x${string}`;
300
- decimals: number;
301
- }[];
302
- swapPrice: number;
303
- priceImpact: number;
304
- amountIn: string;
305
- assumedAmountOut: string;
306
- } | {
307
- tokenFrom: {
308
- symbol: string;
309
- name: string;
310
- address: `0x${string}`;
311
- decimals: number;
312
- } | {
313
- symbol: string;
314
- name: string;
315
- address: `0x${string}`;
316
- decimals: number;
317
- } | undefined;
318
- tokenTo: {
319
- symbol: string;
320
- name: string;
321
- address: `0x${string}`;
322
- decimals: number;
323
- } | {
324
- symbol: string;
325
- name: string;
326
- address: `0x${string}`;
327
- decimals: number;
328
- } | undefined;
329
- status: RouteStatus.Success | RouteStatus.Partial;
330
- tokens: {
331
- symbol: string;
332
- name: string;
333
- address: `0x${string}`;
334
- decimals: number;
335
- }[];
336
- swapPrice: number;
337
- priceImpact: number;
338
- amountIn: string;
339
- assumedAmountOut: string;
340
- tx: {
341
- value: string;
342
- from: `0x${string}`;
343
- to: `0x${string}`;
344
- data: `0x${string}`;
345
- };
346
- }, {
347
- status: RouteStatus.Success | RouteStatus.Partial;
348
- tokens: {
349
- symbol: string;
350
- name: string;
351
- address: string;
352
- decimals: number;
353
- }[];
354
- tokenFrom: number;
355
- tokenTo: number;
356
- swapPrice: number;
357
- priceImpact: number;
358
- amountIn: string;
359
- assumedAmountOut: string;
360
- tx: {
361
- value: string;
362
- from: string;
363
- to: string;
364
- data: string;
365
- };
366
- } | {
367
- status: RouteStatus.NoWay;
368
- }> | z.ZodEffects<z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<{
166
+ }>]> : z.ZodUnion<[z.ZodEffects<z.ZodObject<{
369
167
  status: z.ZodUnion<[z.ZodLiteral<RouteStatus.Success>, z.ZodLiteral<RouteStatus.Partial>]>;
370
168
  tokens: z.ZodArray<z.ZodObject<{
371
169
  address: z.ZodEffects<z.ZodString, `0x${string}`, string>;
@@ -389,24 +187,7 @@ declare function swapResponseSchema<IncludeTransaction extends boolean>(includeT
389
187
  priceImpact: z.ZodNumber;
390
188
  amountIn: z.ZodString;
391
189
  assumedAmountOut: z.ZodString;
392
- }, {
393
- tx: z.ZodObject<{
394
- from: z.ZodEffects<z.ZodString, `0x${string}`, string>;
395
- to: z.ZodEffects<z.ZodString, `0x${string}`, string>;
396
- data: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, `0x${string}`, string>;
397
- value: z.ZodString;
398
- }, "strip", z.ZodTypeAny, {
399
- value: string;
400
- from: `0x${string}`;
401
- to: `0x${string}`;
402
- data: `0x${string}`;
403
- }, {
404
- value: string;
405
- from: string;
406
- to: string;
407
- data: string;
408
- }>;
409
- }>, "strip", z.ZodTypeAny, {
190
+ }, "strip", z.ZodTypeAny, {
410
191
  status: RouteStatus.Success | RouteStatus.Partial;
411
192
  tokens: {
412
193
  symbol: string;
@@ -420,12 +201,6 @@ declare function swapResponseSchema<IncludeTransaction extends boolean>(includeT
420
201
  priceImpact: number;
421
202
  amountIn: string;
422
203
  assumedAmountOut: string;
423
- tx: {
424
- value: string;
425
- from: `0x${string}`;
426
- to: `0x${string}`;
427
- data: `0x${string}`;
428
- };
429
204
  }, {
430
205
  status: RouteStatus.Success | RouteStatus.Partial;
431
206
  tokens: {
@@ -440,77 +215,19 @@ declare function swapResponseSchema<IncludeTransaction extends boolean>(includeT
440
215
  priceImpact: number;
441
216
  amountIn: string;
442
217
  assumedAmountOut: string;
443
- tx: {
444
- value: string;
445
- from: string;
446
- to: string;
447
- data: string;
448
- };
449
- }>, z.ZodObject<{
450
- status: z.ZodLiteral<RouteStatus.NoWay>;
451
- }, "strip", z.ZodTypeAny, {
452
- status: RouteStatus.NoWay;
453
- }, {
454
- status: RouteStatus.NoWay;
455
- }>]>, {
456
- status: RouteStatus.NoWay;
457
- } | {
218
+ }>, {
458
219
  tokenFrom: {
459
220
  symbol: string;
460
221
  name: string;
461
222
  address: `0x${string}`;
462
223
  decimals: number;
463
- } | {
464
- symbol: string;
465
- name: string;
466
- address: `0x${string}`;
467
- decimals: number;
468
- } | undefined;
469
- tokenTo: {
470
- symbol: string;
471
- name: string;
472
- address: `0x${string}`;
473
- decimals: number;
474
- } | {
475
- symbol: string;
476
- name: string;
477
- address: `0x${string}`;
478
- decimals: number;
479
- } | undefined;
480
- status: RouteStatus.Success | RouteStatus.Partial;
481
- tokens: {
482
- symbol: string;
483
- name: string;
484
- address: `0x${string}`;
485
- decimals: number;
486
- }[];
487
- swapPrice: number;
488
- priceImpact: number;
489
- amountIn: string;
490
- assumedAmountOut: string;
491
- } | {
492
- tokenFrom: {
493
- symbol: string;
494
- name: string;
495
- address: `0x${string}`;
496
- decimals: number;
497
- } | {
498
- symbol: string;
499
- name: string;
500
- address: `0x${string}`;
501
- decimals: number;
502
- } | undefined;
224
+ };
503
225
  tokenTo: {
504
226
  symbol: string;
505
227
  name: string;
506
228
  address: `0x${string}`;
507
229
  decimals: number;
508
- } | {
509
- symbol: string;
510
- name: string;
511
- address: `0x${string}`;
512
- decimals: number;
513
- } | undefined;
230
+ };
514
231
  status: RouteStatus.Success | RouteStatus.Partial;
515
232
  tokens: {
516
233
  symbol: string;
@@ -522,15 +239,7 @@ declare function swapResponseSchema<IncludeTransaction extends boolean>(includeT
522
239
  priceImpact: number;
523
240
  amountIn: string;
524
241
  assumedAmountOut: string;
525
- tx: {
526
- value: string;
527
- from: `0x${string}`;
528
- to: `0x${string}`;
529
- data: `0x${string}`;
530
- };
531
242
  }, {
532
- status: RouteStatus.NoWay;
533
- } | {
534
243
  status: RouteStatus.Success | RouteStatus.Partial;
535
244
  tokens: {
536
245
  symbol: string;
@@ -544,14 +253,14 @@ declare function swapResponseSchema<IncludeTransaction extends boolean>(includeT
544
253
  priceImpact: number;
545
254
  amountIn: string;
546
255
  assumedAmountOut: string;
547
- tx: {
548
- value: string;
549
- from: string;
550
- to: string;
551
- data: string;
552
- };
553
- }>;
554
- export type SwapResponse<IncludeTransaction extends boolean> = z.infer<ReturnType<typeof swapResponseSchema<IncludeTransaction>>>;
256
+ }>, z.ZodObject<{
257
+ status: z.ZodLiteral<RouteStatus.NoWay>;
258
+ }, "strip", z.ZodTypeAny, {
259
+ status: RouteStatus.NoWay;
260
+ }, {
261
+ status: RouteStatus.NoWay;
262
+ }>]>;
263
+ export type SwapResponse<IncludeTransaction extends boolean = true> = z.infer<ReturnType<typeof swapResponseSchema<IncludeTransaction>>>;
555
264
  export declare function getSwap<IncludeTransaction extends boolean = false, EnableFee extends boolean = false>(params: SwapRequest<IncludeTransaction, EnableFee>, options?: RequestInit): Promise<SwapResponse<IncludeTransaction>>;
556
265
  export {};
557
266
  //# sourceMappingURL=swap.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"swap.d.ts","sourceRoot":"","sources":["../../api/swap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAA;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAG3D,KAAK,EAAE,CAAC,QAAQ,SAAS,OAAO,IAAI,QAAQ,SAAS,IAAI,GACrD;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,GACf;IAAE,EAAE,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAEpB,KAAK,GAAG,CAAC,OAAO,SAAS,OAAO,IAAI,OAAO,SAAS,IAAI,GACpD;IACE,SAAS,EAAE,OAAO,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,OAAO,CAAA;IACpB,KAAK,CAAC,EAAE,aAAa,CAAA;CACtB,GACD;IACE,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,KAAK,CAAC,EAAE,aAAa,CAAA;CACtB,CAAA;AAEL,MAAM,MAAM,WAAW,CACrB,kBAAkB,SAAS,OAAO,EAClC,SAAS,SAAS,OAAO,IACvB;IACF,OAAO,EAAE,yBAAyB,CAAA;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;IACvC,GAAG,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAA;AAE1B,iBAAS,kBAAkB,CAAC,kBAAkB,SAAS,OAAO,EAC5D,kBAAkB,CAAC,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDxC;AAED,MAAM,MAAM,YAAY,CAAC,kBAAkB,SAAS,OAAO,IAAI,CAAC,CAAC,KAAK,CACpE,UAAU,CAAC,OAAO,kBAAkB,CAAC,kBAAkB,CAAC,CAAC,CAC1D,CAAA;AAED,wBAAsB,OAAO,CAC3B,kBAAkB,SAAS,OAAO,GAAG,KAAK,EAC1C,SAAS,SAAS,OAAO,GAAG,KAAK,EAEjC,MAAM,EAAE,WAAW,CAAC,kBAAkB,EAAE,SAAS,CAAC,EAClD,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CA2C3C"}
1
+ {"version":3,"file":"swap.d.ts","sourceRoot":"","sources":["../../api/swap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAA;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAG3D,KAAK,EAAE,CAAC,QAAQ,SAAS,OAAO,IAAI,QAAQ,SAAS,IAAI,GACrD;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,GACf;IAAE,EAAE,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAEpB,KAAK,GAAG,CAAC,OAAO,SAAS,OAAO,IAAI,OAAO,SAAS,IAAI,GACpD;IACE,SAAS,EAAE,OAAO,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,OAAO,CAAA;IACpB,KAAK,CAAC,EAAE,aAAa,CAAA;CACtB,GACD;IACE,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,KAAK,CAAC,EAAE,aAAa,CAAA;CACtB,CAAA;AAEL,MAAM,MAAM,WAAW,CACrB,kBAAkB,SAAS,OAAO,EAClC,SAAS,SAAS,OAAO,IACvB;IACF,OAAO,EAAE,yBAAyB,CAAA;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;IACvC,GAAG,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAA;AAE1B,iBAAS,kBAAkB,CAAC,kBAAkB,SAAS,OAAO,EAC5D,kBAAkB,CAAC,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+CxC;AAED,MAAM,MAAM,YAAY,CAAC,kBAAkB,SAAS,OAAO,GAAG,IAAI,IAAI,CAAC,CAAC,KAAK,CAC3E,UAAU,CAAC,OAAO,kBAAkB,CAAC,kBAAkB,CAAC,CAAC,CAC1D,CAAA;AAED,wBAAsB,OAAO,CAC3B,kBAAkB,SAAS,OAAO,GAAG,KAAK,EAC1C,SAAS,SAAS,OAAO,GAAG,KAAK,EAEjC,MAAM,EAAE,WAAW,CAAC,kBAAkB,EAAE,SAAS,CAAC,EAClD,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CA2C3C"}
package/api/swap.ts CHANGED
@@ -42,26 +42,32 @@ export type SwapRequest<
42
42
  function swapResponseSchema<IncludeTransaction extends boolean>(
43
43
  includeTransaction?: IncludeTransaction,
44
44
  ) {
45
- const baseSuccessPartial = z.object({
46
- status: z.literal(RouteStatus.Success).or(z.literal(RouteStatus.Partial)),
47
- tokens: z.array(
48
- z.object({
49
- address: sz.address(),
50
- decimals: z.number(),
51
- symbol: z.string(),
52
- name: z.string(),
53
- }),
54
- ),
55
- tokenFrom: z.number(),
56
- tokenTo: z.number(),
57
-
58
- swapPrice: z.number(),
59
- priceImpact: z.number(),
60
-
61
- amountIn: z.string(),
62
- assumedAmountOut: z.string(),
45
+ const tokenSchema = z.object({
46
+ address: sz.address(),
47
+ decimals: z.number(),
48
+ symbol: z.string(),
49
+ name: z.string(),
63
50
  })
64
51
 
52
+ const baseSuccessPartial = z
53
+ .object({
54
+ status: z.literal(RouteStatus.Success).or(z.literal(RouteStatus.Partial)),
55
+ tokens: z.array(tokenSchema),
56
+ tokenFrom: z.number(),
57
+ tokenTo: z.number(),
58
+
59
+ swapPrice: z.number(),
60
+ priceImpact: z.number(),
61
+
62
+ amountIn: z.string(),
63
+ assumedAmountOut: z.string(),
64
+ })
65
+ .transform((data) => ({
66
+ ...data,
67
+ tokenFrom: data.tokens[data.tokenFrom]!,
68
+ tokenTo: data.tokens[data.tokenTo]!,
69
+ }))
70
+
65
71
  const baseNoWay = z.object({
66
72
  status: z.literal(RouteStatus.NoWay),
67
73
  })
@@ -70,32 +76,20 @@ function swapResponseSchema<IncludeTransaction extends boolean>(
70
76
  from: sz.address(),
71
77
  to: sz.address(),
72
78
  data: sz.hex(),
73
- value: z.string(),
79
+ value: z.string().optional(),
74
80
  })
75
81
 
76
82
  const baseSchema = baseSuccessPartial.or(baseNoWay)
77
- const baseTxSchema = baseSuccessPartial.extend({ tx: txSchema }).or(baseNoWay)
83
+ const baseTxSchema = baseSchema.and(z.object({ tx: txSchema })).or(baseNoWay)
78
84
 
79
- type Result = IncludeTransaction extends true
85
+ type Schema = IncludeTransaction extends true
80
86
  ? typeof baseTxSchema
81
87
  : typeof baseSchema
82
88
 
83
- const schema = includeTransaction ? baseTxSchema : (baseSchema as Result)
84
-
85
- return schema.transform((data) => {
86
- if (data.status === RouteStatus.NoWay) {
87
- return data
88
- }
89
-
90
- return {
91
- ...data,
92
- tokenFrom: data.tokens[data.tokenFrom],
93
- tokenTo: data.tokens[data.tokenTo],
94
- }
95
- })
89
+ return (includeTransaction ? baseTxSchema : baseSchema) as Schema
96
90
  }
97
91
 
98
- export type SwapResponse<IncludeTransaction extends boolean> = z.infer<
92
+ export type SwapResponse<IncludeTransaction extends boolean = true> = z.infer<
99
93
  ReturnType<typeof swapResponseSchema<IncludeTransaction>>
100
94
  >
101
95
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "sushi",
3
3
  "description": "Sushi",
4
- "version": "5.0.10",
4
+ "version": "5.0.12",
5
5
  "main": "./_cjs/index.js",
6
6
  "module": "./_esm/index.js",
7
7
  "types": "./_types/index.d.ts",