Skip to content

Commit d6f6abb

Browse files
committed
Fixed typescript issues (needed to revert back to zod 3.22.3
1 parent c1d6bba commit d6f6abb

File tree

13 files changed

+73
-80
lines changed

13 files changed

+73
-80
lines changed

apps/proxy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@aws-sdk/client-sqs": "^3.445.0",
1616
"@trigger.dev/core": "workspace:*",
1717
"ulidx": "^2.2.1",
18-
"zod": "3.23.8",
18+
"zod": "3.22.3",
1919
"zod-error": "1.5.0"
2020
}
2121
}

apps/webapp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
"ulid": "^2.3.0",
176176
"ulidx": "^2.2.1",
177177
"ws": "^8.11.0",
178-
"zod": "3.23.8",
178+
"zod": "3.22.3",
179179
"zod-error": "1.5.0",
180180
"zod-validation-error": "^1.5.0"
181181
},

packages/cli-v3/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"tinyexec": "^0.2.0",
118118
"ws": "^8.18.0",
119119
"xdg-app-paths": "^8.3.0",
120-
"zod": "3.23.8",
120+
"zod": "3.22.3",
121121
"zod-validation-error": "^1.5.0"
122122
},
123123
"engines": {

packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"update-version": "tsx ../../scripts/updateVersion.ts",
6464
"build": "tshy",
6565
"dev": "tshy --watch",
66-
"typecheck": "tsc --noEmit",
66+
"typecheck": "tsc --noEmit -p tsconfig.src.json",
6767
"test": "vitest"
6868
},
6969
"dependencies": {
@@ -84,7 +84,7 @@
8484
"socket.io-client": "4.7.5",
8585
"superjson": "^2.2.1",
8686
"tinyglobby": "^0.2.2",
87-
"zod": "3.23.8",
87+
"zod": "3.22.3",
8888
"zod-error": "1.5.0",
8989
"zod-validation-error": "^1.5.0"
9090
},

packages/core/src/bloom.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,18 @@ export class BloomFilter {
1111

1212
add(item: string): void {
1313
const index = murmurHash3(item) % this.size;
14-
// @ts-expect-error
15-
this.bitArray[Math.floor(index / 8)] |= 1 << index % 8;
14+
const bitIndex = Math.floor(index / 8);
15+
if (this.bitArray[bitIndex] !== undefined) {
16+
this.bitArray[bitIndex] |= 1 << index % 8;
17+
}
1618
}
1719

1820
test(item: string): boolean {
1921
const index = murmurHash3(item) % this.size;
20-
// @ts-expect-error
21-
return (this.bitArray[Math.floor(index / 8)] & (1 << index % 8)) !== 0;
22+
const bitIndex = Math.floor(index / 8);
23+
return (
24+
this.bitArray[bitIndex] !== undefined && (this.bitArray[bitIndex] & (1 << index % 8)) !== 0
25+
);
2226
}
2327

2428
// Serialize to a Base64 string

packages/core/src/utils.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ export function deepMergeFilters(...filters: EventFilter[]): EventFilter {
2323
) {
2424
result[key] = deepMergeFilters(existingValue, filterValue);
2525
} else {
26-
// @ts-expect-error
27-
result[key] = filterValue;
26+
result[key] = filterValue as any;
2827
}
2928
}
3029
}

packages/core/src/v3/utils/flattenAttributes.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,24 +104,24 @@ export function unflattenAttributes(
104104
let current: any = result;
105105
for (let i = 0; i < parts.length - 1; i++) {
106106
const part = parts[i];
107+
108+
if (!part) {
109+
continue;
110+
}
111+
107112
const nextPart = parts[i + 1];
108-
// @ts-expect-error
109-
const isArray = /^\d+$/.test(nextPart);
110-
// @ts-expect-error
113+
const isArray = nextPart && /^\d+$/.test(nextPart);
111114
if (isArray && !Array.isArray(current[part])) {
112-
// @ts-expect-error
113115
current[part] = [];
114-
// @ts-expect-error
115116
} else if (!isArray && current[part] === undefined) {
116-
// @ts-expect-error
117117
current[part] = {};
118118
}
119-
// @ts-expect-error
120119
current = current[part];
121120
}
122121
const lastPart = parts[parts.length - 1];
123-
// @ts-expect-error
124-
current[lastPart] = rehydrateNull(value);
122+
if (lastPart) {
123+
current[lastPart] = rehydrateNull(value);
124+
}
125125
}
126126

