@contember/engine-content-api 1.2.0-alpha.1 → 1.2.0-alpha.2

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

@@ -1 +1 @@
-{"version":3,"file":"VariableInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGrD,qBAAa,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAhD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,SAAS,EAAE,GAAG,CAAC,YAAY;IAExF,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,mBAAmB,GAAG,KAAK,CAAC,KAAK;IAmBhF,OAAO,CAAC,eAAe;CAYvB"}
+{"version":3,"file":"VariableInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGrD,qBAAa,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAhD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,SAAS,EAAE,GAAG,CAAC,YAAY;IAExF,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,mBAAmB,GAAG,KAAK,CAAC,KAAK;IAmBhF,OAAO,CAAC,eAAe;CAcvB"}

package/dist/src/acl/VariableInjector.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VariableInjector = void 0;
+const schema_1 = require("@contember/schema");
 const schema_utils_1 = require("@contember/schema-utils");
 class VariableInjector {
     constructor(schema, variables) {
@@ -25,16 +26,17 @@ class VariableInjector {
         });
     }
     createCondition(variable) {
-        if (variable === undefined) {
+        if (variable === undefined || variable.value.length === 0) {
             return { never: true };
         }
-        if (Array.isArray(variable)) {
-            return { in: variable };
+        const { value, definition } = variable;
+        if (definition.type === schema_1.Acl.VariableType.condition) {
+            if (value.length === 1) {
+                return value[0];
+            }
+            return { or: value };
         }
-        if (typeof variable === 'string' || typeof variable === 'number') {
-            return { eq: variable };
-        }
-        throw new Error('not implemented');
+        return { in: value };
     }
 }
 exports.VariableInjector = VariableInjector;

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

@@ -1 +1 @@
-{"version":3,"file":"VariableInjector.js","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":";;;AACA,0DAAsE;AAEtE,MAAa,gBAAgB;IAC5B,YAA6B,MAAoB,EAAmB,SAA2B;QAAlE,WAAM,GAAN,MAAM,CAAc;QAAmB,cAAS,GAAT,SAAS,CAAkB;IAAG,CAAC;IAE5F,MAAM,CAAC,MAAoB,EAAE,KAA8B;QACjE,MAAM,4BAA4B,GAAG,IAAI,2CAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAElF,OAAO,4BAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE;YAC1D,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,CAAA;iBAC/D;gBACD,OAAO,KAAwB,CAAA;YAChC,CAAC;YACD,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;gBAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,EAAE,CAAA;iBAC3F;gBACD,OAAO,KAAK,CAAA;YACb,CAAC;SACD,CAAC,CAAA;IACH,CAAC;IAEO,eAAe,CAAC,QAAuC;QAC9D,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC3B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;SACtB;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC5B,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAA;SACvB;QACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACjE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAA;SACvB;QACD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;IACnC,CAAC;CACD;AAlCD,4CAkCC"}
+{"version":3,"file":"VariableInjector.js","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":";;;AAAA,8CAAqD;AACrD,0DAAsE;AAEtE,MAAa,gBAAgB;IAC5B,YAA6B,MAAoB,EAAmB,SAA2B;QAAlE,WAAM,GAAN,MAAM,CAAc;QAAmB,cAAS,GAAT,SAAS,CAAkB;IAAG,CAAC;IAE5F,MAAM,CAAC,MAAoB,EAAE,KAA8B;QACjE,MAAM,4BAA4B,GAAG,IAAI,2CAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAElF,OAAO,4BAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE;YAC1D,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,CAAA;iBAC/D;gBACD,OAAO,KAAwB,CAAA;YAChC,CAAC;YACD,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;gBAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,EAAE,CAAA;iBAC3F;gBACD,OAAO,KAAK,CAAA;YACb,CAAC;SACD,CAAC,CAAA;IACH,CAAC;IAEO,eAAe,CAAC,QAA0C;QACjE,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;SACtB;QAED,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAA;QACtC,IAAI,UAAU,CAAC,IAAI,KAAK,YAAG,CAAC,YAAY,CAAC,SAAS,EAAE;YACnD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,OAAO,KAAK,CAAC,CAAC,CAAoB,CAAA;aAClC;YACD,OAAO,EAAE,EAAE,EAAE,KAA0B,EAAE,CAAA;SACzC;QACD,OAAO,EAAE,EAAE,EAAE,KAA4B,EAAE,CAAA;IAC5C,CAAC;CACD;AApCD,4CAoCC"}

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

@@ -1 +1 @@
-{"version":3,"file":"VariableUtils.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAGvC,aAAK,WAAW,GAAG,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,EAAE,CAAA;CAAE,EAAE,CAAA;AAEjH,eAAO,MAAM,kBAAkB,cACnB,IAAI,MAAM,YACX;IACT,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,WAAW,EAAE,WAAW,CAAA;CACxB,KACC,IAAI,YA0BN,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,gBAAgB,MAAM,WAA+B,CAAA"}
+{"version":3,"file":"VariableUtils.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAGvC,aAAK,WAAW,GAAG,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,EAAE,CAAA;CAAE,EAAE,CAAA;AAEjH,eAAO,MAAM,kBAAkB,cACnB,IAAI,MAAM,YACX;IACT,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,WAAW,EAAE,WAAW,CAAA;CACxB,KACC,IAAI,YA+BN,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,gBAAgB,MAAM,WAA+B,CAAA"}

package/dist/src/acl/VariableUtils.js

@@ -8,19 +8,25 @@ const createAclVariables = (aclSchema, identity) => {
         const roleVariables = (0, schema_utils_1.getRoleVariables)(membership.role, aclSchema);
         const membershipVariablesMap = Object.fromEntries(membership.variables.map(it => [it.name, it.values]));
         return Object.entries(roleVariables).map(([name, def]) => {
-            var _a;
             const prefixed = (0, exports.prefixVariable)(membership.role, name);
-            switch (def.type) {
-                case schema_1.Acl.VariableType.entity:
-                    return [prefixed, (_a = membershipVariablesMap[name]) !== null && _a !== void 0 ? _a : []];
-                case schema_1.Acl.VariableType.predefined:
-                    switch (def.value) {
-                        case 'identityID':
-                            return [prefixed, [identity.identityId]];
-                        case 'personID':
-                            return [prefixed, identity.personId ? [identity.personId] : []];
-                    }
-            }
+            const value = (() => {
+                var _a, _b;
+                switch (def.type) {
+                    case schema_1.Acl.VariableType.entity:
+                        return (_a = membershipVariablesMap[name]) !== null && _a !== void 0 ? _a : [];
+                    case schema_1.Acl.VariableType.predefined:
+                        switch (def.value) {
+                            case 'identityID':
+                                return [identity.identityId];
+                            case 'personID':
+                                return identity.personId ? [identity.personId] : [];
+                        }
+                        throw new Error(`Unknown predefined variable ${def.value}`);
+                    case schema_1.Acl.VariableType.condition:
+                        return ((_b = membershipVariablesMap[name]) !== null && _b !== void 0 ? _b : []).map(it => JSON.parse(it));
+                }
+            })();
+            return [prefixed, { value: value, definition: def }];
         });
     });
     return Object.fromEntries(variablesEntries);

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

