@contember/schema-definition 2.0.1 → 2.1.0-alpha.2

package/dist/types/utils/MetadataStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MetadataStore.d.ts","sourceRoot":"","sources":["../../../src/utils/MetadataStore.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAA;AAEzB,MAAM,WAAW,aAAa,CAAC,CAAC;IAC/B,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAA;IACtB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;CAC1D;AAED,eAAO,MAAM,mBAAmB,GAAI,CAAC,gBAAgB,CAAC,KAAG,aAAa,CAAC,CAAC,CAevE,CAAA"}
+{"version":3,"file":"MetadataStore.d.ts","sourceRoot":"","sources":["../../../src/utils/MetadataStore.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAA;AAEzB,MAAM,WAAW,aAAa,CAAC,CAAC;IAC/B,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAA;IACtB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;CAC1D;AAED,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,cAAc,CAAC,KAAG,aAAa,CAAC,CAAC,CAevE,CAAA"}

package/dist/types/utils/filterEntityDefinition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filterEntityDefinition.d.ts","sourceRoot":"","sources":["../../../src/utils/filterEntityDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAEhD,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAC1B,CAAA;AAE/E,eAAO,MAAM,mBAAmB,OAAQ,OAAO,KAAG,EAAE,IAAI,iBAEvD,CAAA"}
+{"version":3,"file":"filterEntityDefinition.d.ts","sourceRoot":"","sources":["../../../src/utils/filterEntityDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAEhD,eAAO,MAAM,sBAAsB,GAAI,aAAa,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAC1B,CAAA;AAE/E,eAAO,MAAM,mBAAmB,GAAI,IAAI,OAAO,KAAG,EAAE,IAAI,iBAEvD,CAAA"}

package/dist/types/utils/tuple.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../../../src/utils/tuple.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,GAAI,CAAC,SAAS,OAAO,EAAE,WAAW,CAAC,MAAS,CAAA"}
+{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../../../src/utils/tuple.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,GAAI,CAAC,SAAS,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,MAAS,CAAA"}

package/dist/types/validation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/validation/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/validation/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/schema-definition",
-  "version": "2.0.1",
+  "version": "2.1.0-alpha.2",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -23,8 +23,8 @@
     }
   },
   "dependencies": {
-    "@contember/schema": "2.0.1",
-    "@contember/schema-utils": "2.0.1",
+    "@contember/schema": "2.1.0-alpha.2",
+    "@contember/schema-utils": "2.1.0-alpha.2",
     "reflect-metadata": "^0.2.2",
     "fast-deep-equal": "^3.1.3"
   },

package/src/acl/definition/aclExtensions.ts

@@ -0,0 +1,28 @@
+import { Acl, Model } from '@contember/schema'
+import { createMetadataStore, DecoratorFunction, EntityConstructor } from '../../utils'
+import { Role } from './roles'
+
+export type EntityAclExtensionArgs =
+	& {
+		entity: Model.Entity
+		role: Role
+		permissions: Acl.EntityPermissions
+	}
+
+const entityAclExtensionsStore = createMetadataStore<EntityAclExtension[]>([])
+
+export type EntityAclExtension = (args: EntityAclExtensionArgs) => Acl.EntityPermissions
+export const extendEntityAcl = <T>(extension: EntityAclExtension): DecoratorFunction<T> => {
+	return function (cls: EntityConstructor) {
+		entityAclExtensionsStore.update(cls, current => [...current, extension])
+	}
+}
+
+export const applyEntityAclExtensions = (
+	cls: EntityConstructor,
+	args: EntityAclExtensionArgs,
+): Acl.EntityPermissions =>
+	entityAclExtensionsStore.get(cls).reduce(
+		(permissions, ext) => ext({ ...args, permissions }),
+		args.permissions,
+	)

package/src/acl/definition/customPrimary.ts

@@ -1,13 +1,12 @@
 import { Role } from './roles'
-import { allowCustomPrimaryAllRolesStore, allowCustomPrimaryStore } from './internal/stores'
-import { DecoratorFunction, EntityConstructor } from '../../utils'
+import { DecoratorFunction } from '../../utils'
+import { extendEntityAcl } from './aclExtensions'
 
 export const allowCustomPrimary = (role?: Role | Role[]): DecoratorFunction<any> => {
-	return (entity: EntityConstructor) => {
-		if (!role) {
-			allowCustomPrimaryAllRolesStore.update(entity, () => true)
-		} else {
-			allowCustomPrimaryStore.update(entity, val => [...val, ...(Array.isArray(role) ? role : [role])])
+	return extendEntityAcl(({ permissions, role: currentRole }) => {
+		if (!role || role === currentRole || (Array.isArray(role) && role.includes(currentRole))) {
+			return { ...permissions, operations: { customPrimary: true } }
 		}
-	}
+		return permissions
+	})
 }

package/src/acl/definition/internal/AclFactory.ts

@@ -4,14 +4,13 @@ import { getEntity } from '@contember/schema-utils'
 import { EntityPredicatesResolver } from './EntityPredicateResolver'
 import { AllowDefinition } from '../permissions'
 import {
-	allowCustomPrimaryAllRolesStore,
-	allowCustomPrimaryStore,
 	allowDefinitionsStore,
 	EntityPermissionsDefinition,
 } from './stores'
 import { Role } from '../roles'
 import {  VariableDefinition } from '../variables'
 import { filterEntityDefinition } from '../../../utils'
+import { applyEntityAclExtensions } from '../aclExtensions'
 
 export class AclFactory {
 	constructor(
@@ -36,7 +35,7 @@ export class AclFactory {
 					{
 						...role.options,
 						stages: role.options.stages ?? '*',
-						entities: this.createPermissions(rolePermissions),
+						entities: this.createPermissions(rolePermissions, Object.fromEntries(entityLikeDefinition), role),
 						variables: this.createVariables(role, variables),
 					},
 				]
@@ -44,46 +43,49 @@ export class AclFactory {
 		}
 	}
 
-	private createPermissions(rolePermissions: PermissionsByEntity | undefined): Acl.Permissions {
-		if (!rolePermissions) {
-			return {}
-		}
-		return Object.fromEntries(Array.from(rolePermissions.keys()).map((entityName): [string, Acl.EntityPermissions] => {
-			const entity = getEntity(this.model, entityName)
+	private createPermissions(rolePermissions: PermissionsByEntity | undefined, entityLikeDefinition: Record<string, { new(): any }>, role: Role): Acl.Permissions {
+		return Object.fromEntries(Object.values(this.model.entities).map((entity): [string, Acl.EntityPermissions] | undefined => {
+			const permissions = rolePermissions ? this.createPermissionsFromAllow(rolePermissions, entity) : { predicates: {}, operations: {} }
+			const isEmpty = rolePermissions === undefined
+			const withExtensions = applyEntityAclExtensions(entityLikeDefinition[entity.name], { entity, permissions, role })
+			if (isEmpty && withExtensions === permissions) {
+				return undefined
+			}
+			return [
+				entity.name,
+				withExtensions,
+			]
+		}).filter(<T>(it: T | undefined): it is T => it !== undefined))
+	}
 
-			const predicatesResolver = EntityPredicatesResolver.create(rolePermissions, this.model, entity)
+	private createPermissionsFromAllow(rolePermissions: PermissionsByEntity, entity: Model.Entity): Acl.EntityPermissions {
+		const predicatesResolver = EntityPredicatesResolver.create(rolePermissions, this.model, entity)
 
-			const entityOperations: Writable<Acl.EntityOperations> = {
-			}
-			const noRootOptions = this.getNoRootOptions(entity, rolePermissions.get(entityName))
-			if (noRootOptions?.length) {
-				entityOperations.noRoot = noRootOptions
-			}
-			for (const op of ['create', 'update', 'read'] as const) {
-				const fieldPermissions: Writable<Acl.FieldPermissions> = {}
-				for (const field of Object.keys(entity.fields)) {
-					const predicate = predicatesResolver.createFieldPredicate(op, field, field === entity.primary)
-					if (predicate !== undefined) {
-						fieldPermissions[field] = predicate
-					}
-				}
-				if (Object.keys(fieldPermissions).length > 0) {
-					entityOperations[op] = fieldPermissions
+		const entityOperations: Writable<Acl.EntityOperations> = {}
+		const noRootOptions = this.getNoRootOptions(entity, rolePermissions.get(entity.name))
+		if (noRootOptions?.length) {
+			entityOperations.noRoot = noRootOptions
+		}
+		for (const op of ['create', 'update', 'read'] as const) {
+			const fieldPermissions: Writable<Acl.FieldPermissions> = {}
+			for (const field of Object.keys(entity.fields)) {
+				const predicate = predicatesResolver.createFieldPredicate(op, field, field === entity.primary)
+				if (predicate !== undefined) {
+					fieldPermissions[field] = predicate
 				}
 			}
-			const delPredicate = predicatesResolver.createFieldPredicate('delete', '', false)
-			if (delPredicate !== undefined) {
-				entityOperations.delete = delPredicate
-			}
-			if (rolePermissions.get(entityName)?.allowCustomPrimary) {
-				entityOperations.customPrimary = true
+			if (Object.keys(fieldPermissions).length > 0) {
+				entityOperations[op] = fieldPermissions
 			}
-			return [entityName, {
-				predicates: predicatesResolver.getUsedPredicates(),
-				operations: entityOperations,
-
-			}]
-		}))
+		}
+		const delPredicate = predicatesResolver.createFieldPredicate('delete', '', false)
+		if (delPredicate !== undefined) {
+			entityOperations.delete = delPredicate
+		}
+		return {
+			predicates: predicatesResolver.getUsedPredicates(),
+			operations: entityOperations,
+		}
 	}
 
 
@@ -123,7 +125,6 @@ export class AclFactory {
 				const rolePermissions: PermissionsByEntity = groupedPermissions.get(role) ?? new Map()
 				groupedPermissions.set(role, rolePermissions)
 				const entityPermissions = rolePermissions.get(name) ?? {
-					allowCustomPrimary: false,
 					definitions: [],
 				}
 				rolePermissions.set(name, entityPermissions)
@@ -137,11 +138,6 @@ export class AclFactory {
 				const entityPermissions = initEntityPermissions(role)
 				entityPermissions.definitions.push(definition)
 			}
-
-			const rolesWithCustomPrimary = allowCustomPrimaryAllRolesStore.get(entity) ? roles : allowCustomPrimaryStore.get(entity)
-			for (const role of rolesWithCustomPrimary) {
-				initEntityPermissions(role).allowCustomPrimary = true
-			}
 		}
 
 		return groupedPermissions
@@ -149,6 +145,6 @@ export class AclFactory {
 }
 
 
-export type EntityPermissions = { definitions: AllowDefinition<any>[]; allowCustomPrimary: boolean }
+export type EntityPermissions = { definitions: AllowDefinition<any>[] }
 export type PermissionsByEntity = Map<string, EntityPermissions>
 export type PermissionsByRoleAndEntity = Map<Role, PermissionsByEntity>

package/src/acl/definition/internal/stores.ts

@@ -2,9 +2,6 @@ import { createMetadataStore } from '../../../utils/MetadataStore'
 import { Role } from '../roles'
 import { AllowDefinition } from '../permissions'
 
-export const allowCustomPrimaryStore = createMetadataStore<Role[]>([])
-export const allowCustomPrimaryAllRolesStore = createMetadataStore<boolean>(false)
-
 export type EntityPermissionsDefinition =
 	& AllowDefinition<any>
 	& {

package/src/createSchema.ts

@@ -2,17 +2,21 @@ import { SchemaDefinition } from './model'
 import * as InputValidation from './validation'
 import * as AclDefinition from './acl/definition'
 import * as ActionsDefinition from './actions/definition'
-import { Schema } from '@contember/schema'
+import { Model, Schema } from '@contember/schema'
 import { emptySchema } from '@contember/schema-utils'
 import { allStrict, StrictOptions, StrictDefinitionValidator } from './strict'
 
 export const createSchema = (definitions: Record<string, any>, modifyCallback?: (schema: Schema) => Schema, options?: {
 	strict?: boolean | StrictOptions
+	defaultCollation?: Model.Collation
 }): Schema => {
 	const strictOptions = options?.strict === true ? allStrict : (options?.strict || {})
 	const strictDefinitionValidator = new StrictDefinitionValidator(strictOptions)
 
-	const model = SchemaDefinition.createModel(definitions, { strictDefinitionValidator: strictDefinitionValidator })
+	const model = SchemaDefinition.createModel(definitions, {
+		strictDefinitionValidator: strictDefinitionValidator,
+		defaultCollation: options?.defaultCollation,
+	})
 	const validation = InputValidation.parseDefinition(definitions)
 	const acl = AclDefinition.createAcl(definitions, model)
 	const actions = ActionsDefinition.createActions(definitions)

package/src/index.ts

@@ -66,6 +66,7 @@ export const c = {
 	intColumn: SchemaDefinition.intColumn,
 	doubleColumn: SchemaDefinition.doubleColumn,
 	dateColumn: SchemaDefinition.dateColumn,
+	timeColumn: SchemaDefinition.timeColumn,
 	dateTimeColumn: SchemaDefinition.dateTimeColumn,
 	jsonColumn: SchemaDefinition.jsonColumn,
 	stringColumn: SchemaDefinition.stringColumn,

package/src/model/builder/SchemaBuilderInternal.ts

@@ -158,7 +158,7 @@ export default class SchemaBuilderInternal {
 		entityName: string,
 		options: EntityBuilder.EntityOptions,
 		fieldOptions: FieldBuilder.Map,
-	): Model.UniqueConstraints {
+	): Model.Uniques {
 		const unique: Model.UniqueConstraint[] = []
 
 		for (const singleUnique of options.unique || []) {

package/src/model/definition/UniqueDefinition.ts

@@ -4,8 +4,17 @@ import { Model } from '@contember/schema'
 
 export type UniqueOptions<T> = {
 	fields: (keyof T & string)[]
-	timing?: Model.ConstraintTiming
-}
+
+} & (
+	| {
+		index?: false
+		timing?: Model.ConstraintTiming
+	}
+	| {
+		index: true
+		nulls?: Model.NullsDistinctBehaviour
+	}
+)
 export function Unique<T>(options: UniqueOptions<T>): DecoratorFunction<T>
 export function Unique<T>(...fields: (keyof T & string)[]): DecoratorFunction<T>
 export function Unique<T>(options: UniqueOptions<T> | keyof T & string, ...args: (keyof T & string)[]): DecoratorFunction<T> {

package/src/model/definition/ViewDefinition.ts

@@ -1,7 +1,14 @@
 import { extendEntity } from './extensions'
 import { EntityConstructor } from './types'
+import { DecoratorFunction } from '../../utils'
 
-export const View = (sql: string, { dependencies }: { dependencies?: (() => EntityConstructor[]) | EntityConstructor[] } = {}) =>
+export type ViewOptions<T> = {
+	dependencies?: (() => EntityConstructor[]) | EntityConstructor[]
+	idSource?: readonly ((keyof T) & string)[]
+	materialized?: boolean
+}
+
+export const View = <T>(sql: string, { dependencies, idSource, materialized }: ViewOptions<T> = {}): DecoratorFunction<T> =>
 	extendEntity(({ entity, entityRegistry }) => {
 		const dependenciesResolved = typeof dependencies === 'function' ? dependencies() : dependencies
 		if (dependenciesResolved?.some(it => it === undefined)) {
@@ -19,6 +26,8 @@ dependencies: () => [MyEntity]
 			view: {
 				sql,
 				...(dependenciesResolved ? { dependencies: dependenciesResolved.map(it => entityRegistry.getName(it)) } : {}),
+				...(idSource ? { idSource } : {}),
+				...(materialized ? { materialized: true } : {}),
 			},
 		})
 	})

package/src/model/definition/context.ts

@@ -7,4 +7,7 @@ export type CommonContext = {
 	enumRegistry: EnumRegistry
 	entityRegistry: EntityRegistry
 	strictDefinitionValidator: StrictDefinitionValidator
+	options: {
+		defaultCollation?: string
+	}
 }

package/src/model/definition/fieldDefinitions/ColumnDefinition.ts

@@ -26,6 +26,10 @@ export class ColumnDefinition extends FieldDefinition<ColumnDefinitionOptions> {
 		return this.withOption('columnType', columnType)
 	}
 
+	public list(): ColumnDefinition {
+		return this.withOption('list', true)
+	}
+
 	public nullable(): ColumnDefinition {
 		return this.withOption('nullable', true)
 	}
@@ -50,14 +54,23 @@ export class ColumnDefinition extends FieldDefinition<ColumnDefinitionOptions> {
 		return this.withOption('typeAlias', alias)
 	}
 
-	createField({ name, conventions, enumRegistry, entityName }: CreateFieldContext): Model.AnyField {
-		const { type, nullable, columnName, enumDefinition, default: defaultValue, columnType, typeAlias, sequence } = this.options
+	/**
+	 * Collation for string columns
+	 */
+	public collation(collation: Model.Collation): ColumnDefinition {
+		return this.withOption('collation', collation)
+	}
+
+	createField({ name, conventions, enumRegistry, entityName, options }: CreateFieldContext): Model.AnyField {
+		const { type, nullable, columnName, enumDefinition, default: defaultValue, columnType, typeAlias, sequence, list, collation = options.defaultCollation } = this.options
 		const common = {
 			name: name,
 			columnName: columnName || conventions.getColumnName(name),
 			nullable: nullable === undefined ? true : nullable,
+			...(list ? { list } : {}),
 			...(defaultValue !== undefined ? { default: defaultValue } : {}),
 			...(sequence !== undefined ? { sequence } : {}),
+			...(type === Model.ColumnType.String && collation !== undefined ? { collation } : {}),
 		}
 		if (type === Model.ColumnType.Enum) {
 			if (typeAlias) {
@@ -113,6 +126,10 @@ export function dateColumn(): ColumnDefinition {
 	return column(Model.ColumnType.Date)
 }
 
+export function timeColumn(): ColumnDefinition {
+	return column(Model.ColumnType.Time)
+}
+
 export function dateTimeColumn(args?: { precision?: number }): ColumnDefinition {
 	const col = column(Model.ColumnType.DateTime)
 	if (!args?.precision) {
@@ -139,10 +156,13 @@ export type ColumnTypeOptions = {
 export type ColumnDefinitionOptions = {
 	type: Model.ColumnType
 	columnType?: string
+	list?: boolean
 	typeAlias?: string
 	columnName?: string
 	unique?: { timing?: Model.ConstraintTiming }
 	nullable?: boolean
 	default?: Model.ColumnTypeDefinition['default']
 	sequence?: Model.ColumnTypeDefinition['sequence']
+	collation?: Model.Collation
 } & ColumnTypeOptions
+

package/src/model/definition/index.ts

@@ -26,10 +26,12 @@ export type ModelDefinition<M> = {
 
 export function createModel<M extends ModelDefinition<M>>(definitions: M, options: {
 	strictDefinitionValidator?: StrictDefinitionValidator
+	defaultCollation?: string
 } = {}): Model.Schema {
 	const schemaBuilder = new SchemaBuilder(
 		new DefaultNamingConventions(),
 		options.strictDefinitionValidator,
+		{ defaultCollation: options.defaultCollation },
 	)
 	for (const [name, definition] of Object.entries(definitions)) {
 		if (definition instanceof EnumDefinition) {

package/src/model/definition/internal/SchemaBuilder.ts

@@ -18,6 +18,9 @@ export class SchemaBuilder {
 	constructor(
 		private readonly conventions: NamingConventions,
 		private readonly strictDefinitionValidator: StrictDefinitionValidator = new StrictDefinitionValidator({}),
+		private readonly options: {
+			defaultCollation?: string
+		},
 	) {}
 
 	public addEntity(name: string, entity: EntityConstructor): void {
@@ -52,6 +55,7 @@ export class SchemaBuilder {
 						enumRegistry: this.enumRegistry,
 						entityRegistry: this.entityRegistry,
 						strictDefinitionValidator: this.strictDefinitionValidator,
+						options: this.options,
 					})
 				})
 				.reduce<Model.Entity['fields']>((acc, field) => {
@@ -82,6 +86,7 @@ export class SchemaBuilder {
 				conventions: this.conventions,
 				enumRegistry: this.enumRegistry,
 				strictDefinitionValidator: this.strictDefinitionValidator,
+				options: this.options,
 			})
 		})
 
@@ -98,7 +103,7 @@ export class SchemaBuilder {
 		})
 	}
 
-	private createUnique(entityName: string, fieldDefinitions: FieldsDefinition): Model.UniqueConstraints {
+	private createUnique(entityName: string, fieldDefinitions: FieldsDefinition): Model.Uniques {
 		const unique: Model.UniqueConstraint[] = []
 		for (const [fieldName, definition] of Object.entries(fieldDefinitions)) {
 			if (definition.options.unique) {

package/src/presets.ts

@@ -29,8 +29,20 @@ const v2_0preset: Settings.Schema = {
 	},
 }
 
+
+const v2_1preset: Settings.Schema = {
+	...v2_0preset,
+	content: {
+		...v2_0preset.content,
+		uuidVersion: 7,
+	},
+}
+
 export const settingsPresets = {
 	'v1.3': v1_3preset,
 	'v1.4': v1_4preset,
 	'v2.0': v2_0preset,
+	'v2.1': v2_1preset,
+
+	'latest': v2_1preset,
 }