avo 1.6.0 → 1.8.0

package/README.md

@@ -48,7 +48,10 @@ yarn commit
 
 ## How to Create a Release
 
+1. Update the semantic version in `package.json`
+2. Publish the package to npm
+
 ```
-npm run release-it
+npm publish
 ```
 

package/cli.js

@@ -685,6 +685,7 @@ function codegen(json, result) {
   let targets = result.sources;
   let newJson = Object.assign({}, _.cloneDeep(json), {schema: schema});
   let warnings = result.warnings;
+  let errors = result.errors;
 
   newJson.sources = newJson.sources.map(source => {
     let target = _.find(targets, target => target.id === source.id);
@@ -711,6 +712,10 @@ function codegen(json, result) {
   let avoJsonTask = writeAvoJson(newJson);
 
   Promise.all(_.concat([avoJsonTask], sourceTasks)).then(() => {
+    if (errors !== undefined && errors !== null && errors !== "") {
+      report.warn(errors + "\n");
+    }
+
     if (warnings !== undefined && warnings !== null && Array.isArray(warnings)) {
       warnings.forEach(warning => {
         report.warn(warning);
@@ -969,11 +974,13 @@ function pull(sourceFilter, json) {
           branchId: json.branch.id,
           sources: _.map(sources, source => {
             return {id: source.id, path: source.path};
-          })
+          }),
+          force: json.force || false
         }
       });
     })
     .then(res => {
+
       cancelWait();
       let result = res.body;
       if (result.ok) {
@@ -1135,9 +1142,30 @@ function status(source, json, argv) {
                 moduleMap || sourcePath.name || 'Avo'
               );
 
+              let sourcePathExts = [];
+
+              if (sourcePath.ext === ".js" || sourcePath.ext === ".ts") {
+                sourcePathExts.push("js");
+                sourcePathExts.push("jsx");
+                sourcePathExts.push("ts");
+                sourcePathExts.push("tsx");
+              } else if (sourcePath.ext === ".java" || sourcePath.ext === ".kt") {
+                sourcePathExts.push("java");
+                sourcePathExts.push("kt");
+              } else if (sourcePath.ext === ".m" || sourcePath.ext === ".swift") {
+                sourcePathExts.push("m");
+                sourcePathExts.push("swift");
+              } else {
+                sourcePathExts.push(sourcePath.ext.substring(1));
+              }
+
+              if (argv.verbose) {
+                console.log("Looking in files with extensions:" , sourcePathExts);
+              }
+
               let globs = [
                 new Minimatch(
-                  _.get(source, 'analysis.glob', '**/*' + sourcePath.ext),
+                  _.get(source, 'analysis.glob', '**/*.+(' + sourcePathExts.join("|") + ")"),
                   {}
                 ),
                 new Minimatch('!' + source.path, {})
@@ -1149,7 +1177,7 @@ function status(source, json, argv) {
 
               return Promise.all(
                 eventMap.map(eventName => {
-                  let re = new RegExp(moduleName + '\\.' + eventName);
+                  let re = new RegExp('(' + moduleName + '\\.' + eventName + '|\\[' + moduleName + " " + eventName +')');
                   let results = _.flatMap(lookup, (data, path) => {
                     if (argv.verbose) {
                       report.info(`Looking for events in ${path}`);
@@ -1634,9 +1662,6 @@ require('yargs')
           report.info(`Currently on branch '${json.branch.name}'`);
           return getSource(argv, json);
         })
-        .then(([source, json]) => {
-          return writeAvoJson(json).then(json => [source, json]);
-        })
         .then(([source, json]) => {
           return status(source, json, argv);
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avo",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "The command-line interface for Avo",
   "author": "Avo (https://www.avo.app)",
   "repository": {
@@ -16,8 +16,6 @@
     "node": ">=6"
   },
   "scripts": {
-    "commit": "git-cz",
-    "release": "release-it",
     "postinstall": "node cli.js track-install"
   },
   "files": [
@@ -30,11 +28,11 @@
     "date-fns": "1.30.1",
     "http-shutdown": "1.2.0",
     "ignore-walk": "3.0.1",
-    "inquirer": "6.2.0",
+    "inquirer": "8.2",
     "inquirer-fuzzy-path": "2.3.0",
     "jsonwebtoken": "8.4.0",
     "load-json-file": "5.1.0",
-    "lodash": "4.17.19",
+    "lodash": "4.17.21",
     "log-symbols": "2.2.0",
     "minimatch": "3.0.4",
     "node-avo-inspector": "^1.0.1",
@@ -44,22 +42,11 @@
     "portfinder": "1.0.19",
     "request": "2.88.0",
     "semver": "5.6.0",
-    "update-notifier": "2.5.0",
+    "update-notifier": "5.1",
     "uuid": "3.3.2",
     "write": "1.0.3",
     "write-json-file": "3.0.2",
-    "yargs": "12.0.5",
-    "yurnalist": "1.0.5"
-  },
-  "devDependencies": {
-    "commitizen": "3.0.5",
-    "conventional-changelog-cli": "2.0.11",
-    "cz-conventional-changelog": "2.1.0",
-    "release-it": "8.2.0"
-  },
-  "config": {
-    "commitizen": {
-      "path": "cz-conventional-changelog"
-    }
+    "yargs": "17.2",
+    "yurnalist": "2"
   }
 }

package/CHANGELOG.md

@@ -1,182 +0,0 @@
-## [1.5.1](https://github.com/avohq/avo/compare/1.5.0...1.5.1) (2021-03-16)
-
-* Fix a bug preventing users from being not able to pick a location for their avo.json file
-
-## [1.5.0](https://github.com/avohq/avo/compare/1.4.2...1.5.0) (2021-03-16)
-
-* Rename the master branch to main
-* Update dependencies
-* Faster autocompletion in big projects
-
-## [1.4.2](https://github.com/avohq/avo/compare/1.4.1...1.4.2) (2020-06-10)
-
-
-
-## [1.4.1](https://github.com/avohq/avo/compare/1.4.1-beta.0...1.4.1) (2019-11-20)
-
-
-
-## [1.4.1-beta.0](https://github.com/avohq/avo/compare/1.4.0...1.4.1-beta.0) (2019-11-20)
-
-
-### Bug Fixes
-
-* Fix postinstall crash on Windows ([8b13c83](https://github.com/avohq/avo/commit/8b13c83))
-
-
-
-# [1.4.0](https://github.com/avohq/avo/compare/1.4.0-beta.3...1.4.0) (2019-10-29)
-
-
-
-# [1.4.0-beta.3](https://github.com/avohq/avo/compare/1.4.0-beta.2...1.4.0-beta.3) (2019-10-21)
-
-
-### Bug Fixes
-
-* Updated analytics for merge conflict resolver ([07b0958](https://github.com/avohq/avo/commit/07b0958))
-
-
-
-# [1.4.0-beta.2](https://github.com/avohq/avo/compare/1.4.0-beta.1...1.4.0-beta.2) (2019-10-21)
-
-
-### Bug Fixes
-
-* Fix authentication when resolving merge conflicts ([efda141](https://github.com/avohq/avo/commit/efda141))
-
-
-
-# [1.4.0-beta.1](https://github.com/avohq/avo/compare/1.4.0-beta.0...1.4.0-beta.1) (2019-10-21)
-
-
-
-# [1.4.0-beta.0](https://github.com/avohq/avo/compare/1.3.6...1.4.0-beta.0) (2019-10-21)
-
-
-### Features
-
-* Resolve simple merge conflicts in Avo files automatically ([886cc7f](https://github.com/avohq/avo/commit/886cc7f))
-
-
-
-## [1.3.6](https://github.com/avohq/avo/compare/1.3.5...1.3.6) (2019-08-21)
-
-
-### Bug Fixes
-
-* Request and handle gzipped responses ([c108ccf](https://github.com/avohq/avo/commit/c108ccf))
-
-
-
-## [1.3.5](https://github.com/avohq/avo/compare/1.3.4...1.3.5) (2019-07-01)
-
-
-### Bug Fixes
-
-* Suggest a command if provided command is unknown ([24f9345](https://github.com/avohq/avo/commit/24f9345))
-
-
-
-## [1.3.4](https://github.com/avohq/avo/compare/1.3.3...1.3.4) (2019-07-01)
-
-
-### Bug Fixes
-
-* Fixes issue where switching branch doesn't carry which source is being generated ([f851f0e](https://github.com/avohq/avo/commit/f851f0e))
-
-
-
-## [1.3.3](https://github.com/avohq/avo/compare/1.3.2...1.3.3) (2019-04-05)
-
-
-### Bug Fixes
-
-* Prevent crash if analytics endpoint fails ([a38e608](https://github.com/avohq/avo/commit/a38e608))
-
-
-
-## [1.3.2](https://github.com/avohq/avo/compare/1.3.1...1.3.2) (2019-03-10)
-
-
-### Bug Fixes
-
-* Use object.assign instead of spread syntax ([1b50034](https://github.com/avohq/avo/commit/1b50034))
-
-
-
-## [1.3.1](https://github.com/avohq/avo/compare/1.3.0...1.3.1) (2019-02-26)
-
-
-### Bug Fixes
-
-* Fix module map parsing for multi-line comments ([eb9796b](https://github.com/avohq/avo/commit/eb9796b))
-
-
-
-# [1.3.0](https://github.com/avohq/avo/compare/1.2.4...1.3.0) (2019-02-25)
-
-
-### Features
-
-* Read analytics wrapper module name from source file ([3867652](https://github.com/avohq/avo/commit/3867652))
-
-
-
-## [1.2.4](https://github.com/avohq/avo/compare/1.2.3...1.2.4) (2019-02-18)
-
-
-
-## [1.2.3](https://github.com/avohq/avo/compare/1.2.2...1.2.3) (2019-02-18)
-
-
-
-## [1.2.2](https://github.com/avohq/avo/compare/1.2.1...1.2.2) (2019-02-18)
-
-
-
-## [1.2.1](https://github.com/avohq/avo/compare/1.2.0...1.2.1) (2019-02-17)
-
-
-### Bug Fixes
-
-* Non-destructive changes to sources json when pulling ([171851e](https://github.com/avohq/avo/commit/171851e))
-
-
-
-# [1.2.0](https://github.com/avohq/avo/compare/1.1.2...1.2.0) (2019-02-17)
-
-
-### Features
-
-* avo status with simple linting ([#2](https://github.com/avohq/avo/issues/2)) ([51adb92](https://github.com/avohq/avo/commit/51adb92))
-
-
-
-## [1.1.2](https://github.com/avohq/avo/compare/1.1.1...1.1.2) (2019-02-16)
-
-
-### Bug Fixes
-
-* avo pull source does not pull all sources if it is missing ([80c1048](https://github.com/avohq/avo/commit/80c1048))
-
-
-
-## [1.1.1](https://github.com/avohq/avo/compare/1.1.0...1.1.1) (2019-02-12)
-
-
-
-# [1.1.0](https://github.com/avohq/avo/compare/1.0.1...1.1.0) (2019-02-12)
-
-
-### Features
-
-* Add avo status command ([9d32c1f](https://github.com/avohq/avo/commit/9d32c1f))
-
-
-
-## [1.0.1](https://github.com/avohq/avo/compare/1.0.0...1.0.1) (2019-01-18)
-
-
-
-# 1.0.0 (2019-01-18)