contensis-cli 1.4.1-beta.1 → 1.4.2-beta.0

package/src/util/assert.ts

@@ -0,0 +1,35 @@
+export const isSharedSecret = (str = '') =>
+  str.length > 80 && str.split('-').length === 3 ? str : undefined;
+
+export const isPassword = (str = '') =>
+  !isSharedSecret(str) ? str : undefined;
+
+export const tryParse = (str: any) => {
+  try {
+    return typeof str === 'object' ? str : JSON.parse(str);
+  } catch (e) {
+    return false;
+  }
+};
+
+export const isJson = (str?: string) =>
+  typeof str === 'object' || !!tryParse(str);
+
+export const tryStringify = (obj: any) => {
+  try {
+    return typeof obj === 'object' ? JSON.stringify(obj) : obj;
+  } catch (e) {
+    return obj;
+  }
+};
+
+export const isSysError = (error: any): error is Error =>
+  error?.message !== undefined && error.stack;
+
+export const isUuid = (str: string) => {
+  // Regular expression to check if string is a valid UUID
+  const regexExp =
+    /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/gi;
+
+  return regexExp.test(str);
+};

package/src/util/index.ts

@@ -1,42 +1,8 @@
+import { ICreateTag, ICreateTagGroup } from 'contensis-management-api';
 import mergeWith from 'lodash/mergeWith';
 import { Logger } from './logger';
 import { LogMessages as enGB } from '../localisation/en-GB.js';
-
-export const isSharedSecret = (str = '') =>
-  str.length > 80 && str.split('-').length === 3 ? str : undefined;
-
-export const isPassword = (str = '') =>
-  !isSharedSecret(str) ? str : undefined;
-
-export const tryParse = (str: any) => {
-  try {
-    return typeof str === 'object' ? str : JSON.parse(str);
-  } catch (e) {
-    return false;
-  }
-};
-
-export const isJson = (str?: string) =>
-  typeof str === 'object' || !!tryParse(str);
-
-export const tryStringify = (obj: any) => {
-  try {
-    return typeof obj === 'object' ? JSON.stringify(obj) : obj;
-  } catch (e) {
-    return obj;
-  }
-};
-
-export const isSysError = (error: any): error is Error =>
-  error?.message !== undefined && error.stack;
-
-export const isUuid = (str: string) => {
-  // Regular expression to check if string is a valid UUID
-  const regexExp =
-    /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/gi;
-
-  return regexExp.test(str);
-};
+import { isObject } from 'lodash';
 
 export const url = (alias: string, project: string) => {
   const projectAndAlias =
@@ -74,3 +40,16 @@ export const Logging = async (language = 'en-GB') => {
     Log: Logger,
   };
 };
+
+export const splitTagsAndGroups = (
+  tagsAndGroups: unknown[] = [],
+  tags: ICreateTag[] = [],
+  groups: ICreateTagGroup[] = []
+) => {
+  for (const item of tagsAndGroups) {
+    if (isObject(item) && 'id' in item) {
+      if ('name' in item) groups.push(item as ICreateTagGroup);
+      else tags.push(item as ICreateTag);
+    }
+  }
+};

package/src/util/logger.ts

@@ -8,7 +8,7 @@ import {
   strlen,
 } from 'printable-characters';
 // import ProgressBar from 'progress';
-import { isSysError, tryStringify } from '.';
+import { isSysError, tryStringify } from './assert';
 
 type LogMethod = (content: string) => void;
 type LogErrorMethod = (content: string, err?: any, newline?: string) => void;
@@ -21,6 +21,22 @@ type LogErrorFunc = (
   level?: 'error' | 'critical'
 ) => void;
 
+const cleanseError = (e: any) => {
+  if (e && typeof e === 'object') {
+    if (isSysError(e) && e instanceof Error) return e.toString();
+    if (e.type === 'undefined') delete e.type;
+    if (e.status === 500) delete e.status;
+    delete e.stack;
+  }
+  return JSON.stringify(e, null, 2);
+};
+
+const errorMessages = (errors: any) => {
+  if (Array.isArray(errors))
+    return errors.map(error => cleanseError(error)).join('\n\n');
+  return cleanseError(errors);
+};
+
 export class Logger {
   static isUserTerminal = !!process.stdout.columns;
   static getPrefix = () => {
@@ -45,11 +61,7 @@ export class Logger {
   static error: LogErrorMethod = (content, err, newline = '\n') => {
     const message = `${Logger.getPrefix()} ${Logger.errorText(
       `${Logger.isUserTerminal ? '❌' : '[ERROR]'} ${content}${
-        err
-          ? `\n\n${Logger.infoText(
-              isSysError(err) ? err.toString() : JSON.stringify(err, null, 2)
-            )}`
-          : ''
+        err ? `\n${Logger.infoText(errorMessages(err))}` : ''
       }`
     )}${newline}`;
     if (progress.active) progress.current.interrupt(message);

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.4.1-beta.1";
+export const LIB_VERSION = "1.4.2-beta.0";