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

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
 }
 

package/tests/client/names.ts

@@ -1,117 +1,129 @@
-import { SchemaNames } from '@contember/client-content'
-export const ContemberClientNames: SchemaNames = {
-  "entities": {
-    "Locale": {
-      "name": "Locale",
-      "fields": {
-        "id": {
-          "type": "column"
-        },
-        "code": {
-          "type": "column"
-        }
-      },
-      "scalars": [
-        "id",
-        "code"
-      ]
-    },
-    "Author": {
-      "name": "Author",
-      "fields": {
-        "id": {
-          "type": "column"
-        },
-        "name": {
-          "type": "column"
-        },
-        "email": {
-          "type": "column"
-        },
-        "posts": {
-          "type": "many",
-          "entity": "Post"
-        }
-      },
-      "scalars": [
-        "id",
-        "name",
-        "email"
-      ]
-    },
-    "Post": {
-      "name": "Post",
-      "fields": {
-        "id": {
-          "type": "column"
-        },
-        "publishedAt": {
-          "type": "column"
-        },
-        "tags": {
-          "type": "many",
-          "entity": "Tag"
-        },
-        "author": {
-          "type": "one",
-          "entity": "Author"
-        },
-        "locales": {
-          "type": "many",
-          "entity": "PostLocale"
-        }
-      },
-      "scalars": [
-        "id",
-        "publishedAt"
-      ]
-    },
-    "PostLocale": {
-      "name": "PostLocale",
-      "fields": {
-        "id": {
-          "type": "column"
-        },
-        "locale": {
-          "type": "one",
-          "entity": "Locale"
-        },
-        "title": {
-          "type": "column"
-        },
-        "content": {
-          "type": "column"
-        },
-        "post": {
-          "type": "one",
-          "entity": "Post"
-        }
-      },
-      "scalars": [
-        "id",
-        "title",
-        "content"
-      ]
-    },
-    "Tag": {
-      "name": "Tag",
-      "fields": {
-        "id": {
-          "type": "column"
-        },
-        "name": {
-          "type": "column"
-        },
-        "posts": {
-          "type": "many",
-          "entity": "Post"
-        }
-      },
-      "scalars": [
-        "id",
-        "name"
-      ]
-    }
-  },
-  "enums": {}
-}
+import type { SchemaNames, SchemaEntityNames } from '@contember/client-content'
+import type { ContemberClientEntities } from './entities'
+import type { ContemberClientEnums } from './enums'
+export const ContemberClientNames = {
+	entities: {
+		"Locale": {
+			"name": "Locale",
+			"fields": {
+				"id": {
+					"type": "column"
+				},
+				"code": {
+					"type": "column"
+				}
+			},
+			"scalars": [
+				"id",
+				"code"
+			]
+		},
+		"Author": {
+			"name": "Author",
+			"fields": {
+				"id": {
+					"type": "column"
+				},
+				"name": {
+					"type": "column"
+				},
+				"email": {
+					"type": "column"
+				},
+				"posts": {
+					"type": "many",
+					"entity": "Post"
+				}
+			},
+			"scalars": [
+				"id",
+				"name",
+				"email"
+			]
+		},
+		"Post": {
+			"name": "Post",
+			"fields": {
+				"id": {
+					"type": "column"
+				},
+				"publishedAt": {
+					"type": "column"
+				},
+				"tags": {
+					"type": "many",
+					"entity": "Tag"
+				},
+				"author": {
+					"type": "one",
+					"entity": "Author"
+				},
+				"locales": {
+					"type": "many",
+					"entity": "PostLocale"
+				},
+				"status": {
+					"type": "column"
+				}
+			},
+			"scalars": [
+				"id",
+				"publishedAt",
+				"status"
+			]
+		},
+		"PostLocale": {
+			"name": "PostLocale",
+			"fields": {
+				"id": {
+					"type": "column"
+				},
+				"locale": {
+					"type": "one",
+					"entity": "Locale"
+				},
+				"title": {
+					"type": "column"
+				},
+				"content": {
+					"type": "column"
+				},
+				"post": {
+					"type": "one",
+					"entity": "Post"
+				}
+			},
+			"scalars": [
+				"id",
+				"title",
+				"content"
+			]
+		},
+		"Tag": {
+			"name": "Tag",
+			"fields": {
+				"id": {
+					"type": "column"
+				},
+				"name": {
+					"type": "column"
+				},
+				"posts": {
+					"type": "many",
+					"entity": "Post"
+				}
+			},
+			"scalars": [
+				"id",
+				"name"
+			]
+		}
+	} satisfies {[K in keyof ContemberClientEntities]: SchemaEntityNames<K>},
+	enums: {
+		"PostStatus": [
+			"draft",
+			"published",
+			"archived"
+		]
+	} satisfies {[K in keyof ContemberClientEnums]: readonly ContemberClientEnums[K][]},
+} satisfies SchemaNames

