avo 3.0.0-beta.2 → 3.1.1

package/Avo.js

@@ -1,4 +1,4 @@
-// Generated by Avo VERSION 107.29.0. You should never have to make changes to this file.
+// Generated by Avo VERSION 108.28.0. You should never have to make changes to this file.
 // If you find yourself in the situation where you have to edit the file please contact us at hi@avo.app.
 // If you encounter a git conflict in this file run `avo pull` and it will be resolved automatically.
 /* tslint:disable */
@@ -275,8 +275,8 @@ function _avo_invoke_payload(body) {
 _avo_invoke = function _avo_invoke(env, eventId, hash, messages, origin) {
     try {
         _avo_invoke_payload({
-            "ac": "DL73ZlCScWgNkQwC3eRv",
-            "br": "master",
+            "ac": "7Lk2c1ODN76gJr4AFEIk",
+            "br": "qsHHWtDYF",
             "en": env,
             "ev": eventId,
             "ha": hash,
@@ -300,8 +300,8 @@ _avo_invoke = function _avo_invoke(env, eventId, hash, messages, origin) {
 _avo_invoke_meta = function _avo_invoke_meta(env, type, messages, origin) {
     try {
         _avo_invoke_payload({
-            "ac": "DL73ZlCScWgNkQwC3eRv",
-            "br": "master",
+            "ac": "7Lk2c1ODN76gJr4AFEIk",
+            "br": "qsHHWtDYF",
             "en": env,
             "ty": type,
             "sc": "fwtXqAc0fCLy7b7oGW40",
@@ -447,7 +447,7 @@ export function setAvoLogger(avoLogger) {
  * @param properties.email: The user's email
  * @param properties.authenticationMethod: Type of authentication method used by user logging in or signing up
  *
- * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/events/54e92613-090c-4f0b-afeb-ed720eff3422}
+ * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/branches/qsHHWtDYF/events/54e92613-090c-4f0b-afeb-ed720eff3422}
  */
 export function signedIn(properties) {
     // assert properties
@@ -502,7 +502,7 @@ export function signedIn(properties) {
  * @param properties.signInError: no description
  * @param properties.emailInput: The email address that is put into the email input on the landing page
  *
- * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/events/7aa64217-bb89-44f5-9a68-f3bc0255a864}
+ * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/branches/qsHHWtDYF/events/7aa64217-bb89-44f5-9a68-f3bc0255a864}
  */
 export function signInFailed(properties) {
     // assert properties
@@ -562,8 +562,9 @@ export function signInFailed(properties) {
  * @param properties.branchName: The name of the branch that this event is related to.
  * @param properties.schemaName: Name of the schema that this event is related to.
  * @param properties.force: Whether the command was called with --force parameter
+ * @param properties.forceFeatures: The features overrides provided to the cli pull
  *
- * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/events/qqpIQEK11}
+ * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/branches/qsHHWtDYF/events/qqpIQEK11}
  */
 export function cliInvoked(properties) {
     // assert properties
@@ -571,7 +572,7 @@ export function cliInvoked(properties) {
         let messages = [];
         // debug console in Avo
         if (!__AVO_NOOP__) {
-            _avo_invoke(__AVO_ENV__, "qqpIQEK11", "33cb14472604cc190f9a5added26d5adb763245b0dc9a2138dc2a4b2cc5a48ef", messages.map(m => Object.assign({}, { tag: m.tag, propertyId: m.propertyId, additionalProperties: m.additionalProperties, actualType: m.actualType })), 'event');
+            _avo_invoke(__AVO_ENV__, "qqpIQEK11", "f424cee5a989c90c69502a11d76705f3b6bc0d3311322c59f5f42ef13269ab2e", messages.map(m => Object.assign({}, { tag: m.tag, propertyId: m.propertyId, additionalProperties: m.additionalProperties, actualType: m.actualType })), 'event');
         }
         InternalAvoLogger.logEventSent("Cli Invoked", {
             "Cli Action": properties.cliAction,
@@ -581,6 +582,7 @@ export function cliInvoked(properties) {
             "Branch Name": properties.branchName,
             "Schema Name": properties.schemaName,
             "Force": properties.force,
+            "Force Features": properties.forceFeatures,
             "Client": sysClient,
             "Version": sysVersion,
         }, {});
@@ -598,6 +600,9 @@ export function cliInvoked(properties) {
     if (properties.force !== undefined && properties.force !== null) {
         eventProperties["Force"] = properties.force;
     }
+    if (properties.forceFeatures !== undefined && properties.forceFeatures !== null) {
+        eventProperties["Force Features"] = properties.forceFeatures;
+    }
     eventProperties["Client"] = sysClient;
     eventProperties["Version"] = sysVersion;
     // @ts-ignore
@@ -615,9 +620,10 @@ export function cliInvoked(properties) {
                     "Branch Name": properties.branchName,
                     "Schema Name": properties.schemaName,
                     "Force": properties.force,
+                    "Force Features": properties.forceFeatures,
                     "Client": sysClient,
                     "Version": sysVersion,
-                }, "qqpIQEK11", "33cb14472604cc190f9a5added26d5adb763245b0dc9a2138dc2a4b2cc5a48ef")
+                }, "qqpIQEK11", "f424cee5a989c90c69502a11d76705f3b6bc0d3311322c59f5f42ef13269ab2e")
                 : Promise.resolve(),
             // destination CustomNodeJS
             CustomNodeJS.logEvent(properties.userId_, "Cli Invoked", Object.assign({}, eventProperties)),
@@ -635,7 +641,7 @@ export function cliInvoked(properties) {
  * @param properties.userId_: User Id is required for server sources.
  * @param properties.cliInvokedByCi: True iff process.env.CI is set.
  *
- * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/events/JCwfVYXTS}
+ * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/branches/qsHHWtDYF/events/JCwfVYXTS}
  */
 export function cliInstalled(properties) {
     // assert properties
@@ -689,7 +695,7 @@ export function cliInstalled(properties) {
  * @param properties.branchName: The name of the branch that this event is related to.
  * @param properties.schemaName: Name of the schema that this event is related to.
  *
- * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/events/Un5dTEMQYy}
+ * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/branches/qsHHWtDYF/events/Un5dTEMQYy}
  */
 export function cliConflictResolveAttempted(properties) {
     // assert properties
@@ -757,7 +763,7 @@ export function cliConflictResolveAttempted(properties) {
  * @param properties.branchId: The ID of the branch that this event is related to.
  * @param properties.branchName: The name of the branch that this event is related to.
  *
- * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/events/4ZhoijIA2U}
+ * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/branches/qsHHWtDYF/events/4ZhoijIA2U}
  */
 export function cliConflictResolveFailed(properties) {
     // assert properties
@@ -825,7 +831,7 @@ export function cliConflictResolveFailed(properties) {
  * @param properties.branchId: The ID of the branch that this event is related to.
  * @param properties.branchName: The name of the branch that this event is related to.
  *
- * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/events/yj_554q43i}
+ * @see {@link https://www.avo.app/schemas/fwtXqAc0fCLy7b7oGW40/branches/qsHHWtDYF/events/yj_554q43i}
  */
 export function cliConflictResolveSucceeded(properties) {
     // assert properties

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) => {
@@ -740,7 +743,11 @@ function loadAvoJsonOrInit({ argv, skipPullMaster, skipInit }) {
         }
         return Promise.resolve(JSON.parse(avoFile));
     })
-        .then((json) => Promise.resolve({ ...json, force: argv.f === true }))
+        .then((json) => Promise.resolve({
+        ...json,
+        force: argv.f === true,
+        forceFeatures: argv.forceFeatures,
+    }))
         .then(validateAvoJson)
         .catch((error) => {
         if (error.code === 'ENOENT' && skipInit) {
@@ -758,7 +765,7 @@ function writeAvoJson(json) {
         indent: 2,
     }).then(() => json);
 }
-function codegen(json, { schema, sources: targets, warnings, errors }) {
+function codegen(json, { schema, sources: targets, warnings, success, errors }) {
     const newJson = { ...JSON.parse(JSON.stringify(json)), schema };
     newJson.sources = newJson.sources.map((source) => {
         const target = targets.find(({ id }) => id === source.id);
@@ -788,6 +795,11 @@ function codegen(json, { schema, sources: targets, warnings, errors }) {
                 report.warn(warning);
             });
         }
+        if (success !== undefined && success !== null && Array.isArray(success)) {
+            success.forEach((success) => {
+                report.success(success);
+            });
+        }
         report.success(`Analytics ${targets.length > 1 ? 'wrappers' : 'wrapper'} successfully updated`);
         targets.forEach((target) => {
             const source = newJson.sources.find(({ id }) => id === target.id);
@@ -924,6 +936,7 @@ function pull(sourceFilter, json) {
                 path: source.path,
             })),
             force: json.force ?? false,
+            forceFeatures: json.forceFeatures,
         },
     }))
         .then((result) => {
@@ -1254,6 +1267,9 @@ function logout(refreshToken) {
         conf.delete('tokens');
     }
 }
+function parseForceFeaturesParam(forceFeatures) {
+    return forceFeatures?.split(',').map((it) => it.trim());
+}
 yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
     .usage('$0 command')
     .scriptName('avo')
@@ -1263,12 +1279,6 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
     default: false,
     describe: 'make output more verbose',
     type: 'boolean',
-})
-    .option('f', {
-    alias: 'force',
-    describe: 'Proceed with merge when incoming branch is open',
-    default: false,
-    type: 'boolean',
 })
     .command({
     command: 'track-install',
@@ -1296,6 +1306,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                     cliAction: Avo.CliAction.INIT,
                     cliInvokedByCi: invokedByCi(),
                     force: undefined,
+                    forceFeatures: undefined,
                 });
                 report.info(`Avo is already initialized for workspace ${cyan(json.schema.name)} (${file('avo.json')} exists)`);
                 return Promise.resolve();
@@ -1309,6 +1320,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.INIT,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             return requireAuth(argv, () => init()
                 .then(writeAvoJson)
@@ -1326,6 +1338,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.INIT,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
         });
     },
@@ -1333,8 +1346,21 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
     .command({
     command: 'pull [source]',
     desc: 'Pull analytics wrappers from Avo workspace',
-    builder: (yargs) => yargs.option('branch', {
+    builder: (yargs) => yargs
+        .option('branch', {
         describe: 'Name of Avo branch to pull from',
+        default: 'main',
+        type: 'string',
+    })
+        .option('f', {
+        alias: 'force',
+        describe: 'Proceed ignoring the unsupported features for given source',
+        default: false,
+        type: 'boolean',
+    })
+        .option('forceFeatures', {
+        describe: 'Optional comma separated list of features to force enable',
+        default: undefined,
         type: 'string',
     }),
     handler: (argv) => {
@@ -1348,7 +1374,8 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 userId_: installIdOrUserId(),
                 cliAction: Avo.CliAction.PULL,
                 cliInvokedByCi: invokedByCi(),
-                force: undefined,
+                force: argv.f === true,
+                forceFeatures: parseForceFeaturesParam(argv.forceFeatures),
             });
             requireAuth(argv, () => {
                 if (argv.branch && json.branch.name !== argv.branch) {
@@ -1370,6 +1397,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.PULL,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             throw error;
         });
@@ -1390,6 +1418,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
             cliAction: Avo.CliAction.CHECKOUT,
             cliInvokedByCi: invokedByCi(),
             force: undefined,
+            forceFeatures: undefined,
         });
         report.info(`Currently on branch '${json.branch.name}'`);
         requireAuth(argv, () => checkout(argv.branch, json).then(writeAvoJson));
@@ -1404,6 +1433,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
             cliAction: Avo.CliAction.CHECKOUT,
             cliInvokedByCi: invokedByCi(),
             force: undefined,
+            forceFeatures: undefined,
         });
         throw error;
     }),
@@ -1428,6 +1458,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                         cliAction: Avo.CliAction.SOURCE,
                         cliInvokedByCi: invokedByCi(),
                         force: undefined,
+                        forceFeatures: undefined,
                     });
                     if (!json.sources || !json.sources.length) {
                         report.info(`No sources defined in ${file('avo.json')}. Run ${cmd('avo source add')} to add sources`);
@@ -1449,6 +1480,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                         cliAction: Avo.CliAction.SOURCE,
                         cliInvokedByCi: invokedByCi(),
                         force: undefined,
+                        forceFeatures: undefined,
                     });
                     throw error;
                 });
