@hubspot/cli 7.0.0-experimental.2 → 7.0.1-experimental.0

package/bin/cli.js

@@ -85,7 +85,7 @@ const handleFailure = (msg, err, yargs) => {
         logError(err);
     }
     if (msg === null) {
-        yargs.showHelp();
+        yargs.showHelp('log');
         process.exit(EXIT_CODES.SUCCESS);
     }
     else {
@@ -142,6 +142,10 @@ const SKIP_CONFIG_VALIDATION = {
     auth: { target: true },
 };
 const loadConfigMiddleware = async (options) => {
+    // Skip this when no command is provided
+    if (!options._.length) {
+        return;
+    }
     const maybeValidateConfig = () => {
         if (!isTargetedCommand(options, SKIP_CONFIG_VALIDATION) &&
             !validateConfig()) {
@@ -160,7 +164,11 @@ const loadConfigMiddleware = async (options) => {
     }
     maybeValidateConfig();
 };
-const checkAndWarnGitInclusionMiddleware = () => {
+const checkAndWarnGitInclusionMiddleware = options => {
+    // Skip this when no command is provided
+    if (!options._.length) {
+        return;
+    }
     checkAndWarnGitInclusion(getConfigPath());
 };
 const accountsSubCommands = {
@@ -187,6 +195,10 @@ const SKIP_ACCOUNT_VALIDATION = {
     sandboxes: sandboxesSubCommands,
 };
 const validateAccountOptions = async (options) => {
+    // Skip this when no command is provided
+    if (!options._.length) {
+        return;
+    }
     let validAccount = true;
     if (!isTargetedCommand(options, SKIP_ACCOUNT_VALIDATION)) {
         validAccount = await validateAccount(options);

package/commands/project/upload.js

@@ -22,15 +22,15 @@ exports.handler = async (options) => {
     const { forceCreate, message, derivedAccountId } = options;
     const accountConfig = getAccountConfig(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-upload', { type: accountType }, derivedAccountId);
     const { projectConfig, projectDir } = await getProjectConfig();
+    trackCommandUsage('project-upload', { type: accountType }, derivedAccountId);
     validateProjectConfig(projectConfig, projectDir);
     await ensureProjectExists(derivedAccountId, projectConfig.name, {
         forceCreate,
         uploadCommand: true,
     });
     try {
-        const result = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message);
+        const result = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message, options.translate);
         if (result.uploadError) {
             if (isSpecifiedError(result.uploadError, {
                 subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
@@ -80,6 +80,11 @@ exports.builder = yargs => {
             type: 'string',
             default: '',
         },
+        translate: {
+            hidden: true,
+            type: 'boolean',
+            default: false,
+        },
     });
     yargs.example([['$0 project upload', i18n(`${i18nKey}.examples.default`)]]);
     addConfigOptions(yargs);

package/commands/secret/deleteSecret.js

@@ -43,9 +43,11 @@ exports.handler = async (options) => {
         }));
     }
     catch (err) {
-        logger.error(i18n(`${i18nKey}.errors.delete`, {
-            secretName,
-        }));
+        if (secretName) {
+            logger.error(i18n(`${i18nKey}.errors.delete`, {
+                secretName,
+            }));
+        }
         logError(err, new ApiErrorContext({
             request: 'delete a secret',
             accountId: derivedAccountId,

package/lib/projects/upload.d.ts

@@ -4,5 +4,5 @@ type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: Proje
 type ProjectUploadDefaultResult = {
     uploadError?: unknown;
 };
-export declare function handleProjectUpload<T = ProjectUploadDefaultResult>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string): Promise<unknown>;
+export declare function handleProjectUpload<T = ProjectUploadDefaultResult>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string, sendIR?: boolean): Promise<unknown>;
 export {};

package/lib/projects/upload.js

@@ -15,8 +15,10 @@ 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 i18nKey = 'lib.projectUpload';
-async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion) {
+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', {
@@ -29,7 +31,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     let buildId;
     let error;
     try {
-        const { data: upload } = await (0, projects_1.uploadProject)(accountId, projectName, filePath, uploadMessage, platformVersion);
+        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`, {
@@ -55,7 +57,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     }
     return { buildId, error };
 }
-async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage) {
+async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage, sendIR = false) {
     const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
     const filenames = fs_extra_1.default.readdirSync(srcDir);
     if (!filenames || filenames.length === 0) {
@@ -75,7 +77,26 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.compressed`, {
             byteCount: archive.pointer(),
         }));
-        const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion);
+        let intermediateRepresentation;
+        if (sendIR) {
+            try {
+                intermediateRepresentation = await (0, project_parsing_lib_1.translate)({
+                    projectSourceDir: path_1.default.join(projectDir, projectConfig.srcDir),
+                    platformVersion: projectConfig.platformVersion,
+                    accountId,
+                });
+            }
+            catch (e) {
+                if ((0, project_parsing_lib_1.isTranslationError)(e)) {
+                    logger_1.logger.error(e.toString());
+                }
+                else {
+                    (0, errorHandlers_1.logError)(e);
+                }
+                return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            }
+        }
+        const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion, intermediateRepresentation);
         if (error) {
             console.log(error);
             uploadResult = { uploadError: error };

package/package.json

@@ -1,11 +1,12 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.0.0-experimental.2",
+    "version": "7.0.1-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
         "@hubspot/local-dev-lib": "3.1.0",
+        "@hubspot/project-parsing-lib": "0.0.1",
         "@hubspot/serverless-dev-runtime": "7.0.0",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.8.33",