@hubspot/cli 7.4.7-experimental.0 → 7.4.7

package/commands/mv.js

@@ -12,7 +12,6 @@ const usageTracking_1 = require("../lib/usageTracking");
 const filesystem_1 = require("../lib/filesystem");
 const lang_1 = require("../lib/lang");
 const ui_1 = require("../lib/ui");
-const i18nKey = 'commands.mv';
 function getCorrectedDestPath(srcPath, destPath) {
     if (!(0, filesystem_1.isPathFolder)(srcPath)) {
         return destPath;
@@ -21,26 +20,26 @@ function getCorrectedDestPath(srcPath, destPath) {
     return `${destPath}/${srcPath.split('/').pop()}`;
 }
 exports.command = 'mv <srcPath> <destPath>';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.mv.describe`), false);
 async function handler(args) {
     const { srcPath, destPath, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('mv', undefined, derivedAccountId);
     try {
         await (0, fileMapper_1.moveFile)(derivedAccountId, srcPath, getCorrectedDestPath(srcPath, destPath));
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.move`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.mv.move`, {
             accountId: derivedAccountId,
             destPath,
             srcPath,
         }));
     }
     catch (error) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.moveFailed`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.mv.errors.moveFailed`, {
             accountId: derivedAccountId,
             destPath,
             srcPath,
         }));
         if ((0, index_1.isSpecifiedError)(error, { statusCode: 409 })) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.sourcePathExists`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.mv.errors.sourcePathExists`, {
                 destPath,
                 srcPath,
             }));

package/commands/open.js

@@ -9,7 +9,6 @@ const links_1 = require("../lib/links");
 const promptUtils_1 = require("../lib/prompts/promptUtils");
 const lang_1 = require("../lib/lang");
 const exitCodes_1 = require("../lib/enums/exitCodes");
-const i18nKey = 'commands.open';
 const separator = ' => ';
 async function createListPrompt(accountId) {
     return (0, promptUtils_1.promptUser)([
@@ -17,14 +16,14 @@ async function createListPrompt(accountId) {
             type: 'rawlist',
             name: 'open',
             pageSize: 20,
-            message: (0, lang_1.i18n)(`${i18nKey}.selectLink`),
+            message: (0, lang_1.i18n)('commands.open.selectLink'),
             choices: (0, links_1.getSiteLinksAsArray)(accountId).map(l => `${l.shortcut}${separator}${l.url}`),
             filter: val => val.split(separator)[0],
         },
     ]);
 }
 exports.command = 'open [shortcut]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.open.describe');
 async function handler(args) {
     const { shortcut, list, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('open', undefined, derivedAccountId);
@@ -46,12 +45,12 @@ function builder(yargs) {
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs.positional('[shortcut]', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.shortcut.describe`),
+        describe: (0, lang_1.i18n)('commands.open.positionals.shortcut.describe'),
         type: 'string',
     });
     yargs.option('list', {
         alias: 'l',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.list.describe`),
+        describe: (0, lang_1.i18n)('commands.open.options.list.describe'),
         type: 'boolean',
     });
     yargs.example([

package/commands/project/add.d.ts

@@ -1,11 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs } from '../../types/Yargs';
-export declare const command = "add";
-export declare const describe: string;
+import { YargsCommandModule, CommonArgs } from '../../types/Yargs';
 type ProjectAddArgs = CommonArgs & {
     type: string;
     name: string;
 };
-export declare function handler(args: ArgumentsCamelCase<ProjectAddArgs>): Promise<void>;
-export declare const builder: (yargs: Argv) => Promise<Argv<ProjectAddArgs>>;
-export {};
+declare const projectAddCommand: YargsCommandModule<unknown, ProjectAddArgs>;
+export default projectAddCommand;

package/commands/project/add.js

@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.describe = exports.command = void 0;
-exports.handler = handler;
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const github_1 = require("@hubspot/local-dev-lib/github");
@@ -12,7 +10,7 @@ const errorHandlers_1 = require("../../lib/errorHandlers");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const projectAddPrompt_1 = require("../../lib/prompts/projectAddPrompt");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const create_1 = require("../../lib/projects/create");
 const structure_1 = require("../../lib/projects/structure");
 const Projects_1 = require("../../types/Projects");
@@ -20,15 +18,14 @@ const ui_1 = require("../../lib/ui");
 const constants_1 = require("../../lib/constants");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const i18nKey = 'commands.project.subcommands.add';
-exports.command = 'add';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+const command = 'add';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.add.describe`), false);
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('project-add', undefined, derivedAccountId);
-    const { projectConfig, projectDir } = await (0, projects_1.getProjectConfig)();
+    const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
     if (!projectDir || !projectConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.locationInProject`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.locationInProject`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     // We currently only support adding private apps to projects
@@ -41,11 +38,11 @@ async function handler(args) {
         (0, errorHandlers_1.debugError)(err);
     }
     if (projectContainsPublicApp) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.projectContainsPublicApp`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.projectContainsPublicApp`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     logger_1.logger.log('');
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.creatingComponent`, {
+    logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.add.creatingComponent`, {
         projectName: projectConfig.name,
     }));
     logger_1.logger.log('');
