@takeshape/cli 9.80.4 → 9.81.3

package/dist/commands/unlink.js

@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _log = _interopRequireDefault(require("../log"));
-
 var _types = require("../types");
-
 var _config = require("../config");
-
 var _data = require("../util/data");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const unlink = async (_, params) => {
   try {
     if ((0, _types.isLoggedInAndLinkedConfig)(params)) {
@@ -25,6 +19,5 @@ const unlink = async (_, params) => {
     (0, _log.default)(e);
   }
 };
-
 var _default = unlink;
 exports.default = _default;

package/dist/commands/validate.js

@@ -4,27 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _log = _interopRequireDefault(require("../log"));
-
 var _fatalError = require("../util/fatal-error");
-
 var _path = _interopRequireDefault(require("path"));
-
 var _formatValidationResult = require("../util/format-validation-result");
-
 var _schema = require("@takeshape/schema");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const validate = async cli => {
   const {
     flags
   } = cli;
   let schemaPath;
-
   if (flags.path) {
     if (_fsExtra.default.existsSync(flags.path) && _fsExtra.default.statSync(flags.path).isDirectory()) {
       schemaPath = _path.default.join(flags.path, 'schema.json');
@@ -34,24 +25,19 @@ const validate = async cli => {
   } else {
     schemaPath = _path.default.join('.', 'schema.json');
   }
-
   if (!_fsExtra.default.existsSync(schemaPath)) {
     return (0, _fatalError.fatalError)(`${schemaPath} does not exist. You can download a project schema with 'takeshape export --schema'` + ` or specify a path with 'takeshape validate --path=/path/to/schema.json'`);
   }
-
   try {
     const schema = JSON.parse(_fsExtra.default.readFileSync(schemaPath).toString());
     const validationString = (0, _formatValidationResult.formatValidationResult)(await (0, _schema.validateSchema)({}, schema));
-
     if (validationString) {
       return (0, _fatalError.fatalError)(validationString);
     }
   } catch (e) {
     return (0, _fatalError.fatalError)(e.message);
   }
-
   (0, _log.default)(`${schemaPath} is valid.`);
 };
-
 var _default = validate;
 exports.default = _default;

package/dist/config.js

@@ -10,56 +10,36 @@ exports.getHomeConfigPath = getHomeConfigPath;
 exports.loadConfig = loadConfig;
 exports.writeHomeConfig = writeHomeConfig;
 exports.writeLinkedProjectConfig = writeLinkedProjectConfig;
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _os = _interopRequireDefault(require("os"));
-
 var _isDocker = _interopRequireDefault(require("is-docker"));
-
 var _messages = require("./util/messages");
-
 var _graphql = require("./graphql");
-
 var _api = require("./util/api");
-
 var _connector = require("./util/connector");
-
 var _getClientSchema = _interopRequireDefault(require("./util/get-client-schema"));
-
 var _ignore = _interopRequireDefault(require("ignore"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const TAKESHAPE_CONFIG_FILENAME = '.takeshaperc';
 exports.TAKESHAPE_CONFIG_FILENAME = TAKESHAPE_CONFIG_FILENAME;
 const GRAPHQL_CONFIG_FILENAME = '.graphqlconfig';
 exports.GRAPHQL_CONFIG_FILENAME = GRAPHQL_CONFIG_FILENAME;
-
 function getHomeConfigPath() {
   return _path.default.join(_os.default.homedir(), TAKESHAPE_CONFIG_FILENAME);
 }
-
 function loadConfig(cwd, cli) {
   let config = {};
-
   const configPath = _path.default.join(cwd, TAKESHAPE_CONFIG_FILENAME);
-
   if (_fsExtra.default.existsSync(configPath)) {
     config = _fsExtra.default.readJsonSync(configPath);
   }
-
   const homeConfigPath = getHomeConfigPath();
-
   if (_fsExtra.default.existsSync(homeConfigPath)) {
     const homeConfig = _fsExtra.default.readJsonSync(homeConfigPath);
-
     config.authToken = homeConfig.accessToken;
     config.personalAccessTokenId = homeConfig.id;
   }
-
   return {
     buildPath: _path.default.join(cwd, cli.flags.output ?? 'build'),
     configFilePath: _path.default.join(cwd, cli.flags.file ?? 'tsg.yml'),
@@ -80,23 +60,18 @@ function loadConfig(cwd, cli) {
     watchContent: Boolean(cli.flags.watchContent)
   };
 }
-
 function gitignores(files) {
   if (_fsExtra.default.existsSync('.gitignore')) {
     const ig = (0, _ignore.default)().add(_fsExtra.default.readFileSync('.gitignore', 'utf8'));
     return ig.filter(files).length === 0;
   }
-
   return false;
 }
-
 async function writeLinkedProjectConfig(params, linkedApiKey, project, site) {
   (0, _messages.writingFilesMsg)();
-
   if (!gitignores([GRAPHQL_CONFIG_FILENAME, TAKESHAPE_CONFIG_FILENAME])) {
     (0, _messages.consoleWarning)();
   }
-
   const graphqlEndpoint = (0, _graphql.getGraphQLEndpoint)(params, project.value);
   const takeshaperc = {
     projectId: project.value,
@@ -127,7 +102,8 @@ async function writeLinkedProjectConfig(params, linkedApiKey, project, site) {
       }
     }
   };
-  await Promise.all([_fsExtra.default.writeJSON(GRAPHQL_CONFIG_FILENAME, graphqlConfigJson), _fsExtra.default.writeJSON(TAKESHAPE_CONFIG_FILENAME, takeshaperc), (0, _getClientSchema.default)((0, _connector.createConnector)({ ...params,
+  await Promise.all([_fsExtra.default.writeJSON(GRAPHQL_CONFIG_FILENAME, graphqlConfigJson), _fsExtra.default.writeJSON(TAKESHAPE_CONFIG_FILENAME, takeshaperc), (0, _getClientSchema.default)((0, _connector.createConnector)({
+    ...params,
     ...takeshaperc
   }, {
     environment: 'PRODUCTION'
@@ -135,26 +111,21 @@ async function writeLinkedProjectConfig(params, linkedApiKey, project, site) {
     cache: false
   }))]);
 }
-
 function deleteLinkedConfig() {
   if (_fsExtra.default.existsSync(GRAPHQL_CONFIG_FILENAME)) {
     _fsExtra.default.removeSync(GRAPHQL_CONFIG_FILENAME);
   }
-
   if (_fsExtra.default.existsSync(TAKESHAPE_CONFIG_FILENAME)) {
     _fsExtra.default.removeSync(TAKESHAPE_CONFIG_FILENAME);
   }
 }
-
 async function writeHomeConfig(accessToken) {
   const configPath = getHomeConfigPath();
   await _fsExtra.default.writeJSON(configPath, accessToken);
   (0, _messages.writingHomeConfigDoneMsg)(configPath);
 }
-
 function deleteHomeConfig() {
   const homeConfigPath = getHomeConfigPath();
-
   if (_fsExtra.default.existsSync(homeConfigPath)) {
     _fsExtra.default.removeSync(homeConfigPath);
   }

package/dist/deprecated.js

@@ -1,9 +1,6 @@
 "use strict";
 
 var _log = _interopRequireDefault(require("./log"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 (0, _log.default)(`${_chalk.default.red('Error:')} The "tsg" command has been deprecated. Use "takeshape" instead`);

package/dist/errors.js

@@ -6,31 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 exports.HTTPError = void 0;
 exports.formatErrorMessage = formatErrorMessage;
 exports.handleHttpErrors = handleHttpErrors;
-
 class HTTPError extends Error {
   constructor(message, statusCode) {
     super(message);
     this.statusCode = statusCode;
   }
-
 }
-
 exports.HTTPError = HTTPError;
-
 function formatErrorMessage(error, activity) {
   if ('statusCode' in error) {
     if (error.statusCode === 401 || error.statusCode === 403) {
       return new Error('Insufficient Permissions to develop with TakeShape CLI. Your account must have the "Admin" role or better.');
     }
-
     if (error.statusCode === 500) {
       return new Error(`A Server error occurred while ${activity}.`);
     }
   }
-
   return error;
 }
-
 function handleHttpErrors(error, activity) {
   throw formatErrorMessage(error, activity);
 }

package/dist/files.js

@@ -6,50 +6,36 @@ Object.defineProperty(exports, "__esModule", {
 exports.copyStatic = copyStatic;
 exports.syncStatic = syncStatic;
 exports.writePages = writePages;
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _bluebird = _interopRequireDefault(require("bluebird"));
-
 var _log = _interopRequireDefault(require("./log"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 async function copyStatic(config) {
   return _fsExtra.default.mkdirs(config.buildPath).then(async () => _fsExtra.default.copy(config.staticPath, config.buildPath, {
     preserveTimestamps: true
   }));
 }
-
 function syncStatic(config) {
   return (event, sourcePath) => {
     const relativePath = sourcePath.replace(config.staticPath, '');
-
     const destPath = _path.default.join(config.buildPath, relativePath);
-
     if (event === 'addDir') {
       (0, _log.default)('takeshape watch - copied ' + relativePath);
-
       _fsExtra.default.mkdirs(destPath);
     } else if (event === 'unlink' || event === 'unlinkDir') {
       (0, _log.default)('takeshape watch - deleted ' + relativePath);
-
       _fsExtra.default.remove(destPath);
     } else {
       (0, _log.default)('takeshape watch - copied ' + relativePath);
-
       _fsExtra.default.copy(sourcePath, destPath);
     }
   };
 }
-
 function writePages(outputPath) {
   return generated => {
     return _bluebird.default.map(generated.pages, async page => {
       const filePath = _path.default.join(outputPath, page.path);
-
       return _fsExtra.default.mkdirs(_path.default.dirname(filePath)).then(async () => _fsExtra.default.writeFile(filePath, page.contents, 'utf8'));
     }).then(() => generated.stats);
   };

package/dist/graphql.js

@@ -5,21 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getGraphQLEndpoint = exports.getGraphQLAdminEndpoint = exports.createConnectorFactory = exports.createConnector = exports.createAdminConnector = void 0;
 exports.graphQLQuery = graphQLQuery;
-
 var _branches = require("@takeshape/branches");
-
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
 var _asyncRetry = _interopRequireDefault(require("async-retry"));
-
 var _errors = require("./errors");
-
 var _api = require("./util/api");
-
 var _branches2 = require("./util/branches");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const getGraphQLEndpointFactory = (path, useBranch) => (params, pathParams) => {
   const projectId = typeof pathParams === 'object' ? pathParams.projectId : pathParams;
   const branchParams = typeof pathParams === 'object' ? pathParams : {
@@ -28,7 +20,6 @@ const getGraphQLEndpointFactory = (path, useBranch) => (params, pathParams) => {
   const basePath = projectId ? useBranch ? (0, _branches2.getBranchBasePath)(branchParams, projectId) : `/project/${projectId}` : '';
   return `${params.endpoint}${basePath}${path}`;
 };
-
 const getGraphQLEndpoint = getGraphQLEndpointFactory('/graphql', true);
 exports.getGraphQLEndpoint = getGraphQLEndpoint;
 const getGraphQLAdminEndpoint = getGraphQLEndpointFactory('/admin-graphql', false);
@@ -37,7 +28,6 @@ const defaultOptions = {
   retries: 3,
   timeout: 0
 };
-
 const createConnectorFactory = getGraphQLEndpoint => (params, authToken, pathParams, options) => {
   const endpoint = getGraphQLEndpoint(params, pathParams ?? {
     environment: _branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM
@@ -46,7 +36,8 @@ const createConnectorFactory = getGraphQLEndpoint => (params, authToken, pathPar
   const {
     timeout,
     retries
-  } = { ...defaultOptions,
+  } = {
+    ...defaultOptions,
     ...options
   };
   return async params => (0, _asyncRetry.default)(async bail => {
@@ -60,31 +51,25 @@ const createConnectorFactory = getGraphQLEndpoint => (params, authToken, pathPar
       }
     });
     const body = await res.json();
-
     if (res.ok) {
       return body;
     }
-
     const error = new _errors.HTTPError(`${res.statusText}: ${body.message}`, res.status);
-
     if (res.status === 401 || res.status === 403) {
       // Bail to stop retrying
       bail(error);
       return;
     }
-
     throw error;
   }, {
     retries
   });
 };
-
 exports.createConnectorFactory = createConnectorFactory;
 const createConnector = createConnectorFactory(getGraphQLEndpoint);
 exports.createConnector = createConnector;
 const createAdminConnector = createConnectorFactory(getGraphQLAdminEndpoint);
 exports.createAdminConnector = createAdminConnector;
-
 function graphQLQuery(query) {
   return async (client, variables) => {
     const {
@@ -94,11 +79,9 @@ function graphQLQuery(query) {
       query,
       variables
     });
-
     if (errors) {
       throw new Error(errors.map(error => error.message).join(', '));
     }
-
     return data.result;
   };
 }

package/dist/index.js

@@ -2,17 +2,11 @@
 "use strict";
 
 var _meow = _interopRequireDefault(require("meow"));
-
 var _main = _interopRequireDefault(require("./main"));
-
 var _config = require("./config");
-
 var _checkVersion = require("./check-version");
-
 var _options = require("./options");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const help = `
     Usage
       $ takeshape <comand>

package/dist/log.js

@@ -6,16 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.log = log;
 exports.logError = logError;
-
 function log(...args) {
   // eslint-disable-next-line no-console
   console.log.apply(null, args);
 }
-
 function logError(...args) {
   // eslint-disable-next-line no-console
   console.error.apply(null, args);
 }
-
 var _default = log;
 exports.default = _default;

package/dist/main.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _log = _interopRequireDefault(require("./log"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const commandPath = {
   build: 'build-or-watch',
   watch: 'build-or-watch',
@@ -25,14 +22,11 @@ const commandPath = {
   validate: 'validate',
   branch: 'branch'
 };
-
 async function _default(cli, params) {
   const command = cli.input[0];
   const path = commandPath[command];
-
   if (path) {
     const fn = require(`./commands/${path}`).default;
-
     await fn(cli, params);
   } else {
     (0, _log.default)('No such command:' + cli.help);

package/dist/prompt.js

@@ -6,15 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.confirm = confirm;
 exports.prompt = prompt;
 exports.promptList = promptList;
-
 var _inquirer = _interopRequireDefault(require("inquirer"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function prompt(options) {
   return _inquirer.default.prompt(options);
 }
-
 async function confirm(message) {
   const {
     isConfirmed
@@ -25,7 +21,6 @@ async function confirm(message) {
   });
   return isConfirmed;
 }
-
 async function promptList(message, choices) {
   const {
     id

package/dist/types.js

@@ -6,15 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.isLinkedCliConfig = isLinkedCliConfig;
 exports.isLoggedInAndLinkedConfig = isLoggedInAndLinkedConfig;
 exports.isLoggedInCliConfig = isLoggedInCliConfig;
-
 function isLinkedCliConfig(cliConfig) {
   return cliConfig.projectId !== undefined && cliConfig.linkedApiKey !== undefined;
 }
-
 function isLoggedInCliConfig(cliConfig) {
   return cliConfig.authToken !== undefined;
 }
-
 function isLoggedInAndLinkedConfig(cliConfig) {
   return isLinkedCliConfig(cliConfig) && isLoggedInCliConfig(cliConfig);
 }

package/dist/util/api.js

@@ -6,16 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = api;
 exports.getAuthHeader = getAuthHeader;
 exports.isJWT = isJWT;
-
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
 var _errors = require("../errors");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function isValidHeader(str) {
   const json = Buffer.from(str, 'base64').toString('utf8');
-
   try {
     const header = JSON.parse(json);
     return header.typ === 'JWT';
@@ -23,54 +18,43 @@ function isValidHeader(str) {
     return false;
   }
 }
-
 function isJWT(str) {
   const parts = str.split('.');
   return parts.length === 3 && isValidHeader(parts[0]);
 }
-
 function getAuthHeader(authToken) {
   if (!authToken) {
     return {};
   }
-
   return isJWT(authToken) ? {
     'X-TakeShape-Token': authToken
   } : {
     Authorization: `Bearer ${authToken}`
   };
 }
-
 async function api(params, method, path, body) {
   var _params$linkedApiKey;
-
   const requestParams = {
     method,
-    headers: { ...getAuthHeader(params.authToken ?? ((_params$linkedApiKey = params.linkedApiKey) === null || _params$linkedApiKey === void 0 ? void 0 : _params$linkedApiKey.apiKey)),
+    headers: {
+      ...getAuthHeader(params.authToken ?? ((_params$linkedApiKey = params.linkedApiKey) === null || _params$linkedApiKey === void 0 ? void 0 : _params$linkedApiKey.apiKey)),
       'Content-Type': 'application/json'
     }
   };
-
   if (body) {
     requestParams.body = JSON.stringify(body);
   }
-
   const endpoint = `${params.endpoint}${path}`;
   const res = await (0, _nodeFetch.default)(endpoint, requestParams);
-
   if (res.ok) {
     const contentLengthHeader = res.headers.get('content-length');
-
     if (contentLengthHeader !== null) {
       const contentLength = parseInt(contentLengthHeader, 10);
-
       if (contentLength === 0) {
         return;
       }
     }
-
     return res.json();
   }
-
   throw new _errors.HTTPError(`${res.statusText}`, res.status);
 }

package/dist/util/branches.js

@@ -8,66 +8,50 @@ exports.getBranchBasePath = getBranchBasePath;
 exports.getBranchParams = getBranchParams;
 exports.getEnvironment = getEnvironment;
 exports.isEnvironment = isEnvironment;
-
 var _fatalError = require("./fatal-error");
-
 var _compact = _interopRequireDefault(require("lodash/compact"));
-
 var _branches = require("@takeshape/branches");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function getEnvironment(cli, flag = 'branch') {
   if (cli.flags.production) {
     return _branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM;
   }
-
   if (cli.flags.development) {
     return _branches.BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM;
   }
-
   if (cli.flags.scratch) {
     return _branches.BRANCH_ENVIRONMENT_SCRATCH_ENUM;
   }
-
   return cli.flags[flag] ? _branches.BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM : _branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM;
 }
-
 function isEnvironment(environment) {
   return [_branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM, _branches.BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM, _branches.BRANCH_ENVIRONMENT_SCRATCH_ENUM].includes(environment);
 }
-
 function getBranchArgs(name) {
   if (name === _branches.BRANCH_ENVIRONMENT_PRODUCTION) {
     return {
       environment: _branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM
     };
   }
-
   return {
     environment: _branches.BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM,
     branchName: name
   };
 }
-
 function getBranchParams(cli, flag = 'branch') {
   const branch = cli.flags[flag];
   const environment = getEnvironment(cli, flag);
-
   if (environment === _branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM && branch) {
     return (0, _fatalError.fatalError)('There is only one production branch --name is invalid');
   }
-
   if (environment === _branches.BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM && !branch) {
     return (0, _fatalError.fatalError)('Development branches require a name, please specify one with --name');
   }
-
   return {
     branch,
     environment
   };
 }
-
 function getBranchBasePath({
   environment,
   branch

package/dist/util/cached-connector.js

@@ -4,31 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.connectorWithCache = connectorWithCache;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _objectHash = _interopRequireDefault(require("object-hash"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const cacheDir = '.cache';
-
 function connectorWithCache(connector) {
   const decorated = async params => {
     const cachePath = _path.default.join(cacheDir, `${(0, _objectHash.default)(params)}.json`);
-
     if (await _fsExtra.default.pathExists(cachePath)) {
       return _fsExtra.default.readJSON(cachePath);
     }
-
     const [result] = await Promise.all([connector(params), _fsExtra.default.mkdirs(cacheDir)]);
     await _fsExtra.default.writeJSON(cachePath, result);
     return result;
   };
-
   decorated.clearCache = async () => _fsExtra.default.remove(cacheDir);
-
   return decorated;
 }

package/dist/util/connector.js

@@ -4,15 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createConnector = createConnector;
-
 var _ssg = require("@takeshape/ssg");
-
 var _graphql = require("../graphql");
-
 var _cachedConnector = require("./cached-connector");
-
 function createConnector(params, branchParams, options) {
-  const connector = (0, _ssg.connectorWithMigrations)((0, _graphql.createConnector)(params, params.linkedApiKey.apiKey, { ...branchParams,
+  const connector = (0, _ssg.connectorWithMigrations)((0, _graphql.createConnector)(params, params.linkedApiKey.apiKey, {
+    ...branchParams,
     projectId: params.projectId
   }, options));
   return options !== null && options !== void 0 && options.cache ? (0, _cachedConnector.connectorWithCache)(connector) : connector;