@avaprotocol/sdk-js 1.3.5-dev.2 → 1.3.6

package/dist/index.d.mts

@@ -1964,13 +1964,7 @@ declare class CronTrigger extends Trigger {
     static fromResponse(raw: TaskTrigger): CronTrigger;
 }
 
-interface EventMatcher {
-    type: string;
-    value: string[];
-}
-type EventTriggerDataType = EventCondition.AsObject & {
-    matcher?: EventMatcher[];
-};
+type EventTriggerDataType = EventCondition.AsObject;
 type EventTriggerProps = TriggerProps & {
     data: EventTriggerDataType;
 };
@@ -2198,4 +2192,4 @@ declare class Client extends BaseClient {
     deleteSecret(name: string, options?: SecretRequestOptions): Promise<boolean>;
 }
 
-export { AUTH_KEY_HEADER, BlockTrigger, type BlockTriggerDataType, type BlockTriggerProps, BranchNode, type BranchNodeData, type BranchNodeProps, type ClientOption, ContractReadNode, type ContractReadNodeData, type ContractReadNodeProps, ContractWriteNode, type ContractWriteNodeData, type ContractWriteNodeProps, CronTrigger, type CronTriggerDataType, type CronTriggerProps, CustomCodeLangs, CustomCodeNode, type CustomCodeNodeData, type CustomCodeNodeProps, DEFAULT_LIMIT, ETHTransferNode, type ETHTransferNodeData, type ETHTransferNodeProps, Edge, type EdgeProps, type Environment, EventTrigger, type EventTriggerDataType, type EventTriggerProps, Execution, type ExecutionProps, ExecutionStatus, FilterNode, type FilterNodeData, type FilterNodeProps, FixedTimeTrigger, type FixedTimeTriggerDataType, type FixedTimeTriggerProps, type GetExecutionsRequest, type GetWalletRequest, type GetWorkflowsRequest, GraphQLQueryNode, type GraphQLQueryNodeData, type GraphQLQueryNodeProps, type ListSecretResponse, Node, NodeFactory, type NodeProps, type RequestOptions, RestAPINode, type RestAPINodeData, type RestAPINodeProps, type SecretRequestOptions, type SmartWallet, Step, type StepProps, Trigger, TriggerFactory, type TriggerProps, TriggerType, Workflow, type WorkflowProps, WorkflowStatus, Client as default };
+export { AUTH_KEY_HEADER, BlockTrigger, type BlockTriggerDataType, type BlockTriggerProps, BranchNode, type BranchNodeData, type BranchNodeProps, type ClientOption, ContractReadNode, type ContractReadNodeData, type ContractReadNodeProps, ContractWriteNode, type ContractWriteNodeData, type ContractWriteNodeProps, CronTrigger, type CronTriggerDataType, type CronTriggerProps, CustomCodeLangs, CustomCodeNode, type CustomCodeNodeData, type CustomCodeNodeProps, DEFAULT_LIMIT, ETHTransferNode, type ETHTransferNodeData, type ETHTransferNodeProps, Edge, type EdgeProps, type Environment, EventTrigger, type EventTriggerDataType, type EventTriggerProps, Execution, type ExecutionProps, ExecutionStatus, FilterNode, type FilterNodeData, type FilterNodeProps, FixedTimeTrigger, type FixedTimeTriggerDataType, type FixedTimeTriggerProps, type GetExecutionsRequest, type GetWalletRequest, type GetWorkflowsRequest, GraphQLQueryNode, type GraphQLQueryNodeData, type GraphQLQueryNodeProps, type ListSecretResponse, Node, NodeFactory, type NodeProps, type RequestOptions, RestAPINode, type RestAPINodeData, type RestAPINodeProps, type SecretRequestOptions, type SmartWallet, Step, type StepProps, Trigger, TriggerFactory, TriggerMetadata, type TriggerProps, TriggerType, Workflow, type WorkflowProps, WorkflowStatus, Client as default };

package/dist/index.d.ts

@@ -1964,13 +1964,7 @@ declare class CronTrigger extends Trigger {
     static fromResponse(raw: TaskTrigger): CronTrigger;
 }
 
-interface EventMatcher {
-    type: string;
-    value: string[];
-}
-type EventTriggerDataType = EventCondition.AsObject & {
-    matcher?: EventMatcher[];
-};
+type EventTriggerDataType = EventCondition.AsObject;
 type EventTriggerProps = TriggerProps & {
     data: EventTriggerDataType;
 };
