@contember/schema-definition 1.2.0-alpha.17 → 1.2.0-alpha.19

package/tests/unit/extendEntity.test.ts

@@ -0,0 +1,42 @@
+import { Model } from '@contember/schema'
+import { assert, test } from 'vitest'
+import { createSchema, SchemaDefinition as def } from '../../src'
+import { extendEntity, FieldDefinition } from '../../src/model/definition'
+import { DecoratorFunction } from '../../src/model/definition/types'
+
+namespace ExtendedModel {
+	export class Article {
+		title = def.stringColumn()
+	}
+
+	const addField = (name: string, field: FieldDefinition<any>): DecoratorFunction<any> => {
+		return extendEntity(({ entity, conventions, entityRegistry, enumRegistry }) => ({
+			...entity,
+			fields: {
+				...entity.fields,
+				[name]: field.createField({
+					name,
+					enumRegistry,
+					entityRegistry,
+					conventions,
+					entityName: entity.name,
+				}),
+			},
+		}))
+	}
+
+	addField('lead', def.stringColumn())(Article)
+}
+
+
+test('add a field to entity using an extension', () => {
+	const schema = createSchema(ExtendedModel)
+
+	assert.deepEqual(schema.model.entities.Article.fields.lead, {
+		columnName: 'lead',
+		name: 'lead',
+		columnType: 'text',
+		type: Model.ColumnType.String,
+		nullable: true,
+	})
+})

package/tests/unit/readAclDefinitions.test.ts

@@ -207,6 +207,72 @@ test('definition with multiple predicates on a single field', () => {
 })
 
 
+namespace ModelWithJoinedPredicateCollision {
+	export const publicRole = acl.createRole('public')
+
+	@acl.allow(publicRole, {
+		when: { isPublishedLoremIpsumDolorSitAmet: { eq: true } },
+		read: ['title'],
+	})
+	@acl.allow(publicRole, {
+		when: { isPublishedLoremIpsumDolorSitAmet: { eq: false } },
+		read: ['title', 'isPublishedLoremIpsumDolorSitAmet'],
+	})
+	@acl.allow(publicRole, {
+		when: { isPublishedLoremIpsumDolorSitAmet: { eq: false } },
+		read: ['isPublishedLoremIpsumDolorSitAmet'],
+	})
+	export class Book {
+		title = def.stringColumn()
+		isPublishedLoremIpsumDolorSitAmet = def.boolColumn()
+	}
+}
+
+test('definition with collision', () => {
+	const schema = createSchema(ModelWithJoinedPredicateCollision)
+	expect(schema.acl.roles.public.entities.Book).toMatchInlineSnapshot(`
+		{
+		  "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 = acl.createRole('public')
 	export const adminRole = acl.createRole('admin')