wikibase-cli 16.0.0 → 16.1.0

package/README.md

@@ -54,7 +54,7 @@ See [CHANGELOG.md](CHANGELOG.md) for version info
 ## Dependencies
 
 ### General
-* [NodeJs](https://nodejs.org) **>= v8** (recommended way to install it: use the awesome [NVM](https://github.com/creationix/nvm))
+* [NodeJs](https://nodejs.org) **>= v10** (recommended way to install it: use the awesome [NVM](https://github.com/creationix/nvm) to install the latest LTS version `nvm install --lts`)
 * [Git](https://git-scm.com/)
 
 ### Per feature

package/bin/wb-add-claim

@@ -7,4 +7,5 @@ const inlineArgsParser = ([ id, property, value ]) => {
   return [ data ]
 }
 program.customArgsParser = polymorphicCommandArgsParser(inlineArgsParser)
+program.customHelpOption = require('../lib/command_with_template_custom_help')
 require('../lib/edit/edit_command')('claim', 'add')

package/bin/wb-merge-entity

@@ -1,7 +1,24 @@
 #!/usr/bin/env node
 const program = require('commander')
 const polymorphicCommandArgsParser = require('../lib/polymorphic_command_args_parser')
-const inlineArgsParser = args => [ { from: args[0], to: args[1] } ]
+
+const inlineArgsParser = args => {
+  if (program.keepOldest) {
+    const [ newest, oldest ] = getSortedEntitiesIds(args)
+    return [ { from: newest, to: oldest } ]
+  } else {
+    return [ { from: args[0], to: args[1] } ]
+  }
+}
+
+const getSortedEntitiesIds = args => {
+  return args
+  .slice(0, 2)
+  .sort((a, b) => getNumericId(b) - getNumericId(a))
+}
+
+const getNumericId = id => parseInt(id.replace(/^[A-Z]+/i, ''))
+
 program.customArgsParser = polymorphicCommandArgsParser(inlineArgsParser)
 program.customHelpOption = require('../lib/command_with_template_custom_help')
 require('../lib/edit/edit_command')('entity', 'merge')

package/bin/wb-search

@@ -15,6 +15,7 @@ if (!(search && search.length > 0)) program.helpAndExit(0)
 
 let { lang: language, json, verbose, properties, limit, type, cirrus } = program
 limit = limit || 20
+if (typeof limit === 'string') limit = parseInt(limit)
 
 if (properties) program.verbose = verbose = true
 

package/lib/edit/edit_command.js

@@ -152,7 +152,7 @@ const runInBatch = (section, action, exitOnError) => {
         successes++
       } catch (err) {
         errors++
-        if (exitOnError) throw err
+        if (exitOnError) logErrorAndExit(err)
         else if (err.code === 'EMPTY_PARAMS') console.error('produced an empty parameters object: passing')
         else console.error(`error triggered by line: "${line}":`, err)
       }
@@ -175,6 +175,10 @@ const randomKey = () => Math.random().toString(16).slice(2)
 const logErrorAndExit = err => {
   if (err.statusCode === 400) {
     console.error(red(err.message), err.context)
+  } else if (err.body && err.body.error && err.body.error.messages) {
+    err.body.error.messages.forEach(message => {
+      console.error(`${red(message.name)}\n${JSON.stringify(message, null, 2)}`)
+    })
   } else {
     // util.inspect doc: https://nodejs.org/api/util.html#util_util_inspect_object_options
     console.error(inspect(err, { depth: null, maxArrayLength: null }))

package/lib/global_options_help.js

@@ -11,5 +11,6 @@ module.exports = {
   summary: [ '-s, --summary <text>', 'set the edit summary' ],
   baserevid: [ '--baserevid <id>', 'set the baserevid' ],
   maxlag: [ '--maxlag <num>', 'set the maxlag value' ],
-  rank: [ '--rank <rank>', 'set the claim rank' ]
+  rank: [ '--rank <rank>', 'set the claim rank' ],
+  keepOldest: [ '--keep-oldest', 'Merge the newest entity in the oldest one. By default, the arguments order determins which entity is kept: the first entity is merged into the second entity' ],
 }

package/metadata/merge-entity.js

@@ -4,7 +4,7 @@ module.exports = {
   alias: 'me',
   args: '<from-id> <to-id>',
   description: 'Merge an entity into another',
-  options: editCommands,
+  options: { keepOldest: true, ...editCommands },
   examples: [
     {
       args: 'Q1 Q2',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikibase-cli",
-  "version": "16.0.0",
+  "version": "16.1.0",
   "description": "A command-line interface to Wikibase",
   "main": "index.js",
   "bin": {
@@ -50,7 +50,7 @@
     "shell-quote": "^1.7.3",
     "split": "^1.0.1",
     "through": "^2.3.8",
-    "wikibase-edit": "^5.0.0",
+    "wikibase-edit": "^5.0.3",
     "wikibase-sdk": "^8.0.0",
     "wikidata-lang": "^2.0.11"
   },