fix relations types circular error

apps/blog-next/config/app.ts

@@ -20,6 +20,6 @@ export default defineAppConfig({
     jobs: 'server/jobs',
     events: 'server/events',
     listeners: 'server/listeners',
-    generatedSchema: 'server/db/schema.generated.ts',
+    generatedSchema: '.holo-js/generated/schema.generated.ts',
   },
 })

apps/blog-next/server/db/migrations/2026_05_02_115334_create_comments_table.ts

@@ -0,0 +1,19 @@
+import { defineMigration, type MigrationContext } from '@holo-js/db'
+
+export default defineMigration({
+  async up({ schema }: MigrationContext) {
+    await schema.createTable('comments', (table) => {
+      table.id()
+      table.integer('post_id')
+      table.index(['post_id'])
+      table.integer('user_id')
+      table.index(['user_id'])
+      table.text('body')
+      table.string('status').default('pending')
+      table.timestamps()
+    })
+  },
+  async down({ schema }: MigrationContext) {
+    await schema.dropTable('comments')
+  },
+})

apps/blog-next/server/holo-models.d.ts

@@ -0,0 +1,57 @@
+import type {
+  BelongsToManyRelationDefinition,
+  BelongsToRelationDefinition,
+  EmptyScopeMap,
+  GeneratedSchemaTable,
+  HasManyRelationDefinition,
+  ModelReference,
+  RelationMap,
+} from '@holo-js/db'
+
+type CategoryTable = GeneratedSchemaTable<'categories'>
+type CommentTable = GeneratedSchemaTable<'comments'>
+type PostTable = GeneratedSchemaTable<'posts'>
+type PostTagTable = GeneratedSchemaTable<'post_tags'>
+type TagTable = GeneratedSchemaTable<'tags'>
+type UserTable = GeneratedSchemaTable<'users'>
+
+interface CategoryRelations extends RelationMap {
+  readonly posts: HasManyRelationDefinition<PostModel>
+}
+
+interface CommentRelations extends RelationMap {
+  readonly post: BelongsToRelationDefinition<PostModel>
+  readonly user: BelongsToRelationDefinition<UserModel>
+}
+
+interface PostRelations extends RelationMap {
+  readonly user: BelongsToRelationDefinition<UserModel>
+  readonly category: BelongsToRelationDefinition<CategoryModel>
+  readonly tags: BelongsToManyRelationDefinition<TagModel, PostTagTable>
+  readonly comments: HasManyRelationDefinition<CommentModel>
+}
+
+interface TagRelations extends RelationMap {
+  readonly posts: BelongsToManyRelationDefinition<PostModel, PostTagTable>
+}
+
+interface UserRelations extends RelationMap {
+  readonly posts: HasManyRelationDefinition<PostModel>
+  readonly comments: HasManyRelationDefinition<CommentModel>
+}
+
+type CategoryModel = ModelReference<CategoryTable, EmptyScopeMap, CategoryRelations>
+type CommentModel = ModelReference<CommentTable, EmptyScopeMap, CommentRelations>
+type PostModel = ModelReference<PostTable, EmptyScopeMap, PostRelations>
+type TagModel = ModelReference<TagTable, EmptyScopeMap, TagRelations>
+type UserModel = ModelReference<UserTable, EmptyScopeMap, UserRelations>
+
+declare module '@holo-js/db' {
+  interface RegisteredModels {
+    Category: CategoryModel
+    Comment: CommentModel
+    Post: PostModel
+    Tag: TagModel
+    User: UserModel
+  }
+}

apps/blog-next/server/models/Category.ts

@@ -1,5 +1,8 @@
-import { defineModel } from '@holo-js/db'
+import { defineModel, hasMany } from '@holo-js/db'
 
 export default defineModel('categories', {
   fillable: ['name', 'slug', 'description'],
+  relations: {
+    posts: hasMany('Post', { foreignKey: 'category_id' }),
+  },
 })

apps/blog-next/server/models/Comment.ts

@@ -0,0 +1,9 @@
+import { belongsTo, defineModel } from '@holo-js/db'
+
+export default defineModel('comments', {
+  fillable: ['post_id', 'user_id', 'body'],
+  relations: {
+    post: belongsTo('Post', { foreignKey: 'post_id' }),
+    user: belongsTo('User', { foreignKey: 'user_id' }),
+  },
+})

apps/blog-next/server/models/Post.ts

