convex-helpers 0.1.43 → 0.1.44
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/server/customFunctions.d.ts +15 -21
- package/dist/server/customFunctions.d.ts.map +1 -1
- package/dist/server/index.d.ts +46 -10
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/migrations.d.ts +24 -16
- package/dist/server/migrations.d.ts.map +1 -1
- package/dist/server/rateLimit.d.ts +7 -3
- package/dist/server/rateLimit.d.ts.map +1 -1
- package/dist/server/sessions.d.ts +1 -1
- package/dist/server/zod.d.ts +44 -26
- package/dist/server/zod.d.ts.map +1 -1
- package/dist/server/zod.js +7 -7
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/validators.d.ts +27 -24
- package/dist/validators.d.ts.map +1 -1
- package/dist/validators.js +7 -7
- package/package.json +5 -5
- package/server/customFunctions.ts +60 -79
- package/server/zod.ts +209 -144
- package/validators.ts +26 -24
|
@@ -10,9 +10,8 @@
|
|
|
10
10
|
* as taking in an authentication parameter like an API key or session ID.
|
|
11
11
|
* These arguments must be sent up by the client along with each request.
|
|
12
12
|
*/
|
|
13
|
-
import { ObjectType, PropertyValidators } from "convex/values";
|
|
14
|
-
import { ActionBuilder, DefaultFunctionArgs, FunctionVisibility, GenericActionCtx, GenericDataModel, GenericMutationCtx, GenericQueryCtx, MutationBuilder, QueryBuilder, RegisteredAction, RegisteredMutation, RegisteredQuery,
|
|
15
|
-
import { EmptyObject } from "../index.js";
|
|
13
|
+
import { GenericValidator, ObjectType, PropertyValidators } from "convex/values";
|
|
14
|
+
import { ActionBuilder, ArgsArrayForOptionalValidator, ArgsArrayToObject, DefaultArgsForOptionalValidator, DefaultFunctionArgs, FunctionVisibility, GenericActionCtx, GenericDataModel, GenericMutationCtx, GenericQueryCtx, MutationBuilder, QueryBuilder, RegisteredAction, RegisteredMutation, RegisteredQuery, ReturnValueForOptionalValidator } from "convex/server";
|
|
16
15
|
/**
|
|
17
16
|
* A modifier for a query, mutation, or action.
|
|
18
17
|
*
|
|
@@ -232,29 +231,24 @@ export type Registration<FuncType extends "query" | "mutation" | "action", Visib
|
|
|
232
231
|
mutation: RegisteredMutation<Visibility, Args, Output>;
|
|
233
232
|
action: RegisteredAction<Visibility, Args, Output>;
|
|
234
233
|
}[FuncType];
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
*/
|
|
239
|
-
type ValidatedBuilder<FuncType extends "query" | "mutation" | "action", ModArgsValidator extends PropertyValidators, ModCtx extends Record<string, any>, ModMadeArgs extends Record<string, any>, InputCtx, Visibility extends FunctionVisibility> = <ExistingArgsValidator extends PropertyValidators, Output>(fn: {
|
|
240
|
-
args: ExistingArgsValidator;
|
|
241
|
-
handler: (ctx: Overwrite<InputCtx, ModCtx>, args: Overwrite<ObjectType<ExistingArgsValidator>, ModMadeArgs>) => Output;
|
|
242
|
-
}) => Registration<FuncType, Visibility, ObjectType<ExistingArgsValidator & ModArgsValidator>, Output>;
|
|
243
|
-
/**
|
|
244
|
-
* A builder that customizes a Convex function which doesn't validate arguments.
|
|
245
|
-
* e.g. `query(async (ctx, args) => {})`
|
|
246
|
-
* or `query({ handler: async (ctx, args) => {} })`
|
|
247
|
-
*/
|
|
248
|
-
export type UnvalidatedBuilder<FuncType extends "query" | "mutation" | "action", ModCtx extends Record<string, any>, ModMadeArgs extends Record<string, any>, InputCtx, Visibility extends FunctionVisibility> = <Output, ExistingArgs extends DefaultFunctionArgs = DefaultFunctionArgs>(fn: UnvalidatedFunction<Overwrite<InputCtx, ModCtx>, [
|
|
249
|
-
ExistingArgs & ModMadeArgs
|
|
250
|
-
], Output>) => Registration<FuncType, Visibility, ExistingArgs, Output>;
|
|
234
|
+
type Expand<ObjectType extends Record<any, any>> = ObjectType extends Record<any, any> ? {
|
|
235
|
+
[Key in keyof ObjectType]: ObjectType[Key];
|
|
236
|
+
} : never;
|
|
251
237
|
/**
|
|
252
238
|
* A builder that customizes a Convex function, whether or not it validates
|
|
253
239
|
* arguments. If the customization requires arguments, however, the resulting
|
|
254
240
|
* builder will require argument validation too.
|
|
255
241
|
*/
|
|
256
|
-
type CustomBuilder<FuncType extends "query" | "mutation" | "action", ModArgsValidator extends PropertyValidators, ModCtx extends Record<string, any>, ModMadeArgs extends Record<string, any>, InputCtx, Visibility extends FunctionVisibility> =
|
|
257
|
-
|
|
242
|
+
export type CustomBuilder<FuncType extends "query" | "mutation" | "action", ModArgsValidator extends PropertyValidators, ModCtx extends Record<string, any>, ModMadeArgs extends Record<string, any>, InputCtx, Visibility extends FunctionVisibility> = {
|
|
243
|
+
<ArgsValidator extends PropertyValidators | void, ReturnsValidator extends GenericValidator | void, ReturnValue extends ReturnValueForOptionalValidator<ReturnsValidator> = any, OneOrZeroArgs extends ArgsArrayForOptionalValidator<ArgsValidator> = DefaultArgsForOptionalValidator<ArgsValidator>>(func: {
|
|
244
|
+
args?: ArgsValidator;
|
|
245
|
+
returns?: ReturnsValidator;
|
|
246
|
+
handler: (ctx: Overwrite<InputCtx, ModCtx>, ...args: OneOrZeroArgs extends [infer A] ? [Expand<A & ModMadeArgs>] : [ModMadeArgs]) => ReturnValue;
|
|
247
|
+
} | {
|
|
248
|
+
(ctx: Overwrite<InputCtx, ModCtx>, ...args: OneOrZeroArgs extends [infer A] ? [Expand<A & ModMadeArgs>] : [ModMadeArgs]): ReturnValue;
|
|
249
|
+
}): Registration<FuncType, Visibility, ArgsArrayToObject<OneOrZeroArgs extends [infer A] ? [Expand<A & ObjectType<ModArgsValidator>>] : [ObjectType<ModArgsValidator>]>, ReturnValue>;
|
|
250
|
+
};
|
|
251
|
+
export type CustomCtx<Builder> = Builder extends CustomBuilder<any, any, infer ModCtx, any, infer InputCtx, any> ? Overwrite<InputCtx, ModCtx> : never;
|
|
258
252
|
type Overwrite<T, U> = Omit<T, keyof U> & U;
|
|
259
253
|
export {};
|
|
260
254
|
//# sourceMappingURL=customFunctions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customFunctions.d.ts","sourceRoot":"","sources":["../../server/customFunctions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"customFunctions.d.ts","sourceRoot":"","sources":["../../server/customFunctions.ts"],"names":[],"mappings":"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"}
|
package/dist/server/index.d.ts
CHANGED
|
@@ -18,21 +18,57 @@ import { Expand } from "../index.js";
|
|
|
18
18
|
*/
|
|
19
19
|
export declare function Table<T extends Record<string, Validator<any, any, any>>, TableName extends string>(name: TableName, fields: T): {
|
|
20
20
|
name: TableName;
|
|
21
|
-
table: import("convex/server").TableDefinition<import("convex/
|
|
22
|
-
doc: import("convex/values").
|
|
23
|
-
_id:
|
|
24
|
-
_creationTime:
|
|
25
|
-
}
|
|
21
|
+
table: import("convex/server").TableDefinition<import("convex/values").VObject<import("convex/server").Expand<{ [Property_1 in { [Property in keyof T]: T[Property]["isOptional"] extends "optional" ? Property : never; }[keyof T]]?: Exclude<Infer<T[Property_1]>, undefined> | undefined; } & { [Property_2 in Exclude<keyof T, { [Property in keyof T]: T[Property]["isOptional"] extends "optional" ? Property : never; }[keyof T]>]: Infer<T[Property_2]>; }>, T, "required", { [Property_3 in keyof T]: Property_3 | `${Property_3 & string}.${T[Property_3]["fieldPaths"]}`; }[keyof T] & string>, {}, {}, {}>;
|
|
22
|
+
doc: import("convex/values").VObject<import("convex/server").Expand<{ [Property_5 in (Expand<T & {
|
|
23
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
24
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
25
|
+
}> extends infer T_1 extends Record<string, import("convex/values").GenericValidator> ? { [Property_4 in keyof T_1]: Expand<T & {
|
|
26
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
27
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
28
|
+
}>[Property_4]["isOptional"] extends "optional" ? Property_4 : never; } : never)[keyof Expand<T & {
|
|
29
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
30
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
31
|
+
}>]]?: Exclude<Infer<Expand<T & {
|
|
32
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
33
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
34
|
+
}>[Property_5]>, undefined> | undefined; } & { [Property_1_1 in Exclude<keyof Expand<T & {
|
|
35
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
36
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
37
|
+
}>, (Expand<T & {
|
|
38
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
39
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
40
|
+
}> extends infer T_1 extends Record<string, import("convex/values").GenericValidator> ? { [Property_4 in keyof T_1]: Expand<T & {
|
|
41
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
42
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
43
|
+
}>[Property_4]["isOptional"] extends "optional" ? Property_4 : never; } : never)[keyof Expand<T & {
|
|
44
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
45
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
46
|
+
}>]>]: Infer<Expand<T & {
|
|
47
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
48
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
49
|
+
}>[Property_1_1]>; }>, Expand<T & {
|
|
50
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
51
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
52
|
+
}>, "required", (Expand<T & {
|
|
53
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
54
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
55
|
+
}> extends infer T_2 extends import("convex/values").PropertyValidators ? { [Property_2_1 in keyof T_2]: Property_2_1 | `${Property_2_1 & string}.${Expand<T & {
|
|
56
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
57
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
58
|
+
}>[Property_2_1]["fieldPaths"]}`; } : never)[keyof Expand<T & {
|
|
59
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
60
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
61
|
+
}>] & string>;
|
|
26
62
|
withoutSystemFields: T;
|
|
27
63
|
withSystemFields: Expand<T & {
|
|
28
|
-
_id:
|
|
29
|
-
_creationTime:
|
|
64
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
65
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
30
66
|
}>;
|
|
31
67
|
systemFields: {
|
|
32
|
-
_id:
|
|
33
|
-
_creationTime:
|
|
68
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
69
|
+
_creationTime: import("convex/values").VFloat64<number, "required">;
|
|
34
70
|
};
|
|
35
|
-
_id:
|
|
71
|
+
_id: import("convex/values").VId<GenericId<TableName>, "required">;
|
|
36
72
|
};
|
|
37
73
|
/**
|
|
38
74
|
* @deprecated Use `missingEnvVariableError`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAK,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,KAAK,CACnB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAClD,SAAS,SAAS,MAAM,EACxB,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAK,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,KAAK,CACnB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAClD,SAAS,SAAS,MAAM,EACxB,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqB3B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,UAE3E;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,UAOnB;AAED;;;GAGG;AACH,wBAAgB,cAAc,uBAK7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,IAAI,CAClB,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EACvD,SAAS,SAAS,MAAM,EACxB,SAAS,SAAS,gBAAgB,EAClC,eAAe,SAAS,kBAAkB,EAC1C,kBAAkB,SAAS,kBAAkB,EAE7C,KAAK,EAAE;IACL,IAAI,EAAE,SAAS,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;IACrC,mBAAmB,EAAE,MAAM,CAAC;CAC7B,EACD,KAAK,EAAE,YAAY,CAAC,SAAS,EAAE,eAAe,CAAC,EAC/C,QAAQ,EAAE,eAAe,CAAC,SAAS,EAAE,kBAAkB,CAAC;YAuBhD,kBAAkB,CACtB,kBAAkB,EAClB,UAAU,CAAC,MAAM,CAAC,EAClB,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAC9C;UAMK,eAAe,CACnB,eAAe,EACf;QAAE,EAAE,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;KAAE,EAC5B,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CACrD;cAQK,eAAe,CACnB,eAAe,EACf;QAAE,cAAc,EAAE,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;KAAE,EACzD,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAChE;YAiBK,kBAAkB,CACtB,kBAAkB,EAClB;QACE,EAAE,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QACzB,KAAK,EAAE,OAAO,CACZ,mBAAmB,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAC1D,CAAC;KACH,EACD,OAAO,CAAC,IAAI,CAAC,CACd;aAUK,kBAAkB,CACtB,kBAAkB,EAClB;QAAE,EAAE,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;KAAE,EAC5B,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CACrD;EAEJ"}
|
|
@@ -26,22 +26,21 @@ import { GenericId, ObjectType } from "convex/values";
|
|
|
26
26
|
import { ErrorMessage } from "../index.js";
|
|
27
27
|
export declare const DEFAULT_BATCH_SIZE = 100;
|
|
28
28
|
declare const migrationsFields: {
|
|
29
|
-
name: import("convex/values").
|
|
30
|
-
table: import("convex/values").
|
|
31
|
-
cursor: import("convex/values").
|
|
32
|
-
isDone: import("convex/values").
|
|
33
|
-
workerId: import("convex/values").
|
|
34
|
-
processed: import("convex/values").
|
|
35
|
-
latestStart: import("convex/values").
|
|
36
|
-
latestEnd: import("convex/values").
|
|
29
|
+
name: import("convex/values").VString<string, "required">;
|
|
30
|
+
table: import("convex/values").VString<string, "required">;
|
|
31
|
+
cursor: import("convex/values").VUnion<string | null, [import("convex/values").VString<string, "required">, import("convex/values").VNull<null, "required">], "required", never>;
|
|
32
|
+
isDone: import("convex/values").VBoolean<boolean, "required">;
|
|
33
|
+
workerId: import("convex/values").VId<GenericId<"_scheduled_functions"> | undefined, "optional">;
|
|
34
|
+
processed: import("convex/values").VFloat64<number, "required">;
|
|
35
|
+
latestStart: import("convex/values").VFloat64<number, "required">;
|
|
36
|
+
latestEnd: import("convex/values").VFloat64<number | undefined, "optional">;
|
|
37
37
|
};
|
|
38
38
|
type MigrationMetadata = ObjectType<typeof migrationsFields>;
|
|
39
39
|
type MigrationMetadataDoc<TableName extends string> = MigrationMetadata & {
|
|
40
40
|
_id: GenericId<TableName>;
|
|
41
41
|
_creationTime: number;
|
|
42
42
|
};
|
|
43
|
-
export declare const migrationsTable: import("convex/server").TableDefinition<{
|
|
44
|
-
_creationTime: number;
|
|
43
|
+
export declare const migrationsTable: import("convex/server").TableDefinition<import("convex/values").VObject<{
|
|
45
44
|
workerId?: GenericId<"_scheduled_functions"> | undefined;
|
|
46
45
|
latestEnd?: number | undefined;
|
|
47
46
|
name: string;
|
|
@@ -50,15 +49,24 @@ export declare const migrationsTable: import("convex/server").TableDefinition<{
|
|
|
50
49
|
cursor: string | null;
|
|
51
50
|
processed: number;
|
|
52
51
|
latestStart: number;
|
|
53
|
-
},
|
|
52
|
+
}, {
|
|
53
|
+
name: import("convex/values").VString<string, "required">;
|
|
54
|
+
table: import("convex/values").VString<string, "required">;
|
|
55
|
+
cursor: import("convex/values").VUnion<string | null, [import("convex/values").VString<string, "required">, import("convex/values").VNull<null, "required">], "required", never>;
|
|
56
|
+
isDone: import("convex/values").VBoolean<boolean, "required">;
|
|
57
|
+
workerId: import("convex/values").VId<GenericId<"_scheduled_functions"> | undefined, "optional">;
|
|
58
|
+
processed: import("convex/values").VFloat64<number, "required">;
|
|
59
|
+
latestStart: import("convex/values").VFloat64<number, "required">;
|
|
60
|
+
latestEnd: import("convex/values").VFloat64<number | undefined, "optional">;
|
|
61
|
+
}, "required", "name" | "table" | "isDone" | "cursor" | "workerId" | "processed" | "latestStart" | "latestEnd">, {
|
|
54
62
|
name: ["name", "_creationTime"];
|
|
55
63
|
}, {}, {}>;
|
|
56
64
|
declare const migrationArgs: {
|
|
57
|
-
fn: import("convex/values").
|
|
58
|
-
cursor: import("convex/values").
|
|
59
|
-
batchSize: import("convex/values").
|
|
60
|
-
next: import("convex/values").
|
|
61
|
-
dryRun: import("convex/values").
|
|
65
|
+
fn: import("convex/values").VString<string, "required">;
|
|
66
|
+
cursor: import("convex/values").VUnion<string | null | undefined, [import("convex/values").VString<string, "required">, import("convex/values").VNull<null, "required">], "optional", never>;
|
|
67
|
+
batchSize: import("convex/values").VFloat64<number | undefined, "optional">;
|
|
68
|
+
next: import("convex/values").VArray<string[] | undefined, import("convex/values").VString<string, "required">, "optional">;
|
|
69
|
+
dryRun: import("convex/values").VBoolean<boolean | undefined, "optional">;
|
|
62
70
|
};
|
|
63
71
|
type MigrationArgs = ObjectType<typeof migrationArgs>;
|
|
64
72
|
type MigrationTableNames<DataModel extends GenericDataModel> = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../server/migrations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EAGL,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EAErB,gBAAgB,EAChB,kBAAkB,EAGlB,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,SAAS,EAET,qBAAqB,EACtB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,UAAU,EAAK,MAAM,eAAe,CAAC;AACzD,OAAO,EAAY,YAAY,EAAE,MAAM,aAAa,CAAC;AAGrD,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAGtC,QAAA,MAAM,gBAAgB;;;;;;;;;CAUrB,CAAC;AACF,KAAK,iBAAiB,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC7D,KAAK,oBAAoB,CAAC,SAAS,SAAS,MAAM,IAAI,iBAAiB,GAAG;IACxE,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AACF,eAAO,MAAM,eAAe
|
|
1
|
+
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../server/migrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -91,13 +91,17 @@ export declare const RateLimitTable = "rateLimits";
|
|
|
91
91
|
* This is necessary as the rate limit implementation uses an index.
|
|
92
92
|
*/
|
|
93
93
|
export declare const rateLimitTables: {
|
|
94
|
-
rateLimits: import("convex/server").TableDefinition<{
|
|
95
|
-
_creationTime: number;
|
|
94
|
+
rateLimits: import("convex/server").TableDefinition<import("convex/values").VObject<{
|
|
96
95
|
key?: string | undefined;
|
|
97
96
|
name: string;
|
|
98
97
|
value: number;
|
|
99
98
|
ts: number;
|
|
100
|
-
},
|
|
99
|
+
}, {
|
|
100
|
+
name: import("convex/values").VString<string, "required">;
|
|
101
|
+
key: import("convex/values").VString<string | undefined, "optional">;
|
|
102
|
+
value: import("convex/values").VFloat64<number, "required">;
|
|
103
|
+
ts: import("convex/values").VFloat64<number, "required">;
|
|
104
|
+
}, "required", "name" | "value" | "key" | "ts">, {
|
|
101
105
|
name: ["name", "key", "_creationTime"];
|
|
102
106
|
}, {}, {}>;
|
|
103
107
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../../server/rateLimit.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,qBAAqB,EACrB,qBAAqB,EACrB,6BAA6B,EAC7B,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,oBAAoB,GAAG,oBAAoB,CAAC;AAE1E;;;;;;;;;GASG;AACH,UAAU,0BAA0B,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM;IAC/D,IAAI,EAAE,IAAI,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAMnC;AAED;;;;;;;;;;;;GAYG;AACH,UAAU,aAAc,SAAQ,0BAA0B;IACxD,MAAM,EAAE,eAAe,CAAC;CACzB;AAED,eAAO,MAAM,cAAc,eAAe,CAAC;AAE3C;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,eAAe
|
|
1
|
+
{"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../../server/rateLimit.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ export type SessionId = string & {
|
|
|
60
60
|
};
|
|
61
61
|
export declare const vSessionId: Validator<SessionId>;
|
|
62
62
|
export declare const SessionIdArg: {
|
|
63
|
-
sessionId: Validator<SessionId
|
|
63
|
+
sessionId: Validator<SessionId>;
|
|
64
64
|
};
|
|
65
65
|
type SessionFunction<T extends "query" | "mutation" | "action", Args extends any = any> = FunctionReference<T, "public" | "internal", {
|
|
66
66
|
sessionId: SessionId;
|
package/dist/server/zod.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { ZodTypeDef, z } from "zod";
|
|
2
|
-
import { GenericId, ObjectType, PropertyValidators, Validator } from "convex/values";
|
|
3
|
-
import { FunctionVisibility, GenericDataModel, GenericActionCtx, GenericQueryCtx, MutationBuilder, QueryBuilder, GenericMutationCtx, ActionBuilder, TableNamesInDataModel } from "convex/server";
|
|
4
|
-
import { Mod, Registration
|
|
5
|
-
import { EmptyObject } from "../index.js";
|
|
2
|
+
import { GenericId, ObjectType, PropertyValidators, VArray, VAny, VString, VId, VUnion, VFloat64, VInt64, VBoolean, VNull, VLiteral, GenericValidator, VOptional, VObject, Validator } from "convex/values";
|
|
3
|
+
import { FunctionVisibility, GenericDataModel, GenericActionCtx, GenericQueryCtx, MutationBuilder, QueryBuilder, GenericMutationCtx, ActionBuilder, TableNamesInDataModel, DefaultFunctionArgs, ArgsArrayToObject } from "convex/server";
|
|
4
|
+
import { Mod, Registration } from "./customFunctions.js";
|
|
6
5
|
export type ZodValidator = Record<string, z.ZodTypeAny>;
|
|
7
6
|
/**
|
|
8
7
|
* Create a validator for a Convex `Id`.
|
|
@@ -179,34 +178,53 @@ export declare function zCustomMutation<ModArgsValidator extends PropertyValidat
|
|
|
179
178
|
* @returns A new action builder using zod validation to define queries.
|
|
180
179
|
*/
|
|
181
180
|
export declare function zCustomAction<ModArgsValidator extends PropertyValidators, ModCtx extends Record<string, any>, ModMadeArgs extends Record<string, any>, Visibility extends FunctionVisibility, DataModel extends GenericDataModel>(action: ActionBuilder<DataModel, Visibility>, mod: Mod<GenericActionCtx<DataModel>, ModArgsValidator, ModCtx, ModMadeArgs>): CustomBuilder<"action", ModArgsValidator, ModCtx, ModMadeArgs, GenericActionCtx<DataModel>, Visibility>;
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
type
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
181
|
+
type OneArgArray<ArgsObject extends DefaultFunctionArgs = DefaultFunctionArgs> = [
|
|
182
|
+
ArgsObject
|
|
183
|
+
];
|
|
184
|
+
export type ArgsArray = OneArgArray | [];
|
|
185
|
+
export type ReturnValueForOptionalZodValidator<ReturnsValidator extends z.ZodTypeAny | void> = [ReturnsValidator] extends [z.ZodTypeAny] ? z.input<ReturnsValidator> | Promise<z.input<ReturnsValidator>> : any;
|
|
186
|
+
export type ArgsArrayForOptionalValidator<ArgsValidator extends ZodValidator | void> = [ArgsValidator] extends [ZodValidator] ? [z.output<z.ZodObject<ArgsValidator>>] : ArgsArray;
|
|
187
|
+
export type DefaultArgsForOptionalValidator<ArgsValidator extends ZodValidator | void> = [ArgsValidator] extends [ZodValidator] ? [z.output<z.ZodObject<ArgsValidator>>] : OneArgArray;
|
|
188
|
+
type Overwrite<T, U> = Omit<T, keyof U> & U;
|
|
189
|
+
type Expand<ObjectType extends Record<any, any>> = ObjectType extends Record<any, any> ? {
|
|
190
|
+
[Key in keyof ObjectType]: ObjectType[Key];
|
|
191
|
+
} : never;
|
|
191
192
|
/**
|
|
192
193
|
* A builder that customizes a Convex function, whether or not it validates
|
|
193
194
|
* arguments. If the customization requires arguments, however, the resulting
|
|
194
195
|
* builder will require argument validation too.
|
|
195
196
|
*/
|
|
196
|
-
type CustomBuilder<FuncType extends "query" | "mutation" | "action", ModArgsValidator extends PropertyValidators, ModCtx extends Record<string, any>, ModMadeArgs extends Record<string, any>, InputCtx, Visibility extends FunctionVisibility> =
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
}
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
197
|
+
export type CustomBuilder<FuncType extends "query" | "mutation" | "action", ModArgsValidator extends PropertyValidators, ModCtx extends Record<string, any>, ModMadeArgs extends Record<string, any>, InputCtx, Visibility extends FunctionVisibility> = {
|
|
198
|
+
<ArgsValidator extends ZodValidator | void, ReturnsZodValidtor extends z.ZodTypeAny | void, ReturnValue extends ReturnValueForOptionalZodValidator<ReturnsZodValidtor> = any, OneOrZeroArgs extends ArgsArrayForOptionalValidator<ArgsValidator> = DefaultArgsForOptionalValidator<ArgsValidator>>(func: {
|
|
199
|
+
args?: ArgsValidator;
|
|
200
|
+
output?: ReturnsZodValidtor;
|
|
201
|
+
handler: (ctx: Overwrite<InputCtx, ModCtx>, ...args: OneOrZeroArgs extends [infer A] ? [Expand<A & ModMadeArgs>] : [ModMadeArgs]) => ReturnValue;
|
|
202
|
+
} | {
|
|
203
|
+
(ctx: Overwrite<InputCtx, ModCtx>, ...args: OneOrZeroArgs extends [infer A] ? [Expand<A & ModMadeArgs>] : [ModMadeArgs]): ReturnValue;
|
|
204
|
+
}): Registration<FuncType, Visibility, ArgsArrayToObject<[
|
|
205
|
+
ArgsValidator
|
|
206
|
+
] extends [ZodValidator] ? [
|
|
207
|
+
Expand<z.input<z.ZodObject<ArgsValidator>> & ObjectType<ModArgsValidator>>
|
|
208
|
+
] : OneOrZeroArgs extends [infer A] ? [Expand<A & ObjectType<ModArgsValidator>>] : [ObjectType<ModArgsValidator>]>, ReturnValue>;
|
|
209
|
+
};
|
|
210
|
+
type ConvexUnionValidatorFromZod<T> = T extends z.ZodTypeAny[] ? VUnion<ConvexValidatorFromZod<T[number]>["type"], {
|
|
211
|
+
[Index in keyof T]: T[Index] extends z.ZodTypeAny ? ConvexValidatorFromZod<T[Index]> : never;
|
|
212
|
+
}, "required", ConvexValidatorFromZod<T[number]>["fieldPaths"]> : never;
|
|
213
|
+
type ConvexValidatorFromZod<Z extends z.ZodTypeAny> = Z extends Zid<infer TableName> ? VId<GenericId<TableName>> : Z extends z.ZodString ? VString : Z extends z.ZodNumber ? VFloat64 : Z extends z.ZodNaN ? VFloat64 : Z extends z.ZodBigInt ? VInt64 : Z extends z.ZodBoolean ? VBoolean : Z extends z.ZodNull ? VNull : Z extends z.ZodUnknown ? VAny : Z extends z.ZodAny ? VAny : Z extends z.ZodArray<infer Inner> ? VArray<ConvexValidatorFromZod<Inner>["type"][], ConvexValidatorFromZod<Inner>> : Z extends z.ZodObject<infer ZodShape> ? VObject<{
|
|
214
|
+
[key in keyof ZodShape]: ConvexValidatorFromZod<ZodShape[key]>["type"];
|
|
215
|
+
}, {
|
|
208
216
|
[key in keyof ZodShape]: ConvexValidatorFromZod<ZodShape[key]>;
|
|
209
|
-
}> : Z extends z.ZodUnion<infer T> ?
|
|
217
|
+
}> : Z extends z.ZodUnion<infer T> ? ConvexUnionValidatorFromZod<T> : Z extends z.ZodDiscriminatedUnion<any, infer T> ? VUnion<ConvexValidatorFromZod<T[number]>["type"], {
|
|
218
|
+
[Index in keyof T]: ConvexValidatorFromZod<T[Index]>;
|
|
219
|
+
}, "required", ConvexValidatorFromZod<T[number]>["fieldPaths"]> : Z extends z.ZodTuple<infer Inner> ? VArray<ConvexValidatorFromZod<Inner[number]>["type"][], ConvexValidatorFromZod<Inner[number]>> : Z extends z.ZodLazy<infer Inner> ? ConvexValidatorFromZod<Inner> : Z extends z.ZodLiteral<infer Literal> ? VLiteral<Literal> : Z extends z.ZodEnum<infer T> ? T extends Array<any> ? VUnion<T[number], {
|
|
220
|
+
[Index in keyof T]: VLiteral<T[Index]>;
|
|
221
|
+
}, "required", ConvexValidatorFromZod<T[number]>["fieldPaths"]> : never : Z extends z.ZodEffects<infer Inner> ? ConvexValidatorFromZod<Inner> : Z extends z.ZodOptional<infer Inner> ? ConvexValidatorFromZod<Inner> extends GenericValidator ? VOptional<ConvexValidatorFromZod<Inner>> : never : Z extends z.ZodNullable<infer Inner> ? ConvexValidatorFromZod<Inner> extends Validator<any, "required", any> ? VUnion<null | ConvexValidatorFromZod<Inner>["type"], [
|
|
222
|
+
ConvexValidatorFromZod<Inner>,
|
|
223
|
+
VNull
|
|
224
|
+
], "required", ConvexValidatorFromZod<Inner>["fieldPaths"]> : ConvexValidatorFromZod<Inner> extends Validator<infer T, "optional", infer F> ? VUnion<null | Exclude<ConvexValidatorFromZod<Inner>["type"], undefined>, [
|
|
225
|
+
Validator<T, "required", F>,
|
|
226
|
+
VNull
|
|
227
|
+
], "optional", ConvexValidatorFromZod<Inner>["fieldPaths"]> : never : Z extends z.ZodBranded<infer Inner, any> ? ConvexValidatorFromZod<Inner> : Z extends z.ZodDefault<infer Inner> ? ConvexValidatorFromZod<Inner> extends GenericValidator ? VOptional<ConvexValidatorFromZod<Inner>> : never : Z extends z.ZodReadonly<infer Inner> ? ConvexValidatorFromZod<Inner> : Z extends z.ZodPipeline<infer Inner, any> ? ConvexValidatorFromZod<Inner> : never;
|
|
210
228
|
/**
|
|
211
229
|
* Turn a Zod validator into a Convex Validator.
|
|
212
230
|
* @param zod Zod validator can be a Zod object, or a Zod type like `z.string()`
|
package/dist/server/zod.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zod.d.ts","sourceRoot":"","sources":["../../server/zod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC3D,OAAO,EAGL,SAAS,EACT,UAAU,EACV,kBAAkB,
|
|
1
|
+
{"version":3,"file":"zod.d.ts","sourceRoot":"","sources":["../../server/zod.ts"],"names":[],"mappings":"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"}
|
package/dist/server/zod.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
2
|
import { v, ConvexError, } from "convex/values";
|
|
3
|
-
import { NoOp, splitArgs
|
|
3
|
+
import { NoOp, splitArgs } from "./customFunctions.js";
|
|
4
4
|
/**
|
|
5
5
|
* Create a validator for a Convex `Id`.
|
|
6
6
|
*
|
|
@@ -334,7 +334,7 @@ export function zodToConvex(zod) {
|
|
|
334
334
|
return v.any();
|
|
335
335
|
case "ZodArray":
|
|
336
336
|
const inner = zodToConvex(zod._def.type);
|
|
337
|
-
if (inner.isOptional) {
|
|
337
|
+
if (inner.isOptional === "optional") {
|
|
338
338
|
throw new Error("Arrays of optional values are not supported");
|
|
339
339
|
}
|
|
340
340
|
return v.array(inner);
|
|
@@ -360,18 +360,18 @@ export function zodToConvex(zod) {
|
|
|
360
360
|
case "ZodOptional":
|
|
361
361
|
return v.optional(zodToConvex(zod.unwrap()));
|
|
362
362
|
case "ZodNullable":
|
|
363
|
-
const nullable =
|
|
364
|
-
if (nullable.
|
|
363
|
+
const nullable = zod.unwrap();
|
|
364
|
+
if (nullable._def.typeName === "ZodOptional") {
|
|
365
365
|
// Swap nullable(optional(Z)) for optional(nullable(Z))
|
|
366
366
|
// Casting to any to ignore the mismatch of optional
|
|
367
|
-
return v.optional(v.union(
|
|
367
|
+
return v.optional(v.union(zodToConvex(nullable.unwrap()), v.null()));
|
|
368
368
|
}
|
|
369
|
-
return v.union(v.null()
|
|
369
|
+
return v.union(zodToConvex(nullable), v.null());
|
|
370
370
|
case "ZodBranded":
|
|
371
371
|
return zodToConvex(zod.unwrap());
|
|
372
372
|
case "ZodDefault":
|
|
373
373
|
const withDefault = zodToConvex(zod._def.innerType);
|
|
374
|
-
if (withDefault.isOptional) {
|
|
374
|
+
if (withDefault.isOptional === "optional") {
|
|
375
375
|
return withDefault;
|
|
376
376
|
}
|
|
377
377
|
return v.optional(withDefault);
|