Merge pull request #2212 from lindapaiste/chore/no-useless-catch

Cleanup unnecessary `catch` clauses

Author: raclim

.eslintrc

@@ -20,6 +20,7 @@
     "no-console": 0,
     "no-alert": 0,
     "no-underscore-dangle": 0,
+    "no-useless-catch": 2,
     "max-len": [1, 120, 2, {"ignoreComments": true, "ignoreTemplateLiterals": true}],
     "quote-props": [1, "as-needed"],
     "no-unused-vars": [1, {"vars": "local", "args": "none"}],

server/scripts/examples-gg-latest.js

@@ -121,20 +121,16 @@ async function getCodePackage() {
     }
   };
 
-  try {
-    const { data } = await axios.request(options);
-    data.forEach((metadata) => {
-      if (
-        metadata.name.endsWith('P') === true ||
-        metadata.name.endsWith('M') === true
-      ) {
-        sketchRootList.push(metadata);
-      }
-    });
-    return sketchRootList;
-  } catch (err) {
-    throw err;
-  }
+  const { data } = await axios.request(options);
+  data.forEach((metadata) => {
+    if (
+      metadata.name.endsWith('P') === true ||
+      metadata.name.endsWith('M') === true
+    ) {
+      sketchRootList.push(metadata);
+    }
+  });
+  return sketchRootList;
 }
 
 // 2. get the list of all the top-level sketch directories in P and M
@@ -155,13 +151,9 @@ function getSketchDirectories(sketchRootList) {
         }
       };
 
-      try {
-        const { data } = await axios.request(options);
-        const sketchDirs = flatten(data);
-        return sketchDirs;
-      } catch (err) {
-        throw err;
-      }
+      const { data } = await axios.request(options);
+      const sketchDirs = flatten(data);
+      return sketchDirs;
     })
   ).then((output) => {
     const sketchList = [];
@@ -193,13 +185,9 @@ function appendSketchItemLinks(sketchList) {
         }
       };
 
-      try {
-        const { data } = await axios.request(options);
-        sketches.tree = data;
-        return sketchList;
-      } catch (err) {
-        throw err;
-      }
+      const { data } = await axios.request(options);
+      sketches.tree = data;
+      return sketchList;
     })
   );
 }
@@ -220,13 +208,9 @@ function getSketchItems(sketchList) {
         }
       };
 
-      try {
-        const { data } = axios.request(options);
-        sketch.data = data;
-        return sketch;
-      } catch (err) {
-        throw err;
-      }
+      const { data } = axios.request(options);
+      sketch.data = data;
+      return sketch;
     }
     // pass
   })))).then(() => sketchList[0]);
@@ -422,13 +406,9 @@ function getAllSketchContent(newProjectList) {
       };
 
       // console.log("CONVERT ME!")
-      try {
-        const { data } = await axios.request(options);
-        newProject.files[i].content = data;
-        return newProject;
-      } catch (err) {
-        throw err;
-      }
+      const { data } = await axios.request(options);
+      newProject.files[i].content = data;
+      return newProject;
     }
     if (newProject.files[i].url) {
       return new Promise((resolve, reject) => {
@@ -444,9 +424,8 @@ function getAllSketchContent(newProjectList) {
         resolve(newProject);
       });
     }
-  })).catch((err) => {
-    throw err;
-  }))).then(() => newProjectList);
+  }))
+  )).then(() => newProjectList);
   /* eslint-enable */
 }
 

server/scripts/examples-ml5.js

@@ -75,12 +75,9 @@ async function fetchFileContent(item) {
       options.url !== null ||
       options.url !== ''
     ) {
-      try {
-        const { data } = await axios.request(options);
-        file.content = data;
-      } catch (err) {
-        throw err;
-      }
+      const { data } = await axios.request(options);
+      file.content = data;
+
       // NOTE: remove the URL property if there's content
       // Otherwise the p5 editor will try to pull from that url
       if (file.content !== null) delete file.url;
@@ -107,18 +104,13 @@ async function fetchFileContent(item) {
 }
 
 /**
- * STEP 1: Get the top level cateogories
+ * STEP 1: Get the top level categories
  */
 async function getCategories() {
-  try {
-    const options = Object.assign({}, githubRequestOptions);
-    options.url = `${options.url}/examples/p5js${branchRef}`;
-    const { data } = await axios.request(options);
-
-    return data;
-  } catch (err) {
-    return err;
-  }
+  const options = Object.assign({}, githubRequestOptions);
+  options.url = `${options.url}/examples/p5js${branchRef}`;
+  const { data } = await axios.request(options);
+  return data;
 }
 
 /**
@@ -170,12 +162,8 @@ async function traverseSketchTree(parentObject) {
   const options = Object.assign({}, githubRequestOptions);
   options.url = `${options.url}${parentObject.path}${branchRef}`;
 
-  try {
-    const { data } = await axios.request(options);
-    output.tree = data;
-  } catch (err) {
-    throw err;
-  }
+  const { data } = await axios.request(options);
+  output.tree = data;
 
   output.tree = output.tree.map((file) => traverseSketchTree(file));
 
@@ -287,12 +275,8 @@ async function getProjectsList() {
   const options = Object.assign({}, editorRequestOptions);
   options.url = `${options.url}/sketches`;
 
-  try {
-    const { data } = await axios.request(options);
-    return data.sketches;
-  } catch (err) {
-    throw err;
-  }
+  const { data } = await axios.request(options);
+  return data.sketches;
 }
 
 /**
@@ -303,12 +287,8 @@ async function deleteProject(project) {
   options.method = 'DELETE';
   options.url = `${options.url}/sketches/${project.id}`;
 
-  try {
-    const { data } = await axios.request(options);
-    return data;
-  } catch (err) {
-    throw err;
-  }
+  const { data } = await axios.request(options);
+  return data;
 }
 
 /**
@@ -320,12 +300,8 @@ async function createProject(project) {
   options.url = `${options.url}/sketches`;
   options.data = project;
 
-  try {
-    const { data } = await axios.request(options);
-    return data;
-  } catch (err) {
-    throw err;
-  }
+  const { data } = await axios.request(options);
+  return data;
 }
 
 /**