avo 3.3.1 → 3.5.0-alpha.0

package/cli.js

@@ -909,6 +909,23 @@ function codegen(json, { schema, sources: targets, warnings, success, errors })
 function matchesSource(source, filter) {
     return source.name.toLowerCase() === filter.toLowerCase();
 }
+// Prompt message helpers — exported for testing
+export function buildFolderMessage(source) {
+    const examplePath = source.outputDirExample ?? 'src/analytics';
+    const folderDescription = 'Generated telemetry code — place it inside your source tree';
+    return `${folderDescription}\n(e.g. ${examplePath})`;
+}
+export function buildInterfaceFolderMessage(source) {
+    const examplePath = source.outputDirExample ?? 'src/analytics';
+    const interfaceFolderDescription = 'Generated interface file — place it inside your source tree';
+    return `${interfaceFolderDescription}\n(e.g. ${examplePath})`;
+}
+export function buildFilenameMessage() {
+    return "This file is regenerated on every 'avo pull' — do not edit it manually";
+}
+export function buildInterfaceFilenameMessage() {
+    return "This file is regenerated on every 'avo pull' — do not edit it manually";
+}
 function selectSource(sourceToAdd, json) {
     wait('Fetching sources');
     return api
@@ -932,6 +949,14 @@ function selectSource(sourceToAdd, json) {
                 return 1;
             return 0;
         });
