@contrail/cli 2.1.5 → 2.1.7

package/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.1.5 darwin-arm64 node-v18.13.0
+@contrail/cli/2.1.7 darwin-arm64 node-v18.13.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/commands/groups/export.js

@@ -41,7 +41,7 @@ ExportGroups.flags = {
 async function exportGroups(fileLocation, overwrite) {
     const allGroups = await (0, users_1.getGroups)({ relations: ['groupPrincipals'] });
     const allUsersInOrg = await (0, users_1.getUserOrgs)();
-    const groups = [];
+    let groups = [];
     for (const group of allGroups) {
         const groupPrincipals = getGroupPrincipals(group, allGroups, allUsersInOrg);
         groups.push({
@@ -49,6 +49,7 @@ async function exportGroups(fileLocation, overwrite) {
             groupPrincipals,
         });
     }
+    groups = groups.sort((one, two) => (one.name < two.name ? -1 : 1));
     await saveData(groups, fileLocation, overwrite);
 }
 exports.exportGroups = exportGroups;
@@ -88,5 +89,5 @@ function getGroupPrincipals(group, allGroups, orgUsers) {
             });
         }
     }
-    return principals;
+    return principals.sort((one, two) => { var _a, _b; return (((_b = (_a = one.email) !== null && _a !== void 0 ? _a : one.name < two.email) !== null && _b !== void 0 ? _b : two.name) ? -1 : 1); });
 }

package/dist/commands/types/getAll.js

@@ -99,7 +99,7 @@ async function reduceTypePropertyPolicies(data) {
                 statements: x.policy.statements.map(x => reducePrincipal(x)),
             }
         };
-    });
+    }).sort((one, two) => (one.label < two.label ? -1 : 1));
 }
 function reduceTypePropertyPolicyLinks(data) {
     var _a, _b;
@@ -168,7 +168,7 @@ async function reduceTypePolicies(data) {
                 statements: x.policy.statements.map(x => reducePrincipal(x)),
             }
         };
-    });
+    }).sort((one, two) => (one.label < two.label ? -1 : 1));
 }
 function reduceTypePolicyLinks(data) {
     var _a;
@@ -197,7 +197,7 @@ function reduceUsageInfo(data) {
             typeSlug: (_a = data.types.find(y => y.id === x.typeId)) === null || _a === void 0 ? void 0 : _a.slug,
             typePropertySlug: (_b = typeProperties.find(y => y.id === x.typePropertyId)) === null || _b === void 0 ? void 0 : _b.slug,
         };
-    });
+    }).sort((one, two) => (one.label < two.label ? -1 : 1));
 }
 function reduceRuleSetLinks(data) {
     var _a, _b;
@@ -216,7 +216,12 @@ function reduceRuleSetLinks(data) {
             type: type.slug
         });
     }
-    return reducedRuleSetLinks;
+    return reducedRuleSetLinks.sort((one, two) => {
+        if (one.type === two.type) {
+            return one.ruleSet > two.ruleSet ? -1 : 1;
+        }
+        return one.type > two.type ? -1 : 1;
+    });
 }
 function reduceRuleSets(data) {
     var _a;
@@ -225,7 +230,7 @@ function reduceRuleSets(data) {
             ruleSet: x.ruleSet,
             name: x.name,
         };
-    });
+    }).sort((one, two) => (one.name < two.name ? -1 : 1));
 }
 function reduceOptionSets(data) {
     var _a;
@@ -235,7 +240,7 @@ function reduceOptionSets(data) {
             isArchived: optionSet.isArchived,
             optionSet: optionSet.optionSet,
         };
-    });
+    }).sort((one, two) => (one.name < two.name ? -1 : 1));
 }
 function reduceOptionSetHierarchies(data) {
     var _a;
@@ -246,7 +251,7 @@ function reduceOptionSetHierarchies(data) {
             options: x.options,
             name: x.name
         };
-    });
+    }).sort((one, two) => (one.name < two.name ? -1 : 1));
 }
 function reduceOptionSetHierarchyLinks(data) {
     var _a;
@@ -276,7 +281,7 @@ function reduceOptionSetHierarchyLinks(data) {
             typeSlug: type.slug,
             typePropertySlugs,
         };
-    }).filter(x => !!x);
+    }).filter(x => !!x).sort((one, two) => (one.typeSlug < two.typeSlug ? -1 : 1));
 }
 function reduceTypes(dataHolder) {
     console.log('Found types: ', dataHolder.types.length);
@@ -320,7 +325,7 @@ function reduceTypes(dataHolder) {
                 return {
                     ...x
                 };
-            }),
+            }).sort((one, two) => (one.slug < two.slug ? -1 : 1)),
         };
         reducedTypes.push(reducedType);
     }

package/dist/commands/users/export.js

@@ -40,7 +40,7 @@ ExportUsers.flags = {
 };
 async function exportUsers(fileLocation, overwrite) {
     const allUsersInOrg = await (0, users_1.getUserOrgs)();
-    const users = [];
+    let users = [];
     for (const userInOrg of allUsersInOrg) {
         delete userInOrg.user.id;
         delete userInOrg.user.updatedBy;
@@ -53,6 +53,7 @@ async function exportUsers(fileLocation, overwrite) {
             ...userInOrg.user
         });
     }
+    users = users.sort((one, two) => (one.email < two.email ? -1 : 1));
     await saveData(users, fileLocation, overwrite);
 }
 exports.exportUsers = exportUsers;

package/dist/templates/typescript/tsconfig.json

@@ -23,7 +23,7 @@
     "strictPropertyInitialization": false,
     "target": "ES2020",
     "types": [
-      "node"
+      "node", "jest"
     ]
   },
   "exclude": [

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.5",
+  "version": "2.1.7",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",