@contember/engine-content-api 2.1.0-beta.1 → 2.2.0-alpha.1

package/tests/cases/integration/graphQlRequests/insert/validation/toBeFixed.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'bun:test'
-import { execute, sqlTransaction } from '../../../../../src/test'
-import { GQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { execute, sqlTransaction } from '../../../../../src/test.js'
+import { GQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 import { Model, Validation } from '@contember/schema'
 import { InputValidation as v, SchemaBuilder } from '@contember/schema-definition'
 

package/tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.ts

@@ -1,9 +1,9 @@
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Acl } from '@contember/schema'
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { execute } from '../../../../../src/test.js'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 const schema = new SchemaBuilder().entity('Author', e => e.column('username')).buildSchema()
 

package/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.ts

@@ -1,9 +1,9 @@
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Acl, Model } from '@contember/schema'
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { execute } from '../../../../../src/test.js'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 const schema = new SchemaBuilder()
 	.enum('locale', ['cs', 'en'])

package/tests/cases/integration/graphQlRequests/query/acl/isNullAcl.test.ts

@@ -1,9 +1,9 @@
 import { AclDefinition as acl, createSchema, SchemaDefinition as def } from '@contember/schema-definition'
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
-import { GQL, SQL } from '../../../../../src/tags'
-import { PermissionFactory } from '../../../../../../src'
-import { testUuid } from '../../../../../src/testUuid'
+import { execute } from '../../../../../src/test.js'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { PermissionFactory } from '../../../../../../src/index.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 namespace RowPredicateSubset {
 	export const ownerRole = acl.createRole('owner')

package/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.ts

@@ -1,9 +1,9 @@
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Acl, Model } from '@contember/schema'
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { execute } from '../../../../../src/test.js'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 const schema = new SchemaBuilder()
 	.enum('locale', ['cs', 'en'])

package/tests/cases/integration/graphQlRequests/query/acl/orPredicate.test.ts

@@ -1,9 +1,9 @@
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Acl } from '@contember/schema'
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { execute } from '../../../../../src/test.js'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 const schema = new SchemaBuilder()
 	.entity('Author', e => e.column('firstName').column('lastName').column('username'))

package/tests/cases/integration/graphQlRequests/query/acl/predicateElimination.test.ts