package/tests/generate.ts

@@ -10,4 +10,3 @@ await fs.mkdir(dir, { recursive: true })
 for (const [name, content] of Object.entries(result)) {
 	await fs.writeFile(join(dir, name), content, 'utf8')
 }
-

package/tests/lib.ts

@@ -13,4 +13,3 @@ export const createClient = (result?: any) => {
 	})
 	return [client, calls] as const
 }
-

package/tests/schema.ts

@@ -5,7 +5,6 @@ namespace Schema {
 		code = c.stringColumn().unique().notNull()
 	}
 
-
 	export class Author {
 		name = c.stringColumn()
 		email = c.stringColumn()
@@ -17,6 +16,7 @@ namespace Schema {
 		tags = c.manyHasMany(Tag, 'posts')
 		author = c.manyHasOne(Author, 'posts')
 		locales = c.oneHasMany(PostLocale, 'post')
+		status = c.enumColumn(c.createEnum('draft', 'published', 'archived'))
 	}
 
 	@c.Unique('locale', 'post')
@@ -33,5 +33,4 @@ namespace Schema {
 	}
 }
 
-
 export const schema = createSchema(Schema)

package/dist/development/index.cjs

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const ContentClient = require("./src/ContentClient.cjs");
-const ContentQueryBuilder = require("./src/ContentQueryBuilder.cjs");
-const mutationFragments = require("./src/utils/mutationFragments.cjs");
-const ContentEntitySelection = require("./src/nodes/ContentEntitySelection.cjs");
-const ContentOperation = require("./src/nodes/ContentOperation.cjs");
-exports.ContentClient = ContentClient.ContentClient;
-exports.ContentQueryBuilder = ContentQueryBuilder.ContentQueryBuilder;
-exports.mutationFragments = mutationFragments.mutationFragments;
-exports.ContentEntitySelection = ContentEntitySelection.ContentEntitySelection;
-exports.ContentOperation = ContentOperation.ContentOperation;
-//# sourceMappingURL=index.cjs.map

package/dist/development/index.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;"}

package/dist/development/index.js

@@ -1,13 +0,0 @@
-import { ContentClient } from "./src/ContentClient.js";
-import { ContentQueryBuilder } from "./src/ContentQueryBuilder.js";
-import { mutationFragments } from "./src/utils/mutationFragments.js";
-import { ContentEntitySelection } from "./src/nodes/ContentEntitySelection.js";
-import { ContentOperation } from "./src/nodes/ContentOperation.js";
-export {
-  ContentClient,
-  ContentEntitySelection,
-  ContentOperation,
-  ContentQueryBuilder,
-  mutationFragments
-};
-//# sourceMappingURL=index.js.map

package/dist/development/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}

package/dist/development/src/ContentClient.cjs

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const mutationFragments = require("./utils/mutationFragments.cjs");
-const graphqlBuilder = require("@contember/graphql-builder");
-const createMutationOperationSet = require("./utils/createMutationOperationSet.cjs");
-const createQueryOperationSet = require("./utils/createQueryOperationSet.cjs");
-class ContentClient {
-  constructor(client) {
-    this.client = client;
-  }
-  async query(queries, options) {
-    const printer = new graphqlBuilder.GraphQlQueryPrinter();
-    const operationSet = createQueryOperationSet.createQueryOperationSet(queries);
-    const { query, variables } = printer.printDocument("query", operationSet.selection, {});
-    const result = await this.client.execute(query, { variables, ...options });
-    return operationSet.parse(result);
-  }
-  async mutate(input, options) {
-    const operationSet = createMutationOperationSet.createMutationOperationSet(input);
-    const printer = new graphqlBuilder.GraphQlQueryPrinter();
-    const { query, variables } = printer.printDocument("mutation", operationSet.selection, mutationFragments.mutationFragments);
-    const result = await this.client.execute(query, { variables, ...options });
-    return operationSet.parse(result);
-  }
-}
-exports.ContentClient = ContentClient;
-//# sourceMappingURL=ContentClient.cjs.map

