stepzen 0.44.0 → 0.45.0-beta.0

package/lib/commands/import/postgresql.js

@@ -1,22 +1,47 @@
-"use strict";
 // Copyright IBM Corp. 2020, 2024
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
-const errors_1 = require("@oclif/core/lib/errors");
-const chalk = require("chalk");
-const lodash_1 = require("lodash");
-const flags_1 = require("../../generate/flags");
-const import_command_1 = require("../../generate/import-command");
-const questions_1 = require("../../generate/questions");
-const sql2sdl_1 = require("../../generate/sql2sdl");
-const configuration_1 = require("../../shared/configuration");
-const dsn_parser_1 = require("@soluble/dsn-parser");
-const inquirer = require("../../shared/inquirer");
-const utils_1 = require("../../shared/utils");
-class ImportPostgreSQL extends import_command_1.ImportCommandBase {
+import { Args } from '@oclif/core';
+import { CLIError } from '@oclif/core/errors';
+import { parseDsn } from '@soluble/dsn-parser';
+import chalk from 'chalk';
+import { pickBy } from 'lodash-es';
+import { ImportFlags } from '../../generate/flags.js';
+import { ImportCommandBase } from '../../generate/import-command.js';
+import { ImportQuestions } from '../../generate/questions.js';
+import { sql2sdl } from '../../generate/sql2sdl.js';
+import { readConfiguration } from '../../shared/configuration.js';
+import * as inquirer from '../../shared/inquirer.js';
+import { rewriteLocalhostToHostGateway } from '../../shared/utils.js';
+export default class ImportPostgreSQL extends ImportCommandBase {
+    static description = `Import a schema for a PostgreSQL data source into your GraphQL API.` +
+        `\n` +
+        chalk `\n{bold stepzen import postgresql} automatically introspects a` +
+        ` PostgreSQL database, generates a GraphQL schema for accessing this` +
+        ` database through a StepZen API, and merges the generated types,` +
+        ` queries and mutations into your GraphQL schema.`;
     get source() {
         return 'postgresql';
     }
+    static aliases = ['import:postgres'];
+    static flags = {
+        ...ImportCommandBase.flags,
+        'db-host': ImportFlags.dbHost(),
+        'db-user': ImportFlags.dbUser(),
+        'db-password': ImportFlags.dbPassword(),
+        'db-database': ImportFlags.dbDatabase(),
+        'db-schema': ImportFlags.dbSchema(),
+        'db-link-types': ImportFlags.dbLinkTypes(),
+        'db-include': ImportFlags.dbInclude(),
+        'db-use-deprecated-2022-naming': ImportFlags.dbUseDeprecatedNaming(),
+    };
+    static args = {
+        dsn: Args.string({
+            description: chalk `{italic (optional)} Data Source Name (DSN) of a PostgreSQL database.` +
+                chalk `\nExample: {bold postgresql://user:password@host:port/database?schema=schema}` +
+                chalk `\n` +
+                chalk `\nFlags, such as {bold --db-host}, override the corresponding` +
+                chalk ` parts of the DSN (if both are provided).`,
+        }),
+    };
     async import(commonOptions) {
         const { args, flags } = await this.parse(ImportPostgreSQL);
         const nonInteractiveOptions = {
@@ -43,7 +68,7 @@ class ImportPostgreSQL extends import_command_1.ImportCommandBase {
         }
         else {
             if (flags['non-interactive']) {
-                throw new errors_1.CLIError('Please provide a Data Source Name (DSN) string for a PostgreSQL database.' +
+                throw new CLIError('Please provide a Data Source Name (DSN) string for a PostgreSQL database.' +
                     chalk `\nSee more help with {bold stepzen import postgresql --help}`);
             }
             // no parameters given: start an interactive prompt
@@ -67,9 +92,9 @@ class ImportPostgreSQL extends import_command_1.ImportCommandBase {
                 ...interactiveOptions,
             };
         }
-        const configuration = await (0, configuration_1.readConfiguration)();
-        sql2sdlOptions.host = (0, utils_1.rewriteLocalhostToHostGateway)(configuration, sql2sdlOptions.host);
-        return this.wrapInProgressAndTimeout((0, sql2sdl_1.sql2sdl)(sql2sdlOptions, configuration));
+        const configuration = await readConfiguration();
+        sql2sdlOptions.host = rewriteLocalhostToHostGateway(configuration, sql2sdlOptions.host);
+        return this.wrapInProgressAndTimeout(sql2sdl(sql2sdlOptions, configuration));
     }
     getImportOptionsFromFlags(flags) {
         const options = {
@@ -87,10 +112,10 @@ class ImportPostgreSQL extends import_command_1.ImportCommandBase {
             },
         };
         // Remove `undefined`-valued properties
-        return (0, lodash_1.pickBy)(options, value => value !== undefined);
+        return pickBy(options, value => value !== undefined);
     }
     getImportOptionsFromDsn(possibleDsn) {
-        const parsed = (0, dsn_parser_1.parseDsn)(possibleDsn);
+        const parsed = parseDsn(possibleDsn);
         if (parsed.success) {
             const value = parsed.value;
             const options = {
@@ -103,48 +128,20 @@ class ImportPostgreSQL extends import_command_1.ImportCommandBase {
                     : `${value.params?.schema}`,
             };
             // Remove `undefined`-valued properties
-            return (0, lodash_1.pickBy)(options, value => value !== undefined);
+            return pickBy(options, value => value !== undefined);
         }
-        throw new errors_1.CLIError(parsed.message);
+        throw new CLIError(parsed.message);
     }
     async getImportOptionsInteractively(defaults = {}) {
         const questions = inquirer.overrideDefaults([
-            questions_1.ImportQuestions.dbHost(),
-            questions_1.ImportQuestions.dbUser(),
-            questions_1.ImportQuestions.dbPassword(),
-            questions_1.ImportQuestions.dbDatabase(),
-            questions_1.ImportQuestions.dbSchema(),
-            questions_1.ImportQuestions.dbLinkTypes(),
+            ImportQuestions.dbHost(),
+            ImportQuestions.dbUser(),
+            ImportQuestions.dbPassword(),
+            ImportQuestions.dbDatabase(),
+            ImportQuestions.dbSchema(),
+            ImportQuestions.dbLinkTypes(),
         ], defaults);
         return inquirer.prompt(`import-${this.source}`, questions);
     }
 }
-exports.default = ImportPostgreSQL;
-ImportPostgreSQL.description = `Import a schema for a PostgreSQL data source into your GraphQL API.` +
-    `\n` +
-    chalk `\n{bold stepzen import postgresql} automatically introspects a` +
-    ` PostgreSQL database, generates a GraphQL schema for accessing this` +
-    ` database through a StepZen API, and merges the generated types,` +
-    ` queries and mutations into your GraphQL schema.`;
-ImportPostgreSQL.aliases = ['import:postgres'];
-ImportPostgreSQL.flags = {
-    ...import_command_1.ImportCommandBase.flags,
-    'db-host': flags_1.ImportFlags.dbHost(),
-    'db-user': flags_1.ImportFlags.dbUser(),
-    'db-password': flags_1.ImportFlags.dbPassword(),
-    'db-database': flags_1.ImportFlags.dbDatabase(),
-    'db-schema': flags_1.ImportFlags.dbSchema(),
-    'db-link-types': flags_1.ImportFlags.dbLinkTypes(),
-    'db-include': flags_1.ImportFlags.dbInclude(),
-    'db-use-deprecated-2022-naming': flags_1.ImportFlags.dbUseDeprecatedNaming(),
-};
-ImportPostgreSQL.args = {
-    dsn: core_1.Args.string({
-        description: chalk `{italic (optional)} Data Source Name (DSN) of a PostgreSQL database.` +
-            chalk `\nExample: {bold postgresql://user:password@host:port/database?schema=schema}` +
-            chalk `\n` +
-            chalk `\nFlags, such as {bold --db-host}, override the corresponding` +
-            chalk ` parts of the DSN (if both are provided).`,
-    }),
-};
 //# sourceMappingURL=postgresql.js.map

package/lib/commands/import/postgresql.js.map

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

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

@@ -1,33 +1,25 @@
-import { ImportCommandBase } from '../../generate/import-command';
-import type { CommonImportOptions } from '../../generate/import-command';
-import type { PrestoImportOptions } from '../../generate/sql2sdl';
-import type { FlagsT } from '../../shared/types';
-export declare type PrestoAnswers = Pick<PrestoImportOptions, 'host' | 'user' | 'password' | 'catalog' | 'schema' | 'linkTypes'>;
+import type { CommonImportOptions } from '../../generate/import-command.js';
+import type { PrestoImportOptions } from '../../generate/sql2sdl.js';
+import type { FlagsT } from '../../shared/types.js';
+import { ImportCommandBase } from '../../generate/import-command.js';
+export type PrestoAnswers = Pick<PrestoImportOptions, 'host' | 'user' | 'password' | 'catalog' | 'schema' | 'linkTypes'>;
 export default class ImportPresto extends ImportCommandBase {
     static description: string;
     get source(): "presto";
     static hidden: boolean;
     static flags: {
-        'db-host': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'db-user': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'db-password': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'db-catalog': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'db-schema': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'db-link-types': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'db-include': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        dir: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        silent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'db-host': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'db-user': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'db-password': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'db-catalog': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'db-schema': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'db-link-types': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'db-include': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static args: {
-        dsn: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+        dsn: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
-    protected import(commonOptions: CommonImportOptions): Promise<import("../../shared/types").ErrorOr<import("../../generate/helpers").IntrospectionServiceResponse, {
-        message: string;
-    }>>;
+    protected import(commonOptions: CommonImportOptions): Promise<import("../../shared/types.js").ErrorOr<import("../../generate/helpers.js").IntrospectionServiceResponse>>;
     getImportOptionsFromFlags(flags: FlagsT<typeof ImportPresto>): {
         host: string | undefined;
         user: string | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"presto.d.ts","sourceRoot":"","sources":["../../../src/commands/import/presto.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAA;AAU/D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,wBAAwB,CAAA;AAC/D,OAAO,KAAK,EAAU,MAAM,EAAC,MAAM,oBAAoB,CAAA;AAEvD,oBAAY,aAAa,GAAG,IAAI,CAC9B,mBAAmB,EACnB,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,CAClE,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IACzD,MAAM,CAAC,WAAW,SAMgC;IAElD,IAAI,MAAM,aAET;IAGD,MAAM,CAAC,MAAM,UAAwC;IAErD,MAAM,CAAC,KAAK;;;;;;;;;;;;;;MAYX;IAED,MAAM,CAAC,IAAI;;MASV;cAEe,MAAM,CAAC,aAAa,EAAE,mBAAmB;;;IAoFzD,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC;;;;;;;;;IAe5D,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;;;;;IAmBrC,6BAA6B,CACjC,QAAQ,GAAE,OAAO,CAAC,aAAa,CAAM,GACpC,OAAO,CAAC,aAAa,CAAC;CAoB1B"}
+{"version":3,"file":"presto.d.ts","sourceRoot":"","sources":["../../../src/commands/import/presto.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAA;AACzE,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAA;AAClE,OAAO,KAAK,EAAU,MAAM,EAAC,MAAM,uBAAuB,CAAA;AAS1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAA;AAWlE,MAAM,MAAM,aAAa,GAAG,IAAI,CAC9B,mBAAmB,EACnB,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,CAClE,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IACzD,MAAM,CAAC,WAAW,SAMgC;IAElD,IAAI,MAAM,aAET;IAGD,MAAM,CAAC,MAAM,UAAwC;IAErD,MAAM,CAAC,KAAK;;;;;;;;MAYX;IAED,MAAM,CAAC,IAAI;;MASV;cAEe,MAAM,CAAC,aAAa,EAAE,mBAAmB;IAoFzD,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC;;;;;;;;;IAe5D,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;;;;;IAmBrC,6BAA6B,CACjC,QAAQ,GAAE,OAAO,CAAC,aAAa,CAAM,GACpC,OAAO,CAAC,aAAa,CAAC;CAoB1B"}

package/lib/commands/import/presto.js

@@ -1,23 +1,51 @@
-"use strict";
 // Copyright IBM Corp. 2020, 2024
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
-const errors_1 = require("@oclif/core/lib/errors");
-const chalk = require("chalk");
-const lodash_1 = require("lodash");
-const flags_1 = require("../../generate/flags");
-const import_command_1 = require("../../generate/import-command");
-const questions_1 = require("../../generate/questions");
-const sql2sdl_1 = require("../../generate/sql2sdl");
-const configuration_1 = require("../../shared/configuration");
-const constants_1 = require("../../shared/constants");
-const dsn_parser_1 = require("@soluble/dsn-parser");
-const inquirer = require("../../shared/inquirer");
-const utils_1 = require("../../shared/utils");
-class ImportPresto extends import_command_1.ImportCommandBase {
+import { Args, Flags } from '@oclif/core';
+import { CLIError } from '@oclif/core/errors';
+import { parseDsn } from '@soluble/dsn-parser';
+import chalk from 'chalk';
+import { pickBy } from 'lodash-es';
+import { ImportFlags } from '../../generate/flags.js';
+import { ImportCommandBase } from '../../generate/import-command.js';
+import { ImportQuestions } from '../../generate/questions.js';
+import { sql2sdl } from '../../generate/sql2sdl.js';
+import { readConfiguration } from '../../shared/configuration.js';
+import { ENABLE_PRESTO_IMPORT } from '../../shared/constants.js';
+import * as inquirer from '../../shared/inquirer.js';
+import { getFeatureFlag, rewriteLocalhostToHostGateway, } from '../../shared/utils.js';
+export default class ImportPresto extends ImportCommandBase {
+    static description = `Import a schema for a Presto data source into your GraphQL API.` +
+        `\n` +
+        chalk `\n{bold stepzen import presto} automatically introspects a Presto` +
+        ` database, generates a GraphQL schema for accessing this database` +
+        ` through a StepZen API, and merges the generated types, queries and` +
+        ` mutations into your into your GraphQL schema.`;
     get source() {
         return 'presto';
     }
+    // the GA version of the introspection service does not support Presto yet
+    static hidden = !getFeatureFlag(ENABLE_PRESTO_IMPORT);
+    static flags = {
+        ...ImportCommandBase.flags,
+        'db-host': ImportFlags.dbHost(),
+        'db-user': ImportFlags.dbUser(),
+        'db-password': ImportFlags.dbPassword(),
+        // 'db-database': ImportFlags.dbDatabase(), -- intentionally omitted (Presto does not have databases)
+        'db-catalog': Flags.string({
+            description: 'Name of the catalog to import',
+        }),
+        'db-schema': ImportFlags.dbSchema(),
+        'db-link-types': ImportFlags.dbLinkTypes(),
+        'db-include': ImportFlags.dbInclude(),
+    };
+    static args = {
+        dsn: Args.string({
+            description: chalk `{italic (optional)} Data Source Name (DSN) of a Presto data source.` +
+                chalk `\nExample: {bold presto://user:password@host:port/catalog}` +
+                chalk `\n` +
+                chalk `\nFlags, such as {bold --db-host}, override the corresponding` +
+                chalk ` parts of the DSN (if both are provided).`,
+        }),
+    };
     async import(commonOptions) {
         const { args, flags } = await this.parse(ImportPresto);
         const nonInteractiveOptions = {
@@ -45,7 +73,7 @@ class ImportPresto extends import_command_1.ImportCommandBase {
         }
         else {
             if (flags['non-interactive']) {
-                throw new errors_1.CLIError('Please provide a complete Data Source Name (DSN) string for a Presto database.' +
+                throw new CLIError('Please provide a complete Data Source Name (DSN) string for a Presto database.' +
                     chalk `\nSee more help with {bold stepzen import presto --help}`);
             }
             // no parameters given: start an interactive prompt
@@ -69,9 +97,9 @@ class ImportPresto extends import_command_1.ImportCommandBase {
                 ...interactiveOptions,
             };
         }
-        const configuration = await (0, configuration_1.readConfiguration)();
-        sql2sdlOptions.host = (0, utils_1.rewriteLocalhostToHostGateway)(configuration, sql2sdlOptions.host);
-        return this.wrapInProgressAndTimeout((0, sql2sdl_1.sql2sdl)(sql2sdlOptions, configuration));
+        const configuration = await readConfiguration();
+        sql2sdlOptions.host = rewriteLocalhostToHostGateway(configuration, sql2sdlOptions.host);
+        return this.wrapInProgressAndTimeout(sql2sdl(sql2sdlOptions, configuration));
     }
     getImportOptionsFromFlags(flags) {
         const options = {
@@ -84,10 +112,10 @@ class ImportPresto extends import_command_1.ImportCommandBase {
             include: flags['db-include'],
         };
         // Remove `undefined`-valued properties
-        return (0, lodash_1.pickBy)(options, value => value !== undefined);
+        return pickBy(options, value => value !== undefined);
     }
     getImportOptionsFromDsn(possibleDsn) {
-        const parsed = (0, dsn_parser_1.parseDsn)(possibleDsn);
+        const parsed = parseDsn(possibleDsn);
         if (parsed.success) {
             const value = parsed.value;
             const options = {
@@ -98,55 +126,24 @@ class ImportPresto extends import_command_1.ImportCommandBase {
                 schema: value.params?.schema,
             };
             // Remove `undefined`-valued properties
-            return (0, lodash_1.pickBy)(options, value => value !== undefined);
+            return pickBy(options, value => value !== undefined);
         }
-        throw new errors_1.CLIError(parsed.message);
+        throw new CLIError(parsed.message);
     }
     async getImportOptionsInteractively(defaults = {}) {
         const questions = inquirer.overrideDefaults([
-            questions_1.ImportQuestions.dbHost(),
-            questions_1.ImportQuestions.dbUser(),
-            questions_1.ImportQuestions.dbPassword(),
+            ImportQuestions.dbHost(),
+            ImportQuestions.dbUser(),
+            ImportQuestions.dbPassword(),
             {
                 name: 'catalog',
                 message: 'What is your Presto catalog name?',
                 validate: input => input.trim() !== '' || 'Catalog name must not be empty',
             },
-            questions_1.ImportQuestions.dbSchema({ required: true }),
-            questions_1.ImportQuestions.dbLinkTypes(),
+            ImportQuestions.dbSchema({ required: true }),
+            ImportQuestions.dbLinkTypes(),
         ], defaults);
         return inquirer.prompt(`import-${this.source}`, questions);
     }
 }
-exports.default = ImportPresto;
-ImportPresto.description = `Import a schema for a Presto data source into your GraphQL API.` +
-    `\n` +
-    chalk `\n{bold stepzen import presto} automatically introspects a Presto` +
-    ` database, generates a GraphQL schema for accessing this database` +
-    ` through a StepZen API, and merges the generated types, queries and` +
-    ` mutations into your into your GraphQL schema.`;
-// the GA version of the introspection service does not support Presto yet
-ImportPresto.hidden = !(0, utils_1.getFeatureFlag)(constants_1.ENABLE_PRESTO_IMPORT);
-ImportPresto.flags = {
-    ...import_command_1.ImportCommandBase.flags,
-    'db-host': flags_1.ImportFlags.dbHost(),
-    'db-user': flags_1.ImportFlags.dbUser(),
-    'db-password': flags_1.ImportFlags.dbPassword(),
-    // 'db-database': ImportFlags.dbDatabase(), -- intentionally omitted (Presto does not have databases)
-    'db-catalog': core_1.Flags.string({
-        description: 'Name of the catalog to import',
-    }),
-    'db-schema': flags_1.ImportFlags.dbSchema(),
-    'db-link-types': flags_1.ImportFlags.dbLinkTypes(),
-    'db-include': flags_1.ImportFlags.dbInclude(),
-};
-ImportPresto.args = {
-    dsn: core_1.Args.string({
-        description: chalk `{italic (optional)} Data Source Name (DSN) of a Presto data source.` +
-            chalk `\nExample: {bold presto://user:password@host:port/catalog}` +
-            chalk `\n` +
-            chalk `\nFlags, such as {bold --db-host}, override the corresponding` +
-            chalk ` parts of the DSN (if both are provided).`,
-    }),
-};
 //# sourceMappingURL=presto.js.map

package/lib/commands/import/presto.js.map

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

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

@@ -1,34 +1,26 @@
-import { ImportCommandBase } from '../../generate/import-command';
-import type { CommonImportOptions } from '../../generate/import-command';
-import type { DBIntrospectionOptions, SnowflakeImportOptions } from '../../generate/sql2sdl';
-import type { FlagsT } from '../../shared/types';
-export declare type SnowflakeAnswers = Pick<SnowflakeImportOptions, 'accountId' | 'database' | 'schema' | 'warehouse' | 'user' | 'password' | 'linkTypes'>;
+import type { CommonImportOptions } from '../../generate/import-command.js';
+import type { DBIntrospectionOptions, SnowflakeImportOptions } from '../../generate/sql2sdl.js';
+import type { FlagsT } from '../../shared/types.js';
+import { ImportCommandBase } from '../../generate/import-command.js';
+export type SnowflakeAnswers = Pick<SnowflakeImportOptions, 'accountId' | 'database' | 'schema' | 'warehouse' | 'user' | 'password' | 'linkTypes'>;
 export default class ImportSnowflake extends ImportCommandBase {
     static description: string;
     get source(): "snowflake";
     static flags: {
-        'db-user': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'db-password': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'db-database': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'db-schema': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'db-link-types': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'db-include': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'db-use-deprecated-2022-naming': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'snowflake-account-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'snowflake-warehouse': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        dir: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        silent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'db-user': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'db-password': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'db-database': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'db-schema': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'db-link-types': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'db-include': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'db-use-deprecated-2022-naming': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'snowflake-account-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'snowflake-warehouse': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static args: {
-        dsn: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+        dsn: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
-    protected import(commonOptions: CommonImportOptions): Promise<import("../../shared/types").ErrorOr<import("../../generate/helpers").IntrospectionServiceResponse, {
-        message: string;
-    }>>;
+    protected import(commonOptions: CommonImportOptions): Promise<import("../../shared/types.js").ErrorOr<import("../../generate/helpers.js").IntrospectionServiceResponse>>;
     getImportOptionsFromFlags(flags: FlagsT<typeof ImportSnowflake>): {
         accountId: string | undefined;
         user: string | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"snowflake.d.ts","sourceRoot":"","sources":["../../../src/commands/import/snowflake.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAA;AAQ/D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAU,MAAM,EAAC,MAAM,oBAAoB,CAAA;AAEvD,oBAAY,gBAAgB,GAAG,IAAI,CACjC,sBAAsB,EACpB,WAAW,GACX,UAAU,GACV,QAAQ,GACR,WAAW,GACX,MAAM,GACN,UAAU,GACV,WAAW,CACd,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,iBAAiB;IAC5D,MAAM,CAAC,WAAW,SAMkC;IAEpD,IAAI,MAAM,gBAET;IAED,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;MAmBX;IAED,MAAM,CAAC,IAAI;;MASV;cAEe,MAAM,CAAC,aAAa,EAAE,mBAAmB;;;IAsFzD,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,eAAe,CAAC;;;;;;;;;;;IAqB/D,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;;;;;;IAyBrC,6BAA6B,CACjC,QAAQ,GAAE,OAAO,CAAC,gBAAgB,CAAM,GACvC,OAAO,CAAC,gBAAgB,CAAC;CA+B7B"}
+{"version":3,"file":"snowflake.d.ts","sourceRoot":"","sources":["../../../src/commands/import/snowflake.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAA;AACzE,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAU,MAAM,EAAC,MAAM,uBAAuB,CAAA;AAS1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAA;AAOlE,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,sBAAsB,EACpB,WAAW,GACX,UAAU,GACV,QAAQ,GACR,WAAW,GACX,MAAM,GACN,UAAU,GACV,WAAW,CACd,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,iBAAiB;IAC5D,MAAM,CAAC,WAAW,SAMkC;IAEpD,IAAI,MAAM,gBAET;IAED,MAAM,CAAC,KAAK;;;;;;;;;;MAmBX;IAED,MAAM,CAAC,IAAI;;MASV;cAEe,MAAM,CAAC,aAAa,EAAE,mBAAmB;IAsFzD,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,eAAe,CAAC;;;;;;;;;;;IAqB/D,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;;;;;;IA0BrC,6BAA6B,CACjC,QAAQ,GAAE,OAAO,CAAC,gBAAgB,CAAM,GACvC,OAAO,CAAC,gBAAgB,CAAC;CA+B7B"}