@scifeon/sdk 0.86.0 → 0.89.0

package/dist/app-generator.js

@@ -238,18 +238,15 @@ class AppGenerator {
     }
     addElnStepSectionDecorators() {
         const builderRegex = /@scifeonElnStepSection\s*\(\s*(\{[^]*?\})\s*\)/i;
-        const nameRegex = /name\s*:\s*('.*'|".*")/i;
         const idRegex = /id\s*:\s*('.*'|".*")/i;
         for (const file of this.tsFiles) {
             if (!this.fileIncludesDecorator(file.content, "@scifeonElnStepSection"))
                 continue;
             const match = builderRegex.exec(file.content);
-            const nameMatch = nameRegex.exec(match[1]);
             const idMatch = idRegex.exec(match[1]);
             const section = {
                 id: idMatch[1].slice(1, -1),
                 src: file.src,
-                name: nameMatch[1].slice(1, -1),
                 type: plugin_types_1.PLUGIN_TYPE.ELN_STEP_SECTION,
             };
             this.contributionsJson.plugins.push(section);

package/dist/cli/commands/app/build.d.ts

@@ -1,3 +1,4 @@
 export declare class BuildCommand {
-    execute(): Promise<void>;
+    execute(options: any): Promise<void>;
+    private downloadTypes;
 }

package/dist/cli/commands/app/build.js

@@ -16,12 +16,26 @@ const download_utils_1 = require("../../../download-utils");
 const config_1 = require("../../config");
 const webpack_runner_1 = require("../../webpack-runner");
 class BuildCommand {
-    execute() {
+    execute(options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!fs.existsSync(config_1.config.wwwDir)) {
-                yield download_utils_1.DownloadUtils.downloadZip("https://scifeon.azureedge.net/sdk/packages-types.zip", path.resolve("runtime", "scifeon", "generated"), "Downloading Scifeon Types");
+                let branch = "";
+                if (options === null || options === void 0 ? void 0 : options.branch) {
+                    branch = `-${options.branch}`;
+                }
+                try {
+                    yield this.downloadTypes(branch);
+                }
+                catch (_a) {
+                    yield this.downloadTypes();
+                }
             }
-            webpack_runner_1.webpackRunner("build");
+            (0, webpack_runner_1.webpackRunner)("build");
+        });
+    }
+    downloadTypes(branch) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield download_utils_1.DownloadUtils.downloadZip(`https://scifeon.azureedge.net/sdk/packages-types${branch}.zip`, path.resolve("runtime", "scifeon", "generated"), `Downloading Scifeon Types ${branch}`);
         });
     }
 }

package/dist/cli/commands/app/new.js

