@contember/schema-utils 1.1.0-alpha.4 → 1.1.0-alpha.7

package/dist/src/type-schema/model.js

@@ -0,0 +1,148 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelSchema = void 0;
+const Typesafe = __importStar(require("@contember/typesafe"));
+const schema_1 = require("@contember/schema");
+const orderBySchema = Typesafe.array(Typesafe.object({
+    path: Typesafe.array(Typesafe.string),
+    direction: Typesafe.enumeration(schema_1.Model.OrderDirection.asc, schema_1.Model.OrderDirection.desc),
+}));
+const joiningColumnSchema = Typesafe.object({
+    columnName: Typesafe.string,
+    onDelete: Typesafe.enumeration(schema_1.Model.OnDelete.cascade, schema_1.Model.OnDelete.restrict, schema_1.Model.OnDelete.setNull),
+});
+const oneHasManyRelationSchema = Typesafe.intersection(Typesafe.object({
+    type: Typesafe.literal(schema_1.Model.RelationType.OneHasMany),
+    name: Typesafe.string,
+    target: Typesafe.string,
+    ownedBy: Typesafe.string,
+}), Typesafe.partial({
+    orderBy: orderBySchema,
+}));
+const oneHasManyRelationSchemaCheck = true;
+const manyHasOneRelationSchema = Typesafe.intersection(Typesafe.object({
+    type: Typesafe.literal(schema_1.Model.RelationType.ManyHasOne),
+    name: Typesafe.string,
+    target: Typesafe.string,
+    joiningColumn: joiningColumnSchema,
+    nullable: Typesafe.boolean,
+}), Typesafe.partial({
+    inversedBy: Typesafe.string,
+}));
+const manyHasOneRelationSchemaCheck = true;
+const oneHasOneInverseRelationSchema = Typesafe.object({
+    type: Typesafe.literal(schema_1.Model.RelationType.OneHasOne),
+    name: Typesafe.string,
+    target: Typesafe.string,
+    ownedBy: Typesafe.string,
+    nullable: Typesafe.boolean,
+});
+const oneHasOneInverseRelationSchemaCheck = true;
+const oneHasOneOwningRelationSchema = Typesafe.intersection(Typesafe.object({
+    type: Typesafe.literal(schema_1.Model.RelationType.OneHasOne),
+    name: Typesafe.string,
+    target: Typesafe.string,
+    joiningColumn: joiningColumnSchema,
+    nullable: Typesafe.boolean,
+}), Typesafe.partial({
+    inversedBy: Typesafe.string,
+    orphanRemoval: Typesafe.literal(true),
+}));
+const oneHasOneOwningRelationSchemaCheck = true;
+const manyHasManyOwningRelationSchema = Typesafe.intersection(Typesafe.object({
+    type: Typesafe.literal(schema_1.Model.RelationType.ManyHasMany),
+    name: Typesafe.string,
+    target: Typesafe.string,
+    joiningTable: Typesafe.object({
+        tableName: Typesafe.string,
+        joiningColumn: joiningColumnSchema,
+        inverseJoiningColumn: joiningColumnSchema,
+        eventLog: Typesafe.object({
+            enabled: Typesafe.boolean,
+        }),
+    }),
+}), Typesafe.partial({
+    inversedBy: Typesafe.string,
+    orderBy: orderBySchema,
+}));
+const manyHasManyOwningRelationSchemaCheck = true;
+const manyHasManyInverseRelationSchema = Typesafe.intersection(Typesafe.object({
+    type: Typesafe.literal(schema_1.Model.RelationType.ManyHasMany),
+    name: Typesafe.string,
+    target: Typesafe.string,
+    ownedBy: Typesafe.string,
+}), Typesafe.partial({
+    orderBy: orderBySchema,
+}));
+const manyHasManyInverseRelationSchemaCheck = true;
+const intersectionSchema = Typesafe.intersection(Typesafe.object({
+    precedence: Typesafe.enumeration('ALWAYS', 'BY DEFAULT'),
+}), Typesafe.partial({
+    start: Typesafe.number,
+}));
+const intersectionSchemaCheck = true;
+const columnSchema = Typesafe.intersection(Typesafe.object({
+    name: Typesafe.string,
+    columnName: Typesafe.string,
+    columnType: Typesafe.string,
+    nullable: Typesafe.boolean,
+    type: Typesafe.enumeration(...Object.values(schema_1.Model.ColumnType)),
+}), Typesafe.partial({
+    typeAlias: Typesafe.string,
+    default: Typesafe.union(Typesafe.string, Typesafe.number, Typesafe.boolean, Typesafe.null_),
+    sequence: intersectionSchema,
+}));
+const columnSchemaCheck = true;
+const fieldSchema = Typesafe.union(oneHasOneInverseRelationSchema, oneHasOneOwningRelationSchema, oneHasManyRelationSchema, manyHasOneRelationSchema, manyHasManyInverseRelationSchema, manyHasManyOwningRelationSchema, columnSchema);
+const viewSchemaInner = Typesafe.intersection(Typesafe.object({
+    sql: Typesafe.string,
+}), Typesafe.partial({
+    dependencies: Typesafe.array(Typesafe.string),
+}));
+const viewSchemaCheck = true;
+const viewSchema = viewSchemaInner;
+const entitySchema = Typesafe.intersection(Typesafe.object({
+    name: Typesafe.string,
+    primary: Typesafe.string,
+    primaryColumn: Typesafe.string,
+    tableName: Typesafe.string,
+    fields: Typesafe.record(Typesafe.string, fieldSchema),
+    unique: Typesafe.record(Typesafe.string, Typesafe.object({
+        fields: Typesafe.array(Typesafe.string),
+        name: Typesafe.string,
+    })),
+    eventLog: Typesafe.object({
+        enabled: Typesafe.boolean,
+    }),
+}), Typesafe.partial({
+    view: viewSchema,
+}));
+const entitySchemaCheck = true;
+exports.modelSchema = Typesafe.object({
+    entities: Typesafe.record(Typesafe.string, entitySchema),
+    enums: Typesafe.record(Typesafe.string, Typesafe.array(Typesafe.string)),
+});
+//# sourceMappingURL=model.js.map

