stepzen 0.45.0-beta.3 → 0.45.0-beta.5

package/README.md

@@ -1,6 +1,6 @@
 # StepZen CLI
 
-The StepZen Command Line Interface (CLI) tool enables you to set up and manage StepZen using commands in your command-line shell. 
+The StepZen Command Line Interface (CLI) tool enables you to set up and manage StepZen using commands in your command-line shell.
 
 After you have written or imported your GraphQL schema in the form of a Schema Definition Language (SDL) file, and defined your "configuration" in a YAML files, you can upload and deploy them to StepZen using the StepZen CLI - resulting in a live GraphQL endpoint.
 
@@ -9,6 +9,7 @@ After you have written or imported your GraphQL schema in the form of a Schema D
 `npm install -g stepzen`
 
 # Verifying your installation
+
 To verify your  CLI installation, use the `stepzen --version` command:
 
 `$ stepzen (-v|--version|version)`
@@ -35,7 +36,7 @@ $ npm install -g stepzen
 $ stepzen COMMAND
 running command...
 $ stepzen (--version|-v)
-stepzen/0.45.0-beta.3 linux-x64 node-v18.20.5
+stepzen/0.45.0-beta.5 linux-x64 node-v18.20.5
 $ stepzen --help [COMMAND]
 USAGE
   $ stepzen COMMAND
