wikibase-cli 16.3.2 → 16.3.3

package/bin/wb-hub

@@ -19,7 +19,7 @@ if (!(/s(ite)?=/.test(argsString))) argsString += ' site=wikidata'
 if (!(open || urlOnly)) argsString += ' format=json'
 
 const query = encodeURIComponent(argsString)
-const url = `https://tools.wmflabs.org/hub/query?q=${query}`
+const url = `https://hub.toolforge.org/query?q=${query}`
 
 const errors_ = require('../lib/errors')
 

package/lib/generate_select_sparql_query.js

@@ -56,9 +56,12 @@ module.exports = program => {
   setElement('object')
 
   if (selectLabels) {
-    if (lang !== 'en') {
-      // include English as a fallback
-      lang = `${lang},en`
+    // Include [AUTO_LANGUAGE], especially useful if program.open === true
+    if (lang === 'en') {
+      lang = 'en,[AUTO_LANGUAGE]'
+    } else {
+      // Include English as a fallback
+      lang = `${lang},[AUTO_LANGUAGE],en`
     }
     triple += `
   SERVICE wikibase:label {
@@ -71,7 +74,7 @@ module.exports = program => {
   let sparql = `SELECT ${select.trim()} WHERE {
   ${triple}
 }`
-  if (limit) sparql += ` LIMIT ${limit}`
+  if (limit) sparql += `\nLIMIT ${limit}`
 
   return sparql
 }

package/lib/get_pattern_filter.js

@@ -1,19 +1,27 @@
 const program = require('./program')
 const { propTypes } = require('./properties')
+const normalizeTypeName = name => name.replace(/-/g, '').toLowerCase()
+const normalizedTypesNames = Object.keys(propTypes).map(normalizeTypeName)
 
 module.exports = (pattern, includeTypes) => {
   const { type } = program
+  let normalizedType, isKnownType
+  // If --type is called without argument, `type` will be a boolean
+  if (typeof type === 'string') {
+    normalizedType = normalizeTypeName(type)
+    isKnownType = normalizedTypesNames.includes(normalizedType)
+  }
   if (!(pattern && pattern.length > 0)) {
-    if (typeof type === 'string') {
+    if (normalizedType) {
       // Consider that what was passed as a type argument was actually a pattern
-      if (!(type.toLowerCase() in propTypes)) pattern = type
+      if (!isKnownType) pattern = type
     } else {
       return
     }
   }
 
-  if (includeTypes && pattern.toLowerCase() in propTypes) {
-    return propData => propData.type === pattern
+  if (includeTypes && isKnownType) {
+    return propData => normalizeTypeName(propData.type) === normalizedType
   }
 
   // Set the insensitive case flag only if only lowercased was used
@@ -23,8 +31,8 @@ module.exports = (pattern, includeTypes) => {
   const filterRegex = new RegExp(pattern, flag)
 
   let typeFilter
-  if (typeof type === 'string' && type.toLowerCase() in propTypes) {
-    typeFilter = propData => propData.type === type
+  if (normalizedType && isKnownType) {
+    typeFilter = propData => normalizeTypeName(propData.type) === normalizedType
   } else {
     typeFilter = () => true
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikibase-cli",
-  "version": "16.3.2",
+  "version": "16.3.3",
   "description": "A command-line interface to Wikibase",
   "main": "index.js",
   "bin": {
@@ -11,7 +11,6 @@
     "docker:publish": "./scripts/docker_publish",
     "lint": "eslint -c .eslintrc bin/wb* lib/* lib/*/* test/* test/lib/*",
     "lint-staged": "./scripts/lint_staged",
-    "prepublishOnly": "npm run lint && npm test",
     "postpublish": "npm run docker:publish && git push --tags",
     "test": "mocha --exit --timeout 20000 $MOCHA_OPTIONS",
     "update-toc": "./scripts/update_toc"