@@ -106,7 +106,7 @@ class NewCommand {
             fs.writeFileSync(path.resolve(packageJson.name, "contributions.json"), JSON.stringify(contributionsJson, null, 2));
             logger_1.LOGGER.msg("Installing node_modules...");
             const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
-            const proc = child_process_1.spawn(npmCmd, ["install --silent --prefer-offline --no-audit"], { cwd: path.resolve(packageJson.name) });
+            const proc = (0, child_process_1.spawn)(npmCmd, ["install --silent --prefer-offline --no-audit"], { cwd: path.resolve(packageJson.name) });
             proc.stderr.on("data", (data) => console.log(data.toString()));
             proc.stdout.on("data", (data) => console.log(data.toString()));
             proc.once("exit", () => logger_1.LOGGER.msg("App created in folder [" + packageJson.name + "]. Run 'scifeon-cli debug' in this directory to start development of your app."));

package/dist/cli/commands/app/package.js

@@ -4,7 +4,7 @@ exports.PackageCommand = void 0;
 const webpack_runner_1 = require("../../webpack-runner");
 class PackageCommand {
     execute() {
-        webpack_runner_1.webpackRunner("package");
+        (0, webpack_runner_1.webpackRunner)("package");
     }
 }
 exports.PackageCommand = PackageCommand;

package/dist/cli/commands/app/unit-test.js

@@ -5,7 +5,7 @@ const unit_test_runner_1 = require("../../../unit-test-runner");
 const config_1 = require("../../config");
 class TestCommand {
     execute(options) {
-        unit_test_runner_1.unitTestRunner(options, config_1.config);
+        (0, unit_test_runner_1.unitTestRunner)(options, config_1.config);
     }
 }
 exports.TestCommand = TestCommand;

package/dist/cli/commands/app/watch.js

@@ -22,7 +22,7 @@ class WatchCommand {
             if (!fs.existsSync("./runtime")) {
                 yield new download_1.DownloadCommand().execute();
             }
-            const webpackConfig = webpack_app_config_1.webpackAppConfig({ watch: true }, config_1.config);
+            const webpackConfig = (0, webpack_app_config_1.webpackAppConfig)({ watch: true }, config_1.config);
             webpackConfig.output.publicPath = "http://localhost:9090" + webpackConfig.output.publicPath;
             webpackConfig.entry.app.unshift(require.resolve("webpack-dev-server/client") + "?http://localhost:9090", require.resolve("webpack/hot/dev-server"));
             const compiler = webpack(webpackConfig);

package/dist/cli/index.js

@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -59,9 +59,10 @@ class ScifeonCLI {
     setup() {
         this.program
             .command("build")
+            .option("--branch [branch]", "Platform branch to use for SDK types")
             .allowUnknownOption()
             .description("Build the App into the folder /build.\n")
-            .action(() => __awaiter(this, void 0, void 0, function* () { return yield new build_1.BuildCommand().execute(); }));
+            .action((options) => __awaiter(this, void 0, void 0, function* () { return yield new build_1.BuildCommand().execute(options); }));
         this.program
             .command("clean")
             .description("Remove the /build-folder.\n")

package/dist/cli/webpack-runner.js

@@ -8,7 +8,7 @@ const config_1 = require("./config");
 function webpackRunner(mode) {
     const env = {};
     env[mode] = true;
-    const compiler = webpack(webpack_app_config_1.webpackAppConfig(env, config_1.config));
+    const compiler = webpack((0, webpack_app_config_1.webpackAppConfig)(env, config_1.config));
     compiler.run(function (err, stats) {
         logger_1.LOGGER.info("Webpack output: ");
         const config = logger_1.LOGGER.verbose ? "verbose" : {

package/dist/download-utils.d.ts

@@ -1,3 +1,3 @@
 export declare class DownloadUtils {
-    static downloadZip(url: string, targetPath: string, progressBarMsg: string): Promise<unknown>;
+    static downloadZip(url: string, targetPath: string, progressBarMsg: string): Promise<void>;
 }

package/dist/plugin-types.d.ts

@@ -31,5 +31,7 @@ export declare enum PLUGIN_TYPE {
     ELN_STEP_SECTION = "eln.step.section",
     ELN_EXPERIMENT_COMPLETE = "eln.experiment.complete",
     ELN_EXPERIMENT_LOCK = "eln.experiment.lock",
-    PRE_PROCESS_SAVE_ENTITY = "pre_process_save_entity"
+    ELN_STEP_FORM_MODE = "eln.step.form.mode",
+    PRE_PROCESS_SAVE_ENTITY = "pre_process_save_entity",
+    ADMINISTRATION_SETTINGS_ELN = "administration.settings.eln"
 }

package/dist/plugin-types.js

@@ -35,5 +35,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_STEP_FORM_MODE"] = "eln.step.form.mode";
     PLUGIN_TYPE["PRE_PROCESS_SAVE_ENTITY"] = "pre_process_save_entity";
+    PLUGIN_TYPE["ADMINISTRATION_SETTINGS_ELN"] = "administration.settings.eln";
 })(PLUGIN_TYPE = exports.PLUGIN_TYPE || (exports.PLUGIN_TYPE = {}));

package/dist/unit-test-runner.js

@@ -27,7 +27,7 @@ function unitTestRunner(options, config, appType = "sdk") {
     }
     file_utils_1.FileUtils.createDirRecurSync(path.resolve(config.tempDir));
     fs.writeFileSync(path.resolve(config.tempDir, "unit-tests.js"), unitTestsJs.join("\n"));
-    const webpackConfig = webpack_app_config_1.webpackAppConfig({ test: true }, config, appType);
+    const webpackConfig = (0, webpack_app_config_1.webpackAppConfig)({ test: true }, config, appType);
     webpackConfig.target = "node";
     const compiler = webpack(webpackConfig);
     compiler.run(function (err, stats) {

package/dist/utils/test-helper.js

@@ -20,7 +20,7 @@ const requireURL = (url) => __awaiter(void 0, void 0, void 0, function* () {
         script = requireCache[url];
     }
     else {
-        const response = yield node_fetch_1.default(url);
+        const response = yield (0, node_fetch_1.default)(url);
         script = yield response.text();
         requireCache[url] = script;
     }

package/dist/webpack-app-config.js

@@ -15,26 +15,6 @@ const logger_1 = require("./logger");
 const webpack_utils_1 = require("./webpack-utils");
 const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
 const TerserJSPlugin = require("terser-webpack-plugin");
-const ModuleDependencyWarning = require("webpack/lib/ModuleDependencyWarning");
-class IgnoreNotFoundExportPlugin {
-    apply(compiler) {
-        const messageRegExp = /export '.*'( \(reexported as '.*'\))? was not found in/;
-        function doneHook(stats) {
-            stats.compilation.warnings = stats.compilation.warnings.filter(function (warn) {
-                if (warn instanceof ModuleDependencyWarning && messageRegExp.test(warn.message)) {
-                    return false;
-                }
-                return true;
-            });
-        }
-        if (compiler.hooks) {
-            compiler.hooks.done.tap("IgnoreNotFoundExportPlugin", doneHook);
-        }
-        else {
-            compiler.plugin("done", doneHook);
-        }
-    }
-}
 function webpackAppConfig(env, config, appType = "sdk") {
     env = env || { debug: true };
     const DEBUG = env.debug;
@@ -62,12 +42,13 @@ function webpackAppConfig(env, config, appType = "sdk") {
         let output = {};
         if (!TEST) {
             const aureliaPlugins = [];
-            plugins = plugins.concat([...aureliaPlugins,
+            plugins = plugins.concat([
+                ...aureliaPlugins,
                 new MiniCssExtractPlugin({
                     filename: "[name].[contenthash].css",
                     chunkFilename: "[id].[contenthash].css",
                 }),
-                new IgnoreNotFoundExportPlugin(),
+                new webpack_utils_1.IgnoreNotFoundExportPlugin(),
             ]);
             if (PACKAGE) {
                 plugins.push(webpack_utils_1.WebpackUtils.parseLogForAzureDevOps());

package/dist/webpack-utils.d.ts

@@ -3,3 +3,6 @@ export declare class WebpackUtils {
     static getPublicPath(fallback: string, prefix: string, postfix?: string): string;
     static transformTsConfig(file: string): string;
 }
+export declare class IgnoreNotFoundExportPlugin {
+    apply(compiler: any): void;
+}

package/dist/webpack-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebpackUtils = void 0;
+exports.IgnoreNotFoundExportPlugin = exports.WebpackUtils = void 0;
 const FriendlyErrorsPlugin = require("friendly-errors-webpack-plugin");
 const fs = require("fs");
 const file_utils_1 = require("./file-utils");
@@ -59,3 +59,26 @@ function getFileDirectory(filePath) {
         return filePath.substring(0, filePath.lastIndexOf("/"));
     }
 }
+class IgnoreNotFoundExportPlugin {
+    apply(compiler) {
+        const doneHook = (stats) => {
+            stats.compilation.warnings = stats.compilation.warnings.filter(warn => {
+                const ignoreWarn1 = /export '.*'( \(reexported as '.*'\))? was not found in/;
+                const ignoreWarn2 = /export 'default'( \(imported as '.*'\))? was not found in/;
+                const ignoreWarn3 = /export '.*'( \(imported as '.*'\))? was not found in/;
+                if (warn.constructor.name === "ModuleDependencyWarning"
+                    && (ignoreWarn1.test(warn.message) || ignoreWarn2.test(warn.message) || ignoreWarn3.test(warn.message))) {
+                    return false;
+                }
+                return true;
+            });
+        };
+        if (compiler.hooks) {
+            compiler.hooks.done.tap("IgnoreNotFoundExportPlugin", doneHook);
+        }
+        else {
+            compiler.plugin("done", doneHook);
+        }
+    }
+}
+exports.IgnoreNotFoundExportPlugin = IgnoreNotFoundExportPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scifeon/sdk",
-  "version": "0.86.0",
+  "version": "0.89.0",
   "description": "A tool for developing Apps for Scifeon.",
   "author": {
     "name": "Scifeon",
@@ -55,11 +55,11 @@
     "semver": "7.3.2",
     "style-loader": "1.2.1",
     "terser-webpack-plugin": "2.3.6",
-    "ts-loader": "7.0.2",
+    "ts-loader": "8.3.0",
     "ts-node": "8.9.1",
     "tsconfig-paths-webpack-plugin": "3.2.0",
-    "tslib": "1.11.1",
-    "typescript": "3.9.5",
+    "tslib": "2.3.1",
+    "typescript": "4.4.2",
     "url-loader": "4.1.0",
     "webpack": "4.43.0",
     "webpack-cli": "3.3.11",