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

package/tests/cases/unit/readAclDefinitions.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from 'bun:test'
 import { c, createSchema } from '../../../src'
-import { Acl } from '@contember/schema'
+import { Acl, Model } from '@contember/schema'
 
 namespace SimpleModel {
 	export const publicRole = c.createRole('public')
@@ -23,7 +23,6 @@ test('simple definitions', () => {
 	})
 })
 
-
 namespace RoleOptions {
 	export const publicRole = c.createRole('public', {
 		debug: true,
@@ -46,7 +45,6 @@ test('role options', () => {
 	})
 })
 
-
 namespace ModelWithPredicate {
 	export const publicRole = c.createRole('public')
 
@@ -110,7 +108,6 @@ test('definition with a predicate on field', () => {
 	})
 })
 
-
 namespace ModelWithModificationAcl {
 	export const publicRole = c.createRole('public')
 
@@ -130,29 +127,28 @@ test('definition with update, create, delete predicates', () => {
 	const schema = createSchema(ModelWithModificationAcl)
 	expect(schema.acl.roles.public.entities.Book).toStrictEqual(
 		{
-		  'operations': {
-		    'create': {
-		      'isPublished': 'isPublished_eq_true',
-		      'title': 'isPublished_eq_true',
-		    },
-		    'delete': 'isPublished_eq_true',
-		    'update': {
-		      'isPublished': 'isPublished_eq_true',
-		      'title': 'isPublished_eq_true',
-		    },
-		  },
-		  'predicates': {
-		    'isPublished_eq_true': {
-		      'isPublished': {
-		        'eq': true,
-		      },
-		    },
-		  },
+			'operations': {
+				'create': {
+					'isPublished': 'isPublished_eq_true',
+					'title': 'isPublished_eq_true',
+				},
+				'delete': 'isPublished_eq_true',
+				'update': {
+					'isPublished': 'isPublished_eq_true',
+					'title': 'isPublished_eq_true',
+				},
+			},
+			'predicates': {
+				'isPublished_eq_true': {
+					'isPublished': {
+						'eq': true,
+					},
+				},
+			},
 		},
 	)
 })
 
-
 namespace ModelWithMultiplePredicates {
 	export const publicRole = c.createRole('public')
 
@@ -174,32 +170,31 @@ test('definition with multiple predicates on a single field', () => {
 	const schema = createSchema(ModelWithMultiplePredicates)
 	expect(schema.acl.roles.public.entities.Book).toStrictEqual(
 		{
-		  'operations': {
-		    'read': {
-		      'title': 'or_isPublished_eq_false_isPub',
-		    },
-		  },
-		  'predicates': {
-		    'or_isPublished_eq_false_isPub': {
-		      'or': [
-		        {
-		          'isPublished': {
-		            'eq': false,
-		          },
-		        },
-		        {
-		          'isPublished': {
-		            'eq': true,
-		          },
-		        },
-		      ],
-		    },
-		  },
+			'operations': {
+				'read': {
+					'title': 'or_isPublished_eq_false_isPub',
+				},
+			},
+			'predicates': {
+				'or_isPublished_eq_false_isPub': {
+					'or': [
+						{
+							'isPublished': {
+								'eq': false,
+							},
+						},
+						{
+							'isPublished': {
+								'eq': true,
+							},
+						},
+					],
+				},
+			},
 		},
 	)
 })
 
-
 namespace ModelWithJoinedPredicateCollision {
 	export const publicRole = c.createRole('public')
 
@@ -225,47 +220,46 @@ test('definition with collision', () => {
 	const schema = createSchema(ModelWithJoinedPredicateCollision)
 	expect(schema.acl.roles.public.entities.Book).toStrictEqual(
 		{
-		  'operations': {
-		    'read': {
-		      'isPublishedLoremIpsumDolorSitAmet': 'or_isPublishedLoremIpsumDolor_1',
-		      'title': 'or_isPublishedLoremIpsumDolor',
-		    },
-		  },
-		  'predicates': {
-		    'or_isPublishedLoremIpsumDolor': {
-		      'or': [
-		        {
-		          'isPublishedLoremIpsumDolorSitAmet': {
-		            'eq': false,
-		          },
-		        },
-		        {
-		          'isPublishedLoremIpsumDolorSitAmet': {
-		            'eq': true,
-		          },
-		        },
-		      ],
-		    },
-		    'or_isPublishedLoremIpsumDolor_1': {
-		      'or': [
-		        {
-		          'isPublishedLoremIpsumDolorSitAmet': {
-		            'eq': false,
-		          },
-		        },
-		        {
-		          'isPublishedLoremIpsumDolorSitAmet': {
-		            'eq': false,
-		          },
-		        },
-		      ],
-		    },
-		  },
+			'operations': {
+				'read': {
+					'isPublishedLoremIpsumDolorSitAmet': 'or_isPublishedLoremIpsumDolor_1',
+					'title': 'or_isPublishedLoremIpsumDolor',
+				},
+			},
+			'predicates': {
+				'or_isPublishedLoremIpsumDolor': {
+					'or': [
+						{
+							'isPublishedLoremIpsumDolorSitAmet': {
+								'eq': false,
+							},
+						},
+						{
+							'isPublishedLoremIpsumDolorSitAmet': {
+								'eq': true,
+							},
+						},
+					],
+				},
+				'or_isPublishedLoremIpsumDolor_1': {
+					'or': [
+						{
+							'isPublishedLoremIpsumDolorSitAmet': {
+								'eq': false,
+							},
+						},
+						{
+							'isPublishedLoremIpsumDolorSitAmet': {
+								'eq': false,
+							},
+						},
+					],
+				},
+			},
 		},
 	)
 })
 
-
 namespace ModelWithMultipleRolesForSinglePredicate {
 	export const publicRole = c.createRole('public')
 	export const adminRole = c.createRole('admin')
@@ -283,34 +277,34 @@ test('definition with multiple roles in single predicate', () => {
 	const schema = createSchema(ModelWithMultipleRolesForSinglePredicate)
 	expect(schema.acl.roles).toStrictEqual(
 		{
-		  'admin': {
-		    'entities': {
-		      'Book': {
-		        'operations': {
-		          'read': {
-		            'title': true,
-		          },
-		        },
-		        'predicates': {},
-		      },
-		    },
-		    'stages': '*',
-		    'variables': {},
-		  },
-		  'public': {
-		    'entities': {
-		      'Book': {
-		        'operations': {
-		          'read': {
-		            'title': true,
-		          },
-		        },
-		        'predicates': {},
-		      },
-		    },
-		    'stages': '*',
-		    'variables': {},
-		  },
+			'admin': {
+				'entities': {
+					'Book': {
+						'operations': {
+							'read': {
+								'title': true,
+							},
+						},
+						'predicates': {},
+					},
+				},
+				'stages': '*',
+				'variables': {},
+			},
+			'public': {
+				'entities': {
+					'Book': {
+						'operations': {
+							'read': {
+								'title': true,
+							},
+						},
+						'predicates': {},
+					},
+				},
+				'stages': '*',
+				'variables': {},
+			},
 		},
 	)
 })
@@ -326,6 +320,7 @@ namespace ModelWithAclPredicateReferences {
 		title = c.stringColumn()
 		isPublished = c.boolColumn()
 	}
+
 	@c.Allow(publicRole, {
 		when: { book: c.canRead('title') },
 		read: ['content'],
@@ -340,41 +335,40 @@ test('definition with predicate references', () => {
 	const schema = createSchema(ModelWithAclPredicateReferences)
 	expect(schema.acl.roles.public.entities).toStrictEqual(
 		{
-		  'Book': {
-		    'operations': {
-		      'read': {
-		        'title': 'isPublished_eq_true',
-		      },
-		    },
-		    'predicates': {
-		      'isPublished_eq_true': {
-		        'isPublished': {
-		          'eq': true,
-		        },
-		      },
-		    },
-		  },
-		  'BookReview': {
-		    'operations': {
-		      'read': {
-		        'content': 'book_isPublished_eq_true',
-		      },
-		    },
-		    'predicates': {
-		      'book_isPublished_eq_true': {
-		        'book': {
-		          'isPublished': {
-		            'eq': true,
-		          },
-		        },
-		      },
-		    },
-		  },
+			'Book': {
+				'operations': {
+					'read': {
+						'title': 'isPublished_eq_true',
+					},
+				},
+				'predicates': {
+					'isPublished_eq_true': {
+						'isPublished': {
+							'eq': true,
+						},
+					},
+				},
+			},
+			'BookReview': {
+				'operations': {
+					'read': {
+						'content': 'book_isPublished_eq_true',
+					},
+				},
+				'predicates': {
+					'book_isPublished_eq_true': {
+						'book': {
+							'isPublished': {
+								'eq': true,
+							},
+						},
+					},
+				},
+			},
 		},
 	)
 })
 
-
 namespace ModelWithVariables {
 	export const managerRole = c.createRole('manager')
 	export const bookIdVariable = c.createEntityVariable('bookId', 'Book', managerRole)
@@ -392,27 +386,27 @@ test('definition with variables', () => {
 	const schema = createSchema(ModelWithVariables)
 	expect(schema.acl.roles.manager).toStrictEqual(
 		{
-		  'entities': {
-		    'Book': {
-		      'operations': {
-		        'read': {
-		          'title': 'id_bookId',
-		        },
-		      },
-		      'predicates': {
-		        'id_bookId': {
-		          'id': 'bookId',
-		        },
-		      },
-		    },
-		  },
-		  'stages': '*',
-		  'variables': {
-		    'bookId': {
-		      'entityName': 'Book',
-		      'type': Acl.VariableType.entity,
-		    },
-		  },
+			'entities': {
+				'Book': {
+					'operations': {
+						'read': {
+							'title': 'id_bookId',
+						},
+					},
+					'predicates': {
+						'id_bookId': {
+							'id': 'bookId',
+						},
+					},
+				},
+			},
+			'stages': '*',
+			'variables': {
+				'bookId': {
+					'entityName': 'Book',
+					'type': Acl.VariableType.entity,
+				},
+			},
 		},
 	)
 })
@@ -430,10 +424,10 @@ test('allow custom primary', () => {
 	const schema = createSchema(ModelWithAllowCustomPrimary)
 	expect(schema.acl.roles.public.entities.Book).toStrictEqual(
 		{
-		  'operations': {
-		    'customPrimary': true,
-		  },
-		  'predicates': {},
+			'operations': {
+				'customPrimary': true,
+			},
+			'predicates': {},
 		},
 	)
 })
@@ -451,15 +445,14 @@ test('allow custom primary', () => {
 	const schema = createSchema(ModelWithAllowCustomPrimaryAllRoles)
 	expect(schema.acl.roles.public.entities.Book).toStrictEqual(
 		{
-		  'operations': {
-		    'customPrimary': true,
-		  },
-		  'predicates': {},
+			'operations': {
+				'customPrimary': true,
+			},
+			'predicates': {},
 		},
 	)
 })
 
-
 namespace ModelWithInvalidAclPredicateReferences {
 	export const publicRole = c.createRole('public')
 
@@ -484,12 +477,11 @@ namespace ModelWithInvalidAclPredicateReferences {
 
 test('definition with invalid predicate references', () => {
 	expect(() => createSchema(ModelWithInvalidAclPredicateReferences)).toThrow(
-		'Predicate references are allowed only on relations. \n' +
-		'You cannot use "canRead("title")" on a column "content" of entity "BookReview".',
+		'Predicate references are allowed only on relations. \n'
+			+ 'You cannot use "canRead("title")" on a column "content" of entity "BookReview".',
 	)
 })
 
-
 namespace ModelWithPredefinedVariables {
 	export const customerRole = c.createRole('customer')
 	export const personId = c.createPredefinedVariable('person', 'personID', customerRole)
@@ -545,7 +537,6 @@ test('invalid column', () => {
 	expect(() => createSchema(InvalidModel)).toThrow('Field "bar" does not exist on entity "Book" in read ACL definition.')
 })
 
-
 namespace ExplicitIdPredicate {
 	export const publicRole = c.createRole('public')
 
@@ -620,7 +611,6 @@ test('no root - valid', () => {
 	})
 })
 
-
 namespace NoRootInvalid {
 	export const publicRole = c.createRole('public')
 
@@ -642,3 +632,28 @@ namespace NoRootInvalid {
 test('no root - invalid combo', () => {
 	expect(() => createSchema(NoRootInvalid)).toThrow('Operation update cannot be both allowed and disallowed on root on entity Book')
 })
+
+namespace AllowFactoryModel {
+	export const publicRole = c.createRole('public')
+
+	@c.Allow(publicRole, ({ except }) => ({
+		read: except('confidential'),
+	}))
+	export class Book {
+		title = c.stringColumn()
+		confidential = c.stringColumn()
+	}
+}
+
+test('allow with factory', () => {
+	const schema = createSchema(AllowFactoryModel)
+	expect(schema.acl.roles.public.entities.Book).toStrictEqual({
+		'operations': {
+			'read': {
+				'id': true,
+				'title': true,
+			},
+		},
+		'predicates': {},
+	})
+})

package/tests/cases/unit/readActions.test.ts

@@ -3,7 +3,6 @@ import { expect, test } from 'bun:test'
 import { createActions } from '../../../src/actions/definition'
 
 namespace SimpleActions {
-
 	@c.Watch({
 		name: 'book_watch',
 		watch: `
@@ -32,7 +31,6 @@ namespace SimpleActions {
 		locale = c.manyHasOne(Locale)
 	}
 
-
 	export class Category {
 		locales = c.oneHasMany(CategoryLocale, 'category')
 	}

package/vitest.config.ts

@@ -1,3 +0,0 @@
-import { defineProject } from 'vitest/config'
-
-export default defineProject({})