wikibase-cli 16.0.2 → 16.1.0

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/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.2",
+  "version": "16.1.0",
   "description": "A command-line interface to Wikibase",
   "main": "index.js",
   "bin": {