@saltcorn/plugins-loader 1.0.0-beta.13 → 1.0.0-beta.14

package/download_utils.js

@@ -2,7 +2,7 @@ const fs = require("fs");
 const { rm } = require("fs").promises;
 const { mkdir, pathExists } = require("fs-extra");
 const { tmpName } = require("tmp-promise");
-const { execSync } = require("child_process");
+const { execFileSync } = require("child_process");
 const { extract } = require("tar");
 const { join } = require("path");
 const { createWriteStream, unlink } = require("fs");
@@ -93,7 +93,10 @@ const loadTarball = (rootFolder, url, name) => {
  */
 const gitPullOrClone = async (plugin, pluginDir) => {
   let keyfnm,
-    setKey = `-c core.sshCommand="ssh -oBatchMode=yes -o 'StrictHostKeyChecking no'" `;
+    setKey = [
+      "-c",
+      `core.sshCommand="ssh -oBatchMode=yes -o 'StrictHostKeyChecking no'"`,
+    ];
   if (plugin.deploy_private_key) {
     keyfnm = await tmpName();
     await fs.promises.writeFile(
@@ -104,12 +107,15 @@ const gitPullOrClone = async (plugin, pluginDir) => {
         encoding: "ascii",
       }
     );
-    setKey = `-c core.sshCommand="ssh -oBatchMode=yes -o 'StrictHostKeyChecking no' -i ${keyfnm}" `;
+    setKey = [
+      "-c",
+      `core.sshCommand="ssh -oBatchMode=yes -o 'StrictHostKeyChecking no' -i ${keyfnm}"`,
+    ];
   }
   if (fs.existsSync(pluginDir)) {
-    execSync(`git ${setKey} -C ${pluginDir} pull`);
+    execFileSync("git", [...setKey, "-C", pluginDir, "pull"]);
   } else {
-    execSync(`git ${setKey} clone ${plugin.location} ${pluginDir}`);
+    execFileSync("git", [...setKey, "clone", plugin.location, pluginDir]);
   }
   if (plugin.deploy_private_key && keyfnm) await fs.promises.unlink(keyfnm);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/plugins-loader",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.14",
   "description": "Saltcorn plugin loader",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -11,7 +11,7 @@
   "dependencies": {
     "env-paths": "^2.2.0",
     "npm-registry-fetch": "17.1.0",
-    "@saltcorn/data": "1.0.0-beta.13"
+    "@saltcorn/data": "1.0.0-beta.14"
   },
   "author": "Christian Hugo",
   "license": "MIT",

package/plugin_installer.js

@@ -27,10 +27,10 @@ const readPackageJson = async (filePath) => {
 };
 
 const npmInstallNeeded = (oldPckJSON, newPckJSON) => {
-  const oldDeps = oldPckJSON.dependencies || {};
-  const oldDevDeps = oldPckJSON.devDependencies || {};
-  const newDeps = newPckJSON.dependencies || {};
-  const newDevDeps = newPckJSON.devDependencies || {};
+  const oldDeps = oldPckJSON.dependencies || Object.create(null);
+  const oldDevDeps = oldPckJSON.devDependencies || Object.create(null);
+  const newDeps = newPckJSON.dependencies || Object.create(null);
+  const newDevDeps = newPckJSON.devDependencies || Object.create(null);
   return (
     JSON.stringify(oldDeps) !== JSON.stringify(newDeps) ||
     JSON.stringify(oldDevDeps) !== JSON.stringify(newDevDeps)
@@ -38,7 +38,7 @@ const npmInstallNeeded = (oldPckJSON, newPckJSON) => {
 };
 
 class PluginInstaller {
-  constructor(plugin, opts = {}) {
+  constructor(plugin, opts = Object.create(null)) {
     this.plugin = plugin;
     this.rootFolder =
       opts.rootFolder || envPaths("saltcorn", { suffix: "plugins" }).data;

package/stable_versioning.js

@@ -22,10 +22,10 @@ const doCheck = (pluginVersion, versionInfos, scVersion) => {
 
 /**
  * check if 'pluginVersion' is supported or find the latest supported version
- * @param {*} pluginVersion - wanted version
- * @param {*} versionInfos - version infos from the npm registry (resembles the package.json version).
+ * @param pluginVersion - wanted version
+ * @param versionInfos - version infos from the npm registry (resembles the package.json version).
  *                            Here you'll find the engines.saltcorn property.
- * @param {*} scVersion - saltcorn version
+ * @param scVersion - optional saltcorn version (if not set it will be taken from the state)
  * @returns
  */
 const supportedVersion = (
@@ -35,14 +35,15 @@ const supportedVersion = (
 ) => {
   const resolved =
     pluginVersion === "latest" ? resolveLatest(versionInfos) : pluginVersion;
-  if (doCheck(resolved, versionInfos, scVersion)) return resolved;
+  const safeScVersion = scVersion || getState().scVersion;
+  if (doCheck(resolved, versionInfos, safeScVersion)) return resolved;
   else {
     const keys = Object.keys(versionInfos);
     keys.sort((a, b) => semver.rcompare(b, a));
     // iterate in reverse order to get the latest version
     for (let i = keys.length - 1; i >= 0; i--) {
       const version = keys[i];
-      if (doCheck(version, versionInfos, scVersion)) return version;
+      if (doCheck(version, versionInfos, safeScVersion)) return version;
     }
     return null;
   }
@@ -54,21 +55,21 @@ const supportedVersion = (
  * @param scEngine - version infos from the npm registry (resembles the package.json version)
  *                        Here you'll find the engines.saltcorn property.
  *                        If versionInfos is a string, it will be treated as the engines.saltcorn property.
- * @param scVersion - optional saltcorn version (if not set it will be taken from the package.json)
+ * @param scVersion - optional saltcorn version (if not set it will be taken from the state)
  */
 const isVersionSupported = (pluginVersion, scEngine, scVersion) => {
   const safeInfos =
     typeof scEngine === "string"
       ? { [pluginVersion]: { engines: scEngine } }
       : scEngine;
-  const safeScVersion = scVersion || require("package.json").version;
+  const safeScVersion = scVersion || getState().scVersion;
   return doCheck(pluginVersion, safeInfos, safeScVersion);
 };
 
 /**
  * check if 'scVersion' fullfilles 'scEngine'
  * @param scEngine fixed version or range of saltcorn versions (e.g. ">=1.0.0")
- * @param scVersion optional saltcorn version (if not set it will be taken from the package.json)
+ * @param scVersion optional saltcorn version (if not set it will be taken from the state)
  * @returns true if the saltcorn version fullfilles scEngine
  */
 const isEngineSatisfied = (scEngine, scVersion) => {
@@ -77,7 +78,7 @@ const isEngineSatisfied = (scEngine, scVersion) => {
     getState().log(4, `invalid engine property: ${scEngine}`);
     return true;
   }
-  const safeScVersion = scVersion || require("package.json").version;
+  const safeScVersion = scVersion || getState().scVersion;
   if (semver.valid(safeScVersion) === null) {
     getState().log(4, `invalid saltcorn version: ${scVersion}`);
     return true;
@@ -87,7 +88,7 @@ const isEngineSatisfied = (scEngine, scVersion) => {
 
 /**
  * change latest to the actual version
- * @param versionInfos - version infos from the npm registry (resembles the package.json version)
+ * @param versionInfos - version infos from the npm registry
  */
 const resolveLatest = (versionInfos) => {
   const keys = Object.keys(versionInfos);