fix computed fields

Author: ymc9

packages/runtime/src/client/executor/name-mapper.ts

@@ -252,7 +252,7 @@ export class QueryNameMapper extends OperationNodeTransformer {
         this.requireCurrentModel(contextNode);
         const modelDef = requireModel(this.schema, this.currentModel!);
         const scalarFields = Object.entries(modelDef.fields)
-            .filter(([, fieldDef]) => !fieldDef.relation)
+            .filter(([, fieldDef]) => !fieldDef.relation && !fieldDef.computed)
             .map(([fieldName]) => fieldName);
         return scalarFields;
     }

samples/blog/zenstack/schema.ts

@@ -2,7 +2,7 @@
 // DO NOT MODIFY THIS FILE                                                                  //
 // This file is automatically generated by ZenStack CLI and should not be manually updated. //
 //////////////////////////////////////////////////////////////////////////////////////////////
-import { type SchemaDef, type OperandExpression } from "@zenstackhq/runtime/schema";
+import { type SchemaDef, type OperandExpression, Expression } from "@zenstackhq/runtime/schema";
 import path from "node:path";
 import url from "node:url";
 import SQLite from "better-sqlite3";
@@ -17,35 +17,40 @@ export const schema = {
     },
     models: {
         User: {
-            dbTable: "User",
             fields: {
                 id: {
                     type: "String",
                     id: true,
+                    attributes: [{ name: "@id" }, { name: "@default", args: [{ name: "value", value: Expression.call("cuid") }] }],
                     default: { call: "cuid" }
                 },
                 createdAt: {
                     type: "DateTime",
+                    attributes: [{ name: "@default", args: [{ name: "value", value: Expression.call("now") }] }],
                     default: { call: "now" }
                 },
                 updatedAt: {
                     type: "DateTime",
-                    updatedAt: true
+                    updatedAt: true,
+                    attributes: [{ name: "@updatedAt" }]
                 },
                 email: {
                     type: "String",
-                    unique: true
+                    unique: true,
+                    attributes: [{ name: "@unique" }]
                 },
                 name: {
                     type: "String",
                     optional: true
                 },
                 postCount: {
                     type: "Int",
+                    attributes: [{ name: "@computed" }],
                     computed: true
                 },
                 role: {
                     type: "Role",
+                    attributes: [{ name: "@default", args: [{ name: "value", value: Expression.ref("Role", "USER") }] }],
                     default: "USER"
                 },
                 posts: {
@@ -71,11 +76,11 @@ export const schema = {
             }
         },
         Profile: {
-            dbTable: "Profile",
             fields: {
                 id: {
                     type: "String",
                     id: true,
+                    attributes: [{ name: "@id" }, { name: "@default", args: [{ name: "value", value: Expression.call("cuid") }] }],
                     default: { call: "cuid" }
                 },
                 bio: {
@@ -89,12 +94,14 @@ export const schema = {
                 user: {
                     type: "User",
                     optional: true,
+                    attributes: [{ name: "@relation", args: [{ name: "fields", value: Expression.array([Expression.ref("Profile", "userId")]) }, { name: "references", value: Expression.array([Expression.ref("User", "id")]) }] }],
                     relation: { opposite: "profile", fields: ["userId"], references: ["id"] }
                 },
                 userId: {
                     type: "String",
                     unique: true,
-                    optional: true
+                    optional: true,
+                    attributes: [{ name: "@unique" }]
                 }
             },
             idFields: ["id"],
@@ -104,20 +111,22 @@ export const schema = {
             }
         },
         Post: {
-            dbTable: "Post",
             fields: {
                 id: {
                     type: "String",
                     id: true,
+                    attributes: [{ name: "@id" }, { name: "@default", args: [{ name: "value", value: Expression.call("cuid") }] }],
                     default: { call: "cuid" }
                 },
                 createdAt: {
                     type: "DateTime",
+                    attributes: [{ name: "@default", args: [{ name: "value", value: Expression.call("now") }] }],
                     default: { call: "now" }
                 },
                 updatedAt: {
                     type: "DateTime",
-                    updatedAt: true
+                    updatedAt: true,
+                    attributes: [{ name: "@updatedAt" }]
                 },
                 title: {
                     type: "String"
@@ -126,10 +135,13 @@ export const schema = {
                     type: "String"
                 },
                 published: {
-                    type: "Boolean"
+                    type: "Boolean",
+                    attributes: [{ name: "@default", args: [{ name: "value", value: Expression.literal(false) }] }],
+                    default: false
                 },
                 author: {
                     type: "User",
+                    attributes: [{ name: "@relation", args: [{ name: "fields", value: Expression.array([Expression.ref("Post", "authorId")]) }, { name: "references", value: Expression.array([Expression.ref("User", "id")]) }] }],
                     relation: { opposite: "posts", fields: ["authorId"], references: ["id"] }
                 },
                 authorId: {