@contember/schema-definition 2.1.0-beta.2 → 2.2.0-alpha.2

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

@@ -1,4 +1,4 @@
-import { EntityConstructor } from './decorators';
+import { EntityConstructor } from './decorators.js';
 export declare const filterEntityDefinition: (definitions: Record<string, unknown>) => [string, EntityConstructor][];
 export declare const isEntityConstructor: (it: unknown) => it is EntityConstructor;
 //# sourceMappingURL=filterEntityDefinition.d.ts.map

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,GAAI,aAAa,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAEzB,CAAA;AAEhF,eAAO,MAAM,mBAAmB,GAAI,IAAI,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,iBAAiB,CAAA;AAEnD,eAAO,MAAM,sBAAsB,GAAI,aAAa,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAEzB,CAAA;AAEhF,eAAO,MAAM,mBAAmB,GAAI,IAAI,OAAO,KAAG,EAAE,IAAI,iBAEvD,CAAA"}

package/dist/types/utils/index.d.ts

@@ -1,6 +1,6 @@
-export * from './assertNever';
-export * from './filterEntityDefinition';
-export * from './tuple';
-export * from './decorators';
-export * from './MetadataStore';
+export * from './assertNever.js';
+export * from './filterEntityDefinition.js';
+export * from './tuple.js';
+export * from './decorators.js';
+export * from './MetadataStore.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,0BAA0B,CAAA;AACxC,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,oBAAoB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/schema-definition",
-  "version": "2.1.0-beta.2",
+  "version": "2.2.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.1.0-beta.1",
-    "@contember/schema-utils": "2.1.0-beta.1",
+    "@contember/schema": "2.1.0-beta.2",
+    "@contember/schema-utils": "2.1.0-beta.2",
     "reflect-metadata": "^0.2.2",
     "fast-deep-equal": "^3.1.3"
   },

package/src/acl/builder/EntityPermissionsBuilder.ts

@@ -1,10 +1,10 @@
-import { tuple } from '../../utils'
-import EntitySelector from './EntitySelector'
+import { tuple } from '../../utils/index.js'
+import EntitySelector from './EntitySelector.js'
 import { Acl, Model, Writable } from '@contember/schema'
