new structure

Author: timea-solid

.github/workflows/ci.yml

@@ -23,7 +23,6 @@ jobs:
     strategy:
       matrix:
         node-version: 
-          - 18.x
           - 20.x
           - 22.x
 

eslint.config.mjs

@@ -1,23 +1,29 @@
-import { defineConfig, globalIgnores } from "eslint/config";
-import globals from "globals";
+import globals from "globals"
 
-export default defineConfig([globalIgnores(["src/**/*.test.js"]), {
-    languageOptions: {
-        globals: {
-            ...globals.browser,
-            ...globals.node,
-            Atomics: "readonly",
-            SharedArrayBuffer: "readonly",
+export default [
+    {
+        ignores: [
+            'node_modules/**',
+            'coverage/**'
+        ],
+    }, 
+    {
+        files: ['src/**/*.js'],
+        languageOptions: {
+            globals: {
+                ...globals.browser,
+                ...globals.node,
+                Atomics: "readonly",
+                SharedArrayBuffer: "readonly",
+            },
         },
 
-        ecmaVersion: 8,
-        sourceType: "commonjs",
-    },
-
-    rules: {
-        "no-unused-vars": ["warn", {
-            argsIgnorePattern: "^_",
-            varsIgnorePattern: "^_",
-        }],
-    },
-}]);
+        rules: {
+            semi: ['error', 'never'],
+            quotes: ['error', 'single'],
+            'no-console': 'warn',
+            'no-unused-vars': 'warn',
+            'no-undef': 'error'
+        },
+    }
+]

jest.config.js

@@ -1,8 +1,12 @@
 module.exports = {
+  collectCoverage: true,
+  coverageDirectory: 'coverage',
   testEnvironment: 'jsdom',
   testEnvironmentOptions: {
       customExportConditions: ['node']
   },
-  setupFilesAfterEnv: ["./jest.setup.js"],
+  setupFilesAfterEnv: ["./test/helpers/jest.setup.js"],
   transformIgnorePatterns: ["/node_modules/(?!lit-html).+\\.js"],
+  testMatch: ['**/__tests__/**/*.ts?(x)', '**/?(*.)+(spec|test).ts?(x)'],
+  roots: ['<rootDir>/src', '<rootDir>/test'],
 }

package.json

@@ -5,9 +5,9 @@
   "main": "src/sourcePane.js",
   "scripts": {
     "build": "echo nothing to build",
-    "lint": "eslint 'src/*.js'",
-    "lint-fix": "eslint 'src/*.js' --fix",
-    "test": "jest",
+    "lint": "eslint",
+    "test": "jest --no-coverage",
+    "test-coverage": "jest --coverage --collectCoverageFrom=src/**/*.[jt]s",
     "prepublishOnly": "npm run lint && npm run test",
     "postpublish": "git push origin main --follow-tags"
   },

src/sourcePane.js

@@ -131,8 +131,8 @@ module.exports = {
       textArea.style.color = '#888'
       cancelButton.style.visibility = 'visible'
       saveButton.style.visibility = 'collapse'
-      myCompactButton['style'] = "visibility: visible; width: 100px; padding: 10.2px; transform: translate(0, -30%)"
-      if (!compactable[contentType.split(';')]) {  myCompactButton.style.visibility = "collapse" }
+      myCompactButton['style'] = 'visibility: visible; width: 100px; padding: 10.2px; transform: translate(0, -30%)'
+      if (!compactable[contentType.split(';')]) {  myCompactButton.style.visibility = 'collapse' }
       textArea.setAttribute('readonly', 'true')
     }
     function setEditable () {
@@ -193,6 +193,7 @@ module.exports = {
     function HTMLDataIsland (data) {
       let dataIslandContentType = ''
       let dataIsland = ''
+      let pos = 0 
       const scripts = data.split('</script')
       if (scripts && scripts.length) {
         for (let script of scripts) {
@@ -206,11 +207,12 @@ module.exports = {
           }
         }
       }
-      return [dataIsland, dataIslandContentType]
+      return [dataIsland, dataIslandContentType, pos]
     }
 
     function checkSyntax (data, contentType, base) {
       if (!parseable[contentType]) return true // don't check things we don't understand
+      let pos
       if (contentType === 'text/html') {
         [data, contentType, pos] = HTMLDataIsland(data)
         if (!contentType) return true
@@ -306,7 +308,7 @@ module.exports = {
             $rdf.parse(textArea.value, kb, subject.uri, contentType)
             // for jsonld serialize which is a Promise. New rdflib
             const serialized = Promise.resolve($rdf.serialize(kb.sym(subject.uri), kb, subject.uri, contentType))
-            serialized.then(result => { textArea.value = result; /*return div*/ })
+            serialized.then(result => { textArea.value = result /*return div*/ })
             cancelButton.style.visibility = 'visible'
           } catch (e) {
             statusRow.appendChild(UI.widgets.errorMessageBlock(dom, e))

jest.setup.js renamed to test/helpers/jest.setup.js

@@ -1,4 +1,4 @@
-const { context, doc, subject } = require('./setup')
+const { context, doc, subject } = require('./helpers/setup')
 const pane = require('../src/sourcePane')
 const { findByText, fireEvent, getByTitle, waitFor } = require('@testing-library/dom')
 const fetchMock = require('jest-fetch-mock')