@saltcorn/cli 1.0.0-beta.2 → 1.0.0-beta.6

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

@@ -2,8 +2,7 @@
  * @category saltcorn-cli
  * @module commands/set-cfg
  */
-const { Command, flags } = require("@oclif/command");
-const { cli } = require("cli-ux");
+const { Command, Flags, Args, ux } = require("@oclif/core");
 const {
   maybe_as_tenant,
   init_some_tenants,
@@ -20,7 +19,7 @@ class SetDailyTimeCommand extends Command {
    * @returns {Promise<void>}
    */
   async run() {
-    const { args, flags } = this.parse(SetDailyTimeCommand);
+    const { args, flags } = await this.parse(SetDailyTimeCommand);
     if (typeof args.mins === "undefined") {
       console.error("Must supply minutes value");
       this.exit(1);
@@ -48,18 +47,17 @@ SetDailyTimeCommand.description = `Set the time the default daily event will run
 /**
  * @type {object[]}
  */
-SetDailyTimeCommand.args = [
-  {
-    name: "mins",
+SetDailyTimeCommand.args = {
+  mins: Args.string({
     description: "Number of minutes in the futute (negative for past)",
-  },
-];
+  }),
+};
 
 /**
  * @type {object}
  */
 SetDailyTimeCommand.flags = {
-  tenant: flags.string({
+  tenant: Flags.string({
     char: "t",
     description: "tenant",
   }),

package/src/commands/setup-benchmark.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/setup-benchmark
  */
-const { Command, flags } = require("@oclif/command");
+const { Command, Flags, Args } = require("@oclif/core");
 const { maybe_as_tenant } = require("../common");
 
 /**
@@ -14,8 +14,11 @@ class SetupBenchmarkCommand extends Command {
   /**
    * @returns {Promise<void>}
    */
-  async install_forum_pack() {
-    const { fetch_pack_by_name, install_pack } = require("@saltcorn/data/pack");
+  async install_forum_pack(flags) {
+    const {
+      fetch_pack_by_name,
+      install_pack,
+    } = require("@saltcorn/admin-models/models/pack");
     const load_plugins = require("@saltcorn/server/load_plugins");
     const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
     const { init_multi_tenant } = require("@saltcorn/data/db/state");
@@ -33,10 +36,10 @@ class SetupBenchmarkCommand extends Command {
    * @returns {Promise<void>}
    */
   async run() {
-    const { args, flags } = this.parse(SetupBenchmarkCommand);
+    const { args, flags } = await this.parse(SetupBenchmarkCommand);
     await maybe_as_tenant(flags.tenant, async () => {
       // install pack
-      await this.install_forum_pack();
+      await this.install_forum_pack(flags);
       // create user if one does not exist
       const User = require("@saltcorn/data/models/user");
       const nusers = await User.count();
@@ -77,7 +80,7 @@ class SetupBenchmarkCommand extends Command {
 }
 
 /** @type {object[]} */
-SetupBenchmarkCommand.args = [];
+SetupBenchmarkCommand.args = {};
 
 /**
  * @type {string}
@@ -88,10 +91,14 @@ SetupBenchmarkCommand.description = `Setup an instance for benchmarking`;
  * @type {object}
  */
 SetupBenchmarkCommand.flags = {
-  tenant: flags.string({
+  tenant: Flags.string({
     char: "t",
     description: "tenant",
   }),
+  name: Flags.string({
+    char: "n",
+    description: "name",
+  }),
 };
 
 const simple_page_pack = {

package/src/commands/setup.js

@@ -3,14 +3,13 @@
  * @category saltcorn-cli
  * @module commands/setup
  */
-const { Command, flags } = require("@oclif/command");
+const { Command, Flags, ux } = require("@oclif/core");
 const {
   getConnectObject,
   configFilePath,
   configFileDir,
   defaultDataPath,
 } = require("@saltcorn/data/db/connect");
-const { cli } = require("cli-ux");
 const { is } = require("contractis");
 const path = require("path");
 const fs = require("fs");
@@ -169,14 +168,14 @@ const asyncSudoPostgres = (args) => {
  * @returns {Promise<string>}
  */
 const get_password = async (for_who) => {
-  var password = await cli.prompt(`Set ${for_who} to [auto-generate]`, {
+  var password = await ux.prompt(`Set ${for_who} to [auto-generate]`, {
     type: "hide",
     required: false,
   });
   if (!password) {
     password = gen_password();
     console.log(`Setting ${for_who} to:`, password);
-    await cli.anykey();
+    await ux.anykey();
   }
   return password;
 };
@@ -243,17 +242,17 @@ const install_db = async () => {
  */
 const prompt_connection = async () => {
   console.log("Enter database connection parameters");
-  const host = await cli.prompt("Database host [localhost]", {
+  const host = await ux.prompt("Database host [localhost]", {
     required: false,
   });
-  const port = await cli.prompt("Database port [5432]", { required: false });
-  const database = await cli.prompt("Database name [saltcorn]", {
+  const port = await ux.prompt("Database port [5432]", { required: false });
+  const database = await ux.prompt("Database name [saltcorn]", {
     required: false,
   });
-  const user = await cli.prompt("Database user [saltcorn]", {
+  const user = await ux.prompt("Database user [saltcorn]", {
     required: false,
   });
-  const password = await cli.prompt("Database password", {
+  const password = await ux.prompt("Database password", {
     type: "hide",
     required: true,
   });
@@ -353,8 +352,8 @@ const setup_users = async () => {
   const hasUsers = await User.nonEmpty();
   if (!hasUsers) {
     console.log("No users found. Please create an admin user");
-    const email = await cli.prompt("Email address");
-    const password = await cli.prompt("Password", { type: "hide" });
+    const email = await ux.prompt("Email address");
+    const password = await ux.prompt("Password", { type: "hide" });
     await User.create({ email, password, role_id: 1 });
   } else {
     console.log("Users already present");
@@ -400,7 +399,7 @@ configuration file
  * @type {object}
  */
 SetupCommand.flags = {
-  coverage: flags.boolean({ char: "c", description: "Coverage" }),
+  coverage: Flags.boolean({ char: "c", description: "Coverage" }),
 };
 
 module.exports = SetupCommand;

package/src/commands/sync-upload-data.js

@@ -1,4 +1,4 @@
-const { Command, flags } = require("@oclif/command");
+const { Command, Flags } = require("@oclif/core");
 const path = require("path");
 const { init_multi_tenant } = require("@saltcorn/data/db/state");
 const User = require("@saltcorn/data/models/user");
@@ -232,7 +232,7 @@ class SyncUploadData extends Command {
   async run() {
     let returnCode = 0,
       inTransaction = false;
-    const { flags } = await this.parse(SyncUploadData);
+    const { flags } = await await this.parse(SyncUploadData);
     if (db.is_it_multi_tenant() && flags.tenantAppName) {
       await init_multi_tenant(loadAllPlugins, true, [flags.tenantAppName]);
     }
@@ -282,22 +282,22 @@ class SyncUploadData extends Command {
 SyncUploadData.description = "Runs a sync for data supplied by the mobile app";
 
 SyncUploadData.flags = {
-  tenantAppName: flags.string({
+  tenantAppName: Flags.string({
     name: "tenant",
     string: "tenant",
     description: "Optional name of a tenant application",
   }),
-  userEmail: flags.string({
+  userEmail: Flags.string({
     name: "user email",
     string: "userEmail",
     description: "email of the user running the sync",
   }),
-  directory: flags.string({
+  directory: Flags.string({
     name: "directory",
     string: "directory",
     description: "directory name for input output data",
   }),
-  syncTimestamp: flags.integer({
+  syncTimestamp: Flags.integer({
     name: "syncTimestamp",
     string: "syncTimestamp",
     description: "new timestamp for the sync_info rows",

package/src/commands/take-snapshot.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/install-pack
  */
-const { Command, flags } = require("@oclif/command");
+const { Command, Flags } = require("@oclif/core");
 const { maybe_as_tenant, init_some_tenants } = require("../common");
 const fs = require("fs");
 
@@ -16,13 +16,12 @@ class TakeSnapshotCommand extends Command {
    * @returns {Promise<void>}
    */
   async run() {
-    const { flags } = this.parse(TakeSnapshotCommand);
+    const { flags } = await this.parse(TakeSnapshotCommand);
     const Snapshot = require("@saltcorn/admin-models/models/snapshot");
     await init_some_tenants(flags.tenant);
 
     await maybe_as_tenant(flags.tenant, async () => {
-      if(flags.fresh)
-        await Snapshot.take_if_changed();
+      if (flags.fresh) await Snapshot.take_if_changed();
       const snps = await Snapshot.latest();
       console.log(JSON.stringify(snps, null, 2));
     });
@@ -39,11 +38,11 @@ TakeSnapshotCommand.description = `Print a current snapshout to stdout`;
  * @type {object}
  */
 TakeSnapshotCommand.flags = {
-  tenant: flags.string({
+  tenant: Flags.string({
     char: "t",
     description: "tenant",
   }),
-  fresh: flags.boolean({
+  fresh: Flags.boolean({
     char: "f",
     description: "fresh",
   }),

package/src/commands/transform-field.js

@@ -2,7 +2,7 @@
  * @category saltcorn-cli
  * @module commands/transform-field
  */
-const { Command, flags } = require("@oclif/command");
+const { Command, Flags, Args } = require("@oclif/core");
 
 /**
  * TransformFieldCommand Class
@@ -23,7 +23,7 @@ class TransformFieldCommand extends Command {
     const {
       get_async_expression_function,
     } = require("@saltcorn/data/models/expression");
-    const { args } = this.parse(TransformFieldCommand);
+    const { args } = await this.parse(TransformFieldCommand);
     await loadAllPlugins();
     if (args.tenant && db.is_it_multi_tenant()) {
       const tenants = await getAllTenants();
@@ -54,16 +54,15 @@ class TransformFieldCommand extends Command {
 /**
  * @type {object}
  */
-TransformFieldCommand.args = [
-  {
-    name: "expression",
+TransformFieldCommand.args = {
+  expression: Args.string({
     required: true,
     description: "expression to calculate field",
-  },
-  { name: "field", required: true, description: "field name" },
-  { name: "table", required: true, description: "table name" },
-  { name: "tenant", required: false, description: "tenant name" },
-];
+  }),
+  field: Args.string({ required: true, description: "field name" }),
+  table: Args.string({ required: true, description: "table name" }),
+  tenant: Args.string({ required: false, description: "tenant name" }),
+};
 
 /**
  * @type {string}

package/src/index.js

@@ -40,4 +40,4 @@
  * @category saltcorn-cli
  */
 
-module.exports = require("@oclif/command");
+module.exports = require("@oclif/core");