@contember/client-content 2.1.0-alpha.30 → 2.1.0-alpha.35

package/tests/cases/unit/__snapshots__/query.test.ts.snap

@@ -1,138 +1,134 @@
-// Bun Snapshot v1, https://goo.gl/fbAQLP
+// Bun Snapshot v1, https://bun.sh/docs/test/snapshots
 
 exports[`queries list 1`] = `
 "query {
-\tauthors: listAuthor {
-\t\tid
-\t\tname
-\t\temail
-\t}
+	authors: listAuthor {
+		id
+		name
+		email
+	}
 }
 "
 `;
 
 exports[`queries multiple queries 1`] = `
 "query {
-\tauthors: listAuthor {
-\t\tid
-\t\tname
-\t\temail
-\t}
-\tposts: listPost {
-\t\tid
-\t\tpublishedAt
-\t}
+	authors: listAuthor {
+		id
+		name
+		email
+	}
+	posts: listPost {
+		id
+		publishedAt
+		status
+	}
 }
 "
 `;
 
 exports[`queries single query 1`] = `
 "query {
-\tvalue: listPost {
-\t\tid
-\t\tpublishedAt
-\t}
+	value: listPost {
+		id
+		publishedAt
+		status
+	}
 }
 "
 `;
 
 exports[`queries nested object 1`] = `
 "query {
-\tauthors: listAuthor {
-\t\tid
-\t\tname
-\t\temail
-\t\tposts {
-\t\t\tid
-\t\t\tpublishedAt
-\t\t\ttags {
-\t\t\t\tid
-\t\t\t\tname
-\t\t\t}
-\t\t}
-\t}
+	authors: listAuthor {
+		id
+		name
+		email
+		posts {
+			id
+			publishedAt
+			status
+			tags {
+				id
+				name
+			}
+		}
+	}
 }
 "
 `;
 
 exports[`queries nested object args 1`] = `
 "query($PostWhere_0: PostWhere, $Int_1: Int) {
-\tauthors: listAuthor {
-\t\tid
-\t\tname
-\t\temail
-\t\tposts(filter: $PostWhere_0, limit: $Int_1) {
-\t\t\tid
-\t\t\tpublishedAt
-\t\t}
-\t}
+	authors: listAuthor {
+		id
+		name
+		email
+		posts(filter: $PostWhere_0, limit: $Int_1) {
+			id
+			publishedAt
+			status
+		}
+	}
 }
 "
 `;
 
 exports[`queries list with args: 
-\t\t\t"query($AuthorWhere_0: AuthorWhere, $AuthorOrderBy_1: [AuthorOrderBy!], $Int_2: Int, $Int_3: Int) {
-\t\t\t\tauthors: listAuthor(filter: $AuthorWhere_0, orderBy: $AuthorOrderBy_1, limit: $Int_2, offset: $Int_3) {
-\t\t\t\t\tid
-\t\t\t\t\tname
-\t\t\t\t\temail
-\t\t\t\t}
-\t\t\t}
-\t\t\t"
-\t\t 1`] = `
+			"query($AuthorWhere_0: AuthorWhere, $AuthorOrderBy_1: [AuthorOrderBy!], $Int_2: Int, $Int_3: Int) {
+				authors: listAuthor(filter: $AuthorWhere_0, orderBy: $AuthorOrderBy_1, limit: $Int_2, offset: $Int_3) {
+					id
+					name
+					email
+				}
+			}
+			"
+		 1`] = `
 "query($AuthorWhere_0: AuthorWhere, $AuthorOrderBy_1: [AuthorOrderBy!], $Int_2: Int, $Int_3: Int) {
-\tauthors: listAuthor(filter: $AuthorWhere_0, orderBy: $AuthorOrderBy_1, limit: $Int_2, offset: $Int_3) {
-\t\tid
-\t\tname
-\t\temail
-\t}
+	authors: listAuthor(filter: $AuthorWhere_0, orderBy: $AuthorOrderBy_1, limit: $Int_2, offset: $Int_3) {
+		id
+		name
+		email
+	}
 }
 "
 `;
 
 exports[`queries get by id 1`] = `
 "query($AuthorUniqueWhere_0: AuthorUniqueWhere!) {
-\tauthors: getAuthor(by: $AuthorUniqueWhere_0) {
-\t\tid
-\t\tname
-\t\temail
-\t}
+	authors: getAuthor(by: $AuthorUniqueWhere_0) {
+		id
+		name
+		email
+	}
 }
 "
 `;
 
