@abi-software/simulationvuer 3.0.12 → 3.0.13

package/src/components/SimulationVuerInput.vue

@@ -44,6 +44,7 @@
 
 <script>
 import { ElInputNumber, ElOption, ElSelect, ElSlider } from "element-plus";
+
 import { updateUi } from "./common.js";
 
 export default {
@@ -79,7 +80,7 @@ export default {
   data: function () {
     return {
       isDiscrete: this.possibleValues !== undefined,
-      labelClasses: "default " + ((this.possibleValues !== undefined) ? "discrete" : "scalar"),
+      labelClasses: `default ${this.possibleValues !== undefined ? "discrete" : "scalar"}`,
       visible: true,
       vModel: this.defaultValue,
     };

package/src/components/common.js

@@ -26,7 +26,10 @@ export function updateUi(parent) {
     parent.simulationUiInfo.input.forEach((input) => {
       ++index;
 
-      parent.$refs.simInput[index].visible = (input.visible === undefined) ? true : evaluateValue(parent, input.visible);
+      parent.$refs.simInput[index].visible =
+        input.visible === undefined
+          ? true
+          : evaluateValue(parent, input.visible);
     });
   });
 }
@@ -35,21 +38,29 @@ export function finaliseUi(parent) {
   // Finalise our UI, but only if we haven't already done so, we are mounted,
   // and we have some valid simulation UI information.
 
-  if (!parent.hasFinalisedUi && parent.isMounted && parent.hasValidSimulationUiInfo) {
+  if (
+    !parent.hasFinalisedUi &&
+    parent.isMounted &&
+    parent.hasValidSimulationUiInfo
+  ) {
     // Configure the PlotVuer's.
 
-    parent.$refs.output.classList.add("x" + parent.simulationUiInfo.output.plots.length);
+    parent.$refs.output.classList.add(
+      `x${parent.simulationUiInfo.output.plots.length}`,
+    );
 
     // Initialise the simulation results.
 
     let index = -1;
 
     parent.simulationUiInfo.output.plots.forEach(() => {
-      parent.simulationResults[++index] = [{
-        x: [],
-        y: [],
-        type: "scatter",
-      }];
+      parent.simulationResults[++index] = [
+        {
+          x: [],
+          y: [],
+          type: "scatter",
+        },
+      ];
     });
 
     // Make sure that our UI is up to date.

package/src/components/index.js

@@ -1,7 +1,5 @@
 // The Vue build version to load with the `import` command
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
-import SimulationVuer from './SimulationVuer.vue';
+import SimulationVuer from "./SimulationVuer.vue";
 
-export {
-    SimulationVuer
-};
+export { SimulationVuer };

package/src/components/json.js

@@ -1,4 +1,5 @@
 import { Validator } from "jsonschema";
+
 import { OPENCOR_SOLVER_NAME } from "./common.js";
 
 export function validJson(json) {
@@ -224,7 +225,7 @@ export function validJson(json) {
   const result = validator.validate(json, schema, { nestedErrors: true });
 
   if (!result.valid) {
-    console.warn(result.toString());
+    console.warn(`SimulationVuer: JSON: ${result.toString()}`);
 
     return false;
   }
@@ -235,13 +236,15 @@ export function validJson(json) {
   const inputValid = json.input.every((input) => {
     if (input.id !== undefined) {
       if (input.id === "") {
-        console.warn("JSON: the input id must not be empty.");
+        console.warn("SimulationVuer: JSON: the input id must not be empty.");
 
         return false;
       }
 
       if (inputIdUsed[input.id] !== undefined) {
-        console.warn("JSON: the input id must be unique (" + input.id + " is used more than once).");
+        console.warn(
+          `SimulationVuer: JSON: the input id must be unique (${input.id} is used more than once).`,
+        );
 
         return false;
       }
@@ -250,21 +253,25 @@ export function validJson(json) {
     }
 
     if (input.name === "") {
-      console.warn("JSON: the input name must not be empty.");
+      console.warn("SimulationVuer: JSON: the input name must not be empty.");
 
       return false;
     }
 
     if (input.possibleValues !== undefined) {
-      if (!input.possibleValues.every((possibleValue) => {
-        if (possibleValue.name === "") {
-          console.warn("JSON: an input possible value must not be empty.");
-
-          return false;
-        }
-
-        return true;
-      })) {
+      if (
+        !input.possibleValues.every((possibleValue) => {
+          if (possibleValue.name === "") {
+            console.warn(
+              "SimulationVuer: JSON: an input possible value must not be empty.",
+            );
+
+            return false;
+          }
+
+          return true;
+        })
+      ) {
         return false;
       }
 
@@ -273,36 +280,49 @@ export function validJson(json) {
       });
       const valueUsed = {};
 
-      if (!values.every((value) => {
-        if (valueUsed[value] !== undefined) {
-          console.warn("JSON: an input possible value must have a unique value (" + value + " is used more than once).");
+      if (
+        !values.every((value) => {
+          if (valueUsed[value] !== undefined) {
+            console.warn(
+              `SimulationVuer: JSON: an input possible value must have a unique value (${value} is used more than once).`,
+            );
 
-          return false;
-        }
+            return false;
+          }
 
-        valueUsed[value] = true;
+          valueUsed[value] = true;
 
-        return true;
-      })) {
+          return true;
+        })
+      ) {
         return false;
       }
 
       if (!values.includes(input.defaultValue)) {
-        console.warn("JSON: the input default value (" + input.defaultValue + ") must be one of the possible values (" + values.join(", ") + ").");
+        console.warn(
+          `SimulationVuer: JSON: the input default value (${input.defaultValue}) must be one of the possible values (${values.join(", ")}).`,
+        );
 
         return false;
       }
     }
 
-    if ((input.minimumValue !== undefined) && (input.maximumValue !== undefined)) {
+    if (input.minimumValue !== undefined && input.maximumValue !== undefined) {
       if (input.minimumValue >= input.maximumValue) {
-        console.warn("JSON: the input minimum value (" + input.minimumValue + ") must be lower than the maximum value (" + input.maximumValue + ").");
+        console.warn(
+          `SimulationVuer: JSON: the input minimum value (${input.minimumValue}) must be lower than the maximum value (${input.maximumValue}).`,
+        );
 
         return false;
       }
 
-      if ((input.defaultValue < input.minimumValue) || (input.defaultValue > input.maximumValue)) {
-        console.warn("JSON: the input default value (" + input.defaultValue + ") must be greater or equal than the minimum value (" + input.minimumValue + ") and lower or equal than the maximum value (" + input.maximumValue + ").");
+      if (
+        input.defaultValue < input.minimumValue ||
+        input.defaultValue > input.maximumValue
+      ) {
+        console.warn(
+          `SimulationVuer: JSON: the input default value (${input.defaultValue}) must be greater or equal than the minimum value (${input.minimumValue}) and lower or equal than the maximum value (${input.maximumValue}).`,
+        );
 
         return false;
       }
@@ -310,20 +330,26 @@ export function validJson(json) {
       const range = input.maximumValue - input.minimumValue;
 
       if (input.stepValue !== undefined) {
-        if ((input.stepValue <= 0) || (input.stepValue > range)) {
-          console.warn("JSON: the input step value (" + input.stepValue + ") must be greater than zero and lower or equal than the range value (" + range + ").");
+        if (input.stepValue <= 0 || input.stepValue > range) {
+          console.warn(
+            `SimulationVuer: JSON: the input step value (${input.stepValue}) must be greater than zero and lower or equal than the range value (${range}).`,
+          );
 
           return false;
         }
 
         if (!Number.isInteger(range / input.stepValue)) {
-          console.warn("JSON: the input step value (" + input.stepValue + ") must be a factor of the range value (" + range + ").");
+          console.warn(
+            `SimulationVuer: JSON: the input step value (${input.stepValue}) must be a factor of the range value (${range}).`,
+          );
 
           return false;
         }
       } else {
         if (!Number.isInteger(range)) {
-          console.warn("JSON: the (default) input step value (1) must be a factor of the range value (" + range + ").");
+          console.warn(
+            `SimulationVuer: JSON: the (default) input step value (1) must be a factor of the range value (${range}).`,
+          );
 
           return false;
         }
@@ -332,7 +358,9 @@ export function validJson(json) {
 
     if (input.visible !== undefined) {
       if (input.visible === "") {
-        console.warn("JSON: the input visible must not be empty.");
+        console.warn(
+          "SimulationVuer: JSON: the input visible must not be empty.",
+        );
 
         return false;
       }
@@ -351,13 +379,17 @@ export function validJson(json) {
   const outputDataValid = json.output.data.every((outputData) => {
     if (outputData.id !== undefined) {
       if (outputData.id === "") {
-        console.warn("JSON: the output data id must not be empty.");
+        console.warn(
+          "SimulationVuer: JSON: the output data id must not be empty.",
+        );
 
         return false;
       }
 
       if (outputIdUsed[outputData.id] !== undefined) {
-        console.warn("JSON: the output data id must be unique (" + outputData.id + " is used more than once).");
+        console.warn(
+          `SimulationVuer: JSON: the output data id must be unique (${outputData.id} is used more than once).`,
+        );
 
         return false;
       }
@@ -366,7 +398,9 @@ export function validJson(json) {
     }
 
     if (outputData.name === "") {
-      console.warn("JSON: the output data name must not be empty.");
+      console.warn(
+        "SimulationVuer: JSON: the output data name must not be empty.",
+      );
 
       return false;
     }
@@ -380,25 +414,33 @@ export function validJson(json) {
 
   const outputPlotsValid = json.output.plots.every((outputPlot) => {
     if (outputPlot.xAxisTitle === "") {
-      console.warn("JSON: the output plot X axis title must not be empty.");
+      console.warn(
+        "SimulationVuer: JSON: the output plot X axis title must not be empty.",
+      );
 
       return false;
     }
 
     if (outputPlot.xValue === "") {
-      console.warn("JSON: the output plot X value must not be empty.");
+      console.warn(
+        "SimulationVuer: JSON: the output plot X value must not be empty.",
+      );
 
       return false;
     }
 
     if (outputPlot.yAxisTitle === "") {
-      console.warn("JSON: the output plot Y axis title must not be empty.");
+      console.warn(
+        "SimulationVuer: JSON: the output plot Y axis title must not be empty.",
+      );
 
       return false;
     }
 
     if (outputPlot.yValue === "") {
-      console.warn("JSON: the output plot Y value must not be empty.");
+      console.warn(
+        "SimulationVuer: JSON: the output plot Y value must not be empty.",
+      );
 
       return false;
     }
@@ -415,13 +457,17 @@ export function validJson(json) {
   if (json.parameters !== undefined) {
     const parametersValid = json.parameters.every((parameter) => {
       if (parameter.name === "") {
-        console.warn("JSON: the parameter name must not be empty.");
+        console.warn(
+          "SimulationVuer: JSON: the parameter name must not be empty.",
+        );
 
         return false;
       }
 
       if (parameter.value === "") {
-        console.warn("JSON: the parameter value must not be empty.");
+        console.warn(
+          "SimulationVuer: JSON: the parameter value must not be empty.",
+        );
 
         return false;
       }
@@ -438,57 +484,74 @@ export function validJson(json) {
 
   let needOpencorSettings = false;
 
-  if (!json.simulation.solvers.every((solver) => {
-    if (solver.if !== undefined) {
-      if (solver.if === "") {
-        console.warn("JSON: a simulation solver if must not be empty.");
+  if (
+    !json.simulation.solvers.every((solver) => {
+      if (solver.if !== undefined) {
+        if (solver.if === "") {
+          console.warn(
+            "SimulationVuer: JSON: a simulation solver if must not be empty.",
+          );
 
-        return false;
+          return false;
+        }
       }
-    }
 
-    if (solver.input !== undefined) {
-      if (solver.input.name === "") {
-        console.warn("JSON: a simulation solver input name must not be empty.");
+      if (solver.input !== undefined) {
+        if (solver.input.name === "") {
+          console.warn(
+            "SimulationVuer: JSON: a simulation solver input name must not be empty.",
+          );
 
-        return false;
-      }
+          return false;
+        }
 
-      if (solver.input.value === "") {
-        console.warn("JSON: a simulation solver input value must not be empty.");
+        if (solver.input.value === "") {
+          console.warn(
+            "SimulationVuer: JSON: a simulation solver input value must not be empty.",
+          );
 
-        return false;
+          return false;
+        }
       }
-    }
 
-    if (solver.name === "") {
-      console.warn("JSON: a simulation solver name must not be empty.");
+      if (solver.name === "") {
+        console.warn(
+          "SimulationVuer: JSON: a simulation solver name must not be empty.",
+        );
 
-      return false;
-    }
+        return false;
+      }
 
-    needOpencorSettings = needOpencorSettings || (solver.name === OPENCOR_SOLVER_NAME);
+      needOpencorSettings =
+        needOpencorSettings || solver.name === OPENCOR_SOLVER_NAME;
 
-    if (solver.version === "") {
-      console.warn("JSON: a simulation solver version must not be empty.");
+      if (solver.version === "") {
+        console.warn(
+          "SimulationVuer: JSON: a simulation solver version must not be empty.",
+        );
 
-      return false;
-    }
+        return false;
+      }
 
-    return true;
-  })) {
+      return true;
+    })
+  ) {
     return false;
   }
 
-  if (needOpencorSettings && (json.simulation.opencor === undefined)) {
-    console.warn("JSON: the simulation solver for OpenCOR is specified so simulation OpenCOR settings must also be specified.");
+  if (needOpencorSettings && json.simulation.opencor === undefined) {
+    console.warn(
+      "SimulationVuer: JSON: the simulation solver for OpenCOR is specified so simulation OpenCOR settings must also be specified.",
+    );
 
     return false;
   }
 
   if (json.simulation.opencor !== undefined) {
     if (json.simulation.opencor.resource === "") {
-      console.warn("JSON: the simulation OpenCOR resource must not be empty.");
+      console.warn(
+        "SimulationVuer: JSON: the simulation OpenCOR resource must not be empty.",
+      );
 
       return false;
     }
@@ -496,23 +559,31 @@ export function validJson(json) {
     if (json.simulation.opencor.endingPoint !== undefined) {
       if (json.simulation.opencor.pointInterval !== undefined) {
         if (json.simulation.opencor.endingPoint <= 0.0) {
-          console.warn("JSON: the simulation OpenCOR ending point (" + json.simulation.opencor.endingPoint + ") must be greater than zero.");
+          console.warn(
+            `SimulationVuer: JSON: the simulation OpenCOR ending point (${json.simulation.opencor.endingPoint}) must be greater than zero.`,
+          );
 
           return false;
         }
 
         if (json.simulation.opencor.pointInterval <= 0.0) {
-          console.warn("JSON: the simulation OpenCOR point interval (" + json.simulation.opencor.pointInterval + ") must be greater than zero.");
+          console.warn(
+            `SimulationVuer: JSON: the simulation OpenCOR point interval (${json.simulation.opencor.pointInterval}) must be greater than zero.`,
+          );
 
           return false;
         }
       } else {
-        console.warn("JSON: a simulation OpenCOR ending point is specified so a simulation OpenCOR point interval must also be specified.");
+        console.warn(
+          "SimulationVuer: JSON: a simulation OpenCOR ending point is specified so a simulation OpenCOR point interval must also be specified.",
+        );
 
         return false;
       }
     } else if (json.simulation.opencor.pointInterval !== undefined) {
-      console.warn("JSON: a simulation OpenCOR point interval is specified so a simulation OpenCOR ending point must also be specified.");
+      console.warn(
+        "SimulationVuer: JSON: a simulation OpenCOR point interval is specified so a simulation OpenCOR ending point must also be specified.",
+      );
 
       return false;
     }

package/src/main.js

@@ -1,7 +1,8 @@
+import ElementPlus from "element-plus";
 import { createApp } from "vue";
 import * as VueRouter from "vue-router";
+
 import App from "./App.vue";
-import ElementPlus from "element-plus";
 
 const routes = [{ path: "/", component: App }];
 const router = VueRouter.createRouter({

package/vite.config.js

@@ -1,10 +1,13 @@
-import path from "path";
-import { resolve } from "node:path";
-const pathSrc = path.resolve(__dirname, "./src");
-import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
-import Components from "unplugin-vue-components/vite";
+
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { ElementPlusResolver } from "unplugin-vue-components/resolvers";
+import Components from "unplugin-vue-components/vite";
+import { defineConfig } from "vite";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const pathSrc = path.resolve(__dirname, "./src");
 
 export default defineConfig(({ command, mode }) => {
   const config = {
@@ -60,7 +63,9 @@ export default defineConfig(({ command, mode }) => {
   if (mode === "app") {
     config.base = "./";
 
-    ["build", "define", "resolve", "server"].forEach(key => delete config[key]);
+    for (const key of ["build", "define", "resolve", "server"]) {
+      delete config[key];
+    }
   }
 
   return config;