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

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

@@ -1,4 +1,4 @@
-import { expect, test } from 'vitest'
+import { expect, test } from 'bun:test'
 import { c, createSchema, settingsPresets } from '../../../src'
 
 namespace SimpleModel {
@@ -17,85 +17,83 @@ test('basic createSchema test', () => {
 		settings: settingsPresets['v1.3'],
 	}))
 
-	expect(schema).toMatchInlineSnapshot(`
-		{
-		  "acl": {
-		    "roles": {
-		      "public": {
-		        "entities": {
-		          "Book": {
-		            "operations": {
-		              "read": {
-		                "title": true,
-		              },
-		            },
-		            "predicates": {},
-		          },
-		        },
-		        "stages": "*",
-		        "variables": {},
-		      },
-		    },
-		  },
-		  "actions": {
-		    "targets": {},
-		    "triggers": {},
-		  },
-		  "model": {
-		    "entities": {
-		      "Book": {
-		        "eventLog": {
-		          "enabled": true,
-		        },
-		        "fields": {
-		          "id": {
-		            "columnName": "id",
-		            "columnType": "uuid",
-		            "name": "id",
-		            "nullable": false,
-		            "type": "Uuid",
-		          },
-		          "title": {
-		            "columnName": "title",
-		            "columnType": "text",
-		            "name": "title",
-		            "nullable": true,
-		            "type": "String",
-		          },
-		        },
-		        "indexes": [],
-		        "name": "Book",
-		        "primary": "id",
-		        "primaryColumn": "id",
-		        "tableName": "book",
-		        "unique": [],
-		      },
-		    },
-		    "enums": {},
-		  },
-		  "settings": {
-		    "tenant": {
-		      "inviteExpirationMinutes": 10080,
-		    },
-		    "useExistsInHasManyFilter": true,
-		  },
-		  "validation": {
-		    "Book": {
-		      "title": [
-		        {
-		          "message": {
-		            "text": "test",
-		          },
-		          "validator": {
-		            "args": [],
-		            "operation": "defined",
-		          },
-		        },
-		      ],
-		    },
-		  },
-		}
-	`)
+	expect(schema as any).toStrictEqual({
+		'acl': {
+			'roles': {
+				'public': {
+					'entities': {
+						'Book': {
+							'operations': {
+								'read': {
+									'title': true,
+								},
+							},
+							'predicates': {},
+						},
+					},
+					'stages': '*',
+					'variables': {},
+				},
+			},
+		},
+		'actions': {
+			'targets': {},
+			'triggers': {},
+		},
+		'model': {
+			'entities': {
+				'Book': {
+					'eventLog': {
+						'enabled': true,
+					},
+					'fields': {
+						'id': {
+							'columnName': 'id',
+							'columnType': 'uuid',
+							'name': 'id',
+							'nullable': false,
+							'type': 'Uuid',
+						},
+						'title': {
+							'columnName': 'title',
+							'columnType': 'text',
+							'name': 'title',
+							'nullable': true,
+							'type': 'String',
+						},
+					},
+					'indexes': [],
+					'name': 'Book',
+					'primary': 'id',
+					'primaryColumn': 'id',
+					'tableName': 'book',
+					'unique': [],
+				},
+			},
+			'enums': {},
+		},
+		'settings': {
+			'tenant': {
+				'inviteExpirationMinutes': 10080,
+			},
+			'useExistsInHasManyFilter': true,
+		},
+		'validation': {
+			'Book': {
+				'title': [
+					{
+						'message': {
+							'text': 'test',
+						},
+						'validator': {
+							'args': [],
+							'operation': 'defined',
+						},
+					},
+				],
+			},
+		},
+	})
 })
 
 

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

@@ -1,5 +1,5 @@
 import { Model } from '@contember/schema'
-import { assert, test } from 'vitest'
+import { expect, test } from 'bun:test'
 import { createSchema, c } from '../../../src'
 import { extendEntity, FieldDefinition } from '../../../src/model/definition'
 import { DecoratorFunction } from '../../../src/utils'
@@ -30,7 +30,7 @@ namespace ExtendedModel {
 test('add a field to entity using an extension', () => {
 	const schema = createSchema(ExtendedModel)
 
-	assert.deepEqual(schema.model.entities.Article.fields.lead, {
+	expect(schema.model.entities.Article.fields.lead).toStrictEqual({
 		columnName: 'lead',
 		name: 'lead',
 		columnType: 'text',

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

@@ -1,7 +1,11 @@
 import { Model } from '@contember/schema'
-import { assert, describe, expect, test, vi } from 'vitest'
+import { describe, expect, test } from 'bun:test'
 import { c, createSchema } from '../../../src'
 
+
+const assert = {
+	deepEqual: (a: any, b: any) => expect(a).toStrictEqual(b),
+}
 namespace OrderByModel {
 	@c.OrderBy('title')
 	export class Entity1 {
@@ -68,8 +72,9 @@ describe('order by', () => {
 
 	test('deprecated orderBy', () => {
 
-		const consoleMock = vi.spyOn(console, 'warn').mockImplementation(() => {
-		})
+		const origWarn = console.warn
+		let msg = ''
+		console.warn = (m: string) => msg = m
 
 		const schema = createSchema(LegacyOrderBy)
 
@@ -79,10 +84,9 @@ describe('order by', () => {
 			{ path: ['order'], direction: Model.OrderDirection.asc },
 		])
 
-		expect(consoleMock).toHaveBeenCalledOnce()
-		expect(consoleMock).toHaveBeenLastCalledWith('DEPRECATED: The "order by" property for the entity Entity5 has already been defined. Using multiple decorators can lead to unexpected order. Please provide an array containing all the \'order by\' items as an input.')
+		expect(msg).toBe('DEPRECATED: The "order by" property for the entity Entity5 has already been defined. Using multiple decorators can lead to unexpected order. Please provide an array containing all the \'order by\' items as an input.')
 
-		consoleMock.mockReset()
+		console.warn = origWarn
 	})
 })