avo 3.2.9-beta.2 → 3.2.10

package/cli.js

@@ -113,7 +113,10 @@ let accessToken;
 let refreshToken;
 /// //////////////////////////////////////////////////////////////////////
 // REQUEST HANDLING
-function responseToError(response) {
+function responseToError(response, error) {
+    if (!response) {
+        return new AvoError(error, {});
+    }
     let { body } = response;
     if (typeof body === 'string' && response.statusCode === 404) {
         body = {
@@ -174,15 +177,12 @@ function _request(options) {
         got(options)
             .then((response) => {
             if (response.statusCode >= 400) {
-                return reject(responseToError(response));
-            }
-            if (response && response.body) {
-                return resolve(JSON.parse(response.body));
+                return reject(responseToError(response, null));
             }
-            return reject(responseToError(response));
+            return resolve(JSON.parse(response.body));
         })
             .catch((err) => {
-            report.error(`${responseToError(err.response)}\n`);
+            report.error(`${responseToError(err.response, err)}\n`);
             reject(new AvoError(`Server Error. ${err.message}`, {
                 original: err,
                 exit: 2,
@@ -201,7 +201,7 @@ const _appendQueryData = (urlPath, data) => {
 function _refreshAccessToken(refreshToken) {
     return api // eslint-disable-line
         .request('POST', '/auth/refresh', {
-        origin: api.apiOrigin,
+        origin: api.apiOrigin, // eslint-disable-line
         json: {
             token: refreshToken,
         },
@@ -1035,7 +1035,7 @@ function findMatches(data, regex) {
     lastIndex += lines.length;
     return fileMatches;
 }
-function getEventMap(data) {
+function getEventMap(data, verbose) {
     const searchFor = 'AVOEVENTMAP:';
     const lines = data.split('\n').filter((line) => line.indexOf(searchFor) > -1);
     if (lines.length === 1) {
@@ -1044,9 +1044,12 @@ function getEventMap(data) {
         const eventMap = JSON.parse(line);
         return eventMap;
     }
+    if (verbose) {
+        report.error('No event map found');
+    }
     return null;
 }
-function getModuleMap(data) {
+function getModuleMap(data, verbose) {
     const searchFor = 'AVOMODULEMAP:';
     const lines = data.split('\n').filter((line) => line.indexOf(searchFor) > -1);
     if (lines.length === 1) {
@@ -1055,6 +1058,9 @@ function getModuleMap(data) {
         const moduleMap = JSON.parse(line);
         return moduleMap;
     }
+    if (verbose) {
+        report.error('No module map found');
+    }
     return null;
 }
 function getSource(argv, json) {
@@ -1090,21 +1096,30 @@ function status(source, json, argv) {
         follow: false,
     }).then((results) => Promise.all(results
         .filter((result) => !result.startsWith('.git'))
-        .map((resultPath) => pify(fs.lstat)(resultPath).then((stats) => {
+        .map((resultPath) => pify(fs.lstat)(resultPath)
+        .then((stats) => {
         if (stats.isSymbolicLink()) {
             return [];
         }
-        return pify(fs.readFile)(resultPath, 'utf8').then((data) => [
-            resultPath,
-            data,
-        ]);
+        return pify(fs.readFile)(resultPath, 'utf8')
+            .then((data) => [resultPath, data])
+            .catch((error) => {
+            if (argv.verbose) {
+                report.warn(`Failed to parse file: ${resultPath}`, error);
+            }
+        });
+    })
+        .catch((error) => {
+        if (argv.verbose) {
+            report.warn(`Failed to read file stats: ${resultPath}`, error);
+        }
     }))).then((cachePairs) => Object.fromEntries(cachePairs)));
     fileCache
         .then((cache) => {
         sources = Promise.all(sources.map((source) => pify(fs.readFile)(source.path, 'utf8').then((data) => {
-            const eventMap = getEventMap(data);
+            const eventMap = getEventMap(data, argv.verbose);
             if (eventMap !== null) {
-                const moduleMap = getModuleMap(data);
+                const moduleMap = getModuleMap(data, argv.verbose);
                 const sourcePath = path.parse(source.path);
                 const moduleName = source.analysis?.module ??
                     moduleMap ??
@@ -1148,13 +1163,19 @@ function status(source, json, argv) {
                         lookup[cachePath] = value;
                     }
                 });
+                if (argv.verbose) {
+                    const combinedPaths = [];
+                    Object.entries(lookup).forEach(([path, _data]) => {
+                        combinedPaths.push(path);
+                    });
+                    report.info(`Looking for events: ${eventMap.join('\n')}`);
+                    report.info(`Looking in module: ${moduleName}`);
+                    report.info(`Looking in files: ${combinedPaths.join('\n')}`);
+                }
                 return Promise.all(eventMap.map((eventName) => {
                     const re = new RegExp(`(${moduleName}\\.${eventName}|\\[${moduleName} ${eventName})`);
                     const results = Object.entries(lookup)
                         .map(([path, data]) => {
-                        if (argv.verbose) {
-                            report.info(`Looking for events in ${path}`);
-                        }
                         const results = findMatches(data, re);
                         return results.length ? [[path, results]] : [];
                     })
@@ -1870,7 +1891,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 .catch(() => {
                 Avo.signInFailed({
                     userId_: conf.get('avo_install_id'),
-                    emailInput: '',
+                    emailInput: '', // XXX this is not passed back here
                     signInError: Avo.SignInError.UNKNOWN,
                 });
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avo",
-  "version": "3.2.9-beta.2",
+  "version": "3.2.10",
   "type": "module",
   "description": "The command-line interface for Avo",
   "author": "Avo (https://www.avo.app)",
@@ -17,6 +17,7 @@
     "node": ">=14.16"
   },
   "scripts": {
+    "postinstall": "node cli.js track-install",
     "prepublishOnly": "npm run compile",
     "lint": "eslint cli.ts",
     "format": "prettier --write cli.ts",
@@ -63,7 +64,7 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.25.2",
-    "prettier": "3.0.3",
+    "prettier": "3.2.5",
     "typescript": "^5.0.2"
   }
 }