-import FieldSelector from './FieldSelector'
-import FieldPermissionsBuilder from './FieldPermissionsBuilder'
-import { PermissionsBuilder } from './PermissionsBuilder'
-import PredicateReference, { resolvePredicateReference } from './PredicateReference'
+import FieldSelector from './FieldSelector.js'
+import FieldPermissionsBuilder from './FieldPermissionsBuilder.js'
+import { PermissionsBuilder } from './PermissionsBuilder.js'
+import PredicateReference, { resolvePredicateReference } from './PredicateReference.js'
 
 export default class EntityPermissionsBuilder {
 	public constructor(public readonly builder: PermissionsBuilder, private readonly entities: Model.Entity[]) {}

package/src/acl/builder/FieldPermissionsBuilder.ts

@@ -1,8 +1,8 @@
-import FieldSelector from './FieldSelector'
-import EntityPermissionsBuilder from './EntityPermissionsBuilder'
+import FieldSelector from './FieldSelector.js'
+import EntityPermissionsBuilder from './EntityPermissionsBuilder.js'
 import { Acl, Model, Writable } from '@contember/schema'
-import EntitySelector from './EntitySelector'
-import { PermissionsBuilder } from './PermissionsBuilder'
+import EntitySelector from './EntitySelector.js'
+import { PermissionsBuilder } from './PermissionsBuilder.js'
 
 export default class FieldPermissionsBuilder {
 	public constructor(

package/src/acl/builder/PermissionOverrider.ts

@@ -1,5 +1,5 @@
 import { Acl } from '@contember/schema'
-import { tuple } from '../../utils'
+import { tuple } from '../../utils/index.js'
 
 export default class PermissionOverrider {
 	public override(original: Acl.Permissions, overrides: Acl.Permissions): Acl.Permissions {

package/src/acl/builder/PermissionsBuilder.ts

@@ -1,10 +1,10 @@
 import { Acl, Model } from '@contember/schema'
 import { AllowAllPermissionFactory } from '@contember/schema-utils'
-import PermissionOverrider from './PermissionOverrider'
-import EntitySelector from './EntitySelector'
-import EntityPermissionsBuilder from './EntityPermissionsBuilder'
-import FieldSelector from './FieldSelector'
-import Reference from './PredicateReference'
+import PermissionOverrider from './PermissionOverrider.js'
+import EntitySelector from './EntitySelector.js'
+import EntityPermissionsBuilder from './EntityPermissionsBuilder.js'
+import FieldSelector from './FieldSelector.js'
+import Reference from './PredicateReference.js'
 
 class PermissionsBuilder {
 	constructor(public readonly schema: Model.Schema, public readonly permissions: Acl.Permissions) {}

package/src/acl/definition/aclExtensions.ts

@@ -1,6 +1,6 @@
 import { Acl, Model } from '@contember/schema'
-import { createMetadataStore, DecoratorFunction, EntityConstructor } from '../../utils'
-import { Role } from './roles'
+import { createMetadataStore, DecoratorFunction, EntityConstructor } from '../../utils/index.js'
+import { Role } from './roles.js'
 
 export type EntityAclExtensionArgs = {
 	entity: Model.Entity

package/src/acl/definition/customPrimary.ts

@@ -1,6 +1,6 @@
-import { Role } from './roles'
-import { DecoratorFunction } from '../../utils'
-import { extendEntityAcl } from './aclExtensions'
+import { Role } from './roles.js'
+import { DecoratorFunction } from '../../utils/index.js'
+import { extendEntityAcl } from './aclExtensions.js'
 
 export const allowCustomPrimary = (role?: Role | Role[]): DecoratorFunction<any> => {
 	return extendEntityAcl(({ permissions, role: currentRole }) => {

package/src/acl/definition/index.ts

@@ -1,11 +1,11 @@
 import { Acl, Model } from '@contember/schema'
-import { AclFactory } from './internal/AclFactory'
+import { AclFactory } from './internal/AclFactory.js'
 
-export * from './customPrimary'
-export * from './permissions'
-export * from './references'
-export * from './roles'
-export * from './variables'
+export * from './customPrimary.js'
+export * from './permissions.js'
+export * from './references.js'
+export * from './roles.js'
+export * from './variables.js'
 
 export const createAcl = (
 	exportedDefinitions: Record<string, any>,

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

@@ -1,13 +1,13 @@
 import { Acl, Model, Writable } from '@contember/schema'
 import { getEntity } from '@contember/schema-utils'
 
-import { EntityPredicatesResolver } from './EntityPredicateResolver'
-import { AllowDefinition } from '../permissions'
-import { allowDefinitionsStore, EntityPermissionsDefinition } from './stores'
-import { Role } from '../roles'
-import { VariableDefinition } from '../variables'
-import { filterEntityDefinition } from '../../../utils'
-import { applyEntityAclExtensions } from '../aclExtensions'
+import { EntityPredicatesResolver } from './EntityPredicateResolver.js'
+import { AllowDefinition } from '../permissions.js'
+import { allowDefinitionsStore, EntityPermissionsDefinition } from './stores.js'
+import { Role } from '../roles.js'
+import { VariableDefinition } from '../variables.js'
+import { filterEntityDefinition } from '../../../utils/index.js'
+import { applyEntityAclExtensions } from '../aclExtensions.js'
 
 export class AclFactory {
 	constructor(

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

@@ -3,11 +3,11 @@ import deepEqual from 'fast-deep-equal'
 import { Acl, Input, Model, Writable } from '@contember/schema'
 import { PredicateDefinitionProcessor } from '@contember/schema-utils'
 
-import { PermissionsByEntity } from './AclFactory'
-import { createPredicateName } from './createPredicateName'
-import { AllowDefinition, PredicateExtra, WhenDefinition } from '../permissions'
-import { PredicateEvaluationReference } from '../references'
-import { VariableDefinition } from '../variables'
+import { PermissionsByEntity } from './AclFactory.js'
+import { createPredicateName } from './createPredicateName.js'
+import { AllowDefinition, PredicateExtra, WhenDefinition } from '../permissions.js'
+import { PredicateEvaluationReference } from '../references.js'
+import { VariableDefinition } from '../variables.js'
 
 export class EntityPredicatesResolver {
 	private usedPredicates: string[] = []

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

@@ -1,4 +1,4 @@
-import { WhenDefinition } from '../permissions'
+import { WhenDefinition } from '../permissions.js'
 
 export const createPredicateName = (when: WhenDefinition) => {
 	const json = JSON.stringify(when)

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

@@ -1,6 +1,6 @@
-import { createMetadataStore } from '../../../utils/MetadataStore'
-import { AllowDefinitionFactory } from '../permissions'
-import { Role } from '../roles'
+import { createMetadataStore } from '../../../utils/MetadataStore.js'
+import { AllowDefinitionFactory } from '../permissions.js'
+import { Role } from '../roles.js'
 
 export type EntityPermissionsDefinition = {
 	factory: AllowDefinitionFactory<any>

package/src/acl/definition/permissions.ts

@@ -1,9 +1,9 @@
 import { Acl, Model } from '@contember/schema'
-import { Role } from './roles'
-import { VariableDefinition } from './variables'
-import { PredicateEvaluationReference } from './references'
-import { allowDefinitionsStore } from './internal/stores'
-import { DecoratorFunction, EntityConstructor } from '../../utils'
+import { Role } from './roles.js'
+import { VariableDefinition } from './variables.js'
+import { PredicateEvaluationReference } from './references.js'
+import { allowDefinitionsStore } from './internal/stores.js'
+import { DecoratorFunction, EntityConstructor } from '../../utils/index.js'
 
 export type PredicateExtra = PredicateEvaluationReference | VariableDefinition
 export type WhenDefinition = Acl.PredicateDefinition<PredicateExtra>

package/src/acl/definition/variables.ts

@@ -1,4 +1,4 @@
-import { Role } from './roles'
+import { Role } from './roles.js'
 import { Acl, Input } from '@contember/schema'
 
 export class VariableDefinition<

package/src/actions/definition/index.ts

@@ -1,8 +1,8 @@
 import { Actions } from '@contember/schema'
-import { ActionsFactory } from './internal/ActionsFactory'
+import { ActionsFactory } from './internal/ActionsFactory.js'
 
-export * from './triggers'
-export * from './targets'
+export * from './triggers.js'
+export * from './targets.js'
 
 export const createActions = (
 	exportedDefinitions: Record<string, any>,

package/src/actions/definition/internal/ActionsFactory.ts

@@ -1,8 +1,8 @@
-import { assertNever, filterEntityDefinition } from '../../../utils'
+import { assertNever, filterEntityDefinition } from '../../../utils/index.js'
 import { Actions } from '@contember/schema'
-import { triggersStore } from './store'
-import { BasicTriggerDefinition, TargetDefinition, WatchTriggerDefinition } from '../triggers'
-import { ActionsTarget } from '../targets'
+import { triggersStore } from './store.js'
+import { BasicTriggerDefinition, TargetDefinition, WatchTriggerDefinition } from '../triggers.js'
+import { ActionsTarget } from '../targets.js'
 import { Kind, parse, SelectionNode, ValueNode } from 'graphql'
 
 export class ActionsFactory {

package/src/actions/definition/internal/store.ts

@@ -1,5 +1,5 @@
-import { createMetadataStore } from '../../../utils'
-import { BasicTriggerDefinition, WatchTriggerDefinition } from '../triggers'
+import { createMetadataStore } from '../../../utils/index.js'
+import { BasicTriggerDefinition, WatchTriggerDefinition } from '../triggers.js'
 
 type StoredTrigger =
 	| { type: 'basic'; definition: BasicTriggerDefinition }

package/src/actions/definition/triggers.ts

@@ -1,7 +1,7 @@
-import { DecoratorFunction, EntityConstructor } from '../../utils'
+import { DecoratorFunction, EntityConstructor } from '../../utils/index.js'
 import { Actions } from '@contember/schema'
-import { triggersStore } from './internal/store'
-import { ActionsTarget } from './targets'
+import { triggersStore } from './internal/store.js'
+import { ActionsTarget } from './targets.js'
 
 export type TriggerWebhookDefinition = {
 	webhook:

package/src/createSchema.ts

@@ -1,10 +1,10 @@
-import { SchemaDefinition } from './model'
-import * as InputValidation from './validation'
-import * as AclDefinition from './acl/definition'
-import * as ActionsDefinition from './actions/definition'
+import { SchemaDefinition } from './model/index.js'
+import * as InputValidation from './validation/index.js'
+import * as AclDefinition from './acl/definition/index.js'
+import * as ActionsDefinition from './actions/definition/index.js'
 import { Model, Schema } from '@contember/schema'
 import { emptySchema } from '@contember/schema-utils'
-import { allStrict, StrictDefinitionValidator, StrictOptions } from './strict'
+import { allStrict, StrictDefinitionValidator, StrictOptions } from './strict.js'
 
 export const createSchema = (definitions: Record<string, any>, modifyCallback?: (schema: Schema) => Schema, options?: {
 	strict?: boolean | StrictOptions
@@ -17,13 +17,14 @@ export const createSchema = (definitions: Record<string, any>, modifyCallback?:
 		strictDefinitionValidator: strictDefinitionValidator,
 		defaultCollation: options?.defaultCollation,
 	})
+	strictDefinitionValidator.validateModel(model)
 	const validation = InputValidation.parseDefinition(definitions)
 	const acl = AclDefinition.createAcl(definitions, model)
 	const actions = ActionsDefinition.createActions(definitions)
 	const schema = { ...emptySchema, model, validation, acl, actions }
 
 	if (strictDefinitionValidator.warnings.length > 0) {
-		throw `Strict schema validation failed: \n${strictDefinitionValidator.warnings.map(it => `- ${it.message}`).join('\n')}`
+		throw `Strict schema validation failed:\n${strictDefinitionValidator.warnings.map(it => `- ${it.message}`).join('\n')}`
 	}
 
 	return modifyCallback ? modifyCallback(schema) : schema

package/src/index.ts

@@ -1,17 +1,17 @@
-import * as AclDefinition from './acl/definition'
-import { Role } from './acl/definition'
-import * as ActionsDefinition from './actions/definition'
-import * as InputValidation from './validation'
-import { SchemaDefinition } from './model'
-import { createSchema } from './createSchema'
+import * as AclDefinition from './acl/definition/index.js'
+import { Role } from './acl/definition/index.js'
+import * as ActionsDefinition from './actions/definition/index.js'
+import * as InputValidation from './validation/index.js'
+import { SchemaDefinition } from './model/index.js'
+import { createSchema } from './createSchema.js'
 
 export { AllowAllPermissionFactory } from '@contember/schema-utils'
-export { PermissionsBuilder } from './acl/builder/PermissionsBuilder'
-export * from './model'
-export * from './presets'
+export { PermissionsBuilder } from './acl/builder/PermissionsBuilder.js'
+export * from './model/index.js'
+export * from './presets.js'
 
 export type { Role }
-export type { VariableDefinition } from './acl/definition'
+export type { VariableDefinition } from './acl/definition/index.js'
 export type {
 	ColumnDefinition,
 	EnumDefinition,
@@ -22,7 +22,7 @@ export type {
 	OneHasManyDefinition,
 	OneHasOneDefinition,
 	OneHasOneInverseDefinition,
-} from './model/definition'
+} from './model/definition/index.js'
 
 export { AclDefinition, ActionsDefinition, createSchema, InputValidation, SchemaDefinition }
 
@@ -62,6 +62,7 @@ export const c = {
 	boolColumn: SchemaDefinition.boolColumn,
 	intColumn: SchemaDefinition.intColumn,
 	doubleColumn: SchemaDefinition.doubleColumn,
+	numericColumn: SchemaDefinition.numericColumn,
 	dateColumn: SchemaDefinition.dateColumn,
 	timeColumn: SchemaDefinition.timeColumn,
 	dateTimeColumn: SchemaDefinition.dateTimeColumn,

package/src/model/builder/ColumnBuilder.ts

@@ -1,4 +1,4 @@
-import FieldBuilder from './FieldBuilder'
+import FieldBuilder from './FieldBuilder.js'
 import { Model } from '@contember/schema'
 
 type PartialColumnOptions<K extends keyof ColumnBuilder.Options> =

package/src/model/builder/EntityBuilder.ts

@@ -1,11 +1,11 @@
-import FieldBuilder from './FieldBuilder'
-import ColumnBuilder from './ColumnBuilder'
-import OneHasOneBuilder from './OneHasOneBuilder'
-import ManyHasManyBuilder from './ManyHasManyBuilder'
-import OneHasManyBuilder from './OneHasManyBuilder'
-import ManyHasOneBuilder from './ManyHasOneBuilder'
+import FieldBuilder from './FieldBuilder.js'
+import ColumnBuilder from './ColumnBuilder.js'
+import OneHasOneBuilder from './OneHasOneBuilder.js'
+import ManyHasManyBuilder from './ManyHasManyBuilder.js'
+import OneHasManyBuilder from './OneHasManyBuilder.js'
+import ManyHasOneBuilder from './ManyHasOneBuilder.js'
 import { Model } from '@contember/schema'
-import { AddEntityCallback } from './types'
+import { AddEntityCallback } from './types.js'
 
 class EntityBuilder {
 	constructor(

package/src/model/builder/FieldBuilder.ts

@@ -1,8 +1,8 @@
-import OneHasOneBuilder from './OneHasOneBuilder'
-import ManyHasOneBuilder from './ManyHasOneBuilder'
-import ManyHasManyBuilder from './ManyHasManyBuilder'
-import OneHasManyBuilder from './OneHasManyBuilder'
-import ColumnBuilder from './ColumnBuilder'
+import OneHasOneBuilder from './OneHasOneBuilder.js'
+import ManyHasOneBuilder from './ManyHasOneBuilder.js'
+import ManyHasManyBuilder from './ManyHasManyBuilder.js'
+import OneHasManyBuilder from './OneHasManyBuilder.js'
+import ColumnBuilder from './ColumnBuilder.js'
 
 interface FieldBuilder<O> {
 	getOption(): O

package/src/model/builder/ManyHasManyBuilder.ts

@@ -1,6 +1,6 @@
 import { Model } from '@contember/schema'
-import FieldBuilder from './FieldBuilder'
-import { AddEntityCallback, EntityConfigurator } from './types'
+import FieldBuilder from './FieldBuilder.js'
+import { AddEntityCallback, EntityConfigurator } from './types.js'
 
 type PartialOptions<K extends keyof ManyHasManyBuilder.Options> =
 	& Partial<ManyHasManyBuilder.Options>

package/src/model/builder/ManyHasOneBuilder.ts

@@ -1,6 +1,6 @@
 import { Model } from '@contember/schema'
-import FieldBuilder from './FieldBuilder'
-import { AddEntityCallback, EntityConfigurator } from './types'
+import FieldBuilder from './FieldBuilder.js'
+import { AddEntityCallback, EntityConfigurator } from './types.js'
 
 type PartialOptions<K extends keyof ManyHasOneBuilder.Options> =
 	& Partial<ManyHasOneBuilder.Options>

package/src/model/builder/OneHasManyBuilder.ts

@@ -1,6 +1,6 @@
 import { Model } from '@contember/schema'
-import FieldBuilder from './FieldBuilder'
-import { AddEntityCallback, EntityConfigurator } from './types'
+import FieldBuilder from './FieldBuilder.js'
+import { AddEntityCallback, EntityConfigurator } from './types.js'
 
 type PartialOptions<K extends keyof OneHasManyBuilder.Options> =
 	& Partial<OneHasManyBuilder.Options>

package/src/model/builder/OneHasOneBuilder.ts

@@ -1,6 +1,6 @@
 import { Model } from '@contember/schema'
-import FieldBuilder from './FieldBuilder'
-import { AddEntityCallback, EntityConfigurator } from './types'
+import FieldBuilder from './FieldBuilder.js'
+import { AddEntityCallback, EntityConfigurator } from './types.js'
 
 type PartialOptions<K extends keyof OneHasOneBuilder.Options> =
 	& Partial<OneHasOneBuilder.Options>

package/src/model/builder/SchemaBuilder.ts

@@ -1,8 +1,8 @@
 import { Model } from '@contember/schema'
-import EntityBuilder from './EntityBuilder'
+import EntityBuilder from './EntityBuilder.js'
 import { DefaultNamingConventions, NamingConventions } from '@contember/schema-utils'
-import SchemaBuilderInternal from './SchemaBuilderInternal'
-import { EntityConfigurator } from './types'
+import SchemaBuilderInternal from './SchemaBuilderInternal.js'
+import { EntityConfigurator } from './types.js'
 
 export default class SchemaBuilder {
 	private entities: { [name: string]: EntityConfigurator } = {}
@@ -39,4 +39,4 @@ export default class SchemaBuilder {
 	}
 }
 
-export * from './SchemaBuilderError'
+export * from './SchemaBuilderError.js'

package/src/model/builder/SchemaBuilderInternal.ts

@@ -1,14 +1,14 @@
 import { Model } from '@contember/schema'
 import { NamingConventions } from '@contember/schema-utils'
-import EntityBuilder from './EntityBuilder'
-import { SchemaBuilderError } from './SchemaBuilderError'
-import FieldProcessor from './internal/FieldProcessor'
-import ColumnProcessor from './internal/ColumnProcessor'
-import ManyHasManyProcessor from './internal/ManyHasManyProcessor'
-import OneHasOneProcessor from './internal/OneHasOneProcessor'
-import OneHasManyProcessor from './internal/OneHasManyProcessor'
-import ManyHasOneProcessor from './internal/ManyHasOneProcessor'
-import FieldBuilder from './FieldBuilder'
+import EntityBuilder from './EntityBuilder.js'
+import { SchemaBuilderError } from './SchemaBuilderError.js'
+import FieldProcessor from './internal/FieldProcessor.js'
+import ColumnProcessor from './internal/ColumnProcessor.js'
+import ManyHasManyProcessor from './internal/ManyHasManyProcessor.js'
+import OneHasOneProcessor from './internal/OneHasOneProcessor.js'
+import OneHasManyProcessor from './internal/OneHasManyProcessor.js'
+import ManyHasOneProcessor from './internal/ManyHasOneProcessor.js'
+import FieldBuilder from './FieldBuilder.js'
 
 export default class SchemaBuilderInternal {
 	private entities: { [name: string]: Model.Entity & { fields: Record<string, Model.AnyField> } } = {}

package/src/model/builder/internal/ColumnProcessor.ts

@@ -1,5 +1,5 @@
-import FieldProcessor from './FieldProcessor'
-import ColumnBuilder from '../ColumnBuilder'
+import FieldProcessor from './FieldProcessor.js'
+import ColumnBuilder from '../ColumnBuilder.js'
 import { Model } from '@contember/schema'
 import { NamingConventions, resolveDefaultColumnType } from '@contember/schema-utils'
 

package/src/model/builder/internal/ManyHasManyProcessor.ts

@@ -1,5 +1,5 @@
-import FieldProcessor from './FieldProcessor'
-import ManyHasManyBuilder from '../ManyHasManyBuilder'
+import FieldProcessor from './FieldProcessor.js'
+import ManyHasManyBuilder from '../ManyHasManyBuilder.js'
 import { Model } from '@contember/schema'
 import { NamingConventions } from '@contember/schema-utils'
 

package/src/model/builder/internal/ManyHasOneProcessor.ts

@@ -1,6 +1,6 @@
-import FieldProcessor from './FieldProcessor'
+import FieldProcessor from './FieldProcessor.js'
 import { Model } from '@contember/schema'
-import ManyHasOneBuilder from '../ManyHasOneBuilder'
+import ManyHasOneBuilder from '../ManyHasOneBuilder.js'
 import { NamingConventions } from '@contember/schema-utils'
 
 export default class ManyHasOneProcessor implements FieldProcessor<ManyHasOneBuilder.Options> {

package/src/model/builder/internal/OneHasManyProcessor.ts

@@ -1,5 +1,5 @@
-import FieldProcessor from './FieldProcessor'
-import OneHasManyBuilder from '../OneHasManyBuilder'
+import FieldProcessor from './FieldProcessor.js'
+import OneHasManyBuilder from '../OneHasManyBuilder.js'
 import { Model } from '@contember/schema'
 import { NamingConventions } from '@contember/schema-utils'
 

package/src/model/builder/internal/OneHasOneProcessor.ts

@@ -1,5 +1,5 @@
-import OneHasOneBuilder from '../OneHasOneBuilder'
-import FieldProcessor from './FieldProcessor'
+import OneHasOneBuilder from '../OneHasOneBuilder.js'
+import FieldProcessor from './FieldProcessor.js'
 import { Model } from '@contember/schema'
 import { NamingConventions } from '@contember/schema-utils'
 

package/src/model/builder/types.ts

@@ -1,4 +1,4 @@
-import EntityBuilder from './EntityBuilder'
+import EntityBuilder from './EntityBuilder.js'
 
 export type EntityConfigurator = (entityBuilder: EntityBuilder) => EntityBuilder
 export type AddEntityCallback = (name: string, configurator: EntityConfigurator) => void

package/src/model/definition/EventLogDefinition.ts

@@ -1,4 +1,4 @@
-import { extendEntity } from './extensions'
+import { extendEntity } from './extensions.js'
 
 export const DisableEventLog = () =>
 	extendEntity(({ entity }) => ({

package/src/model/definition/IndexDefinition.ts

@@ -1,22 +1,62 @@
-import { extendEntity } from './extensions'
-import { DecoratorFunction } from '../../utils'
+import { extendEntity } from './extensions.js'
+import { DecoratorFunction } from '../../utils/index.js'
 import { Model } from '@contember/schema'
 
+export type IndexColumn<T> =
+	| keyof T
+	| {
+		field: keyof T
+		order?: Model.IndexColumnOrder
+		nulls?: Model.IndexColumnNulls
+		opClass?: string
+	}
+
 export type IndexOptions<T> = {
-	fields: (keyof T)[]
+	fields: IndexColumn<T>[]
 	method?: Model.IndexMethod
+	opClass?: string
+	where?: string
+	include?: (keyof T)[]
 }
 export function Index<T>(options: IndexOptions<T>): DecoratorFunction<T>
 export function Index<T>(...fields: (keyof T)[]): DecoratorFunction<T>
 export function Index<T>(options: IndexOptions<T> | keyof T, ...args: (keyof T)[]): DecoratorFunction<T> {
-	return extendEntity(({ entity }) => {
-		const indexDef = (typeof options !== 'object' ? { fields: [options, ...args] } : options) as { fields: string[]; method?: Model.IndexMethod }
-		return {
-			...entity,
-			indexes: [
-				...entity.indexes,
-				indexDef,
-			],
+	return extendEntity(({ entity }) => ({
+		...entity,
+		indexes: [
+			...entity.indexes,
+			typeof options !== 'object'
+				? { fields: [String(options), ...args.map(String)] }
+				: normalizeIndex(options),
+		],
+	}))
+}
+
+const normalizeIndex = <T>(options: IndexOptions<T>): Model.Index => {
+	const fields: string[] = []
+	const columnOptions: { [field: string]: Model.IndexColumnOptions } = {}
+	for (const column of options.fields) {
+		if (typeof column === 'object') {
+			const field = String(column.field)
+			fields.push(field)
+			const columnOption: Model.IndexColumnOptions = {
+				...(column.order !== undefined ? { order: column.order } : {}),
+				...(column.nulls !== undefined ? { nulls: column.nulls } : {}),
+				...(column.opClass !== undefined ? { opClass: column.opClass } : {}),
+			}
+			if (Object.keys(columnOption).length > 0) {
+				columnOptions[field] = columnOption
+			}
+		} else {
+			fields.push(String(column))
 		}
-	})
+	}
+	return {
+		fields,
+		...(options.method !== undefined ? { method: options.method } : {}),
+		...(options.opClass !== undefined ? { opClass: options.opClass } : {}),
+		...(options.where !== undefined ? { where: options.where } : {}),
+		...(options.include !== undefined ? { include: options.include.map(String) } : {}),
+		...(Object.keys(columnOptions).length > 0 ? { columnOptions } : {}),
+	}
 }