@saltcorn/cli 1.1.1 → 1.1.2-beta.1

package/package.json

@@ -2,38 +2,38 @@
   "name": "@saltcorn/cli",
   "description": "Command-line interface for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
-  "version": "1.1.1",
+  "version": "1.1.2-beta.1",
   "author": "Tom Nielsen @glutamate",
   "bin": {
     "saltcorn": "./bin/saltcorn"
   },
   "bugs": "https://github.com/saltcorn/saltcorn/issues",
   "dependencies": {
-    "@oclif/core": "^2.16.0",
-    "@oclif/plugin-plugins": "^3.9.4",
-    "@saltcorn/admin-models": "1.1.1",
-    "@saltcorn/common-code": "1.1.1",
-    "@saltcorn/data": "1.1.1",
-    "@saltcorn/mobile-app": "1.1.1",
-    "@saltcorn/mobile-builder": "1.1.1",
-    "@saltcorn/plugins-loader": "1.1.1",
-    "@saltcorn/server": "1.1.1",
+    "@oclif/core": "^4.2.4",
+    "@oclif/plugin-plugins": "^5.4.26",
+    "@saltcorn/admin-models": "1.1.2-beta.1",
+    "@saltcorn/common-code": "1.1.2-beta.1",
+    "@saltcorn/data": "1.1.2-beta.1",
+    "@saltcorn/mobile-app": "1.1.2-beta.1",
+    "@saltcorn/mobile-builder": "1.1.2-beta.1",
+    "@saltcorn/plugins-loader": "1.1.2-beta.1",
+    "@saltcorn/server": "1.1.2-beta.1",
     "contractis": "^0.1.0",
-    "dateformat": "^3.0.3",
-    "inquirer": "^7.3.3",
+    "dateformat": "^4.6.3",
+    "inquirer": "^12.3.3",
     "js-yaml": "^4.1.0",
     "node-fetch": "2.6.9",
-    "node-watch": "^0.7.3",
+    "node-watch": "^0.7.4",
     "source-map-support": "^0.5.21",
     "sudo": "^1.0.3",
-    "systeminformation": "^5.21.7",
+    "systeminformation": "^5.25.11",
     "tcp-port-used": "^1.0.2",
     "wrk": "^1.2.1"
   },
   "devDependencies": {
-    "oclif": "3.17.2",
-    "globby": "^10.0.2",
-    "ts-node": "^9.1.1"
+    "oclif": "4.17.17",
+    "globby": "^11.1.0",
+    "ts-node": "^10.9.2"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/commands/add-schema.js

@@ -2,7 +2,8 @@
  * @category saltcorn-cli
  * @module commands/add-schema
  */
-const { Command, Flags, ux } = require("@oclif/core");
+const { Command, Flags } = require("@oclif/core");
+const inquirer = require("inquirer").default;
 
 /**
  * AddSchemaCommand Class
@@ -17,10 +18,15 @@ class AddSchemaCommand extends Command {
     const { flags } = await this.parse(AddSchemaCommand);
     const reset = require("@saltcorn/data/db/reset_schema");
     if (!flags.force) {
-      const ans = await ux.confirm(
-        `This adds Saltcorn schema to existing database\nContinue (y/n)?`
-      );
-      if (!ans) {
+      const confirmation = await inquirer.prompt([
+        {
+          type: "confirm",
+          name: "continue",
+          message: "This adds Saltcorn schema to existing database\nContinue?",
+          default: false,
+        },
+      ]);
+      if (!confirmation.continue) {
         console.log(`Success: Command execution canceled`);
         this.exit(1);
       }

package/src/commands/configuration-check-backups.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/configuration-check-backups
  */
-const { Command, Flags, Args, ux } = require("@oclif/core");
+const { Command, Flags, Args } = require("@oclif/core");
 const { maybe_as_tenant, init_some_tenants } = require("../common");
 
 /**

package/src/commands/configuration-check.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/configuration-check
  */
-const { Command, Flags, ux } = require("@oclif/core");
+const { Command, Flags } = require("@oclif/core");
 const { maybe_as_tenant, init_some_tenants } = require("../common");
 
 /**

package/src/commands/create-user.js

@@ -2,8 +2,36 @@
  * @category saltcorn-cli
  * @module commands/create-user
  */
-const { Command, Flags, ux } = require("@oclif/core");
+const { Command, Flags } = require("@oclif/core");
 const { maybe_as_tenant, init_some_tenants } = require("../common");
+const inquirer = require("inquirer").default;
+
+const promptEmailPassword = async (flags) => {
+  let email = flags.email;
+  let password = flags.password;
+  if (!email) {
+    const answersEmail = await inquirer.prompt([
+      {
+        name: "email",
+        message: "Email address",
+        type: "input",
+      },
+    ]);
+    email = answersEmail.email;
+  }
+  if (!password) {
+    const answersPassword = await inquirer.prompt([
+      {
+        name: "password",
+        message: "Password",
+        type: "password",
+        mask: "*",
+      },
+    ]);
+    password = answersPassword.password;
+  }
+  return { email, password };
+};
 
 // todo update logic based on modify-user command
 /**
@@ -38,9 +66,7 @@ class CreateUserCommand extends Command {
         }
         role_id = role.id;
       }
-      const email = flags.email || (await ux.prompt("Email address"));
-      const password =
-        flags.password || (await ux.prompt("Password", { type: "hide" }));
+      const { email, password } = await promptEmailPassword(flags);
       const u = await User.create({ email, password, role_id });
       if (u instanceof User)
         console.log(

package/src/commands/delete-user.js

@@ -4,8 +4,9 @@
  */
 
 // todo support for  users without emails (using user.id)
-const { Command, Flags, Args, ux } = require("@oclif/core");
+const { Command, Flags, Args } = require("@oclif/core");
 const { maybe_as_tenant } = require("../common");
+const inquirer = require("inquirer").default;
 
 /**
  * DeleteUserCommand Class
@@ -38,12 +39,18 @@ class DeleteUserCommand extends Command {
       // make changes
       // todo handle errors
       if (!flags.force) {
-        const ans = await ux.confirm(
-          `This will delete user ${args.user_email} ${
-            typeof flags.tenant !== "undefined" ? "from " + flags.tenant : ""
-          }.\nContinue (y/n)?`
-        );
-        if (!ans) {
+        const confirmation = await inquirer.prompt([
+          {
+            type: "confirm",
+            name: "continue",
+            message: `This will delete user ${args.user_email} ${
+              typeof flags.tenant !== "undefined" ? "from " + flags.tenant : ""
+            }.\nContinue?`,
+            default: false,
+          },
+        ]);
+
+        if (!confirmation.continue) {
           console.log(`Success: Command execution canceled`);
           this.exit(1);
         }

package/src/commands/get-cfg.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/set-cfg
  */
-const { Command, Flags, Args, ux } = require("@oclif/core");
+const { Command, Flags, Args } = require("@oclif/core");
 const { maybe_as_tenant, init_some_tenants } = require("../common");
 
 /**

package/src/commands/inspect.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/create-user
  */
-const { Command, Flags, Args, ux } = require("@oclif/core");
+const { Command, Flags, Args } = require("@oclif/core");
 const { maybe_as_tenant, init_some_tenants } = require("../common");
 
 // todo update logic based on modify-user command

package/src/commands/list-triggers.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/run-trigger
  */
-const { Command, Flags, ux } = require("@oclif/core");
+const { Command, Flags } = require("@oclif/core");
 const {
   maybe_as_tenant,
   init_some_tenants,

package/src/commands/list-users.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/run-trigger
  */
-const { Command, Flags, ux } = require("@oclif/core");
+const { Command, Flags } = require("@oclif/core");
 const { maybe_as_tenant, init_some_tenants } = require("../common");
 
 /**

package/src/commands/modify-user.js

@@ -4,8 +4,9 @@
  */
 
 // todo support for  users without emails (using user.id)
-const { Command, Flags, Args, ux } = require("@oclif/core");
+const { Command, Flags, Args } = require("@oclif/core");
 const { maybe_as_tenant, init_some_tenants } = require("../common");
+const inquirer = require("inquirer").default;
 
 /**
  * ModifyUserCommand Class
@@ -46,10 +47,17 @@ class ModifyUserCommand extends Command {
       // email
       let email;
       if (flags.email) email = flags.email;
-      else if (flags.imode)
-        email = await ux.prompt("New Email address", {
-          default: args.user_email,
-        });
+      else if (flags.imode) {
+        const emailPrompt = await inquirer.prompt([
+          {
+            type: "input",
+            name: "email",
+            message: "New Email address",
+            default: args.user_email,
+          },
+        ]);
+        email = emailPrompt.email;
+      }
       if (email === args.user_email) email = undefined; // little trick - we won't update email if it already same
       if (email)
         if (!User.valid_email(email)) {
@@ -61,8 +69,17 @@ class ModifyUserCommand extends Command {
       // todo check for repeated passwords
       let password;
       if (flags.password) password = flags.password;
-      else if (flags.imode)
-        password = await ux.prompt("New Password", { type: "hide" });
+      else if (flags.imode) {
+        const passwordPrompt = await inquirer.prompt([
+          {
+            type: "password",
+            name: "password",
+            message: "New Password",
+            mask: "*",
+          },
+        ]);
+        password = passwordPrompt.password;
+      }
       if (password)
         if (User.unacceptable_password_reason(password)) {
           console.error(

package/src/commands/reset-schema.js

@@ -2,8 +2,9 @@
  * @category saltcorn-cli
  * @module commands/reset-schema
  */
-const { Command, Flags, ux } = require("@oclif/core");
+const { Command, Flags } = require("@oclif/core");
 const { maybe_as_tenant } = require("../common");
+const inquirer = require("inquirer").default;
 
 /**
  * ResetCommand Class
@@ -23,12 +24,18 @@ class ResetCommand extends Command {
       if (flags.force) {
         await reset(false, schema);
       } else {
-        const ans = await ux.confirm(
-          `This will wipe all data from database "${
-            db.isSQLite ? "SQLite" : db.connectObj.database + "." + schema
-          }".\nContinue (y/n)?`
-        );
-        if (ans) await reset(false, schema);
+        const confirmation = await inquirer.prompt([
+          {
+            type: "confirm",
+            name: "continue",
+            message: `This will wipe all data from database "${
+              db.isSQLite ? "SQLite" : db.connectObj.database + "." + schema
+            }".\nContinue?`,
+            default: false,
+          },
+        ]);
+
+        if (confirmation.continue) await reset(false, schema);
       }
     });
     console.log("Successfully ran the 'reset-schema' command");

package/src/commands/rm-tenant.js

@@ -2,8 +2,8 @@
  * @category saltcorn-cli
  * @module commands/rm-tenant
  */
-const { Command, Flags, ux } = require("@oclif/core");
-
+const { Command, Flags } = require("@oclif/core");
+const inquirer = require("inquirer").default;
 /**
  * RmTenantCommand Class
  * @extends oclif.Command
@@ -19,10 +19,15 @@ class RmTenantCommand extends Command {
     const { deleteTenant } = require("@saltcorn/admin-models/models/tenant");
 
     if (!flags.force) {
-      const ans = await ux.confirm(
-        `This will delete tenant ${flags.tenant}. Attention! All tenant data will be lost!\nContinue (y/n)?`
-      );
-      if (!ans) {
+      const answer = await inquirer.prompt([
+        {
+          type: "confirm",
+          name: "proceed",
+          message: `This will delete tenant ${flags.tenant}. Attention! All tenant data will be lost!\nContinue (y/n)?`,
+          default: false,
+        },
+      ]);
+      if (!answer.proceed) {
         console.log(`Success: Command execution canceled`);
         this.exit(1);
       }

package/src/commands/run-js.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/run-js
  */
-const { Command, Flags, ux } = require("@oclif/core");
+const { Command, Flags } = require("@oclif/core");
 const {
   maybe_as_tenant,
   init_some_tenants,

package/src/commands/run-sql.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/run-sql
  */
-const { Command, Flags, ux } = require("@oclif/core");
+const { Command, Flags } = require("@oclif/core");
 const {
   maybe_as_tenant,
   init_some_tenants,

package/src/commands/run-trigger.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/run-trigger
  */
-const { Command, Flags, Args, ux } = require("@oclif/core");
+const { Command, Flags, Args } = require("@oclif/core");
 const { maybe_as_tenant, init_some_tenants } = require("../common");
 
 /**

package/src/commands/set-cfg.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/set-cfg
  */
-const { Command, Flags, Args, ux } = require("@oclif/core");
+const { Command, Flags, Args } = require("@oclif/core");
 const {
   maybe_as_tenant,
   init_some_tenants,

package/src/commands/set-daily-time.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/set-cfg
  */
-const { Command, Flags, Args, ux } = require("@oclif/core");
+const { Command, Flags, Args } = require("@oclif/core");
 const {
   maybe_as_tenant,
   init_some_tenants,

package/src/commands/setup.js

@@ -3,7 +3,7 @@
  * @category saltcorn-cli
  * @module commands/setup
  */
-const { Command, Flags, ux } = require("@oclif/core");
+const { Command, Flags } = require("@oclif/core");
 const {
   getConnectObject,
   configFilePath,
@@ -13,7 +13,7 @@ const {
 const { is } = require("contractis");
 const path = require("path");
 const fs = require("fs");
-const inquirer = require("inquirer");
+const inquirer = require("inquirer").default;
 const tcpPortUsed = require("tcp-port-used");
 const { spawnSync } = require("child_process");
 const sudo = require("sudo");
@@ -168,14 +168,27 @@ const asyncSudoPostgres = (args) => {
  * @returns {Promise<string>}
  */
 const get_password = async (for_who) => {
-  var password = await ux.prompt(`Set ${for_who} to [auto-generate]`, {
-    type: "hide",
-    required: false,
-  });
+  const answers = await inquirer.prompt([
+    {
+      name: "password",
+      message: `Set ${for_who} to [auto-generate]`,
+      type: "password",
+      mask: "*",
+      default: "",
+    },
+  ]);
+
+  let password = answers.password;
   if (!password) {
     password = gen_password();
     console.log(`Setting ${for_who} to:`, password);
-    await ux.anykey();
+    await inquirer.prompt([
+      {
+        name: "continue",
+        message: "Press any key to continue...",
+        type: "input",
+      },
+    ]);
   }
   return password;
 };
@@ -242,28 +255,49 @@ const install_db = async () => {
  */
 const prompt_connection = async () => {
   console.log("Enter database connection parameters");
-  const host = await ux.prompt("Database host [localhost]", {
-    required: false,
-  });
-  const port = await ux.prompt("Database port [5432]", { required: false });
-  const database = await ux.prompt("Database name [saltcorn]", {
-    required: false,
-  });
-  const user = await ux.prompt("Database user [saltcorn]", {
-    required: false,
-  });
-  const password = await ux.prompt("Database password", {
-    type: "hide",
-    required: true,
-  });
+
+  const answers = await inquirer.prompt([
+    {
+      type: "input",
+      name: "host",
+      message: "Database host",
+      default: "localhost",
+    },
+    {
+      type: "input",
+      name: "port",
+      message: "Database port",
+      default: "5432",
+    },
+    {
+      type: "input",
+      name: "database",
+      message: "Database name",
+      default: "saltcorn",
+    },
+    {
+      type: "input",
+      name: "user",
+      message: "Database user",
+      default: "saltcorn",
+    },
+    {
+      type: "password",
+      name: "password",
+      message: "Database password",
+      mask: "*",
+      validate: (input) => (input ? true : "Password is required"),
+    },
+  ]);
+
   const session_secret = await get_password("session secret");
   const jwt_secret = genJwtSecret();
   return {
-    host: host || "localhost",
-    port: port || 5432,
-    database: database || "saltcorn",
-    user: user || "saltcorn",
-    password: password,
+    host: answers.host || "localhost",
+    port: answers.port || 5432,
+    database: answers.database || "saltcorn",
+    user: answers.user || "saltcorn",
+    password: answers.password,
     session_secret,
     jwt_secret,
     multi_tenant: false,
@@ -352,9 +386,25 @@ const setup_users = async () => {
   const hasUsers = await User.nonEmpty();
   if (!hasUsers) {
     console.log("No users found. Please create an admin user");
-    const email = await ux.prompt("Email address");
-    const password = await ux.prompt("Password", { type: "hide" });
-    await User.create({ email, password, role_id: 1 });
+    const credentials = await inquirer.prompt([
+      {
+        type: "input",
+        name: "email",
+        message: "Email address",
+      },
+      {
+        type: "password",
+        name: "password",
+        message: "Password",
+        mask: "*",
+      },
+    ]);
+
+    await User.create({
+      email: credentials.email,
+      password: credentials.password,
+      role_id: 1,
+    });
   } else {
     console.log("Users already present");
   }