@@ -1,15 +1,14 @@
-import { belongsTo, belongsToMany, defineModel } from '@holo-js/db'
-
-import Category from './Category'
-import Tag from './Tag'
+import { belongsTo, belongsToMany, defineModel, hasMany } from '@holo-js/db'
 
 const relations = {
-  category: belongsTo(() => Category, { foreignKey: 'category_id' }),
-  tags: belongsToMany(() => Tag, {
+  user: belongsTo('User', { foreignKey: 'user_id' }),
+  category: belongsTo('Category', { foreignKey: 'category_id' }),
+  tags: belongsToMany('Tag', {
     pivotTable: 'post_tags',
     foreignPivotKey: 'post_id',
     relatedPivotKey: 'tag_id',
   }),
+  comments: hasMany('Comment', { foreignKey: 'post_id' }),
 }
 
 export default defineModel('posts', {

apps/blog-next/server/models/Tag.ts

@@ -1,5 +1,12 @@
-import { defineModel } from '@holo-js/db'
+import { belongsToMany, defineModel } from '@holo-js/db'
 
 export default defineModel('tags', {
   fillable: ['name', 'slug'],
+  relations: {
+    posts: belongsToMany('Post', {
+      pivotTable: 'post_tags',
+      foreignPivotKey: 'tag_id',
+      relatedPivotKey: 'post_id',
+    }),
+  },
 })

apps/blog-next/server/models/User.ts

@@ -1,6 +1,10 @@
-import { defineModel } from '@holo-js/db'
+import { defineModel, hasMany } from '@holo-js/db'
 
 export default defineModel('users', {
   fillable: ['name', 'email', 'password', 'avatar'],
   hidden: ['password'],
+  relations: {
+    posts: hasMany('Post', { foreignKey: 'user_id' }),
+    comments: hasMany('Comment', { foreignKey: 'user_id' }),
+  },
 })

apps/blog-next/tests/blog-logic.mjs

@@ -5,6 +5,7 @@ import { initializeHoloAdapterProject } from '@holo-js/core'
 import Category from '../server/models/Category.ts'
 import Post from '../server/models/Post.ts'
 import Tag from '../server/models/Tag.ts'
+import User from '../server/models/User.ts'
 import {
   createCategory,
   createPost,
@@ -37,6 +38,13 @@ try {
   assert.equal(home.categories.length, 2)
   assert.equal(home.tags.length, 3)
 
+  const firstUser = await User.with('posts').first()
+  assert.ok(firstUser)
+  assert.ok(Array.isArray(firstUser.posts))
+
+  const featuredPost = await Post.with('user').where('slug', home.featured?.slug ?? '').first()
+  assert.ok(featuredPost?.user)
+
   const dashboard = await getAdminDashboardData()
   assert.equal(dashboard.postCount, 2)
   assert.equal(dashboard.publishedCount, 2)

apps/blog-nuxt/config/app.ts

@@ -20,6 +20,6 @@ export default defineAppConfig({
     jobs: 'server/jobs',
     events: 'server/events',
     listeners: 'server/listeners',
-    generatedSchema: 'server/db/schema.generated.ts',
+    generatedSchema: '.holo-js/generated/schema.generated.ts',
   },
 })

apps/blog-nuxt/pages/admin/categories/index.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-const { data } = await useFetch('/api/admin/categories')
+import type { AdminCategoriesData } from '../../../server/lib/blog'
+
+const { data } = await useFetch<AdminCategoriesData>('/api/admin/categories')
 </script>
 
 <template>

apps/blog-nuxt/pages/admin/posts/[id]/edit.vue

@@ -1,6 +1,8 @@
 <script setup lang="ts">
+import type { AdminPostData } from '../../../../server/lib/blog'
+
 const route = useRoute()
-const { data } = await useFetch(`/api/admin/posts/${route.params.id}`)
+const { data } = await useFetch<AdminPostData>(`/api/admin/posts/${route.params.id}`)
 const selectedTagIds = computed(() => new Set((data.value?.post?.tags ?? []).map(tag => tag.id)))
 
 if (!data.value) {

apps/blog-nuxt/pages/admin/posts/index.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-const { data } = await useFetch('/api/admin/posts')
+import type { AdminPostsData } from '../../../server/lib/blog'
+
+const { data } = await useFetch<AdminPostsData>('/api/admin/posts')
 </script>
 
 <template>

apps/blog-nuxt/pages/admin/posts/new.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-const { data } = await useFetch('/api/admin/posts')
+import type { AdminPostsData } from '../../../server/lib/blog'
+
+const { data } = await useFetch<AdminPostsData>('/api/admin/posts')
 </script>
 
 <template>

apps/blog-nuxt/pages/admin/tags/index.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-const { data } = await useFetch('/api/admin/tags')
+import type { AdminTagsData } from '../../../server/lib/blog'
+
+const { data } = await useFetch<AdminTagsData>('/api/admin/tags')
 </script>
 
 <template>

apps/blog-nuxt/pages/categories/[slug].vue

@@ -1,6 +1,8 @@
 <script setup lang="ts">
+import type { CategoryArchiveData } from '../../server/lib/blog'
+
 const route = useRoute()
-const { data } = await useFetch(`/api/blog/categories/${route.params.slug}`)
+const { data } = await useFetch<CategoryArchiveData>(`/api/blog/categories/${route.params.slug}`)
 
 if (!data.value) {
   throw createError({ statusCode: 404, statusMessage: 'Category not found' })

apps/blog-nuxt/pages/index.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-const { data } = await useFetch('/api/blog/home')
+import type { HomePageData } from '../server/lib/blog'
+
+const { data } = await useFetch<HomePageData>('/api/blog/home')
 </script>
 
 <template>