@contember/schema-definition 1.1.0-alpha.6 → 1.1.0-beta.0

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

@@ -0,0 +1,449 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const src_1 = require("../../src");
+var SimpleModel;
+(function (SimpleModel) {
+    SimpleModel.publicRole = src_1.AclDefinition.createRole('public');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allow(SimpleModel.publicRole, { read: true })
+    ], Book);
+    SimpleModel.Book = Book;
+})(SimpleModel || (SimpleModel = {}));
+(0, vitest_1.test)('simple definitions', () => {
+    const schema = (0, src_1.createSchema)(SimpleModel);
+    (0, vitest_1.expect)(schema.acl.roles.public.entities.Book).toMatchInlineSnapshot(`
+		{
+		  "operations": {
+		    "read": {
+		      "title": true,
+		    },
+		  },
+		  "predicates": {},
+		}
+	`);
+});
+var ModelWithPredicate;
+(function (ModelWithPredicate) {
+    ModelWithPredicate.publicRole = src_1.AclDefinition.createRole('public');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+            this.isPublished = src_1.SchemaDefinition.boolColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allow(ModelWithPredicate.publicRole, {
+            when: { isPublished: { eq: true } },
+            read: true,
+        })
+    ], Book);
+    ModelWithPredicate.Book = Book;
+})(ModelWithPredicate || (ModelWithPredicate = {}));
+(0, vitest_1.test)('definition with a predicate', () => {
+    const schema = (0, src_1.createSchema)(ModelWithPredicate);
+    (0, vitest_1.expect)(schema.acl.roles.public.entities.Book).toMatchInlineSnapshot(`
+		{
+		  "operations": {
+		    "read": {
+		      "isPublished": "isPublished_eq_true",
+		      "title": "isPublished_eq_true",
+		    },
+		  },
+		  "predicates": {
+		    "isPublished_eq_true": {
+		      "isPublished": {
+		        "eq": true,
+		      },
+		    },
+		  },
+		}
+	`);
+});
+var ModelWithPredicateOnField;
+(function (ModelWithPredicateOnField) {
+    ModelWithPredicateOnField.publicRole = src_1.AclDefinition.createRole('public');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+            this.isPublished = src_1.SchemaDefinition.boolColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allow(ModelWithPredicateOnField.publicRole, {
+            when: { isPublished: { eq: true } },
+            read: ['title'],
+        })
+    ], Book);
+    ModelWithPredicateOnField.Book = Book;
+})(ModelWithPredicateOnField || (ModelWithPredicateOnField = {}));
+(0, vitest_1.test)('definition with a predicate on field', () => {
+    const schema = (0, src_1.createSchema)(ModelWithPredicateOnField);
+    (0, vitest_1.expect)(schema.acl.roles.public.entities.Book).toMatchInlineSnapshot(`
+		{
+		  "operations": {
+		    "read": {
+		      "title": "isPublished_eq_true",
+		    },
+		  },
+		  "predicates": {
+		    "isPublished_eq_true": {
+		      "isPublished": {
+		        "eq": true,
+		      },
+		    },
+		  },
+		}
+	`);
+});
+var ModelWithModificationAcl;
+(function (ModelWithModificationAcl) {
+    ModelWithModificationAcl.publicRole = src_1.AclDefinition.createRole('public');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+            this.isPublished = src_1.SchemaDefinition.boolColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allow(ModelWithModificationAcl.publicRole, {
+            when: { isPublished: { eq: true } },
+            create: true,
+            update: true,
+            delete: true,
+        })
+    ], Book);
+    ModelWithModificationAcl.Book = Book;
+})(ModelWithModificationAcl || (ModelWithModificationAcl = {}));
+(0, vitest_1.test)('definition with update, create, delete predicates', () => {
+    const schema = (0, src_1.createSchema)(ModelWithModificationAcl);
+    (0, vitest_1.expect)(schema.acl.roles.public.entities.Book).toMatchInlineSnapshot(`
+		{
+		  "operations": {
+		    "create": {
+		      "isPublished": "isPublished_eq_true",
+		      "title": "isPublished_eq_true",
+		    },
+		    "delete": "isPublished_eq_true",
+		    "update": {
+		      "isPublished": "isPublished_eq_true",
+		      "title": "isPublished_eq_true",
+		    },
+		  },
+		  "predicates": {
+		    "isPublished_eq_true": {
+		      "isPublished": {
+		        "eq": true,
+		      },
+		    },
+		  },
+		}
+	`);
+});
+var ModelWithMultiplePredicates;
+(function (ModelWithMultiplePredicates) {
+    ModelWithMultiplePredicates.publicRole = src_1.AclDefinition.createRole('public');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+            this.isPublished = src_1.SchemaDefinition.boolColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allow(ModelWithMultiplePredicates.publicRole, {
+            when: { isPublished: { eq: true } },
+            read: ['title'],
+        }),
+        src_1.AclDefinition.allow(ModelWithMultiplePredicates.publicRole, {
+            when: { isPublished: { eq: false } },
+            read: ['title'],
+        })
+    ], Book);
+    ModelWithMultiplePredicates.Book = Book;
+})(ModelWithMultiplePredicates || (ModelWithMultiplePredicates = {}));
+(0, vitest_1.test)('definition with multiple predicates on a single field', () => {
+    const schema = (0, src_1.createSchema)(ModelWithMultiplePredicates);
+    (0, vitest_1.expect)(schema.acl.roles.public.entities.Book).toMatchInlineSnapshot(`
+		{
+		  "operations": {
+		    "read": {
+		      "title": "or_isPublished_eq_false_isPub",
+		    },
+		  },
+		  "predicates": {
+		    "or_isPublished_eq_false_isPub": {
+		      "or": [
+		        {
+		          "isPublished": {
+		            "eq": false,
+		          },
+		        },
+		        {
+		          "isPublished": {
+		            "eq": true,
+		          },
+		        },
+		      ],
+		    },
+		  },
+		}
+	`);
+});
+var ModelWithMultipleRolesForSinglePredicate;
+(function (ModelWithMultipleRolesForSinglePredicate) {
+    ModelWithMultipleRolesForSinglePredicate.publicRole = src_1.AclDefinition.createRole('public');
+    ModelWithMultipleRolesForSinglePredicate.adminRole = src_1.AclDefinition.createRole('admin');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+            this.isPublished = src_1.SchemaDefinition.boolColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allow([ModelWithMultipleRolesForSinglePredicate.publicRole, ModelWithMultipleRolesForSinglePredicate.adminRole], {
+            read: ['title'],
+        })
+    ], Book);
+    ModelWithMultipleRolesForSinglePredicate.Book = Book;
+})(ModelWithMultipleRolesForSinglePredicate || (ModelWithMultipleRolesForSinglePredicate = {}));
+(0, vitest_1.test)('definition with multiple roles in single predicate', () => {
+    const schema = (0, src_1.createSchema)(ModelWithMultipleRolesForSinglePredicate);
+    (0, vitest_1.expect)(schema.acl.roles).toMatchInlineSnapshot(`
+		{
+		  "admin": {
+		    "entities": {
+		      "Book": {
+		        "operations": {
+		          "read": {
+		            "title": true,
+		          },
+		        },
+		        "predicates": {},
+		      },
+		    },
+		    "stages": "*",
+		    "variables": {},
+		  },
+		  "public": {
+		    "entities": {
+		      "Book": {
+		        "operations": {
+		          "read": {
+		            "title": true,
+		          },
+		        },
+		        "predicates": {},
+		      },
+		    },
+		    "stages": "*",
+		    "variables": {},
+		  },
+		}
+	`);
+});
+var ModelWithAclPredicateReferences;
+(function (ModelWithAclPredicateReferences) {
+    ModelWithAclPredicateReferences.publicRole = src_1.AclDefinition.createRole('public');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+            this.isPublished = src_1.SchemaDefinition.boolColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allow(ModelWithAclPredicateReferences.publicRole, {
+            when: { isPublished: { eq: true } },
+            read: ['title'],
+        })
+    ], Book);
+    ModelWithAclPredicateReferences.Book = Book;
+    let BookReview = class BookReview {
+        constructor() {
+            this.book = src_1.SchemaDefinition.manyHasOne(Book);
+            this.content = src_1.SchemaDefinition.stringColumn();
+        }
+    };
+    BookReview = __decorate([
+        src_1.AclDefinition.allow(ModelWithAclPredicateReferences.publicRole, {
+            when: { book: src_1.AclDefinition.canRead('title') },
+            read: ['content'],
+        })
+    ], BookReview);
+    ModelWithAclPredicateReferences.BookReview = BookReview;
+})(ModelWithAclPredicateReferences || (ModelWithAclPredicateReferences = {}));
+(0, vitest_1.test)('definition with predicate references', () => {
+    const schema = (0, src_1.createSchema)(ModelWithAclPredicateReferences);
+    (0, vitest_1.expect)(schema.acl.roles.public.entities).toMatchInlineSnapshot(`
+		{
+		  "Book": {
+		    "operations": {
+		      "read": {
+		        "title": "isPublished_eq_true",
+		      },
+		    },
+		    "predicates": {
+		      "isPublished_eq_true": {
+		        "isPublished": {
+		          "eq": true,
+		        },
+		      },
+		    },
+		  },
+		  "BookReview": {
+		    "operations": {
+		      "read": {
+		        "content": "book_isPublished_eq_true",
+		      },
+		    },
+		    "predicates": {
+		      "book_isPublished_eq_true": {
+		        "book": {
+		          "isPublished": {
+		            "eq": true,
+		          },
+		        },
+		      },
+		    },
+		  },
+		}
+	`);
+});
+var ModelWithVariables;
+(function (ModelWithVariables) {
+    ModelWithVariables.managerRole = src_1.AclDefinition.createRole('manager');
+    ModelWithVariables.bookIdVariable = src_1.AclDefinition.createEntityVariable('bookId', 'Book', ModelWithVariables.managerRole);
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allow(ModelWithVariables.managerRole, {
+            when: { id: ModelWithVariables.bookIdVariable },
+            read: ['title'],
+        })
+    ], Book);
+    ModelWithVariables.Book = Book;
+})(ModelWithVariables || (ModelWithVariables = {}));
+(0, vitest_1.test)('definition with variables', () => {
+    const schema = (0, src_1.createSchema)(ModelWithVariables);
+    (0, vitest_1.expect)(schema.acl.roles.manager).toMatchInlineSnapshot(`
+		{
+		  "entities": {
+		    "Book": {
+		      "operations": {
+		        "read": {
+		          "title": "id_bookId",
+		        },
+		      },
+		      "predicates": {
+		        "id_bookId": {
+		          "id": "bookId",
+		        },
+		      },
+		    },
+		  },
+		  "stages": "*",
+		  "variables": {
+		    "bookId": {
+		      "entityName": "Book",
+		      "type": "entity",
+		    },
+		  },
+		}
+	`);
+});
+var ModelWithAllowCustomPrimary;
+(function (ModelWithAllowCustomPrimary) {
+    ModelWithAllowCustomPrimary.publicRole = src_1.AclDefinition.createRole('public');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allowCustomPrimary(ModelWithAllowCustomPrimary.publicRole)
+    ], Book);
+    ModelWithAllowCustomPrimary.Book = Book;
+})(ModelWithAllowCustomPrimary || (ModelWithAllowCustomPrimary = {}));
+(0, vitest_1.test)('allow custom primary', () => {
+    const schema = (0, src_1.createSchema)(ModelWithAllowCustomPrimary);
+    (0, vitest_1.expect)(schema.acl.roles.public.entities.Book).toMatchInlineSnapshot(`
+		{
+		  "operations": {
+		    "customPrimary": true,
+		  },
+		  "predicates": {},
+		}
+	`);
+});
+var ModelWithAllowCustomPrimaryAllRoles;
+(function (ModelWithAllowCustomPrimaryAllRoles) {
+    ModelWithAllowCustomPrimaryAllRoles.publicRole = src_1.AclDefinition.createRole('public');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allowCustomPrimary()
+    ], Book);
+    ModelWithAllowCustomPrimaryAllRoles.Book = Book;
+})(ModelWithAllowCustomPrimaryAllRoles || (ModelWithAllowCustomPrimaryAllRoles = {}));
+(0, vitest_1.test)('allow custom primary', () => {
+    const schema = (0, src_1.createSchema)(ModelWithAllowCustomPrimaryAllRoles);
+    (0, vitest_1.expect)(schema.acl.roles.public.entities.Book).toMatchInlineSnapshot(`
+		{
+		  "operations": {
+		    "customPrimary": true,
+		  },
+		  "predicates": {},
+		}
+	`);
+});
+var ModelWithInvalidAclPredicateReferences;
+(function (ModelWithInvalidAclPredicateReferences) {
+    ModelWithInvalidAclPredicateReferences.publicRole = src_1.AclDefinition.createRole('public');
+    let Book = class Book {
+        constructor() {
+            this.title = src_1.SchemaDefinition.stringColumn();
+            this.isPublished = src_1.SchemaDefinition.boolColumn();
+        }
+    };
+    Book = __decorate([
+        src_1.AclDefinition.allow(ModelWithInvalidAclPredicateReferences.publicRole, {
+            when: { isPublished: { eq: true } },
+            read: ['title'],
+        })
+    ], Book);
+    ModelWithInvalidAclPredicateReferences.Book = Book;
+    let BookReview = class BookReview {
+        constructor() {
+            this.book = src_1.SchemaDefinition.manyHasOne(Book);
+            this.content = src_1.SchemaDefinition.stringColumn();
+        }
+    };
+    BookReview = __decorate([
+        src_1.AclDefinition.allow(ModelWithInvalidAclPredicateReferences.publicRole, {
+            when: { content: src_1.AclDefinition.canRead('title') },
+            read: ['content'],
+        })
+    ], BookReview);
+    ModelWithInvalidAclPredicateReferences.BookReview = BookReview;
+})(ModelWithInvalidAclPredicateReferences || (ModelWithInvalidAclPredicateReferences = {}));
+(0, vitest_1.test)('definition with invalid predicate references', () => {
+    (0, vitest_1.expect)(() => (0, src_1.createSchema)(ModelWithInvalidAclPredicateReferences)).toThrow('Predicate references are allowed only on relations. \n' +
+        'You cannot use "canRead("title")" on a column "content" of entity "BookReview".');
+});
+//# sourceMappingURL=readAclDefinitions.test.js.map

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

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

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@contember/schema-definition",
-  "version": "1.1.0-alpha.6",
+  "version": "1.1.0-beta.0",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
   "scripts": {
-    "test": "echo 'No tests'"
+    "test": "vitest"
   },
   "dependencies": {
-    "@contember/schema": "^1.1.0-alpha.6",
-    "@contember/schema-utils": "^1.1.0-alpha.6",
+    "@contember/schema": "^1.1.0-beta.0",
+    "@contember/schema-utils": "^1.1.0-beta.0",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {}

package/src/acl/{EntityPermissionsBuilder.ts → builder/EntityPermissionsBuilder.ts}

@@ -1,9 +1,9 @@
-import { tuple } from '../utils'
+import { tuple } from '../../utils'
 import EntitySelector from './EntitySelector'
 import { Acl, Model, Writable } from '@contember/schema'
 import FieldSelector from './FieldSelector'
 import FieldPermissionsBuilder from './FieldPermissionsBuilder'
-import PermissionsBuilder from './PermissionsBuilder'
+import { PermissionsBuilder } from './PermissionsBuilder'
 import PredicateReference, { resolvePredicateReference } from './PredicateReference'
 
 export default class EntityPermissionsBuilder {

package/src/acl/{FieldPermissionsBuilder.ts → builder/FieldPermissionsBuilder.ts}

@@ -2,7 +2,7 @@ import FieldSelector from './FieldSelector'
 import EntityPermissionsBuilder from './EntityPermissionsBuilder'
 import { Acl, Model, Writable } from '@contember/schema'
 import EntitySelector from './EntitySelector'
-import PermissionsBuilder from './PermissionsBuilder'
+import { PermissionsBuilder } from './PermissionsBuilder'
 
 export default class FieldPermissionsBuilder {
 	public constructor(

package/src/acl/{PermissionOverrider.ts → builder/PermissionOverrider.ts}

@@ -1,5 +1,5 @@
 import { Acl } from '@contember/schema'
-import { tuple } from '../utils'
+import { tuple } from '../../utils'
 
 export default class PermissionOverrider {
 	public override(original: Acl.Permissions, overrides: Acl.Permissions): Acl.Permissions {

package/src/acl/{PermissionsBuilder.ts → builder/PermissionsBuilder.ts}

@@ -58,4 +58,4 @@ namespace PermissionsBuilder {
 	}
 	export const predicateReference = (name: Acl.PredicateReference) => new Reference(name)
 }
-export default PermissionsBuilder
+export { PermissionsBuilder }

package/src/acl/definition/customPrimary.ts

@@ -0,0 +1,13 @@
+import { Role } from './roles'
+import { allowCustomPrimaryAllRolesStore, allowCustomPrimaryStore } from './internal/stores'
+import { DecoratorFunction, EntityConstructor } from '../../model/definition/types'
+
+export const allowCustomPrimary = (role?: Role | Role[]): DecoratorFunction<any> => {
+	return (entity: EntityConstructor) => {
+		if (!role) {
+			allowCustomPrimaryAllRolesStore.update(entity, () => true)
+		} else {
+			allowCustomPrimaryStore.update(entity, val => [...val, ...(Array.isArray(role) ? role : [role])])
+		}
+	}
+}

package/src/acl/definition/index.ts

@@ -0,0 +1,16 @@
+import { Acl, Model } from '@contember/schema'
+import { AclFactory } from './internal/AclFactory'
+
+export * from './customPrimary'
+export * from './permissions'
+export * from './references'
+export * from './roles'
+export * from './variables'
+
+export const createAcl = (
+	exportedDefinitions: Record<string, any>,
+	model: Model.Schema,
+): Acl.Schema => {
+	const aclFactory = new AclFactory(model)
+	return aclFactory.create(exportedDefinitions)
+}