Add first

alineacms · Jan 20, 2025 · 0ba5a85 · 0ba5a85
1 parent eb5ce70
commit 0ba5a85
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 12 deletions.
diff --git a/apps/web/src/page/BlogPage.tsx b/apps/web/src/page/BlogPage.tsx
@@ -5,6 +5,7 @@ import {Link} from '@/layout/nav/Link'
 import {BlogOverview} from '@/schema/BlogOverview'
 import {BlogPost} from '@/schema/BlogPost'
 import styler from '@alinea/styler'
+import {Query} from 'alinea'
 import {Entry} from 'alinea/core/Entry'
 import {VStack} from 'alinea/ui'
 import {MetadataRoute} from 'next'
@@ -18,8 +19,7 @@ export default async function BlogPage() {
     type: BlogOverview,
     select: {
       title: BlogOverview.title,
-      posts: {
-        children: {},
+      posts: Query.children({
         type: BlogPost,
         select: {
           ...Entry,
@@ -28,7 +28,7 @@ export default async function BlogPage() {
           author: BlogPost.author,
           publishDate: BlogPost.publishDate
         }
-      }
+      })
     }
   })
   return (

diff --git a/src/backend/Database.test.ts b/src/backend/Database.test.ts
@@ -395,7 +395,6 @@ test('remove field contents', async () => {
 
 test('take/skip', async () => {
   const example = createExample()
-  const {Page} = example.schema
   const lastTwo = await example.find({
     root: example.workspaces.main.pages,
     skip: 1,

diff --git a/src/backend/resolver/EntryResolver.ts b/src/backend/resolver/EntryResolver.ts
@@ -306,14 +306,19 @@ export class EntryResolver {
             is(ctx.Table.locale, from.locale)
           )
           .orderBy(asc(ctx.Table.level))
-      case 'link':
+      case 'entryMultiple': {
         const linkedField = this.field(from, query.field)
         return cursor
           .innerJoin(
             {[internalTarget]: sql`json_each(${linkedField}) as lF`} as any,
             eq(ctx.Table.id, sql`lF.value->>'_entry'`)
           )
           .orderBy(asc(sql`lF.id`))
+      }
+      case 'entrySingle': {
+        const linkedField = this.field(from, query.field)
+        return cursor.where(eq(ctx.Table.id, sql`${linkedField}->>'_entry'`))
+      }
       default:
         return cursor.orderBy(asc(ctx.Table.index))
     }
@@ -567,6 +572,7 @@ export class EntryResolver {
     return Boolean(
       query.first ||
         query.get ||
+        query.count ||
         query.edge === 'parent' ||
         query.edge === 'next' ||
         query.edge === 'previous'

diff --git a/src/core/Graph.ts b/src/core/Graph.ts
@@ -54,8 +54,13 @@ export interface EdgePrevious {
   edge: 'previous'
 }
 
-export interface EdgeLink {
-  edge: 'link'
+export interface EdgeEntries {
+  edge: 'entryMultiple'
+  field: HasField & Expr
+}
+
+export interface EdgeEntry {
+  edge: 'entrySingle'
   field: HasField & Expr
 }
 
@@ -67,7 +72,8 @@ export type Edge =
   | EdgeParent
   | EdgeNext
   | EdgePrevious
-  | EdgeLink
+  | EdgeEntries
+  | EdgeEntry
 
 export type EdgeQuery<
   Selection = unknown,
@@ -138,10 +144,10 @@ export type AnyQueryResult<Query extends GraphQuery> = Query extends CountQuery<
   any
 >
   ? number
-  : Query extends FirstQuery<infer S, infer T, infer I>
-  ? QueryResult<S, T, I> | null
   : Query extends GetQuery<infer S, infer T, infer I>
   ? QueryResult<S, T, I>
+  : Query extends FirstQuery<infer S, infer T, infer I>
+  ? QueryResult<S, T, I> | null
   : Query extends GraphQuery<infer S, infer T, infer I>
   ? Array<QueryResult<S, T, I>>
   : unknown

diff --git a/src/field/link/LinkField.ts b/src/field/link/LinkField.ts
@@ -33,7 +33,17 @@ export interface LinkOptions<Value> extends LinkFieldOptions<Value> {
 export class LinkField<
   StoredValue extends Reference,
   QueryValue
-> extends UnionField<StoredValue, QueryValue, LinkOptions<StoredValue>> {}
+> extends UnionField<StoredValue, QueryValue, LinkOptions<StoredValue>> {
+  first<
+    Selection extends SelectionGuard = undefined,
+    const Type extends TypeGuard = undefined,
+    Include extends IncludeGuard = undefined
+  >(
+    query: GraphQuery<Selection, Type, Include>
+  ): EdgeQuery<Selection, Type, Include> & {first: true} {
+    return {edge: 'entrySingle', first: true, field: this, ...query}
+  }
+}
 
 export function createLink<StoredValue extends Reference, QueryValue>(
   label: string,
@@ -72,7 +82,27 @@ export class LinksField<
   >(
     query: GraphQuery<Selection, Type, Include>
   ): EdgeQuery<Selection, Type, Include> {
-    return {edge: 'link', field: this, ...query}
+    return {edge: 'entryMultiple', field: this, ...query}
+  }
+
+  first<
+    Selection extends SelectionGuard = undefined,
+    const Type extends TypeGuard = undefined,
+    Include extends IncludeGuard = undefined
+  >(
+    query?: GraphQuery<Selection, Type, Include>
+  ): EdgeQuery<Selection, Type, Include> & {first: true} {
+    return {edge: 'entryMultiple', first: true, field: this, ...query}
+  }
+
+  count<
+    Selection extends SelectionGuard = undefined,
+    const Type extends TypeGuard = undefined,
+    Include extends IncludeGuard = undefined
+  >(
+    query?: GraphQuery<Selection, Type, Include>
+  ): EdgeQuery<Selection, Type, Include> & {count: true} {
+    return {edge: 'entryMultiple', count: true, field: this, ...query}
   }
 }