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

package/src/type-schema/model.ts

@@ -133,6 +133,7 @@ const columnSchema = Typesafe.intersection(
 		list: Typesafe.boolean,
 		default: Typesafe.anyJson,
 		sequence: intersectionSchema as Typesafe.Type<Model.AnyColumn['sequence']>,
+		collation: Typesafe.string as Typesafe.Type<Model.AnyColumn['collation']>,
 	}),
 )
 const columnSchemaCheck: Typesafe.Equals<Model.AnyColumn, ReturnType<typeof columnSchema>> = true
@@ -154,13 +155,15 @@ const viewSchemaInner = Typesafe.intersection(
 	}),
 	Typesafe.partial({
 		dependencies: Typesafe.array(Typesafe.string),
+		idSource: Typesafe.array(Typesafe.string),
+		materialized: Typesafe.boolean,
 	}),
 )
 const viewSchemaCheck: Typesafe.Equals<Model.View, ReturnType<typeof viewSchemaInner>> = true
 const viewSchema: Typesafe.Type<Model.View> = viewSchemaInner
 
 
-const indexLike: Typesafe.Type<{readonly fields: readonly string[]; readonly name?: string | undefined}> = Typesafe.intersection(
+const indexSchemaBase = Typesafe.intersection(
 	Typesafe.object({
 		fields: Typesafe.array(Typesafe.string),
 	}),
@@ -168,22 +171,37 @@ const indexLike: Typesafe.Type<{readonly fields: readonly string[]; readonly nam
 		name: Typesafe.string,
 	}),
 )
+const indexCheck: Typesafe.Equals<Model.Index, ReturnType<typeof indexSchemaBase>> = true
 
 const indexesSchema = Typesafe.coalesce<Model.Indexes, Model.Indexes>(
 	Typesafe.preprocess(
-		Typesafe.array(indexLike),
+		Typesafe.array(indexSchemaBase),
 		it => it?.constructor === Object ? Object.values(it) : it,
 	),
 	[],
 )
 
 const uniqueConstraint = Typesafe.intersection(
-	indexLike,
+	Typesafe.object({
+		fields: Typesafe.array(Typesafe.string),
+	}),
 	Typesafe.partial({
 		timing: Typesafe.enumeration('deferrable', 'deferred'),
+		name: Typesafe.string,
+		index: Typesafe.literal(false),
+	}),
+)
+const uniqueIndex = Typesafe.intersection(
+	Typesafe.object({
+		fields: Typesafe.array(Typesafe.string),
+		index: Typesafe.literal(true),
+	}),
+	Typesafe.partial({
+		nulls: Typesafe.enumeration('distinct', 'not distinct'),
 	}),
 )
 const uniqueConstraintCheck: Typesafe.Equals<Model.UniqueConstraint, ReturnType<typeof uniqueConstraint>> = true
+const uniqueIndexCheck: Typesafe.Equals<Model.UniqueIndex, ReturnType<typeof uniqueIndex>> = true
 
 const entitySchema = Typesafe.intersection(
 	Typesafe.object({
@@ -192,8 +210,8 @@ const entitySchema = Typesafe.intersection(
 		primaryColumn: Typesafe.string,
 		tableName: Typesafe.string,
 		fields: Typesafe.record(Typesafe.string, fieldSchema),
-		unique: Typesafe.preprocess<Model.UniqueConstraints>(
-			Typesafe.array(uniqueConstraint),
+		unique: Typesafe.preprocess<Model.Uniques>(
+			Typesafe.array(Typesafe.union(uniqueConstraint, uniqueIndex)),
 			it => it?.constructor === Object ? Object.values(it) : it,
 		),
 		indexes: indexesSchema,

package/src/validation/ModelValidator.ts

@@ -60,6 +60,9 @@ export class ModelValidator {
 
 	private validateUniqueConstraints(entity: Model.Entity, errors: ErrorBuilder): void {
 		for (const constraint of entity.unique) {
+			if (entity.view && !constraint.index) {
+				errors.add('MODEL_INVALID_CONSTRAINT', 'Unique constraint on view entity must be an index. Please set index: true')
+			}
 			for (const field of constraint.fields) {
 				const fieldDef = entity.fields[field]
 				if (!fieldDef) {

package/src/validation/errors.ts

@@ -9,6 +9,7 @@ export type ValidationErrorCode =
 	| 'MODEL_INVALID_VIEW_USAGE'
 	| 'MODEL_INVALID_IDENTIFIER'
 	| 'MODEL_INVALID_ENTITY_NAME'
+	| 'MODEL_INVALID_CONSTRAINT'
 	| 'MODEL_NAME_COLLISION'
 
 	| 'ACL_INVALID_CONDITION'