@@ -1469,6 +1501,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                         cliAction: Avo.CliAction.SOURCE_ADD,
                         cliInvokedByCi: invokedByCi(),
                         force: undefined,
+                        forceFeatures: undefined,
                     });
                     requireAuth(argv, () => {
                         selectSource(argv.source, json).then(writeAvoJson);
@@ -1484,6 +1517,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                         cliAction: Avo.CliAction.SOURCE_ADD,
                         cliInvokedByCi: invokedByCi(),
                         force: undefined,
+                        forceFeatures: undefined,
                     });
                     throw error;
                 });
@@ -1505,6 +1539,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                         cliAction: Avo.CliAction.SOURCE_REMOVE,
                         cliInvokedByCi: invokedByCi(),
                         force: undefined,
+                        forceFeatures: undefined,
                     });
                     if (!json.sources || !json.sources.length) {
                         report.warn(`No sources defined in ${file('avo.json')}. Run ${cmd('avo source add')} to add sources`);
@@ -1566,6 +1601,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                         cliAction: Avo.CliAction.SOURCE_REMOVE,
                         cliInvokedByCi: invokedByCi(),
                         force: undefined,
+                        forceFeatures: undefined,
                     });
                     throw error;
                 });
@@ -1588,6 +1624,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.STATUS,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             report.info(`Currently on branch '${json.branch.name}'`);
             return getSource(argv, json);