-exports[`queries nested has-many transform 1`] = `
+exports[`queries top level list transform 1`] = `
 [
   {
     "query": 
-"query($AuthorUniqueWhere_0: AuthorUniqueWhere!) {
-	author: getAuthor(by: $AuthorUniqueWhere_0) {
+"query {
+	authors: listAuthor {
 		id
 		name
 		email
-		posts {
-			id
-			publishedAt
-		}
 	}
 }
 "
 ,
-    "variables": {
-      "AuthorUniqueWhere_0": {
-        "id": "123",
-      },
-    },
+    "variables": {},
   },
 ]
 `;
 
-exports[`queries top level list transform 1`] = `
+exports[`queries top level get transform 1`] = `
 [
   {
     "query": 
-"query {
-	authors: listAuthor {
+"query($AuthorUniqueWhere_0: AuthorUniqueWhere!) {
+	author: getAuthor(by: $AuthorUniqueWhere_0) {
 		id
 		name
 		email
@@ -140,12 +136,16 @@ exports[`queries top level list transform 1`] = `
 }
 "
 ,
-    "variables": {},
+    "variables": {
+      "AuthorUniqueWhere_0": {
+        "id": "123",
+      },
+    },
   },
 ]
 `;
 
-exports[`queries top level get transform 1`] = `
+exports[`queries nested has-many transform 1`] = `
 [
   {
     "query": 
@@ -154,6 +154,11 @@ exports[`queries top level get transform 1`] = `
 		id
 		name
 		email
+		posts {
+			id
+			publishedAt
+			status
+		}
 	}
 }
 "
