@hubspot/cli 7.5.1-experimental.0 → 7.5.2-beta.0

package/lib/projects/ui.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logFeedbackMessage = logFeedbackMessage;
+const logger_1 = require("../ui/logger");
+const constants_1 = require("../constants");
+const ui_1 = require("../ui");
+const en_1 = require("../../lang/en");
+function logFeedbackMessage(buildId) {
+    if (buildId > 0 && buildId % constants_1.FEEDBACK_INTERVAL === 0) {
+        (0, ui_1.uiLine)();
+        logger_1.uiLogger.log(en_1.lib.projects.logFeedbackMessage.feedbackHeader);
+        (0, ui_1.uiLine)();
+        logger_1.uiLogger.log(en_1.lib.projects.logFeedbackMessage.feedbackMessage);
+    }
+}

package/lib/projects/upload.d.ts

@@ -1,9 +1,21 @@
 import { FileResult } from 'tmp';
 import { ProjectConfig } from '../../types/Projects';
-type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId?: number) => Promise<T>;
+type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number) => Promise<T>;
 type ProjectUploadResult<T> = {
     result?: T;
     uploadError?: unknown;
 };
-export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string, sendIR?: boolean, skipValidation?: boolean): Promise<ProjectUploadResult<T>>;
+type HandleProjectUploadArg<T> = {
+    accountId: number;
+    projectConfig: ProjectConfig;
+    projectDir: string;
+    callbackFunc: ProjectUploadCallbackFunction<T>;
+    uploadMessage?: string;
+    forceCreate?: boolean;
+    isUploadCommand?: boolean;
+    sendIR?: boolean;
+    skipValidation?: boolean;
+    profile?: string;
+};
+export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
 export {};

package/lib/projects/upload.js

@@ -10,23 +10,21 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const ui_1 = require("../ui");
-const lang_1 = require("../lang");
 const exitCodes_1 = require("../enums/exitCodes");
 const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
 const errorHandlers_1 = require("../errorHandlers");
 const node_util_1 = __importDefault(require("node:util"));
-const i18nKey = 'lib.projectUpload';
+const en_1 = require("../../lang/en");
+const ensureProjectExists_1 = require("./ensureProjectExists");
+const logger_1 = require("../ui/logger");
+const buildAndDeploy_1 = require("./buildAndDeploy");
 async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager_1.default.init({});
     const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId);
     SpinniesManager_1.default.add('upload', {
-        text: (0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.add`, {
-            accountIdentifier,
-            projectName,
-        }),
+        text: en_1.lib.projectUpload.uploadProjectFiles.add(projectName, accountIdentifier),
         succeedColor: 'white',
     });
     let buildId;
@@ -35,48 +33,38 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
         const { data: upload } = await (0, projects_1.uploadProject)(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation);
         buildId = upload.buildId;
         SpinniesManager_1.default.succeed('upload', {
-            text: (0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.succeed`, {
-                accountIdentifier,
-                projectName,
-            }),
+            text: en_1.lib.projectUpload.uploadProjectFiles.succeed(projectName, accountIdentifier),
         });
         if (buildId) {
-            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.buildCreated`, {
-                buildId,
-                projectName,
-            }));
+            logger_1.uiLogger.debug(en_1.lib.projectUpload.uploadProjectFiles.buildCreated(projectName, buildId));
         }
     }
     catch (err) {
         SpinniesManager_1.default.fail('upload', {
-            text: (0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.fail`, {
-                accountIdentifier,
-                projectName,
-            }),
+            text: en_1.lib.projectUpload.uploadProjectFiles.fail(projectName, accountIdentifier),
         });
         error = err;
     }
     return { buildId, error };
 }
