nodejs-nomer 1.3.7 → 1.3.9

package/.github/workflows/npm-publish.yml

@@ -14,12 +14,24 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v4
         with:
-          node-version: '21.x'           
+          node-version: '21.x'
           registry-url: 'https://registry.npmjs.org'
       - run: npm ci
-      - run: npm publish      
+      - name: Run build process
+        run: npm run build
+      - name: Verify dist folder exists
+        run: |
+          if [! -d "dist" ]; then
+            echo "X dist folder not found after build!"
+            ls -la
+            exit 1
+          fi
+          echo "OK dist folder content:"
+          ls -la dist/
+      - name: Publish to npm
+        run: npm publish --provenance --access public
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/dist/index.js

@@ -103,7 +103,7 @@ var Nomer = exports.Nomer = /*#__PURE__*/function () {
     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));
+      return (0, _utils.runNomerAsync)((0, _utils.getNomerMatchCmd)(null, "append", matcher, this.getPropertiesPath(), outputFormat, this.echoOpt));
     }
   }, {
     key: "getPropertiesPath",

package/dist/utils.js

@@ -27,7 +27,11 @@ var getNomerMatchCmd = exports.getNomerMatchCmd = function getNomerMatchCmd() {
   var properties = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
   var outputFormat = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
   var echoOpt = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : "-e";
-  var nomerCmd = "echo ".concat(echoOpt, " '").concat(query, "' | nomer ").concat(cmd, " ").concat(matcher);
+  var nomerCmd = "";
+  if (query) {
+    nomerCmd = "echo ".concat(echoOpt, " '").concat(query, "' | ");
+  }
+  nomerCmd = "".concat(nomerCmd, "nomer ").concat(cmd, " ").concat(matcher);
   if (properties) {
     nomerCmd = "".concat(nomerCmd, " -p ").concat(properties);
   }

package/install_nomer.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-NOMER_VERSION="0.5.13"
+NOMER_VERSION="0.5.17"
 
 mkdir -p ./bin
 echo "https://github.com/globalbioticinteractions/nomer/releases/download/${NOMER_VERSION}/nomer.jar)"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodejs-nomer",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "description": "NodeJS wrapper for nomer",
   "bin": {
     "nomer": "./bin/nomer"
@@ -36,4 +36,4 @@
   "dependencies": {
     "properties-file": "^3.5.1"
   }
-}
+}

package/src/index.js

@@ -82,7 +82,16 @@ export class Nomer {
     }
 
     appendAsync(matcher = "globi-taxon-cache", outputFormat = "tsv") {
-        return runNomerAsync(`nomer append ${matcher} -o ${outputFormat}`)
+        return runNomerAsync(
+            getNomerMatchCmd(
+                null,
+                "append",
+                matcher,
+                this.getPropertiesPath(),
+                outputFormat,
+                this.echoOpt
+            )
+        );
     }
 
     getPropertiesPath() {

package/src/utils.js

@@ -13,7 +13,13 @@ export const getNomerValidateCmd = (filepath = "", cmd = "validate-term", proper
 }
 
 export const getNomerMatchCmd = (query = "", cmd = "append", matcher = "globi-taxon-cache", properties = null, outputFormat = null, echoOpt = "-e") => {
-    let nomerCmd = `echo ${echoOpt} '${query}' | nomer ${cmd} ${matcher}`;
+    let nomerCmd = "";
+
+    if (query) {
+        nomerCmd = `echo ${echoOpt} '${query}' | `;
+    }
+    nomerCmd = `${nomerCmd}nomer ${cmd} ${matcher}`;
+
     if (properties) {
         nomerCmd = `${nomerCmd} -p ${properties}`;
     }

package/test/script.js

@@ -1,46 +0,0 @@
-const Nomer = require("nodejs-nomer")
-
-const nomer = new Nomer.Nomer();
-
-console.time("version")
-console.log(nomer.version());
-console.timeEnd("version")
-
-
-console.time("append async")
-const process = nomer.appendAsync("col")
-const resultsAsync = []
-
-const result = (stdout) => new Promise(resolve => {
-    stdout.on('data', async (data) => {
-        console.log(data.toString())
-        return nomer.toObject(data).filter((obj) => obj.matchType !== "NONE")
-
-    })
-    stdout.on('end', () => {
-        resolve('end')
-    })
-})
-
-p = result(process.stdout)
-for (let index = 0; index < 1000; index++) {
-    process.stdin.write("\tBauhinia rufa\t\n")
-}
-process.stdin.end()
-
-result.then((v) => console.log(v))
-
-
-// console.time("append")
-// const results = []
-// for (let index = 0; index < 100; index++) {
-//     results.push(nomer.append("\tBauhinia rufa\t", "gbif"))
-// }
-// console.timeEnd("append")
-
-// console.time("toObject")
-// for (let index = 0; index < results.length; index++) {
-//     const element = results[index];
-//     nomer.toObject(element)
-// }
-// console.timeEnd("toObject")