@@ -43,7 +44,7 @@ USAGE
 ```
 <!-- usagestop -->
 
-# QA from cloned repo 
+# QA from cloned repo
 <!-- QA -->
 To run from code: `path-to-repo/bin/run start` (start or whatever command you're QAing)
 <!-- QAstop -->
@@ -59,11 +60,11 @@ $ stepzen deploy ENDPOINT --schema=schema [--configurationsets=cs1[,cs2[,..]]]`]
 * [`stepzen help [COMMAND]`](#stepzen-help-command)
 * [`stepzen import [SOURCE]`](#stepzen-import-source)
 * [`stepzen import curl`](#stepzen-import-curl)
-* [`stepzen import db2 [DSN]`](#stepzen-import-db2-dsn)
+* [`stepzen import db2 [JDBCURL]`](#stepzen-import-db2-jdbcurl)
 * [`stepzen import flow [FLOW]`](#stepzen-import-flow-flow)
 * [`stepzen import graphql [URL]`](#stepzen-import-graphql-url)
 * [`stepzen import mysql [DSN]`](#stepzen-import-mysql-dsn)
-* [`stepzen import oracle [DSN]`](#stepzen-import-oracle-dsn)
+* [`stepzen import oracle [JDBCURL]`](#stepzen-import-oracle-jdbcurl)
 * [`stepzen import postgres [DSN]`](#stepzen-import-postgres-dsn)
 * [`stepzen import postgresql [DSN]`](#stepzen-import-postgresql-dsn)
 * [`stepzen import singlestore [DSN]`](#stepzen-import-singlestore-dsn)
@@ -262,32 +263,25 @@ DESCRIPTION
   through a StepZen API, and adds the generated types and a query field into your GraphQL schema.
 ```
 
-## `stepzen import db2 [DSN]`
+## `stepzen import db2 [JDBCURL]`
 
 Import a schema for a Db2 data source into your GraphQL API.
 
 ```
 USAGE
-  $ stepzen import db2 [DSN] [-h] [--non-interactive] [--dir <value>] [--name <value>] [--db-host <value>]
-    [--db-user <value>] [--db-password <value>] [--db-database <value>] [--db-schema <value>] [--db-link-types]
-    [--db-include tables-only|views-only|tables-and-views] [--db-use-deprecated-2022-naming] [--ssl-connection]
+  $ stepzen import db2 [JDBCURL] [-h] [--non-interactive] [--dir <value>] [--name <value>] [--db-schema <value>]
+    [--db-link-types] [--db-include tables-only|views-only|tables-and-views] [--db-use-deprecated-2022-naming]
 
 ARGUMENTS
-  DSN  (optional) Data Source Name (DSN) of a Db2 database.
-       Example: 'jdbc:db2://host:port/db:user=username;password=password;schema=schema;sslConnection=true/false;'
+  JDBCURL  (optional) JDBC URL of a Db2 database.
+           Example: 'jdbc:db2://host:port/db:user=username;password=password;schema=schema;sslConnection=true/false;'
 
-       Flags, such as --db-host, override the corresponding parts of the DSN (if both are provided).
+           The --db-schema flag overrides the schema part of the JDBC URL (if both are provided).
 
 FLAGS
   -h, --help
       Show CLI help
 
-  --db-database=<value>
-      Name of database to import
-
-  --db-host=<value>
-      Database host and optional port (as HOST[:PORT])
-
   --db-include=<option>
       Should the generated GraphQL schema be based only on database views, only on tables or on both
       <options: tables-only|views-only|tables-and-views>
@@ -296,9 +290,6 @@ FLAGS
       Automatically link types based on foreign key relationships using @materializer
       (https://stepzen.com/docs/features/linking-types)
 
-  --db-password=<value>
-      Database password
-
   --db-schema=<value>
       Database schema to import tables from (default: public)
 
@@ -311,9 +302,6 @@ FLAGS
       - the generated type and property names match exactly the DB table and column names
       - the generated field names use the customer and customerList style.
 
-  --db-user=<value>
-      Database user name
-
   --dir=<value>
       Working directory
 
@@ -324,9 +312,6 @@ FLAGS
   --non-interactive
       Disable all interactive prompts
 
-  --ssl-connection
-      Is SSL enabled?
-
 DESCRIPTION
   Import a schema for a Db2 data source into your GraphQL API.
 
@@ -483,32 +468,25 @@ ALIASES
   $ stepzen import singlestore
 ```
 
-## `stepzen import oracle [DSN]`
+## `stepzen import oracle [JDBCURL]`
 
 Import a schema for a oracle data source into your GraphQL API.
 
 ```
 USAGE
-  $ stepzen import oracle [DSN] [-h] [--non-interactive] [--dir <value>] [--name <value>] [--db-host <value>]
-    [--db-user <value>] [--db-password <value>] [--db-database <value>] [--db-schema <value>] [--db-link-types]
-    [--db-include tables-only|views-only|tables-and-views] [--db-use-deprecated-2022-naming]
+  $ stepzen import oracle [JDBCURL] [-h] [--non-interactive] [--dir <value>] [--name <value>] [--db-schema <value>]
+    [--db-link-types] [--db-include tables-only|views-only|tables-and-views] [--db-use-deprecated-2022-naming]
 
 ARGUMENTS
-  DSN  (optional) Data Source Name (DSN) of an Oracle database.
-       Example: 'jdbc:oracle:thin:user/password@//host:port/db?currentschema=schema'
+  JDBCURL  (optional) JDBC URL of an Oracle database.
+           Example: 'jdbc:oracle:thin:user/password@//host:port/db?currentschema=schema'
 
-       Flags, such as --db-host, override the corresponding parts of the DSN (if both are provided).
+           The --db-schema flag overrides the schema part of the JDBC URL (if both are provided).
 
 FLAGS
   -h, --help
       Show CLI help
 
-  --db-database=<value>
-      Name of database to import
-
-  --db-host=<value>
-      Database host and optional port (as HOST[:PORT])
-
   --db-include=<option>
       Should the generated GraphQL schema be based only on database views, only on tables or on both
       <options: tables-only|views-only|tables-and-views>
@@ -517,9 +495,6 @@ FLAGS
       Automatically link types based on foreign key relationships using @materializer
       (https://stepzen.com/docs/features/linking-types)
 
-  --db-password=<value>
-      Database password
-
   --db-schema=<value>
       Database schema to import tables from (default: public)
 
@@ -532,9 +507,6 @@ FLAGS
       - the generated type and property names match exactly the DB table and column names
       - the generated field names use the customer and customerList style.
 
-  --db-user=<value>
-      Database user name
-
   --dir=<value>
       Working directory
 

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

@@ -2,69 +2,29 @@ import type { CommonImportOptions } from '../../generate/import-command.js';
 import type { DBIntrospectionOptions, Db2sqlImportOptions } from '../../generate/sql2sdl.js';
 import type { FlagsT } from '../../shared/types.js';
 import { ImportCommandBase } from '../../generate/import-command.js';
-type ParserSuccessResult = {
-    success: true;
-    value: ParsedDsn;
-};
-type ParserErrorResult = {
-    success: false;
-    message: string;
-};
-export type ParserResult = ParserSuccessResult | ParserErrorResult;
-type ParsedDsn = {
-    driver: string;
-    host: string;
-    user?: string;
-    password?: string;
-    port?: number;
-    db?: string;
-    schema?: string;
-    sslConnection?: boolean;
-};
-export type Db2SQLAnswers = Pick<Db2sqlImportOptions, 'host' | 'user' | 'password' | 'database' | 'schema' | 'linkTypes' | 'sslConnection'>;
+export type Db2SQLAnswers = Pick<Db2sqlImportOptions, 'jdbcUrl' | 'schema' | 'linkTypes'>;
 export default class ImportDb2SQL extends ImportCommandBase {
     static description: string;
     get source(): "db2";
     static flags: {
-        '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-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>;
-        'ssl-connection': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        dsn: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        jdbcUrl: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     protected import(commonOptions: CommonImportOptions): Promise<import("../../shared/types.js").ErrorOr<import("../../generate/helpers.js").IntrospectionServiceResponse>>;
     getImportOptionsFromFlags(flags: FlagsT<typeof ImportDb2SQL>): {
-        host: string | undefined;
-        user: string | undefined;
-        password: string | undefined;
-        database: string | undefined;
         schema: string | undefined;
         linkTypes: boolean;
         include: "tables-only" | "views-only" | "tables-and-views" | undefined;
-        sslConnection: boolean;
         introspectionOptions: DBIntrospectionOptions;
     };
     getImportOptionsFromDsn(possibleDsn: string): {
-        host: string;
-        user: string | undefined;
-        password: string | undefined;
-        database: string | undefined;
-        schema: string | undefined;
-        sslConnection: boolean | undefined;
+        jdbcUrl: string;
     };
     getImportOptionsInteractively(defaults?: Partial<Db2SQLAnswers>): Promise<Db2SQLAnswers>;
-    parseDsn(dsn: string): ParserResult;
-    isValidJdbcDb2Url(dsnString: string): {
-        status: boolean;
-        message?: string;
-    };
 }
-export {};
 //# sourceMappingURL=db2.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"db2.d.ts","sourceRoot":"","sources":["../../../src/commands/import/db2.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAA;AACzE,OAAO,KAAK,EACV,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAU,MAAM,EAAC,MAAM,uBAAuB,CAAA;AAQ1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAA;AAOlE,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,IAAI,CAAA;IACb,KAAK,EAAE,SAAS,CAAA;CACjB,CAAA;AACD,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,KAAK,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,mBAAmB,GAAG,iBAAiB,CAAA;AAElE,KAAK,SAAS,GAAG;IACf,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,IAAI,CAC9B,mBAAmB,EACjB,MAAM,GACN,MAAM,GACN,UAAU,GACV,UAAU,GACV,QAAQ,GACR,WAAW,GACX,eAAe,CAClB,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IACzD,MAAM,CAAC,WAAW,SAMkC;IAEpD,IAAI,MAAM,UAET;IAED,MAAM,CAAC,KAAK;;;;;;;;;;MAaX;IAED,MAAM,CAAC,IAAI;;MASV;cAEe,MAAM,CAAC,aAAa,EAAE,mBAAmB;IAuFzD,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC;;;;;;;;;;;IAoB5D,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;;;;;;IAyBrC,6BAA6B,CACjC,QAAQ,GAAE,OAAO,CAAC,aAAa,CAAM,GACpC,OAAO,CAAC,aAAa,CAAC;IAkBzB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAuDnC,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAC;CAoC1E"}
+{"version":3,"file":"db2.d.ts","sourceRoot":"","sources":["../../../src/commands/import/db2.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAA;AACzE,OAAO,KAAK,EACV,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAU,MAAM,EAAC,MAAM,uBAAuB,CAAA;AAQ1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAA;AAQlE,MAAM,MAAM,aAAa,GAAG,IAAI,CAC9B,mBAAmB,EACnB,SAAS,GAAG,QAAQ,GAAG,WAAW,CACnC,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IACzD,MAAM,CAAC,WAAW,SAMkC;IAEpD,IAAI,MAAM,UAET;IAED,MAAM,CAAC,KAAK;;;;;MAMX;IAED,MAAM,CAAC,IAAI;;MAQV;cAEe,MAAM,CAAC,aAAa,EAAE,mBAAmB;IA0EzD,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC;;;;;;IAe5D,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;IAerC,6BAA6B,CACjC,QAAQ,GAAE,OAAO,CAAC,aAAa,CAAM,GACpC,OAAO,CAAC,aAAa,CAAC;CAW1B"}

package/lib/commands/import/db2.js

@@ -1,5 +1,5 @@
 // Copyright IBM Corp. 2020, 2024
-import { Args, Flags } from '@oclif/core';
+import { Args } from '@oclif/core';
 import { CLIError } from '@oclif/core/errors';
 import chalk from 'chalk';
 import { pickBy } from 'lodash-es';
@@ -9,6 +9,7 @@ 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 { isValidJdbcUrl } from '../../shared/url-helpers.js';
 import { rewriteLocalhostToHostGateway } from '../../shared/utils.js';
 export default class ImportDb2SQL extends ImportCommandBase {
     static description = `Import a schema for a Db2 data source into your GraphQL API.` +
@@ -22,40 +23,27 @@ export default class ImportDb2SQL extends ImportCommandBase {
     }
     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(),
-        'ssl-connection': Flags.boolean({
-            description: 'Is SSL enabled?',
-        }),
     };
     static args = {
-        dsn: Args.string({
-            description: chalk `{italic (optional)} Data Source Name (DSN) of a Db2 database.` +
+        jdbcUrl: Args.string({
+            description: chalk `{italic (optional)} JDBC URL of a Db2 database.` +
                 chalk `\nExample: {bold 'jdbc:db2://host:port/db:user=username;password=password;schema=schema;sslConnection=true/false;'}` +
                 chalk `\n` +
-                chalk `\nFlags, such as {bold --db-host}, override the corresponding` +
-                chalk ` parts of the DSN (if both are provided).`,
+                chalk `\nThe {bold --db-schema} flag overrides the schema part of the JDBC URL (if both are provided).`,
         }),
     };
     async import(commonOptions) {
         const { args, flags } = await this.parse(ImportDb2SQL);
         const nonInteractiveOptions = {
-            ...(args.dsn ? this.getImportOptionsFromDsn(args.dsn) : {}),
+            ...(args.jdbcUrl ? this.getImportOptionsFromDsn(args.jdbcUrl) : {}),
             ...this.getImportOptionsFromFlags(flags),
         };
         const requiredOptions = [
-            'host',
-            'user',
-            'password',
-            'database',
-            'sslConnection',
-            'schema',
+            'jdbcUrl',
         ];
         const hasRequiredOptions = requiredOptions.every(option => nonInteractiveOptions[option] !== undefined);
         let sql2sdlOptions;
@@ -71,7 +59,7 @@ export default class ImportDb2SQL extends ImportCommandBase {
         }
         else {
             if (flags['non-interactive']) {
-                throw new CLIError('Please provide a Data Source Name (DSN) string for a Db2 database.' +
+                throw new CLIError('Please provide a JDBC URL for a Db2 database.' +
                     chalk `\nSee more help with {bold stepzen import db2 --help}`);
             }
             // no parameters given: start an interactive prompt
@@ -96,19 +84,15 @@ export default class ImportDb2SQL extends ImportCommandBase {
             };
         }
         const configuration = await readConfiguration();
-        sql2sdlOptions.host = rewriteLocalhostToHostGateway(configuration, sql2sdlOptions.host);
+        // support localhost
+        sql2sdlOptions.jdbcUrl = rewriteLocalhostToHostGateway(configuration, sql2sdlOptions.jdbcUrl);
         return this.wrapInProgressAndTimeout(sql2sdl(sql2sdlOptions, configuration));
     }
     getImportOptionsFromFlags(flags) {
         const options = {
-            host: flags['db-host'],
-            user: flags['db-user'],
-            password: flags['db-password'],
-            database: flags['db-database'],
             schema: flags['db-schema'],
             linkTypes: flags['db-link-types'],
             include: flags['db-include'],
-            sslConnection: flags['ssl-connection'],
             introspectionOptions: {
                 // Use the 2023 naming convention by default, and the 2022 naming
                 // convention only if explicitly requested by the user.
@@ -119,120 +103,23 @@ export default class ImportDb2SQL extends ImportCommandBase {
         return pickBy(options, value => value !== undefined);
     }
     getImportOptionsFromDsn(possibleDsn) {
-        /**
-        According to the documentation for Db2, customers are required to provide the JDBC URL.
-        However, introspection does not currently support this feature, so the `jdbc:` keyword will need to be removed from the URL.
-        */
-        possibleDsn = possibleDsn.replace('jdbc:', '');
-        const parsed = this.parseDsn(possibleDsn);
-        if (parsed.success) {
-            const value = parsed.value;
+        //  jdbc prefix  validation
+        const parsed = isValidJdbcUrl(possibleDsn);
+        if (parsed.status) {
             const options = {
-                host: value.host + (value.port ? `:${value.port}` : ''),
-                user: value.user,
-                password: value.password,
-                database: value.db,
-                schema: value.schema,
-                sslConnection: value.sslConnection,
+                jdbcUrl: possibleDsn,
             };
-            // Remove `undefined`-valued properties
-            return pickBy(options, value => value !== undefined);
+            return options;
         }
-        throw new CLIError(parsed.message);
+        throw new CLIError(parsed && parsed.message ? parsed.message : `Cannot parse DSN`);
     }
     async getImportOptionsInteractively(defaults = {}) {
         const questions = inquirer.overrideDefaults([
-            ImportQuestions.dbHost(),
-            ImportQuestions.dbUser(),
-            ImportQuestions.dbPassword(),
-            ImportQuestions.dbDatabase(),
-            ImportQuestions.dbSchema({ required: true }),
+            ImportQuestions.jdbcUrl(),
+            ImportQuestions.dbSchema({ dbDriver: 'db2', required: false }),
             ImportQuestions.dbLinkTypes(),
-            ImportQuestions.sslConnection(),
         ], defaults);
         return inquirer.prompt(`import-${this.source}`, questions);
     }
-    // Created a new function as parseDsn from '@soluble/dsn-parser' is not supporting the jdbc db2 url format
-    parseDsn(dsn) {
-        const isValidDsn = this.isValidJdbcDb2Url(dsn);
-        if (isValidDsn.status) {
-            // const urlWithoutPrefix = dsn.replace(/^jdbc:db2:\/\//i, '') Commented as jdbc is not supported by introspection right now
-            // Remove the jdbc:db2:// prefix
-            const urlWithoutPrefix = dsn.replace(/^db2:\/\//i, '');
-            const parsedDsn = { driver: 'jdbc:db2' };
-            const seperateHost = urlWithoutPrefix.split('/');
-            const hostPort = seperateHost[0].split(':');
-            parsedDsn.host = hostPort[0];
-            parsedDsn.port = Number.parseInt(hostPort[1], 10);
-            const manageParams = seperateHost[1].split(':');
-            parsedDsn.db = manageParams[0];
-            // Split by ; to separate key-value pairs
-            const keyValuePairs = manageParams[1].split(';');
-            for (const pair of keyValuePairs) {
-                const [key, value] = pair.split('=');
-                switch (key.toLowerCase()) {
-                    case 'user':
-                        parsedDsn.user = value;
-                        break;
-                    case 'password':
-                        parsedDsn.password = value;
-                        break;
-                    case 'currentschema':
-                        parsedDsn.schema = value;
-                        break;
-                    case 'sslconnection':
-                        parsedDsn.sslConnection = value.toLowerCase() === 'true';
-                        break;
-                    default:
-                        break;
-                }
-            }
-            return {
-                success: true,
-                value: parsedDsn,
-            };
-        }
-        return {
-            success: false,
-            message: isValidDsn && isValidDsn.message
-                ? isValidDsn.message
-                : 'Cannot parse DSN',
-        };
-    }
-    isValidJdbcDb2Url(dsnString) {
-        // const pattern = /^jdbc:db2:\/\/[a-zA-Z0-9.-]+:\d+\/[a-zA-Z0-9_-]+?(?::[a-zA-Z]+=[\w-]+(?:;[a-zA-Z]+=[\w-]+)*;)*$/; Commented as jdbc is not suppported by introspection right now
-        const pattern = /^db2:\/\/[a-zA-Z0-9.-]+:\d+\/[a-zA-Z0-9_-]+?(?::[a-zA-Z]+=[\w-]+(?:;[a-zA-Z]+=[\w-]+)*;)*$/;
-        if (!pattern.test(dsnString)) {
-            // To identify what is missing or incorrect:
-            // 1. Check for missing mandatory parts
-            let message;
-            if (dsnString.match(/^db2:\/\//) === undefined) {
-                message = `Missing 'db2://' prefix`;
-            }
-            else {
-                const urlWithoutPrefix = dsnString.replace(/^db2:\/\//i, '');
-                if (urlWithoutPrefix.at(-1) !== ';') {
-                    // If not, add a semicolon at the end
-                    message = `Missing ';' at the end of the url`;
-                }
-                const separateHost = urlWithoutPrefix.split('/');
-                const hostPort = separateHost[0].split(':');
-                if (hostPort[1] === undefined) {
-                    message = `Port number missing`;
-                }
-                else if (separateHost[1] === undefined) {
-                    message = `database name not present in the provided url, should follow the format jdbc:db2://hostname/databasename:<params separated by ;>`;
-                }
-                else {
-                    const manageParams = separateHost[1].split(':');
-                    if (manageParams[1] === undefined) {
-                        message = `expected : after the database name, should follow the format jdbc:db2://hostname/databasename:<params separated by ;>`;
-                    }
-                }
-            }
-            return { status: false, message };
-        }
-        return { status: true };
-    }
 }
 //# sourceMappingURL=db2.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/import/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,KAAK,EACL,UAAU,EACV,WAAW,EACX,YAAY,EACb,MAAM,oBAAoB,CAAA;AAW3B,OAAO,UAAU,MAAM,6BAA6B,CAAA;AAqBpD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAU;IAC5C,MAAM,CAAC,WAAW,SAEoD;IAEtE,MAAM,CAAC,KAAK;;MAGX;IAED,MAAM,CAAC,IAAI;;MAMV;IAED,MAAM,CAAC,MAAM,UAAQ;IAEf,GAAG;cAwIO,KAAK,CAEnB,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,EAC1B,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,EAC1B,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,EAGzB,OAAO,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACvB,IAAI,GAAE,MAAM,EAAc,GACzB,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAwBjC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAC;CA4CvE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/import/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,KAAK,EACL,UAAU,EACV,WAAW,EACX,YAAY,EACb,MAAM,oBAAoB,CAAA;AAW3B,OAAO,UAAU,MAAM,6BAA6B,CAAA;AAqBpD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAU;IAC5C,MAAM,CAAC,WAAW,SAEoD;IAEtE,MAAM,CAAC,KAAK;;MAGX;IAED,MAAM,CAAC,IAAI;;MAMV;IAED,MAAM,CAAC,MAAM,UAAQ;IAEf,GAAG;cAwIO,KAAK,CAEnB,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,EAC1B,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,EAC1B,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,EAGzB,OAAO,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACvB,IAAI,GAAE,MAAM,EAAc,GACzB,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAwBjC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAC;CA+CvE"}

package/lib/commands/import/index.js

@@ -188,7 +188,8 @@ export default class Import extends ZenCommand {
             source = 'mysql';
         }
         // support the Oracle JDBC URL format: e.g., jdbc:oracle:thin://url
-        if (source.toLowerCase().startsWith('oracle:thin')) {
+        if (source.toLowerCase().startsWith('jdbc:oracle:thin') ||
+            source.toLowerCase().startsWith('oracle:thin')) {
             source = 'oracle';
         }
         return { source, dsn };

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

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

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

@@ -2,65 +2,29 @@ import type { CommonImportOptions } from '../../generate/import-command.js';
 import type { DBIntrospectionOptions, OraclesqlImportOptions } from '../../generate/sql2sdl.js';
 import type { FlagsT } from '../../shared/types.js';
 import { ImportCommandBase } from '../../generate/import-command.js';
-type ParsedDsn = {
-    driver: string;
-    host: string;
-    user?: string;
-    password?: string;
-    port?: number;
-    db?: string;
-    schema?: string;
-};
-type ParserSuccessResult = {
-    success: true;
-    value: ParsedDsn;
-};
-type ParserErrorResult = {
-    success: false;
-    message: string;
-};
-export type ParserResult = ParserSuccessResult | ParserErrorResult;
-export type OracleSQLAnswers = Pick<OraclesqlImportOptions, 'host' | 'user' | 'password' | 'database' | 'schema' | 'linkTypes'>;
+export type OracleSQLAnswers = Pick<OraclesqlImportOptions, 'jdbcUrl' | 'schema' | 'linkTypes'>;
 export default class ImportOracle extends ImportCommandBase {
     get source(): "oracle";
     static description: string;
     static flags: {
-        '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-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>;
     };
     static args: {
-        dsn: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        jdbcUrl: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     protected import(commonOptions: CommonImportOptions): Promise<import("../../shared/types.js").ErrorOr<import("../../generate/helpers.js").IntrospectionServiceResponse>>;
     getImportOptionsFromFlags(flags: FlagsT<typeof ImportOracle>): {
-        host: string | undefined;
-        user: string | undefined;
-        password: string | undefined;
-        database: string | undefined;
         schema: string | undefined;
         linkTypes: boolean;
         include: "tables-only" | "views-only" | "tables-and-views" | undefined;
         introspectionOptions: DBIntrospectionOptions;
     };
     getImportOptionsFromDsn(possibleDsn: string): {
-        host: string;
-        user: string | undefined;
-        password: string | undefined;
-        database: string | undefined;
-        schema: string | undefined;
+        jdbcUrl: string;
     };
     getImportOptionsInteractively(defaults?: Partial<OracleSQLAnswers>): Promise<OracleSQLAnswers>;
-    parseDsn(dsn: string): ParserResult;
-    isValidJdbcOracleUrl(dsnString: string): {
-        status: boolean;
-        message?: string;
-    };
 }
-export {};
 //# sourceMappingURL=oracle.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../../src/commands/import/oracle.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;AAQ1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAA;AAOlE,KAAK,SAAS,GAAG;IACf,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,IAAI,CAAA;IACb,KAAK,EAAE,SAAS,CAAA;CACjB,CAAA;AACD,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,KAAK,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AACD,MAAM,MAAM,YAAY,GAAG,mBAAmB,GAAG,iBAAiB,CAAA;AAElE,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,sBAAsB,EACtB,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,WAAW,CACnE,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IACzD,IAAI,MAAM,aAET;IAED,MAAM,CAAC,WAAW,SAMkC;IAEpD,MAAM,CAAC,KAAK;;;;;;;;;MAUX;IAED,MAAM,CAAC,IAAI;;MASV;cAEe,MAAM,CAAC,aAAa,EAAE,mBAAmB;IAmFzD,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC;;;;;;;;;;IAmB5D,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;;;;;IAoBrC,6BAA6B,CACjC,QAAQ,GAAE,OAAO,CAAC,gBAAgB,CAAM,GACvC,OAAO,CAAC,gBAAgB,CAAC;IAgB5B,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAwDnC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAC;CAqC7E"}
+{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../../src/commands/import/oracle.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;AAQ1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAA;AAQlE,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,sBAAsB,EACtB,SAAS,GAAG,QAAQ,GAAG,WAAW,CACnC,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IACzD,IAAI,MAAM,aAET;IAED,MAAM,CAAC,WAAW,SAMkC;IAEpD,MAAM,CAAC,KAAK;;;;;MAMX;IAED,MAAM,CAAC,IAAI;;MAQV;cAEe,MAAM,CAAC,aAAa,EAAE,mBAAmB;IA0EzD,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,YAAY,CAAC;;;;;;IAe5D,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;IAerC,6BAA6B,CACjC,QAAQ,GAAE,OAAO,CAAC,gBAAgB,CAAM,GACvC,OAAO,CAAC,gBAAgB,CAAC;CAY7B"}