@contember/engine-tenant-api 2.0.0-alpha.15 → 2.0.0-alpha.16

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

@@ -1 +1 @@
-{"version":3,"file":"batchQuery.d.ts","sourceRoot":"","sources":["../../../src/utils/batchQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,MAAM,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAEhE,MAAM,MAAM,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,eAAe,KAAK,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC,CAAA;AACnK,eAAO,MAAM,WAAW,GAAI,GAAG,EAAE,MAAM,EAAE,IAAI,kCADqC,eAAe,KAAK,OAAO,QAAQ,oFAClB,CAAA;AAEnG,eAAO,MAAM,eAAe,GAAI,GAAG,EAAE,MAAM,EAAE,IAAI,2BACvB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MACvD,eAAe,KACjB,UAAU,CAAC,GAAG,EAAE,IAAI,CAiBtB,CAAA"}
+{"version":3,"file":"batchQuery.d.ts","sourceRoot":"","sources":["../../../src/utils/batchQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,MAAM,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAEhE,MAAM,MAAM,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,eAAe,KAAK,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC,CAAA;AACnK,eAAO,MAAM,WAAW,GAAI,GAAG,EAAE,MAAM,EAAE,IAAI,kCADqC,eAAe,wGACE,CAAA;AAEnG,eAAO,MAAM,eAAe,GAAI,GAAG,EAAE,MAAM,EAAE,IAAI,2BACvB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MACvD,eAAe,KACjB,UAAU,CAAC,GAAG,EAAE,IAAI,CAiBtB,CAAA"}

package/{graphql-tenant.codegen.yml → graphql.codegen.yml}

@@ -14,4 +14,4 @@ generates:
       - "typescript-resolvers"
 hooks:
   afterAllFileWrite:
-    - eslint --fix
+    - yarn run -T eslint --fix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-tenant-api",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.16",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -23,38 +23,34 @@
     }
   },
   "scripts": {
-    "generate": "gql-gen --config graphql-tenant.codegen.yml"
+    "generate": "gql-gen --config graphql.codegen.yml"
   },
   "dependencies": {
-    "@contember/authorization": "2.0.0-alpha.15",
-    "@contember/config-loader": "2.0.0-alpha.15",
-    "@contember/database": "2.0.0-alpha.15",
-    "@contember/database-migrations": "2.0.0-alpha.15",
-    "@contember/dic": "2.0.0-alpha.15",
-    "@contember/graphql-utils": "2.0.0-alpha.15",
-    "@contember/logger": "2.0.0-alpha.15",
-    "@contember/schema": "2.0.0-alpha.15",
-    "@contember/schema-utils": "2.0.0-alpha.15",
-    "@contember/typesafe": "2.0.0-alpha.15",
-    "@graphql-tools/utils": "^10.0.8",
+    "@contember/authorization": "2.0.0-alpha.16",
+    "@contember/config-loader": "2.0.0-alpha.16",
+    "@contember/database": "2.0.0-alpha.16",
+    "@contember/database-migrations": "2.0.0-alpha.16",
+    "@contember/dic": "2.0.0-alpha.16",
+    "@contember/graphql-utils": "2.0.0-alpha.16",
+    "@contember/logger": "2.0.0-alpha.16",
+    "@contember/schema": "2.0.0-alpha.16",
+    "@contember/schema-utils": "2.0.0-alpha.16",
+    "@contember/typesafe": "2.0.0-alpha.16",
+    "@graphql-tools/utils": "^10.5.4",
     "graphql-tag": "^2.12.6",
-    "jose": "^5.1.1",
+    "jose": "^5.8.0",
     "mustache": "^4.2.0",
-    "nodemailer": "^6.9.7",
-    "openid-client": "^5.6.1",
-    "otpauth": "^9.1.5"
+    "nodemailer": "^6.9.15",
+    "openid-client": "^5.7.0",
+    "otpauth": "^9.3.2"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.0.0-alpha.15",
-    "@graphql-codegen/cli": "^5.0.0",
-    "@graphql-codegen/typescript": "^4.0.1",
-    "@graphql-codegen/typescript-operations": "^4.0.1",
-    "@graphql-codegen/typescript-resolvers": "^4.0.1",
-    "@graphql-tools/schema": "^10.0.0",
+    "@contember/database-tester": "2.0.0-alpha.16",
+    "@graphql-tools/schema": "^10.0.6",
     "@types/mustache": "^4.2.5",
-    "@types/node": "^20.9.0",
-    "@types/nodemailer": "^6.4.14",
-    "graphql": "^16.8.1"
+    "@types/node": "^20.16.5",
+    "@types/nodemailer": "^6.4.15",
+    "graphql": "^16.9.0"
   },
   "peerDependencies": {
     "graphql": ">= 14.6.0",

package/src/resolvers/types/ProjectTypeResolver.ts

@@ -48,11 +48,11 @@ export class ProjectTypeResolver implements ProjectResolvers {
 			variables: Object.entries(getRoleVariables(role, schema.acl)).map(([name, variableDef]) => {
 				switch (variableDef.type) {
 					case Acl.VariableType.entity:
-						return { __typename: 'RoleEntityVariableDefinition', name, entityName: variableDef.entityName }
+						return { __typename: 'RoleEntityVariableDefinition' as const, name, entityName: variableDef.entityName }
 					case Acl.VariableType.predefined:
-						return { __typename: 'RolePredefinedVariableDefinition', name, value: variableDef.value }
+						return { __typename: 'RolePredefinedVariableDefinition' as const, name, value: variableDef.value }
 					case Acl.VariableType.condition:
-						return { __typename: 'RoleConditionVariableDefinition', name }
+						return { __typename: 'RoleConditionVariableDefinition' as const, name }
 				}
 			}),
 		}))