+        // Resolve source early when sourceToAdd is provided, so the folder
+        // prompt can show a platform-specific example path
+        const resolvedSource = sourceToAdd
+            ? sources.find((s) => matchesSource(s, sourceToAdd))
+            : null;
+        if (sourceToAdd && !resolvedSource) {
+            throw new AvoError(`Source ${sourceToAdd} does not exist`);
+        }
         const prompts = [
             {
                 type: 'fuzzypath',
@@ -940,7 +965,8 @@ function selectSource(sourceToAdd, json) {
                     maybeExcludePath.startsWith('.git'),
                 itemType: 'directory',
                 rootPath: '.',
-                message: 'Select a folder to save the analytics wrapper in',
+                // @ts-ignore — message is a callback to access selected source's outputDirExample
+                message: (answers) => buildFolderMessage(answers.source ?? resolvedSource ?? {}),
                 default: '.',
                 suggestOnly: false,
                 depthLimit: 10,
@@ -954,7 +980,7 @@ function selectSource(sourceToAdd, json) {
             prompts.unshift({
                 type: 'list',
                 name: 'source',
-                message: 'Select a source to set up',
+                message: 'In Avo, a source represents one platform/language target for codegen.\nSelect a source to set up',
                 // @ts-ignore
                 choices,
                 pageSize: 15,
@@ -962,7 +988,7 @@ function selectSource(sourceToAdd, json) {
             prompts.push({
                 type: 'input',
                 name: 'filename',
-                message: 'Select a filename for the analytics wrapper',
+                message: buildFilenameMessage(),
                 // @ts-ignore
                 default(answers) {
                     return answers.source.filenameHint;
@@ -970,14 +996,11 @@ function selectSource(sourceToAdd, json) {
             });
         }
         else {
-            const source = sources.find((soruceToFind) => matchesSource(soruceToFind, sourceToAdd));
-            if (!source) {
-                throw new AvoError(`Source ${sourceToAdd} does not exist`);
-            }
+            const source = resolvedSource;
             prompts.push({
                 type: 'input',
                 name: 'filename',
-                message: 'Select a filename for the library',
+                message: buildFilenameMessage(),
                 // @ts-ignore
                 default() {
                     return source.filenameHint;
@@ -1001,7 +1024,7 @@ function selectSource(sourceToAdd, json) {
                             maybeExcludePath.startsWith('.git'),
                         itemType: 'directory',
                         rootPath: '.',
-                        message: 'Select a folder to save the analytics wrapper interface file in',
+                        message: buildInterfaceFolderMessage(answerSource),
                         default: '.',
                         suggestOnly: false,
                         depthLimit: 10,
@@ -1009,10 +1032,11 @@ function selectSource(sourceToAdd, json) {
                     {
                         type: 'input',
                         name: 'interfaceFilename',
-                        message: (_answers) => 'Select a filename for the analytics wrapper interface file',
+                        message: buildInterfaceFilenameMessage(),
                         // @ts-ignore
                         default() {
-                            return answerSource.filenameHint;
+                            return (answerSource.interfaceFilenameHint ??
+                                answerSource.filenameHint);
                         },
                     },
                 ]
@@ -1434,11 +1458,44 @@ function _respondWithRedirect(req, res, Location) {
         resolve();
     });
 }
+function _extractAuthorizationCode(codeOrUrl) {
+    const input = codeOrUrl.trim();
+    if (!input) {
+        return input;
+    }
+    try {
+        const parsedUrl = new URL(input);
+        const code = parsedUrl.searchParams.get('code');
+        if (code) {
+            return code.trim();
+        }
+    }
+    catch {
+        // Not a full URL, fall back to parsing possible query-like input.
+    }
+    const query = input.includes('?')
+        ? input.split('?').slice(1).join('?')
+        : input;
+    const code = new URLSearchParams(query).get('code');
+    return code ? code.trim() : input;
+}
 function _loginWithoutLocalhost() {
     const callbackUrl = _getCallbackUrl();
     const authUrl = _getLoginUrl(callbackUrl);
     report.info(`Visit this URL on any device to login: ${new URL(authUrl)}`);
-    return open(authUrl);
+    open(authUrl);
+    return inquirer
+        .prompt([
+        {
+            type: 'input',
+            name: 'codeOrUrl',
+            message: 'Paste full redirect URL or code (value after code=):',
+        },
+    ])
+        .then((answers) => _getTokensFromAuthorizationCode(_extractAuthorizationCode(answers.codeOrUrl), callbackUrl).then((tokens) => ({
+        user: jwt.decode(tokens.idToken),
+        tokens,
+    })));
 }
 function _loginWithLocalhost(port) {
     return new Promise((resolve, reject) => {
@@ -1476,7 +1533,10 @@ function _loginWithLocalhost(port) {
         });
     });
 }
-function login() {
+function login(forceManual = false) {
+    if (forceManual) {
+        return _loginWithoutLocalhost();
+    }
     return _getPort().then(_loginWithLocalhost, _loginWithoutLocalhost);
 }
 function logout(refreshToken) {
@@ -2044,14 +2104,20 @@ if (isMainModule) {
             .command({
             command: 'login',
             describe: 'Log into the Avo platform',
-            handler: () => {
+            builder: (yargs) => yargs.option('force-manual', {
+                alias: 'm',
+                describe: 'Force manual login (copy-paste code)',
+                type: 'boolean',
+                default: false,
+            }),
+            handler: (argv) => {
                 const command = () => {
                     const user = conf.get('user');
                     if (user) {
                         report.info(`Already logged in as ${email(user.email)}`);
                         return;
                     }
-                    login()
+                    login(argv.forceManual)
                         .then((result) => {
                         conf.set('user', result.user);
                         conf.set('tokens', result.tokens);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avo",
-  "version": "3.3.1",
+  "version": "3.5.0-alpha.0",
   "type": "module",
   "description": "The command-line interface for Avo",
   "author": "Avo (https://www.avo.app)",
@@ -37,7 +37,7 @@
     "got": "^12.1.0",
     "http-shutdown": "^1.2.0",
     "ignore-walk": "^5.0.1",
-    "inquirer": "^8.0.0",
+    "inquirer": "8.2.6",
     "inquirer-fuzzy-path": "^2.3.0",
     "jsonwebtoken": "^9.0.3",
     "load-json-file": "^7.0.1",
@@ -59,7 +59,7 @@
     "@types/ignore-walk": "^4.0.0",
     "@types/jest": "^29.5.14",
     "@types/minimatch": "^5.1.2",
-    "@types/node": "^24.1.0",
+    "@types/node": "^25.3.0",
     "@typescript-eslint/eslint-plugin": "^5.30.5",
     "@typescript-eslint/parser": "^5.30.5",
     "eslint": "^7.32.0 || ^8.2.0",
@@ -67,7 +67,7 @@
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-import": "^2.25.2",
     "jest": "^29.7.0",
-    "prettier": "3.6.2",
+    "prettier": "3.8.1",
     "ts-jest": "^29.4.5",
     "typescript": "^5.0.2"
   },