stepzen 0.18.0 → 0.19.0-beta.2

package/lib/commands/start.js

@@ -27,25 +27,27 @@ class Start extends zen_command_1.default {
         if (flags.endpoint) {
             workspace.endpoint = flags.endpoint;
         }
-        // Check the port is available
-        const port = await detect(flags.port);
-        if (flags.port !== port) {
-            throw new errors_1.CLIError(`Could not start - port ${flags.port} is already in use`);
+        if (!flags['no-dashboard']) {
+            // Check the port is available
+            const port = await detect(flags.port);
+            if (flags.port !== port) {
+                throw new errors_1.CLIError(`Could not start - port ${flags.port} is already in use`);
+            }
         }
-        const printEndpointDetailsOnce = lodash_1.once(() => {
-            start_1.success({
+        const printEndpointDetailsOnce = (0, lodash_1.once)(() => {
+            (0, start_1.success)({
                 workspace,
                 account: configuration.account,
-                port: flags.port,
+                port: flags['no-dashboard'] ? undefined : flags.port,
             });
             this.log();
         });
         // This is the file watcher
         if (!flags['no-watcher']) {
-            const redeploy = throttle_debounce_1.debounce(500, (path) => {
+            const redeploy = (0, 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 }).then(didDeploy => {
+                (0, start_1.changed)({ workspace, file: path });
+                (0, start_1.deploy)({ workspace, flags }).then(didDeploy => {
                     didDeploy && printEndpointDetailsOnce();
                 });
             });
@@ -65,7 +67,7 @@ class Start extends zen_command_1.default {
         let didDeploy = false;
         // Unless explicitly disabled, auto-init
         if (!flags['no-init']) {
-            didDeploy = await start_1.deploy({ workspace, flags });
+            didDeploy = await (0, start_1.deploy)({ workspace, flags });
         }
         // Create the dashboard
         if (!flags['no-dashboard']) {
@@ -96,7 +98,7 @@ class Start extends zen_command_1.default {
                 printEndpointDetailsOnce();
             }
             if (!flags['no-watcher']) {
-                start_1.watching(workspace);
+                (0, start_1.watching)(workspace);
             }
         }
     }

package/lib/commands/transpile.js

@@ -12,10 +12,10 @@ const zen_command_1 = require("../shared/zen-command");
 class Transpile extends zen_command_1.default {
     async run() {
         const { args, flags } = this.parse(Transpile);
-        const folder = utils_1.getDirectory(args.folder);
+        const folder = (0, utils_1.getDirectory)(args.folder);
         // CONFIG
         if (flags['output-configuration']) {
-            const config = await transpiler_1.configure(folder, flags.silent);
+            const config = await (0, transpiler_1.configure)(folder, flags.silent);
             if (flags['hide-output']) {
                 return config;
             }
@@ -24,9 +24,9 @@ class Transpile extends zen_command_1.default {
         }
         // SCHEMA
         try {
-            const schema = transpiler_1.stitch(folder);
-            transpiler_1.validate(schema, {
-                extensions: await utils_1.getStepZenExtensions(),
+            const schema = (0, transpiler_1.stitch)(folder);
+            (0, transpiler_1.validate)(schema, {
+                extensions: await (0, utils_1.getStepZenExtensions)(),
             });
             const file = path.join(schema, 'index.graphql');
             const stitched = fs.readFileSync(file, 'utf8');

package/lib/commands/upload.js

@@ -37,7 +37,7 @@ class Upload extends zen_command_1.default {
         if (!flags.silent) {
             this.log('Uploading...');
         }
-        const response = await actions_1.upload(args.type, args.destination, source);
+        const response = await (0, actions_1.upload)(args.type, args.destination, source);
         if (response.success) {
             if (!flags.silent) {
                 this.log(response.message);

package/lib/commands/validate.js

@@ -7,17 +7,19 @@ 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 core_1 = require("@oclif/core");
 class Validate extends zen_command_1.default {
     async run() {
         const { args } = this.parse(Validate);
-        const folder = utils_1.getDirectory(args.folder);
+        const folder = (0, utils_1.getDirectory)(args.folder);
         try {
-            const schema = transpiler_1.stitch(folder);
-            transpiler_1.validate(schema, {
-                extensions: await utils_1.getStepZenExtensions(),
+            const schema = (0, transpiler_1.stitch)(folder);
+            (0, transpiler_1.validate)(schema, {
+                extensions: await (0, utils_1.getStepZenExtensions)(),
             });
         }
         catch (error) {
+            core_1.CliUx.ux.action.stop(chalk.red('fail'));
             throw new errors_1.CLIError(chalk.red(error));
         }
     }

package/lib/commands/whoami.js

@@ -9,7 +9,7 @@ const zen_command_1 = require("../shared/zen-command");
 class WhoAmI extends zen_command_1.default {
     async run() {
         const { flags } = this.parse(WhoAmI);
-        const configuration = await configuration_1.readConfiguration();
+        const configuration = await (0, configuration_1.readConfiguration)();
         if (!('account' in configuration)) {
             this.log('You are not logged in.');
             return;
@@ -36,7 +36,7 @@ class WhoAmI extends zen_command_1.default {
                 details.adminkey = configuration.adminkey;
             }
             else {
-                details.adminkey = utils_1.maskStepZenKey(configuration.adminkey);
+                details.adminkey = (0, utils_1.maskStepZenKey)(configuration.adminkey);
             }
         }
         if (configuration.apikey) {
@@ -44,7 +44,7 @@ class WhoAmI extends zen_command_1.default {
                 details.apikey = configuration.apikey;
             }
             else {
-                details.apikey = utils_1.maskStepZenKey(configuration.apikey);
+                details.apikey = (0, utils_1.maskStepZenKey)(configuration.apikey);
             }
         }
         this.log();

package/lib/generate/curl2sdl.d.ts

@@ -1,18 +1,16 @@
 import { CurlArguments } from '../shared/curl-parser';
 import { PathParam } from '../shared/path-params-parser';
 import { HeaderInput } from '../shared/header';
-export declare type Curl2SdlOptions = {
+import type { CommonImportOptions } from '.';
+export declare type Curl2SdlOptions = CommonImportOptions & {
     curlArgs: CurlArguments;
-    name?: string;
-    source: string;
     queryName?: string;
     rootType?: string;
     typePrefix?: string;
     pathParams: readonly PathParam[];
     headers: readonly HeaderInput[];
-    onConflict: 'overwrite' | 'append';
 };
-export declare type EditableCurl2SdlOptions = Pick<Curl2SdlOptions, 'curlArgs' | 'queryName' | 'rootType' | 'typePrefix' | 'pathParams'>;
+export declare type InteractiveCurl2SdlOptions = Pick<Curl2SdlOptions, 'curlArgs' | 'queryName' | 'rootType' | 'typePrefix' | 'pathParams'>;
 export declare type CurlAnswers = {
     url: string;
     queryName: string;
@@ -47,7 +45,7 @@ export declare const compileParameterList: (headers: HeaderInput[], pathParams:
  *              there are no duplicates
  */
 export declare const makeDuplicateParamsMessage: (headers: HeaderInput[], pathParams: PathParam[], url: string) => string | null;
-export declare const askCurlQuestions: (defaultAnswers?: Partial<CurlAnswers>) => Promise<EditableCurl2SdlOptions>;
+export declare const askCurlQuestions: (defaultAnswers?: Partial<CurlAnswers>) => Promise<InteractiveCurl2SdlOptions>;
 export declare const curl2sdl: ({ curlArgs, name, source, queryName, rootType, typePrefix, pathParams, headers, onConflict, }: Curl2SdlOptions) => Promise<{
     error: string;
 } | {

package/lib/generate/curl2sdl.js

@@ -9,6 +9,7 @@ const string_argv_1 = require("string-argv");
 const curl_parser_1 = require("../shared/curl-parser");
 const path_params_parser_1 = require("../shared/path-params-parser");
 const helpers_1 = require("./helpers");
+const constants_1 = require("../shared/constants");
 /**
  * Collect together all query parameters from HTTP headers and from the
  * pathname, and return them as a uniform list.
@@ -18,12 +19,12 @@ const helpers_1 = require("./helpers");
  * @param {*} pathname full pathname of the REST endpoint
  * @returns {*} combined list of query parameters in a uniform format
  */
-exports.compileParameterList = (headers, pathParams, pathname) => {
+const compileParameterList = (headers, pathParams, pathname) => {
     // Drop empty segments, including empty string before the leading slash
     const pathSegments = pathname.split('/').filter(Boolean);
     // For each header, make a list of the parameters it contains.
     // `flatMap()` concatenates each header's param lists into a single list.
-    return lodash_1.flatMap(headers, header => {
+    return (0, lodash_1.flatMap)(headers, header => {
         // skip headers that don't contain parameters
         if (!('parts' in header)) {
             return [];
@@ -52,6 +53,7 @@ exports.compileParameterList = (headers, pathParams, pathname) => {
         context: `pathname ${chalk.dim(`(${pathname})`)}`,
     })));
 };
+exports.compileParameterList = compileParameterList;
 /**
  * Check the header and path parameters for duplicates, and construct a
  * user-friendly error message describing identified problems (if any).
@@ -63,15 +65,15 @@ exports.compileParameterList = (headers, pathParams, pathname) => {
  * @returns {*} a message describing duplicate query parameters, or null if
  *              there are no duplicates
  */
-exports.makeDuplicateParamsMessage = (headers, pathParams, url) => {
+const makeDuplicateParamsMessage = (headers, pathParams, url) => {
     // Create a uniform list of query parameters from the headers and path
-    const parameters = exports.compileParameterList(headers, pathParams, new URL(url).pathname);
-    const errors = Object.entries(lodash_1.groupBy(parameters, 'name'))
+    const parameters = (0, exports.compileParameterList)(headers, pathParams, new URL(url).pathname);
+    const errors = Object.entries((0, lodash_1.groupBy)(parameters, 'name'))
         // Create groups for each unique parameter name,
         // and then sub-groups for each unique [name, value] tuple.
         .map(([name, group]) => ({
         name,
-        values: Object.entries(lodash_1.groupBy(group, 'value')),
+        values: Object.entries((0, lodash_1.groupBy)(group, 'value')),
     }))
         // ignore the [name, value] tuples that occur only once
         .filter(({ values }) => values.length > 1)
@@ -87,8 +89,9 @@ exports.makeDuplicateParamsMessage = (headers, pathParams, url) => {
     }
     return null;
 };
-exports.askCurlQuestions = async (defaultAnswers = {}) => {
-    let questions = [
+exports.makeDuplicateParamsMessage = makeDuplicateParamsMessage;
+const askCurlQuestions = async (defaultAnswers = {}) => {
+    const questions = [
         {
             name: 'url',
             message: 'Endpoint URL or a full curl command',
@@ -110,16 +113,15 @@ exports.askCurlQuestions = async (defaultAnswers = {}) => {
             message: 'Prefix to add to all generated type names (leave blank to use defaults)',
         },
     ];
-    questions = questions.map(question => (Object.assign(Object.assign({}, question), { default: lodash_1.get(defaultAnswers, question.name) })));
-    const answers = await inquirer.prompt(questions);
-    const curlArgs = curl_parser_1.parseCurlArgv(string_argv_1.default(answers.url));
+    const answers = await inquirer.prompt((0, helpers_1.overrideDefaults)(questions, defaultAnswers));
+    const curlArgs = (0, curl_parser_1.parseCurlArgv)((0, string_argv_1.default)(answers.url));
     if ('error' in curlArgs) {
         console.log();
         console.log(chalk.red('A problem occurred while parsing the curl command:\n', curlArgs.error), '\nPlease enter a URL or a supported curl command.');
         console.log();
-        return exports.askCurlQuestions(answers);
+        return (0, exports.askCurlQuestions)(answers);
     }
-    const parsedPathParamsOrError = path_params_parser_1.parsePathParamsPattern(curlArgs.url, answers.pathParams);
+    const parsedPathParamsOrError = (0, path_params_parser_1.parsePathParamsPattern)(curlArgs.url, answers.pathParams);
     if ('error' in parsedPathParamsOrError) {
         console.log();
         console.log(chalk.red('A problem occurred while parsing path parameters pattern:\n', parsedPathParamsOrError.error));
@@ -132,7 +134,7 @@ exports.askCurlQuestions = async (defaultAnswers = {}) => {
             `\tendpoint URL: https://example.com/users/jane/posts/12\n ` +
             `\tpath parameters: /users/${chalk.bold('$userId')}/posts/${chalk.bold('$postId')}`);
         console.log();
-        return exports.askCurlQuestions(answers);
+        return (0, exports.askCurlQuestions)(answers);
     }
     return {
         curlArgs,
@@ -142,8 +144,9 @@ exports.askCurlQuestions = async (defaultAnswers = {}) => {
         pathParams: parsedPathParamsOrError,
     };
 };
-exports.curl2sdl = async ({ curlArgs, name, source, queryName, rootType, typePrefix, pathParams, headers, onConflict, }) => {
-    const response = await helpers_1.queryIntrospectionService({
+exports.askCurlQuestions = askCurlQuestions;
+const curl2sdl = async ({ curlArgs, name, source, queryName, rootType, typePrefix, pathParams, headers, onConflict, }) => {
+    const response = await (0, helpers_1.queryIntrospectionService)(constants_1.STEPZEN_JSON2SDL_SERVER_URL, {
         operation: 'getSDLFromCurl',
         variables: {
             command: {
@@ -183,5 +186,11 @@ exports.curl2sdl = async ({ curlArgs, name, source, queryName, rootType, typePre
     if (response.error) {
         return { error: response.error };
     }
-    return helpers_1.writeSdlAndConfig(name || 'curl', source, onConflict, response);
+    return (0, helpers_1.writeSdlAndConfig)({
+        name: name || 'curl',
+        source,
+        onConflict,
+        response,
+    });
 };
+exports.curl2sdl = curl2sdl;

package/lib/generate/graphql2sdl.d.ts

@@ -1,21 +1,19 @@
 import { HeaderInput } from '../shared/header';
-export declare type GraphQL2SdlOptions = {
-    name?: string;
-    source: string;
+import type { CommonImportOptions } from '.';
+export declare type GraphQL2SdlOptions = CommonImportOptions & {
     endpoint: string;
     typePrefix?: string;
     includeRootOperations?: boolean;
     headers: readonly HeaderInput[];
-    onConflict: 'overwrite' | 'append';
 };
-export declare type EditableGraphQL2SdlOptions = Pick<GraphQL2SdlOptions, 'endpoint' | 'typePrefix' | 'includeRootOperations' | 'headers'>;
+export declare type InteractiveGraphQL2SdlOptions = Pick<GraphQL2SdlOptions, 'endpoint' | 'typePrefix' | 'includeRootOperations' | 'headers'>;
 export declare type GraphQLAnswers = {
     endpoint: string;
     typePrefix: string;
     includeRootOperations: boolean;
-    headers: readonly HeaderInput[];
+    header: string;
 };
-export declare const askGraphQLQuestions: (defaultAnswers?: Partial<GraphQLAnswers>) => Promise<EditableGraphQL2SdlOptions>;
+export declare const askGraphQLQuestions: (defaultAnswers?: Partial<GraphQLAnswers>) => Promise<InteractiveGraphQL2SdlOptions>;
 export declare const graphql2sdl: ({ name, source, endpoint, typePrefix, includeRootOperations, headers, onConflict, }: GraphQL2SdlOptions) => Promise<{
     error: string;
 } | {

package/lib/generate/graphql2sdl.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.graphql2sdl = exports.askGraphQLQuestions = void 0;
 const inquirer = require("inquirer");
-const lodash_1 = require("lodash");
 const header_1 = require("../shared/header");
 const helpers_1 = require("./helpers");
-exports.askGraphQLQuestions = async (defaultAnswers = {}) => {
-    let questions = [
+const constants_1 = require("../shared/constants");
+const askGraphQLQuestions = async (defaultAnswers = {}) => {
+    const questions = [
         {
             name: 'endpoint',
             message: 'What is the GraphQL endpoint URL?',
@@ -30,11 +30,18 @@ exports.askGraphQLQuestions = async (defaultAnswers = {}) => {
             validate: input => input === '' || header_1.HEADER_REGEX.test(input.trim()) || 'invalid header',
         },
     ];
-    questions = questions.map(question => (Object.assign(Object.assign({}, question), { default: lodash_1.get(defaultAnswers, question.name) })));
-    return inquirer.prompt(questions);
+    const answers = await inquirer.prompt((0, helpers_1.overrideDefaults)(questions, defaultAnswers));
+    const header = (0, header_1.parseHeader)(answers.header);
+    return {
+        endpoint: answers.endpoint,
+        typePrefix: answers.typePrefix.trim() === '' ? undefined : answers.typePrefix.trim(),
+        includeRootOperations: answers.includeRootOperations,
+        headers: header && !('error' in header) ? [header] : [],
+    };
 };
-exports.graphql2sdl = async ({ name, source, endpoint, typePrefix, includeRootOperations, headers, onConflict, }) => {
-    const response = await helpers_1.queryIntrospectionService({
+exports.askGraphQLQuestions = askGraphQLQuestions;
+const graphql2sdl = async ({ name, source, endpoint, typePrefix, includeRootOperations, headers, onConflict, }) => {
+    const response = await (0, helpers_1.queryIntrospectionService)(constants_1.STEPZEN_JSON2SDL_SERVER_URL, {
         operation: 'getSDLFromGraphQL',
         variables: {
             endpoint: {
@@ -58,5 +65,11 @@ exports.graphql2sdl = async ({ name, source, endpoint, typePrefix, includeRootOp
     if (response.error) {
         return { error: response.error };
     }
-    return helpers_1.writeSdlAndConfig(name || 'graphql', source, onConflict, response);
+    return (0, helpers_1.writeSdlAndConfig)({
+        name: name || 'graphql',
+        source,
+        onConflict,
+        response,
+    });
 };
+exports.graphql2sdl = graphql2sdl;

package/lib/generate/helpers.d.ts

@@ -1,3 +1,4 @@
+import * as inquirer from 'inquirer';
 import type { Answers, DistinctQuestion } from 'inquirer';
 export declare const createGeneratorFiles: (id: string, details: any) => Promise<string>;
 export declare type GeneratorConfiguration = {
@@ -25,7 +26,14 @@ export declare type IntrospectionServiceResponse = {
     config?: string;
     error?: string;
 };
-export declare const queryIntrospectionService: (query: IntrospectionServiceQuery) => Promise<IntrospectionServiceResponse>;
-export declare const writeSdlAndConfig: (name: string, source: string, onConflict: 'overwrite' | 'append', { config, sdl }: IntrospectionServiceResponse) => Promise<{
+export declare const queryIntrospectionService: (serverUrl: string, query: IntrospectionServiceQuery) => Promise<IntrospectionServiceResponse>;
+export declare const writeSdlAndConfig: ({ name, source, mergeTypes, onConflict, response, }: {
+    name: string;
+    source: string;
+    mergeTypes?: boolean | undefined;
+    onConflict: 'overwrite' | 'append';
+    response: IntrospectionServiceResponse;
+}) => Promise<{
     outPath: string;
 }>;
+export declare const overrideDefaults: <Options>(questions: inquirer.DistinctQuestion<Options>[], defaultAnswers: Partial<Options>) => inquirer.DistinctQuestion<Options>[];

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.writeSdlAndConfig = exports.queryIntrospectionService = exports.askTemplateQuestions = exports.askGeneratorQuestions = exports.getTemplates = exports.getSchema = exports.getConfiguration = exports.createGeneratorFiles = void 0;
+exports.overrideDefaults = exports.writeSdlAndConfig = exports.queryIntrospectionService = exports.askTemplateQuestions = exports.askGeneratorQuestions = exports.getTemplates = exports.getSchema = exports.getConfiguration = exports.createGeneratorFiles = void 0;
 const errors_1 = require("@oclif/errors");
 const chalk = require("chalk");
 const debug = require("debug");
@@ -17,12 +17,12 @@ const prettier = require("prettier");
 const constants_1 = require("../shared/constants");
 const errors_2 = require("../shared/errors");
 const { version } = require('../../package.json');
-exports.createGeneratorFiles = async (id, details) => {
+const 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, {
+        const response = await (0, node_fetch_1.default)(url, {
             body: JSON.stringify({
                 id,
                 details: JSON.stringify(details.answers),
@@ -62,11 +62,12 @@ exports.createGeneratorFiles = async (id, details) => {
             : new errors_1.CLIError(errors_2.PERMANENT_STEPZEN_ERROR);
     }
 };
-exports.getConfiguration = async (id, details = {}) => {
+exports.createGeneratorFiles = createGeneratorFiles;
+const 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 {
-        const response = await node_fetch_1.default(url, {
+        const response = await (0, node_fetch_1.default)(url, {
             body: JSON.stringify({
                 id,
                 details: JSON.stringify(details),
@@ -90,7 +91,8 @@ exports.getConfiguration = async (id, details = {}) => {
         throw new errors_1.CLIError(errors_2.PERMANENT_STEPZEN_ERROR);
     }
 };
-exports.getSchema = (arg) => {
+exports.getConfiguration = getConfiguration;
+const getSchema = (arg) => {
     const schema = arg.trim();
     // Now supports importing only one schema at a time:
     // https://github.com/steprz/stepzen-cli/issues/628
@@ -104,7 +106,8 @@ exports.getSchema = (arg) => {
     }
     return schema;
 };
-exports.getTemplates = async () => {
+exports.getSchema = getSchema;
+const getTemplates = async () => {
     const tmp = path.join(os.tmpdir(), `stepzen-api-templates-${Date.now()}`);
     fs.ensureDirSync(tmp);
     const repository = constants_1.STEPZEN_API_TEMPLATES_REPOSITORY;
@@ -115,7 +118,8 @@ exports.getTemplates = async () => {
     }
     return tmp;
 };
-exports.askGeneratorQuestions = async (id, settings, state) => {
+exports.getTemplates = getTemplates;
+const askGeneratorQuestions = async (id, settings, state) => {
     var _a, _b;
     let status = -1;
     do {
@@ -123,14 +127,14 @@ exports.askGeneratorQuestions = async (id, settings, state) => {
             return 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)
+                    ? (0, 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);
+        state = (0, lodash_1.merge)(state, answers);
         // eslint-disable-next-line no-await-in-loop
-        const result = await exports.getConfiguration(id, state);
+        const result = await (0, 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);
@@ -150,22 +154,23 @@ exports.askGeneratorQuestions = async (id, settings, state) => {
                 questions: result.questions,
             };
             // eslint-disable-next-line require-atomic-updates
-            state = lodash_1.merge(state, result.answers);
+            state = (0, lodash_1.merge)(state, result.answers);
         }
         status = result.status;
     } while (status === -1);
     return state;
 };
-exports.askTemplateQuestions = async (id, settings, state) => {
+exports.askGeneratorQuestions = askGeneratorQuestions;
+const askTemplateQuestions = async (id, settings, state) => {
     const questions = settings.questions.map((question) => (Object.assign({ type: 'password' }, question)));
     const answers = await inquirer.prompt(questions);
     return Object.assign(Object.assign({}, state), answers);
 };
-exports.queryIntrospectionService = async (query) => {
+exports.askTemplateQuestions = askTemplateQuestions;
+const queryIntrospectionService = async (serverUrl, query) => {
     let json;
     try {
-        const url = `${constants_1.STEPZEN_JSON2SDL_SERVER_URL}/api/graphql`;
-        debug('stepzen:introspection')(url);
+        debug('stepzen:introspection')(serverUrl);
         const queryString = `query (
       ${Object.entries(query.variables).map(([id, { type }]) => `$${id}: ${type}`)} 
       ) { 
@@ -178,10 +183,10 @@ exports.queryIntrospectionService = async (query) => {
         debug('stepzen:introspection')(query.variables);
         const payload = JSON.stringify({
             query: queryString,
-            variables: lodash_1.mapValues(query.variables, ({ value }) => value),
+            variables: (0, lodash_1.mapValues)(query.variables, ({ value }) => value),
         });
         debug('stepzen:introspection')(payload);
-        const response = await node_fetch_1.default(url, {
+        const response = await (0, node_fetch_1.default)(serverUrl, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: payload,
@@ -201,9 +206,17 @@ exports.queryIntrospectionService = async (query) => {
     }
     if (json.errors) {
         const compileError = (error) => {
-            var _a;
+            var _a, _b, _c;
             return error.message +
-                (((_a = error.extensions) === null || _a === void 0 ? void 0 : _a.details) ? `: ${JSON.stringify(error.extensions.details)}`
+                // error.extensions.Message: DB introspection API (e.g. wrong password)
+                (((_a = error.extensions) === null || _a === void 0 ? void 0 : _a.Message) ? `: ${error.extensions.Message}` : '') +
+                // error.extensions.details: REST instrospection API (e.g. 401 / unauthorized)
+                (((_b = error.extensions) === null || _b === void 0 ? void 0 : _b.details)
+                    ? `: ${JSON.stringify(error.extensions.details)}`
+                    : '') +
+                // error.extensions.cause: DB introspection API (e.g. --db-include=views-only and there are no views)
+                (((_c = error.extensions) === null || _c === void 0 ? void 0 : _c.cause)
+                    ? `: ${JSON.stringify(error.extensions.cause)}`
                     : '');
         };
         return { error: json.errors.map(compileError).join('\n') };
@@ -222,7 +235,9 @@ exports.queryIntrospectionService = async (query) => {
     }
     return { config, sdl };
 };
-exports.writeSdlAndConfig = async (name, source, onConflict, { config, sdl }) => {
+exports.queryIntrospectionService = queryIntrospectionService;
+const writeSdlAndConfig = async ({ name, source, mergeTypes = false, onConflict, response, }) => {
+    const { config, sdl } = response;
     // write out the generated config and schema files
     const tmp = path.join(os.tmpdir(), `stepzen-introspection-${Date.now()}`);
     fs.ensureDirSync(tmp);
@@ -240,8 +255,16 @@ exports.writeSdlAndConfig = async (name, source, onConflict, { config, sdl }) =>
         answers: {},
         output: null,
         silent: true,
-        mergeTypes: false,
+        mergeTypes,
         onConflict,
     });
     return { outPath: result };
 };
+exports.writeSdlAndConfig = writeSdlAndConfig;
+const overrideDefaults = (questions, defaultAnswers) => {
+    return questions.map(question => {
+        const def = (0, lodash_1.get)(defaultAnswers, question.name);
+        return def === undefined ? question : Object.assign(Object.assign({}, question), { default: def });
+    });
+};
+exports.overrideDefaults = overrideDefaults;

package/lib/generate/index.d.ts

@@ -1,8 +1,10 @@
-export declare type GenerateOptions = {
-    schema: string;
+export declare type CommonImportOptions = {
     name?: string;
-    onConflict: 'overwrite' | 'append';
     source: string;
+    onConflict: 'overwrite' | 'append';
+};
+export declare type GenerateOptions = CommonImportOptions & {
+    schema: string;
     preAnswered?: {
         [question: string]: string;
     };

package/lib/generate/index.js

@@ -19,7 +19,7 @@ exports.default = async ({ schema, name, onConflict, source, preAnswered = {}, }
     // Start downloading
     core_1.CliUx.ux.action.start('Downloading from StepZen...');
     // Get the generator configuration
-    const configure = await helpers_1.getConfiguration(schema, answers);
+    const configure = await (0, helpers_1.getConfiguration)(schema, answers);
     if (((_a = configure === null || configure === void 0 ? void 0 : configure.questions) === null || _a === void 0 ? void 0 : _a.length) ||
         ((configure === null || configure === void 0 ? void 0 : configure.status) && configure.status >= 0)) {
         generator = {
@@ -44,7 +44,7 @@ exports.default = async ({ schema, name, onConflict, source, preAnswered = {}, }
     // Get the API templates repository
     let templates;
     if (generator === undefined) {
-        templates = await helpers_1.getTemplates();
+        templates = await (0, helpers_1.getTemplates)();
         if (fs.existsSync(`${templates}/${schema}`)) {
             const file = path.join(templates, schema, 'stepzen.config.json');
             const config = fs.readFileSync(file, 'utf8');
@@ -67,19 +67,19 @@ exports.default = async ({ schema, name, onConflict, source, preAnswered = {}, }
         throw new errors_1.CLIError(`Cannot find the schema ${schema}`);
     }
     else if (generator.type === 'generator') {
-        result = await helpers_1.askGeneratorQuestions(schema, generator, answers);
+        result = await (0, helpers_1.askGeneratorQuestions)(schema, generator, answers);
     }
     else if (generator.type === 'template') {
-        result = await helpers_1.askTemplateQuestions(schema, generator, answers);
+        result = await (0, helpers_1.askTemplateQuestions)(schema, generator, answers);
     }
     generator.answers = result;
-    answers = lodash_1.merge(answers, result);
+    answers = (0, lodash_1.merge)(answers, result);
     // We now have all the answers! Generate schemas
     console.log();
     core_1.CliUx.ux.action.start('Generating schemas...');
     let files;
     if (generator.type === 'generator') {
-        files = await helpers_1.createGeneratorFiles(schema, generator);
+        files = await (0, helpers_1.createGeneratorFiles)(schema, generator);
         tempFiles.push(files);
     }
     else {