@contember/binding-common 2.0.0-alpha.19 → 2.0.0-alpha.21

package/src/queryLanguage/Parser.ts

@@ -1,4 +1,4 @@
-import { GraphQlBuilder, Input, Writable } from '@contember/client'
+import { Input, Writable } from '@contember/client'
 import { EmbeddedActionsParser, Lexer } from 'chevrotain'
 import { Environment } from '../environment'
 import type { EntityName, FieldName, Filter, OrderBy, UniqueWhere } from '../treeParameters'
@@ -303,7 +303,7 @@ class Parser extends EmbeddedActionsParser {
 				ALT: () => {
 					const variable = this.SUBRULE(this.variable)
 					return this.ACTION(() => {
-						if (typeof variable !== 'object' || variable instanceof GraphQlBuilder.GraphQlLiteral) {
+						if (typeof variable !== 'object') {
 							throw new QueryLanguageError(`Invalid filter value '${JSON.stringify(variable)}'`)
 						}
 						return variable
@@ -479,7 +479,7 @@ class Parser extends EmbeddedActionsParser {
 					},
 				})
 				this.CONSUME(tokens.Equals)
-				const primaryValue = this.SUBRULE<Input.PrimaryValue<GraphQlBuilder.GraphQlLiteral>>(this.primaryValue)
+				const primaryValue = this.SUBRULE<Input.PrimaryValue>(this.primaryValue)
 
 				this.ACTION(() => {
 					let nestedWhere = where
@@ -498,7 +498,7 @@ class Parser extends EmbeddedActionsParser {
 							if (nestedField in nestedWhere) {
 								const existingWhere = nestedWhere[nestedField]
 
-								if (typeof existingWhere === 'object' && !(existingWhere instanceof GraphQlBuilder.GraphQlLiteral)) {
+								if (typeof existingWhere === 'object') {
 									nestedWhere = existingWhere
 								} else {
 									throw new QueryLanguageError(
@@ -637,7 +637,7 @@ class Parser extends EmbeddedActionsParser {
 		])
 	})
 
-	private primaryValue = this.RULE<Input.PrimaryValue<GraphQlBuilder.GraphQlLiteral>>('primaryValue', () => {
+	private primaryValue = this.RULE<Input.PrimaryValue>('primaryValue', () => {
 		return this.OR([
 			{
 				ALT: () => this.SUBRULE(this.string),
@@ -654,8 +654,7 @@ class Parser extends EmbeddedActionsParser {
 					return this.ACTION(() => {
 						if (
 							typeof variableValue === 'string' ||
-							typeof variableValue === 'number' ||
-							variableValue instanceof GraphQlBuilder.GraphQlLiteral
+							typeof variableValue === 'number'
 						) {
 							return variableValue
 						}
@@ -772,8 +771,7 @@ class Parser extends EmbeddedActionsParser {
 			}
 
 			if (Parser.environment.hasVariable(variableName)) {
-				const value = Parser.environment.getVariable(variableName)
-				return value instanceof GraphQlBuilder.GraphQlLiteral ? value.value : value
+				return Parser.environment.getVariable(variableName)
 			}
 			if (Parser.environment.hasParameter(variableName)) {
 				return Parser.environment.getParameter(variableName)
@@ -882,7 +880,7 @@ namespace Parser {
 	export namespace AST {
 		export type FieldWhere = Input.FieldWhere<Condition>
 
-		export type ColumnValue = Input.ColumnValue<GraphQlBuilder.GraphQlLiteral>
+		export type ColumnValue = Input.ColumnValue
 
 		export type Condition = Input.Condition<ColumnValue>
 

package/src/queryLanguage/QueryLanguage.ts

@@ -43,7 +43,6 @@ import {
 	UnsugarableSingleEntityEventListeners,
 } from '../treeParameters'
 import { Parser } from './Parser'
-import { GraphQlLiteral } from '@contember/client'
 import { ParsedHasManyRelation, ParsedHasOneRelation } from './ParserResults'
 import { TokenRegExps } from './tokenList'
 import { TreeParameterMerger } from '../treeParameters/TreeParameterMerger'
@@ -544,7 +543,6 @@ export class QueryLanguage {
 	public static desugarQualifiedSingleEntity(
 		{ entity, ...unsugarableSingleEntity }: SugaredQualifiedSingleEntity,
 		environment: Environment,
-		options: { missingSetOnCreate?: 'fill' | 'fillAndWarn' } = {},
 	): QualifiedSingleEntity {
 		let entityName: EntityName
 		let where: UniqueWhere
@@ -582,16 +580,6 @@ export class QueryLanguage {
 				? this.desugarSetOnCreate(unsugarableSingleEntity.setOnCreate, environment)
 				: undefined
 
-		// todo: remove deprecated code
-		if (!setOnCreate && options.missingSetOnCreate) {
-			const whereValues = Object.values(where)
-			if (whereValues.length === 1 && whereValues[0] instanceof GraphQlLiteral) {
-				setOnCreate = where
-				if (import.meta.env.DEV && options.missingSetOnCreate === 'fillAndWarn') {
-					console.warn('Automatic creation of singleton entities in EditPage is deprecated. Please use setOnCreate prop.')
-				}
-			}
-		}
 
 		const isNonbearing: boolean =
 			unsugarableSingleEntity.isNonbearing !== undefined

package/src/treeParameters/TreeParameterMerger.ts

@@ -1,4 +1,4 @@
-import { GraphQlBuilder, Writable } from '@contember/client'
+import { Writable } from '@contember/client'
 import type {
 	Alias,
 	EntityEventListenerStore,
@@ -197,23 +197,8 @@ export class TreeParameterMerger {
 			if (field in originalCopy) {
 				const fromOriginal = originalCopy[field]
 				const fromFresh = fresh[field]
-
-				if (fromOriginal instanceof GraphQlBuilder.GraphQlLiteral) {
-					if (fromFresh instanceof GraphQlBuilder.GraphQlLiteral) {
-						if (fromOriginal.value === fromFresh.value) {
-							// Good, do nothing.
-							continue
-						} else {
-							throw new BindingError() // TODO msg
-						}
-					} else {
-						throw new BindingError() // TODO msg
-					}
-				}
 				if (typeof fromOriginal === 'object') {
-					if (fromFresh instanceof GraphQlBuilder.GraphQlLiteral) {
-						throw new BindingError() // TODO msg
-					} else if (typeof fromFresh === 'object') {
+					if (typeof fromFresh === 'object') {
 						const merged = this.mergeSetOnCreate(fromOriginal, fromFresh)
 						if (merged !== undefined) {
 							originalCopy[field] = merged

package/src/treeParameters/helpers/wrapFilterInHasOnes.ts

@@ -1,5 +1,5 @@
-import { whereToFilter } from '@contember/client'
 import type { Filter, HasOneRelation } from '../../treeParameters'
+import { whereToFilter } from '../../utils/whereToFilter'
 
 export const wrapFilterInHasOnes = (path: HasOneRelation[], filter: Filter): Filter => {
 	for (let i = path.length - 1; i >= 0; i--) {

package/src/treeParameters/primitives/Filter.ts

@@ -1,6 +1,6 @@
-import type { GraphQlLiteral, Input } from '@contember/client'
+import type { Input } from '@contember/client'
 
-export type Filter<T = GraphQlLiteral> = Input.Where<Input.Condition<Input.ColumnValue<T>>>
+export type Filter<T = never> = Input.Where<Input.Condition<Input.ColumnValue<T>>>
 
 // E.g. [author.son.age < 123]
 // It is *always* enclosed within square brackets.

package/src/treeParameters/primitives/OrderBy.ts

@@ -1,6 +1,6 @@
-import type { CrudQueryBuilder, Input } from '@contember/client'
+import type { Input } from '@contember/client'
 
-export type OrderBy = Input.OrderBy<CrudQueryBuilder.OrderDirection>[]
+export type OrderBy = Input.OrderBy<`${Input.OrderDirection}`>[]
 
 // E.g. items.order asc, items.content.name asc
 export type SugaredOrderBy = OrderBy | string

package/src/treeParameters/primitives/UniqueWhere.ts

@@ -1,6 +1,6 @@
-import type { GraphQlBuilder, Input } from '@contember/client'
+import type { Input } from '@contember/client'
 
-export type UniqueWhere<T = GraphQlBuilder.GraphQlLiteral> = Input.UniqueWhere<T>
+export type UniqueWhere<T = never> = Input.UniqueWhere<T>
 
 // E.g. (author.mother.id = 123)
 // It is *always* enclosed within parentheses

package/src/types/BindingOperations.ts

@@ -1,4 +1,3 @@
-import type { TreeFilter } from '@contember/client'
 import type { AsyncBatchUpdatesOptions } from './AsyncBatchUpdatesOptions'
 import type { BatchUpdatesOptions } from './BatchUpdatesOptions'
 import type { ExtendTree } from './ExtendTree'
@@ -16,8 +15,6 @@ export type BatchDeferredUpdates = (performUpdates: (bindingOperations: BatchUpd
 
 export interface BindingOperations<Node> extends AsyncBatchUpdatesOptions {
 	// addEventListener: ...
-	getTreeFilters: () => TreeFilter[]
-
 	extendTree: ExtendTree<Node>
 	fetchData: FetchData<Node>
 	batchDeferredUpdates: BatchDeferredUpdates

package/src/utils/whereToFilter.ts

@@ -0,0 +1,18 @@
+import type { Input, Writable } from '@contember/client'
+
+export const whereToFilter = (
+	by: Input.UniqueWhere,
+): Input.Where<Input.Condition<Input.ColumnValue>> => {
+	const where: Writable<Input.Where<Input.Condition<Input.ColumnValue>>> = {}
+	for (const key in by) {
+		const value = by[key]
+
+		if (typeof value === 'string' || typeof value === 'number') {
+			where[key] = { eq: value }
+		} else {
+			where[key] = whereToFilter(value)
+		}
+	}
+
+	return where
+}

package/tests/cases/unit/queryLanguage/general.spec.tsx

@@ -1,5 +1,4 @@
 import { expect, it, describe } from 'vitest'
-import { GraphQlBuilder } from '@contember/client'
 import { Environment } from '../../../../src/environment'
 import { Parser } from '../../../../src/queryLanguage'
 
@@ -26,8 +25,8 @@ describe('query language parser', () => {
 			ab: 456,
 			a: 123,
 			x: 'x',
-			lit: new GraphQlBuilder.GraphQlLiteral('lit'),
-			literal: new GraphQlBuilder.GraphQlLiteral('literal'),
+			lit: 'lit',
+			literal: 'literal',
 		})
 		expect(
 			Parser.parseQueryLanguageExpression(

package/tests/cases/unit/queryLanguage/orderBy.spec.tsx

@@ -1,5 +1,4 @@
 import { expect, it, describe } from 'vitest'
-import { GraphQlBuilder } from '@contember/client'
 import { Environment } from '../../../../src/environment'
 import { Parser } from '../../../../src/queryLanguage'
 

package/tests/cases/unit/queryLanguage/singleRelativeField.spec.tsx

@@ -1,5 +1,4 @@
 import { expect, it, describe } from 'vitest'
-import { GraphQlLiteral } from '@contember/client'
 import { Environment } from '../../../../src/environment'
 import { Parser } from '../../../../src/queryLanguage'
 

package/tests/cases/unit/whereToFilter.ts

@@ -0,0 +1,24 @@
+import { expect, it, describe } from 'vitest'
+import { whereToFilter } from '../../../src'
+
+describe('whereToFilter', () => {
+	it('complex by', () => {
+		expect(
+			whereToFilter({
+				foo: {
+					bar: {
+						baz: '123',
+						xyz: 456,
+					},
+				},
+			}),
+		).toEqual({
+			foo: {
+				bar: {
+					baz: { eq: '123' },
+					xyz: { eq: 456 },
+				},
+			},
+		})
+	})
+})