@saltcorn/cli 1.6.0-alpha.0 → 1.6.0-alpha.2

package/oclif.manifest.json

@@ -264,6 +264,12 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "syncOnAppResume": {
+          "description": "When offline mode is enabled, synchronize the synchedTables tables when the app is resumed.",
+          "name": "syncOnAppResume",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "pushSync": {
           "description": "When offline mode is enabled, synchronize the synchedTables tables when a push notification is received.",
           "name": "pushSync",
@@ -277,6 +283,12 @@
           "multiple": false,
           "type": "option"
         },
+        "noProvisioningProfile": {
+          "description": "Do not use a provisioning profile, only for simulator builds (iOS only)",
+          "name": "noProvisioningProfile",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "provisioningProfile": {
           "description": "This profile will be used to sign your app",
           "name": "provisioningProfile",
@@ -298,6 +310,12 @@
           "multiple": false,
           "type": "option"
         },
+        "allowClearTextTraffic": {
+          "description": "Enable this to allow unsecure HTTP connections. Useful for local testing.",
+          "name": "allowClearTextTraffic",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "androidKeystore": {
           "description": "A self-signed certificate that includes the private key used to sign your app.",
           "name": "androidKeystore",
@@ -2127,6 +2145,14 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "overwriteDependency": {
+          "char": "o",
+          "description": "Dependency to overwrite with a local plugin (can be used multiple times). Please specify the path to the local plugin, the module name will be taken from there.",
+          "name": "overwriteDependency",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -2315,5 +2341,5 @@
       ]
     }
   },
-  "version": "1.6.0-alpha.0"
+  "version": "1.6.0-alpha.2"
 }

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.0",
+  "version": "1.6.0-alpha.2",
   "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.0",
-    "@saltcorn/common-code": "1.6.0-alpha.0",
-    "@saltcorn/data": "1.6.0-alpha.0",
-    "@saltcorn/mobile-app": "1.6.0-alpha.0",
-    "@saltcorn/mobile-builder": "1.6.0-alpha.0",
-    "@saltcorn/plugins-loader": "1.6.0-alpha.0",
-    "@saltcorn/server": "1.6.0-alpha.0",
+    "@saltcorn/admin-models": "1.6.0-alpha.2",
+    "@saltcorn/common-code": "1.6.0-alpha.2",
+    "@saltcorn/data": "1.6.0-alpha.2",
+    "@saltcorn/mobile-app": "1.6.0-alpha.2",
+    "@saltcorn/mobile-builder": "1.6.0-alpha.2",
+    "@saltcorn/plugins-loader": "1.6.0-alpha.2",
+    "@saltcorn/server": "1.6.0-alpha.2",
     "contractis": "^0.1.0",
     "dateformat": "^4.6.3",
     "inquirer": "^12.3.3",

package/src/commands/build-app.js

@@ -2,9 +2,7 @@ const { Command, Flags } = require("@oclif/core");
 const path = require("path");
 const Plugin = require("@saltcorn/data/models/plugin");
 const { MobileBuilder } = require("@saltcorn/mobile-builder/mobile-builder");
-const {
-  decodeProvisioningProfile,
-} = require("@saltcorn/mobile-builder/utils/common-build-utils");
+const { decodeProvisioningProfile } = require("@saltcorn/data/utils");
 const { init_multi_tenant, getState } = require("@saltcorn/data/db/state");
 const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
 const User = require("@saltcorn/data/models/user");
@@ -44,7 +42,7 @@ class BuildAppCommand extends Command {
       );
     }
 
