Loading...
;
} else if (status === 'unauthenticated') {
- signIn();
+ router.push('/signin');
return <>;
} else {
return <>{children};
diff --git a/samples/todo/components/BreadCrumb.tsx b/samples/todo/components/BreadCrumb.tsx
index 98e233c4e..f537f9c1b 100644
--- a/samples/todo/components/BreadCrumb.tsx
+++ b/samples/todo/components/BreadCrumb.tsx
@@ -1,16 +1,17 @@
-import { useList } from '@zenstackhq/runtime/hooks';
+import { List, Space } from '@zenstackhq/runtime/types';
import Link from 'next/link';
import { useRouter } from 'next/router';
-import { useCurrentSpace } from '@lib/context';
-export default function BreadCrumb() {
+type Props = {
+ space: Space;
+ list?: List;
+};
+
+export default function BreadCrumb({ space, list }: Props) {
const router = useRouter();
- const space = useCurrentSpace();
- const { get: getList } = useList();
const parts = router.asPath.split('/').filter((p) => p);
-
- const [base, slug, listId] = parts;
+ const [base] = parts;
if (base !== 'space') {
return <>;
}
@@ -18,13 +19,12 @@ export default function BreadCrumb() {
const items: Array<{ text: string; link: string }> = [];
items.push({ text: 'Home', link: '/' });
- items.push({ text: space?.name || '', link: `/space/${slug}` });
+ items.push({ text: space.name || '', link: `/space/${space.slug}` });
- if (listId) {
- const { data } = getList(listId);
+ if (list) {
items.push({
- text: data?.title || '',
- link: `/space/${slug}/${listId}`,
+ text: list?.title || '',
+ link: `/space/${space.slug}/${list.id}`,
});
}
diff --git a/samples/todo/components/ManageMembers.tsx b/samples/todo/components/ManageMembers.tsx
index f9134c498..f72bfdad2 100644
--- a/samples/todo/components/ManageMembers.tsx
+++ b/samples/todo/components/ManageMembers.tsx
@@ -1,11 +1,11 @@
import { PlusIcon, TrashIcon } from '@heroicons/react/24/outline';
import { useCurrentUser } from '@lib/context';
-import { HooksError, useSpaceUser } from '@zenstackhq/runtime/hooks';
import { Space, SpaceUserRole } from '@zenstackhq/runtime/types';
-import { ServerErrorCode } from '@zenstackhq/runtime/client';
+import { HooksError, ServerErrorCode } from '@zenstackhq/runtime/client';
import { ChangeEvent, KeyboardEvent, useState } from 'react';
import { toast } from 'react-toastify';
import Avatar from './Avatar';
+import { useSpaceUser } from '@zenstackhq/runtime/client';
type Props = {
space: Space;
@@ -24,6 +24,9 @@ export default function ManageMembers({ space }: Props) {
include: {
user: true,
},
+ orderBy: {
+ role: 'desc',
+ },
});
const inviteUser = async () => {
diff --git a/samples/todo/components/NavBar.tsx b/samples/todo/components/NavBar.tsx
index 0d1b52ee8..6266c6c31 100644
--- a/samples/todo/components/NavBar.tsx
+++ b/samples/todo/components/NavBar.tsx
@@ -11,6 +11,10 @@ type Props = {
};
export default function NavBar({ user, space }: Props) {
+ const onSignout = async () => {
+ await signOut({ callbackUrl: '/signin' });
+ };
+
return (
@@ -47,7 +51,7 @@ export default function NavBar({ user, space }: Props) {
{user &&
{user.name || user.email}
}
- signOut()}>Logout
+ Logout
diff --git a/samples/todo/components/SpaceMembers.tsx b/samples/todo/components/SpaceMembers.tsx
index 92dbad08f..419692a91 100644
--- a/samples/todo/components/SpaceMembers.tsx
+++ b/samples/todo/components/SpaceMembers.tsx
@@ -1,4 +1,4 @@
-import { useSpaceUser } from '@zenstackhq/runtime/hooks';
+import { useSpaceUser } from '@zenstackhq/runtime/client';
import { useCurrentSpace } from '@lib/context';
import { PlusIcon } from '@heroicons/react/24/outline';
import Avatar from './Avatar';
@@ -46,17 +46,20 @@ export default function SpaceMembers() {
const space = useCurrentSpace();
const { find: findMembers } = useSpaceUser();
- const { data: members } = findMembers({
- where: {
- spaceId: space?.id,
+ const { data: members } = findMembers(
+ {
+ where: {
+ spaceId: space?.id,
+ },
+ include: {
+ user: true,
+ },
+ orderBy: {
+ role: 'desc',
+ },
},
- include: {
- user: true,
- },
- orderBy: {
- role: 'desc',
- },
- });
+ { disabled: !space }
+ );
return (
diff --git a/samples/todo/components/Spaces.tsx b/samples/todo/components/Spaces.tsx
index 936d029f8..eaac0f578 100644
--- a/samples/todo/components/Spaces.tsx
+++ b/samples/todo/components/Spaces.tsx
@@ -1,13 +1,14 @@
-import { useSpace } from '@zenstackhq/runtime/hooks';
+import { Space } from '@zenstackhq/runtime/types';
import Link from 'next/link';
-export default function Spaces() {
- const { find } = useSpace();
- const spaces = find();
+type Props = {
+ spaces: Space[];
+};
+export default function Spaces({ spaces }: Props) {
return (
- {spaces.data?.map((space) => (
+ {spaces?.map((space) => (
-
+
+ {children}
+
+ );
+}
diff --git a/samples/todo/lib/context.ts b/samples/todo/lib/context.ts
index 0fa24e751..5793f1d43 100644
--- a/samples/todo/lib/context.ts
+++ b/samples/todo/lib/context.ts
@@ -1,4 +1,4 @@
-import { useSpace } from '@zenstackhq/runtime/hooks';
+import { useSpace } from '@zenstackhq/runtime/client';
import { Space } from '@zenstackhq/runtime/types';
import { User } from 'next-auth';
import { useSession } from 'next-auth/react';
@@ -17,15 +17,16 @@ export const SpaceContext = createContext(undefined);
export function useCurrentSpace() {
const router = useRouter();
const { find } = useSpace();
- const spaces = find({
- where: {
- slug: router.query.slug as string,
+ const spaces = find(
+ {
+ where: {
+ slug: router.query.slug as string,
+ },
},
- });
-
- if (!router.query.slug) {
- return undefined;
- }
+ {
+ disabled: !router.query.slug,
+ }
+ );
return spaces.data?.[0];
}
diff --git a/samples/todo/lib/query-utils.ts b/samples/todo/lib/query-utils.ts
new file mode 100644
index 000000000..572d8eb85
--- /dev/null
+++ b/samples/todo/lib/query-utils.ts
@@ -0,0 +1,11 @@
+import service, { QueryContext } from '@zenstackhq/runtime/server';
+
+export async function getSpaceBySlug(queryContext: QueryContext, slug: string) {
+ const spaces = await service.space.find(queryContext, {
+ where: { slug },
+ });
+ if (spaces.length === 0) {
+ throw new Error('Space not found: ' + slug);
+ }
+ return spaces[0];
+}
diff --git a/samples/todo/next.config.js b/samples/todo/next.config.js
index f9cb6f102..ccd6c89af 100644
--- a/samples/todo/next.config.js
+++ b/samples/todo/next.config.js
@@ -3,7 +3,11 @@ const nextConfig = {
reactStrictMode: true,
swcMinify: true,
images: {
- domains: ['lh3.googleusercontent.com', 'picsum.photos'],
+ domains: [
+ 'picsum.photos',
+ 'lh3.googleusercontent.com',
+ 'avatars.githubusercontent.com',
+ ],
},
};
diff --git a/samples/todo/package-lock.json b/samples/todo/package-lock.json
index ef225c9c5..cb2563a39 100644
--- a/samples/todo/package-lock.json
+++ b/samples/todo/package-lock.json
@@ -1,17 +1,16 @@
{
"name": "todo",
- "version": "0.3.1",
+ "version": "0.3.23",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "todo",
- "version": "0.3.1",
+ "version": "0.3.23",
"dependencies": {
"@heroicons/react": "^2.0.12",
- "@prisma/client": "^4.4.0",
- "@zenstackhq/internal": "^0.3.1",
- "@zenstackhq/runtime": "^0.3.1",
+ "@prisma/client": "^4.7.0",
+ "@zenstackhq/runtime": "^0.3.23",
"bcryptjs": "^2.4.3",
"daisyui": "^2.31.0",
"moment": "^2.29.4",
@@ -20,8 +19,7 @@
"next-auth": "^4.15.1",
"react": "18.2.0",
"react-dom": "18.2.0",
- "react-toastify": "^9.0.8",
- "swr": "^1.3.0"
+ "react-toastify": "^9.0.8"
},
"devDependencies": {
"@tailwindcss/line-clamp": "^0.4.2",
@@ -35,7 +33,37 @@
"postcss": "^8.4.16",
"tailwindcss": "^3.1.8",
"typescript": "^4.6.2",
- "zenstack": "^0.3.1"
+ "zenstack": "^0.3.23"
+ }
+ },
+ "../../packages/runtime": {
+ "name": "@zenstackhq/runtime",
+ "version": "0.3.10",
+ "extraneous": true,
+ "license": "MIT",
+ "dependencies": {
+ "@zenstackhq/internal": "latest",
+ "colors": "1.4.0",
+ "cuid": "^2.1.8",
+ "decimal.js": "^10.4.2",
+ "deepcopy": "^2.1.0",
+ "swr": "^1.3.0",
+ "zod": "^3.19.1",
+ "zod-validation-error": "^0.2.1"
+ },
+ "devDependencies": {
+ "@types/bcryptjs": "^2.4.2",
+ "@types/jest": "^29.0.3",
+ "@types/node": "^14.18.29",
+ "rimraf": "^3.0.2",
+ "typescript": "^4.9.3"
+ },
+ "peerDependencies": {
+ "@types/bcryptjs": "^2.4.2",
+ "bcryptjs": "^2.4.3",
+ "next": "^12.3.1",
+ "react": "^17.0.2 || ^18",
+ "react-dom": "^17.0.2 || ^18"
}
},
"node_modules/@babel/code-frame": {
@@ -475,12 +503,12 @@
}
},
"node_modules/@prisma/client": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.5.0.tgz",
- "integrity": "sha512-B2cV0OPI1smhdYUxsJoLYQLoMlLH06MUxgFUWQnHodGMX98VRVXKmQE/9OcrTNkqtke5RC+YU24Szxd04tZA2g==",
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.7.0.tgz",
+ "integrity": "sha512-keXMa0oJWJGOzMEFKp+CEgzJPwnOtGSrnTWw6qMYxnypYrRFdNxqyA06EzELZexBhgM4oLooZ1jDJ3iy46wExA==",
"hasInstallScript": true,
"dependencies": {
- "@prisma/engines-version": "4.5.0-43.0362da9eebca54d94c8ef5edd3b2e90af99ba452"
+ "@prisma/engines-version": "4.7.0-74.39190b250ebc338586e25e6da45e5e783bc8a635"
},
"engines": {
"node": ">=14.17"
@@ -495,16 +523,16 @@
}
},
"node_modules/@prisma/engines": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.5.0.tgz",
- "integrity": "sha512-4t9ir2SbQQr/wMCNU4YpHWp5hU14J2m3wHUZnGJPpmBF8YtkisxyVyQsKd1e6FyLTaGq8LOLhm6VLYHKqKNm+g==",
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.7.0.tgz",
+ "integrity": "sha512-afKrVFktaZ1pOK12/uFl2hRsBWIJZuC5FdDtacuKk5x/mR+rC5AbA+PlN3ZCZbmYTaeiBMHjcU5wbT5z2N3nSQ==",
"devOptional": true,
"hasInstallScript": true
},
"node_modules/@prisma/engines-version": {
- "version": "4.5.0-43.0362da9eebca54d94c8ef5edd3b2e90af99ba452",
- "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.5.0-43.0362da9eebca54d94c8ef5edd3b2e90af99ba452.tgz",
- "integrity": "sha512-o7LyVx8PPJBLrEzLl6lpxxk2D5VnlM4Fwmrbq0NoT6pr5aa1OuHD9ZG+WJY6TlR/iD9bhmo2LNcxddCMr5Rv2A=="
+ "version": "4.7.0-74.39190b250ebc338586e25e6da45e5e783bc8a635",
+ "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.7.0-74.39190b250ebc338586e25e6da45e5e783bc8a635.tgz",
+ "integrity": "sha512-ImczGEQ8NS1OUApEeyAGxC4uLTtQp0wI1+2wM4MeQLVwIQbyMHk1vOhWWE8Pwbi3rnzLcPvsIrd9sm6oNXhERw=="
},
"node_modules/@rushstack/eslint-patch": {
"version": "1.2.0",
@@ -551,9 +579,9 @@
}
},
"node_modules/@ts-morph/common/node_modules/minimatch": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
- "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz",
+ "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
@@ -721,37 +749,28 @@
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
}
},
- "node_modules/@zenstackhq/internal": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@zenstackhq/internal/-/internal-0.3.1.tgz",
- "integrity": "sha512-ZCpV2R5MVW7BYyCCvltojvKmmRftG9qcDrkFuLFbX+kf2k+M7rQQ9W7GpMOwO3PgCm8+wajLLytPl58L2OWlkA==",
+ "node_modules/@zenstackhq/runtime": {
+ "version": "0.3.23",
+ "resolved": "https://registry.npmjs.org/@zenstackhq/runtime/-/runtime-0.3.23.tgz",
+ "integrity": "sha512-p6QDSjn2I5hDLhz0qK2//9XTno2YpP2C9x8ak9GzoV4XOJcUua7bNvSpRjJ25n15VYzTnelXndsruZjDTeoCaw==",
"dependencies": {
+ "@types/bcryptjs": "^2.4.2",
"bcryptjs": "^2.4.3",
"colors": "1.4.0",
"cuid": "^2.1.8",
"decimal.js": "^10.4.2",
"deepcopy": "^2.1.0",
- "swr": "^1.3.0"
+ "swr": "^1.3.0",
+ "tslib": "^2.4.1",
+ "zod": "^3.19.1",
+ "zod-validation-error": "^0.2.1"
},
"peerDependencies": {
- "@prisma/client": "^4.4.0",
- "next": "^12.3.1",
+ "next": "^12.3.1 || ^13",
"react": "^17.0.2 || ^18",
"react-dom": "^17.0.2 || ^18"
}
},
- "node_modules/@zenstackhq/runtime": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@zenstackhq/runtime/-/runtime-0.3.1.tgz",
- "integrity": "sha512-VsrFgiA2c08914biFfMgNLNxPD26Gj84uOt5F27AcLTWSS/6fAPOJUQTb3YB6ytYUvqcRzaIPiG6JHOR7dmU3g==",
- "dependencies": {
- "@zenstackhq/internal": "latest"
- },
- "peerDependencies": {
- "@types/bcryptjs": "^2.4.2",
- "bcryptjs": "^2.4.3"
- }
- },
"node_modules/acorn": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -790,6 +809,18 @@
"node": ">=0.4.0"
}
},
+ "node_modules/agent-base": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+ "dev": true,
+ "dependencies": {
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6.0.0"
+ }
+ },
"node_modules/ajv": {
"version": "6.12.6",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -957,6 +988,15 @@
"node": ">=8"
}
},
+ "node_modules/async-exit-hook": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
+ "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.12.0"
+ }
+ },
"node_modules/autoprefixer": {
"version": "10.4.12",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
@@ -2416,6 +2456,19 @@
"tslib": "^2.0.3"
}
},
+ "node_modules/https-proxy-agent": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+ "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+ "dev": true,
+ "dependencies": {
+ "agent-base": "6",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/ignore": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -2898,6 +2951,18 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/mixpanel": {
+ "version": "0.17.0",
+ "resolved": "https://registry.npmjs.org/mixpanel/-/mixpanel-0.17.0.tgz",
+ "integrity": "sha512-DY5WeOy/hmkPrNiiZugJpWR0iMuOwuj1a3u0bgwB2eUFRV6oIew/pIahhpawdbNjb+Bye4a8ID3gefeNPvL81g==",
+ "dev": true,
+ "dependencies": {
+ "https-proxy-agent": "5.0.0"
+ },
+ "engines": {
+ "node": ">=10.0"
+ }
+ },
"node_modules/mkdirp": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -3067,6 +3132,12 @@
"tslib": "^2.0.3"
}
},
+ "node_modules/node-machine-id": {
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
+ "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
+ "dev": true
+ },
"node_modules/node-releases": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
@@ -3534,13 +3605,13 @@
"integrity": "sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew=="
},
"node_modules/prisma": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.5.0.tgz",
- "integrity": "sha512-9Aeg4qiKlv9Wsjz4NO8k2CzRzlvS3A4FYVJ5+28sBBZ0eEwbiVOE/Jj7v6rZC1tFW2s4GSICQOAyuOjc6WsNew==",
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.7.0.tgz",
+ "integrity": "sha512-VsecNo0Ca3+bDTzSpJqIpdupKVhhQ8aOYeWc09JlUM89knqvhSrlMrg0U8BiOD4tFrY1OPaCcraK8leDBxKMBg==",
"devOptional": true,
"hasInstallScript": true,
"dependencies": {
- "@prisma/engines": "4.5.0"
+ "@prisma/engines": "4.7.0"
},
"bin": {
"prisma": "build/index.js",
@@ -3898,6 +3969,12 @@
"node": ">=8"
}
},
+ "node_modules/sleep-promise": {
+ "version": "9.1.0",
+ "resolved": "https://registry.npmjs.org/sleep-promise/-/sleep-promise-9.1.0.tgz",
+ "integrity": "sha512-UHYzVpz9Xn8b+jikYSD6bqvf754xL2uBUzDFwiU6NcdZeifPr6UfgU43xpkPu67VMS88+TI2PSI7Eohgqf2fKA==",
+ "dev": true
+ },
"node_modules/slice-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
@@ -4225,9 +4302,9 @@
}
},
"node_modules/tslib": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
- "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+ "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
},
"node_modules/tsutils": {
"version": "3.21.0",
@@ -4526,20 +4603,26 @@
}
},
"node_modules/zenstack": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/zenstack/-/zenstack-0.3.1.tgz",
- "integrity": "sha512-eQOO7Je4cMUTFblXn/Sbi1+kV+KOW7kMpOi6UhVtqKKxy9R5J2mdCaT0Npkb1YI9ppCnfeF1VDYRJutZsFc4Vg==",
+ "version": "0.3.23",
+ "resolved": "https://registry.npmjs.org/zenstack/-/zenstack-0.3.23.tgz",
+ "integrity": "sha512-sJMIVxNpxWGozFbs2kndyLM9NPLucdHvjYASfGRi8tp9FrRg2d4Ji2qDC2W5C7sqIvWrUltxpuoynbdjNljhHA==",
"dev": true,
+ "hasInstallScript": true,
"dependencies": {
- "@zenstackhq/internal": "0.3.1",
+ "@zenstackhq/runtime": "0.3.23",
+ "async-exit-hook": "^2.0.1",
"change-case": "^4.1.2",
"chevrotain": "^9.1.0",
"colors": "1.4.0",
"commander": "^8.3.0",
+ "cuid": "^2.1.8",
"langium": "^0.5.0",
+ "mixpanel": "^0.17.0",
+ "node-machine-id": "^1.1.12",
"pluralize": "^8.0.0",
- "prisma": "^4.5.0",
+ "prisma": "~4.7.0",
"promisify": "^0.0.3",
+ "sleep-promise": "^9.1.0",
"ts-morph": "^16.0.0",
"uuid": "^9.0.0",
"vscode-jsonrpc": "^8.0.2",
@@ -4563,6 +4646,28 @@
"bin": {
"uuid": "dist/bin/uuid"
}
+ },
+ "node_modules/zod": {
+ "version": "3.19.1",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-3.19.1.tgz",
+ "integrity": "sha512-LYjZsEDhCdYET9ikFu6dVPGp2YH9DegXjdJToSzD9rO6fy4qiRYFoyEYwps88OseJlPyl2NOe2iJuhEhL7IpEA==",
+ "funding": {
+ "url": "https://github.com/sponsors/colinhacks"
+ }
+ },
+ "node_modules/zod-validation-error": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-0.2.1.tgz",
+ "integrity": "sha512-zGg6P5EHi5V0dvyEeC8HBZd2pzp7QDKTngkSWgWunljrY+0SHkHyjI519D+u8/37BHkGHAFseWgnZ2Uq8LNFKg==",
+ "dependencies": {
+ "@swc/helpers": "^0.4.11"
+ },
+ "engines": {
+ "node": "^14.17 || >=16.0.0"
+ },
+ "peerDependencies": {
+ "zod": "^3.18.0"
+ }
}
},
"dependencies": {
@@ -4841,23 +4946,23 @@
"integrity": "sha512-MSAs9t3Go7GUkMhpKC44T58DJ5KGk2vBo+h1cqQeqlMfdGkxaVB78ZWpv9gYi/g2fa4sopag9gJsNvS8XGgWJA=="
},
"@prisma/client": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.5.0.tgz",
- "integrity": "sha512-B2cV0OPI1smhdYUxsJoLYQLoMlLH06MUxgFUWQnHodGMX98VRVXKmQE/9OcrTNkqtke5RC+YU24Szxd04tZA2g==",
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.7.0.tgz",
+ "integrity": "sha512-keXMa0oJWJGOzMEFKp+CEgzJPwnOtGSrnTWw6qMYxnypYrRFdNxqyA06EzELZexBhgM4oLooZ1jDJ3iy46wExA==",
"requires": {
- "@prisma/engines-version": "4.5.0-43.0362da9eebca54d94c8ef5edd3b2e90af99ba452"
+ "@prisma/engines-version": "4.7.0-74.39190b250ebc338586e25e6da45e5e783bc8a635"
}
},
"@prisma/engines": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.5.0.tgz",
- "integrity": "sha512-4t9ir2SbQQr/wMCNU4YpHWp5hU14J2m3wHUZnGJPpmBF8YtkisxyVyQsKd1e6FyLTaGq8LOLhm6VLYHKqKNm+g==",
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.7.0.tgz",
+ "integrity": "sha512-afKrVFktaZ1pOK12/uFl2hRsBWIJZuC5FdDtacuKk5x/mR+rC5AbA+PlN3ZCZbmYTaeiBMHjcU5wbT5z2N3nSQ==",
"devOptional": true
},
"@prisma/engines-version": {
- "version": "4.5.0-43.0362da9eebca54d94c8ef5edd3b2e90af99ba452",
- "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.5.0-43.0362da9eebca54d94c8ef5edd3b2e90af99ba452.tgz",
- "integrity": "sha512-o7LyVx8PPJBLrEzLl6lpxxk2D5VnlM4Fwmrbq0NoT6pr5aa1OuHD9ZG+WJY6TlR/iD9bhmo2LNcxddCMr5Rv2A=="
+ "version": "4.7.0-74.39190b250ebc338586e25e6da45e5e783bc8a635",
+ "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.7.0-74.39190b250ebc338586e25e6da45e5e783bc8a635.tgz",
+ "integrity": "sha512-ImczGEQ8NS1OUApEeyAGxC4uLTtQp0wI1+2wM4MeQLVwIQbyMHk1vOhWWE8Pwbi3rnzLcPvsIrd9sm6oNXhERw=="
},
"@rushstack/eslint-patch": {
"version": "1.2.0",
@@ -4902,9 +5007,9 @@
}
},
"minimatch": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
- "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz",
+ "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==",
"dev": true,
"requires": {
"brace-expansion": "^2.0.1"
@@ -5022,25 +5127,21 @@
}
}
},
- "@zenstackhq/internal": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@zenstackhq/internal/-/internal-0.3.1.tgz",
- "integrity": "sha512-ZCpV2R5MVW7BYyCCvltojvKmmRftG9qcDrkFuLFbX+kf2k+M7rQQ9W7GpMOwO3PgCm8+wajLLytPl58L2OWlkA==",
+ "@zenstackhq/runtime": {
+ "version": "0.3.23",
+ "resolved": "https://registry.npmjs.org/@zenstackhq/runtime/-/runtime-0.3.23.tgz",
+ "integrity": "sha512-p6QDSjn2I5hDLhz0qK2//9XTno2YpP2C9x8ak9GzoV4XOJcUua7bNvSpRjJ25n15VYzTnelXndsruZjDTeoCaw==",
"requires": {
+ "@types/bcryptjs": "^2.4.2",
"bcryptjs": "^2.4.3",
"colors": "1.4.0",
"cuid": "^2.1.8",
"decimal.js": "^10.4.2",
"deepcopy": "^2.1.0",
- "swr": "^1.3.0"
- }
- },
- "@zenstackhq/runtime": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@zenstackhq/runtime/-/runtime-0.3.1.tgz",
- "integrity": "sha512-VsrFgiA2c08914biFfMgNLNxPD26Gj84uOt5F27AcLTWSS/6fAPOJUQTb3YB6ytYUvqcRzaIPiG6JHOR7dmU3g==",
- "requires": {
- "@zenstackhq/internal": "latest"
+ "swr": "^1.3.0",
+ "tslib": "^2.4.1",
+ "zod": "^3.19.1",
+ "zod-validation-error": "^0.2.1"
}
},
"acorn": {
@@ -5070,6 +5171,15 @@
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
},
+ "agent-base": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+ "dev": true,
+ "requires": {
+ "debug": "4"
+ }
+ },
"ajv": {
"version": "6.12.6",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -5191,6 +5301,12 @@
"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
"dev": true
},
+ "async-exit-hook": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
+ "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
+ "dev": true
+ },
"autoprefixer": {
"version": "10.4.12",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
@@ -6286,6 +6402,16 @@
"tslib": "^2.0.3"
}
},
+ "https-proxy-agent": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+ "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+ "dev": true,
+ "requires": {
+ "agent-base": "6",
+ "debug": "4"
+ }
+ },
"ignore": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -6639,6 +6765,15 @@
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
"integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
},
+ "mixpanel": {
+ "version": "0.17.0",
+ "resolved": "https://registry.npmjs.org/mixpanel/-/mixpanel-0.17.0.tgz",
+ "integrity": "sha512-DY5WeOy/hmkPrNiiZugJpWR0iMuOwuj1a3u0bgwB2eUFRV6oIew/pIahhpawdbNjb+Bye4a8ID3gefeNPvL81g==",
+ "dev": true,
+ "requires": {
+ "https-proxy-agent": "5.0.0"
+ }
+ },
"mkdirp": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -6736,6 +6871,12 @@
"tslib": "^2.0.3"
}
},
+ "node-machine-id": {
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
+ "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
+ "dev": true
+ },
"node-releases": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
@@ -7053,12 +7194,12 @@
"integrity": "sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew=="
},
"prisma": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.5.0.tgz",
- "integrity": "sha512-9Aeg4qiKlv9Wsjz4NO8k2CzRzlvS3A4FYVJ5+28sBBZ0eEwbiVOE/Jj7v6rZC1tFW2s4GSICQOAyuOjc6WsNew==",
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.7.0.tgz",
+ "integrity": "sha512-VsecNo0Ca3+bDTzSpJqIpdupKVhhQ8aOYeWc09JlUM89knqvhSrlMrg0U8BiOD4tFrY1OPaCcraK8leDBxKMBg==",
"devOptional": true,
"requires": {
- "@prisma/engines": "4.5.0"
+ "@prisma/engines": "4.7.0"
}
},
"progress": {
@@ -7301,6 +7442,12 @@
"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
"dev": true
},
+ "sleep-promise": {
+ "version": "9.1.0",
+ "resolved": "https://registry.npmjs.org/sleep-promise/-/sleep-promise-9.1.0.tgz",
+ "integrity": "sha512-UHYzVpz9Xn8b+jikYSD6bqvf754xL2uBUzDFwiU6NcdZeifPr6UfgU43xpkPu67VMS88+TI2PSI7Eohgqf2fKA==",
+ "dev": true
+ },
"slice-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
@@ -7551,9 +7698,9 @@
}
},
"tslib": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
- "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+ "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
},
"tsutils": {
"version": "3.21.0",
@@ -7778,20 +7925,25 @@
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
},
"zenstack": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/zenstack/-/zenstack-0.3.1.tgz",
- "integrity": "sha512-eQOO7Je4cMUTFblXn/Sbi1+kV+KOW7kMpOi6UhVtqKKxy9R5J2mdCaT0Npkb1YI9ppCnfeF1VDYRJutZsFc4Vg==",
+ "version": "0.3.23",
+ "resolved": "https://registry.npmjs.org/zenstack/-/zenstack-0.3.23.tgz",
+ "integrity": "sha512-sJMIVxNpxWGozFbs2kndyLM9NPLucdHvjYASfGRi8tp9FrRg2d4Ji2qDC2W5C7sqIvWrUltxpuoynbdjNljhHA==",
"dev": true,
"requires": {
- "@zenstackhq/internal": "0.3.1",
+ "@zenstackhq/runtime": "0.3.23",
+ "async-exit-hook": "^2.0.1",
"change-case": "^4.1.2",
"chevrotain": "^9.1.0",
"colors": "1.4.0",
"commander": "^8.3.0",
+ "cuid": "^2.1.8",
"langium": "^0.5.0",
+ "mixpanel": "^0.17.0",
+ "node-machine-id": "^1.1.12",
"pluralize": "^8.0.0",
- "prisma": "^4.5.0",
+ "prisma": "~4.7.0",
"promisify": "^0.0.3",
+ "sleep-promise": "^9.1.0",
"ts-morph": "^16.0.0",
"uuid": "^9.0.0",
"vscode-jsonrpc": "^8.0.2",
@@ -7808,6 +7960,19 @@
"dev": true
}
}
+ },
+ "zod": {
+ "version": "3.19.1",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-3.19.1.tgz",
+ "integrity": "sha512-LYjZsEDhCdYET9ikFu6dVPGp2YH9DegXjdJToSzD9rO6fy4qiRYFoyEYwps88OseJlPyl2NOe2iJuhEhL7IpEA=="
+ },
+ "zod-validation-error": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-0.2.1.tgz",
+ "integrity": "sha512-zGg6P5EHi5V0dvyEeC8HBZd2pzp7QDKTngkSWgWunljrY+0SHkHyjI519D+u8/37BHkGHAFseWgnZ2Uq8LNFKg==",
+ "requires": {
+ "@swc/helpers": "^0.4.11"
+ }
}
}
}
diff --git a/samples/todo/package.json b/samples/todo/package.json
index b339af888..c0a8c92a6 100644
--- a/samples/todo/package.json
+++ b/samples/todo/package.json
@@ -1,6 +1,6 @@
{
"name": "todo",
- "version": "0.3.2",
+ "version": "0.4.0-pre.1",
"private": true,
"scripts": {
"dev": "next dev",
@@ -14,14 +14,14 @@
"db:browse": "zenstack studio",
"generate": "zenstack generate",
"vercel-build": "npm run build && npm run db:deploy",
- "deps-local": "npm i -D ../../packages/schema && npm i ../../packages/internal ../../packages/runtime",
- "deps-npm": "npm i -D zenstack@latest && npm i @zenstackhq/internal@latest @zenstackhq/runtime@latest"
+ "deps-local": "npm i -D ../../packages/schema && npm i ../../packages/runtime/dist",
+ "deps-latest": "npm i -D zenstack@latest && npm i @zenstackhq/runtime@latest",
+ "deps-dev": "npm i -D zenstack@dev && npm i @zenstackhq/runtime@dev"
},
"dependencies": {
"@heroicons/react": "^2.0.12",
- "@prisma/client": "^4.4.0",
- "@zenstackhq/internal": "^0.3.1",
- "@zenstackhq/runtime": "^0.3.1",
+ "@prisma/client": "^4.7.0",
+ "@zenstackhq/runtime": "^0.3.23",
"bcryptjs": "^2.4.3",
"daisyui": "^2.31.0",
"moment": "^2.29.4",
@@ -30,8 +30,7 @@
"next-auth": "^4.15.1",
"react": "18.2.0",
"react-dom": "18.2.0",
- "react-toastify": "^9.0.8",
- "swr": "^1.3.0"
+ "react-toastify": "^9.0.8"
},
"devDependencies": {
"@tailwindcss/line-clamp": "^0.4.2",
@@ -45,6 +44,6 @@
"postcss": "^8.4.16",
"tailwindcss": "^3.1.8",
"typescript": "^4.6.2",
- "zenstack": "^0.3.1"
+ "zenstack": "^0.3.23"
}
}
diff --git a/samples/todo/pages/_app.tsx b/samples/todo/pages/_app.tsx
index e6039b23b..defec6cbe 100644
--- a/samples/todo/pages/_app.tsx
+++ b/samples/todo/pages/_app.tsx
@@ -3,7 +3,6 @@ import type { AppProps } from 'next/app';
import { SessionProvider } from 'next-auth/react';
import 'react-toastify/dist/ReactToastify.css';
import { ToastContainer } from 'react-toastify';
-import NavBar from 'components/NavBar';
import {
SpaceContext,
useCurrentSpace,
@@ -21,7 +20,6 @@ function AppContent(props: { children: JSX.Element | JSX.Element[] }) {
-
{props.children}
diff --git a/samples/todo/pages/api/auth/[...nextauth].ts b/samples/todo/pages/api/auth/[...nextauth].ts
index ae1b6e660..987f5d53b 100644
--- a/samples/todo/pages/api/auth/[...nextauth].ts
+++ b/samples/todo/pages/api/auth/[...nextauth].ts
@@ -1,10 +1,11 @@
import NextAuth, { NextAuthOptions, User } from 'next-auth';
import CredentialsProvider from 'next-auth/providers/credentials';
+import GitHubProvider from 'next-auth/providers/github';
import {
authorize,
NextAuthAdapter as Adapter,
-} from '@zenstackhq/runtime/auth';
-import service from '@zenstackhq/runtime';
+} from '@zenstackhq/runtime/server/auth';
+import service from '@zenstackhq/runtime/server';
import { nanoid } from 'nanoid';
import { SpaceUserRole } from '@zenstackhq/runtime/types';
@@ -17,21 +18,28 @@ export const authOptions: NextAuthOptions = {
strategy: 'jwt',
},
+ pages: {
+ signIn: '/signin',
+ },
+
providers: [
CredentialsProvider({
credentials: {
email: {
- label: 'Email Address',
type: 'email',
- placeholder: 'john.doe@example.com',
},
password: {
- label: 'Password',
type: 'password',
- placeholder: 'Your super secure password',
},
},
- authorize: authorize(service, true),
+ authorize: authorize(service),
+ }),
+
+ GitHubProvider({
+ clientId: process.env.GITHUB_ID!,
+ clientSecret: process.env.GITHUB_SECRET!,
+ // @ts-ignore
+ scope: 'read:user,user:email',
}),
],
diff --git a/samples/todo/pages/api/zenstack/[...path].ts b/samples/todo/pages/api/zenstack/[...path].ts
index d078ed3e6..cdae27d69 100644
--- a/samples/todo/pages/api/zenstack/[...path].ts
+++ b/samples/todo/pages/api/zenstack/[...path].ts
@@ -5,7 +5,7 @@ import {
} from '@zenstackhq/runtime/server';
import { authOptions } from '@api/auth/[...nextauth]';
import { unstable_getServerSession } from 'next-auth';
-import service from '@zenstackhq/runtime';
+import service from '@zenstackhq/runtime/server';
const options: RequestHandlerOptions = {
async getServerUser(req: NextApiRequest, res: NextApiResponse) {
diff --git a/samples/todo/pages/create-space.tsx b/samples/todo/pages/create-space.tsx
index a438ee7ce..3839fdafd 100644
--- a/samples/todo/pages/create-space.tsx
+++ b/samples/todo/pages/create-space.tsx
@@ -1,11 +1,15 @@
+import {
+ ServerErrorCode,
+ useSpace,
+ type HooksError,
+} from '@zenstackhq/runtime/client';
+import { SpaceUserRole } from '@zenstackhq/runtime/types';
+import WithNavBar from 'components/WithNavBar';
import { NextPage } from 'next';
+import { useSession } from 'next-auth/react';
+import { useRouter } from 'next/router';
import { FormEvent, useState } from 'react';
-import { useSpace, type HooksError } from '@zenstackhq/runtime/hooks';
import { toast } from 'react-toastify';
-import { useRouter } from 'next/router';
-import { useSession } from 'next-auth/react';
-import { SpaceUserRole } from '@zenstackhq/runtime/types';
-import { ServerErrorCode } from '@zenstackhq/runtime/client';
const CreateSpace: NextPage = () => {
const { data: session } = useSession();
@@ -40,7 +44,7 @@ const CreateSpace: NextPage = () => {
router.push(`/space/${space.slug}`);
}
}, 2000);
- } catch (err) {
+ } catch (err: any) {
console.error(err);
if (
(err as HooksError).info?.code ===
@@ -48,68 +52,73 @@ const CreateSpace: NextPage = () => {
) {
toast.error('Space slug alread in use');
} else {
- toast.error(`Error occurred: ${err}`);
+ toast.error(
+ `Error occurred: ${err.info?.message || err.message}`
+ );
}
}
};
return (
-
+ 
-
+ 
+
@@ -15,258 +17,36 @@