@hubspot/cli 6.2.1 → 6.2.2-experimental.0

package/lib/validation.js

@@ -1,52 +1,33 @@
+"use strict";
 const fs = require('fs');
 const path = require('path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { MODE } = require('@hubspot/local-dev-lib/constants/files');
-const {
-  API_KEY_AUTH_METHOD,
-  OAUTH_AUTH_METHOD,
-  PERSONAL_ACCESS_KEY_AUTH_METHOD,
-} = require('@hubspot/local-dev-lib/constants/auth');
+const { API_KEY_AUTH_METHOD, OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } = require('@hubspot/local-dev-lib/constants/auth');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
-const {
-  loadConfig,
-  getConfigPath,
-  validateConfig,
-  getAccountConfig,
-  loadConfigFromEnvironment,
-} = require('@hubspot/local-dev-lib/config');
+const { loadConfig, getConfigPath, validateConfig, getAccountConfig, loadConfigFromEnvironment, } = require('@hubspot/local-dev-lib/config');
 const { getOauthManager } = require('@hubspot/local-dev-lib/oauth');
-const {
-  accessTokenForPersonalAccessKey,
-} = require('@hubspot/local-dev-lib/personalAccessKey');
-const {
-  getAbsoluteFilePath,
-  getCwd,
-  getExt,
-} = require('@hubspot/local-dev-lib/path');
+const { accessTokenForPersonalAccessKey, } = require('@hubspot/local-dev-lib/personalAccessKey');
+const { getAbsoluteFilePath, getCwd, getExt, } = require('@hubspot/local-dev-lib/path');
 const { getAccountId, getMode, setLogLevel } = require('./commonOpts');
 const { logDebugInfo } = require('./debugInfo');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { checkAndWarnGitInclusion } = require('./ui/git');
 const { logError } = require('./errorHandlers/index');
-
 async function loadAndValidateOptions(options, shouldValidateAccount = true) {
-  setLogLevel(options);
-  logDebugInfo(options);
-  const { config: configPath } = options;
-  loadConfig(configPath, options);
-  checkAndWarnGitInclusion(getConfigPath());
-
-  let validAccount = true;
-  if (shouldValidateAccount) {
-    validAccount = await validateAccount(options);
-  }
-
-  if (!(validateConfig() && validAccount)) {
-    process.exit(EXIT_CODES.ERROR);
-  }
+    setLogLevel(options);
+    logDebugInfo(options);
+    const { config: configPath } = options;
+    loadConfig(configPath, options);
+    checkAndWarnGitInclusion(getConfigPath());
+    let validAccount = true;
+    if (shouldValidateAccount) {
+        validAccount = await validateAccount(options);
+    }
+    if (!(validateConfig() && validAccount)) {
+        process.exit(EXIT_CODES.ERROR);
+    }
 }
-
 /**
  * Validate that an account was passed to the command and that the account's configuration is valid
  *
@@ -55,186 +36,144 @@ async function loadAndValidateOptions(options, shouldValidateAccount = true) {
  * @returns {boolean}
  */
 async function validateAccount(options) {
-  const accountId = getAccountId(options);
-  const {
-    portalId: portalIdOption,
-    portal: portalOption,
-    accountId: _accountIdOption,
-    account: _accountOption,
-  } = options;
-  const accountOption = portalOption || _accountOption;
-  const accountIdOption = portalIdOption || _accountIdOption;
-
-  if (!accountId) {
-    if (accountOption) {
-      logger.error(
-        `The account "${accountOption}" could not be found in the config`
-      );
-    } else if (accountIdOption) {
-      logger.error(
-        `The account "${accountIdOption}" could not be found in the config`
-      );
-    } else {
-      logger.error(
-        'An account needs to be supplied either via "--account" or through setting a "defaultPortal"'
-      );
+    const accountId = getAccountId(options);
+    const { portalId: portalIdOption, portal: portalOption, accountId: _accountIdOption, account: _accountOption, } = options;
+    const accountOption = portalOption || _accountOption;
+    const accountIdOption = portalIdOption || _accountIdOption;
+    if (!accountId) {
+        if (accountOption) {
+            logger.error(`The account "${accountOption}" could not be found in the config`);
+        }
+        else if (accountIdOption) {
+            logger.error(`The account "${accountIdOption}" could not be found in the config`);
+        }
+        else {
+            logger.error('An account needs to be supplied either via "--account" or through setting a "defaultPortal"');
+        }
+        return false;
     }
-    return false;
-  }
-
-  if (accountOption && 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 = getAccountConfig(accountId);
-  if (!accountConfig) {
-    logger.error(`The account ${accountId} has not been configured`);
-    return false;
-  }
-
-  const { authType, auth, apiKey, personalAccessKey } = accountConfig;
-
-  if (typeof authType === 'string' && authType !== authType.toLowerCase()) {
-    logger.error(
-      `Invalid "authType" value "${authType}" for account "${accountId}" in config file: ${getConfigPath()}. Valid values are ${commaSeparatedValues(
-        [
-          PERSONAL_ACCESS_KEY_AUTH_METHOD,
-          OAUTH_AUTH_METHOD,
-          API_KEY_AUTH_METHOD,
-        ].map(method => method.value)
-      )}.`
-    );
-  }
-
-  if (authType === 'oauth2') {
-    if (typeof auth !== 'object') {
-      logger.error(
-        `The OAuth2 auth configuration for account ${accountId} is missing`
-      );
-      return false;
-    }
-
-    const { clientId, clientSecret, tokenInfo } = auth;
-
-    if (!clientId || !clientSecret || !tokenInfo || !tokenInfo.refreshToken) {
-      logger.error(
-        `The OAuth2 configuration for account ${accountId} is incorrect`
-      );
-      logger.error('Run "hs auth --type=oauth2" to reauthenticate');
-      return false;
-    }
-
-    const oauth = getOauthManager(accountId, accountConfig);
-    try {
-      const accessToken = await oauth.accessToken();
-      if (!accessToken) {
-        logger.error(
-          `The OAuth2 access token could not be found for accountId ${accountId}`
-        );
+    if (accountOption && 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 = getAccountConfig(accountId);
+    if (!accountConfig) {
+        logger.error(`The account ${accountId} has not been configured`);
         return false;
-      }
-    } catch (e) {
-      logger.error(e.message);
-      return false;
-    }
-  } else if (authType === 'personalaccesskey') {
-    if (!personalAccessKey) {
-      logger.error(
-        `The account "${accountId}" is configured to use a access key for authentication and is missing a "personalAccessKey" in the configuration file`
-      );
-      return false;
-    }
-
-    try {
-      const accessToken = await accessTokenForPersonalAccessKey(accountId);
-      if (!accessToken) {
-        logger.error(
-          `An OAuth2 access token for account "${accountId} could not be retrieved using the "personalAccessKey" provided`
-        );
+    }
+    const { authType, auth, apiKey, personalAccessKey } = accountConfig;
+    if (typeof authType === 'string' && authType !== authType.toLowerCase()) {
+        logger.error(`Invalid "authType" value "${authType}" for account "${accountId}" in config file: ${getConfigPath()}. Valid values are ${commaSeparatedValues([
+            PERSONAL_ACCESS_KEY_AUTH_METHOD,
+            OAUTH_AUTH_METHOD,
+            API_KEY_AUTH_METHOD,
+        ].map(method => method.value))}.`);
+    }
+    if (authType === 'oauth2') {
+        if (typeof auth !== 'object') {
+            logger.error(`The OAuth2 auth configuration for account ${accountId} is missing`);
+            return false;
+        }
+        const { clientId, clientSecret, tokenInfo } = auth;
+        if (!clientId || !clientSecret || !tokenInfo || !tokenInfo.refreshToken) {
+            logger.error(`The OAuth2 configuration for account ${accountId} is incorrect`);
+            logger.error('Run "hs auth --type=oauth2" to reauthenticate');
+            return false;
+        }
+        const oauth = getOauthManager(accountId, accountConfig);
+        try {
+            const accessToken = await oauth.accessToken();
+            if (!accessToken) {
+                logger.error(`The OAuth2 access token could not be found for accountId ${accountId}`);
+                return false;
+            }
+        }
+        catch (e) {
+            logger.error(e.message);
+            return false;
+        }
+    }
+    else if (authType === 'personalaccesskey') {
+        if (!personalAccessKey) {
+            logger.error(`The account "${accountId}" is configured to use a access key for authentication and is missing a "personalAccessKey" in the configuration file`);
+            return false;
+        }
+        try {
+            const accessToken = await accessTokenForPersonalAccessKey(accountId);
+            if (!accessToken) {
+                logger.error(`An OAuth2 access token for account "${accountId} could not be retrieved using the "personalAccessKey" provided`);
+                return false;
+            }
+        }
+        catch (e) {
+            logError(e);
+            return false;
+        }
+    }
+    else if (!apiKey) {
+        logger.error(`The accountId ${accountId} is missing authentication configuration`);
         return false;
-      }
-    } catch (e) {
-      logError(e);
-      return false;
-    }
-  } else if (!apiKey) {
-    logger.error(
-      `The accountId ${accountId} is missing authentication configuration`
-    );
-    return false;
-  }
-
-  return true;
+    }
+    return true;
 }
-
 /**
  * @param {object} command options
  * @returns {boolean}
  */
 function validateMode(options) {
-  const mode = getMode(options);
-  if (MODE[mode]) {
-    return true;
-  }
-  const modesMessage = `Available modes are: ${Object.values(MODE).join(
-    ', '
-  )}.`;
-  if (mode != null) {
-    logger.error([`The mode "${mode}" is invalid.`, modesMessage].join(' '));
-  } else {
-    logger.error(['The mode option is missing.', modesMessage].join(' '));
-  }
-  return false;
+    const mode = getMode(options);
+    if (MODE[mode]) {
+        return true;
+    }
+    const modesMessage = `Available modes are: ${Object.values(MODE).join(', ')}.`;
+    if (mode != null) {
+        logger.error([`The mode "${mode}" is invalid.`, modesMessage].join(' '));
+    }
+    else {
+        logger.error(['The mode option is missing.', modesMessage].join(' '));
+    }
+    return false;
 }
-
 const fileExists = _path => {
-  let isFile;
-  try {
-    const absoluteSrcPath = path.resolve(getCwd(), _path);
-    if (!absoluteSrcPath) return false;
-
-    const stats = fs.statSync(absoluteSrcPath);
-    isFile = stats.isFile();
-
-    if (!isFile) {
-      logger.error(`The path "${_path}" is not a path to a file`);
-      return false;
-    }
-  } catch (e) {
-    logger.error(`The path "${_path}" is not a path to a file`);
-    return false;
-  }
-
-  return true;
+    let isFile;
+    try {
+        const absoluteSrcPath = path.resolve(getCwd(), _path);
+        if (!absoluteSrcPath)
+            return false;
+        const stats = fs.statSync(absoluteSrcPath);
+        isFile = stats.isFile();
+        if (!isFile) {
+            logger.error(`The path "${_path}" is not a path to a file`);
+            return false;
+        }
+    }
+    catch (e) {
+        logger.error(`The path "${_path}" is not a path to a file`);
+        return false;
+    }
+    return true;
 };
-
 const checkAndConvertToJson = _path => {
-  const filePath = getAbsoluteFilePath(_path);
-  if (!fileExists(filePath)) return false;
-
-  if (getExt(_path) !== 'json') {
-    logger.error(`The file "${_path}" must be a valid JSON file`);
-    return null;
-  }
-
-  let result;
-
-  try {
-    result = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
-  } catch (e) {
-    logger.error(`The file "${_path}" contains invalid JSON`);
-    result = null;
-  }
-
-  return result;
+    const filePath = getAbsoluteFilePath(_path);
+    if (!fileExists(filePath))
+        return false;
+    if (getExt(_path) !== 'json') {
+        logger.error(`The file "${_path}" must be a valid JSON file`);
+        return null;
+    }
+    let result;
+    try {
+        result = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+    }
+    catch (e) {
+        logger.error(`The file "${_path}" contains invalid JSON`);
+        result = null;
+    }
+    return result;
 };
-
 module.exports = {
-  validateMode,
-  validateAccount,
-  checkAndConvertToJson,
-  fileExists,
-  loadAndValidateOptions,
+    validateMode,
+    validateAccount,
+    checkAndConvertToJson,
+    fileExists,
+    loadAndValidateOptions,
 };

package/package.json

@@ -1,49 +1,80 @@
 {
-  "name": "@hubspot/cli",
-  "version": "6.2.1",
-  "description": "CLI for working with HubSpot",
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/HubSpot/hubspot-cli"
-  },
-  "dependencies": {
-    "@hubspot/local-dev-lib": "^2.0.1",
-    "@hubspot/serverless-dev-runtime": "6.2.0",
-    "@hubspot/theme-preview-dev-server": "0.0.8",
-    "@hubspot/ui-extensions-dev-server": "0.8.33",
-    "archiver": "^7.0.1",
-    "chalk": "^4.1.2",
-    "chokidar": "^3.0.1",
-    "cli-cursor": "^3.1.0",
-    "cli-progress": "^3.11.2",
-    "express": "^4.17.1",
-    "findup-sync": "^4.0.0",
-    "fs-extra": "^8.1.0",
-    "inquirer": "8.2.0",
-    "js-yaml": "^4.1.0",
-    "moment": "^2.29.1",
-    "open": "^7.0.3",
-    "p-queue": "^6.0.2",
-    "strip-ansi": "^5.2.0",
-    "table": "^6.6.0",
-    "tmp": "^0.2.1",
-    "update-notifier": "^5.1.0",
-    "yargs": "17.7.2"
-  },
-  "devDependencies": {
-    "axios": "^1.7.2",
-    "mock-stdin": "^1.0.0"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "bin": {
-    "hs": "./bin/hs",
-    "hscms": "./bin/hscms"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "gitHead": "bca108b05c57cfb6984cda5c09740760855c70d8"
+    "name": "@hubspot/cli",
+    "version": "6.2.2-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": "^2.0.1",
+        "@hubspot/serverless-dev-runtime": "7.0.0",
+        "@hubspot/theme-preview-dev-server": "0.0.8",
+        "@hubspot/ui-extensions-dev-server": "0.8.33",
+        "archiver": "^7.0.1",
+        "chalk": "^4.1.2",
+        "chokidar": "^3.0.1",
+        "cli-cursor": "^3.1.0",
+        "cli-progress": "^3.11.2",
+        "express": "^4.17.1",
+        "findup-sync": "^4.0.0",
+        "fs-extra": "^8.1.0",
+        "inquirer": "8.2.0",
+        "jest": "^29.5.0",
+        "js-yaml": "^4.1.0",
+        "moment": "^2.29.1",
+        "open": "^7.0.3",
+        "p-queue": "^6.0.2",
+        "strip-ansi": "^5.2.0",
+        "table": "^6.6.0",
+        "tmp": "^0.2.1",
+        "update-notifier": "^5.1.0",
+        "yargs": "17.7.2"
+    },
+    "devDependencies": {
+        "axios": "^1.7.2",
+        "eslint": "^8.56.0",
+        "husky": "^4.3.8",
+        "lint-staged": "^10.5.4",
+        "madge": "^8.0.0",
+        "mock-stdin": "^1.0.0",
+        "prettier": "^1.19.1",
+        "semver": "^7.6.3",
+        "typescript": "^5.6.2"
+    },
+    "scripts": {
+        "build": "rm -rf ./dist/ && tsc && yarn copy-files",
+        "copy-files": "cp -r lang dist/lang && cp bin/hs dist/bin/hs && cp bin/hscms dist/bin/hscms",
+        "lint": "eslint . && prettier --list-different ./**/*.{js,json}",
+        "prettier:write": "prettier --write ./**/*.{js,json}",
+        "test": "jest",
+        "test-cli": "yarn --cwd 'acceptance-tests' test-ci",
+        "test-cli-debug": "yarn --cwd 'acceptance-tests' test-debug",
+        "test-cli-qa": "yarn --cwd 'acceptance-tests' test-qa",
+        "test-cli-latest": "yarn build-docker && docker container run -it --rm --name=hs-cli-container hs-cli-image yarn test-cli",
+        "build-docker": "docker image build --tag hs-cli-image . && docker image prune -f",
+        "circular-deps": "yarn madge --circular .",
+        "release": "bash ./scripts/release.sh",
+        "hs": "yarn build && node ./dist/bin/hs"
+    },
+    "lint-staged": {
+        "**/*.{js,scss,css}": [
+            "prettier -l",
+            "eslint"
+        ]
+    },
+    "husky": {
+        "hooks": {
+            "pre-commit": "lint-staged"
+        }
+    },
+    "engines": {
+        "node": ">=18"
+    },
+    "bin": {
+        "hs": "./bin/hs",
+        "hscms": "./bin/hscms"
+    },
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org/"
+    }
 }

package/CHANGELOG.md

@@ -1,16 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [4.1.5](https://github.com/HubSpot/hubspot-cms-tools/compare/v4.1.5-beta.4...v4.1.5) (2023-01-09)
-
-**Note:** Version bump only for package @hubspot/cli
-
-
-
-
-
-## [3.0.4](https://github.com/HubSpot/hubspot-cms-tools/compare/v3.0.4-beta.1...v3.0.4) (2021-04-01)
-
-**Note:** Version bump only for package @hubspot/cli

package/LICENSE

@@ -1,12 +0,0 @@
-Copyright 2019  HubSpot, Inc.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.