@hubspot/cli 7.0.2-experimental.0 → 7.0.3-experimental.0

package/lib/projects/upload.d.ts

@@ -1,8 +1,9 @@
 import { FileResult } from 'tmp';
 import { ProjectConfig } from '../../types/Projects';
-type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId?: number) => Promise<T | undefined>;
-type ProjectUploadDefaultResult = {
+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 = ProjectUploadDefaultResult>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string, sendIR?: boolean): Promise<unknown>;
+export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string): Promise<ProjectUploadResult<T>>;
 export {};

package/lib/projects/upload.js

@@ -15,11 +15,8 @@ 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';
-async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
+async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion) {
     SpinniesManager_1.default.init({});
     const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId);
     SpinniesManager_1.default.add('upload', {
@@ -32,7 +29,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, intermediateRepresentation);
+        const { data: upload } = await (0, projects_1.uploadProject)(accountId, projectName, filePath, uploadMessage, platformVersion);
         buildId = upload.buildId;
         SpinniesManager_1.default.succeed('upload', {
             text: (0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.succeed`, {
@@ -58,7 +55,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     }
     return { buildId, error };
 }
-async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage, sendIR = false) {
+async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage) {
     const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
     const filenames = fs_extra_1.default.readdirSync(srcDir);
     if (!filenames || filenames.length === 0) {
@@ -74,38 +71,17 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
     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 () {
-        let uploadResult;
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.compressed`, {
             byteCount: archive.pointer(),
         }));
-        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,
-                });
-                logger_1.logger.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());
-                }
-                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);
+        const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion);
         if (error) {
-            uploadResult = { uploadError: error };
+            resolve({ uploadError: error });
         }
         else if (callbackFunc) {
-            uploadResult = await callbackFunc(accountId, projectConfig, tempFile, buildId);
+            const uploadResult = await callbackFunc(accountId, projectConfig, tempFile, buildId);
+            resolve({ result: uploadResult });
         }
-        resolve(uploadResult || {});
     }));
     archive.pipe(output);
     let loggedIgnoredNodeModule = false;

package/lib/prompts/createProjectPrompt.js

