nodejs-nomer 1.0.9 → 1.1.0

package/DEVELOPMENT.md

@@ -0,0 +1,17 @@
+# DEVELOPMENT
+
+Build:
+`npm run build`
+
+Link:
+
+`npm link`
+
+Use package for testing:
+`npm link nodejs-nomer`
+
+Run `script.js`
+`node script.js`
+
+# PUBLISH
+

package/dist/index.js

@@ -91,9 +91,16 @@ var Nomer = /*#__PURE__*/function () {
       var query = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
       var matcher = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "globi-taxon-cache";
       var outputFormat = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "tsv";
-      var res = (0, _utils.runNomer)((0, _utils.getNomerMatchCmd)(query, "append", matcher, this.getPropertiesPath(), outputFormat, this.echoOpt));
+      var res = (0, _utils.runNomer)((0, _utils.getNomerMatchCmd)(query, "append", matcher, this.getPropertiesPath(), outputFormat, this.echoOpt), query);
       return res;
     }
+  }, {
+    key: "appendAsync",
+    value: function appendAsync() {
+      var matcher = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "globi-taxon-cache";
+      var outputFormat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "tsv";
+      return (0, _utils.runNomerAsync)("nomer append ".concat(matcher, " -o ").concat(outputFormat));
+    }
   }, {
     key: "getPropertiesPath",
     value: function getPropertiesPath() {

package/dist/utils.js

@@ -1,7 +1,9 @@
 "use strict";
 
 var _require = require('child_process'),
-  execSync = _require.execSync;
+  execSync = _require.execSync,
+  exec = _require.exec,
+  spawn = _require.spawn;
 var getNomerValidateCmd = function getNomerValidateCmd() {
   var filepath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
   var cmd = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "validate-term";
@@ -61,9 +63,18 @@ var runNomer = function runNomer(nomerCmd) {
     return null;
   }
 };
+var runNomerAsync = function runNomerAsync(nomerCmd) {
+  var nomerCmdArr = nomerCmd.split(/\s+/);
+  var p = spawn(nomerCmdArr[0], nomerCmdArr.slice(1), {
+    // maxBuffer: 4096 * 4096
+    shell: true
+  });
+  return p;
+};
 module.exports = {
   getNomerValidateCmd: getNomerValidateCmd,
   getNomerMatchCmd: getNomerMatchCmd,
   getNomerSimpleCmd: getNomerSimpleCmd,
-  runNomer: runNomer
+  runNomer: runNomer,
+  runNomerAsync: runNomerAsync
 };

package/package.json

@@ -1,14 +1,18 @@
 {
   "name": "nodejs-nomer",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "NodeJS wrapper for nomer",
   "bin": {
     "nomer": "./bin/nomer"
   },
+  "config": {
+    "nomerVersion": "0.5.7"
+  },
   "main": "index.js",
   "scripts": {
     "test": "npm run test",
-    "build": "babel src -d dist"
+    "build": "babel src -d dist",
+    "preinstall": "./install_nomer.sh ${npm_package_config_nomerVersion}"
   },
   "repository": {
     "type": "git",

package/src/index.js

@@ -1,4 +1,4 @@
-import { runNomer, getNomerSimpleCmd, getNomerValidateCmd, getNomerMatchCmd } from "./utils";
+import { runNomer, runNomerAsync, getNomerSimpleCmd, getNomerValidateCmd, getNomerMatchCmd } from "./utils";
 import Result from './result'
 import { getProperties } from "properties-file";
 
@@ -75,11 +75,16 @@ class Nomer {
                 this.getPropertiesPath(),
                 outputFormat,
                 this.echoOpt
-            )
+            ),
+            query
         );
         return res;
     }
 
+    appendAsync(matcher = "globi-taxon-cache", outputFormat = "tsv") {
+        return runNomerAsync(`nomer append ${matcher} -o ${outputFormat}`)
+    }
+
     getPropertiesPath() {
         return this.propertiesPath;
     }

package/src/utils.js

@@ -1,4 +1,4 @@
-const { execSync } = require('child_process')
+const { execSync, exec, spawn } = require('child_process')
 
 const getNomerValidateCmd = (filepath = "", cmd = "validate-term", properties = null) => {
     if (filepath === "") {
@@ -42,7 +42,7 @@ const getNomerSimpleCmd = (cmd = "version", verbose = false, properties = null,
 const runNomer = (nomerCmd) => {
     try {
         const result = execSync(nomerCmd, {
-            maxBuffer: 4096 * 4096
+            maxBuffer: 4096 * 4096,
         }).toString();
         if (result) {
             return result.trimEnd();
@@ -53,9 +53,20 @@ const runNomer = (nomerCmd) => {
     }
 }
 
+const runNomerAsync = (nomerCmd) => {
+    const nomerCmdArr = nomerCmd.split(/\s+/)
+    const p = spawn(nomerCmdArr[0], nomerCmdArr.slice(1), {
+        // maxBuffer: 4096 * 4096
+        shell: true
+    })
+
+    return p
+}
+
 module.exports = {
     getNomerValidateCmd,
     getNomerMatchCmd,
     getNomerSimpleCmd,
-    runNomer
+    runNomer,
+    runNomerAsync
 };