stepzen 0.17.0-beta.0 → 0.17.0-beta.3

package/README.md

@@ -29,7 +29,7 @@ $ npm install -g stepzen
 $ stepzen COMMAND
 running command...
 $ stepzen (-v|--version|version)
-stepzen/0.17.0-beta.0 darwin-x64 node-v14.19.1
+stepzen/0.17.0-beta.3 darwin-x64 node-v14.19.3
 $ stepzen --help [COMMAND]
 USAGE
   $ stepzen COMMAND
@@ -126,9 +126,6 @@ OPTIONS
       Subfolder inside the workspace folder to save the imported schema files to. Defaults to the name of the imported
       schema.
 
-  --overwrite
-      Overwrite any existing schema with the same name. Cannot be used without also providing a --name flag.
-
   --path-params=path-params
       [curl] specifies path parameters in the URL path. Can be formed by taking the original path and replacing the
       variable segments with $paramName placeholders.
@@ -137,7 +134,7 @@ OPTIONS
       stepzen import curl https://example.com/users/jane/posts/12 --path-params '/users/$userId/posts/$postId'
 
   --prefix=prefix
-      [curl] prefix to add every type in the generated schema.
+      [curl, graphql] prefix to add every type in the generated schema.
 
   --query-name=query-name
       [curl] property name to add to the Query type as a way to access the imported cURL endpoint.

package/lib/commands/import.d.ts