@@ -1,10 +1,10 @@
 import { c, createSchema, SchemaDefinition as def } from '@contember/schema-definition'
 import { Acl } from '@contember/schema'
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
-import { PermissionFactory } from '../../../../../../src'
+import { execute } from '../../../../../src/test.js'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
+import { PermissionFactory } from '../../../../../../src/index.js'
 
 namespace TestModel {
 	export class Author {

package/tests/cases/integration/graphQlRequests/query/acl/relationAcl.test.ts

@@ -1,9 +1,9 @@
 import { c, createSchema } from '@contember/schema-definition'
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
-import { GQL, SQL } from '../../../../../src/tags'
-import { PermissionFactory } from '../../../../../../src'
-import { testUuid } from '../../../../../src/testUuid'
+import { execute } from '../../../../../src/test.js'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { PermissionFactory } from '../../../../../../src/index.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 namespace RelationAclManyHasOne {
 	export const readerRole = c.createRole('reader')

package/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.ts

@@ -1,10 +1,10 @@
 import { AclDefinition as acl, createSchema, SchemaDefinition as def } from '@contember/schema-definition'
 import { Acl } from '@contember/schema'
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
-import { PermissionFactory } from '../../../../../../src'
+import { execute } from '../../../../../src/test.js'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
+import { PermissionFactory } from '../../../../../../src/index.js'
 
 namespace RowPredicateSubset {
 	export const readerRole = acl.createRole('reader')

package/tests/cases/integration/graphQlRequests/query/acl/sameRowAndFieldPredicate.test.ts

@@ -1,9 +1,9 @@
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Acl } from '@contember/schema'
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { execute } from '../../../../../src/test.js'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 const schema = new SchemaBuilder().entity('Author', e => e.column('username')).buildSchema()
 

package/tests/cases/integration/graphQlRequests/query/filter/backReferencedFilter.test.ts

@@ -1,8 +1,8 @@
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
+import { execute } from '../../../../../src/test.js'
 import { SchemaBuilder } from '@contember/schema-definition'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 test('Categories with children filtered by back-referenced parent', async () => {
 	await execute({

package/tests/cases/integration/graphQlRequests/query/filter/complexCondition.test.ts

@@ -1,9 +1,9 @@
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
+import { execute } from '../../../../../src/test.js'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 test('Complex condition', async () => {
 	await execute({

package/tests/cases/integration/graphQlRequests/query/filter/composedFilter.test.ts

@@ -1,9 +1,9 @@
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
+import { execute } from '../../../../../src/test.js'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 test('Composed filter with nulls', async () => {
 	await execute({

package/tests/cases/integration/graphQlRequests/query/filter/containsQuery.test.ts

@@ -1,9 +1,9 @@
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
+import { execute } from '../../../../../src/test.js'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 test('Post title contains', async () => {
 	await execute({

package/tests/cases/integration/graphQlRequests/query/filter/manyHasManyOwnerRelation.test.ts

@@ -1,9 +1,9 @@
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
+import { execute } from '../../../../../src/test.js'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 test('Post by category name (where many has many owning)', async () => {
 	await execute({

package/tests/cases/integration/graphQlRequests/query/filter/manyHasOneRelation.test.ts

@@ -1,9 +1,9 @@
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
+import { execute } from '../../../../../src/test.js'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 test('Post by author name (where many has one)', async () => {
 	await execute({

package/tests/cases/integration/graphQlRequests/query/filter/numericFilter.test.ts

@@ -0,0 +1,92 @@
+import { test } from 'bun:test'
+import { execute } from '../../../../../src/test.js'
+import { createSchema, SchemaDefinition as def } from '@contember/schema-definition'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
+
+namespace NumericFilterModel {
+	export class Product {
+		price = def.numericColumn(20, 9)
+	}
+}
+
+const schema = createSchema(NumericFilterModel).model
+
+test('Numeric column "in" filter renders an IN list', async () => {
+	await execute({
+		schema,
+		query: GQL`
+        query {
+          listProduct(filter: {price: {in: ["100.5", "200.25"]}}) {
+            price
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."price"::text as "root_price", "root_"."id" as "root_id"
+                     from "public"."product" as "root_"
+                     where "root_"."price" in (?, ?)`,
+				parameters: ['100.5', '200.25'],
+				response: { rows: [{ root_id: testUuid(1), root_price: '100.500000000' }] },
+			},
+		],
+		return: {
+			data: {
+				listProduct: [{ price: '100.500000000' }],
+			},
+		},
+	})
+})
+
+test('Numeric column "notIn" filter renders a negated IN list', async () => {
+	await execute({
+		schema,
+		query: GQL`
+        query {
+          listProduct(filter: {price: {notIn: ["100.5", "200.25"]}}) {
+            price
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."price"::text as "root_price", "root_"."id" as "root_id"
+                     from "public"."product" as "root_"
+                     where not("root_"."price" in (?, ?))`,
+				parameters: ['100.5', '200.25'],
+				response: { rows: [{ root_id: testUuid(1), root_price: '1.000000000' }] },
+			},
+		],
+		return: {
+			data: {
+				listProduct: [{ price: '1.000000000' }],
+			},
+		},
+	})
+})
+
+test('Numeric column "in" filter with >100 values uses the any(?::numeric(p,s)[]) fast path', async () => {
+	const values = Array.from({ length: 101 }, (_, i) => String(i))
+	await execute({
+		schema,
+		query: GQL`
+        query {
+          listProduct(filter: {price: {in: ${JSON.stringify(values)}}}) {
+            price
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."price"::text as "root_price", "root_"."id" as "root_id"
+                     from "public"."product" as "root_"
+                     where "root_"."price" = any(?::numeric(20, 9)[])`,
+				parameters: [values],
+				response: { rows: [{ root_id: testUuid(1), root_price: '1.000000000' }] },
+			},
+		],
+		return: {
+			data: {
+				listProduct: [{ price: '1.000000000' }],
+			},
+		},
+	})
+})

package/tests/cases/integration/graphQlRequests/query/filter/oneHasManyRelation.test.ts

@@ -1,9 +1,9 @@
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
+import { execute } from '../../../../../src/test.js'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
 
 test('Author by post title (where one has many)', async () => {
 	await execute({

package/tests/cases/integration/graphQlRequests/query/filter/similarQuery.test.ts

@@ -0,0 +1,72 @@
+import { test } from 'bun:test'
+import { execute } from '../../../../../src/test.js'
+import { SchemaBuilder } from '@contember/schema-definition'
+import { Model } from '@contember/schema'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
+
+test('Post title similar', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.column('title', column => column.type(Model.ColumnType.String)))
+			.buildSchema(),
+		query: GQL`
+        query {
+          listPost(filter: {title: {similar: "Hello"}}) {
+            id
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`
+							select "root_"."id" as "root_id"
+							from "public"."post" as "root_"
+							where "root_"."title" % ?`,
+				response: { rows: [{ root_id: testUuid(1) }] },
+				parameters: ['Hello'],
+			},
+		],
+		return: {
+			data: {
+				listPost: [
+					{
+						id: testUuid(1),
+					},
+				],
+			},
+		},
+	})
+})
+
+test('Post title wordSimilar', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.column('title', column => column.type(Model.ColumnType.String)))
+			.buildSchema(),
+		query: GQL`
+        query {
+          listPost(filter: {title: {wordSimilar: "Helo"}}) {
+            id
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`
+							select "root_"."id" as "root_id"
+							from "public"."post" as "root_"
+							where ? <% "root_"."title"`,
+				response: { rows: [{ root_id: testUuid(1) }] },
+				parameters: ['Helo'],
+			},
+		],
+		return: {
+			data: {
+				listPost: [
+					{
+						id: testUuid(1),
+					},
+				],
+			},
+		},
+	})
+})

package/tests/cases/integration/graphQlRequests/query/formatting/dateFormat.test.ts

@@ -1,9 +1,140 @@
 import { test } from 'bun:test'
-import { execute } from '../../../../../src/test'
-import { SchemaBuilder } from '@contember/schema-definition'
+import { execute } from '../../../../../src/test.js'
+import { SchemaBuilder, SchemaDefinition } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
-import { GQL, SQL } from '../../../../../src/tags'
-import { testUuid } from '../../../../../src/testUuid'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
+
+namespace DateTimeListModel {
+	export class Post {
+		publishedAt = SchemaDefinition.dateTimeColumn().list()
+	}
+}
+
+test('Format dateTime query with fullDateTimeResponse (legacy format, default)', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.column('publishedAt', column => column.type(Model.ColumnType.DateTime)))
+			.buildSchema(),
+		settings: { content: { fullDateTimeResponse: true } },
+		query: GQL`
+        query {
+          getPost(by: {id: "${testUuid(1)}"}) {
+            publishedAt
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."published_at"::text as "root_publishedAt", "root_"."id" as "root_id"
+                     from "public"."post" as "root_"
+                     where "root_"."id" = ?`,
+				response: { rows: [{ root_id: testUuid(1), root_publishedAt: '2019-11-01 05:00:00.000000+00' }] },
+				parameters: [testUuid(1)],
+			},
+		],
+		return: {
+			data: {
+				getPost: {
+					publishedAt: '2019-11-01 05:00:00.000000+00',
+				},
+			},
+		},
+	})
+})
+
+test('Format dateTime query with fullDateTimeResponse (iso8601 format)', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.column('publishedAt', column => column.type(Model.ColumnType.DateTime)))
+			.buildSchema(),
+		settings: { content: { fullDateTimeResponse: true, dateTimeResponseFormat: 'iso8601' } },
+		query: GQL`
+        query {
+          getPost(by: {id: "${testUuid(1)}"}) {
+            publishedAt
+          }
+        }`,
+		executes: [
+			{
+				sql:
+					SQL`select to_char("root_"."published_at" AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"') as "root_publishedAt", "root_"."id" as "root_id"
+                     from "public"."post" as "root_"
+                     where "root_"."id" = ?`,
+				response: { rows: [{ root_id: testUuid(1), root_publishedAt: '2019-11-01T05:00:00.000000Z' }] },
+				parameters: [testUuid(1)],
+			},
+		],
+		return: {
+			data: {
+				getPost: {
+					publishedAt: '2019-11-01T05:00:00.000000Z',
+				},
+			},
+		},
+	})
+})
+
+test('Format dateTime query with fullDateTimeResponse (iso8601, null value)', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.column('publishedAt', column => column.type(Model.ColumnType.DateTime)))
+			.buildSchema(),
+		settings: { content: { fullDateTimeResponse: true, dateTimeResponseFormat: 'iso8601' } },
+		query: GQL`
+        query {
+          getPost(by: {id: "${testUuid(1)}"}) {
+            publishedAt
+          }
+        }`,
+		executes: [
+			{
+				sql:
+					SQL`select to_char("root_"."published_at" AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"') as "root_publishedAt", "root_"."id" as "root_id"
+                     from "public"."post" as "root_"
+                     where "root_"."id" = ?`,
+				response: { rows: [{ root_id: testUuid(1), root_publishedAt: null }] },
+				parameters: [testUuid(1)],
+			},
+		],
+		return: {
+			data: {
+				getPost: {
+					publishedAt: null,
+				},
+			},
+		},
+	})
+})
+
+test('Format dateTime[] query with fullDateTimeResponse (iso8601 list)', async () => {
+	await execute({
+		schema: SchemaDefinition.createModel(DateTimeListModel),
+		settings: { content: { fullDateTimeResponse: true, dateTimeResponseFormat: 'iso8601' } },
+		query: GQL`
+        query {
+          getPost(by: {id: "${testUuid(1)}"}) {
+            publishedAt
+          }
+        }`,
+		executes: [
+			{
+				sql:
+					SQL`select (select array_agg(to_char(elem AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"') order by ord) from unnest("root_"."published_at") with ordinality as t(elem, ord)) as "root_publishedAt", "root_"."id" as "root_id"
+                     from "public"."post" as "root_"
+                     where "root_"."id" = ?`,
+				response: { rows: [{ root_id: testUuid(1), root_publishedAt: ['2019-11-01T05:00:00.000000Z', '2020-01-15T08:30:00.000000Z'] }] },
+				parameters: [testUuid(1)],
+			},
+		],
+		return: {
+			data: {
+				getPost: {
+					publishedAt: ['2019-11-01T05:00:00.000000Z', '2020-01-15T08:30:00.000000Z'],
+				},
+			},
+		},
+	})
+})
 
 test('Format date query', async () => {
 	await execute({

package/tests/cases/integration/graphQlRequests/query/formatting/numericFormat.test.ts

@@ -0,0 +1,68 @@
+import { test } from 'bun:test'
+import { execute } from '../../../../../src/test.js'
+import { SchemaBuilder } from '@contember/schema-definition'
+import { Model } from '@contember/schema'
+import { GQL, SQL } from '../../../../../src/tags.js'
+import { testUuid } from '../../../../../src/testUuid.js'
+
+test('Numeric column is selected as text (string transport)', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Product', entity => entity.column('price', column => column.type(Model.ColumnType.Numeric)))
+			.buildSchema(),
+		query: GQL`
+        query {
+          getProduct(by: {id: "${testUuid(1)}"}) {
+            price
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."price"::text as "root_price", "root_"."id" as "root_id"
+                     from "public"."product" as "root_"
+                     where "root_"."id" = ?`,
+				response: { rows: [{ root_id: testUuid(1), root_price: '123.450000000' }] },
+				parameters: [testUuid(1)],
+			},
+		],
+		return: {
+			data: {
+				getProduct: {
+					price: '123.450000000',
+				},
+			},
+		},
+	})
+})
+
+test('Numeric column can be filtered as a number', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Product', entity => entity.column('price', column => column.type(Model.ColumnType.Numeric)))
+			.buildSchema(),
+		query: GQL`
+        query {
+          listProduct(filter: {price: {gt: "100.5"}}) {
+            price
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."price"::text as "root_price", "root_"."id" as "root_id"
+                     from "public"."product" as "root_"
+                     where "root_"."price" > ?`,
+				response: { rows: [{ root_id: testUuid(1), root_price: '123.450000000' }] },
+				parameters: ['100.5'],
+			},
+		],
+		return: {
+			data: {
+				listProduct: [
+					{
+						price: '123.450000000',
+					},
+				],
+			},
+		},
+	})
+})