wikibase-cli 18.3.2 → 18.3.3

package/bin/wb-claims.js

@@ -59,11 +59,13 @@ const run = async () => {
     return output(ids)
   }
 
-  const simplifiedClaims = simplifyClaims(entity[statementsKey], { keepNonTruthy })
+  const simplifiedClaims = simplifyClaims(entity[statementsKey], { keepNonTruthy, keepTypes: true })
   if (!prop) return logClaims({ program, simplifiedClaims, pattern, resort: true })
 
-  value = simplifiedClaims[prop]
-  if (value != null) return output(simplifiedClaims[prop])
+  if (simplifiedClaims[prop] != null) {
+    const values = simplifiedClaims[prop].map(({ value }) => value)
+    return output(values)
+  }
 
   const label = await getEntityLabel(prop)
   console.log(yellow('no statement found'), label)

package/lib/execute_function.js

@@ -12,8 +12,6 @@ export async function executeFunction (absoluePath, inputArgs) {
     fn = module.default
   }
 
-  if (typeof fn !== 'function') throw new Error('function not found')
-
   let metadata
 
   if (fn && fn.template) {
@@ -21,6 +19,8 @@ export async function executeFunction (absoluePath, inputArgs) {
     fn = fn.template
   }
 
+  if (typeof fn !== 'function') throw new Error('function not found')
+
   validateFunctionArgs(fn, inputArgs, metadata)
 
   try {

package/lib/log_claims.js

@@ -1,5 +1,4 @@
-import { chain, max, padEnd } from 'lodash-es'
-import { isEntityId } from 'wikibase-sdk'
+import { chain, compact, max, padEnd, uniq } from 'lodash-es'
 import { bgMagenta, grey } from '#lib/chalk'
 import filterClaimsProperties from '#lib/filter_claims_properties'
 import getClaimsTexts from '#lib/get_claims_texts'
@@ -9,6 +8,7 @@ import getPropertiesData from './get_properties_data.js'
 export default async ({ program, simplifiedClaims, extraData = {}, pattern, resort }) => {
   const { lang } = program
   const ids = collectEntityIds(simplifiedClaims, extraData)
+  simplifiedClaims = furtherSimplify(simplifiedClaims)
   const labels = await getEntitiesLabels(ids, lang)
 
   const propertiesIds = Object.keys(simplifiedClaims)
@@ -39,14 +39,17 @@ const collectEntityIds = (claims, extraData) => {
   const claimIds = chain(claims)
     .values()
     .flatten()
-    .filter(isEntityId)
+    .filter(isEntityClaim)
+    .map(getClaimValue)
     .value()
 
   const extraDataIds = Object.values(extraData)
 
-  return claimIds.concat(extraDataIds)
+  return uniq(compact(claimIds.concat(extraDataIds)))
 }
 
+const isEntityClaim = claim => claim.type.split('-')[0] === 'wikibase'
+
 const propClaimsText = targetLength => claimsTextData => {
   const { propText, valuesText } = claimsTextData
   return harmonizedLength(propText, targetLength) + valuesText
@@ -63,3 +66,12 @@ const logExtraData = (extraData, labels) => {
     console.log(bgMagenta(key), labels[id], grey(id))
   }
 }
+
+function furtherSimplify (simplifiedClaims) {
+  for (const [ property, propertyClaims ] of Object.entries(simplifiedClaims)) {
+    simplifiedClaims[property] = propertyClaims.map(getClaimValue)
+  }
+  return simplifiedClaims
+}
+
+const getClaimValue = claim => claim.value

package/lib/reset_properties.js

@@ -5,8 +5,10 @@ import { getCacheFolderPath } from '#lib/get_cache_folder_path'
 export default () => {
   return getCacheFolderPath('props')
   .then(propsDir => {
-    // --force: ignore if there are no more files to delete
-    exec(`rm --force ${propsDir}/*.json`, (err, res) => {
+    // -f: ignore if there are no more files to delete
+    // Use `-f` rather than `--force` to make it work on BusyBox
+    // cf https://www.wikidata.org/wiki/User_talk:Maxlath#Small_fix and https://paste.toolforge.org/view/f40c24e5
+    exec(`rm -f ${propsDir}/*.json`, (err, res) => {
       if (err) console.error('reset properties failed', err)
       else console.log(green('properties reset'))
     })

package/lib/summary_parser.js

@@ -69,7 +69,7 @@ const parseEntity = async (entity, params) => {
     if (instanceMainProps) properties = instanceMainProps
   }
   claims = program.verbose ? claims : pick(claims, properties)
-  const simplifiedClaims = simplify.claims(claims)
+  const simplifiedClaims = simplify.claims(claims, { keepTypes: true })
 
   const extraData = {}
   if (type === 'lexeme') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikibase-cli",
-  "version": "18.3.2",
+  "version": "18.3.3",
   "description": "A command-line interface to Wikibase",
   "type": "module",
   "main": "index.js",