@takeshape/cli 9.80.4 → 9.81.3

package/dist/util/data.js

@@ -14,15 +14,10 @@ exports.deletePersonalAccessTokenMutation = void 0;
 exports.fetchProjects = fetchProjects;
 exports.fetchSites = fetchSites;
 exports.siteListQuery = exports.projectListQuery = exports.laterSite = void 0;
-
 var _graphql = require("../graphql");
-
 var _errors = require("../errors");
-
 var _os = _interopRequireDefault(require("os"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const projectListQuery = `
     {
        projects: tsGetProjectList {
@@ -44,7 +39,6 @@ const siteListQuery = `
     }
 `;
 exports.siteListQuery = siteListQuery;
-
 async function fetchProjects(params) {
   try {
     const client = (0, _graphql.createAdminConnector)(params, params.authToken);
@@ -58,13 +52,11 @@ async function fetchProjects(params) {
     throw (0, _errors.formatErrorMessage)(e, 'fetching your projects');
   }
 }
-
 const laterSite = {
   name: 'Select site later',
   value: 'NONE'
 };
 exports.laterSite = laterSite;
-
 async function fetchSites(params, pathParams) {
   try {
     const client = (0, _graphql.createConnector)(params, params.authToken, pathParams);
@@ -79,7 +71,6 @@ async function fetchSites(params, pathParams) {
     throw (0, _errors.formatErrorMessage)(e, 'fetching your static sites');
   }
 }
-
 const createPersonalAccessTokenMutation = (0, _graphql.graphQLQuery)(`
   mutation ($name: String!){
     result: tsCreatePersonalAccessToken(name: $name) {
@@ -110,11 +101,9 @@ const deleteApiKeyMutation = (0, _graphql.graphQLQuery)(`
   }
 `);
 exports.deleteApiKeyMutation = deleteApiKeyMutation;
-
 function createKeyName() {
   return `TakeShape CLI ${_os.default.hostname()} ${new Date().toISOString().split('T')[0]}`;
 }
-
 async function createPersonalAccessToken(params, userJwt) {
   try {
     const client = (0, _graphql.createAdminConnector)(params, userJwt);
@@ -125,23 +114,19 @@ async function createPersonalAccessToken(params, userJwt) {
     throw (0, _errors.formatErrorMessage)(e, 'creating your personal access token');
   }
 }
-
 async function deletePersonalAccessToken(params) {
   try {
     const client = (0, _graphql.createAdminConnector)(params, params.authToken);
-
     if (params.personalAccessTokenId) {
       return await deletePersonalAccessTokenMutation(client, {
         id: params.personalAccessTokenId
       });
     }
-
     throw new Error('personalAccessTokenId is required');
   } catch (e) {
     throw (0, _errors.formatErrorMessage)(e, 'deleting your personal access token');
   }
 }
-
 async function createReadOnlyApiKey(params, pathParams) {
   try {
     const client = (0, _graphql.createAdminConnector)(params, params.authToken, pathParams);
@@ -152,7 +137,6 @@ async function createReadOnlyApiKey(params, pathParams) {
     throw (0, _errors.formatErrorMessage)(e, 'creating your read-only api key');
   }
 }
-
 async function deleteApiKey(params, pathParams, apiKeyId) {
   try {
     const client = (0, _graphql.createAdminConnector)(params, params.authToken, pathParams);

package/dist/util/fatal-error.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fatalError = fatalError;
-
 var _log = _interopRequireDefault(require("../log"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function fatalError(message) {
   (0, _log.default)(_chalk.default.red('Error'), message);
   process.exit(1);

package/dist/util/format-error.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = formatError;
-
 function formatError(error) {
   return error.message || JSON.stringify(error, null, 2);
 }

package/dist/util/format-validation-result.js

@@ -4,13 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.formatValidationResult = formatValidationResult;
-
 function formatValidationResult(schemaValidationResult) {
   const {
     valid,
     errors
   } = schemaValidationResult;
-
   if (!valid && errors) {
     return `Invalid schema:\n  ${errors.map(e => `${e.type}: ${e.message} at ${e.path.join('/')}`).join('\n  ')}`;
   }

package/dist/util/fs.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveFromFlag = resolveFromFlag;
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _path = _interopRequireDefault(require("path"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function resolveFromFlag(from, expectedFilename) {
   if (!_fsExtra.default.existsSync(from)) {
     return {
@@ -18,23 +14,19 @@ function resolveFromFlag(from, expectedFilename) {
       file: from
     };
   }
-
   if (_fsExtra.default.lstatSync(from).isFile()) {
     return {
       exists: true,
       file: from
     };
   }
-
   const file = _path.default.join(from, expectedFilename);
-
   if (_fsExtra.default.existsSync(file) && _fsExtra.default.lstatSync(file).isFile()) {
     return {
       exists: true,
       file
     };
   }
-
   return {
     exists: false,
     file

package/dist/util/generate-types.js

@@ -4,31 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.generateTypes = generateTypes;
-
 var _fsExtra = require("fs-extra");
-
 var _path = require("path");
-
 var _graphql = require("graphql");
-
 var _core = require("@graphql-codegen/core");
-
 var typescriptPlugin = _interopRequireWildcard(require("@graphql-codegen/typescript"));
-
 var _load = require("@graphql-tools/load");
-
 var _graphqlFileLoader = require("@graphql-tools/graphql-file-loader");
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _log = _interopRequireDefault(require("../log"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 /** Uses [GraphQL Code Generator](https://www.graphql-code-generator.com/)
  *  to create TypeScript definitions from a GraphQL schema file.
  */
@@ -46,11 +33,12 @@ async function generateTypes(schemaFile, outputFile) {
     // returns the string output, rather than writing to a file
     filename: outputFile,
     schema: (0, _graphql.parse)((0, _graphql.printSchema)(schema)),
-    plugins: [// Each plugin should be an object
+    plugins: [
+    // Each plugin should be an object
     {
       typescript: {} // Here you can pass configuration to the plugin
-
     }],
+
     pluginMap: {
       typescript: typescriptPlugin
     }

package/dist/util/get-client-schema.js

@@ -5,18 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.SCHEMA_FILE_NAME = void 0;
 exports.getClientSchema = getClientSchema;
-
 var _graphql = require("graphql");
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _oraWrapper = _interopRequireDefault(require("./ora-wrapper"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const SCHEMA_FILE_NAME = 'takeshape-project.graphql';
 exports.SCHEMA_FILE_NAME = SCHEMA_FILE_NAME;
-
 async function getClientSchema(connector) {
   const res = await connector({
     query: (0, _graphql.getIntrospectionQuery)()
@@ -25,7 +19,5 @@ async function getClientSchema(connector) {
   const result = (0, _graphql.printSchema)(schema);
   await _fsExtra.default.writeFile(SCHEMA_FILE_NAME, result);
 }
-
 var _default = (0, _oraWrapper.default)(getClientSchema, 'Getting client schema.', `Client schema saved as ${SCHEMA_FILE_NAME}.`, 'Failed while getting client schema.');
-
 exports.default = _default;

package/dist/util/glitch.js

@@ -7,39 +7,27 @@ exports.isGlitch = isGlitch;
 exports.readDotEnv = readDotEnv;
 exports.updateEnv = updateEnv;
 exports.writeDotEnv = writeDotEnv;
-
 var _dotenv = _interopRequireDefault(require("dotenv"));
-
 var _dotenvStringify = _interopRequireDefault(require("dotenv-stringify"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _path = _interopRequireDefault(require("path"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function isGlitch() {
   return Boolean(process.env.GLITCH) || Boolean(process.env.PROJECT_REMIX_CHAIN);
 }
-
 function getEnvPath() {
   return _path.default.resolve(process.cwd(), '.env');
 }
-
 async function readDotEnv() {
   const path = getEnvPath();
-
   if (_fsExtra.default.existsSync(path)) {
     return _dotenv.default.parse(await _fsExtra.default.readFile(path));
   }
-
   return {};
 }
-
 async function writeDotEnv(env) {
   return _fsExtra.default.writeFile(getEnvPath(), (0, _dotenvStringify.default)(env));
 }
-
 async function updateEnv(authToken, project, site = {}) {
   const env = await readDotEnv();
   env.TS_AUTH_TOKEN = authToken;

package/dist/util/linked-command.js

@@ -6,39 +6,32 @@ Object.defineProperty(exports, "__esModule", {
 exports.linkedCommand = linkedCommand;
 exports.loggedInAndLinkedCommand = loggedInAndLinkedCommand;
 exports.loggedInCommand = loggedInCommand;
-
 var _types = require("../types");
-
 var _log = require("../log");
-
 function assertLinked(params) {
   if (!(0, _types.isLinkedCliConfig)(params)) {
     (0, _log.logError)('Error: Missing project information not initialized please run `takeshape link`.');
     process.exit(1);
   }
 }
-
 function assertLoggedIn(params) {
   if (!(0, _types.isLoggedInCliConfig)(params)) {
     (0, _log.logError)(`Error: You are not logged in to TakeShape. Please run 'takeshape login' to login.`);
     process.exit(1);
   }
 }
-
 function linkedCommand(handler) {
   return async (cli, params) => {
     assertLinked(params);
     return handler(cli, params);
   };
 }
-
 function loggedInCommand(handler) {
   return async (cli, params) => {
     assertLoggedIn(params);
     return handler(cli, params);
   };
 }
-
 function loggedInAndLinkedCommand(handler) {
   return async (cli, params) => {
     assertLoggedIn(params);

package/dist/util/login.js

@@ -8,53 +8,42 @@ exports.attemptOpenForgotPassword = attemptOpenForgotPassword;
 exports.loginBrowser = loginBrowser;
 exports.loginCli = loginCli;
 exports.waitingQuestions = exports.loginQuestions = void 0;
-
 var _http = _interopRequireDefault(require("http"));
-
 var _open = _interopRequireDefault(require("open"));
-
 var _prompt = require("../prompt");
-
 var _emailValidator = require("email-validator");
-
 var _getPort = _interopRequireDefault(require("get-port"));
-
 var _auth = require("../auth");
-
 var _messages = require("./messages");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const waitingQuestions = [{
   type: 'input',
   name: 'token',
   message: 'Opening a web browser to log you in. If the browser gives you a token, paste it here:\n'
 }];
 exports.waitingQuestions = waitingQuestions;
-
 async function loginBrowser(params) {
   // Port for login page to communicate with the CLI
-  const port = await (0, _getPort.default)(); // Open a browser to the login page
+  const port = await (0, _getPort.default)();
 
+  // Open a browser to the login page
   await (0, _open.default)(`${params.appUrl}/login?returnToCli=true&cliPort=${port}`, {
     wait: false
   });
-  let loginPromptUi; // Spin up an ad-hoc server to recive the auth token from the login page
+  let loginPromptUi;
 
+  // Spin up an ad-hoc server to recive the auth token from the login page
   return new Promise((resolve, reject) => {
     const server = _http.default.createServer((req, res) => {
       res.setHeader('Content-Type', 'text/plain');
       res.setHeader('Access-Control-Allow-Origin', params.appUrl);
       res.setHeader('Access-Control-Allow-Headers', 'x-takeshape-token');
-
       if (req.method === 'OPTIONS') {
         res.statusCode = 200;
         res.end('Success');
         return;
       }
-
       const token = req.headers['x-takeshape-token'];
-
       if (typeof token === 'string') {
         res.statusCode = 200;
         res.end('Success');
@@ -65,16 +54,13 @@ async function loginBrowser(params) {
         res.end('Bad Request');
         reject(new Error('Did not receive auth token from webapp.'));
       }
-
       if (loginPromptUi) {
         // @ts-expect-error `close` is protected but this is the suggested solution from here:
         // https://github.com/SBoudrias/Inquirer.js/issues/941
         loginPromptUi.close();
       }
-
       server.close();
     });
-
     server.listen(port, '127.0.0.1', async () => {
       const loginPrompt = (0, _prompt.prompt)(waitingQuestions);
       loginPromptUi = loginPrompt.ui;
@@ -84,58 +70,48 @@ async function loginBrowser(params) {
     });
   });
 }
-
 const loginQuestions = [{
   type: 'input',
   name: 'email',
   message: 'Enter your TakeShape email:',
-
   validate(input) {
     return (0, _emailValidator.validate)(input) || 'Please enter a valid email';
   }
-
 }, {
   type: 'password',
   name: 'password',
   message: 'Enter your TakeShape password:'
 }];
 exports.loginQuestions = loginQuestions;
-
 async function attemptLogin(params) {
   const answers = await (0, _prompt.prompt)(loginQuestions);
   return (0, _auth.login)(params.endpoint, answers.email, answers.password);
 }
-
 async function attemptOpenForgotPassword(params) {
   const isConfirmed = await (0, _prompt.confirm)('Would you like to open TakeShape to set a password?');
-
   if (isConfirmed) {
     await (0, _open.default)(params.appUrl + '/forgot-password', {
       wait: false
     });
   }
 }
-
 async function loginCli(params, maxAttempts) {
   let attempts = 0;
-
   do {
     attempts++;
-
     try {
       // eslint-disable-next-line no-await-in-loop
       return await attemptLogin(params);
     } catch (e) {
       if (e.statusCode === 403) {
         attempts--;
-        (0, _messages.missingPasswordMsg)(); // eslint-disable-next-line no-await-in-loop
-
+        (0, _messages.missingPasswordMsg)();
+        // eslint-disable-next-line no-await-in-loop
         await attemptOpenForgotPassword(params);
       } else {
         (0, _messages.invalidLoginMsg)();
       }
     }
   } while (attempts < maxAttempts);
-
   (0, _messages.forgotPasswordWarning)(params);
 }

package/dist/util/messages.js

@@ -11,13 +11,9 @@ exports.noProjectsError = noProjectsError;
 exports.waitingForLogin = void 0;
 exports.warning = warning;
 exports.writingHomeConfigDoneMsg = exports.writingFilesMsg = void 0;
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _log = _interopRequireDefault(require("../log"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function warning(msg) {
   return () => {
     msg.split('\n').forEach(line => {
@@ -25,13 +21,11 @@ function warning(msg) {
     });
   };
 }
-
 function info(msg) {
   return () => {
     (0, _log.default)(msg);
   };
 }
-
 const waitingForLogin = info('Opening a web browser to log you in...');
 exports.waitingForLogin = waitingForLogin;
 const loginSuccess = info('Successfully logged in.');
@@ -42,19 +36,15 @@ const missingPasswordMsg = info('No password set in TakeShape. Follow the forgot
 exports.missingPasswordMsg = missingPasswordMsg;
 const writingFilesMsg = info('Writing .takeshaperc, .graphqlconfig.');
 exports.writingFilesMsg = writingFilesMsg;
-
 const writingHomeConfigDoneMsg = path => {
   (0, _log.default)(`Personal access token saved to ${path}`);
 };
-
 exports.writingHomeConfigDoneMsg = writingHomeConfigDoneMsg;
 const consoleWarning = warning('**************************************************************************************************\n' + ' Add the following to your vcs ignore file:                                                       \n' + '   .takeshaperc                                                                                   \n' + '   .graphqlconfig                                                                                 \n' + '**************************************************************************************************');
 exports.consoleWarning = consoleWarning;
-
 function forgotPasswordWarning(params) {
   (0, _log.default)(`If you forgot your credentials please visit ${params.appUrl}/forgot-password`);
 }
-
 function noProjectsError(params) {
   (0, _log.default)(`No projects configured. Set one up at ${params.appUrl}/projects`);
 }

package/dist/util/ora-wrapper.js

@@ -4,19 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = oraWrapper;
-
 var _ora = _interopRequireDefault(require("ora"));
-
 var _formatError = _interopRequireDefault(require("./format-error"));
-
 var _log = require("../log");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function oraWrapper(fn, start, success, failure) {
   return async (...args) => {
     const spinner = (0, _ora.default)(start).start();
-
     try {
       await fn(...args);
       spinner.succeed(success);

package/dist/util/pusher.js

@@ -5,13 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleAction = handleAction;
 exports.subscribe = subscribe;
-
 var _api = _interopRequireDefault(require("./api"));
-
 var _pusherJs = _interopRequireDefault(require("pusher-js"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function handleAction(callback) {
   return action => {
     if (action.type === 'content/CONTENT_UPDATED' || action.type === 'content/CONTENT_CREATED' || action.type === 'content/CONTENT_DELETED') {
@@ -19,7 +15,6 @@ function handleAction(callback) {
     }
   };
 }
-
 async function subscribe(params, callback) {
   const config = await (0, _api.default)(params, 'GET', `/project/${params.projectId}/pusher-client-config`);
   const pusher = new _pusherJs.default(config.key, {

package/dist/util/runner.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createRunner = createRunner;
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _formatError = _interopRequireDefault(require("./format-error"));
-
 var _log = _interopRequireDefault(require("../log"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function createRunner(name, task) {
   let running = false;
   return async (...args) => {
@@ -20,7 +15,6 @@ function createRunner(name, task) {
       running = true;
       const startTime = Date.now();
       (0, _log.default)(`${name} - Started!`);
-
       try {
         const stats = await task(...args);
         const totalSeconds = (Date.now() - startTime) / 1000;
@@ -28,14 +22,12 @@ function createRunner(name, task) {
         const {
           warnings
         } = stats;
-
         if (warnings !== null && warnings !== void 0 && warnings.length) {
           (0, _log.default)(`${name} - ` + _chalk.default.yellow('Warnings:'));
           warnings.forEach(warning => {
             (0, _log.default)(_chalk.default.yellow(`${warning.source}: ${warning.message}`));
           });
         }
-
         running = false;
       } catch (error) {
         (0, _log.default)(`${name} - ` + _chalk.default.red(`Error:\n${(0, _formatError.default)(error)}`));

package/dist/util/select-project.js

@@ -4,20 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.selectProject = selectProject;
-
 var _data = require("./data");
-
 var _messages = require("./messages");
-
 var _prompt = require("../prompt");
-
 async function selectProject(params) {
   const projects = await (0, _data.fetchProjects)(params);
-
   if (!projects.length) {
     (0, _messages.noProjectsError)(params);
     return;
   }
-
   return (0, _prompt.promptList)('Select a project:', projects);
 }

package/dist/util/spin.js

@@ -4,38 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _util = require("@takeshape/util");
-
 const SPINTERVAL = 100;
-
 async function spin(spinQuery) {
   const res = await spinQuery();
   const status = res === null ? 'running' : res.status;
-
   switch (status) {
     case 'running':
       await (0, _util.delay)(SPINTERVAL);
       await spin(spinQuery);
       break;
-
     case 'completed':
       break;
-
     case 'timeout':
       throw new Error('Export timed out');
-
     case 'error':
       if (res !== null && res !== void 0 && res.message) {
         throw new Error(res.message);
       } else {
         throw new Error('An unknown error occurred');
       }
-
     default:
       throw new Error(`Unexpected export status: ${status}`);
   }
 }
-
 var _default = spin;
 exports.default = _default;