@@ -1603,6 +1640,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.STATUS,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             throw error;
         });
@@ -1612,6 +1650,12 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
     command: 'merge main',
     aliases: ['merge master'],
     desc: 'Pull the Avo main branch into your current branch',
+    builder: (yargs) => yargs.option('f', {
+        alias: 'force',
+        describe: 'Proceed with merge when incoming branch is open',
+        default: false,
+        type: 'boolean',
+    }),
     handler: (argv) => {
         loadAvoJsonOrInit({ argv, skipPullMaster: true, skipInit: false })
             .then((json) => {
@@ -1624,6 +1668,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.MERGE,
                 cliInvokedByCi: invokedByCi(),
                 force: json.force,
+                forceFeatures: undefined,
             });
             return requireAuth(argv, () => pullMaster(json).then(writeAvoJson));
         })
@@ -1637,6 +1682,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.MERGE,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             throw error;
         });
@@ -1662,6 +1708,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                     cliAction: Avo.CliAction.CONFLICT,
                     cliInvokedByCi: invokedByCi(),
                     force: undefined,
+                    forceFeatures: undefined,
                 });
                 pull(null, json);
             }));
@@ -1677,6 +1724,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
             cliAction: Avo.CliAction.CONFLICT,
             cliInvokedByCi: invokedByCi(),
             force: undefined,