package/dist/development/src/ContentClient.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"ContentClient.cjs","sources":["../../../../packages/client-content/src/ContentClient.ts"],"sourcesContent":["import { mutationFragments } from './utils/mutationFragments'\nimport { GraphQlClient, GraphQlClientRequestOptions } from '@contember/graphql-client'\nimport { GraphQlQueryPrinter } from '@contember/graphql-builder'\nimport { ContentMutation, ContentQuery } from './nodes'\nimport { createMutationOperationSet } from './utils/createMutationOperationSet'\nimport { createQueryOperationSet } from './utils/createQueryOperationSet'\n\n\nexport type QueryExecutorOptions =\n\t& GraphQlClientRequestOptions\n\nexport class ContentClient {\n\tconstructor(\n\t\tprivate readonly client: Pick<GraphQlClient, 'execute'>,\n\t) {\n\t}\n\n\n\tpublic async query<Value>(query: ContentQuery<Value>, options?: QueryExecutorOptions): Promise<Value>\n\tpublic async query<Values extends Record<string, any>>(queries: {[K in keyof Values]: ContentQuery<Values[K]>}, options?: QueryExecutorOptions): Promise<Values>\n\tpublic async query(queries: Record<string, ContentQuery<any>> | ContentQuery<any>, options?: QueryExecutorOptions): Promise<any> {\n\t\tconst printer = new GraphQlQueryPrinter()\n\t\tconst operationSet = createQueryOperationSet(queries)\n\t\tconst { query, variables } = printer.printDocument('query', operationSet.selection, {})\n\t\tconst result = await this.client.execute(query, { variables, ...options })\n\t\treturn operationSet.parse(result)\n\t}\n\n\tpublic async mutate<Value>(mutation: ContentMutation<Value>, options?: QueryExecutorOptions,): Promise<Value>\n\tpublic async mutate<Value>(mutations: ContentMutation<Value>[], options?: QueryExecutorOptions,): Promise<Value[]>\n\tpublic async mutate<Values extends Record<string, any>>(mutations: { [K in keyof Values]: ContentMutation<Values[K]> | ContentQuery<Values[K]> }, options?: QueryExecutorOptions): Promise<Values>\n\tpublic async mutate(input: Record<string, ContentMutation<any> | ContentQuery<any>> | ContentMutation<any> | ContentMutation<any>[], options?: QueryExecutorOptions): Promise<any> {\n\t\tconst operationSet = createMutationOperationSet(input)\n\n\t\tconst printer = new GraphQlQueryPrinter()\n\t\tconst { query, variables } = printer.printDocument('mutation', operationSet.selection, mutationFragments)\n\t\tconst result = await this.client.execute(query, { variables, ...options })\n\n\t\treturn operationSet.parse(result)\n\t}\n}\n"],"names":["GraphQlQueryPrinter","createQueryOperationSet","createMutationOperationSet","mutationFragments"],"mappings":";;;;;;AAWO,MAAM,cAAc;AAAA,EAC1B,YACkB,QAChB;AADgB,SAAA,SAAA;AAAA,EAAA;AAAA,EAOlB,MAAa,MAAM,SAAgE,SAA8C;AAC1H,UAAA,UAAU,IAAIA,mCAAoB;AAClC,UAAA,eAAeC,gDAAwB,OAAO;AAC9C,UAAA,EAAE,OAAO,UAAA,IAAc,QAAQ,cAAc,SAAS,aAAa,WAAW,EAAE;AAChF,UAAA,SAAS,MAAM,KAAK,OAAO,QAAQ,OAAO,EAAE,WAAW,GAAG,SAAS;AAClE,WAAA,aAAa,MAAM,MAAM;AAAA,EAAA;AAAA,EAMjC,MAAa,OAAO,OAAiH,SAA8C;AAC5K,UAAA,eAAeC,sDAA2B,KAAK;AAE/C,UAAA,UAAU,IAAIF,mCAAoB;AAClC,UAAA,EAAE,OAAO,UAAU,IAAI,QAAQ,cAAc,YAAY,aAAa,WAAWG,mCAAiB;AAClG,UAAA,SAAS,MAAM,KAAK,OAAO,QAAQ,OAAO,EAAE,WAAW,GAAG,SAAS;AAElE,WAAA,aAAa,MAAM,MAAM;AAAA,EAAA;AAElC;;"}

package/dist/development/src/ContentClient.js

@@ -1,27 +0,0 @@
-import { mutationFragments } from "./utils/mutationFragments.js";
-import { GraphQlQueryPrinter } from "@contember/graphql-builder";
-import { createMutationOperationSet } from "./utils/createMutationOperationSet.js";
-import { createQueryOperationSet } from "./utils/createQueryOperationSet.js";
-class ContentClient {
-  constructor(client) {
-    this.client = client;
-  }
-  async query(queries, options) {
-    const printer = new GraphQlQueryPrinter();
-    const operationSet = createQueryOperationSet(queries);
-    const { query, variables } = printer.printDocument("query", operationSet.selection, {});
-    const result = await this.client.execute(query, { variables, ...options });
-    return operationSet.parse(result);
-  }
-  async mutate(input, options) {
-    const operationSet = createMutationOperationSet(input);
-    const printer = new GraphQlQueryPrinter();
-    const { query, variables } = printer.printDocument("mutation", operationSet.selection, mutationFragments);
-    const result = await this.client.execute(query, { variables, ...options });
-    return operationSet.parse(result);
-  }
-}
-export {
-  ContentClient
-};
-//# sourceMappingURL=ContentClient.js.map