@@ -175,6 +180,7 @@ exports[`queries nested has-one transform 1`] = `
 	post: getPost(by: $PostUniqueWhere_0) {
 		id
 		publishedAt
+		status
 		author {
 			id
 			name
@@ -201,6 +207,7 @@ exports[`queries nested has-many-by transform 1`] = `
 	post: getPost(by: $PostUniqueWhere_0) {
 		id
 		publishedAt
+		status
 		localesByLocale(by: $PostLocalesByLocaleUniqueWhere_1) {
 			id
 			title

package/tests/cases/unit/mutation.test.ts

@@ -22,7 +22,6 @@ describe('mutations in trx', () => {
 		}))
 		const result = await client.mutate(createAuthor)
 
-
 		expect(result.data.ok).toBe(true)
 		expect(calls).toHaveLength(1)
 		expect(calls[0].query).toMatchSnapshot()
@@ -303,7 +302,6 @@ describe('mutations in trx', () => {
 		expect(calls[0].query).toMatchSnapshot()
 		expect(calls[0].variables).toMatchSnapshot()
 	})
-
 })
 describe('mutations without trx', () => {
 	test('create', async () => {
@@ -320,7 +318,6 @@ describe('mutations without trx', () => {
 		})
 		const result = await client.mutate(createAuthor)
 
-
 		expect(result.ok).toBe(true)
 		expect(calls).toHaveLength(1)
 		expect(calls[0].query).toMatchSnapshot()
@@ -541,7 +538,6 @@ describe('mutations without trx', () => {
 		expect(calls[0].variables).toMatchSnapshot()
 	})
 
-
 	test('mutate or fail - ok', async () => {
 		const [client, calls] = createClient({
 			mut: {

package/tests/cases/unit/query.test.ts

@@ -5,7 +5,6 @@ import OrderDirection = Input.OrderDirection
 import { queryBuilder } from '../../client'
 
 describe('queries', () => {
-
 	const qb = queryBuilder
 	test('list', async () => {
 		const [client, calls] = createClient({
@@ -98,7 +97,6 @@ describe('queries', () => {
 		expect(calls[0].variables).toEqual({})
 	})
 
-
 	test('single query', async () => {
 		const [client, calls] = createClient({
 			value: [
@@ -129,7 +127,6 @@ describe('queries', () => {
 		expect(calls[0].variables).toEqual({})
 	})
 
-
 	test('nested object', async () => {
 		const [client, calls] = createClient()
 		await client.query({
@@ -142,10 +139,11 @@ describe('queries', () => {
 	test('nested object args', async () => {
 		const [client, calls] = createClient()
 		await client.query({
-			authors: qb.list('Author', {}, it => it.$$().$('posts', {
-				limit: 10,
-				filter: { tags: { name: { eq: 'foo' } } },
-			}, it => it.$$())),
+			authors: qb.list('Author', {}, it =>
+				it.$$().$('posts', {
+					limit: 10,
+					filter: { tags: { name: { eq: 'foo' } } },
+				}, it => it.$$())),
 		})
 		expect(calls).toHaveLength(1)
 		expect(calls[0].query).toMatchSnapshot()
@@ -161,7 +159,6 @@ describe('queries', () => {
 		})
 	})
 
-
 	test('list with args', async () => {
 		const [client, calls] = createClient()
 		await client.query({
@@ -201,7 +198,6 @@ describe('queries', () => {
 		)
 	})
 
-
 	test('get by id', async () => {
 		const [client, calls] = createClient()
 		const result = await client.query({
@@ -232,13 +228,13 @@ describe('queries', () => {
 			],
 		})
 		const result = await client.query({
-			authors: qb.list('Author', {}, it => it
-				.$$()
-				.transform(it => ({
-					...it,
-					label: `${it.name} (${it.email})`,
-				})),
-			),
+			authors: qb.list('Author', {}, it =>
+				it
+					.$$()
+					.transform(it => ({
+						...it,
+						label: `${it.name} (${it.email})`,
+					}))),
 		})
 		expect(result as any).toStrictEqual({
 			authors: [
@@ -266,13 +262,13 @@ describe('queries', () => {
 			},
 		})
 		const result = await client.query({
-			author: qb.get('Author', { by: { id: '123' } }, it => it
-				.$$()
-				.transform(it => ({
-					...it,
-					label: `${it.name} (${it.email})`,
-				})),
-			),
+			author: qb.get('Author', { by: { id: '123' } }, it =>
+				it
+					.$$()
+					.transform(it => ({
+						...it,
+						label: `${it.name} (${it.email})`,
+					}))),
 		})
 		expect(result as any).toStrictEqual({
 			author: {
@@ -285,7 +281,6 @@ describe('queries', () => {
 		expect(calls).toMatchSnapshot()
 	})
 
-
 	test('nested has-many transform', async () => {
 		const [client, calls] = createClient({
 			author: {
@@ -302,13 +297,14 @@ describe('queries', () => {
 			},
 		})
 		const result = await client.query({
-			author: qb.get('Author', { by: { id: '123' } }, it => it
-				.$$()
-				.$('posts', {}, it => it.$$().transform(it => ({
-					...it,
-					publishYear: it.publishedAt ? new Date(it.publishedAt).getFullYear() : null,
-				}))),
-			),
+			author: qb.get('Author', { by: { id: '123' } }, it =>
+				it
+					.$$()
+					.$('posts', {}, it =>
+						it.$$().transform(it => ({
+							...it,
+							publishYear: it.publishedAt ? new Date(it.publishedAt).getFullYear() : null,
+						})))),
 		})
 		expect(result as any).toStrictEqual({
 			author: {
@@ -330,7 +326,6 @@ describe('queries', () => {
 		expect(calls).toMatchSnapshot()
 	})
 
-
 	test('nested has-one transform', async () => {
 		const [client, calls] = createClient({
 			post: {
@@ -341,19 +336,19 @@ describe('queries', () => {
 				},
 			},
 		})
-		const author = qb.fragment('Author', it => it
-			.$$()
-			.transform(it => ({
-				...it,
-				label: `${it.name} (${it.email})`,
-			})),
-		)
+		const author = qb.fragment('Author', it =>
+			it
+				.$$()
+				.transform(it => ({
+					...it,
+					label: `${it.name} (${it.email})`,
+				})))
 
 		const result = await client.query({
-			post: qb.get('Post', { by: { id: '123' } }, it => it
-				.$$()
-				.$('author', author),
-			),
+			post: qb.get('Post', { by: { id: '123' } }, it =>
+				it
+					.$$()
+					.$('author', author)),
 		})
 		expect(result as any).toStrictEqual({
 			post: {
@@ -368,7 +363,6 @@ describe('queries', () => {
 		expect(calls).toMatchSnapshot()
 	})
 
-
 	test('nested has-many-by transform', async () => {
 		const [client, calls] = createClient({
 			post: {
@@ -379,13 +373,14 @@ describe('queries', () => {
 			},
 		})
 		const result = await client.query({
-			post: qb.get('Post', { by: { id: '123' } }, it => it
-				.$$()
-				.$('localesByLocale', { by: { locale: { code: 'en' } } }, it => it.$$().transform(it => ({
-					...it,
-					label: it.title?.toUpperCase(),
-				}))),
-			),
+			post: qb.get('Post', { by: { id: '123' } }, it =>
+				it
+					.$$()
+					.$('localesByLocale', { by: { locale: { code: 'en' } } }, it =>
+						it.$$().transform(it => ({
+							...it,
+							label: it.title?.toUpperCase(),
+						})))),
 		})
 		expect(result as any).toStrictEqual({
 			post: {
@@ -415,21 +410,22 @@ describe('queries', () => {
 			},
 		})
 		const result = await client.query({
-			author: qb.get('Author', { by: { id: '123' } }, it => it
-				.$$()
-				.transform(it => ({
-					...it,
-					value1: 'foo',
-				}))
-				.$('posts', {}, it => it.$$().transform(it => ({
-					...it,
-					postLabel: 'foo bar',
-				})))
-				.transform(it => ({
-					...it,
-					value2: 'bar',
-				})),
-			),
+			author: qb.get('Author', { by: { id: '123' } }, it =>
+				it
+					.$$()
+					.transform(it => ({
+						...it,
+						value1: 'foo',
+					}))
+					.$('posts', {}, it =>
+						it.$$().transform(it => ({
+							...it,
+							postLabel: 'foo bar',
+						})))
+					.transform(it => ({
+						...it,
+						value2: 'bar',
+					}))),
 		})
 		expect(result as any).toStrictEqual({
 			author: {
@@ -476,5 +472,4 @@ describe('queries', () => {
 		expect(calls[0].query).toMatchSnapshot()
 		expect(calls[0].variables).toStrictEqual({})
 	})
-
 })

package/tests/cases/unit/types.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { describe, expect, test } from 'bun:test'
 import { ContentClientInput } from '../../../src'
-import { ContemberClientEntities, FragmentOf, FragmentType, queryBuilder } from '../../client'
+import { ContemberClientEntities, FragmentOf, FragmentType, PostStatus, queryBuilder } from '../../client'
 import { expectTypeOf } from 'expect-type'
 
 const qb = queryBuilder
@@ -75,10 +75,11 @@ describe('ts types', () => {
 	test('has one field on fragment type', async () => {
 		const fragment = qb.fragment('Post', it => it.$('author', it => it.$$().$('posts', it => it.$('id'))))
 		type fragmentType = FragmentType<typeof fragment>
-		expectTypeOf<fragmentType>().toEqualTypeOf<{ author: ({ id: string; name: string | null; email: string | null } & { posts: { id: string }[] }) | null }>()
+		expectTypeOf<fragmentType>().toEqualTypeOf<
+			{ author: ({ id: string; name: string | null; email: string | null } & { posts: { id: string }[] }) | null }
+		>()
 	})
 
-
 	test('has one without arg', async () => {
 		qb.list('Post', {}, it => it.$('author', it => it.$$()))
 	})
@@ -88,13 +89,13 @@ describe('ts types', () => {
 	})
 
 	test('has one with invalid arg', async () => {
-		qb.list('Post', {}, it => it
-			.$('author',
-				// @ts-expect-error
-				{ filter: { foo: { eq: 'xx' } } },
-				it => it.$$(),
-			),
-		)
+		qb.list('Post', {}, it =>
+			it
+				.$(
+					'author', // @ts-expect-error
+					{ filter: { foo: { eq: 'xx' } } },
+					it => it.$$(),
+				))
 	})
 
 	test('has many without arg', async () => {
@@ -102,36 +103,33 @@ describe('ts types', () => {
 	})
 
 	test('has many with arg', async () => {
-		qb.list('Post', {}, it => it.$('locales', { filter: { locale: { code: { eq: 'cs' } } } },  it => it.$$()))
+		qb.list('Post', {}, it => it.$('locales', { filter: { locale: { code: { eq: 'cs' } } } }, it => it.$$()))
 	})
 
 	test('has many with invalid arg', async () => {
-		qb.list('Post', {}, it => it
-			.$('locales',
-				// @ts-expect-error
-				{ filter: { locale: { eq: 'cs' } } },
-				it => it.$$(),
-			),
-		)
+		qb.list('Post', {}, it =>
+			it
+				.$(
+					'locales', // @ts-expect-error
+					{ filter: { locale: { eq: 'cs' } } },
+					it => it.$$(),
+				))
 	})
 
 	test('reduced has may', async () => {
-		qb.list('Post', {}, it => it.$('localesByLocale', { by: { locale: { code: 'cs' } } },  it => it.$$()))
+		qb.list('Post', {}, it => it.$('localesByLocale', { by: { locale: { code: 'cs' } } }, it => it.$$()))
 	})
 
 	test('reduced has may - invalid "by"', async () => {
-		qb.list('Post',
-			{},
-			it => it
-				.$('localesByLocale',
-					// @ts-expect-error
+		qb.list('Post', {}, it =>
+			it
+				.$(
+					'localesByLocale', // @ts-expect-error
 					{ by: { locale: {} } },
 					qb.fragment('PostLocale'),
-				),
-		)
+				))
 	})
 
-
 	test('invalid field', async () => {
 		expect(() => {
 			qb.list(
@@ -146,6 +144,6 @@ describe('ts types', () => {
 	test('omit', async () => {
 		const fragment = qb.fragment('Post', it => it.$$().omit('publishedAt'))
 		type fragmentType = FragmentType<typeof fragment>
-		expectTypeOf<fragmentType>().toEqualTypeOf<{ id: string }>()
+		expectTypeOf<fragmentType>().toEqualTypeOf<{ id: string; status: PostStatus | null }>()
 	})
 })

package/tests/client/entities.ts

@@ -1,3 +1,4 @@
+import type { PostStatus } from './enums'
 
 export type JSONPrimitive = string | number | boolean | null
 export type JSONValue = JSONPrimitive | JSONObject | JSONArray
@@ -47,6 +48,7 @@ export type Post <OverRelation extends string | never = never> = {
 	columns: {
 		id: string
 		publishedAt: string | null
+		status: PostStatus | null
 	}
 	hasOne: {
 		author: Author

package/tests/client/enums.ts

@@ -1,3 +1,8 @@
+export type PostStatus = 
+	 | "draft"
+	 | "published"
+	 | "archived"
 export type ContemberClientEnums = {
+	PostStatus: PostStatus
 }