avo 3.1.0 → 3.2.1

package/cli.js

@@ -167,10 +167,13 @@ function _request(options) {
             }
             return resolve(JSON.parse(response.body));
         })
-            .catch((err) => reject(new AvoError(`Server Error. ${err.message}`, {
-            original: err,
-            exit: 2,
-        })));
+            .catch((err) => {
+            report.error(`${responseToError(err.response)}\n`);
+            reject(new AvoError(`Server Error. ${err.message}`, {
+                original: err,
+                exit: 2,
+            }));
+        });
     });
 }
 const _appendQueryData = (urlPath, data) => {
@@ -773,6 +776,7 @@ function codegen(json, { schema, sources: targets, warnings, success, errors })
                 name: target.name,
                 id: target.id,
                 path: source.path,
+                interfacePath: source.interfacePath,
                 branchId: target.branchId,
                 updatedAt: target.updatedAt,
             };
@@ -887,18 +891,61 @@ function selectSource(sourceToAdd, json) {
                 },
             });
         }
-        return inquirer.prompt(prompts).then((answer) => {
-            const relativePath = path.relative(process.cwd(), path.join(path.resolve(answer.folder), answer.filename));
+        return inquirer.prompt(prompts).then(async (answer) => {
+            let answerSource;
+            if (sourceToAdd) {
+                answerSource = sources.find((soruceToFind) => matchesSource(soruceToFind, sourceToAdd));
+            }
+            else {
+                answerSource = answer.source;
+            }
+            const moreAnswers = await inquirer.prompt(answerSource.canHaveInterfaceFile === true
+                ? [
+                    {
+                        type: 'fuzzypath',
+                        name: 'folder',
+                        excludePath: (maybeExcludePath) => maybeExcludePath.startsWith('node_modules') ||
+                            maybeExcludePath.startsWith('.git'),
+                        itemType: 'directory',
+                        rootPath: '.',
+                        message: 'Select a folder to save the analytics wrapper interface file in',
+                        default: '.',
+                        suggestOnly: false,
+                        depthLimit: 10,
+                    },
+                    {
+                        type: 'input',
+                        name: 'interfaceFilename',
+                        message: (_answers) => 'Select a filename for the analytics wrapper interface file',
+                        // @ts-ignore
+                        default() {
+                            return answerSource.filenameHint;
+                        },
+                    },
+                ]
+                : []);
+            const hasMultiPath = moreAnswers.interfaceFilename != null;
+            const relativeMainPath = path.relative(process.cwd(), path.join(path.resolve(answer.folder), answer.filename));
+            let relativeInterfacePath = relativeMainPath;
+            if (hasMultiPath) {
+                relativeInterfacePath = path.relative(process.cwd(), path.join(path.resolve(answer.folder), moreAnswers.interfaceFilename));
+            }
             let source;
             if (sourceToAdd) {
                 source = sources.find((sourceToFind) => matchesSource(sourceToFind, sourceToAdd));
-                source = { id: source.id, name: source.name, path: relativePath };
+                source = {
+                    id: source.id,
+                    name: source.name,
+                    path: relativeMainPath,
+                    interfacePath: relativeInterfacePath,
+                };
             }
             else {
                 source = {
                     id: answer.source.id,
                     name: answer.source.name,
-                    path: relativePath,
+                    path: relativeMainPath,
+                    interfacePath: relativeInterfacePath,
                 };
             }
             sources = (json.sources ?? []).concat([source]);
@@ -931,6 +978,7 @@ function pull(sourceFilter, json) {
             sources: sources.map((source) => ({
                 id: source.id,
                 path: source.path,
+                interfacePath: source.interfacePath,
             })),
             force: json.force ?? false,
             forceFeatures: json.forceFeatures,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avo",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "type": "module",
   "description": "The command-line interface for Avo",
   "author": "Avo (https://www.avo.app)",
@@ -18,6 +18,7 @@
   },
   "scripts": {
     "postinstall": "node cli.js track-install; true",
+    "prepublishOnly": "npm run compile",
     "lint": "eslint cli.ts",
     "format": "prettier --write cli.ts",
     "check-format": "prettier --check cli.ts",
@@ -34,7 +35,7 @@
     "got": "^12.1.0",
     "http-shutdown": "^1.2.0",
     "ignore-walk": "^5.0.1",
-    "inquirer": "^9.0",
+    "inquirer": "^8.0.0",
     "inquirer-fuzzy-path": "^2.3.0",
     "jsonwebtoken": "^8.4.0",
     "load-json-file": "^7.0.1",