@takeshape/cli 9.80.3 → 9.81.0

package/dist/auth.js

@@ -6,38 +6,28 @@ Object.defineProperty(exports, "__esModule", {
 exports.login = login;
 exports.parseToken = parseToken;
 exports.projectAuth = projectAuth;
-
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
 var _errors = require("./errors");
-
 var _api = require("./util/api");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 async function parseToken(res) {
   try {
     const body = await res.json();
-
     if (body.token) {
       return body.token;
     }
-  } catch {// ignore parsing error
+  } catch {
+    // ignore parsing error
   }
-
   const cookie = res.headers.get('set-cookie');
-
   if (cookie) {
     const matches = /s=(.+?);/.exec(cookie);
-
     if (matches) {
       return matches[1];
     }
   }
-
   throw new _errors.HTTPError('Forbidden', 403);
 }
-
 async function fetchToken(method, endpoint, body, headers) {
   const params = {
     method,
@@ -46,27 +36,21 @@ async function fetchToken(method, endpoint, body, headers) {
       ...headers
     }
   };
-
   if (body) {
     params.body = JSON.stringify(body);
   }
-
   const res = await (0, _nodeFetch.default)(endpoint, params);
-
   if (res.ok) {
     return parseToken(res);
   }
-
   throw new _errors.HTTPError(`${res.statusText}`, res.status);
 }
-
 async function login(endpoint, email, password) {
   return fetchToken('POST', `${endpoint}/login`, {
     email,
     password
   });
 }
-
 async function projectAuth(endpoint, projectId, authToken) {
   try {
     return await fetchToken('GET', `${endpoint}/project/${projectId}/access-token`, null, (0, _api.getAuthHeader)(authToken));

package/dist/check-version.js

@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.checkVersion = checkVersion;
-
 var _semver = _interopRequireDefault(require("semver"));
-
 var _package = require("../package.json");
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _log = _interopRequireDefault(require("./log"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function checkVersion(currentVersion) {
   if (!_semver.default.satisfies(currentVersion, _package.engines.node)) {
     (0, _log.default)(_chalk.default.yellow(`WARNING: TakeShape CLI does not officially support node ${currentVersion} yet. Please use node version ${_package.engines.node}.`));

package/dist/commands/branch/commands/create.js

@@ -4,23 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBranch = void 0;
-
 var _linkedCommand = require("../../../util/linked-command");
-
 var _graphql = require("../../../graphql");
-
 var _log = _interopRequireDefault(require("../../../log"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _branches = require("../../../util/branches");
-
 var _fatalError = require("../../../util/fatal-error");
-
 var _prettyjson = _interopRequireDefault(require("prettyjson"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const createBranchMutation = (0, _graphql.graphQLQuery)(`
 mutation ($input: TSCreateSchemaBranchInput!) {
   result: tsCreateSchemaBranch(input: $input) {
@@ -38,11 +29,9 @@ const createBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, pa
     branch,
     environment
   } = (0, _branches.getBranchParams)(cli, 'name');
-
   if (environment === 'PRODUCTION') {
     return (0, _fatalError.fatalError)('There is only one production branch and it already exists');
   }
-
   try {
     const client = (0, _graphql.createAdminConnector)(params, params.authToken, params.projectId);
     const res = await createBranchMutation(client, {

package/dist/commands/branch/commands/delete.js

@@ -4,21 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.deleteBranch = void 0;
-
 var _linkedCommand = require("../../../util/linked-command");
-
 var _graphql = require("../../../graphql");
-
 var _log = _interopRequireDefault(require("../../../log"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _branches = require("../../../util/branches");
-
 var _fatalError = require("../../../util/fatal-error");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const deleteBranchMutation = (0, _graphql.graphQLQuery)(`
 mutation ($input: TSDeleteSchemaBranchInput!) {
   result: tsDeleteSchemaBranch(input: $input) {
@@ -33,11 +25,9 @@ const deleteBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, pa
     branch,
     environment
   } = (0, _branches.getBranchParams)(cli, 'name');
-
   if (environment === 'PRODUCTION') {
     return (0, _fatalError.fatalError)('You cannot delete the production branch');
   }
-
   const client = (0, _graphql.createAdminConnector)(params, params.authToken, params.projectId);
   const {
     deletedBranch
@@ -48,7 +38,6 @@ const deleteBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, pa
     }
   });
   const branchName = branch ?? environment.toLowerCase();
-
   if (deletedBranch) {
     (0, _log.default)(_chalk.default.green(`Branch "${branchName}" was deleted!`));
   } else {

package/dist/commands/branch/commands/list.js

@@ -4,21 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.listBranches = void 0;
-
 var _linkedCommand = require("../../../util/linked-command");
-
 var _graphql = require("../../../graphql");
-
 var _log = _interopRequireDefault(require("../../../log"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _formatRelative = _interopRequireDefault(require("date-fns/formatRelative"));
-
 var _prettyjson = _interopRequireDefault(require("prettyjson"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const getBranchListQuery = (0, _graphql.graphQLQuery)(`
 {
   result: tsGetSchemaBranchList(first: 100) {
@@ -39,7 +31,6 @@ const listBranches = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, pa
   const {
     nodes: branches
   } = await getBranchListQuery(client, {});
-
   for (const branch of branches ?? []) {
     const env = branch.environment.toLowerCase();
     const name = branch.branchName ?? env;

package/dist/commands/branch/commands/merge.js

@@ -4,24 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeBranch = void 0;
-
 var _linkedCommand = require("../../../util/linked-command");
-
 var _graphql = require("../../../graphql");
-
 var _log = _interopRequireDefault(require("../../../log"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _branches = require("../../../util/branches");
-
 var _fatalError = require("../../../util/fatal-error");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const getBranchQuery = (0, _graphql.graphQLQuery)(
-/* GraphQL */
-`
+const getBranchQuery = (0, _graphql.graphQLQuery)( /* GraphQL */`
   query CliGetBranchQuery($projectId: String!, $environment: TSSchemaBranchEnvironment!, $branchName: String) {
     result: tsGetSchemaBranch(projectId: $projectId, environment: $environment, branchName: $branchName) {
       latestVersion {
@@ -32,9 +22,7 @@ const getBranchQuery = (0, _graphql.graphQLQuery)(
     }
   }
 `);
-const getBranchParentQuery = (0, _graphql.graphQLQuery)(
-/* GraphQL */
-`
+const getBranchParentQuery = (0, _graphql.graphQLQuery)( /* GraphQL */`
   query CliGetBranchParentQuery($projectId: String!, $environment: TSSchemaBranchEnvironment!, $branchName: String) {
     result: tsGetSchemaBranch(projectId: $projectId, environment: $environment, branchName: $branchName) {
       parentVersion {
@@ -44,9 +32,7 @@ const getBranchParentQuery = (0, _graphql.graphQLQuery)(
     }
   }
 `);
-const mergeBranchMutation = (0, _graphql.graphQLQuery)(
-/* GraphQL */
-`
+const mergeBranchMutation = (0, _graphql.graphQLQuery)( /* GraphQL */`
   mutation CliMergeBranchMutation($input: TSMergeSchemaBranchInput!) {
     result: tsMergeSchemaBranch(input: $input) {
       dryRun
@@ -61,15 +47,12 @@ const mergeBranchMutation = (0, _graphql.graphQLQuery)(
     }
   }
 `);
-
 function ensureHeadArgs(cli) {
   if (!cli.flags.head) {
     throw new Error('You must provide a --head to merge.');
   }
-
   return (0, _branches.getBranchArgs)(cli.flags.head);
 }
-
 const mergeBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, params) => {
   try {
     const {
@@ -84,17 +67,14 @@ const mergeBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, par
     const targetInput = cli.flags.target && (0, _branches.getBranchArgs)(cli.flags.target);
     const client = (0, _graphql.createAdminConnector)(params, params.authToken, projectId);
     let base;
-
     if (baseInput) {
       const baseQueryResult = await getBranchQuery(client, {
         projectId,
         ...baseInput
       });
-
       if (!(baseQueryResult !== null && baseQueryResult !== void 0 && baseQueryResult.latestVersion)) {
         return (0, _fatalError.fatalError)('Base branch does not exist');
       }
-
       const {
         environment,
         branchName
@@ -108,14 +88,11 @@ const mergeBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, par
         projectId,
         ...head
       });
-
       if (!(parentQueryResult !== null && parentQueryResult !== void 0 && parentQueryResult.parentVersion)) {
         return (0, _fatalError.fatalError)('Head branch does not exist');
       }
-
       base = parentQueryResult.parentVersion;
     }
-
     const targetParams = targetInput ? {
       projectId,
       ...targetInput
@@ -124,11 +101,9 @@ const mergeBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, par
       ...base
     };
     const branchQueryResult = await getBranchQuery(client, targetParams);
-
     if (!(branchQueryResult !== null && branchQueryResult !== void 0 && branchQueryResult.latestVersion)) {
       return (0, _fatalError.fatalError)('Target branch does not exist');
     }
-
     const target = branchQueryResult.latestVersion;
     const res = await mergeBranchMutation(client, {
       input: {
@@ -147,7 +122,6 @@ const mergeBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, par
     const dryRunText = res.dryRun ? _chalk.default.blue('[DRY RUN]') : '';
     (0, _log.default)(_chalk.default.green(`${dryRunText} Head branch "${headBranchName}" was merged into base branch "${baseBranchName}"`.trim()));
     (0, _log.default)(_chalk.default.green(`${dryRunText} Target branch "${targetBranchName}" was updated`.trim()));
-
     if (deletedBranchName) {
       (0, _log.default)(_chalk.default.green(`${dryRunText} Head branch "${headBranchName}" was deleted`.trim()));
     }

package/dist/commands/branch/commands/promote.js

@@ -4,21 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.promoteBranch = void 0;
-
 var _linkedCommand = require("../../../util/linked-command");
-
 var _graphql = require("../../../graphql");
-
 var _log = _interopRequireDefault(require("../../../log"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _branches = require("../../../util/branches");
-
 var _fatalError = require("../../../util/fatal-error");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const promoteBranchMutation = (0, _graphql.graphQLQuery)(`
 mutation ($input: TSPromoteSchemaBranchInput!) {
   result: tsPromoteSchemaBranch(input: $input) {
@@ -33,11 +25,9 @@ const promoteBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, p
     branch,
     environment
   } = (0, _branches.getBranchParams)(cli, 'name');
-
   if (environment === 'PRODUCTION') {
     return (0, _fatalError.fatalError)('You cannot promote the production branch');
   }
-
   const client = (0, _graphql.createAdminConnector)(params, params.authToken, params.projectId);
   await promoteBranchMutation(client, {
     input: {

package/dist/commands/branch/commands/tag-version.js

@@ -4,18 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.tagBranchVersion = void 0;
-
 var _linkedCommand = require("../../../util/linked-command");
-
 var _graphql = require("../../../graphql");
-
 var _branches = require("../../../util/branches");
-
 var _fatalError = require("../../../util/fatal-error");
-
-const createBranchTag = (0, _graphql.graphQLQuery)(
-/* GraphQL */
-`
+const createBranchTag = (0, _graphql.graphQLQuery)( /* GraphQL */`
   mutation ($input: TSCreateSchemaBranchTagInput!) {
     result: tsCreateSchemaBranchTag(input: $input) {
       branchVersion {
@@ -36,11 +29,9 @@ const tagBranchVersion = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli
     tag,
     hash
   } = flags;
-
   if (!tag) {
     return (0, _fatalError.fatalError)('--tag flag is required');
   }
-
   const client = (0, _graphql.createAdminConnector)(params, params.authToken, params.projectId);
   const {
     branchVersion: {

package/dist/commands/branch/commands/url.js

@@ -4,18 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getVersionUrl = exports.getUrl = void 0;
-
 var _linkedCommand = require("../../../util/linked-command");
-
 var _graphql = require("../../../graphql");
-
 var _branches = require("../../../util/branches");
-
 var _fatalError = require("../../../util/fatal-error");
-
-const getBranchVersionQuery = (0, _graphql.graphQLQuery)(
-/* GraphQL */
-`
+const getBranchVersionQuery = (0, _graphql.graphQLQuery)( /* GraphQL */`
   query ($environment: TSSchemaBranchEnvironment!, $branchName: String, $tagName: String, $schemaHash: String) {
     result: tsGetSchemaBranchVersion(
       environment: $environment
@@ -27,9 +20,7 @@ const getBranchVersionQuery = (0, _graphql.graphQLQuery)(
     }
   }
 `);
-const getBranchQuery = (0, _graphql.graphQLQuery)(
-/* GraphQL */
-`
+const getBranchQuery = (0, _graphql.graphQLQuery)( /* GraphQL */`
   query ($environment: TSSchemaBranchEnvironment!, $branchName: String) {
     result: tsGetSchemaBranch(environment: $environment, branchName: $branchName) {
       graphqlUrl
@@ -44,11 +35,9 @@ const getVersionUrl = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, p
   const {
     flags
   } = cli;
-
   if (flags.tag && flags.hash) {
     return (0, _fatalError.fatalError)('Can only provide one of: --tag OR --hash');
   }
-
   const client = (0, _graphql.createAdminConnector)(params, params.authToken, params.projectId);
   const result = await getBranchVersionQuery(client, {
     environment,
@@ -56,11 +45,9 @@ const getVersionUrl = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, p
     tagName: flags.tag,
     schemaHash: flags.hash
   });
-
   if (!result) {
     return (0, _fatalError.fatalError)('Branch does not exist');
   }
-
   process.stdout.write(result.graphqlUrl);
 });
 exports.getVersionUrl = getVersionUrl;
@@ -74,11 +61,9 @@ const getUrl = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, params)
     environment,
     branchName: branch
   });
-
   if (!result) {
     return (0, _fatalError.fatalError)('Branch does not exist');
   }
-
   process.stdout.write(result.graphqlUrl);
 });
 exports.getUrl = getUrl;

package/dist/commands/branch/index.js

@@ -4,23 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _fatalError = require("../../util/fatal-error");
-
 var _delete = require("./commands/delete");
-
 var _create = require("./commands/create");
-
 var _promote = require("./commands/promote");
-
 var _url = require("./commands/url");
-
 var _list = require("./commands/list");
-
 var _tagVersion = require("./commands/tag-version");
-
 var _merge = require("./commands/merge");
-
 const subcommands = {
   delete: _delete.deleteBranch,
   create: _create.createBranch,
@@ -31,17 +22,13 @@ const subcommands = {
   tagVersion: _tagVersion.tagBranchVersion,
   merge: _merge.mergeBranch
 };
-
 const commandHandler = async (cli, params) => {
   const subCommandName = cli.input[1];
   const subCommand = subcommands[subCommandName];
-
   if (subCommand) {
     return subCommand(cli, params);
   }
-
   (0, _fatalError.fatalError)(`Invalid branch command "${subCommandName}"`);
 };
-
 var _default = commandHandler;
 exports.default = _default;

package/dist/commands/build-or-watch.js

@@ -5,27 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildHandler = buildHandler;
 exports.default = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _ssg = require("@takeshape/ssg");
-
 var _files = require("../files");
-
 var _pusher = require("../util/pusher");
-
 var _linkedCommand = require("../util/linked-command");
-
 var _connector = require("../util/connector");
-
 var _runner = require("../util/runner");
-
 var _watcher = require("../util/watcher");
-
 var _branches = require("../util/branches");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function buildHandler(config, params) {
   const {
     connector
@@ -34,17 +23,13 @@ function buildHandler(config, params) {
     if (clearCache && connector.clearCache) {
       await connector.clearCache();
     }
-
     const pages = await (0, _ssg.generate)(config, params);
     return (0, _files.writePages)(config.buildPath)(pages);
   };
 }
-
 var _default = (0, _linkedCommand.linkedCommand)(async (cli, params) => {
   const command = cli.input[0];
-
   const sitePath = _path.default.dirname(params.configFilePath);
-
   const fileLoader = (0, _ssg.createFileSystemLoader)(sitePath);
   const templateFileLoader = (0, _ssg.createSyncFileSystemLoader)(sitePath);
   const config = await (0, _ssg.loadConfig)(fileLoader, _path.default.basename(params.configFilePath), {
@@ -59,15 +44,12 @@ var _default = (0, _linkedCommand.linkedCommand)(async (cli, params) => {
     templateFileLoader
   }));
   await Promise.all([build(false), (0, _files.copyStatic)(config)]);
-
   if (command === 'watch') {
     (0, _watcher.createWatcher)('templates', build.bind(null, false), config.templatePath);
     (0, _watcher.createWatcher)('static', (0, _files.syncStatic)(config), config.staticPath);
-
     if (params.watchContent) {
       await (0, _pusher.subscribe)(params, build.bind(null, true));
     }
   }
 });
-
 exports.default = _default;

package/dist/commands/deploy/index.js

@@ -5,33 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.successMessage = successMessage;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _glob = _interopRequireDefault(require("glob"));
-
 var _ssg = require("@takeshape/ssg");
-
 var _linkedCommand = require("../../util/linked-command");
-
 var _zip = require("./zip");
-
 var _log = _interopRequireDefault(require("../../log"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _prettyBytes = _interopRequireDefault(require("pretty-bytes"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function countFiles(projectPath, config) {
   const staticFiles = _glob.default.sync(`${_path.default.join(projectPath, config.staticPath)}/**/*.*`);
-
   const templateFiles = _glob.default.sync(`${_path.default.join(projectPath, config.templatePath)}/**/*.*`);
-
   return staticFiles.length + templateFiles.length;
 }
-
 function successMessage({
   siteName,
   zipSize,
@@ -42,18 +29,14 @@ function successMessage({
   (0, _log.default)(`Deploy Size: ${_chalk.default.green((0, _prettyBytes.default)(zipSize))}`);
   (0, _log.default)(`Files Deployed: ${_chalk.default.green(`${fileCount}`)}`);
 }
-
 var _default = (0, _linkedCommand.linkedCommand)(async (_, params) => {
   if (!params.siteId || !params.siteName) {
     (0, _log.default)('Error: no site selected. Please run `takeshape link`.');
     process.exit(1);
   }
-
   try {
     const projectPath = _path.default.dirname(params.configFilePath);
-
     const configFilename = _path.default.basename(params.configFilePath);
-
     const config = await (0, _ssg.loadConfig)((0, _ssg.createFileSystemLoader)(projectPath), configFilename);
     const zipSize = await (0, _zip.deployZip)({
       config,
@@ -70,5 +53,4 @@ var _default = (0, _linkedCommand.linkedCommand)(async (_, params) => {
     process.exit(1);
   }
 });
-
 exports.default = _default;

package/dist/commands/deploy/zip.js

@@ -5,19 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createZip = createZip;
 exports.deployZip = deployZip;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _archiver = _interopRequireDefault(require("archiver"));
-
 var _streamToPromise = _interopRequireDefault(require("stream-to-promise"));
-
 var _upload = require("../../util/upload");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 async function createZip({
   projectPath,
   staticPath,
@@ -26,7 +19,6 @@ async function createZip({
   zipPath
 }) {
   const output = _fsExtra.default.createWriteStream(zipPath);
-
   const archive = (0, _archiver.default)('zip');
   archive.pipe(output);
   archive.file(configFilePath, {
@@ -37,10 +29,8 @@ async function createZip({
   await archive.finalize();
   return (0, _streamToPromise.default)(output);
 }
-
 async function deployZip(params) {
   const [zipPath, removeTempFile] = (0, _upload.createTempFile)('deploy.zip');
-
   try {
     const [uploadUrl] = await Promise.all([(0, _upload.getUploadUrl)(params.params), createZip({
       zipPath,

package/dist/commands/export/index.js

@@ -4,20 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _projectExport = _interopRequireDefault(require("./project-export"));
-
 var _schemaExport = _interopRequireDefault(require("./schema-export"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const commandHandler = async (cli, params) => {
   if (cli.flags.schema) {
     return (0, _schemaExport.default)(cli, params);
   }
-
   return (0, _projectExport.default)(cli, params);
 };
-
 var _default = commandHandler;
 exports.default = _default;