@@ -1 +1 @@
-{"version":3,"file":"VariableUtils.js","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":";;;AAAA,8CAAuC;AACvC,0DAA0D;AAInD,MAAM,kBAAkB,GAAG,CACjC,SAAqB,EACrB,QAIC,EACkB,EAAE;IAErB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CACpD,UAAU,CAAC,EAAE;QACZ,MAAM,aAAa,GAAG,IAAA,+BAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAClE,MAAM,sBAAsB,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAEvG,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE;;YACxD,MAAM,QAAQ,GAAG,IAAA,sBAAc,EAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAEtD,QAAQ,GAAG,CAAC,IAAI,EAAE;gBACjB,KAAK,YAAG,CAAC,YAAY,CAAC,MAAM;oBAC3B,OAAO,CAAC,QAAQ,EAAE,MAAA,sBAAsB,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC,CAAA;gBACtD,KAAK,YAAG,CAAC,YAAY,CAAC,UAAU;oBAC/B,QAAQ,GAAG,CAAC,KAAK,EAAE;wBAClB,KAAK,YAAY;4BAChB,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;wBACzC,KAAK,UAAU;4BACd,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;qBAChE;aACF;QACF,CAAC,CAAC,CAAA;IACH,CAAC,CACD,CAAA;IAED,OAAO,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAA;AAC5C,CAAC,CAAA;AAjCY,QAAA,kBAAkB,sBAiC9B;AAEM,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,YAAoB,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,YAAY,EAAE,CAAA;AAAnF,QAAA,cAAc,kBAAqE"}
+{"version":3,"file":"VariableUtils.js","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":";;;AAAA,8CAAuC;AACvC,0DAA0D;AAInD,MAAM,kBAAkB,GAAG,CACjC,SAAqB,EACrB,QAIC,EACkB,EAAE;IAErB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CACpD,UAAU,CAAC,EAAE;QACZ,MAAM,aAAa,GAAG,IAAA,+BAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAClE,MAAM,sBAAsB,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAEvG,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAkC,EAAE;YACxF,MAAM,QAAQ,GAAG,IAAA,sBAAc,EAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACtD,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE;;gBACnB,QAAQ,GAAG,CAAC,IAAI,EAAE;oBACjB,KAAK,YAAG,CAAC,YAAY,CAAC,MAAM;wBAC3B,OAAO,MAAA,sBAAsB,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAA;oBAC1C,KAAK,YAAG,CAAC,YAAY,CAAC,UAAU;wBAC/B,QAAQ,GAAG,CAAC,KAAK,EAAE;4BAClB,KAAK,YAAY;gCAChB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;4BAC7B,KAAK,UAAU;gCACd,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;yBACpD;wBACD,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,CAAC,KAAK,EAAE,CAAC,CAAA;oBAC5D,KAAK,YAAG,CAAC,YAAY,CAAC,SAAS;wBAC9B,OAAO,CAAC,MAAA,sBAAsB,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;iBACtE;YACF,CAAC,CAAC,EAAE,CAAA;YACJ,OAAO,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAA;QACrD,CAAC,CAAC,CAAA;IACH,CAAC,CACD,CAAA;IAED,OAAO,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAA;AAC5C,CAAC,CAAA;AAtCY,QAAA,kBAAkB,sBAsC9B;AAEM,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,YAAoB,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,YAAY,EAAE,CAAA;AAAnF,QAAA,cAAc,kBAAqE"}