Merge pull request #160 from zenstackhq/dev

ymc9 · web-flow · commit aec009645481 · 2025-08-13T08:03:49.000Z
merge dev to main (v3.0.0-alpha.22)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "description": "ZenStack",
     "packageManager": "pnpm@10.12.1",
     "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -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.21",
+    "version": "3.0.0-alpha.22",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {
diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {
diff --git a/packages/dialects/sql.js/package.json b/packages/dialects/sql.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/kysely-sql-js",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "description": "Kysely dialect for sql.js",
     "type": "module",
     "scripts": {
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "type": "module",
     "private": true,
     "license": "MIT"
diff --git a/packages/ide/vscode/package.json b/packages/ide/vscode/package.json
@@ -1,7 +1,7 @@
 {
     "name": "zenstack",
     "publisher": "zenstack",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "displayName": "ZenStack Language Tools",
     "description": "VSCode extension for ZenStack ZModel language",
     "private": true,
diff --git a/packages/language/package.json b/packages/language/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/runtime",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "description": "ZenStack Runtime",
     "type": "module",
     "scripts": {
@@ -65,11 +65,12 @@
         }
     },
     "dependencies": {
-        "@zenstackhq/common-helpers": "workspace:*",
         "@paralleldrive/cuid2": "^2.2.2",
+        "@zenstackhq/common-helpers": "workspace:*",
         "decimal.js": "^10.4.3",
         "json-stable-stringify": "^1.3.0",
         "nanoid": "^5.0.9",
+        "toposort": "^2.0.2",
         "ts-pattern": "catalog:",
         "ulid": "^3.0.0",
         "uuid": "^11.0.5"
@@ -91,6 +92,7 @@
     "devDependencies": {
         "@types/better-sqlite3": "^7.6.13",
         "@types/pg": "^8.0.0",
+        "@types/toposort": "^2.0.7",
         "@zenstackhq/eslint-config": "workspace:*",
         "@zenstackhq/language": "workspace:*",
         "@zenstackhq/sdk": "workspace:*",
diff --git a/packages/runtime/src/client/helpers/schema-db-pusher.ts b/packages/runtime/src/client/helpers/schema-db-pusher.ts
@@ -1,12 +1,12 @@
 import { invariant } from '@zenstackhq/common-helpers';
 import { CreateTableBuilder, sql, type ColumnDataType, type OnModifyForeignAction } from 'kysely';
+import toposort from 'toposort';
 import { match } from 'ts-pattern';
 import {
     ExpressionUtils,
     type BuiltinType,
     type CascadeAction,
     type FieldDef,
-    type GetModels,
     type ModelDef,
     type SchemaDef,
 } from '../../schema';
@@ -24,32 +24,84 @@ export class SchemaDbPusher<Schema extends SchemaDef> {
             if (this.schema.enums && this.schema.provider.type === 'postgresql') {
                 for (const [name, enumDef] of Object.entries(this.schema.enums)) {
                     const createEnum = tx.schema.createType(name).asEnum(Object.values(enumDef));
-                    // console.log('Creating enum:', createEnum.compile().sql);
                     await createEnum.execute();
                 }
             }
 
-            for (const model of Object.keys(this.schema.models)) {
-                const createTable = this.createModelTable(tx, model as GetModels<Schema>);
-                // console.log('Creating table:', createTable.compile().sql);
+            // sort models so that target of fk constraints are created first
+            const sortedModels = this.sortModels(this.schema.models);
+            for (const modelDef of sortedModels) {
+                const createTable = this.createModelTable(tx, modelDef);
                 await createTable.execute();
             }
         });
     }
 
-    private createModelTable(kysely: ToKysely<Schema>, model: GetModels<Schema>) {
-        let table = kysely.schema.createTable(model).ifNotExists();
-        const modelDef = requireModel(this.schema, model);
+    private sortModels(models: Record<string, ModelDef>): ModelDef[] {
+        const graph: [ModelDef, ModelDef | undefined][] = [];
+
+        for (const model of Object.values(models)) {
+            let added = false;
+
+            if (model.baseModel) {
+                // base model should be created before concrete model
+                const baseDef = requireModel(this.schema, model.baseModel);
+                // edge: concrete model -> base model
+                graph.push([model, baseDef]);
+                added = true;
+            }
+
+            for (const field of Object.values(model.fields)) {
+                // relation order
+                if (field.relation && field.relation.fields && field.relation.references) {
+                    const targetModel = requireModel(this.schema, field.type);
+                    // edge: fk side -> target model
+                    graph.push([model, targetModel]);
+                    added = true;
+                }
+            }
+
+            if (!added) {
+                // no relations, add self to graph to ensure it is included in the result
+                graph.push([model, undefined]);
+            }
+        }
+
+        return toposort(graph)
+            .reverse()
+            .filter((m) => !!m);
+    }
+
+    private createModelTable(kysely: ToKysely<Schema>, modelDef: ModelDef) {
+        let table: CreateTableBuilder<string, any> = kysely.schema.createTable(modelDef.name).ifNotExists();
+
         for (const [fieldName, fieldDef] of Object.entries(modelDef.fields)) {
+            if (fieldDef.originModel && !fieldDef.id) {
+                // skip non-id fields inherited from base model
+                continue;
+            }
+
             if (fieldDef.relation) {
-                table = this.addForeignKeyConstraint(table, model, fieldName, fieldDef);
+                table = this.addForeignKeyConstraint(table, modelDef.name, fieldName, fieldDef);
             } else if (!this.isComputedField(fieldDef)) {
-                table = this.createModelField(table, fieldName, fieldDef, modelDef);
+                table = this.createModelField(table, fieldDef, modelDef);
             }
         }
 
-        table = this.addPrimaryKeyConstraint(table, model, modelDef);
-        table = this.addUniqueConstraint(table, model, modelDef);
+        if (modelDef.baseModel) {
+            // create fk constraint
+            const baseModelDef = requireModel(this.schema, modelDef.baseModel);
+            table = table.addForeignKeyConstraint(
+                `fk_${modelDef.baseModel}_delegate`,
+                baseModelDef.idFields,
+                modelDef.baseModel,
+                baseModelDef.idFields,
+                (cb) => cb.onDelete('cascade').onUpdate('cascade'),
+            );
+        }
+
+        table = this.addPrimaryKeyConstraint(table, modelDef);
+        table = this.addUniqueConstraint(table, modelDef);
 
         return table;
     }
@@ -58,11 +110,7 @@ export class SchemaDbPusher<Schema extends SchemaDef> {
         return fieldDef.attributes?.some((a) => a.name === '@computed');
     }
 
-    private addPrimaryKeyConstraint(
-        table: CreateTableBuilder<string, any>,
-        model: GetModels<Schema>,
-        modelDef: ModelDef,
-    ) {
+    private addPrimaryKeyConstraint(table: CreateTableBuilder<string, any>, modelDef: ModelDef) {
         if (modelDef.idFields.length === 1) {
             if (Object.values(modelDef.fields).some((f) => f.id)) {
                 // @id defined at field level
@@ -71,13 +119,13 @@ export class SchemaDbPusher<Schema extends SchemaDef> {
         }
 
         if (modelDef.idFields.length > 0) {
-            table = table.addPrimaryKeyConstraint(`pk_${model}`, modelDef.idFields);
+            table = table.addPrimaryKeyConstraint(`pk_${modelDef.name}`, modelDef.idFields);
         }
 
         return table;
     }
 
-    private addUniqueConstraint(table: CreateTableBuilder<string, any>, model: string, modelDef: ModelDef) {
+    private addUniqueConstraint(table: CreateTableBuilder<string, any>, modelDef: ModelDef) {
         for (const [key, value] of Object.entries(modelDef.uniqueFields)) {
             invariant(typeof value === 'object', 'expecting an object');
             if ('type' in value) {
@@ -86,22 +134,17 @@ export class SchemaDbPusher<Schema extends SchemaDef> {
                 if (fieldDef.unique) {
                     continue;
                 }
-                table = table.addUniqueConstraint(`unique_${model}_${key}`, [key]);
+                table = table.addUniqueConstraint(`unique_${modelDef.name}_${key}`, [key]);
             } else {
                 // multi-field constraint
-                table = table.addUniqueConstraint(`unique_${model}_${key}`, Object.keys(value));
+                table = table.addUniqueConstraint(`unique_${modelDef.name}_${key}`, Object.keys(value));
             }
         }
         return table;
     }
 
-    private createModelField(
-        table: CreateTableBuilder<any>,
-        fieldName: string,
-        fieldDef: FieldDef,
-        modelDef: ModelDef,
-    ) {
-        return table.addColumn(fieldName, this.mapFieldType(fieldDef), (col) => {
+    private createModelField(table: CreateTableBuilder<any>, fieldDef: FieldDef, modelDef: ModelDef) {
+        return table.addColumn(fieldDef.name, this.mapFieldType(fieldDef), (col) => {
             // @id
             if (fieldDef.id && modelDef.idFields.length === 1) {
                 col = col.primaryKey();
@@ -178,7 +221,7 @@ export class SchemaDbPusher<Schema extends SchemaDef> {
 
     private addForeignKeyConstraint(
         table: CreateTableBuilder<string, any>,
-        model: GetModels<Schema>,
+        model: string,
         fieldName: string,
         fieldDef: FieldDef,
     ) {
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {
diff --git a/packages/tanstack-query/package.json b/packages/tanstack-query/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "description": "",
     "main": "index.js",
     "type": "module",
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {
diff --git a/packages/typescript-config/package.json b/packages/typescript-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "private": true,
     "license": "MIT"
 }
diff --git a/packages/vitest-config/package.json b/packages/vitest-config/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "private": true,
     "license": "MIT",
     "exports": {
diff --git a/packages/zod/package.json b/packages/zod/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/zod",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "description": "",
     "type": "module",
     "main": "index.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/samples/blog/package.json b/samples/blog/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sample-blog",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "description": "",
     "main": "index.js",
     "scripts": {
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -1,6 +1,6 @@
 {
     "name": "e2e",
-    "version": "3.0.0-alpha.21",
+    "version": "3.0.0-alpha.22",
     "private": true,
     "type": "module",
     "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack-v3",`
`3`		`- "version": "3.0.0-alpha.21",`
	`3`	`+ "version": "3.0.0-alpha.22",`
`4`	`4`	`"description": "ZenStack",`
`5`	`5`	`"packageManager": "[email protected]",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/common-helpers",`
`3`		`- "version": "3.0.0-alpha.21",`
	`3`	`+ "version": "3.0.0-alpha.22",`
`4`	`4`	`"description": "ZenStack Common Helpers",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-zenstack",`
`3`		`- "version": "3.0.0-alpha.21",`
	`3`	`+ "version": "3.0.0-alpha.22",`
`4`	`4`	`"description": "Create a new ZenStack project",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/kysely-sql-js",`
`3`		`- "version": "3.0.0-alpha.21",`
	`3`	`+ "version": "3.0.0-alpha.22",`
`4`	`4`	`"description": "Kysely dialect for sql.js",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/eslint-config",`
`3`		`- "version": "3.0.0-alpha.21",`
	`3`	`+ "version": "3.0.0-alpha.22",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack",`
`3`	`3`	`"publisher": "zenstack",`
`4`		`- "version": "3.0.0-alpha.21",`
	`4`	`+ "version": "3.0.0-alpha.22",`
`5`	`5`	`"displayName": "ZenStack Language Tools",`
`6`	`6`	`"description": "VSCode extension for ZenStack ZModel language",`
`7`	`7`	`"private": true,`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/language",`
`3`	`3`	`"description": "ZenStack ZModel language specification",`
`4`		`- "version": "3.0.0-alpha.21",`
	`4`	`+ "version": "3.0.0-alpha.22",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"author": "ZenStack Team",`
`7`	`7`	`"files": [`