-async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage, sendIR = false, skipValidation = false) {
+async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, }) {
     const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
     const filenames = fs_extra_1.default.readdirSync(srcDir);
     if (!filenames || filenames.length === 0) {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.emptySource`, {
-            srcDir: projectConfig.srcDir,
-        }));
+        logger_1.uiLogger.log(en_1.lib.projectUpload.handleProjectUpload.emptySource(projectConfig.srcDir));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
+    const hasHsMetaFiles = await (0, project_parsing_lib_1.projectContainsHsMetaFiles)(srcDir);
+    if (!(0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion) && hasHsMetaFiles) {
+        logger_1.uiLogger.error(en_1.lib.projectUpload.wrongPlatformVersionMetaFiles);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const tempFile = tmp_1.default.fileSync({ postfix: '.zip' });
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.compressing`, {
-        path: tempFile.name,
-    }));
+    logger_1.uiLogger.debug(en_1.lib.projectUpload.handleProjectUpload.compressing(tempFile.name));
     const output = fs_extra_1.default.createWriteStream(tempFile.name);
     const archive = (0, archiver_1.default)('zip');
     const result = new Promise(resolve => output.on('close', async function () {
-        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.compressed`, {
-            byteCount: archive.pointer(),
-        }));
+        logger_1.uiLogger.debug(en_1.lib.projectUpload.handleProjectUpload.compressed(archive.pointer()));
         let intermediateRepresentation;
         if (sendIR) {
             try {
@@ -84,12 +72,12 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
                     projectSourceDir: path_1.default.join(projectDir, projectConfig.srcDir),
                     platformVersion: projectConfig.platformVersion,
                     accountId,
-                }, { skipValidation });
-                logger_1.logger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
+                }, { skipValidation, profile });
+                logger_1.uiLogger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
             }
             catch (e) {
                 if ((0, project_parsing_lib_1.isTranslationError)(e)) {
-                    logger_1.logger.error(e.toString());
+                    logger_1.uiLogger.error(e.toString());
                 }
                 else {
                     (0, errorHandlers_1.logError)(e);
@@ -97,6 +85,10 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
                 return process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
         }
+        await (0, ensureProjectExists_1.ensureProjectExists)(accountId, projectConfig.name, {
+            forceCreate,
+            uploadCommand: isUploadCommand,
+        });
         const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion, intermediateRepresentation);
         if (error) {
             resolve({ uploadError: error });
@@ -113,9 +105,7 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
         if (ignored) {
             const isNodeModule = file.name.includes('node_modules');
             if (!isNodeModule || !loggedIgnoredNodeModule) {
-                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.fileFiltered`, {
-                    filename: file.name,
-                }));
+                logger_1.uiLogger.debug(en_1.lib.projectUpload.handleProjectUpload.fileFiltered(file.name));
             }
             if (isNodeModule && !loggedIgnoredNodeModule) {
                 loggedIgnoredNodeModule = true;

package/lib/projects/urls.d.ts

@@ -1,4 +1,5 @@
 export declare function getProjectDetailUrl(projectName: string, accountId: number): string | undefined;
+export declare function getProjectSettingsUrl(projectName: string, accountId: number): string | undefined;
 export declare function getProjectActivityUrl(projectName: string, accountId: number): string;
 export declare function getProjectBuildDetailUrl(projectName: string, buildId: number, accountId: number): string;
 export declare function getProjectDeployDetailUrl(projectName: string, deployId: number, accountId: number): string;

package/lib/projects/urls.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectDetailUrl = getProjectDetailUrl;
+exports.getProjectSettingsUrl = getProjectSettingsUrl;
 exports.getProjectActivityUrl = getProjectActivityUrl;
 exports.getProjectBuildDetailUrl = getProjectBuildDetailUrl;
 exports.getProjectDeployDetailUrl = getProjectDeployDetailUrl;
@@ -16,6 +17,11 @@ function getProjectDetailUrl(projectName, accountId) {
         return;
     return `${getProjectHomeUrl(accountId)}/project/${projectName}`;
 }
+function getProjectSettingsUrl(projectName, accountId) {
+    if (!projectName)
+        return;
+    return `${getProjectDetailUrl(projectName, accountId)}/settings`;
+}
 function getProjectActivityUrl(projectName, accountId) {
     return `${getProjectDetailUrl(projectName, accountId)}/activity`;
 }

package/lib/projects/watch.d.ts

@@ -1,4 +1,4 @@
 import { ProjectConfig } from '../../types/Projects';
-type ProjectWatchHandlerFunction = (accountId: number, projectName: string, currentBuildId: number) => Promise<void>;
+type ProjectWatchHandlerFunction = (accountId: number, projectName: string, currentBuildId: number) => Promise<void> | void;
 export declare function createWatcher(accountId: number, projectConfig: ProjectConfig, projectDir: string, handleBuildStatusFn: ProjectWatchHandlerFunction, handleUserInputFn: ProjectWatchHandlerFunction): Promise<void>;
 export {};

package/lib/projects/watch.js

@@ -8,16 +8,15 @@ const chokidar_1 = __importDefault(require("chokidar"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
 const p_queue_1 = __importDefault(require("p-queue"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const path_2 = require("@hubspot/local-dev-lib/path");
 const extensions_1 = require("@hubspot/local-dev-lib/constants/extensions");
 const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const errorHandlers_1 = require("../errorHandlers");
-const lang_1 = require("../lang");
 const constants_1 = require("../constants");
-const i18nKey = 'commands.project.subcommands.watch';
+const en_1 = require("../../lang/en");
+const logger_1 = require("../ui/logger");
 const queue = new p_queue_1.default({
     concurrency: 10,
 });
@@ -44,18 +43,18 @@ function debounceQueueBuild(accountId, projectName, platformVersion) {
         clearTimeout(timer);
     }
     timer = setTimeout(async () => {
-        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.pause`, { projectName }));
+        logger_1.uiLogger.debug(en_1.commands.project.watch.debug.pause);
         queue.pause();
         await queue.onIdle();
         try {
             await (0, projects_1.queueBuild)(accountId, projectName, platformVersion);
-            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.buildStarted`, { projectName }));
+            logger_1.uiLogger.debug(en_1.commands.project.watch.debug.buildStarted);
         }
         catch (err) {
             if ((0, index_1.isSpecifiedError)(err, {
                 subCategory: constants_1.PROJECT_ERROR_TYPES.MISSING_PROJECT_PROVISION,
             })) {
-                logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.watchCancelledFromUi`));
+                logger_1.uiLogger.log(en_1.commands.project.watch.logs.watchCancelledFromUi);
                 process.exit(0);
             }
             else {
@@ -69,24 +68,24 @@ function debounceQueueBuild(accountId, projectName, platformVersion) {
             await processStandByQueue(accountId, projectName, platformVersion);
         }
         queue.start();
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.resuming`));
-        logger_1.logger.log(`\n> Press ${chalk_1.default.bold('q')} to quit watching\n`);
+        logger_1.uiLogger.log(en_1.commands.project.watch.logs.resuming);
+        logger_1.uiLogger.log(`\n> Press ${chalk_1.default.bold('q')} to quit watching\n`);
     }, 2000);
 }
 async function queueFileOrFolder(accountId, projectName, platformVersion, filePath, remotePath, action) {
     if (action === 'upload' &&
         !(0, path_2.isAllowedExtension)(filePath, Array.from(extensions_1.JSR_ALLOWED_EXTENSIONS))) {
-        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.extensionNotAllowed`, { filePath }));
+        logger_1.uiLogger.debug(en_1.commands.project.watch.debug.extensionNotAllowed(filePath));
         return;
     }
     if ((0, ignoreRules_1.shouldIgnoreFile)(filePath, true)) {
-        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.ignored`, { filePath }));
+        logger_1.uiLogger.debug(en_1.commands.project.watch.debug.ignored(filePath));
         return;
     }
     if (!queue.isPaused) {
         debounceQueueBuild(accountId, projectName, platformVersion);
     }
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.uploading`, { filePath, remotePath }));
+    logger_1.uiLogger.debug(en_1.commands.project.watch.debug.uploading(filePath, remotePath));
     return queue.add(async () => {
         try {
             if (action === 'upload') {
@@ -95,16 +94,20 @@ async function queueFileOrFolder(accountId, projectName, platformVersion, filePa
             else if (action === 'deleteFile' || action === 'deleteFolder') {
                 await (0, projects_1.deleteFileFromBuild)(accountId, projectName, remotePath);
             }
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.${action}Succeeded`, { filePath, remotePath }));
+            logger_1.uiLogger.log(
+            // @ts-expect-error
+            en_1.commands.project.watch.logs[`${action}Succeeded`](remotePath, filePath));
         }
         catch (err) {
-            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.errors.${action}Failed`, { filePath, remotePath }));
+            logger_1.uiLogger.debug(
+            // @ts-expect-error
+            en_1.commands.project.watch.errors[`${action}Failed`](remotePath, filePath));
         }
     });
 }
 async function createNewBuild(accountId, projectName, platformVersion) {
     try {
-        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.attemptNewBuild`));
+        logger_1.uiLogger.debug(en_1.commands.project.watch.debug.attemptNewBuild);
         const { data: { buildId }, } = await (0, projects_1.provisionBuild)(accountId, projectName, platformVersion);
         return buildId;
     }
