wikibase-cli 15.15.1 → 15.15.5

package/bin/wb-data

@@ -3,9 +3,9 @@ const program = require('../lib/program')
 
 program
 .option('-s, --simplify', 'get simplified entities data')
-.option('-k, --keep <props>', 'data to keep when simplifying claims')
+.option('-k, --keep <props>', 'data to keep when simplifying claims (ids,richvalues,types,references,qualifiers,hashes,nontruthy,nondeprecated,ranks)')
 .option('--time-converter <converter>', 'specify which time format should be used when simplifying')
-.option('-p, --props <props>', 'request only certain properties (info, sitelinks, aliases, labels, descriptions, claims, datatype)')
+.option('-p, --props <props>', 'request only certain properties (info,sitelinks,aliases,labels,descriptions,claims,datatype)')
 .option('-r, --revision <id>', 'request a specific revision')
 .option('-f, --format <format>', 'Default: ndjson. Alternatives: ttl')
 .process('data')

package/bin/wb-query

@@ -5,6 +5,8 @@ program
 .option('-s, --subject <subject>', 'set a subject')
 .option('-p, --property <property>', 'set a property')
 .option('-o, --object <object>', 'set an object')
+.option('-qp, --qualifier-property <property>', 'set a qualifier property')
+.option('-qo, --qualifier-object <object>', 'set a qualifier value')
 .option('--describe <node>', 'make a DESCRIBE request')
 .option('--sample', 'select a sample of triples')
 .option('-a, --labels', 'requests results labels')

package/lib/config/file_path.js

