Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zenstack-v3",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"description": "ZenStack",
"packageManager": "pnpm@10.12.1",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"publisher": "zenstack",
"displayName": "ZenStack CLI",
"description": "FullStack database toolkit with built-in access control and automatic API generation.",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"type": "module",
"author": {
"name": "ZenStack Team"
Expand Down
2 changes: 1 addition & 1 deletion packages/common-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/common-helpers",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"description": "ZenStack Common Helpers",
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-zenstack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-zenstack",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"description": "Create a new ZenStack project",
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/eslint-config",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"type": "module",
"private": true,
"license": "MIT"
Expand Down
2 changes: 1 addition & 1 deletion packages/ide/vscode/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "zenstack",
"publisher": "zenstack",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"displayName": "ZenStack Language Tools",
"description": "VSCode extension for ZenStack ZModel language",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/language/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@zenstackhq/language",
"description": "ZenStack ZModel language specification",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"license": "MIT",
"author": "ZenStack Team",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/runtime",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"description": "ZenStack Runtime",
"type": "module",
"scripts": {
Expand Down
90 changes: 73 additions & 17 deletions packages/runtime/src/client/client-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -411,100 +411,156 @@ function createModelCrudHandler<Schema extends SchemaDef, Model extends GetModel
});
};

// type parameters to operation handlers are explicitly specified to improve tsc performance
return {
findUnique: (args: unknown) => {
return createPromise('findUnique', args, new FindOperationHandler(client, model, inputValidator), true);
return createPromise(
'findUnique',
args,
new FindOperationHandler<Schema>(client, model, inputValidator),
true,
);
},

findUniqueOrThrow: (args: unknown) => {
return createPromise(
'findUnique',
args,
new FindOperationHandler(client, model, inputValidator),
new FindOperationHandler<Schema>(client, model, inputValidator),
true,
true,
);
},

findFirst: (args: unknown) => {
return createPromise('findFirst', args, new FindOperationHandler(client, model, inputValidator), true);
return createPromise(
'findFirst',
args,
new FindOperationHandler<Schema>(client, model, inputValidator),
true,
);
},

findFirstOrThrow: (args: unknown) => {
return createPromise(
'findFirst',
args,
new FindOperationHandler(client, model, inputValidator),
new FindOperationHandler<Schema>(client, model, inputValidator),
true,
true,
);
},

findMany: (args: unknown) => {
return createPromise('findMany', args, new FindOperationHandler(client, model, inputValidator), true);
return createPromise(
'findMany',
args,
new FindOperationHandler<Schema>(client, model, inputValidator),
true,
);
},

create: (args: unknown) => {
return createPromise('create', args, new CreateOperationHandler(client, model, inputValidator), true);
return createPromise(
'create',
args,
new CreateOperationHandler<Schema>(client, model, inputValidator),
true,
);
},

createMany: (args: unknown) => {
return createPromise('createMany', args, new CreateOperationHandler(client, model, inputValidator), false);
return createPromise(
'createMany',
args,
new CreateOperationHandler<Schema>(client, model, inputValidator),
false,
);
},

createManyAndReturn: (args: unknown) => {
return createPromise(
'createManyAndReturn',
args,
new CreateOperationHandler(client, model, inputValidator),
new CreateOperationHandler<Schema>(client, model, inputValidator),
true,
);
},

update: (args: unknown) => {
return createPromise('update', args, new UpdateOperationHandler(client, model, inputValidator), true);
return createPromise(
'update',
args,
new UpdateOperationHandler<Schema>(client, model, inputValidator),
true,
);
},

updateMany: (args: unknown) => {
return createPromise('updateMany', args, new UpdateOperationHandler(client, model, inputValidator), false);
return createPromise(
'updateMany',
args,
new UpdateOperationHandler<Schema>(client, model, inputValidator),
false,
);
},

updateManyAndReturn: (args: unknown) => {
return createPromise(
'updateManyAndReturn',
args,
new UpdateOperationHandler(client, model, inputValidator),
new UpdateOperationHandler<Schema>(client, model, inputValidator),
true,
);
},

upsert: (args: unknown) => {
return createPromise('upsert', args, new UpdateOperationHandler(client, model, inputValidator), true);
return createPromise(
'upsert',
args,
new UpdateOperationHandler<Schema>(client, model, inputValidator),
true,
);
},

delete: (args: unknown) => {
return createPromise('delete', args, new DeleteOperationHandler(client, model, inputValidator), true);
return createPromise(
'delete',
args,
new DeleteOperationHandler<Schema>(client, model, inputValidator),
true,
);
},

deleteMany: (args: unknown) => {
return createPromise('deleteMany', args, new DeleteOperationHandler(client, model, inputValidator), false);
return createPromise(
'deleteMany',
args,
new DeleteOperationHandler<Schema>(client, model, inputValidator),
false,
);
},

count: (args: unknown) => {
return createPromise('count', args, new CountOperationHandler(client, model, inputValidator), false);
return createPromise(
'count',
args,
new CountOperationHandler<Schema>(client, model, inputValidator),
false,
);
},

aggregate: (args: unknown) => {
return createPromise(
'aggregate',
args,
new AggregateOperationHandler(client, model, inputValidator),
new AggregateOperationHandler<Schema>(client, model, inputValidator),
false,
);
},

groupBy: (args: unknown) => {
return createPromise('groupBy', args, new GroupByOperationHandler(client, model, inputValidator));
return createPromise('groupBy', args, new GroupByOperationHandler<Schema>(client, model, inputValidator));
},
} as ModelOperations<Schema, Model>;
}
30 changes: 13 additions & 17 deletions packages/runtime/src/utils/type-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,19 @@ export type WrapType<T, Optional = false, Array = false> = Optional extends true
? T[]
: T;

