@dyedurham/search-and-file-widget 2.0.70 → 2.0.72

package/dnd-filing-shell.js

@@ -84177,7 +84177,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/constants/BritishColumbiaConstants.ts
-  var BCNameType, BCNameTypeLabel, BC_NUMBERED_NAME_PREVIEW, BC_DEFAULT_COUNTRY, BC_FUTURE_EFFECTIVE_DATE_FEE, BC_PASSWORD_MIN_LENGTH, BC_PASSWORD_MAX_LENGTH, BC_PASSWORD_PATTERN, BC_COMPANY_EMAIL_MAX_LENGTH, BC_NAME_RESERVATION_MAX_LENGTH, BC_NAME_RESERVATION_PATTERN, BC_COMPLETING_PARTY_COUNTRY_OPTIONS;
+  var BCNameType, BCNameTypeLabel, BC_NUMBERED_NAME_PREVIEW, BC_DEFAULT_COUNTRY, BC_FUTURE_EFFECTIVE_DATE_FEE, BC_PASSWORD_MIN_LENGTH, BC_PASSWORD_MAX_LENGTH, BC_PASSWORD_PATTERN, BC_COMPANY_EMAIL_MAX_LENGTH, BC_CANADIAN_POSTAL_PATTERN, BC_NAME_RESERVATION_MAX_LENGTH, BC_NAME_RESERVATION_PATTERN, BC_COMPLETING_PARTY_COUNTRY_OPTIONS;
   var init_BritishColumbiaConstants = __esm({
     "src/app/constants/BritishColumbiaConstants.ts"() {
       init_common_constants();
@@ -84196,6 +84196,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       BC_PASSWORD_MAX_LENGTH = 15;
       BC_PASSWORD_PATTERN = /^[A-Za-z0-9]+$/;
       BC_COMPANY_EMAIL_MAX_LENGTH = 150;
+      BC_CANADIAN_POSTAL_PATTERN = /^[A-Za-z]\d[A-Za-z][ -]?\d[A-Za-z]\d$/;
       BC_NAME_RESERVATION_MAX_LENGTH = 9;
       BC_NAME_RESERVATION_PATTERN = /^(NR)?\d{1,7}$/i;
       BC_COMPLETING_PARTY_COUNTRY_OPTIONS = [
@@ -84344,7 +84345,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         additionalStreetAddress: address?.addressLine2?.trim() || void 0,
         city: address?.city?.trim() ?? "",
         provinceOrState: toProvinceOrStateCode(address?.provinceState, country),
-        postalOrZipCode: address?.postalZip?.trim() ?? "",
+        postalOrZipCode: normalizePostalCode(address?.postalZip, country),
         country
       }
     };
@@ -84371,15 +84372,24 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const streetNumber = getAddressComponent(address, "Street Number Only");
     const streetName = getAddressComponent(address, "Street Only");
     const suite = getAddressComponent(address, "Suite/Apartment");
+    const singleLineStreet = getAddressComponent(address, "Street Address");
     return {
-      streetAddress: [streetNumber, streetName].filter(Boolean).join(" ") || address?.street || "",
+      streetAddress: [streetNumber, streetName].filter(Boolean).join(" ") || singleLineStreet || address?.street || "",
       additionalStreetAddress: padShortAddressLine(suite || address?.address2),
       city: address?.city ?? "",
       provinceOrState: toProvinceOrStateCode(address?.province_state, country),
-      postalOrZipCode: address?.postal_zip ?? "",
+      postalOrZipCode: normalizePostalCode(address?.postal_zip, country),
       country
     };
   }
+  function normalizePostalCode(value, countryCode) {
+    const trimmed = (value ?? "").trim();
+    if (countryCode !== "CA") {
+      return trimmed;
+    }
+    const compact = trimmed.replace(/[\s-]+/g, "").toUpperCase();
+    return /^[A-Z]\d[A-Z]\d[A-Z]\d$/.test(compact) ? `${compact.slice(0, 3)} ${compact.slice(3)}` : trimmed;
+  }
   function toProvinceOrStateCode(value, countryCode) {
     const trimmed = (value ?? "").trim();
     if (!trimmed || trimmed.length === 2) {
@@ -84471,7 +84481,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/helpers/british-columbia/formation/british-columbia-formation-form.helper.ts
-  var ifNamed, BritishColumbiaFormationFormHelper;
+  var ifNamed, ifCanada, BritishColumbiaFormationFormHelper;
   var init_british_columbia_formation_form_helper = __esm({
     "src/app/helpers/british-columbia/formation/british-columbia-formation-form.helper.ts"() {
       init_forms();
@@ -84482,6 +84492,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_custom_validators();
       init_BritishColumbiaConstants();
       ifNamed = (validator) => (control) => control.parent?.get(BCFormationFormControls.CorporationNameType)?.value === BCNameType.Named ? validator(control) : null;
+      ifCanada = (validator) => (control) => control.parent?.get(BCFormationFormControls.Country)?.value === "Canada" ? validator(control) : null;
       BritishColumbiaFormationFormHelper = class {
         static generateConfig(task, translateFn, currentUser) {
           const t = translateFn ?? ((key) => key);
@@ -84595,7 +84606,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const streetNumber = getAddressComponent(address, "Street Number Only");
           const streetName = getAddressComponent(address, "Street Only");
           const suite = getAddressComponent(address, "Suite/Apartment");
-          const street = [streetNumber, streetName].filter(Boolean).join(" ") || address.street || "";
+          const street = [streetNumber, streetName].filter(Boolean).join(" ") || getAddressComponent(address, "Street Address") || address.street || "";
           return [
             suite ? `Unit ${suite}` : "",
             street,
@@ -84676,8 +84687,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             [BCFormationFormControls.AddressLine1]: new FormControl(mailAddress?.addressLine1 ?? prefill.mailingAddress.addressLine1, [Validators.required, Validators.minLength(3), Validators.maxLength(40)]),
             [BCFormationFormControls.AddressLine2]: new FormControl(mailAddress?.addressLine2 ?? prefill.mailingAddress.addressLine2, Validators.maxLength(40)),
             [BCFormationFormControls.City]: new FormControl(mailAddress?.city ?? prefill.mailingAddress.city, [Validators.required, Validators.maxLength(40)]),
-            [BCFormationFormControls.ProvinceState]: new FormControl(mailAddress?.provinceState ?? prefill.mailingAddress.provinceState),
-            [BCFormationFormControls.PostalZip]: new FormControl(mailAddress?.postalZip ?? prefill.mailingAddress.postalZip, [Validators.required, Validators.maxLength(10)]),
+            // The API requires a province / state when the country is Canada or the United States.
+            [BCFormationFormControls.ProvinceState]: new FormControl(mailAddress?.provinceState ?? prefill.mailingAddress.provinceState, requiredIfValueIn(BCFormationFormControls.Country, ["Canada", "United States"])),
+            [BCFormationFormControls.PostalZip]: new FormControl(mailAddress?.postalZip ?? prefill.mailingAddress.postalZip, [Validators.required, Validators.maxLength(10), ifCanada(Validators.pattern(BC_CANADIAN_POSTAL_PATTERN))]),
             [BCFormationFormControls.Country]: new FormControl(mailAddress?.country ?? (prefill.mailingAddress.country || BC_DEFAULT_COUNTRY), Validators.required),
             [BCFormationFormControls.HasConfirmedCompletion]: new FormControl(deltaData?.hasConfirmedCompletion ?? false, Validators.requiredTrue),
             [BCFormationFormControls.HasRequiredDocuments]: new FormControl(deltaData?.hasRequiredDocuments ?? false, Validators.requiredTrue)
@@ -84713,7 +84725,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             lastName: isPerson ? certified?.lastName ?? "" : "",
             email: certified?.email ?? "",
             mailingAddress: {
-              addressLine1: [streetNumber, streetName].filter(Boolean).join(" ") || address?.street || "",
+              addressLine1: [streetNumber, streetName].filter(Boolean).join(" ") || getAddressComponent(address, "Street Address") || address?.street || "",
               addressLine2: getAddressComponent(address, "Suite/Apartment") || address?.address2 || "",
               city: address?.city ?? "",
               provinceState: address?.province_state ?? "",
@@ -85003,6 +85015,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           label: "Postal / Zip Code",
           formControlName: BCFormationFormControls.PostalZip,
           required: true,
+          errorMessage: "Enter a valid Canadian postal code (for example V8W 1X4)",
+          showRequiredMessage: true,
           class: "column-2"
         },
         {
@@ -85011,7 +85025,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           formControlName: BCFormationFormControls.Country,
           required: true,
           options: BC_COMPLETING_PARTY_COUNTRY_OPTIONS,
-          class: "span-4"
+          class: "span-4",
+          // Province / State is required for Canada and the US, and the postal code format is Canada-only.
+          onChange: (form) => {
+            [BCFormationFormControls.ProvinceState, BCFormationFormControls.PostalZip].forEach((control) => form.get(control)?.updateValueAndValidity({ emitEvent: false }));
+          }
         },
         {
           type: FormType.Checkbox,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyedurham/search-and-file-widget",
-  "version": "2.0.70",
+  "version": "2.0.72",
   "description": "",
   "main": "dnd-filing-shell.js",
   "scripts": {