contensis-cli 1.0.12-beta.8 → 1.1.1-beta.0

package/src/shell.ts

@@ -152,6 +152,8 @@ class ContensisShell {
         'get nodes',
         'get model',
         'get project',
+        'get proxy',
+        'get renderer',
         'get role',
         'get token',
         'get version',
@@ -303,3 +305,5 @@ process.stdin.on('data', key => {
     shell().quit();
   }
 });
+
+// process.env.http_proxy = 'http://127.0.0.1:8888';

package/src/util/csv.formatter.ts

@@ -1,8 +1,5 @@
-import { flatten } from 'flat';
 import { Parser } from 'json2csv';
-import cleaner from 'deep-cleaner';
-
-const flattenObject = (obj: any) => flatten(cleaner(obj, ['workflow']));
+import { flattenObject } from './json.formatter';
 
 export const csvFormatter = <T>(entries: T | T[]) => {
   // Flatten the passed in object

package/src/util/diff.ts

@@ -70,7 +70,7 @@ export const diffFileContent = (
     } else needsNewLine = true;
   }
 
-  return output.join('');
+  return output.join('').replaceAll('\n\n\n', '\n\n');
 };
 
 const addDiffPositionInfo = (diff: Change[]) => {

package/src/util/git.ts

@@ -75,7 +75,7 @@ export class GitHelper {
   }
   gitcwd = () => path.join(this.gitRepoPath);
   gitInfo = (url: string = this.originUrl) => hostedGitInfo.fromUrl(url);
-  hostType = (url: string = this.originUrl): GitTypes => {
+  hostType = (url: string = this.originUrl): GitTypes | undefined => {
     if (url) {
       if (url.includes('github.com')) return 'github';
       else return 'gitlab';
@@ -87,6 +87,7 @@ export class GitHelper {
   gitConfig = (cwd = this.gitRepoPath) => {
     // Find .git/config in project cwd
     const config = parseGitConfig.sync({
+      cwd,
       path: '.git/config',
       expandKeys: true,
     });

package/src/util/json.formatter.ts

@@ -1 +1,32 @@
-export const jsonFormatter = <T>(obj: T) => JSON.stringify(obj, null, 2);
+import { flatten, unflatten } from 'flat';
+import cleaner from 'deep-cleaner';
+
+// Format a JSON object for a nice output
+export const jsonFormatter = <T>(obj: T, fields?: string[]) =>
+  JSON.stringify(limitFields(obj, fields), null, 2);
+
+// Flatten a JSON object such as an entry so there are no
+// nested object and the keys are presented like "sys.version.versionNo": "1.0"
+export const flattenObject = (obj: any) => flatten(cleaner(obj, ['workflow']));
+
+// Will limit and sort an object's keys by an array of supplied fields
+export const limitFields = (obj: any, fields?: string[]): any => {
+  if (!fields) return obj;
+  if (obj && Array.isArray(obj)) {
+    const arr = [];
+    for (const child of obj) arr.push(limitFields(child, fields));
+    return arr;
+  }
+
+  if (obj && typeof obj === 'object') {
+    const flattenedObj = flatten(obj) as any;
+    const sortedObj = {} as any;
+    for (const field of fields) {
+      sortedObj[field] = flattenedObj[field];
+    }
+
+    return unflatten(sortedObj);
+  }
+
+  return obj;
+};

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.0.12-beta.8";
+export const LIB_VERSION = "1.1.1-beta.0";