@@ -2198,4 +2192,4 @@ declare class Client extends BaseClient {
     deleteSecret(name: string, options?: SecretRequestOptions): Promise<boolean>;
 }
 
-export { AUTH_KEY_HEADER, BlockTrigger, type BlockTriggerDataType, type BlockTriggerProps, BranchNode, type BranchNodeData, type BranchNodeProps, type ClientOption, ContractReadNode, type ContractReadNodeData, type ContractReadNodeProps, ContractWriteNode, type ContractWriteNodeData, type ContractWriteNodeProps, CronTrigger, type CronTriggerDataType, type CronTriggerProps, CustomCodeLangs, CustomCodeNode, type CustomCodeNodeData, type CustomCodeNodeProps, DEFAULT_LIMIT, ETHTransferNode, type ETHTransferNodeData, type ETHTransferNodeProps, Edge, type EdgeProps, type Environment, EventTrigger, type EventTriggerDataType, type EventTriggerProps, Execution, type ExecutionProps, ExecutionStatus, FilterNode, type FilterNodeData, type FilterNodeProps, FixedTimeTrigger, type FixedTimeTriggerDataType, type FixedTimeTriggerProps, type GetExecutionsRequest, type GetWalletRequest, type GetWorkflowsRequest, GraphQLQueryNode, type GraphQLQueryNodeData, type GraphQLQueryNodeProps, type ListSecretResponse, Node, NodeFactory, type NodeProps, type RequestOptions, RestAPINode, type RestAPINodeData, type RestAPINodeProps, type SecretRequestOptions, type SmartWallet, Step, type StepProps, Trigger, TriggerFactory, type TriggerProps, TriggerType, Workflow, type WorkflowProps, WorkflowStatus, Client as default };
+export { AUTH_KEY_HEADER, BlockTrigger, type BlockTriggerDataType, type BlockTriggerProps, BranchNode, type BranchNodeData, type BranchNodeProps, type ClientOption, ContractReadNode, type ContractReadNodeData, type ContractReadNodeProps, ContractWriteNode, type ContractWriteNodeData, type ContractWriteNodeProps, CronTrigger, type CronTriggerDataType, type CronTriggerProps, CustomCodeLangs, CustomCodeNode, type CustomCodeNodeData, type CustomCodeNodeProps, DEFAULT_LIMIT, ETHTransferNode, type ETHTransferNodeData, type ETHTransferNodeProps, Edge, type EdgeProps, type Environment, EventTrigger, type EventTriggerDataType, type EventTriggerProps, Execution, type ExecutionProps, ExecutionStatus, FilterNode, type FilterNodeData, type FilterNodeProps, FixedTimeTrigger, type FixedTimeTriggerDataType, type FixedTimeTriggerProps, type GetExecutionsRequest, type GetWalletRequest, type GetWorkflowsRequest, GraphQLQueryNode, type GraphQLQueryNodeData, type GraphQLQueryNodeProps, type ListSecretResponse, Node, NodeFactory, type NodeProps, type RequestOptions, RestAPINode, type RestAPINodeData, type RestAPINodeProps, type SecretRequestOptions, type SmartWallet, Step, type StepProps, Trigger, TriggerFactory, TriggerMetadata, type TriggerProps, TriggerType, Workflow, type WorkflowProps, WorkflowStatus, Client as default };

package/dist/index.js

