@contember/engine-content-api 1.3.0-alpha.6 → 1.3.0-alpha.8

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

@@ -9,9 +9,9 @@ const entity: Model.Entity = {
 	primaryColumn: 'id',
 	tableName: 'foo',
 	fields: {},
-	unique: {},
+	unique: [],
 	eventLog: { enabled: true },
-	indexes: {},
+	indexes: [],
 }
 
 describe('order by helper', () => {

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

@@ -1,7 +1,8 @@
 import { Acl, Model } from '@contember/schema'
 import { PermissionFactory } from '../../../src/acl'
 import { SchemaBuilder } from '@contember/schema-definition'
-import { describe, it, assert } from 'vitest'
+import { assert, describe, it } from 'vitest'
+import { emptySchema } from '@contember/schema-utils'
 
 interface Test {
 	acl: Acl.Schema
@@ -10,13 +11,17 @@ interface Test {
 }
 
 const execute = (test: Test) => {
-	const schema: Model.Schema = new SchemaBuilder()
+	const model: Model.Schema = new SchemaBuilder()
 		.entity('Entity1', e => e.column('lorem').column('bar'))
 		.entity('Entity2', e => e.oneHasOne('xyz', r => r.target('Entity1')))
 		.buildSchema()
-	const merger = new PermissionFactory(schema)
+	const merger = new PermissionFactory()
 	const initialAcl = JSON.parse(JSON.stringify(test.acl))
-	const result = merger.create(test.acl, test.roles)
+	const result = merger.create({
+		...emptySchema,
+		 model,
+		acl: test.acl,
+	}, test.roles)
 	assert.deepStrictEqual(result, test.result)
 	assert.deepStrictEqual(test.acl, initialAcl)
 }

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

@@ -160,7 +160,7 @@ namespace DeepFilterModel {
 
 describe('predicates injector elimination', () => {
 	const schema = createSchema(DeepFilterModel)
-	const permissions = new PermissionFactory(schema.model).create(schema.acl, ['reader'])
+	const permissions = new PermissionFactory().create(schema, ['reader'])
 
 	const injector = new PredicatesInjector(
 		schema.model,

package/tests/src/test.ts

@@ -1,6 +1,6 @@
 import { Acl, Model, Schema, Validation } from '@contember/schema'
 import { Authorizator, GraphQlSchemaBuilderFactory, ExecutionContainerFactory } from '../../src'
-import { AllowAllPermissionFactory, emptySchema } from '@contember/schema-utils'
+import { AllowAllPermissionFactory, dummySchemaDatabaseMetadata, emptySchema } from '@contember/schema-utils'
 import { executeGraphQlTest } from './testGraphql'
 import { Client } from '@contember/database'
 import { createConnectionMock } from '@contember/database-tester'
@@ -111,6 +111,7 @@ export const execute = async (test: Test) => {
 					systemSchema: 'system',
 					stage: { id: '00000000-0000-0000-0000-000000000000', slug: 'live' },
 					project: { slug: 'test' },
+					schemaDatabaseMetadata: dummySchemaDatabaseMetadata,
 				}),
 			timer: (label: any, cb: any) => cb(),
 		},

package/dist/src/acl/PermissionsByIdentityFactory.d.ts

@@ -1,12 +0,0 @@
-import { Acl, Schema } from '@contember/schema';
-export declare class PermissionsByIdentityFactory {
-    createPermissions(schema: Schema, identity: Identity): PermissionResult;
-}
-export interface Identity {
-    projectRoles: string[];
-}
-export interface PermissionResult {
-    permissions: Acl.Permissions;
-    verifier: (identity: Identity) => boolean;
-}
-//# sourceMappingURL=PermissionsByIdentityFactory.d.ts.map

package/dist/src/acl/PermissionsByIdentityFactory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PermissionsByIdentityFactory.d.ts","sourceRoot":"","sources":["../../../src/acl/PermissionsByIdentityFactory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE/C,qBAAa,4BAA4B;IACjC,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,gBAAgB;CAM9E;AAED,MAAM,WAAW,QAAQ;IACxB,YAAY,EAAE,MAAM,EAAE,CAAA;CACtB;AAED,MAAM,WAAW,gBAAgB;IAChC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAA;IAC5B,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAA;CACzC"}

package/dist/src/acl/PermissionsByIdentityFactory.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PermissionsByIdentityFactory = void 0;
-const PermissionFactory_1 = require("./PermissionFactory");
-const utils_1 = require("../utils");
-class PermissionsByIdentityFactory {
-    createPermissions(schema, identity) {
-        return {
-            permissions: new PermissionFactory_1.PermissionFactory(schema.model).create(schema.acl, identity.projectRoles),
-            verifier: otherIdentity => (0, utils_1.arrayEquals)(identity.projectRoles, otherIdentity.projectRoles),
-        };
-    }
-}
-exports.PermissionsByIdentityFactory = PermissionsByIdentityFactory;
-//# sourceMappingURL=PermissionsByIdentityFactory.js.map

package/dist/src/acl/PermissionsByIdentityFactory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"PermissionsByIdentityFactory.js","sourceRoot":"","sources":["../../../src/acl/PermissionsByIdentityFactory.ts"],"names":[],"mappings":";;;AAAA,2DAAuD;AACvD,oCAAsC;AAGtC,MAAa,4BAA4B;IACjC,iBAAiB,CAAC,MAAc,EAAE,QAAkB;QAC1D,OAAO;YACN,WAAW,EAAE,IAAI,qCAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,YAAY,CAAC;YAC1F,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,CAAC;SACzF,CAAA;IACF,CAAC;CACD;AAPD,oEAOC"}

package/dist/src/utils/arrays.d.ts

@@ -1,3 +0,0 @@
-declare const arrayEquals: (a: unknown[] | null, b: unknown[] | null) => boolean;
-export { arrayEquals };
-//# sourceMappingURL=arrays.d.ts.map

package/dist/src/utils/arrays.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"arrays.d.ts","sourceRoot":"","sources":["../../../src/utils/arrays.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,WAAW,MAAO,OAAO,EAAE,GAAG,IAAI,KAAK,OAAO,EAAE,GAAG,IAAI,KAAG,OAgB/D,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/dist/src/utils/arrays.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.arrayEquals = void 0;
-const arrayEquals = (a, b) => {
-    if (a === b) {
-        return true;
-    }
-    if (a === null || b === null) {
-        return false;
-    }
-    if (a.length !== b.length) {
-        return false;
-    }
-    for (let i = 0; i < a.length; ++i) {
-        if (a[i] !== b[i]) {
-            return false;
-        }
-    }
-    return true;
-};
-exports.arrayEquals = arrayEquals;
-//# sourceMappingURL=arrays.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"arrays.js","sourceRoot":"","sources":["../../../src/utils/arrays.ts"],"names":[],"mappings":";;;AAAA,MAAM,WAAW,GAAG,CAAC,CAAmB,EAAE,CAAmB,EAAW,EAAE;IACzE,IAAI,CAAC,KAAK,CAAC,EAAE;QACZ,OAAO,IAAI,CAAA;KACX;IACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE;QAC7B,OAAO,KAAK,CAAA;KACZ;IACD,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,EAAE;QAC1B,OAAO,KAAK,CAAA;KACZ;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QAClC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;YAClB,OAAO,KAAK,CAAA;SACZ;KACD;IACD,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA;AAEQ,kCAAW"}

package/src/acl/PermissionsByIdentityFactory.ts

@@ -1,21 +0,0 @@
-import { PermissionFactory } from './PermissionFactory'
-import { arrayEquals } from '../utils'
-import { Acl, Schema } from '@contember/schema'
-
-export class PermissionsByIdentityFactory {
-	public createPermissions(schema: Schema, identity: Identity): PermissionResult {
-		return {
-			permissions: new PermissionFactory(schema.model).create(schema.acl, identity.projectRoles),
-			verifier: otherIdentity => arrayEquals(identity.projectRoles, otherIdentity.projectRoles),
-		}
-	}
-}
-
-export interface Identity {
-	projectRoles: string[]
-}
-
-export interface PermissionResult {
-	permissions: Acl.Permissions
-	verifier: (identity: Identity) => boolean
-}

package/src/utils/arrays.ts

@@ -1,19 +0,0 @@
-const arrayEquals = (a: unknown[] | null, b: unknown[] | null): boolean => {
-	if (a === b) {
-		return true
-	}
-	if (a === null || b === null) {
-		return false
-	}
-	if (a.length !== b.length) {
-		return false
-	}
-	for (let i = 0; i < a.length; ++i) {
-		if (a[i] !== b[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-export { arrayEquals }