@contember/schema-utils 1.1.0-alpha.5 → 1.1.0-alpha.6

package/dist/src/validation/ValidationValidator.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValidationValidator = void 0;
-const schema_1 = require("@contember/schema");
 const errors_1 = require("./errors");
-const utils_1 = require("./utils");
 const model_1 = require("../model");
 class ValidationValidator {
     constructor(model) {
@@ -11,32 +9,19 @@ class ValidationValidator {
     }
     validate(schema) {
         const errorBuilder = new errors_1.ErrorBuilder([], ['validation']);
-        let validSchema;
-        if (!(0, utils_1.isObject)(schema)) {
-            errorBuilder.add('Must be an object');
-            validSchema = { roles: {} };
-        }
-        else {
-            validSchema = {};
-            for (const entityName in schema) {
-                const entity = this.model.entities[entityName];
-                const entityErrorBuilder = errorBuilder.for(entityName);
-                if (!entity) {
-                    entityErrorBuilder.add('Entity not found');
-                }
-                else {
-                    validSchema[entityName] = this.validateEntityRules(entityErrorBuilder, schema[entityName], entity);
-                }
+        for (const entityName in schema) {
+            const entity = this.model.entities[entityName];
+            const entityErrorBuilder = errorBuilder.for(entityName);
+            if (!entity) {
+                entityErrorBuilder.add('Entity not found');
+            }
+            else {
+                this.validateEntityRules(entityErrorBuilder, schema[entityName], entity);
             }
         }
-        return [validSchema, errorBuilder.errors];
+        return errorBuilder.errors;
     }
     validateEntityRules(errorBuilder, entitySchema, entity) {
-        if (!(0, utils_1.isObject)(entitySchema)) {
-            errorBuilder.add('Must be an object');
-            return {};
-        }
-        const validRules = {};
         for (const fieldName in entitySchema) {
             const field = entity.fields[fieldName];
             const fieldErrorBuilder = errorBuilder.for(fieldName);
@@ -44,30 +29,16 @@ class ValidationValidator {
                 fieldErrorBuilder.add('Field not found');
             }
             else {
-                validRules[fieldName] = this.validateFieldRules(fieldErrorBuilder, entitySchema[fieldName], entity, field);
+                this.validateFieldRules(fieldErrorBuilder, entitySchema[fieldName], entity, field);
             }
         }
-        return validRules;
     }
     validateFieldRules(errorBuilder, fieldSchema, entity, field) {
-        if (!(0, utils_1.isArray)(fieldSchema)) {
-            errorBuilder.add('Must be an array');
-            return [];
-        }
-        const validRules = [];
         for (const i in fieldSchema) {
-            const rule = this.validateFieldRule(errorBuilder.for(i), fieldSchema[i], entity, field);
-            if (rule !== undefined) {
-                validRules.push(rule);
-            }
+            this.validateFieldRule(errorBuilder.for(i), fieldSchema[i], entity, field);
         }
-        return validRules;
     }
     validateFieldRule(errorBuilder, rule, entity, field) {
-        if (!(0, utils_1.isObject)(rule)) {
-            errorBuilder.add('Must be an object');
-            return undefined;
-        }
         const errorMessage = (0, model_1.acceptFieldVisitor)(this.model, entity, field, {
             visitColumn: () => null,
             visitHasOne: () => null,
@@ -76,144 +47,43 @@ class ValidationValidator {
             },
         });
         if (errorMessage) {
-            errorBuilder.add(errorMessage);
-            return undefined;
+            return errorBuilder.add(errorMessage);
         }
-        const validMessage = this.validateFieldRuleMessage(errorBuilder.for('message'), rule.message);
-        if (!validMessage) {
-            return undefined;
-        }
-        const validValidator = this.validateValidator(errorBuilder.for('validator'), rule.validator, entity, field);
-        if (!validValidator) {
-            return undefined;
-        }
-        return { message: validMessage, validator: validValidator };
-    }
-    validateFieldRuleMessage(errorBuilder, message) {
-        if (!(0, utils_1.isObject)(message)) {
-            errorBuilder.add('Must be an object');
-            return undefined;
-        }
-        if (!(0, utils_1.hasStringProperty)(message, 'text')) {
-            errorBuilder.for('text').add('Must be a string');
-            return undefined;
-        }
-        let validMessage = { text: message.text };
-        if (message.parameters) {
-            if (!(0, utils_1.hasArrayProperty)(message, 'parameters')) {
-                errorBuilder.for('parameters').add('Must be an array');
-                return undefined;
-            }
-            validMessage.parameters = message.parameters;
-        }
-        return validMessage;
+        this.validateValidator(errorBuilder.for('validator'), rule.validator, entity, field);
     }
     validateValidator(errorBuilder, validator, entity, field) {
-        if (!(0, utils_1.isObject)(validator)) {
-            errorBuilder.add('Must be an object');
-            return undefined;
-        }
         const validatorCast = validator;
         switch (validatorCast.operation) {
             case 'and':
-                const andArgs = validatorCast.args
-                    .map((it, index) => this.validateValidatorArgument(errorBuilder.for(String(index)), it, entity, field))
-                    .filter((it) => it !== undefined);
-                return { operation: 'and', args: andArgs };
             case 'or':
-                const orArgs = validatorCast.args
-                    .map((it, index) => this.validateValidatorArgument(errorBuilder.for(String(index)), it, entity, field))
-                    .filter((it) => it !== undefined);
-                return { operation: 'or', args: orArgs };
+                return validatorCast.args
+                    .forEach((it, index) => this.validateValidatorArgument(errorBuilder.for(String(index)), it, entity, field));
             case 'conditional':
-                const argA = this.validateValidatorArgument(errorBuilder.for('condition'), validatorCast.args[0], entity, field);
-                const argB = this.validateValidatorArgument(errorBuilder.for('rule'), validatorCast.args[1], entity, field);
-                if (argA === undefined || argB === undefined) {
-                    return undefined;
-                }
-                return { operation: 'conditional', args: [argA, argB] };
+                this.validateValidatorArgument(errorBuilder.for('condition'), validatorCast.args[0], entity, field);
+                this.validateValidatorArgument(errorBuilder.for('rule'), validatorCast.args[1], entity, field);
+                return;
             case 'pattern':
-                const patternLiteral = this.validateLiteralArgument(errorBuilder, validatorCast.args[0]);
-                if (!patternLiteral) {
-                    return undefined;
-                }
-                if (!(0, utils_1.isArray)(patternLiteral.value) ||
-                    patternLiteral.value.length !== 2 ||
-                    typeof patternLiteral.value[0] !== 'string' ||
-                    typeof patternLiteral.value[1] !== 'string') {
-                    errorBuilder.add('Invalid pattern value');
-                    return undefined;
-                }
-                return { operation: 'pattern', args: [patternLiteral] };
             case 'lengthRange':
-                const lengthArgA = this.validateLiteralArgument(errorBuilder.for('min'), validatorCast.args[0]);
-                const lengthArgB = this.validateLiteralArgument(errorBuilder.for('max'), validatorCast.args[1]);
-                if (lengthArgA === undefined || lengthArgB === undefined) {
-                    return undefined;
-                }
-                return {
-                    operation: 'lengthRange',
-                    args: [lengthArgA, lengthArgB],
-                };
             case 'range':
-                const rangeArgA = this.validateLiteralArgument(errorBuilder.for('min'), validatorCast.args[0]);
-                const rangeArgB = this.validateLiteralArgument(errorBuilder.for('max'), validatorCast.args[1]);
-                if (rangeArgA === undefined || rangeArgB === undefined) {
-                    return undefined;
-                }
-                return {
-                    operation: 'range',
-                    args: [rangeArgA, rangeArgB],
-                };
             case 'equals':
-                const eqArg = this.validateLiteralArgument(errorBuilder, validatorCast.args[0]);
-                if (eqArg === undefined) {
-                    return undefined;
-                }
-                return {
-                    operation: 'equals',
-                    args: [eqArg],
-                };
-            case 'not':
-                const notArg = this.validateValidatorArgument(errorBuilder, validatorCast.args[0], entity, field);
-                if (notArg === undefined) {
-                    return undefined;
-                }
-                return { operation: 'not', args: [notArg] };
             case 'empty':
-                return { operation: 'empty', args: [] };
             case 'defined':
-                return { operation: 'defined', args: [] };
+                return;
+            case 'not':
+                return this.validateValidatorArgument(errorBuilder, validatorCast.args[0], entity, field);
             case 'inContext':
                 const pathArgResult = this.validatePathArgument(errorBuilder.for('path'), validatorCast.args[0], entity);
                 if (pathArgResult === undefined) {
                     return undefined;
                 }
-                const [pathArg, inField] = pathArgResult;
-                const inValidatorArg = this.validateValidatorArgument(errorBuilder.for('validator'), validatorCast.args[1], entity, inField);
-                if (inValidatorArg === undefined) {
-                    return undefined;
-                }
-                return { operation: 'inContext', args: [pathArg, inValidatorArg] };
+                return this.validateValidatorArgument(errorBuilder.for('validator'), validatorCast.args[1], entity, pathArgResult);
             case 'every':
-                const everyArg = this.validateValidatorArgument(errorBuilder, validatorCast.args[0], entity, field);
-                if (everyArg === undefined) {
-                    return undefined;
-                }
-                return { operation: 'every', args: [everyArg] };
             case 'any':
-                const anyArg = this.validateValidatorArgument(errorBuilder, validatorCast.args[0], entity, field);
-                if (anyArg === undefined) {
-                    return undefined;
-                }
-                return { operation: 'any', args: [anyArg] };
+                return this.validateValidatorArgument(errorBuilder, validatorCast.args[0], entity, field);
             case 'filter':
-                const filterArgA = this.validateValidatorArgument(errorBuilder.for('filter'), validatorCast.args[0], entity, field);
-                const filterArgB = this.validateValidatorArgument(errorBuilder.for('validator'), validatorCast.args[1], entity, field);
-                if (filterArgA === undefined || filterArgB === undefined) {
-                    return undefined;
-                }
-                return { operation: 'filter', args: [filterArgA, filterArgB] };
+                this.validateValidatorArgument(errorBuilder.for('filter'), validatorCast.args[0], entity, field);
+                this.validateValidatorArgument(errorBuilder.for('validator'), validatorCast.args[1], entity, field);
+                return;
             default:
                 ((_) => {
                     errorBuilder.for('operation', `Operation ${validatorCast.operation} is not an valid option`);
@@ -221,52 +91,9 @@ class ValidationValidator {
         }
     }
     validateValidatorArgument(errorBuilder, argument, entity, field) {
-        if (!(0, utils_1.isObject)(argument)) {
-            errorBuilder.add('Must be an object');
-            return undefined;
-        }
-        if (!(0, utils_1.hasStringProperty)(argument, 'type') || argument.type !== schema_1.Validation.ArgumentType.validator) {
-            errorBuilder.for('type').add(`Invalid value ${argument.type}`);
-            return undefined;
-        }
-        const validator = this.validateValidator(errorBuilder.for('validator'), argument.validator, entity, field);
-        if (!validator) {
-            return undefined;
-        }
-        return { validator, type: argument.type };
-    }
-    validateLiteralArgument(errorBuilder, argument) {
-        if (!(0, utils_1.isObject)(argument)) {
-            errorBuilder.add('Must be an object');
-            return undefined;
-        }
-        if (!(0, utils_1.hasStringProperty)(argument, 'type') || argument.type !== schema_1.Validation.ArgumentType.literal) {
-            errorBuilder.for('type').add(`Invalid value ${argument.type}`);
-            return undefined;
-        }
-        if (!('value' in argument)) {
-            errorBuilder.for('value').add('Undefined literal value');
-            return undefined;
-        }
-        return { type: argument.type, value: argument.value };
+        this.validateValidator(errorBuilder.for('validator'), argument.validator, entity, field);
     }
     validatePathArgument(errorBuilder, argument, entity) {
-        if (!(0, utils_1.isObject)(argument)) {
-            errorBuilder.add('Must be an object');
-            return undefined;
-        }
-        if (!(0, utils_1.hasStringProperty)(argument, 'type') || argument.type !== schema_1.Validation.ArgumentType.path) {
-            errorBuilder.for('type').add(`Invalid value ${argument.type}`);
-            return undefined;
-        }
-        if (!(0, utils_1.hasArrayProperty)(argument, 'path')) {
-            errorBuilder.add('Undefined path');
-            return undefined;
-        }
-        if (!(0, utils_1.everyIs)(argument.path, (it) => typeof it === 'string')) {
-            errorBuilder.add('Invalid path');
-            return undefined;
-        }
         const isRelation = (0, model_1.acceptFieldVisitor)(this.model, entity, argument.path[0], {
             visitColumn: () => false,
             visitRelation: () => true,
@@ -275,7 +102,7 @@ class ValidationValidator {
             errorBuilder.add('Rules depending on relations are currently not supported.');
             return undefined;
         }
-        return [{ type: argument.type, path: argument.path }, entity.fields[argument.path[0]]];
+        return entity.fields[argument.path[0]];
     }
 }
 exports.ValidationValidator = ValidationValidator;

package/dist/src/validation/ValidationValidator.js.map

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

package/dist/src/validation/index.d.ts

@@ -1,4 +1,6 @@
 export * from './AclValidator';
+export * from './ModelValidator';
+export * from './ValidationValidator';
 export * from './errors';
 export * from './SchemaValidator';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/validation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/validation/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,UAAU,CAAA;AACxB,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/validation/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,uBAAuB,CAAA;AACrC,cAAc,UAAU,CAAA;AACxB,cAAc,mBAAmB,CAAA"}

package/dist/src/validation/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11,6 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AclValidator"), exports);
+__exportStar(require("./ModelValidator"), exports);
+__exportStar(require("./ValidationValidator"), exports);
 __exportStar(require("./errors"), exports);
 __exportStar(require("./SchemaValidator"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/validation/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/validation/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA8B;AAC9B,2CAAwB;AACxB,oDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/validation/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA8B;AAC9B,mDAAgC;AAChC,wDAAqC;AACrC,2CAAwB;AACxB,oDAAiC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/schema-utils",
-  "version": "1.1.0-alpha.5",
+  "version": "1.1.0-alpha.6",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -8,7 +8,8 @@
     "test": "echo 'No tests'"
   },
   "dependencies": {
-    "@contember/schema": "^1.1.0-alpha.5"
+    "@contember/schema": "^1.1.0-alpha.6",
+    "@contember/typesafe": "^1.1.0-alpha.6"
   },
   "devDependencies": {
     "@types/node": "^17.0.5"

package/src/acl/AllowAllPermissionFactory.ts

@@ -1,4 +1,4 @@
-import { Acl, Model } from '@contember/schema'
+import { Acl, Model, Writable } from '@contember/schema'
 
 export class AllowAllPermissionFactory {
 	constructor(
@@ -11,7 +11,7 @@ export class AllowAllPermissionFactory {
 	) {}
 
 	create(schema: Pick<Model.Schema, 'entities'>, allowCustomPrimary = false): Acl.Permissions {
-		const permissions: Acl.Permissions = {}
+		const permissions: Writable<Acl.Permissions> = {}
 		for (let entityName in schema.entities) {
 			if (!schema.entities.hasOwnProperty(entityName)) {
 				continue

package/src/dataUtils.ts

@@ -37,11 +37,11 @@ export const resolveDefaultValue = (column: Model.AnyColumn, providers: Pick<Pro
 	throw new NoDataError(`No data for column ${column.name}`)
 }
 
-export const resolvePrimaryGenerator = (column: Model.AnyColumn, providers: Providers): (() => Input.PrimaryValue) => {
+export const resolvePrimaryGenerator = (column: Model.AnyColumn, providers: Providers): (() => Input.PrimaryValue | undefined) => {
 	if (column.type === Model.ColumnType.Uuid) {
 		return providers.uuid
 	}
-	throw new Error('not implemented')
+	return () => undefined
 }
 
 export const resolveColumnValue = (
@@ -55,7 +55,7 @@ export const resolveColumnValue = (
 		input: Input.ColumnValue | undefined
 	},
 	providers: Providers,
-): Value.AtomicValue => {
+): Value.AtomicValue | undefined => {
 	if (input !== undefined) {
 		return input as Value.AtomicValue
 	}

package/src/index.ts

@@ -1,5 +1,7 @@
 import { Schema } from '@contember/schema'
 import { emptyModelSchema } from './model'
+import * as Typesafe from '@contember/typesafe'
+import { aclSchema, modelSchema, validationSchema } from './type-schema'
 
 export * from './model'
 export * from './acl'
@@ -14,3 +16,9 @@ export const emptySchema: Schema = {
 	acl: { roles: {} },
 	validation: {},
 }
+
+export const schemaType: Typesafe.Type<Schema> = Typesafe.object({
+	model: modelSchema,
+	acl: aclSchema,
+	validation: validationSchema,
+})

package/src/model/NamingHelper.ts

@@ -10,7 +10,7 @@ export class NamingHelper {
 		return 'fk_' + fromTable + '_' + fromColumn + '_' + uniqueSuffix.slice(0, 6)
 	}
 
-	public static createUniqueConstraintName = (entityName: string, fields: string[]): string => {
+	public static createUniqueConstraintName = (entityName: string, fields: readonly string[]): string => {
 		const uniqueSuffix = crypto
 			.createHash('sha256')
 			.update(JSON.stringify([entityName, ...fields]), 'ascii')

package/src/tsconfig.json

@@ -7,6 +7,9 @@
 	"references": [
 		{
 			"path": "../../schema/src"
+		},
+		{
+			"path": "../../typesafe/src"
 		}
 	]
 }

package/src/type-schema/acl.ts

@@ -0,0 +1,100 @@
+import { Acl, Model } from '@contember/schema'
+import * as Typesafe from '@contember/typesafe'
+
+const tenantPermissionsSchema = Typesafe.partial({
+	invite: Typesafe.boolean,
+	unmanagedInvite: Typesafe.boolean,
+	manage: Typesafe.record(Typesafe.string, Typesafe.partial({
+		variables: Typesafe.union(
+			Typesafe.literal(true),
+			Typesafe.record(
+				Typesafe.string,
+				Typesafe.union(Typesafe.literal(true), Typesafe.string),
+			),
+		),
+	})),
+})
+const tenantSchemaCheck: Typesafe.Equals<Acl.TenantPermissions, ReturnType<typeof tenantPermissionsSchema>> = true
+
+const systemPermissionsSchema = Typesafe.partial({
+	history: Typesafe.union(Typesafe.boolean, Typesafe.enumeration('any', 'none')),
+	migrate: Typesafe.boolean,
+	assumeIdentity: Typesafe.boolean,
+})
+const systemSchemaCheck: Typesafe.Equals<Acl.SystemPermissions, ReturnType<typeof systemPermissionsSchema>> = true
+
+const variablesSchema = Typesafe.record(
+	Typesafe.string,
+	Typesafe.union(
+		Typesafe.object({
+			type: Typesafe.literal(Acl.VariableType.entity),
+			entityName: Typesafe.string,
+		}),
+		Typesafe.object({
+			type: Typesafe.literal(Acl.VariableType.predefined),
+			value: Typesafe.enumeration('identityID', 'personID'),
+		}),
+	),
+)
+
+const variableSchemaCheck: Typesafe.Equals<Acl.Variables, ReturnType<typeof variablesSchema>> = true
+
+const fieldPermissionsSchema = Typesafe.record(
+	Typesafe.string,
+	Typesafe.union(Typesafe.string, Typesafe.boolean),
+)
+const predicatesSchema = Typesafe.record(
+	Typesafe.string,
+	(v, p): Acl.PredicateDefinition => Typesafe.anyJsonObject(v, p) as Acl.PredicateDefinition,
+)
+
+const predicatesSchemaCheck: Typesafe.Equals<Acl.PredicateMap, ReturnType<typeof predicatesSchema>> = true
+
+const entityOperationsSchema = Typesafe.partial({
+	read: fieldPermissionsSchema,
+	create: fieldPermissionsSchema,
+	update: fieldPermissionsSchema,
+	delete: Typesafe.union(Typesafe.string, Typesafe.boolean),
+	customPrimary: Typesafe.boolean,
+})
+const opSchemaCheck: Typesafe.Equals<Acl.EntityOperations, ReturnType<typeof entityOperationsSchema>> = true
+const entitiesSchema = Typesafe.record(
+	Typesafe.string,
+	Typesafe.object({
+		predicates: predicatesSchema,
+		operations: entityOperationsSchema,
+	}),
+)
+const entitiesSchemaCheck: Typesafe.Equals<Acl.Permissions, ReturnType<typeof entitiesSchema>> = true
+
+const baseRolePermissionsSchema = Typesafe.intersection(
+	Typesafe.object({
+		variables: variablesSchema,
+		entities: entitiesSchema,
+	}),
+	Typesafe.partial({
+		inherits: Typesafe.array(Typesafe.string),
+		implicit: Typesafe.boolean,
+		stages: Typesafe.union(
+			Typesafe.literal('*'),
+			Typesafe.array(Typesafe.string),
+		),
+		tenant: tenantPermissionsSchema,
+		system: systemPermissionsSchema,
+	}),
+)
+const baseRolePermissionsCheck: Typesafe.Equals<Acl.BaseRolePermissions, ReturnType<typeof baseRolePermissionsSchema>> = true
+
+export const aclSchema = Typesafe.object({
+	roles: Typesafe.record(
+		Typesafe.string,
+		(v, p): Acl.RolePermissions => {
+			const main: Acl.BaseRolePermissions = baseRolePermissionsSchema(v, p)
+			return {
+				...(v as any),
+				...main,
+			}
+		},
+	),
+})
+const aclSchemaCheck: Typesafe.Equals<Acl.Schema, ReturnType<typeof aclSchema>> = true

package/src/type-schema/index.ts

@@ -0,0 +1,3 @@
+export * from './acl'
+export * from './model'
+export * from './validation'