nodejs-nomer 1.0.8 → 1.0.11

package/dist/index.js

@@ -41,25 +41,25 @@ var Nomer = /*#__PURE__*/function () {
   }, {
     key: "clean",
     value: function clean() {
-      var res = (0, _utils.runNomer)((0, _utils.getNomerSimpleCmd)("clean", this.getPropertiesPath()));
+      var res = (0, _utils.runNomer)((0, _utils.getNomerSimpleCmd)("clean", false, this.getPropertiesPath()));
       return res;
     }
   }, {
     key: "inputSchema",
     value: function inputSchema() {
-      var res = (0, _utils.runNomer)((0, _utils.getNomerSimpleCmd)("input-schema", this.getPropertiesPath()));
+      var res = (0, _utils.runNomer)((0, _utils.getNomerSimpleCmd)("input-schema", false, this.getPropertiesPath()));
       return res;
     }
   }, {
     key: "outputSchema",
     value: function outputSchema() {
-      var res = (0, _utils.runNomer)((0, _utils.getNomerSimpleCmd)("output-schema", this.getPropertiesPath()));
+      var res = (0, _utils.runNomer)((0, _utils.getNomerSimpleCmd)("output-schema", false, this.getPropertiesPath()));
       return res;
     }
   }, {
     key: "properties",
     value: function properties() {
-      var res = (0, _utils.runNomer)((0, _utils.getNomerSimpleCmd)("properties", this.getPropertiesPath()));
+      var res = (0, _utils.runNomer)((0, _utils.getNomerSimpleCmd)("properties", false, this.getPropertiesPath()));
       return res;
     }
   }, {
@@ -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/result.js

@@ -13,7 +13,6 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var TSV_COLUMNS = ['inputId', 'inputName', 'match', 'externalId', 'name', 'authorship', 'rank', 'commonNames', 'path', 'pathIds', 'pathNames', 'pathAuthorship', 'externalUrl'];
 var Result = /*#__PURE__*/function () {
   function Result() {
     _classCallCheck(this, Result);

package/dist/utils.js

@@ -1,7 +1,8 @@
 "use strict";
 
 var _require = require('child_process'),
-  execSync = _require.execSync;
+  execSync = _require.execSync,
+  exec = _require.exec;
 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";
@@ -50,7 +51,9 @@ var getNomerSimpleCmd = function getNomerSimpleCmd() {
 };
 var runNomer = function runNomer(nomerCmd) {
   try {
-    var result = execSync(nomerCmd).toString();
+    var result = execSync(nomerCmd, {
+      maxBuffer: 4096 * 4096
+    }).toString();
     if (result) {
       return result.trimEnd();
     }
@@ -59,9 +62,19 @@ var runNomer = function runNomer(nomerCmd) {
     return null;
   }
 };
+var runNomerAsync = function runNomerAsync(nomerCmd) {
+  var p = exec(nomerCmd, {
+    maxBuffer: 4096 * 4096
+  });
+  return {
+    stdin: p.stdin,
+    stdout: p.stdout
+  };
+};
 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.8",
+  "version": "1.0.11",
   "description": "NodeJS wrapper for nomer",
-  "directories": {
-    "bin": "./bin"
+  "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",
@@ -32,4 +36,4 @@
   "dependencies": {
     "properties-file": "^3.5.1"
   }
-}
+}

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";
 
@@ -23,22 +23,22 @@ class Nomer {
     }
 
     clean() {
-        const res = runNomer(getNomerSimpleCmd("clean", this.getPropertiesPath()))
+        const res = runNomer(getNomerSimpleCmd("clean", false, this.getPropertiesPath()))
         return res;
     }
 
     inputSchema() {
-        const res = runNomer(getNomerSimpleCmd("input-schema", this.getPropertiesPath()))
+        const res = runNomer(getNomerSimpleCmd("input-schema", false, this.getPropertiesPath()))
         return res;
     }
 
     outputSchema() {
-        const res = runNomer(getNomerSimpleCmd("output-schema", this.getPropertiesPath()))
+        const res = runNomer(getNomerSimpleCmd("output-schema", false, this.getPropertiesPath()))
         return res;
     }
 
     properties() {
-        const res = runNomer(getNomerSimpleCmd("properties", this.getPropertiesPath()))
+        const res = runNomer(getNomerSimpleCmd("properties", false, this.getPropertiesPath()))
         return res;
     }
 
@@ -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/result.js

@@ -1,19 +1,3 @@
-const TSV_COLUMNS = [
-    'inputId',
-    'inputName',
-    'match',
-    'externalId',
-    'name',
-    'authorship',
-    'rank',
-    'commonNames',
-    'path',
-    'pathIds',
-    'pathNames',
-    'pathAuthorship',
-    'externalUrl'
-];
-
 class Result {
 
     static json(result) {

package/src/utils.js

@@ -1,10 +1,10 @@
-const { execSync } = require('child_process')
+const { execSync, exec } = require('child_process')
 
 const getNomerValidateCmd = (filepath = "", cmd = "validate-term", properties = null) => {
     if (filepath === "") {
         throw new Exception("Filepath cannot be empty string");
     }
-    let nomerCmd = `curl -L ${filepath} | ./bin/nomer ${cmd}`;
+    let nomerCmd = `curl -L ${filepath} | nomer ${cmd}`;
     if (properties) {
         nomerCmd = `${nomerCmd} -p ${properties}`;
     }
@@ -13,7 +13,7 @@ const getNomerValidateCmd = (filepath = "", cmd = "validate-term", properties =
 }
 
 const getNomerMatchCmd = (query = "", cmd = "append", matcher = "globi-taxon-cache", properties = null, outputFormat = null, echoOpt = "-e") => {
-    let nomerCmd = `echo ${echoOpt} '${query}' | ./bin/nomer ${cmd} ${matcher}`;
+    let nomerCmd = `echo ${echoOpt} '${query}' | nomer ${cmd} ${matcher}`;
     if (properties) {
         nomerCmd = `${nomerCmd} -p ${properties}`;
     }
@@ -25,7 +25,7 @@ const getNomerMatchCmd = (query = "", cmd = "append", matcher = "globi-taxon-cac
 }
 
 const getNomerSimpleCmd = (cmd = "version", verbose = false, properties = null, outputFormat = null) => {
-    let nomerCmd = `./bin/nomer ${cmd}`;
+    let nomerCmd = `nomer ${cmd}`;
     if (properties) {
         nomerCmd = `${nomerCmd} -p ${properties}`;
     }
@@ -41,7 +41,9 @@ const getNomerSimpleCmd = (cmd = "version", verbose = false, properties = null,
 
 const runNomer = (nomerCmd) => {
     try {
-        const result = execSync(nomerCmd).toString();
+        const result = execSync(nomerCmd, {
+            maxBuffer: 4096 * 4096,
+        }).toString();
         if (result) {
             return result.trimEnd();
         }
@@ -51,9 +53,18 @@ const runNomer = (nomerCmd) => {
     }
 }
 
+const runNomerAsync = (nomerCmd) => {
+    const p = exec(nomerCmd, {
+        maxBuffer: 4096 * 4096
+    })
+
+    return { stdin: p.stdin, stdout: p.stdout }
+}
+
 module.exports = {
     getNomerValidateCmd,
     getNomerMatchCmd,
     getNomerSimpleCmd,
-    runNomer
+    runNomer,
+    runNomerAsync
 };

package/test/script.js

@@ -1,7 +1,23 @@
 const Nomer = require("nodejs-nomer")
 
 const nomer = new Nomer();
+
+console.time("version")
 console.log(nomer.version());
+console.timeEnd("version")
+
+
+
+// console.time("append")
+// const results = []
+// for (let index = 0; index < 100; index++) {
+//     results.push(nomer.append("\tBauhinia rufa\t", "gbif"))
+// }
+// console.timeEnd("append")
 
-console.log(nomer.matcher());
-console.log(nomer.append("\tHomo sapiens", "gbif-web"));
+// console.time("toObject")
+// for (let index = 0; index < results.length; index++) {
+//     const element = results[index];
+//     nomer.toObject(element)
+// }
+// console.timeEnd("toObject")

package/package.json.bkp

@@ -1,39 +0,0 @@
-{
-  "name": "nodejs-nomer",
-  "version": "1.0.7",
-  "description": "NodeJS wrapper for nomer",
-  "config": {
-    "nomerVersion": "0.5.7"
-  },
-  "directories": {
-    "bin": "./bin"
-  },
-  "main": "index.js",
-  "scripts": {
-    "test": "npm run test",
-    "build": "babel src -d dist",
-    //"preinstall": "./install_nomer.sh ${npm_package_config_nomerVersion}"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/zedomel/nodejs-nomer.git"
-  },
-  "keywords": [
-    "nomer",
-    "nodejs"
-  ],
-  "author": "Jose A Salim",
-  "license": "GPL-3.0",
-  "bugs": {
-    "url": "https://github.com/zedomel/nodejs-nomer/issues"
-  },
-  "homepage": "https://github.com/zedomel/nodejs-nomer#readme",
-  "devDependencies": {
-    "@babel/cli": "^7.23.9",
-    "@babel/core": "^7.24.0",
-    "@babel/preset-env": "^7.24.0"
-  },
-  "dependencies": {
-    "properties-file": "^3.5.1"
-  }
-}