@contember/schema-utils - npm Package Compare versions

Comparing version 1.0.0-alpha.1 to 1.0.0-alpha.2

dist/src/acl/index.d.ts

 export * from './AllowAllPermissionFactory';
 export * from './PredicateDefinitionProcessor';
+export * from './schemaUtils';
 //# sourceMappingURL=index.d.ts.map

dist/src/acl/index.js

@@ -15,2 +15,3 @@ "use strict";
 __exportStar(require("./PredicateDefinitionProcessor"), exports);
+__exportStar(require("./schemaUtils"), exports);
 //# sourceMappingURL=index.js.map

dist/src/validation/AclValidator.js

@@ -130,2 +130,16 @@ "use strict";
                 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:
@@ -132,0 +146,0 @@ errorBuilder.add(`Variable type "${variable.type}" is not supported.`);

package.json

 {
   "name": "@contember/schema-utils",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
   "license": "Apache-2.0",
@@ -11,3 +11,3 @@ "main": "dist/src/index.js",
   "dependencies": {
-    "@contember/schema": "^1.0.0-alpha.1"
+    "@contember/schema": "^1.0.0-alpha.2"
   },
@@ -14,0 +14,0 @@ "devDependencies": {

src/acl/index.ts

 export * from './AllowAllPermissionFactory'
 export * from './PredicateDefinitionProcessor'
+export * from './schemaUtils'

src/validation/AclValidator.ts

@@ -146,2 +146,17 @@ import { Acl, Model } from '@contember/schema'
 				return { type: Acl.VariableType.entity, entityName: variable.entityName }
+
+			case Acl.VariableType.predefined:
+				if (!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 = checkExtraProperties(variable, ['type', 'value'])
+				if (extra2.length) {
+					errorBuilder.add('Unsupported properties found: ' + extra2.join(', '))
+				}
+				return { type: variable.type, value: variable.value }
 			default:
@@ -148,0 +163,0 @@ errorBuilder.add(`Variable type "${variable.type}" is not supported.`)

No alert changes

Improved metrics

Total package byte prevSize

252683

increased by1.56%

Number of package files

116

increased by4.5%

Lines of code

3840

increased by1.29%

Dependency changes

• Updated@contember/schema@^1.0.0-alpha.2