@universe/address-parser - npm Package Compare versions

Comparing version 3.3.0 to 3.3.1

dist/src/Address.js

@@ -13,2 +13,12 @@ import { Country, FacilityType, getCountryDesc, isCountry, isDirectional, StreetType } from '@universe/models';
 const forceStreetExpansion = new Set([StreetType.PLZ]);
+const singleStreetSuffix = new Set([
+    StreetType.BLFS, StreetType.BRKS, StreetType.CIRS, StreetType.CLFS, StreetType.CMNS,
+    StreetType.CORS, StreetType.CTS, StreetType.XING, StreetType.XRDS, StreetType.DRS,
+    StreetType.ESTS, StreetType.EXTS, StreetType.FLS, StreetType.FLDS, StreetType.FLTS,
+    StreetType.FRDS, StreetType.JCTS, StreetType.KYS, StreetType.KNLS, StreetType.MEWS,
+    StreetType.MDWS, StreetType.RDGS, StreetType.RIV, StreetType.SHLS, StreetType.SHRS,
+    StreetType.SPGS, StreetType.SQS, StreetType.ST, StreetType.STS, StreetType.TER,
+    StreetType.VLY, StreetType.VLYS, StreetType.VLG, StreetType.VLGS, StreetType.VIS,
+    StreetType.WALK, StreetType.WAY, StreetType.WLS,
+]);
 function streetName(name, type) {
@@ -25,4 +35,4 @@ if (!type || isStreetPrefix(type)) {
     }
-    if (isNumberOrCode(name) && !isOrdinal(name) && !isDirectional(name)) {
-        return [streetTypeString(toStreetType(type)), name];
+    if (name.startsWith('of the') || (isNumberOrCode(name) && !isOrdinal(name) && !isDirectional(name) && !singleStreetSuffix.has(type))) {
+        return [streetTypeString(toStreetType(type), true), name];
     }
@@ -144,2 +154,2 @@ return [name, streetTypeOut];
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Address.js","sourceRoot":"","sources":["../../src/Address.ts"],"names":[],"mappings":"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","sourcesContent":["import { Country, FacilityType, getCountryDesc, isCountry,isDirectional, ISitus, State, StreetType } from '@universe/models';\n\nimport { toDirectional } from './data/Directional.js';\nimport { isUrbanization } from './data/FacilityType.js';\nimport { isStreetPrefix, streetTypeString,toStreetType } from './data/StreetType.js';\nimport { parse } from './parser/index.js';\nimport { isNumberOrCode } from './parser/tokenizer.js';\nimport { isOrdinal } from './parser/utils.js';\n\nexport interface USPSLabel {\n  care: string | null;\n  urbanization: string | null;\n  line1: string | null;\n  line2: string | null;\n  city: string | null;\n  state: State | null;\n  zip: string | null;\n  zip4: string | null;\n  country: string | null;\n}\n\nfunction concat(...values: (string | null)[]): string {\n  return values.filter(Boolean).join(' ').toUpperCase().trim();\n}\n\n// USPS likes to force some streets to always be expanded...\nconst forceStreetExpansion = new Set([StreetType.PLZ]);\nfunction streetName(name: string | null, type: StreetType | null): (string | null)[] {\n  if (!type || isStreetPrefix(type)) { return [name]; }\n\n  let streetTypeOut: string = type;\n  if (forceStreetExpansion.has(type)) { streetTypeOut = streetTypeString(type) || type; }\n\n  if (!name) { return [streetTypeOut]; }\n  if (isNumberOrCode(name) && !isOrdinal(name) && !isDirectional(name)) {\n    return [ streetTypeString(toStreetType(type)), name ];\n  }\n\n  return [ name, streetTypeOut ];\n}\n\nexport class Address {\n  address: ISitus;\n\n  constructor(...lines: string[] | ISitus[]) {\n    if (typeof lines[0] === 'string') {\n      this.address = parse(lines.join('\\n'));\n    }\n    else {\n      this.address = lines[0];\n    }\n  }\n\n  static label(addr?: ISitus | null): USPSLabel {\n    if (!addr) {\n      return {\n        care: null,\n        urbanization: null,\n        line1: null,\n        line2: null,\n        city: null,\n        state: null,\n        zip: null,\n        zip4: null,\n        country: null,\n      };\n    }\n\n    // Simple bug catching.\n    if (addr.unitNum === addr.zip) { addr.unitNum = null; }\n\n    // This is how USPS wants UMRs presented.\n    if (addr.facilityType === FacilityType.UMR) {\n      addr.facilityType = 'UNIT' as FacilityType;\n    }\n\n    addr.streetPreDir = addr.streetPreDir ? toDirectional(addr.streetPreDir) : null;\n    addr.streetPostDir = addr.streetPostDir ? toDirectional(addr.streetPostDir) : null;\n\n    // Ensure we have clean PO Boxes for USPS.\n    if (addr.facilityType === FacilityType.PO) {\n      addr.facility = null;\n    }\n\n    let streetSegment: string | null = concat(\n      addr.facilityType && !isUrbanization(addr.facilityType) ? '' : addr.number,\n      isStreetPrefix(addr.streetType) ? streetTypeString(addr.streetType) : '',\n      addr.streetPreDir,\n      ...streetName(addr.streetName, addr.streetType),\n      addr.streetPostDir,\n    );\n    let facility: string | null = concat(addr.facilityType, addr.facility, addr.facilityType ? addr.number : '');\n    const PIN = concat(addr.pinType || (addr.pinNum && '#'), addr.pinNum);\n    const unit = concat(addr.unitAbbr || (addr.unitNum && '#'), addr.unitNum);\n\n    let urbanization = null;\n    if (isUrbanization(addr.facilityType)) {\n      urbanization = concat(addr.facilityType, addr.facility);\n      facility = null;\n    }\n\n    if (addr.facilityType === FacilityType.PO) {\n      streetSegment = null;\n    }\n\n    const line2 = null;\n    if (unit || PIN) {\n      if ((facility && streetSegment) || (addr.facilityType === FacilityType.PO)) {\n        facility = concat(facility, unit);\n        facility = concat(facility, PIN);\n      }\n\n      else if (streetSegment) {\n        streetSegment = concat(streetSegment, unit);\n        streetSegment = concat(streetSegment, PIN);\n      }\n\n      else {\n        facility = concat(facility, unit);\n        facility = concat(facility, PIN);\n      }\n    }\n\n    // if (PIN) {\n    //   if (!facility && streetSegment && !addr.pinType) {\n    //   }\n    // }\n\n    return {\n      care: addr.care ? addr.care.toUpperCase() : null,\n      urbanization,\n      line1: facility || streetSegment,\n      line2: ((facility && streetSegment) ? streetSegment : line2) || null,\n      city: addr.city ? addr.city.toUpperCase() : null,\n      state: addr.state ? addr.state : null,\n      zip: addr.zip || null,\n      zip4: addr.zip4 || null,\n      country: addr.country || null,\n    };\n  }\n\n  static lines(addr?: ISitus | null): [string | null, string | null, string | null, string | null] {\n    if (!addr) { return [ null, null, null, null ]; }\n    const label = Address.label(addr);\n    const out = [\n      label.care,\n      label.urbanization,\n      [ label.line1, label.line2 ].filter(Boolean).join(' ').trim(),\n      [ label.city, label.state, label.zip ? ` ${label.zip}` : null ].filter(Boolean).join(' ').trim(),\n    ].filter(Boolean);\n    if (isCountry(label.country) && label.country !== Country.USA && label.country !== Country.FOREIGN) {\n      const name = getCountryDesc(label.country)?.name;\n      name && out.push(name.toUpperCase());\n    }\n    return [\n      out[0] || null,\n      out[1] || null,\n      out[2] || null,\n      out[3] || null,\n    ];\n  }\n\n  static print(addr?: ISitus | null): string {\n    if (!addr) { return ''; }\n    return Address.lines(addr).filter(Boolean).join('\\n');\n  }\n\n  public label(): USPSLabel { return Address.label(this.address); }\n  public lines(): [string | null, string | null, string | null, string | null] { return Address.lines(this.address); }\n  public print(): string { return Address.print(this.address); }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Address.js","sourceRoot":"","sources":["../../src/Address.ts"],"names":[],"mappings":"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","sourcesContent":["import { Country, FacilityType, getCountryDesc, isCountry,isDirectional, ISitus, State, StreetType } from '@universe/models';\n\nimport { toDirectional } from './data/Directional.js';\nimport { isUrbanization } from './data/FacilityType.js';\nimport { isStreetPrefix, streetTypeString, toStreetType } from './data/StreetType.js';\nimport { parse } from './parser/index.js';\nimport { isNumberOrCode } from './parser/tokenizer.js';\nimport { isOrdinal } from './parser/utils.js';\n\nexport interface USPSLabel {\n  care: string | null;\n  urbanization: string | null;\n  line1: string | null;\n  line2: string | null;\n  city: string | null;\n  state: State | null;\n  zip: string | null;\n  zip4: string | null;\n  country: string | null;\n}\n\nfunction concat(...values: (string | null)[]): string {\n  return values.filter(Boolean).join(' ').toUpperCase().trim();\n}\n\n// USPS likes to force some streets to always be expanded...\nconst forceStreetExpansion = new Set([StreetType.PLZ]);\nconst singleStreetSuffix = new Set([\n  StreetType.BLFS, StreetType.BRKS, StreetType.CIRS, StreetType.CLFS, StreetType.CMNS,\n  StreetType.CORS, StreetType.CTS, StreetType.XING, StreetType.XRDS, StreetType.DRS,\n  StreetType.ESTS, StreetType.EXTS, StreetType.FLS, StreetType.FLDS, StreetType.FLTS,\n  StreetType.FRDS, StreetType.JCTS, StreetType.KYS, StreetType.KNLS, StreetType.MEWS,\n  StreetType.MDWS, StreetType.RDGS, StreetType.RIV, StreetType.SHLS, StreetType.SHRS,\n  StreetType.SPGS, StreetType.SQS, StreetType.ST, StreetType.STS, StreetType.TER,\n  StreetType.VLY, StreetType.VLYS, StreetType.VLG, StreetType.VLGS, StreetType.VIS,\n  StreetType.WALK, StreetType.WAY, StreetType.WLS,\n]);\nfunction streetName(name: string | null, type: StreetType | null): (string | null)[] {\n  if (!type || isStreetPrefix(type)) { return [name]; }\n\n  let streetTypeOut: string = type;\n  if (forceStreetExpansion.has(type)) { streetTypeOut = streetTypeString(type) || type; }\n\n  if (!name) { return [streetTypeOut]; }\n\n  if (name.startsWith('of the') || (isNumberOrCode(name) && !isOrdinal(name) && !isDirectional(name) && !singleStreetSuffix.has(type))) {\n    return [ streetTypeString(toStreetType(type), true), name ];\n  }\n\n  return [ name, streetTypeOut ];\n}\n\nexport class Address {\n  address: ISitus;\n\n  constructor(...lines: string[] | ISitus[]) {\n    if (typeof lines[0] === 'string') {\n      this.address = parse(lines.join('\\n'));\n    }\n    else {\n      this.address = lines[0];\n    }\n  }\n\n  static label(addr?: ISitus | null): USPSLabel {\n    if (!addr) {\n      return {\n        care: null,\n        urbanization: null,\n        line1: null,\n        line2: null,\n        city: null,\n        state: null,\n        zip: null,\n        zip4: null,\n        country: null,\n      };\n    }\n\n    // Simple bug catching.\n    if (addr.unitNum === addr.zip) { addr.unitNum = null; }\n\n    // This is how USPS wants UMRs presented.\n    if (addr.facilityType === FacilityType.UMR) {\n      addr.facilityType = 'UNIT' as FacilityType;\n    }\n\n    addr.streetPreDir = addr.streetPreDir ? toDirectional(addr.streetPreDir) : null;\n    addr.streetPostDir = addr.streetPostDir ? toDirectional(addr.streetPostDir) : null;\n\n    // Ensure we have clean PO Boxes for USPS.\n    if (addr.facilityType === FacilityType.PO) {\n      addr.facility = null;\n    }\n\n    let streetSegment: string | null = concat(\n      addr.facilityType && !isUrbanization(addr.facilityType) ? '' : addr.number,\n      isStreetPrefix(addr.streetType) ? streetTypeString(addr.streetType) : '',\n      addr.streetPreDir,\n      ...streetName(addr.streetName, addr.streetType),\n      addr.streetPostDir,\n    );\n    let facility: string | null = concat(addr.facilityType, addr.facility, addr.facilityType ? addr.number : '');\n    const PIN = concat(addr.pinType || (addr.pinNum && '#'), addr.pinNum);\n    const unit = concat(addr.unitAbbr || (addr.unitNum && '#'), addr.unitNum);\n\n    let urbanization = null;\n    if (isUrbanization(addr.facilityType)) {\n      urbanization = concat(addr.facilityType, addr.facility);\n      facility = null;\n    }\n\n    if (addr.facilityType === FacilityType.PO) {\n      streetSegment = null;\n    }\n\n    const line2 = null;\n    if (unit || PIN) {\n      if ((facility && streetSegment) || (addr.facilityType === FacilityType.PO)) {\n        facility = concat(facility, unit);\n        facility = concat(facility, PIN);\n      }\n\n      else if (streetSegment) {\n        streetSegment = concat(streetSegment, unit);\n        streetSegment = concat(streetSegment, PIN);\n      }\n\n      else {\n        facility = concat(facility, unit);\n        facility = concat(facility, PIN);\n      }\n    }\n\n    // if (PIN) {\n    //   if (!facility && streetSegment && !addr.pinType) {\n    //   }\n    // }\n\n    return {\n      care: addr.care ? addr.care.toUpperCase() : null,\n      urbanization,\n      line1: facility || streetSegment,\n      line2: ((facility && streetSegment) ? streetSegment : line2) || null,\n      city: addr.city ? addr.city.toUpperCase() : null,\n      state: addr.state ? addr.state : null,\n      zip: addr.zip || null,\n      zip4: addr.zip4 || null,\n      country: addr.country || null,\n    };\n  }\n\n  static lines(addr?: ISitus | null): [string | null, string | null, string | null, string | null] {\n    if (!addr) { return [ null, null, null, null ]; }\n    const label = Address.label(addr);\n    const out = [\n      label.care,\n      label.urbanization,\n      [ label.line1, label.line2 ].filter(Boolean).join(' ').trim(),\n      [ label.city, label.state, label.zip ? ` ${label.zip}` : null ].filter(Boolean).join(' ').trim(),\n    ].filter(Boolean);\n    if (isCountry(label.country) && label.country !== Country.USA && label.country !== Country.FOREIGN) {\n      const name = getCountryDesc(label.country)?.name;\n      name && out.push(name.toUpperCase());\n    }\n    return [\n      out[0] || null,\n      out[1] || null,\n      out[2] || null,\n      out[3] || null,\n    ];\n  }\n\n  static print(addr?: ISitus | null): string {\n    if (!addr) { return ''; }\n    return Address.lines(addr).filter(Boolean).join('\\n');\n  }\n\n  public label(): USPSLabel { return Address.label(this.address); }\n  public lines(): [string | null, string | null, string | null, string | null] { return Address.lines(this.address); }\n  public print(): string { return Address.print(this.address); }\n}\n"]}

dist/src/data/StreetType.d.ts

@@ -8,3 +8,3 @@ import { StreetType } from '@universe/models';
 export declare function isSpanishPrefix(val: unknown): boolean;
-export declare function streetTypeString(type: StreetType | null): string | null;
+export declare function streetTypeString(type: StreetType | null, force?: boolean): string | null;
 export declare function isStreetType(val?: string | null): val is StreetType;

dist/src/data/StreetType.js

@@ -75,7 +75,7 @@ import { aliases, StreetType } from '@universe/models';
 const DO_NOT_EXPAND = new Set([StreetType.DR, StreetType.ST]);
-export function streetTypeString(type) {
+export function streetTypeString(type, force = false) {
     if (type === null) {
         return null;
     }
-    if (DO_NOT_EXPAND.has(normalize(type))) {
+    if (!force && DO_NOT_EXPAND.has(normalize(type))) {
         return type;
@@ -92,2 +92,2 @@ }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RyZWV0VHlwZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kYXRhL1N0cmVldFR5cGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBQyxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV0RCxPQUFPLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTFELE1BQU0sQ0FBQyxNQUFNLGlCQUFpQixHQUFpQyxFQUFFLENBQUM7QUFFbEUsS0FBSyxNQUFNLElBQUksSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQWlCLEVBQUU7SUFDbEUsaUJBQWlCLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDO0lBQzFDLEtBQUssTUFBTSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRTtRQUMxQyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUM7S0FDMUM7Q0FDRjtBQUVELE1BQU0sVUFBVSxZQUFZLENBQUMsR0FBVztJQUN0QyxPQUFPLGlCQUFpQixDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0FBQzNDLENBQUM7QUFFRCxNQUFNLGNBQWMsR0FBRyxJQUFJLEdBQUcsQ0FBQztJQUM3QixVQUFVLENBQUMsRUFBRTtJQUNiLFVBQVUsQ0FBQyxFQUFFO0lBQ2IsVUFBVSxDQUFDLEVBQUU7SUFDYixVQUFVLENBQUMsRUFBRTtJQUNiLFVBQVUsQ0FBQyxFQUFFO0lBQ2IsVUFBVSxDQUFDLEdBQUc7SUFFZCxVQUFVLENBQUMsR0FBRztJQUNkLFVBQVUsQ0FBQyxHQUFHO0lBQ2QsVUFBVSxDQUFDLEdBQUc7SUFDZCxVQUFVLENBQUMsR0FBRztJQUNkLFVBQVUsQ0FBQyxHQUFHO0lBQ2QsVUFBVSxDQUFDLEdBQUc7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dmVyc2UvbW9kZWxzJztcblxuaW1wb3J0IHsgbm9ybWFsaXplLCB0aXRsZUNhc2UgfSBmcm9tICcuLi9wYXJzZXIvdXRpbHMuanMnO1xuXG5leHBvcnQgY29uc3QgU3RyZWV0VHlwZU1hcHBpbmc6IHtba2V5OiBzdHJpbmddOiBTdHJlZXRUeXBlIH0gPSB7fTtcblxuZm9yIChjb25zdCBhYmJyIG9mIE9iamVjdC5rZXlzKGFsaWFzZXMuU3RyZWV0VHlwZSkgYXMgU3RyZWV0VHlwZVtdKSB7XG4gIFN0cmVldFR5cGVNYXBwaW5nW25vcm1hbGl6ZShhYmJyKV0gPSBhYmJyO1xuICBmb3IgKGNvbnN0IHZhbCBvZiBhbGlhc2VzLlN0cmVldFR5cGVbYWJicl0pIHtcbiAgICBTdHJlZXRUeXBlTWFwcGluZ1tub3JtYWxpemUodmFsKV0gPSBhYmJyO1xuICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB0b1N0cmVldFR5cGUodmFsOiBzdHJpbmcpOiBTdHJlZXRUeXBlIHtcbiAgcmV0dXJuIFN0cmVldFR5cGVNYXBwaW5nW25vcm1hbGl6ZSh2YWwpXTtcbn1cblxuY29uc3QgU3RyZWV0UHJlZml4ZXMgPSBuZXcgU2V0KFtcbiAgU3RyZWV0VHlwZS5IQyxcbiAgU3RyZWV0VHlwZS5GTSxcbiAgU3RyZWV0VHlwZS5SUixcbiAgU3RyZWV0VHlwZS5TUixcbiAgU3RyZWV0VHlwZS5DUixcbiAgU3RyZWV0VHlwZS5UU1IsXG5cbiAgU3RyZWV0VHlwZS5DTEwsXG4gIFN0cmVldFR5cGUuQ01ULFxuICBTdHJlZXRUeXBlLkNBTSxcbiAgU3RyZWV0VHlwZS5DRVIsXG4gIFN0cmVldFR5cGUuRU5ULFxuICBTdHJlZXRUeXBlLlBTTyxcbiAgU3RyZWV0VHlwZS5QTEEsXG4gIFN0cmVldFR5cGUuUkNILFxuICBTdHJlZXRUeXBlLlZFUixcbiAgU3RyZWV0VHlwZS5WSUEsXG5cbiAgU3RyZWV0VHlwZS5MQ01ULFxuICBTdHJlZXRUeXBlLkVDQU0sXG4gIFN0cmVldFR5cGUuTENFUixcbiAgU3RyZWV0VHlwZS5MRU5ULFxuICBTdHJlZXRUeXBlLkVQU08sXG4gIFN0cmVldFR5cGUuTFBMQSxcbiAgU3RyZWV0VHlwZS5FUkNILFxuICBTdHJlZXRUeXBlLkxWRVIsXG5dKTtcblxuY29uc3QgU3BhbmlzaFByZWZpeGVzID0gbmV3IFNldChbXG4gIFN0cmVldFR5cGUuQ0xMLFxuICBTdHJlZXRUeXBlLkNNVCxcbiAgU3RyZWV0VHlwZS5DQU0sXG4gIFN0cmVldFR5cGUuQ0VSLFxuICBTdHJlZXRUeXBlLkVOVCxcbiAgU3RyZWV0VHlwZS5QU08sXG4gIFN0cmVldFR5cGUuUExBLFxuICBTdHJlZXRUeXBlLlJDSCxcbiAgU3RyZWV0VHlwZS5WRVIsXG4gIFN0cmVldFR5cGUuVklBLFxuXG4gIFN0cmVldFR5cGUuTENNVCxcbiAgU3RyZWV0VHlwZS5FQ0FNLFxuICBTdHJlZXRUeXBlLkxDRVIsXG4gIFN0cmVldFR5cGUuTEVOVCxcbiAgU3RyZWV0VHlwZS5FUFNPLFxuICBTdHJlZXRUeXBlLkxQTEEsXG4gIFN0cmVldFR5cGUuRVJDSCxcbiAgU3RyZWV0VHlwZS5MVkVSLFxuXSk7XG5cbmV4cG9ydCBmdW5jdGlvbiBpc1N0cmVldFByZWZpeCh2YWw6IHVua25vd24pOiBib29sZWFuIHtcbiAgaWYgKCF2YWwpIHsgcmV0dXJuIGZhbHNlOyB9XG4gIGNvbnN0IHR5cGUgPSB0b1N0cmVldFR5cGUoU3RyaW5nKHZhbCkpO1xuICByZXR1cm4gdHlwZSA/IFN0cmVldFByZWZpeGVzLmhhcyh0eXBlKSA6IHR5cGU7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBpc1NwYW5pc2hQcmVmaXgodmFsOiB1bmtub3duKTogYm9vbGVhbiB7XG4gIGlmICghdmFsKSB7IHJldHVybiBmYWxzZTsgfVxuICBjb25zdCB0eXBlID0gdG9TdHJlZXRUeXBlKFN0cmluZyh2YWwpKTtcbiAgcmV0dXJuIHR5cGUgPyBTcGFuaXNoUHJlZml4ZXMuaGFzKHR5cGUpIDogdHlwZTtcbn1cblxuLy8gRG9uJ3QgZXhwYW5kIGFiYnJldmVhdGlvbnMgdGhhdCBtYXkgaGF2ZSBtdWx0aXBsZSBhbWJpZ3VvdXMgbWVhbmluZ3MuIEV4OiBEb2N0b3IgYW5kIFNhaW50LlxuY29uc3QgRE9fTk9UX0VYUEFORDogU2V0PHN0cmluZz4gPSBuZXcgU2V0KFsgU3RyZWV0VHlwZS5EUiwgU3RyZWV0VHlwZS5TVCBdKTtcbmV4cG9ydCBmdW5jdGlvbiBzdHJlZXRUeXBlU3RyaW5nKHR5cGU6IFN0cmVldFR5cGUgfCBudWxsKTogc3RyaW5nIHwgbnVsbCB7XG4gIGlmICh0eXBlID09PSBudWxsKSB7XG4gICAgcmV0dXJuIG51bGw7XG4gIH1cbiAgaWYgKERPX05PVF9FWFBBTkQuaGFzKG5vcm1hbGl6ZSh0eXBlKSkpIHsgcmV0dXJuIHR5cGU7IH1cbiAgdHlwZSA9IHRvU3RyZWV0VHlwZSh0eXBlKTtcbiAgcmV0dXJuIHRpdGxlQ2FzZShhbGlhc2VzLlN0cmVldFR5cGVbbm9ybWFsaXplKHR5cGUpXT8uWzBdIHx8ICcnKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGlzU3RyZWV0VHlwZSh2YWw/OiBzdHJpbmcgfCBudWxsKTogdmFsIGlzIFN0cmVldFR5cGUge1xuICBpZiAoIXZhbCkgeyByZXR1cm4gZmFsc2U7IH1cbiAgcmV0dXJuICEhU3RyZWV0VHlwZU1hcHBpbmdbbm9ybWFsaXplKHZhbCldO1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RyZWV0VHlwZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kYXRhL1N0cmVldFR5cGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBQyxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV0RCxPQUFPLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTFELE1BQU0sQ0FBQyxNQUFNLGlCQUFpQixHQUFpQyxFQUFFLENBQUM7QUFFbEUsS0FBSyxNQUFNLElBQUksSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQWlCLEVBQUU7SUFDbEUsaUJBQWlCLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDO0lBQzFDLEtBQUssTUFBTSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRTtRQUMxQyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUM7S0FDMUM7Q0FDRjtBQUVELE1BQU0sVUFBVSxZQUFZLENBQUMsR0FBVztJQUN0QyxPQUFPLGlCQUFpQixDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0FBQzNDLENBQUM7QUFFRCxNQUFNLGNBQWMsR0FBRyxJQUFJLEdBQUcsQ0FBQztJQUM3QixVQUFVLENBQUMsRUFBRTtJQUNiLFVBQVUsQ0FBQyxFQUFFO0lBQ2IsVUFBVSxDQUFDLEVBQUU7SUFDYixVQUFVLENBQUMsRUFBRTtJQUNiLFVBQVUsQ0FBQyxFQUFFO0lBQ2IsVUFBVSxDQUFDLEdBQUc7SUFFZCxVQUFVLENBQUMsR0FBRztJQUNkLFVBQVUsQ0FBQyxHQUFHO0lBQ2QsVUFBVSxDQUFDLEdBQUc7SUFDZCxVQUFVLENBQUMsR0FBRztJQUNkLFVBQVUsQ0FBQyxHQUFHO0lBQ2QsVUFBVSxDQUFDLEdBQUc7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dCB7IGFsaWFzZXMsU3RyZWV0VHlwZSB9IGZyb20gJ0B1bml2ZXJzZS9tb2RlbHMnO1xuXG5pbXBvcnQgeyBub3JtYWxpemUsIHRpdGxlQ2FzZSB9IGZyb20gJy4uL3BhcnNlci91dGlscy5qcyc7XG5cbmV4cG9ydCBjb25zdCBTdHJlZXRUeXBlTWFwcGluZzoge1trZXk6IHN0cmluZ106IFN0cmVldFR5cGUgfSA9IHt9O1xuXG5mb3IgKGNvbnN0IGFiYnIgb2YgT2JqZWN0LmtleXMoYWxpYXNlcy5TdHJlZXRUeXBlKSBhcyBTdHJlZXRUeXBlW10pIHtcbiAgU3RyZWV0VHlwZU1hcHBpbmdbbm9ybWFsaXplKGFiYnIpXSA9IGFiYnI7XG4gIGZvciAoY29uc3QgdmFsIG9mIGFsaWFzZXMuU3RyZWV0VHlwZVthYmJyXSkge1xuICAgIFN0cmVldFR5cGVNYXBwaW5nW25vcm1hbGl6ZSh2YWwpXSA9IGFiYnI7XG4gIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRvU3RyZWV0VHlwZSh2YWw6IHN0cmluZyk6IFN0cmVldFR5cGUge1xuICByZXR1cm4gU3RyZWV0VHlwZU1hcHBpbmdbbm9ybWFsaXplKHZhbCldO1xufVxuXG5jb25zdCBTdHJlZXRQcmVmaXhlcyA9IG5ldyBTZXQoW1xuICBTdHJlZXRUeXBlLkhDLFxuICBTdHJlZXRUeXBlLkZNLFxuICBTdHJlZXRUeXBlLlJSLFxuICBTdHJlZXRUeXBlLlNSLFxuICBTdHJlZXRUeXBlLkNSLFxuICBTdHJlZXRUeXBlLlRTUixcblxuICBTdHJlZXRUeXBlLkNMTCxcbiAgU3RyZWV0VHlwZS5DTVQsXG4gIFN0cmVldFR5cGUuQ0FNLFxuICBTdHJlZXRUeXBlLkNFUixcbiAgU3RyZWV0VHlwZS5FTlQsXG4gIFN0cmVldFR5cGUuUFNPLFxuICBTdHJlZXRUeXBlLlBMQSxcbiAgU3RyZWV0VHlwZS5SQ0gsXG4gIFN0cmVldFR5cGUuVkVSLFxuICBTdHJlZXRUeXBlLlZJQSxcblxuICBTdHJlZXRUeXBlLkxDTVQsXG4gIFN0cmVldFR5cGUuRUNBTSxcbiAgU3RyZWV0VHlwZS5MQ0VSLFxuICBTdHJlZXRUeXBlLkxFTlQsXG4gIFN0cmVldFR5cGUuRVBTTyxcbiAgU3RyZWV0VHlwZS5MUExBLFxuICBTdHJlZXRUeXBlLkVSQ0gsXG4gIFN0cmVldFR5cGUuTFZFUixcbl0pO1xuXG5jb25zdCBTcGFuaXNoUHJlZml4ZXMgPSBuZXcgU2V0KFtcbiAgU3RyZWV0VHlwZS5DTEwsXG4gIFN0cmVldFR5cGUuQ01ULFxuICBTdHJlZXRUeXBlLkNBTSxcbiAgU3RyZWV0VHlwZS5DRVIsXG4gIFN0cmVldFR5cGUuRU5ULFxuICBTdHJlZXRUeXBlLlBTTyxcbiAgU3RyZWV0VHlwZS5QTEEsXG4gIFN0cmVldFR5cGUuUkNILFxuICBTdHJlZXRUeXBlLlZFUixcbiAgU3RyZWV0VHlwZS5WSUEsXG5cbiAgU3RyZWV0VHlwZS5MQ01ULFxuICBTdHJlZXRUeXBlLkVDQU0sXG4gIFN0cmVldFR5cGUuTENFUixcbiAgU3RyZWV0VHlwZS5MRU5ULFxuICBTdHJlZXRUeXBlLkVQU08sXG4gIFN0cmVldFR5cGUuTFBMQSxcbiAgU3RyZWV0VHlwZS5FUkNILFxuICBTdHJlZXRUeXBlLkxWRVIsXG5dKTtcblxuZXhwb3J0IGZ1bmN0aW9uIGlzU3RyZWV0UHJlZml4KHZhbDogdW5rbm93bik6IGJvb2xlYW4ge1xuICBpZiAoIXZhbCkgeyByZXR1cm4gZmFsc2U7IH1cbiAgY29uc3QgdHlwZSA9IHRvU3RyZWV0VHlwZShTdHJpbmcodmFsKSk7XG4gIHJldHVybiB0eXBlID8gU3RyZWV0UHJlZml4ZXMuaGFzKHR5cGUpIDogdHlwZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGlzU3BhbmlzaFByZWZpeCh2YWw6IHVua25vd24pOiBib29sZWFuIHtcbiAgaWYgKCF2YWwpIHsgcmV0dXJuIGZhbHNlOyB9XG4gIGNvbnN0IHR5cGUgPSB0b1N0cmVldFR5cGUoU3RyaW5nKHZhbCkpO1xuICByZXR1cm4gdHlwZSA/IFNwYW5pc2hQcmVmaXhlcy5oYXModHlwZSkgOiB0eXBlO1xufVxuXG4vLyBEb24ndCBleHBhbmQgYWJicmV2ZWF0aW9ucyB0aGF0IG1heSBoYXZlIG11bHRpcGxlIGFtYmlndW91cyBtZWFuaW5ncy4gRXg6IERvY3RvciBhbmQgU2FpbnQuXG5jb25zdCBET19OT1RfRVhQQU5EOiBTZXQ8c3RyaW5nPiA9IG5ldyBTZXQoWyBTdHJlZXRUeXBlLkRSLCBTdHJlZXRUeXBlLlNUIF0pO1xuZXhwb3J0IGZ1bmN0aW9uIHN0cmVldFR5cGVTdHJpbmcodHlwZTogU3RyZWV0VHlwZSB8IG51bGwsIGZvcmNlID0gZmFsc2UpOiBzdHJpbmcgfCBudWxsIHtcbiAgaWYgKHR5cGUgPT09IG51bGwpIHtcbiAgICByZXR1cm4gbnVsbDtcbiAgfVxuICBpZiAoIWZvcmNlICYmIERPX05PVF9FWFBBTkQuaGFzKG5vcm1hbGl6ZSh0eXBlKSkpIHsgcmV0dXJuIHR5cGU7IH1cbiAgdHlwZSA9IHRvU3RyZWV0VHlwZSh0eXBlKTtcbiAgcmV0dXJuIHRpdGxlQ2FzZShhbGlhc2VzLlN0cmVldFR5cGVbbm9ybWFsaXplKHR5cGUpXT8uWzBdIHx8ICcnKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGlzU3RyZWV0VHlwZSh2YWw/OiBzdHJpbmcgfCBudWxsKTogdmFsIGlzIFN0cmVldFR5cGUge1xuICBpZiAoIXZhbCkgeyByZXR1cm4gZmFsc2U7IH1cbiAgcmV0dXJuICEhU3RyZWV0VHlwZU1hcHBpbmdbbm9ybWFsaXplKHZhbCldO1xufVxuIl19

package.json

 {
   "name": "@universe/address-parser",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "main": "dist/src/index.js",
@@ -30,3 +30,3 @@ "module": "dist/src/index.js",
   "dependencies": {
-    "@universe/models": "^3.0.4",
+    "@universe/models": "^3.0.10",
     "@universe/util": "^1.2.2"
@@ -33,0 +33,0 @@ },

No alert changes

Improved metrics

Total package byte prevSize

909975

increased by0.35%

Lines of code

17340

increased by0.06%

Dependency changes

• Updated@universe/models@^3.0.10