@alwaysmeticulous/cli 2.19.2 → 2.20.0

package/dist/utils/sentry.utils.d.ts

@@ -1,4 +1,3 @@
 export declare const initSentry: (meticulousVersion: string) => void;
 export declare const setOptions: (options: any) => void;
-export declare const reportHandlerError: (error: any) => Promise<void>;
 export declare const wrapHandler: <T>(handler: (args: T) => Promise<void>) => (args: T) => Promise<void>;

package/dist/utils/sentry.utils.js

@@ -22,10 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapHandler = exports.reportHandlerError = exports.setOptions = exports.initSentry = void 0;
+exports.wrapHandler = exports.setOptions = exports.initSentry = void 0;
+const common_1 = require("@alwaysmeticulous/common");
 const Sentry = __importStar(require("@sentry/node"));
 const tracing_1 = require("@sentry/tracing");
+const loglevel_1 = __importDefault(require("loglevel"));
 const luxon_1 = require("luxon");
 const SENTRY_DSN = "https://10c6a6c9f5434786b37fb81b01323798@o914390.ingest.sentry.io/6435232";
 const SENTRY_FLUSH_TIMEOUT = luxon_1.Duration.fromObject({ seconds: 1 });
@@ -50,11 +55,6 @@ const setOptions = (options) => {
     Sentry.setContext("invoke-options", options);
 };
 exports.setOptions = setOptions;
-const reportHandlerError = async (error) => {
-    Sentry.captureException(error);
-    await Sentry.flush(SENTRY_FLUSH_TIMEOUT.toMillis());
-};
-exports.reportHandlerError = reportHandlerError;
 const wrapHandler = function wrapHandler_(handler) {
     return async (args) => {
         await handler(args)
@@ -63,24 +63,29 @@ const wrapHandler = function wrapHandler_(handler) {
             const transaction = (_a = Sentry.getCurrentHub().getScope()) === null || _a === void 0 ? void 0 : _a.getTransaction();
             if (transaction !== undefined) {
                 transaction.setStatus("ok");
+                transaction.finish();
             }
         })
             .catch(async (error) => {
             var _a;
-            await (0, exports.reportHandlerError)(error);
+            await reportHandlerError(error);
             const transaction = (_a = Sentry.getCurrentHub().getScope()) === null || _a === void 0 ? void 0 : _a.getTransaction();
             if (transaction !== undefined) {
                 transaction.setStatus("unknown_error");
-            }
-            throw error;
-        })
-            .finally(() => {
-            var _a;
-            const transaction = (_a = Sentry.getCurrentHub().getScope()) === null || _a === void 0 ? void 0 : _a.getTransaction();
-            if (transaction !== undefined) {
                 transaction.finish();
             }
+            // Don't display the help text which can obscure the error
+            process.exit(1);
         });
     };
 };
 exports.wrapHandler = wrapHandler;
+const reportHandlerError = async (error) => {
+    const logger = loglevel_1.default.getLogger(common_1.METICULOUS_LOGGER_NAME);
+    logger.info("");
+    logger.error(error instanceof Error ? error.message : error);
+    logger.info("");
+    logger.info("Tip: run `meticulous <command> --help` for help on a particular command, or `meticulous --help` for a list of the available commands.");
+    Sentry.captureException(error);
+    await Sentry.flush(SENTRY_FLUSH_TIMEOUT.toMillis());
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alwaysmeticulous/cli",
-  "version": "2.19.2",
+  "version": "2.20.0",
   "description": "The Meticulous CLI",
   "license": "ISC",
   "main": "dist/index.js",
@@ -21,10 +21,11 @@
     "lint:commit": "eslint --cache $(git diff --relative --name-only --diff-filter=ACMRTUXB master | grep  -E \"(.js$|.ts$|.tsx$)\")",
     "lint:fix": "eslint src --ext=ts,tsx,js --cache --fix",
     "cli": "node dist/main.js",
-    "cli:dev": "ts-node src/main.ts"
+    "cli:dev": "ts-node src/main.ts",
+    "test": "jest"
   },
   "dependencies": {
-    "@alwaysmeticulous/common": "^2.19.1",
+    "@alwaysmeticulous/common": "^2.20.0",
     "@sentry/node": "^7.21.1",
     "@sentry/tracing": "^7.21.1",
     "adm-zip": "^0.5.9",
@@ -38,11 +39,13 @@
     "luxon": "^2.4.0",
     "pixelmatch": "^5.3.0",
     "pngjs": "^6.0.0",
+    "proper-lockfile": "^4.1.2",
     "yargs": "^17.5.1"
   },
   "devDependencies": {
-    "@alwaysmeticulous/api": "^2.19.1",
-    "@types/express": "^4.17.14"
+    "@alwaysmeticulous/api": "^2.20.0",
+    "@types/express": "^4.17.14",
+    "@types/proper-lockfile": "^4.1.2"
   },
   "peerDependencies": {
     "@alwaysmeticulous/record": "^2.3.3",
@@ -77,5 +80,22 @@
   "bugs": {
     "url": "https://github.com/alwaysmeticulous/meticulous-sdk/issues"
   },
-  "gitHead": "e21ef2e0db964bc04d1cad74b6d57421d463d822"
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".*\\.spec\\.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  },
+  "gitHead": "f9494ff5044559a3febbf45fd0f9600a8f4f2e99"
 }