wikibase-cli 17.0.0 → 17.0.1

package/README.md

@@ -54,7 +54,7 @@ See [CHANGELOG.md](CHANGELOG.md) for version info
 ## Dependencies
 
 ### General
-* [NodeJs](https://nodejs.org) **>= v10** (recommended way to install it: use the awesome [NVM](https://github.com/creationix/nvm) to install the latest LTS version `nvm install --lts`)
+* [NodeJs](https://nodejs.org) **>= v14** (recommended way to install it: use the awesome [NVM](https://github.com/creationix/nvm) to install the latest LTS version `nvm install --lts`)
 * [Git](https://git-scm.com/)
 
 ### Per feature

package/bin/wd.js

@@ -3,6 +3,10 @@ process.env.WB_INSTANCE = 'https://www.wikidata.org'
 process.env.WB_SPARQL_ENDPOINT = 'https://query.wikidata.org/sparql'
 // Fake the executed script to be wb to trick commander to believe it
 // as it would otherwise fail to build subcommand paths
-process.argv[1] = process.argv[1].replace(/wd\.js$/, 'wb.js')
+process.argv[1] = process.argv[1]
+  // Case when called directly as ./bin/wd.js
+  .replace(/wd\.js$/, 'wb.js')
+  // Case when called directly as a link such as defined in package.json, ./node_modules/.bin/wd
+  .replace(/wd$/, 'wb')
 
 await import('./wb.js')

package/lib/edit/parse_batch_line.js

@@ -1,7 +1,7 @@
 // Args can't be just a line splitted on spaces
 // as there are JSON strings arguments, and signle or double quoted strings args
 
-import { parse } from 'shell-quote'
+import parse from 'shell-quote/parse.js'
 
 export default line => {
   // One JSON object as single argument

package/lib/edit/prompt.js

@@ -1,9 +1,6 @@
-import { promisify } from 'node:util'
 import read from 'read'
 import { blue, yellow, grey } from '#lib/chalk'
 
-const readAsync = promisify(read)
-
 export default readsData => {
   const results = {}
 
@@ -30,7 +27,7 @@ const prompt = (label, pattern, options, info) => {
       })
       message += '\n-'
     }
-    let res = await readAsync({ prompt: message })
+    let res = await read({ prompt: message })
     res = res.trim()
     if (!pattern || pattern.test(res)) {
       return res

package/lib/entity_attribute_parser.js

@@ -22,6 +22,7 @@ export default (entity, attribute, lang, strictLang) => {
 
 const attributesPerType = {
   item: [ 'labels', 'descriptions', 'aliases' ],
-  property: [ 'labels', 'descriptions', 'aliases' ],
   lexeme: [ 'lemmas' ],
+  mediainfo: [ 'labels', 'descriptions' ],
+  property: [ 'labels', 'descriptions', 'aliases' ],
 }

package/lib/fs.js

@@ -1,28 +1,13 @@
-import fs from 'node:fs'
-import mkdirp from 'mkdirp'
+import { accessSync, constants } from 'node:fs'
+import { access } from 'node:fs/promises'
 
-export const writeFile = (filepath, content) => {
-  return new Promise((resolve, reject) => {
-    fs.writeFile(filepath, content, (err, res) => {
-      err ? reject(err) : resolve(res)
-    })
-  })
-}
-export const exists = path => {
-  return new Promise((resolve, reject) => {
-    fs.access(path, (err, res) => err ? reject(err) : resolve(res))
-  })
-}
-export const createFolder = path => {
-  return new Promise((resolve, reject) => {
-    mkdirp(path, err => err ? reject(err) : resolve())
-  })
-}
-export const writeAccessSync = path => {
+export const exists = path => access(path)
+
+export const assertWriteAccessSync = path => {
   // Testing right to write
   // cf https://nodejs.org/api/fs.html#fs_fs_access_path_mode_callback
   // Will throw if failing
-  fs.accessSync(path, fs.constants.W_OK)
+  accessSync(path, constants.W_OK)
 }
 
 export function getDirname (fileUrl) {

package/lib/get_cache_folder_path.js

@@ -1,15 +1,18 @@
-import { exists, createFolder } from './fs.js'
+import { access } from 'node:fs/promises'
+import { mkdirp } from 'mkdirp'
 import getFolderPath from './get_folder_path.js'
 
-export default subfolder => {
+export async function getCacheFolderPath (subfolder) {
   const subfolderPath = getFolderPath('cache', subfolder)
-  return exists(subfolderPath)
-  .catch(err => {
+  try {
+    await access(subfolderPath)
+    return subfolderPath
+  } catch (err) {
     if (err.code === 'ENOENT') {
-      return createFolder(subfolderPath)
+      await mkdirp(subfolderPath)
+      return subfolderPath
     } else {
       throw err
     }
-  })
-  .then(() => subfolderPath)
+  }
 }

package/lib/get_folder_path.js

@@ -1,9 +1,9 @@
-import os from 'node:os'
+import { homedir } from 'node:os'
 import path from 'node:path'
-import mkdirp from 'mkdirp'
-import { writeAccessSync } from './fs.js'
+import { mkdirp } from 'mkdirp'
+import { assertWriteAccessSync } from './fs.js'
 
-const homePath = os.homedir()
+const homePath = homedir()
 
 export default (category, subfolderName) => {
   let folderPath
@@ -17,7 +17,7 @@ export default (category, subfolderName) => {
   }
   mkdirp.sync(folderPath)
   // Make sure we have write access right in case the folder already existed
-  writeAccessSync(folderPath)
+  assertWriteAccessSync(folderPath)
 
   return folderPath
 }

package/lib/get_lang_props.js

@@ -1,9 +1,9 @@
+import { writeFile } from 'node:fs/promises'
 import { URL } from 'node:url'
-import getCacheFolderPath from '#lib/get_cache_folder_path'
+import { getCacheFolderPath } from '#lib/get_cache_folder_path'
 import { hashString } from '#lib/hash_string'
 import { readJsonFile } from '#lib/json'
 import fetchLangProps from './fetch_lang_props.js'
-import { writeFile } from './fs.js'
 
 export default async program => {
   const { lang, sparqlEndpoint, noCache } = program

package/lib/log_command_examples.js

@@ -1,4 +1,5 @@
 import { execSync } from 'node:child_process'
+import { dirname } from 'node:path'
 import { grey } from '#lib/chalk'
 
 export default (command, examples, doc, dryRun = false) => {
@@ -8,10 +9,9 @@ export default (command, examples, doc, dryRun = false) => {
       let { args, comment } = example
       if (args instanceof Array) args = args.join(' ')
       if (comment) console.log(grey(`\n  # ${comment}`))
-      const cmd = `wb ${command} ${args}`
-      console.log(`  ${cmd}`)
+      console.log(`  wb ${command} ${args}`)
       if (dryRun && example.dryRun !== false) {
-        const generatedData = execSync(`${cmd} --dry`).toString()
+        const generatedData = execSync(`${getWbAbsolutePath()} ${command} ${args} --dry`).toString()
         console.log(grey('  # output:'))
         if (command.startsWith('sparql')) console.log(formatSparql(generatedData))
         else console.log(formatJsonInMixedOutput(generatedData))
@@ -23,6 +23,11 @@ export default (command, examples, doc, dryRun = false) => {
   console.log('')
 }
 
+function getWbAbsolutePath () {
+  const binDirectory = dirname(process.argv[1])
+  return `${binDirectory}/wb.js`
+}
+
 const indent = line => '  ' + line
 
 const formatJsonInMixedOutput = output => {

package/lib/reset_properties.js

@@ -1,6 +1,6 @@
 import { exec } from 'node:child_process'
 import { green } from '#lib/chalk'
-import getCacheFolderPath from '#lib/get_cache_folder_path'
+import { getCacheFolderPath } from '#lib/get_cache_folder_path'
 
 export default () => {
   return getCacheFolderPath('props')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikibase-cli",
-  "version": "17.0.0",
+  "version": "17.0.1",
   "description": "A command-line interface to Wikibase",
   "type": "module",
   "main": "index.js",
@@ -11,8 +11,8 @@
   "scripts": {
     "docker:publish": "./scripts/docker_publish",
     "git-pre-commit": "./scripts/githooks/pre-commit",
-    "lint": "eslint -c .eslintrc.cjs bin/wb* lib/* lib/*/* test/* test/lib/*",
-    "lint-fix": "eslint -c .eslintrc.cjs --fix bin/wb* lib/* lib/*/* test/* test/lib/*",
+    "lint": "eslint --config .eslintrc.cjs bin/* lib test",
+    "lint-fix": "eslint --config .eslintrc.cjs --fix bin/* lib test",
     "lint-staged": "./scripts/lint_staged",
     "prepublishOnly": "npm run lint && npm test",
     "postpublish": "npm run docker:publish && git push --tags",
@@ -47,15 +47,15 @@
   },
   "homepage": "https://github.com/maxlath/wikibase-cli#readme",
   "dependencies": {
-    "chalk": "^2.4.2",
+    "chalk": "^5.3.0",
     "commander": "^6.0.0",
-    "copy-paste": "^1.3.0",
+    "copy-paste": "^1.5.3",
     "lodash-es": "^4.17.21",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^3.0.1",
     "node-fetch": "^2.6.0",
-    "open": "^7.0.4",
-    "read": "^1.0.7",
-    "shell-quote": "^1.7.3",
+    "open": "^9.1.0",
+    "read": "^2.1.0",
+    "shell-quote": "^1.8.1",
     "split": "^1.0.1",
     "through": "^2.3.8",
     "wikibase-edit": "^6.0.1",
@@ -75,6 +75,6 @@
     "should": "^13.2.3"
   },
   "engines": {
-    "node": ">= 14.0.0"
+    "node": ">= 14.17.0"
   }
 }