@hubspot/cli 4.1.8-beta.5 → 4.1.8-beta.7

package/commands/theme/generate-selectors.js

@@ -0,0 +1,214 @@
+const fs = require('fs');
+const { i18n } = require('../../lib/lang');
+const { logger } = require('@hubspot/cli-lib/logger');
+const {
+  findFieldsJsonPath,
+  combineThemeCss,
+  setPreviewSelectors,
+  generateInheritedSelectors,
+  generateSelectorsMap,
+  getMaxFieldsDepth,
+} = require('../../lib/generate-selectors');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+
+const HUBL_EXPRESSION_REGEX = new RegExp(/{%\s*(.*)\s*%}/, 'g');
+const HUBL_VARIABLE_NAME_REGEX = new RegExp(/{%\s*set\s*(\w*)/, 'i');
+const HUBL_STATEMENT_REGEX = new RegExp(/{{\s*[\w.(,\d\-\s)|/~]*.*}}/, 'g');
+const HUBL_STATEMENT_PLACEHOLDER_REGEX = new RegExp(/hubl_statement_\d*/, 'g');
+
+const CSS_VARS_REGEX = new RegExp(/--([\w.(,\d\-)]*):(.*);/, 'g');
+const CSS_VARS_NAME_REGEX = new RegExp(/(--[\w.(,\d\-)]*)/, 'g');
+const CSS_SELECTORS_REGEX = new RegExp(/([\s\w:.,\0-[\]]*){/, 'i');
+const CSS_EXPRESSION_REGEX = new RegExp(/(?!\s)([^}])*(?![.#\s,>])[^}]*}/, 'g');
+const THEME_PATH_REGEX = new RegExp(/=\s*.*(theme\.(\w|\.)*)/, 'i');
+
+const i18nKey = 'cli.commands.theme.subcommands.generateSelectors';
+
+exports.command = 'generate-selectors <themePath>';
+exports.describe = i18n(`${i18nKey}.describe`);
+
+exports.handler = options => {
+  const { themePath } = options;
+
+  const fieldsJsonPath = findFieldsJsonPath(themePath);
+  if (!fieldsJsonPath) {
+    logger.error(i18n(`${i18nKey}.errors.fieldsNotFound`));
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  let fieldsJson = JSON.parse(fs.readFileSync(fieldsJsonPath));
+  let cssString = combineThemeCss(themePath);
+
+  /**
+   * Creates map of HubL variable names to theme field paths
+   */
+  const HubLExpressions = cssString.match(HUBL_EXPRESSION_REGEX) || [];
+  const hublVariableMap = HubLExpressions.reduce(
+    (_hublVariableMap, expression) => {
+      const variableName = expression.match(HUBL_VARIABLE_NAME_REGEX);
+      const themeFieldKey = expression.match(THEME_PATH_REGEX);
+
+      if (!themeFieldKey || !variableName) return _hublVariableMap;
+
+      _hublVariableMap[variableName[1]] = themeFieldKey[1];
+      return _hublVariableMap;
+    },
+    {}
+  );
+
+  /**
+   * Removes HubL variable expressions
+   */
+  cssString = cssString.replace(HUBL_EXPRESSION_REGEX, '');
+
+  /**
+   * Regex for HubL variable names
+   */
+  const HUBL_EXPRESSIONS = new RegExp(
+    `.*(${Object.keys(hublVariableMap).join('|')}).*`,
+    'g'
+  );
+
+  /**
+   * Matches all HubL statements in the CSS and replaces them with a placeholder string
+   * This is to prevent the the css expression regex from capturing all the HubL as well
+   */
+  const hublStatements = cssString.match(HUBL_STATEMENT_REGEX) || [];
+  const hublStatementsMap = {};
+  hublStatements.forEach((statement, index) => {
+    const statementKey = `hubl_statement_${index}`;
+    hublStatementsMap[statementKey] = statement;
+    cssString = cssString.replace(statement, statementKey);
+  });
+
+  /**
+   * Matchs all css variables and determines if there are hubl within those vars.
+   */
+  const cssVars = cssString.match(CSS_VARS_REGEX) || [];
+  const cssVarsMap = cssVars.reduce((acc, expression) => {
+    const cssVarName = expression.match(CSS_VARS_NAME_REGEX);
+    const hublVariables = expression.match(HUBL_STATEMENT_PLACEHOLDER_REGEX);
+
+    if (!cssVarName || !hublVariables) return acc;
+
+    cssString = cssString.replace(expression, '');
+    return { ...acc, [cssVarName[0]]: hublVariables };
+  }, {});
+
+  // replace all css variable references with corresponding hubl placeholder
+  Object.keys(cssVarsMap).forEach(cssVarName => {
+    const hublPlaceholders = cssVarsMap[cssVarName];
+    cssString = cssString.replace(cssVarName, hublPlaceholders.join('  '));
+  });
+
+  /**
+   * Parses each css string for a HubL statement and tries to map theme field paths to CSS selectors
+   */
+  const cssExpressions = (
+    cssString.match(CSS_EXPRESSION_REGEX) || []
+  ).map(exp => exp.replace(/\r?\n/g, ' '));
+
+  const finalMap = cssExpressions.reduce(
+    (themeFieldsSelectorMap, cssExpression) => {
+      const hublStatementsPlaceholderKey =
+        cssExpression.match(HUBL_STATEMENT_PLACEHOLDER_REGEX) || [];
+
+      hublStatementsPlaceholderKey.forEach(placeholderKey => {
+        const hublStatement = hublStatementsMap[placeholderKey].match(
+          HUBL_EXPRESSIONS
+        );
+        const themeFieldPath = hublStatementsMap[placeholderKey].match(
+          /theme\.[\w|.]*/,
+          'g'
+        );
+        const cssSelectors = cssExpression.match(CSS_SELECTORS_REGEX);
+
+        /**
+         * Try to match a HubL statement to any HubL Variables being used
+         */
+        if (cssSelectors && themeFieldPath) {
+          const cssSelector = cssSelectors[1].replace(/\n/g, ' ');
+          const hublThemePath = themeFieldPath[0];
+
+          if (!themeFieldsSelectorMap[hublThemePath]) {
+            themeFieldsSelectorMap[hublThemePath] = [];
+          }
+
+          if (!themeFieldsSelectorMap[hublThemePath].includes(cssSelector)) {
+            themeFieldsSelectorMap[hublThemePath] = themeFieldsSelectorMap[
+              hublThemePath
+            ].concat(cssSelector);
+          }
+        }
+
+        if (cssSelectors && hublStatement) {
+          const cssSelector = cssSelectors[1].replace(/\n/g, ' ');
+          const hublVariableName = Object.keys(hublVariableMap).find(_hubl => {
+            return hublStatement[0].includes(_hubl);
+          });
+
+          const themeFieldKey = hublVariableMap[hublVariableName];
+
+          /**
+           * If the theme path is referenced directly add selectors
+           */
+          if (themeFieldKey) {
+            if (!themeFieldsSelectorMap[themeFieldKey]) {
+              themeFieldsSelectorMap[themeFieldKey] = [];
+            }
+
+            if (!themeFieldsSelectorMap[themeFieldKey].includes(cssSelector)) {
+              themeFieldsSelectorMap[themeFieldKey] = themeFieldsSelectorMap[
+                themeFieldKey
+              ].concat(cssSelector);
+            }
+          }
+        }
+      });
+
+      return themeFieldsSelectorMap;
+    },
+    {}
+  );
+
+  if (!Object.keys(finalMap).length) {
+    logger.error(i18n(`${i18nKey}.errors.noSelectorsFound`));
+    process.exit(EXIT_CODES.ERROR);
+  }
+  Object.keys(finalMap).forEach(themeFieldKey => {
+    const fieldKey = themeFieldKey.split('.');
+    const selectors = finalMap[themeFieldKey];
+    fieldsJson = setPreviewSelectors(fieldsJson, fieldKey.splice(1), selectors);
+  });
+
+  // Because fields can have nested inheritance we generated inherited selectors
+  // multiple times to make sure all inherted selectors are bubbled up.
+  const maxFieldsDepth = getMaxFieldsDepth();
+  for (let i = 0; i < maxFieldsDepth; i += 1) {
+    fieldsJson = generateInheritedSelectors(fieldsJson, fieldsJson);
+  }
+
+  const selectorsMap = generateSelectorsMap(fieldsJson);
+  const selectorsPath = `${themePath}/editor-preview.json`;
+
+  fs.writeFileSync(
+    selectorsPath,
+    `${JSON.stringify({ selectors: selectorsMap }, null, 2)}\n`
+  );
+
+  logger.success(
+    i18n(`${i18nKey}.success`, {
+      themePath,
+      selectorsPath,
+    })
+  );
+};
+
+exports.builder = yargs => {
+  yargs.positional('themePath', {
+    describe: i18n(`${i18nKey}.positionals.themePath.describe`),
+    type: 'string',
+  });
+
+  return yargs;
+};

package/commands/theme.js

@@ -1,5 +1,6 @@
 const marketplaceValidate = require('./theme/marketplace-validate');
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const generateSelectors = require('./theme/generate-selectors');
+
 const { i18n } = require('../lib/lang');
 
 const i18nKey = 'cli.commands.theme';
@@ -8,10 +9,10 @@ exports.command = 'theme';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-
-  yargs.command(marketplaceValidate).demandCommand(1, '');
+  yargs
+    .command(marketplaceValidate)
+    .command(generateSelectors)
+    .demandCommand(1, '');
 
   return yargs;
 };

package/lang/en.lyaml

@@ -8,10 +8,10 @@ en:
         describe: "Commands for working with accounts."
         subcommands:
           list:
-            accounts: "Accounts:"
-            defaultAccount: "Default account: {{ account }}"
+            accounts: "{{#bold}}Accounts{{/bold}}:"
+            defaultAccount: "{{#bold}}Default account{{/bold}}: {{ account }}"
             describe: "List names of accounts defined in config."
-            configPath: "Config path: {{ configPath }}"
+            configPath: "{{#bold}}Config path{{/bold}}: {{ configPath }}"
             labels:
               accountId: "Account ID"
               authType: "Auth Type"
@@ -57,7 +57,7 @@ en:
             success:
               accountRemoved: "Account \"{{ accountName }}\" removed from the config"
           info:
-            accountId: "Account ID: {{ accountId }}"
+            accountId: "{{#bold}}Account ID{{/bold}}: {{ accountId }}"
             describe: "Print information about the default account, or about the account specified with the \"--account\" option."
             errors:
               notUsingPersonalAccessKey: "This command currently only supports fetching scopes for the personal access key auth type."
@@ -65,8 +65,8 @@ en:
               default: "Print information for the default account"
               idBased: "Print information for the account with accountId equal to \"1234567\""
               nameBased: "Print information for the account in the config with name equal to \"MyAccount\""
-            name: "Account name: {{ name }}"
-            scopeGroups: "Scopes available:\n{{ scopeGroups }}"
+            name: "{{#bold}}Account name{{/bold}}: {{ name }}"
+            scopeGroups: "{{#bold}}Scopes available{{/bold}}:"
       auth:
         describe: "Configure authentication for a HubSpot account. Supported authentication protocols are {{ supportedProtocols }}."
         errors:
@@ -484,7 +484,7 @@ en:
                 describe: "Project name (cannot be changed)"
               template:
                 describe: "The starting template"
-              repoPath:
+              templateSource:
                 describe: "Path to custom GitHub repository from which to create project template"
           add:
             describe: "Create a new component within a project"
@@ -662,10 +662,11 @@ en:
               deleteDefault: "Sandbox \"{{ account }}\" with portalId \"{{ sandboxHubId }}\" was deleted successfully and removed as the default account."
               configFileUpdated: "Removed account {{ account }} from {{ configFilename }}."
             failure:
+              invalidUser: "Couldn't delete {{ accountName }} because your account has been removed from {{ parentAccountName }} or your permission set doesn't allow you to delete the sandbox. To update your permissions, contact a super admin in {{ parentAccountName }}."
               noAccount: "No account specified. Specify an account by using the --account flag."
               noSandboxAccounts: "There are no sandboxes connected to the CLI. To add a sandbox, run {{#bold}}hs auth{{/bold}}."
               noParentAccount: "This sandbox can't be deleted from the CLI because you haven't given the CLI access to its parent account. To do this, run {{#bold}}hs auth{{/bold}} and add the parent account."
-              objectNotFound: "Sandbox {{#bold}}{{ account }}{{/bold}} may have been be deleted through the UI. The account has been removed from the config."
+              objectNotFound: "Sandbox {{#bold}}{{ account }}{{/bold}} may have been deleted through the UI. The account has been removed from the config."
               noParentPortalAvailable: "This sandbox can't be deleted from the CLI because you haven't given the CLI access to its parent account. To do this, run {{#bold}}{{ command }}{{/bold}}. You can also delete the sandbox from the HubSpot management tool: {{#bold}}{{ url }}{{/bold}}."
               invalidKey: "Your personal access key for account {{#bold}}{{ account }}{{/bold}} is inactive. To re-authenticate, please run {{#bold}}hs auth personalaccesskey{{/bold}}."
             options:
@@ -734,6 +735,16 @@ en:
       theme:
         describe: "Commands for working with themes, including marketplace validation with the marketplace-validate subcommand."
         subcommands:
+          generateSelectors:
+            describe: "Automatically generates an editor-preview.json file for the given theme. The selectors this command generates are not perfect, so please edit editor-preview.json after running."
+            errors:
+              invalidPath: "Could not find directory \"{{ themePath }}\""
+              fieldsNotFound: "Unable to find theme's fields.json."
+              noSelectorsFound: "No selectors found."
+            success: "Selectors generated for {{ themePath }}, please double check the selectors generated at {{ selectorsPath }} before uploading the theme."
+            positionals:
+              themePath:
+                describe: "The path of the theme you'd like to generate an editor-preview.json for."
           marketplaceValidate:
             describe: "Validate a theme for the marketplace"
             errors:
@@ -847,7 +858,7 @@ en:
         header:
           betaMessage: "{{#yellow}}{{#bold}}[beta]{{/bold}}{{/yellow}} HubSpot projects local development"
           learnMoreLink: "Learn more about the projects local dev server"
-          running: "Running {{ projectName}} locally on {{ accountIdentifier }}, waiting for project file changes ..."
+          running: "Running {{ projectName}} locally on {{ accountIdentifier }}, waiting for changes ..."
           quitHelper: "Press {{#bold}}'q'{{/bold}} to stop the local dev server"
           viewInHubSpotLink: "View in HubSpot"
           status:
@@ -859,8 +870,8 @@ en:
             manualUpload: "{{#bold}}Status:{{/bold}} {{#green}}Manually uploading pending changes{{/green}}"
         upload:
           noUploadsAllowed: "The change to {{ filePath }} requires an upload, but the CLI cannot upload to a project that is using a github integration."
-          manualUploadSkipped: "Manually upload and deploy project: {{#green}}(n){{/green}}"
-          manualUploadConfirmed: "Manually upload and deploy project: {{#green}}(Y){{/green}}"
+          manualUploadSkipped: "Manually upload and deploy project to production account: {{#green}}(n){{/green}}"
+          manualUploadConfirmed: "Manually upload and deploy project to production account: {{#green}}(Y){{/green}}"
           manualUploadRequired: "Project file changes require a manual upload and deploy ..."
           manualUploadExplanation1: "{{#yellow}}> Dev server is running on a {{#bold}}non-sandbox account{{/bold}}.{{/yellow}}"
           manualUploadExplanation2: "{{#yellow}}> Uploading changes may overwrite production data.{{/yellow}}"
@@ -869,9 +880,9 @@ en:
           uploadedAddChange: "[INFO] Uploaded {{ filePath }}"
           uploadingRemoveChange: "[INFO] Removing {{ filePath }}"
           uploadedRemoveChange: "[INFO] Removed {{ filePath }}"
-          uploadingChanges: "{{#bold}}Building and deploying recent changes on {{ accountIdentifier }}{{/bold}}"
-          uploadedChangesSucceeded: "{{#bold}}Built and deployed recent changes on {{ accountIdentifier }}{{/bold}}"
-          uploadedChangesFailed: "{{#bold}}Failed to build and deploy recent changes on {{ accountIdentifier }}{{/bold}}"
+          uploadingChanges: "{{#bold}}Building #{{ buildId }} and deploying recent changes on {{ accountIdentifier }}{{/bold}}"
+          uploadedChangesSucceeded: "{{#bold}}Built #{{ buildId }} and deployed recent changes on {{ accountIdentifier }}{{/bold}}"
+          uploadedChangesFailed: "{{#bold}}Failed to build #{{ buildId }} and deploy recent changes on {{ accountIdentifier }}{{/bold}}"
       projects:
         uploadProjectFiles:
           add: "Uploading {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
@@ -922,6 +933,9 @@ en:
             helpCommand:
               command: "hs help"
               message: "Run {{ command }} to see a list of available commands"
+            projectCreateCommand:
+              command: "hs project create"
+              message: "Run {{ command }} to create a new project"
             projectDeployCommand:
               command: "hs project deploy"
               message: "Ready to take your project live? Run {{ command }}"
@@ -933,13 +947,13 @@ en:
               message: "Run {{ command }} to upload your project to HubSpot and trigger builds"
             projectDevCommand:
               command: "hs project dev"
-              message: "Run {{ command }} to start testing your project locally."
+              message: "Run {{ command }} to start testing your project locally"
             sandboxSyncDevelopmentCommand:
               command: "hs sandbox sync"
-              message: "Run {{ command }} to to update CRM object definitions in your sandbox."
+              message: "Run {{ command }} to to update CRM object definitions in your sandbox"
             sandboxSyncStandardCommand:
               command: "hs sandbox sync"
-              message: "Run {{ command }} to to update all supported assets to your sandbox from production."
+              message: "Run {{ command }} to to update all supported assets to your sandbox from production"
       commonOpts:
         options:
           portal:
@@ -959,7 +973,7 @@ en:
             describe: "Use environment variable config"
       prompts:
         projectDevTargetAccountPrompt:
-          createNewSandboxOption: "<Test on a new dev sandbox>"
+          createNewSandboxOption: "<Test on a new development sandbox>"
           chooseDefaultAccountOption: "<{{#bold}}!{{/bold}} Test on this production account {{#bold}}!{{/bold}}>"
           promptMessage: "[--account] Choose a sandbox under {{ accountIdentifier }} to test with:"
           sandboxLimit: "You’ve reached the limit of {{ limit }} development sandboxes"
@@ -1115,6 +1129,7 @@ en:
           success:
             configFileUpdated: "{{ configFilename }} updated with {{ authMethod }} for account {{ account }}."
           failure:
+            invalidUser: "Couldn't create {{#bold}}{{ accountName }}{{/bold}} because your account has been removed from {{#bold}}{{ parentAccountName }}{{/bold}} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in {{#bold}}{{ parentAccountName }}{{/bold}}."
             limit:
               developer:
                 one: "{{#bold}}{{ accountName }}{{/bold}} reached the limit of {{ limit }} development sandbox.
@@ -1172,10 +1187,11 @@ en:
             fail: "Failed to fetch sync updates. View the sync status at: {{ url }}"
             succeed: "Sandbox sync complete."
           failure:
+            invalidUser: "Couldn't sync {{ accountName }} because your account has been removed from {{ parentAccountName }} or your permission set doesn't allow you to sync the sandbox. To update your permissions, contact a super admin in {{ parentAccountName }}."
             missingScopes: "Couldn’t run the sync because there are scopes missing in your production account. To update scopes, deactivate your current personal access key for {{#bold}}{{ accountName }}{{/bold}}, and generate a new one. Then run `hs auth` to update the CLI with the new key."
             syncInProgress: "Couldn’t run the sync because there’s another sync in progress. Wait for the current sync to finish and then try again. To check the sync status, visit the sync activity log: {{ url }}."
             notSuperAdmin: "Couldn't run the sync because you are not a super admin in {{ account }}. Ask the account owner for super admin access to the sandbox."
-            objectNotFound: "Couldn't sync the sandbox because {{#bold}}{{ account }}{{/bold}} may have been be deleted through the UI. Run {{#bold}}hs sandbox delete{{/bold}} to remove this account from the config. "
+            objectNotFound: "Couldn't sync the sandbox because {{#bold}}{{ account }}{{/bold}} may have been deleted through the UI. Run {{#bold}}hs sandbox delete{{/bold}} to remove this account from the config. "
           types:
             parcels:
               label: "Account tools and features"

package/lib/LocalDevManager.js

@@ -29,7 +29,8 @@ const { uiAccountDescription, uiLink } = require('./ui');
 
 const i18nKey = 'cli.lib.LocalDevManager';
 
-const BUILD_DEBOUNCE_TIME = 3500;
+const BUILD_DEBOUNCE_TIME_LONG = 5000;
+const BUILD_DEBOUNCE_TIME_SHORT = 3500;
 
 const WATCH_EVENTS = {
   add: 'add',
@@ -335,7 +336,7 @@ class LocalDevManager {
       await this.flushStandbyChanges();
 
       if (!this.uploadQueue.isPaused) {
-        this.debounceQueueBuild();
+        this.debounceQueueBuild(changeInfo);
       }
 
       return this.uploadQueue.add(async () => {
@@ -463,7 +464,9 @@ class LocalDevManager {
     }
   }
 
-  debounceQueueBuild() {
+  debounceQueueBuild(changeInfo) {
+    const { event } = changeInfo;
+
     if (this.uploadPermission === UPLOAD_PERMISSIONS.always) {
       this.updateDevModeStatus('uploadPending');
     }
@@ -472,9 +475,14 @@ class LocalDevManager {
       clearTimeout(this.debouncedBuild);
     }
 
+    const debounceWaitTime =
+      event === WATCH_EVENTS.add
+        ? BUILD_DEBOUNCE_TIME_LONG
+        : BUILD_DEBOUNCE_TIME_SHORT;
+
     this.debouncedBuild = setTimeout(
       this.queueBuild.bind(this),
-      BUILD_DEBOUNCE_TIME
+      debounceWaitTime
     );
   }
 
@@ -482,6 +490,7 @@ class LocalDevManager {
     const spinniesKey = this.spinnies.add(null, {
       text: i18n(`${i18nKey}.upload.uploadingChanges`, {
         accountIdentifier: uiAccountDescription(this.targetAccountId),
+        buildId: this.currentStagedBuildId,
       }),
       noIndent: true,
     });
@@ -523,6 +532,7 @@ class LocalDevManager {
       this.spinnies.succeed(spinniesKey, {
         text: i18n(`${i18nKey}.upload.uploadedChangesSucceeded`, {
           accountIdentifier: uiAccountDescription(this.targetAccountId),
+          buildId: result.buildId,
         }),
         succeedColor: 'white',
         noIndent: true,
@@ -531,6 +541,7 @@ class LocalDevManager {
       this.spinnies.fail(spinniesKey, {
         text: i18n(`${i18nKey}.upload.uploadedChangesFailed`, {
           accountIdentifier: uiAccountDescription(this.targetAccountId),
+          buildId: result.buildId,
         }),
         failColor: 'white',
         noIndent: true,
@@ -561,7 +572,7 @@ class LocalDevManager {
               this.uploadPermission === UPLOAD_PERMISSIONS.always &&
               !this.uploadQueue.isPaused
             ) {
-              this.debounceQueueBuild();
+              this.debounceQueueBuild(changeInfo);
             }
             await this.sendChanges(changeInfo);
           };

package/lib/generate-selectors.js

@@ -0,0 +1,161 @@
+const fs = require('fs');
+const { EXIT_CODES } = require('./enums/exitCodes');
+const { logger } = require('@hubspot/cli-lib/logger');
+const { i18n } = require('../lib/lang');
+
+const CSS_COMMENTS_REGEX = new RegExp(/\/\*.*\*\//, 'g');
+const CSS_PSEUDO_CLASS_REGEX = new RegExp(
+  /:active|:checked|:disabled|:empty|:enabled|:first-of-type|:focus|:hover|:in-range|:invalid|:link|:optional|:out-of-range|:read-only|:read-write|:required|:target|:valid|:visited/,
+  'g'
+);
+const i18nKey = 'cli.commands.theme.subcommands.generateSelectors';
+
+let maxFieldsDepth = 0;
+
+function getMaxFieldsDepth() {
+  return maxFieldsDepth;
+}
+
+function findFieldsJsonPath(basePath) {
+  const _path = basePath.endsWith('/') ? basePath.slice(0, -1) : basePath;
+  if (!fs.existsSync(_path)) {
+    logger.error(
+      i18n(`${i18nKey}.errors.invalidPath`, {
+        themePath: basePath,
+      })
+    );
+    process.exit(EXIT_CODES.ERROR);
+  }
+  const files = fs.readdirSync(_path);
+
+  if (files.includes('fields.json')) {
+    return `${_path}/fields.json`;
+  }
+
+  for (let i = 0; i < files.length; i++) {
+    const fileName = files[i];
+    const isDirectory = fs.lstatSync(`${_path}/${fileName}`).isDirectory();
+
+    if (isDirectory && !fileName.includes('.module')) {
+      const fieldsJsonPath = findFieldsJsonPath(`${_path}/${fileName}`);
+      if (fieldsJsonPath) return fieldsJsonPath;
+    }
+  }
+
+  return null;
+}
+
+function combineThemeCss(basePath, cssString = '') {
+  const _path = basePath.endsWith('/') ? basePath.slice(0, -1) : basePath;
+  const isDirectory = fs.lstatSync(_path).isDirectory();
+
+  if (isDirectory) {
+    const filesList = fs.readdirSync(_path);
+    return filesList.reduce((css, fileName) => {
+      const newCss = combineThemeCss(`${_path}/${fileName}`);
+      return newCss ? `${css}\n${newCss}` : css;
+    }, cssString);
+  } else if (_path.includes('.css') && !_path.includes('.module')) {
+    return `${cssString}\n${fs.readFileSync(_path, 'utf8')}`;
+  }
+
+  return null;
+}
+
+function setPreviewSelectors(fields, fieldPath, selectors, depth = 0) {
+  fields.forEach((field, index) => {
+    if (field.name === fieldPath[0]) {
+      if (field.children && fieldPath.length > 0) {
+        fields[index].children = setPreviewSelectors(
+          fields[index].children,
+          fieldPath.splice(1),
+          selectors,
+          (depth += 1)
+        );
+      } else {
+        if (!field.selectors) field.selectors = [];
+
+        if (depth > maxFieldsDepth) {
+          maxFieldsDepth = depth;
+        }
+
+        selectors.forEach(selector => {
+          const fieldSelectors = field.selectors;
+          selector = selector.replace(CSS_COMMENTS_REGEX, '');
+          selector = selector.replace(CSS_PSEUDO_CLASS_REGEX, '').trim();
+
+          if (
+            !fieldSelectors.includes(selector) &&
+            !selector.includes('@media')
+          ) {
+            field.selectors = fieldSelectors.concat(selector);
+          }
+        });
+      }
+    }
+  });
+
+  return fields;
+}
+
+function generateInheritedSelectors(fields) {
+  let finalFieldsJson = [...fields];
+
+  const _generateInheritedSelectors = fieldsToCheck => {
+    fieldsToCheck.forEach(field => {
+      if (field.children) {
+        _generateInheritedSelectors(field.children);
+      }
+
+      const fieldInheritance =
+        field.inherited_value && field.inherited_value.property_value_paths;
+      const fieldSelectors = field.selectors;
+
+      if (fieldSelectors && fieldInheritance) {
+        Object.values(fieldInheritance).forEach(path => {
+          const fieldPath = path.split('.');
+          if (fieldPath[0] === 'theme') {
+            finalFieldsJson = setPreviewSelectors(
+              finalFieldsJson,
+              fieldPath.splice(1),
+              fieldSelectors
+            );
+          }
+        });
+      }
+    });
+  };
+
+  _generateInheritedSelectors(fields);
+
+  return finalFieldsJson;
+}
+
+function generateSelectorsMap(fields, fieldKey = []) {
+  let selectorsMap = {};
+
+  fields.forEach(field => {
+    const { children, name, selectors } = field;
+    const _fieldKey = [...fieldKey, name];
+
+    if (field.children) {
+      selectorsMap = {
+        ...selectorsMap,
+        ...generateSelectorsMap(children, _fieldKey),
+      };
+    } else {
+      selectorsMap[_fieldKey.join('.')] = selectors;
+    }
+  });
+
+  return selectorsMap;
+}
+
+module.exports = {
+  findFieldsJsonPath,
+  combineThemeCss,
+  setPreviewSelectors,
+  generateInheritedSelectors,
+  generateSelectorsMap,
+  getMaxFieldsDepth,
+};

package/lib/projects.js

@@ -92,7 +92,7 @@ const createProjectConfig = async (
   projectPath,
   projectName,
   template,
-  repoPath
+  templateSource
 ) => {
   const { projectConfig, projectDir } = await getProjectConfig(projectPath);
 
@@ -137,7 +137,11 @@ const createProjectConfig = async (
       srcDir: 'src',
     });
   } else {
-    await downloadGitHubRepoContents(repoPath, template.path, projectPath);
+    await downloadGitHubRepoContents(
+      templateSource,
+      template.path,
+      projectPath
+    );
     const _config = JSON.parse(fs.readFileSync(projectConfigPath));
     writeProjectConfig(projectConfigPath, {
       ..._config,
@@ -256,7 +260,10 @@ const ensureProjectExists = async (
           );
           return true;
         } catch (err) {
-          return logApiErrorInstance(err, new ApiErrorContext({ accountId }));
+          return logApiErrorInstance(
+            err,
+            new ApiErrorContext({ accountId, projectName })
+          );
         }
       } else {
         if (!noLogs) {
@@ -270,8 +277,8 @@ const ensureProjectExists = async (
         return false;
       }
     }
-    logApiErrorInstance(err, new ApiErrorContext({ accountId }));
-    return false;
+    logApiErrorInstance(err, new ApiErrorContext({ accountId, projectName }));
+    process.exit(EXIT_CODES.ERROR);
   }
 };