-    if (flags.platforms.includes("ios")) {
+    if (flags.platforms.includes("ios") && !flags.noProvisioningProfile) {
       if (!flags.provisioningProfile)
         throw new Error("Please specify a provisioning profile");
       if (flags.allowShareTo && !flags.shareExtensionProvisioningProfile)
@@ -73,26 +71,30 @@ class BuildAppCommand extends Command {
   async buildIosParams(flags) {
     let result = undefined;
     if (flags.platforms.includes("ios")) {
-      const mainProfileVals = await decodeProvisioningProfile(
-        flags.buildDirectory,
-        flags.provisioningProfile
-      );
-      result = {
-        appleTeamId: mainProfileVals.teamId,
-        mainProvisioningProfile: {
-          guuid: mainProfileVals.guuid,
-        },
-      };
-      if (flags.allowShareTo) {
-        const shareExtProfileVals = await decodeProvisioningProfile(
-          flags.buildDirectory,
-          flags.shareExtensionProvisioningProfile
+      if (flags.noProvisioningProfile)
+        result = {
+          noProvisioningProfile: true,
+        };
+      else {
+        const mainProfileVals = await decodeProvisioningProfile(
+          flags.provisioningProfile
         );
-        result.shareExtensionProvisioningProfile = {
-          guuid: shareExtProfileVals.guuid,
-          specifier: shareExtProfileVals.specifier,
-          identifier: shareExtProfileVals.identifier,
+        result = {
+          appleTeamId: mainProfileVals.teamId,
+          mainProvisioningProfile: {
+            guuid: mainProfileVals.guuid,
+          },
         };
+        if (flags.allowShareTo) {
+          const shareExtProfileVals = await decodeProvisioningProfile(
+            flags.shareExtensionProvisioningProfile
+          );
+          result.shareExtensionProvisioningProfile = {
+            guuid: shareExtProfileVals.guuid,
+            specifier: shareExtProfileVals.specifier,
+            identifier: shareExtProfileVals.identifier,
+          };
+        }
       }
     }
     return result;
@@ -138,6 +140,7 @@ class BuildAppCommand extends Command {
         showContinueAsPublicUser: flags.showContinueAsPublicUser,
         allowOfflineMode: flags.allowOfflineMode,
         syncOnReconnect: flags.syncOnReconnect,
+        syncOnAppResume: flags.syncOnAppResume,
         pushSync: flags.pushSync,
         syncInterval: flags.syncInterval,
         allowShareTo: flags.allowShareTo,
@@ -147,6 +150,7 @@ class BuildAppCommand extends Command {
         iosParams: iosParams,
         tenantAppName: flags.tenantAppName,
         buildType: flags.buildType,
+        allowClearTextTraffic: flags.allowClearTextTraffic,
         keyStorePath: flags.androidKeystore,
         keyStoreAlias: flags.androidKeyStoreAlias,
         keyStorePassword: flags.androidKeystorePassword,
@@ -324,6 +328,12 @@ BuildAppCommand.flags = {
       "Run Synchronizations and return into online mode when the network connection is restored. " +
       "When disabled, you still can do this manually.",
   }),
+  syncOnAppResume: Flags.boolean({
+    name: "Sync on app resume",
+    string: "syncOnAppResume",
+    description:
+      "When offline mode is enabled, synchronize the synchedTables tables when the app is resumed.",
+  }),
   pushSync: Flags.boolean({
     name: "Push sync",
     string: "pushSync",
@@ -337,6 +347,13 @@ BuildAppCommand.flags = {
       "Perdiodic interval (in minutes) to run synchronizations in the background. " +
       "This is just a min interval, depending on system conditions, the actual time may be longer.",
   }),
+  noProvisioningProfile: Flags.boolean({
+    name: "no provisioning profile",
+    string: "noProvisioningProfile",
+    description:
+      "Do not use a provisioning profile, only for simulator builds (iOS only)",
+    default: false,
+  }),
   provisioningProfile: Flags.string({
     name: "provisioning profile",
     string: "provisioningProfile",
@@ -353,6 +370,13 @@ BuildAppCommand.flags = {
     string: "buildType",
     description: "debug or release build",
   }),
+  allowClearTextTraffic: Flags.boolean({
+    name: "allow clear text traffic",
+    string: "allowClearTextTraffic",
+    description:
+      "Enable this to allow unsecure HTTP connections. Useful for local testing.",
+    default: false,
+  }),
   androidKeystore: Flags.string({
     name: "android key store",
     string: "androidKeyStore",

package/src/commands/dev/plugin-test.js

@@ -15,7 +15,9 @@ const removePluginsDir = () => {
     fs.rmSync(pluginsPath, { force: true, recursive: true });
 };
 
-const writeJestConfigIntoPluginDir = (location) => {
+const writeJestConfigIntoPluginDir = (location, plugin) => {
+  const state = getState();
+  const module = state.plugins[plugin.name];
   fs.writeFileSync(
     path.join(location, "jest.config.js"),
     `const sqliteDir = process.env.JEST_SC_SQLITE_DIR;
@@ -35,6 +37,17 @@ const config = {
     "@saltcorn/markup$": markupDir,
     "@saltcorn/markup/(.*)": markupDir + "/$1",
     "@saltcorn/admin-models/(.*)": adminModelsDir + "/$1",
+    ${(module?.dependencies || [])
+      .map((dep) => {
+        let pluginLocation = state.plugin_locations[dep];
+        if (!pluginLocation) {
+          // try without org
+          const orgRemoved = dep.replace(/^@[^/]+\//, "");
+          pluginLocation = state.plugin_locations[orgRemoved];
+        }
+        return pluginLocation ? `"${dep}": "${pluginLocation}",` : "";
+      })
+      .join("\n    ")}
   },
   modulePaths: [modulePath],
 };
@@ -77,42 +90,48 @@ const spawnTest = async (installDir, env) => {
   return ret.status;
 };
 
-const installPlugin = async (plugin) => {
+const preparePlugin = async (plugin, overwrites) => {
   await removeOldPlugin(plugin);
   removePluginsDir();
-  await loadAndSaveNewPlugin(plugin, false, false);
+  await loadAndSaveNewPlugin(
+    plugin,
+    false,
+    false,
+    (str) => str,
+    false,
+    overwrites
+  );
   const location = getPluginLocation(plugin.name);
   writeMockFilesIntoPluginDir(location);
-  writeJestConfigIntoPluginDir(location);
+  writeJestConfigIntoPluginDir(location, plugin);
   return location;
 };
 
-const removeOldPlugin = async (plugin) => {
-  const byName = await Plugin.findOne({ name: plugin.name });
+const removeOldPlugin = async (newPlugin) => {
+  const byName = await Plugin.findOne({ name: newPlugin.name });
   if (byName) {
     await byName.delete();
     await new PluginInstaller(byName).remove();
   }
-  let oldPlugin = null;
-  if (!plugin.name.startsWith("@saltcorn/")) {
-    const withOrg = await Plugin.findOne({ name: `@saltcorn/${plugin.name}` });
+  let oldDbPlugin = null;
+  if (!newPlugin.name.startsWith("@saltcorn/")) {
+    const withOrg = await Plugin.findOne({
+      name: `@saltcorn/${newPlugin.name}`,
+    });
     if (withOrg) {
       await withOrg.delete();
-      oldPlugin = withOrg;
+      oldDbPlugin = withOrg;
     }
   } else {
     const withoutOrg = await Plugin.findOne({
-      name: plugin.name.replace(/^@saltcorn\//, ""),
+      name: newPlugin.name.replace(/^@saltcorn\//, ""),
     });
     if (withoutOrg) {
       await withoutOrg.delete();
-      oldPlugin = withoutOrg;
+      oldDbPlugin = withoutOrg;
     }
   }
-  if (oldPlugin) {
-    const installer = new PluginInstaller(oldPlugin);
-    await installer.remove();
-  }
+  await new PluginInstaller(oldDbPlugin || newPlugin).remove();
 };
 
 const getPluginLocation = (pluginName) => {
@@ -123,7 +142,7 @@ const getPluginLocation = (pluginName) => {
   );
 };
 
-const testLocalPlugin = async (dir, env, backupFile) => {
+const testLocalPlugin = async (dir, env, backupFile, overwrites) => {
   if (backupFile) {
     await prep_test_db(path.join(dir, "tests", backupFile));
   } else await require("@saltcorn/data/db/reset_schema")();
@@ -135,27 +154,49 @@ const testLocalPlugin = async (dir, env, backupFile) => {
     source: "local",
     location: path.resolve(dir),
   });
-  const installDir = await installPlugin(plugin);
+  const installDir = await preparePlugin(plugin, overwrites);
   return await spawnTest(installDir, env);
 };
 
-const testReleasedPlugin = async (pluginName, env, backupFile) => {
+const testReleasedPlugin = async (pluginName, env, backupFile, overwrites) => {
   await require("@saltcorn/data/db/reset_schema")();
   const plugin = await Plugin.store_by_name(pluginName);
   delete plugin.id;
-  const installDir = await installPlugin(plugin);
+  const installDir = await preparePlugin(plugin, overwrites);
   if (backupFile) {
     await prep_test_db(path.join(installDir, "tests", backupFile));
   }
   return await spawnTest(installDir, env);
 };
 
+/**
+ *
+ * @param {string[]} overwrites paths to local plugins
+ * @returns an object mapping module names to paths
+ */
+const prepOverwritesCfg = (overwrites) => {
+  const result = {};
+  if (overwrites) {
+    for (const flag of overwrites) {
+      const pkgpath = path.join(flag, "package.json");
+      if (!fs.existsSync(pkgpath))
+        throw new Error(
+          `Overwrite dependency package.json not found in ${flag}`
+        );
+      const pkg = require(pkgpath);
+      result[pkg.name] = flag;
+    }
+  }
+  return result;
+};
+
 /**
  * Install a plugin, spawn 'npm run test' in the install dir and check the return code
  */
 class PluginTestCommand extends Command {
   async run() {
     const { flags } = await this.parse(PluginTestCommand);
+    const overwrites = prepOverwritesCfg(flags.overwriteDependency);
     const dbname = flags.database ? flags.database : "saltcorn_test";
     let env = null;
     const db = require("@saltcorn/data/db");
@@ -174,14 +215,16 @@ class PluginTestCommand extends Command {
         jestStatus = await testLocalPlugin(
           flags.directory,
           env,
-          flags.backupFile
+          flags.backupFile,
+          overwrites
         );
       } else if (flags.name) {
         console.log(`Testing released plugin '${flags.name}'`);
         jestStatus = await testReleasedPlugin(
           flags.name,
           env,
-          flags.backupFile
+          flags.backupFile,
+          overwrites
         );
       }
     } catch (error) {
@@ -218,6 +261,13 @@ PluginTestCommand.flags = {
     string: "database",
     description: "Run on specified database. Default is 'saltcorn_test''",
   }),
+  overwriteDependency: Flags.string({
+    char: "o",
+    description:
+      "Dependency to overwrite with a local plugin (can be used multiple times). " +
+      "Please specify the path to the local plugin, the module name will be taken from there.",
+    multiple: true,
+  }),
 };
 
 PluginTestCommand.description =