add regex fallback to splitAddress1 function, release v0.7.0 of TS pa…

…ckage

CHANGELOG.md

@@ -26,7 +26,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Security in case of vulnerabilities.
 
 ## [Unreleased]
-- Nil.
+- Add address1_regex to regions [#281](https://github.com/Shopify/worldwide/pull/281)
+- Add address1_regex for BE, CL, MX, ES, IL [#282](https://github.com/Shopify/worldwide/pull/282)
+- Add address1_regex for DE [#286](https://github.com/Shopify/worldwide/pull/286)
 
 ---
 

db/data/regions/BE.yml

@@ -31,6 +31,9 @@ format:
  show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{country}_{phone}"
 format_extended:
  edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}_{phone}"
+address1_regex:
+ - "^(?<streetName>[^\\d,]+),? (?<streetNumber>\\d+(?: ?[a-z])?)$"
+ - "^(?<streetNumber>\\d+(?: ?[a-z])?),? (?<streetName>[^\\d,]+)$"
 additional_address_fields:
  - name: streetName
  required: true

db/data/regions/BR.yml

@@ -28,6 +28,8 @@ format:
  show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city} {province}_{country}_{phone}"
 format_extended:
  edit: "{country}_{firstName}{lastName}_{company}_{zip}_{streetName}{streetNumber}_{line2}{neighborhood}_{city}{province}_{phone}"
+address1_regex:
+ - "^(?<streetName>(?!.*\\bnúmero\\b)[^\\d,]+(?<!\\s))(?:,? ?)(?<streetNumber>\\d+(?: ?[a-z])?)$"
 additional_address_fields:
  - name: streetName
  required: true

db/data/regions/CL.yml

@@ -16,6 +16,8 @@ format:
  show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{province}_{country}_{phone}"
 format_extended:
  edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{line2}{neighborhood}_{zip}{city}_{province}_{phone}"
+address1_regex:
+ - "^(?<streetName>[^\\d,]+?),? (?<streetNumber>(?:n|n\\.|nº|número|no\\.|no|#)? ?\\d+(?: ?[a-z])?)$"
 additional_address_fields:
  - name: streetName
  required: true

db/data/regions/DE.yml

@@ -29,6 +29,9 @@ format:
  show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{country}_{phone}"
 format_extended:
  edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}_{phone}"
+address1_regex:
+- "^(?<streetName>[^\\d,]+?\\.?)[, ]{1,2}(?<streetNumber>\\d+(?: ?[a-z])?)$"
+- "^(?<streetName>[^\\d,]+\\.)(?<streetNumber>\\d+(?: ?[a-z])?)$"
 additional_address_fields:
  - name: streetName
  required: true

db/data/regions/ES.yml

@@ -29,6 +29,8 @@ format:
  show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{province}_{country}_{phone}"
 format_extended:
  edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}{province}_{phone}"
+address1_regex:
+ - "^(?<streetName>[^\\d,]+?),? (?<streetNumber>(?:n|n\\.|nº|número|no\\.|no|#)? ?\\d+(?: ?[a-z])?)$"
 additional_address_fields:
  - name: streetName
  required: true

db/data/regions/IL.yml

@@ -18,6 +18,9 @@ format:
  show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{country}_{phone}"
 format_extended:
  edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}_{phone}"
+address1_regex:
+ - "^(?<streetName>[^\\d,]+),? (?<streetNumber>\\d+(?:\/\\d+)?)$"
+ - "^(?<streetNumber>\\d+(?:\/\\d+)?),? (?<streetName>[^\\d,]+)$"
 additional_address_fields:
  - name: streetName
  required: true

db/data/regions/MX.yml

@@ -17,6 +17,8 @@ format:
  show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city} {province}_{country}_{phone}"
 format_extended:
  edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{line2}{neighborhood}_{zip}{city}{province}_{phone}"
+address1_regex:
+ - "^(?<streetName>[^\\d,]+?),? (?<streetNumber>(?:n|n\\.|nº|número|no\\.|no|#)? ?\\d+(?: ?[a-z])?)$"
 additional_address_fields:
  - name: streetName
  required: true

db/data/regions/NL.yml

@@ -30,6 +30,8 @@ format:
  show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{country}_{phone}"
 format_extended:
  edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}_{phone}"
+address1_regex:
+ - "^(?<streetName>[^\\d]+) (?<streetNumber>\\d+(?: ?[a-z])?)$"
 additional_address_fields:
  - name: streetName
  required: true

lang/typescript/.eslintrc

@@ -17,7 +17,7 @@
  "selector": "property",
  "format": ["strictCamelCase"],
  "filter": {
- "regex": "^(combined_address_format)$",
+ "regex": "^(combined_address_format|address1_regex)$",
  "match": false
  }
  }

lang/typescript/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @shopify/worldwide
 
+## 0.7.0
+
+### Minor Changes
+
+- bbacde1: Add address1 regex for BE, BR, CL, ES, IL, MX
+- b6e1c7f: Add address1 regex for DE
+- ee7b7a9: Add optional tryRegexFallback param to splitAddress1 function to attempt splitting address lines that do not contain the reserved delimiter
+
+## 0.7.0-next.2
+
+### Minor Changes
+
+- 3bfb56a: Add address1 regex for DE
+
+## 0.7.0-next.1
+
+### Minor Changes
+
+- Add address1 regex for BE, BR, CL, ES, IL, MX
+
+## 0.7.0-next.0
+
+### Minor Changes
+
+- 1f5d405: Add optional tryRegexFallback param to splitAddress1 function to attempt splitting address lines that do not contain the reserved delimiter
+
 ## 0.6.0
 
 ### Minor Changes

lang/typescript/package.json

@@ -1,7 +1,7 @@
 {
  "name": "@shopify/worldwide",
  "description": "Utilities for parsing and formatting address fields",
- "version": "0.6.0",
+ "version": "0.7.0",
  "repository": "git@github.com:Shopify/worldwide.git",
  "author": "Shopify Inc.",
  "homepage": "https://github.com/Shopify/worldwide/tree/main/lang/typescript#readme",

lang/typescript/rollup-plugin-regions-yaml/utils.ts

@@ -63,6 +63,7 @@ const regionYamlSchema = z.object({
  })
  .strict()
  .optional(),
+ address1_regex: z.optional(z.array(z.string())),
 });
 export type RegionYaml = z.infer<typeof regionYamlSchema>;
 
@@ -106,7 +107,10 @@ export function validateRegionYaml(
  return regionYaml;
 }
 
-export type MinimalRegionYaml = Pick<RegionYaml, 'combined_address_format'>;
+export type MinimalRegionYaml = Pick<
+ RegionYaml,
+ 'combined_address_format' | 'address1_regex'
+>;
 
 /**
  * Strip the YAML data down to only what we need to keep the resulting JS
@@ -115,5 +119,6 @@ export type MinimalRegionYaml = Pick<RegionYaml, 'combined_address_format'>;
 export function transformRegionYaml(regionYaml: RegionYaml): MinimalRegionYaml {
  return {
  combined_address_format: regionYaml.combined_address_format,
+ address1_regex: regionYaml.address1_regex,
  };
 }