@@ -9,7 +9,7 @@ if (configFolder != null) {
     fs.accessSync(configPath)
   } catch (err) {
     // Initialize if it doesn't exist
-    fs.writeFileSync(configPath, '{}')
+    fs.writeFileSync(configPath, '{}', { mode: 0o600 })
   }
   module.exports = configPath
 } else {

package/lib/format_statement_element_value.js

@@ -1,29 +1,39 @@
 const { isEntityId, isPropertyId } = require('wikibase-sdk')
 const errors_ = require('../lib/errors')
 
+const prefixedProperty = prefix => value => {
+  if (isPropertyId(value)) return `${prefix}:${value}`
+  if (isUrlValue(value)) return formatUrlValue(value)
+  errors_.exit(`invalid property: ${value}`)
+}
+
+const object = value => {
+  // entity
+  if (value[0] === 'Q') return `wd:${value}`
+  // property
+  if (value[0] === 'P') return `wdt:${value}`
+  // number
+  if (/^\d+(\.\d+)?$/.test(value)) return value
+  // URL
+  if (isUrlValue(value)) return formatUrlValue(value)
+  // string
+  return `"${value}"`.replace(/""/g, '"')
+}
+
 module.exports = {
   subject: value => {
     if (isEntityId(value)) return `wd:${value}`
     if (isUrlValue(value)) return formatUrlValue(value)
     errors_.exit(`invalid subject: ${value}`)
   },
-  property: value => {
-    if (isPropertyId(value)) return `wdt:${value}`
-    if (isUrlValue(value)) return formatUrlValue(value)
-    errors_.exit(`invalid property: ${value}`)
-  },
-  object: value => {
-    // entity
-    if (value[0] === 'Q') return `wd:${value}`
-    // property
-    if (value[0] === 'P') return `wdt:${value}`
-    // number
-    if (/^\d+(\.\d+)?$/.test(value)) return value
-    // URL
-    if (isUrlValue(value)) return formatUrlValue(value)
-    // string
-    return `"${value}"`.replace(/""/g, '"')
-  }
+
+  property: prefixedProperty('wdt'),
+  pProperty: prefixedProperty('p'),
+  psProperty: prefixedProperty('ps'),
+  pqProperty: prefixedProperty('pq'),
+
+  object,
+  pqObject: object,
 }
 
 const isUrlValue = value => /^<?(https?|ftp):\/\/.+/.test(value)

package/lib/generate_select_sparql_query.js

@@ -1,20 +1,29 @@
 const formatStatementElementValue = require('./format_statement_element_value')
 
 module.exports = program => {
-  let { count: countResults, labels: selectLabels, lang } = program
+  let { count: countResults, labels: selectLabels, lang, qualifierProperty, qualifierObject } = program
+
+  const useSubSnaks = (qualifierProperty != null || qualifierObject != null)
 
   selectLabels = selectLabels && !countResults
 
   if (program.subject && program.property && program.object) {
-    console.log('At maximum two statement element should be set')
+    console.log('At maximum two main statement elements should be set')
     process.exit(1)
   }
 
   let select = ''
-  let triple = '?subject ?property ?object .'
+  let triple
+  if (useSubSnaks) {
+    triple = `?subject ?pProperty ?statement .
+  ?statement ?psProperty ?object .
+  ?statement ?pqProperty ?pqObject .`
+  } else {
+    triple = '?subject ?property ?object .'
+  }
 
-  const setElement = elName => {
-    let value = program[elName]
+  const setElement = (elName, value) => {
+    value = value || program[elName]
     if (value) {
       value = formatStatementElementValue[elName](value)
       triple = triple.replace(`?${elName}`, value)
@@ -36,7 +45,14 @@ module.exports = program => {
   }
 
   setElement('subject')
-  setElement('property')
+  if (useSubSnaks) {
+    setElement('pProperty', program.property)
+    setElement('psProperty', program.property)
+    if (qualifierProperty) setElement('pqProperty', qualifierProperty)
+    if (qualifierObject) setElement('pqObject', qualifierObject)
+  } else {
+    setElement('property')
+  }
   setElement('object')
 
   if (selectLabels) {

package/lib/validate_function_args.js

@@ -9,12 +9,15 @@ module.exports = (fn, inputArgs, metadata) => {
     const minArgs = minimumRequiredArgs(metadata.args)
     if (metadata.args && inputArgs.length < minArgs) {
       const message = `the passed function expects at least ${minArgs} arguments`
-      errors_.bundle(message, { expectedArgs: metadata.args, inputArgs })
+      errors_.bundle(message, { expectedArgs: metadata.args, inputArgs, fn: fn.toString() })
     }
   } else {
-    if (fn.length !== inputArgs.length) {
-      const message = `the passed function expects ${fn.length} arguments`
-      errors_.bundle(message, { inputArgs })
+    const minArgs = fn.length
+    // It might be that the function accepts more than fn.length arguments
+    // as rest parameters aren't counted
+    if (inputArgs.length < minArgs) {
+      const message = `the passed function expects at least ${fn.length} arguments`
+      errors_.bundle(message, { inputArgs, fn: fn.toString() })
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikibase-cli",
-  "version": "15.15.1",
+  "version": "15.15.5",
   "description": "A command-line interface to Wikibase",
   "main": "index.js",
   "bin": {
@@ -13,7 +13,7 @@
     "lint-staged": "./scripts/lint_staged",
     "prepublishOnly": "npm run lint && npm test",
     "postpublish": "npm run docker:publish && git push --tags",
-    "test": "mocha --exit",
+    "test": "mocha --exit --timeout 20000",
     "update-toc": "./scripts/update_toc"
   },
   "repository": {
@@ -50,7 +50,7 @@
     "split": "^1.0.1",
     "through": "^2.3.8",
     "wikibase-edit": "^4.14.2",
-    "wikibase-sdk": "^7.14.0",
+    "wikibase-sdk": "^7.14.1",
     "wikidata-lang": "^2.0.11"
   },
   "devDependencies": {
@@ -62,7 +62,7 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
     "git-hooks": "^1.1.10",
-    "mocha": "^5.2.0",
+    "mocha": "^9.1.3",
     "should": "^13.2.3"
   },
   "engines": {