stepzen 0.28.0-experimental.fa8aa47 → 0.29.0-beta.0

package/README.md

@@ -30,7 +30,7 @@ $ npm install -g stepzen
 $ stepzen COMMAND
 running command...
 $ stepzen (--version|-v)
-stepzen/0.28.0-experimental.fa8aa47 linux-x64 node-v14.21.2
+stepzen/0.29.0-beta.0 linux-x64 node-v14.21.2
 $ stepzen --help [COMMAND]
 USAGE
   $ stepzen COMMAND
@@ -50,13 +50,13 @@ To run from code: `path-to-repo/bin/run start` (start or whatever command you're
 -- OR (deprecated) --
 
 $ stepzen deploy ENDPOINT --schema=schema [--configurationsets=cs1[,cs2[,..]]]`](#stepzen-deploy-endpoint---configpathtoconfigyaml---dirpathtoworkspace---or-deprecated----stepzen-deploy-endpoint---schemaschema---configurationsetscs1cs2)
-* [`stepzen help [COMMAND]`](#stepzen-help-command)
-* [`stepzen import curl [[CURLOPTS] URL] [--prefix=PREFIX] [--header=HEADER] [--header-param=HEADER-PARAM] [--query-name=QUERY-NAME] [--query-type=QUERY-TYPE] [--path-params=PATH-PARAMS]`](#stepzen-import-curl-curlopts-url---prefixprefix---headerheader---header-paramheader-param---query-namequery-name---query-typequery-type---path-paramspath-params)
+* [`stepzen help [COMMANDS]`](#stepzen-help-commands)
+* [`stepzen import curl [[CURLOPTS] URL] [--prefix=PREFIX] [--data=DATA] [--request=REQUEST] [--url=URL] [--header=HEADER] [--header-param=HEADER-PARAM] [--query-name=QUERY-NAME] [--query-type=QUERY-TYPE] [--path-params=PATH-PARAMS]`](#stepzen-import-curl-curlopts-url---prefixprefix---datadata---requestrequest---urlurl---headerheader---header-paramheader-param---query-namequery-name---query-typequery-type---path-paramspath-params)
 * [`stepzen init`](#stepzen-init)
 * [`stepzen list [TYPE]`](#stepzen-list-type)
 * [`stepzen login`](#stepzen-login)
 * [`stepzen logout`](#stepzen-logout)
-* [`stepzen request QUERY`](#stepzen-request-query)
+* [`stepzen request [QUERY]`](#stepzen-request-query)
 * [`stepzen service [ACTION]`](#stepzen-service-action)
 * [`stepzen start`](#stepzen-start)
 * [`stepzen upload TYPE DESTINATION`](#stepzen-upload-type-destination)
@@ -120,16 +120,16 @@ DESCRIPTION
   Deploy to StepZen.
 ```
 
-## `stepzen help [COMMAND]`
+## `stepzen help [COMMANDS]`
 
 Display help for stepzen.
 
 ```
 USAGE
-  $ stepzen help [COMMAND] [-n]
+  $ stepzen help [COMMANDS] [-n]
 
 ARGUMENTS
-  COMMAND  Command to show help for.
+  COMMANDS  Command to show help for.
 
 FLAGS
   -n, --nested-commands  Include all nested commands in the output.
@@ -138,16 +138,17 @@ DESCRIPTION
   Display help for stepzen.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.1.23/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.4/src/commands/help.ts)_
 
-## `stepzen import curl [[CURLOPTS] URL] [--prefix=PREFIX] [--header=HEADER] [--header-param=HEADER-PARAM] [--query-name=QUERY-NAME] [--query-type=QUERY-TYPE] [--path-params=PATH-PARAMS]`
+## `stepzen import curl [[CURLOPTS] URL] [--prefix=PREFIX] [--data=DATA] [--request=REQUEST] [--url=URL] [--header=HEADER] [--header-param=HEADER-PARAM] [--query-name=QUERY-NAME] [--query-type=QUERY-TYPE] [--path-params=PATH-PARAMS]`
 
 Import a schema for an external data source or an API endpoint to your GraphQL API.
 
 ```
 USAGE
-  $ stepzen import curl [[CURLOPTS] URL] [--prefix=PREFIX] [--header=HEADER] [--header-param=HEADER-PARAM]
-    [--query-name=QUERY-NAME] [--query-type=QUERY-TYPE] [--path-params=PATH-PARAMS]
+  $ stepzen import curl [[CURLOPTS] URL] [--prefix=PREFIX] [--data=DATA] [--request=REQUEST] [--url=URL]
+    [--header=HEADER] [--header-param=HEADER-PARAM] [--query-name=QUERY-NAME] [--query-type=QUERY-TYPE]
+    [--path-params=PATH-PARAMS]
   $ stepzen import graphql [URL] [--prefix=PREFIX] [--header=HEADER] [--header-param=HEADER-PARAM]
   $ stepzen import mysql [--db-host=DB-HOST] [--db-user=DB-USER] [--db-password=DB-PASSWORD]
     [--db-database=DB-DATABASE] [--db-link-types] [--db-include=DB-INCLUDE]
@@ -328,17 +329,18 @@ DESCRIPTION
   Log out of StepZen.
 ```
 
-## `stepzen request QUERY`
+## `stepzen request [QUERY]`
 
 Send a GraphQL request to a StepZen endpoint and print the response, using the API key and the target endpoint from the current StepZen workspace.
 
 ```
 USAGE
   $ stepzen request [QUERY] [-h] [--dir <value> | --endpoint <value>] [-H <value>] [--operation-name <value>]
-    [--var <value>] [--var-file <value>]
+    [--var <value>] [--var-file <value>] [-f <value>]
 
 ARGUMENTS
-  QUERY  GraphQL query (could include a query, a mutation or a subscription)
+  QUERY  GraphQL query (could include a query, a mutation or a subscription).
+         This argument is required unless you provide the query as a file with --file=file.
 
 FLAGS
   -H, --header=<value>...
@@ -352,6 +354,12 @@ FLAGS
       Use the -H "Header-Name:" syntax to drop a default header, and the -H "Header-Name;" syntax to send a header with an
       empty value.
 
+  -f, --file=<value>
+      Read the query text from a file instead of the command line.
+
+      Example:
+      stepzen request -f query.graphql
+
   -h, --help
       Show CLI help
 
@@ -511,7 +519,7 @@ FLAG DESCRIPTIONS
     Additionally shows the architecture, node version, operating system, and versions of plugins that the CLI is using.
 ```
 
-_See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/v1.1.4/src/commands/version.ts)_
+_See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/v1.2.1/src/commands/version.ts)_
 
 ## `stepzen whoami`
 

package/bin/dev

@@ -1,5 +1,11 @@
 #!/usr/bin/env node
 
+// workaround for https://github.com/oclif/core/issues/630
+if (!global.AbortController) {
+  const {AbortController} = require('node-abort-controller')
+  global.AbortController = AbortController
+}
+
 const oclif = require('@oclif/core')
 
 const path = require('path')

package/bin/run

@@ -18,6 +18,12 @@ if (nodeMajor > 0 && nodeMajor < 14) {
   console.warn(yellow + message.replace('$$version.', version) + reset)
 }
 
+// workaround for https://github.com/oclif/core/issues/630
+if (!global.AbortController) {
+  const {AbortController} = require('node-abort-controller')
+  global.AbortController = AbortController
+}
+
 const oclif = require('@oclif/core')
 const flush = require('@oclif/core/flush')
 const handleError = require('@oclif/core/handle')
@@ -26,6 +32,5 @@ oclif
   .run()
   .then(flush)
   .catch(error => {
-    flush()
-    handleError(error)
+    return flush().then(() => handleError(error))
   })

package/lib/commands/deploy.d.ts

@@ -5,19 +5,17 @@ export default class Deploy extends ZenCommand {
     static description: string;
     static usage: string;
     static flags: {
-        dir: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        dir: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         silent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        configurationsets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        config: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        schema: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        configurationsets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        config: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        schema: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
+        endpoint: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+    };
     run(): Promise<void>;
     doDeployV1WithSdkV1({ endpoint, schema, configurationsets, configuration, }: {
         endpoint: string;

package/lib/commands/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAcA,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAE9C,OAAO,EAAC,4BAA4B,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAA;AACvE,OAAO,EAEL,cAAc,EAEf,MAAM,uBAAuB,CAAA;AAG9B,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAU;IAC5C,MAAM,CAAC,WAAW,SAAuB;IAEzC,MAAM,CAAC,KAAK,SAIiE;IAE7E,MAAM,CAAC,KAAK;;;;;;;;MAuCX;IAED,MAAM,CAAC,IAAI;;;;QAOV;IAGK,GAAG;IAsLH,mBAAmB,CAAC,EACxB,QAAQ,EACR,MAAM,EACN,iBAAiB,EACjB,aAAa,GACd,EAAE;QACD,QAAQ,EAAE,MAAM,CAAA;QAChB,MAAM,EAAE,MAAM,CAAA;QACd,iBAAiB,CAAC,EAAE,MAAM,CAAA;QAC1B,aAAa,EAAE,4BAA4B,CAAA;KAC5C;;;;;;;;;IAqBK,mBAAmB,CAAC,EACxB,QAAQ,EACR,SAAS,EACT,cAAc,EACd,aAAa,GACd,EAAE;QACD,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,SAAS,CAAA;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,aAAa,EAAE,4BAA4B,CAAA;KAC5C;;;;;;;;;IA+BK,mBAAmB,CAAC,EACxB,QAAQ,EACR,SAAS,EACT,cAAc,EACd,aAAa,EACb,OAAO,GACR,EAAE;QACD,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,SAAS,CAAA;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,aAAa,EAAE,4BAA4B,CAAA;QAC3C,OAAO,EAAE,cAAc,CAAA;KACxB;;;;CAoDF"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAcA,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAE9C,OAAO,EAAC,4BAA4B,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAA;AACvE,OAAO,EAEL,cAAc,EAEf,MAAM,uBAAuB,CAAA;AAG9B,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAU;IAC5C,MAAM,CAAC,WAAW,SAAuB;IAEzC,MAAM,CAAC,KAAK,SAIiE;IAE7E,MAAM,CAAC,KAAK;;;;;;;;MAuCX;IAED,MAAM,CAAC,IAAI;;MAMV;IAGK,GAAG;IAsLH,mBAAmB,CAAC,EACxB,QAAQ,EACR,MAAM,EACN,iBAAiB,EACjB,aAAa,GACd,EAAE;QACD,QAAQ,EAAE,MAAM,CAAA;QAChB,MAAM,EAAE,MAAM,CAAA;QACd,iBAAiB,CAAC,EAAE,MAAM,CAAA;QAC1B,aAAa,EAAE,4BAA4B,CAAA;KAC5C;;;;;;;;;IAqBK,mBAAmB,CAAC,EACxB,QAAQ,EACR,SAAS,EACT,cAAc,EACd,aAAa,GACd,EAAE;QACD,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,SAAS,CAAA;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,aAAa,EAAE,4BAA4B,CAAA;KAC5C;;;;;;;;;IA+BK,mBAAmB,CAAC,EACxB,QAAQ,EACR,SAAS,EACT,cAAc,EACd,aAAa,EACb,OAAO,GACR,EAAE;QACD,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,SAAS,CAAA;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,aAAa,EAAE,4BAA4B,CAAA;QAC3C,OAAO,EAAE,cAAc,CAAA;KACxB;;;;CAoDF"}

package/lib/commands/deploy.js

@@ -81,7 +81,7 @@ class Deploy extends zen_command_1.default {
         if (hasDeprecatedFlags) {
             const endpoint = args.endpoint;
             if (!flags.silent) {
-                core_1.CliUx.ux.action.start(`Deploying ${chalk.yellow(endpoint)} to StepZen`);
+                core_1.ux.action.start(`Deploying ${chalk.yellow(endpoint)} to StepZen`);
             }
             try {
                 result = await this.doDeployV1WithSdkV1({
@@ -93,7 +93,7 @@ class Deploy extends zen_command_1.default {
             }
             catch (error2) {
                 if (!flags.silent) {
-                    core_1.CliUx.ux.action.stop(chalk.red('fail'));
+                    core_1.ux.action.stop(chalk.red('fail'));
                 }
                 throw error2;
             }
@@ -106,7 +106,7 @@ class Deploy extends zen_command_1.default {
             });
             const endpoint = args.endpoint || workspace.endpoint;
             if (!flags.silent) {
-                core_1.CliUx.ux.action.start(`Deploying ${chalk.yellow(endpoint)} to StepZen`);
+                core_1.ux.action.start(`Deploying ${chalk.yellow(endpoint)} to StepZen`);
             }
             let configPath;
             if (flags.config) {
@@ -148,7 +148,7 @@ class Deploy extends zen_command_1.default {
             }
             catch (error2) {
                 if (!flags.silent) {
-                    core_1.CliUx.ux.action.stop(chalk.red('fail'));
+                    core_1.ux.action.stop(chalk.red('fail'));
                 }
                 throw error2;
             }
@@ -158,13 +158,13 @@ class Deploy extends zen_command_1.default {
             if (!flags.silent) {
                 const deployEnd = new Date().getTime();
                 const deployTime = deployEnd - deployStart;
-                core_1.CliUx.ux.action.stop(`${chalk.grey('done in')} ${prettyMilliseconds(deployTime)} 🚀`);
+                core_1.ux.action.stop(`${chalk.grey('done in')} ${prettyMilliseconds(deployTime)} 🚀`);
                 console.log((0, utils_1.formatEndpointInfo)({ configuration, endpoint }));
             }
         }
         else {
             if (!flags.silent) {
-                core_1.CliUx.ux.action.stop(chalk.red('fail'));
+                core_1.ux.action.stop(chalk.red('fail'));
             }
             // Errors. Exit, and output the server's error response
             throw new errors_1.CLIError(error?.message || 'An error occurred.');
@@ -297,12 +297,11 @@ Deploy.flags = {
         exclusive: ['config', 'dir'],
     }),
 };
-Deploy.args = [
-    {
-        name: 'endpoint',
+Deploy.args = {
+    endpoint: core_1.Args.string({
         description: chalk `name of the endpoint (e.g. {bold api/customers})
         [default: use the {underline endpoint} property from stepzen.config.json]`,
         required: false,
-    },
-];
+    }),
+};
 //# sourceMappingURL=deploy.js.map

package/lib/commands/deploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}

package/lib/commands/import.d.ts

@@ -1,9 +1,9 @@
+import { BooleanFlag, OptionFlag, ArgOutput, FlagOutput, Input, ParserOutput } from '@oclif/core/lib/interfaces/parser';
 import type { CommonImportOptions } from '../generate';
 import ZenCommand from '../shared/zen-command';
 import { DBType, DBIntrospectionOptions } from '../generate/sql2sdl';
 import { HeaderInput } from '../shared/header';
 import { Workspace, FlagsT } from '../shared/types';
-import { BooleanFlag, OptionFlag } from '@oclif/core/lib/interfaces';
 export declare type DataSourceType = 'curl' | 'graphql' | 'postgresql' | 'mysql' | 'snowflake';
 declare type OptionFlagWithDataSource<T> = OptionFlag<T> & {
     dataSources?: DataSourceType[];
@@ -19,6 +19,9 @@ export default class Import extends ZenCommand {
         name: OptionFlagWithDataSource<string | undefined>;
         overwrite: BooleanFlagWithDataSource<boolean>;
         prefix: OptionFlagWithDataSource<string | undefined>;
+        data: OptionFlagWithDataSource<string[] | undefined>;
+        request: OptionFlagWithDataSource<string | undefined>;
+        url: OptionFlagWithDataSource<string[] | undefined>;
         header: OptionFlagWithDataSource<string[] | undefined>;
         'header-param': OptionFlagWithDataSource<string[] | undefined>;
         'query-name': OptionFlagWithDataSource<string | undefined>;
@@ -38,46 +41,20 @@ export default class Import extends ZenCommand {
         'non-interactive': BooleanFlag<boolean>;
     };
     static args: {
-        name: string;
-        required: boolean;
-    }[];
+        source: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+    };
     static flagHelpForSource: (source: DataSourceType, exclude?: Array<keyof typeof Import.flags>) => string;
     static usage: string[];
     static strict: boolean;
+    protected parse<F extends FlagOutput, B extends FlagOutput, A extends ArgOutput>(options?: Input<F, B, A>, argv?: string[]): Promise<ParserOutput<F, B, A> & {
+        argv: string[];
+    }>;
     run(): Promise<void>;
     importCurl(argv: string[], flags: FlagsT<typeof Import>, commonOptions: CommonImportOptions): Promise<string>;
     importGraphQL(argv: string[], flags: FlagsT<typeof Import>, commonOptions: CommonImportOptions): Promise<string>;
     importSql(source: DBType, dsn: string | undefined, flags: FlagsT<typeof Import>, fixedOptions: CommonImportOptions): Promise<string>;
     ensureOnConflictBehavior(workspace: Workspace, source: string, flags: FlagsT<typeof Import>): Promise<"overwrite" | "append">;
     warnAboutIgnoredFlags(source: string, usedFlags: FlagsT<typeof Import>): void;
-    parseWorkaround(): Promise<import("@oclif/core/lib/interfaces").ParserOutput<{
-        dir: string | undefined;
-        silent: boolean;
-        name: string | undefined;
-        overwrite: boolean;
-        prefix: string | undefined;
-        header: string[] | undefined;
-        'header-param': string[] | undefined;
-        'query-name': string | undefined;
-        'query-type': string | undefined;
-        'path-params': string | undefined;
-        'db-host': string | undefined;
-        'db-user': string | undefined;
-        'db-password': string | undefined;
-        'db-database': string | undefined;
-        'db-link-types': boolean;
-        'db-include': string | undefined;
-        'db-schema': string | undefined;
-        'db-use-deprecated-2022-naming': boolean;
-        'snowflake-account-id': string | undefined;
-        'snowflake-warehouse': string | undefined;
-        help: void;
-        'non-interactive': boolean;
-    }, {
-        [flag: string]: any;
-    }, {
-        [name: string]: any;
-    }>>;
     parseHeaderFlags(headerFlagValues?: string[], headerParamFlagValues?: string[]): HeaderInput[];
     getSqlOptionsFromFlags(flags: FlagsT<typeof Import>): {
         host: string | undefined;

package/lib/commands/import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,aAAa,CAAA;AAepD,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAM9C,OAAO,EAIL,MAAM,EACN,sBAAsB,EAIvB,MAAM,qBAAqB,CAAA;AAK5B,OAAO,EAAS,WAAW,EAAc,MAAM,kBAAkB,CAAA;AACjE,OAAO,EAAC,SAAS,EAAE,MAAM,EAAU,MAAM,iBAAiB,CAAA;AAE1D,OAAO,EAAC,WAAW,EAAE,UAAU,EAAU,MAAM,4BAA4B,CAAA;AAE3E,oBAAY,cAAc,GACtB,MAAM,GACN,SAAS,GACT,YAAY,GACZ,OAAO,GACP,WAAW,CAAA;AAGf,aAAK,wBAAwB,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG;IACjD,WAAW,CAAC,EAAE,cAAc,EAAE,CAAA;CAC/B,CAAA;AAGD,aAAK,yBAAyB,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,GAAG;IACnD,WAAW,CAAC,EAAE,cAAc,EAAE,CAAA;CAC/B,CAAA;AAiFD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAU;IAC5C,MAAM,CAAC,WAAW,SACqE;IAEvF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;;MAwIX;IAED,MAAM,CAAC,IAAI;;;QAKV;IAED,MAAM,CAAC,iBAAiB,WACd,cAAc,YACZ,MAAM,MAAM,OAAO,OAAO,KAAK,CAAC,YAa9B;IAEd,MAAM,CAAC,KAAK,WA0BX;IAGD,MAAM,CAAC,MAAM,UAAQ;IAEf,GAAG;IA6EH,UAAU,CACd,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,MAAM,CAAC,OAAO,MAAM,CAAC,EAC5B,aAAa,EAAE,mBAAmB,GACjC,OAAO,CAAC,MAAM,CAAC;IA0EZ,aAAa,CACjB,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,MAAM,CAAC,OAAO,MAAM,CAAC,EAC5B,aAAa,EAAE,mBAAmB,GACjC,OAAO,CAAC,MAAM,CAAC;IAuCZ,SAAS,CACb,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,KAAK,EAAE,MAAM,CAAC,OAAO,MAAM,CAAC,EAC5B,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,MAAM,CAAC;IA6FZ,wBAAwB,CAC5B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,CAAC,OAAO,MAAM,CAAC;IAmE9B,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,OAAO,MAAM,CAAC;IAwBhE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA6CrB,gBAAgB,CACd,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,qBAAqB,CAAC,EAAE,MAAM,EAAE,GAC/B,WAAW,EAAE;IAuBhB,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,MAAM,CAAC;;;;;;;;;;;;IAsBnD,oBAAoB,CAAC,WAAW,EAAE,MAAM;;;;;;;;;IA6BlC,uBAAuB,CAC3B,QAAQ,EAAE,MAAM,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,GAAG,GAAG,CAAC,EAC9C,UAAU,SAAK;CA+DlB"}
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"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"}

package/lib/commands/import.js

@@ -6,6 +6,7 @@ const fsx = require("fs-extra");
 const path = require("path");
 const core_1 = require("@oclif/core");
 const errors_1 = require("@oclif/core/lib/errors");
+const errors_2 = require("@oclif/core/lib/parser/errors");
 const dsn_parser_1 = require("@soluble/dsn-parser");
 const lodash_1 = require("lodash");
 const inquirer = require("../shared/inquirer");
@@ -21,6 +22,7 @@ const path_params_parser_1 = require("../shared/path-params-parser");
 const header_params_parser_1 = require("../shared/header-params-parser");
 const header_1 = require("../shared/header");
 const configuration_1 = require("../shared/configuration");
+const rmtemp_1 = require("../shared/rmtemp");
 const _addDataTypesToDescription = (options) => {
     const prefix = options?.dataSources
         ? `[${options?.dataSources.join(', ')}]`
@@ -49,8 +51,61 @@ const Flags = {
     }),
 };
 class Import extends zen_command_1.default {
+    // special parsing to support curl flags and options
+    async parse(options, argv = this.argv) {
+        let parsed;
+        try {
+            parsed = await super.parse(options, argv);
+        }
+        catch (error) {
+            if (!(error instanceof errors_2.CLIParseError)) {
+                throw error;
+            }
+            const { parse: { output }, } = error;
+            const isCurl = output?.args?.source?.toLowerCase() === 'curl';
+            const hasUnsupportedFlags = Boolean(output?.nonExistentFlags?.length);
+            if (isCurl && hasUnsupportedFlags) {
+                const unsupportedFlags = output.nonExistentFlags;
+                throw new errors_1.CLIError(`Unsupported curl flag${unsupportedFlags.length > 1 ? 's' : ''}: ${unsupportedFlags.join(', ')}.` +
+                    ` If this is a blocker for you, please let us know on Discord (${constants_1.STEPZEN_DISCORD_URL})`);
+            }
+            throw error;
+        }
+        const isCurl = parsed.args.source.toLowerCase() === 'curl';
+        if (isCurl) {
+            // "unparse" the curl flags and args into the argv array
+            // (to be parsed again by the curl-parser code later)
+            //
+            // The main reason for this non-optimal approach:
+            //  - In StepZen CLI, a curl command parser with support for
+            //    curl-specific validation and error messages has been historically
+            //    implemented without using the oclif parser. (This was done
+            //    because the curl syntax conventions for command line flags and
+            //    options slightly differ from those in oclif.)
+            //  - The custom curl parser is used in 2 places: to initially parse
+            //    the command line when running the Import command, and also to
+            //    parse the user answer to the "URL or a whole curl command"
+            //    question in the `askCurlQuestions()` function.
+            //  - The workarounds added to the oclif's `parse()` method in the
+            //    ZenCommand base class make it feasible to use the customised
+            //    oclif parser also for the curl command line. However, considering
+            //    the two options:
+            //      1. "unparse" the oclif parser output and keep using a custom
+            //         curl parser as before
+            //      2. remove the custom curl parser and use the oclif parser in
+            //         both places
+            //    the first option seems to provide more specific error messages,
+            //    and it is not drastically more complex than the second one
+            //    (calling the oclif parser directly outisde of the `parse()`
+            //    method is non-trivial).
+            parsed.argv.push(...(parsed.flags.data
+                ? parsed.flags.data.flatMap((data) => ['-d', data])
+                : []), ...(parsed.flags.request ? ['-X', parsed.flags.request] : []), ...(parsed.flags.url ? [parsed.flags.url] : []));
+        }
+        return parsed;
+    }
     async run() {
-        const { args, argv, flags } = await this.parseWorkaround();
+        const { args, argv, flags } = await this.parse(Import);
         // Get the schema you're asking for; may be a DSN
         const { source, dsn } = (0, helpers_1.getSource)(args.source);
         // If using a local StepZen service instance, make sure it's running
@@ -93,11 +148,15 @@ class Import extends zen_command_1.default {
                     chalk `\n\tSee {bold stepzen import --help} for supported data sources.`);
         }
         const result = await importFn();
-        // Housekeeping
-        fsx.copySync(result, workspace.schema);
-        fsx.removeSync(result);
-        // Nice message
-        this.log(chalk.green(`Successfully imported ${chalk.bold(source)} data source into your GraphQL schema`));
+        try {
+            // Housekeeping
+            fsx.copySync(result, workspace.schema);
+            // Nice message
+            this.log(chalk.green(`Successfully imported ${chalk.bold(source)} data source into your GraphQL schema`));
+        }
+        finally {
+            (0, rmtemp_1.rmtemp)(result);
+        }
     }
     async importCurl(argv, flags, commonOptions) {
         const headers = this.parseHeaderFlags(flags.header, flags['header-param']);
@@ -299,48 +358,6 @@ class Import extends zen_command_1.default {
             }
         });
     }
-    // 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
-    async parseWorkaround() {
-        const argv = this.argv;
-        const parsed = await this.parse(Import, argv);
-        const fixFlag = (flag) => {
-            const values = parsed.flags[flag];
-            if (values) {
-                // Every ['--flag', value] pair in the argv array should match
-                // only one value in the flag's value list.
-                const matchedIndices = new Set();
-                // For each value in the flag's value list, find the original
-                // ['--flag', value] pair in the argv array.
-                for (let i = 0; i < values.length; i++) {
-                    const value = values[i];
-                    const flagIdx = argv.findIndex((arg, idx) => {
-                        const spaceDelimMatch = (arg === `--${flag}` ||
-                            (Import.flags[flag].char &&
-                                arg === `-${Import.flags[flag].char}`)) &&
-                            idx < argv.length &&
-                            argv[idx + 1] === value;
-                        const eqlDelimMatch = arg === `--${flag}=${value}`;
-                        return ((spaceDelimMatch || eqlDelimMatch) && !matchedIndices.has(idx));
-                    });
-                    // If not found, that means the given value was associated with the
-                    // `flag` incorrectly. In that case, it's moved from `flags` to `argv` in
-                    // the parsed output.
-                    if (flagIdx === -1) {
-                        values.splice(i, 1);
-                        i -= 1; // compensate for the .splice() call above
-                        parsed.argv.push(value);
-                    }
-                    else {
-                        matchedIndices.add(flagIdx);
-                    }
-                }
-            }
-        };
-        fixFlag('header');
-        fixFlag('header-param');
-        return parsed;
-    }
     parseHeaderFlags(headerFlagValues, headerParamFlagValues) {
         const headers = [];
         if (headerFlagValues) {
@@ -412,24 +429,24 @@ class Import extends zen_command_1.default {
             const importPromise = importFn();
             let timeoutPromise;
             let resultOrError;
-            core_1.CliUx.ux.action.start('Starting');
+            core_1.ux.action.start('Starting');
             timeoutPromise = (0, utils_1.getTimeout)(5 * 1000);
             resultOrError = await Promise.race([importPromise, timeoutPromise]);
             if (!resultOrError) {
                 // 5 sec passed, but no result yet
-                core_1.CliUx.ux.action.start('Creating a GraphQL schema');
+                core_1.ux.action.start('Creating a GraphQL schema');
                 timeoutPromise = (0, utils_1.getTimeout)(5 * 1000);
                 resultOrError = await Promise.race([importPromise, timeoutPromise]);
             }
             if (!resultOrError) {
                 // another 5 sec passed (10 sec total)
-                core_1.CliUx.ux.action.start('Creating a GraphQL schema (this is taking longer than usual)');
+                core_1.ux.action.start('Creating a GraphQL schema (this is taking longer than usual)');
                 timeoutPromise = (0, utils_1.getTimeout)(30 * 1000);
                 resultOrError = await Promise.race([importPromise, timeoutPromise]);
             }
             if (!resultOrError) {
                 // another 30 sec passed (40 sec total)
-                core_1.CliUx.ux.action.start('Creating a GraphQL schema (it may take up to 10 minutes)');
+                core_1.ux.action.start('Creating a GraphQL schema (it may take up to 10 minutes)');
                 timeoutPromise = (0, utils_1.getTimeout)((8 * 60 + 20) * 1000);
                 resultOrError = await Promise.race([importPromise, timeoutPromise]);
             }
@@ -445,16 +462,16 @@ class Import extends zen_command_1.default {
                 };
             }
             if ('error' in resultOrError) {
-                core_1.CliUx.ux.action.stop(chalk.red('fail'));
+                core_1.ux.action.stop(chalk.red('fail'));
                 this.log('A problem occurred while processing your import. ' + ctaOnError);
                 this.log(resultOrError.error);
                 this.exit(1);
             }
-            core_1.CliUx.ux.action.stop('done');
+            core_1.ux.action.stop('done');
             return resultOrError;
         }
         catch (error) {
-            core_1.CliUx.ux.action.stop(chalk.red('fail'));
+            core_1.ux.action.stop(chalk.red('fail'));
             throw error;
         }
     }
@@ -479,6 +496,23 @@ Import.flags = {
         dataSources: ['curl', 'graphql'],
         description: 'Prefix to add to every type in the generated schema',
     }),
+    data: Flags.string({
+        char: 'd',
+        dataSources: ['curl'],
+        hidden: true,
+        aliases: ['data-ascii', 'data-raw', 'data-binary'],
+        multiple: true,
+    }),
+    request: Flags.string({
+        char: 'X',
+        dataSources: ['curl'],
+        hidden: true,
+    }),
+    url: Flags.string({
+        dataSources: ['curl'],
+        hidden: true,
+        multiple: true,
+    }),
     header: Flags.string({
         char: 'H',
         dataSources: ['curl', 'graphql'],
@@ -579,12 +613,9 @@ Import.flags = {
         description: 'Snowflake warehouse',
     }),
 };
-Import.args = [
-    {
-        name: 'source',
-        required: true,
-    },
-];
+Import.args = {
+    source: core_1.Args.string({ required: true }),
+};
 Import.flagHelpForSource = (source, exclude) => Object.entries(Import.flags)
     .filter(([name, value]) => 'dataSources' in value &&
     value.dataSources?.includes(source) &&