Improve the reporting of libCellML-related error messages

package.json

@@ -23,7 +23,7 @@
     "url": "git+https://github.com/opencor/webapp.git"
   },
   "type": "module",
-  "version": "1.20261005.0",
+  "version": "1.20261005.1",
   "engines": {
     "bun": ">=1.2.0"
   },
@@ -86,7 +86,7 @@
     "electron-vite": "^5.0.0",
     "esbuild": "^0.28.2",
     "node-addon-api": "^8.9.2",
-    "postcss": "^8.5.28",
+    "postcss": "^8.5.29",
     "rollup-plugin-visualizer": "^7.1.1",
     "stylelint": "^17.16.0",
     "stylelint-config-standard": "^40.0.0",

src/renderer/package.json

@@ -42,7 +42,7 @@
     },
     "./style.css": "./dist/opencor.css"
   },
-  "version": "1.20261005.0",
+  "version": "1.20261005.1",
   "libopencorVersion": "1.20260803.0",
   "scripts": {
     "build": "vite build && bun scripts/generate.version.ts",
@@ -87,7 +87,7 @@
     "@vue/tsconfig": "^0.9.1",
     "autoprefixer": "^10.6.1",
     "esbuild": "^0.28.2",
-    "postcss": "^8.5.28",
+    "postcss": "^8.5.29",
     "rollup-plugin-visualizer": "^7.1.1",
     "stylelint": "^17.16.0",
     "stylelint-config-standard": "^40.0.0",

src/renderer/src/components/views/SimulationExperimentInteractiveView.vue

@@ -284,7 +284,7 @@ const uiJsonEmpty = vue.computed<boolean>(() => {
 });
 
 const mathEval = new math.Float64ArrayMath();
-const model = document.model(0);
+const model = isDocumentValid ? document.model(0) : null;
 const isSimulating = vue.ref<boolean>(false);
 const liveData = vue.ref<IGraphPanelData[]>([]);
 let margins: Record<string, IGraphPanelMargins> = {};
@@ -1049,9 +1049,9 @@ const reinstantiateInstance = (): locApi.SedInstance => {
 // Run the interactive simulation.
 
 const updateSimulation = async (): Promise<void> => {
-  // Make sure that the view is usable, i.e. that we have an instance.
+  // Make sure that the view is usable, i.e. that we have a model and an instance.
 
-  if (!instance) {
+  if (!model || !instance) {
     return;
   }
 
@@ -1649,7 +1649,7 @@ const onToggleRunColorPopover = (index: number, event: MouseEvent): void => {
 const onDownloadCombineArchive = (): void => {
   const jsZip = new dependencies._jsZip();
   const baseFileName = common.fileName(props.file.path()).replace(/\.[^/.]+$/, '');
-  const modelFile = model.file();
+  const modelFile = model?.file();
 
   if (!modelFile) {
     emit('error', 'Cannot create COMBINE archive: no model file available.');

src/renderer/src/libopencor/locFileApi.ts

@@ -141,7 +141,7 @@ export class File {
   }
 
   document(): SedDocument {
-    return new SedDocument(this._path, this._wasmFile);
+    return new SedDocument(this._path, this._wasmFile, this._issues);
   }
 
   uiJson(): IUiJson | undefined {

src/renderer/src/libopencor/locSedApi.ts

@@ -38,7 +38,16 @@ export class SedDocument {
   private _wasmSedDocument: IWasmSedDocument = {} as IWasmSedDocument;
   private _issues: IIssue[] = [];
 
-  constructor(filePath: string, wasmFile: IWasmFile) {
+  constructor(filePath: string, wasmFile: IWasmFile, fileIssues: IIssue[]) {
+    // If the file has some errors (e.g., an invalid CellML file), then report its issues rather than those of the
+    // SED-ML document (since those are likely to be a consequence of the file's errors).
+
+    if (fileIssues.some((issue: IIssue) => issue.type === EIssueType.ERROR)) {
+      this._issues = [...fileIssues];
+
+      return;
+    }
+
     // Create the SED-ML document.
 
     if (cppVersion()) {
@@ -53,6 +62,12 @@ export class SedDocument {
       ? _cppLocApi.sedDocumentIssues(this._cppDocumentId)
       : wasmIssuesToIssues(this._wasmSedDocument.issues);
 
+    // Don't check anything else if the SED-ML document already has some errors.
+
+    if (this._issues.some((issue: IIssue) => issue.type === EIssueType.ERROR)) {
+      return;
+    }
+
     // TODO: we only support a limited subset of SED-ML for now, so we need to check a few more things. Might wnat to
     // check https://github.com/opencor/opencor/blob/master/src/plugins/support/SEDMLSupport/src/sedmlfile.cpp#L579-L1492.