@contember/engine-content-api 1.1.0-rc.2 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "1.1.0-rc.2",
+  "version": "1.1.1",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -10,19 +10,19 @@
     "test": "vitest --no-threads"
   },
   "dependencies": {
-    "@contember/database": "^1.1.0-rc.2",
-    "@contember/dic": "^1.1.0-rc.2",
-    "@contember/engine-common": "^1.1.0-rc.2",
-    "@contember/graphql-utils": "^1.1.0-rc.2",
-    "@contember/schema": "^1.1.0-rc.2",
-    "@contember/schema-utils": "^1.1.0-rc.2",
+    "@contember/database": "^1.1.1",
+    "@contember/dic": "^1.1.1",
+    "@contember/engine-common": "^1.1.1",
+    "@contember/graphql-utils": "^1.1.1",
+    "@contember/schema": "^1.1.1",
+    "@contember/schema-utils": "^1.1.1",
     "@graphql-tools/schema": "^8.3.5",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "^1.1.0-rc.2",
-    "@contember/engine-api-tester": "^1.1.0-rc.2",
-    "@contember/schema-definition": "^1.1.0-rc.2",
+    "@contember/database-tester": "^1.1.1",
+    "@contember/engine-api-tester": "^1.1.1",
+    "@contember/schema-definition": "^1.1.1",
     "@graphql-codegen/cli": "^1.15.2",
     "@graphql-codegen/typescript": "^1.15.2",
     "@graphql-codegen/typescript-operations": "^1.15.2",

package/src/input-validation/EntityRulesResolver.ts

@@ -35,7 +35,7 @@ export class EntityRulesResolver {
 
 	public getEntityRules(entityName: string): Validation.EntityRules {
 		const definedRules = this.validationSchema[entityName] || {}
-		const fieldsNotNullFlag = acceptEveryFieldVisitor(this.model, entityName, new NotNullFieldsVisitor())
+		const fieldsNotNullFlag = acceptEveryFieldVisitor(this.model, entityName, new RequiredFieldsVisitor())
 		const notNullFields = Object.keys(filterObject(fieldsNotNullFlag, (field, val) => val))
 		return notNullFields.reduce(
 			(entityRules, field) => ({
@@ -50,9 +50,9 @@ export class EntityRulesResolver {
 	}
 }
 
-class NotNullFieldsVisitor implements Model.RelationByTypeVisitor<boolean>, Model.ColumnVisitor<boolean> {
+class RequiredFieldsVisitor implements Model.RelationByTypeVisitor<boolean>, Model.ColumnVisitor<boolean> {
 	visitColumn(entity: Model.Entity, column: Model.AnyColumn): boolean {
-		return !column.nullable
+		return !column.nullable && typeof column.default === 'undefined' && !column.sequence
 	}
 
 	visitManyHasManyInverse(): boolean {

package/src/input-validation/preValidation/InputPreValidator.ts

@@ -105,8 +105,8 @@ export class InputPreValidator {
 				return data[column.name] as Input.ColumnValue | undefined
 			},
 			visitHasOne: (entity, relation) => {
-				const value = data[relation.name] as Input.CreateOneRelationInput | Input.UpdateOneRelationInput | undefined
-				if (value === undefined) {
+				const value = data[relation.name] as Input.CreateOneRelationInput | Input.UpdateOneRelationInput | undefined | null
+				if (value === undefined || value === null) {
 					return undefined
 				}
 				if ('disconnect' in value) {

package/src/mapper/select/ConditionBuilder.ts

@@ -10,11 +10,14 @@ export class ConditionBuilder {
 		columnType: string,
 		condition: Input.Condition<any>,
 	): SqlConditionBuilder {
-		const keys = Object.keys(condition) as (keyof Required<Input.Condition<any>>)[]
-		if (keys.length === 0) {
+		const entries = Object.entries(condition)
+			.filter(<T extends keyof Input.Condition>(it: [string, any]): it is [T, Input.Condition[T]] =>
+				it[1] !== null,
+			)
+		if (entries.length === 0) {
 			return builder
 		}
-		if (keys.length > 1) {
+		if (entries.length > 1) {
 			throw new UserError(
 				'Only single field is allowed. If you want to combine multiple conditions, use "and" or "or". Got: ' +
 					JSON.stringify(condition),
@@ -53,6 +56,6 @@ export class ConditionBuilder {
 			null: (builder, value) => value ? builder.isNull(columnIdentifier) : builder.not(clause => clause.isNull(columnIdentifier)),
 		}
 
-		return handler[keys[0]](builder, condition[keys[0]])
+		return handler[entries[0][0]](builder, entries[0][1])
 	}
 }

package/tests/cases/integration/graphQlDb/insert/insertSequence.test.ts

@@ -0,0 +1,34 @@
+import { SchemaDefinition as def } from '@contember/schema-definition'
+import { GQL } from '../../../../src/tags'
+import { test } from 'vitest'
+import { executeDbTest } from '@contember/engine-api-tester'
+
+namespace SeqModel {
+	export class Order {
+		seqId = def.intColumn().sequence().notNull()
+	}
+}
+
+test('insert author with id', async () => {
+	const schema = def.createModel(SeqModel)
+	await executeDbTest({
+		schema: schema,
+		query: GQL`
+          mutation {
+              createOrder(data: {}) {
+                  node {
+                  	seqId
+                  }
+              }
+          }`,
+		seed: [],
+		return: {
+			createOrder: {
+				node: {
+					seqId: 1,
+				},
+			},
+		},
+	})
+})
+