wikibase-cli 15.16.2 → 15.16.6

package/bin/wb-hub

@@ -3,9 +3,10 @@ const program = require('../lib/program')
 
 program
 .option('-o, --open', 'open the found URL in a web browser')
+.option('-u, --url', 'simply generate the url')
 .process('hub')
 
-const { args, lang, json, open } = program
+const { args, lang, json, open, url: urlOnly } = program
 if (args.length === 0) program.helpAndExit(0)
 
 let argsString = args.join(' ')
@@ -15,15 +16,15 @@ if (lang && !(/l(ang)?=/.test(argsString))) argsString += ` lang=${lang}`
 // Default to Wikidata instead of Wikipedia
 if (!(/s(ite)?=/.test(argsString))) argsString += ' site=wikidata'
 
-if (!open) argsString += ' format=json'
+if (!(open || urlOnly)) argsString += ' format=json'
 
 const query = encodeURIComponent(argsString)
 const url = `https://tools.wmflabs.org/hub/query?q=${query}`
 
 const errors_ = require('../lib/errors')
 
-if (open) {
-  require('open')(url, { url: true })
+if (open || urlOnly) {
+  require('../lib/open')(url)
 } else {
   const output = require('../lib/output')(program)
   require('../lib/request').get(url)

package/bin/wd

@@ -1,21 +1,9 @@
 #!/usr/bin/env node
 
-// This use to be a simple one line shell script, but due to
-// compatibility reasons with Windows, it needed to be rewritten
-// in the one environment we know is available: node
+process.env.WB_INSTANCE = 'https://www.wikidata.org'
+process.env.WB_SPARQL_ENDPOINT = 'https://query.wikidata.org/sparql'
+// Fake the executed script to be wb to trick commander to believe it
+// as it would otherwise fail to build subcommand paths
+process.argv[1] = process.argv[1].replace(/wd$/, 'wb')
 
-const { spawn } = require('child_process')
-
-const escapeDollars = arg => arg.replace(/\$/g, '\\$')
-const args = process.argv.slice(2).map(escapeDollars)
-
-spawn('wb', args, {
-  env: Object.assign({
-    WB_INSTANCE: 'https://www.wikidata.org',
-    WB_SPARQL_ENDPOINT: 'https://query.wikidata.org/sparql',
-  }, process.env),
-  stdio: 'inherit',
-  // Required to not get a ENOENT on Windows
-  // See https://stackoverflow.com/a/54515183/3324977
-  shell: true,
-})
+require('./wb')

package/lib/edit/parse_batch_line.js

@@ -1,6 +1,8 @@
 // Args can't be just a line splitted on spaces
 // as there are JSON strings arguments, and signle or double quoted strings args
 
+const { parse } = require('shell-quote')
+
 module.exports = line => {
   // One JSON object as single argument
   // typically for (create|edit)-entity commands
@@ -11,7 +13,16 @@ module.exports = line => {
   // ex: [ "Q1" , "P2", '{"amount":123,"unit":"Q1947"}' ]'
   if (line[0] === '[') return JSON.parse(line)
 
-  // Otherwise, arguments should be simple enough to be separated by a single space
-  // ex: Q1 P2 123
-  return line.split(' ')
+  // Otherwise, parse arguments as shell arguments
+  // ex: Q1 P2 "ab cd"
+  return parse(preserveDollarGuid(line))
+}
+
+const preserveDollarGuid = line => {
+  return line
+  // Dashed GUIDs should be a supported format and don't produce
+  // the same dollar issues when parsing as shell arguments
+  .replace(dollarGuidPattern, '$1-$2')
 }
+
+const dollarGuidPattern = /(\w{1}\d+)\$([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/ig

package/metadata/hub.js

@@ -13,6 +13,7 @@ module.exports = {
   examples: [
     { args: 'viaf:24597135', comment: 'Find the entity having 24597135 as VIAF id' },
     { args: '--open viaf:24597135 site=inventaire', comment: 'Find the entity having 24597135 as VIAF id and open the corresponding page on inventaire.io' },
-    { args: 'Q3 property=image width=300', comment: 'Get the image illustrating Q3 in 300px' }
+    { args: 'Q3 property=image width=300', comment: 'Get the image illustrating Q3 in 300px' },
+    { args: 'Q3 --url', comment: 'Just return the query URL' },
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikibase-cli",
-  "version": "15.16.2",
+  "version": "15.16.6",
   "description": "A command-line interface to Wikibase",
   "main": "index.js",
   "bin": {
@@ -47,6 +47,7 @@
     "node-fetch": "^2.6.0",
     "open": "^7.0.4",
     "read": "^1.0.7",
+    "shell-quote": "^1.7.3",
     "split": "^1.0.1",
     "through": "^2.3.8",
     "wikibase-edit": "^4.16.0",