@contember/schema-definition - npm Package Compare versions

Comparing version 2.0.0-alpha.12 to 2.0.0-alpha.13

dist/development/src/model/definition/fieldDefinitions/ColumnDefinition.js

@@ -74,2 +74,5 @@ import { Model } from "@contember/schema";
   }
+  withOption(key, value) {
+    return new ColumnDefinition({ ...this.options, [key]: value });
+  }
 }
@@ -76,0 +79,0 @@ function column(type, typeOptions = {}) {

dist/development/src/model/definition/fieldDefinitions/FieldDefinition.js

@@ -5,5 +5,2 @@ class FieldDefinition {
   }
-  withOption(key, value) {
-    return new this.constructor({ ...this.options, [key]: value });
-  }
 }
@@ -10,0 +7,0 @@ export {

dist/development/src/model/definition/fieldDefinitions/ManyHasManyDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class ManyHasManyDefinitionImpl extends FieldDefinition {
+class ManyHasManyDefinition extends FieldDefinition {
   constructor() {
@@ -47,10 +47,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new ManyHasManyDefinition({ ...this.options, [key]: value });
+  }
 }
 function manyHasMany(target, inversedBy) {
-  return new ManyHasManyDefinitionImpl({ target, inversedBy });
+  return new ManyHasManyDefinition({ target, inversedBy });
 }
 export {
-  ManyHasManyDefinitionImpl,
+  ManyHasManyDefinition,
   manyHasMany
 };
 //# sourceMappingURL=ManyHasManyDefinition.js.map

dist/development/src/model/definition/fieldDefinitions/ManyHasManyInverseDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class ManyHasManyInverseDefinitionImpl extends FieldDefinition {
+class ManyHasManyInverseDefinition extends FieldDefinition {
   constructor() {
@@ -26,14 +26,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new ManyHasManyInverseDefinition({ ...this.options, [key]: value });
+  }
 }
 function manyHasManyInverse(target, ownedBy) {
-  return new ManyHasManyInverseDefinitionImpl({ target, ownedBy });
+  return new ManyHasManyInverseDefinition({ target, ownedBy });
 }
-function manyHasManyInversed(target, ownedBy) {
-  return new ManyHasManyInverseDefinitionImpl({ target, ownedBy });
-}
 export {
-  ManyHasManyInverseDefinitionImpl,
-  manyHasManyInverse,
-  manyHasManyInversed
+  ManyHasManyInverseDefinition,
+  manyHasManyInverse
 };
 //# sourceMappingURL=ManyHasManyInverseDefinition.js.map

dist/development/src/model/definition/fieldDefinitions/ManyHasOneDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class ManyHasOneDefinitionImpl extends FieldDefinition {
+class ManyHasOneDefinition extends FieldDefinition {
   constructor() {
@@ -50,10 +50,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new ManyHasOneDefinition({ ...this.options, [key]: value });
+  }
 }
 function manyHasOne(target, inversedBy) {
-  return new ManyHasOneDefinitionImpl({ target, inversedBy });
+  return new ManyHasOneDefinition({ target, inversedBy });
 }
 export {
-  ManyHasOneDefinitionImpl,
+  ManyHasOneDefinition,
   manyHasOne
 };
 //# sourceMappingURL=ManyHasOneDefinition.js.map

dist/development/src/model/definition/fieldDefinitions/OneHasManyDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class OneHasManyDefinitionImpl extends FieldDefinition {
+class OneHasManyDefinition extends FieldDefinition {
   constructor() {
@@ -26,10 +26,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new OneHasManyDefinition({ ...this.options, [key]: value });
+  }
 }
 function oneHasMany(target, ownedBy) {
-  return new OneHasManyDefinitionImpl({ target, ownedBy });
+  return new OneHasManyDefinition({ target, ownedBy });
 }
 export {
-  OneHasManyDefinitionImpl,
+  OneHasManyDefinition,
   oneHasMany
 };
 //# sourceMappingURL=OneHasManyDefinition.js.map

dist/development/src/model/definition/fieldDefinitions/OneHasOneDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class OneHasOneDefinitionImpl extends FieldDefinition {
+class OneHasOneDefinition extends FieldDefinition {
   constructor() {
@@ -54,10 +54,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new OneHasOneDefinition({ ...this.options, [key]: value });
+  }
 }
 function oneHasOne(target, inversedBy) {
-  return new OneHasOneDefinitionImpl({ target, inversedBy });
+  return new OneHasOneDefinition({ target, inversedBy });
 }
 export {
-  OneHasOneDefinitionImpl,
+  OneHasOneDefinition,
   oneHasOne
 };
 //# sourceMappingURL=OneHasOneDefinition.js.map

dist/development/src/model/definition/fieldDefinitions/OneHasOneInverseDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class OneHasOneInverseDefinitionImpl extends FieldDefinition {
+class OneHasOneInverseDefinition extends FieldDefinition {
   constructor() {
@@ -25,14 +25,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new this.constructor({ ...this.options, [key]: value });
+  }
 }
 function oneHasOneInverse(target, ownedBy) {
-  return new OneHasOneInverseDefinitionImpl({ target, ownedBy });
+  return new OneHasOneInverseDefinition({ target, ownedBy });
 }
-function oneHasOneInversed(target, ownedBy) {
-  return new OneHasOneInverseDefinitionImpl({ target, ownedBy });
-}
 export {
-  OneHasOneInverseDefinitionImpl,
-  oneHasOneInverse,
-  oneHasOneInversed
+  OneHasOneInverseDefinition,
+  oneHasOneInverse
 };
 //# sourceMappingURL=OneHasOneInverseDefinition.js.map

dist/development/src/model/definition/index.js

@@ -10,8 +10,8 @@ import { Model } from "@contember/schema";
 import { FieldDefinition } from "./fieldDefinitions/FieldDefinition.js";
-import { ManyHasManyDefinitionImpl, manyHasMany } from "./fieldDefinitions/ManyHasManyDefinition.js";
-import { ManyHasManyInverseDefinitionImpl, manyHasManyInverse, manyHasManyInversed } from "./fieldDefinitions/ManyHasManyInverseDefinition.js";
-import { ManyHasOneDefinitionImpl, manyHasOne } from "./fieldDefinitions/ManyHasOneDefinition.js";
-import { OneHasManyDefinitionImpl, oneHasMany } from "./fieldDefinitions/OneHasManyDefinition.js";
-import { OneHasOneDefinitionImpl, oneHasOne } from "./fieldDefinitions/OneHasOneDefinition.js";
-import { OneHasOneInverseDefinitionImpl, oneHasOneInverse, oneHasOneInversed } from "./fieldDefinitions/OneHasOneInverseDefinition.js";
+import { ManyHasManyDefinition, manyHasMany } from "./fieldDefinitions/ManyHasManyDefinition.js";
+import { ManyHasManyInverseDefinition, manyHasManyInverse } from "./fieldDefinitions/ManyHasManyInverseDefinition.js";
+import { ManyHasOneDefinition, manyHasOne } from "./fieldDefinitions/ManyHasOneDefinition.js";
+import { OneHasManyDefinition, oneHasMany } from "./fieldDefinitions/OneHasManyDefinition.js";
+import { OneHasOneDefinition, oneHasOne } from "./fieldDefinitions/OneHasOneDefinition.js";
+import { OneHasOneInverseDefinition, oneHasOneInverse } from "./fieldDefinitions/OneHasOneInverseDefinition.js";
 import { DisableEventLog } from "./EventLogDefinition.js";
@@ -49,9 +49,9 @@ import { Index } from "./IndexDefinition.js";
   Index,
-  ManyHasManyDefinitionImpl,
-  ManyHasManyInverseDefinitionImpl,
-  ManyHasOneDefinitionImpl,
+  ManyHasManyDefinition,
+  ManyHasManyInverseDefinition,
+  ManyHasOneDefinition,
   OnDelete,
-  OneHasManyDefinitionImpl,
-  OneHasOneDefinitionImpl,
-  OneHasOneInverseDefinitionImpl,
+  OneHasManyDefinition,
+  OneHasOneDefinition,
+  OneHasOneInverseDefinition,
   OrderBy,
@@ -74,3 +74,2 @@ OrderDirection,
   manyHasManyInverse,
-  manyHasManyInversed,
   manyHasOne,
@@ -80,3 +79,2 @@ oneHasMany,
   oneHasOneInverse,
-  oneHasOneInversed,
   stringColumn,
@@ -83,0 +81,0 @@ uuidColumn

dist/production/src/model/definition/fieldDefinitions/ColumnDefinition.js

@@ -74,2 +74,5 @@ import { Model } from "@contember/schema";
   }
+  withOption(key, value) {
+    return new ColumnDefinition({ ...this.options, [key]: value });
+  }
 }
@@ -76,0 +79,0 @@ function column(type, typeOptions = {}) {

dist/production/src/model/definition/fieldDefinitions/FieldDefinition.js

@@ -5,5 +5,2 @@ class FieldDefinition {
   }
-  withOption(key, value) {
-    return new this.constructor({ ...this.options, [key]: value });
-  }
 }
@@ -10,0 +7,0 @@ export {

dist/production/src/model/definition/fieldDefinitions/ManyHasManyDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class ManyHasManyDefinitionImpl extends FieldDefinition {
+class ManyHasManyDefinition extends FieldDefinition {
   constructor() {
@@ -47,10 +47,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new ManyHasManyDefinition({ ...this.options, [key]: value });
+  }
 }
 function manyHasMany(target, inversedBy) {
-  return new ManyHasManyDefinitionImpl({ target, inversedBy });
+  return new ManyHasManyDefinition({ target, inversedBy });
 }
 export {
-  ManyHasManyDefinitionImpl,
+  ManyHasManyDefinition,
   manyHasMany
 };
 //# sourceMappingURL=ManyHasManyDefinition.js.map

dist/production/src/model/definition/fieldDefinitions/ManyHasManyInverseDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class ManyHasManyInverseDefinitionImpl extends FieldDefinition {
+class ManyHasManyInverseDefinition extends FieldDefinition {
   constructor() {
@@ -26,14 +26,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new ManyHasManyInverseDefinition({ ...this.options, [key]: value });
+  }
 }
 function manyHasManyInverse(target, ownedBy) {
-  return new ManyHasManyInverseDefinitionImpl({ target, ownedBy });
+  return new ManyHasManyInverseDefinition({ target, ownedBy });
 }
-function manyHasManyInversed(target, ownedBy) {
-  return new ManyHasManyInverseDefinitionImpl({ target, ownedBy });
-}
 export {
-  ManyHasManyInverseDefinitionImpl,
-  manyHasManyInverse,
-  manyHasManyInversed
+  ManyHasManyInverseDefinition,
+  manyHasManyInverse
 };
 //# sourceMappingURL=ManyHasManyInverseDefinition.js.map

dist/production/src/model/definition/fieldDefinitions/ManyHasOneDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class ManyHasOneDefinitionImpl extends FieldDefinition {
+class ManyHasOneDefinition extends FieldDefinition {
   constructor() {
@@ -50,10 +50,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new ManyHasOneDefinition({ ...this.options, [key]: value });
+  }
 }
 function manyHasOne(target, inversedBy) {
-  return new ManyHasOneDefinitionImpl({ target, inversedBy });
+  return new ManyHasOneDefinition({ target, inversedBy });
 }
 export {
-  ManyHasOneDefinitionImpl,
+  ManyHasOneDefinition,
   manyHasOne
 };
 //# sourceMappingURL=ManyHasOneDefinition.js.map

dist/production/src/model/definition/fieldDefinitions/OneHasManyDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class OneHasManyDefinitionImpl extends FieldDefinition {
+class OneHasManyDefinition extends FieldDefinition {
   constructor() {
@@ -26,10 +26,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new OneHasManyDefinition({ ...this.options, [key]: value });
+  }
 }
 function oneHasMany(target, ownedBy) {
-  return new OneHasManyDefinitionImpl({ target, ownedBy });
+  return new OneHasManyDefinition({ target, ownedBy });
 }
 export {
-  OneHasManyDefinitionImpl,
+  OneHasManyDefinition,
   oneHasMany
 };
 //# sourceMappingURL=OneHasManyDefinition.js.map

dist/production/src/model/definition/fieldDefinitions/OneHasOneDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class OneHasOneDefinitionImpl extends FieldDefinition {
+class OneHasOneDefinition extends FieldDefinition {
   constructor() {
@@ -54,10 +54,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new OneHasOneDefinition({ ...this.options, [key]: value });
+  }
 }
 function oneHasOne(target, inversedBy) {
-  return new OneHasOneDefinitionImpl({ target, inversedBy });
+  return new OneHasOneDefinition({ target, inversedBy });
 }
 export {
-  OneHasOneDefinitionImpl,
+  OneHasOneDefinition,
   oneHasOne
 };
 //# sourceMappingURL=OneHasOneDefinition.js.map

dist/production/src/model/definition/fieldDefinitions/OneHasOneInverseDefinition.js

@@ -6,3 +6,3 @@ import { Model } from "@contember/schema";
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
-class OneHasOneInverseDefinitionImpl extends FieldDefinition {
+class OneHasOneInverseDefinition extends FieldDefinition {
   constructor() {
@@ -25,14 +25,13 @@ super(...arguments);
   }
+  withOption(key, value) {
+    return new this.constructor({ ...this.options, [key]: value });
+  }
 }
 function oneHasOneInverse(target, ownedBy) {
-  return new OneHasOneInverseDefinitionImpl({ target, ownedBy });
+  return new OneHasOneInverseDefinition({ target, ownedBy });
 }
-function oneHasOneInversed(target, ownedBy) {
-  return new OneHasOneInverseDefinitionImpl({ target, ownedBy });
-}
 export {
-  OneHasOneInverseDefinitionImpl,
-  oneHasOneInverse,
-  oneHasOneInversed
+  OneHasOneInverseDefinition,
+  oneHasOneInverse
 };
 //# sourceMappingURL=OneHasOneInverseDefinition.js.map

dist/production/src/model/definition/index.js

@@ -10,8 +10,8 @@ import { Model } from "@contember/schema";
 import { FieldDefinition } from "./fieldDefinitions/FieldDefinition.js";
-import { ManyHasManyDefinitionImpl, manyHasMany } from "./fieldDefinitions/ManyHasManyDefinition.js";
-import { ManyHasManyInverseDefinitionImpl, manyHasManyInverse, manyHasManyInversed } from "./fieldDefinitions/ManyHasManyInverseDefinition.js";
-import { ManyHasOneDefinitionImpl, manyHasOne } from "./fieldDefinitions/ManyHasOneDefinition.js";
-import { OneHasManyDefinitionImpl, oneHasMany } from "./fieldDefinitions/OneHasManyDefinition.js";
-import { OneHasOneDefinitionImpl, oneHasOne } from "./fieldDefinitions/OneHasOneDefinition.js";
-import { OneHasOneInverseDefinitionImpl, oneHasOneInverse, oneHasOneInversed } from "./fieldDefinitions/OneHasOneInverseDefinition.js";
+import { ManyHasManyDefinition, manyHasMany } from "./fieldDefinitions/ManyHasManyDefinition.js";
+import { ManyHasManyInverseDefinition, manyHasManyInverse } from "./fieldDefinitions/ManyHasManyInverseDefinition.js";
+import { ManyHasOneDefinition, manyHasOne } from "./fieldDefinitions/ManyHasOneDefinition.js";
+import { OneHasManyDefinition, oneHasMany } from "./fieldDefinitions/OneHasManyDefinition.js";
+import { OneHasOneDefinition, oneHasOne } from "./fieldDefinitions/OneHasOneDefinition.js";
+import { OneHasOneInverseDefinition, oneHasOneInverse } from "./fieldDefinitions/OneHasOneInverseDefinition.js";
 import { DisableEventLog } from "./EventLogDefinition.js";
@@ -49,9 +49,9 @@ import { Index } from "./IndexDefinition.js";
   Index,
-  ManyHasManyDefinitionImpl,
-  ManyHasManyInverseDefinitionImpl,
-  ManyHasOneDefinitionImpl,
+  ManyHasManyDefinition,
+  ManyHasManyInverseDefinition,
+  ManyHasOneDefinition,
   OnDelete,
-  OneHasManyDefinitionImpl,
-  OneHasOneDefinitionImpl,
-  OneHasOneInverseDefinitionImpl,
+  OneHasManyDefinition,
+  OneHasOneDefinition,
+  OneHasOneInverseDefinition,
   OrderBy,
@@ -74,3 +74,2 @@ OrderDirection,
   manyHasManyInverse,
-  manyHasManyInversed,
   manyHasOne,
@@ -80,3 +79,2 @@ oneHasMany,
   oneHasOneInverse,
-  oneHasOneInversed,
   stringColumn,
@@ -83,0 +81,0 @@ uuidColumn

dist/types/index.d.ts

 import * as AclDefinition from './acl/definition';
+import { Role } from './acl/definition';
 import * as ActionsDefinition from './actions/definition';
@@ -10,2 +11,5 @@ import * as InputValidation from './validation';
 export * from './presets';
+export type { Role };
+export type { VariableDefinition } from './acl/definition';
+export type { ColumnDefinition, FieldDefinition, OneHasOneDefinition, OneHasOneInverseDefinition, OneHasManyDefinition, ManyHasOneDefinition, ManyHasManyDefinition, ManyHasManyInverseDefinition, EnumDefinition, } from './model/definition';
 export { AclDefinition, ActionsDefinition, SchemaDefinition, InputValidation, createSchema };
@@ -15,3 +19,3 @@ export declare const c: {
     Allow: <E, R extends AclDefinition.Role<string>>(role: R | R[], args: AclDefinition.AllowDefinition<E>) => import("./utils").DecoratorFunction<E>;
-    createRole: <Name extends string>(name: Name, options?: AclDefinition.RoleOptions) => AclDefinition.Role<Name>;
+    createRole: <Name extends string>(name: Name, options?: AclDefinition.RoleOptions) => Role<Name>;
     createConditionVariable: <R extends AclDefinition.Role<string>, Name extends string>(name: Name, roles: R | R[], fallback?: import("@contember/schema").Input.Condition) => AclDefinition.VariableDefinition<Name, R, import("@contember/schema").Acl.ConditionVariable>;
@@ -18,0 +22,0 @@ createEntityVariable: <R extends AclDefinition.Role<string>, Name extends string>(name: Name, entityName: string, roles: R | R[], fallback?: import("@contember/schema").Input.Condition) => AclDefinition.VariableDefinition<Name, R, import("@contember/schema").Acl.EntityVariable>;

dist/types/model/definition/fieldDefinitions/ColumnDefinition.d.ts

 import { Model } from '@contember/schema';
-import { Interface } from '../types';
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition';
@@ -8,13 +7,14 @@ import { EnumDefinition } from '../EnumDefinition';
     static create(type: Model.ColumnType, typeOptions?: ColumnTypeOptions): ColumnDefinition;
-    columnName(columnName: string): Interface<ColumnDefinition>;
-    columnType(columnType: string): Interface<ColumnDefinition>;
-    nullable(): Interface<ColumnDefinition>;
-    notNull(): Interface<ColumnDefinition>;
-    sequence(options?: Partial<Model.ColumnTypeDefinition['sequence']>): Interface<ColumnDefinition>;
+    columnName(columnName: string): ColumnDefinition;
+    columnType(columnType: string): ColumnDefinition;
+    nullable(): ColumnDefinition;
+    notNull(): ColumnDefinition;
+    sequence(options?: Partial<Model.ColumnTypeDefinition['sequence']>): ColumnDefinition;
     unique(options?: {
         timing?: Model.ConstraintTiming;
-    }): Interface<ColumnDefinition>;
-    default(value: ColumnDefinition['options']['default']): Interface<ColumnDefinition>;
-    typeAlias(alias: string): Interface<ColumnDefinition>;
+    }): ColumnDefinition;
+    default(value: ColumnDefinition['options']['default']): ColumnDefinition;
+    typeAlias(alias: string): ColumnDefinition;
     createField({ name, conventions, enumRegistry, entityName }: CreateFieldContext): Model.AnyField;
+    protected withOption<K extends keyof ColumnDefinitionOptions>(key: K, value: ColumnDefinitionOptions[K]): ColumnDefinition;
 }
@@ -21,0 +21,0 @@ export declare function column(type: Model.ColumnType, typeOptions?: ColumnTypeOptions): ColumnDefinition;

dist/types/model/definition/fieldDefinitions/FieldDefinition.d.ts

@@ -6,5 +6,2 @@ import { Model } from '@contember/schema';
     constructor(options: O);
-    protected withOption<K extends keyof O>(this: any, key: K, value: O[K]): {
-        [K in keyof this]: this[K];
-    };
     abstract createField(context: CreateFieldContext): Model.AnyField;
@@ -11,0 +8,0 @@ }

dist/types/model/definition/fieldDefinitions/ManyHasManyDefinition.d.ts

 import { Model } from '@contember/schema';
-import { EntityConstructor, Interface, RelationTarget } from '../types';
+import { EntityConstructor, RelationTarget } from '../types';
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition';
-export declare class ManyHasManyDefinitionImpl extends FieldDefinition<ManyHasManyDefinitionOptions> {
+export declare class ManyHasManyDefinition extends FieldDefinition<ManyHasManyDefinitionOptions> {
     type: "ManyHasManyDefinition";
-    inversedBy(inversedBy: string): Interface<ManyHasManyDefinition>;
-    joiningTable(joiningTable: Partial<Model.JoiningTable>): Interface<ManyHasManyDefinition>;
-    orderBy(field: string | string[], direction?: Model.OrderDirection | `${Model.OrderDirection}`): Interface<ManyHasManyDefinition>;
+    inversedBy(inversedBy: string): ManyHasManyDefinition;
+    joiningTable(joiningTable: Partial<Model.JoiningTable>): ManyHasManyDefinition;
+    orderBy(field: string | string[], direction?: Model.OrderDirection | `${Model.OrderDirection}`): ManyHasManyDefinition;
     createField({ name, conventions, entityName, entityRegistry, strictDefinitionValidator }: CreateFieldContext): Model.AnyField;
+    protected withOption<K extends keyof ManyHasManyDefinitionOptions>(key: K, value: ManyHasManyDefinitionOptions[K]): ManyHasManyDefinition;
 }
-export type ManyHasManyDefinition = Interface<ManyHasManyDefinitionImpl>;
 export declare function manyHasMany(target: EntityConstructor, inversedBy?: string): ManyHasManyDefinition;
@@ -13,0 +13,0 @@ export type ManyHasManyDefinitionOptions = {

dist/types/model/definition/fieldDefinitions/ManyHasManyInverseDefinition.d.ts

 import { Model } from '@contember/schema';
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition';
-import { EntityConstructor, Interface, RelationTarget } from '../types';
-export declare class ManyHasManyInverseDefinitionImpl extends FieldDefinition<ManyHasManyInverseDefinitionOptions> {
+import { EntityConstructor, RelationTarget } from '../types';
+export declare class ManyHasManyInverseDefinition extends FieldDefinition<ManyHasManyInverseDefinitionOptions> {
     type: "ManyHasManyInverseDefinition";
-    orderBy(field: string | string[], direction?: Model.OrderDirection | `${Model.OrderDirection}`): Interface<ManyHasManyInverseDefinition>;
+    orderBy(field: string | string[], direction?: Model.OrderDirection | `${Model.OrderDirection}`): ManyHasManyInverseDefinition;
     createField({ name, conventions, entityName, entityRegistry }: CreateFieldContext): Model.AnyField;
+    protected withOption<K extends keyof ManyHasManyInverseDefinitionOptions>(key: K, value: ManyHasManyInverseDefinitionOptions[K]): ManyHasManyInverseDefinition;
 }
-export type ManyHasManyInverseDefinition = Interface<ManyHasManyInverseDefinitionImpl>;
-/** @deprecated use ManyHasManyInverseDefinition */
-export type ManyHasManyInversedDefinition = Interface<ManyHasManyInverseDefinitionImpl>;
 export declare function manyHasManyInverse(target: EntityConstructor, ownedBy: string): ManyHasManyInverseDefinition;
-/** @deprecated use manyHasManyInverse */
-export declare function manyHasManyInversed(target: EntityConstructor, ownedBy: string): ManyHasManyInverseDefinition;
 export type ManyHasManyInverseDefinitionOptions = {
@@ -16,0 +12,0 @@ target: RelationTarget;

dist/types/model/definition/fieldDefinitions/ManyHasOneDefinition.d.ts

@@ -1,16 +0,16 @@
-import { EntityConstructor, Interface, RelationTarget } from '../types';
+import { EntityConstructor, RelationTarget } from '../types';
 import { Model } from '@contember/schema';
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition';
-export declare class ManyHasOneDefinitionImpl extends FieldDefinition<ManyHasOneDefinitionOptions> {
+export declare class ManyHasOneDefinition extends FieldDefinition<ManyHasOneDefinitionOptions> {
     type: "ManyHasOneDefinition";
-    inversedBy(inversedBy: string): Interface<ManyHasOneDefinition>;
-    joiningColumn(columnName: string): Interface<ManyHasOneDefinition>;
-    onDelete(onDelete: Model.OnDelete | `${Model.OnDelete}`): Interface<ManyHasOneDefinition>;
-    cascadeOnDelete(): Interface<ManyHasOneDefinition>;
-    setNullOnDelete(): Interface<ManyHasOneDefinition>;
-    restrictOnDelete(): Interface<ManyHasOneDefinition>;
-    notNull(): Interface<ManyHasOneDefinition>;
+    inversedBy(inversedBy: string): ManyHasOneDefinition;
+    joiningColumn(columnName: string): ManyHasOneDefinition;
+    onDelete(onDelete: Model.OnDelete | `${Model.OnDelete}`): ManyHasOneDefinition;
+    cascadeOnDelete(): ManyHasOneDefinition;
+    setNullOnDelete(): ManyHasOneDefinition;
+    restrictOnDelete(): ManyHasOneDefinition;
+    notNull(): ManyHasOneDefinition;
     createField({ name, conventions, entityName, entityRegistry, strictDefinitionValidator }: CreateFieldContext): Model.AnyField;
+    protected withOption<K extends keyof ManyHasOneDefinitionOptions>(key: K, value: ManyHasOneDefinitionOptions[K]): ManyHasOneDefinition;
 }
-export type ManyHasOneDefinition = Interface<ManyHasOneDefinitionImpl>;
 export declare function manyHasOne(target: EntityConstructor, inversedBy?: string): ManyHasOneDefinition;
@@ -17,0 +17,0 @@ export type ManyHasOneDefinitionOptions = {

dist/types/model/definition/fieldDefinitions/OneHasManyDefinition.d.ts

 import { Model } from '@contember/schema';
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition';
-import { EntityConstructor, Interface, RelationTarget } from '../types';
-export declare class OneHasManyDefinitionImpl extends FieldDefinition<OneHasManyDefinitionOptions> {
+import { EntityConstructor, RelationTarget } from '../types';
+export declare class OneHasManyDefinition extends FieldDefinition<OneHasManyDefinitionOptions> {
     type: "OneHasManyDefinition";
-    orderBy(field: string | string[], direction?: Model.OrderDirection | `${Model.OrderDirection}`): Interface<OneHasManyDefinition>;
+    orderBy(field: string | string[], direction?: Model.OrderDirection | `${Model.OrderDirection}`): OneHasManyDefinition;
     createField({ name, entityRegistry }: CreateFieldContext): Model.AnyField;
+    protected withOption<K extends keyof OneHasManyDefinitionOptions>(key: K, value: OneHasManyDefinitionOptions[K]): OneHasManyDefinition;
 }
-export type OneHasManyDefinition = Interface<OneHasManyDefinitionImpl>;
 export declare function oneHasMany(target: EntityConstructor, ownedBy: string): OneHasManyDefinition;
@@ -11,0 +11,0 @@ export type OneHasManyDefinitionOptions = {

dist/types/model/definition/fieldDefinitions/OneHasOneDefinition.d.ts

 import { Model } from '@contember/schema';
-import { EntityConstructor, Interface, RelationTarget } from '../types';
+import { EntityConstructor, RelationTarget } from '../types';
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition';
-export declare class OneHasOneDefinitionImpl extends FieldDefinition<OneHasOneDefinitionOptions> {
+export declare class OneHasOneDefinition extends FieldDefinition<OneHasOneDefinitionOptions> {
     type: "OneHasOneDefinition";
-    inversedBy(inversedBy: string): Interface<OneHasOneDefinition>;
-    joiningColumn(columnName: string): Interface<OneHasOneDefinition>;
-    onDelete(onDelete: Model.OnDelete | `${Model.OnDelete}`): Interface<OneHasOneDefinition>;
-    cascadeOnDelete(): Interface<OneHasOneDefinition>;
-    setNullOnDelete(): Interface<OneHasOneDefinition>;
-    restrictOnDelete(): Interface<OneHasOneDefinition>;
-    notNull(): Interface<OneHasOneDefinition>;
-    removeOrphan(): Interface<OneHasOneDefinition>;
+    inversedBy(inversedBy: string): OneHasOneDefinition;
+    joiningColumn(columnName: string): OneHasOneDefinition;
+    onDelete(onDelete: Model.OnDelete | `${Model.OnDelete}`): OneHasOneDefinition;
+    cascadeOnDelete(): OneHasOneDefinition;
+    setNullOnDelete(): OneHasOneDefinition;
+    restrictOnDelete(): OneHasOneDefinition;
+    notNull(): OneHasOneDefinition;
+    removeOrphan(): OneHasOneDefinition;
     createField({ name, conventions, entityRegistry, strictDefinitionValidator, entityName }: CreateFieldContext): Model.AnyField;
+    protected withOption<K extends keyof OneHasOneDefinitionOptions>(key: K, value: OneHasOneDefinitionOptions[K]): OneHasOneDefinition;
 }
-export type OneHasOneDefinition = Interface<OneHasOneDefinitionImpl>;
 export declare function oneHasOne(target: EntityConstructor, inversedBy?: string): OneHasOneDefinition;
@@ -18,0 +18,0 @@ export type OneHasOneDefinitionOptions = {

dist/types/model/definition/fieldDefinitions/OneHasOneInverseDefinition.d.ts

 import { Model } from '@contember/schema';
-import { EntityConstructor, Interface } from '../types';
+import { EntityConstructor } from '../types';
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition';
 import { RelationTarget } from '../types';
-export declare class OneHasOneInverseDefinitionImpl extends FieldDefinition<OneHasOneInverseDefinitionOptions> {
+export declare class OneHasOneInverseDefinition extends FieldDefinition<OneHasOneInverseDefinitionOptions> {
     type: "OneHasOneInverseDefinition";
-    notNull(): Interface<OneHasOneInverseDefinition>;
+    notNull(): OneHasOneInverseDefinition;
     createField({ name, conventions, entityRegistry }: CreateFieldContext): Model.AnyField;
+    protected withOption<K extends keyof OneHasOneInverseDefinitionOptions>(this: any, key: K, value: OneHasOneInverseDefinitionOptions[K]): OneHasOneInverseDefinition;
 }
-export type OneHasOneInverseDefinition = Interface<OneHasOneInverseDefinitionImpl>;
-/** @deprecated use OneHasOneInverseDefinition */
-export type OneHasOneInversedDefinition = Interface<OneHasOneInverseDefinitionImpl>;
 export declare function oneHasOneInverse(target: EntityConstructor, ownedBy: string): OneHasOneInverseDefinition;
-/** @deprecated use oneHasOneInverse */
-export declare function oneHasOneInversed(target: EntityConstructor, ownedBy: string): OneHasOneInverseDefinition;
 export type OneHasOneInverseDefinitionOptions = {
@@ -17,0 +13,0 @@ target: RelationTarget;

dist/types/model/definition/index.d.ts

@@ -1,2 +0,1 @@
-import { Interface } from './types';
 import { Model } from '@contember/schema';
@@ -16,3 +15,3 @@ import { EnumDefinition } from './EnumDefinition';
 export declare abstract class Entity {
-    [key: string]: Interface<FieldDefinition<any>> | undefined;
+    [key: string]: FieldDefinition<any> | undefined;
 }
@@ -19,0 +18,0 @@ export type ModelDefinition<M> = {

dist/types/model/definition/types.d.ts

@@ -0,9 +1,6 @@
+import { EntityConstructor } from '../../utils';
 import { FieldDefinition } from './fieldDefinitions';
-import { EntityConstructor } from '../../utils';
-export type Interface<T> = {
-    [P in keyof T]: T[P];
-};
 export type RelationTarget = EntityConstructor;
-export type FieldsDefinition = Record<string, Interface<FieldDefinition<any>>>;
+export type FieldsDefinition = Record<string, FieldDefinition<any>>;
 export { type EntityConstructor };
 //# sourceMappingURL=types.d.ts.map

package.json

 {
   "name": "@contember/schema-definition",
-  "version": "2.0.0-alpha.12",
+  "version": "2.0.0-alpha.13",
   "license": "Apache-2.0",
@@ -26,4 +26,4 @@ "main": "./dist/production/index.js",
   "dependencies": {
-    "@contember/schema": "2.0.0-alpha.12",
-    "@contember/schema-utils": "2.0.0-alpha.12",
+    "@contember/schema": "2.0.0-alpha.13",
+    "@contember/schema-utils": "2.0.0-alpha.13",
     "reflect-metadata": "^0.1.13"
@@ -30,0 +30,0 @@ },

src/index.ts

 import * as AclDefinition from './acl/definition'
+import { Role } from './acl/definition'
 import * as ActionsDefinition from './actions/definition'
@@ -12,2 +13,16 @@ import * as InputValidation from './validation'
 
+export type { Role }
+export type { VariableDefinition } from './acl/definition'
+export type {
+	ColumnDefinition,
+	FieldDefinition,
+	OneHasOneDefinition,
+	OneHasOneInverseDefinition,
+	OneHasManyDefinition,
+	ManyHasOneDefinition,
+	ManyHasManyDefinition,
+	ManyHasManyInverseDefinition,
+	EnumDefinition,
+} from './model/definition'
+
 export { AclDefinition, ActionsDefinition, SchemaDefinition, InputValidation, createSchema }
@@ -14,0 +29,0 @@

src/model/definition/fieldDefinitions/ColumnDefinition.ts

 import { Model } from '@contember/schema'
-import { Interface } from '../types'
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition'
@@ -10,2 +9,3 @@ import { EnumDefinition } from '../EnumDefinition'
 
+
 	public static create(
@@ -22,31 +22,31 @@ type: Model.ColumnType,
 
-	public columnName(columnName: string): Interface<ColumnDefinition> {
+	public columnName(columnName: string): ColumnDefinition {
 		return this.withOption('columnName', columnName)
 	}
 
-	public columnType(columnType: string): Interface<ColumnDefinition> {
+	public columnType(columnType: string): ColumnDefinition {
 		return this.withOption('columnType', columnType)
 	}
 
-	public nullable(): Interface<ColumnDefinition> {
+	public nullable(): ColumnDefinition {
 		return this.withOption('nullable', true)
 	}
 
-	public notNull(): Interface<ColumnDefinition> {
+	public notNull(): ColumnDefinition {
 		return this.withOption('nullable', false)
 	}
 
-	public sequence(options?: Partial<Model.ColumnTypeDefinition['sequence']>): Interface<ColumnDefinition> {
+	public sequence(options?: Partial<Model.ColumnTypeDefinition['sequence']>): ColumnDefinition {
 		return this.withOption('sequence', { precedence: 'BY DEFAULT', ...options })
 	}
 
-	public unique(options: { timing?: Model.ConstraintTiming } = {}): Interface<ColumnDefinition> {
+	public unique(options: { timing?: Model.ConstraintTiming } = {}): ColumnDefinition {
 		return this.withOption('unique', options)
 	}
 
-	public default(value: ColumnDefinition['options']['default']): Interface<ColumnDefinition> {
+	public default(value: ColumnDefinition['options']['default']): ColumnDefinition {
 		return this.withOption('default', value)
 	}
 
-	public typeAlias(alias: string): Interface<ColumnDefinition> {
+	public typeAlias(alias: string): ColumnDefinition {
 		return this.withOption('typeAlias', alias)
@@ -88,2 +88,6 @@ }
 	}
+
+	protected withOption<K extends keyof ColumnDefinitionOptions>(key: K, value: ColumnDefinitionOptions[K]): ColumnDefinition {
+		return new ColumnDefinition({ ...this.options, [key]: value })
+	}
 }
@@ -95,35 +99,35 @@
 
-export function stringColumn() {
+export function stringColumn(): ColumnDefinition {
 	return column(Model.ColumnType.String)
 }
 
-export function intColumn() {
+export function intColumn(): ColumnDefinition {
 	return column(Model.ColumnType.Int)
 }
 
-export function boolColumn() {
+export function boolColumn(): ColumnDefinition {
 	return column(Model.ColumnType.Bool)
 }
 
-export function doubleColumn() {
+export function doubleColumn(): ColumnDefinition {
 	return column(Model.ColumnType.Double)
 }
 
-export function dateColumn() {
+export function dateColumn(): ColumnDefinition {
 	return column(Model.ColumnType.Date)
 }
 
-export function dateTimeColumn() {
+export function dateTimeColumn(): ColumnDefinition {
 	return column(Model.ColumnType.DateTime)
 }
 
-export function jsonColumn() {
+export function jsonColumn(): ColumnDefinition {
 	return column(Model.ColumnType.Json)
 }
 
-export function enumColumn(enumDefinition: EnumDefinition) {
+export function enumColumn(enumDefinition: EnumDefinition): ColumnDefinition {
 	return column(Model.ColumnType.Enum, { enumDefinition })
 }
 
-export function uuidColumn() {
+export function uuidColumn(): ColumnDefinition {
 	return column(Model.ColumnType.Uuid)
@@ -130,0 +134,0 @@ }

src/model/definition/fieldDefinitions/FieldDefinition.ts

@@ -5,8 +5,4 @@ import { Model } from '@contember/schema'
 export abstract class FieldDefinition<O> {
-	constructor(public readonly options: O) {}
-
-	protected withOption<K extends keyof O>(this: any, key: K, value: O[K]): { [K in keyof this]: this[K] } {
-		return new this.constructor({ ...this.options, [key]: value })
+	constructor(public readonly options: O) {
 	}
-
 	abstract createField(context: CreateFieldContext): Model.AnyField
@@ -13,0 +9,0 @@ }

src/model/definition/fieldDefinitions/ManyHasManyDefinition.ts

 import { Model } from '@contember/schema'
-import { EntityConstructor, Interface, RelationTarget } from '../types'
+import { EntityConstructor, RelationTarget } from '../types'
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition'
 
-export class ManyHasManyDefinitionImpl extends FieldDefinition<ManyHasManyDefinitionOptions> {
+export class ManyHasManyDefinition extends FieldDefinition<ManyHasManyDefinitionOptions> {
 	type = 'ManyHasManyDefinition' as const
 
-	inversedBy(inversedBy: string): Interface<ManyHasManyDefinition> {
+	inversedBy(inversedBy: string): ManyHasManyDefinition {
 		return this.withOption('inversedBy', inversedBy)
 	}
 
-	joiningTable(joiningTable: Partial<Model.JoiningTable>): Interface<ManyHasManyDefinition> {
+	joiningTable(joiningTable: Partial<Model.JoiningTable>): ManyHasManyDefinition {
 		return this.withOption('joiningTable', joiningTable)
@@ -19,3 +19,3 @@ }
 		direction: Model.OrderDirection | `${Model.OrderDirection}` = Model.OrderDirection.asc,
-	): Interface<ManyHasManyDefinition> {
+	): ManyHasManyDefinition {
 		const path = typeof field === 'string' ? [field] : field
@@ -52,8 +52,12 @@ return this.withOption('orderBy', [...(this.options.orderBy || []), { path, direction: direction as Model.OrderDirection }])
 	}
+
+
+	protected withOption<K extends keyof ManyHasManyDefinitionOptions>(key: K, value: ManyHasManyDefinitionOptions[K]): ManyHasManyDefinition {
+		return new ManyHasManyDefinition({ ...this.options, [key]: value })
+	}
 }
 
-export type ManyHasManyDefinition = Interface<ManyHasManyDefinitionImpl>
 
 export function manyHasMany(target: EntityConstructor, inversedBy?: string): ManyHasManyDefinition {
-	return new ManyHasManyDefinitionImpl({ target, inversedBy })
+	return new ManyHasManyDefinition({ target, inversedBy })
 }
@@ -60,0 +64,0 @@

src/model/definition/fieldDefinitions/ManyHasManyInverseDefinition.ts

 import { Model } from '@contember/schema'
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition'
-import { EntityConstructor, Interface, RelationTarget } from '../types'
+import { EntityConstructor, RelationTarget } from '../types'
 
-export class ManyHasManyInverseDefinitionImpl extends FieldDefinition<ManyHasManyInverseDefinitionOptions> {
+export class ManyHasManyInverseDefinition extends FieldDefinition<ManyHasManyInverseDefinitionOptions> {
 	type = 'ManyHasManyInverseDefinition' as const
@@ -11,3 +11,3 @@
 		direction: Model.OrderDirection | `${Model.OrderDirection}` = Model.OrderDirection.asc,
-	): Interface<ManyHasManyInverseDefinition> {
+	): ManyHasManyInverseDefinition {
 		const path = typeof field === 'string' ? [field] : field
@@ -27,17 +27,13 @@ return this.withOption('orderBy', [...(this.options.orderBy || []), { path, direction: direction as Model.OrderDirection }])
 	}
+
+	protected withOption<K extends keyof ManyHasManyInverseDefinitionOptions>(key: K, value: ManyHasManyInverseDefinitionOptions[K]): ManyHasManyInverseDefinition {
+		return new ManyHasManyInverseDefinition({ ...this.options, [key]: value })
+	}
 }
 
-export type ManyHasManyInverseDefinition = Interface<ManyHasManyInverseDefinitionImpl>
-/** @deprecated use ManyHasManyInverseDefinition */
-export type ManyHasManyInversedDefinition = Interface<ManyHasManyInverseDefinitionImpl>
 
 export function manyHasManyInverse(target: EntityConstructor, ownedBy: string): ManyHasManyInverseDefinition {
-	return new ManyHasManyInverseDefinitionImpl({ target, ownedBy })
+	return new ManyHasManyInverseDefinition({ target, ownedBy })
 }
 
-/** @deprecated use manyHasManyInverse */
-export function manyHasManyInversed(target: EntityConstructor, ownedBy: string): ManyHasManyInverseDefinition {
-	return new ManyHasManyInverseDefinitionImpl({ target, ownedBy })
-}
-
 export type ManyHasManyInverseDefinitionOptions = {
@@ -44,0 +40,0 @@ target: RelationTarget

src/model/definition/fieldDefinitions/ManyHasOneDefinition.ts

@@ -1,33 +0,33 @@
-import { EntityConstructor, Interface, RelationTarget } from '../types'
+import { EntityConstructor,  RelationTarget } from '../types'
 import { Model } from '@contember/schema'
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition'
 
-export class ManyHasOneDefinitionImpl extends FieldDefinition<ManyHasOneDefinitionOptions> {
+export class ManyHasOneDefinition extends FieldDefinition<ManyHasOneDefinitionOptions> {
 	type = 'ManyHasOneDefinition' as const
 
-	inversedBy(inversedBy: string): Interface<ManyHasOneDefinition> {
+	inversedBy(inversedBy: string): ManyHasOneDefinition {
 		return this.withOption('inversedBy', inversedBy)
 	}
 
-	joiningColumn(columnName: string): Interface<ManyHasOneDefinition> {
+	joiningColumn(columnName: string): ManyHasOneDefinition {
 		return this.withOption('joiningColumn', { ...this.options.joiningColumn, columnName })
 	}
 
-	onDelete(onDelete: Model.OnDelete | `${Model.OnDelete}`): Interface<ManyHasOneDefinition> {
+	onDelete(onDelete: Model.OnDelete | `${Model.OnDelete}`): ManyHasOneDefinition {
 		return this.withOption('joiningColumn', { ...this.options.joiningColumn, onDelete: onDelete as Model.OnDelete })
 	}
 
-	cascadeOnDelete(): Interface<ManyHasOneDefinition> {
+	cascadeOnDelete(): ManyHasOneDefinition {
 		return this.withOption('joiningColumn', { ...this.options.joiningColumn, onDelete: Model.OnDelete.cascade })
 	}
 
-	setNullOnDelete(): Interface<ManyHasOneDefinition> {
+	setNullOnDelete(): ManyHasOneDefinition {
 		return this.withOption('joiningColumn', { ...this.options.joiningColumn, onDelete: Model.OnDelete.setNull })
 	}
 
-	restrictOnDelete(): Interface<ManyHasOneDefinition> {
+	restrictOnDelete(): ManyHasOneDefinition {
 		return this.withOption('joiningColumn', { ...this.options.joiningColumn, onDelete: Model.OnDelete.restrict })
 	}
 
-	notNull(): Interface<ManyHasOneDefinition> {
+	notNull(): ManyHasOneDefinition {
 		return this.withOption('nullable', false)
@@ -54,8 +54,10 @@ }
 	}
+
+	protected withOption<K extends keyof ManyHasOneDefinitionOptions>(key: K, value: ManyHasOneDefinitionOptions[K]): ManyHasOneDefinition {
+		return new ManyHasOneDefinition({ ...this.options, [key]: value })
+	}
 }
 
-export type ManyHasOneDefinition = Interface<ManyHasOneDefinitionImpl>
-
 export function manyHasOne(target: EntityConstructor, inversedBy?: string): ManyHasOneDefinition {
-	return new ManyHasOneDefinitionImpl({ target, inversedBy })
+	return new ManyHasOneDefinition({ target, inversedBy })
 }
@@ -62,0 +64,0 @@

src/model/definition/fieldDefinitions/OneHasManyDefinition.ts

 import { Model } from '@contember/schema'
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition'
-import { EntityConstructor, Interface, RelationTarget } from '../types'
+import { EntityConstructor, RelationTarget } from '../types'
 
-export class OneHasManyDefinitionImpl extends FieldDefinition<OneHasManyDefinitionOptions> {
+export class OneHasManyDefinition extends FieldDefinition<OneHasManyDefinitionOptions> {
 	type = 'OneHasManyDefinition' as const
@@ -11,3 +11,3 @@
 		direction: Model.OrderDirection | `${Model.OrderDirection}` = Model.OrderDirection.asc,
-	): Interface<OneHasManyDefinition> {
+	): OneHasManyDefinition {
 		const path = typeof field === 'string' ? [field] : field
@@ -26,8 +26,11 @@ return this.withOption('orderBy', [...(this.options.orderBy || []), { path, direction: direction as Model.OrderDirection }])
 	}
+
+	protected withOption<K extends keyof OneHasManyDefinitionOptions>(key: K, value: OneHasManyDefinitionOptions[K]): OneHasManyDefinition {
+		return new OneHasManyDefinition({ ...this.options, [key]: value })
+	}
 }
 
-export type OneHasManyDefinition = Interface<OneHasManyDefinitionImpl>
 
 export function oneHasMany(target: EntityConstructor, ownedBy: string): OneHasManyDefinition {
-	return new OneHasManyDefinitionImpl({ target, ownedBy })
+	return new OneHasManyDefinition({ target, ownedBy })
 }
@@ -34,0 +37,0 @@

src/model/definition/fieldDefinitions/OneHasOneDefinition.ts

 import { Model } from '@contember/schema'
-import { EntityConstructor, Interface, RelationTarget } from '../types'
+import { EntityConstructor, RelationTarget } from '../types'
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition'
 
-export class OneHasOneDefinitionImpl extends FieldDefinition<OneHasOneDefinitionOptions> {
+export class OneHasOneDefinition extends FieldDefinition<OneHasOneDefinitionOptions> {
 	type = 'OneHasOneDefinition' as const
 
-	inversedBy(inversedBy: string): Interface<OneHasOneDefinition> {
+
+	inversedBy(inversedBy: string): OneHasOneDefinition {
 		return this.withOption('inversedBy', inversedBy)
 	}
 
-	joiningColumn(columnName: string): Interface<OneHasOneDefinition> {
+	joiningColumn(columnName: string): OneHasOneDefinition {
 		return this.withOption('joiningColumn', { ...this.joiningColumn, columnName })
 	}
 
-	onDelete(onDelete: Model.OnDelete | `${Model.OnDelete}`): Interface<OneHasOneDefinition> {
+	onDelete(onDelete: Model.OnDelete | `${Model.OnDelete}`): OneHasOneDefinition {
 		return this.withOption('joiningColumn', { ...this.joiningColumn, onDelete: onDelete as Model.OnDelete })
 	}
 
-	cascadeOnDelete(): Interface<OneHasOneDefinition> {
+	cascadeOnDelete(): OneHasOneDefinition {
 		return this.withOption('joiningColumn', { ...this.options.joiningColumn, onDelete: Model.OnDelete.cascade })
 	}
 
-	setNullOnDelete(): Interface<OneHasOneDefinition> {
+	setNullOnDelete(): OneHasOneDefinition {
 		return this.withOption('joiningColumn', { ...this.options.joiningColumn, onDelete: Model.OnDelete.setNull })
 	}
 
-	restrictOnDelete(): Interface<OneHasOneDefinition> {
+	restrictOnDelete(): OneHasOneDefinition {
 		return this.withOption('joiningColumn', { ...this.options.joiningColumn, onDelete: Model.OnDelete.restrict })
 	}
 
-	notNull(): Interface<OneHasOneDefinition> {
+	notNull(): OneHasOneDefinition {
 		return this.withOption('nullable', false)
 	}
 
-	removeOrphan(): Interface<OneHasOneDefinition> {
+	removeOrphan(): OneHasOneDefinition {
 		return this.withOption('orphanRemoval', true)
@@ -60,8 +61,11 @@ }
 	}
+
+	protected withOption<K extends keyof OneHasOneDefinitionOptions>(key: K, value: OneHasOneDefinitionOptions[K]): OneHasOneDefinition {
+		return new OneHasOneDefinition({ ...this.options, [key]: value })
+	}
 }
 
-export type OneHasOneDefinition = Interface<OneHasOneDefinitionImpl>
 
 export function oneHasOne(target: EntityConstructor, inversedBy?: string): OneHasOneDefinition {
-	return new OneHasOneDefinitionImpl({ target, inversedBy })
+	return new OneHasOneDefinition({ target, inversedBy })
 }
@@ -68,0 +72,0 @@

src/model/definition/fieldDefinitions/OneHasOneInverseDefinition.ts

 import { Model } from '@contember/schema'
-import { EntityConstructor, Interface } from '../types'
+import { EntityConstructor } from '../types'
 import { CreateFieldContext, FieldDefinition } from './FieldDefinition'
 import { RelationTarget } from '../types'
 
-export class OneHasOneInverseDefinitionImpl extends FieldDefinition<OneHasOneInverseDefinitionOptions> {
+export class OneHasOneInverseDefinition extends FieldDefinition<OneHasOneInverseDefinitionOptions> {
 	type = 'OneHasOneInverseDefinition' as const
 
-	notNull(): Interface<OneHasOneInverseDefinition> {
+	notNull() {
 		return this.withOption('nullable', false)
@@ -23,16 +23,13 @@ }
 	}
+
+	protected withOption<K extends keyof OneHasOneInverseDefinitionOptions>(this: any, key: K, value: OneHasOneInverseDefinitionOptions[K]): OneHasOneInverseDefinition {
+		return new this.constructor({ ...this.options, [key]: value })
+	}
 }
 
-export type OneHasOneInverseDefinition = Interface<OneHasOneInverseDefinitionImpl>
-/** @deprecated use OneHasOneInverseDefinition */
-export type OneHasOneInversedDefinition = Interface<OneHasOneInverseDefinitionImpl>
 
 export function oneHasOneInverse(target: EntityConstructor, ownedBy: string): OneHasOneInverseDefinition {
-	return new OneHasOneInverseDefinitionImpl({ target, ownedBy })
+	return new OneHasOneInverseDefinition({ target, ownedBy })
 }
 
-/** @deprecated use oneHasOneInverse */
-export function oneHasOneInversed(target: EntityConstructor, ownedBy: string): OneHasOneInverseDefinition {
-	return new OneHasOneInverseDefinitionImpl({ target, ownedBy })
-}
 
@@ -39,0 +36,0 @@ export type OneHasOneInverseDefinitionOptions = {

src/model/definition/index.ts

@@ -1,2 +0,1 @@
-import { Interface } from './types'
 import { Model } from '@contember/schema'
@@ -21,3 +20,3 @@ import { EnumDefinition } from './EnumDefinition'
 export abstract class Entity {
-	[key: string]: Interface<FieldDefinition<any>> | undefined
+	[key: string]: FieldDefinition<any> | undefined
 }
@@ -24,0 +23,0 @@

src/model/definition/types.ts

@@ -0,7 +1,6 @@
+import { EntityConstructor } from '../../utils'
 import { FieldDefinition } from './fieldDefinitions'
-import { EntityConstructor } from '../../utils'
 
-export type Interface<T> = { [P in keyof T]: T[P] }
 export type RelationTarget = EntityConstructor
-export type FieldsDefinition = Record<string, Interface<FieldDefinition<any>>>
+export type FieldsDefinition = Record<string, FieldDefinition<any>>
 export { type EntityConstructor }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1614879

increased by0.17%

Lines of code

16639

increased by0.2%

Dependency changes

• + Added@contember/schema@2.0.0-alpha.13(transitive)

• + Added@contember/schema-utils@2.0.0-alpha.13(transitive)

• + Added@contember/typesafe@2.0.0-alpha.13(transitive)

• - Removed@contember/schema@2.0.0-alpha.12(transitive)

• - Removed@contember/schema-utils@2.0.0-alpha.12(transitive)

• - Removed@contember/typesafe@2.0.0-alpha.12(transitive)

• Updated@contember/schema@2.0.0-alpha.13

• Updated@contember/schema-utils@2.0.0-alpha.13