fix: no multiple warning for loading config file (#74)

closes #68
currents-dev · Mar 10, 2023 · a87ffc7 · a87ffc7
1 parent ba5f47a
commit a87ffc7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/packages/cypress-cloud/lib/cli/cli.ts b/packages/cypress-cloud/lib/cli/cli.ts
@@ -6,6 +6,7 @@ import {
   TestingType,
 } from "../../types";
 import { getCurrentsConfig } from "../config";
+import { withError } from "../log";
 import { sanitizeAndConvertNestedArgs } from "./parser";
 import { program } from "./program";
 
@@ -115,15 +116,19 @@ export async function getRunParameters(
 
   if (!key) {
     return program.error(
-      "Missing 'key'. Please either pass it as a cli flag '-k, --key <record-key>', set it in currents.config.js, or set CURRENTS_RECORD_KEY environment variable."
+      withError(
+        "Missing 'key'. Please either pass it as a cli flag '-k, --key <record-key>', set it in currents.config.js, or set CURRENTS_RECORD_KEY environment variable."
+      )
     );
   }
 
   const _projectId = process.env.CURRENTS_PROJECT_ID ?? projectId;
 
   if (!_projectId) {
     return program.error(
-      "Missing 'projectId'. Please either set it in currents.config.js, or as CURRENTS_PROJECT_ID environment variable."
+      withError(
+        "Missing 'projectId'. Please either set it in currents.config.js, or as CURRENTS_PROJECT_ID environment variable."
+      )
     );
   }
 

diff --git a/packages/cypress-cloud/lib/config.ts b/packages/cypress-cloud/lib/config.ts
@@ -20,7 +20,12 @@ export type CurrentsConfig = {
   component: ComponentConfig;
 };
 
+let _config: CurrentsConfig | null = null;
 export function getCurrentsConfig(): CurrentsConfig {
+  if (_config) {
+    return _config;
+  }
+
   const configFilePath = getConfigFilePath();
   debug("loading currents config file from '%s'", configFilePath);
 
@@ -36,13 +41,15 @@ export function getCurrentsConfig(): CurrentsConfig {
 
   try {
     const fsConfig = require(configFilePath);
-    return {
+    _config = {
       ...defaultConfig,
       ...fsConfig,
-    };
+    } as CurrentsConfig;
+    return _config;
   } catch (e) {
     warn("failed to load currents config file: %s", configFilePath);
-    return defaultConfig;
+    _config = defaultConfig;
+    return _config;
   }
 }
 

diff --git a/packages/cypress-cloud/lib/log.ts b/packages/cypress-cloud/lib/log.ts
@@ -1,18 +1,23 @@
 import chalk from "chalk";
 import util from "util";
 
-const log = (...args: unknown[]) => console.log("  ", util.format(...args));
+const log = (...args: unknown[]) => console.log(util.format(...args));
 
 export const info = log;
 
+export const withError = (msg: string) =>
+  chalk.bgRed.white(" ERROR ") + " " + msg;
+export const withWarning = (msg: string) =>
+  chalk.bgYellow.black(" WARNING ") + " " + msg;
+
 export const warn = (...args: unknown[]) =>
-  log(chalk.bgYellow.black(" WARNING "), util.format(...args));
+  log(withWarning(util.format(...args)));
 
 export const success = (...args: unknown[]) =>
   log(chalk.green(util.format(...args)));
 
 export const error = (...args: unknown[]) =>
-  log(chalk.bgRed.white(" ERROR "), util.format(...args));
+  log(withError(util.format(...args)));
 
 type Color = "red" | "green" | "yellow" | "blue" | "magenta" | "cyan" | "white";
 export const title = (color: Color, ...args: unknown[]) =>
@@ -21,7 +26,7 @@ export const title = (color: Color, ...args: unknown[]) =>
 export const divider = () =>
   console.log("\n" + chalk.gray(Array(100).fill("=").join("")) + "\n");
 
-export const spacer = (n: number = 2) =>
+export const spacer = (n: number = 0) =>
   console.log(Array(n).fill("").join("\n"));
 
 export const cyan = chalk.cyan;