@contember/schema-utils 2.0.0 → 2.1.0-alpha.1

package/src/type-schema/condition.ts

@@ -67,6 +67,7 @@ const resolveColumnTypeSchema = (type: Model.ColumnType) => {
 		// todo: validate format of string-like inputs uuid, date, enum
 		case Model.ColumnType.Date:
 		case Model.ColumnType.DateTime:
+		case Model.ColumnType.Time:
 		case Model.ColumnType.Uuid:
 		case Model.ColumnType.Enum:
 		case Model.ColumnType.String:

package/src/type-schema/model.ts

@@ -130,7 +130,8 @@ const columnSchema = Typesafe.intersection(
 	}),
 	Typesafe.partial({
 		typeAlias: Typesafe.string,
-		default: Typesafe.union(Typesafe.string, Typesafe.number, Typesafe.boolean, Typesafe.null_),
+		list: Typesafe.boolean,
+		default: Typesafe.anyJson,
 		sequence: intersectionSchema as Typesafe.Type<Model.AnyColumn['sequence']>,
 	}),
 )

package/src/type-schema/settings.ts

@@ -11,6 +11,7 @@ export const settingsSchema = Typesafe.partial({
 		useExistsInHasManyFilter: Typesafe.boolean,
 		fullDateTimeResponse: Typesafe.boolean,
 		shortDateResponse: Typesafe.boolean,
+		uuidVersion: Typesafe.union(Typesafe.literal(4), Typesafe.literal(7)),
 	}),
 })
 

package/src/validation/ModelValidator.ts

@@ -1,6 +1,6 @@
 import { Model } from '@contember/schema'
 import { ErrorBuilder, ValidationError } from './errors'
-import { acceptEveryFieldVisitor, getTargetEntity, isInverseRelation, isOwningRelation } from '../model'
+import { acceptEveryFieldVisitor, getTargetEntity, isColumn, isInverseRelation, isOwningRelation } from '../model'
 
 const IDENTIFIER_PATTERN = /^[_a-zA-Z][_a-zA-Z0-9]*$/
 const RESERVED_WORDS = ['and', 'or', 'not']
@@ -52,18 +52,20 @@ export class ModelValidator {
 			}
 		}
 		this.validateUniqueConstraints(
-			entity.unique,
-			new Set(Object.keys(entity.fields)),
+			entity,
 			errors.for('unique'),
 		)
 		this.validateColumnNamesCollision(entity, errors)
 	}
 
-	private validateUniqueConstraints(uniqueConstraints: Model.Entity['unique'], fields: Set<string>, errors: ErrorBuilder): void {
-		for (const constraint of uniqueConstraints) {
+	private validateUniqueConstraints(entity: Model.Entity, errors: ErrorBuilder): void {
+		for (const constraint of entity.unique) {
 			for (const field of constraint.fields) {
-				if (!fields.has(field)) {
+				const fieldDef = entity.fields[field]
+				if (!fieldDef) {
 					errors.add('MODEL_UNDEFINED_FIELD', `Referenced field ${field} in a constraint does not exists`)
+				} else if (isColumn(fieldDef) && fieldDef.list) {
+					errors.add('MODEL_INVALID_FIELD', `Field ${field} in a unique constraint cannot be an array`)
 				}
 			}
 		}

package/src/validation/errors.ts

@@ -1,6 +1,7 @@
 export type ValidationErrorCode =
 	| 'MODEL_NAME_MISMATCH'
 	| 'MODEL_UNDEFINED_FIELD'
+	| 'MODEL_INVALID_FIELD'
 	| 'MODEL_UNDEFINED_ENTITY'
 	| 'MODEL_RELATION_REQUIRED'
 	| 'MODEL_INVALID_RELATION_DEFINITION'