@takeshape/cli 9.80.4 → 9.81.3

package/dist/commands/export/project-export.js

@@ -4,29 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _fsExtra = require("fs-extra");
-
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _streams = require("@takeshape/streams");
-
 var _spin = _interopRequireDefault(require("../../util/spin"));
-
 var _log = _interopRequireDefault(require("../../log"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _graphql = require("../../graphql");
-
 var _linkedCommand = require("../../util/linked-command");
-
 var _selectProject = require("../../util/select-project");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const startExport = (0, _graphql.graphQLQuery)(`
   mutation ($empty: Boolean) {
     result: tsExportProject(empty: $empty, origin: "@takeshape/cli")
@@ -41,7 +29,6 @@ const getExport = (0, _graphql.graphQLQuery)(`
     }
   }
 `);
-
 async function downloadExport(projectExport, basePath) {
   // Download the file to the current directory
   const fileName = `export-${projectExport.id}.zip`;
@@ -49,6 +36,7 @@ async function downloadExport(projectExport, basePath) {
   await (0, _streams.pump)(res.body, (0, _fsExtra.createWriteStream)(_path.default.join(basePath, fileName)));
   return fileName;
 }
+
 /*
 takeshape export --project
 
@@ -58,8 +46,6 @@ Options:
   --without-data: download an empty project, defaults to false
   --to: the path to save the download, defaults to current directory
 */
-
-
 var _default = (0, _linkedCommand.loggedInCommand)(async (cli, params) => {
   const {
     flags
@@ -72,19 +58,14 @@ var _default = (0, _linkedCommand.loggedInCommand)(async (cli, params) => {
   } = params;
   const withoutData = flags.withoutData ?? false;
   const basePath = flags.to ?? '.';
-
   if (!projectId) {
     const choice = await (0, _selectProject.selectProject)(params);
-
     if (!choice) {
       return;
     }
-
     projectId = choice.value;
   }
-
   const client = (0, _graphql.createAdminConnector)(params, authToken, projectId);
-
   try {
     const exportId = await startExport(client, {
       empty: withoutData
@@ -105,5 +86,4 @@ var _default = (0, _linkedCommand.loggedInCommand)(async (cli, params) => {
     process.exit(1);
   }
 });
-
 exports.default = _default;

package/dist/commands/export/schema-export.js

@@ -4,31 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _fatalError = require("../../util/fatal-error");
-
 var _api = _interopRequireDefault(require("../../util/api"));
-
 var _log = _interopRequireDefault(require("../../log"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _linkedCommand = require("../../util/linked-command");
-
 var _selectProject = require("../../util/select-project");
-
 var _branches = require("../../util/branches");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const DEFAULT_SCHEMA_FILE_NAME = 'schema.json';
-
 /*
 takeshape export --schema --to ./path/to
 
@@ -47,7 +34,6 @@ var _default = (0, _linkedCommand.loggedInCommand)(async (cli, params) => {
   } = params;
   const branchParams = (0, _branches.getBranchParams)(cli);
   let outputPath;
-
   if (flags.to) {
     if (flags.to.endsWith('.json')) {
       outputPath = flags.to;
@@ -58,31 +44,24 @@ var _default = (0, _linkedCommand.loggedInCommand)(async (cli, params) => {
   } else {
     outputPath = _path.default.join('.', DEFAULT_SCHEMA_FILE_NAME);
   }
-
   if (!projectId) {
     const choice = await (0, _selectProject.selectProject)(params);
-
     if (!choice) {
       return;
     }
-
     projectId = choice.value;
     projectName = choice.name;
   }
-
   try {
     (0, _log.default)(`Downloading schema for project ${projectName}…\n`);
     const schema = await (0, _api.default)(params, 'GET', `${(0, _branches.getBranchBasePath)(branchParams, projectId)}/schema`);
-
     _fs.default.writeFileSync(outputPath, JSON.stringify(schema, null, 2), {
       encoding: 'utf8'
     });
-
     (0, _log.default)(_chalk.default.green(`Success!`), `Schema version ${schema.version} written to ${outputPath}.`);
     process.exit(0);
   } catch (e) {
     return (0, _fatalError.fatalError)(e.message);
   }
 });
-
 exports.default = _default;

package/dist/commands/import/index.js

@@ -4,30 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _projectImport = _interopRequireDefault(require("./project-import"));
-
 var _schemaImport = _interopRequireDefault(require("./schema-import"));
-
 var _rolesImport = _interopRequireDefault(require("./roles-import"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const commandHandler = async (cli, params) => {
   const {
     flags
   } = cli;
-
   if (flags.schema) {
     return (0, _schemaImport.default)(cli, params);
   }
-
   if (flags.roles) {
     return (0, _rolesImport.default)(cli, params);
   }
-
   return (0, _projectImport.default)(cli, params);
 };
-
 var _default = commandHandler;
 exports.default = _default;

package/dist/commands/import/project-import.js

@@ -5,38 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.determineImportStrategy = determineImportStrategy;
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _path = require("path");
-
 var _archiver = _interopRequireDefault(require("archiver"));
-
 var _streams = require("@takeshape/streams");
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _log = _interopRequireDefault(require("../../log"));
-
 var _upload = require("../../util/upload");
-
 var _spin = _interopRequireDefault(require("../../util/spin"));
-
 var _graphql = require("../../graphql");
-
 var _fatalError = require("../../util/fatal-error");
-
 var _linkedCommand = require("../../util/linked-command");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var TO;
-
-(function (TO) {
+var TO = /*#__PURE__*/function (TO) {
   TO["NEW_PROJECT"] = "new-project";
   TO["CURRENT_PROJECT"] = "current-project";
-})(TO || (TO = {}));
-
+  return TO;
+}(TO || {});
 const startImport = (0, _graphql.graphQLQuery)(`
   mutation ($uri: String!, $name: String, $projectId: String) {
     result: tsImportProject(uri: $uri, name: $name, origin: "@takeshape/cli", projectId: $projectId)
@@ -60,44 +45,35 @@ const getUploadUrl = (0, _graphql.graphQLQuery)(`
     }
   }
 `);
-
 async function determineImportStrategy(path) {
   if (/^https?:\/\/.*/.exec(path) !== null) {
     return 'uri';
   }
-
   if (/\.zip$/.exec(path) !== null) {
     return 'zip';
   }
-
   await _fsExtra.default.access(path);
-
   if (_fsExtra.default.statSync(path).isDirectory()) {
     return 'dir';
   }
-
   throw Error('Unrecognized import path provided. Please provide a URI, zip path, or directory path');
 }
-
 function getTo(to) {
   if (to === undefined) {
     return TO.NEW_PROJECT;
   }
-
   if (Object.values(TO).includes(to)) {
     return to;
   }
-
   throw new Error(`Invalid "to" param. Was ${to}, must be one of: ${Object.values(TO).join(', ')}`);
 }
-
 async function listenForImportSuccess(client, importId) {
   // Spin until we get a 'success' message or it throws an error
   const spinQuery = getImport.bind(getImport, client, {
     importId
   });
-  await (0, _spin.default)(spinQuery); // Return the ID of the project created by the import
-
+  await (0, _spin.default)(spinQuery);
+  // Return the ID of the project created by the import
   const {
     projectId
   } = await getImport(client, {
@@ -105,7 +81,6 @@ async function listenForImportSuccess(client, importId) {
   });
   return projectId;
 }
-
 async function uploadZipFile(client, filename, filePath, projectId) {
   const {
     uri,
@@ -117,6 +92,7 @@ async function uploadZipFile(client, filename, filePath, projectId) {
   await (0, _upload.uploadFile)(filePath, uri);
   return importId;
 }
+
 /*
 Takeshape import --project
 
@@ -128,19 +104,15 @@ Flags:
 --name  Provides a name for the newly imported project.
         Otherwise, the import will use the name in the pattern.yml file.
 */
-
-
 var _default = (0, _linkedCommand.loggedInCommand)(async (cli, params) => {
   const {
     flags
-  } = cli; // We need to get a user token in order for the import to work
-
+  } = cli;
+  // We need to get a user token in order for the import to work
   if (!flags || !flags.from) {
     return (0, _fatalError.fatalError)('No flags provided.');
   }
-
   const client = (0, _graphql.createAdminConnector)(params, params.authToken);
-
   try {
     const {
       from
@@ -148,20 +120,15 @@ var _default = (0, _linkedCommand.loggedInCommand)(async (cli, params) => {
     const strategy = await determineImportStrategy(from);
     const to = getTo(flags.to);
     const projectId = to === TO.CURRENT_PROJECT ? params.projectId : undefined;
-
     if (to === TO.CURRENT_PROJECT && projectId === undefined) {
       throw new Error('Not currently linked to a project. Run `takeshape link` to link to a project.');
     }
-
     let importId;
-
     if (strategy === 'dir') {
       (0, _log.default)(`Zipping up ${from}…`);
       const dirName = (0, _path.basename)(from);
       const [zipPath] = (0, _upload.createTempFile)(`${dirName}.zip`);
-
       const output = _fsExtra.default.createWriteStream(zipPath);
-
       const archive = (0, _archiver.default)('zip');
       archive.directory(from, false);
       await archive.finalize();
@@ -169,13 +136,11 @@ var _default = (0, _linkedCommand.loggedInCommand)(async (cli, params) => {
       (0, _log.default)(`Starting import from ${dirName}.zip…\n`);
       importId = await uploadZipFile(client, `${dirName}.zip`, zipPath, projectId);
     }
-
     if (strategy === 'zip') {
       (0, _log.default)(`Starting import from ${from}…\n`);
       const fileName = (0, _path.basename)(from);
       importId = await uploadZipFile(client, fileName, from, projectId);
     }
-
     if (strategy === 'uri') {
       (0, _log.default)(`Starting import from ${from}…\n`);
       importId = await startImport(client, {
@@ -184,7 +149,6 @@ var _default = (0, _linkedCommand.loggedInCommand)(async (cli, params) => {
         projectId
       });
     }
-
     if (importId) {
       const resultProjectId = await listenForImportSuccess(client, importId);
       (0, _log.default)(_chalk.default.green(`Success!`), `${projectId ? 'Updated' : 'Created'} project ${resultProjectId} from import.`);
@@ -194,5 +158,4 @@ var _default = (0, _linkedCommand.loggedInCommand)(async (cli, params) => {
     return (0, _fatalError.fatalError)(error.message);
   }
 });
-
 exports.default = _default;

package/dist/commands/import/roles-import.js

@@ -4,47 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _fatalError = require("../../util/fatal-error");
-
 var _linkedCommand = require("../../util/linked-command");
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _log = require("../../log");
-
 var _api = _interopRequireDefault(require("../../util/api"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _schema = require("@takeshape/schema");
-
 var _fs = require("../../util/fs");
-
 var _branches = require("../../util/branches");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = (0, _linkedCommand.linkedCommand)(async (cli, params) => {
   const {
     flags
   } = cli;
-
   if (!flags.from) {
     return (0, _fatalError.fatalError)('No roles file provided. Use `--from path/to/file` or `--from directory`.');
   }
-
   const {
     exists,
     file
   } = (0, _fs.resolveFromFlag)(flags.from, 'roles.json');
-
   if (!exists) {
     return (0, _fatalError.fatalError)(`Roles file does not exist: ${file}`);
   }
-
   const branchParams = (0, _branches.getBranchParams)(cli);
-
   try {
     const roles = JSON.parse(_fsExtra.default.readFileSync(file).toString());
     const validatedRoles = (0, _schema.ensureValidRoleImport)(roles);
@@ -55,5 +39,4 @@ var _default = (0, _linkedCommand.linkedCommand)(async (cli, params) => {
     return (0, _fatalError.fatalError)(e.message);
   }
 });
-
 exports.default = _default;

package/dist/commands/import/schema-import.js

@@ -4,31 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _fatalError = require("../../util/fatal-error");
-
 var _api = _interopRequireDefault(require("../../util/api"));
-
 var _log = _interopRequireDefault(require("../../log"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _schema = require("@takeshape/schema");
-
 var _linkedCommand = require("../../util/linked-command");
-
 var _formatValidationResult = require("../../util/format-validation-result");
-
 var _fs = require("../../util/fs");
-
 var _branches = require("../../util/branches");
-
 var _url = require("url");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /*
 takeshape import --schema --from ./path/to/schema.json
 
@@ -45,41 +32,32 @@ var _default = (0, _linkedCommand.linkedCommand)(async (cli, params) => {
   const {
     projectId
   } = params;
-
   if (!flags.from) {
     return (0, _fatalError.fatalError)('No schema file provided. Use `--from path/to/file` or `--from directory`.');
   }
-
   const {
     exists,
     file
   } = (0, _fs.resolveFromFlag)(flags.from, 'schema.json');
-
   if (!exists) {
     return (0, _fatalError.fatalError)(`Schema file does not exist: ${file}`);
   }
-
   const branchParams = (0, _branches.getBranchParams)(cli);
   const queryParams = {
     force: 'true'
   };
-
   if (flags.preserveAuth) {
     queryParams.preserveAuth = 'true';
   }
-
   if (flags.tag) {
     queryParams.tag = flags.tag;
   }
-
   try {
     const newSchema = JSON.parse(_fsExtra.default.readFileSync(file).toString());
     const validationString = (0, _formatValidationResult.formatValidationResult)((0, _schema.validateProjectSchemaImport)(newSchema));
-
     if (validationString) {
       return (0, _fatalError.fatalError)(validationString);
     }
-
     (0, _log.default)(`Uploading schema from ${file}…\n`);
     const schemaImportPath = `${(0, _branches.getBranchBasePath)(branchParams, projectId)}/schema?${new _url.URLSearchParams(queryParams)}`;
     const uploaded = await (0, _api.default)(params, 'POST', schemaImportPath, newSchema);
@@ -89,5 +67,4 @@ var _default = (0, _linkedCommand.linkedCommand)(async (cli, params) => {
     return (0, _fatalError.fatalError)(e.message);
   }
 });
-
 exports.default = _default;

package/dist/commands/link.js

@@ -4,60 +4,45 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _log = _interopRequireDefault(require("../log"));
-
 var _prompt = require("../prompt");
-
 var _data = require("../util/data");
-
 var _config = require("../config");
-
 var _linkedCommand = require("../util/linked-command");
-
 var _selectProject = require("../util/select-project");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = (0, _linkedCommand.loggedInCommand)(async (_, params) => {
   try {
     const project = await (0, _selectProject.selectProject)(params);
-
     if (!project) {
       return;
     }
-
     const sites = await (0, _data.fetchSites)(params, project.value);
     let site;
-
     if (sites.length) {
       var _site;
-
       site = await (0, _prompt.promptList)('Select a site:', sites);
-
       if (((_site = site) === null || _site === void 0 ? void 0 : _site.value) === 'NONE') {
         site = undefined;
       }
     }
-
     const isSameProject = params.projectId === project.value;
     let {
       linkedApiKey
-    } = params; // Clean up old API key
+    } = params;
 
+    // Clean up old API key
     if (!isSameProject && params.linkedApiKey && params.projectId) {
       await (0, _data.deleteApiKey)(params, params.projectId, params.linkedApiKey.id);
-    } // Only create a new API key if project has changed
-
+    }
 
+    // Only create a new API key if project has changed
     if (!isSameProject || !linkedApiKey) {
       linkedApiKey = await (0, _data.createReadOnlyApiKey)(params, project.value);
     }
-
     await (0, _config.writeLinkedProjectConfig)(params, linkedApiKey, project, site);
   } catch (e) {
     (0, _log.default)(e);
   }
 });
-
 exports.default = _default;

package/dist/commands/login.js

@@ -4,21 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _log = _interopRequireDefault(require("../log"));
-
 var _login = require("../util/login");
-
 var _config = require("../config");
-
 var _data = require("../util/data");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const login = async (_, params) => {
   try {
     const userJwt = await (params.cliLogin ? (0, _login.loginCli)(params, 3) : (0, _login.loginBrowser)(params));
-
     if (userJwt) {
       const personalAccessToken = await (0, _data.createPersonalAccessToken)(params, userJwt);
       await (0, _config.writeHomeConfig)(personalAccessToken);
@@ -27,6 +20,5 @@ const login = async (_, params) => {
     (0, _log.default)(e);
   }
 };
-
 var _default = login;
 exports.default = _default;

package/dist/commands/logout.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 logout = async (_, params) => {
   try {
     if ((0, _types.isLoggedInCliConfig)(params)) {
@@ -25,6 +19,5 @@ const logout = async (_, params) => {
     (0, _log.default)(e);
   }
 };
-
 var _default = logout;
 exports.default = _default;

package/dist/commands/schema.js

@@ -4,22 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _linkedCommand = require("../util/linked-command");
-
 var _connector = require("../util/connector");
-
 var _getClientSchema = _interopRequireDefault(require("../util/get-client-schema"));
-
 var _branches = require("../util/branches");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = (0, _linkedCommand.linkedCommand)(async (cli, params) => {
   const connector = (0, _connector.createConnector)(params, (0, _branches.getBranchParams)(cli), {
     cache: false
   });
   await (0, _getClientSchema.default)(connector);
 });
-
 exports.default = _default;

package/dist/commands/status.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _linkedCommand = require("../util/linked-command");
-
 var _log = _interopRequireDefault(require("../log"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = (0, _linkedCommand.linkedCommand)(async (cli, params) => {
   (0, _log.default)(`Project: ${params.projectName} \nStatic Site: ${params.siteName ?? 'not configured'}`);
 });
-
 exports.default = _default;

package/dist/commands/types.js

@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _linkedCommand = require("../util/linked-command");
-
 var _generateTypes = require("../util/generate-types");
-
 var _getClientSchema = require("../util/get-client-schema");
-
 const DEFAULT_GENERATED_FILE = './takeshape.d.ts';
+
 /*
 takeshape types --to ./takeshape.d.ts
 
@@ -21,10 +18,8 @@ Options:
   --in: if provided, will generate types used
   --to: the path to save the download or the full file path, defaults to current directory
 */
-
 var _default = (0, _linkedCommand.linkedCommand)(async cli => {
   const output = cli.flags.to ?? DEFAULT_GENERATED_FILE;
   await (0, _generateTypes.generateTypes)(_getClientSchema.SCHEMA_FILE_NAME, output);
 });
-
 exports.default = _default;