@@ -23,7 +23,14 @@ async function createTemplateOptions(templateSource, githubRef) {
     const branch = hasCustomTemplateSource
         ? constants_1.DEFAULT_PROJECT_TEMPLATE_BRANCH
         : githubRef;
-    const config = await (0, github_1.fetchFileFromRepository)(templateSource || constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'config.json', branch);
+    let config;
+    try {
+        config = await (0, github_1.fetchFileFromRepository)(templateSource || constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'config.json', branch);
+    }
+    catch (e) {
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.missingConfigFileTemplateSource`));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     if (!config || !config[constants_1.PROJECT_COMPONENT_TYPES.PROJECTS]) {
         logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noProjectsInConfig`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);

package/lib/prompts/installPublicAppPrompt.d.ts

@@ -1 +1 @@
-export declare function installPublicAppPrompt(env: string, targetAccountId: number, clientId: number, scopes: string[], redirectUrls: string[], isReinstall?: boolean): Promise<void>;
+export declare function installPublicAppPrompt(env: string, targetAccountId: number, clientId: string, scopes: string[], redirectUrls: string[], isReinstall?: boolean): Promise<void>;

package/lib/prompts/personalAccessKeyPrompt.d.ts

@@ -21,7 +21,7 @@ type ScopesPromptResponse = {
  */
 export declare function personalAccessKeyPrompt({ env, account, }: {
     env: string;
-    account?: string;
+    account?: number;
 }): Promise<PersonalAccessKeyPromptResponse>;
 export declare const OAUTH_FLOW: (PromptConfig<{
     name: string;

package/lib/prompts/projectDevTargetAccountPrompt.d.ts

@@ -1,6 +1,6 @@
-import { CLIAccount, AccountType } from '@hubspot/local-dev-lib/types/Accounts';
+import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { DeveloperTestAccount } from '@hubspot/local-dev-lib/types/developerTestAccounts';
 export declare function selectSandboxTargetAccountPrompt(accounts: CLIAccount[], defaultAccountConfig: CLIAccount): Promise<DeveloperTestAccount | CLIAccount>;
 export declare function selectDeveloperTestTargetAccountPrompt(accounts: CLIAccount[], defaultAccountConfig: CLIAccount): Promise<DeveloperTestAccount | CLIAccount>;
-export declare function confirmDefaultAccountPrompt(accountName: string, accountType: AccountType): Promise<boolean>;
+export declare function confirmDefaultAccountPrompt(accountName: string, accountType: string): Promise<boolean>;
 export declare function confirmUseExistingDeveloperTestAccountPrompt(account: DeveloperTestAccount): Promise<boolean>;

package/lib/sandboxes.d.ts

@@ -17,4 +17,4 @@ export declare const SANDBOX_API_TYPE_MAP: {
 export declare function getSandboxTypeAsString(accountType?: AccountType): string;
 export declare function getAvailableSyncTypes(parentAccountConfig: CLIAccount, config: CLIAccount): Promise<Array<SandboxSyncTask>>;
 export declare function validateSandboxUsageLimits(accountConfig: CLIAccount, sandboxType: AccountType, env: Environment): Promise<void>;
-export declare function handleSandboxCreateError(err: unknown, env: Environment, name: string, accountId: number): void;
+export declare function handleSandboxCreateError(err: unknown, env: Environment, name: string, accountId: number): never;

package/lib/serverlessLogs.d.ts

@@ -1 +1,4 @@
-export {};
+import { HubSpotPromise } from '@hubspot/local-dev-lib/types/Http';
+import { FunctionLog, GetFunctionLogsResponse } from '@hubspot/local-dev-lib/types/Functions';
+export declare function tailLogs(accountId: number, name: string, fetchLatest: () => HubSpotPromise<FunctionLog>, tailCall: (after?: string) => HubSpotPromise<GetFunctionLogsResponse>, compact?: boolean): Promise<void>;
+export declare function outputBuildLog(buildLogUrl: string): Promise<string>;

package/lib/serverlessLogs.js

@@ -1,89 +1,97 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const https = require('https');
-const SpinniesManager = require('./ui/SpinniesManager');
-const { handleExit, handleKeypress } = require('./process');
-const chalk = require('chalk');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { outputLogs } = require('./ui/serverlessFunctionLogs');
-const { logError, ApiErrorContext } = require('./errorHandlers/index');
-const { EXIT_CODES } = require('./enums/exitCodes');
-const { isHubSpotHttpError, isMissingScopeError, } = require('@hubspot/local-dev-lib/errors/index');
-const { SCOPE_GROUPS, PERSONAL_ACCESS_KEY_AUTH_METHOD, } = require('@hubspot/local-dev-lib/constants/auth');
-const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const { fetchScopeData } = require('@hubspot/local-dev-lib/api/localDevAuth');
-const { i18n } = require('./lang');
+exports.tailLogs = tailLogs;
+exports.outputBuildLog = outputBuildLog;
+const https_1 = __importDefault(require("https"));
+const chalk_1 = __importDefault(require("chalk"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const localDevAuth_1 = require("@hubspot/local-dev-lib/api/localDevAuth");
+const serverlessFunctionLogs_1 = require("./ui/serverlessFunctionLogs");
+const index_2 = require("./errorHandlers/index");
+const SpinniesManager_1 = __importDefault(require("./ui/SpinniesManager"));
+const process_1 = require("./process");
+const exitCodes_1 = require("./enums/exitCodes");
+const lang_1 = require("./lang");
 const TAIL_DELAY = 5000;
-const base64EncodeString = valueToEncode => {
+function base64EncodeString(valueToEncode) {
     if (typeof valueToEncode !== 'string') {
         return valueToEncode;
     }
     const stringBuffer = Buffer.from(valueToEncode);
     return encodeURIComponent(stringBuffer.toString('base64'));
-};
-const handleUserInput = () => {
+}
+function handleUserInput() {
     const onTerminate = async () => {
-        SpinniesManager.remove('tailLogs');
-        SpinniesManager.remove('stopMessage');
-        process.exit(EXIT_CODES.SUCCESS);
+        SpinniesManager_1.default.remove('tailLogs');
+        SpinniesManager_1.default.remove('stopMessage');
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     };
-    handleExit(onTerminate);
-    handleKeypress(key => {
+    (0, process_1.handleExit)(onTerminate);
+    (0, process_1.handleKeypress)(key => {
         if ((key.ctrl && key.name == 'c') || key.name === 'q') {
             onTerminate();
         }
     });
-};
+}
 async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
-    const accountConfig = getAccountConfig(accountId);
+    const accountConfig = (0, config_1.getAccountConfig)(accountId);
+    if (!accountConfig) {
+        return;
+    }
     // TODO[JOE]: Update this i18n key
     const i18nKey = 'lib.serverless';
     const { authType } = accountConfig;
-    if (authType !== PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+    if (authType !== auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
         return;
     }
     let scopesData;
     try {
-        scopesData = await fetchScopeData(accountId, scopeGroup);
+        const resp = await (0, localDevAuth_1.fetchScopeData)(accountId, scopeGroup);
+        scopesData = resp.data;
     }
     catch (e) {
-        logger.debug(i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
             scopeGroup,
-            error: e,
         }));
+        logger_1.logger.debug(e);
         return;
     }
     const { portalScopesInGroup, userScopesInGroup } = scopesData;
     if (!portalScopesInGroup.length) {
-        logger.error(i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.portalMissingScope`));
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.portalMissingScope`));
         return;
     }
     if (!portalScopesInGroup.every(s => userScopesInGroup.includes(s))) {
-        logger.error(i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.userMissingScope`));
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.userMissingScope`));
     }
     else {
-        logger.error(i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.genericMissingScope`));
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.genericMissingScope`));
     }
 }
-const tailLogs = async ({ accountId, compact, fetchLatest, tailCall, name, }) => {
-    let initialAfter;
+async function tailLogs(accountId, name, fetchLatest, tailCall, compact = false) {
+    let initialAfter = '';
     try {
         const { data: latestLog } = await fetchLatest();
         initialAfter = latestLog && base64EncodeString(latestLog.id);
     }
     catch (e) {
         // A 404 means no latest log exists(never executed)
-        if (isHubSpotHttpError(e) && e.status !== 404) {
-            if (isMissingScopeError(e)) {
-                await verifyAccessKeyAndUserAccess(accountId, SCOPE_GROUPS.CMS_FUNCTIONS);
+        if ((0, index_1.isHubSpotHttpError)(e) && e.status !== 404) {
+            if ((0, index_1.isMissingScopeError)(e)) {
+                await verifyAccessKeyAndUserAccess(accountId, auth_1.SCOPE_GROUPS.CMS_FUNCTIONS);
             }
             else {
-                await logError(e, new ApiErrorContext({ accountId }));
+                await (0, index_2.logError)(e, new index_2.ApiErrorContext({ accountId }));
             }
         }
     }
-    const tail = async (after) => {
+    async function tail(after) {
         let latestLog;
         let nextAfter;
         try {
@@ -92,41 +100,41 @@ const tailLogs = async ({ accountId, compact, fetchLatest, tailCall, name, }) =>
             nextAfter = latestLog.paging.next.after;
         }
         catch (e) {
-            if (isHubSpotHttpError(e) && e.status !== 404) {
-                logError(e, new ApiErrorContext({
+            if ((0, index_1.isHubSpotHttpError)(e) && e.status !== 404) {
+                (0, index_2.logError)(e, new index_2.ApiErrorContext({
                     accountId,
                 }));
             }
-            process.exit(EXIT_CODES.SUCCESS);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
         if (latestLog && latestLog.results.length) {
-            outputLogs(latestLog, {
+            (0, serverlessFunctionLogs_1.outputLogs)(latestLog, {
                 compact,
             });
         }
         setTimeout(async () => {
             await tail(nextAfter);
         }, TAIL_DELAY);
-    };
-    SpinniesManager.init();
-    SpinniesManager.add('tailLogs', {
+    }
+    SpinniesManager_1.default.init();
+    SpinniesManager_1.default.add('tailLogs', {
         text: `Following logs for ${name}`,
     });
-    SpinniesManager.add('stopMessage', {
-        text: `> Press ${chalk.bold('q')} to stop following`,
+    SpinniesManager_1.default.add('stopMessage', {
+        text: `> Press ${chalk_1.default.bold('q')} to stop following`,
         status: 'non-spinnable',
     });
     handleUserInput();
     await tail(initialAfter);
-};
-const outputBuildLog = async (buildLogUrl) => {
+}
+async function outputBuildLog(buildLogUrl) {
     if (!buildLogUrl) {
-        logger.debug('Unable to display build output. No build log URL was provided.');
-        return;
+        logger_1.logger.debug('Unable to display build output. No build log URL was provided.');
+        return '';
     }
     return new Promise(resolve => {
         try {
-            https
+            https_1.default
                 .get(buildLogUrl, response => {
                 if (response.statusCode === 404) {
                     resolve('');
@@ -136,21 +144,17 @@ const outputBuildLog = async (buildLogUrl) => {
                     data += chunk;
                 });
                 response.on('end', () => {
-                    logger.log(data);
+                    logger_1.logger.log(data);
                     resolve(data);
                 });
             })
                 .on('error', () => {
-                logger.error('The build log could not be retrieved.');
+                logger_1.logger.error('The build log could not be retrieved.');
             });
         }
         catch (e) {
-            logger.error('The build log could not be retrieved.');
+            logger_1.logger.error('The build log could not be retrieved.');
             resolve('');
         }
     });
-};
-module.exports = {
-    outputBuildLog,
-    tailLogs,
-};
+}

package/lib/ui/serverlessFunctionLogs.d.ts

@@ -1 +1,9 @@
+import { FunctionLog, GetFunctionLogsResponse } from '@hubspot/local-dev-lib/types/Functions';
+type Options = {
+    compact?: boolean;
+    insertions?: {
+        header?: string;
+    };
+};
+export declare function outputLogs(logsResp: GetFunctionLogsResponse | FunctionLog, options: Options): void;
 export {};

package/lib/ui/serverlessFunctionLogs.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.outputLogs = outputLogs;
 const moment_1 = __importDefault(require("moment"));
 const chalk_1 = __importDefault(require("chalk"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
@@ -90,6 +91,3 @@ function processLogs(logsResp, options) {
 function outputLogs(logsResp, options) {
     logger_1.logger.log(processLogs(logsResp, options));
 }
-module.exports = {
-    outputLogs,
-};

package/lib/validation.d.ts

@@ -3,6 +3,8 @@ import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
 export declare function validateAccount(options: Arguments<{
     account?: string;
     accountId?: string;
+    derivedAccountId?: number;
+    providedAccountId?: string;
 }>): Promise<boolean>;
 export declare function validateCmsPublishMode(options: Arguments<{
     cmsPublishMode?: CmsPublishMode;

package/lib/validation.js

@@ -50,21 +50,18 @@ const path_1 = require("@hubspot/local-dev-lib/path");
 const commonOpts_1 = require("./commonOpts");
 const index_1 = require("./errorHandlers/index");
 async function validateAccount(options) {
-    const accountId = (0, commonOpts_1.getAccountId)(options);
-    const { accountId: accountIdOption, account: accountOption } = options;
+    const { derivedAccountId, providedAccountId } = options;
+    const accountId = (0, config_1.getAccountId)(derivedAccountId);
     if (!accountId) {
-        if (accountOption) {
-            logger_1.logger.error(`The account "${accountOption}" could not be found in the config`);
-        }
-        else if (accountIdOption) {
-            logger_1.logger.error(`The account "${accountIdOption}" could not be found in the config`);
+        if (providedAccountId) {
+            logger_1.logger.error(`The account "${providedAccountId}" could not be found in the config`);
         }
         else {
             logger_1.logger.error('An account needs to be supplied either via "--account" or through setting a "defaultPortal"');
         }
         return false;
     }
-    if (accountOption && (0, config_1.loadConfigFromEnvironment)()) {
+    if (providedAccountId && (0, config_1.loadConfigFromEnvironment)()) {
         throw new Error('Cannot specify an account when environment variables are supplied. Please unset the environment variables or do not use the "--account" flag.');
     }
     const accountConfig = (0, config_1.getAccountConfig)(accountId);

package/package.json

@@ -1,12 +1,11 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.0.2-experimental.0",
+    "version": "7.0.3-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.1",
-        "@hubspot/project-parsing-lib": "^0.0.2-experimental.0",
+        "@hubspot/local-dev-lib": "3.1.3",
         "@hubspot/serverless-dev-runtime": "7.0.1",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.8.40",

package/types/Projects.d.ts

@@ -41,6 +41,12 @@ export type ProjectTemplateRepoConfig = {
     projects?: ProjectTemplate[];
     components?: ComponentTemplate[];
 };
+export type ProjectPollResult = {
+    succeeded: boolean;
+    buildId: number;
+    buildResult: Build;
+    deployResult: Deploy | null;
+};
 export type PrivateAppComponentConfig = {
     name: string;
     description: string;
@@ -103,9 +109,9 @@ export declare enum ComponentTypes {
     PublicApp = "public-app",
     HublTheme = "hubl-theme"
 }
-export type Component = {
+export type Component<T = GenericComponentConfig> = {
     type: ComponentTypes;
-    config: GenericComponentConfig;
+    config: T;
     runnable: boolean;
     path: string;
 };

package/types/Yargs.d.ts

@@ -0,0 +1,14 @@
+import { Options } from 'yargs';
+export type CommonArgs = {
+    derivedAccountId: number;
+    providedAccountId?: number;
+    d: boolean;
+    debug: boolean;
+};
+export type ConfigArgs = {
+    c?: string;
+    config?: string;
+};
+export type StringArgType = Options & {
+    type: 'string';
+};

package/types/Yargs.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });