@mountainpass/addressr 2.0.3 → 2.1.0

package/lib/ci/build.js

@@ -35,7 +35,7 @@ console.log('starting...');
   const node = client.container().from('node:12.11.0');
 
   // mount cloned repository into Node image
-  const runner = client.container({
+  await client.container({
     id: node
   }).withMountedDirectory('/src', source).withWorkdir('/src').withExec(['npm', 'run', 'hello']);
 });

package/lib/ci/pipeline.js

@@ -28,10 +28,12 @@ actions:
 
 */
 
-const cacheDir = `${(0, _envPaths.default)('', {
+const cacheDirectory = `${(0, _envPaths.default)('', {
   suffix: ''
 }).cache}/dagger`;
-const binLocation = `${cacheDir}/dagger-0.3.9`;
+const binLocation = `${cacheDirectory}/dagger-0.3.9`;
+
+// eslint-disable-next-line security/detect-non-literal-fs-filename -- internal cache path
 if (!process.env._EXPERIMENTAL_DAGGER_CLI_BIN && _nodeFs.default.existsSync(binLocation)) {
   process.env._EXPERIMENTAL_DAGGER_CLI_BIN = binLocation;
   console.log(`using already downloaded '${binLocation}'`);
@@ -59,8 +61,6 @@ console.log('connecting...');
   // console.log("Hello from Dagger and Node " + version)
 
   await installed.withExec(['npm', 'run', 'genversion']).file('version.js').export('dagger-version.js');
-  console.log(stdout);
-  console.error(stderr);
 
   /*
     npm run genversion

package/lib/client/elasticsearch.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ELASTIC_PORT = void 0;
+exports.ES_LOCALITY_INDEX_NAME = exports.ELASTIC_PORT = void 0;
 exports.dropIndex = dropIndex;
+exports.dropLocalityIndex = dropLocalityIndex;
 exports.esConnect = esConnect;
 exports.initIndex = initIndex;
+exports.initLocalityIndex = initLocalityIndex;
 var _debug = _interopRequireDefault(require("debug"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const waitPort = require('wait-port');
@@ -14,6 +16,7 @@ const elasticsearch = require('@opensearch-project/opensearch');
 const logger = (0, _debug.default)('api');
 const error = (0, _debug.default)('error');
 const ES_INDEX_NAME = process.env.ES_INDEX_NAME || 'addressr';
+const ES_LOCALITY_INDEX_NAME = exports.ES_LOCALITY_INDEX_NAME = `${ES_INDEX_NAME}-localities`;
 const ELASTIC_PORT = exports.ELASTIC_PORT = Number.parseInt(process.env.ELASTIC_PORT || '9200');
 const ELASTIC_HOST = process.env.ELASTIC_HOST || '127.0.0.1';
 const ELASTIC_USERNAME = process.env.ELASTIC_USERNAME || undefined;
@@ -75,7 +78,7 @@ async function initIndex(esClient, clear, synonyms) {
           tokenizer: {
             whitecomma: {
               type: 'pattern',
-              pattern: '[\\W,]+',
+              pattern: String.raw`[\W,]+`,
               lowercase: false
             }
           }
@@ -164,6 +167,138 @@ async function initIndex(esClient, clear, synonyms) {
   });
   logger(`indexGetResult:\n${JSON.stringify(indexGetResult, undefined, 2)}`);
 }
+async function dropLocalityIndex(esClient) {
+  let exists = await esClient.indices.exists({
+    index: ES_LOCALITY_INDEX_NAME
+  });
+  if (exists.body) {
+    const deleteIndexResult = await esClient.indices.delete({
+      index: ES_LOCALITY_INDEX_NAME
+    });
+    logger({
+      deleteIndexResult
+    });
+  }
+}
+async function initLocalityIndex(esClient, clear, synonyms) {
+  if (clear) {
+    await dropLocalityIndex(esClient);
+  }
+  const exists = await esClient.indices.exists({
+    index: ES_LOCALITY_INDEX_NAME
+  });
+  const indexBody = {
+    settings: {
+      index: {
+        analysis: {
+          filter: {
+            my_synonym_filter: {
+              type: 'synonym',
+              lenient: true,
+              synonyms: synonyms || []
+            },
+            comma_stripper: {
+              type: 'pattern_replace',
+              pattern: ',',
+              replacement: ''
+            }
+          },
+          analyzer: {
+            my_analyzer: {
+              tokenizer: 'whitecomma',
+              filter: ['uppercase', 'asciifolding', 'my_synonym_filter', 'comma_stripper', 'trim']
+            }
+          },
+          tokenizer: {
+            whitecomma: {
+              type: 'pattern',
+              pattern: String.raw`[\W,]+`,
+              lowercase: false
+            }
+          }
+        }
+      }
+    },
+    aliases: {},
+    mappings: {
+      properties: {
+        locality_name: {
+          type: 'text',
+          analyzer: 'my_analyzer',
+          fields: {
+            raw: {
+              type: 'keyword'
+            }
+          }
+        },
+        locality_class_code: {
+          type: 'keyword'
+        },
+        locality_class_name: {
+          type: 'keyword'
+        },
+        primary_postcode: {
+          type: 'keyword'
+        },
+        state_abbreviation: {
+          type: 'keyword'
+        },
+        state_name: {
+          type: 'keyword'
+        },
+        postcodes: {
+          type: 'keyword'
+        },
+        locality_pid: {
+          type: 'keyword'
+        }
+      }
+    }
+  };
+  if (exists.body) {
+    const indexCloseResult = await esClient.indices.close({
+      index: ES_LOCALITY_INDEX_NAME
+    });
+    logger({
+      indexCloseResult
+    });
+    const indexPutSettingsResult = await esClient.indices.putSettings({
+      index: ES_LOCALITY_INDEX_NAME,
+      body: indexBody
+    });
+    logger({
+      indexPutSettingsResult
+    });
+    const indexPutMappingResult = await esClient.indices.putMapping({
+      index: ES_LOCALITY_INDEX_NAME,
+      body: indexBody.mappings
+    });
+    logger({
+      indexPutMappingResult
+    });
+    const indexOpenResult = await esClient.indices.open({
+      index: ES_LOCALITY_INDEX_NAME
+    });
+    logger({
+      indexOpenResult
+    });
+    const refreshResult = await esClient.indices.refresh({
+      index: ES_LOCALITY_INDEX_NAME
+    });
+    logger({
+      refreshResult
+    });
+  } else {
+    logger(`creating index: ${ES_LOCALITY_INDEX_NAME}`);
+    const indexCreateResult = await esClient.indices.create({
+      index: ES_LOCALITY_INDEX_NAME,
+      body: indexBody
+    });
+    logger({
+      indexCreateResult
+    });
+  }
+}
 async function esConnect(esport = ELASTIC_PORT, eshost = ELASTIC_HOST, interval = 1000, timeout = 0) {
   // we keep trying to connect, no matter what
 
@@ -208,7 +343,7 @@ async function esConnect(esport = ELASTIC_PORT, eshost = ELASTIC_HOST, interval
             logger(`connecting elastic search client on ${eshost}:${esport}...`);
             await esClient.ping();
             logger(`...connected to ${eshost}:${esport}`);
-            global.esClient = esClient;
+            globalThis.esClient = esClient;
             return esClient;
           } catch (error_) {
             error(`An error occurred while trying to connect the elastic search client on ${eshost}:${esport}`, error_);

package/lib/controllers/Addresses.js

@@ -17,12 +17,12 @@ function getAddress(request, response) {
     if (addressResponse.statusCode) {
       response.setHeader('Content-Type', 'application/json');
       response.status(addressResponse.statusCode);
-      response.json(addressResponse.json);
-    } else {
-      response.setHeader('link', addressResponse.link.toString());
-      (0, _writer.writeJson)(response, addressResponse.json);
+      return response.json(addressResponse.json);
     }
-    return;
+    response.setHeader('link', addressResponse.link.toString());
+    return (0, _writer.writeJson)(response, addressResponse.json);
+  }).catch(function (error_) {
+    (0, _writer.writeJson)(response, error_.body || error_);
   });
 }
 function getAddresses(request, response) {
@@ -33,12 +33,12 @@ function getAddresses(request, response) {
     if (addressesResponse.statusCode) {
       response.setHeader('Content-Type', 'application/json');
       response.status(addressesResponse.statusCode);
-      response.json(addressesResponse.json);
-    } else {
-      response.setHeader('link', addressesResponse.link.toString());
-      response.setHeader('link-template', addressesResponse.linkTemplate.toString());
-      (0, _writer.writeJson)(response, addressesResponse.json);
+      return response.json(addressesResponse.json);
     }
-    return;
+    response.setHeader('link', addressesResponse.link.toString());
+    response.setHeader('link-template', addressesResponse.linkTemplate.toString());
+    return (0, _writer.writeJson)(response, addressesResponse.json);
+  }).catch(function (error_) {
+    (0, _writer.writeJson)(response, error_.body || error_);
   });
 }

package/lib/controllers/Default.js

@@ -10,12 +10,12 @@ var _writer = require("../utils/writer.js");
 
 // var logger = debug('api');
 
-function getApiRoot(request, res) {
+function getApiRoot(request, response_) {
   (0, _DefaultService.getApiRoot)().then(function (response) {
-    res.setHeader('link', response.link.toString());
-    res.setHeader('link-template', response.linkTemplate.toString());
-    (0, _writer.writeJson)(res, response.body);
+    response_.setHeader('link', response.link.toString());
+    response_.setHeader('link-template', response.linkTemplate.toString());
+    return (0, _writer.writeJson)(response_, response.body);
   }).catch(function (error) {
-    (0, _writer.writeJson)(res, error.body);
+    (0, _writer.writeJson)(response_, error.body);
   });
 }

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

@@ -62,12 +62,12 @@ function createPackageJson(context, filepath) {
       [name]: version
     }
   };
-  fs.writeFileSync(filepath, JSON.stringify(newPackageJson, null, 2));
+  fs.writeFileSync(filepath, JSON.stringify(newPackageJson, undefined, 2)); // eslint-disable-line security/detect-non-literal-fs-filename -- internal deployment path
 }
-async function createDeploymentArchive(deploymentDir) {
-  shell.mkdir('-p', deploymentDir);
-  createPackageJson(packageJson, `${deploymentDir}/package.json`);
+async function createDeploymentArchive(deploymentDirectory) {
+  shell.mkdir('-p', deploymentDirectory);
+  createPackageJson(packageJson, `${deploymentDirectory}/package.json`);
   const archiveName = packageJson.name.replace('@', '').replace('/', '-');
-  await zip(`${deploymentDir}/`, `${archiveName}-deployment-${packageJson.version}.zip`);
+  await zip(`${deploymentDirectory}/`, `${archiveName}-deployment-${packageJson.version}.zip`);
 }
 createDeploymentArchive('./deployment');

package/lib/eslint.config.js

@@ -37,24 +37,28 @@ var _default = exports.default = [{
     strict: 2,
     'prettier/prettier': 'error',
     'import-x/default': 0,
-    'unicorn/filename-case': ['warn', {
+    'unicorn/filename-case': ['error', {
       cases: {
         kebabCase: true,
         pascalCase: true
       }
     }],
-    'unicorn/prevent-abbreviations': 'warn',
-    'unicorn/no-null': 'warn',
-    'unicorn/no-process-exit': 'warn',
+    'unicorn/prevent-abbreviations': ['error', {
+      replacements: {
+        res: {
+          response: true
+        },
+        dir: {
+          directory: true
+        }
+      }
+    }],
+    // Blocked by ADR 005 (Babel/CJS — requires native ESM)
     'unicorn/prefer-module': 'off',
+    // waycharter ops.find()/ops.filter() are not Array.prototype — false positives
     'unicorn/no-array-callback-reference': 'off',
-    'unicorn/no-array-for-each': 'off',
-    'unicorn/prefer-spread': 'off',
+    // Blocked by ADR 005 (Babel/CJS — requires native ESM)
     'unicorn/prefer-top-level-await': 'off',
-    'unicorn/prefer-global-this': 'off',
-    'unicorn/require-module-specifiers': 'off',
-    'unicorn/prefer-string-raw': 'off',
-    'unicorn/no-anonymous-default-export': 'off',
     'promise/always-return': 'warn',
     'promise/catch-or-return': 'warn',
     'n/no-unsupported-features/es-syntax': 'off',
@@ -65,9 +69,16 @@ var _default = exports.default = [{
     'no-process-exit': 'warn',
     'no-useless-assignment': 'off',
     complexity: 'warn',
+    'max-lines-per-function': ['warn', {
+      max: 100,
+      skipBlankLines: true,
+      skipComments: true
+    }],
+    'max-depth': ['warn', 4],
+    'max-params': ['warn', 4],
     'n/hashbang': ['error', {
       convertPath: {
-        'bin/**/*.js': ['^bin/(.+?)\\.js$', 'lib/bin/$1.js']
+        'bin/**/*.js': [String.raw`^bin/(.+?)\.js$`, 'lib/bin/$1.js']
       }
     }]
   }
@@ -89,4 +100,24 @@ var _default = exports.default = [{
   rules: {
     'n/hashbang': 'off'
   }
+}, {
+  // Dagger CI runtime — modules resolved by Dagger SDK, not Node.js
+  files: ['ci/**'],
+  rules: {
+    'import-x/no-unresolved': 'off',
+    'n/no-missing-import': 'off'
+  }
+}, {
+  // k6 load testing runtime — modules resolved by k6, not Node.js
+  files: ['test/k6/**'],
+  rules: {
+    'import-x/no-unresolved': 'off',
+    'n/no-missing-import': 'off'
+  }
+}, {
+  // Deploy scripts — deps installed in deployment context, not dev
+  files: ['deploy/**'],
+  rules: {
+    'n/no-missing-require': 'off'
+  }
 }];

package/lib/loader.js

@@ -3,7 +3,7 @@
 var _debug = _interopRequireDefault(require("debug"));
 var _elasticsearch = require("./client/elasticsearch");
 var _addressService = require("./service/address-service");
-var _printVersion = require("./service/printVersion");
+var _printVersion = require("./service/print-version");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const logger = (0, _debug.default)('api');
 const error = (0, _debug.default)('error');
@@ -12,20 +12,20 @@ if (process.env.DEBUG == undefined) {
 }
 const start = process.hrtime();
 (0, _elasticsearch.esConnect)().then(() => {
-  logger('es client connected');
+  return logger('es client connected');
 }).then(() => {
   console.log('======================');
   console.log('Addressr - Data Loader');
   console.log('======================');
-  (0, _printVersion.printVersion)();
+  return (0, _printVersion.printVersion)();
 }).then(_addressService.loadGnaf).then(() => {
-  logger('data loaded');
+  return logger('data loaded');
 }).then(() => {
   const end = process.hrtime(start);
-  logger(`Execution time: ${end[0]}s ${end[1] / 1_000_000}ms`);
+  return logger(`Execution time: ${end[0]}s ${end[1] / 1_000_000}ms`);
 }).then(() => {
   logger(`Fin`);
-  process.exit();
+  process.exit(); // eslint-disable-line unicorn/no-process-exit, n/no-process-exit, no-process-exit -- CLI loader entry point
 }).catch(error_ => {
   error('error loading data', error_);
   throw error_;

package/lib/server.js

@@ -2,20 +2,20 @@
 
 var _debug = _interopRequireDefault(require("debug"));
 var _elasticsearch = require("./client/elasticsearch");
-var _printVersion = require("./service/printVersion");
+var _printVersion = require("./service/print-version");
 var _swagger = require("./swagger");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const logger = (0, _debug.default)('api');
-(0, _swagger.startServer)().then(() => {
+(0, _swagger.startServer)().then(async () => {
   logger('connecting es client');
-  const p1 = (0, _elasticsearch.esConnect)().then(esClient => {
-    global.esClient = esClient;
-    logger('es client connected');
-  });
-  p1.then(() => {
-    console.log('=====================');
-    console.log('Addressr - API Server');
-    console.log('=====================');
-    (0, _printVersion.printVersion)();
-  });
+  const esClient = await (0, _elasticsearch.esConnect)();
+  globalThis.esClient = esClient;
+  logger('es client connected');
+  console.log('=====================');
+  console.log('Addressr - API Server');
+  console.log('=====================');
+  (0, _printVersion.printVersion)();
+}).catch(error => {
+  console.error('Failed to start server:', error);
+  throw error;
 });

package/lib/service/DefaultService.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getApiRoot = getApiRoot;
 var _debug = _interopRequireDefault(require("debug"));
 var _httpLinkHeader = _interopRequireDefault(require("http-link-header"));
-var _setLinkOptions = require("./setLinkOptions");
+var _setLinkOptions = require("./set-link-options");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var logger = (0, _debug.default)('api');
 
@@ -17,10 +17,11 @@ var logger = (0, _debug.default)('api');
  * returns Root
  **/
 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);
+  /* eslint-disable security/detect-object-injection -- iterating Object.keys() of swagger spec, not user input */
+  const paths = Object.keys(globalThis.swaggerDocument.paths).filter(p => globalThis.swaggerDocument.paths[p].get !== undefined && globalThis.swaggerDocument.paths[p].get['x-root-rel'] !== undefined);
   const link = new _httpLinkHeader.default();
   for (const p of paths) {
-    const op = global.swaggerDoc.paths[p].get;
+    const op = globalThis.swaggerDocument.paths[p].get;
     if (op.parameters && op.parameters.some(parameter => parameter.required === true)) {
       // skip
     } else {
@@ -45,10 +46,13 @@ async function getApiRoot() {
   });
   const linkTemplate = new _httpLinkHeader.default();
   for (const url of paths) {
-    const op = global.swaggerDoc.paths[url].get;
+    const op = globalThis.swaggerDocument.paths[url].get;
     logger(op);
     (0, _setLinkOptions.setLinkOptions)(op, url, linkTemplate);
   }
+
+  /* eslint-enable security/detect-object-injection */
+
   return {
     link: link,
     body: {},