stepzen 0.9.38-beta.0 → 0.9.38-beta.4

package/README.md

@@ -29,7 +29,7 @@ $ npm install -g stepzen
 $ stepzen COMMAND
 running command...
 $ stepzen (-v|--version|version)
-stepzen/0.9.38-beta.0 darwin-x64 node-v14.18.3
+stepzen/0.9.38-beta.4 darwin-x64 node-v14.18.3
 $ stepzen --help [COMMAND]
 USAGE
   $ stepzen COMMAND

package/lib/commands/deploy.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // objects, a single schema, and a collection of configurationsets
 // and uses them to produce an endpoint which serves a GraphQL API.
 const command_1 = require("@oclif/command");
+const errors_1 = require("@oclif/errors");
 const actions_1 = require("../shared/actions");
 const configuration_1 = require("../shared/configuration");
 class Deploy extends command_1.Command {
@@ -13,12 +14,12 @@ class Deploy extends command_1.Command {
         const { args, flags } = this.parse(Deploy);
         // Make sure that you definitely specify folder/name
         if (args.destination.includes('/') === false) {
-            this.error('You must specify the folder/name you want to use');
+            throw new errors_1.CLIError('You must specify the folder/name you want to use');
         }
         const configuration = configuration_1.readConfiguration();
         if (!configuration) {
             // Configuration not found. Most likely because someone is not logged in. Exit with error.
-            this.error('You are probably not logged in.');
+            throw new errors_1.CLIError('You are probably not logged in.');
         }
         if (!flags.silent) {
             this.log('Deploying...');
@@ -31,7 +32,7 @@ class Deploy extends command_1.Command {
         }
         else {
             // Errors. Exit, and output the server's error response
-            this.error(JSON.stringify(response.errors) || 'An error occurred.');
+            throw new errors_1.CLIError(JSON.stringify(response.errors) || 'An error occurred.');
         }
     }
 }

package/lib/commands/init.js

@@ -2,6 +2,7 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@oclif/command");
+const errors_1 = require("@oclif/errors");
 const fs = require("fs");
 const glob = require("glob");
 const inquirer = require("inquirer");
@@ -17,12 +18,12 @@ class Init extends command_1.Command {
         // Make sure it is not already a workspace
         const w = workspace_1.getWorkspace(directory);
         if (w)
-            this.error('This is already a workspace, cannot init');
+            throw new errors_1.CLIError('This is already a workspace, cannot init');
         // If you've passed an endpoint, validate it, and throw an error straight away if needed
         if (flags.endpoint) {
             const error = utils_1.validateEndpoint(flags.endpoint);
             if (typeof error === 'string')
-                this.error(error);
+                throw new errors_1.CLIError(error);
         }
         // Make a suggestion for the endpoint
         const endpoint = flags.endpoint || `api/${moniker_1.default()}`;

package/lib/commands/list.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // of resources stored within a stepzen account.
 // You can use list to retrieve configurationsets and schemas.
 const command_1 = require("@oclif/command");
+const errors_1 = require("@oclif/errors");
 const actions_1 = require("../shared/actions");
 const configuration_1 = require("../shared/configuration");
 class List extends command_1.Command {
@@ -15,7 +16,7 @@ class List extends command_1.Command {
         const configuration = configuration_1.readConfiguration();
         if (!configuration) {
             // Configuration not found. Most likely because someone is not logged in. Exit with error.
-            this.error('You are probably not logged in.');
+            throw new errors_1.CLIError('You are probably not logged in.');
         }
         const response = await actions_1.list(args.type);
         if (response.success) {
@@ -30,7 +31,7 @@ class List extends command_1.Command {
         }
         else {
             // Error. Exit, and output the server's error response
-            this.error(JSON.stringify(response.errors) || 'An error occurred.');
+            throw new errors_1.CLIError(JSON.stringify(response.errors) || 'An error occurred.');
         }
     }
 }

package/lib/commands/login.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // Stepzen login checks that credentials presented are good and
 // subsequently changes the identity of the logged in account.
 const command_1 = require("@oclif/command");
+const errors_1 = require("@oclif/errors");
 const cli_ux_1 = require("cli-ux");
 const configuration_1 = require("../shared/configuration");
 class Login extends command_1.Command {
@@ -45,7 +46,7 @@ class Login extends command_1.Command {
         const isValidConfiguration = await configuration_1.verifyConfiguration(configuration);
         if (!isValidConfiguration) {
             // Exit, with error
-            this.error('We are unable to verify your account details. Could you please check them?');
+            throw new errors_1.CLIError('We are unable to verify your account details. Could you please check them?');
         }
         // Change the default account.
         configuration_1.writeConfigurationToLoginFile(configuration);

package/lib/commands/start.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chokidar = require("chokidar");
 const cli_ux_1 = require("cli-ux");
 const command_1 = require("@oclif/command");
+const errors_1 = require("@oclif/errors");
 const throttle_debounce_1 = require("throttle-debounce");
 const detect = require("detect-port");
 const configuration_1 = require("../shared/configuration");
@@ -21,7 +22,7 @@ class Start extends command_1.Command {
         const configuration = configuration_1.readConfiguration();
         if (!configuration) {
             // Configuration not found. Most likely because someone is not logged in. Exit with error.
-            this.error('You are probably not logged in.');
+            throw new errors_1.CLIError('You are probably not logged in.');
         }
         // Get the working directory and workspace
         const directory = utils_1.getDirectory(flags.dir);
@@ -41,7 +42,7 @@ class Start extends command_1.Command {
         // Check the port is available
         const port = await detect(flags.port);
         if (flags.port !== port) {
-            this.error(`Could not start - port ${flags.port} is already in use`);
+            throw new errors_1.CLIError(`Could not start - port ${flags.port} is already in use`);
         }
         // This is the file watcher
         if (!flags['no-watcher']) {
@@ -51,21 +52,23 @@ class Start extends command_1.Command {
             })
                 .on('change', throttle_debounce_1.debounce(500, async (path) => {
                 await utils_1.checkAuth();
-                start_1.console(workspace, flags);
-                start_1.deploy(path, workspace, flags);
+                utils_1.clearConsole();
+                await start_1.deploy(path, workspace, flags);
+                await start_1.console(workspace);
             }));
         }
         // Start!
+        utils_1.clearConsole();
         cli_ux_1.default.action.start('Starting...');
-        if (!flags['no-console']) {
-            start_1.console(workspace, flags);
-        }
         // Unless explicitly disabled, auto-init
         if (!flags['no-init']) {
             await start_1.deploy(null, workspace, flags);
         }
+        if (!flags['no-console']) {
+            start_1.console(workspace);
+        }
         // Create the dashboard
-        if (flags['local-proxy']) {
+        if (!flags['no-dashboard']) {
             const ui = await dashboard({
                 account: configuration.account,
                 adminkey: configuration.adminkey,
@@ -84,7 +87,6 @@ class Start extends command_1.Command {
                 workspace,
             });
             await ui.start();
-            await ui.open();
         }
         // Done
         cli_ux_1.default.action.stop();
@@ -97,7 +99,7 @@ Start.flags = {
     endpoint: command_1.flags.string({ description: 'Override workspace endpoint' }),
     help: command_1.flags.help({ char: 'h' }),
     'no-console': command_1.flags.boolean({ hidden: true }),
-    'local-proxy': command_1.flags.boolean({ hidden: true }),
+    'no-dashboard': command_1.flags.boolean({ hidden: true }),
     'no-init': command_1.flags.boolean({ hidden: true }),
     'no-server': command_1.flags.boolean({ hidden: true }),
     'no-validate': command_1.flags.boolean({ hidden: true }),

package/lib/commands/transpile.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const command_1 = require("@oclif/command");
+const errors_1 = require("@oclif/errors");
 const fs = require("fs-extra");
 const path = require("path");
 const utils_1 = require("../shared/utils");
@@ -31,7 +32,7 @@ class Transpile extends command_1.Command {
             this.log(stitched);
         }
         catch (error) {
-            this.error(chalk.red(error));
+            throw new errors_1.CLIError(chalk.red(error));
         }
     }
 }

package/lib/commands/upload.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // When uploaded, each resource is stored and referenced using a name
 // provided by the user.
 const command_1 = require("@oclif/command");
+const errors_1 = require("@oclif/errors");
 const configuration_1 = require("../shared/configuration");
 const actions_1 = require("../shared/actions");
 class Upload extends command_1.Command {
@@ -17,16 +18,16 @@ class Upload extends command_1.Command {
         const { args, flags } = this.parse(Upload);
         // Make sure that you definitely specify folder/name
         if (args.destination.includes('/') === false) {
-            this.error('You must specify the folder/name you want to use');
+            throw new errors_1.CLIError('You must specify the folder/name you want to use');
         }
         const configuration = configuration_1.readConfiguration();
         if (!configuration) {
             // Configuration not found. Most likely because someone is not logged in. Exit with error.
-            this.error('You are probably not logged in.');
+            throw new errors_1.CLIError('You are probably not logged in.');
         }
         if (!flags.file && !flags.dir) {
             // You need to specify a file or directory. Exit with error.
-            this.error('You must specify a file or directory.');
+            throw new errors_1.CLIError('You must specify a file or directory.');
         }
         if (!flags.silent) {
             this.log('Uploading...');
@@ -39,7 +40,7 @@ class Upload extends command_1.Command {
         }
         else {
             // Errors. Exit, and output the server's error response
-            this.error(JSON.stringify(response.errors) || 'An error occurred.');
+            throw new errors_1.CLIError(JSON.stringify(response.errors) || 'An error occurred.');
         }
     }
 }

package/lib/commands/validate.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const command_1 = require("@oclif/command");
+const errors_1 = require("@oclif/errors");
 const utils_1 = require("../shared/utils");
 const { stitch, validate } = require('@stepzen/transpiler');
 class Validate extends command_1.Command {
@@ -16,7 +17,7 @@ class Validate extends command_1.Command {
             });
         }
         catch (error) {
-            this.error(chalk.red(error));
+            throw new errors_1.CLIError(chalk.red(error));
         }
     }
 }

package/lib/generate/helpers.d.ts

@@ -1,5 +1,12 @@
+import type { Answers, DistinctQuestion } from 'inquirer';
 export declare const createGeneratorFiles: (id: string, details: any) => Promise<string>;
-export declare const getConfiguration: (id: string, details?: any) => Promise<any>;
+export declare type GeneratorConfiguration = {
+    questions: DistinctQuestion<Answers>[];
+    answers: Answers;
+    errors: Record<string, any>;
+    status: number;
+};
+export declare const getConfiguration: (id: string, details?: any) => Promise<GeneratorConfiguration | null>;
 export declare const getSchemaList: (arg: string) => string[];
 export declare const getTemplates: () => Promise<string>;
 export declare const askGeneratorQuestions: (id: string, settings: any, state: any) => Promise<any>;

package/lib/generate/helpers.js

@@ -2,6 +2,9 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.askTemplateQuestions = exports.askGeneratorQuestions = exports.getTemplates = exports.getSchemaList = exports.getConfiguration = exports.createGeneratorFiles = void 0;
+const errors_1 = require("@oclif/errors");
+const chalk = require("chalk");
+const debug = require("debug");
 const node_fetch_1 = require("node-fetch");
 const fs = require("fs-extra");
 const inquirer = require("inquirer");
@@ -11,6 +14,7 @@ const path = require("path");
 const shell = require("shelljs");
 const configuration_1 = require("../shared/configuration");
 const constants_1 = require("../shared/constants");
+const errors_2 = require("../shared/errors");
 const { version } = require('../../package.json');
 exports.createGeneratorFiles = async (id, details) => {
     const config = configuration_1.readConfiguration();
@@ -35,10 +39,13 @@ exports.createGeneratorFiles = async (id, details) => {
         },
         method: 'POST',
     });
-    const { data: { create }, } = await response.json();
+    const { data, errors } = await response.json();
+    if (errors) {
+        throw new errors_1.CLIError(errors_2.formatTemporaryErrorMessage(errors));
+    }
     const tmp = path.join(os.tmpdir(), `stepzen-generated-schema-${Date.now()}`);
     fs.ensureDirSync(tmp);
-    for (const file of create) {
+    for (const file of data.create) {
         const dir = path.join(tmp, file.name);
         fs.writeFileSync(dir, file.content);
     }
@@ -69,8 +76,29 @@ exports.getConfiguration = async (id, details = {}) => {
         },
         method: 'POST',
     });
-    const { data } = await response.json();
-    return data;
+    const { data, errors } = await response.json();
+    if (errors) {
+        return {
+            questions: [],
+            answers: {},
+            status: -1,
+            errors: {
+                error: errors[0].message,
+            },
+        };
+    }
+    try {
+        if (data.configure) {
+            data.configure.answers = JSON.parse(data.configure.answers);
+            data.configure.errors = JSON.parse(data.configure.errors);
+            data.configure.questions = JSON.parse(data.configure.questions);
+        }
+    }
+    catch (error) {
+        debug('stepzen:response')(error);
+        throw new errors_1.CLIError(errors_2.PERMANENT_STEPZEN_ERROR);
+    }
+    return data.configure;
 };
 exports.getSchemaList = (arg) => {
     const schemas = arg.split(',').map((schema) => schema.trim());
@@ -78,10 +106,17 @@ exports.getSchemaList = (arg) => {
     for (const schema of schemas) {
         const instances = schemas.filter((s) => s === schema);
         if (instances.length > 1) {
-            throw new Error(`You are trying to import "${schema}" more than once`);
+            throw new errors_1.CLIError(`You are trying to import "${schema}" more than once`);
         }
     }
-    return schemas;
+    return schemas.map(schema => {
+        // support `postgres` as an alias to `postgresql`
+        // https://github.com/steprz/stepzen-cli/issues/431
+        if (schema.toLowerCase() === 'postgres') {
+            return 'postgresql';
+        }
+        return schema;
+    });
 };
 exports.getTemplates = async () => {
     const tmp = path.join(os.tmpdir(), `stepzen-api-templates-${Date.now()}`);
@@ -90,23 +125,44 @@ exports.getTemplates = async () => {
     const command = `git clone ${repository} ${tmp}`;
     const result = shell.exec(command, { silent: true });
     if (result.code !== 0) {
-        throw new Error(result.stderr.trim());
+        throw new errors_1.CLIError(result.stderr.trim());
     }
     return tmp;
 };
 exports.askGeneratorQuestions = async (id, settings, state) => {
+    var _a, _b;
     let status = -1;
     do {
-        const questions = settings.questions.map((question) => (Object.assign({ type: 'password' }, question)));
+        if (settings.questions.length === 0) {
+            // would cause a hot loop, so it's an error
+            throw new errors_1.CLIError(errors_2.PERMANENT_STEPZEN_ERROR);
+        }
+        const questions = settings.questions.map((question) => (Object.assign(Object.assign({ type: 'password' }, question), { 
+            // set the previous iteration's answer as the default value, except for password fields
+            default: question.type && question.type !== 'password'
+                ? lodash_1.get(state, question.name)
+                : undefined })));
         // eslint-disable-next-line no-await-in-loop
         const answers = await inquirer.prompt(questions);
         state = lodash_1.merge(state, answers);
         // eslint-disable-next-line no-await-in-loop
-        const { configure: result } = await exports.getConfiguration(id, state);
-        settings = {
-            questions: JSON.parse(result.questions),
-        };
-        state = lodash_1.merge(state, JSON.parse(result.answers));
+        const result = await exports.getConfiguration(id, state);
+        if (!result) {
+            // at this point the generator ${id} should have been validated
+            throw new errors_1.CLIError(errors_2.PERMANENT_STEPZEN_ERROR);
+        }
+        if (result.status === -1 && result.questions.length === 0) {
+            console.log();
+            console.log(chalk.red(`A problem occurred when running ${id} import${((_a = result.errors) === null || _a === void 0 ? void 0 : _a.error) ? `: "${(_b = result.errors) === null || _b === void 0 ? void 0 : _b.error}"` : '.'}`));
+            console.log('Please try again');
+        }
+        else {
+            settings = {
+                questions: result.questions,
+            };
+            // eslint-disable-next-line require-atomic-updates
+            state = lodash_1.merge(state, result.answers);
+        }
         status = result.status;
     } while (status === -1);
     return state;

package/lib/generate/index.js

@@ -2,6 +2,7 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const errors_1 = require("@oclif/errors");
 const cli_ux_1 = require("cli-ux");
 const fs = require("fs-extra");
 const lodash = require("lodash");
@@ -25,10 +26,10 @@ exports.default = async (schemas, source) => {
         // Get all generators from...Generators
         for (var _f = tslib_1.__asyncValues(Object.keys(generators)), _g; _g = await _f.next(), !_g.done;) {
             const id = _g.value;
-            const { configure } = await helpers_1.getConfiguration(id, {});
+            const configure = await helpers_1.getConfiguration(id, {});
             if (configure) {
                 generators[id] = {
-                    questions: JSON.parse(configure.questions),
+                    questions: configure.questions,
                     type: 'generator',
                 };
             }
@@ -79,7 +80,7 @@ exports.default = async (schemas, source) => {
         .filter(i => i);
     if (notFound.length > 0) {
         fs.removeSync(templates);
-        throw new Error(`Cannot find the schema ${notFound[0]}`);
+        throw new errors_1.CLIError(`Cannot find the schema ${notFound[0]}`);
     }
     try {
         // Ask all the questions

package/lib/shared/configuration.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeConfigurationToLoginFile = exports.verifyConfiguration = exports.removeConfigurationFromLoginFile = exports.importConfiguration = exports.readConfiguration = void 0;
 // This file contains methods for managing configuration
+const errors_1 = require("@oclif/errors");
 const debug = require("debug");
 const node_fetch_1 = require("node-fetch");
 const fs = require("fs");
@@ -32,7 +33,7 @@ exports.readConfiguration = () => {
 };
 exports.importConfiguration = (filepath) => {
     if (!fs.existsSync(filepath)) {
-        throw new Error('Configuration file does not exist');
+        throw new errors_1.CLIError('Configuration file does not exist');
     }
     const configuration = fs.readFileSync(filepath, 'utf8');
     try {
@@ -41,7 +42,7 @@ exports.importConfiguration = (filepath) => {
         return parsed;
     }
     catch (_a) {
-        throw new Error('Configuration file is not valid yaml');
+        throw new errors_1.CLIError('Configuration file is not valid yaml');
     }
 };
 exports.removeConfigurationFromLoginFile = () => {

package/lib/shared/errors.d.ts

@@ -0,0 +1,4 @@
+export declare const formatTemporaryErrorMessage: (errors: ReadonlyArray<{
+    message?: string;
+}>) => string;
+export declare const PERMANENT_STEPZEN_ERROR: string;

package/lib/shared/errors.js

@@ -0,0 +1,12 @@
+"use strict";
+// Copyright (c) 2020,2021,2022, StepZen, Inc.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PERMANENT_STEPZEN_ERROR = exports.formatTemporaryErrorMessage = void 0;
+exports.formatTemporaryErrorMessage = (errors) => `A problem occurred while processing your import${errors.length > 0 && errors[0].message ? `: "${errors[0].message}"` : ''}. Please try again.` +
+    ` If the issue persists, make sure you are on the latest version of StepZen ` +
+    `CLI. And if the issue still persists contact support via the StepZen discord ` +
+    `channel (https://discord.gg/9k2VdPn2FR).`;
+exports.PERMANENT_STEPZEN_ERROR = 'An unexpected problem occurred while processing your import.' +
+    ` If the issue persists, make sure you are on the latest version of StepZen ` +
+    `CLI. And if the issue still persists contact support via the StepZen discord ` +
+    `channel (https://discord.gg/9k2VdPn2FR).`;

package/lib/shared/utils.js

@@ -2,6 +2,7 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateEndpoint = exports.getStepZenExtensions = exports.getDirectory = exports.ensureApiKey = exports.clearConsole = exports.checkAuth = void 0;
+const errors_1 = require("@oclif/errors");
 const chalk = require("chalk");
 const debug = require("debug");
 const node_fetch_1 = require("node-fetch");
@@ -77,7 +78,7 @@ exports.getDirectory = (d = process.cwd()) => {
         directory = path.resolve(directory);
     // If the path does not exist, throw an error
     if (!fs.existsSync(directory)) {
-        throw new Error(`Cannot find ${directory}`);
+        throw new errors_1.CLIError(`Cannot find ${directory}`);
     }
     return directory;
 };

package/lib/shared/validation.js

@@ -2,16 +2,17 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateSchema = exports.validateConfigurationset = void 0;
+const errors_1 = require("@oclif/errors");
 const fs = require("fs");
 const glob = require("glob");
 const yaml = require("yaml");
 // Validate the Configurationset file
 exports.validateConfigurationset = async (file) => {
     if (!file) {
-        throw new Error('You must provide a file path');
+        throw new errors_1.CLIError('You must provide a file path');
     }
     if (!fs.existsSync(file)) {
-        throw new Error('The file does not exist');
+        throw new errors_1.CLIError('The file does not exist');
     }
     const content = fs.readFileSync(file, 'utf8');
     // Ensure the file is valid YAML
@@ -19,20 +20,20 @@ exports.validateConfigurationset = async (file) => {
         yaml.parse(content);
     }
     catch (_a) {
-        throw new Error('The file is not valid YAML');
+        throw new errors_1.CLIError('The file is not valid YAML');
     }
 };
 // Validate the Schema directory
 exports.validateSchema = async (directory) => {
     if (!directory) {
-        throw new Error('You must provide a directory path');
+        throw new errors_1.CLIError('You must provide a directory path');
     }
     if (!fs.existsSync(directory)) {
-        throw new Error('The directory does not exist');
+        throw new errors_1.CLIError('The directory does not exist');
     }
     // Ensure there's a root `index.graphql` file
     const allSchemaFiles = glob.sync('index.graphql', { cwd: directory });
     if (allSchemaFiles.length === 0) {
-        throw new Error('Schemas must include an `index.graphql` file');
+        throw new errors_1.CLIError('Schemas must include an `index.graphql` file');
     }
 };

package/lib/shared/workspace.js

@@ -2,6 +2,7 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWorkspace = void 0;
+const errors_1 = require("@oclif/errors");
 const fs = require("fs");
 const path = require("path");
 const utils_1 = require("./utils");
@@ -32,7 +33,7 @@ exports.getWorkspace = (directory) => {
             workspace = Object.assign(Object.assign({}, workspace), config);
         }
         catch (_a) {
-            throw new Error(`Cannot parse configuration from ${filepath}`);
+            throw new errors_1.CLIError(`Cannot parse configuration from ${filepath}`);
         }
     }
     // Add the 'schema' property, which is the directory + the 'root'
@@ -41,10 +42,10 @@ exports.getWorkspace = (directory) => {
     if (workspace.directory) {
         const error = utils_1.validateEndpoint(workspace.endpoint);
         if (typeof error === 'string')
-            throw new Error(error);
+            throw new errors_1.CLIError(error);
         const schemaExists = fs.existsSync(workspace.schema);
         if (!schemaExists)
-            throw new Error(`Cannot find workspace schema folder ${workspace.schema}`);
+            throw new errors_1.CLIError(`Cannot find workspace schema folder ${workspace.schema}`);
         return workspace;
     }
     // This is not a workspace folder

package/lib/start/console.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (workspace: any, flags: any) => Promise<void>;
+declare const _default: (workspace: any) => Promise<void>;
 export default _default;

package/lib/start/console.js

@@ -2,22 +2,15 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const cli_ux_1 = require("cli-ux");
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
-const utils_1 = require("../shared/utils");
-// eslint-disable-next-line max-params
-exports.default = async (workspace, flags) => {
-    utils_1.clearConsole();
+exports.default = async (workspace) => {
     const cwd = workspace.schema.replace(os.homedir(), '~');
     const config = path.join(cwd, 'config.yaml');
+    console.log();
     if (fs.existsSync(config)) {
-        console.log(`Watching ${chalk.blue(config)} for configuration changes`);
-    }
-    console.log(`Watching ${chalk.blue(cwd)} for GraphQL changes`);
-    if (flags['local-proxy']) {
-        console.log();
-        cli_ux_1.default.url(`Running StepZen at http://localhost:${flags.port}/${workspace.endpoint}`, `http://localhost:${flags.port}/${workspace.endpoint}`);
+        console.log(`Watching ${chalk.blue(config)} for configuration changes...`);
     }
+    console.log(`Watching ${chalk.blue(cwd)} for GraphQL changes...`);
 };

package/lib/start/deploy.js

@@ -4,9 +4,9 @@ const tslib_1 = require("tslib");
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 const chalk = require("chalk");
 const cli_ux_1 = require("cli-ux");
-const date_fns_1 = require("date-fns");
 const fs = require("fs-extra");
 const path = require("path");
+const prettyMilliseconds = require("pretty-ms");
 const deploy_1 = require("../commands/deploy");
 const configuration_1 = require("../shared/configuration");
 const constants_1 = require("../shared/constants");
@@ -16,7 +16,6 @@ const dotenv = require('dotenv');
 exports.default = async (file, workspace, flags) => {
     var e_1, _a;
     dotenv.config({ path: path.join(workspace.directory, '.env') });
-    console.log();
     if (file) {
         console.log(`File changed: ${chalk.blue(file)}`);
     }
@@ -33,7 +32,7 @@ exports.default = async (file, workspace, flags) => {
             return;
         }
     }
-    cli_ux_1.default.action.start('Deploying to StepZen...');
+    cli_ux_1.default.action.start(`Deploying ${chalk.yellow(workspace.endpoint)} to StepZen`);
     const deployArgs = [workspace.endpoint, '--silent'];
     const uploadCmds = [];
     const configPath = path.join(workspace.schema, 'config.yaml');
@@ -72,6 +71,7 @@ exports.default = async (file, workspace, flags) => {
             console.log(chalk.red(error));
         }
     };
+    const deployStart = new Date().getTime();
     try {
         for (var uploadCmds_1 = tslib_1.__asyncValues(uploadCmds), uploadCmds_1_1; uploadCmds_1_1 = await uploadCmds_1.next(), !uploadCmds_1_1.done;) {
             const cmd = uploadCmds_1_1.value;
@@ -98,40 +98,20 @@ exports.default = async (file, workspace, flags) => {
         logError(error);
         return;
     }
-    cli_ux_1.default.action.stop();
-    const what = chalk.yellow(workspace.endpoint);
-    const when = chalk.yellow(date_fns_1.format(new Date(), 'h:mm:ss aa'));
-    console.log();
-    console.log(chalk.green(`Successfully deployed ${what} at ${when}`));
+    const deployEnd = new Date().getTime();
+    const deployTime = deployEnd - deployStart;
+    cli_ux_1.default.action.stop(`${chalk.grey('done in')} ${prettyMilliseconds(deployTime)} 🚀`);
     const domain = constants_1.STEPZEN_DOMAIN.replace('.io', '.net');
     const endpoint = `https://${configuration.account}.${domain}/${workspace.endpoint}/__graphql`;
-    let firstProxyLine = '';
-    let secondProxyLine = '';
-    if (flags['local-proxy']) {
-        firstProxyLine = `Explore your deployed GraphQL endpoint at a local proxy with GraphiQL:`;
-        secondProxyLine = ` http://localhost:${flags.port}/${workspace.endpoint}`;
-    }
-    else {
-        firstProxyLine = '';
-        secondProxyLine = '';
-    }
-    if (configuration.apikey) {
-        const parts = configuration.apikey.split('::');
-        const key = parts[2];
-        const firstTwoChars = key.substring(0, 2);
-        const lastTwoChars = key.slice(-2);
-        const masked = `${firstTwoChars}***${lastTwoChars}`;
-        const masked_apikey = `${parts[0]}::${parts[1]}::${masked}`;
-        console.log();
-        console.log(chalk.grey(`Your GraphQL schema is deployed to`, chalk.green(` ${endpoint}`)));
-        console.log();
-        console.log(chalk.grey(`You can test your endpoint with cURL:`));
-        console.log();
-        console.log(`curl ${endpoint} \\`);
-        console.log(`   --header "Authorization: Apikey ${masked_apikey}" \\`);
-        console.log(`   --header "Content-Type: application/json" \\`);
-        console.log(`   --data '{"query": "your graphql query"}' \\`);
-        console.log();
-        console.log(chalk.grey(firstProxyLine), chalk.green(secondProxyLine));
-    }
+    console.log();
+    console.log(chalk.grey(`Your API url is`, chalk.green(` ${endpoint}`)));
+    console.log();
+    console.log(chalk.grey(`You can test your hosted API with cURL:`));
+    console.log();
+    console.log(`curl ${endpoint} \\`);
+    console.log(`   --header "Authorization: Apikey {{insert yours from https://stepzen.com/account}}" \\`);
+    console.log(`   --header "Content-Type: application/json" \\`);
+    console.log(`   --data '{"query": "your graphql query"}'`);
+    console.log();
+    console.log(chalk.grey(`or explore it with GraphiQL at`), chalk.green(` http://localhost:${flags.port}/${workspace.endpoint}`));
 };

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.9.38-beta.0","commands":{"deploy":{"id":"deploy","description":"deploy to stepzen","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"configurationsets":{"name":"configurationsets","type":"option","description":"Configurationsets to use","default":""},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"schema":{"name":"schema","type":"option","description":"Schema to use","required":true},"silent":{"name":"silent","type":"boolean","allowNo":false}},"args":[{"name":"destination","description":"destination","required":true}]},"import":{"id":"import","description":"import schemas from stepzen","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"working directory"},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"silent":{"name":"silent","type":"boolean","hidden":true,"allowNo":false}},"args":[{"name":"schemas","required":true}]},"init":{"id":"init","description":"stepzen init","pluginName":"stepzen","pluginType":"core","hidden":true,"aliases":[],"flags":{"endpoint":{"name":"endpoint","type":"option","hidden":true},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"yes":{"name":"yes","type":"boolean","hidden":true,"allowNo":false}},"args":[{"name":"directory","hidden":true}]},"lint":{"id":"lint","description":"stepzen lint","pluginName":"stepzen","pluginType":"core","hidden":true,"aliases":[],"flags":{"dir":{"name":"dir","type":"option","hidden":true},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"list":{"id":"list","description":"list your items","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[{"name":"type","description":"type","required":true,"options":["configurationsets","schemas"]}]},"login":{"id":"login","description":"log in to stepzen","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"account":{"name":"account","type":"option","char":"a","hidden":true},"adminkey":{"name":"adminkey","type":"option","char":"k","hidden":true},"config":{"name":"config","type":"option","hidden":true},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"logout":{"id":"logout","description":"log out of stepzen","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"start":{"id":"start","description":"upload and deploy your schema","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"working directory"},"endpoint":{"name":"endpoint","type":"option","description":"Override workspace endpoint"},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"no-console":{"name":"no-console","type":"boolean","hidden":true,"allowNo":false},"local-proxy":{"name":"local-proxy","type":"boolean","hidden":true,"allowNo":false},"no-init":{"name":"no-init","type":"boolean","hidden":true,"allowNo":false},"no-server":{"name":"no-server","type":"boolean","hidden":true,"allowNo":false},"no-validate":{"name":"no-validate","type":"boolean","hidden":true,"allowNo":false},"no-watcher":{"name":"no-watcher","type":"boolean","hidden":true,"allowNo":false},"port":{"name":"port","type":"option","default":5001}},"args":[]},"transpile":{"id":"transpile","description":"transpile a graphql schema","pluginName":"stepzen","pluginType":"core","hidden":true,"aliases":[],"flags":{"config":{"name":"config","type":"option","hidden":true},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"hide-output":{"name":"hide-output","type":"boolean","hidden":true,"allowNo":false},"inspect":{"name":"inspect","type":"boolean","char":"i","hidden":true,"allowNo":false},"inspect-after":{"name":"inspect-after","type":"boolean","hidden":true,"allowNo":false},"output-configuration":{"name":"output-configuration","type":"boolean","allowNo":false},"silent":{"name":"silent","type":"boolean","allowNo":false}},"args":[{"name":"folder","required":true}]},"upload":{"id":"upload","description":"upload to stepzen","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"A directory to upload"},"file":{"name":"file","type":"option","description":"A file to upload"},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"silent":{"name":"silent","type":"boolean","allowNo":false}},"args":[{"name":"type","description":"type","required":true,"options":["configurationset","schema"]},{"name":"destination","description":"destination","required":true}]},"validate":{"id":"validate","description":"validate a graphql schema","pluginName":"stepzen","pluginType":"core","hidden":true,"aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[{"name":"folder","required":true}]},"whoami":{"id":"whoami","description":"stepzen whoami","pluginName":"stepzen","pluginType":"core","hidden":true,"aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"showkeys":{"name":"showkeys","type":"boolean","allowNo":false}},"args":[]}}}
+{"version":"0.9.38-beta.4","commands":{"deploy":{"id":"deploy","description":"deploy to stepzen","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"configurationsets":{"name":"configurationsets","type":"option","description":"Configurationsets to use","default":""},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"schema":{"name":"schema","type":"option","description":"Schema to use","required":true},"silent":{"name":"silent","type":"boolean","allowNo":false}},"args":[{"name":"destination","description":"destination","required":true}]},"import":{"id":"import","description":"import schemas from stepzen","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"working directory"},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"silent":{"name":"silent","type":"boolean","hidden":true,"allowNo":false}},"args":[{"name":"schemas","required":true}]},"init":{"id":"init","description":"stepzen init","pluginName":"stepzen","pluginType":"core","hidden":true,"aliases":[],"flags":{"endpoint":{"name":"endpoint","type":"option","hidden":true},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"yes":{"name":"yes","type":"boolean","hidden":true,"allowNo":false}},"args":[{"name":"directory","hidden":true}]},"lint":{"id":"lint","description":"stepzen lint","pluginName":"stepzen","pluginType":"core","hidden":true,"aliases":[],"flags":{"dir":{"name":"dir","type":"option","hidden":true},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"list":{"id":"list","description":"list your items","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[{"name":"type","description":"type","required":true,"options":["configurationsets","schemas"]}]},"login":{"id":"login","description":"log in to stepzen","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"account":{"name":"account","type":"option","char":"a","hidden":true},"adminkey":{"name":"adminkey","type":"option","char":"k","hidden":true},"config":{"name":"config","type":"option","hidden":true},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"logout":{"id":"logout","description":"log out of stepzen","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"start":{"id":"start","description":"upload and deploy your schema","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"working directory"},"endpoint":{"name":"endpoint","type":"option","description":"Override workspace endpoint"},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"no-console":{"name":"no-console","type":"boolean","hidden":true,"allowNo":false},"no-dashboard":{"name":"no-dashboard","type":"boolean","hidden":true,"allowNo":false},"no-init":{"name":"no-init","type":"boolean","hidden":true,"allowNo":false},"no-server":{"name":"no-server","type":"boolean","hidden":true,"allowNo":false},"no-validate":{"name":"no-validate","type":"boolean","hidden":true,"allowNo":false},"no-watcher":{"name":"no-watcher","type":"boolean","hidden":true,"allowNo":false},"port":{"name":"port","type":"option","default":5001}},"args":[]},"transpile":{"id":"transpile","description":"transpile a graphql schema","pluginName":"stepzen","pluginType":"core","hidden":true,"aliases":[],"flags":{"config":{"name":"config","type":"option","hidden":true},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"hide-output":{"name":"hide-output","type":"boolean","hidden":true,"allowNo":false},"inspect":{"name":"inspect","type":"boolean","char":"i","hidden":true,"allowNo":false},"inspect-after":{"name":"inspect-after","type":"boolean","hidden":true,"allowNo":false},"output-configuration":{"name":"output-configuration","type":"boolean","allowNo":false},"silent":{"name":"silent","type":"boolean","allowNo":false}},"args":[{"name":"folder","required":true}]},"upload":{"id":"upload","description":"upload to stepzen","pluginName":"stepzen","pluginType":"core","aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"A directory to upload"},"file":{"name":"file","type":"option","description":"A file to upload"},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"silent":{"name":"silent","type":"boolean","allowNo":false}},"args":[{"name":"type","description":"type","required":true,"options":["configurationset","schema"]},{"name":"destination","description":"destination","required":true}]},"validate":{"id":"validate","description":"validate a graphql schema","pluginName":"stepzen","pluginType":"core","hidden":true,"aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[{"name":"folder","required":true}]},"whoami":{"id":"whoami","description":"stepzen whoami","pluginName":"stepzen","pluginType":"core","hidden":true,"aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"showkeys":{"name":"showkeys","type":"boolean","allowNo":false}},"args":[]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stepzen",
   "description": "The StepZen CLI",
-  "version": "0.9.38-beta.0",
+  "version": "0.9.38-beta.4",
   "license": "MIT",
   "author": "Darren Waddell <darren@stepzen.com>",
   "contributors": [
@@ -28,6 +28,7 @@
   "dependencies": {
     "@oclif/command": "^1.8.0",
     "@oclif/config": "^1.17.1",
+    "@oclif/errors": "1.3.5",
     "@oclif/plugin-help": "^5.1.10",
     "@stepzen/dashboard": "0.1.36",
     "@stepzen/sdk": "0.9.42",
@@ -46,6 +47,7 @@
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.6",
     "prettier": "^2.4.1",
+    "pretty-ms": "^7.0.1",
     "shelljs": "^0.8.5",
     "throttle-debounce": "^3.0.1",
     "yaml": "^1.10.0"
@@ -72,6 +74,7 @@
     "@types/prettier": "^2.1.6",
     "@types/rimraf": "^3.0.0",
     "@types/shelljs": "^0.8.8",
+    "@types/sinon-chai": "3.2.8",
     "@types/throttle-debounce": "^2.1.0",
     "@types/unzipper": "^0.10.4",
     "chai": "^4.2.0",
@@ -89,6 +92,8 @@
     "nock": "^13.0.4",
     "nodemon": "^2.0.7",
     "nyc": "^14.1.1",
+    "sinon": "13.0.1",
+    "sinon-chai": "3.7.0",
     "ts-node": "^8.10.2",
     "typescript": "^3.9.7"
   },