@scifeon/sdk 0.106.0 → 0.108.0

package/dist/app/app-generator.js

@@ -157,7 +157,7 @@ class AppGenerator {
                     this.javascript.push(` id: '${plugin.id}',`);
                 }
                 const funcExt = fs.existsSync(`${path.resolve(this.config.appPath, plugin.src)}.ts`) ? "t" : "j";
-                if (!plugin.chunk && plugin.types.length === 1) {
+                if (!plugin.chunk) {
                     plugin.chunk = plugin.src;
                 }
                 if (plugin.chunk) {
@@ -335,6 +335,7 @@ class AppGenerator {
         const nameRegex = /name\s*:\s*('.*'|".*")/i;
         const idRegex = /id\s*:\s*('.*'|".*")/i;
         const descriptionRegex = /description\s*:\s*('.*'|".*")/i;
+        const pluginTypeRegex = /(PLUGIN_TYPE\.\w+)/g;
         for (const file of this.tsFiles) {
             if (!this.fileIncludesDecorator(file.content, "@scifeonDashboardWidget"))
                 continue;
@@ -342,12 +343,21 @@ class AppGenerator {
             const nameMatch = nameRegex.exec(match[1]);
             const idMatch = idRegex.exec(match[1]);
             const descriptionMatch = descriptionRegex.exec(match[1]);
+            const types = [];
+            let type = pluginTypeRegex.exec(match[1]);
+            while (type) {
+                types.push(type[1]);
+                type = pluginTypeRegex.exec(match[1]);
+            }
+            if (types.length === 0) {
+                types.push("PLUGIN_TYPE.DASHBOARD_WIDGET");
+            }
             const dashboardWidget = {
                 id: idMatch[1].slice(1, -1),
                 src: file.src,
+                types: new Function("PLUGIN_TYPE", `return [${types.join(", ")}]`)(plugin_types_1.PLUGIN_TYPE),
                 name: nameMatch !== null ? nameMatch[1].slice(1, -1) : file.name,
                 description: descriptionMatch !== null ? descriptionMatch[1].slice(1, -1) : null,
-                type: plugin_types_1.PLUGIN_TYPE.DASHBOARD_WIDGET,
             };
             this.contributionsJson.plugins.push(dashboardWidget);
             const configSrc = `${file.src}-config.ts`;
@@ -355,7 +365,7 @@ class AppGenerator {
                 const config = JSON.parse(JSON.stringify(dashboardWidget));
                 config.src = `${file.src}-config`;
                 config.id += ".$CONFIG";
-                config.type += ".$CONFIG";
+                config.types = config.types.map(t => `${t}.$CONFIG`);
                 this.contributionsJson.plugins.push(config);
             }
         }

package/dist/download-utils.js

@@ -15,15 +15,16 @@ class DownloadUtils {
             if (!fs.existsSync(targetPath)) {
                 file_utils_1.FileUtils.createDirRecurSync(targetPath);
             }
-            const tmpFilePath = os.tmpdir() + path.sep + Date.now() + "-scifeon-temp.zip";
-            https.get(url, (response) => {
+            const tmpFilePath = `${os.tmpdir() + path.sep + Date.now()}-scifeon-temp.zip`;
+            console.log(progressBarMsg);
+            https.get(url, response => {
                 const len = parseInt(response.headers["content-length"], 10);
-                const toMegabytes = (bytes) => {
+                const toMegabytes = bytes => {
                     const mb = bytes / 1024 / 1024;
                     return `${Math.round(mb * 10) / 10} Mb`;
                 };
                 console.log();
-                const bar = new ProgressBar(progressBarMsg + ` - ${toMegabytes(len)} [:bar] :percent :etas`, {
+                const bar = new ProgressBar(`${progressBarMsg} - ${toMegabytes(len)} [:bar] :percent :etas`, {
                     complete: "=",
                     incomplete: " ",
                     width: 20,

package/dist/plugin-types.d.ts

@@ -3,6 +3,7 @@ export declare enum PLUGIN_TYPE {
     PAGE = "page",
     DATA_LOADER = "data_loader",
     DASHBOARD_WIDGET = "dashboard.widget",
+    ANALYTICS_WIDGET = "analytics.widget",
     ENTITY_SIDEBAR = "entity.sidebar",
     ENTITY_PANEL = "entity.panel",
     ENTITY_RESULT_SET = "entity.result_set",
@@ -32,6 +33,7 @@ export declare enum PLUGIN_TYPE {
     ELN_STEP_SECTION = "eln.step.section",
     ELN_EXPERIMENT_COMPLETE = "eln.experiment.complete",
     ELN_EXPERIMENT_LOCK = "eln.experiment.lock",
+    ELN_EXPERIMENT_SECTION = "eln.experiment.section",
     ELN_STEP_FORM_MODE = "eln.step.form.mode",
     ELN_STEP_CONTROL = "eln.step.control",
     ELN_STEP_SELECT_PROCEDURE_FILTER = "eln.step.select_procedure_filter",

package/dist/plugin-types.js

@@ -7,6 +7,7 @@ var PLUGIN_TYPE;
     PLUGIN_TYPE["PAGE"] = "page";
     PLUGIN_TYPE["DATA_LOADER"] = "data_loader";
     PLUGIN_TYPE["DASHBOARD_WIDGET"] = "dashboard.widget";
+    PLUGIN_TYPE["ANALYTICS_WIDGET"] = "analytics.widget";
     PLUGIN_TYPE["ENTITY_SIDEBAR"] = "entity.sidebar";
     PLUGIN_TYPE["ENTITY_PANEL"] = "entity.panel";
     PLUGIN_TYPE["ENTITY_RESULT_SET"] = "entity.result_set";
@@ -36,6 +37,7 @@ var PLUGIN_TYPE;
     PLUGIN_TYPE["ELN_STEP_SECTION"] = "eln.step.section";
     PLUGIN_TYPE["ELN_EXPERIMENT_COMPLETE"] = "eln.experiment.complete";
     PLUGIN_TYPE["ELN_EXPERIMENT_LOCK"] = "eln.experiment.lock";
+    PLUGIN_TYPE["ELN_EXPERIMENT_SECTION"] = "eln.experiment.section";
     PLUGIN_TYPE["ELN_STEP_FORM_MODE"] = "eln.step.form.mode";
     PLUGIN_TYPE["ELN_STEP_CONTROL"] = "eln.step.control";
     PLUGIN_TYPE["ELN_STEP_SELECT_PROCEDURE_FILTER"] = "eln.step.select_procedure_filter";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scifeon/sdk",
-  "version": "0.106.0",
+  "version": "0.108.0",
   "description": "A tool for developing Apps for Scifeon.",
   "author": {
     "name": "Scifeon",
@@ -58,7 +58,7 @@
     "ts-loader": "8.3.0",
     "ts-node": "10.8.1",
     "tsconfig-paths-webpack-plugin": "3.2.0",
-    "tslib": "2.4.0",
+    "tslib": "2.6.2",
     "typescript": "4.6.4",
     "url-loader": "4.1.0",
     "webpack": "4.43.0",