@whiteslove/parsing-lexicon 0.4.3 → 0.4.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@whiteslove/parsing-lexicon",
-  "version": "0.4.3",
-  "description": "Shared deterministic multilingual parsing lexicon for Whiteslove housing and hiring services",
+  "version": "0.4.4",
+  "description": "Shared deterministic multilingual parsing lexicon for WhitesLove housing and hiring services",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/AmoneMisa/parsing-lexicon.git"

package/src/locations.js

@@ -172,11 +172,21 @@ export function matchDictionaryLocation(text, countryCode, city = null) {
   const country = locationCities(countryCode);
   const cities = city && country[city] ? [[city, country[city]]] : Object.entries(country);
   const value = String(text || '');
+  let best = null;
   for (const [cityName, data] of cities) {
     for (const type of LOCATION_LIST_KEYS) {
-      const match = (data[type] || []).find((entry) => entry?.re?.test(value));
-      if (match) return { city: cityName, type, name: match.name, aliases: match.aliases };
+      for (const entry of data[type] || []) {
+        const match = entry?.re?.exec(value);
+        if (!match) continue;
+        const start = match.index;
+        const end = start + match[0].length;
+        const containsBest = best && start <= best.start && end >= best.end && end - start > best.end - best.start;
+        if (best && !containsBest) continue;
+        best = { city: cityName, type, name: entry.name, aliases: entry.aliases, start, end };
+      }
     }
   }
-  return null;
+  if (!best) return null;
+  const { start: _start, end: _end, ...result } = best;
+  return result;
 }

package/src/uz-location-extensions.js

@@ -210,6 +210,8 @@ export const UZ_LOCATION_EXTENSIONS = Object.freeze({
       ['Tashkent City', 'Ташкент Сити', 'Toshkent City', 'Tashkent City IBC'],
     ],
     streets: [
+      { name: 'Gulobod Street', aliases: ['Gulobod ko‘chasi', "Gulobod ko'chasi", 'улица Гулобод', 'ул. Гулобод'], parent: 'Shaykhantahur' },
+      { name: 'Sebzor Street', aliases: ['Sebzor ko‘chasi', "Sebzor ko'chasi", 'улица Себзор', 'ул. Себзор'], parent: 'Almazar' },
       { name: 'Lolazor Street', aliases: ['Lolazor ko‘chasi', "Lolazor ko'chasi", 'улица Лолазор', 'ул. Лолазор'], parent: 'Uchtepa' },
       { name: 'Shohimardon Street', aliases: ['Shohimardon ko‘chasi', "Shohimardon ko'chasi", 'улица Шохимардон', 'ул. Шохимардон'], parent: 'Yashnobod' },
       { name: 'Shohimardon Passage 1', aliases: ['Shohimardon 1-tor ko‘chasi', "Shohimardon 1-tor ko'chasi", '1-й проезд Шохимардон', '1 проезд Шохимардон'], parent: 'Yashnobod' },