@mountainpass/addressr 1.1.7 → 1.1.8

package/lib/client/elasticsearch.js

@@ -118,16 +118,7 @@ async function initIndex(esClient, clear, synonyms) {
       }
     }
   };
-  if (!exists.body) {
-    logger(`creating index: ${ES_INDEX_NAME}`);
-    const indexCreateResult = await esClient.indices.create({
-      index: ES_INDEX_NAME,
-      body: indexBody
-    });
-    logger({
-      indexCreateResult
-    });
-  } else {
+  if (exists.body) {
     // update the index
     const indexCloseResult = await esClient.indices.close({
       index: ES_INDEX_NAME
@@ -162,6 +153,15 @@ async function initIndex(esClient, clear, synonyms) {
     logger({
       refreshResult
     });
+  } else {
+    logger(`creating index: ${ES_INDEX_NAME}`);
+    const indexCreateResult = await esClient.indices.create({
+      index: ES_INDEX_NAME,
+      body: indexBody
+    });
+    logger({
+      indexCreateResult
+    });
   }
   const indexGetResult = await esClient.indices.get({
     index: ES_INDEX_NAME,

package/lib/deploy/create-deployment-archive.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const fs = require('fs');
+const fs = require('node:fs');
 const packageJson = require('../package.json');
 const shell = require('shelljs');
 const {

package/lib/service/address-service.js

@@ -972,7 +972,7 @@ function buildSynonyms(context) {
 }
 const {
   readdir
-} = require('fs').promises;
+} = require('node:fs').promises;
 async function getFiles(currentDir, baseDir) {
   const dir = _nodePath2.default.resolve(baseDir, currentDir);
   logger(`reading ${dir} (${currentDir} in ${baseDir})`);
@@ -992,7 +992,7 @@ function countFileLines(filePath) {
     let last;
     readStream.on('data', function (chunk) {
       lines += chunk.split('\n').length - 1;
-      last = chunk[chunk.length - 1];
+      last = chunk.at(-1);
     });
     readStream.on('end', function () {
       if (last !== '\n') {
@@ -1105,7 +1105,7 @@ async function loadFileCounts(countsFile) {
             errors: row.errors
           });
         }
-        const psvFile = row.data.File.replace(/\\/g, '/').replace(/\.zip$/, '.psv');
+        const psvFile = row.data.File.replaceAll('\\', '/').replace(/\.zip$/, '.psv');
         filesCounts[psvFile] = row.data.Count;
       },
       complete: function () {
@@ -1283,12 +1283,12 @@ async function loadAuthFiles(files, directory, loadContext, filesCounts) {
         complete: function (results) {
           loadContext[contextKey] = results.data;
           if (filesCounts) {
-            if (results.data.length != filesCounts[authFile]) {
-              error(`Error loading '${directory}/${authFile}'. Expected '${filesCounts[authFile]}' rows, got '${results.data.length}'`);
-              reject(`Error loading '${directory}/${authFile}'. Expected '${filesCounts[authFile]}' rows, got '${results.data.length}'`);
-            } else {
+            if (results.data.length == filesCounts[authFile]) {
               logger(`loaded '${results.data.length}' rows from '${directory}/${authFile}' into key '${contextKey}'`);
               resolve();
+            } else {
+              error(`Error loading '${directory}/${authFile}'. Expected '${filesCounts[authFile]}' rows, got '${results.data.length}'`);
+              reject(`Error loading '${directory}/${authFile}'. Expected '${filesCounts[authFile]}' rows, got '${results.data.length}'`);
             }
           }
         },

package/lib/swagger.js

@@ -35,7 +35,7 @@ var options = {
 
 // The Swagger document (require it, build it programmatically, fetch it from a URL, ...)
 var spec = (0, _nodeFs.readFileSync)(_nodePath2.default.join(__dirname, 'api/swagger.yaml'), 'utf8');
-var swaggerDoc = exports.swaggerDoc = (0, _jsYaml.safeLoad)(spec);
+var swaggerDoc = exports.swaggerDoc = (0, _jsYaml.load)(spec);
 global.swaggerDoc = swaggerDoc;
 function swaggerInit() {
   // Initialize the Swagger middleware

package/lib/utils/stream-down.js

@@ -5,10 +5,10 @@ var _progress2 = _interopRequireDefault(_progress);
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const {
   parse
-} = require('url');
-const http = require('https');
-const fs = require('fs');
-const pathUtil = require('path');
+} = require('node:url');
+const http = require('node:https');
+const fs = require('node:fs');
+const pathUtil = require('node:path');
 module.exports = function (url, path, size) {
   const uri = parse(url);
   if (!path) {

package/lib/version.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 // Generated by genversion.
-const version = exports.version = '1.1.7';
+const version = exports.version = '1.1.8';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Australian Address Validation, Search and Autocomplete",
   "author": {
     "name": "Mountain Pass",
@@ -167,7 +167,7 @@
     "glob-promise": "^4.2.0",
     "got": "^9.6.0",
     "http-link-header": "1.0.2",
-    "js-yaml": "^3.3.0",
+    "js-yaml": "^4.1.1",
     "json-ptr": "2.1.0",
     "keyv": "^4.0.1",
     "keyv-file": "^0.2.0",
@@ -184,6 +184,7 @@
   "devDependencies": {
     "@babel/cli": "^7.6.2",
     "@babel/core": "^7.6.2",
+    "@babel/eslint-parser": "^7.28.6",
     "@babel/node": "^7.6.2",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
     "@babel/plugin-transform-runtime": "^7.6.2",
@@ -195,24 +196,22 @@
     "@istanbuljs/nyc-config-babel": "^3.0.0",
     "@mountainpass/waychaser": "^4.0.0",
     "@windyroad/cucumber-js-throwables": "^1.0.4",
-    "babel-eslint": "^10.0.2",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-preset-env": "^1.7.0",
     "bats": "^1.13.0",
     "chai": "^4.2.0",
     "cucumber": "^5.1.0",
     "dry-aged-deps": "^2.6.0",
-    "eslint": "^7.9.0",
+    "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.2",
-    "eslint-plugin-chai-friendly": "^0.7.1",
+    "eslint-plugin-chai-friendly": "^0.7.4",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.2.5",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-react": "^7.7.0",
-    "eslint-plugin-security": "^1.4.0",
-    "eslint-plugin-unicorn": "^34.0.1",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-n": "^17.24.0",
+    "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-promise": "^6.6.0",
+    "eslint-plugin-security": "^1.7.1",
+    "eslint-plugin-unicorn": "^49.0.0",
     "genversion": "^3.0.0",
     "husky": "^9.1.7",
     "imagemin-lint-staged": "^0.5.1",
@@ -220,7 +219,7 @@
     "istanbul-middleware": "^0.2.2",
     "license-checker": "^25.0.1",
     "lint-staged": "^15.5.2",
-    "nodemon": "^2.0.4",
+    "nodemon": "^3.1.14",
     "npm-check": "^5.9.0",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",