@blocklet/launcher-util 2.1.20 → 2.1.22

package/lib/format-error.js

@@ -1,18 +1,35 @@
-const get = require('lodash.get');
+const formatError = (err) => {
+  if (!err) {
+    return err;
+  }
+
+  const { details, errors, response } = err;
 
-module.exports = function formatError(error) {
-  if (!error) {
-    return error;
+  // graphql error
+  if (Array.isArray(errors)) {
+    return errors.map((x) => x.message).join('\n');
   }
 
-  if (Array.isArray(error.errors)) {
-    return error.errors.map((x) => x.message).join('\n');
+  // joi validate error
+  if (Array.isArray(details)) {
+    const formatted = details.map((e) => {
+      const errorMessage = e.message.replace(/["]/g, "'");
+      const errorPath = e.path.join('.');
+      return `${errorPath}: ${errorMessage}`;
+    });
+
+    return `Validate failed: ${formatted.join(';')}`;
   }
 
-  const dataError = get(error, 'response.data.error');
-  if (dataError) {
-    return dataError;
+  // axios error
+  if (response) {
+    return (
+      response.data.error ||
+      `Request failed: ${response.status} ${response.statusText}: ${JSON.stringify(response.data)}`
+    );
   }
 
-  return error.message || error;
+  return err.message || err;
 };
+
+module.exports = formatError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-util",
-  "version": "2.1.20",
+  "version": "2.1.22",
   "description": "Common constants",
   "keywords": [
     "constant"
@@ -46,5 +46,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "6570634a807d34d81addfaf7485e8ca6dd7e6fac"
+  "gitHead": "82cfc8d632852ef0dd4d40c9a082f90264345291"
 }