127127
// Convert the result to an array if all top-level keys are numeric indices

packages/core/src/v3/zodIpc.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ class ZodIpcMessageHandler<
9696
if (!parsedMessage.success) {
9797
throw new Error(`Failed to parse message: ${JSON.stringify(parsedMessage.error)}`);
9898
}
99-
// @ts-expect-error
100-
const schema = this.#schema[parsedMessage.data.type]["message"];
99+
const schema = this.#schema[parsedMessage.data.type]?.["message"];
101100

102101
if (!schema) {
103102
throw new Error(`Unknown message type: ${parsedMessage.data.type}`);
@@ -265,8 +264,7 @@ export class ZodIpcConnection<
265264
type: K,
266265
payload: z.input<GetSocketMessageSchema<TEmitCatalog, K>>
267266
): Promise<void> {
268-
// @ts-expect-error
269-
const schema = this.opts.emitSchema[type]["message"];
267+
const schema = this.opts.emitSchema[type]?.["message"];
270268

271269
if (!schema) {
272270
throw new Error(`Unknown message type: ${type as string}`);
@@ -312,8 +310,7 @@ export class ZodIpcConnection<
312310

313311
this.#acks.set(currentId, { resolve, reject, timeout });
314312

315-
// @ts-expect-error
316-
const schema = this.opts.emitSchema[type]["message"];
313+
const schema = this.opts.emitSchema[type]?.["message"];
317314

318315
if (!schema) {
319316
clearTimeout(timeout);

packages/core/src/v3/zodSocket.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ export class ZodSocketMessageHandler<TRPCCatalog extends ZodSocketMessageCatalog
147147
};
148148
}
149149

150-
// @ts-expect-error
151-
const schema = this.#schema[parsedMessage.data.type]["message"];
150+
const schema = this.#schema[parsedMessage.data.type]?.["message"];
152151

153152
if (!schema) {
154153
return {
@@ -267,8 +266,7 @@ export class ZodSocketMessageSender<TMessageCatalog extends ZodSocketMessageCata
267266
type: K,
268267
payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>
269268
): void {
270-
// @ts-expect-error
271-
const schema = this.#schema[type]["message"];
269+
const schema = this.#schema[type]?.["message"];
272270

273271
if (!schema) {
274272
throw new Error(`Unknown message type: ${type as string}`);
@@ -293,8 +291,7 @@ export class ZodSocketMessageSender<TMessageCatalog extends ZodSocketMessageCata
293291
type: K,
294292
payload: z.input<GetSocketMessageSchema<TMessageCatalog, K>>
295293
): Promise<z.infer<GetSocketCallbackSchema<TMessageCatalog, K>>> {
296-
// @ts-expect-error
297-
const schema = this.#schema[type]["message"];
294+
const schema = this.#schema[type]?.["message"];
298295

299296
if (!schema) {
300297
throw new Error(`Unknown message type: ${type as string}`);

packages/emails/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"react-email": "^2.1.1",
1616
"resend": "^3.2.0",
1717
"tiny-invariant": "^1.2.0",
18-
"zod": "3.23.8"
18+
"zod": "3.22.3"
1919
},
2020
"devDependencies": {
2121
"@types/node": "^18",

packages/trigger-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"ulid": "^2.3.0",
4949
"uuid": "^9.0.0",
5050
"ws": "^8.11.0",
51-
"zod": "3.23.8"
51+
"zod": "3.22.3"
5252
},
5353
"devDependencies": {
5454
"@types/debug": "^4.1.7",

0 commit comments

Comments
 (0)