JavaScript: fixed linting issues with our JavaScript-related code.

Author: agarny

doc/stylesheet.css

@@ -26,7 +26,7 @@ body {
 body,
 div,
 #nav-tree .label {
-  font-family: "Arial", "Sans-Serif" !important;
+  font-family: "Arial", sans-serif !important;
 }
 
 div.line {

tests/bindings/javascript/res/res/libopencor.js

@@ -15,15 +15,15 @@ const lineSeries = chart.addLineSeries().setName('')
 
 export function showPage(page) {
   $('.nav-link').each(function () {
-    if (this.id === 'nav' + page) {
+    if (this.id === `nav${page}`) {
       this.classList.add('active')
     } else {
       this.classList.remove('active')
     }
   })
 
   $('.page').each(function () {
-    this.style.display = this.id === 'page' + page ? 'block' : 'none'
+    this.style.display = this.id === `page${page}` ? 'block' : 'none'
   })
 }
 
@@ -32,9 +32,9 @@ function showIssues(issues) {
 
   issuesElement.empty()
 
-  if (issues instanceof Array) {
+  if (Array.isArray(issues)) {
     for (let i = 0; i < issues.length; ++i) {
-      issuesElement.append('<li><span class="bold">Error:</span> ' + formattedIssueDescription(issues[i]) + '</li>')
+      issuesElement.append(`<li><span·class="bold">Error:</span>·${formattedIssueDescription(issues[i])}</li>`)
     }
   } else {
     for (let i = 0; i < issues.size(); ++i) {
@@ -62,7 +62,7 @@ function listFiles() {
     const files = fileManager.files
 
     for (let i = 0; i < files.size(); ++i) {
-      console.log(' - ' + files.get(i).fileName)
+      console.log(` - ${files.get(i).fileName}`)
     }
   } else {
     console.log('No files.')
@@ -85,11 +85,11 @@ export function reset() {
 }
 
 function addAxisElement(axis, name) {
-  axis.append('<option>' + name + '</option>')
+  axis.append(`<option>${name}</option>`)
 }
 
 function populateAxis(axisId) {
-  const axis = $('#' + axisId)
+  const axis = $(`#${axisId}`)
 
   axis.empty()
 
@@ -196,8 +196,8 @@ $(() => {
 
     input.onchange = () => {
       if (hasValidFile) {
-        let inputFile = input.files[0]
-        let fileReader = new FileReader()
+        const inputFile = input.files[0]
+        const fileReader = new FileReader()
 
         input.value = '' // Allow the user to select the same file again.
 
@@ -253,7 +253,7 @@ $(() => {
 
                 simulation = document.simulations.get(0)
 
-                if (simulation !== null && simulation.hasIssues) {
+                if (simulation?.hasIssues) {
                   showIssues(simulation.issues)
 
                   return
@@ -269,7 +269,7 @@ $(() => {
 
                 instanceTask = instance.tasks.get(0)
 
-                if (instanceTask !== null && instanceTask.hasIssues) {
+                if (instanceTask?.hasIssues) {
                   showIssues(instanceTask.issues)
 
                   return

tests/bindings/javascript/sed.basic.test.js

@@ -120,7 +120,7 @@ test.describe('Sed basic tests', () => {
 
     assert.strictEqual(document.hasIssues, true)
 
-    const neededFile = new loc.File(utils.CELLML_FILE)
+    new loc.File(utils.CELLML_FILE)
 
     document = new loc.SedDocument(file)
 
@@ -136,7 +136,7 @@ test.describe('Sed basic tests', () => {
 
     assert.strictEqual(document.hasIssues, true)
 
-    const neededFile = new loc.File(utils.LOCAL_FILE)
+    new loc.File(utils.LOCAL_FILE)
 
     document = new loc.SedDocument(file)
 
@@ -152,7 +152,7 @@ test.describe('Sed basic tests', () => {
 
     assert.strictEqual(document.hasIssues, true)
 
-    const neededFile = new loc.File(utils.REMOTE_FILE)
+    new loc.File(utils.REMOTE_FILE)
 
     document = new loc.SedDocument(file)
 

tests/bindings/javascript/sed.coverage.test.js

@@ -493,13 +493,16 @@ test.describe('Sed coverage tests', () => {
 
   test('SedDocument', () => {
     let file = new loc.File(utils.HTTP_REMOTE_CELLML_FILE)
-    let document = new loc.SedDocument(file)
+
+    new loc.SedDocument(file)
 
     file = new loc.File(utils.HTTP_REMOTE_SEDML_FILE)
-    document = new loc.SedDocument(file)
+
+    new loc.SedDocument(file)
 
     file = new loc.File(utils.HTTP_REMOTE_COMBINE_ARCHIVE)
-    document = new loc.SedDocument(file)
+
+    new loc.SedDocument(file)
   })
 
   test('Solver', () => {

tests/bindings/javascript/sed.serialise.test.js

@@ -146,7 +146,7 @@ test.describe('Sed serialise tests', () => {
     const document = new loc.SedDocument(file)
 
     assert.strictEqual(
-      document.serialise(utils.RESOURCE_LOCATION + '/../..'),
+      document.serialise(`${utils.RESOURCE_LOCATION}/../..`),
       cvodeExpectedSerialisation('some/path/cellml_2.cellml')
     )
   })
@@ -194,7 +194,7 @@ test.describe('Sed serialise tests', () => {
     const document = new loc.SedDocument(file)
 
     assert.strictEqual(
-      document.serialise(utils.REMOTE_BASE_PATH + '/../..'),
+      document.serialise(`${utils.REMOTE_BASE_PATH}/../..`),
       cvodeExpectedSerialisation('tests/res/cellml_2.cellml')
     )
   })
@@ -668,7 +668,7 @@ test.describe('Sed serialise tests', () => {
 
     file.setContents(sedmlContentsPtr, utils.SEDML_CONTENTS.length)
 
-    let document = new loc.SedDocument(file)
+    const document = new loc.SedDocument(file)
 
     assertIssues(loc, document, [
       [
@@ -922,7 +922,7 @@ test.describe('Sed serialise tests', () => {
 
     file.setContents(sedmlWithSimulationsContentsPtr, utils.SEDML_WITH_SIMULATIONS_CONTENTS.length)
 
-    let document = new loc.SedDocument(file)
+    const document = new loc.SedDocument(file)
 
     assertIssues(loc, document, [
       [loc.Issue.Type.WARNING, "The solver 'KISAO:1234567' is not recognised. The CVODE solver will be used instead."],

tests/bindings/javascript/utils.in.js

@@ -115,7 +115,7 @@ export function assertValue(value, expectedValue, precision) {
   } else if (Number.isNaN(expectedValue)) {
     assert.ok(Number.isNaN(value))
   } else {
-    assert.ok(Math.abs(value - expectedValue) < Math.pow(10, -precision) / 2)
+    assert.ok(Math.abs(value - expectedValue) < 0.5 * 10 ** -precision)
   }
 }
 
@@ -175,5 +175,5 @@ function stringToArrayBuffer(string) {
 }
 
 export function resourcePath(resourceRelativePath) {
-  return RESOURCE_LOCATION + '/' + resourceRelativePath
+  return `${RESOURCE_LOCATION}/${resourceRelativePath}`
 }

tests/bindings/javascript/version.test.js

@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import fs from 'fs'
 import assert from 'node:assert'
+import fs from 'node:fs'
+import path from 'node:path'
 import test from 'node:test'
-import path from 'path'
-import { fileURLToPath } from 'url'
+import { fileURLToPath } from 'node:url'
 
 import libOpenCOR from './libopencor.js'
 
@@ -41,7 +41,7 @@ test.describe('Version tests', () => {
     const ten = BigInt(10)
     const four = BigInt(4)
 
-    while (number != 0) {
+    while (number !== 0) {
       version |= (number % ten) << i
       number /= ten
       i += four