@nucypher/taco 0.4.0 → 0.6.0-alpha.0

package/dist/cjs/conditions/base/rpc.js

@@ -1,30 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RpcCondition = exports.rpcConditionSchema = exports.RpcConditionType = void 0;
-const zod_1 = require("zod");
+exports.RpcCondition = exports.RpcConditionType = exports.rpcConditionSchema = void 0;
 const condition_1 = require("../condition");
-const const_1 = require("../const");
-const shared_1 = require("../shared");
-const zod_2 = __importDefault(require("../zod"));
-exports.RpcConditionType = 'rpc';
-exports.rpcConditionSchema = zod_1.z.object({
-    conditionType: zod_1.z.literal(exports.RpcConditionType).default(exports.RpcConditionType),
-    chain: (0, zod_2.default)(const_1.SUPPORTED_CHAIN_IDS),
-    method: zod_1.z.enum(['eth_getBalance']),
-    parameters: zod_1.z.union([
-        zod_1.z.array(shared_1.EthAddressOrUserAddressSchema).nonempty(),
-        // Using tuple here because ordering matters
-        zod_1.z.tuple([shared_1.EthAddressOrUserAddressSchema, shared_1.paramOrContextParamSchema]),
-    ]),
-    returnValueTest: shared_1.returnValueTestSchema, // Update to allow multiple return values after expanding supported methods
-});
+const rpc_1 = require("../schemas/rpc");
+var rpc_2 = require("../schemas/rpc");
+Object.defineProperty(exports, "rpcConditionSchema", { enumerable: true, get: function () { return rpc_2.rpcConditionSchema; } });
+Object.defineProperty(exports, "RpcConditionType", { enumerable: true, get: function () { return rpc_2.RpcConditionType; } });
 class RpcCondition extends condition_1.Condition {
     constructor(value) {
-        super(exports.rpcConditionSchema, {
-            conditionType: exports.RpcConditionType,
+        super(rpc_1.rpcConditionSchema, {
+            conditionType: rpc_1.RpcConditionType,
             ...value,
         });
     }

package/dist/cjs/conditions/base/rpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../../src/conditions/base/rpc.ts"],"names":[],"mappings":";;;;;;AAAA,6BAAwB;AAExB,4CAAyC;AACzC,oCAA+C;AAC/C,sCAKmB;AACnB,iDAAuC;AAE1B,QAAA,gBAAgB,GAAG,KAAK,CAAC;AAEzB,QAAA,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IACzC,aAAa,EAAE,OAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC;IACpE,KAAK,EAAE,IAAA,aAAiB,EAAC,2BAAmB,CAAC;IAC7C,MAAM,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAClC,UAAU,EAAE,OAAC,CAAC,KAAK,CAAC;QAClB,OAAC,CAAC,KAAK,CAAC,sCAA6B,CAAC,CAAC,QAAQ,EAAE;QACjD,4CAA4C;QAC5C,OAAC,CAAC,KAAK,CAAC,CAAC,sCAA6B,EAAE,kCAAyB,CAAC,CAAC;KACpE,CAAC;IACF,eAAe,EAAE,8BAAqB,EAAE,2EAA2E;CACpH,CAAC,CAAC;AAIH,MAAa,YAAa,SAAQ,qBAAS;IACzC,YAAY,KAA2C;QACrD,KAAK,CAAC,0BAAkB,EAAE;YACxB,aAAa,EAAE,wBAAgB;YAC/B,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF;AAPD,oCAOC"}
+{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../../src/conditions/base/rpc.ts"],"names":[],"mappings":";;;AAAA,4CAAyC;AACzC,wCAIwB;AAGxB,sCAIwB;AAFtB,yGAAA,kBAAkB,OAAA;AAClB,uGAAA,gBAAgB,OAAA;AAGlB,MAAa,YAAa,SAAQ,qBAAS;IACzC,YAAY,KAA2C;QACrD,KAAK,CAAC,wBAAkB,EAAE;YACxB,aAAa,EAAE,sBAAgB;YAC/B,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF;AAPD,oCAOC"}

package/dist/cjs/conditions/base/time.d.ts

@@ -1,45 +1,7 @@
-import { z } from 'zod';
 import { Condition } from '../condition';
+import { TimeConditionProps } from '../schemas/time';
 import { OmitConditionType } from '../shared';
-export declare const TimeConditionType = "time";
-export declare const TimeConditionMethod = "blocktime";
-export declare const timeConditionSchema: z.ZodObject<{
-    conditionType: z.ZodDefault<z.ZodLiteral<"time">>;
-    method: z.ZodDefault<z.ZodLiteral<"blocktime">>;
-    chain: z.ZodNever | z.ZodLiteral<z.Primitive> | z.ZodUnion<[z.ZodLiteral<z.Primitive>, z.ZodLiteral<z.Primitive>, ...z.ZodLiteral<z.Primitive>[]]>;
-    returnValueTest: z.ZodObject<{
-        index: z.ZodOptional<z.ZodNumber>;
-        comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
-        value: z.ZodType<any, z.ZodTypeDef, any>;
-    }, "strip", z.ZodTypeAny, {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
-        index?: number | undefined;
-    }, {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
-        index?: number | undefined;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    conditionType: "time";
-    method: "blocktime";
-    returnValueTest: {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
-        index?: number | undefined;
-    };
-    chain?: z.Primitive;
-}, {
-    returnValueTest: {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
-        index?: number | undefined;
-    };
-    conditionType?: "time" | undefined;
-    chain?: z.Primitive;
-    method?: "blocktime" | undefined;
-}>;
-export type TimeConditionProps = z.infer<typeof timeConditionSchema>;
+export { TimeConditionMethod, TimeConditionProps, timeConditionSchema, TimeConditionType, } from '../schemas/time';
 export declare class TimeCondition extends Condition {
     constructor(value: OmitConditionType<TimeConditionProps>);
 }

package/dist/cjs/conditions/base/time.js

@@ -1,23 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeCondition = exports.timeConditionSchema = exports.TimeConditionMethod = exports.TimeConditionType = void 0;
-const zod_1 = require("zod");
+exports.TimeCondition = exports.TimeConditionType = exports.timeConditionSchema = exports.TimeConditionMethod = void 0;
 const condition_1 = require("../condition");
-const rpc_1 = require("./rpc");
-// TimeCondition is an RpcCondition with the method set to 'blocktime' and no parameters
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const { parameters: _, ...restShape } = rpc_1.rpcConditionSchema.shape;
-exports.TimeConditionType = 'time';
-exports.TimeConditionMethod = 'blocktime';
-exports.timeConditionSchema = zod_1.z.object({
-    ...restShape,
-    conditionType: zod_1.z.literal(exports.TimeConditionType).default(exports.TimeConditionType),
-    method: zod_1.z.literal(exports.TimeConditionMethod).default(exports.TimeConditionMethod),
-});
+const time_1 = require("../schemas/time");
+var time_2 = require("../schemas/time");
+Object.defineProperty(exports, "TimeConditionMethod", { enumerable: true, get: function () { return time_2.TimeConditionMethod; } });
+Object.defineProperty(exports, "timeConditionSchema", { enumerable: true, get: function () { return time_2.timeConditionSchema; } });
+Object.defineProperty(exports, "TimeConditionType", { enumerable: true, get: function () { return time_2.TimeConditionType; } });
 class TimeCondition extends condition_1.Condition {
     constructor(value) {
-        super(exports.timeConditionSchema, {
-            conditionType: exports.TimeConditionType,
+        super(time_1.timeConditionSchema, {
+            conditionType: time_1.TimeConditionType,
             ...value,
         });
     }

package/dist/cjs/conditions/base/time.js.map

@@ -1 +1 @@
-{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../../src/conditions/base/time.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,4CAAyC;AAGzC,+BAA2C;AAE3C,wFAAwF;AACxF,6DAA6D;AAC7D,MAAM,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,wBAAkB,CAAC,KAAK,CAAC;AAEpD,QAAA,iBAAiB,GAAG,MAAM,CAAC;AAC3B,QAAA,mBAAmB,GAAG,WAAW,CAAC;AAElC,QAAA,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC1C,GAAG,SAAS;IACZ,aAAa,EAAE,OAAC,CAAC,OAAO,CAAC,yBAAiB,CAAC,CAAC,OAAO,CAAC,yBAAiB,CAAC;IACtE,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,2BAAmB,CAAC,CAAC,OAAO,CAAC,2BAAmB,CAAC;CACpE,CAAC,CAAC;AAIH,MAAa,aAAc,SAAQ,qBAAS;IAC1C,YAAY,KAA4C;QACtD,KAAK,CAAC,2BAAmB,EAAE;YACzB,aAAa,EAAE,yBAAiB;YAChC,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF;AAPD,sCAOC"}
+{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../../src/conditions/base/time.ts"],"names":[],"mappings":";;;AAAA,4CAAyC;AACzC,0CAIyB;AAGzB,wCAKyB;AAJvB,2GAAA,mBAAmB,OAAA;AAEnB,2GAAA,mBAAmB,OAAA;AACnB,yGAAA,iBAAiB,OAAA;AAGnB,MAAa,aAAc,SAAQ,qBAAS;IAC1C,YAAY,KAA4C;QACtD,KAAK,CAAC,0BAAmB,EAAE;YACzB,aAAa,EAAE,wBAAiB;YAChC,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF;AAPD,sCAOC"}

package/dist/cjs/conditions/compound-condition.d.ts

@@ -1,9 +1,7 @@
-import { z } from 'zod';
 import { Condition, ConditionProps } from './condition';
+import { CompoundConditionProps } from './schemas/compound';
 import { OmitConditionType } from './shared';
-export declare const CompoundConditionType = "compound";
-export declare const compoundConditionSchema: z.ZodSchema;
-export type CompoundConditionProps = z.infer<typeof compoundConditionSchema>;
+export { CompoundConditionProps, compoundConditionSchema, CompoundConditionType, } from './schemas/compound';
 export type ConditionOrProps = Condition | ConditionProps;
 export declare class CompoundCondition extends Condition {
     constructor(value: OmitConditionType<CompoundConditionProps>);

package/dist/cjs/conditions/compound-condition.js

@@ -1,46 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CompoundCondition = exports.compoundConditionSchema = exports.CompoundConditionType = void 0;
-const zod_1 = require("zod");
-const contract_1 = require("./base/contract");
-const rpc_1 = require("./base/rpc");
-const time_1 = require("./base/time");
+exports.CompoundCondition = exports.CompoundConditionType = exports.compoundConditionSchema = void 0;
 const condition_1 = require("./condition");
-exports.CompoundConditionType = 'compound';
-exports.compoundConditionSchema = zod_1.z
-    .object({
-    conditionType: zod_1.z
-        .literal(exports.CompoundConditionType)
-        .default(exports.CompoundConditionType),
-    operator: zod_1.z.enum(['and', 'or', 'not']),
-    operands: zod_1.z
-        .array(zod_1.z.lazy(() => zod_1.z.union([
-        rpc_1.rpcConditionSchema,
-        time_1.timeConditionSchema,
-        contract_1.contractConditionSchema,
-        exports.compoundConditionSchema,
-    ])))
-        .min(1),
-})
-    .refine((condition) => {
-    // 'and' and 'or' operators must have at least 2 operands
-    if (['and', 'or'].includes(condition.operator)) {
-        return condition.operands.length >= 2;
-    }
-    // 'not' operator must have exactly 1 operand
-    if (condition.operator === 'not') {
-        return condition.operands.length === 1;
-    }
-    // We test positive cases exhaustively, so we return false here:
-    return false;
-}, ({ operands, operator }) => ({
-    message: `Invalid number of operands ${operands.length} for operator "${operator}"`,
-    path: ['operands'],
-}));
+const compound_1 = require("./schemas/compound");
+var compound_2 = require("./schemas/compound");
+Object.defineProperty(exports, "compoundConditionSchema", { enumerable: true, get: function () { return compound_2.compoundConditionSchema; } });
+Object.defineProperty(exports, "CompoundConditionType", { enumerable: true, get: function () { return compound_2.CompoundConditionType; } });
 class CompoundCondition extends condition_1.Condition {
     constructor(value) {
-        super(exports.compoundConditionSchema, {
-            conditionType: exports.CompoundConditionType,
+        super(compound_1.compoundConditionSchema, {
+            conditionType: compound_1.CompoundConditionType,
             ...value,
         });
     }

package/dist/cjs/conditions/compound-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"compound-condition.js","sourceRoot":"","sources":["../../../src/conditions/compound-condition.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,8CAA0D;AAC1D,oCAAgD;AAChD,sCAAkD;AAClD,2CAAwD;AAG3C,QAAA,qBAAqB,GAAG,UAAU,CAAC;AAEnC,QAAA,uBAAuB,GAAgB,OAAC;KAClD,MAAM,CAAC;IACN,aAAa,EAAE,OAAC;SACb,OAAO,CAAC,6BAAqB,CAAC;SAC9B,OAAO,CAAC,6BAAqB,CAAC;IACjC,QAAQ,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACtC,QAAQ,EAAE,OAAC;SACR,KAAK,CACJ,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CACV,OAAC,CAAC,KAAK,CAAC;QACN,wBAAkB;QAClB,0BAAmB;QACnB,kCAAuB;QACvB,+BAAuB;KACxB,CAAC,CACH,CACF;SACA,GAAG,CAAC,CAAC,CAAC;CACV,CAAC;KACD,MAAM,CACL,CAAC,SAAS,EAAE,EAAE;IACZ,yDAAyD;IACzD,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/C,OAAO,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,6CAA6C;IAC7C,IAAI,SAAS,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;IACzC,CAAC;IAED,gEAAgE;IAChE,OAAO,KAAK,CAAC;AACf,CAAC,EACD,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3B,OAAO,EAAE,8BAA8B,QAAQ,CAAC,MAAM,kBAAkB,QAAQ,GAAG;IACnF,IAAI,EAAE,CAAC,UAAU,CAAC;CACnB,CAAC,CACH,CAAC;AAMJ,MAAa,iBAAkB,SAAQ,qBAAS;IAC9C,YAAY,KAAgD;QAC1D,KAAK,CAAC,+BAAuB,EAAE;YAC7B,aAAa,EAAE,6BAAqB;YACpC,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,YAAY,CACzB,QAA4B,EAC5B,QAA8B;QAE9B,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACzC,IAAI,OAAO,YAAY,qBAAS,EAAE,CAAC;gBACjC,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC;YACzB,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,iBAAiB,CAAC;YAC3B,QAAQ;YACR,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,EAAE,CAAC,UAA8B;QAC7C,OAAO,iBAAiB,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1D,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,UAA8B;QAC9C,OAAO,iBAAiB,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,SAA2B;QAC3C,OAAO,iBAAiB,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;CACF;AAnCD,8CAmCC"}
+{"version":3,"file":"compound-condition.js","sourceRoot":"","sources":["../../../src/conditions/compound-condition.ts"],"names":[],"mappings":";;;AAAA,2CAAwD;AACxD,iDAI4B;AAG5B,+CAI4B;AAF1B,mHAAA,uBAAuB,OAAA;AACvB,iHAAA,qBAAqB,OAAA;AAKvB,MAAa,iBAAkB,SAAQ,qBAAS;IAC9C,YAAY,KAAgD;QAC1D,KAAK,CAAC,kCAAuB,EAAE;YAC7B,aAAa,EAAE,gCAAqB;YACpC,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,YAAY,CACzB,QAA4B,EAC5B,QAA8B;QAE9B,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACzC,IAAI,OAAO,YAAY,qBAAS,EAAE,CAAC;gBACjC,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC;YACzB,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,iBAAiB,CAAC;YAC3B,QAAQ;YACR,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,EAAE,CAAC,UAA8B;QAC7C,OAAO,iBAAiB,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1D,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,UAA8B;QAC9C,OAAO,iBAAiB,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,SAA2B;QAC3C,OAAO,iBAAiB,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;CACF;AAnCD,8CAmCC"}

package/dist/cjs/conditions/condition-expr.d.ts

@@ -1,7 +1,5 @@
 import { Conditions as CoreConditions } from '@nucypher/nucypher-core';
-import { AuthProviders } from '@nucypher/taco-auth';
 import { Condition } from './condition';
-import { ConditionContext, CustomContextParam } from './context';
 export type ConditionExpressionJSON = {
     version: string;
     condition: Record<string, unknown>;
@@ -17,6 +15,5 @@ export declare class ConditionExpression {
     static fromJSON(json: string): ConditionExpression;
     toCoreCondition(): CoreConditions;
     static fromCoreConditions(conditions: CoreConditions): ConditionExpression;
-    buildContext(customParameters?: Record<string, CustomContextParam>, authProviders?: AuthProviders): ConditionContext;
     equals(other: ConditionExpression): boolean;
 }

package/dist/cjs/conditions/condition-expr.js

@@ -5,7 +5,6 @@ const nucypher_core_1 = require("@nucypher/nucypher-core");
 const shared_1 = require("@nucypher/shared");
 const semver_1 = require("semver");
 const condition_factory_1 = require("./condition-factory");
-const context_1 = require("./context");
 const ERR_VERSION = (provided, current) => `Version provided, ${provided}, is incompatible with current version, ${current}`;
 const ERR_CONDITION = (condition) => `Invalid condition: unrecognized condition data ${JSON.stringify(condition)}`;
 class ConditionExpression {
@@ -47,9 +46,6 @@ class ConditionExpression {
     static fromCoreConditions(conditions) {
         return ConditionExpression.fromJSON(conditions.toString());
     }
-    buildContext(customParameters = {}, authProviders = {}) {
-        return new context_1.ConditionContext(this.condition, customParameters, authProviders);
-    }
     equals(other) {
         return [
             this.version === other.version,

package/dist/cjs/conditions/condition-expr.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition-expr.js","sourceRoot":"","sources":["../../../src/conditions/condition-expr.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,6CAA0C;AAE1C,mCAAgC;AAGhC,2DAAuD;AACvD,uCAAiE;AAEjE,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,OAAe,EAAE,EAAE,CACxD,qBAAqB,QAAQ,2CAA2C,OAAO,EAAE,CAAC;AACpF,MAAM,aAAa,GAAG,CAAC,SAAkC,EAAE,EAAE,CAC3D,kDAAkD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;AAOhF,MAAa,mBAAmB;IAIZ;IACA;IAJX,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IAEhC,YACkB,SAAoB,EACpB,UAAkB,mBAAmB,CAAC,OAAO;QAD7C,cAAS,GAAT,SAAS,CAAW;QACpB,YAAO,GAAP,OAAO,CAAsC;IAC5D,CAAC;IAEG,KAAK;QACV,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS;SACV,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,GAA4B;QAChD,MAAM,eAAe,GAAG,IAAI,eAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,cAAc,GAAG,IAAI,eAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,eAAe,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,SAAS,GAAG,oCAAgB,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrE,OAAO,IAAI,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAEM,MAAM;QACX,OAAO,IAAA,eAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,IAAY;QACjC,OAAO,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACvD,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,0BAAc,CAAC,IAAA,eAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,UAA0B;QACzD,OAAO,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAEM,YAAY,CACjB,mBAAuD,EAAE,EACzD,gBAA+B,EAAE;QAEjC,OAAO,IAAI,0BAAgB,CACzB,IAAI,CAAC,SAAS,EACd,gBAAgB,EAChB,aAAa,CACd,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,KAA0B;QACtC,OAAO;YACL,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO;YAC9B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;SACvC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;;AA/DH,kDAgEC"}
+{"version":3,"file":"condition-expr.js","sourceRoot":"","sources":["../../../src/conditions/condition-expr.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,6CAA0C;AAC1C,mCAAgC;AAGhC,2DAAuD;AAEvD,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,OAAe,EAAE,EAAE,CACxD,qBAAqB,QAAQ,2CAA2C,OAAO,EAAE,CAAC;AACpF,MAAM,aAAa,GAAG,CAAC,SAAkC,EAAE,EAAE,CAC3D,kDAAkD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;AAOhF,MAAa,mBAAmB;IAIZ;IACA;IAJX,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IAEhC,YACkB,SAAoB,EACpB,UAAkB,mBAAmB,CAAC,OAAO;QAD7C,cAAS,GAAT,SAAS,CAAW;QACpB,YAAO,GAAP,OAAO,CAAsC;IAC5D,CAAC;IAEG,KAAK;QACV,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS;SACV,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,GAA4B;QAChD,MAAM,eAAe,GAAG,IAAI,eAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,cAAc,GAAG,IAAI,eAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,eAAe,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,SAAS,GAAG,oCAAgB,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrE,OAAO,IAAI,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAEM,MAAM;QACX,OAAO,IAAA,eAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,IAAY;QACjC,OAAO,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACvD,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,0BAAc,CAAC,IAAA,eAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,UAA0B;QACzD,OAAO,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAEM,MAAM,CAAC,KAA0B;QACtC,OAAO;YACL,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO;YAC9B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;SACvC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;;AApDH,kDAqDC"}

package/dist/cjs/conditions/condition-factory.js

@@ -2,21 +2,32 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConditionFactory = void 0;
 const contract_1 = require("./base/contract");
+const json_api_1 = require("./base/json-api");
 const rpc_1 = require("./base/rpc");
 const time_1 = require("./base/time");
 const compound_condition_1 = require("./compound-condition");
+const if_then_else_condition_1 = require("./if-then-else-condition");
+const sequential_1 = require("./sequential");
 const ERR_INVALID_CONDITION_TYPE = (type) => `Invalid condition type: ${type}`;
 class ConditionFactory {
     static conditionFromProps(props) {
         switch (props.conditionType) {
+            // Base Conditions
             case rpc_1.RpcConditionType:
                 return new rpc_1.RpcCondition(props);
             case time_1.TimeConditionType:
                 return new time_1.TimeCondition(props);
             case contract_1.ContractConditionType:
                 return new contract_1.ContractCondition(props);
+            case json_api_1.JsonApiConditionType:
+                return new json_api_1.JsonApiCondition(props);
+            // Logical Conditions
             case compound_condition_1.CompoundConditionType:
                 return new compound_condition_1.CompoundCondition(props);
+            case sequential_1.SequentialConditionType:
+                return new sequential_1.SequentialCondition(props);
+            case if_then_else_condition_1.IfThenElseConditionType:
+                return new if_then_else_condition_1.IfThenElseCondition(props);
             default:
                 throw new Error(ERR_INVALID_CONDITION_TYPE(props.conditionType));
         }

package/dist/cjs/conditions/condition-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition-factory.js","sourceRoot":"","sources":["../../../src/conditions/condition-factory.ts"],"names":[],"mappings":";;;AAAA,8CAIyB;AACzB,oCAA+E;AAC/E,sCAIqB;AACrB,6DAI8B;AAG9B,MAAM,0BAA0B,GAAG,CAAC,IAAY,EAAE,EAAE,CAClD,2BAA2B,IAAI,EAAE,CAAC;AAEpC,MAAa,gBAAgB;IACpB,MAAM,CAAC,kBAAkB,CAAC,KAAqB;QACpD,QAAQ,KAAK,CAAC,aAAa,EAAE,CAAC;YAC5B,KAAK,sBAAgB;gBACnB,OAAO,IAAI,kBAAY,CAAC,KAA0B,CAAC,CAAC;YACtD,KAAK,wBAAiB;gBACpB,OAAO,IAAI,oBAAa,CAAC,KAA2B,CAAC,CAAC;YACxD,KAAK,gCAAqB;gBACxB,OAAO,IAAI,4BAAiB,CAAC,KAA+B,CAAC,CAAC;YAChE,KAAK,0CAAqB;gBACxB,OAAO,IAAI,sCAAiB,CAAC,KAA+B,CAAC,CAAC;YAChE;gBACE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;CACF;AAfD,4CAeC"}
+{"version":3,"file":"condition-factory.js","sourceRoot":"","sources":["../../../src/conditions/condition-factory.ts"],"names":[],"mappings":";;;AAAA,8CAIyB;AACzB,8CAIyB;AACzB,oCAA+E;AAC/E,sCAIqB;AACrB,6DAI8B;AAE9B,qEAIkC;AAClC,6CAIsB;AAEtB,MAAM,0BAA0B,GAAG,CAAC,IAAY,EAAE,EAAE,CAClD,2BAA2B,IAAI,EAAE,CAAC;AAEpC,MAAa,gBAAgB;IACpB,MAAM,CAAC,kBAAkB,CAAC,KAAqB;QACpD,QAAQ,KAAK,CAAC,aAAa,EAAE,CAAC;YAC5B,kBAAkB;YAClB,KAAK,sBAAgB;gBACnB,OAAO,IAAI,kBAAY,CAAC,KAA0B,CAAC,CAAC;YACtD,KAAK,wBAAiB;gBACpB,OAAO,IAAI,oBAAa,CAAC,KAA2B,CAAC,CAAC;YACxD,KAAK,gCAAqB;gBACxB,OAAO,IAAI,4BAAiB,CAAC,KAA+B,CAAC,CAAC;YAChE,KAAK,+BAAoB;gBACvB,OAAO,IAAI,2BAAgB,CAAC,KAA8B,CAAC,CAAC;YAC9D,qBAAqB;YACrB,KAAK,0CAAqB;gBACxB,OAAO,IAAI,sCAAiB,CAAC,KAA+B,CAAC,CAAC;YAChE,KAAK,oCAAuB;gBAC1B,OAAO,IAAI,gCAAmB,CAAC,KAAiC,CAAC,CAAC;YACpE,KAAK,gDAAuB;gBAC1B,OAAO,IAAI,4CAAmB,CAAC,KAAiC,CAAC,CAAC;YACpE;gBACE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;CACF;AAvBD,4CAuBC"}

package/dist/cjs/conditions/condition.d.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+export { baseConditionSchema } from './schemas/common';
 type ConditionSchema = z.ZodSchema;
 export type ConditionProps = z.infer<ConditionSchema>;
 export declare class Condition {
@@ -14,4 +15,3 @@ export declare class Condition {
     toObj(): ConditionProps;
     equals(other: Condition): boolean;
 }
-export {};

package/dist/cjs/conditions/condition.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Condition = void 0;
+exports.Condition = exports.baseConditionSchema = void 0;
 const shared_1 = require("@nucypher/shared");
 const const_1 = require("./const");
+var common_1 = require("./schemas/common");
+Object.defineProperty(exports, "baseConditionSchema", { enumerable: true, get: function () { return common_1.baseConditionSchema; } });
 const ERR_INVALID_CONDITION = (error) => `Invalid condition: ${JSON.stringify(error.issues)}`;
 class Condition {
     schema;

package/dist/cjs/conditions/condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition.js","sourceRoot":"","sources":["../../../src/conditions/condition.ts"],"names":[],"mappings":";;;AAAA,6CAAgD;AAGhD,mCAA8C;AAK9C,MAAM,qBAAqB,GAAG,CAAC,KAAiB,EAAE,EAAE,CAClD,sBAAsB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;AAEvD,MAAa,SAAS;IAEF;IACA;IAFlB,YACkB,MAAuB,EACvB,KAAqB;QADrB,WAAM,GAAN,MAAM,CAAiB;QACvB,UAAK,GAAL,KAAK,CAAgB;QAErC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC1D,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,QAAQ,CACpB,MAAuB,EACvB,KAAqB;QAKrB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,8CAA8C;IACvC,2BAA2B;QAChC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9C,KAAK,MAAM,KAAK,IAAI,2BAAmB,EAAE,CAAC;YACxC,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,sBAAsB;QAC3B,OAAO,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK;QACV,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACpE,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,MAAM,CAAC,KAAgB;QAC5B,OAAO,IAAA,qBAAY,EAAC,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IACnD,CAAC;CACF;AApDD,8BAoDC"}
+{"version":3,"file":"condition.js","sourceRoot":"","sources":["../../../src/conditions/condition.ts"],"names":[],"mappings":";;;AAAA,6CAAgD;AAGhD,mCAA8C;AAE9C,2CAAuD;AAA9C,6GAAA,mBAAmB,OAAA;AAK5B,MAAM,qBAAqB,GAAG,CAAC,KAAiB,EAAE,EAAE,CAClD,sBAAsB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;AAEvD,MAAa,SAAS;IAEF;IACA;IAFlB,YACkB,MAAuB,EACvB,KAAqB;QADrB,WAAM,GAAN,MAAM,CAAiB;QACvB,UAAK,GAAL,KAAK,CAAgB;QAErC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC1D,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,QAAQ,CACpB,MAAuB,EACvB,KAAqB;QAKrB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,8CAA8C;IACvC,2BAA2B;QAChC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9C,KAAK,MAAM,KAAK,IAAI,2BAAmB,EAAE,CAAC;YACxC,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,sBAAsB;QAC3B,OAAO,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK;QACV,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACpE,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,MAAM,CAAC,KAAgB;QAC5B,OAAO,IAAA,qBAAY,EAAC,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IACnD,CAAC;CACF;AApDD,8BAoDC"}

package/dist/cjs/conditions/const.d.ts

@@ -1,7 +1,6 @@
 import { ChainId } from '@nucypher/shared';
-export declare const USER_ADDRESS_PARAM_EXTERNAL_EIP4361 = ":userAddressExternalEIP4361";
 export declare const CONTEXT_PARAM_REGEXP: RegExp;
+export declare const CONTEXT_PARAM_FULL_MATCH_REGEXP: RegExp;
 export declare const CONTEXT_PARAM_PREFIX = ":";
 export declare const SUPPORTED_CHAIN_IDS: ChainId[];
 export declare const USER_ADDRESS_PARAMS: string[];
-export declare const RESERVED_CONTEXT_PARAMS: string[];

package/dist/cjs/conditions/const.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RESERVED_CONTEXT_PARAMS = exports.USER_ADDRESS_PARAMS = exports.SUPPORTED_CHAIN_IDS = exports.CONTEXT_PARAM_PREFIX = exports.CONTEXT_PARAM_REGEXP = exports.USER_ADDRESS_PARAM_EXTERNAL_EIP4361 = void 0;
+exports.USER_ADDRESS_PARAMS = exports.SUPPORTED_CHAIN_IDS = exports.CONTEXT_PARAM_PREFIX = exports.CONTEXT_PARAM_FULL_MATCH_REGEXP = exports.CONTEXT_PARAM_REGEXP = void 0;
 const shared_1 = require("@nucypher/shared");
 const taco_auth_1 = require("@nucypher/taco-auth");
-exports.USER_ADDRESS_PARAM_EXTERNAL_EIP4361 = ':userAddressExternalEIP4361';
 // Only allow alphanumeric characters and underscores
-exports.CONTEXT_PARAM_REGEXP = new RegExp('^:[a-zA-Z_][a-zA-Z0-9_]*$');
+const contextParamRegexString = ':[a-zA-Z_][a-zA-Z0-9_]*';
+exports.CONTEXT_PARAM_REGEXP = new RegExp(contextParamRegexString);
+// Entire string is context param
+exports.CONTEXT_PARAM_FULL_MATCH_REGEXP = new RegExp(`^${contextParamRegexString}$`);
 exports.CONTEXT_PARAM_PREFIX = ':';
 exports.SUPPORTED_CHAIN_IDS = [
     shared_1.ChainId.POLYGON,
@@ -14,12 +16,8 @@ exports.SUPPORTED_CHAIN_IDS = [
     shared_1.ChainId.ETHEREUM_MAINNET,
 ];
 exports.USER_ADDRESS_PARAMS = [
-    exports.USER_ADDRESS_PARAM_EXTERNAL_EIP4361,
+    taco_auth_1.USER_ADDRESS_PARAM_EXTERNAL_EIP4361,
     // Ordering matters, this should always be last
     taco_auth_1.USER_ADDRESS_PARAM_DEFAULT,
 ];
-exports.RESERVED_CONTEXT_PARAMS = [
-    taco_auth_1.USER_ADDRESS_PARAM_DEFAULT,
-    // USER_ADDRESS_PARAM_EXTERNAL_EIP4361 is not reserved and can be used as a custom context parameter
-];
 //# sourceMappingURL=const.js.map

package/dist/cjs/conditions/const.js.map

@@ -1 +1 @@
-{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../src/conditions/const.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAC3C,mDAAiE;AAEpD,QAAA,mCAAmC,GAC9C,6BAA6B,CAAC;AAEhC,qDAAqD;AACxC,QAAA,oBAAoB,GAAG,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAE/D,QAAA,oBAAoB,GAAG,GAAG,CAAC;AAE3B,QAAA,mBAAmB,GAAG;IACjC,gBAAO,CAAC,OAAO;IACf,gBAAO,CAAC,IAAI;IACZ,gBAAO,CAAC,OAAO;IACf,gBAAO,CAAC,gBAAgB;CACzB,CAAC;AAEW,QAAA,mBAAmB,GAAG;IACjC,2CAAmC;IACnC,+CAA+C;IAC/C,sCAA0B;CAC3B,CAAC;AAEW,QAAA,uBAAuB,GAAG;IACrC,sCAA0B;IAC1B,oGAAoG;CACrG,CAAC"}
+{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../src/conditions/const.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAC3C,mDAG6B;AAE7B,qDAAqD;AACrD,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AAE7C,QAAA,oBAAoB,GAAG,IAAI,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAExE,iCAAiC;AACpB,QAAA,+BAA+B,GAAG,IAAI,MAAM,CACvD,IAAI,uBAAuB,GAAG,CAC/B,CAAC;AAEW,QAAA,oBAAoB,GAAG,GAAG,CAAC;AAE3B,QAAA,mBAAmB,GAAG;IACjC,gBAAO,CAAC,OAAO;IACf,gBAAO,CAAC,IAAI;IACZ,gBAAO,CAAC,OAAO;IACf,gBAAO,CAAC,gBAAgB;CACzB,CAAC;AAEW,QAAA,mBAAmB,GAAG;IACjC,+CAAmC;IACnC,+CAA+C;IAC/C,sCAA0B;CAC3B,CAAC"}

package/dist/cjs/conditions/context/context.d.ts

@@ -1,25 +1,27 @@
 import { ThresholdMessageKit } from '@nucypher/nucypher-core';
-import { AuthProviders, AuthSignature } from '@nucypher/taco-auth';
-import { CoreConditions, CoreContext } from '../../types';
-import { Condition, ConditionProps } from '../condition';
-export type CustomContextParam = string | number | boolean | AuthSignature;
+import { AuthProvider, AuthSignature } from '@nucypher/taco-auth';
+import { CoreContext } from '../../types';
+import { Condition } from '../condition';
+export type CustomContextParam = string | number | boolean;
 export type ContextParam = CustomContextParam | AuthSignature;
+export declare const RESERVED_CONTEXT_PARAMS: string[];
 export declare class ConditionContext {
-    readonly customParameters: Record<string, CustomContextParam>;
-    private readonly authProviders;
-    requestedParameters: Set<string>;
-    constructor(condition: Condition, customParameters?: Record<string, CustomContextParam>, authProviders?: AuthProviders);
-    private validateContextParameters;
-    private validateCoreConditions;
+    requestedContextParameters: Set<string>;
+    private customContextParameters;
+    private authProviders;
+    constructor(condition: Condition);
+    private static validateCoreConditions;
     private validateNoMissingContextParameters;
     private fillContextParameters;
     private validateAuthProviders;
     private fillAuthContextParameters;
+    private validateCustomContextParameter;
     private static isContextParameter;
-    static findContextParameters(condition: ConditionProps): Set<string>;
+    private static findContextParameters;
+    addCustomContextParameterValues(customContextParameters: Record<string, CustomContextParam>): void;
+    addAuthProvider(contextParam: string, authProvider: AuthProvider): void;
     toJson(): Promise<string>;
     toCoreContext(): Promise<CoreContext>;
     toContextParameters: () => Promise<Record<string, ContextParam>>;
-    static fromConditions(conditions: CoreConditions, authProviders?: AuthProviders, customParameters?: Record<string, CustomContextParam>): ConditionContext;
-    static requestedContextParameters(messageKit: ThresholdMessageKit): Set<string>;
+    static fromMessageKit(messageKit: ThresholdMessageKit): ConditionContext;
 }

package/dist/cjs/conditions/context/context.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConditionContext = void 0;
+exports.ConditionContext = exports.RESERVED_CONTEXT_PARAMS = void 0;
 const shared_1 = require("@nucypher/shared");
 const taco_auth_1 = require("@nucypher/taco-auth");
 const types_1 = require("../../types");
@@ -11,33 +11,28 @@ const ERR_RESERVED_PARAM = (key) => `Cannot use reserved parameter name ${key} a
 const ERR_INVALID_CUSTOM_PARAM = (key) => `Custom parameter ${key} must start with ${const_1.CONTEXT_PARAM_PREFIX}`;
 const ERR_AUTH_PROVIDER_REQUIRED = (key) => `No matching authentication provider to satisfy ${key} context variable in condition`;
 const ERR_MISSING_CONTEXT_PARAMS = (params) => `Missing custom context parameter(s): ${params.join(', ')}`;
-const ERR_UNKNOWN_CONTEXT_PARAMS = (params) => `Unknown custom context parameter(s): ${params.join(', ')}`;
-const ERR_NO_AUTH_PROVIDER_FOR_PARAM = (param) => `No custom parameter for requested context parameter: ${param}`;
+const ERR_UNKNOWN_CUSTOM_CONTEXT_PARAM = (param) => `Unknown custom context parameter: ${param}`;
+const ERR_INVALID_AUTH_PROVIDER_TYPE = (param, expected) => `Invalid AuthProvider type for ${param}; expected ${expected}`;
+const ERR_AUTH_PROVIDER_NOT_NEEDED_FOR_CONTEXT_PARAM = (param) => `AuthProvider not necessary for context parameter: ${param}`;
+const EXPECTED_AUTH_PROVIDER_TYPES = {
+    [taco_auth_1.USER_ADDRESS_PARAM_DEFAULT]: taco_auth_1.EIP4361AuthProvider,
+    [taco_auth_1.USER_ADDRESS_PARAM_EXTERNAL_EIP4361]: taco_auth_1.SingleSignOnEIP4361AuthProvider,
+};
+exports.RESERVED_CONTEXT_PARAMS = [
+    taco_auth_1.USER_ADDRESS_PARAM_EXTERNAL_EIP4361,
+    taco_auth_1.USER_ADDRESS_PARAM_DEFAULT,
+];
 class ConditionContext {
-    customParameters;
-    authProviders;
-    requestedParameters;
-    constructor(condition, customParameters = {}, authProviders = {}) {
-        this.customParameters = customParameters;
-        this.authProviders = authProviders;
+    requestedContextParameters;
+    customContextParameters = {};
+    authProviders = {};
+    constructor(condition) {
         const condProps = condition.toObj();
-        this.validateContextParameters();
-        this.validateCoreConditions(condProps);
-        this.requestedParameters =
+        ConditionContext.validateCoreConditions(condProps);
+        this.requestedContextParameters =
             ConditionContext.findContextParameters(condProps);
-        this.validateAuthProviders(this.requestedParameters);
     }
-    validateContextParameters() {
-        Object.keys(this.customParameters).forEach((key) => {
-            if (const_1.RESERVED_CONTEXT_PARAMS.includes(key)) {
-                throw new Error(ERR_RESERVED_PARAM(key));
-            }
-            if (!key.startsWith(const_1.CONTEXT_PARAM_PREFIX)) {
-                throw new Error(ERR_INVALID_CUSTOM_PARAM(key));
-            }
-        });
-    }
-    validateCoreConditions(condObject) {
+    static validateCoreConditions(condObject) {
         // Checking whether the condition is compatible with the current version of the library
         // Intentionally ignoring the return value of the function
         new types_1.CoreConditions((0, shared_1.toJSON)(condObject));
@@ -45,56 +40,54 @@ class ConditionContext {
     validateNoMissingContextParameters(parameters) {
         // Ok, so at this point we should have all the parameters we need
         // If we don't, we have a problem and we should throw
-        const missingParameters = Array.from(this.requestedParameters).filter((key) => parameters[key] === undefined);
+        const missingParameters = Array.from(this.requestedContextParameters).filter((key) => parameters[key] === undefined);
         if (missingParameters.length > 0) {
             throw new Error(ERR_MISSING_CONTEXT_PARAMS(missingParameters));
         }
-        // We may also have some parameters that are not used
-        const unknownParameters = Object.keys(parameters).filter((key) => !this.requestedParameters.has(key) &&
-            !const_1.RESERVED_CONTEXT_PARAMS.includes(key));
-        if (unknownParameters.length > 0) {
-            throw new Error(ERR_UNKNOWN_CONTEXT_PARAMS(unknownParameters));
-        }
     }
-    async fillContextParameters(requestedParameters) {
-        const parameters = await this.fillAuthContextParameters(requestedParameters);
-        for (const key in this.customParameters) {
-            parameters[key] = this.customParameters[key];
+    async fillContextParameters(requestedContextParameters) {
+        const parameters = await this.fillAuthContextParameters(requestedContextParameters);
+        for (const key in this.customContextParameters) {
+            parameters[key] = this.customContextParameters[key];
         }
         return parameters;
     }
-    validateAuthProviders(requestedParameters) {
-        for (const param of requestedParameters) {
+    validateAuthProviders() {
+        for (const param of this.requestedContextParameters) {
             // If it's not a user address parameter, we can skip
             if (!const_1.USER_ADDRESS_PARAMS.includes(param)) {
                 continue;
             }
-            // If it's a user address parameter, we need to check if we have an auth provider
-            const authMethod = taco_auth_1.AUTH_METHOD_FOR_PARAM[param];
-            if (!authMethod && !this.customParameters[param]) {
-                // If we don't have an auth method, and we don't have a custom parameter, we have a problem
-                throw new Error(ERR_NO_AUTH_PROVIDER_FOR_PARAM(param));
-            }
-            // If we have an auth method, but we don't have an auth provider, we have a problem
-            if (authMethod && !this.authProviders[authMethod]) {
+            // we don't have a corresponding auth provider, we have a problem
+            if (!this.authProviders[param]) {
                 throw new Error(ERR_AUTH_PROVIDER_REQUIRED(param));
             }
         }
     }
     async fillAuthContextParameters(requestedParameters) {
         const entries = await Promise.all([...requestedParameters]
-            .map((param) => [param, taco_auth_1.AUTH_METHOD_FOR_PARAM[param]])
-            .filter(([, authMethod]) => !!authMethod)
-            .map(async ([param, authMethod]) => {
-            const maybeAuthProvider = this.authProviders[authMethod];
+            .filter((param) => const_1.USER_ADDRESS_PARAMS.includes(param))
+            .map(async (param) => {
+            const maybeAuthProvider = this.authProviders[param];
             // TODO: Throw here instead of validating in the constructor?
             // TODO: Hide getOrCreateAuthSignature behind a more generic interface
             return [param, await maybeAuthProvider.getOrCreateAuthSignature()];
         }));
         return Object.fromEntries(entries);
     }
+    validateCustomContextParameter(customParam) {
+        if (!ConditionContext.isContextParameter(customParam)) {
+            throw new Error(ERR_INVALID_CUSTOM_PARAM(customParam));
+        }
+        if (exports.RESERVED_CONTEXT_PARAMS.includes(customParam)) {
+            throw new Error(ERR_RESERVED_PARAM(customParam));
+        }
+        if (!this.requestedContextParameters.has(customParam)) {
+            throw new Error(ERR_UNKNOWN_CUSTOM_CONTEXT_PARAM(customParam));
+        }
+    }
     static isContextParameter(param) {
-        return !!String(param).match(const_1.CONTEXT_PARAM_REGEXP);
+        return !!String(param).match(const_1.CONTEXT_PARAM_FULL_MATCH_REGEXP);
     }
     static findContextParameters(condition) {
         // First, we want to find all the parameters we need to add
@@ -134,6 +127,21 @@ class ConditionContext {
         }
         return requestedParameters;
     }
+    addCustomContextParameterValues(customContextParameters) {
+        Object.keys(customContextParameters).forEach((key) => {
+            this.validateCustomContextParameter(key);
+            this.customContextParameters[key] = customContextParameters[key];
+        });
+    }
+    addAuthProvider(contextParam, authProvider) {
+        if (!(contextParam in EXPECTED_AUTH_PROVIDER_TYPES)) {
+            throw new Error(ERR_AUTH_PROVIDER_NOT_NEEDED_FOR_CONTEXT_PARAM(contextParam));
+        }
+        if (!(authProvider instanceof EXPECTED_AUTH_PROVIDER_TYPES[contextParam])) {
+            throw new Error(ERR_INVALID_AUTH_PROVIDER_TYPE(contextParam, typeof authProvider));
+        }
+        this.authProviders[contextParam] = authProvider;
+    }
     async toJson() {
         const parameters = await this.toContextParameters();
         return (0, shared_1.toJSON)(parameters);
@@ -143,16 +151,14 @@ class ConditionContext {
         return new types_1.CoreContext(asJson);
     }
     toContextParameters = async () => {
-        const parameters = await this.fillContextParameters(this.requestedParameters);
+        this.validateAuthProviders();
+        const parameters = await this.fillContextParameters(this.requestedContextParameters);
         this.validateNoMissingContextParameters(parameters);
         return parameters;
     };
-    static fromConditions(conditions, authProviders, customParameters) {
-        return new ConditionContext(condition_expr_1.ConditionExpression.fromCoreConditions(conditions).condition, customParameters, authProviders);
-    }
-    static requestedContextParameters(messageKit) {
+    static fromMessageKit(messageKit) {
         const conditionExpr = condition_expr_1.ConditionExpression.fromCoreConditions(messageKit.acp.conditions);
-        return ConditionContext.findContextParameters(conditionExpr.condition.toObj());
+        return new ConditionContext(conditionExpr.condition);
     }
 }
 exports.ConditionContext = ConditionContext;