@hubspot/cli 7.2.0-beta.0 → 7.2.0

package/lib/ui/supportsColor.js

@@ -7,7 +7,7 @@ exports.supportsColor = void 0;
 const process_1 = __importDefault(require("process"));
 const os_1 = __importDefault(require("os"));
 const tty_1 = __importDefault(require("tty"));
-const hasFlag_1 = require("../hasFlag");
+const yargsUtils_1 = require("../yargsUtils");
 const { env } = process_1.default;
 function translateLevel(level) {
     if (level === 0) {
@@ -33,7 +33,7 @@ function _supportsColor(haveStream, { streamIsTTY } = {}) {
     if (env.TERM === 'dumb') {
         return min;
     }
-    if ((0, hasFlag_1.hasFlag)('noColor')) {
+    if ((0, yargsUtils_1.hasFlag)('noColor')) {
         return 0;
     }
     if (process_1.default.platform === 'win32') {

package/lib/usageTracking.d.ts

@@ -16,6 +16,6 @@ type Meta = {
 export declare function trackCommandUsage(command: string, meta?: Meta, accountId?: number): Promise<void>;
 export declare function trackHelpUsage(command: string): Promise<void>;
 export declare function trackConvertFieldsUsage(command: string): Promise<void>;
-export declare function trackAuthAction(command: string, authType: string, step: string, accountId: number): Promise<void>;
+export declare function trackAuthAction(command: string, authType: string, step: string, accountId?: number): Promise<void>;
 export declare function trackCommandMetadataUsage(command: string, meta?: Meta, accountId?: number): Promise<void>;
 export {};

package/lib/yargsUtils.d.ts

@@ -0,0 +1,9 @@
+import { Argv } from 'yargs';
+export declare function hasFlag(flag: string, argv?: string[]): boolean;
+export declare function makeYargsBuilder<T>(callback: (yargs: Argv) => Argv<T>, command: string, describe: string, options: {
+    useGlobalOptions?: boolean;
+    useAccountOptions?: boolean;
+    useConfigOptions?: boolean;
+    useUseEnvironmentOptions?: boolean;
+    useTestingOptions?: boolean;
+}): (yargs: Argv) => Promise<Argv<T>>;

package/lib/yargsUtils.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasFlag = hasFlag;
+exports.makeYargsBuilder = makeYargsBuilder;
+const process_1 = __importDefault(require("process"));
+const commonOpts_1 = require("./commonOpts");
+// See https://github.com/sindresorhus/has-flag/blob/main/index.js (License: https://github.com/sindresorhus/has-flag/blob/main/license)
+function hasFlag(flag, argv = process_1.default.argv) {
+    const prefix = flag.startsWith('-') ? '' : flag.length === 1 ? '-' : '--';
+    const position = argv.indexOf(prefix + flag);
+    const terminatorPosition = argv.indexOf('--');
+    return (position !== -1 &&
+        (terminatorPosition === -1 || position < terminatorPosition));
+}
+function makeYargsBuilder(callback, command, describe, options) {
+    return async function (yargs) {
+        if (options.useGlobalOptions) {
+            (0, commonOpts_1.addGlobalOptions)(yargs);
+        }
+        if (options.useAccountOptions) {
+            (0, commonOpts_1.addAccountOptions)(yargs);
+        }
+        if (options.useConfigOptions) {
+            (0, commonOpts_1.addConfigOptions)(yargs);
+        }
+        if (options.useUseEnvironmentOptions) {
+            (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+        }
+        if (options.useTestingOptions) {
+            (0, commonOpts_1.addTestingOptions)(yargs);
+        }
+        const result = callback(yargs);
+        // Must go last to pick up available options
+        await (0, commonOpts_1.addCustomHelpOutput)(result, command, describe);
+        return result;
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.2.0-beta.0",
+    "version": "7.2.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",

package/lib/hasFlag.d.ts

@@ -1 +0,0 @@
-export declare function hasFlag(flag: string, argv?: string[]): boolean;

package/lib/hasFlag.js

@@ -1,15 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasFlag = hasFlag;
-const process_1 = __importDefault(require("process"));
-// See https://github.com/sindresorhus/has-flag/blob/main/index.js (License: https://github.com/sindresorhus/has-flag/blob/main/license)
-function hasFlag(flag, argv = process_1.default.argv) {
-    const prefix = flag.startsWith('-') ? '' : flag.length === 1 ? '-' : '--';
-    const position = argv.indexOf(prefix + flag);
-    const terminatorPosition = argv.indexOf('--');
-    return (position !== -1 &&
-        (terminatorPosition === -1 || position < terminatorPosition));
-}