@@ -7363,6 +7363,7 @@ __export(index_exports, {
   Step: () => step_default,
   Trigger: () => interface_default,
   TriggerFactory: () => factory_default,
+  TriggerMetadata: () => metadata_default,
   TriggerType: () => TriggerType,
   Workflow: () => workflow_default,
   WorkflowStatus: () => WorkflowStatus,
@@ -7477,11 +7478,6 @@ var avs_pb4 = __toESM(require_avs_pb());
 var CronTrigger = class _CronTrigger extends interface_default {
   constructor(props) {
     super({ ...props, type: "cron" /* Cron */, data: props.data });
-    console.log("CronTrigger.constructor.props:", {
-      ...props,
-      type: "cron" /* Cron */,
-      data: props.data
-    });
   }
   toRequest() {
     const request = new avs_pb4.TaskTrigger();
@@ -7493,12 +7489,10 @@ var CronTrigger = class _CronTrigger extends interface_default {
     const condition = new avs_pb4.CronCondition();
     condition.setScheduleList(this.data.scheduleList);
     request.setCron(condition);
-    console.log("CronTrigger.toRequest.request:", request.toObject());
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    console.log("CronTrigger.fromResponse.obj:", obj);
     return new _CronTrigger({
       ...obj,
       type: "cron" /* Cron */,
@@ -7509,15 +7503,11 @@ var CronTrigger = class _CronTrigger extends interface_default {
 var cron_default = CronTrigger;
 
 // src/models/trigger/event.ts
+var _ = __toESM(require("lodash"));
 var avs_pb5 = __toESM(require_avs_pb());
 var EventTrigger = class _EventTrigger extends interface_default {
   constructor(props) {
     super({ ...props, type: "event" /* Event */, data: props.data });
-    console.log("EventTrigger.constructor.props:", {
-      ...props,
-      type: "event" /* Event */,
-      data: props.data
-    });
   }
   toRequest() {
     const request = new avs_pb5.TaskTrigger();
@@ -7528,34 +7518,36 @@ var EventTrigger = class _EventTrigger extends interface_default {
     }
     const condition = new avs_pb5.EventCondition();
     const expression = this.data.expression;
-    const matcher = this.data.matcher;
-    if (expression && expression != "") {
-      condition.setExpression(expression);
+    const matcherList = this.data.matcherList;
+    if (_.isUndefined(expression)) {
+      throw new Error(`Expression is undefined for ${this.type}`);
     }
-    if (matcher && matcher.length >= 1) {
-      condition.setMatcherList(matcher.map((element) => {
+    condition.setExpression(expression);
+    if (_.isUndefined(matcherList)) {
+      throw new Error(`Matcher list is undefined for ${this.type}`);
+    }
+    condition.setMatcherList(
+      matcherList.map((element) => {
         const m = new avs_pb5.EventCondition.Matcher();
         m.setType(element["type"]);
-        m.setValueList(element["value"]);
+        m.setValueList(element["valueList"]);
         return m;
-      }));
-    }
+      })
+    );
     request.setEvent(condition);
-    console.log("EventTrigger.toRequest.request:", request.toObject());
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    console.log("EventTrigger.fromResponse.obj:", obj);
     let data = {};
     if (raw.getEvent().getExpression()) {
       data.expression = raw.getEvent().getExpression();
     }
     if (raw.getEvent().getMatcherList()) {
-      data.matcher = raw.getEvent().getMatcherList().map((item) => {
+      data.matcherList = raw.getEvent().getMatcherList().map((item) => {
         return {
           type: item.getType(),
-          value: item.getValueList()
+          valueList: item.getValueList()
         };
       });
     }
@@ -7573,11 +7565,6 @@ var avs_pb6 = __toESM(require_avs_pb());
 var FixedTimeTrigger = class _FixedTimeTrigger extends interface_default {
   constructor(props) {
     super({ ...props, type: "fixed_time" /* FixedTime */, data: props.data });
-    console.log("FixedTimeTrigger.constructor.props:", {
-      ...props,
-      type: "fixed_time" /* FixedTime */,
-      data: props.data
-    });
   }
   toRequest() {
     const request = new avs_pb6.TaskTrigger();
@@ -7589,12 +7576,10 @@ var FixedTimeTrigger = class _FixedTimeTrigger extends interface_default {
     const condition = new avs_pb6.FixedTimeCondition();
     condition.setEpochsList(this.data.epochsList);
     request.setFixedTime(condition);
-    console.log("FixedTimeTrigger.toRequest.request:", request.toObject());
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    console.log("FixedTimeTrigger.fromResponse.obj:", obj);
     return new _FixedTimeTrigger({
       ...obj,
       type: "fixed_time" /* FixedTime */,
@@ -7887,6 +7872,7 @@ var BranchNode2 = class _BranchNode extends interface_default2 {
         const conditionObj = new avs_pb14.Condition();
         conditionObj.setId(condition.id);
         conditionObj.setType(condition.type);
+        conditionObj.setExpression(condition.expression);
         return conditionObj;
       })
     );
@@ -8702,6 +8688,7 @@ var Client = class extends BaseClient {
   Step,
   Trigger,
   TriggerFactory,
+  TriggerMetadata,
   TriggerType,
   Workflow,
   WorkflowStatus

package/dist/index.mjs

@@ -7340,13 +7340,13 @@ var require_avs_grpc_pb = __commonJS({
 // src/index.ts
 var import_avs_grpc_pb = __toESM(require_avs_grpc_pb());
 var avs_pb20 = __toESM(require_avs_pb());
-import _4 from "lodash";
+import _5 from "lodash";
 import { credentials, Metadata } from "@grpc/grpc-js";
 import { Timestamp } from "google-protobuf/google/protobuf/timestamp_pb";
 
 // src/models/workflow.ts
 var avs_pb16 = __toESM(require_avs_pb());
-import _3 from "lodash";
+import _4 from "lodash";
 
 // src/models/edge.ts
 var avs_pb = __toESM(require_avs_pb());
@@ -7446,11 +7446,6 @@ var avs_pb4 = __toESM(require_avs_pb());
 var CronTrigger = class _CronTrigger extends interface_default {
   constructor(props) {
     super({ ...props, type: "cron" /* Cron */, data: props.data });
-    console.log("CronTrigger.constructor.props:", {
-      ...props,
-      type: "cron" /* Cron */,
-      data: props.data
-    });
   }
   toRequest() {
     const request = new avs_pb4.TaskTrigger();
@@ -7462,12 +7457,10 @@ var CronTrigger = class _CronTrigger extends interface_default {
     const condition = new avs_pb4.CronCondition();
     condition.setScheduleList(this.data.scheduleList);
     request.setCron(condition);
-    console.log("CronTrigger.toRequest.request:", request.toObject());
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    console.log("CronTrigger.fromResponse.obj:", obj);
     return new _CronTrigger({
       ...obj,
       type: "cron" /* Cron */,
@@ -7479,14 +7472,10 @@ var cron_default = CronTrigger;
 
 // src/models/trigger/event.ts
 var avs_pb5 = __toESM(require_avs_pb());
+import * as _ from "lodash";
 var EventTrigger = class _EventTrigger extends interface_default {
   constructor(props) {
     super({ ...props, type: "event" /* Event */, data: props.data });
-    console.log("EventTrigger.constructor.props:", {
-      ...props,
-      type: "event" /* Event */,
-      data: props.data
-    });
   }
   toRequest() {
     const request = new avs_pb5.TaskTrigger();
@@ -7497,34 +7486,36 @@ var EventTrigger = class _EventTrigger extends interface_default {
     }
     const condition = new avs_pb5.EventCondition();
     const expression = this.data.expression;
-    const matcher = this.data.matcher;
-    if (expression && expression != "") {
-      condition.setExpression(expression);
+    const matcherList = this.data.matcherList;
+    if (_.isUndefined(expression)) {
+      throw new Error(`Expression is undefined for ${this.type}`);
     }
-    if (matcher && matcher.length >= 1) {
-      condition.setMatcherList(matcher.map((element) => {
+    condition.setExpression(expression);
+    if (_.isUndefined(matcherList)) {
+      throw new Error(`Matcher list is undefined for ${this.type}`);
+    }
+    condition.setMatcherList(
+      matcherList.map((element) => {
         const m = new avs_pb5.EventCondition.Matcher();
         m.setType(element["type"]);
-        m.setValueList(element["value"]);
+        m.setValueList(element["valueList"]);
         return m;
-      }));
-    }
+      })
+    );
     request.setEvent(condition);
-    console.log("EventTrigger.toRequest.request:", request.toObject());
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    console.log("EventTrigger.fromResponse.obj:", obj);
     let data = {};
     if (raw.getEvent().getExpression()) {
       data.expression = raw.getEvent().getExpression();
     }
     if (raw.getEvent().getMatcherList()) {
-      data.matcher = raw.getEvent().getMatcherList().map((item) => {
+      data.matcherList = raw.getEvent().getMatcherList().map((item) => {
         return {
           type: item.getType(),
-          value: item.getValueList()
+          valueList: item.getValueList()
         };
       });
     }
@@ -7542,11 +7533,6 @@ var avs_pb6 = __toESM(require_avs_pb());
 var FixedTimeTrigger = class _FixedTimeTrigger extends interface_default {
   constructor(props) {
     super({ ...props, type: "fixed_time" /* FixedTime */, data: props.data });
-    console.log("FixedTimeTrigger.constructor.props:", {
-      ...props,
-      type: "fixed_time" /* FixedTime */,
-      data: props.data
-    });
   }
   toRequest() {
     const request = new avs_pb6.TaskTrigger();
@@ -7558,12 +7544,10 @@ var FixedTimeTrigger = class _FixedTimeTrigger extends interface_default {
     const condition = new avs_pb6.FixedTimeCondition();
     condition.setEpochsList(this.data.epochsList);
     request.setFixedTime(condition);
-    console.log("FixedTimeTrigger.toRequest.request:", request.toObject());
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    console.log("FixedTimeTrigger.fromResponse.obj:", obj);
     return new _FixedTimeTrigger({
       ...obj,
       type: "fixed_time" /* FixedTime */,
@@ -7616,12 +7600,12 @@ var TriggerFactory = class {
 var factory_default = TriggerFactory;
 
 // src/models/node/factory.ts
-import _2 from "lodash";
+import _3 from "lodash";
 
 // src/models/node/interface.ts
 var avs_pb7 = __toESM(require_avs_pb());
 import { NodeType } from "@avaprotocol/types";
-import _ from "lodash";
+import _2 from "lodash";
 var Node = class {
   constructor(props) {
     this.id = props.id;
@@ -7633,7 +7617,7 @@ var Node = class {
     const request = new avs_pb7.TaskNode();
     const raw = request.serializeBinary();
     const parsed = avs_pb7.TaskNode.deserializeBinary(raw);
-    if (!_.isEqual(request, parsed)) {
+    if (!_2.isEqual(request, parsed)) {
       throw new Error("Invalid request object");
     }
     return request;
@@ -7856,6 +7840,7 @@ var BranchNode2 = class _BranchNode extends interface_default2 {
         const conditionObj = new avs_pb14.Condition();
         conditionObj.setId(condition.id);
         conditionObj.setType(condition.type);
+        conditionObj.setExpression(condition.expression);
         return conditionObj;
       })
     );
@@ -7920,7 +7905,7 @@ var NodeFactory = class {
     }
   }
   static createNodes(props) {
-    return _2.map(props, (node) => this.create(node));
+    return _3.map(props, (node) => this.create(node));
   }
   static fromResponse(raw) {
     switch (true) {
@@ -7992,11 +7977,11 @@ var Workflow = class _Workflow {
     if (!trigger) {
       throw new Error("Trigger is undefined in fromResponse()");
     }
-    const nodes = _3.map(
+    const nodes = _4.map(
       obj.getNodesList(),
       (node) => factory_default2.fromResponse(node)
     );
-    const edges = _3.map(obj.getEdgesList(), (edge) => edge_default.fromResponse(edge));
+    const edges = _4.map(obj.getEdgesList(), (edge) => edge_default.fromResponse(edge));
     const workflow = new _Workflow({
       id: obj.getId(),
       owner: obj.getOwner(),
@@ -8045,8 +8030,8 @@ var Workflow = class _Workflow {
     const request = new avs_pb16.CreateTaskReq();
     request.setSmartWalletAddress(this.smartWalletAddress);
     request.setTrigger(this.trigger.toRequest());
-    _3.map(this.nodes, (node) => request.addNodes(node.toRequest()));
-    _3.map(this.edges, (edge) => request.addEdges(edge.toRequest()));
+    _4.map(this.nodes, (node) => request.addNodes(node.toRequest()));
+    _4.map(this.edges, (edge) => request.addEdges(edge.toRequest()));
     request.setStartAt(this.startAt);
     request.setExpiredAt(this.expiredAt);
     request.setMaxExecution(this.maxExecution);
@@ -8354,7 +8339,7 @@ var BaseClient = class {
    * @returns {Promise<TResponse>} - The response from the gRPC call
    */
   sendGrpcRequest(method, request, options) {
-    const metadata = _4.cloneDeep(this.metadata);
+    const metadata = _5.cloneDeep(this.metadata);
     if (options?.authKey) {
       metadata.set(AUTH_KEY_HEADER, options.authKey);
     } else if (this.authKey) {
@@ -8670,6 +8655,7 @@ export {
   step_default as Step,
   interface_default as Trigger,
   factory_default as TriggerFactory,
+  metadata_default as TriggerMetadata,
   TriggerType,
   workflow_default as Workflow,
   WorkflowStatus,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avaprotocol/sdk-js",
-  "version": "1.3.5-dev.2",
+  "version": "1.3.6",
   "description": "A JavaScript/TypeScript SDK designed to simplify integration with Ava Protocol's AVS",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "require": "./dist/index.js"
     }
   },
   "author": "Vinh Nguyen (https://github.com/v9n), Chris Li (https://github.com/chrisli30)",