@mountainpass/addressr 1.1.5 → 1.1.7

package/README.md

@@ -81,6 +81,7 @@ Or for peace of mind for your mission critical solutions, get commercial support
    ```
 
    NOTE: If you are running windows, you'll need to use [wsl](https://docs.microsoft.com/en-us/windows/wsl/install-win10)
+
 2. Start open search. For example run
 
    ```
@@ -123,7 +124,6 @@ Or for peace of mind for your mission critical solutions, get commercial support
    ```
 
    Valid values are:
-
    - ACT
    - NSW
    - NT
@@ -156,21 +156,21 @@ Or for peace of mind for your mission critical solutions, get commercial support
 
 ## Additional Settings
 
-| Environment Variable | Value       | Description                                           | Default |
-| -------------------- | ----------- | ----------------------------------------------------- | ------- |
-| ELASTIC_PROTOCOL     | http        | Connect to open search over http                   | ✅      |
-| ELASTIC_PROTOCOL     | https       | Connect to open search over https                  |         |
-| ELASTIC_USERNAME     | _blank_     | Connect to open search without authentication      | ✅      |
-| ELASTIC_USERNAME     | _non-blank_ | Connect to open search with the specified username |         |
-| ELASTIC_PASSWORD     | _blank_     | Connect to open search without authentication      | ✅      |
-| ELASTIC_PASSWORD     | _non-blank_ | Connect to open search with the specified password |         |
-| PAGE_SIZE            | 8           | Number or records to return in a search               | ✅      |
-| ADDRESSR_ACCESS_CONTROL_ALLOW_ORIGIN | _blank_ | An `Access-Control-Allow-Origin` response header is **not** returned | ✅      |
-| ADDRESSR_ACCESS_CONTROL_ALLOW_ORIGIN | _non-blank_ | An `Access-Control-Allow-Origin` response header is returned with the value in the environment variable |       |
-| ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS | _blank_ | An `Access-Control-Expose-Headers` response header is **not** returned | ✅      |
-| ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS | _non-blank_ | An `Access-Control-Expose-Headers` response header is returned with the value in the environment variable |       |
-| ADDRESSR_ACCESS_CONTROL_ALLOW_HEADERS | _blank_ | An `Access-Control-Allow-Headers` response header is **not** returned | ✅      |
-| ADDRESSR_ACCESS_CONTROL_ALLOW_HEADERS | _non-blank_ | An `Access-Control-Allow-Headers` response header is returned with the value in the environment variable |       |
+| Environment Variable                   | Value       | Description                                                                                               | Default |
+| -------------------------------------- | ----------- | --------------------------------------------------------------------------------------------------------- | ------- |
+| ELASTIC_PROTOCOL                       | http        | Connect to open search over http                                                                          | ✅      |
+| ELASTIC_PROTOCOL                       | https       | Connect to open search over https                                                                         |         |
+| ELASTIC_USERNAME                       | _blank_     | Connect to open search without authentication                                                             | ✅      |
+| ELASTIC_USERNAME                       | _non-blank_ | Connect to open search with the specified username                                                        |         |
+| ELASTIC_PASSWORD                       | _blank_     | Connect to open search without authentication                                                             | ✅      |
+| ELASTIC_PASSWORD                       | _non-blank_ | Connect to open search with the specified password                                                        |         |
+| PAGE_SIZE                              | 8           | Number or records to return in a search                                                                   | ✅      |
+| ADDRESSR_ACCESS_CONTROL_ALLOW_ORIGIN   | _blank_     | An `Access-Control-Allow-Origin` response header is **not** returned                                      | ✅      |
+| ADDRESSR_ACCESS_CONTROL_ALLOW_ORIGIN   | _non-blank_ | An `Access-Control-Allow-Origin` response header is returned with the value in the environment variable   |         |
+| ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS | _blank_     | An `Access-Control-Expose-Headers` response header is **not** returned                                    | ✅      |
+| ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS | _non-blank_ | An `Access-Control-Expose-Headers` response header is returned with the value in the environment variable |         |
+| ADDRESSR_ACCESS_CONTROL_ALLOW_HEADERS  | _blank_     | An `Access-Control-Allow-Headers` response header is **not** returned                                     | ✅      |
+| ADDRESSR_ACCESS_CONTROL_ALLOW_HEADERS  | _non-blank_ | An `Access-Control-Allow-Headers` response header is returned with the value in the environment variable  |         |
 
 NOTE: When adjusting PAGE_SIZE, you should take into account how quickly you want the initial results returned to the user. In many use cases, you want this to be as fast as possible. If you need show more results to the user, you are often better off leaving it a 8 and using the paging links to get more results while you are displaying the first 8.
 

package/api/swagger-2.yaml

@@ -40,7 +40,7 @@ paths:
         503:
           description: service unavailable
         500:
-          description: unexpected error 
+          description: unexpected error
   /addresses:
     get:
       summary: Search for a list of addresses
@@ -79,7 +79,7 @@ paths:
         503:
           description: service unavailable
         500:
-          description: unexpected error 
+          description: unexpected error
   /addresses/{addressId}:
     get:
       summary: Get Address
@@ -118,7 +118,7 @@ paths:
         503:
           description: service unavailable
         500:
-          description: unexpected error 
+          description: unexpected error
 definitions:
   Index:
     type: object

package/api/swagger.yaml

@@ -43,11 +43,11 @@ paths:
         503:
           description: service unavailable
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
         500:
-          description: unexpected error 
+          description: unexpected error
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
   /addresses:
     get:
       summary: Get List of Addresses
@@ -98,11 +98,11 @@ paths:
         503:
           description: service unavailable
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
         500:
-          description: unexpected error 
+          description: unexpected error
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
   /addresses/{addressId}:
     get:
       summary: Get Address
@@ -141,11 +141,11 @@ paths:
         503:
           description: service unavailable
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
         500:
-          description: unexpected error 
+          description: unexpected error
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
 definitions:
   Root:
     type: object

package/lib/api/swagger-2.yaml

@@ -40,7 +40,7 @@ paths:
         503:
           description: service unavailable
         500:
-          description: unexpected error 
+          description: unexpected error
   /addresses:
     get:
       summary: Search for a list of addresses
@@ -79,7 +79,7 @@ paths:
         503:
           description: service unavailable
         500:
-          description: unexpected error 
+          description: unexpected error
   /addresses/{addressId}:
     get:
       summary: Get Address
@@ -118,7 +118,7 @@ paths:
         503:
           description: service unavailable
         500:
-          description: unexpected error 
+          description: unexpected error
 definitions:
   Index:
     type: object

package/lib/api/swagger.yaml

@@ -43,11 +43,11 @@ paths:
         503:
           description: service unavailable
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
         500:
-          description: unexpected error 
+          description: unexpected error
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
   /addresses:
     get:
       summary: Get List of Addresses
@@ -98,11 +98,11 @@ paths:
         503:
           description: service unavailable
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
         500:
-          description: unexpected error 
+          description: unexpected error
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
   /addresses/{addressId}:
     get:
       summary: Get Address
@@ -141,11 +141,11 @@ paths:
         503:
           description: service unavailable
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
         500:
-          description: unexpected error 
+          description: unexpected error
           schema:
-            $ref: "#/definitions/Error"
+            $ref: '#/definitions/Error'
 definitions:
   Root:
     type: object

package/lib/ci/build.js

@@ -1,5 +1,6 @@
-#!/usr/bin/env node
+"use strict";
 
+var _dagger = require("@dagger.io/dagger");
 // Use Node 16 or above to run this script.
 // `node build.js` will run this script.
 //
@@ -23,20 +24,18 @@ actions:
 
 
 */
-"use strict";
 
-var _dagger = require("@dagger.io/dagger");
 // initialize Dagger client
 console.log('starting...');
 (0, _dagger.connect)(async client => {
   // get reference to the local project
-  const source = client.host().directory(".");
+  const source = client.host().directory('.');
 
   // get Node image
-  const node = client.container().from("node:12.11.0");
+  const node = client.container().from('node:12.11.0');
 
   // mount cloned repository into Node image
   const runner = client.container({
     id: node
-  }).withMountedDirectory("/src", source).withWorkdir("/src").withExec(["npm", "run", "hello"]);
+  }).withMountedDirectory('/src', source).withWorkdir('/src').withExec(['npm', 'run', 'hello']);
 });

package/lib/ci/pipeline.js

@@ -1,5 +1,11 @@
-#!/usr/bin/env node
+"use strict";
 
+var _dagger = require("@dagger.io/dagger");
+var _envPaths = require("env-paths");
+var _envPaths2 = _interopRequireDefault(_envPaths);
+var _nodeFs = require("node:fs");
+var _nodeFs2 = _interopRequireDefault(_nodeFs);
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Use Node 16 or above to run this script.
 // `node build.js` will run this script.
 //
@@ -23,19 +29,12 @@ actions:
 
 
 */
-"use strict";
 
-var _dagger = require("@dagger.io/dagger");
-var _envPaths = require("env-paths");
-var _envPaths2 = _interopRequireDefault(_envPaths);
-var _fs = require("fs");
-var _fs2 = _interopRequireDefault(_fs);
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const cacheDir = `${(0, _envPaths2.default)("", {
-  suffix: ""
+const cacheDir = `${(0, _envPaths2.default)('', {
+  suffix: ''
 }).cache}/dagger`;
 const binLocation = `${cacheDir}/dagger-0.3.9`;
-if (!process.env._EXPERIMENTAL_DAGGER_CLI_BIN && _fs2.default.existsSync(binLocation)) {
+if (!process.env._EXPERIMENTAL_DAGGER_CLI_BIN && _nodeFs2.default.existsSync(binLocation)) {
   process.env._EXPERIMENTAL_DAGGER_CLI_BIN = binLocation;
   console.log(`using already downloaded '${binLocation}'`);
 }
@@ -44,11 +43,11 @@ console.log('connecting...');
   console.log('\t...connected');
   // get reference to the local project
   client.log;
-  const workspace = client.host().directory("."); //, { exclude: ["node_modules/"] })
+  const workspace = client.host().directory('.'); //, { exclude: ["node_modules/"] })
 
   // get Node image
-  const node = client.container().from("node:14.21.2").withMountedDirectory("/workspace", workspace).withWorkdir("/workspace");
-  console.log(await node.withExec(["npm", "--version"]).stdout());
+  const node = client.container().from('node:14.21.2').withMountedDirectory('/workspace', workspace).withWorkdir('/workspace');
+  console.log(await node.withExec(['npm', '--version']).stdout());
   const installed = node;
   //     .withExec(["npm", "install"])
 
@@ -61,18 +60,18 @@ console.log('connecting...');
   // print output
   // console.log("Hello from Dagger and Node " + version)
 
-  await installed.withExec(["npm", "run", "genversion"]).file('version.js').export('dagger-version.js');
+  await installed.withExec(['npm', 'run', 'genversion']).file('version.js').export('dagger-version.js');
   console.log(stdout);
   console.error(stderr);
 
   /*
-  npm run genversion
-              npm run check-licenses
-              npm run cover:nodejs:nogeo
-              npm run cover:rest:nogeo
-  */
+    npm run genversion
+                npm run check-licenses
+                npm run cover:nodejs:nogeo
+                npm run cover:rest:nogeo
+    */
 
-  installed.withExec(["npm", "run", "build"]);
+  installed.withExec(['npm', 'run', 'build']);
   // await runner.exitCode()
   // .directory("node_modules/")
   // .export("./dagger_node_modules")

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

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 "use strict";
 
 const fs = require('fs');
@@ -43,7 +42,7 @@ function createPackageJson(context, filepath) {
     homepage
   } = context;
   const newPackageJson = {
-    "name": `${name}-deployment`,
+    name: `${name}-deployment`,
     version,
     description,
     author,
@@ -55,11 +54,11 @@ function createPackageJson(context, filepath) {
     repository,
     bugs,
     homepage,
-    "scripts": {
+    scripts: {
       // TODO: see if we can use the context.main as the start script
-      "start": "addressr-server-2"
+      start: 'addressr-server-2'
     },
-    "dependencies": {
+    dependencies: {
       [name]: version
     }
   };

package/lib/loader.js

@@ -23,7 +23,7 @@ const start = process.hrtime();
   logger('data loaded');
 }).then(() => {
   const end = process.hrtime(start);
-  logger(`Execution time: ${end[0]}s ${end[1] / 1000000}ms`);
+  logger(`Execution time: ${end[0]}s ${end[1] / 1_000_000}ms`);
 }).then(() => {
   logger(`Fin`);
   process.exit();

package/lib/service/DefaultService.js

@@ -21,7 +21,7 @@ var logger = (0, _debug2.default)('api');
 async function getApiRoot() {
   const paths = Object.keys(global.swaggerDoc.paths).filter(p => global.swaggerDoc.paths[p].get !== undefined && global.swaggerDoc.paths[p].get['x-root-rel'] !== undefined);
   const link = new _httpLinkHeader2.default();
-  paths.forEach(p => {
+  for (const p of paths) {
     const op = global.swaggerDoc.paths[p].get;
     if (op.parameters && op.parameters.find(parameter => parameter.required === true)) {
       // skip
@@ -32,7 +32,7 @@ async function getApiRoot() {
         title: op.summary
       });
     }
-  });
+  }
   link.set({
     rel: 'describedby',
     uri: '/docs/',
@@ -46,11 +46,11 @@ async function getApiRoot() {
     type: 'application/json'
   });
   const linkTemplate = new _httpLinkHeader2.default();
-  paths.forEach(url => {
+  for (const url of paths) {
     const op = global.swaggerDoc.paths[url].get;
     logger(op);
     (0, _setLinkOptions.setLinkOptions)(op, url, linkTemplate);
-  });
+  }
   return {
     link: link,
     body: {},

package/lib/service/address-service.js

@@ -17,18 +17,18 @@ var _debug = require("debug");
 var _debug2 = _interopRequireDefault(_debug);
 var _directoryExists = require("directory-exists");
 var _directoryExists2 = _interopRequireDefault(_directoryExists);
-var _fs = require("fs");
-var _fs2 = _interopRequireDefault(_fs);
+var _nodeFs = require("node:fs");
+var _nodeFs2 = _interopRequireDefault(_nodeFs);
 var _got = require("got");
 var _got2 = _interopRequireDefault(_got);
 var _httpLinkHeader = require("http-link-header");
 var _httpLinkHeader2 = _interopRequireDefault(_httpLinkHeader);
 var _papaparse = require("papaparse");
 var _papaparse2 = _interopRequireDefault(_papaparse);
-var _path = require("path");
-var _path2 = _interopRequireDefault(_path);
-var _stream = require("stream");
-var _stream2 = _interopRequireDefault(_stream);
+var _nodePath = require("node:path");
+var _nodePath2 = _interopRequireDefault(_nodePath);
+var _nodeStream = require("node:stream");
+var _nodeStream2 = _interopRequireDefault(_nodeStream);
 var _unzipStream = require("unzip-stream");
 var _unzipStream2 = _interopRequireDefault(_unzipStream);
 var _elasticsearch = require("../client/elasticsearch");
@@ -38,8 +38,8 @@ var _setLinkOptions = require("./setLinkOptions");
 var _keyv = require("keyv");
 var _keyv2 = _interopRequireDefault(_keyv);
 var _keyvFile = require("keyv-file");
-var _crypto = require("crypto");
-var _crypto2 = _interopRequireDefault(_crypto);
+var _nodeCrypto = require("node:crypto");
+var _nodeCrypto2 = _interopRequireDefault(_nodeCrypto);
 var _globPromise = require("glob-promise");
 var _globPromise2 = _interopRequireDefault(_globPromise);
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -48,7 +48,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 /* eslint-disable security/detect-object-injection */
 /* eslint-disable security/detect-non-literal-fs-filename */
 
-const fsp = _fs2.default.promises;
+const fsp = _nodeFs2.default.promises;
 var logger = (0, _debug2.default)('api');
 var error = (0, _debug2.default)('error');
 const cache = new _keyv2.default({
@@ -59,11 +59,7 @@ const cache = new _keyv2.default({
 const PAGE_SIZE = process.env.PAGE_SIZE || 8;
 function getCoveredStates() {
   const covered = process.env.COVERED_STATES || '';
-  if (covered == '') {
-    return [];
-  } else {
-    return covered.split(',');
-  }
+  return covered == '' ? [] : covered.split(',');
 }
 const COVERED_STATES = getCoveredStates();
 const ONE_DAY_S = 60 /*sec*/ * 60 /*min*/ * 24; /*hours*/
@@ -80,7 +76,7 @@ async function clearAddresses() {
 async function setAddresses(addr) {
   await clearAddresses();
   const indexingBody = [];
-  addr.forEach(row => {
+  for (const row of addr) {
     indexingBody.push({
       index: {
         _index: ES_INDEX_NAME,
@@ -98,7 +94,7 @@ async function setAddresses(addr) {
       structurted,
       confidence: structurted.structurted.confidence
     });
-  });
+  }
   if (indexingBody.length > 0) {
     await sendIndexRequest(indexingBody);
   }
@@ -144,11 +140,9 @@ async function fetchPackageData() {
     return response;
   } catch (error_) {
     // we were unable to fetch. if we have cached value that isn't stale, return in
-    if (cachedResponse !== undefined) {
-      if (age < THIRTY_DAYS_MS) {
-        cachedResponse.headers['warning'] = '110	custom/1.0 "Response is Stale"';
-        return cachedResponse;
-      }
+    if (cachedResponse !== undefined && age < THIRTY_DAYS_MS) {
+      cachedResponse.headers['warning'] = '110	custom/1.0 "Response is Stale"';
+      return cachedResponse;
     }
     // otherwise, throw the original network error
     throw error_;
@@ -165,12 +159,12 @@ async function fetchGnafFile() {
   logger('dataResource', JSON.stringify(dataResource, undefined, 2));
   logger('url', dataResource.url);
   logger('headers', JSON.stringify(response.headers, undefined, 2));
-  const basename = _path2.default.basename(dataResource.url);
+  const basename = _nodePath2.default.basename(dataResource.url);
   logger('basename', basename);
   const complete_path = GNAF_DIR;
   const incomplete_path = `${complete_path}/incomplete`;
   await new Promise((resolve, reject) => {
-    _fs2.default.mkdir(incomplete_path, {
+    _nodeFs2.default.mkdir(incomplete_path, {
       recursive: true
     }, error_ => {
       if (error_) reject(error_);else resolve();
@@ -178,7 +172,7 @@ async function fetchGnafFile() {
   });
   const destination = `${complete_path}/${basename}`;
   await new Promise((resolve, reject) => {
-    _fs2.default.mkdir(incomplete_path, {
+    _nodeFs2.default.mkdir(incomplete_path, {
       recursive: true
     }, error_ => {
       if (error_) reject(error_);else resolve();
@@ -187,7 +181,7 @@ async function fetchGnafFile() {
   // see if the file exists already
   try {
     await new Promise((resolve, reject) => {
-      _fs2.default.access(destination, _fs2.default.constants.R_OK, error_ => {
+      _nodeFs2.default.access(destination, _nodeFs2.default.constants.R_OK, error_ => {
         if (error_) reject(error_);else resolve();
       });
     });
@@ -208,8 +202,8 @@ async function fetchGnafFile() {
   }
 }
 async function unzipFile(file) {
-  const extname = _path2.default.extname(file);
-  const basenameWithoutExtention = _path2.default.basename(file, extname);
+  const extname = _nodePath2.default.extname(file);
+  const basenameWithoutExtention = _nodePath2.default.basename(file, extname);
   const incomplete_path = `${GNAF_DIR}/incomplete/${basenameWithoutExtention}`;
   const complete_path = `${GNAF_DIR}/${basenameWithoutExtention}`;
   const exists = await (0, _directoryExists2.default)(complete_path);
@@ -219,21 +213,21 @@ async function unzipFile(file) {
     return complete_path;
   } else {
     await new Promise((resolve, reject) => {
-      _fs2.default.mkdir(incomplete_path, {
+      _nodeFs2.default.mkdir(incomplete_path, {
         recursive: true
       }, error_ => {
         if (error_) reject(error_);else resolve();
       });
     });
-    const readStream = _fs2.default.createReadStream(file);
+    const readStream = _nodeFs2.default.createReadStream(file);
     logger('before pipe');
     let prom = new Promise((resolve, reject) => {
-      readStream.pipe(_unzipStream2.default.Parse()).pipe(_stream2.default.Transform({
+      readStream.pipe(_unzipStream2.default.Parse()).pipe(_nodeStream2.default.Transform({
         objectMode: true,
         transform: function (entry, encoding, callback) {
           const entryPath = `${incomplete_path}/${entry.path}`;
           if (entry.isDirectory) {
-            _fs2.default.mkdir(entryPath, {
+            _nodeFs2.default.mkdir(entryPath, {
               recursive: true
             }, error_ => {
               if (error_) {
@@ -245,15 +239,15 @@ async function unzipFile(file) {
               }
             });
           } else {
-            const dirname = _path2.default.dirname(entryPath);
-            _fs2.default.mkdir(dirname, {
+            const dirname = _nodePath2.default.dirname(entryPath);
+            _nodeFs2.default.mkdir(dirname, {
               recursive: true
             }, error_ => {
               if (error_) {
                 entry.autodrain();
                 callback(error_);
               } else {
-                _fs2.default.stat(entryPath, (error_, stats) => {
+                _nodeFs2.default.stat(entryPath, (error_, stats) => {
                   if (error_ && error_.code !== 'ENOENT') {
                     logger('error statting file', error_);
                     entry.autodrain();
@@ -268,7 +262,7 @@ async function unzipFile(file) {
                   } else {
                     // size is different, so extract the file
                     logger('extracting', entryPath);
-                    entry.pipe(_fs2.default.createWriteStream(entryPath)).on('finish', () => {
+                    entry.pipe(_nodeFs2.default.createWriteStream(entryPath)).on('finish', () => {
                       logger('finished extracting', entryPath);
                       callback();
                     }).on('error', error => {
@@ -291,7 +285,7 @@ async function unzipFile(file) {
     });
     await prom;
     return await new Promise((resolve, reject) => {
-      _fs2.default.rename(incomplete_path, complete_path, error_ => {
+      _nodeFs2.default.rename(incomplete_path, complete_path, error_ => {
         if (error_) reject(error_);else resolve(complete_path);
       });
     });
@@ -423,14 +417,14 @@ function mapStreetLocality(l, context) {
 function mapGeo(geoSite, context, geoDefault) {
   let foundDefault = false;
   if (geoSite && geoDefault) {
-    geoSite.forEach(geo => {
+    for (const geo of geoSite) {
       if (geo.GEOCODE_TYPE_CODE === geoDefault[0].GEOCODE_TYPE_CODE && geo.LATITUDE === geoDefault[0].LATITUDE && geo.LONGITUDE === geoDefault[0].LONGITUDE) {
         foundDefault = true;
         geo.default = true;
       } else {
         geo.default = false;
       }
-    });
+    }
   }
   const sites = geoSite ? geoSite.map(geo => {
     if (geo.BOUNDARY_EXTENT !== '') {
@@ -525,8 +519,7 @@ function mapToMla(s) {
   const streetType = s.street.type ? ` ${s.street.type.name}` : '';
   const streetSuffix = s.street.suffix ? ` ${s.street.suffix.name}` : '';
   const street = `${s.street.name}${streetType}${streetSuffix}`;
-  fla.push(`${number} ${street}`);
-  fla.push(`${s.locality.name} ${s.state.abbreviation} ${s.postcode}`);
+  fla.push(`${number} ${street}`, `${s.locality.name} ${s.state.abbreviation} ${s.postcode}`);
   if (fla.length > 4) {
     logger('FLA TOO LONG', fla, s);
     throw new Error('FLA TOO LONG');
@@ -555,8 +548,7 @@ function mapToShortMla(s) {
   const streetType = s.street.type ? ` ${s.street.type.name}` : '';
   const streetSuffix = s.street.suffix ? ` ${s.street.suffix.code}` : '';
   const street = `${s.street.name}${streetType}${streetSuffix}`;
-  fla.push(`${number} ${street}`);
-  fla.push(`${s.locality.name} ${s.state.abbreviation} ${s.postcode}`);
+  fla.push(`${number} ${street}`, `${s.locality.name} ${s.state.abbreviation} ${s.postcode}`);
   if (fla.length > 4) {
     logger('FLA TOO LONG', fla, s);
     throw new Error('FLA TOO LONG');
@@ -565,7 +557,7 @@ function mapToShortMla(s) {
 }
 
 // eslint-disable-next-line complexity
-function mapAddressDetails(d, context, i, count) {
+function mapAddressDetails(d, context, index, count) {
   const streetLocality = context.streetLocalityIndexed[d.STREET_LOCALITY_PID];
   const locality = context.localityIndexed[d.LOCALITY_PID];
   const geoSite = context.geoIndexed ? context.geoIndexed[d.ADDRESS_SITE_PID] : undefined;
@@ -692,14 +684,14 @@ function mapAddressDetails(d, context, i, count) {
     rval.ssla = mapToSla(rval.smla);
   }
   if (count) {
-    if (i % Math.ceil(count / 100) === 0) {
+    if (index % Math.ceil(count / 100) === 0) {
       logger('addr', JSON.stringify(rval, undefined, 2));
-      logger(`${i / count * 100}%`);
+      logger(`${index / count * 100}%`);
     }
   } else {
-    if (i % 10000 === 0) {
+    if (index % 10_000 === 0) {
       logger('addr', JSON.stringify(rval, undefined, 2));
-      logger(`${i} rows`);
+      logger(`${index} rows`);
     }
   }
   return rval;
@@ -709,7 +701,7 @@ async function loadAddressDetails(file, expectedCount, context, {
 } = {}) {
   let actualCount = 0;
   await new Promise((resolve, reject) => {
-    _papaparse2.default.parse(_fs2.default.createReadStream(file), {
+    _papaparse2.default.parse(_nodeFs2.default.createReadStream(file), {
       header: true,
       skipEmptyLines: true,
       chunkSize: Number.parseInt(process.env.ADDRESSR_LOADING_CHUNK_SIZE || '10') * 1024 * 1024,
@@ -723,7 +715,7 @@ async function loadAddressDetails(file, expectedCount, context, {
           });
         }
         const indexingBody = [];
-        chunk.data.forEach(row => {
+        for (const row of chunk.data) {
           const item = mapAddressDetails(row, context, actualCount, expectedCount);
           items.push(item);
           actualCount += 1;
@@ -744,7 +736,7 @@ async function loadAddressDetails(file, expectedCount, context, {
             structured,
             confidence: structured.structured.confidence
           });
-        });
+        }
         if (indexingBody.length > 0) {
           sendIndexRequest(indexingBody, undefined, {
             refresh
@@ -946,7 +938,7 @@ async function sendIndexRequest(indexingBody, initialBackoff = Number.parseInt(p
 }
 async function getStateName(abbr, file) {
   return await new Promise((resolve, reject) => {
-    _papaparse2.default.parse(_fs2.default.createReadStream(file), {
+    _papaparse2.default.parse(_nodeFs2.default.createReadStream(file), {
       header: true,
       delimiter: '|',
       complete: results => {
@@ -982,7 +974,7 @@ const {
   readdir
 } = require('fs').promises;
 async function getFiles(currentDir, baseDir) {
-  const dir = _path2.default.resolve(baseDir, currentDir);
+  const dir = _nodePath2.default.resolve(baseDir, currentDir);
   logger(`reading ${dir} (${currentDir} in ${baseDir})`);
   const dirents = await readdir(dir, {
     withFileTypes: true
@@ -995,9 +987,9 @@ async function getFiles(currentDir, baseDir) {
 }
 function countFileLines(filePath) {
   return new Promise((resolve, reject) => {
-    const readStream = _fs2.default.createReadStream(filePath, 'utf-8');
+    const readStream = _nodeFs2.default.createReadStream(filePath, 'utf-8');
     let lines = 0;
-    let last = undefined;
+    let last;
     readStream.on('data', function (chunk) {
       lines += chunk.split('\n').length - 1;
       last = chunk[chunk.length - 1];
@@ -1008,8 +1000,8 @@ function countFileLines(filePath) {
       }
       resolve(lines);
     });
-    readStream.on('error', function (err) {
-      reject(err);
+    readStream.on('error', function (error_) {
+      reject(error_);
     });
   });
 }
@@ -1048,7 +1040,7 @@ async function loadGnafData(directory, {
   const addressDetailFiles = files.filter(f => f.match(/ADDRESS_DETAIL/) && f.match(/\/Standard\//));
   logger('addressDetailFiles', addressDetailFiles);
   for (const detailFile of addressDetailFiles) {
-    const state = _path2.default.basename(detailFile, _path2.default.extname(detailFile)).replace(/_.*/, '');
+    const state = _nodePath2.default.basename(detailFile, _nodePath2.default.extname(detailFile)).replace(/_.*/, '');
     if (COVERED_STATES.length === 0 || COVERED_STATES.includes(state)) {
       loadContext.state = state;
       loadContext.stateName = await loadState(files, directory, state);
@@ -1093,17 +1085,17 @@ async function loadGnafData(directory, {
 }
 async function fileExists(countsFile) {
   try {
-    await fsp.access(countsFile, _fs2.default.constants.F_OK);
+    await fsp.access(countsFile, _nodeFs2.default.constants.F_OK);
     return true;
-  } catch (err) {
-    error(err);
+  } catch (error_) {
+    error(error_);
     return false;
   }
 }
 async function loadFileCounts(countsFile) {
   const filesCounts = {};
   await new Promise((resolve, reject) => {
-    _papaparse2.default.parse(_fs2.default.createReadStream(countsFile), {
+    _papaparse2.default.parse(_nodeFs2.default.createReadStream(countsFile), {
       header: true,
       skipEmptyLines: true,
       step: function (row) {
@@ -1150,7 +1142,7 @@ async function loadStreetLocality(files, directory, state) {
     return [];
   } else {
     return await new Promise((resolve, reject) => {
-      _papaparse2.default.parse(_fs2.default.createReadStream(`${directory}/${localityFile}`), {
+      _papaparse2.default.parse(_nodeFs2.default.createReadStream(`${directory}/${localityFile}`), {
         header: true,
         delimiter: '|',
         complete: results => {
@@ -1171,7 +1163,7 @@ async function loadLocality(files, directory, state) {
     return [];
   } else {
     return await new Promise((resolve, reject) => {
-      _papaparse2.default.parse(_fs2.default.createReadStream(`${directory}/${localityFile}`), {
+      _papaparse2.default.parse(_nodeFs2.default.createReadStream(`${directory}/${localityFile}`), {
         header: true,
         delimiter: '|',
         complete: results => {
@@ -1195,7 +1187,7 @@ async function loadSiteGeo(files, directory, state, loadContext, filesCounts) {
     const expectedCount = filesCounts[geoFile];
     let count = 0;
     return await new Promise((resolve, reject) => {
-      _papaparse2.default.parse(_fs2.default.createReadStream(`${directory}/${geoFile}`), {
+      _papaparse2.default.parse(_nodeFs2.default.createReadStream(`${directory}/${geoFile}`), {
         header: true,
         delimiter: '|',
         chunk: function (chunk, parser) {
@@ -1206,11 +1198,9 @@ async function loadSiteGeo(files, directory, state, loadContext, filesCounts) {
               errors: chunk.errors
             });
           } else {
-            chunk.data.forEach(row => {
-              if (expectedCount) {
-                if (count % Math.ceil(expectedCount / 100) === 0) {
-                  logger(`${Math.floor(count / expectedCount * 100)}% (${count}/ ${expectedCount})`);
-                }
+            for (const row of chunk.data) {
+              if (expectedCount && count % Math.ceil(expectedCount / 100) === 0) {
+                logger(`${Math.floor(count / expectedCount * 100)}% (${count}/ ${expectedCount})`);
               }
               const g = row;
               if (loadContext.geoIndexed[g.ADDRESS_SITE_PID] === undefined) {
@@ -1219,7 +1209,7 @@ async function loadSiteGeo(files, directory, state, loadContext, filesCounts) {
                 loadContext.geoIndexed[g.ADDRESS_SITE_PID].push(g);
               }
               count += 1;
-            });
+            }
             parser.resume();
           }
         },
@@ -1244,7 +1234,7 @@ async function loadDefaultGeo(files, directory, state, loadContext, filesCounts)
     const expectedCount = filesCounts[geoFile];
     let count = 0;
     return await new Promise((resolve, reject) => {
-      _papaparse2.default.parse(_fs2.default.createReadStream(`${directory}/${geoFile}`), {
+      _papaparse2.default.parse(_nodeFs2.default.createReadStream(`${directory}/${geoFile}`), {
         header: true,
         delimiter: '|',
         chunk: function (chunk, parser) {
@@ -1255,11 +1245,9 @@ async function loadDefaultGeo(files, directory, state, loadContext, filesCounts)
               errors: chunk.errors
             });
           } else {
-            chunk.data.forEach(row => {
-              if (expectedCount) {
-                if (count % Math.ceil(expectedCount / 100) === 0) {
-                  logger(`${Math.floor(count / expectedCount * 100)}% (${count}/ ${expectedCount})`);
-                }
+            for (const row of chunk.data) {
+              if (expectedCount && count % Math.ceil(expectedCount / 100) === 0) {
+                logger(`${Math.floor(count / expectedCount * 100)}% (${count}/ ${expectedCount})`);
               }
               const g = row;
               if (loadContext.geoDefaultIndexed[g.ADDRESS_DETAIL_PID] === undefined) {
@@ -1268,7 +1256,7 @@ async function loadDefaultGeo(files, directory, state, loadContext, filesCounts)
                 loadContext.geoDefaultIndexed[g.ADDRESS_DETAIL_PID].push(g);
               }
               count += 1;
-            });
+            }
             parser.resume();
           }
         },
@@ -1287,9 +1275,9 @@ async function loadAuthFiles(files, directory, loadContext, filesCounts) {
   const authCodeFiles = files.filter(f => f.match(/Authority Code/));
   logger('authCodeFiles', authCodeFiles);
   for (const authFile of authCodeFiles) {
-    const contextKey = _path2.default.basename(authFile, _path2.default.extname(authFile));
+    const contextKey = _nodePath2.default.basename(authFile, _nodePath2.default.extname(authFile));
     await new Promise((resolve, reject) => {
-      _papaparse2.default.parse(_fs2.default.createReadStream(`${directory}/${authFile}`), {
+      _papaparse2.default.parse(_nodeFs2.default.createReadStream(`${directory}/${authFile}`), {
         delimiter: '|',
         header: true,
         complete: function (results) {
@@ -1321,7 +1309,7 @@ async function loadGnaf({
   logger('Data dir', unzipped);
   const contents = await fsp.readdir(unzipped);
   logger('Data dir contents', contents);
-  if (contents.length == 0) {
+  if (contents.length === 0) {
     throw new Error(`Data dir '${unzipped}' is empty`);
   }
   const gnafDir = await (0, _globPromise2.default)('**/G-NAF/', {
@@ -1331,7 +1319,7 @@ async function loadGnaf({
   if (gnafDir.length === 0) {
     throw new Error(`Cannot find 'G-NAF' directory in Data dir '${unzipped}'`);
   }
-  const mainDirectory = _path2.default.dirname(`${unzipped}/${gnafDir[0].slice(0, -1)}`);
+  const mainDirectory = _nodePath2.default.dirname(`${unzipped}/${gnafDir[0].slice(0, -1)}`);
   logger('Main Data dir', mainDirectory);
   await loadGnafData(mainDirectory, {
     refresh
@@ -1364,7 +1352,7 @@ async function getAddress(addressId) {
       uri: `/addresses/${addressId}`
     });
     // TODO: store hash in address
-    const hash = _crypto2.default.createHash('md5').update(JSON.stringify(json)).digest('hex');
+    const hash = _nodeCrypto2.default.createHash('md5').update(JSON.stringify(json)).digest('hex');
     return {
       link,
       json,

package/lib/src/waycharterServer.js

@@ -9,12 +9,12 @@ var _debug = require("debug");
 var _debug2 = _interopRequireDefault(_debug);
 var _express = require("express");
 var _express2 = _interopRequireDefault(_express);
-var _http = require("http");
+var _nodeHttp = require("node:http");
 var _waycharter = require("@mountainpass/waycharter");
 var _addressService = require("../service/address-service");
 var _version = require("../version");
-var _crypto = require("crypto");
-var _crypto2 = _interopRequireDefault(_crypto);
+var _nodeCrypto = require("node:crypto");
+var _nodeCrypto2 = _interopRequireDefault(_nodeCrypto);
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 //import connect from 'connect';
 
@@ -85,7 +85,7 @@ function startRest2Server() {
             pid: h._id.replace('/addresses/', '')
           };
         });
-        const responseHash = _crypto2.default.createHash('md5').update(JSON.stringify(body)).digest('hex');
+        const responseHash = _nodeCrypto2.default.createHash('md5').update(JSON.stringify(body)).digest('hex');
         return {
           body,
           hasMore: page < foundAddresses.body.hits.total.value / PAGE_SIZE - 1,
@@ -142,7 +142,7 @@ function startRest2Server() {
       };
     }
   });
-  server = (0, _http.createServer)(app);
+  server = (0, _nodeHttp.createServer)(app);
   return new Promise(resolve => {
     server.listen(serverPort, function () {
       logger('📡  Addressr is listening on port %d ( http://localhost:%d ) ', serverPort, serverPort);

package/lib/swagger.js

@@ -11,11 +11,11 @@ var _debug = require("debug");
 var _debug2 = _interopRequireDefault(_debug);
 var _express = require("express");
 var _express2 = _interopRequireDefault(_express);
-var _fs = require("fs");
-var _http = require("http");
+var _nodeFs = require("node:fs");
+var _nodeHttp = require("node:http");
 var _jsYaml = require("js-yaml");
-var _path = require("path");
-var _path2 = _interopRequireDefault(_path);
+var _nodePath = require("node:path");
+var _nodePath2 = _interopRequireDefault(_nodePath);
 var _swaggerTools = require("swagger-tools");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 //import connect from 'connect';
@@ -28,13 +28,13 @@ error.log = console.error.bind(console); // eslint-disable-line no-console
 
 // swaggerRouter configuration
 var options = {
-  swaggerUi: _path2.default.join(__dirname, '/swagger.json'),
-  controllers: _path2.default.join(__dirname, './controllers'),
+  swaggerUi: _nodePath2.default.join(__dirname, '/swagger.json'),
+  controllers: _nodePath2.default.join(__dirname, './controllers'),
   useStubs: process.env.NODE_ENV === 'development' // Conditionally turn on stubs (mock mode)
 };
 
 // The Swagger document (require it, build it programmatically, fetch it from a URL, ...)
-var spec = (0, _fs.readFileSync)(_path2.default.join(__dirname, 'api/swagger.yaml'), 'utf8');
+var spec = (0, _nodeFs.readFileSync)(_nodePath2.default.join(__dirname, 'api/swagger.yaml'), 'utf8');
 var swaggerDoc = exports.swaggerDoc = (0, _jsYaml.safeLoad)(spec);
 global.swaggerDoc = swaggerDoc;
 function swaggerInit() {
@@ -107,7 +107,7 @@ function startServer() {
     // logger(app);
     // logger(middleware);
 
-    server = (0, _http.createServer)(app);
+    server = (0, _nodeHttp.createServer)(app);
     server.listen(serverPort, function () {
       logger('📡  Addressr is listening on port %d ( http://localhost:%d ) ', serverPort, serverPort);
       logger('📑  Swagger-ui is available on http://localhost:%d/docs', serverPort);

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Australian Address Validation, Search and Autocomplete",
   "author": {
     "name": "Mountain Pass",
@@ -116,7 +116,7 @@
     "predocker:push": "echo \"$DOCKER_ID_PASS\" | docker login --username \"$DOCKER_ID_USER\" --password-stdin",
     "docker:push": "docker push \"mountainpass/addressr:${npm_package_version}\"",
     "postdocker:push": "docker push \"mountainpass/addressr:latest\"",
-    "check-licenses": "license-checker --production --onlyAllow 'MIT;Apache-2.0;ISC;Custom: http://github.com/substack/node-bufferlist;Unlicense;BSD-2-Clause;BSD-3-Clause;WTFPL;0BSD;MIT*' --summary",
+    "check-licenses": "license-checker --production --onlyAllow 'MIT;Apache-2.0;ISC;Custom: http://github.com/substack/node-bufferlist;Unlicense;BSD-2-Clause;BSD-3-Clause;WTFPL;0BSD;MIT*;Python-2.0;MPL-2.0' --summary",
     "pre-commit": "lint-staged && npm run check-licenses",
     "check-deps": "dry-aged-deps --check",
     "test:performance": "k6 run --out csv=target/stress.csv test/k6/script.js",
@@ -125,7 +125,8 @@
     "ci:publish": "[ \"$CI\" = true ] && changeset publish || echo \"Dry run: changeset publish\"",
     "push:watch": "bash scripts/push-and-watch.sh",
     "release:watch": "bash scripts/release-watch.sh",
-    "test:hooks": "bats .claude/hooks/test/"
+    "test:hooks": "bats .claude/hooks/test/",
+    "prepare": "husky"
   },
   "bin": {
     "addressr-loader": "lib/bin/addressr-loader.js",
@@ -202,29 +203,29 @@
     "cucumber": "^5.1.0",
     "dry-aged-deps": "^2.6.0",
     "eslint": "^7.9.0",
-    "eslint-config-prettier": "^8.0.0",
+    "eslint-config-prettier": "^9.1.2",
     "eslint-plugin-chai-friendly": "^0.7.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.1",
+    "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",
     "genversion": "^3.0.0",
-    "husky": "^7.0.0",
-    "imagemin-lint-staged": "^0.4.0",
+    "husky": "^9.1.7",
+    "imagemin-lint-staged": "^0.5.1",
     "istanbul": "^0.4.5",
     "istanbul-middleware": "^0.2.2",
     "license-checker": "^25.0.1",
-    "lint-staged": "^11.0.0",
+    "lint-staged": "^15.5.2",
     "nodemon": "^2.0.4",
     "npm-check": "^5.9.0",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
-    "prettier": "^2.1.0",
-    "prettier-config-standard": "^4.0.0"
+    "prettier": "^3.8.1",
+    "prettier-config-standard": "^7.0.0"
   },
   "repository": {
     "type": "git",
@@ -235,27 +236,9 @@
   },
   "homepage": "https://addressr.io",
   "lint-staged": {
-    "*.{js,jsx}": [
-      "eslint --fix",
-      "git add"
-    ],
-    "*.{json,css,md}": [
-      "prettier --write",
-      "git add"
-    ],
-    "*.{png,jpeg,jpg,gif,svg}": [
-      "imagemin-lint-staged",
-      "git add"
-    ],
-    ".circleci/config.yml": [
-      "circleci config validate",
-      "git add"
-    ]
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm run pre-commit",
-      "pre-push": "npm run check-deps"
-    }
+    "*.{js,jsx}": "eslint --fix",
+    "*.{json,css,md}": "prettier --write",
+    "*.{png,jpeg,jpg,gif,svg}": "imagemin-lint-staged",
+    ".circleci/config.yml": "circleci config validate"
   }
 }

package/scripts/check-version.js

@@ -1,12 +1,11 @@
 #!/usr/bin/env node
-'use strict';
 const { satisfies } = require('semver');
 const { engines } = require('../package');
 
 const version = engines.node;
 if (!satisfies(process.version, version)) {
   console.log(
-    `Required node version ${version} not satisfied with current version ${process.version}.`
+    `Required node version ${version} not satisfied with current version ${process.version}.`,
   );
   process.exit(1);
 }