stepzen 0.13.0-beta.1 → 0.13.0

package/README.md

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

package/lib/commands/deploy.d.ts

@@ -1,7 +1,15 @@
-import { Command, flags } from '@oclif/command';
-export default class Deploy extends Command {
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
+export default class Deploy extends ZenCommand {
     static description: string;
-    static flags: flags.Input<any>;
+    static flags: {
+        configurationsets: flags.IOptionFlag<string>;
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        schema: flags.IOptionFlag<string>;
+        silent: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     static args: {
         name: string;
         description: string;

package/lib/commands/deploy.js

@@ -8,19 +8,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 {
+const zen_command_1 = require("../shared/zen-command");
+class Deploy extends zen_command_1.default {
     async run() {
         const { args, flags } = this.parse(Deploy);
         // Make sure that you definitely specify folder/name
         if (args.destination.includes('/') === false) {
             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.
-            throw new errors_1.CLIError('You are probably not logged in.');
-        }
+        await this.ensureStepZenAccount();
         if (!flags.silent) {
             this.log('Deploying...');
         }
@@ -38,17 +34,13 @@ class Deploy extends command_1.Command {
 }
 exports.default = Deploy;
 Deploy.description = 'deploy to stepzen';
-Deploy.flags = {
+Deploy.flags = Object.assign(Object.assign({}, zen_command_1.default.flags), { 
     // configurationsets is assumed to be a comma separated string naming uploaded configurationsets
     // a special configuration 'stepzen/defaults' is recognized.
     configurationsets: command_1.flags.string({
         description: 'Configurationsets to use',
         default: '',
-    }),
-    help: command_1.flags.help({ char: 'h' }),
-    schema: command_1.flags.string({ description: 'Schema to use', required: true }),
-    silent: command_1.flags.boolean(),
-};
+    }), help: command_1.flags.help({ char: 'h' }), schema: command_1.flags.string({ description: 'Schema to use', required: true }), silent: command_1.flags.boolean() });
 Deploy.args = [
     {
         name: 'destination',

package/lib/commands/import.d.ts

@@ -1,7 +1,19 @@
-import { Command, flags } from '@oclif/command';
-export default class Import extends Command {
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
+export default class Import extends ZenCommand {
     static description: string;
-    static flags: flags.Input<any>;
+    static flags: {
+        dir: flags.IOptionFlag<string | undefined>;
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        silent: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        name: flags.IOptionFlag<string | undefined>;
+        prefix: flags.IOptionFlag<string | undefined>;
+        'query-name': flags.IOptionFlag<string | undefined>;
+        'query-type': flags.IOptionFlag<string | undefined>;
+        'path-params': flags.IOptionFlag<string | undefined>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     static args: {
         name: string;
         required: boolean;

package/lib/commands/import.js

@@ -7,17 +7,17 @@ const command_1 = require("@oclif/command");
 const errors_1 = require("@oclif/errors");
 const transpiler_1 = require("@stepzen/transpiler");
 const cli_ux_1 = require("cli-ux");
-const deploy_1 = require("./deploy");
 const generate_1 = require("../generate");
 const utils_1 = require("../shared/utils");
 const helpers_1 = require("../generate/helpers");
 const curl2sdl_1 = require("../generate/curl2sdl");
 const curl_parser_1 = require("../shared/curl-parser");
 const workspace_1 = require("../shared/workspace");
+const zen_command_1 = require("../shared/zen-command");
 const init_1 = require("./init");
 const constants_1 = require("../shared/constants");
 const path_params_parser_1 = require("../shared/path-params-parser");
-class Import extends command_1.Command {
+class Import extends zen_command_1.default {
     async run() {
         const { args, argv, flags } = this.parse(Import);
         // Get a list of schemas you're asking for
@@ -106,13 +106,6 @@ class Import extends command_1.Command {
                     this.log(chalk.gray(`The ${chalk.bold(`--${flag}`)} flag only applies when importing ${chalk.bold('curl')}. It will be ignored now.`));
                 }
             });
-            // Make sure the user has latest Generator Schema
-            await deploy_1.default.run([
-                constants_1.STEPZEN_GENERATOR_ENGINES_ENDPOINT,
-                '--schema',
-                constants_1.STEPZEN_GENERATOR_ENGINES_SCHEMA,
-                '--silent',
-            ]);
             // Let's go!
             result = await generate_1.default(schemas, flags.name, workspace.schema);
             // Validate
@@ -130,26 +123,18 @@ class Import extends command_1.Command {
 }
 exports.default = Import;
 Import.description = 'Import a schema for an external data source or a API endpoint to your GraphQL API.';
-Import.flags = {
-    dir: command_1.flags.string({ description: 'working directory' }),
-    help: command_1.flags.help({ char: 'h' }),
-    silent: command_1.flags.boolean({ hidden: true }),
-    name: command_1.flags.string({
+Import.flags = Object.assign(Object.assign({}, zen_command_1.default.flags), { dir: command_1.flags.string({ description: 'working directory' }), help: command_1.flags.help({ char: 'h' }), silent: command_1.flags.boolean({ hidden: true }), name: command_1.flags.string({
         description: 'subfolder inside the workspace folder to save the imported' +
             ' schema files, defaults to the imported schema name',
-    }),
-    prefix: command_1.flags.string({
+    }), prefix: command_1.flags.string({
         description: '[curl] prefix to add every type in the generated schema.',
-    }),
-    'query-name': command_1.flags.string({
+    }), 'query-name': command_1.flags.string({
         description: '[curl] property name to add to the Query type as a way to' +
             ' access the imported cURL endpoint.',
-    }),
-    'query-type': command_1.flags.string({
+    }), 'query-type': command_1.flags.string({
         description: '[curl] name for the type returned by the cURL endpoint in the ' +
             `generated schema. The name specified by ${chalk.bold('--query-type')} is not prefixed by ${chalk.bold('--prefix')} if both flags are present.`,
-    }),
-    'path-params': command_1.flags.string({
+    }), 'path-params': command_1.flags.string({
         description: `[curl] specifies path parameters in the URL path.` +
             ` Can be formed by taking the original path and replacing the` +
             ` variable segments with ${chalk.bold('$paramName')} placeholders.` +
@@ -158,8 +143,7 @@ Import.flags = {
             `\nstepzen import curl https://example.com/users/jane/posts/12` +
             ` --path-params` +
             ` '/users/${chalk.bold('$userId')}/posts/${chalk.bold('$postId')}'`,
-    }),
-};
+    }) });
 Import.args = [
     {
         name: 'schemas',

package/lib/commands/init.d.ts

@@ -1,11 +1,18 @@
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
 export declare const validateWorkspaceName: (directory: string, name: string) => boolean;
 export declare const generateWorkspaceName: (directory: string) => string;
 export declare const guessSchemaRoot: (directory: string) => string;
-export default class Init extends Command {
+export default class Init extends ZenCommand {
     static description: string;
     static hidden: boolean;
-    static flags: flags.Input<any>;
+    static flags: {
+        endpoint: flags.IOptionFlag<string | undefined>;
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        yes: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     static args: {
         hidden: boolean;
         name: string;

package/lib/commands/init.js

@@ -12,6 +12,7 @@ const path = require("path");
 const utils_1 = require("../shared/utils");
 const moniker_1 = require("../shared/moniker");
 const workspace_1 = require("../shared/workspace");
+const zen_command_1 = require("../shared/zen-command");
 exports.validateWorkspaceName = (directory, name) => {
     return !fs.existsSync(path.join(directory, name));
 };
@@ -35,7 +36,7 @@ exports.guessSchemaRoot = (directory) => {
     ];
     return existing.length > 0 ? path.dirname(existing[0]) : '';
 };
-class Init extends command_1.Command {
+class Init extends zen_command_1.default {
     async run() {
         const { args, flags } = this.parse(Init);
         // Get the correct directory
@@ -121,11 +122,7 @@ class Init extends command_1.Command {
 exports.default = Init;
 Init.description = 'stepzen init';
 Init.hidden = true;
-Init.flags = {
-    endpoint: command_1.flags.string({ hidden: true }),
-    help: command_1.flags.help({ char: 'h' }),
-    yes: command_1.flags.boolean({ default: false, hidden: true }),
-};
+Init.flags = Object.assign(Object.assign({}, zen_command_1.default.flags), { endpoint: command_1.flags.string({ hidden: true }), help: command_1.flags.help({ char: 'h' }), yes: command_1.flags.boolean({ default: false, hidden: true }) });
 Init.args = [
     {
         hidden: true,

package/lib/commands/lint.d.ts

@@ -1,7 +1,13 @@
-import { Command, flags } from '@oclif/command';
-export default class Init extends Command {
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
+export default class Init extends ZenCommand {
     static description: string;
     static hidden: boolean;
-    static flags: flags.Input<any>;
+    static flags: {
+        dir: flags.IOptionFlag<string | undefined>;
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     run(): Promise<void>;
 }

package/lib/commands/lint.js

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@oclif/command");
 const utils_1 = require("../shared/utils");
+const zen_command_1 = require("../shared/zen-command");
 const { lint } = require('@stepzen/transpiler');
-class Init extends command_1.Command {
+class Init extends zen_command_1.default {
     async run() {
         const { flags } = this.parse(Init);
         // Get the correct directory
@@ -23,7 +24,4 @@ class Init extends command_1.Command {
 exports.default = Init;
 Init.description = 'stepzen lint';
 Init.hidden = true;
-Init.flags = {
-    dir: command_1.flags.string({ hidden: true }),
-    help: command_1.flags.help({ char: 'h' }),
-};
+Init.flags = Object.assign(Object.assign({}, zen_command_1.default.flags), { dir: command_1.flags.string({ hidden: true }), help: command_1.flags.help({ char: 'h' }) });

package/lib/commands/list.d.ts

@@ -1,7 +1,12 @@
-import { Command, flags } from '@oclif/command';
-export default class List extends Command {
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
+export default class List extends ZenCommand {
     static description: string;
-    static flags: flags.Input<any>;
+    static flags: {
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     static args: {
         name: string;
         required: boolean;

package/lib/commands/list.js

@@ -8,16 +8,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 {
+const zen_command_1 = require("../shared/zen-command");
+class List extends zen_command_1.default {
     async run() {
         var _a;
         const { args } = this.parse(List);
-        const configuration = configuration_1.readConfiguration();
-        if (!configuration) {
-            // Configuration not found. Most likely because someone is not logged in. Exit with error.
-            throw new errors_1.CLIError('You are probably not logged in.');
-        }
+        await this.ensureStepZenAccount();
         const response = await actions_1.list(args.type);
         if (response.success) {
             if (((_a = response.results) === null || _a === void 0 ? void 0 : _a.length) === 0) {
@@ -37,9 +33,7 @@ class List extends command_1.Command {
 }
 exports.default = List;
 List.description = 'list your items';
-List.flags = {
-    help: command_1.flags.help({ char: 'h' }),
-};
+List.flags = Object.assign(Object.assign({}, zen_command_1.default.flags), { help: command_1.flags.help({ char: 'h' }) });
 List.args = [
     {
         name: 'type',

package/lib/commands/login.d.ts

@@ -1,6 +1,14 @@
-import { Command, flags } from '@oclif/command';
-export default class Login extends Command {
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
+export default class Login extends ZenCommand {
     static description: string;
-    static flags: flags.Input<any>;
+    static flags: {
+        account: flags.IOptionFlag<string | undefined>;
+        adminkey: flags.IOptionFlag<string | undefined>;
+        config: flags.IOptionFlag<string | undefined>;
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     run(): Promise<void>;
 }

package/lib/commands/login.js

@@ -5,11 +5,11 @@ 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");
 const stepzen_sdk_1 = require("../shared/stepzen-sdk");
-class Login extends command_1.Command {
+const zen_command_1 = require("../shared/zen-command");
+class Login extends zen_command_1.default {
     async run() {
         const { flags } = this.parse(Login);
         let account;
@@ -38,26 +38,12 @@ class Login extends command_1.Command {
                 });
             }
         }
-        // Check whether the account and admin key exist and are correct by calling
-        // the stepzen admin api.
-        const isValidConfiguration = await stepzen_sdk_1.default.verify(account, adminkey);
-        if (!isValidConfiguration) {
-            // Exit, with error
-            throw new errors_1.CLIError('We are unable to verify your account details. Could you please check them?');
-        }
+        const configuration = await stepzen_sdk_1.default.login(adminkey, account);
         // Change the default account.
-        configuration_1.writeConfigurationToLoginFile({
-            account,
-            adminkey,
-        });
+        configuration_1.writeConfigurationToLoginFile(configuration);
         this.log('You have successfully logged in.');
     }
 }
 exports.default = Login;
 Login.description = 'log in to stepzen';
-Login.flags = {
-    account: command_1.flags.string({ char: 'a', exclusive: ['config'], hidden: true }),
-    adminkey: command_1.flags.string({ char: 'k', exclusive: ['config'], hidden: true }),
-    config: command_1.flags.string({ exclusive: ['account', 'adminkey'], hidden: true }),
-    help: command_1.flags.help({ char: 'h' }),
-};
+Login.flags = Object.assign(Object.assign({}, zen_command_1.default.flags), { account: command_1.flags.string({ char: 'a', exclusive: ['config'], hidden: true }), adminkey: command_1.flags.string({ char: 'k', exclusive: ['config'], hidden: true }), config: command_1.flags.string({ exclusive: ['account', 'adminkey'], hidden: true }), help: command_1.flags.help({ char: 'h' }) });

package/lib/commands/logout.d.ts

@@ -1,6 +1,11 @@
-import { Command, flags } from '@oclif/command';
-export default class Logout extends Command {
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
+export default class Logout extends ZenCommand {
     static description: string;
-    static flags: flags.Input<any>;
+    static flags: {
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     run(): Promise<void>;
 }

package/lib/commands/logout.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // The logout command removes the entry in the login file.
 const command_1 = require("@oclif/command");
 const configuration_1 = require("../shared/configuration");
-class Logout extends command_1.Command {
+const zen_command_1 = require("../shared/zen-command");
+class Logout extends zen_command_1.default {
     async run() {
         // Remove the configuration from the login file.
         configuration_1.removeConfigurationFromLoginFile();
@@ -14,6 +15,4 @@ class Logout extends command_1.Command {
 }
 exports.default = Logout;
 Logout.description = 'log out of stepzen';
-Logout.flags = {
-    help: command_1.flags.help({ char: 'h' }),
-};
+Logout.flags = Object.assign(Object.assign({}, zen_command_1.default.flags), { help: command_1.flags.help({ char: 'h' }) });

package/lib/commands/start.d.ts

@@ -1,7 +1,21 @@
-import { Command, flags } from '@oclif/command';
-export default class Start extends Command {
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
+export default class Start extends ZenCommand {
     static description: string;
-    static flags: flags.Input<any>;
+    static flags: {
+        dir: flags.IOptionFlag<string | undefined>;
+        endpoint: flags.IOptionFlag<string | undefined>;
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        'no-console': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'no-dashboard': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'no-init': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'no-server': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'no-validate': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'no-watcher': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        port: import("@oclif/parser/lib/flags").IOptionFlag<number>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     static args: never[];
     run(): Promise<void>;
 }

package/lib/commands/start.js

@@ -7,23 +7,19 @@ 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");
 const utils_1 = require("../shared/utils");
 const start_1 = require("../start");
 const workspace_1 = require("../shared/workspace");
 const init_1 = require("./init");
 const dashboard_interface_1 = require("../generate/dashboard-interface");
 const constants_1 = require("../shared/constants");
+const zen_command_1 = require("../shared/zen-command");
 const dashboard = require('@stepzen/dashboard');
 const { version } = require('../../package.json');
-class Start extends command_1.Command {
+class Start extends zen_command_1.default {
     async run() {
         const { flags } = this.parse(Start);
-        const configuration = configuration_1.readConfiguration();
-        if (!configuration) {
-            // Configuration not found. Most likely because someone is not logged in. Exit with error.
-            throw new errors_1.CLIError('You are probably not logged in.');
-        }
+        const { configuration } = await this.ensureStepZenAccount();
         // Get the working directory and workspace
         let workspace;
         const directory = utils_1.getDirectory(flags.dir);
@@ -103,16 +99,5 @@ class Start extends command_1.Command {
 }
 exports.default = Start;
 Start.description = 'upload and deploy your schema';
-Start.flags = {
-    dir: command_1.flags.string({ description: 'working directory' }),
-    endpoint: command_1.flags.string({ description: 'Override workspace endpoint' }),
-    help: command_1.flags.help({ char: 'h' }),
-    'no-console': 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 }),
-    'no-watcher': command_1.flags.boolean({ hidden: true }),
-    port: command_1.flags.integer({ default: 5001, env: 'PORT' }),
-};
+Start.flags = Object.assign(Object.assign({}, zen_command_1.default.flags), { dir: command_1.flags.string({ description: 'working directory' }), endpoint: command_1.flags.string({ description: 'Override workspace endpoint' }), help: command_1.flags.help({ char: 'h' }), 'no-console': 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 }), 'no-watcher': command_1.flags.boolean({ hidden: true }), port: command_1.flags.integer({ default: 5001, env: 'PORT' }) });
 Start.args = [];

package/lib/commands/transpile.d.ts

@@ -1,8 +1,19 @@
-import { Command, flags } from '@oclif/command';
-export default class Transpile extends Command {
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
+export default class Transpile extends ZenCommand {
     static description: string;
     static hidden: boolean;
-    static flags: flags.Input<any>;
+    static flags: {
+        config: flags.IOptionFlag<string | undefined>;
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        'hide-output': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        inspect: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'inspect-after': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'output-configuration': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        silent: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     static args: {
         name: string;
         required: boolean;

package/lib/commands/transpile.js

@@ -7,8 +7,9 @@ const errors_1 = require("@oclif/errors");
 const fs = require("fs-extra");
 const path = require("path");
 const utils_1 = require("../shared/utils");
+const zen_command_1 = require("../shared/zen-command");
 const { configure, stitch, validate } = require('@stepzen/transpiler');
-class Transpile extends command_1.Command {
+class Transpile extends zen_command_1.default {
     async run() {
         const { args, flags } = this.parse(Transpile);
         const folder = utils_1.getDirectory(args.folder);
@@ -39,15 +40,7 @@ class Transpile extends command_1.Command {
 exports.default = Transpile;
 Transpile.description = 'transpile a graphql schema';
 Transpile.hidden = true;
-Transpile.flags = {
-    config: command_1.flags.string({ hidden: true }),
-    help: command_1.flags.help({ char: 'h' }),
-    'hide-output': command_1.flags.boolean({ hidden: true }),
-    inspect: command_1.flags.boolean({ char: 'i', hidden: true }),
-    'inspect-after': command_1.flags.boolean({ hidden: true }),
-    'output-configuration': command_1.flags.boolean(),
-    silent: command_1.flags.boolean(),
-};
+Transpile.flags = Object.assign(Object.assign({}, zen_command_1.default.flags), { config: command_1.flags.string({ hidden: true }), help: command_1.flags.help({ char: 'h' }), 'hide-output': command_1.flags.boolean({ hidden: true }), inspect: command_1.flags.boolean({ char: 'i', hidden: true }), 'inspect-after': command_1.flags.boolean({ hidden: true }), 'output-configuration': command_1.flags.boolean(), silent: command_1.flags.boolean() });
 Transpile.args = [
     {
         name: 'folder',

package/lib/commands/upload.d.ts

@@ -1,7 +1,15 @@
-import { Command, flags } from '@oclif/command';
-export default class Upload extends Command {
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
+export default class Upload extends ZenCommand {
     static description: string;
-    static flags: flags.Input<any>;
+    static flags: {
+        dir: flags.IOptionFlag<string | undefined>;
+        file: flags.IOptionFlag<string | undefined>;
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        silent: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     static args: ({
         name: string;
         required: boolean;

package/lib/commands/upload.js

@@ -11,28 +11,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // 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 {
+const zen_command_1 = require("../shared/zen-command");
+class Upload extends zen_command_1.default {
     async run() {
         const { args, flags } = this.parse(Upload);
         // Make sure that you definitely specify folder/name
         if (args.destination.includes('/') === false) {
             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.
-            throw new errors_1.CLIError('You are probably not logged in.');
+        await this.ensureStepZenAccount();
+        let source;
+        if (args.type === 'configurationset') {
+            if (!flags.file) {
+                throw new errors_1.CLIError('Please specify a source file with the --file flag');
+            }
+            source = flags.file;
         }
-        if (!flags.file && !flags.dir) {
-            // You need to specify a file or directory. Exit with error.
-            throw new errors_1.CLIError('You must specify a file or directory.');
+        else {
+            if (!flags.dir) {
+                throw new errors_1.CLIError('Please specify a source directory with the --dir flag');
+            }
+            source = flags.dir;
         }
         if (!flags.silent) {
             this.log('Uploading...');
         }
-        const response = await actions_1.upload(args.type, args.destination, flags.file, flags.dir);
+        const response = await actions_1.upload(args.type, args.destination, source);
         if (response.success) {
             if (!flags.silent) {
                 this.log(response.message);
@@ -48,15 +53,10 @@ exports.default = Upload;
 Upload.description = 'upload to stepzen';
 // The uploaded resource is either a directory or a file. In case it is the former,
 // it will be packaged into a zip archive and transferred.
-Upload.flags = {
-    dir: command_1.flags.string({
+Upload.flags = Object.assign(Object.assign({}, zen_command_1.default.flags), { dir: command_1.flags.string({
         description: 'A directory to upload',
         exclusive: ['file'],
-    }),
-    file: command_1.flags.string({ description: 'A file to upload', exclusive: ['dir'] }),
-    help: command_1.flags.help({ char: 'h' }),
-    silent: command_1.flags.boolean(),
-};
+    }), file: command_1.flags.string({ description: 'A file to upload', exclusive: ['dir'] }), help: command_1.flags.help({ char: 'h' }), silent: command_1.flags.boolean() });
 // the type and name of the uploaded resource.
 Upload.args = [
     {

package/lib/commands/validate.d.ts

@@ -1,8 +1,13 @@
-import { Command, flags } from '@oclif/command';
-export default class Validate extends Command {
+import { flags } from '@oclif/command';
+import ZenCommand from '../shared/zen-command';
+export default class Validate extends ZenCommand {
     static description: string;
     static hidden: boolean;
-    static flags: flags.Input<any>;
+    static flags: {
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+        'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        'enable-login-prompt': flags.IOptionFlag<boolean | undefined>;
+    };
     static args: {
         name: string;
         required: boolean;