@openfn/project 0.7.2 → 0.8.1

package/dist/index.js

@@ -258,7 +258,7 @@ function to_json_default(project) {
 }
 
 // src/serialize/to-app-state.ts
-import { pick, omitBy, isNil } from "lodash-es";
+import { pick, omitBy, isNil, sortBy } from "lodash-es";
 import { randomUUID } from "node:crypto";
 
 // src/util/rename-keys.ts
@@ -327,7 +327,7 @@ var mapWorkflow = (workflow) => {
     obj[next.id] = next.openfn.uuid;
     return obj;
   }, {});
-  workflow.steps.forEach((s) => {
+  sortBy(workflow.steps, "name").forEach((s) => {
     let isTrigger = false;
     let node;
     if (s.type && !s.expression) {
@@ -374,6 +374,7 @@ var mapWorkflow = (workflow) => {
       wfState.edges.push(e);
     });
   });
+  wfState.edges = sortBy(wfState.edges, "id");
   return wfState;
 };
 
@@ -544,7 +545,7 @@ var handleOutput = (data, filePath, format) => {
 };
 
 // src/parse/from-app-state.ts
-var from_app_state_default = (state, meta, config = {}) => {
+var from_app_state_default = (state, meta = {}, config = {}) => {
   let stateJson;
   if (typeof state === "string") {
     if (config.format === "yaml") {
@@ -1397,7 +1398,7 @@ import { randomUUID as randomUUID2 } from "node:crypto";
 import path4 from "node:path";
 import { readFileSync as readFileSync2 } from "node:fs";
 import { grammar } from "ohm-js";
-import { isNil as isNil3 } from "lodash-es";
+import { isNil as isNil3, set } from "lodash-es";
 var parser;
 var initOperations = (options = {}) => {
   let nodes = {};
@@ -1427,7 +1428,7 @@ var initOperations = (options = {}) => {
       const steps = Object.values(nodes);
       const attributes = attrs.children.map((c) => c.buildWorkflow()).reduce((obj, next) => {
         const [key, value] = next;
-        obj[key] = value;
+        set(obj, key, value);
         return obj;
       }, {});
       return { ...attributes, steps };
@@ -1436,7 +1437,19 @@ var initOperations = (options = {}) => {
       return null;
     },
     attribute(_, name, _space, value) {
-      return [name.sourceString, value.sourceString];
+      return [
+        name.sourceString,
+        value.isTerminal() ? value.sourceString : value.buildWorkflow()
+      ];
+    },
+    attr_value(n) {
+      return n.isTerminal() ? n.sourceString : n.buildWorkflow();
+    },
+    bool(value) {
+      return value.sourceString === "true";
+    },
+    int(value) {
+      return parseInt(value.sourceString);
     },
     Pair(parent, edge, child) {
       const n1 = parent.buildWorkflow();
@@ -1475,18 +1488,27 @@ var initOperations = (options = {}) => {
     },
     // Bit flaky - we need this to handle quoted props
     _iter(...items) {
-      return items.map((i) => i.buildWorkflow()).join("");
+      return items.map((i) => i.isTerminal() ? i.sourceString : i.buildWorkflow()).join("");
     },
     alnum(a) {
       return a.sourceString;
     },
-    quotedProp(_left, value, _right) {
+    quoted_prop(_left, value, _right) {
       return value.sourceString;
     },
     edge(_) {
       return {
         openfn: {}
       };
+    },
+    edge_with_props(_, props, __) {
+      const edge = {
+        openfn: {}
+      };
+      props.buildWorkflow().forEach(([key, value]) => {
+        edge[key] = value;
+      });
+      return edge;
     }
   };
   return operations;

package/dist/workflow.ohm

@@ -5,11 +5,13 @@
 Workflow {
   Workflow = attribute* Pair*
 
-  attribute = "@" attr_name space attr_name
+  attribute = "@" chained_attr_name space (attr_value | quoted_prop)
 
-  attr_name = (alnum | "_" | "-")+
+  attr_value = int | bool | (alnum | "_" | "-" | ":")+
 
-  Pair =  node edge node
+  chained_attr_name = (alnum | "_" | "-" | ".")+
+
+  Pair =  node (edge_with_props | edge) node
 
   comment = "#" (~lineTerminator any)*
 
@@ -25,13 +27,21 @@ Workflow {
 
   props = "(" listOf<prop, ","> ")"
 
-  prop = alnum+ "=" propValue
+  prop = (alnum | "-" | "_")+ "=" propValue
+
+  propValue = quoted_prop | bool | int | alnum+ 
 
-  propValue = alnum+ | quotedProp
+  // TODO we only parse numbers as positive ints right now
+  // fine for tests
+  int = digit+
+
+  bool = "false" | "true"
   
-  quotedProp = "\"" (~"\"" any)* "\""
+  quoted_prop = "\"" (~"\"" any)* "\""
 
   edge = "-"
+  
+  edge_with_props = "-" props "-"
 
   lineTerminator =  "\n" | "\r"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/project",
-  "version": "0.7.2",
+  "version": "0.8.1",
   "description": "Read, serialize, replicate and sync OpenFn projects",
   "type": "module",
   "exports": {
@@ -34,8 +34,8 @@
     "lodash-es": "^4.17.21",
     "ohm-js": "^17.2.1",
     "yaml": "^2.2.2",
-    "@openfn/logger": "1.0.6",
-    "@openfn/lexicon": "^1.2.6"
+    "@openfn/lexicon": "^1.2.6",
+    "@openfn/logger": "1.0.6"
   },
   "files": [
     "dist",