Tweak CLI tool

MarcL · Nov 9, 2019 · 7f15dd3 · 7f15dd3
1 parent 81bd842
commit 7f15dd3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/bin/cli.js b/bin/cli.js
@@ -3,8 +3,9 @@ const yargs = require('yargs');
 const chalk = require('chalk');
 const convertAndCreateCampaign = require('../src');
 
-const logError = error => console.error(chalk.bold.red(`❌ ${error}`));
-const logSuccess = message => console.log(chalk.green(`✅ ${message}`));
+const logError = message => console.error(chalk.red(`❌ - ${message}`));
+const logWarning = message => console.error(chalk.yellow(`⚠️ - ${message}`));
+const logSuccess = message => console.log(chalk.green(`✅ - ${message}`));
 
 const { argv } = yargs
     .usage('Usage: $0 [options]')
@@ -50,10 +51,13 @@ const { argv } = yargs
 
 convertAndCreateCampaign(argv)
     .then(data => {
-        const { email, campaign } = data;
-        if (email.errors.length > 0) {
-            throw new Error(email.errors.toString());
-        }
+        const {
+            email: { errors },
+            campaign,
+        } = data;
+        errors.forEach(error => {
+            logWarning(error.message);
+        });
 
         logSuccess('Email created');
 
@@ -64,4 +68,6 @@ convertAndCreateCampaign(argv)
             logSuccess(`Mailchimp campaign: ${editUrl}?id=${id}`);
         }
     })
-    .catch(error => logError(error));
+    .catch(error => {
+        logError(error);
+    });
diff --git a/src/markdown.js b/src/markdown.js
@@ -28,9 +28,10 @@ const createMailchimpRenderer = originalRenderer => {
             .join('&amp;');
 
         const newBaseUrl = `${protocol}//${hostname}${pathname}`;
+
         const newHref =
             newQueryParameters.length > 0
-                ? `${newBaseUrl}${pathname}?${newQueryParameters}`
+                ? `${newBaseUrl}?${newQueryParameters}`
                 : newBaseUrl;
         return `<a href="${newHref}">${title}</a>`;
     };

diff --git a/src/markdownToHtmlEmail.js b/src/markdownToHtmlEmail.js
@@ -28,8 +28,6 @@ const markdownToHtmlEmail = async options => {
         keepMailChimpTags
     );
 
-    console.log(fileData);
-
     const mjmlRenderedTemplate = await renderHandlebars({
         filename: mjmlTemplateFilename,
         context: {

diff --git a/tests/__snapshots__/markdown.test.js.snap b/tests/__snapshots__/markdown.test.js.snap
@@ -68,7 +68,7 @@ Object {
     "subject": "Email subject line",
     "title": "Title of the email campaign in Mailchimp",
   },
-  "html": "<p>Testing link in markdown: <a href=\\"https://test.com/path/to/api/path/to/api?param=*|MC:DATE|*&amp;another=true&amp;test=lets%20test\\">link</a></p>
+  "html": "<p>Testing link in markdown: <a href=\\"https://test.com/path/to/api?param=*|MC:DATE|*&amp;another=true&amp;test=lets%20test\\">link</a></p>
 ",
   "markdown": "
 Testing link in markdown: [link](https://test.com/path/to/api?param=*|MC:DATE|*&another=true&test=lets%20test)