Merge pull request #299 from zazuko/test-fixes

Test fixes
zazuko · May 15, 2024 · 2c9e4e4 · 2c9e4e4
2 parents 30be08d + d1dfc9a
commit 2c9e4e4
Show file tree

Hide file tree

Showing 22 changed files with 82 additions and 32 deletions.
diff --git a/.changeset/wet-walls-greet.md b/.changeset/wet-walls-greet.md
@@ -0,0 +1,5 @@
+---
+"barnard59-formats": patch
+---
+
+Context was unbound in step `jsonld/parse/object`
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -29,8 +29,6 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - run: npm ci
-      - name: Compile TypeScript packages
-        run: npx wsrun -mc build --sourceMap
       - run: npx c8 --all --src packages/${{ matrix.package }} -x "packages/!(${{ matrix.package }})" --reporter lcovonly --reporter text wsrun --no-prefix -p barnard59-${{ matrix.package }} -c test
       - name: Codecov
         uses: codecov/codecov-action@v3

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
   "devDependencies": {
     "@changesets/cli": "^2.26.1",
     "@tpluscode/eslint-config": "^0.4.5",
+    "@types/chai": "^4.3.16",
     "@types/node": "^18",
     "@typescript-eslint/eslint-plugin": "^6.13.2",
     "@typescript-eslint/parser": "^6.13.2",
@@ -27,7 +28,6 @@
     "mocha": "^10.2.0",
     "sinon-chai": "^3.7.0",
     "ts-node": "^10.9.2",
-    "tsm": "^2.3.0",
     "typescript": "^5.3.2",
     "wsrun": "^5.2.4"
   },

diff --git a/packages/base/package.json b/packages/base/package.json
@@ -51,6 +51,6 @@
   },
   "mocha": {
     "require": "../../test/mocha-setup.cjs",
-    "loader": "tsm"
+    "loader": "ts-node/esm/transpile-only"
   }
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -53,6 +53,7 @@
     "@rdfjs-elements/formats-pretty": "^0.6.7",
     "@types/lodash": "^4.14.202",
     "@types/readable-stream": "^4.0.10",
+    "@types/shelljs": "^0.8.15",
     "approvals": "^6.2.2",
     "barnard59-base": "^2.4.2",
     "barnard59-formats": "^2.1.1",
@@ -66,6 +67,6 @@
     "strip-ansi": "^7.0.0"
   },
   "mocha": {
-    "loader": "esmock"
+    "loader": "ts-node/esm/transpile-only"
   }
 }
diff --git a/packages/cli/test/support/filenamePipelineDefinition.js b/packages/cli/test/support/filenamePipelineDefinition.js
@@ -2,6 +2,10 @@ import { resolve } from 'path'
 
 const base = new URL('.', import.meta.url).pathname
 
+/**
+ * @param {string} name
+ * @returns {string}
+ */
 function filenamePipelineDefinition(name) {
   return resolve(base, `definitions/${name}.ttl`)
 }

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -50,6 +50,6 @@
   },
   "mocha": {
     "require": "../../test/mocha-setup.cjs",
-    "loader": "tsm"
+    "loader": "ts-node/esm"
   }
 }
diff --git a/packages/csvw/package.json b/packages/csvw/package.json
@@ -37,6 +37,6 @@
     "node": ">= 14.0.0"
   },
   "mocha": {
-    "loader": "tsm"
+    "loader": "ts-node/esm"
   }
 }
diff --git a/packages/cube/package.json b/packages/cube/package.json
@@ -42,6 +42,6 @@
     "shelljs": "^0.8.5"
   },
   "mocha": {
-    "loader": "tsm"
+    "loader": "ts-node/esm"
   }
 }
diff --git a/packages/formats/jsonld.js b/packages/formats/jsonld.js
@@ -29,7 +29,7 @@ function parse({ localContext } = {}) {
   })
 }
 
-const parseObject = () => {
+const parseObject = function () {
   return tracer.startActiveSpan('jsonld:parse.object', span => {
     const stream = combine([jsonStringify(), parse.call(this)], { objectMode: true })
     stream.on('error', err => {

diff --git a/packages/formats/package.json b/packages/formats/package.json
@@ -40,6 +40,6 @@
     "node": ">= 14.0.0"
   },
   "mocha": {
-    "loader": "tsm"
+    "loader": "ts-node/esm"
   }
 }
diff --git a/packages/ftp/package.json b/packages/ftp/package.json
@@ -35,6 +35,6 @@
     "ssh2": "^1.15.0"
   },
   "mocha": {
-    "loader": "tsm"
+    "loader": "ts-node/esm"
   }
 }
diff --git a/packages/graph-store/package.json b/packages/graph-store/package.json
@@ -53,6 +53,6 @@
     "node": ">= 14.0.0"
   },
   "mocha": {
-    "loader": "tsm"
+    "loader": "ts-node/esm/transpile-only"
   }
 }
diff --git a/packages/http/package.json b/packages/http/package.json
@@ -32,6 +32,6 @@
     "is-stream": "^3.0.0"
   },
   "mocha": {
-    "loader": "tsm"
+    "loader": "ts-node/esm"
   }
 }
diff --git a/packages/rdf/package.json b/packages/rdf/package.json
@@ -60,6 +60,6 @@
   },
   "mocha": {
     "require": "../../test/mocha-setup.cjs",
-    "loader": "tsm"
+    "loader": "ts-node/esm/transpile-only"
   }
 }
diff --git a/packages/s3/package.json b/packages/s3/package.json
@@ -46,6 +46,6 @@
     "rimraf": "^5.0.5"
   },
   "mocha": {
-    "loader": "tsm"
+    "loader": "ts-node/esm/transpile-only"
   }
 }
diff --git a/packages/shacl/package.json b/packages/shacl/package.json
@@ -49,6 +49,6 @@
   },
   "mocha": {
     "require": "../../test/mocha-setup.cjs",
-    "loader": "tsm"
+    "loader": "ts-node/esm/transpile-only"
   }
 }
diff --git a/packages/sparql/package.json b/packages/sparql/package.json
@@ -39,6 +39,6 @@
     "node": ">= 14.0.0"
   },
   "mocha": {
-    "loader": "tsm"
+    "loader": "ts-node/esm/transpile-only"
   }
 }
diff --git a/packages/validation/lib/utils.js b/packages/validation/lib/utils.js
@@ -7,6 +7,8 @@ import { manifestLocation } from './config.js'
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 const require = module.createRequire(url.fileURLToPath(import.meta.url))
 
+require.extensions['.ts'] = require.extensions['.js']
+
 const resolvePaths = [
   process.cwd(),
   __dirname,

diff --git a/packages/validation/package.json b/packages/validation/package.json
@@ -42,6 +42,6 @@
     "rdf-loader-code": "^2.1.3"
   },
   "mocha": {
-    "loader": "esmock"
+    "loader": ["ts-node/esm", "esmock"]
   }
 }
diff --git a/packages/validation/test/cli.test.js b/packages/validation/test/cli.test.js
@@ -5,10 +5,16 @@ const { assert } = chai
 chai.use(chaiExec)
 chaiExec.defaults = {
   command: './cli.js',
+  options: {
+    env: {
+      ...process.env,
+      NODE_OPTIONS: '--no-warnings --loader ts-node/esm',
+    },
+  },
 }
 
 describe('barnard59-validate', function () {
-  this.timeout(10000)
+  this.timeout(20000)
 
   it('should exit with a zero exit code', () => {
     const cli = chaiExec(' ./sample-pipelines/fetch-json-to-ntriples.ttl')