package/dist/src/type-schema/model.js.map

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

package/dist/src/type-schema/validation.d.ts

@@ -0,0 +1,15 @@
+import * as Typesafe from '@contember/typesafe';
+import { Validation } from '@contember/schema';
+export declare const validationSchema: Typesafe.Type<{
+    readonly [x: string]: {
+        readonly [x: string]: readonly {
+            readonly validator: Validation.Validator;
+            readonly message: {
+                readonly text: string;
+            } & {
+                readonly parameters?: readonly (string | number)[] | undefined;
+            };
+        }[];
+    };
+}>;
+//# sourceMappingURL=validation.d.ts.map

package/dist/src/type-schema/validation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/type-schema/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AA+F9C,eAAO,MAAM,gBAAgB;;;;;;;;;;;EAG5B,CAAA"}

package/dist/src/type-schema/validation.js

@@ -0,0 +1,95 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validationSchema = void 0;
+const Typesafe = __importStar(require("@contember/typesafe"));
+const schema_1 = require("@contember/schema");
+const messageSchema = Typesafe.intersection(Typesafe.object({
+    text: Typesafe.string,
+}), Typesafe.partial({
+    parameters: Typesafe.array(Typesafe.union(Typesafe.string, Typesafe.number)),
+}));
+const literalArgumentFactory = (inner) => Typesafe.object({
+    type: Typesafe.literal(schema_1.Validation.ArgumentType.literal),
+    value: inner,
+});
+const validatorArgumentSchema = Typesafe.object({
+    type: Typesafe.literal(schema_1.Validation.ArgumentType.validator),
+    validator: (v, p) => validatorSchema(v, p),
+});
+const pathArgumentSchema = Typesafe.object({
+    type: Typesafe.literal(schema_1.Validation.ArgumentType.path),
+    path: Typesafe.array(Typesafe.string),
+});
+const validatorSchema = Typesafe.union(Typesafe.object({
+    operation: Typesafe.literal('and'),
+    args: Typesafe.array(validatorArgumentSchema),
+}), Typesafe.object({
+    operation: Typesafe.literal('or'),
+    args: Typesafe.array(validatorArgumentSchema),
+}), Typesafe.object({
+    operation: Typesafe.literal('conditional'),
+    args: Typesafe.tuple(validatorArgumentSchema, validatorArgumentSchema),
+}), Typesafe.object({
+    operation: Typesafe.literal('pattern'),
+    args: Typesafe.tuple(literalArgumentFactory(Typesafe.tuple(Typesafe.string, Typesafe.string))),
+}), Typesafe.object({
+    operation: Typesafe.literal('lengthRange'),
+    args: Typesafe.tuple(literalArgumentFactory(Typesafe.union(Typesafe.null_, Typesafe.number)), literalArgumentFactory(Typesafe.union(Typesafe.null_, Typesafe.number))),
+}), Typesafe.object({
+    operation: Typesafe.literal('range'),
+    args: Typesafe.tuple(literalArgumentFactory(Typesafe.union(Typesafe.null_, Typesafe.number)), literalArgumentFactory(Typesafe.union(Typesafe.null_, Typesafe.number))),
+}), Typesafe.object({
+    operation: Typesafe.literal('equals'),
+    args: Typesafe.tuple(literalArgumentFactory(Typesafe.anyJson)),
+}), Typesafe.object({
+    operation: Typesafe.literal('not'),
+    args: Typesafe.tuple(validatorArgumentSchema),
+}), Typesafe.object({
+    operation: Typesafe.literal('empty'),
+    args: Typesafe.tuple(),
+}), Typesafe.object({
+    operation: Typesafe.literal('defined'),
+    args: Typesafe.tuple(),
+}), Typesafe.object({
+    operation: Typesafe.literal('inContext'),
+    args: Typesafe.tuple(pathArgumentSchema, validatorArgumentSchema),
+}), Typesafe.object({
+    operation: Typesafe.literal('every'),
+    args: Typesafe.tuple(validatorArgumentSchema),
+}), Typesafe.object({
+    operation: Typesafe.literal('any'),
+    args: Typesafe.tuple(validatorArgumentSchema),
+}), Typesafe.object({
+    operation: Typesafe.literal('filter'),
+    args: Typesafe.tuple(validatorArgumentSchema, validatorArgumentSchema),
+}));
+const validatorSchemaCheck = true;
+const validationRuleSchema = Typesafe.object({
+    validator: validatorSchema,
+    message: messageSchema,
+});
+exports.validationSchema = Typesafe.record(Typesafe.string, Typesafe.record(Typesafe.string, Typesafe.array(validationRuleSchema)));
+//# sourceMappingURL=validation.js.map