package/src/schema/index.ts

@@ -6,6 +6,7 @@ export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?:
 export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> }
 export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never }
 export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never }
+export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>
 export type RequireFields<T, K extends keyof T> = Omit<T, K> & { [P in K]-?: NonNullable<T[P]> }
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
@@ -1520,7 +1521,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
 
 
 /** Mapping of interface types */
-export type ResolversInterfaceTypes<RefType extends Record<string, unknown>> = {
+export type ResolversInterfaceTypes<_RefType extends Record<string, unknown>> = {
 	CommonSignInResult: (CreateSessionTokenResult) | (SignInIdpResult) | (SignInPasswordlessResult) | (SignInResult)
 	RoleVariableDefinition: (RoleConditionVariableDefinition) | (RoleEntityVariableDefinition) | (RolePredefinedVariableDefinition)
 }
@@ -1532,8 +1533,8 @@ export type ResolversTypes = {
 	ActivatePasswordlessOtpResponse: ResolverTypeWrapper<ActivatePasswordlessOtpResponse>
 	AddGlobalIdentityRolesError: ResolverTypeWrapper<AddGlobalIdentityRolesError>
 	AddGlobalIdentityRolesErrorCode: AddGlobalIdentityRolesErrorCode
-	AddGlobalIdentityRolesResponse: ResolverTypeWrapper<AddGlobalIdentityRolesResponse>
-	AddGlobalIdentityRolesResult: ResolverTypeWrapper<AddGlobalIdentityRolesResult>
+	AddGlobalIdentityRolesResponse: ResolverTypeWrapper<Omit<AddGlobalIdentityRolesResponse, 'result'> & { result?: Maybe<ResolversTypes['AddGlobalIdentityRolesResult']> }>
+	AddGlobalIdentityRolesResult: ResolverTypeWrapper<Omit<AddGlobalIdentityRolesResult, 'identity'> & { identity: ResolversTypes['Identity'] }>
 	AddIDPError: ResolverTypeWrapper<AddIdpError>
 	AddIDPErrorCode: AddIdpErrorCode
 	AddIDPResponse: ResolverTypeWrapper<AddIdpResponse>
@@ -1543,8 +1544,8 @@ export type ResolversTypes = {
 	AddProjectMemberError: ResolverTypeWrapper<AddProjectMemberError>
 	AddProjectMemberErrorCode: AddProjectMemberErrorCode
 	AddProjectMemberResponse: ResolverTypeWrapper<AddProjectMemberResponse>
-	ApiKey: ResolverTypeWrapper<ApiKey>
-	ApiKeyWithToken: ResolverTypeWrapper<ApiKeyWithToken>
+	ApiKey: ResolverTypeWrapper<Omit<ApiKey, 'identity'> & { identity: ResolversTypes['Identity'] }>
+	ApiKeyWithToken: ResolverTypeWrapper<Omit<ApiKeyWithToken, 'identity'> & { identity: ResolversTypes['Identity'] }>
 	Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>
 	ChangeMyPasswordError: ResolverTypeWrapper<ChangeMyPasswordError>
 	ChangeMyPasswordErrorCode: ChangeMyPasswordErrorCode
@@ -1574,16 +1575,16 @@ export type ResolversTypes = {
 	ConfirmOtpResponse: ResolverTypeWrapper<ConfirmOtpResponse>
 	CreateApiKeyError: ResolverTypeWrapper<CreateApiKeyError>
 	CreateApiKeyErrorCode: CreateApiKeyErrorCode
-	CreateApiKeyResponse: ResolverTypeWrapper<CreateApiKeyResponse>
-	CreateApiKeyResult: ResolverTypeWrapper<CreateApiKeyResult>
+	CreateApiKeyResponse: ResolverTypeWrapper<Omit<CreateApiKeyResponse, 'result'> & { result?: Maybe<ResolversTypes['CreateApiKeyResult']> }>
+	CreateApiKeyResult: ResolverTypeWrapper<Omit<CreateApiKeyResult, 'apiKey'> & { apiKey: ResolversTypes['ApiKeyWithToken'] }>
 	CreatePasswordResetRequestError: ResolverTypeWrapper<CreatePasswordResetRequestError>
 	CreatePasswordResetRequestErrorCode: CreatePasswordResetRequestErrorCode
 	CreatePasswordResetRequestResponse: ResolverTypeWrapper<CreatePasswordResetRequestResponse>
 	CreateProjectOptions: CreateProjectOptions
-	CreateProjectResponse: ResolverTypeWrapper<CreateProjectResponse>
+	CreateProjectResponse: ResolverTypeWrapper<Omit<CreateProjectResponse, 'result'> & { result?: Maybe<ResolversTypes['CreateProjectResult']> }>
 	CreateProjectResponseError: ResolverTypeWrapper<CreateProjectResponseError>
 	CreateProjectResponseErrorCode: CreateProjectResponseErrorCode
-	CreateProjectResult: ResolverTypeWrapper<CreateProjectResult>
+	CreateProjectResult: ResolverTypeWrapper<Omit<CreateProjectResult, 'deployerApiKey'> & { deployerApiKey?: Maybe<ResolversTypes['ApiKeyWithToken']> }>
 	CreateResetPasswordRequestOptions: CreateResetPasswordRequestOptions
 	CreateSessionTokenError: ResolverTypeWrapper<CreateSessionTokenError>
 	CreateSessionTokenErrorCode: CreateSessionTokenErrorCode
@@ -1608,9 +1609,9 @@ export type ResolversTypes = {
 	IDPOptions: IdpOptions
 	IDPOptionsOutput: ResolverTypeWrapper<IdpOptionsOutput>
 	IDPResponseInput: IdpResponseInput
-	Identity: ResolverTypeWrapper<Identity>
+	Identity: ResolverTypeWrapper<Omit<Identity, 'apiKey' | 'projects'> & { apiKey?: Maybe<ResolversTypes['ApiKey']>; projects: ReadonlyArray<ResolversTypes['IdentityProjectRelation']> }>
 	IdentityGlobalPermissions: ResolverTypeWrapper<IdentityGlobalPermissions>
-	IdentityProjectRelation: ResolverTypeWrapper<IdentityProjectRelation>
+	IdentityProjectRelation: ResolverTypeWrapper<Omit<IdentityProjectRelation, 'project'> & { project: ResolversTypes['Project'] }>
 	IdentityProvider: ResolverTypeWrapper<IdentityProvider>
 	InitSignInIDPError: ResolverTypeWrapper<InitSignInIdpError>
 	InitSignInIDPErrorCode: InitSignInIdpErrorCode
@@ -1640,19 +1641,19 @@ export type ResolversTypes = {
 	MembershipValidationErrorCode: MembershipValidationErrorCode
 	Mutation: ResolverTypeWrapper<{}>
 	PasswordlessValidationType: PasswordlessValidationType
-	Person: ResolverTypeWrapper<Person>
+	Person: ResolverTypeWrapper<Omit<Person, 'identity'> & { identity: ResolversTypes['Identity'] }>
 	PrepareOtpResponse: ResolverTypeWrapper<PrepareOtpResponse>
 	PrepareOtpResult: ResolverTypeWrapper<PrepareOtpResult>
-	Project: ResolverTypeWrapper<Project>
-	ProjectIdentityRelation: ResolverTypeWrapper<ProjectIdentityRelation>
+	Project: ResolverTypeWrapper<Omit<Project, 'members' | 'roles'> & { members: ReadonlyArray<ResolversTypes['ProjectIdentityRelation']>; roles: ReadonlyArray<ResolversTypes['RoleDefinition']> }>
+	ProjectIdentityRelation: ResolverTypeWrapper<Omit<ProjectIdentityRelation, 'identity'> & { identity: ResolversTypes['Identity'] }>
 	ProjectMembersFilter: ProjectMembersFilter
 	ProjectMembersInput: ProjectMembersInput
 	ProjectSecret: ProjectSecret
 	Query: ResolverTypeWrapper<{}>
 	RemoveGlobalIdentityRolesError: ResolverTypeWrapper<RemoveGlobalIdentityRolesError>
 	RemoveGlobalIdentityRolesErrorCode: RemoveGlobalIdentityRolesErrorCode
-	RemoveGlobalIdentityRolesResponse: ResolverTypeWrapper<RemoveGlobalIdentityRolesResponse>
-	RemoveGlobalIdentityRolesResult: ResolverTypeWrapper<RemoveGlobalIdentityRolesResult>
+	RemoveGlobalIdentityRolesResponse: ResolverTypeWrapper<Omit<RemoveGlobalIdentityRolesResponse, 'result'> & { result?: Maybe<ResolversTypes['RemoveGlobalIdentityRolesResult']> }>
+	RemoveGlobalIdentityRolesResult: ResolverTypeWrapper<Omit<RemoveGlobalIdentityRolesResult, 'identity'> & { identity: ResolversTypes['Identity'] }>
 	RemoveMailTemplateError: ResolverTypeWrapper<RemoveMailTemplateError>
 	RemoveMailTemplateErrorCode: RemoveMailTemplateErrorCode
 	RemoveMailTemplateResponse: ResolverTypeWrapper<RemoveMailTemplateResponse>
@@ -1663,7 +1664,7 @@ export type ResolversTypes = {
 	ResetPasswordErrorCode: ResetPasswordErrorCode
 	ResetPasswordResponse: ResolverTypeWrapper<ResetPasswordResponse>
 	RoleConditionVariableDefinition: ResolverTypeWrapper<RoleConditionVariableDefinition>
-	RoleDefinition: ResolverTypeWrapper<RoleDefinition>
+	RoleDefinition: ResolverTypeWrapper<Omit<RoleDefinition, 'variables'> & { variables: ReadonlyArray<ResolversTypes['RoleVariableDefinition']> }>
 	RoleEntityVariableDefinition: ResolverTypeWrapper<RoleEntityVariableDefinition>
 	RolePredefinedVariableDefinition: ResolverTypeWrapper<RolePredefinedVariableDefinition>
 	RoleVariableDefinition: ResolverTypeWrapper<ResolversInterfaceTypes<ResolversTypes>['RoleVariableDefinition']>
@@ -1712,16 +1713,16 @@ export type ResolversParentTypes = {
 	ActivatePasswordlessOtpError: ActivatePasswordlessOtpError
 	ActivatePasswordlessOtpResponse: ActivatePasswordlessOtpResponse
 	AddGlobalIdentityRolesError: AddGlobalIdentityRolesError
-	AddGlobalIdentityRolesResponse: AddGlobalIdentityRolesResponse
-	AddGlobalIdentityRolesResult: AddGlobalIdentityRolesResult
+	AddGlobalIdentityRolesResponse: Omit<AddGlobalIdentityRolesResponse, 'result'> & { result?: Maybe<ResolversParentTypes['AddGlobalIdentityRolesResult']> }
+	AddGlobalIdentityRolesResult: Omit<AddGlobalIdentityRolesResult, 'identity'> & { identity: ResolversParentTypes['Identity'] }
 	AddIDPError: AddIdpError
 	AddIDPResponse: AddIdpResponse
 	AddMailTemplateError: AddMailTemplateError
 	AddMailTemplateResponse: AddMailTemplateResponse
 	AddProjectMemberError: AddProjectMemberError
 	AddProjectMemberResponse: AddProjectMemberResponse
-	ApiKey: ApiKey
-	ApiKeyWithToken: ApiKeyWithToken
+	ApiKey: Omit<ApiKey, 'identity'> & { identity: ResolversParentTypes['Identity'] }
+	ApiKeyWithToken: Omit<ApiKeyWithToken, 'identity'> & { identity: ResolversParentTypes['Identity'] }
 	Boolean: Scalars['Boolean']['output']
 	ChangeMyPasswordError: ChangeMyPasswordError
 	ChangeMyPasswordResponse: ChangeMyPasswordResponse
@@ -1742,14 +1743,14 @@ export type ResolversParentTypes = {
 	ConfirmOtpError: ConfirmOtpError
 	ConfirmOtpResponse: ConfirmOtpResponse
 	CreateApiKeyError: CreateApiKeyError
-	CreateApiKeyResponse: CreateApiKeyResponse
-	CreateApiKeyResult: CreateApiKeyResult
+	CreateApiKeyResponse: Omit<CreateApiKeyResponse, 'result'> & { result?: Maybe<ResolversParentTypes['CreateApiKeyResult']> }
+	CreateApiKeyResult: Omit<CreateApiKeyResult, 'apiKey'> & { apiKey: ResolversParentTypes['ApiKeyWithToken'] }
 	CreatePasswordResetRequestError: CreatePasswordResetRequestError
 	CreatePasswordResetRequestResponse: CreatePasswordResetRequestResponse
 	CreateProjectOptions: CreateProjectOptions
-	CreateProjectResponse: CreateProjectResponse
+	CreateProjectResponse: Omit<CreateProjectResponse, 'result'> & { result?: Maybe<ResolversParentTypes['CreateProjectResult']> }
 	CreateProjectResponseError: CreateProjectResponseError
-	CreateProjectResult: CreateProjectResult
+	CreateProjectResult: Omit<CreateProjectResult, 'deployerApiKey'> & { deployerApiKey?: Maybe<ResolversParentTypes['ApiKeyWithToken']> }
 	CreateResetPasswordRequestOptions: CreateResetPasswordRequestOptions
 	CreateSessionTokenError: CreateSessionTokenError
 	CreateSessionTokenResponse: CreateSessionTokenResponse
@@ -1768,9 +1769,9 @@ export type ResolversParentTypes = {
 	IDPOptions: IdpOptions
 	IDPOptionsOutput: IdpOptionsOutput
 	IDPResponseInput: IdpResponseInput
-	Identity: Identity
+	Identity: Omit<Identity, 'apiKey' | 'projects'> & { apiKey?: Maybe<ResolversParentTypes['ApiKey']>; projects: ReadonlyArray<ResolversParentTypes['IdentityProjectRelation']> }
 	IdentityGlobalPermissions: IdentityGlobalPermissions
-	IdentityProjectRelation: IdentityProjectRelation
+	IdentityProjectRelation: Omit<IdentityProjectRelation, 'project'> & { project: ResolversParentTypes['Project'] }
 	IdentityProvider: IdentityProvider
 	InitSignInIDPError: InitSignInIdpError
 	InitSignInIDPResponse: InitSignInIdpResponse
@@ -1792,18 +1793,18 @@ export type ResolversParentTypes = {
 	MembershipInput: MembershipInput
 	MembershipValidationError: MembershipValidationError
 	Mutation: {}
-	Person: Person
+	Person: Omit<Person, 'identity'> & { identity: ResolversParentTypes['Identity'] }
 	PrepareOtpResponse: PrepareOtpResponse
 	PrepareOtpResult: PrepareOtpResult
-	Project: Project
-	ProjectIdentityRelation: ProjectIdentityRelation
+	Project: Omit<Project, 'members' | 'roles'> & { members: ReadonlyArray<ResolversParentTypes['ProjectIdentityRelation']>; roles: ReadonlyArray<ResolversParentTypes['RoleDefinition']> }
+	ProjectIdentityRelation: Omit<ProjectIdentityRelation, 'identity'> & { identity: ResolversParentTypes['Identity'] }
 	ProjectMembersFilter: ProjectMembersFilter
 	ProjectMembersInput: ProjectMembersInput
 	ProjectSecret: ProjectSecret
 	Query: {}
 	RemoveGlobalIdentityRolesError: RemoveGlobalIdentityRolesError
-	RemoveGlobalIdentityRolesResponse: RemoveGlobalIdentityRolesResponse
-	RemoveGlobalIdentityRolesResult: RemoveGlobalIdentityRolesResult
+	RemoveGlobalIdentityRolesResponse: Omit<RemoveGlobalIdentityRolesResponse, 'result'> & { result?: Maybe<ResolversParentTypes['RemoveGlobalIdentityRolesResult']> }
+	RemoveGlobalIdentityRolesResult: Omit<RemoveGlobalIdentityRolesResult, 'identity'> & { identity: ResolversParentTypes['Identity'] }
 	RemoveMailTemplateError: RemoveMailTemplateError
 	RemoveMailTemplateResponse: RemoveMailTemplateResponse
 	RemoveProjectMemberError: RemoveProjectMemberError
@@ -1811,7 +1812,7 @@ export type ResolversParentTypes = {
 	ResetPasswordError: ResetPasswordError
 	ResetPasswordResponse: ResetPasswordResponse
 	RoleConditionVariableDefinition: RoleConditionVariableDefinition
-	RoleDefinition: RoleDefinition
+	RoleDefinition: Omit<RoleDefinition, 'variables'> & { variables: ReadonlyArray<ResolversParentTypes['RoleVariableDefinition']> }
 	RoleEntityVariableDefinition: RoleEntityVariableDefinition
 	RolePredefinedVariableDefinition: RolePredefinedVariableDefinition
 	RoleVariableDefinition: ResolversInterfaceTypes<ResolversParentTypes>['RoleVariableDefinition']