@contember/client-content 2.1.0-alpha.9 → 2.1.0-beta.2

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: [
@@ -255,6 +251,7 @@ describe('queries', () => {
 			],
 		})
 		expect(calls).toHaveLength(1)
+		expect(calls).toMatchSnapshot()
 	})
 
 	test('top level get transform', async () => {
@@ -265,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: {
@@ -281,32 +278,31 @@ describe('queries', () => {
 			},
 		})
 		expect(calls).toHaveLength(1)
+		expect(calls).toMatchSnapshot()
 	})
 
-
 	test('nested has-many transform', async () => {
 		const [client, calls] = createClient({
 			author: {
 				name: 'John',
 				email: 'foo@localhost',
-				posts: [
-					{
-						publishedAt: '2021-01-01T00:00:00Z',
-					},
-					{
-						publishedAt: '2021-01-02T00:00:00Z',
-					},
-				],
+				posts: {
+					edges: [
+						{ node: { publishedAt: '2021-01-01T00:00:00Z' } },
+						{ node: { publishedAt: '2021-01-02T00:00:00Z' } },
+					],
+				},
 			},
 		})
 		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: {
@@ -325,9 +321,9 @@ describe('queries', () => {
 			},
 		})
 		expect(calls).toHaveLength(1)
+		expect(calls).toMatchSnapshot()
 	})
 
-
 	test('nested has-one transform', async () => {
 		const [client, calls] = createClient({
 			post: {
@@ -338,19 +334,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: {
@@ -362,9 +358,9 @@ describe('queries', () => {
 				},
 			},
 		})
+		expect(calls).toMatchSnapshot()
 	})
 
-
 	test('nested has-many-by transform', async () => {
 		const [client, calls] = createClient({
 			post: {
@@ -375,13 +371,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: {
@@ -392,6 +389,7 @@ describe('queries', () => {
 				},
 			},
 		})
+		expect(calls).toMatchSnapshot()
 	})
 
 	test('multiple transforms', async () => {
@@ -399,32 +397,31 @@ describe('queries', () => {
 			author: {
 				name: 'John',
 				email: 'foo@localhost',
-				posts: [
-					{
-						publishedAt: '2021-01-01T00:00:00Z',
-					},
-					{
-						publishedAt: '2021-01-02T00:00:00Z',
-					},
-				],
+				posts: {
+					edges: [
+						{ node: { publishedAt: '2021-01-01T00:00:00Z' } },
+						{ node: { publishedAt: '2021-01-02T00:00:00Z' } },
+					],
+				},
 			},
 		})
 		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: {
@@ -447,4 +444,28 @@ describe('queries', () => {
 		expect(calls).toHaveLength(1)
 	})
 
+	test('omit', async () => {
+		const [client, calls] = createClient({
+			authors: [
+				{
+					id: '1',
+					name: 'John',
+				},
+			],
+		})
+		const result = await client.query({
+			authors: qb.list('Author', {}, it => it.$$().omit('email').$('posts', {}, it => it.$$()).omit('posts')),
+		})
+		expect(result).toStrictEqual({
+			authors: [
+				{
+					id: '1',
+					name: 'John',
+				},
+			],
+		})
+		expect(calls).toHaveLength(1)
+		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(
@@ -142,4 +140,10 @@ describe('ts types', () => {
 			)
 		}).toThrow('Field Post.lorem does not exist.')
 	})
+
+	test('omit', async () => {
+		const fragment = qb.fragment('Post', it => it.$$().omit('publishedAt'))
+		type fragmentType = FragmentType<typeof fragment>
+		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
 }