api-tuner 0.4.2 → 0.5.2

package/index.js

@@ -1,13 +1,16 @@
 import * as url from 'node:url';
 import * as childProcess from 'node:child_process';
-import { PassThrough } from 'node:stream';
-import { resolve } from 'node:path';
+import { PassThrough, Readable } from 'node:stream';
+import { resolve, dirname } from 'node:path';
 import { program } from 'commander';
 import getStream from 'get-stream';
+import mergeStreams from '@sindresorhus/merge-streams';
+import rdf from '@zazuko/env-node';
 import packageJson from './package.json' with { type: 'json' };
 import parseTestCase from './lib/parse-test-case.js';
 import summariseResults from './lib/summarise-results.js';
 const eyePvmPath = url.fileURLToPath(new URL('eye/lib/eye.pvm', import.meta.url));
+const tuner = rdf.namespace('https://api-tuner.described.at/');
 program
     .name('api-tuner')
     .option('--lib <lib>', 'Specify rules to include in all tests. Can be used multiple times. Make sure to surround globs in quotes to prevent expansion.', (lib, arr) => [...arr, lib], [])
@@ -47,7 +50,6 @@ const levelIcon = {
 };
 async function processPath(path) {
     return new Promise(resolve => {
-        const testCaseStream = parseTestCase(path, options.baseIri);
         const eyeProc = childProcess.spawn('swipl', [
             '-x',
             eyePvmPath,
@@ -59,7 +61,10 @@ async function processPath(path) {
         ], {
             shell: true,
         });
-        testCaseStream.pipe(eyeProc.stdin);
+        mergeStreams([
+            parseTestCase(path, options.baseIri),
+            tunerParams({ path }),
+        ]).pipe(eyeProc.stdin);
         const stdout = new PassThrough();
         const stderr = new PassThrough();
         eyeProc.on('exit', (code) => {
@@ -73,6 +78,14 @@ async function processPath(path) {
         eyeProc.stderr.pipe(stderr);
     });
 }
+function tunerParams({ path }) {
+    const rdfString = rdf.clownface()
+        .blankNode()
+        .addOut(tuner.scriptPath, dirname(resolve(path)))
+        .dataset
+        .toCanonical();
+    return Readable.from(rdfString);
+}
 const testSuites = program.args.map(async (path) => {
     const absolutePath = resolve(process.cwd(), path);
     const result = await processPath(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-tuner",
-  "version": "0.4.2",
+  "version": "0.5.2",
   "main": "index.js",
   "type": "module",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "postinstall": "([ -d eye ] || npm run download-eye) && eye/install.sh --prefix=eye",
     "prepare": "husky",
     "lint": "eslint . --quiet --ignore-path .gitignore",
-    "pre_test": "docker compose up -d",
+    "pre_test": "docker compose up -d && docker compose restart && npx wait-on http-get://localhost:1080/ping -t 10s",
     "_test": "./bin/tuner.sh --base-iri http://localhost:1080/",
     "test": "npm run _test -- tests/*.n3 tests/**/*.n3",
     "prepack": "tsc",
@@ -30,6 +30,7 @@
   "dependencies": {
     "@changesets/cli": "^2.29.7",
     "@jeswr/pretty-turtle": "^1.5.0",
+    "@sindresorhus/merge-streams": "^4.0.0",
     "@zazuko/env-node": "^2.1.4",
     "commander": "^13.1.0",
     "get-stream": "^9.0.1",
@@ -37,7 +38,7 @@
     "jsonld": "^8.3.3",
     "rdf-validate-shacl": "^0.5.6",
     "replacestream": "^4.0.3",
-    "tar": "^7.5.1"
+    "tar": "^7.5.2"
   },
   "devDependencies": {
     "@rdfjs/types": "^1",

package/rules/curl-body.n3

@@ -35,6 +35,9 @@ prefix math: <http://www.w3.org/2000/10/swap/math#>
 } <= {
   ?multipartBody!tuner:form!list:length math:greaterThan 0 .
 
+  ({ ?multipartBody tuner:done true } false true) log:ifThenElseIn ?SCOPE .
+  true log:becomes { ?multipartBody tuner:done true } .
+
   (
     ?formField
     {

package/rules/files.n3

@@ -1,3 +1,4 @@
+PREFIX tuner: <https://api-tuner.described.at/>
 prefix e: <http://eulersharp.sourceforge.net/2003/03swap/log-rules#>
 prefix string: <http://www.w3.org/2000/10/swap/string#>
 prefix log: <http://www.w3.org/2000/10/swap/log#>
@@ -49,5 +50,9 @@ prefix file: <http://www.w3.org/2000/10/swap/file#>
   ?fileUri string:startsWith "file:" .
   ( ?fileUri 6 ) string:substring ?relative .
 
-  ( "@$(pwd)/" ?relative ) string:concatenation ?ref .
+  [
+      tuner:scriptPath ?scriptPath
+  ] .
+
+  ( "@'" ?scriptPath "/" ?relative "'" ) string:concatenation ?ref .
 } .