@@ -61,12 +58,12 @@ async function handler(args) {
         (0, errorHandlers_1.debugError)(err);
     }
     if (!latestRepoReleaseTag) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.failedToFetchComponentList`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.failedToFetchComponentList`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const components = await (0, create_1.getProjectComponentListFromRepo)(latestRepoReleaseTag);
     if (!components.length) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.failedToFetchComponentList`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.failedToFetchComponentList`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const projectAddPromptResponse = await (0, projectAddPrompt_1.projectAddPrompt)(components, args);
@@ -78,13 +75,13 @@ async function handler(args) {
             hideLogs: true,
         });
         logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.project.subcommands.add.success`, {
             componentName: projectAddPromptResponse.name,
         }));
     }
     catch (error) {
         (0, errorHandlers_1.debugError)(error);
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.failedToDownloadComponent`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.failedToDownloadComponent`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
@@ -92,27 +89,35 @@ async function handler(args) {
 function projectAddBuilder(yargs) {
     yargs.options({
         type: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.type.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.add.options.type.describe`),
             type: 'string',
         },
         name: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.name.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.add.options.name.describe`),
             type: 'string',
         },
     });
-    yargs.example([['$0 project add', (0, lang_1.i18n)(`${i18nKey}.examples.default`)]]);
+    yargs.example([
+        [
+            '$0 project add',
+            (0, lang_1.i18n)(`commands.project.subcommands.add.examples.default`),
+        ],
+    ]);
     yargs.example([
         [
             '$0 project add --name="my-component" --type="components/example-app"',
-            (0, lang_1.i18n)(`${i18nKey}.examples.withFlags`),
+            (0, lang_1.i18n)(`commands.project.subcommands.add.examples.withFlags`),
         ],
     ]);
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(projectAddBuilder, exports.command, exports.describe);
-module.exports = {
-    command: exports.command,
-    describe: exports.describe,
-    builder: exports.builder,
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectAddBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const projectAddCommand = {
+    command,
+    describe,
     handler,
+    builder,
 };
+exports.default = projectAddCommand;

package/commands/project/cloneApp.d.ts

@@ -1,9 +1,7 @@
-import { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
-import { CloneAppArgs } from '../../types/Yargs';
-export declare const command = "clone-app";
-export declare const describe: string | undefined;
-export declare const deprecated = true;
-export declare const handler: (options: ArgumentsCamelCase<CloneAppArgs>) => Promise<never>;
-export declare const builder: (yargs: Argv) => Argv<CloneAppArgs>;
-declare const cloneAppCommand: CommandModule<unknown, CloneAppArgs>;
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+export type CloneAppArgs = ConfigArgs & EnvironmentArgs & AccountArgs & CommonArgs & {
+    dest: string;
+    appId: number;
+};
+declare const cloneAppCommand: YargsCommandModule<unknown, CloneAppArgs>;
 export default cloneAppCommand;

package/commands/project/cloneApp.js

@@ -3,50 +3,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.handler = exports.deprecated = exports.describe = exports.command = void 0;
-const ui_1 = require("../../lib/ui");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const selectPublicAppPrompt_1 = require("../../lib/prompts/selectPublicAppPrompt");
 const createProjectPrompt_1 = require("../../lib/prompts/createProjectPrompt");
 const polling_1 = require("../../lib/polling");
-const ui_2 = require("../../lib/ui");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const accountTypes_1 = require("../../lib/accountTypes");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const constants_1 = require("../../lib/constants");
-const projects_2 = require("@hubspot/local-dev-lib/api/projects");
+const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const path_2 = require("@hubspot/local-dev-lib/path");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const archive_1 = require("@hubspot/local-dev-lib/archive");
-const config_1 = require("@hubspot/local-dev-lib/config");
+const config_2 = require("@hubspot/local-dev-lib/config");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const migrate_1 = require("../../lib/app/migrate");
-const i18nKey = 'commands.project.subcommands.cloneApp';
-exports.command = 'clone-app';
-exports.describe = (0, ui_1.uiDeprecatedTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
-exports.deprecated = true;
-const handler = async (options) => {
-    const { derivedAccountId } = options;
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const ui_1 = require("../../lib/ui");
+const command = 'clone-app';
+const describe = (0, ui_1.uiDeprecatedTag)((0, lang_1.i18n)(`commands.project.subcommands.cloneApp.describe`), false);
+const deprecated = true;
+async function handler(args) {
+    const { derivedAccountId } = args;
     await (0, usageTracking_1.trackCommandUsage)('clone-app', {}, derivedAccountId);
-    const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
-    const accountName = (0, ui_2.uiAccountDescription)(derivedAccountId);
+    const accountConfig = (0, config_2.getAccountConfig)(derivedAccountId);
+    const accountName = (0, ui_1.uiAccountDescription)(derivedAccountId);
     if (!accountConfig) {
         throw new Error((0, lang_1.i18n)(`commands.projects.subcommands.cloneApp.errors.noAccountConfig`));
     }
-    if (!(0, accountTypes_1.isAppDeveloperAccount)(accountConfig)) {
-        (0, migrate_1.logInvalidAccountError)(i18nKey);
+    const defaultAccountIsUnified = await (0, accountTypes_1.isUnifiedAccount)(accountConfig);
+    if (!(0, accountTypes_1.isAppDeveloperAccount)(accountConfig) && !defaultAccountIsUnified) {
+        (0, migrate_1.logInvalidAccountError)();
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     let appId;
     let projectName;
     let projectDest;
     try {
-        appId = options.appId;
+        appId = args.appId;
         if (!appId) {
             const appIdResponse = await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
                 accountId: derivedAccountId,
@@ -55,7 +53,7 @@ const handler = async (options) => {
             });
             appId = appIdResponse.appId;
         }
-        const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(options);
+        const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args);
         projectName = createProjectPromptResponse.name;
         projectDest = createProjectPromptResponse.dest;
     }
@@ -67,17 +65,17 @@ const handler = async (options) => {
     try {
         SpinniesManager_1.default.init();
         SpinniesManager_1.default.add('cloneApp', {
-            text: (0, lang_1.i18n)(`${i18nKey}.cloneStatus.inProgress`),
+            text: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.inProgress`),
         });
