@nucypher/taco 0.6.0 → 0.7.0-alpha.1

package/dist/es/conditions/schemas/json-api.js

@@ -1,14 +1,28 @@
 import { z } from 'zod';
-import { baseConditionSchema, httpsURLSchema, jsonPathSchema } from './common';
+import { baseConditionSchema, httpsURLSchema, jsonAuthorizationTypeSchema, jsonPathSchema, } from './common';
 import { contextParamSchema } from './context';
 import { returnValueTestSchema } from './return-value-test';
 export const JsonApiConditionType = 'json-api';
-export const jsonApiConditionSchema = baseConditionSchema.extend({
-    conditionType: z.literal(JsonApiConditionType).default(JsonApiConditionType),
+export const jsonApiConditionSchema = baseConditionSchema
+    .extend({
+    conditionType: z
+        .literal(JsonApiConditionType)
+        .default(JsonApiConditionType),
     endpoint: httpsURLSchema,
     parameters: z.record(z.string(), z.unknown()).optional(),
     query: jsonPathSchema.optional(),
     authorizationToken: contextParamSchema.optional(),
+    authorizationType: jsonAuthorizationTypeSchema.optional(),
     returnValueTest: returnValueTestSchema, // Update to allow multiple return values after expanding supported methods
+})
+    .refine((data) => {
+    // Ensure that if authorizationType is provided, then authorizationToken is set
+    if (data.authorizationType && !data.authorizationToken) {
+        return false;
+    }
+    return true;
+}, {
+    message: 'authorizationToken must be provided if authorizationType is set',
+    path: ['authorizationType'],
 });
 //# sourceMappingURL=json-api.js.map

package/dist/es/conditions/schemas/json-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-api.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/json-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAC;AAE/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,mBAAmB,CAAC,MAAM,CAAC;IAC/D,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC;IAC5E,QAAQ,EAAE,cAAc;IACxB,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IACxD,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE;IAChC,kBAAkB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACjD,eAAe,EAAE,qBAAqB,EAAE,2EAA2E;CACpH,CAAC,CAAC"}
+{"version":3,"file":"json-api.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/json-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,2BAA2B,EAC3B,cAAc,GACf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAC;AAE/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,mBAAmB;KACtD,MAAM,CAAC;IACN,aAAa,EAAE,CAAC;SACb,OAAO,CAAC,oBAAoB,CAAC;SAC7B,OAAO,CAAC,oBAAoB,CAAC;IAChC,QAAQ,EAAE,cAAc;IACxB,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IACxD,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE;IAChC,kBAAkB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACjD,iBAAiB,EAAE,2BAA2B,CAAC,QAAQ,EAAE;IACzD,eAAe,EAAE,qBAAqB,EAAE,2EAA2E;CACpH,CAAC;KACD,MAAM,CACL,CAAC,IAAI,EAAE,EAAE;IACP,+EAA+E;IAC/E,IAAI,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACvD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,EACD;IACE,OAAO,EACL,iEAAiE;IACnE,IAAI,EAAE,CAAC,mBAAmB,CAAC;CAC5B,CACF,CAAC"}

package/dist/es/conditions/schemas/json-rpc.d.ts

@@ -1,51 +1,86 @@
 import { z } from 'zod';
 export declare const JsonRpcConditionType = "json-rpc";
-export declare const jsonRpcConditionSchema: z.ZodObject<z.objectUtil.extendShape<{
-    conditionType: z.ZodString;
-}, {
+export declare const jsonRpcConditionSchema: z.ZodEffects<z.ZodObject<{} & {
     conditionType: z.ZodDefault<z.ZodLiteral<"json-rpc">>;
     endpoint: z.ZodEffects<z.ZodString, string, string>;
     method: z.ZodString;
     params: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodUnknown, "many">, z.ZodRecord<z.ZodString, z.ZodUnknown>]>>;
     query: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     authorizationToken: z.ZodOptional<z.ZodString>;
-    returnValueTest: z.ZodObject<z.objectUtil.extendShape<{
+    authorizationType: z.ZodOptional<z.ZodEnum<["Bearer", "Basic", "X-API-Key"]>>;
+    returnValueTest: z.ZodEffects<z.ZodObject<{
         index: z.ZodOptional<z.ZodNumber>;
-        comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
-    }, {
+        comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!=", "in", "!in"]>;
+    } & {
         value: z.ZodType<any, z.ZodTypeDef, any>;
-    }>, "strip", z.ZodTypeAny, {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+    }, "strip", z.ZodTypeAny, {
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
+        value?: any;
+        index?: number | undefined;
+    }, {
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
+        value?: any;
+        index?: number | undefined;
+    }>, {
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
         value?: any;
         index?: number | undefined;
     }, {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
         value?: any;
         index?: number | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     conditionType: "json-rpc";
+    endpoint: string;
     method: string;
     returnValueTest: {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
         value?: any;
         index?: number | undefined;
     };
-    endpoint: string;
     params?: unknown[] | Record<string, unknown> | undefined;
     query?: string | undefined;
     authorizationToken?: string | undefined;
+    authorizationType?: "Bearer" | "Basic" | "X-API-Key" | undefined;
 }, {
+    endpoint: string;
+    method: string;
+    returnValueTest: {
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
+        value?: any;
+        index?: number | undefined;
+    };
+    params?: unknown[] | Record<string, unknown> | undefined;
+    conditionType?: "json-rpc" | undefined;
+    query?: string | undefined;
+    authorizationToken?: string | undefined;
+    authorizationType?: "Bearer" | "Basic" | "X-API-Key" | undefined;
+}>, {
+    conditionType: "json-rpc";
+    endpoint: string;
     method: string;
     returnValueTest: {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
         value?: any;
         index?: number | undefined;
     };
+    params?: unknown[] | Record<string, unknown> | undefined;
+    query?: string | undefined;
+    authorizationToken?: string | undefined;
+    authorizationType?: "Bearer" | "Basic" | "X-API-Key" | undefined;
+}, {
     endpoint: string;
+    method: string;
+    returnValueTest: {
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
+        value?: any;
+        index?: number | undefined;
+    };
     params?: unknown[] | Record<string, unknown> | undefined;
     conditionType?: "json-rpc" | undefined;
     query?: string | undefined;
     authorizationToken?: string | undefined;
+    authorizationType?: "Bearer" | "Basic" | "X-API-Key" | undefined;
 }>;
 export type JsonRpcConditionProps = z.infer<typeof jsonRpcConditionSchema>;

package/dist/es/conditions/schemas/json-rpc.js

@@ -1,10 +1,13 @@
 import { z } from 'zod';
-import { baseConditionSchema, httpsURLSchema, jsonPathSchema } from './common';
+import { baseConditionSchema, httpsURLSchema, jsonAuthorizationTypeSchema, jsonPathSchema, } from './common';
 import { contextParamSchema } from './context';
 import { returnValueTestSchema } from './return-value-test';
 export const JsonRpcConditionType = 'json-rpc';
-export const jsonRpcConditionSchema = baseConditionSchema.extend({
-    conditionType: z.literal(JsonRpcConditionType).default(JsonRpcConditionType),
+export const jsonRpcConditionSchema = baseConditionSchema
+    .extend({
+    conditionType: z
+        .literal(JsonRpcConditionType)
+        .default(JsonRpcConditionType),
     endpoint: httpsURLSchema,
     method: z.string(),
     // list or dictionary
@@ -13,6 +16,17 @@ export const jsonRpcConditionSchema = baseConditionSchema.extend({
         .optional(),
     query: jsonPathSchema.optional(),
     authorizationToken: contextParamSchema.optional(),
+    authorizationType: jsonAuthorizationTypeSchema.optional(),
     returnValueTest: returnValueTestSchema,
+})
+    .refine((data) => {
+    // Ensure that if authorizationType is provided, then authorizationToken is set
+    if (data.authorizationType && !data.authorizationToken) {
+        return false;
+    }
+    return true;
+}, {
+    message: 'authorizationToken must be provided if authorizationType is set',
+    path: ['authorizationType'],
 });
 //# sourceMappingURL=json-rpc.js.map

package/dist/es/conditions/schemas/json-rpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-rpc.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/json-rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAC;AAE/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,mBAAmB,CAAC,MAAM,CAAC;IAC/D,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC;IAC5E,QAAQ,EAAE,cAAc;IACxB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,qBAAqB;IACrB,MAAM,EAAE,CAAC;SACN,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;SAChE,QAAQ,EAAE;IACb,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE;IAChC,kBAAkB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACjD,eAAe,EAAE,qBAAqB;CACvC,CAAC,CAAC"}
+{"version":3,"file":"json-rpc.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/json-rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,2BAA2B,EAC3B,cAAc,GACf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAC;AAE/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,mBAAmB;KACtD,MAAM,CAAC;IACN,aAAa,EAAE,CAAC;SACb,OAAO,CAAC,oBAAoB,CAAC;SAC7B,OAAO,CAAC,oBAAoB,CAAC;IAChC,QAAQ,EAAE,cAAc;IACxB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,qBAAqB;IACrB,MAAM,EAAE,CAAC;SACN,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;SAChE,QAAQ,EAAE;IACb,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE;IAChC,kBAAkB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACjD,iBAAiB,EAAE,2BAA2B,CAAC,QAAQ,EAAE;IACzD,eAAe,EAAE,qBAAqB;CACvC,CAAC;KACD,MAAM,CACL,CAAC,IAAI,EAAE,EAAE;IACP,+EAA+E;IAC/E,IAAI,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACvD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,EACD;IACE,OAAO,EACL,iEAAiE;IACnE,IAAI,EAAE,CAAC,mBAAmB,CAAC;CAC5B,CACF,CAAC"}

package/dist/es/conditions/schemas/jwt.d.ts

@@ -1,14 +1,12 @@
 import { z } from 'zod';
 export declare const JWT_PARAM_DEFAULT = ":jwtToken";
 export declare const JWTConditionType = "jwt";
-export declare const jwtConditionSchema: z.ZodObject<z.objectUtil.extendShape<{
-    conditionType: z.ZodString;
-}, {
+export declare const jwtConditionSchema: z.ZodObject<{} & {
     conditionType: z.ZodDefault<z.ZodLiteral<"jwt">>;
     publicKey: z.ZodString;
     expectedIssuer: z.ZodOptional<z.ZodString>;
     jwtToken: z.ZodDefault<z.ZodString>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     conditionType: "jwt";
     publicKey: string;
     jwtToken: string;

package/dist/es/conditions/schemas/return-value-test.d.ts

@@ -1,29 +1,45 @@
 import { z } from 'zod';
-export declare const returnValueTestSchema: z.ZodObject<z.objectUtil.extendShape<{
+export declare const returnValueTestSchema: z.ZodEffects<z.ZodObject<{
     index: z.ZodOptional<z.ZodNumber>;
-    comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
-}, {
+    comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!=", "in", "!in"]>;
+} & {
     value: z.ZodType<any, z.ZodTypeDef, any>;
-}>, "strip", z.ZodTypeAny, {
-    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+}, "strip", z.ZodTypeAny, {
+    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
+    value?: any;
+    index?: number | undefined;
+}, {
+    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
+    value?: any;
+    index?: number | undefined;
+}>, {
+    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
     value?: any;
     index?: number | undefined;
 }, {
-    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
     value?: any;
     index?: number | undefined;
 }>;
-export declare const blockchainReturnValueTestSchema: z.ZodObject<z.objectUtil.extendShape<{
+export declare const blockchainReturnValueTestSchema: z.ZodEffects<z.ZodObject<{
     index: z.ZodOptional<z.ZodNumber>;
-    comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
-}, {
+    comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!=", "in", "!in"]>;
+} & {
     value: z.ZodType<any, z.ZodTypeDef, any>;
-}>, "strip", z.ZodTypeAny, {
-    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+}, "strip", z.ZodTypeAny, {
+    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
+    value?: any;
+    index?: number | undefined;
+}, {
+    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
+    value?: any;
+    index?: number | undefined;
+}>, {
+    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
     value?: any;
     index?: number | undefined;
 }, {
-    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+    comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
     value?: any;
     index?: number | undefined;
 }>;

package/dist/es/conditions/schemas/return-value-test.js

@@ -2,12 +2,26 @@ import { z } from 'zod';
 import { blockchainParamOrContextParamSchema, paramOrContextParamSchema, } from './context';
 const returnValueTestBaseSchema = z.object({
     index: z.number().int().nonnegative().optional(),
-    comparator: z.enum(['==', '>', '<', '>=', '<=', '!=']),
+    comparator: z.enum(['==', '>', '<', '>=', '<=', '!=', 'in', '!in']),
 });
-export const returnValueTestSchema = returnValueTestBaseSchema.extend({
+const requireNonEmptyArrayIfComparatorIsIn = (data) => {
+    if (data.comparator === 'in' || data.comparator === '!in') {
+        return Array.isArray(data.value) && data.value.length > 0;
+    }
+    return true;
+};
+const inComparatorErrorConfig = {
+    message: `"value" must be a non-empty array when comparator is "in"/"!in"`,
+    path: ['value'],
+};
+export const returnValueTestSchema = returnValueTestBaseSchema
+    .extend({
     value: paramOrContextParamSchema,
-});
-export const blockchainReturnValueTestSchema = returnValueTestBaseSchema.extend({
+})
+    .refine(requireNonEmptyArrayIfComparatorIsIn, inComparatorErrorConfig);
+export const blockchainReturnValueTestSchema = returnValueTestBaseSchema
+    .extend({
     value: blockchainParamOrContextParamSchema,
-});
+})
+    .refine(requireNonEmptyArrayIfComparatorIsIn, inComparatorErrorConfig);
 //# sourceMappingURL=return-value-test.js.map

package/dist/es/conditions/schemas/return-value-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"return-value-test.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/return-value-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,mCAAmC,EACnC,yBAAyB,GAC1B,MAAM,WAAW,CAAC;AAEnB,MAAM,yBAAyB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;IAChD,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;CACvD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAC,MAAM,CAAC;IACpE,KAAK,EAAE,yBAAyB;CACjC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,+BAA+B,GAAG,yBAAyB,CAAC,MAAM,CAC7E;IACE,KAAK,EAAE,mCAAmC;CAC3C,CACF,CAAC"}
+{"version":3,"file":"return-value-test.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/return-value-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,mCAAmC,EACnC,yBAAyB,GAC1B,MAAM,WAAW,CAAC;AAEnB,MAAM,yBAAyB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;IAChD,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;CACpE,CAAC,CAAC;AAEH,MAAM,oCAAoC,GAAG,CAAC,IAI7C,EAAW,EAAE;IACZ,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG;IAC9B,OAAO,EAAE,iEAAiE;IAC1E,IAAI,EAAE,CAAC,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB;KAC3D,MAAM,CAAC;IACN,KAAK,EAAE,yBAAyB;CACjC,CAAC;KACD,MAAM,CAAC,oCAAoC,EAAE,uBAAuB,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,+BAA+B,GAAG,yBAAyB;KACrE,MAAM,CAAC;IACN,KAAK,EAAE,mCAAmC;CAC3C,CAAC;KACD,MAAM,CAAC,oCAAoC,EAAE,uBAAuB,CAAC,CAAC"}

package/dist/es/conditions/schemas/rpc.d.ts

@@ -1,45 +1,51 @@
 import { z } from 'zod';
 export declare const RpcConditionType = "rpc";
-export declare const rpcConditionSchema: z.ZodObject<z.objectUtil.extendShape<{
-    conditionType: z.ZodString;
-}, {
+export declare const rpcConditionSchema: z.ZodObject<{} & {
     conditionType: z.ZodDefault<z.ZodLiteral<"rpc">>;
     chain: z.ZodNumber;
     method: z.ZodEnum<["eth_getBalance"]>;
     parameters: z.ZodUnion<[z.ZodTuple<[z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodLiteral<":userAddress">, z.ZodString]>, z.ZodUnion<[z.ZodUnion<[z.ZodNumber, z.ZodString, z.ZodEnum<["earliest", "finalized", "safe", "latest", "pending"]>]>, z.ZodString]>], null>, z.ZodTuple<[z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodLiteral<":userAddress">, z.ZodString]>], null>]>;
-    returnValueTest: z.ZodObject<z.objectUtil.extendShape<{
+    returnValueTest: z.ZodEffects<z.ZodObject<{
         index: z.ZodOptional<z.ZodNumber>;
-        comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
-    }, {
+        comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!=", "in", "!in"]>;
+    } & {
         value: z.ZodType<any, z.ZodTypeDef, any>;
-    }>, "strip", z.ZodTypeAny, {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+    }, "strip", z.ZodTypeAny, {
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
         value?: any;
         index?: number | undefined;
     }, {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
+        value?: any;
+        index?: number | undefined;
+    }>, {
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
+        value?: any;
+        index?: number | undefined;
+    }, {
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
         value?: any;
         index?: number | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     conditionType: "rpc";
-    chain: number;
     method: "eth_getBalance";
-    parameters: [string, string | number] | [string];
     returnValueTest: {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
         value?: any;
         index?: number | undefined;
     };
-}, {
+    parameters: [string] | [string, string | number];
     chain: number;
+}, {
     method: "eth_getBalance";
-    parameters: [string, string | number] | [string];
     returnValueTest: {
-        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
+        comparator: "==" | ">" | "<" | ">=" | "<=" | "!=" | "in" | "!in";
         value?: any;
         index?: number | undefined;
     };
+    parameters: [string] | [string, string | number];
+    chain: number;
     conditionType?: "rpc" | undefined;
 }>;
 export type RpcConditionProps = z.infer<typeof rpcConditionSchema>;

package/dist/es/conditions/schemas/sequential.js

@@ -1,7 +1,36 @@
 import { z } from 'zod';
 import { maxNestedDepth } from '../multi-condition';
 import { baseConditionSchema, plainStringSchema } from './common';
+import { CompoundConditionType } from './compound';
+import { IfThenElseConditionType } from './if-then-else';
 import { anyConditionSchema } from './utils';
+const getAllNestedConditionVariableNames = (condition) => {
+    const conditionVariables = [];
+    if (condition.conditionType === SequentialConditionType) {
+        for (const variable of condition.conditionVariables) {
+            conditionVariables.push(variable.varName);
+            conditionVariables.push(...getAllNestedConditionVariableNames(variable.condition));
+        }
+    }
+    else if (condition.conditionType === IfThenElseConditionType) {
+        conditionVariables.push(...getAllNestedConditionVariableNames(condition.ifCondition));
+        conditionVariables.push(...getAllNestedConditionVariableNames(condition.thenCondition));
+        if (typeof condition.elseCondition !== 'boolean') {
+            conditionVariables.push(...getAllNestedConditionVariableNames(condition.elseCondition));
+        }
+    }
+    else if (condition.conditionType === CompoundConditionType) {
+        for (const operand of condition.operands) {
+            conditionVariables.push(...getAllNestedConditionVariableNames(operand));
+        }
+    }
+    return conditionVariables;
+};
+const noDuplicateVarNames = (condition) => {
+    const allVarNames = getAllNestedConditionVariableNames(condition);
+    const duplicates = allVarNames.filter((item, index) => allVarNames.indexOf(item) !== index);
+    return duplicates.length === 0;
+};
 export const SequentialConditionType = 'sequential';
 export const conditionVariableSchema = z.lazy(() => z.object({
     varName: plainStringSchema,
@@ -18,17 +47,8 @@ export const sequentialConditionSchema = baseConditionSchema
     message: 'Exceeded max nested depth of 2 for multi-condition type',
     path: ['conditionVariables'],
 })
-    .refine(
-// check for duplicate var names
-(condition) => {
-    const seen = new Set();
-    return condition.conditionVariables.every((child) => {
-        if (seen.has(child.varName)) {
-            return false;
-        }
-        seen.add(child.varName);
-        return true;
-    });
+    .refine((condition) => {
+    return noDuplicateVarNames(condition);
 }, {
     message: 'Duplicate variable names are not allowed',
     path: ['conditionVariables'],

package/dist/es/conditions/schemas/sequential.js.map

@@ -1 +1 @@
-{"version":3,"file":"sequential.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/sequential.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE7C,MAAM,CAAC,MAAM,uBAAuB,GAAG,YAAY,CAAC;AAEpD,MAAM,CAAC,MAAM,uBAAuB,GAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAC9D,CAAC,CAAC,MAAM,CAAC;IACP,OAAO,EAAE,iBAAiB;IAC1B,SAAS,EAAE,kBAAkB;CAC9B,CAAC,CACH,CAAC;AAGF,MAAM,CAAC,MAAM,yBAAyB,GAAgB,mBAAmB;KACtE,MAAM,CAAC;IACN,aAAa,EAAE,CAAC;SACb,OAAO,CAAC,uBAAuB,CAAC;SAChC,OAAO,CAAC,uBAAuB,CAAC;IACnC,kBAAkB,EAAE,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;CACnE,CAAC;KACD,MAAM,CACL,CAAC,SAAS,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAC3C;IACE,OAAO,EAAE,yDAAyD;IAClE,IAAI,EAAE,CAAC,oBAAoB,CAAC;CAC7B,CACF;KACA,MAAM;AACL,gCAAgC;AAChC,CAAC,SAAS,EAAE,EAAE;IACZ,MAAM,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;IACvB,OAAO,SAAS,CAAC,kBAAkB,CAAC,KAAK,CACvC,CAAC,KAA6B,EAAE,EAAE;QAChC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;AACJ,CAAC,EACD;IACE,OAAO,EAAE,0CAA0C;IACnD,IAAI,EAAE,CAAC,oBAAoB,CAAC;CAC7B,CACF,CAAC"}
+{"version":3,"file":"sequential.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/sequential.ts"],"names":[],"mappings":"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"}

package/dist/es/conditions/schemas/signing.d.ts

@@ -0,0 +1,12 @@
+import { z } from 'zod';
+export declare const SIGNING_CONDITION_OBJECT_CONTEXT_VAR = ":signingConditionObject";
+export declare const SigningObjectAttributeConditionType = "signing-attribute";
+export declare const signingObjectAttributeConditionSchema: z.ZodSchema;
+export type SigningObjectAttributeConditionProps = z.infer<typeof signingObjectAttributeConditionSchema>;
+export declare const abiParameterValidationSchema: z.ZodSchema;
+export type AbiParameterValidationProps = z.infer<typeof abiParameterValidationSchema>;
+export declare const abiCallValidationSchema: z.ZodSchema;
+export type AbiCallValidationProps = z.infer<typeof abiCallValidationSchema>;
+export declare const SigningObjectAbiAttributeConditionType = "signing-abi-attribute";
+export declare const signingObjectAbiAttributeConditionSchema: z.ZodSchema;
+export type SigningObjectAbiAttributeConditionProps = z.infer<typeof signingObjectAbiAttributeConditionSchema>;