@hubspot/cli 7.5.11-experimental.0 → 7.7.0-experimental.0

package/commands/create/website-theme.js

@@ -1,20 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { cloneGithubRepo } = require('@hubspot/local-dev-lib/github');
-const { getIsInProject } = require('../../lib/projects/config');
+const github_1 = require("@hubspot/local-dev-lib/github");
+const config_1 = require("../../lib/projects/config");
 const PROJECT_BOILERPLATE_BRANCH = 'cms-boilerplate-developer-projects';
-module.exports = {
+const websiteThemeAssetType = {
+    hidden: false,
     dest: ({ name, assetType }) => name || assetType,
-    execute: async ({ dest, assetType, options }) => {
-        const isInProject = await getIsInProject(dest);
+    execute: async ({ dest, assetType, commandArgs }) => {
+        const isInProject = await (0, config_1.getIsInProject)(dest);
         if (isInProject) {
-            options.branch = PROJECT_BOILERPLATE_BRANCH;
+            commandArgs.branch = PROJECT_BOILERPLATE_BRANCH;
         }
-        cloneGithubRepo('HubSpot/cms-theme-boilerplate', dest, {
+        await (0, github_1.cloneGithubRepo)('HubSpot/cms-theme-boilerplate', dest, {
+            ...commandArgs,
             type: assetType,
             sourceDir: 'src',
-            ...options,
         });
     },
 };
+exports.default = websiteThemeAssetType;

package/commands/create.d.ts

@@ -1,24 +1,4 @@
-/**
- * To add a new asset type: See vue-app.js for a simple example
- * 1. Create a new file under the `create` directory with the command name being the name of the file
- * 2. The file _must_ export a `dest` function and an `execute` function.  See below for details
- * Note: No changes should be needed to this file when adding new types, unless you need new functionality
- *
- * @export {(Data) => String} dest - A function returning the destination of the asset we are creating
- * @export {(Data) => Object=} execute - The code called once all other checks pass. This should contain the logic
- *                                       for handling your command.  Optionally return an object containing KV pairs
- *                                       of any context or data you want passed along to usage tracking
- * @export {Boolean=} hidden - If true, the command will not show up in --help
- * @export {(Data) => Boolean=} validate - If provided, return true if it passes validation, false otherwise.
- *                                         If not provided, validation will automatically succeed
- *
- * The Data object contains
- * {
- *   assetType: String - Type of the asset (e.g. api-sample, react-app, template)
- *   name:      String - Filename of the asset
- *   dest:      String - The path specified by the user on where to create the asset
- *   internal:  Boolean - A flag for retrieving the internal spec for the asset type
- *   options:   Object - The options object passed to the command by Yargs
- * }
- */
-export {};
+import { CreateArgs } from '../types/Cms';
+import { YargsCommandModule } from '../types/Yargs';
+declare const createCommand: YargsCommandModule<unknown, CreateArgs>;
+export default createCommand;

package/commands/create.js

@@ -1,97 +1,76 @@
 "use strict";
-// @ts-nocheck
-/**
- * To add a new asset type: See vue-app.js for a simple example
- * 1. Create a new file under the `create` directory with the command name being the name of the file
- * 2. The file _must_ export a `dest` function and an `execute` function.  See below for details
- * Note: No changes should be needed to this file when adding new types, unless you need new functionality
- *
- * @export {(Data) => String} dest - A function returning the destination of the asset we are creating
- * @export {(Data) => Object=} execute - The code called once all other checks pass. This should contain the logic
- *                                       for handling your command.  Optionally return an object containing KV pairs
- *                                       of any context or data you want passed along to usage tracking
- * @export {Boolean=} hidden - If true, the command will not show up in --help
- * @export {(Data) => Boolean=} validate - If provided, return true if it passes validation, false otherwise.
- *                                         If not provided, validation will automatically succeed
- *
- * The Data object contains
- * {
- *   assetType: String - Type of the asset (e.g. api-sample, react-app, template)
- *   name:      String - Filename of the asset
- *   dest:      String - The path specified by the user on where to create the asset
- *   internal:  Boolean - A flag for retrieving the internal spec for the asset type
- *   options:   Object - The options object passed to the command by Yargs
- * }
- */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require('fs-extra');
-const { logError } = require('../lib/errorHandlers/index');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { setLogLevel, addGlobalOptions, addConfigOptions, } = require('../lib/commonOpts');
-const { resolveLocalPath } = require('../lib/filesystem');
-const { trackCommandUsage } = require('../lib/usageTracking');
-const assets = require('./create/index');
-const { i18n } = require('../lib/lang');
-const SUPPORTED_ASSET_TYPES = Object.keys(assets)
-    .filter(t => !assets[t].hidden)
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const index_1 = require("../lib/errorHandlers/index");
+const commonOpts_1 = require("../lib/commonOpts");
+const filesystem_1 = require("../lib/filesystem");
+const usageTracking_1 = require("../lib/usageTracking");
+const index_2 = __importDefault(require("./create/index"));
+const en_1 = require("../lang/en");
+const logger_1 = require("../lib/ui/logger");
+const yargsUtils_1 = require("../lib/yargsUtils");
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const SUPPORTED_ASSET_TYPES = Object.keys(index_2.default)
+    .filter(t => !index_2.default[t].hidden)
     .join(', ');
-exports.command = 'create <type> [name] [dest]';
-exports.describe = i18n(`commands.create.describe`, {
-    supportedAssetTypes: SUPPORTED_ASSET_TYPES,
-});
-exports.handler = async (options) => {
-    let { type: assetType, dest } = options;
-    const { name, internal: getInternalVersion } = options;
-    setLogLevel(options);
-    assetType = typeof assetType === 'string' && assetType.toLowerCase();
+const command = 'create <type> [name] [dest]';
+const describe = en_1.commands.create.describe(SUPPORTED_ASSET_TYPES);
+async function handler(args) {
+    const { name, internal: getInternalVersion, type } = args;
+    let { dest } = args;
+    (0, commonOpts_1.setLogLevel)(args);
+    const assetType = type.toLowerCase();
     if (assetType === 'global-partial') {
-        logger.error(i18n(`commands.create.errors.deprecatedAssetType`, {
-            assetType,
-            newCommand: 'hs create template',
-            type: 'global partial',
-        }));
+        logger_1.uiLogger.error(en_1.commands.create.errors.deprecatedAssetType(assetType, 'hs create template', 'global partial'));
         return;
     }
-    if (!assetType || !assets[assetType]) {
-        logger.error(i18n(`commands.create.errors.unsupportedAssetType`, {
-            assetType,
-            supportedAssetTypes: SUPPORTED_ASSET_TYPES,
-        }));
+    if (!assetType || !index_2.default[assetType]) {
+        logger_1.uiLogger.error(en_1.commands.create.errors.unsupportedAssetType(assetType, SUPPORTED_ASSET_TYPES));
         return;
     }
-    const asset = assets[assetType];
-    const argsToPass = { assetType, name, dest, getInternalVersion, options };
-    dest = argsToPass.dest = resolveLocalPath(asset.dest(argsToPass));
-    const { derivedAccountId } = options;
-    trackCommandUsage('create', { assetType }, derivedAccountId);
+    const asset = index_2.default[assetType];
+    const argsToPass = {
+        commandArgs: args,
+        assetType,
+        name,
+        dest,
+        getInternalVersion: getInternalVersion || false,
+    };
+    dest = argsToPass.dest = (0, filesystem_1.resolveLocalPath)(asset.dest(argsToPass));
+    const { derivedAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('create', { assetType }, derivedAccountId);
     try {
-        await fs.ensureDir(dest);
+        await fs_extra_1.default.ensureDir(dest);
     }
     catch (e) {
-        logger.error(i18n(`commands.create.errors.unusablePath`, {
-            path: dest,
-        }));
-        logError(e, {
-            filepath: dest,
-            operation: 'write',
-        });
+        logger_1.uiLogger.error(en_1.commands.create.errors.unusablePath(dest));
+        (0, index_1.logError)(e);
         return;
     }
     if (asset.validate && !asset.validate(argsToPass))
         return;
-    await asset.execute(argsToPass);
-};
-exports.builder = yargs => {
+    try {
+        await asset.execute(argsToPass);
+    }
+    catch (e) {
+        (0, index_1.logError)(e);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+}
+function createBuilder(yargs) {
     yargs.positional('type', {
-        describe: i18n(`commands.create.positionals.type.describe`),
+        describe: en_1.commands.create.positionals.type.describe,
         type: 'string',
     });
     yargs.positional('name', {
-        describe: i18n(`commands.create.positionals.name.describe`),
+        describe: en_1.commands.create.positionals.name.describe,
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`commands.create.positionals.dest.describe`),
+        describe: en_1.commands.create.positionals.dest.describe,
         type: 'string',
     });
     yargs.option('internal', {
@@ -99,7 +78,18 @@ exports.builder = yargs => {
         type: 'boolean',
         hidden: true,
     });
-    addConfigOptions(yargs);
-    addGlobalOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(createBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const createCommand = {
+    command,
+    describe,
+    builder,
+    handler,
 };
+exports.default = createCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = createCommand;

package/commands/customObject/create.d.ts

@@ -1,12 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "create [name]";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
-type CustomObjectCreateArgs = CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type CustomObjectCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     name?: string;
     path?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<CustomObjectCreateArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<CustomObjectCreateArgs>;
-export {};
+declare const customObjectCreateCommand: YargsCommandModule<unknown, CustomObjectCreateArgs>;
+export default customObjectCreateCommand;

package/commands/customObject/create.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const customObjects_1 = require("@hubspot/local-dev-lib/api/customObjects");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
@@ -13,9 +10,9 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const customObject_1 = require("../../lib/customObject");
-const commonOpts_1 = require("../../lib/commonOpts");
-exports.command = 'create [name]';
-exports.describe = (0, lang_1.i18n)(`commands.customObject.subcommands.create.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'create [name]';
+const describe = (0, lang_1.i18n)(`commands.customObject.subcommands.create.describe`);
 async function handler(args) {
     const { path, name: providedName, derivedAccountId } = args;
     let definitionPath = path;
@@ -44,10 +41,7 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function customObjectCreateBuilder(yargs) {
     yargs
         .positional('name', {
         describe: (0, lang_1.i18n)(`commands.customObject.subcommands.create.positionals.name.describe`),
@@ -59,3 +53,16 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(customObjectCreateBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const customObjectCreateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = customObjectCreateCommand;

package/commands/customObject/schema/create.d.ts

@@ -1,11 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs } from '../../../types/Yargs';
-export declare const command = "create";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & TestingArgs;
-type SchemaCreateArgs = CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../../types/Yargs';
+type SchemaCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & TestingArgs & {
     path: string;
 };
-export declare function handler(args: ArgumentsCamelCase<SchemaCreateArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<SchemaCreateArgs>;
-export {};
+declare const schemaCreateCommand: YargsCommandModule<unknown, SchemaCreateArgs>;
+export default schemaCreateCommand;

package/commands/customObject/schema/create.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
@@ -12,12 +9,12 @@ const urls_1 = require("@hubspot/local-dev-lib/urls");
 const index_1 = require("../../../lib/errorHandlers/index");
 const validation_1 = require("../../../lib/validation");
 const usageTracking_1 = require("../../../lib/usageTracking");
-const commonOpts_1 = require("../../../lib/commonOpts");
 const lang_1 = require("../../../lib/lang");
 const exitCodes_1 = require("../../../lib/enums/exitCodes");
 const customObject_1 = require("../../../lib/customObject");
-exports.command = 'create';
-exports.describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.create.describe`);
+const yargsUtils_1 = require("../../../lib/yargsUtils");
+const command = 'create';
+const describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.create.describe`);
 async function handler(args) {
     const { path, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('custom-object-schema-create', {}, derivedAccountId);
@@ -40,11 +37,7 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
-    (0, commonOpts_1.addTestingOptions)(yargs);
+function schemaCreateBuilder(yargs) {
     yargs.option('path', {
         describe: (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.create.options.definition.describe`),
         type: 'string',
@@ -52,3 +45,17 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(schemaCreateBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+    useTestingOptions: true,
+});
+const schemaCreateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = schemaCreateCommand;

package/commands/customObject/schema/delete.d.ts

@@ -1,12 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../../types/Yargs';
-export declare const command = "delete [name]";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
-type SchemaDeleteArgs = CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../../types/Yargs';
+type SchemaDeleteArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     name?: string;
     force?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<SchemaDeleteArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<SchemaDeleteArgs>;
-export {};
+declare const schemaDeleteCommand: YargsCommandModule<unknown, SchemaDeleteArgs>;
+export default schemaDeleteCommand;

package/commands/customObject/schema/delete.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const customObjects_1 = require("@hubspot/local-dev-lib/api/customObjects");
 const exitCodes_1 = require("../../../lib/enums/exitCodes");
 const promptUtils_1 = require("../../../lib/prompts/promptUtils");
@@ -10,9 +7,9 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const usageTracking_1 = require("../../../lib/usageTracking");
 const lang_1 = require("../../../lib/lang");
 const errorHandlers_1 = require("../../../lib/errorHandlers");
-const commonOpts_1 = require("../../../lib/commonOpts");
-exports.command = 'delete [name]';
-exports.describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.delete.describe`);
+const yargsUtils_1 = require("../../../lib/yargsUtils");
+const command = 'delete [name]';
+const describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.delete.describe`);
 async function handler(args) {
     const { name: providedName, force, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('custom-object-schema-delete', {}, derivedAccountId);
@@ -44,10 +41,7 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function schemaDeleteBuilder(yargs) {
     yargs
         .example([
         [
@@ -65,3 +59,16 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(schemaDeleteBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const schemaDeleteCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = schemaDeleteCommand;

package/commands/customObject/schema/fetch-all.d.ts

@@ -1,11 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs } from '../../../types/Yargs';
-export declare const command = "fetch-all [dest]";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
-type SchemaFetchAllArgs = CombinedArgs & {
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../../types/Yargs';
+type SchemaFetchAllArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     dest?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<SchemaFetchAllArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<SchemaFetchAllArgs>;
-export {};
+declare const schemaFetchAllCommand: YargsCommandModule<unknown, SchemaFetchAllArgs>;
+export default schemaFetchAllCommand;

package/commands/customObject/schema/fetch-all.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const customObjects_1 = require("@hubspot/local-dev-lib/customObjects");
 const promptUtils_1 = require("../../../lib/prompts/promptUtils");
@@ -10,9 +7,9 @@ const usageTracking_1 = require("../../../lib/usageTracking");
 const lang_1 = require("../../../lib/lang");
 const schema_1 = require("../../../lib/schema");
 const errorHandlers_1 = require("../../../lib/errorHandlers");
-const commonOpts_1 = require("../../../lib/commonOpts");
-exports.command = 'fetch-all [dest]';
-exports.describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.fetchAll.describe`);
+const yargsUtils_1 = require("../../../lib/yargsUtils");
+const command = 'fetch-all [dest]';
+const describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.fetchAll.describe`);
 async function handler(args) {
     const { derivedAccountId, dest: providedDest } = args;
     (0, usageTracking_1.trackCommandUsage)('custom-object-schema-fetch-all', {}, derivedAccountId);
@@ -30,10 +27,7 @@ async function handler(args) {
         logger_1.logger.error((0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.fetchAll.errors.fetch`));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function schemaFetchAllBuilder(yargs) {
     yargs
         .example([
         [
@@ -51,3 +45,16 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(schemaFetchAllBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const schemaFetchAllCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = schemaFetchAllCommand;

package/commands/customObject/schema/fetch.d.ts

@@ -1,12 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../../types/Yargs';
-export declare const command = "fetch [name] [dest]";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
-type SchemaFetchArgs = CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../../types/Yargs';
+type SchemaFetchArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     name?: string;
     dest?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<SchemaFetchArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<SchemaFetchArgs>;
-export {};
+declare const schemaFetchCommand: YargsCommandModule<unknown, SchemaFetchArgs>;
+export default schemaFetchCommand;

package/commands/customObject/schema/fetch.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const customObjects_1 = require("@hubspot/local-dev-lib/api/customObjects");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const customObjects_2 = require("@hubspot/local-dev-lib/customObjects");
@@ -10,9 +7,9 @@ const promptUtils_1 = require("../../../lib/prompts/promptUtils");
 const usageTracking_1 = require("../../../lib/usageTracking");
 const lang_1 = require("../../../lib/lang");
 const errorHandlers_1 = require("../../../lib/errorHandlers");
-const commonOpts_1 = require("../../../lib/commonOpts");
-exports.command = 'fetch [name] [dest]';
-exports.describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.fetch.describe`);
+const yargsUtils_1 = require("../../../lib/yargsUtils");
+const command = 'fetch [name] [dest]';
+const describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.fetch.describe`);
 async function handler(args) {
     const { name: providedName, dest: providedDest, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('custom-object-schema-fetch', {}, derivedAccountId);
@@ -39,10 +36,7 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function schemaFetchBuilder(yargs) {
     yargs
         .example([
         [
@@ -64,3 +58,16 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(schemaFetchBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const schemaFetchCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = schemaFetchCommand;

package/commands/customObject/schema/list.d.ts

@@ -1,8 +1,4 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../../types/Yargs';
-export declare const command = "list";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
-export declare function handler(args: ArgumentsCamelCase<CombinedArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<CombinedArgs>;
-export {};
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../../types/Yargs';
+type SchemaListArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
+declare const schemaListCommand: YargsCommandModule<unknown, SchemaListArgs>;
+export default schemaListCommand;

package/commands/customObject/schema/list.js

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
-const commonOpts_1 = require("../../../lib/commonOpts");
 const index_1 = require("../../../lib/errorHandlers/index");
 const usageTracking_1 = require("../../../lib/usageTracking");
 const schema_1 = require("../../../lib/schema");
 const lang_1 = require("../../../lib/lang");
-exports.command = 'list';
-exports.describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.list.describe`);
+const yargsUtils_1 = require("../../../lib/yargsUtils");
+const command = 'list';
+const describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.list.describe`);
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('custom-object-schema-list', {}, derivedAccountId);
@@ -22,9 +19,19 @@ async function handler(args) {
         logger_1.logger.error((0, lang_1.i18n)(`commands.customObject.subcommands.schema.subcommands.list.errors.list`));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function schemaListBuilder(yargs) {
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(schemaListBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const schemaListCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = schemaListCommand;