package/dist/development/src/ContentClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ContentClient.js","sources":["../../../../packages/client-content/src/ContentClient.ts"],"sourcesContent":["import { mutationFragments } from './utils/mutationFragments'\nimport { GraphQlClient, GraphQlClientRequestOptions } from '@contember/graphql-client'\nimport { GraphQlQueryPrinter } from '@contember/graphql-builder'\nimport { ContentMutation, ContentQuery } from './nodes'\nimport { createMutationOperationSet } from './utils/createMutationOperationSet'\nimport { createQueryOperationSet } from './utils/createQueryOperationSet'\n\n\nexport type QueryExecutorOptions =\n\t& GraphQlClientRequestOptions\n\nexport class ContentClient {\n\tconstructor(\n\t\tprivate readonly client: Pick<GraphQlClient, 'execute'>,\n\t) {\n\t}\n\n\n\tpublic async query<Value>(query: ContentQuery<Value>, options?: QueryExecutorOptions): Promise<Value>\n\tpublic async query<Values extends Record<string, any>>(queries: {[K in keyof Values]: ContentQuery<Values[K]>}, options?: QueryExecutorOptions): Promise<Values>\n\tpublic async query(queries: Record<string, ContentQuery<any>> | ContentQuery<any>, options?: QueryExecutorOptions): Promise<any> {\n\t\tconst printer = new GraphQlQueryPrinter()\n\t\tconst operationSet = createQueryOperationSet(queries)\n\t\tconst { query, variables } = printer.printDocument('query', operationSet.selection, {})\n\t\tconst result = await this.client.execute(query, { variables, ...options })\n\t\treturn operationSet.parse(result)\n\t}\n\n\tpublic async mutate<Value>(mutation: ContentMutation<Value>, options?: QueryExecutorOptions,): Promise<Value>\n\tpublic async mutate<Value>(mutations: ContentMutation<Value>[], options?: QueryExecutorOptions,): Promise<Value[]>\n\tpublic async mutate<Values extends Record<string, any>>(mutations: { [K in keyof Values]: ContentMutation<Values[K]> | ContentQuery<Values[K]> }, options?: QueryExecutorOptions): Promise<Values>\n\tpublic async mutate(input: Record<string, ContentMutation<any> | ContentQuery<any>> | ContentMutation<any> | ContentMutation<any>[], options?: QueryExecutorOptions): Promise<any> {\n\t\tconst operationSet = createMutationOperationSet(input)\n\n\t\tconst printer = new GraphQlQueryPrinter()\n\t\tconst { query, variables } = printer.printDocument('mutation', operationSet.selection, mutationFragments)\n\t\tconst result = await this.client.execute(query, { variables, ...options })\n\n\t\treturn operationSet.parse(result)\n\t}\n}\n"],"names":[],"mappings":";;;;AAWO,MAAM,cAAc;AAAA,EAC1B,YACkB,QAChB;AADgB,SAAA,SAAA;AAAA,EAAA;AAAA,EAOlB,MAAa,MAAM,SAAgE,SAA8C;AAC1H,UAAA,UAAU,IAAI,oBAAoB;AAClC,UAAA,eAAe,wBAAwB,OAAO;AAC9C,UAAA,EAAE,OAAO,UAAA,IAAc,QAAQ,cAAc,SAAS,aAAa,WAAW,EAAE;AAChF,UAAA,SAAS,MAAM,KAAK,OAAO,QAAQ,OAAO,EAAE,WAAW,GAAG,SAAS;AAClE,WAAA,aAAa,MAAM,MAAM;AAAA,EAAA;AAAA,EAMjC,MAAa,OAAO,OAAiH,SAA8C;AAC5K,UAAA,eAAe,2BAA2B,KAAK;AAE/C,UAAA,UAAU,IAAI,oBAAoB;AAClC,UAAA,EAAE,OAAO,UAAU,IAAI,QAAQ,cAAc,YAAY,aAAa,WAAW,iBAAiB;AAClG,UAAA,SAAS,MAAM,KAAK,OAAO,QAAQ,OAAO,EAAE,WAAW,GAAG,SAAS;AAElE,WAAA,aAAa,MAAM,MAAM;AAAA,EAAA;AAElC;"}