Updates

seantomburke · Nov 6, 2021 · 3fa9d93 · 3fa9d93
1 parent 2b38b2b
commit 3fa9d93
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 20 deletions.
diff --git a/lib/assets/sitemapper.js b/lib/assets/sitemapper.js
diff --git a/sitemapper.d.ts b/sitemapper.d.ts
@@ -1,7 +1,7 @@
 export interface SitemapperResponse {
-    url: string;
-    sites: string[];
-    errors: SitemapperErrorData[];
+  url: string;
+  sites: string[];
+  errors: SitemapperErrorData[];
 }
 
 export interface SitemapperErrorData {
@@ -11,26 +11,26 @@ export interface SitemapperErrorData {
 }
 
 export interface SitemapperOptions {
-    url?: string;
-    timeout?: number;
-    requestHeaders?: {[name: string]: string};
-    debug?: boolean;
-    concurrency?: number;
-    retries?: number;
+  url?: string;
+  timeout?: number;
+  requestHeaders?: {[name: string]: string};
+  debug?: boolean;
+  concurrency?: number;
+  retries?: number;
 }
 
 declare class Sitemapper {
 
-    timeout: number;
+  timeout: number;
 
-    constructor(options: SitemapperOptions)
+  constructor(options: SitemapperOptions)
 
-    /**
-     * Gets the sites from a sitemap.xml with a given URL
-     *
-     * @param url URL to the sitemap.xml file
-     */
-    fetch(url?: string): Promise<SitemapperResponse>;
+  /**
+   * Gets the sites from a sitemap.xml with a given URL
+   *
+   * @param url URL to the sitemap.xml file
+   */
+  fetch(url?: string): Promise<SitemapperResponse>;
 }
 
 export default Sitemapper;
diff --git a/src/assets/sitemapper.js b/src/assets/sitemapper.js
@@ -192,7 +192,7 @@ export default class Sitemapper {
 
       // Otherwise notify of another error
       return {
-        error: error.error,
+        error: `Error occurred: ${error.name}`,
         data: error
       };
     }
@@ -279,7 +279,7 @@ export default class Sitemapper {
           .filter(result => (result.errors.length == 0))
           .reduce((prev, curr) => prev.concat(curr.sites), []);
         const errors = results
-          .filter(result => result.errors)
+          .filter(result => result.errors.length)
           .reduce((prev, curr) => prev.concat(curr.errors), []);
 
         return {

diff --git a/src/tests/test.es5.js b/src/tests/test.es5.js
@@ -79,6 +79,7 @@ describe('Sitemapper', function () {
       sitemapper.fetch(url)
         .then(data => {
           data.sites.should.be.Array;
+          data.errors.should.be.Array;
           done();
         })
         .catch(error => {

diff --git a/src/tests/test.js b/src/tests/test.js
@@ -77,9 +77,12 @@ describe('Sitemapper', function () {
     it('gibberish.gibberish should fail silently with an empty array', function (done) {
       this.timeout(30000);
       const url = 'http://gibberish.gibberish';
+      sitemapper.debug = true;
       sitemapper.fetch(url)
         .then(data => {
           data.sites.should.be.Array;
+          data.errors.should.be.Array;
+          console.log(data);
           done();
         })
         .catch(error => {
@@ -130,6 +133,8 @@ describe('Sitemapper', function () {
       sitemapper.fetch(url)
         .then(data => {
           data.sites.should.be.Array;
+          data.errors.should.be.Array;
+          console.log(data);
           done();
         })
         .catch(error => {
@@ -187,6 +192,7 @@ describe('Sitemapper', function () {
       sitemapper.fetch(url)
         .then(data => {
           data.sites.should.be.Array;
+          data.errors.should.be.Array;
           data.sites.length.should.be.greaterThan(0);
           done();
         })