@saltcorn/cli 1.6.0-alpha.9 → 1.6.0-beta.1

package/oclif.manifest.json

@@ -878,6 +878,14 @@
           "multiple": false,
           "type": "option"
         },
+        "npm": {
+          "char": "p",
+          "description": "Install plugin directly from npm by package name",
+          "name": "npm",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "unsafe": {
           "char": "u",
           "description": "Allow unsafe plugins on tenants",
@@ -1116,6 +1124,13 @@
           "name": "imode",
           "allowNo": false,
           "type": "boolean"
+        },
+        "generate-api-token": {
+          "char": "g",
+          "description": "generate a new API token for the user and print it to stdout",
+          "name": "generate-api-token",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -2420,5 +2435,5 @@
       ]
     }
   },
-  "version": "1.6.0-alpha.9"
+  "version": "1.6.0-beta.1"
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@saltcorn/cli",
   "description": "Command-line interface for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
-  "version": "1.6.0-alpha.9",
+  "version": "1.6.0-beta.1",
   "author": "Tom Nielsen @glutamate",
   "bin": {
     "saltcorn": "./bin/saltcorn"
@@ -11,13 +11,13 @@
   "dependencies": {
     "@oclif/core": "4.4.0",
     "@oclif/plugin-plugins": "^5.4.26",
-    "@saltcorn/admin-models": "1.6.0-alpha.9",
-    "@saltcorn/common-code": "1.6.0-alpha.9",
-    "@saltcorn/data": "1.6.0-alpha.9",
-    "@saltcorn/mobile-app": "1.6.0-alpha.9",
-    "@saltcorn/mobile-builder": "1.6.0-alpha.9",
-    "@saltcorn/plugins-loader": "1.6.0-alpha.9",
-    "@saltcorn/server": "1.6.0-alpha.9",
+    "@saltcorn/admin-models": "1.6.0-beta.1",
+    "@saltcorn/common-code": "1.6.0-beta.1",
+    "@saltcorn/data": "1.6.0-beta.1",
+    "@saltcorn/mobile-app": "1.6.0-beta.1",
+    "@saltcorn/mobile-builder": "1.6.0-beta.1",
+    "@saltcorn/plugins-loader": "1.6.0-beta.1",
+    "@saltcorn/server": "1.6.0-beta.1",
     "contractis": "^0.1.0",
     "dateformat": "^4.6.3",
     "inquirer": "^12.3.3",

package/src/commands/dev/release.js

@@ -159,7 +159,7 @@ class ReleaseCommand extends Command {
     for (const p of Object.values(pkgs)) {
       updatePkgJson(p.dir);
       if (p.publish) {
-        await publish(p.dir);
+        await publish(p.dir, tag);
         await sleep(5000);
       }
     }

package/src/commands/install-plugin.js

@@ -3,7 +3,10 @@
  * @module commands/install-plugin
  */
 const { Command, Flags } = require("@oclif/core");
-const { maybe_as_tenant_in_transaction, init_some_tenants } = require("../common");
+const {
+  maybe_as_tenant_in_transaction,
+  init_some_tenants,
+} = require("../common");
 const fs = require("fs");
 const path = require("path");
 
@@ -24,9 +27,9 @@ class InstallPluginCommand extends Command {
     } = require("@saltcorn/admin-models/models/pack");
     const load_plugins = require("@saltcorn/server/load_plugins");
 
-    if (!flags.name && !flags.directory) {
+    if (!flags.name && !flags.directory && !flags.npm) {
       console.error(
-        "You must provide either a plugin name (-n) or a directory with the plugin (-d)"
+        "You must provide either a plugin name (-n), a directory (-d), or an npm package (-p)"
       );
       this.exit(1);
     }
@@ -44,6 +47,19 @@ class InstallPluginCommand extends Command {
         }
         delete plugin.id;
 
+        await load_plugins.loadAndSaveNewPlugin(
+          plugin,
+          undefined,
+          undefined,
+          (s) => s,
+          !!flags.unsafe
+        );
+      } else if (flags.npm) {
+        const plugin = new Plugin({
+          name: flags.npm,
+          source: "npm",
+          location: flags.npm,
+        });
         await load_plugins.loadAndSaveNewPlugin(
           plugin,
           undefined,
@@ -64,7 +80,7 @@ class InstallPluginCommand extends Command {
             source: "local",
             location: path.resolve(flags.directory),
           });
-          await load_plugins.loadAndSaveNewPlugin(plugin);
+          await load_plugins.loadAndSaveNewPlugin(plugin, true);
         } catch (e) {
           console.error(e);
           this.exit(1);
@@ -96,6 +112,10 @@ InstallPluginCommand.flags = {
     char: "d",
     description: "Directory with local plugin",
   }),
+  npm: Flags.string({
+    char: "p",
+    description: "Install plugin directly from npm by package name",
+  }),
   unsafe: Flags.boolean({
     char: "u",
     description: "Allow unsafe plugins on tenants",

package/src/commands/modify-user.js

@@ -113,6 +113,12 @@ class ModifyUserCommand extends Command {
 
       if (password) await u.changePasswordTo(password, false);
 
+      if (flags["generate-api-token"]) {
+        const token = await u.getNewAPIToken();
+        console.log(token);
+        return;
+      }
+
       console.log(
         `Success: User ${
           email ? email : args.user_email
@@ -181,6 +187,10 @@ ModifyUserCommand.flags = {
     description: "new password",
   }),
   imode: Flags.boolean({ char: "i", description: "interactive mode" }),
+  "generate-api-token": Flags.boolean({
+    char: "g",
+    description: "generate a new API token for the user and print it to stdout",
+  }),
 };
 
 module.exports = ModifyUserCommand;