stepzen 0.45.0-experimental.d85ee8d → 0.45.0-experimental.edecb3d

package/lib/shared/url-helpers.js

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2020, 2024
+// Copyright IBM Corp. 2020, 2025
 import { CLIError } from '@oclif/core/errors';
 /**
  * Adds the path component to the URL if the URL is missing one.
@@ -44,6 +44,15 @@ export const parseHost = (host) => {
         isValid: true,
     };
 };
+export const isValidJdbcUrl = (jdbcUrl) => {
+    if (!jdbcUrl || !jdbcUrl.startsWith('jdbc:')) {
+        return {
+            status: false,
+            message: `The provided JDBC URL does not look valid (expected it to begin with jdbc:).`,
+        };
+    }
+    return { status: true };
+};
 /**
  *
  * Returns whether the given URL or hostname refers to localhost (by name or loopback IP).

package/lib/shared/url-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"url-helpers.js","sourceRoot":"","sources":["../../src/shared/url-helpers.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAA;AAE3C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAE,IAAY,EAAU,EAAE;IACzE,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IAC9B,IAAI,SAAS,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;QAC/B,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAA;QACzB,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAA;IAC7B,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,IAAa,EACqC,EAAE;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,EAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAC,CAAA;IAC3D,CAAC;IAED,IAAI,GAAG,CAAA;IACP,sEAAsE;IACtE,8EAA8E;IAC9E,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAA;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,kDAAkD;QAClD,+CAA+C;QAC/C,IAAI,CAAC;YACH,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,CAAA;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAC,CAAA;IAChD,CAAC;IAED,OAAO;QACL,IAAI,EAAE,GAAG,CAAC,QAAQ;QAClB,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,SAAS;QAC3B,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CAAC,aAA2B;IACrD,IAAI,QAAQ,CAAA;IACZ,IAAI,CAAC;QACH,yEAAyE;QACzE,aAAa;QACb,QAAQ,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAA;IAC5C,CAAC;IAAC,MAAM,CAAC;QACP,kDAAkD;QAClD,QAAQ,GAAG,GAAG,aAAa,EAAE,CAAC,WAAW,EAAE,CAAA;IAC7C,CAAC;IAED,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC7D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IAC3B,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;IACtB,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,KAAK,CAAA;QACd,CAAC;IACH,CAAC;SAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,IAAI,CAAA;QACb,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,QAAQ,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;IAC5D,CAAC;IAED,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AAClC,CAAC"}
+{"version":3,"file":"url-helpers.js","sourceRoot":"","sources":["../../src/shared/url-helpers.ts"],"names":[],"mappings":"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"}

package/lib/shared/utils.js

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2020, 2024
+// Copyright IBM Corp. 2020, 2025
 import { CLIError } from '@oclif/core/errors';
 import fetch from '@stepzen/fetch';
 import chalk from 'chalk';

package/lib/shared/validation.js

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2020, 2024
+// Copyright IBM Corp. 2020, 2025
 import { CLIError } from '@oclif/core/errors';
 import glob from 'glob';
 import fs from 'node:fs';

package/lib/shared/workspace.js

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2020, 2024
+// Copyright IBM Corp. 2020, 2025
 import { CLIError } from '@oclif/core/errors';
 import chalk from 'chalk';
 import glob from 'glob';

package/lib/shared/zen-command.js

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2020, 2024
+// Copyright IBM Corp. 2020, 2025
 import { Command, Flags } from '@oclif/core';
 import { CLIError } from '@oclif/core/errors';
 import chalk from 'chalk';

package/oclif.manifest.json

@@ -566,6 +566,14 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "env": {
+          "description": "Pass additional environment variables to the docker container",
+          "hidden": true,
+          "name": "env",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -1101,9 +1109,9 @@
     "import:db2": {
       "aliases": [],
       "args": {
-        "dsn": {
-          "description": "(optional) Data Source Name (DSN) of a Db2 database.\nExample: 'jdbc:db2://host:port/db:user=username;password=password;schema=schema;sslConnection=true/false;'\n\nFlags, such as --db-host, override the corresponding parts of the DSN (if both are provided).",
-          "name": "dsn"
+        "jdbcUrl": {
+          "description": "(optional) JDBC URL of a Db2 database.\nExample: 'jdbc:db2://host:port/db:user=username;password=password;schema=schema;sslConnection=true/false;'\n\nThe --db-schema flag overrides the schema part of the JDBC URL (if both are provided).",
+          "name": "jdbcUrl"
         }
       },
       "description": "Import a schema for a Db2 data source into your GraphQL API.\n\nstepzen import db2 automatically introspects a Db2 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.",
@@ -1152,34 +1160,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "db-host": {
-          "description": "Database host and optional port (as HOST[:PORT])",
-          "name": "db-host",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "db-user": {
-          "description": "Database user name",
-          "name": "db-user",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "db-password": {
-          "description": "Database password",
-          "name": "db-password",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "db-database": {
-          "description": "Name of database to import",
-          "name": "db-database",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "db-schema": {
           "description": "Database schema to import tables from (default: public)",
           "name": "db-schema",
@@ -1210,12 +1190,6 @@
           "name": "db-use-deprecated-2022-naming",
           "allowNo": false,
           "type": "boolean"
-        },
-        "ssl-connection": {
-          "description": "Is SSL enabled?",
-          "name": "ssl-connection",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -1660,9 +1634,9 @@
     "import:oracle": {
       "aliases": [],
       "args": {
-        "dsn": {
-          "description": "(optional) Data Source Name (DSN) of an Oracle database.\nExample: 'jdbc:oracle:thin:user/password@//host:port/db?currentschema=schema'\n\nFlags, such as --db-host, override the corresponding parts of the DSN (if both are provided).",
-          "name": "dsn"
+        "jdbcUrl": {
+          "description": "(optional) JDBC URL of an Oracle database.\nExample: 'jdbc:oracle:thin:user/password@//host:port/db?currentschema=schema'\n\nThe --db-schema flag overrides the schema part of the JDBC URL (if both are provided).",
+          "name": "jdbcUrl"
         }
       },
       "description": "Import a schema for a oracle data source into your GraphQL API.\n\nstepzen import oracle automatically introspects an Oracle 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.",
@@ -1711,34 +1685,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "db-host": {
-          "description": "Database host and optional port (as HOST[:PORT])",
-          "name": "db-host",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "db-user": {
-          "description": "Database user name",
-          "name": "db-user",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "db-password": {
-          "description": "Database password",
-          "name": "db-password",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "db-database": {
-          "description": "Name of database to import",
-          "name": "db-database",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "db-schema": {
           "description": "Database schema to import tables from (default: public)",
           "name": "db-schema",
@@ -2182,5 +2128,5 @@
       ]
     }
   },
-  "version": "0.45.0-experimental.d85ee8d"
+  "version": "0.45.0-experimental.edecb3d"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stepzen",
   "description": "The StepZen CLI",
-  "version": "0.45.0-experimental.d85ee8d",
+  "version": "0.45.0-experimental.edecb3d",
   "license": "MIT",
   "author": "Darren Waddell <darren@stepzen.com>",
   "contributors": [
@@ -31,10 +31,10 @@
     "@oclif/plugin-version": "^2.2.16",
     "@segment/analytics-node": "^2.2.0",
     "@soluble/dsn-parser": "^1.7.5",
-    "@stepzen/fetch": "0.45.0-experimental.d85ee8d",
-    "@stepzen/graphiql-proxy": "0.45.0-experimental.d85ee8d",
-    "@stepzen/sdk": "0.45.0-experimental.d85ee8d",
-    "@stepzen/transpiler": "0.45.0-experimental.d85ee8d",
+    "@stepzen/fetch": "0.45.0-experimental.edecb3d",
+    "@stepzen/graphiql-proxy": "0.45.0-experimental.edecb3d",
+    "@stepzen/sdk": "0.45.0-experimental.edecb3d",
+    "@stepzen/transpiler": "0.45.0-experimental.edecb3d",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "compare-versions": "^5.0.3",
@@ -153,5 +153,5 @@
     "micromatch": "^4.0.8",
     "cross-spawn": "^7.0.6"
   },
-  "gitHead": "d85ee8d15b31eeb855167dab2ee1eea686300d5c"
+  "gitHead": "edecb3d823ed326c67eb8b22c39222849d0f31e6"
 }