+            forceFeatures: undefined,
         });
         return Promise.resolve(json);
     })
@@ -1690,6 +1738,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
             cliAction: Avo.CliAction.CONFLICT,
             cliInvokedByCi: invokedByCi(),
             force: undefined,
+            forceFeatures: undefined,
         });
         throw error;
     }),
@@ -1709,6 +1758,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.EDIT,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             const { schema } = json;
             const schemaUrl = `https://www.avo.app/schemas/${schema.id}`;
@@ -1725,6 +1775,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.EDIT,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             throw error;
         });
@@ -1770,6 +1821,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.LOGIN,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             command();
         })
@@ -1783,6 +1835,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.LOGIN,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             command();
         });
@@ -1828,6 +1881,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.LOGOUT,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             command();
         })
@@ -1841,6 +1895,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.LOGOUT,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             command();
         });
@@ -1872,6 +1927,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.WHOAMI,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             command();
         })
@@ -1885,6 +1941,7 @@ yargs(hideBin(process.argv)) // eslint-disable-line no-unused-expressions
                 cliAction: Avo.CliAction.WHOAMI,
                 cliInvokedByCi: invokedByCi(),
                 force: undefined,
+                forceFeatures: undefined,
             });
             command();
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avo",
-  "version": "3.0.0-beta.2",
+  "version": "3.1.1",
   "type": "module",
   "description": "The command-line interface for Avo",
   "author": "Avo (https://www.avo.app)",