@saltcorn/cli 1.1.0-beta.0 → 1.1.0-beta.10

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-beta.0",
+  "version": "1.1.0-beta.10",
   "commands": {
     "add-schema": {
       "id": "add-schema",
@@ -53,6 +53,13 @@
           "description": "Backup tenant in saltcorn zip format",
           "multiple": false
         },
+        "all_tenants": {
+          "name": "all_tenants",
+          "type": "boolean",
+          "char": "a",
+          "description": "Backup all tenants in saltcorn zip format",
+          "allowNo": false
+        },
         "zip": {
           "name": "zip",
           "type": "boolean",

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.1.0-beta.0",
+  "version": "1.1.0-beta.10",
   "author": "Tom Nielsen @glutamate",
   "bin": {
     "saltcorn": "./bin/saltcorn"
@@ -11,13 +11,13 @@
   "dependencies": {
     "@oclif/core": "^2.16.0",
     "@oclif/plugin-plugins": "^3.9.4",
-    "@saltcorn/admin-models": "1.1.0-beta.0",
-    "@saltcorn/common-code": "1.1.0-beta.0",
-    "@saltcorn/data": "1.1.0-beta.0",
-    "@saltcorn/mobile-app": "1.1.0-beta.0",
-    "@saltcorn/mobile-builder": "1.1.0-beta.0",
-    "@saltcorn/plugins-loader": "1.1.0-beta.0",
-    "@saltcorn/server": "1.1.0-beta.0",
+    "@saltcorn/admin-models": "1.1.0-beta.10",
+    "@saltcorn/common-code": "1.1.0-beta.10",
+    "@saltcorn/data": "1.1.0-beta.10",
+    "@saltcorn/mobile-app": "1.1.0-beta.10",
+    "@saltcorn/mobile-builder": "1.1.0-beta.10",
+    "@saltcorn/plugins-loader": "1.1.0-beta.10",
+    "@saltcorn/server": "1.1.0-beta.10",
     "contractis": "^0.1.0",
     "dateformat": "^3.0.3",
     "inquirer": "^7.3.3",
@@ -57,9 +57,8 @@
   "repository": "github:saltcorn/saltcorn",
   "scripts": {
     "postpack": "rm -f oclif.manifest.json",
-    "prepack": "oclif manifest && oclif readme",
+    "manifest": "oclif manifest && oclif readme",
     "test": "echo NO TESTS",
-    "version": "oclif readme && git add README.md",
     "tsc": "echo \"Error: no TypeScript support yet\"",
     "clean": "echo \"Error: no TypeScript support yet\""
   },

package/src/commands/backup.js

@@ -11,6 +11,7 @@ const { getConnectObject } = require("@saltcorn/data/db/connect");
 const day = dateFormat(new Date(), "yyyymmdd");
 const connobj = getConnectObject();
 const { init_some_tenants } = require("../common");
+const fs = require("fs");
 
 const pgdb = connobj.database;
 
@@ -45,6 +46,32 @@ class BackupCommand extends Command {
         const fnm = await create_backup(flags.output);
         console.log(fnm);
       });
+    } else if (flags.all_tenants) {
+      const db = require("@saltcorn/data/db");
+
+      const { create_backup } = require("@saltcorn/admin-models/models/backup");
+      const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
+      const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
+      const { init_multi_tenant } = require("@saltcorn/data/db/state");
+      let nten = 0,
+        nerr = 0;
+      const domain_files = {};
+      await eachTenant(async () => {
+        try {
+          nten += 1;
+          const domain = db.getTenantSchema();
+          await init_multi_tenant(loadAllPlugins, undefined, [domain]);
+          console.log("Backup tenant", domain);
+          const fnm = await create_backup(flags.output);
+          console.log(fnm);
+          domain_files[domain] = fnm;
+        } catch (e) {
+          nerr += 1;
+          console.error(e);
+        }
+      });
+      fs.writeFileSync("domain_files.json", JSON.stringify(domain_files));
+      console.log("done backup all tenants", nerr, "/", nten, "errors");
     } else if (flags.zip) {
       // zip the saltcorn backup
       const { create_backup } = require("@saltcorn/admin-models/models/backup");
@@ -115,6 +142,10 @@ BackupCommand.flags = {
     char: "t",
     description: "Backup tenant in saltcorn zip format",
   }),
+  all_tenants: Flags.boolean({
+    char: "a",
+    description: "Backup all tenants in saltcorn zip format",
+  }),
   zip: Flags.boolean({
     char: "z",
     description: "Backup public in saltcorn zip format",

package/src/commands/dev/release.js

@@ -102,21 +102,19 @@ class ReleaseCommand extends Command {
       const tags = !tags0 ? [] : Array.isArray(tags0) ? tags0 : [tags0];
       if (flags.tag) tags.push(flags.tag);
       const firstTag = tags[0];
-      spawnSync(
-        "npm",
-        [
-          "publish",
-          "--access=public",
-          ...(firstTag ? [`--tag ${firstTag}`] : []),
-        ],
-        {
-          stdio: "inherit",
-          cwd: `packages/${dir}/`,
-        }
+      console.log(
+        `packages/${dir}$ npm publish ${firstTag ? `--tag ${firstTag}` : ""}`
       );
+      spawnSync("npm", ["publish", ...(firstTag ? ["--tag", firstTag] : [])], {
+        stdio: "inherit",
+        cwd: `packages/${dir}/`,
+      });
       tags.shift();
       for (const tag of tags) {
         await sleep(3000);
+        console.log(
+          `packages/${dir}$ npm dist-tag add @saltcorn/cli@${version} ${tag}`
+        );
         spawnSync("npm", ["dist-tag", "add", `@saltcorn/cli@${version}`, tag], {
           stdio: "inherit",
           cwd: `packages/${dir}/`,
@@ -158,12 +156,24 @@ class ReleaseCommand extends Command {
       stdio: "inherit",
       cwd: `packages/saltcorn-cli/`,
     });
+    spawnSync("npm", ["install", "--legacy-peer-deps"], {
+      stdio: "inherit",
+      cwd: `packages/saltcorn-cli/`,
+    });
+    spawnSync("npm", ["run", "manifest"], {
+      stdio: "inherit",
+      cwd: `packages/saltcorn-cli/`,
+    });
+    spawnSync("npm", ["install", "--legacy-peer-deps"], {
+      stdio: "inherit",
+      cwd: ".",
+    });
     // do not run 'audit fix' on full point releases, only on -beta.x, -rc.x etc
-    if (version.includes("-"))
+    /*if (version.includes("-"))
       spawnSync("npm", ["audit", "fix"], {
         stdio: "inherit",
         cwd: `packages/saltcorn-cli/`,
-      });
+      });*/
     await publish("saltcorn-cli", "next");
     fs.writeFileSync(`package.json`, JSON.stringify(rootPackageJson, null, 2));
     // update Dockerfile

package/src/commands/restore.js

@@ -6,6 +6,7 @@ const { Command, Flags, Args } = require("@oclif/core");
 const { spawnSync } = require("child_process");
 const path = require("path");
 const { maybe_as_tenant } = require("../common");
+const fs = require("fs");
 
 /**
  * RestoreCommand Class
@@ -72,6 +73,32 @@ class RestoreCommand extends Command {
       case ".zip":
         this.zip_restore(args.file, flags.tenant);
         break;
+      case ".json":
+        if (!args.file.includes("domain_files.json")) {
+          console.error("unknown filetype: " + path.extname(args.file));
+          this.exit(1);
+        }
+        const fileConts = fs.readFileSync(args.file);
+        const domain_files = JSON.parse(fileConts);
+        const {
+          insertTenant,
+          getAllTenants,
+          switchToTenant,
+        } = require("@saltcorn/admin-models/models/tenant");
+        const { add_tenant } = require("@saltcorn/data/db/state");
+
+        let existing_tenants = new Set(await getAllTenants());
+        existing_tenants.add("public");
+        for (const [tenant, fnm] of Object.entries(domain_files)) {
+          console.log("restore", tenant, "from", fnm);
+          if (!existing_tenants.has(tenant)) {
+            const tenrow = await insertTenant(tenant);
+            add_tenant(tenant);
+            await switchToTenant(tenrow);
+          }
+          await this.zip_restore(fnm, tenant === "public" ? undefined : tenant);
+        }
+        break;
       default:
         console.error("unknown filetype: " + path.extname(args.file));
         this.exit(1);