mstate-cli 0.4.2 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mstate-cli",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "main": "index.js",
   "bin": {
     "mstate": "./dist/index.js"

package/src/common/helpers.ts

@@ -56,3 +56,28 @@ export function getMacID() {
 
   return macAddresses[0];
 }
+
+export function sortJSON(data: any): any {
+  if (Array.isArray(data)) {
+    const newArr = [];
+    for (const val of data) {
+      newArr.push(sortJSON(val));
+    }
+
+    return newArr;
+  } else if (typeof data === 'object') {
+    const entries = Object.entries(data);
+    const sortedObject = entries.sort(([, d1]) =>
+      typeof d1 === 'string' || typeof d1 === 'number' ? -1 : 1,
+    );
+
+    let newObj: any = {};
+    for (const [k, d] of sortedObject) {
+      newObj[k] = sortJSON(d);
+    }
+
+    return newObj;
+  }
+
+  return data;
+}

package/src/handlers/action.handler.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import path from 'path';
 import { MSTATE_URL } from '../common/constant';
-import { getValueFromArgs } from '../common/helpers';
+import { getValueFromArgs, sortJSON } from '../common/helpers';
 import { customLog, getSecretKey } from '../common/utils';
 import { Variables } from 'src/common/enum';
 
@@ -29,7 +29,7 @@ class ActionHandler {
         ...response?.errors,
       );
     } else {
-      const actionConfigs = response?.data;
+      const actionConfigs = sortJSON(response?.data);
 
       const folderPath = path.resolve(workflowName, 'actions');
       fs.mkdirSync(folderPath, { recursive: true });

package/src/handlers/workflow.handler.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import path from 'path';
 import { MSTATE_URL } from '../common/constant';
 import { customLog, getSecretKey } from '../common/utils';
-import { getValueFromArgs } from '../common/helpers';
+import { getValueFromArgs, sortJSON } from '../common/helpers';
 import { Variables } from 'src/common/enum';
 
 class WorkflowHandler {
@@ -112,7 +112,10 @@ class WorkflowHandler {
         ...response?.errors,
       );
     } else {
-      const workflowConfig = response?.data;
+      const workflowConfig = sortJSON(response?.data);
+      if (workflowConfig) {
+        delete workflowConfig?.id;
+      }
 
       const folderPath = path.resolve(workflowName);
       fs.mkdirSync(folderPath, { recursive: true });