update to latest zenstack

Author: ymc9

.env

@@ -0,0 +1,14 @@
+# When adding additional env variables, the schema in /env/schema.mjs should be updated accordingly
+
+# Prisma
+DATABASE_URL=file:./db.sqlite
+
+DISCORD_CLIENT_ID=
+DISCORD_CLIENT_SECRET=
+
+# Next Auth
+# You can generate the secret via 'openssl rand -base64 32' on Linux
+# More info: https://next-auth.js.org/configuration/options#secret
+NEXTAUTH_URL=http://localhost:3000
+
+NEXTAUTH_SECRET=abc123

.gitignore

@@ -32,7 +32,6 @@ yarn-error.log*
 
 # local env files
 # do not commit any .env files to git, except for the .env.example file. https://create.t3.gg/en/usage/env-variables#using-environment-variables
-.env
 .env*.local
 
 # vercel

package-lock.json

@@ -9,13 +9,14 @@
  "postinstall": "prisma generate",
  "lint": "next lint",
  "start": "next start",
- "update": "npm i @zenstackhq/runtime@canary @zenstackhq/next@canary && npm i -D zenstack@canary"
+ "update": "npm i @zenstackhq/runtime@latest @zenstackhq/next@latest && npm i -D zenstack@latest"
  },
  "dependencies": {
  "@next-auth/prisma-adapter": "^1.0.5",
  "@prisma/client": "^4.5.0",
- "@zenstackhq/next": "^0.6.0-pre.18",
- "@zenstackhq/runtime": "^0.6.0-pre.18",
+ "@zenstackhq/next": "^1.0.0-alpha.28",
+ "@zenstackhq/react": "^1.0.0-alpha.28",
+ "@zenstackhq/runtime": "^1.0.0-alpha.28",
  "next": "13.0.2",
  "next-auth": "^4.18.3",
  "react": "18.2.0",
@@ -37,7 +38,7 @@
  "prisma": "^4.5.0",
  "tailwindcss": "^3.2.0",
  "typescript": "^4.8.4",
- "zenstack": "^0.6.0-pre.18"
+ "zenstack": "^1.0.0-alpha.28"
  },
  "ct3aMetadata": {
  "initVersion": "6.11.3"

package.json

@@ -1,3 +1,8 @@
+//////////////////////////////////////////////////////////////////////////////////////////////
+// DO NOT MODIFY THIS FILE //
+// This file is automatically generated by ZenStack CLI and should not be manually updated. //
+//////////////////////////////////////////////////////////////////////////////////////////////
+
 datasource db {
  provider="sqlite"
  url=env("DATABASE_URL")
@@ -13,6 +18,8 @@ model Example {
  updatedAt DateTime @updatedAt()
 }
 
+/// @@allow('all', auth() == author)
+/// @@allow('read', auth() != null && published)
 model Post {
  id String @id() @default(cuid())
  createdAt DateTime @default(now())
@@ -51,11 +58,15 @@ model Session {
  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
+/// @@allow('create,read', true)
+/// @@allow('update,delete', auth() == this)
 model User {
  id String @id() @default(cuid())
  name String?
  email String? @unique()
  emailVerified DateTime?
+ /// @password
+ /// @omit
  password String
  posts Post[]
  image String?

prisma/schema.prisma

@@ -14,8 +14,8 @@ datasource db {
  url = env("DATABASE_URL")
 }
 
-plugin nestjs {
- provider = '@zenstack/react-hooks'
+plugin reactHooks {
+ provider = '@zenstackhq/react'
  output = "./src/lib/hooks"
 }
 
@@ -56,7 +56,6 @@ model Account {
  id_token String? // @db.Text
  session_state String?
  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
-
  @@unique([provider, providerAccountId])
 }
 
@@ -91,6 +90,5 @@ model VerificationToken {
  identifier String
  token String @unique
  expires DateTime
-
  @@unique([identifier, token])
 }

schema.zmodel

@@ -1,7 +1,8 @@
+/* eslint-disable */
 import type { Prisma, Post } from "@prisma/client";
 import { useContext } from 'react';
-import { RequestHandlerContext } from '@zenstackhq/next/client';
-import { request, type RequestOptions } from '@zenstackhq/runtime/client';
+import { RequestHandlerContext, type RequestOptions } from '@zenstackhq/react/runtime';
+import * as request from '@zenstackhq/react/runtime';
 
 export function usePost() {
  const { endpoint } = useContext(RequestHandlerContext);
@@ -21,10 +22,6 @@ export function usePost() {
  }
  }
 
- async function createMany<T extends Prisma.PostCreateManyArgs>(args: Prisma.SelectSubset<T, Prisma.PostCreateManyArgs>) {
- return await request.post<Prisma.SelectSubset<T, Prisma.PostCreateManyArgs>, Prisma.BatchPayload>(`${endpoint}/post/createMany`, args, mutate);
- }
-
  function findMany<T extends Prisma.PostFindManyArgs>(args?: Prisma.SelectSubset<T, Prisma.PostFindManyArgs>, options?: RequestOptions<Array<Prisma.PostGetPayload<T>>>) {
  return request.get<Array<Prisma.PostGetPayload<T>>>(`${endpoint}/post/findMany`, args, options);
  }
@@ -132,9 +129,5 @@ export function usePost() {
  }[OrderFields]>(args: Prisma.SubsetIntersection<T, Prisma.PostGroupByArgs, OrderByArg> & InputErrors, options?: RequestOptions<{} extends InputErrors ? Prisma.GetPostGroupByPayload<T> : InputErrors>) {
  return request.get<{} extends InputErrors ? Prisma.GetPostGroupByPayload<T> : InputErrors>(`${endpoint}/post/groupBy`, args, options);
  }
-
- function count<T extends Prisma.PostCountArgs>(args: Prisma.Subset<T, Prisma.PostCountArgs>, options?: RequestOptions<T extends { select: any; } ? T['select'] extends true ? number : Prisma.GetScalarType<T['select'], Prisma.PostCountAggregateOutputType> : number>) {
- return request.get<T extends { select: any; } ? T['select'] extends true ? number : Prisma.GetScalarType<T['select'], Prisma.PostCountAggregateOutputType> : number>(`${endpoint}/post/count`, args, options);
- }
- return { create, createMany, findMany, findUnique, findFirst, update, updateMany, upsert, del, deleteMany, aggregate, groupBy, count };
+ return { create, findMany, findUnique, findFirst, update, updateMany, upsert, del, deleteMany, aggregate, groupBy };
 }

src/lib/hooks/post.ts

@@ -1,7 +1,8 @@
+/* eslint-disable */
 import type { Prisma, User } from "@prisma/client";
 import { useContext } from 'react';
-import { RequestHandlerContext } from '@zenstackhq/next/client';
-import { request, type RequestOptions } from '@zenstackhq/runtime/client';
+import { RequestHandlerContext, type RequestOptions } from '@zenstackhq/react/runtime';
+import * as request from '@zenstackhq/react/runtime';
 
 export function useUser() {
  const { endpoint } = useContext(RequestHandlerContext);
@@ -21,10 +22,6 @@ export function useUser() {
  }
  }
 
- async function createMany<T extends Prisma.UserCreateManyArgs>(args: Prisma.SelectSubset<T, Prisma.UserCreateManyArgs>) {
- return await request.post<Prisma.SelectSubset<T, Prisma.UserCreateManyArgs>, Prisma.BatchPayload>(`${endpoint}/user/createMany`, args, mutate);
- }
-
  function findMany<T extends Prisma.UserFindManyArgs>(args?: Prisma.SelectSubset<T, Prisma.UserFindManyArgs>, options?: RequestOptions<Array<Prisma.UserGetPayload<T>>>) {
  return request.get<Array<Prisma.UserGetPayload<T>>>(`${endpoint}/user/findMany`, args, options);
  }
@@ -132,9 +129,5 @@ export function useUser() {
  }[OrderFields]>(args: Prisma.SubsetIntersection<T, Prisma.UserGroupByArgs, OrderByArg> & InputErrors, options?: RequestOptions<{} extends InputErrors ? Prisma.GetUserGroupByPayload<T> : InputErrors>) {
  return request.get<{} extends InputErrors ? Prisma.GetUserGroupByPayload<T> : InputErrors>(`${endpoint}/user/groupBy`, args, options);
  }
-
- function count<T extends Prisma.UserCountArgs>(args: Prisma.Subset<T, Prisma.UserCountArgs>, options?: RequestOptions<T extends { select: any; } ? T['select'] extends true ? number : Prisma.GetScalarType<T['select'], Prisma.UserCountAggregateOutputType> : number>) {
- return request.get<T extends { select: any; } ? T['select'] extends true ? number : Prisma.GetScalarType<T['select'], Prisma.UserCountAggregateOutputType> : number>(`${endpoint}/user/count`, args, options);
- }
- return { create, createMany, findMany, findUnique, findFirst, update, updateMany, upsert, del, deleteMany, aggregate, groupBy, count };
+ return { create, findMany, findUnique, findFirst, update, updateMany, upsert, del, deleteMany, aggregate, groupBy };
 }

src/lib/hooks/user.ts

@@ -25,15 +25,6 @@ export const authOptions: NextAuthOptions = {
  // Configure one or more authentication providers
  adapter: PrismaAdapter(prisma),
  providers: [
- // highlight-start
- // Remove DiscordProvider below:
- // DiscordProvider({
- // clientId: env.DISCORD_CLIENT_ID,
- // clientSecret: env.DISCORD_CLIENT_SECRET,
- // }),
- // highlight-end
-
- // highlight-start
  CredentialsProvider({
  credentials: {
  email: {
@@ -45,7 +36,6 @@ export const authOptions: NextAuthOptions = {
  },
  authorize: authorize(prisma),
  }),
- // highlight-end
  ],
 };