@saptools/cf-hana 0.2.0 → 0.2.1

package/dist/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
+import { formatCurrentCfAppSelector, readCurrentCfTarget } from "@saptools/cf-sync";
 import { Command } from "commander";
 
 // src/backup.ts
@@ -587,7 +588,7 @@ async function listColumns(connection, schema, table) {
 
 // src/config.ts
 var CLI_NAME = "cf-hana";
-var CLI_VERSION = "0.2.0";
+var CLI_VERSION = "0.2.1";
 var ENV_PREFIX = "CF_HANA";
 var DEFAULT_QUERY_TIMEOUT_MS = 3e4;
 var DEFAULT_CONNECT_TIMEOUT_MS = 3e4;
@@ -2544,6 +2545,25 @@ function parseQualifiedName(value) {
   }
   return { schema: value.slice(0, dot), table: value.slice(dot + 1) };
 }
+async function resolveSelectorArgument(selector) {
+  if (selector.includes("/")) {
+    return selector;
+  }
+  const current = await readCurrentCfTarget().catch((error) => {
+    throw new CfHanaError(
+      "CONFIG",
+      "No current CF target found. Run `cf target -o <org> -s <space>` or pass a full region/org/space/app selector.",
+      { cause: error }
+    );
+  });
+  if (current === void 0) {
+    throw new CfHanaError(
+      "CONFIG",
+      "No current CF target found. Run `cf target -o <org> -s <space>` or pass a full region/org/space/app selector."
+    );
+  }
+  return formatCurrentCfAppSelector(current, selector);
+}
 function toConnectOptions(opts) {
   assertPositiveOption("--limit", opts.limit);
   assertPositiveOption("--timeout", opts.timeout);
@@ -2611,7 +2631,7 @@ async function runQuery(selector, sql, command) {
   const opts = command.opts();
   assertQueryOptions(sql, opts);
   const cellLimit = resolveCellLimit(opts.cellLimit);
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     const params = opts.param ?? [];
     const backup = await client.backupWriteStatement(sql, params);
@@ -2652,7 +2672,7 @@ async function runQuery(selector, sql, command) {
 }
 async function runTables(selector, schema, command) {
   const opts = command.opts();
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     const tables = await client.listTables(schema ?? client.info.schema);
     const rows = tables.map((table) => ({
@@ -2668,7 +2688,7 @@ async function runTables(selector, schema, command) {
 async function runColumns(selector, target, command) {
   const opts = command.opts();
   const { schema, table } = parseQualifiedName(target);
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     const columns = await client.listColumns(schema, table);
     const rows = columns.map((column) => ({
@@ -2686,7 +2706,7 @@ async function runColumns(selector, target, command) {
 async function runCount(selector, target, command) {
   const opts = command.opts();
   const { schema, table } = parseQualifiedName(target);
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     const total = await client.count({ schema, table });
     print2(String(total));
@@ -2696,7 +2716,7 @@ async function runCount(selector, target, command) {
 }
 async function runPing(selector, command) {
   const opts = command.opts();
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     const started = Date.now();
     await client.query("SELECT 1 FROM DUMMY");
@@ -2709,7 +2729,7 @@ async function runPing(selector, command) {
 }
 async function runInfo(selector, command) {
   const opts = command.opts();
-  const client = await connect(selector, toConnectOptions(opts));
+  const client = await connect(await resolveSelectorArgument(selector), toConnectOptions(opts));
   try {
     print2(formatInfo(client.info));
   } finally {