@mountainpass/addressr 2.3.0 → 2.4.1

package/lib/service/address-service.js

@@ -862,7 +862,13 @@ async function searchForAddress(searchString, p, pageSize = PAGE_SIZE) {
               multi_match: {
                 fields: ['sla', 'ssla'],
                 query: searchString,
-                fuzziness: 'AUTO',
+                // ADR 027: AUTO:5,8 (not default AUTO / AUTO:3,6) so that
+                // 3-4 digit street numbers and postcodes require exact
+                // match. Default AUTO lets `138` fuzzy-match `137`, `135`
+                // etc., which tf-inflates adjacent-number docs above the
+                // actual target (P026). 5+ char tokens still get 1 edit
+                // (Muray → Murray), 8+ char tokens get 2 edits.
+                fuzziness: 'AUTO:5,8',
                 type: 'bool_prefix',
                 lenient: true,
                 auto_generate_synonyms_phrase_query: false,

package/lib/service/range-expansion.js

@@ -3,23 +3,29 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SPAN_CAP = void 0;
 exports.expandRangeAliases = expandRangeAliases;
-// ADR 026: range-number address expansion via multi-valued text alias field.
+// ADR 028 (supersedes ADR 026): endpoint-only range-address expansion.
 // Pure helper — no I/O, no OpenSearch dependency. Invoked by `mapToMla` in
 // `service/address-service.js` when a G-NAF address has NUMBER_LAST set.
-// See docs/problems/015-range-number-addresses-not-searchable-by-base-number.open.md
-// for the range-distribution measurements that justify SPAN_CAP = 20.
+//
+// For a G-NAF range like `103-107 GAZE RD` (NUMBER_FIRST=103, NUMBER_LAST=107),
+// emit exactly two aliases — the first and last endpoints — and nothing else.
+// Mid-range numbers (104, 105, 106) do NOT match the range document:
+//
+//   - Even-indexed mid-range numbers (104, 106) typically belong to properties
+//     on the opposite side of the street under Australian addressing convention.
+//   - Odd-indexed mid-range numbers (105) could be separate properties the
+//     range record absorbed, or a single contiguous frontage — G-NAF does not
+//     tell us which. Returning a range doc for a mid-range query would be a
+//     false positive either way.
+//
+// See ADR 028 and P015 / #367 reporter comments 2022-06-24 (`138-144`) and
+// 2022-07-10 (`225-245`). The earlier full-interpolation approach from ADR 026
+// shipped in v2.3.0 produced these false positives and is superseded.
 
-const SPAN_CAP = exports.SPAN_CAP = 20;
 function expandRangeAliases(first, last, streetPart, localityPart) {
   if (!Number.isInteger(first) || !Number.isInteger(last)) return [];
   if (first <= 0 || last <= 0) return [];
   if (first >= last) return [];
-  if (last - first > SPAN_CAP) return [];
-  const aliases = [];
-  for (let n = first; n <= last; n++) {
-    aliases.push(`${n} ${streetPart}, ${localityPart}`);
-  }
-  return aliases;
+  return [`${first} ${streetPart}, ${localityPart}`, `${last} ${streetPart}, ${localityPart}`];
 }

package/lib/version.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = void 0;
 // Generated by genversion.
-const version = exports.version = '2.3.0';
+const version = exports.version = '2.4.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "description": "Australian Address Validation, Search and Autocomplete",
   "author": {
     "name": "Mountain Pass",
@@ -18,7 +18,9 @@
   "packageManager": "npm@10.9.4",
   "config": {
     "localport": "6060",
-    "SEARCH_IMAGE": "opensearchproject/opensearch:1.3.20"
+    "SEARCH_IMAGE": "opensearchproject/opensearch:2.19.5",
+    "SEARCH_IMAGE_1_3_20": "opensearchproject/opensearch:1.3.20",
+    "SEARCH_IMAGE_2_19": "opensearchproject/opensearch:2.19.5"
   },
   "scripts": {
     "gen-install-cmd": "echo \"#!/bin/sh\n\nnpm install -g ${npm_package_name}@${npm_package_version}\" > install.sh",
@@ -28,7 +30,11 @@
     "turbo:ci:version": "turbo run ci:version",
     "turbo:ci:publish": "turbo run ci:publish",
     "pull:open-search": "docker pull ${npm_package_config_SEARCH_IMAGE}",
-    "start:open-search": "docker run -p 9200:9200 -p 9300:9300 -e \"ES_JAVA_OPTS=-Xms1g -Xmx1g\" -e \"discovery.type=single-node\" -e \"plugins.security.disabled=true\" \"${npm_package_config_SEARCH_IMAGE}\"",
+    "start:open-search": "docker run -p 9200:9200 -p 9300:9300 -e \"ES_JAVA_OPTS=-Xms1g -Xmx1g\" -e \"discovery.type=single-node\" -e \"plugins.security.disabled=true\" -e \"DISABLE_INSTALL_DEMO_CONFIG=true\" \"${npm_package_config_SEARCH_IMAGE}\"",
+    "pull:open-search:1.3.20": "docker pull ${npm_package_config_SEARCH_IMAGE_1_3_20}",
+    "start:open-search:1.3.20": "docker run -p 9200:9200 -p 9300:9300 -e \"ES_JAVA_OPTS=-Xms1g -Xmx1g\" -e \"discovery.type=single-node\" -e \"plugins.security.disabled=true\" -e \"DISABLE_INSTALL_DEMO_CONFIG=true\" \"${npm_package_config_SEARCH_IMAGE_1_3_20}\"",
+    "pull:open-search:2.19": "docker pull ${npm_package_config_SEARCH_IMAGE_2_19}",
+    "start:open-search:2.19": "docker run -p 9200:9200 -p 9300:9300 -e \"ES_JAVA_OPTS=-Xms1g -Xmx1g\" -e \"discovery.type=single-node\" -e \"plugins.security.disabled=true\" -e \"DISABLE_INSTALL_DEMO_CONFIG=true\" \"${npm_package_config_SEARCH_IMAGE_2_19}\"",
     "hmm": "echo mountainpass-addressr-${npm_package_version}.tgz",
     "requirements-check": "scripts/check-version.js",
     "postinstall": "npm run requirements-check",
@@ -133,7 +139,6 @@
     "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/",
     "prepare": "husky"
   },
   "bin": {
@@ -205,7 +210,6 @@
     "@istanbuljs/nyc-config-babel": "^3.0.0",
     "@mountainpass/waychaser": "^5.0.50",
     "babel-plugin-istanbul": "^7.0.1",
-    "bats": "^1.13.0",
     "chai": "^4.2.0",
     "dry-aged-deps": "^2.6.0",
     "eslint": "^9.39.4",