@@ -112,7 +115,7 @@ async function createNewBuild(accountId, projectName, platformVersion) {
         (0, errorHandlers_1.logError)(err, new errorHandlers_1.ApiErrorContext({ accountId }));
         if ((0, index_1.isSpecifiedError)(err, { subCategory: constants_1.PROJECT_ERROR_TYPES.PROJECT_LOCKED })) {
             await (0, projects_1.cancelStagedBuild)(accountId, projectName);
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.previousStagingBuildCancelled`));
+            logger_1.uiLogger.log(en_1.commands.project.watch.logs.previousStagingBuildCancelled);
         }
         process.exit(1);
     }
@@ -121,7 +124,7 @@ async function handleWatchEvent(accountId, projectName, platformVersion, project
     const remotePath = path_1.default.relative(projectSourceDir, filePath);
     if (queue.isPaused) {
         if (standbyQueue.find(file => file.filePath === filePath)) {
-            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.fileAlreadyQueued`, { filePath }));
+            logger_1.uiLogger.debug(en_1.commands.project.watch.debug.fileAlreadyQueued(filePath));
         }
         else {
             standbyQueue.push({
@@ -145,8 +148,8 @@ async function createWatcher(accountId, projectConfig, projectDir, handleBuildSt
         ignored: file => (0, ignoreRules_1.shouldIgnoreFile)(file),
     });
     watcher.on('ready', async () => {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.watching`, { projectDir }));
-        logger_1.logger.log(`\n> Press ${chalk_1.default.bold('q')} to quit watching\n`);
+        logger_1.uiLogger.log(en_1.commands.project.watch.logs.watching(projectDir));
+        logger_1.uiLogger.log(`\n> Press ${chalk_1.default.bold('q')} to quit watching\n`);
     });
     watcher.on('add', async (path) => {
         handleWatchEvent(accountId, projectConfig.name, projectConfig.platformVersion, projectSourceDir, path);

package/lib/prompts/accountNamePrompt.js

@@ -7,24 +7,25 @@ const config_1 = require("@hubspot/local-dev-lib/config");
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
 const config_2 = require("@hubspot/local-dev-lib/constants/config");
-const i18nKey = 'lib.prompts.accountNamePrompt';
 function getCliAccountNamePromptConfig(defaultName) {
     return {
         name: 'name',
-        message: (0, lang_1.i18n)(`${i18nKey}.enterAccountName`),
+        message: (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.enterAccountName`),
         default: defaultName,
         validate(val) {
             if (typeof val !== 'string') {
-                return (0, lang_1.i18n)(`${i18nKey}.errors.invalidName`);
+                return (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.invalidName`);
             }
             else if (!val.length) {
-                return (0, lang_1.i18n)(`${i18nKey}.errors.nameRequired`);
+                return (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.nameRequired`);
             }
             else if (val.indexOf(' ') >= 0) {
-                return (0, lang_1.i18n)(`${i18nKey}.errors.spacesInName`);
+                return (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.spacesInName`);
             }
             return (0, config_1.accountNameExistsInConfig)(val)
-                ? (0, lang_1.i18n)(`${i18nKey}.errors.accountNameExists`, { name: val })
+                ? (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
+                    name: val,
+                })
                 : true;
         },
     };
@@ -41,12 +42,12 @@ function hubspotAccountNamePrompt({ accountType, currentPortalCount = 0, }) {
     let defaultName;
     if (isSandbox) {
         promptMessageString = isDevelopmentSandbox
-            ? (0, lang_1.i18n)(`${i18nKey}.enterDevelopmentSandboxName`)
-            : (0, lang_1.i18n)(`${i18nKey}.enterStandardSandboxName`);
+            ? (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.enterDevelopmentSandboxName`)
+            : (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.enterStandardSandboxName`);
     }
     else if (isDeveloperTestAccount) {
-        promptMessageString = (0, lang_1.i18n)(`${i18nKey}.enterDeveloperTestAccountName`);
-        defaultName = (0, lang_1.i18n)(`${i18nKey}.developerTestAccountDefaultName`, {
+        promptMessageString = (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.enterDeveloperTestAccountName`);
+        defaultName = (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.developerTestAccountDefaultName`, {
             count: currentPortalCount + 1,
         });
     }
@@ -56,13 +57,15 @@ function hubspotAccountNamePrompt({ accountType, currentPortalCount = 0, }) {
             message: promptMessageString,
             validate(val) {
                 if (typeof val !== 'string') {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.invalidName`);
+                    return (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.invalidName`);
                 }
                 else if (!val.trim().length) {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.nameRequired`);
+                    return (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.nameRequired`);
                 }
                 return (0, config_1.accountNameExistsInConfig)(val)
-                    ? (0, lang_1.i18n)(`${i18nKey}.errors.accountNameExists`, { name: val })
+                    ? (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
+                        name: val,
+                    })
                     : true;
             },
             default: defaultName,

package/lib/prompts/accountsPrompt.js

@@ -12,7 +12,6 @@ function mapAccountChoices(portals) {
         value: String(p.name || (0, getAccountIdentifier_1.getAccountIdentifier)(p)),
     })) || []);
 }
-const i18nKey = 'commands.account.subcommands.use';
 async function selectAccountFromConfig(prompt = '') {
     const accountsList = (0, config_1.getConfigAccounts)();
     const defaultAccount = (0, config_1.getConfigDefaultAccount)();
@@ -21,7 +20,7 @@ async function selectAccountFromConfig(prompt = '') {
             type: 'list',
             name: 'default',
             pageSize: 20,
-            message: prompt || (0, lang_1.i18n)(`${i18nKey}.promptMessage`),
+            message: prompt || (0, lang_1.i18n)(`commands.account.subcommands.use.promptMessage`),
             choices: mapAccountChoices(accountsList),
             default: defaultAccount ?? undefined,
         },

package/lib/prompts/cmsFieldPrompt.js

@@ -9,7 +9,6 @@ const fs_1 = __importDefault(require("fs"));
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
 const escapeRegExp_1 = require("@hubspot/local-dev-lib/escapeRegExp");
-const i18nKey = 'lib.prompts.uploadPrompt';
 const FIELDS_FILES = ['fields.json', 'fields.js', 'fields.cjs', 'fields.mjs'];
 async function fieldsJsPrompt(filePath, projectDir, skipFiles = []) {
     const dirName = path_1.default.dirname(filePath);
@@ -33,7 +32,7 @@ async function fieldsJsPrompt(filePath, projectDir, skipFiles = []) {
     }));
     const promptVal = await (0, promptUtils_1.promptUser)([
         {
-            message: (0, lang_1.i18n)(`${i18nKey}.fieldsPrompt`, { dir: fileDir }),
+            message: (0, lang_1.i18n)(`lib.prompts.uploadPrompt.fieldsPrompt`, { dir: fileDir }),
             type: 'list',
             name: 'filePathChoice',
             choices: selection,

package/lib/prompts/createApiSamplePrompt.d.ts

@@ -1,12 +1,4 @@
-type SampleChoice = {
-    name: string;
-    description: string;
-    id: string;
-    languages: string[];
-};
-type SampleConfig = {
-    samples: SampleChoice[];
-};
+import { ApiSampleConfig } from '../../types/Cms';
 type SampleTypePromptResponse = {
     sampleType?: string;
 };
@@ -14,5 +6,5 @@ type LanguagePromptResponse = {
     sampleLanguage?: string;
 };
 type CreateApiSamplePromptResponse = SampleTypePromptResponse & LanguagePromptResponse;
-export declare function createApiSamplePrompt(samplesConfig: SampleConfig): Promise<CreateApiSamplePromptResponse>;
+export declare function createApiSamplePrompt(samplesConfig: ApiSampleConfig): Promise<CreateApiSamplePromptResponse>;
 export {};

package/lib/prompts/createApiSamplePrompt.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createApiSamplePrompt = createApiSamplePrompt;
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
-const i18nKey = 'lib.prompts.createApiSamplePrompt';
 function getSampleTypesPrompt(choices) {
     return {
         type: 'rawlist',
         name: 'sampleType',
-        message: (0, lang_1.i18n)(`${i18nKey}.selectApiSampleApp`),
+        message: (0, lang_1.i18n)(`lib.prompts.createApiSamplePrompt.selectApiSampleApp`),
         choices: choices.map(choice => ({
             name: `${choice.name} - ${choice.description}`,
             value: choice.id,
@@ -19,7 +18,7 @@ function getSampleTypesPrompt(choices) {
                     resolve(true);
                 }
                 else {
-                    reject((0, lang_1.i18n)(`${i18nKey}.errors.apiSampleAppRequired`));
+                    reject((0, lang_1.i18n)(`lib.prompts.createApiSamplePrompt.errors.apiSampleAppRequired`));
                 }
             });
         },
@@ -29,7 +28,7 @@ function getLanguagesPrompt(choices) {
     return {
         type: 'rawlist',
         name: 'sampleLanguage',
-        message: (0, lang_1.i18n)(`${i18nKey}.selectLanguage`),
+        message: (0, lang_1.i18n)(`lib.prompts.createApiSamplePrompt.selectLanguage`),
         choices: choices.map(choice => ({
             name: choice,
             value: choice,
@@ -39,7 +38,7 @@ function getLanguagesPrompt(choices) {
                 if (input && input.length > 0) {
                     resolve(true);
                 }
-                reject((0, lang_1.i18n)(`${i18nKey}.errors.languageRequired`));
+                reject((0, lang_1.i18n)(`lib.prompts.createApiSamplePrompt.errors.languageRequired`));
             });
         },
     };

package/lib/prompts/createFunctionPrompt.js

@@ -3,35 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFunctionPrompt = createFunctionPrompt;
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
-const i18nKey = 'lib.prompts.createFunctionPrompt';
 const FUNCTIONS_FOLDER_PROMPT = {
     name: 'functionsFolder',
-    message: (0, lang_1.i18n)(`${i18nKey}.enterFolder`),
+    message: (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.enterFolder`),
     validate(val) {
         if (typeof val !== 'string') {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.invalid`);
+            return (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.errors.invalid`);
         }
         else if (!val.length) {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.blank`);
+            return (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.errors.blank`);
         }
         else if (val.indexOf(' ') >= 0) {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.space`);
+            return (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.errors.space`);
         }
         return true;
     },
 };
 const FUNCTION_FILENAME_PROMPT = {
     name: 'filename',
-    message: (0, lang_1.i18n)(`${i18nKey}.enterFilename`),
+    message: (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.enterFilename`),
     validate(val) {
         if (typeof val !== 'string') {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.invalid`);
+            return (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.errors.invalid`);
         }
         else if (!val.length) {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.blank`);
+            return (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.errors.blank`);
         }
         else if (val.indexOf(' ') >= 0) {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.space`);
+            return (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.errors.space`);
         }
         return true;
     },
@@ -39,22 +38,22 @@ const FUNCTION_FILENAME_PROMPT = {
 const ENDPOINT_METHOD_PROMPT = {
     type: 'list',
     name: 'endpointMethod',
-    message: (0, lang_1.i18n)(`${i18nKey}.selectEndpointMethod`),
+    message: (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.selectEndpointMethod`),
     default: 'GET',
     choices: ['DELETE', 'GET', 'PATCH', 'POST', 'PUT'],
 };
 const ENDPOINT_PATH_PROMPT = {
     name: 'endpointPath',
-    message: (0, lang_1.i18n)(`${i18nKey}.enterEndpointPath`),
+    message: (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.enterEndpointPath`),
     validate(val) {
         if (typeof val !== 'string') {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.invalid`);
+            return (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.errors.invalid`);
         }
         else if (!val.length) {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.blank`);
+            return (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.errors.blank`);
         }
         else if (val.indexOf(' ') >= 0) {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.space`);
+            return (0, lang_1.i18n)(`lib.prompts.createFunctionPrompt.errors.space`);
         }
         return true;
     },