-        const { data: { exportId }, } = await (0, projects_2.cloneApp)(derivedAccountId, appId);
-        const { status } = await (0, polling_1.poll)(() => (0, projects_2.checkCloneStatus)(derivedAccountId, exportId));
+        const { data: { exportId }, } = await (0, projects_1.cloneApp)(derivedAccountId, appId);
+        const { status } = await (0, polling_1.poll)(() => (0, projects_1.checkCloneStatus)(derivedAccountId, exportId));
         if (status === 'SUCCESS') {
             // Ensure correct project folder structure exists
             const baseDestPath = path_1.default.resolve((0, path_2.getCwd)(), projectDest);
             const absoluteDestPath = path_1.default.resolve(baseDestPath, 'src', 'app');
             fs_1.default.mkdirSync(absoluteDestPath, { recursive: true });
             // Extract zipped app files and place them in correct directory
-            const { data: zippedApp } = await (0, projects_2.downloadClonedProject)(derivedAccountId, exportId);
+            const { data: zippedApp } = await (0, projects_1.downloadClonedProject)(derivedAccountId, exportId);
             await (0, archive_1.extractZipArchive)(zippedApp, (0, path_2.sanitizeFileName)(projectName), absoluteDestPath, {
                 includesRootDir: true,
                 hideLogs: true,
@@ -89,17 +87,19 @@ const handler = async (options) => {
                 srcDir: 'src',
                 platformVersion: '2023.2',
             };
-            const success = (0, projects_1.writeProjectConfig)(configPath, configContent);
+            const success = (0, config_1.writeProjectConfig)(configPath, configContent);
             SpinniesManager_1.default.succeed('cloneApp', {
-                text: (0, lang_1.i18n)(`${i18nKey}.cloneStatus.done`),
+                text: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.done`),
                 succeedColor: 'white',
             });
             if (!success) {
-                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.couldNotWriteConfigPath`), configPath);
+                logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.cloneApp.errors.couldNotWriteConfigPath`), configPath);
             }
             logger_1.logger.log('');
-            (0, ui_2.uiLine)();
-            logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.cloneStatus.success`, { dest: projectDest }));
+            (0, ui_1.uiLine)();
+            logger_1.logger.success((0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.success`, {
+                dest: projectDest,
+            }));
             logger_1.logger.log('');
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
@@ -107,7 +107,7 @@ const handler = async (options) => {
     catch (error) {
         await (0, usageTracking_1.trackCommandMetadataUsage)('clone-app', { successful: false }, derivedAccountId);
         SpinniesManager_1.default.fail('cloneApp', {
-            text: (0, lang_1.i18n)(`${i18nKey}.cloneStatus.failure`),
+            text: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.failure`),
             failColor: 'white',
         });
         // Migrations endpoints return a response object with an errors property. The errors property contains an array of errors.
