stepzen 0.13.0-beta.2 → 0.14.0-beta.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.2 darwin-x64 node-v14.19.1
+stepzen/0.14.0-beta.0 darwin-x64 node-v14.19.1
 $ stepzen --help [COMMAND]
 USAGE
   $ stepzen COMMAND

package/lib/commands/deploy.d.ts

@@ -8,6 +8,7 @@ export default class Deploy extends ZenCommand {
         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;

package/lib/commands/import.d.ts

@@ -12,6 +12,7 @@ export default class Import extends ZenCommand {
         '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;

package/lib/commands/import.js

@@ -6,8 +6,7 @@ const fs = require("fs-extra");
 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 core_1 = require("@oclif/core");
 const generate_1 = require("../generate");
 const utils_1 = require("../shared/utils");
 const helpers_1 = require("../generate/helpers");
@@ -89,9 +88,9 @@ class Import extends zen_command_1.default {
                 }
                 curl2sdlOptions = Object.assign(Object.assign(Object.assign({}, fixedOptions), editableOptions), { pathParams: parsedPathParamsOrError, curlArgs: argsOrError });
             }
-            cli_ux_1.cli.action.start('Starting');
+            core_1.CliUx.ux.action.start('Starting');
             const resultOrError = await curl2sdl_1.curl2sdl(curl2sdlOptions);
-            cli_ux_1.cli.action.stop();
+            core_1.CliUx.ux.action.stop();
             if ('error' in resultOrError) {
                 this.log('A problem occured while processing your import. ' +
                     'Please check that the given cURL command is valid.');
@@ -101,19 +100,12 @@ class Import extends zen_command_1.default {
             result = resultOrError.outPath;
         }
         else {
-            await this.ensureStepZenAccount();
+            ;
             ['prefix', 'query-type', 'query-name', 'path-params'].forEach(flag => {
                 if (flag in flags) {
                     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

package/lib/commands/init.d.ts

@@ -11,6 +11,7 @@ export default class Init extends ZenCommand {
         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;

package/lib/commands/lint.d.ts

@@ -7,6 +7,7 @@ export default class Init extends ZenCommand {
         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/list.d.ts

@@ -1,9 +1,11 @@
+import { flags } from '@oclif/command';
 import ZenCommand from '../shared/zen-command';
 export default class List extends ZenCommand {
     static description: string;
     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;

package/lib/commands/login.d.ts

@@ -8,6 +8,7 @@ export default class Login extends ZenCommand {
         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,7 +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 cli_ux_1 = require("cli-ux");
+const core_1 = require("@oclif/core");
 const configuration_1 = require("../shared/configuration");
 const stepzen_sdk_1 = require("../shared/stepzen-sdk");
 const zen_command_1 = require("../shared/zen-command");
@@ -16,7 +16,7 @@ class Login extends zen_command_1.default {
         let adminkey;
         // If the --config flag is provided, try and log in using the details in the file
         if (flags.config) {
-            const config = configuration_1.importConfiguration(flags.config);
+            const config = await configuration_1.importConfiguration(flags.config);
             account = config.account;
             adminkey = config.adminkey;
         }
@@ -26,21 +26,22 @@ class Login extends zen_command_1.default {
                 account = flags.account;
             }
             else {
-                account = await cli_ux_1.default.prompt('What is your account name?');
+                account = await core_1.CliUx.ux.prompt('What is your account name?');
             }
             // Check if the --adminkey flag is provided, and if not prompt the user for an admin key.
-            if (flags.adminkey) {
-                adminkey = flags.adminkey;
-            }
-            else {
-                adminkey = await cli_ux_1.default.prompt('What is your admin key?', {
+            if (flags.adminkey === undefined) {
+                adminkey = await core_1.CliUx.ux.prompt('What is your admin key?', {
+                    required: false,
                     type: 'hide',
                 });
             }
+            else {
+                adminkey = flags.adminkey;
+            }
         }
         const configuration = await stepzen_sdk_1.default.login(adminkey, account);
         // Change the default account.
-        configuration_1.writeConfigurationToLoginFile(configuration);
+        configuration_1.writeCredentialsToConfigFile(configuration);
         this.log('You have successfully logged in.');
     }
 }

package/lib/commands/logout.d.ts

@@ -1,9 +1,11 @@
+import { flags } from '@oclif/command';
 import ZenCommand from '../shared/zen-command';
 export default class Logout extends ZenCommand {
     static description: string;
     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

@@ -9,7 +9,7 @@ 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();
+        configuration_1.removeCredentialsFromConfigFile();
         this.log('You have been logged out.');
     }
 }

package/lib/commands/start.d.ts

@@ -14,6 +14,7 @@ export default class Start extends ZenCommand {
         '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

@@ -2,7 +2,7 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 const chokidar = require("chokidar");
-const cli_ux_1 = require("cli-ux");
+const core_1 = require("@oclif/core");
 const command_1 = require("@oclif/command");
 const errors_1 = require("@oclif/errors");
 const throttle_debounce_1 = require("throttle-debounce");
@@ -56,7 +56,6 @@ class Start extends zen_command_1.default {
                 ignored: '**/*.js',
             })
                 .on('change', throttle_debounce_1.debounce(500, async (path) => {
-                await utils_1.checkAuth();
                 utils_1.clearConsole();
                 await start_1.deploy(path, workspace, flags);
                 await start_1.console(workspace);
@@ -64,7 +63,7 @@ class Start extends zen_command_1.default {
         }
         // Start!
         utils_1.clearConsole();
-        cli_ux_1.default.action.start('Starting...');
+        core_1.CliUx.ux.action.start('Starting...');
         // Unless explicitly disabled, auto-init
         if (!flags['no-init']) {
             await start_1.deploy(null, workspace, flags);
@@ -94,7 +93,7 @@ class Start extends zen_command_1.default {
             await ui.start();
         }
         // Done
-        cli_ux_1.default.action.stop();
+        core_1.CliUx.ux.action.stop();
     }
 }
 exports.default = Start;

package/lib/commands/transpile.d.ts

@@ -12,6 +12,7 @@ export default class Transpile extends ZenCommand {
         '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;

package/lib/commands/upload.d.ts

@@ -8,6 +8,7 @@ export default class Upload extends ZenCommand {
         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;

package/lib/commands/upload.js

@@ -21,14 +21,23 @@ class Upload extends zen_command_1.default {
             throw new errors_1.CLIError('You must specify the folder/name you want to use');
         }
         await this.ensureStepZenAccount();
-        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.');
+        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;
+        }
+        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);

package/lib/commands/validate.d.ts

@@ -1,3 +1,4 @@
+import { flags } from '@oclif/command';
 import ZenCommand from '../shared/zen-command';
 export default class Validate extends ZenCommand {
     static description: string;
@@ -5,6 +6,7 @@ export default class Validate extends ZenCommand {
     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;

package/lib/commands/whoami.d.ts

@@ -1,3 +1,4 @@
+import { flags } from '@oclif/command';
 import ZenCommand from '../shared/zen-command';
 export default class WhoAmI extends ZenCommand {
     static description: string;
@@ -8,6 +9,7 @@ export default class WhoAmI extends ZenCommand {
         apikey: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
         adminkey: 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: never[];
     run(): Promise<void>;

package/lib/commands/whoami.js

@@ -9,8 +9,8 @@ const zen_command_1 = require("../shared/zen-command");
 class WhoAmI extends zen_command_1.default {
     async run() {
         const { flags } = this.parse(WhoAmI);
-        const configuration = configuration_1.readConfiguration();
-        if (!configuration) {
+        const configuration = await configuration_1.readConfiguration();
+        if (!('account' in configuration)) {
             this.log('You are not logged in.');
             this.exit();
         }

package/lib/generate/helpers.d.ts

@@ -1,6 +1,4 @@
 import type { Answers, DistinctQuestion } from 'inquirer';
-export declare const createGeneratorFilesDirectly: (id: string, details: any) => Promise<string>;
-export declare const createGeneratorFilesViaStepZen: (id: string, details: any) => Promise<string>;
 export declare const createGeneratorFiles: (id: string, details: any) => Promise<string>;
 export declare type GeneratorConfiguration = {
     questions: DistinctQuestion<Answers>[];
@@ -8,8 +6,6 @@ export declare type GeneratorConfiguration = {
     errors: Record<string, any>;
     status: number;
 };
-export declare const getConfigurationDirectly: (id: string, details?: any) => Promise<GeneratorConfiguration | null>;
-export declare const getConfigurationViaStepZen: (id: string, details?: any) => Promise<GeneratorConfiguration | null>;
 export declare const getConfiguration: (id: string, details?: any) => Promise<GeneratorConfiguration | null>;
 export declare const getSchemaList: (arg: string) => string[];
 export declare const getTemplates: () => Promise<string>;

package/lib/generate/helpers.js

@@ -1,7 +1,7 @@
 "use strict";
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.askTemplateQuestions = exports.askGeneratorQuestions = exports.getTemplates = exports.getSchemaList = exports.getConfiguration = exports.getConfigurationViaStepZen = exports.getConfigurationDirectly = exports.createGeneratorFiles = exports.createGeneratorFilesViaStepZen = exports.createGeneratorFilesDirectly = void 0;
+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");
@@ -12,13 +12,13 @@ const lodash_1 = require("lodash");
 const os = require("os");
 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.createGeneratorFilesDirectly = async (id, details) => {
+exports.createGeneratorFiles = async (id, details) => {
     const url = `${constants_1.STEPZEN_DIRECT_GENERATOR_ENGINES_URL}/create`;
     debug('stepzen:generate')(`calling the generator engine ${id} via ${url}`);
+    const engineErrorMessageWrap = (msg) => `An error has occurred when creating the schema: ${msg}. Please check your parameters and try again.`;
     try {
         const response = await node_fetch_1.default(url, {
             body: JSON.stringify({
@@ -31,63 +31,36 @@ exports.createGeneratorFilesDirectly = async (id, details) => {
             },
             method: 'POST',
         });
-        const files = await response.json();
-        const tmp = path.join(os.tmpdir(), `stepzen-generated-schema-${Date.now()}`);
-        fs.ensureDirSync(tmp);
-        for (const file of files) {
-            const dir = path.join(tmp, file.name);
-            fs.writeFileSync(dir, file.content);
+        const responseJson = await response.json();
+        if (responseJson.errors) {
+            // assuming a response of type { status: Int, errors: String }
+            throw new errors_1.CLIError(engineErrorMessageWrap(responseJson.errors));
+        }
+        else {
+            // where errors is an error message if name === null.
+            const files = responseJson;
+            const tmp = path.join(os.tmpdir(), `stepzen-generated-schema-${Date.now()}`);
+            fs.ensureDirSync(tmp);
+            for (const file of files) {
+                if (file.errors) {
+                    throw new errors_1.CLIError(engineErrorMessageWrap(file.errors));
+                }
+                else {
+                    const dir = path.join(tmp, file.name);
+                    fs.writeFileSync(dir, file.content);
+                }
+            }
+            return tmp;
         }
-        return tmp;
     }
     catch (error) {
         debug('stepzen:generate')(error);
-        throw new errors_1.CLIError(errors_2.PERMANENT_STEPZEN_ERROR);
-    }
-};
-exports.createGeneratorFilesViaStepZen = async (id, details) => {
-    const config = configuration_1.readConfiguration();
-    const domain = constants_1.STEPZEN_DOMAIN.replace('.io', '.net');
-    const url = `https://${config.account}.${domain}/${constants_1.STEPZEN_GENERATOR_ENGINES_ENDPOINT}/__graphql`;
-    debug('stepzen:generate')(`calling the generator engine ${id} via ${url}`);
-    const response = await node_fetch_1.default(url, {
-        body: JSON.stringify({
-            query: `
-        query {
-          create(id: "${id}" details: "${JSON.stringify(details.answers).replace(/"/g, '\\"')}") {
-            content
-            name
-          }
-        }
-      `,
-        }),
-        headers: {
-            Authorization: `Apikey ${config.adminkey}`,
-            'Content-Type': 'application/json',
-            'stepzen-cli-version': version,
-            'user-agent': `stepzen-cli/${version}`,
-        },
-        method: 'POST',
-    });
-    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 data.create) {
-        const dir = path.join(tmp, file.name);
-        fs.writeFileSync(dir, file.content);
+        throw error instanceof errors_1.CLIError
+            ? error
+            : new errors_1.CLIError(errors_2.PERMANENT_STEPZEN_ERROR);
     }
-    return tmp;
 };
-exports.createGeneratorFiles = async (id, details) => {
-    const fn = constants_1.STEPZEN_DIRECT_GENERATOR_ENGINES_URL
-        ? exports.createGeneratorFilesDirectly
-        : exports.createGeneratorFilesViaStepZen;
-    return fn(id, details);
-};
-exports.getConfigurationDirectly = async (id, details = {}) => {
+exports.getConfiguration = async (id, details = {}) => {
     const url = `${constants_1.STEPZEN_DIRECT_GENERATOR_ENGINES_URL}/configure`;
     debug('stepzen:generate')(`calling the generator engine ${id} via ${url}`);
     try {
@@ -115,62 +88,6 @@ exports.getConfigurationDirectly = async (id, details = {}) => {
         throw new errors_1.CLIError(errors_2.PERMANENT_STEPZEN_ERROR);
     }
 };
-exports.getConfigurationViaStepZen = async (id, details = {}) => {
-    const config = configuration_1.readConfiguration();
-    const domain = constants_1.STEPZEN_DOMAIN.replace('.io', '.net');
-    const url = `https://${config.account}.${domain}/${constants_1.STEPZEN_GENERATOR_ENGINES_ENDPOINT}/__graphql`;
-    debug('stepzen:generate')(`calling the generator engine ${id} via ${url}`);
-    const response = await node_fetch_1.default(url, {
-        body: JSON.stringify({
-            query: `
-        query {
-          configure(id: "${id}" details: "${JSON.stringify(details).replace(/"/g, '\\"')}") {
-            answers
-            errors
-            questions
-            status
-          }
-        }
-      `,
-        }),
-        headers: {
-            Authorization: `Apikey ${config.adminkey}`,
-            'Content-Type': 'application/json',
-            'stepzen-cli-version': version,
-            'user-agent': `stepzen-cli/${version}`,
-        },
-        method: 'POST',
-    });
-    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.getConfiguration = async (id, details = {}) => {
-    const fn = constants_1.STEPZEN_DIRECT_GENERATOR_ENGINES_URL
-        ? exports.getConfigurationDirectly
-        : exports.getConfigurationViaStepZen;
-    return fn(id, details);
-};
 exports.getSchemaList = (arg) => {
     const schemas = arg.split(',').map((schema) => schema.trim());
     // Make sure they're unique, otherwise, complain

package/lib/generate/index.js

@@ -3,7 +3,7 @@
 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 core_1 = require("@oclif/core");
 const fs = require("fs-extra");
 const lodash = require("lodash");
 const os = require("os");
@@ -21,7 +21,7 @@ exports.default = async (schemas, name, source) => {
     // Store the answers
     let answers = {};
     // Start downloading
-    cli_ux_1.default.action.start('Downloading from StepZen...');
+    core_1.CliUx.ux.action.start('Downloading from StepZen...');
     try {
         // Get all generators from...Generators
         for (var _f = tslib_1.__asyncValues(Object.keys(generators)), _g; _g = await _f.next(), !_g.done;) {
@@ -68,7 +68,7 @@ exports.default = async (schemas, name, source) => {
         finally { if (e_2) throw e_2.error; }
     }
     // Finished downloading
-    cli_ux_1.default.action.stop();
+    core_1.CliUx.ux.action.stop();
     console.log();
     // If you've tried to import non-existent templates, complain and exit
     const notFound = Object.entries(generators)
@@ -109,7 +109,7 @@ exports.default = async (schemas, name, source) => {
     fs.ensureDirSync(output);
     fs.copySync(source, output);
     console.log();
-    cli_ux_1.default.action.start('Generating schemas...');
+    core_1.CliUx.ux.action.start('Generating schemas...');
     try {
         for (var _m = tslib_1.__asyncValues(Object.entries(generators)), _o; _o = await _m.next(), !_o.done;) {
             const [id, generator] = _o.value;
@@ -149,7 +149,7 @@ exports.default = async (schemas, name, source) => {
         finally { if (e_4) throw e_4.error; }
     }
     // Housekeeping
-    cli_ux_1.default.action.stop();
+    core_1.CliUx.ux.action.stop();
     fs.removeSync(templates);
     return output;
 };

package/lib/hooks/prerun/ensure-config-file.js

@@ -0,0 +1,28 @@
+"use strict";
+// Copyright (c) 2020,2021,2022, StepZen, Inc.
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const debug = require("debug");
+const configuration_1 = require("../../shared/configuration");
+const constants_1 = require("../../shared/constants");
+const hook = async function () {
+    // If the configuration is set through an env variable,
+    // skip all the config file checks.
+    if (process.env.STEPZEN_CONFIG_CONTENT) {
+        return;
+    }
+    const configFilePath = path.join(constants_1.STEPZEN_CONFIG_DIRECTORY, constants_1.STEPZEN_CONFIG_FILE);
+    let rawConfiguration;
+    try {
+        rawConfiguration = await configuration_1.importConfiguration(configFilePath);
+    }
+    catch (_a) {
+        rawConfiguration = null;
+    }
+    const { configuration, modified } = await configuration_1.ensureValidConfiguration(rawConfiguration);
+    if (modified) {
+        configuration_1.writeConfiguration(configuration);
+        debug('stepzen:configuration')(`Automatically updated the ${configFilePath} config file.`);
+    }
+};
+exports.default = hook;

package/lib/shared/actions.d.ts

@@ -1,4 +1,4 @@
 import { ZenCtlResponse } from './types';
 export declare const deploy: (destination: string, configurationsets: string | undefined, schema: string) => Promise<ZenCtlResponse>;
 export declare const list: (type: 'configurationsets' | 'schemas') => Promise<ZenCtlResponse>;
-export declare const upload: (type: string, destination: string, file: string | undefined, directory: string | undefined) => Promise<any>;
+export declare const upload: (type: 'configurationset' | 'schema', destination: string, source: string) => Promise<any>;

package/lib/shared/actions.js

@@ -2,13 +2,11 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.upload = exports.list = exports.deploy = void 0;
-// This file contains 'actions' - calls to zenctl
-const errors_1 = require("@oclif/errors");
 const configuration_1 = require("./configuration");
 const constants_1 = require("./constants");
 const stepzen_sdk_1 = require("./stepzen-sdk");
 exports.deploy = async (destination, configurationsets, schema) => {
-    const config = configuration_1.readConfiguration();
+    const config = (await configuration_1.readConfiguration());
     const server = constants_1.STEPZEN_SERVER_URL.replace('{account}', config.account);
     const client = await stepzen_sdk_1.default.client({
         account: config.account,
@@ -23,7 +21,7 @@ exports.deploy = async (destination, configurationsets, schema) => {
     return client.deploy(destination, payload);
 };
 exports.list = async (type) => {
-    const config = configuration_1.readConfiguration();
+    const config = (await configuration_1.readConfiguration());
     const server = constants_1.STEPZEN_SERVER_URL.replace('{account}', config.account);
     const client = await stepzen_sdk_1.default.client({
         account: config.account,
@@ -33,8 +31,8 @@ exports.list = async (type) => {
     });
     return client.list[type]();
 };
-exports.upload = async (type, destination, file, directory) => {
-    const config = configuration_1.readConfiguration();
+exports.upload = async (type, destination, source) => {
+    const config = (await configuration_1.readConfiguration());
     const server = constants_1.STEPZEN_SERVER_URL.replace('{account}', config.account);
     const client = await stepzen_sdk_1.default.client({
         account: config.account,
@@ -42,16 +40,5 @@ exports.upload = async (type, destination, file, directory) => {
         domain: constants_1.STEPZEN_DOMAIN,
         server,
     });
-    if (type === 'configurationset') {
-        if (!file) {
-            throw new errors_1.CLIError('Please specify a source file with the --file flag');
-        }
-        return client.upload.configurationset(destination, file);
-    }
-    if (type === 'schema') {
-        if (!directory) {
-            throw new errors_1.CLIError('Please specify a source directory with the --dir flag');
-        }
-        return client.upload.schema(destination, directory);
-    }
+    return client.upload[type](destination, source);
 };