Skip to content

Commit 9ab31a7

Browse files
heyqbnkheyqbnk
authored
Merge pull request #861 from Telegram-Mini-Apps/bump-error-kid
Bump error kid
2 parents 95bae10 + e9ea686 commit 9ab31a7

8 files changed

Lines changed: 125 additions & 98 deletions

File tree

‎.changeset/two-socks-talk.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@tma.js/init-data-node": patch
3+
"@tma.js/bridge": patch
4+
"@tma.js/sdk": patch
5+
---
6+
7+
Bump `error-kid`.

‎packages/bridge/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@tma.js/transformers": "workspace:^",
5050
"@tma.js/types": "workspace:^",
5151
"better-promises": "^1.0.0",
52-
"error-kid": "^1.0.2",
52+
"error-kid": "^2.0.0",
5353
"fp-ts": "^2.16.11",
5454
"mitt": "^3.0.1",
5555
"valibot": "^1.1.0"

‎packages/bridge/src/errors.ts‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,31 @@ import { errorClass, errorClassWithData } from 'error-kid';
33

44
export class MethodUnsupportedError extends /* @__PURE__ */ errorClass<
55
[method: string, version: Version]
6-
>('MethodUnsupportedError', (method, version) => [
7-
`Method "${method}" is unsupported in Mini Apps version ${version}`,
8-
]) {
6+
>({
7+
name: 'MethodUnsupportedError',
8+
super: (method, version) => [
9+
`Method "${method}" is unsupported in Mini Apps version ${version}`,
10+
],
11+
}) {
912
}
1013

1114
export class MethodParameterUnsupportedError extends /* @__PURE__ */ errorClass<
1215
[method: string, param: string, version: Version]
13-
>('MethodParameterUnsupportedError', (method, param, version) => [
14-
`Parameter "${param}" of "${method}" method is unsupported in Mini Apps version ${version}`,
15-
]) {
16+
>({
17+
name: 'MethodParameterUnsupportedError',
18+
super: (method, param, version) => [
19+
`Parameter "${param}" of "${method}" method is unsupported in Mini Apps version ${version}`,
20+
],
21+
}) {
1622
}
1723

1824
export class LaunchParamsRetrieveError extends /* @__PURE__ */ errorClassWithData<
1925
{ errors: { source: string; error: unknown }[] },
2026
[{ source: string; error: unknown }[]]
21-
>(
22-
'LaunchParamsRetrieveError',
23-
errors => ({ errors }),
24-
errors => [
27+
>({
28+
name: 'LaunchParamsRetrieveError',
29+
data: errors => ({ errors }),
30+
super: errors => [
2531
[
2632
'Unable to retrieve launch parameters from any known source. Perhaps, you have opened your app outside Telegram?',
2733
'📖 Refer to docs for more information:',
@@ -33,22 +39,25 @@ export class LaunchParamsRetrieveError extends /* @__PURE__ */ errorClassWithDat
3339
}),
3440
].join('\n'),
3541
],
36-
) {
42+
}) {
3743
}
3844

3945
export class InvalidLaunchParamsError extends /* @__PURE__ */ errorClass<
4046
[launchParams: string, cause: unknown]
41-
>('InvalidLaunchParamsError', (launchParams, cause) => [
42-
`Invalid value for launch params: ${launchParams}`,
43-
{ cause },
44-
]) {
47+
>({
48+
name: 'InvalidLaunchParamsError',
49+
super: (launchParams, cause) => [
50+
`Invalid value for launch params: ${launchParams}`,
51+
{ cause },
52+
],
53+
}) {
4554
}
4655

47-
export class UnknownEnvError extends /* @__PURE__ */ errorClass('UnknownEnvError') {
56+
export class UnknownEnvError extends /* @__PURE__ */ errorClass({ name: 'UnknownEnvError' }) {
4857
}
4958

50-
export class InvokeCustomMethodFailedError extends /* @__PURE__ */ errorClass<[error: string]>(
51-
'InvokeCustomMethodError',
52-
error => [`Server returned error: ${error}`],
53-
) {
59+
export class InvokeCustomMethodFailedError extends /* @__PURE__ */ errorClass<[error: string]>({
60+
name: 'InvokeCustomMethodError',
61+
super: error => [`Server returned error: ${error}`],
62+
}) {
5463
}

‎packages/init-data-node/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@tma.js/transformers": "workspace:^",
6464
"@tma.js/types": "workspace:^",
6565
"better-promises": "^1.0.0",
66-
"error-kid": "^1.0.2",
66+
"error-kid": "^2.0.0",
6767
"fp-ts": "^2.16.11"
6868
}
6969
}

‎packages/init-data-node/src/errors.ts‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,33 @@ import { errorClass, errorClassWithData } from 'error-kid';
33
export class AuthDateInvalidError extends errorClassWithData<
44
{ value: string | undefined },
55
[value?: string]
6-
>(
7-
'AuthDateInvalidError',
8-
value => ({ value }),
9-
value => [`"auth_date" is invalid: ${value || 'value is missing'}`],
10-
) {
6+
>({
7+
name: 'AuthDateInvalidError',
8+
data: value => ({ value }),
9+
super: value => [`"auth_date" is invalid: ${value || 'value is missing'}`],
10+
}) {
1111
}
1212

13-
export class SignatureInvalidError extends errorClass('SignatureInvalidError') {
13+
export class SignatureInvalidError extends errorClass({ name: 'SignatureInvalidError' }) {
1414
}
1515

16-
export class HexStringLengthInvalidError extends errorClass(
17-
'HexStringLengthInvalidError',
18-
) {
16+
export class HexStringLengthInvalidError extends errorClass({ name: 'HexStringLengthInvalidError' }) {
1917
}
2018

21-
export class SignatureMissingError extends errorClass<[thirdParty: boolean]>(
22-
'SignatureMissingError',
23-
thirdParty => [`"${thirdParty ? 'signature' : 'hash'}" parameter is missing`],
24-
) {
19+
export class SignatureMissingError extends errorClass<[thirdParty: boolean]>({
20+
name: 'SignatureMissingError',
21+
super: thirdParty => [`"${thirdParty ? 'signature' : 'hash'}" parameter is missing`],
22+
}) {
2523
}
2624

2725
export class ExpiredError extends errorClassWithData<
2826
{ issuedAt: Date; expiresAt: Date },
2927
[issuedAt: Date, expiresAt: Date, now: Date]
30-
>(
31-
'ExpiredError',
32-
(issuedAt, expiresAt) => ({ issuedAt, expiresAt }),
33-
(issuedAt, expiresAt, now) => [
28+
>({
29+
name: 'ExpiredError',
30+
data: (issuedAt, expiresAt) => ({ issuedAt, expiresAt }),
31+
super: (issuedAt, expiresAt, now) => [
3432
`Init data expired. Issued at ${issuedAt.toISOString()}, expires at ${expiresAt.toISOString()}, now is ${now.toISOString()}`,
3533
],
36-
) {
34+
}) {
3735
}

‎packages/sdk/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@tma.js/transformers": "workspace:^",
5151
"@tma.js/types": "workspace:^",
5252
"better-promises": "^1.0.0",
53-
"error-kid": "^1.0.2",
53+
"error-kid": "^2.0.0",
5454
"fp-ts": "^2.16.11",
5555
"valibot": "^1.1.0"
5656
},

‎packages/sdk/src/errors.ts‎

Lines changed: 59 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,87 +8,95 @@ function msgToTuple(message?: string): [string?] {
88
export class ValidationError extends /* #__PURE__ */ errorClassWithData<
99
{ input: unknown; issues: BaseIssue<any>[] },
1010
[input: unknown, issues: BaseIssue<any>[]]
11-
>(
12-
'ValidationError',
13-
(input, issues) => ({ input, issues }),
14-
'Validation error',
15-
) {
11+
>({
12+
name: 'ValidationError',
13+
data: (input, issues) => ({ input, issues }),
14+
super: 'Validation error',
15+
}) {
1616
}
1717

18-
export class CSSVarsBoundError extends /* #__PURE__ */ errorClass(
19-
'CSSVarsBoundError',
20-
'CSS variables are already bound',
21-
) {
18+
export class CSSVarsBoundError extends /* #__PURE__ */ errorClass({
19+
name: 'CSSVarsBoundError',
20+
super: 'CSS variables are already bound',
21+
}) {
2222
}
2323

2424
export class DeviceStorageMethodError extends /* #__PURE__ */ errorClassWithData<
2525
{ error: string },
2626
[error: string]
27-
>('DeviceStorageMethodError', error => ({ error }), error => [error]) {
27+
>({
28+
name: 'DeviceStorageMethodError',
29+
data: error => ({ error }),
30+
super: error => [error],
31+
}) {
2832
}
2933

3034
export class SecureStorageMethodError extends /* #__PURE__ */ errorClassWithData<
3135
{ error: string },
3236
[error: string]
33-
>('SecureStorageMethodError', error => ({ error }), error => [error]) {
37+
>({
38+
name: 'SecureStorageMethodError',
39+
data: error => ({ error }),
40+
super: error => [error],
41+
}) {
3442
}
3543

36-
export class NotAvailableError extends /* #__PURE__ */ errorClass<[message: string]>(
37-
'NotAvailableError',
38-
msgToTuple,
39-
) {
44+
export class NotAvailableError extends /* #__PURE__ */ errorClass<[message: string]>({
45+
name: 'NotAvailableError',
46+
super: msgToTuple,
47+
}) {
4048
}
4149

42-
export class InvalidEnvError extends /* #__PURE__ */ errorClass<[message?: string]>(
43-
'InvalidEnvError',
44-
msgToTuple,
45-
) {
50+
export class InvalidEnvError extends /* #__PURE__ */ errorClass<[message?: string]>({
51+
name: 'InvalidEnvError',
52+
super: msgToTuple,
53+
}) {
4654
}
4755

48-
export class FunctionUnavailableError extends /* #__PURE__ */ errorClass<[message?: string]>(
49-
'FunctionNotAvailableError',
50-
msgToTuple,
51-
) {
56+
export class FunctionUnavailableError extends /* #__PURE__ */ errorClass<[message?: string]>({
57+
name: 'FunctionNotAvailableError',
58+
super: msgToTuple,
59+
}) {
5260
}
5361

54-
export class InvalidArgumentsError extends /* #__PURE__ */ errorClass<[message: string, cause?: unknown]>(
55-
'InvalidArgumentsError',
56-
(message, cause) => [message, { cause }],
57-
) {
62+
export class InvalidArgumentsError extends /* #__PURE__ */ errorClass<[message: string, cause?: unknown]>({
63+
name: 'InvalidArgumentsError',
64+
super: (message, cause) => [message, { cause }],
65+
}) {
5866
}
5967

60-
export class ConcurrentCallError extends /* #__PURE__ */ errorClass<[message: string]>(
61-
'ConcurrentCallError',
62-
msgToTuple,
63-
) {
68+
export class ConcurrentCallError extends /* #__PURE__ */ errorClass<[message: string]>({
69+
name: 'ConcurrentCallError',
70+
super: msgToTuple,
71+
}) {
6472
}
6573

66-
export class SetEmojiStatusError extends /* #__PURE__ */ errorClass<[error: string]>(
67-
'SetEmojiStatusError',
68-
error => [`Failed to set emoji status: ${error}`],
69-
) {
74+
export class SetEmojiStatusError extends /* #__PURE__ */ errorClass<[error: string]>({
75+
name: 'SetEmojiStatusError',
76+
super: error => [`Failed to set emoji status: ${error}`],
77+
}) {
7078
}
7179

72-
export class AccessDeniedError extends /* #__PURE__ */ errorClass<[message: string]>(
73-
'AccessDeniedError',
74-
msgToTuple,
75-
) {
80+
export class AccessDeniedError extends /* #__PURE__ */ errorClass<[message: string]>({
81+
name: 'AccessDeniedError',
82+
super: msgToTuple,
83+
}) {
7684
}
7785

78-
export class FullscreenFailedError extends /* #__PURE__ */ errorClass<[message: string]>(
79-
'FullscreenFailedError',
80-
msgToTuple,
81-
) {
86+
export class FullscreenFailedError extends /* #__PURE__ */ errorClass<[message: string]>({
87+
name: 'FullscreenFailedError',
88+
super: msgToTuple,
89+
}) {
8290
}
8391

84-
export class ShareMessageError extends /* #__PURE__ */ errorClass<[error: string]>(
85-
'ShareMessageError',
86-
msgToTuple,
87-
) {
92+
export class ShareMessageError extends /* #__PURE__ */ errorClass<[error: string]>({
93+
name: 'ShareMessageError',
94+
super: msgToTuple,
95+
}) {
8896
}
8997

90-
export class UnknownThemeParamsKeyError extends /* #__PURE__ */ errorClass<[key: string]>(
91-
'UnknownThemeParamsKeyError',
92-
key => [`Unknown theme params key passed: ${key}`],
93-
) {
98+
export class UnknownThemeParamsKeyError extends /* #__PURE__ */ errorClass<[key: string]>({
99+
name: 'UnknownThemeParamsKeyError',
100+
super: key => [`Unknown theme params key passed: ${key}`],
101+
}) {
94102
}

‎pnpm-lock.yaml‎

Lines changed: 11 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)