@@ -123,33 +123,37 @@ const handler = async (options) => {
     }
     await (0, usageTracking_1.trackCommandMetadataUsage)('clone-app', { successful: true }, derivedAccountId);
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
-};
-exports.handler = handler;
-const builder = (yargs) => {
+}
+function cloneAppBuilder(yargs) {
     yargs.options({
         dest: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.dest.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.options.dest.describe`),
             type: 'string',
         },
         'app-id': {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.appId.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.options.appId.describe`),
             type: 'number',
         },
     });
     yargs.example([
-        ['$0 project clone-app', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
+        [
+            '$0 project clone-app',
+            (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.examples.default`),
+        ],
     ]);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     return yargs;
-};
-exports.builder = builder;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(cloneAppBuilder, command, describe, {
+    useGlobalOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useEnvironmentOptions: true,
+});
 const cloneAppCommand = {
-    command: exports.command,
-    describe: exports.describe,
-    handler: exports.handler,
-    builder: exports.builder,
-    deprecated: exports.deprecated,
+    command,
+    describe,
+    handler,
+    builder,
+    deprecated,
 };
 exports.default = cloneAppCommand;

package/commands/project/create.d.ts

@@ -1 +1,10 @@
-export {};
+import { RepoPath } from '@hubspot/local-dev-lib/types/Github';
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type ProjectCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+    name?: string;
+    dest?: string;
+    templateSource?: RepoPath;
+    template?: string;
+};
+declare const projectCreateCommand: YargsCommandModule<unknown, ProjectCreateArgs>;
+export default projectCreateCommand;