@openfn/project 0.8.0 → 0.9.0

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
@@ -286,6 +286,10 @@ function jsonToYaml(json) {
 }
 
 // src/serialize/to-app-state.ts
+var defaultJobProps = {
+  keychain_credential_id: null,
+  project_credential_id: null
+};
 function to_app_state_default(project, options = {}) {
   const { uuid, endpoint, env, ...rest } = project.openfn ?? {};
   const state = omitBy(
@@ -327,7 +331,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) {
@@ -341,12 +345,10 @@ var mapWorkflow = (workflow) => {
       node = omitBy(pick(s, ["name", "adaptor"]), isNil);
       const { uuid: uuid2, ...otherOpenFnProps } = s.openfn ?? {};
       node.id = uuid2;
-      Object.assign(node, otherOpenFnProps);
       if (s.expression) {
         node.body = s.expression;
       }
-      node.project_credential_id = s.openfn?.project_credential_id ?? null;
-      node.keychain_credential_id = null;
+      Object.assign(node, defaultJobProps, otherOpenFnProps);
       wfState.jobs.push(node);
     }
     Object.keys(s.next ?? {}).forEach((next) => {
@@ -374,6 +376,7 @@ var mapWorkflow = (workflow) => {
       wfState.edges.push(e);
     });
   });
+  wfState.edges = sortBy(wfState.edges, "id");
   return wfState;
 };
 
@@ -544,7 +547,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") {
@@ -1399,6 +1402,17 @@ import { readFileSync as readFileSync2 } from "node:fs";
 import { grammar } from "ohm-js";
 import { isNil as isNil3, set } from "lodash-es";
 var parser;
+var expectedNodeProps = [
+  // TODO need to clarify adaptor/adaptors confusion
+  "adaptor",
+  "adaptors",
+  "expression",
+  "condition",
+  "label",
+  "type",
+  "disabled",
+  "name"
+];
 var initOperations = (options = {}) => {
   let nodes = {};
   const uuidMap = options.uuidMap ?? {};
@@ -1472,7 +1486,12 @@ var initOperations = (options = {}) => {
       const name = nameNode.sourceString;
       const node = buildNode(name);
       props.buildWorkflow().forEach(([key, value]) => {
-        nodes[name][key] = value;
+        if (expectedNodeProps.includes(key)) {
+          nodes[name][key] = value;
+        } else {
+          nodes[name].openfn ??= {};
+          nodes[name].openfn[key] = value;
+        }
       });
       return node;
     },

package/dist/workflow.ohm

@@ -27,7 +27,7 @@ Workflow {
 
   props = "(" listOf<prop, ","> ")"
 
-  prop = alnum+ "=" propValue
+  prop = (alnum | "-" | "_")+ "=" propValue
 
   propValue = quoted_prop | bool | int | alnum+ 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/project",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "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",