package/lib/prompts/createModulePrompt.js

@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createModulePrompt = createModulePrompt;
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
-const i18nKey = 'lib.prompts.createModulePrompt';
 const MODULE_LABEL_PROMPT = {
     name: 'moduleLabel',
-    message: (0, lang_1.i18n)(`${i18nKey}.enterLabel`),
+    message: (0, lang_1.i18n)(`lib.prompts.createModulePrompt.enterLabel`),
     validate(val) {
         if (typeof val !== 'string') {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.invalidLabel`);
+            return (0, lang_1.i18n)(`lib.prompts.createModulePrompt.errors.invalidLabel`);
         }
         else if (!val.length) {
-            return (0, lang_1.i18n)(`${i18nKey}.errors.labelRequired`);
+            return (0, lang_1.i18n)(`lib.prompts.createModulePrompt.errors.labelRequired`);
         }
         return true;
     },
@@ -20,13 +19,13 @@ const MODULE_LABEL_PROMPT = {
 const REACT_TYPE_PROMPT = {
     type: 'confirm',
     name: 'reactType',
-    message: (0, lang_1.i18n)(`${i18nKey}.selectReactType`),
+    message: (0, lang_1.i18n)(`lib.prompts.createModulePrompt.selectReactType`),
     default: false,
 };
 const CONTENT_TYPES_PROMPT = {
     type: 'checkbox',
     name: 'contentTypes',
-    message: (0, lang_1.i18n)(`${i18nKey}.selectContentType`),
+    message: (0, lang_1.i18n)(`lib.prompts.createModulePrompt.selectContentType`),
     default: ['ANY'],
     choices: [
         { name: 'Any', value: 'ANY' },
@@ -47,20 +46,20 @@ const CONTENT_TYPES_PROMPT = {
             if (input.length > 0) {
                 resolve(true);
             }
-            reject((0, lang_1.i18n)(`${i18nKey}.errors.contentTypeRequired`));
+            reject((0, lang_1.i18n)(`lib.prompts.createModulePrompt.errors.contentTypeRequired`));
         });
     },
 };
 const GLOBAL_PROMPT = {
     type: 'confirm',
     name: 'global',
-    message: (0, lang_1.i18n)(`${i18nKey}.confirmGlobal`),
+    message: (0, lang_1.i18n)(`lib.prompts.createModulePrompt.confirmGlobal`),
     default: false,
 };
 const AVAILABLE_FOR_NEW_CONTENT = {
     type: 'confirm',
     name: 'availableForNewContent',
-    message: (0, lang_1.i18n)(`${i18nKey}.availableForNewContent`),
+    message: (0, lang_1.i18n)(`lib.prompts.createModulePrompt.availableForNewContent`),
     default: true,
 };
 function createModulePrompt() {