test: add edge-runtime e2e

tests/bun/e2e.test.ts → tests/runtimes/bun/bun-e2e.test.ts

@@ -4,7 +4,7 @@ import { PostgresDialect } from '@zenstackhq/orm/dialects/postgres';
 import { PolicyPlugin } from '@zenstackhq/plugin-policy';
 import { TEST_PG_URL } from '@zenstackhq/testtools';
 import { Database } from 'bun:sqlite';
-import { describe, expect, it } from 'bun:test';
+import { afterEach, describe, expect, it } from 'bun:test';
 import type { Dialect } from 'kysely';
 import { BunSqliteDialect } from 'kysely-bun-sqlite';
 import { Client, Pool } from 'pg';
@@ -13,8 +13,14 @@ import { schema } from './schemas/schema';
 describe('Bun e2e tests', () => {
     const provider = (process.env['TEST_DB_PROVIDER'] ?? 'sqlite') as 'sqlite' | 'postgresql';
 
+    let _db: any;
+
+    afterEach(async () => {
+        await _db?.$disconnect();
+    });
+
     it('works with simple CRUD', async () => {
-        const db = await createClient(provider, 'bun-e2e-crud');
+        const db = (_db = await createClient(provider, 'bun-e2e-crud'));
 
         const user = await db.user.create({
             data: {
@@ -44,7 +50,7 @@ describe('Bun e2e tests', () => {
     });
 
     it('enforces policies', async () => {
-        const db = await createClient(provider, 'bun-e2e-policies');
+        const db = (_db = await createClient(provider, 'bun-e2e-policies'));
         const authDb = db.$use(new PolicyPlugin());
 
         // create a user
@@ -58,13 +64,11 @@ describe('Bun e2e tests', () => {
                         {
                             id: 'p1',
                             title: 'First Post',
-                            content: 'Hello World',
                             published: true,
                         },
                         {
                             id: 'p2',
                             title: 'Second Post',
-                            content: 'Draft Post',
                             published: false,
                         },
                     ],

tests/bun/schemas/models.ts → tests/runtimes/bun/schemas/models.ts

@@ -5,10 +5,7 @@
 
 /* eslint-disable */
 
-import { schema as $schema, type SchemaType as $Schema } from "./schema";
-import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
+import { type SchemaType as $Schema } from "./schema";
+import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
 export type User = $ModelResult<$Schema, "User">;
 export type Post = $ModelResult<$Schema, "Post">;
-export type CommonFields = $TypeDefResult<$Schema, "CommonFields">;
-export const Role = $schema.enums.Role.values;
-export type Role = (typeof Role)[keyof typeof Role];

tests/bun/schemas/schema.ts → tests/runtimes/bun/schemas/schema.ts

@@ -21,18 +21,6 @@ const _schema = {
                     attributes: [{ name: "@id" }, { name: "@default", args: [{ name: "value", value: ExpressionUtils.call("cuid") }] }],
                     default: ExpressionUtils.call("cuid")
                 },
-                createdAt: {
-                    name: "createdAt",
-                    type: "DateTime",
-                    attributes: [{ name: "@default", args: [{ name: "value", value: ExpressionUtils.call("now") }] }],
-                    default: ExpressionUtils.call("now")
-                },
-                updatedAt: {
-                    name: "updatedAt",
-                    type: "DateTime",
-                    updatedAt: true,
-                    attributes: [{ name: "@updatedAt" }]
-                },
                 email: {
                     name: "email",
                     type: "String",
@@ -44,22 +32,11 @@ const _schema = {
                     type: "String",
                     optional: true
                 },
-                role: {
-                    name: "role",
-                    type: "Role",
-                    attributes: [{ name: "@default", args: [{ name: "value", value: ExpressionUtils.literal("USER") }] }],
-                    default: "USER"
-                },
                 posts: {
                     name: "posts",
                     type: "Post",
                     array: true,
                     relation: { opposite: "author" }
-                },
-                meta: {
-                    name: "meta",
-                    type: "Json",
-                    optional: true
                 }
             },
             attributes: [
@@ -82,27 +59,10 @@ const _schema = {
                     attributes: [{ name: "@id" }, { name: "@default", args: [{ name: "value", value: ExpressionUtils.call("cuid") }] }],
                     default: ExpressionUtils.call("cuid")
                 },
-                createdAt: {
-                    name: "createdAt",
-                    type: "DateTime",
-                    attributes: [{ name: "@default", args: [{ name: "value", value: ExpressionUtils.call("now") }] }],
-                    default: ExpressionUtils.call("now")
-                },
-                updatedAt: {
-                    name: "updatedAt",
-                    type: "DateTime",
-                    updatedAt: true,
-                    attributes: [{ name: "@updatedAt" }]
-                },
                 title: {
                     name: "title",
                     type: "String"
                 },
-                content: {
-                    name: "content",
-                    type: "String",
-                    optional: true
-                },
                 published: {
                     name: "published",
                     type: "Boolean",
@@ -134,39 +94,6 @@ const _schema = {
             }
         }
     },
-    typeDefs: {
-        CommonFields: {
-            name: "CommonFields",
-            fields: {
-                id: {
-                    name: "id",
-                    type: "String",
-                    attributes: [{ name: "@id" }, { name: "@default", args: [{ name: "value", value: ExpressionUtils.call("cuid") }] }],
-                    default: ExpressionUtils.call("cuid")
-                },
-                createdAt: {
-                    name: "createdAt",
-                    type: "DateTime",
-                    attributes: [{ name: "@default", args: [{ name: "value", value: ExpressionUtils.call("now") }] }],
-                    default: ExpressionUtils.call("now")
-                },
-                updatedAt: {
-                    name: "updatedAt",
-                    type: "DateTime",
-                    updatedAt: true,
-                    attributes: [{ name: "@updatedAt" }]
-                }
-            }
-        }
-    },
-    enums: {
-        Role: {
-            values: {
-                ADMIN: "ADMIN",
-                USER: "USER"
-            }
-        }
-    },
     authType: "User",
     plugins: {}
 } as const satisfies SchemaDef;

tests/bun/schemas/schema.zmodel → tests/runtimes/bun/schemas/schema.zmodel

@@ -1,39 +1,25 @@
 datasource db {
     provider = "sqlite"
-    url      = "file:./dev.db"
 }
 
 plugin policy {
     provider = "../../../packages/plugins/policy"
 }
 
-enum Role {
-    ADMIN
-    USER
-}
-
-type CommonFields {
-    id        String   @id @default(cuid())
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
-}
-
-model User with CommonFields {
-    email    String  @unique
-    name     String?
-    password String  @ignore
-    role     Role    @default(USER)
-    posts    Post[]
-    meta     Json?
+model User {
+    id    String  @id @default(cuid())
+    email String  @unique
+    name  String?
+    posts Post[]
 
     // Access policies
     @@allow('all', auth().id == id)
     @@allow('read', auth() != null)
 }
 
-model Post with CommonFields {
+model Post {
+    id        String  @id @default(cuid())
     title     String
-    content   String?
     published Boolean @default(false)
     author    User    @relation(fields: [authorId], references: [id], onUpdate: Cascade, onDelete: Cascade)
     authorId  String
@@ -43,4 +29,3 @@ model Post with CommonFields {
     @@allow('all', auth().id == authorId)
     @@allow('read', published)
 }
-