@contember/schema-definition 1.1.2 → 1.2.0-alpha.11

package/dist/tests/unit/readAclDefinitions.test.js

@@ -493,4 +493,20 @@ var ModelWithPredefinedVariables;
 		}
 	`);
 });
+var InvalidModel;
+(function (InvalidModel) {
+    InvalidModel.publicRole = src_1.AclDefinition.createRole('public');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allow(InvalidModel.publicRole, { read: ['bar'] })
+    ], Book);
+    InvalidModel.Book = Book;
+})(InvalidModel || (InvalidModel = {}));
+(0, vitest_1.test)('invalid column', () => {
+    (0, vitest_1.expect)(() => (0, src_1.createSchema)(InvalidModel)).toThrow('Field "bar" does not exist on entity "Book" in read ACL definition.');
+});
 //# sourceMappingURL=readAclDefinitions.test.js.map

package/dist/tests/unit/readAclDefinitions.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"readAclDefinitions.test.js","sourceRoot":"","sources":["../../../tests/unit/readAclDefinitions.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"readAclDefinitions.test.js","sourceRoot":"","sources":["../../../tests/unit/readAclDefinitions.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/schema-definition",
-  "version": "1.1.2",
+  "version": "1.2.0-alpha.11",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -8,8 +8,8 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@contember/schema": "^1.1.2",
-    "@contember/schema-utils": "^1.1.2",
+    "@contember/schema": "^1.2.0-alpha.11",
+    "@contember/schema-utils": "^1.2.0-alpha.11",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {}

package/src/acl/builder/EntitySelector.ts

@@ -18,13 +18,13 @@ export default class EntitySelector {
 		return this.matching((schema, entity) => name.includes(entity.name))
 	}
 
-	public havingRelation(name: string, targetEntity?: string) {
+	public havingRelation(name: string, targetEntityName?: string) {
 		return this.matching(
 			(schema, entity) =>
 				entity.fields[name] &&
 				acceptFieldVisitor(schema, entity, name, {
 					visitColumn: () => false,
-					visitRelation: ({}, {}, target) => !targetEntity || target.name === targetEntity,
+					visitRelation: ({ targetEntity }) => !targetEntityName || targetEntity.name === targetEntityName,
 				}),
 		)
 	}

package/src/acl/definition/internal/EntityPredicateResolver.ts

@@ -45,6 +45,20 @@ export class EntityPredicatesResolver {
 			predicates[predicateName] = resolvedPredicate
 			predicateNamesMap.set(permission.when, predicateName)
 		}
+		for (const op of ['read', 'update', 'create'] as const) {
+			for (const definition of aclDefinitions) {
+				const fields = definition[op]
+				if (!Array.isArray(fields)) {
+					continue
+				}
+				for (const field of fields) {
+					if (!(field in entity.fields)) {
+						throw `Field "${String(field)}" does not exist on entity "${entity.name}" in ${op} ACL definition.`
+					}
+				}
+			}
+		}
+
 		return new EntityPredicatesResolver(aclDefinitions, predicates, predicateNamesMap, generatedNames)
 	}
 

package/src/acl/definition/variables.ts

@@ -35,3 +35,14 @@ export const createPredefinedVariable = <R extends Role<string>, Name extends st
 		{ type: Acl.VariableType.predefined, value },
 	)
 }
+
+export const createConditionVariable = <R extends Role<string>, Name extends string>(
+	name: Name,
+	roles: R | R[],
+): VariableDefinition<Name, R, Acl.ConditionVariable> => {
+	return new VariableDefinition(
+		name,
+		Array.isArray(roles) ? roles : [roles],
+		{ type: Acl.VariableType.condition  },
+	)
+}

package/src/model/builder/SchemaBuilderInternal.ts

@@ -39,6 +39,7 @@ export default class SchemaBuilderInternal {
 			primaryColumn: primaryField.options.columnName || this.conventions.getColumnName(primaryName),
 			unique: this.createUnique(name, options, fieldOptions),
 			fields: {},
+			indexes: {},
 			tableName: options.tableName || this.conventions.getTableName(name),
 			eventLog: {
 				enabled: true,

package/src/model/definition/IndexDefinition.ts

@@ -0,0 +1,23 @@
+import { DecoratorFunction } from './types'
+import { extendEntity } from './extensions'
+import { NamingHelper } from '@contember/schema-utils'
+
+export type IndexOptions<T> = { name?: string; fields: (keyof T)[] }
+export function Index<T>(options: IndexOptions<T>): DecoratorFunction<T>
+export function Index<T>(...fields: (keyof T)[]): DecoratorFunction<T>
+export function Index<T>(options: IndexOptions<T> | keyof T, ...args: (keyof T)[]): DecoratorFunction<T> {
+	return extendEntity(({ entity }) => {
+		const fields = (typeof options !== 'object' ? [options, ...args] : options.fields) as string[]
+		const name =
+			typeof options === 'object' && options.name
+				? options.name
+				: NamingHelper.createIndexName(entity.name, fields)
+		return {
+			...entity,
+			indexes: {
+				...entity.indexes,
+				[name]: { name, fields },
+			},
+		}
+	})
+}

package/src/model/definition/UniqueDefinition.ts

@@ -15,8 +15,8 @@ export function Unique<T>(options: UniqueOptions<T> | keyof T, ...args: (keyof T
 		return {
 			...entity,
 			unique: {
-				[name]: { name, fields },
 				...entity.unique,
+				[name]: { name, fields },
 			},
 		}
 	})

package/src/model/definition/ViewDefinition.ts

@@ -1,11 +1,24 @@
 import { extendEntity } from './extensions'
 import { EntityConstructor } from './types'
 
-export const View = (sql: string, { dependencies }: { dependencies?: EntityConstructor[] } = {}) =>
-	extendEntity(({ entity, registry }) => ({
-		...entity,
-		view: {
-			sql,
-			...(dependencies ? { dependencies: dependencies?.map(it => registry.getName(it)) } : {}),
-		},
-	}))
+export const View = (sql: string, { dependencies }: { dependencies?: (() => EntityConstructor[]) | EntityConstructor[] } = {}) =>
+	extendEntity(({ entity, registry }) => {
+		const dependenciesResolved = typeof dependencies === 'function' ? dependencies() : dependencies
+		if (dependenciesResolved?.some(it => it === undefined)) {
+			throw `"undefined" value detected in dependencies of view entity ${entity.name}. This is possibly caused by circular imports.
+Please wrap the array of dependencies into a function returning this array.
+
+Instead of:
+dependencies: [MyEntity]
+Use:
+dependencies: () => [MyEntity]
+`
+		}
+		return ({
+			...entity,
+			view: {
+				sql,
+				...(dependenciesResolved ? { dependencies: dependenciesResolved.map(it => registry.getName(it)) } : {}),
+			},
+		})
+	})

package/src/model/definition/index.ts

@@ -9,6 +9,7 @@ import { isEntityConstructor } from '../../utils'
 
 export * from './fieldDefinitions'
 export * from './EventLogDefinition'
+export * from './IndexDefinition'
 export * from './EnumDefinition'
 export * from './UniqueDefinition'
 export * from './ViewDefinition'

package/src/model/definition/internal/SchemaBuilder.ts

@@ -36,6 +36,7 @@ export class SchemaBuilder {
 				primary: primaryName,
 				primaryColumn: this.conventions.getColumnName(primaryName),
 				unique: this.createUnique(entityName, definitionInstance),
+				indexes: {},
 				fields: [
 					...definitionInstance[primaryName] ? [] : [tuple(primaryName, this.createPrimaryColumn())],
 					...Object.entries(definitionInstance),

package/tests/unit/readAclDefinitions.test.ts

@@ -448,3 +448,16 @@ test('definition with predefined variables', () => {
 		}
 	`)
 })
+
+namespace InvalidModel {
+	export const publicRole = acl.createRole('public')
+
+	@acl.allow(publicRole, { read: ['bar'] as any })
+	export class Book {
+		title = def.stringColumn()
+	}
+}
+
+test('invalid column', () => {
+	expect(() => createSchema(InvalidModel)).toThrow('Field "bar" does not exist on entity "Book" in read ACL definition.')
+})