wikibase-cli 19.0.1 → 19.1.0

package/bin/wb-open.js

@@ -6,7 +6,7 @@ import { getSitelinkUrlFactory } from '#lib/get_sitelink_url'
 import { getMediaInfoEntityTitle } from '#lib/mediainfo'
 import { openUrl } from '#lib/open'
 import program from '#lib/program'
-import { tolerantIdParserFactory } from '#lib/tolerant_id_parser'
+import { guidPattern, tolerantIdParserFactory } from '#lib/tolerant_id_parser'
 
 await program
 .option('-p, --wikipedia', 'open the Wikipedia article')
@@ -17,7 +17,11 @@ await program
 .process('open')
 
 const getSitelinkUrl = getSitelinkUrlFactory(program)
-const parseId = tolerantIdParserFactory()
+const parseId = tolerantIdParserFactory({
+  allowStatementsIds: true,
+  allowEntitiesSchemasIds: true,
+  allowNestedIds: true,
+})
 
 const { instance, args, lang } = program
 exitOnMissingInstance(instance)
@@ -25,6 +29,7 @@ exitOnMissingInstance(instance)
 let ids
 try {
   ids = args.map(parseId).filter(id => id != null)
+// eslint-disable-next-line no-unused-vars
 } catch (err) {
   // invalid ids: trigger a search
 }
@@ -68,6 +73,9 @@ if (!ids || ids.length === 0) {
       }
     } else if (program.revision) {
       openUrl(`${instance}/w/index.php?title=${id}&oldid=${program.revision}`)
+    } else if (guidPattern.test(id)) {
+      const urlStatementId = id.replace('$', '-')
+      openUrl(`${instance}/entity/statement/${urlStatementId}`)
     } else {
       openUrl(`${instance}/entity/${id}`)
     }

package/lib/config/file_operations.js

@@ -25,7 +25,7 @@ export default {
     } else {
       value = valueParsers[param.type](value)
       // Reject invalid value
-      const valid = param.test ? param.test(value) : typeof value === param.type // eslint-disable-line valid-typeof
+      const valid = param.test ? param.test(value) : typeof value === param.type
       if (!valid) return errors_.bundle('invalid parameter', value)
       config[key] = value
     }

package/lib/edit/parse_object_value.js

@@ -32,9 +32,13 @@ const parseStringValue = value => {
       value = JSON.parse(value)
       return value
     } catch (rawErr) {
-      const err = errors_.new('invalid JSON value', value)
-      err.statusCode = 400
-      throw err
+      if (rawErr.name === 'SyntaxError') {
+        const err = errors_.new('invalid JSON value', value)
+        err.statusCode = 400
+        throw err
+      } else {
+        throw rawErr
+      }
     }
   }
 

package/lib/get_lang_props.js

@@ -16,6 +16,7 @@ export default async program => {
 
   try {
     return readJsonFile(langJsonFilePath)
+  // eslint-disable-next-line no-unused-vars
   } catch (err) {
     return refreshProps(program, langJsonFilePath)
   }

package/lib/log_command_examples.js

@@ -57,6 +57,7 @@ const isValidJson = line => {
     JSON.parse(line)
     return true
   } catch (err) {
-    return false
+    if (err.name === 'SyntaxError') return false
+    else throw err
   }
 }

package/lib/reset_properties.js

@@ -8,7 +8,7 @@ export default () => {
     // -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) => {
+    exec(`rm -f ${propsDir}/*.json`, err => {
       if (err) console.error('reset properties failed', err)
       else console.log(green('properties reset'))
     })

package/lib/tolerant_id_parser.js

@@ -13,11 +13,20 @@ import errors_ from './errors.js'
 const entityIdPattern = /(Q|P|L|M)[1-9][0-9]*/
 const nestedEntityIdPattern = /L[1-9][0-9]*-(F|S)[1-9][0-9]*/
 const entitySchemaIdPattern = /(E)[1-9][0-9]*/
+export const guidPattern = /([QPLM]\d+(-[FS]\d+)?)[-$]([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i
 
 export function tolerantIdParserFactory (options = {}) {
+  const { allowNestedIds = false, allowEntitiesSchemasIds = false, allowStatementsIds = false } = options
+
   return function tolerantIdParser (input) {
+    if (allowStatementsIds) {
+      const guidMatch = input.match(guidPattern)
+      if (guidMatch) return guidMatch[0]
+    }
+
+    // Uppercase after checking statement ids, as they might need to stay lowercased
+    // Example: wds:q1059114-107F1AC7-1195-4137-A779-748D633CDA68
     input = input.toUpperCase()
-    const { allowNestedIds = false, allowEntitiesSchemasIds = false } = options
 
     if (allowNestedIds) {
       const nestedEntityIdMatch = input.match(nestedEntityIdPattern)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikibase-cli",
-  "version": "19.0.1",
+  "version": "19.1.0",
   "description": "A command-line interface to Wikibase",
   "type": "module",
   "main": "index.js",
@@ -11,12 +11,12 @@
   "scripts": {
     "docker:publish": "./scripts/docker_publish",
     "git-pre-commit": "./scripts/githooks/pre-commit",
-    "lint": "eslint --config .eslintrc.cjs bin/* lib test",
-    "lint-fix": "eslint --config .eslintrc.cjs --fix bin/* lib test",
+    "lint": "eslint",
+    "lint-fix": "eslint --fix",
     "lint-staged": "./scripts/lint_staged",
     "prepublishOnly": "export MOCHA_OPTIONS='--bail'; npm run lint && npm test",
     "postpublish": "npm run docker:publish && git push --tags",
-    "test": "export FORCE_COLOR=false; mocha --exit --timeout 20000 $MOCHA_OPTIONS",
+    "test": "export FORCE_COLOR=false; mocha --exit --timeout 20000 $MOCHA_OPTIONS tests",
     "update-toc": "./scripts/update_toc"
   },
   "repository": {
@@ -31,7 +31,7 @@
   "imports": {
     "#lib/*": "./lib/*.js",
     "#metadata/*": "./metadata/*.js",
-    "#test/*": "./test/*.js"
+    "#tests/*": "./tests/*.js"
   },
   "keywords": [
     "wikidata",
@@ -62,14 +62,15 @@
     "wikidata-lang": "^2.0.11"
   },
   "devDependencies": {
+    "@eslint/config-helpers": "^0.4.1",
+    "@eslint/js": "^9.38.0",
+    "@stylistic/eslint-plugin": "^5.5.0",
     "@types/lodash-es": "^4.17.8",
     "@types/node": "^20.4.2",
     "@vercel/git-hooks": "^1.0.0",
-    "eslint": "^8.57.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint": "^9.38.0",
+    "eslint-plugin-import-x": "^4.16.1",
+    "eslint-plugin-n": "^17.23.1",
     "mocha": "^9.1.3",
     "should": "^13.2.3"
   },