@settlemint/btp-sdk-cli - npm Package Compare versions

Comparing version 0.3.2-maina62fddf to 0.3.2-maine178fcc

dist/index.js

 #!/usr/bin/env node
-import { cancel, select, isCancel, intro, outro, spinner, password, text } from '@clack/prompts';
+import { cancel, intro, outro, spinner, select, isCancel, confirm, password, text } from '@clack/prompts';
 import { Command } from '@commander-js/extra-typings';
 import dotenv from 'dotenv';
 import { magentaBright, inverse, greenBright, redBright } from 'yoctocolors';
+import { cosmiconfig } from 'cosmiconfig';
 import { writeFileSync, readFileSync, existsSync } from 'node:fs';
 import path from 'node:path';
-import { cosmiconfig } from 'cosmiconfig';
 import { merge } from 'ts-deepmerge';
@@ -82,17 +82,22 @@ import { z } from 'zod';
 var printCancel = (msg) => cancel(inverse(redBright(msg)));
-var promptPassword = async (options) => {
-  const passwordResult = await password(options);
-  if (isCancel(passwordResult)) {
+var handleCancellation = (result) => {
+  if (isCancel(result)) {
     printCancel("Cancelled");
     process.exit(0);
   }
-  return passwordResult;
 };
+var promptConfirm = async (options) => {
+  const result = await confirm(options);
+  handleCancellation(result);
+  return result;
+};
+var promptPassword = async (options) => {
+  const result = await password(options);
+  handleCancellation(result);
+  return result;
+};
 var promptText = async (options) => {
-  const textResult = await text(options);
-  if (isCancel(textResult)) {
-    printCancel("Cancelled");
-    process.exit(0);
-  }
-  return textResult;
+  const result = await text(options);
+  handleCancellation(result);
+  return result;
 };
@@ -106,2 +111,24 @@ var printSpinner = async (options) => {
 };
+var promptSelect = async ({
+  items,
+  message,
+  allowNone = false
+}) => {
+  if (items.length === 0 && !allowNone) {
+    return void 0;
+  }
+  const options = items.map((item) => ({
+    value: item,
+    label: item.name
+  }));
+  if (allowNone) {
+    options.unshift({ value: void 0, label: "None" });
+  }
+  const result = await select({
+    message,
+    options
+  });
+  handleCancellation(result);
+  return result;
+};
 function findProjectRoot(startDir) {
@@ -119,25 +146,59 @@ let currentDir = startDir;
 // src/lib/config.ts
-var ConfigSchema = z.object({
+var MinimalConfigSchema = z.object({
   instance: z.string()
 });
+var RequiredConfigSchema = MinimalConfigSchema.extend({
+  workspace: z.string(),
+  application: z.string()
+});
+var OptionalConfigSchema = RequiredConfigSchema.extend({
+  portal: z.string().optional(),
+  graph: z.string().optional(),
+  hasura: z.string().optional(),
+  node: z.string().optional()
+});
 var EnvSchema = z.object({
   BTP_PAT_TOKEN: z.string()
 });
-var ConfigEnvSchema = ConfigSchema.extend({
+var MinimalConfigEnvSchema = MinimalConfigSchema.extend({
   pat: z.string()
 });
-async function config() {
-  const config2 = await parseConfig();
+var RequiredConfigEnvSchema = RequiredConfigSchema.extend({
+  pat: z.string()
+});
+var OptionalConfigEnvSchema = OptionalConfigSchema.extend({
+  pat: z.string()
+});
+async function config(type = "optional") {
+  const config2 = await parseConfig(type);
   if (!config2) {
     throw new Error("No config found");
   }
-  return ConfigEnvSchema.parse({ ...config2, pat: process.env.BTP_PAT_TOKEN });
+  switch (type) {
+    case "minimal":
+      return MinimalConfigEnvSchema.parse({ ...config2, pat: process.env.BTP_PAT_TOKEN });
+    case "required":
+      return RequiredConfigEnvSchema.parse({ ...config2, pat: process.env.BTP_PAT_TOKEN });
+    case "optional":
+      return OptionalConfigEnvSchema.parse({ ...config2, pat: process.env.BTP_PAT_TOKEN });
+    default:
+      throw new Error(`Invalid config type: ${type}`);
+  }
 }
-async function parseConfig() {
+async function parseConfig(type = "optional") {
   const explorer = cosmiconfig("btp");
   const result = await explorer.search();
-  if (result) {
-    return ConfigSchema.parse(result.config);
+  if (!result) {
+    return void 0;
   }
-  return void 0;
+  switch (type) {
+    case "minimal":
+      return MinimalConfigSchema.parse(result.config);
+    case "required":
+      return RequiredConfigSchema.parse(result.config);
+    case "optional":
+      return OptionalConfigSchema.parse(result.config);
+    default:
+      throw new Error(`Invalid config type: ${type}`);
+  }
 }
@@ -147,6 +208,6 @@ async function createConfig(config2) {
   const preConfiguredConfig = merge(defaultConfig, config2);
-  const validatedPreConfiguredConfig = ConfigSchema.parse(preConfiguredConfig);
+  const validatedPreConfiguredConfig = OptionalConfigSchema.parse(preConfiguredConfig);
   const existingConfig = await parseConfig();
   const mergedConfig = existingConfig ? merge(existingConfig, validatedPreConfiguredConfig) : preConfiguredConfig;
-  const validatedMergedConfig = ConfigSchema.parse(mergedConfig);
+  const validatedMergedConfig = OptionalConfigSchema.parse(mergedConfig);
   const projectRoot = findProjectRoot(process.cwd());
@@ -178,3 +239,3 @@ const configPath = path.join(projectRoot, ".btprc.json");
 async function getServices() {
-  const { instance, pat } = await config();
+  const { instance, pat } = await config("minimal");
   const result = await fetch(`${instance}/cm/sdk/services`, {
@@ -196,8 +257,15 @@ headers: {
   let envUrl = process.env.BTP_INSTANCE_URL || url;
-  if (!validateInstanceUrl(envUrl)) {
+  if (validateInstanceUrl(envUrl)) {
+    const changeInstance = await promptConfirm({
+      message: "A valid instance URL is already provided. Do you want to change it?",
+      initialValue: false
+    });
+    if (!changeInstance) {
+      return envUrl;
+    }
     envUrl = await promptText({
       message: "Enter the URL of your BTP instance",
       defaultValue: "https://console.settlemint.com",
-      initialValue: "https://console.settlemint.com",
-      placeholder: "https://console.settlemint.com",
+      initialValue: envUrl ?? "https://console.settlemint.com",
+      placeholder: envUrl ?? "https://console.settlemint.com",
       validate(value) {
@@ -223,13 +291,20 @@ if (!validateInstanceUrl(value)) {
 async function coercePatToken(pat) {
-  let envPat = pat;
-  if (!validatePatToken(envPat)) {
-    envPat = await promptPassword({
-      message: "Enter a Personal Access Token for authentication",
-      validate(value) {
-        if (!validatePatToken(value)) {
-          return "Invalid Personal Access Token";
-        }
-      }
+  let envPat = process.env.BTP_PAT_TOKEN || pat;
+  if (validatePatToken(envPat)) {
+    const changeToken = await promptConfirm({
+      message: "A valid PAT is already provided. Do you want to change it?",
+      initialValue: false
     });
+    if (!changeToken) {
+      return envPat;
+    }
   }
+  envPat = await promptPassword({
+    message: "Enter a Personal Access Token for authentication",
+    validate(value) {
+      if (!validatePatToken(value)) {
+        return "Invalid Personal Access Token";
+      }
+    }
+  });
   return envPat;
@@ -273,76 +348,32 @@ }
       });
-      const selectWorkspaceResult = await select({
-        message: "Select a workspace",
-        options: services.map((service) => ({
-          value: service,
-          label: service.name
-        }))
-      });
-      if (isCancel(selectWorkspaceResult)) {
-        printCancel("Cancelled");
+      const workspace = await promptSelect({ items: services, message: "Select a workspace" });
+      if (!workspace) {
+        printCancel("No workspace selected");
         process.exit(0);
       }
-      const selectApplicationResult = await select({
-        message: "Select an application",
-        options: selectWorkspaceResult.applications.map((service) => ({
-          value: service,
-          label: service.name
-        }))
-      });
-      if (isCancel(selectApplicationResult)) {
-        printCancel("Cancelled");
+      const application = await promptSelect({ items: workspace.applications, message: "Select an application" });
+      if (!application) {
+        printCancel("No application selected");
         process.exit(0);
       }
-      if (selectApplicationResult.portals.length > 0) {
-        const selectPortalResult = await select({
-          message: "Select a Smart Contract Set Portal instance",
-          options: selectApplicationResult.portals.map((service) => ({
-            value: service,
-            label: service.name
-          }))
-        });
-        if (isCancel(selectPortalResult)) {
-          printCancel("Cancelled");
-          process.exit(0);
-        }
-      }
-      if (selectApplicationResult.graphs.length > 0) {
-        const selectGraphResult = await select({
-          message: "Select a The Graph instance",
-          options: selectApplicationResult.graphs.map((service) => ({
-            value: service,
-            label: service.name
-          }))
-        });
-        if (isCancel(selectGraphResult)) {
-          printCancel("Cancelled");
-          process.exit(0);
-        }
-      }
-      if (selectApplicationResult.hasuras.length > 0) {
-        const selectHasuraResult = await select({
-          message: "Select an Hasura instance",
-          options: selectApplicationResult.hasuras.map((service) => ({
-            value: service,
-            label: service.name
-          }))
-        });
-        if (isCancel(selectHasuraResult)) {
-          printCancel("Cancelled");
-          process.exit(0);
-        }
-      }
-      if (selectApplicationResult.nodes.length > 0) {
-        const selectNodeResult = await select({
-          message: "Select a blockchain node or loadbalancer",
-          options: selectApplicationResult.nodes.map((service) => ({
-            value: service,
-            label: service.name
-          }))
-        });
-        if (isCancel(selectNodeResult)) {
-          printCancel("Cancelled");
-          process.exit(0);
-        }
-      }
+      const portal = await promptSelect({
+        items: application.portals,
+        message: "Select a Smart Contract Set Portal instance",
+        allowNone: true
+      });
+      const graph = await promptSelect({
+        items: application.graphs,
+        message: "Select a The Graph instance",
+        allowNone: true
+      });
+      const hasura = await promptSelect({
+        items: application.hasuras,
+        message: "Select an Hasura instance",
+        allowNone: true
+      });
+      const node = await promptSelect({
+        items: application.nodes,
+        message: "Select a blockchain node or loadbalancer",
+        allowNone: true
+      });
       printOutro("You're all set!");
@@ -349,0 +380,0 @@ } catch (error) {

package.json

 {
   "name": "@settlemint/btp-sdk-cli",
-  "version": "0.3.2-maina62fddf",
+  "version": "0.3.2-maine178fcc",
   "main": "./dist/index.js",
@@ -5,0 +5,0 @@ "module": "./dist/index.js",

No alert changes

Improved metrics

Total package byte prevSize

47676

increased by6.94%

Lines of code

388

increased by8.68%

Worsened metrics

Number of low supply chain risk alerts

5

increased by150%

No dependency changes