wikibase-cli 18.0.0 → 18.0.1

package/lib/make_sparql_query.js

@@ -34,6 +34,7 @@ function makeRequest (url, format) {
       headers: {
         Accept: formatAcceptHeader[format],
       },
+      parseResponseAsJson: format === 'json',
     })
   } else {
     const [ postUrl, urlencodedSparql ] = url.split('?')
@@ -45,6 +46,7 @@ function makeRequest (url, format) {
         'Content-type': 'application/sparql-query',
         Accept: formatAcceptHeader[format],
       },
+      parseResponseAsJson: format === 'json',
     })
   }
 }
@@ -72,6 +74,9 @@ function parseResult (format) {
         results = minimizeSimplifiedSparqlResults(simplifySparqlResults(results))
         if (indexAttribute) results = indexBy(results, indexAttribute)
       }
+      if (format === 'csv') {
+        results = results.replace(/\r\n/g, '\n')
+      }
       return results
     } catch (err) {
       err.context = { results }

package/lib/request.js

@@ -19,18 +19,18 @@ export const get = async url => {
   return handleResponse({ res, url })
 }
 
-export const customGet = async ({ url, headers }) => {
+export const customGet = async ({ url, headers, parseResponseAsJson = true }) => {
   const res = await request(url, { headers: buildHeaders(headers) })
-  return handleResponse({ res, url })
+  return handleResponse({ res, url, parseResponseAsJson })
 }
 
-export const post = async ({ url, body, headers }) => {
+export const post = async ({ url, body, headers, parseResponseAsJson = true }) => {
   const method = 'post'
   const res = await request(url, { method, body, headers: buildHeaders(headers) })
-  return handleResponse({ res, url, method })
+  return handleResponse({ res, url, method, parseResponseAsJson })
 }
 
-async function handleResponse ({ res, url, method }) {
+async function handleResponse ({ res, url, method, parseResponseAsJson = true }) {
   let body = await res.text()
   const { logResponseHeaders } = program
   if (logResponseHeaders) {
@@ -43,11 +43,13 @@ async function handleResponse ({ res, url, method }) {
     }
     console.error(JSON.stringify({ request: { url, method }, response: { headers } }))
   }
-  // When Wikibase crash it doesn't return JSON errors anymore
-  try {
-    body = JSON.parse(body)
-  } catch (err) {
-    console.error('could not parse response body as JSON', err, { body })
+  if (parseResponseAsJson) {
+    // When Wikibase crash it doesn't return JSON errors anymore
+    try {
+      body = JSON.parse(body)
+    } catch (err) {
+      console.error('could not parse response body as JSON', err, { body })
+    }
   }
   const { status: statusCode } = res
   if (statusCode >= 400) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikibase-cli",
-  "version": "18.0.0",
+  "version": "18.0.1",
   "description": "A command-line interface to Wikibase",
   "type": "module",
   "main": "index.js",
@@ -14,7 +14,7 @@
     "lint": "eslint --config .eslintrc.cjs bin/* lib test",
     "lint-fix": "eslint --config .eslintrc.cjs --fix bin/* lib test",
     "lint-staged": "./scripts/lint_staged",
-    "prepublishOnly": "npm run lint && npm test",
+    "prepublishOnly": "export MOCHA_OPTIONS='--bail'; npm run lint && npm test",
     "postpublish": "npm run docker:publish && git push --tags",
     "test": "mocha --exit --timeout 20000 $MOCHA_OPTIONS",
     "update-toc": "./scripts/update_toc"