package/dist/src/type-schema/validation.js.map

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

package/dist/src/utils/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];

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAA6B;AAC7B,yCAAsB;AACtB,gDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,yCAAsB;AACtB,gDAA6B"}

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

@@ -3,13 +3,12 @@ import { ValidationError } from './errors';
 export declare class AclValidator {
     private readonly model;
     constructor(model: Model.Schema);
-    validate(schema: unknown): [Acl.Schema, ValidationError[]];
+    validate(schema: Acl.Schema): ValidationError[];
     private validateRoles;
     private validateRolePermissions;
     private validateInherits;
     private validateVariables;
     private validateVariable;
-    private validateStagesDefinition;
     private validatePermissions;
     private validateEntityPermissions;
     private validatePredicates;

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

@@ -1 +1 @@
-{"version":3,"file":"AclValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/AclValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAI9C,OAAO,EAAgB,eAAe,EAAE,MAAM,UAAU,CAAA;AAExD,qBAAa,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAejE,OAAO,CAAC,aAAa;IAsBrB,OAAO,CAAC,uBAAuB;IA4C/B,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,gBAAgB;IA6CxB,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,mBAAmB;IAiC3B,OAAO,CAAC,yBAAyB;IA8BjC,OAAO,CAAC,kBAAkB;IA4B1B,OAAO,CAAC,2BAA2B;IAwCnC,OAAO,CAAC,kBAAkB;IAiC1B,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,iBAAiB;CAkBzB"}
+{"version":3,"file":"AclValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/AclValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,EAAgB,eAAe,EAAE,MAAM,UAAU,CAAA;AAGxD,qBAAa,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,eAAe,EAAE;IAMtD,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,uBAAuB;IAY/B,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,yBAAyB;IAoBjC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,2BAA2B;IA2BnC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,wBAAwB;IAiBhC,OAAO,CAAC,iBAAiB;CAYzB"}

package/dist/src/validation/AclValidator.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AclValidator = void 0;
-const schema_1 = require("@contember/schema");
-const utils_1 = require("./utils");
 const acl_1 = require("../acl");
 const model_1 = require("../model");
 const errors_1 = require("./errors");
@@ -12,164 +10,52 @@ class AclValidator {
     }
     validate(schema) {
         const errorBuilder = new errors_1.ErrorBuilder([], ['acl']);
-        let validSchema;
-        if (!(0, utils_1.isObject)(schema)) {
-            errorBuilder.add('Must be an object');
-            validSchema = { roles: {} };
-        }
-        else if (!schema.roles) {
-            errorBuilder.for('roles').add('Property is missing');
-            validSchema = { roles: {} };
-        }
-        else {
-            validSchema = { roles: this.validateRoles(schema.roles, errorBuilder) };
-        }
-        return [validSchema, errorBuilder.errors];
+        this.validateRoles(schema.roles, errorBuilder);
+        return errorBuilder.errors;
     }
     validateRoles(roles, errorBuilder) {
-        if (!(0, utils_1.isObject)(roles)) {
-            errorBuilder.add('Must be an object');
-            return {};
-        }
-        const validRoles = {};
         for (const role in roles) {
             if (!roles.hasOwnProperty(role)) {
                 continue;
             }
-            // if (role === 'admin') {
-            // 	errorBuilder.add('Role "admin" is reserved.')
-            // 	continue
-            // }
-            const rolePermissions = this.validateRolePermissions(roles[role], Object.keys(roles), errorBuilder.for(role));
-            if (rolePermissions !== undefined) {
-                validRoles[role] = rolePermissions;
-            }
+            this.validateRolePermissions(roles[role], Object.keys(roles), errorBuilder.for(role));
         }
-        return validRoles;
     }
     validateRolePermissions(permissions, roles, errorBuilder) {
-        if (!(0, utils_1.isObject)(permissions)) {
-            errorBuilder.add('Must be an object');
-            return;
-        }
-        const { inherits: inheritsIn, variables: variablesIn, stages: stagesIn, entities: entitiesIn, implicit: implicitIn, ...plugins } = permissions;
-        const inherits = this.validateInherits(inheritsIn, roles, errorBuilder.for('inherits'));
-        const variables = this.validateVariables(variablesIn, errorBuilder.for('variables'));
-        const stages = this.validateStagesDefinition(stagesIn, errorBuilder.for('stages'));
-        const entities = this.validatePermissions(entitiesIn, permissions.variables || {}, errorBuilder.for('entities'));
+        this.validateInherits(permissions.inherits, roles, errorBuilder.for('inherits'));
+        this.validateVariables(permissions.variables, errorBuilder.for('variables'));
+        this.validatePermissions(permissions.entities, permissions.variables || {}, errorBuilder.for('entities'));
         // todo: plugins validation
-        const result = { variables, stages, entities };
-        if (inherits !== undefined) {
-            result.inherits = inherits;
-        }
-        if (implicitIn !== undefined) {
-            if (typeof implicitIn !== 'boolean') {
-                errorBuilder.for('implicit').add('Must be boolean');
-                return;
-            }
-            result.implicit = implicitIn;
-        }
-        return { ...plugins, ...result };
     }
     validateInherits(inherits, roles, errorBuilder) {
         if (inherits === undefined) {
             return undefined;
         }
-        if (!Array.isArray(inherits) || !(0, utils_1.everyIs)(inherits, (it) => typeof it === 'string')) {
-            errorBuilder.add('Must be an array of strings');
-            return [];
-        }
-        else {
-            const validRoles = [];
-            for (const inheritsFrom of inherits) {
-                if (!roles.includes(inheritsFrom)) {
-                    // todo: check recursion
-                    errorBuilder.for(inheritsFrom).add('Referenced role not exists.');
-                }
-                else {
-                    validRoles.push(inheritsFrom);
-                }
+        for (const inheritsFrom of inherits) {
+            if (!roles.includes(inheritsFrom)) {
+                errorBuilder.for(inheritsFrom).add('Referenced role not exists.');
             }
-            return validRoles;
         }
     }
     validateVariables(variables, errorBuilder) {
-        let validVariables = {};
-        if (!(0, utils_1.isObject)(variables)) {
-            errorBuilder.add('Must be an object');
-            return {};
-        }
         for (const varName in variables) {
             if (!variables.hasOwnProperty(varName)) {
                 continue;
             }
-            const validVariable = this.validateVariable(variables[varName], errorBuilder.for(varName));
-            if (validVariable) {
-                validVariables[varName] = validVariable;
-            }
+            this.validateVariable(variables[varName], errorBuilder.for(varName));
         }
-        return validVariables;
     }
     validateVariable(variable, errorBuilder) {
-        if (!(0, utils_1.isObject)(variable)) {
-            errorBuilder.add('Must be an object');
-            return;
-        }
-        if (!(0, utils_1.hasStringProperty)(variable, 'type')) {
-            errorBuilder.add('Variable type is not defined');
-            return;
-        }
         switch (variable.type) {
-            case schema_1.Acl.VariableType.entity:
-                if (!(0, utils_1.hasStringProperty)(variable, 'entityName')) {
-                    errorBuilder.add('Entity name must be specified for this type of variable');
-                    return;
-                }
+            case 'entity':
                 if (!this.model.entities[variable.entityName]) {
                     errorBuilder.add(`Entity "${variable.entityName}" not found`);
                     return;
                 }
-                const extra = (0, utils_1.checkExtraProperties)(variable, ['entityName', 'type']);
-                if (extra.length) {
-                    errorBuilder.add('Unsupported properties found: ' + extra.join(', '));
-                }
-                return { type: schema_1.Acl.VariableType.entity, entityName: variable.entityName };
-            case schema_1.Acl.VariableType.predefined:
-                if (!(0, utils_1.hasStringProperty)(variable, 'value')) {
-                    errorBuilder.add('Variable value type must be specified for this type of variable');
-                    return;
-                }
-                if (variable.value !== 'identityID' && variable.value !== 'personID') {
-                    errorBuilder.add('Unknown predefined variable');
-                    return;
-                }
-                const extra2 = (0, utils_1.checkExtraProperties)(variable, ['type', 'value']);
-                if (extra2.length) {
-                    errorBuilder.add('Unsupported properties found: ' + extra2.join(', '));
-                }
-                return { type: variable.type, value: variable.value };
-            default:
-                errorBuilder.add(`Variable type "${variable.type}" is not supported.`);
         }
         return;
     }
-    validateStagesDefinition(stages, errorBuilder) {
-        if (stages === '*') {
-            return '*';
-        }
-        if (!Array.isArray(stages) || !(0, utils_1.everyIs)(stages, (it) => typeof it === 'string')) {
-            errorBuilder.add('Stages must be either "*" or array of stage names');
-            return [];
-        }
-        // todo validate stages ??
-        return stages;
-    }
     validatePermissions(permissions, variables, errorBuilder) {
-        if (!(0, utils_1.isObject)(permissions)) {
-            errorBuilder.add('Must be an object');
-            return {};
-        }
-        const validPermissions = {};
         for (const entityName in permissions) {
             if (!permissions.hasOwnProperty(entityName)) {
                 continue;
@@ -179,108 +65,54 @@ class AclValidator {
                 continue;
             }
             const entity = (0, model_1.getEntity)(this.model, entityName);
-            const entityPermissions = this.validateEntityPermissions(permissions[entityName], entity, variables, errorBuilder.for(entityName));
-            if (entityPermissions) {
-                validPermissions[entityName] = entityPermissions;
-            }
+            this.validateEntityPermissions(permissions[entityName], entity, variables, errorBuilder.for(entityName));
         }
-        return validPermissions;
     }
     validateEntityPermissions(entityPermissions, entity, variables, errorBuilder) {
-        if (!(0, utils_1.isObject)(entityPermissions)) {
-            errorBuilder.add('Must be an object');
-            return;
-        }
-        const extra = (0, utils_1.checkExtraProperties)(entityPermissions, ['predicates', 'operations']);
-        if (extra.length) {
-            errorBuilder.add('Unsupported properties found: ' + extra.join(', '));
-        }
-        const predicates = this.validatePredicates(entityPermissions.predicates, entity, variables, errorBuilder.for('predicates'));
-        const operations = this.validateOperations(entityPermissions.operations, entity, entityPermissions.predicates, errorBuilder.for('operations'));
-        return { operations, predicates };
+        this.validatePredicates(entityPermissions.predicates, entity, variables, errorBuilder.for('predicates'));
+        this.validateOperations(entityPermissions.operations, entity, entityPermissions.predicates, errorBuilder.for('operations'));
     }
     validatePredicates(predicates, entity, variables, errorBuilder) {
-        if (!(0, utils_1.isObject)(predicates)) {
-            errorBuilder.add('Must be an object');
-            return {};
-        }
-        const validPredicates = {};
         for (const predicateName in predicates) {
             if (!predicates.hasOwnProperty(predicateName)) {
                 continue;
             }
-            const predicate = this.validatePredicateDefinition(predicates[predicateName], entity, variables, errorBuilder.for(predicateName));
-            if (predicate) {
-                validPredicates[predicateName] = predicate;
-            }
+            this.validatePredicateDefinition(predicates[predicateName], entity, variables, errorBuilder.for(predicateName));
         }
-        return validPredicates;
     }
     validatePredicateDefinition(predicate, entity, variables, errorBuilder) {
-        if (!(0, utils_1.isObject)(predicate)) {
-            errorBuilder.add('Must be an object');
-            return;
-        }
         const processor = new acl_1.PredicateDefinitionProcessor(this.model);
-        let valid = true;
-        const result = processor.process(entity, predicate, {
+        processor.process(entity, predicate, {
             handleColumn: ctx => {
                 if (typeof ctx.value === 'string' && !variables[ctx.value]) {
-                    valid = false;
                     errorBuilder.for(...ctx.path).add(`Undefined variable ${ctx.value}`);
                 }
                 return ctx.value;
             },
             handleRelation: ctx => {
                 if (typeof ctx.value === 'string' && !variables[ctx.value]) {
-                    valid = false;
                     errorBuilder.for(...ctx.path).add(`Undefined variable ${ctx.value}`);
                 }
                 return ctx.value;
             },
             handleUndefinedField: ctx => {
                 errorBuilder.for(...ctx.path).add(`Undefined field ${ctx.name} on entity ${ctx.entity.name}`);
-                valid = false;
                 return ctx.value;
             },
         });
-        if (!valid) {
-            return;
-        }
-        return result;
     }
     validateOperations(operations, entity, predicates, errorBuilder) {
-        if (!(0, utils_1.isObject)(operations)) {
-            errorBuilder.add('Must be an object');
-            return {};
-        }
-        const extra = (0, utils_1.checkExtraProperties)(operations, ['read', 'create', 'update', 'delete', 'customPrimary']);
-        if (extra.length) {
-            errorBuilder.add('Unsupported properties found: ' + extra.join(', '));
-        }
-        const validOperations = {};
         if (operations.delete !== undefined) {
-            validOperations.delete = this.validatePredicate(operations.delete, predicates, errorBuilder.for('delete'));
+            this.validatePredicate(operations.delete, predicates, errorBuilder.for('delete'));
         }
         for (const op of ['read', 'create', 'update']) {
-            if (operations[op]) {
-                validOperations[op] = this.validateFieldPermissions(operations[op], entity, predicates, errorBuilder.for(op));
-            }
-        }
-        if (operations.customPrimary !== undefined) {
-            if (typeof operations.customPrimary !== 'boolean') {
-                errorBuilder.for('customPrimary').add('Must be boolean');
+            const operation = operations[op];
+            if (operation !== undefined) {
+                this.validateFieldPermissions(operation, entity, predicates, errorBuilder.for(op));
             }
-            validOperations.customPrimary = operations.customPrimary;
         }
-        return validOperations;
     }
     validateFieldPermissions(permissions, entity, predicates, errorBuilder) {
-        if (!(0, utils_1.isObject)(permissions)) {
-            errorBuilder.add('Must be an object');
-            return {};
-        }
-        const valid = {};
         for (const field in permissions) {
             if (!permissions.hasOwnProperty(field)) {
                 continue;
@@ -288,23 +120,16 @@ class AclValidator {
             if (!entity.fields[field]) {
                 errorBuilder.add(`Field ${field} not found on entity ${entity.name}`);
             }
-            valid[field] = this.validatePredicate(permissions[field], predicates, errorBuilder.for(field));
+            this.validatePredicate(permissions[field], predicates, errorBuilder.for(field));
         }
-        return valid;
     }
     validatePredicate(predicate, predicates, errorBuilder) {
         if (predicate === false || predicate === true) {
-            return predicate;
-        }
-        if (typeof predicate !== 'string') {
-            errorBuilder.add('Predicate must be either boolean or predicate reference');
-            return false;
+            return;
         }
         if (!predicates[predicate]) {
             errorBuilder.add(`Predicate ${predicate} not found`);
-            return false;
         }
-        return predicate;
     }
 }
 exports.AclValidator = AclValidator;