@contember/schema 2.1.0-alpha.9 → 2.1.0-beta.1

package/src/schema/model.ts

@@ -2,13 +2,12 @@ import { Input } from './input'
 import { JSONValue } from './json'
 
 export namespace Model {
-
-	export type Entity = {
+	export type Entity<Fields extends string = string> = {
 		readonly name: string
 		readonly primary: string
 		readonly primaryColumn: string
 		readonly tableName: string
-		readonly fields: { readonly [name: string]: AnyField }
+		readonly fields: { readonly [name in Fields]: AnyField }
 		readonly unique: Uniques
 		readonly indexes: Indexes
 		readonly view?: View
@@ -53,7 +52,7 @@ export namespace Model {
 		readonly columnName: string
 	}
 
-	export type ColumnTypeDefinition<T extends ColumnType = ColumnType>  =
+	export type ColumnTypeDefinition<T extends ColumnType = ColumnType> =
 		& Field<T>
 		& {
 			readonly columnType: string
@@ -70,13 +69,95 @@ export namespace Model {
 
 	export type Collation =
 		// generic
-		| 'und-x-icu' | 'C' | 'ucs_basic' | 'unicode' | 'POSIX' | 'default'
+		| 'und-x-icu'
+		| 'C'
+		| 'ucs_basic'
+		| 'unicode'
+		| 'POSIX'
+		| 'default'
 		// some languages
-		| 'cs-x-icu' | 'sk-x-icu' | 'da-x-icu' | 'de-x-icu' | 'en-x-icu' | 'es-x-icu' | 'fr-x-icu' | 'it-x-icu' | 'ja-x-icu' | 'ko-x-icu' | 'nl-x-icu' | 'pl-x-icu' | 'pt-x-icu' | 'ru-x-icu' | 'sv-x-icu' | 'tr-x-icu' | 'zh-x-icu' | 'hu-x-icu' | 'fi-x-icu' | 'el-x-icu' | 'bg-x-icu' | 'hr-x-icu' | 'ro-x-icu' | 'sl-x-icu' | 'sr-x-icu' | 'uk-x-icu' | 'vi-x-icu' | 'th-x-icu' | 'ar-x-icu' | 'he-x-icu' | 'hi-x-icu' | 'id-x-icu' | 'ms-x-icu' | 'fil-x-icu' | 'sw-x-icu' | 'ta-x-icu' | 'te-x-icu' | 'ml-x-icu' | 'bn-x-icu' | 'gu-x-icu' | 'kn-x-icu' | 'mr-x-icu' | 'pa-x-icu' | 'ur-x-icu' | 'or-x-icu' | 'si-x-icu' | 'th-x-icu' | 'lo-x-icu' | 'my-x-icu' | 'ka-x-icu' | 'am-x-icu' | 'ti-x-icu' | 'ne-x-icu' | 'dz-x-icu' | 'kok-x-icu' | 'syr-x-icu' | 'sd-x-icu' | 'bo-x-icu' | 'km-x-icu' | 'mn-x-icu' | 'lo-x-icu' | 'gl-x-icu' | 'eu-x-icu' | 'ca-x-icu' | 'af-x-icu' | 'is-x-icu' | 'mk-x-icu' | 'sq-x-icu' | 'hy-x-icu' | 'mt-x-icu' | 'cy-x-icu' | 'et-x-icu' | 'lv-x-icu' | 'lt-x-icu' | 'tg-x-icu' | 'fa-x-icu' | 'ps-x-icu' | 'ks-x-icu' | 'sd-x'
+		| 'cs-x-icu'
+		| 'sk-x-icu'
+		| 'da-x-icu'
+		| 'de-x-icu'
+		| 'en-x-icu'
+		| 'es-x-icu'
+		| 'fr-x-icu'
+		| 'it-x-icu'
+		| 'ja-x-icu'
+		| 'ko-x-icu'
+		| 'nl-x-icu'
+		| 'pl-x-icu'
+		| 'pt-x-icu'
+		| 'ru-x-icu'
+		| 'sv-x-icu'
+		| 'tr-x-icu'
+		| 'zh-x-icu'
+		| 'hu-x-icu'
+		| 'fi-x-icu'
+		| 'el-x-icu'
+		| 'bg-x-icu'
+		| 'hr-x-icu'
+		| 'ro-x-icu'
+		| 'sl-x-icu'
+		| 'sr-x-icu'
+		| 'uk-x-icu'
+		| 'vi-x-icu'
+		| 'th-x-icu'
+		| 'ar-x-icu'
+		| 'he-x-icu'
+		| 'hi-x-icu'
+		| 'id-x-icu'
+		| 'ms-x-icu'
+		| 'fil-x-icu'
+		| 'sw-x-icu'
+		| 'ta-x-icu'
+		| 'te-x-icu'
+		| 'ml-x-icu'
+		| 'bn-x-icu'
+		| 'gu-x-icu'
+		| 'kn-x-icu'
+		| 'mr-x-icu'
+		| 'pa-x-icu'
+		| 'ur-x-icu'
+		| 'or-x-icu'
+		| 'si-x-icu'
+		| 'th-x-icu'
+		| 'lo-x-icu'
+		| 'my-x-icu'
+		| 'ka-x-icu'
+		| 'am-x-icu'
+		| 'ti-x-icu'
+		| 'ne-x-icu'
+		| 'dz-x-icu'
+		| 'kok-x-icu'
+		| 'syr-x-icu'
+		| 'sd-x-icu'
+		| 'bo-x-icu'
+		| 'km-x-icu'
+		| 'mn-x-icu'
+		| 'lo-x-icu'
+		| 'gl-x-icu'
+		| 'eu-x-icu'
+		| 'ca-x-icu'
+		| 'af-x-icu'
+		| 'is-x-icu'
+		| 'mk-x-icu'
+		| 'sq-x-icu'
+		| 'hy-x-icu'
+		| 'mt-x-icu'
+		| 'cy-x-icu'
+		| 'et-x-icu'
+		| 'lv-x-icu'
+		| 'lt-x-icu'
+		| 'tg-x-icu'
+		| 'fa-x-icu'
+		| 'ps-x-icu'
+		| 'ks-x-icu'
+		| 'sd-x'
 		// fallback
 		| string & {}
 
-
 	export enum RelationType {
 		OneHasOne = 'OneHasOne',
 		OneHasMany = 'OneHasMany',
@@ -99,7 +180,7 @@ export namespace Model {
 
 	export type AnyRelation = AnyInverseRelation | AnyOwningRelation
 
-	export type Relation<T extends RelationType = RelationType>=
+	export type Relation<T extends RelationType = RelationType> =
 		& Field<T>
 		& {
 			readonly name: string
@@ -230,16 +311,19 @@ export namespace Model {
 		readonly fields: readonly string[]
 		readonly index: true
 		readonly nulls?: NullsDistinctBehaviour // empty means distinct
+		readonly method?: IndexMethod
 	}
 
 	export type Indexes = readonly Index[]
 
+	export type IndexMethod = 'btree' | 'gin' | 'gist' | 'hash' | 'brin' | 'spgist'
+
 	export type Index = {
 		readonly fields: readonly string[]
 		readonly name?: string
+		readonly method?: IndexMethod
 	}
 
-
 	export interface ColumnContext {
 		entity: Model.Entity
 		column: Model.AnyColumn
@@ -311,7 +395,6 @@ export namespace Model {
 		targetRelation: Model.OneHasOneInverseRelation | null
 	}
 
-
 	export interface ColumnVisitor<T> {
 		visitColumn(context: ColumnContext): T
 	}

package/src/schema/validation.ts

@@ -31,8 +31,8 @@ export namespace Validation {
 		readonly range: readonly [LiteralArgument<number | null>, LiteralArgument<number | null>]
 		readonly equals: readonly [LiteralArgument<JSONValue>]
 		readonly not: readonly [ValidatorArgument]
-		readonly empty: readonly[]
-		readonly defined: readonly[]
+		readonly empty: readonly []
+		readonly defined: readonly []
 		readonly inContext: readonly [PathArgument, ValidatorArgument]
 		readonly every: readonly [ValidatorArgument]
 		readonly any: readonly [ValidatorArgument]