@openfn/project 0.10.0 → 0.10.1

package/dist/index.js

@@ -361,11 +361,17 @@ var mapWorkflow = (workflow) => {
       } else {
         e.source_job_id = node.id;
       }
-      if (rules.condition === true) {
-        e.condition_type = "always";
-      } else if (rules.condition === false) {
-        e.condition_type = "never";
-      } else if (typeof rules.condition === "string") {
+      if (rules.condition) {
+        if (typeof rules.condition === "boolean") {
+          e.condition_type = rules.condition ? "always" : "never";
+        } else if (rules.condition.match(
+          /^(always|never|on_job_success|on_job_failure)$/
+        )) {
+          e.condition_type = rules.condition;
+        } else {
+          e.condition_type = "js_expression";
+          e.condition_expression = rules.condition;
+        }
       }
       wfState.edges.push(e);
     });
@@ -652,20 +658,23 @@ var from_app_state_default = (state, meta = {}, config = {}) => {
   proj.workflows = stateJson.workflows.map(mapWorkflow2);
   return new Project(proj, config);
 };
-var mapTriggerEdgeCondition = (edge) => {
+var mapEdge = (edge) => {
   const e = {
     disabled: !edge.enabled
   };
-  if (edge.condition_type === "always") {
-    e.condition = true;
-  } else if (edge.condition_type === "never") {
-    e.condition = false;
-  } else {
+  if (edge.condition_type === "js_expression") {
     e.condition = edge.condition_expression;
+  } else if (edge.condition_type) {
+    e.condition = edge.condition_type;
+  }
+  if (edge.condition_label) {
+    e.name = edge.condition_label;
+  }
+  if (edge.id) {
+    e.openfn = {
+      uuid: edge.id
+    };
   }
-  e.openfn = {
-    uuid: edge.id
-  };
   return e;
 };
 var mapWorkflow2 = (workflow) => {
@@ -693,7 +702,7 @@ var mapWorkflow2 = (workflow) => {
         if (!target) {
           throw new Error(`Failed to find ${edge.target_job_id}`);
         }
-        obj[slugify(target.name)] = mapTriggerEdgeCondition(edge);
+        obj[slugify(target.name)] = mapEdge(edge);
         return obj;
       }, {})
     });
@@ -723,7 +732,7 @@ var mapWorkflow2 = (workflow) => {
     if (outboundEdges.length) {
       s.next = outboundEdges.reduce((next, edge) => {
         const target = jobs.find((j) => j.id === edge.target_job_id);
-        next[slugify(target.name)] = mapTriggerEdgeCondition(edge);
+        next[slugify(target.name)] = mapEdge(edge);
         return next;
       }, {});
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/project",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Read, serialize, replicate and sync OpenFn projects",
   "type": "module",
   "exports": {