export type MapBaseType<T> = T extends 'String'
? string
: T extends 'Boolean'
? boolean
: T extends 'Int' | 'Float'
? number
: T extends 'BigInt'
? bigint
: T extends 'Decimal'
? Decimal
: T extends 'DateTime'
? Date
: T extends 'Bytes'
? Uint8Array
: T extends 'Json'
? JsonValue
: unknown;
type TypeMap = {
String: string;
Boolean: boolean;
Int: number;
Float: number;
BigInt: bigint;
Decimal: Decimal;
DateTime: Date;
Bytes: Uint8Array;
Json: JsonValue;
};

export type MapBaseType<T extends string> = T extends keyof TypeMap ? TypeMap[T] : unknown;

export type JsonValue = string | number | boolean | null | JsonObject | JsonArray;

Expand Down
4 changes: 2 additions & 2 deletions packages/runtime/test/client-api/computed-fields.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ model User {
{
computedFields: {
User: {
upperName: (eb) => eb.fn('upper', ['name']),
upperName: (eb: any) => eb.fn('upper', ['name']),
},
},
} as any,
Expand Down Expand Up @@ -90,7 +90,7 @@ model User {
{
computedFields: {
User: {
upperName: (eb) => eb.lit(null),
upperName: (eb: any) => eb.lit(null),
},
},
} as any,
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/sdk",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"description": "ZenStack SDK",
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/tanstack-query/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/tanstack-query",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"description": "",
"main": "index.js",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/testtools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/testtools",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"description": "ZenStack Test Tools",
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/typescript-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/typescript-config",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"private": true,
"license": "MIT"
}
2 changes: 1 addition & 1 deletion packages/zod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/zod",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"description": "",
"type": "module",
"main": "index.js",
Expand Down
2 changes: 1 addition & 1 deletion samples/blog/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sample-blog",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "e2e",
"version": "3.0.0-alpha.11",
"version": "3.0.0-alpha.12",
"private": true,
"scripts": {
"test": "vitest run"
Expand Down