@@ -3,8 +3,10 @@ import ZenCommand from '../shared/zen-command';
 import { Workspace } from '../shared/types';
 export default class Import extends ZenCommand {
     static description: string;
-    static curlFlags: {
+    static commonIntrospectionFlags: {
         prefix: flags.IOptionFlag<string | undefined>;
+    };
+    static curlFlags: {
         'query-name': flags.IOptionFlag<string | undefined>;
         'query-type': flags.IOptionFlag<string | undefined>;
         'path-params': flags.IOptionFlag<string | undefined>;
@@ -22,6 +24,10 @@ export default class Import extends ZenCommand {
     static flagsForSchemas: ({
         flags: {
             prefix: flags.IOptionFlag<string | undefined>;
+        };
+        schemas: string[];
+    } | {
+        flags: {
             'query-name': flags.IOptionFlag<string | undefined>;
             'query-type': flags.IOptionFlag<string | undefined>;
             'path-params': flags.IOptionFlag<string | undefined>;
@@ -48,11 +54,11 @@ export default class Import extends ZenCommand {
         'db-user': flags.IOptionFlag<string | undefined>;
         'db-password': flags.IOptionFlag<string | undefined>;
         'db-database': 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>;
         'header-param': flags.IOptionFlag<string[]>;
+        prefix: flags.IOptionFlag<string | undefined>;
         dir: flags.IOptionFlag<string | undefined>;
         help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
         silent: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
@@ -67,20 +73,20 @@ export default class Import extends ZenCommand {
     static strict: boolean;
     run(): Promise<void>;
     ensureOnConflictBehavior(workspace: Workspace, schema: string, flags: ReturnType<Import['parseWorkaround']>['flags']): Promise<"overwrite" | "append">;
-    warnAboutIgnoredFlags: (schema: string, usedFlags: {
+    warnAboutIgnoredFlags(schema: string, usedFlags: {
         [key: string]: any;
-    }) => void;
+    }): void;
     parseWorkaround(): import("@oclif/parser").Output<{
         'db-schema': string | undefined;
         'db-host': string | undefined;
         'db-user': string | undefined;
         'db-password': string | undefined;
         'db-database': string | undefined;
-        prefix: string | undefined;
         'query-name': string | undefined;
         'query-type': string | undefined;
         'path-params': string | undefined;
         'header-param': string[];
+        prefix: string | undefined;
         dir: string | undefined;
         help: void;
         silent: boolean;

package/lib/commands/import.js

@@ -14,50 +14,19 @@ 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 graphql2sdl_1 = require("../generate/graphql2sdl");
 const constants_1 = require("../shared/constants");
 const path_params_parser_1 = require("../shared/path-params-parser");
 const header_params_parser_1 = require("../shared/header-params-parser");
 class Import extends zen_command_1.default {
-    constructor() {
-        super(...arguments);
-        // notify the user about any ignored flags
-        this.warnAboutIgnoredFlags = (schema, usedFlags) => {
-            Import.flagsForSchemas.forEach(({ flags, schemas }) => {
-                if (!schemas.includes(schema)) {
-                    Object.keys(flags).forEach(flag => {
-                        if (Object.prototype.hasOwnProperty.call(usedFlags, flag)) {
-                            this.log(chalk.gray(`The ${chalk.bold(`--${flag}`)} flag only applies when importing ${schemas
-                                .map(schema => chalk.bold(schema))
-                                .join(', ')}. It will be ignored now.`));
-                        }
-                    });
-                }
-            });
-        };
-    }
     async run() {
         const { args, argv, flags } = this.parseWorkaround();
         // Get a list of schemas you're asking for
         const schema = helpers_1.getSchema(args.schema);
-        // Get the working directory and workspace
-        let workspace;
-        const directory = utils_1.getDirectory(flags.dir);
-        const maybeWorkspace = workspace_1.getWorkspace(directory);
-        if (maybeWorkspace) {
-            workspace = maybeWorkspace;
-        }
-        else {
-            try {
-                workspace = await init_1.default.run([directory]);
-            }
-            catch (error) {
-                throw new errors_1.CLIError(`Could not create a StepZen workspace in the ${flags.dir ? directory : 'current'} directory.\n` + error.message);
-            }
-        }
-        // Make sure that the onConflict behaviour is defined and feasible
+        // Get or create a StepZen workspace (possibly interactive)
+        const workspace = await this.ensureStepZenWorkspace({ directory: flags.dir });
+        // Define a sane onConflict behaviour (possibly interactive)
         const onConflict = await this.ensureOnConflictBehavior(workspace, schema, flags);
         this.warnAboutIgnoredFlags(schema, flags);
         // Select an import execution flow:
@@ -125,6 +94,35 @@ class Import extends zen_command_1.default {
             }
             result = resultOrError.outPath;
         }
+        else if (schema === 'graphql') {
+            const editableOptions = {
+                typePrefix: flags.prefix,
+            };
+            let answers;
+            if (argv.length === 1) {
+                // interactive
+                answers = await graphql2sdl_1.askGraphQLQuestions(editableOptions);
+            }
+            else {
+                // non-interactive
+                answers = Object.assign(Object.assign({}, editableOptions), { endpoint: argv[1] });
+            }
+            const fixedOptions = {
+                name: flags.name,
+                source: workspace.schema,
+                onConflict,
+            };
+            const options = Object.assign(Object.assign({}, fixedOptions), answers);
+            core_1.CliUx.ux.action.start('Starting');
+            const resultOrError = await graphql2sdl_1.graphql2sdl(options);
+            core_1.CliUx.ux.action.stop();
+            if ('error' in resultOrError) {
+                this.log('A problem occured while processing your import.');
+                this.log(resultOrError.error);
+                this.exit();
+            }
+            result = resultOrError.outPath;
+        }
         else {
             // Map flag names to the properties defined for sql engines in:
             // https://github.com/steprz/generator-engines/blob/main/generator/src/shared/sql.ts
@@ -156,6 +154,10 @@ class Import extends zen_command_1.default {
         this.log(chalk.green(`Successfully imported schema ${chalk.bold(schema)} from StepZen`));
     }
     async ensureOnConflictBehavior(workspace, schema, flags) {
+        const featureFlag = process.env.STEPZEN_DETECT_NAME_CONFLICTS;
+        if (featureFlag === undefined || featureFlag.toLowerCase() === 'false') {
+            return 'append';
+        }
         const name = flags.name || schema;
         const hasConflict = fs.existsSync(path.join(workspace.schema, name));
         if (!hasConflict) {
@@ -196,6 +198,20 @@ class Import extends zen_command_1.default {
         }
         this.exit();
     }
+    // notify the user about any ignored flags
+    warnAboutIgnoredFlags(schema, usedFlags) {
+        Import.flagsForSchemas.forEach(({ flags, schemas }) => {
+            if (!schemas.includes(schema)) {
+                Object.keys(flags).forEach(flag => {
+                    if (Object.prototype.hasOwnProperty.call(usedFlags, flag)) {
+                        this.log(chalk.gray(`The ${chalk.bold(`--${flag}`)} flag only applies when importing ${schemas
+                            .map(schema => chalk.bold(schema))
+                            .join(', ')}. It will be ignored now.`));
+                    }
+                });
+            }
+        });
+    }
     // Correct the value for the 'header-param' flag to work around the oclif's
     // parser issue with multi-value flags: https://github.com/oclif/oclif/issues/261
     parseWorkaround() {
@@ -235,10 +251,12 @@ class Import extends zen_command_1.default {
 }
 exports.default = Import;
 Import.description = 'import a schema for an external data source or a API endpoint to your GraphQL API';
-Import.curlFlags = {
+Import.commonIntrospectionFlags = {
     prefix: command_1.flags.string({
-        description: '[curl] prefix to add every type in the generated schema.',
+        description: '[curl, graphql] prefix to add every type in the generated schema.',
     }),
+};
+Import.curlFlags = {
     '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.',
@@ -289,18 +307,20 @@ Import.postgresqlFlags = {
     }),
 };
 Import.flagsForSchemas = [
+    { flags: Import.commonIntrospectionFlags, schemas: ['curl', 'graphql'] },
     { flags: Import.curlFlags, schemas: ['curl'] },
     { flags: Import.sqlFlags, schemas: ['mysql', 'postgresql'] },
     { flags: Import.postgresqlFlags, schemas: ['postgresql'] },
 ];
-Import.flags = Object.assign(Object.assign(Object.assign(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({
+Import.flags = Object.assign(Object.assign(Object.assign(Object.assign(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 to. Defaults to the name of the imported schema.',
     }), overwrite: command_1.flags.boolean({
         description: 'Overwrite any existing schema with the same name. Cannot be used' +
             ' without also providing a --name flag.',
         dependsOn: ['name'],
-    }) }), Import.curlFlags), Import.sqlFlags), Import.postgresqlFlags);
+        hidden: true,
+    }) }), Import.commonIntrospectionFlags), Import.curlFlags), Import.sqlFlags), Import.postgresqlFlags);
 Import.args = [
     {
         name: 'schema',

package/lib/commands/init.d.ts

@@ -1,8 +1,5 @@
 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 ZenCommand {
     static description: string;
     static hidden: boolean;

package/lib/commands/init.js

@@ -1,120 +1,17 @@
 "use strict";
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.guessSchemaRoot = exports.generateWorkspaceName = exports.validateWorkspaceName = void 0;
 const command_1 = require("@oclif/command");
-const errors_1 = require("@oclif/errors");
-const fs = require("fs");
-const glob = require("glob");
-const inquirer = require("inquirer");
-const os = require("os");
-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));
-};
-exports.generateWorkspaceName = (directory) => {
-    let name = 'hello-stepzen';
-    while (!exports.validateWorkspaceName(directory, name)) {
-        name = `hello-${moniker_1.getRandomDescriptor()}-stepzen`;
-    }
-    return name;
-};
-exports.guessSchemaRoot = (directory) => {
-    const existing = [
-        ...glob.sync('*/**/config.yaml', {
-            cwd: directory,
-            ignore: '**/node_modules/**',
-        }),
-        ...glob.sync('*/**/index.graphql', {
-            cwd: directory,
-            ignore: '**/node_modules/**',
-        }),
-    ];
-    return existing.length > 0 ? path.dirname(existing[0]) : '';
-};
 class Init extends zen_command_1.default {
     async run() {
         const { args, flags } = this.parse(Init);
-        // Get the correct directory
-        let directory = utils_1.getDirectory(args.directory);
-        // Make sure it is not already a workspace
-        if (workspace_1.getWorkspace(directory)) {
-            throw new errors_1.CLIError(`This directory is already a StepZen workspace: ${directory}.` +
-                ' Please select a different directory.');
-        }
-        const isHomeDir = directory === os.homedir();
-        // Prevent init from running in the home directory if the directory was
-        // explicitly provided as an aargument to `stepzen init`.
-        // StepZen CLI sometimes would enumerate all files in the workspace folder
-        // doing so in the home directory is likely to fail.
-        if (args.directory && isHomeDir) {
-            throw new errors_1.CLIError('Using the home directory as a StepZen workspace is not supported.' +
-                ' Please select a different directory.');
-        }
-        // Make a suggestion for the workspace name (if running in the HOME
-        // directory)
-        const name = isHomeDir
-            ? exports.generateWorkspaceName(directory)
-            : path.basename(directory);
-        // See if we think there's a StepZen schema already
-        const root = isHomeDir ? '' : exports.guessSchemaRoot(directory);
-        // 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') {
-                throw new errors_1.CLIError(error);
-            }
-        }
-        // Make a suggestion for the endpoint
-        const endpoint = flags.endpoint || `api/${moniker_1.default()}`;
-        // What questions will we ask?
-        const questions = [
-            {
-                default: name,
-                message: 'What would you like to call your workspace?',
-                name: 'name',
-                validate: (name) => exports.validateWorkspaceName(directory, name),
-                when: isHomeDir && !flags.yes,
-            },
-            {
-                default: endpoint,
-                message: 'What would you like your endpoint to be called?',
-                name: 'endpoint',
-                validate: utils_1.validateEndpoint,
-                when: !flags.endpoint && !flags.yes,
-            },
-            {
-                message: `We have detected a schema in this directory. Set the schema root to "${root}"?`,
-                name: 'use-root',
-                type: 'confirm',
-                when: Boolean(root) && !flags.yes,
-            },
-        ];
-        // Get the answers
-        const answers = Object.assign({ name,
-            endpoint, 'use-root': true }, (await inquirer.prompt(questions)));
-        // Append the suggested workspace name to the directory (if running
-        // in the HOME directory)
-        if (isHomeDir) {
-            // eslint-disable-next-line require-atomic-updates
-            directory = path.join(directory, answers.name);
-            fs.mkdirSync(directory);
-        }
-        // Create the workspace
-        const workspace = { endpoint: answers.endpoint };
-        if (root && answers['use-root'])
-            workspace.root = root;
-        // Write the file
-        const file = path.join(directory, 'stepzen.config.json');
-        fs.writeFileSync(file, JSON.stringify(workspace, null, '  '));
-        // Fetch the newly created workspace
-        const created = workspace_1.getWorkspace(directory);
-        // Done!
+        const created = await workspace_1.initWorkspace({
+            directory: args.directory,
+            endpoint: flags.endpoint,
+            yes: flags.yes,
+        });
         this.log(`Created a StepZen workspace in ${created.directory}`);
         return created;
     }

package/lib/commands/lint.js

@@ -2,9 +2,9 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@oclif/command");
+const transpiler_1 = require("@stepzen/transpiler");
 const utils_1 = require("../shared/utils");
 const zen_command_1 = require("../shared/zen-command");
-const { lint } = require('@stepzen/transpiler');
 class Init extends zen_command_1.default {
     async run() {
         const { flags } = this.parse(Init);
@@ -18,7 +18,7 @@ class Init extends zen_command_1.default {
             this.log(formatted);
         };
         // Lint
-        await lint(directory);
+        await transpiler_1.lint(directory);
     }
 }
 exports.default = Init;

package/lib/commands/start.d.ts

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

package/lib/commands/start.js

@@ -2,15 +2,13 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 Object.defineProperty(exports, "__esModule", { value: true });
 const chokidar = require("chokidar");
+const debug = require("debug");
 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");
 const detect = require("detect-port");
-const utils_1 = require("../shared/utils");
 const start_1 = require("../start");
-const workspace_1 = require("../shared/workspace");
-const init_1 = require("./init");
 const constants_1 = require("../shared/constants");
 const zen_command_1 = require("../shared/zen-command");
 const dashboard = require('@stepzen/dashboard');
@@ -19,28 +17,13 @@ class Start extends zen_command_1.default {
     async run() {
         const { flags } = this.parse(Start);
         const { configuration } = await this.ensureStepZenAccount();
-        // Get the working directory and workspace
-        let workspace;
-        const directory = utils_1.getDirectory(flags.dir);
-        const maybeWorkspace = workspace_1.getWorkspace(directory);
-        if (maybeWorkspace) {
-            workspace = maybeWorkspace;
-        }
-        else {
-            const initArgs = [directory];
-            if (flags.endpoint) {
-                initArgs.push('--endpoint', flags.endpoint);
-            }
-            try {
-                workspace = await init_1.default.run(initArgs);
-            }
-            catch (error) {
-                throw new errors_1.CLIError(`Could not create a StepZen workspace in the ${flags.dir ? directory : 'current'} directory.\n` + error.message);
-            }
-        }
-        // If you have overridden the endpoint, set it
+        // Get or create a StepZen workspace (possibly interactive)
+        const workspace = await this.ensureStepZenWorkspace({
+            directory: flags.dir,
+            endpoint: flags.endpoint,
+        });
+        // If the user has overridden the endpoint, apply the override
         if (flags.endpoint) {
-            // eslint-disable-next-line require-atomic-updates
             workspace.endpoint = flags.endpoint;
         }
         // Check the port is available
@@ -50,28 +33,32 @@ class Start extends zen_command_1.default {
         }
         // This is the file watcher
         if (!flags['no-watcher']) {
+            const redeploy = throttle_debounce_1.debounce(500, (path) => {
+                debug('stepzen:start')(`chokidar decected change to ${path}`);
+                start_1.changed({ workspace, file: path });
+                start_1.deploy({ workspace, flags });
+            });
             chokidar
-                .watch(workspace.schema, {
-                ignored: '**/*.js',
+                .watch(['**/*.graphql', 'config.yaml'], {
+                cwd: workspace.schema,
+                ignored: 'node_modules/**',
+                ignoreInitial: true,
             })
-                .on('change', throttle_debounce_1.debounce(500, async (path) => {
-                utils_1.clearConsole();
-                await start_1.deploy(path, workspace, flags);
-                await start_1.console(workspace);
-            }));
+                .on('change', redeploy)
+                .on('add', redeploy)
+                .on('unlink', redeploy);
+            debug('stepzen:start')(`chokidar started watching ${workspace.schema}`);
         }
         // Start!
-        utils_1.clearConsole();
         core_1.CliUx.ux.action.start('Starting...');
+        let didDeploy = false;
         // Unless explicitly disabled, auto-init
         if (!flags['no-init']) {
-            await start_1.deploy(null, workspace, flags);
-        }
-        if (!flags['no-console']) {
-            start_1.console(workspace);
+            didDeploy = await start_1.deploy({ workspace, flags });
         }
         // Create the dashboard
         if (!flags['no-dashboard']) {
+            debug('stepzen:start')(`starting the dashboard server on ${flags.port}`);
             const ui = await dashboard({
                 account: configuration.account,
                 adminkey: configuration.adminkey,
@@ -89,12 +76,26 @@ class Start extends zen_command_1.default {
                 workspace,
             });
             await ui.start();
+            debug('stepzen:start')(`dashboard server on ${flags.port} started`);
         }
         // Done
         core_1.CliUx.ux.action.stop();
+        if (!flags['no-console']) {
+            if (didDeploy) {
+                start_1.success({
+                    workspace,
+                    account: configuration.account,
+                    port: flags.port,
+                });
+                this.log();
+            }
+            if (!flags['no-watcher']) {
+                start_1.watching(workspace);
+            }
+        }
     }
 }
 exports.default = Start;
 Start.description = 'upload and deploy your schema';
-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.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-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

@@ -17,5 +17,5 @@ export default class Transpile extends ZenCommand {
         name: string;
         required: boolean;
     }[];
-    run(): Promise<any>;
+    run(): Promise<string | false | undefined>;
 }

package/lib/commands/transpile.js

@@ -6,26 +6,26 @@ const command_1 = require("@oclif/command");
 const errors_1 = require("@oclif/errors");
 const fs = require("fs-extra");
 const path = require("path");
+const transpiler_1 = require("@stepzen/transpiler");
 const utils_1 = require("../shared/utils");
 const zen_command_1 = require("../shared/zen-command");
-const { configure, stitch, validate } = require('@stepzen/transpiler');
 class Transpile extends zen_command_1.default {
     async run() {
         const { args, flags } = this.parse(Transpile);
         const folder = utils_1.getDirectory(args.folder);
         // CONFIG
         if (flags['output-configuration']) {
-            const config = await configure(folder, flags.silent);
+            const config = await transpiler_1.configure(folder, flags.silent);
             if (flags['hide-output']) {
                 return config;
             }
-            this.log(config);
+            this.log(`${config}`);
             return;
         }
         // SCHEMA
         try {
-            const schema = stitch(folder);
-            validate(schema, {
+            const schema = transpiler_1.stitch(folder);
+            transpiler_1.validate(schema, {
                 extensions: await utils_1.getStepZenExtensions(),
             });
             const file = path.join(schema, 'index.graphql');

package/lib/commands/validate.js

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const command_1 = require("@oclif/command");
 const errors_1 = require("@oclif/errors");
+const transpiler_1 = require("@stepzen/transpiler");
 const utils_1 = require("../shared/utils");
 const zen_command_1 = require("../shared/zen-command");
-const { stitch, validate } = require('@stepzen/transpiler');
 class Validate extends zen_command_1.default {
     async run() {
         const { args } = this.parse(Validate);
         const folder = utils_1.getDirectory(args.folder);
         try {
-            const schema = stitch(folder);
-            validate(schema, {
+            const schema = transpiler_1.stitch(folder);
+            transpiler_1.validate(schema, {
                 extensions: await utils_1.getStepZenExtensions(),
             });
         }

package/lib/generate/curl2sdl.d.ts

@@ -1,24 +1,6 @@
 import { CurlArguments } from '../shared/curl-parser';
 import { PathParam } from '../shared/path-params-parser';
-export declare type NameValueHeaderInput = {
-    name: string;
-    value: string;
-};
-export declare type NamePartsHeaderInput = {
-    name: string;
-    parts: HeaderInputValuePart[];
-};
-export declare type HeaderInput = NameValueHeaderInput | NamePartsHeaderInput;
-export declare type HeaderInputConstantValuePart = {
-    kind: 'Constant';
-    value: string;
-};
-export declare type HeaderInputVariableValuePart = {
-    kind: 'Variable';
-    value: string;
-    name: string;
-};
-export declare type HeaderInputValuePart = HeaderInputConstantValuePart | HeaderInputVariableValuePart;
+import { HeaderInput } from '../shared/header';
 export declare type Curl2SdlOptions = {
     curlArgs: CurlArguments;
     name?: string;