@dyedurham/search-and-file-widget 2.0.23 → 2.0.25

package/dnd-filing-shell.js

@@ -83640,7 +83640,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         return [
           {
             type: FormType.Text,
-            dynamicLabel: (form) => getAddressPreview(form),
+            dynamicLabel: (form) => getAddressPreview(form.getRawValue()),
             formControlName: "",
             required: false,
             class: "span-12"
@@ -83695,7 +83695,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           },
           {
             type: FormType.Text,
-            dynamicLabel: (form, t) => `${t("Residential Address")}: ${getAddressPreview(form)}`,
+            dynamicLabel: (form, t) => `${t("Residential Address")}: ${getAddressPreview(form.getRawValue())}`,
             formControlName: FederalFormationFormControl.DateOfBirth,
             class: "span-12"
           },
@@ -84338,7 +84338,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             [FederalFormationFormControl.ConsentToProvideTheAboveEmailAddresses]: new FormControl(delta?.consentToProvideDirectorEmailAddressesForFullAccessManager ?? false)
           });
           config2[FederalFormationFormGroups.Contact] = new FormGroup({
-            [FederalFormationFormControl.Contact]: new FormControl("", Validators.required)
+            [FederalFormationFormControl.Contact]: new FormControl(delta?.contactUid ?? "", Validators.required)
           });
           return config2;
         }
@@ -87756,17 +87756,20 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function federalFormationTaskToECore(task, deltaData) {
     const corporateNameDelta = deltaData.corporateName;
     const significantControl = deltaData.individualsWithSignificantControl;
+    const minDirectors = task.entity._articles?.min_directors;
+    const maxDirectors = task.entity._articles?.max_directors;
+    const isFixedDirectors = !!minDirectors && minDirectors === maxDirectors;
     const isNumbered = task._ext._numbered_company === true;
     const englishName = !isNumbered ? {
       CorporationName: task.entity._profile.name || "",
       ReservationDate: corporateNameDelta?.primaryNameReservationDate || "",
       ReservationNumber: corporateNameDelta?.primaryNameReservationNumber || ""
-    } : void 0;
+    } : { CorporationName: "", ReservationDate: "", ReservationNumber: "" };
     const frenchName = !isNumbered && task.entity._profile.secondary_name ? {
       CorporationName: task.entity._profile.secondary_name || "",
       ReservationDate: corporateNameDelta?.secondaryNameReservationDate || "",
       ReservationNumber: corporateNameDelta?.secondaryNameReservationNumber || ""
-    } : void 0;
+    } : { CorporationName: "", ReservationDate: "", ReservationNumber: "" };
     const legalEnding = corporateNameDelta?.legalElement;
     const useDifferentMailingAddress = deltaData.registeredOfficeAddress?.useDifferentAddressForCorrespondence;
     const mailingAddressUid = deltaData.registeredOfficeAddress?.mailingAddressForCorrespondenceUid;
@@ -87777,71 +87780,83 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const requestedDate = task._ext._future_filing_date ? new Date(task._ext._future_filing_date).toISOString().split("T")[0] : (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
     const officialBusinessEmail = registeredOfficeAddress?.communications?.find((c) => c.type === "Business Email")?.value;
     const contact = task.entity.affiliations.find((a) => a._id === deltaData.contactUid);
+    const contactPerson = contact?.participant;
+    const signatory = pickSignatory(incorporators, contactPerson);
+    const officerPhone = formatPhone(pickPhone(contactPerson) || signatory.phone || incorporators.map((i) => i.phone).find(Boolean) || pickPhone(directors[0]?.participant) || registeredOfficeAddress?.communications?.find((c) => /phone|tel/i.test(c.type))?.value);
     const epl = getEPRegistrations(task);
     const eplDelta = deltaData.extraProvincialLicenses;
     const directorsDelta = deltaData.directors;
     const individualsWithSignificantControlDelta = deltaData.individualsWithSignificantControl;
     const consentToProvideEmails = deltaData.consentToProvideDirectorEmailAddressesForFullAccessManager;
-    const isListIsc = Number(significantControl.type) === ISCOptions.ListISC;
+    const isListIsc = Number(significantControl?.type) === ISCOptions.ListISC;
     const isNonPreapproved = corporateNameDelta?.nameType === NameType2.NonPreapproved;
     const payload = __spreadProps(__spreadValues({
       IncorporationType: corporateNameDelta?.nameType,
       LegalEnding: isNumbered ? legalEnding : "",
       EnglishName: englishName,
       FrenchName: frenchName,
-      PreappClientNumber: corporateNameDelta?.preapprovalConfirmationNumber,
-      PreappRequestNumber: corporateNameDelta?.preapprovalRequestId,
-      RegisteredOffice: registeredOfficeAddress ? __spreadProps(__spreadValues({}, mapAddress(registeredOfficeAddress)), {
-        MailingAddressSameAsOffice: !useDifferentMailingAddress
-      }) : void 0,
+      PreappClientNumber: corporateNameDelta?.preapprovalConfirmationNumber || void 0,
+      PreappRequestNumber: corporateNameDelta?.preapprovalRequestId || void 0,
+      RegisteredOffice: registeredOfficeAddress ? mapAddress(registeredOfficeAddress) : void 0,
       MailingAddress: mailingAddress ? __spreadProps(__spreadValues({}, mapAddress(mailingAddress)), {
-        MailingAddressSameAsOffice: false
+        MailingAddressSameAsOffice: 0
       }) : registeredOfficeAddress ? __spreadProps(__spreadValues({}, mapAddress(registeredOfficeAddress)), {
-        MailingAddressSameAsOffice: true
+        MailingAddressSameAsOffice: 1
       }) : void 0,
       Directors: directors.map((d) => transformDirector(d, directorsDelta[d.participant._id], consentToProvideEmails)),
       Incorporators: incorporators.map((i) => transformIncorporator(i)),
-      CoverLetter: createCoverLetter2(officialBusinessEmail, contact?.participant),
-      DirectorNumberType: task.entity._articles?.min_directors === task.entity._articles?.max_directors ? ECoreDirectorNumberType.Fixed : ECoreDirectorNumberType.Range
-    }, task.entity._articles?.min_directors === task.entity._articles?.max_directors ? { FixedNumberOfDirectors: task.entity._articles?.min_directors } : {
-      MinimumNumberOfDirectors: task.entity._articles?.min_directors,
-      MaximumNumberOfDirectors: task.entity._articles?.max_directors
+      CoverLetter: createCoverLetter2(officialBusinessEmail, contactPerson, officerPhone),
+      DirectorNumberType: isFixedDirectors ? ECoreDirectorNumberType.Fixed : ECoreDirectorNumberType.Range
+    }, isFixedDirectors ? { FixedNumberOfDirectors: minDirectors } : {
+      MinimumNumberOfDirectors: minDirectors || 1,
+      MaximumNumberOfDirectors: maxDirectors || 10
     }), {
       SignificantControlType: significantControl?.type,
       ExclusionReason: significantControl?.exclusionReason ?? 0,
       RestrictionsOnBusiness: task.entity._articles?.restrictions || "None",
-      RestrictionsOnShareClasses: task.entity._articles?.share_restrictions_text || "",
+      RestrictionsOnShareClasses: task.entity._articles?.share_terms || "",
       RestrictionsOnShareTransfers: task.entity._articles?.transfer_restrictions_text || "None",
       OtherProvisions: task.entity._articles?.other_provisions || "None",
       EffectiveType: determineEffectiveType(requestedDate),
       EffectiveDate: requestedDate,
-      SignatureFirstName: "",
-      SignatureLastName: "",
-      OfficerPhoneNumber: "",
+      // Spec: the signature name must match an Incorporator.
+      SignatureFirstName: signatory.firstName,
+      SignatureLastName: signatory.lastName,
+      OfficerPhoneNumber: officerPhone,
       HasEPL: epl.length > 0 ? 1 : 0,
-      ExtraProvincialLicences: epl.length ? epl.map((reg) => transformEPL(reg, eplDelta[reg.uid])) : void 0,
+      ExtraProvincialLicences: epl.length ? epl.map((reg) => transformEPL(reg, eplDelta[reg.uid], requestedDate, task.entity._profile.entity_language, contact?.participant)) : void 0,
       IndividualsWithSignificantControl: isListIsc ? (() => {
-        const deltaMap = new Map((individualsWithSignificantControlDelta.individuals ?? []).map((d) => [
+        const deltaMap = new Map((individualsWithSignificantControlDelta?.individuals ?? []).map((d) => [
           d.affiliationId,
           d
         ]));
         return task.entity.affiliations.filter((aff) => deltaMap.has(aff._id)).map((aff) => transformIndividualWithSignificantControl(aff, deltaMap.get(aff._id)));
       })() : void 0,
+      // Shape and field names follow the spec's AdditionalInformation sample.
       AdditionalInformation: isNonPreapproved ? [
+        {
+          FieldSection: "Proposed business name",
+          Sections: [
+            {
+              FieldName: "Business Name",
+              FieldValue: task.entity._profile.name || ""
+            }
+          ]
+        },
         {
           FieldSection: "Additional information on business activities",
           Sections: [
             {
-              FieldName: "Describe the type of business/activities that the corporation intends to carry on",
+              FieldName: "What does you business do? Provide a brief description.",
               FieldValue: corporateNameDelta?.businessActivity ?? ""
             },
             {
-              FieldName: "Specify the geographic area in which the corporation is likely to operate (e.g., province, territory, state or other)",
-              FieldValue: corporateNameDelta?.locationOfOperations ?? ""
+              FieldName: "Who are your clients? Provide a brief description.",
+              FieldValue: corporateNameDelta?.typeOfClientele ?? ""
             },
             {
-              FieldName: "Describe the type of clientele the corporation intends to have",
-              FieldValue: corporateNameDelta?.typeOfClientele ?? ""
+              FieldName: "Where will your business operate? (City, town, province etc.) Be specific.",
+              FieldValue: corporateNameDelta?.locationOfOperations ?? ""
             },
             {
               FieldName: "If the proposed name contains a family name belonging to someone other than the incorporator, state the person's relationship to the corporation.",
@@ -87851,7 +87866,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               FieldName: "Similar names or trademarks you've registered or searches you conducted.",
               FieldValue: corporateNameDelta?.similarNamesSearchedOrRegistered ?? ""
             }
-          ]
+          ].filter((section) => section.FieldValue)
         }
       ] : void 0
       // NOTE: Spec does not include these; kept commented for reference.
@@ -87870,16 +87885,17 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function transformDirector(affiliation, deltaData, consentToProvideEmails) {
     const address = affiliation.addresses[0] || affiliation.parent_affiliation?.addresses?.[0];
-    return {
+    return __spreadValues({
       FirstName: affiliation.participant._profile.firstName,
       MiddleName: affiliation.participant._profile.middleName,
       LastName: affiliation.participant._profile.lastName,
       IsResident: deltaData.residentCanadian ? 1 : 2,
       Address: address ? mapAddress(address) : void 0,
-      RequiresFullAccessManagerInvitation: deltaData.inviteForFullAccessManager,
-      FullAccessManagerInvitationEmail: affiliation.participant.communicationEmail,
+      RequiresFullAccessManagerInvitation: !!deltaData.inviteForFullAccessManager
+    }, deltaData.inviteForFullAccessManager ? {
+      FullAccessManagerInvitationEmail: pickEmail(affiliation.participant),
       FullAccessManagerEmailConsent: consentToProvideEmails
-    };
+    } : {});
   }
   function transformIndividualWithSignificantControl(affiliation, deltaData) {
     const address = affiliation.addresses[0] || affiliation.parent_affiliation?.addresses?.[0];
@@ -87894,7 +87910,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       LastName: affiliation.participant._profile.lastName,
       DateOfBirth: affiliation.participant._profile.date_of_birth,
       CountriesOfCitizenship: (affiliation.participant?._profile?.["citizenships"] ?? []).map((c) => normalizeCountryCode(c)),
-      CountriesOfResidence: normalizeCountryCode(affiliation.participant?._profile?.tax_residency?.country),
+      CountriesOfResidence: [
+        normalizeCountryCode(affiliation.participant?._profile?.tax_residency?.country)
+      ],
       Address: address ? mapAddress(address) : void 0,
       ServiceAddress: serviceAddress ? mapAddress(serviceAddress) : void 0,
       TypeOfInterest: deltaData.typeOfInterest,
@@ -87911,8 +87929,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       FirstName: isIndividual ? incorporator.firstName : void 0,
       MiddleName: isIndividual ? incorporator.middleName : void 0,
       LastName: isIndividual ? incorporator.lastName : void 0,
-      CompanyName: !isIndividual ? incorporator.incorporator_name : void 0,
-      Signature: `${incorporator.signatory_first_name ?? ""} ${incorporator.signatory_last_name ?? ""}, ${incorporator.signatory_title ?? ""}`,
+      // Spec: BodyCorporate and Signature apply only to body-corporate incorporators.
+      BodyCorporate: !isIndividual ? incorporator.incorporator_name : void 0,
+      Signature: !isIndividual && (incorporator.signatory_first_name || incorporator.signatory_last_name) ? [
+        `${incorporator.signatory_first_name ?? ""} ${incorporator.signatory_last_name ?? ""}`.trim(),
+        incorporator.signatory_title
+      ].filter(Boolean).join(", ") : void 0,
       Address: mapAddress(incorporator)
     };
   }
@@ -87920,20 +87942,21 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const country = normalizeCountryCode(address?.country ?? "");
     const provinceState = country === "CA" ? CANCodeToProvince(address?.province_state) : country === "US" ? USCodeToState(address?.province_state) : address?.province_state ?? "";
     const addressRegion = country === "CA" ? CANProvinceToCode(provinceState) : country === "US" ? USStateToCode(provinceState) : provinceState;
+    const street = resolveStreet(address);
     return {
-      CareOf: address?.components?.find((c) => c.name === "Attention")?.value || "",
-      StreetNumber: address?.components?.find((c) => c.name === "Street Number Only")?.value || "",
-      StreetName: address?.components?.find((c) => c.name === "Street Only")?.value || "",
-      UnitNumber: address?.components?.find((c) => c.name === "Suite/Apartment")?.value || "",
-      AddressLine2: "",
-      DeliveryCode: "",
+      // Spec: CareOf min length 4 and UnitNumber/AddressLine2 min length 3 when present, so omit blanks.
+      CareOf: address?.components?.find((c) => c.name === "Attention")?.value || void 0,
+      StreetNumber: street.number,
+      StreetName: street.name,
+      UnitNumber: address?.components?.find((c) => c.name === "Suite/Apartment")?.value || void 0,
+      DeliveryCode: "None",
       City: address?.city ?? "",
       ProvinceState: addressRegion,
       Code: address?.postal_zip ?? "",
       Country: normalizeCountryCode(address?.country)
     };
   }
-  function transformEPL(registration, deltaData) {
+  function transformEPL(registration, deltaData, incorporationEffectiveDate, entityLanguage, filingContact) {
     const registeredOffice = [...registration.affiliations ?? []].find((aff) => aff.role.role_name === "Shared Address" && aff.role.static_title === "Registered Office");
     const registeredOfficeAddress = registeredOffice?.addresses?.[0] || registeredOffice?.parent_affiliation?.addresses?.[0];
     let operatingAddress;
@@ -87963,55 +87986,89 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       }
     }
     return {
-      Jurisdiction: registration._compliance.home_jurisdiction,
+      Jurisdiction: CANProvinceToCode(registration._compliance.home_jurisdiction),
       epFiling: {
-        EffectiveDate: registration.registration_date,
-        Language: '""',
+        EffectiveDate: incorporationEffectiveDate,
+        // Spec: "English" or "French".
+        Language: entityLanguage?.toLowerCase().startsWith("fr") ? "French" : "English",
         RegOffice: {
+          Jurisdiction: CANProvinceToCode(registration._compliance.home_jurisdiction),
           Address: registeredOfficeAddress ? mapAddress(registeredOfficeAddress) : {}
         },
-        OperatingAddress: {
-          Address: operatingAddress ? mapAddress(operatingAddress) : {}
-        },
+        OperatingAddress: operatingAddress ? { Address: mapAddress(operatingAddress) } : void 0,
         DeliveryAddress: contactAffiliation ? {
           FirstName: contactAffiliation.participant._profile.firstName,
           LastName: contactAffiliation.participant._profile.lastName,
-          PhoneNumber: contactAffiliation.participant.communicationPhone,
-          Email: contactAffiliation.participant.communicationEmail,
-          Office: serviceAddress ? __spreadProps(__spreadValues({}, mapAddress(serviceAddress)), {
-            MailingAddressSameAsOffice: registeredOfficeAddress?.uid === deltaData.serviceAddressUid
-          }) : {},
-          PickupNumber: ""
+          PhoneNumber: formatPhone(pickPhone(contactAffiliation.participant)),
+          Email: pickEmail(contactAffiliation.participant),
+          Office: serviceAddress ? mapAddress(serviceAddress) : void 0
         } : void 0,
-        ChiefManager: {
-          FirstName: chiefManager?.participant._profile.firstName,
-          MiddleName: chiefManager?.participant._profile.middleName,
-          LastName: chiefManager?.participant._profile.lastName,
-          Office: chiefManagerAddress ? mapAddress(chiefManagerAddress) : {},
+        ChiefManager: chiefManager ? {
+          FirstName: chiefManager.participant._profile.firstName,
+          MiddleName: chiefManager.participant._profile.middleName,
+          LastName: chiefManager.participant._profile.lastName,
+          Office: chiefManagerAddress ? mapAddress(chiefManagerAddress) : void 0,
           AddressEffectiveDate: chiefManagerAddress?.effective_date,
-          EffectiveDate: chiefManager?.start_date,
-          PhoneNumber: chiefManager?.participant.communicationPhone
-        },
+          // Spec: must equal Incorporation.EffectiveDate.
+          EffectiveDate: incorporationEffectiveDate,
+          Email: pickEmail(chiefManager.participant),
+          PhoneNumber: formatPhone(pickPhone(chiefManager.participant))
+        } : void 0,
         Signatory: {
           FirstName: signatoryManager?.participant._profile.firstName,
           MiddleName: signatoryManager?.participant._profile.middleName,
           LastName: signatoryManager?.participant._profile.lastName,
           SigningTitle: deltaData.signatoryRole
         },
-        OfficialEmail: registeredOfficeAddress?.communications?.find((c) => c.type === "Business Email")?.value,
-        NAICSCode: deltaData.businessActivity,
+        // Spec: required. Fall back to the filing contact's email when the office has no Business Email.
+        OfficialEmail: registeredOfficeAddress?.communications?.find((c) => c.type === "Business Email")?.value || pickEmail(filingContact),
+        NAICSCode: deltaData.businessActivity?.toString(),
         PrimaryActivity: NAICS_CODE_DESCRIPTIONS[deltaData.businessActivity?.toString()]
       }
     };
   }
-  function createCoverLetter2(officialBusinessEmail, contact) {
+  function createCoverLetter2(officialBusinessEmail, contact, phone) {
     return {
       FirstName: contact?._profile?.firstName || "",
       LastName: contact?._profile?.lastName || "",
       MiddleName: contact?._profile?.middleName || "",
-      Email: contact?.communicationEmail || officialBusinessEmail || "",
-      Phone: contact?.communicationPhone || "",
-      Fax: '""'
+      Email: pickEmail(contact) || officialBusinessEmail || "",
+      Phone: phone || ""
+    };
+  }
+  function formatPhone(phone) {
+    const digits = (phone ?? "").replace(/\D/g, "").slice(-10);
+    return digits.length === 10 ? `${digits.slice(0, 3)}-${digits.slice(3, 6)}-${digits.slice(6)}` : phone ?? "";
+  }
+  function pickEmail(person) {
+    const p = person;
+    return p?.communicationEmail || p?.communications?.find((c) => /e-?mail/i.test(c.type))?.value || void 0;
+  }
+  function pickPhone(person) {
+    const p = person;
+    return p?.communicationPhone || p?.communications?.find((c) => /phone|mobile|cell|tel/i.test(c.type))?.value || void 0;
+  }
+  function resolveStreet(address) {
+    const find = (name2) => address?.components?.find((c) => c.name === name2)?.value?.trim();
+    const number = find("Street Number Only");
+    const name = find("Street Only");
+    if (number && name)
+      return { number, name };
+    const line = name || find("Street Address") || address?.street?.trim() || address?.display?.line1?.trim() || "";
+    const match = /^(\d[\w-]*)\s+(.+)$/.exec(line);
+    if (number)
+      return { number, name: name || line };
+    return match ? { number: match[1], name: match[2] } : { number: "", name: line };
+  }
+  function pickSignatory(incorporators, contact) {
+    const contactId = contact?._id;
+    const chosen = incorporators.find((i) => i.type === "person" && contactId && i.profileID === contactId) ?? incorporators.find((i) => i.type === "person") ?? incorporators[0];
+    if (!chosen)
+      return { firstName: "", lastName: "" };
+    return chosen.type === "person" ? { firstName: chosen.firstName ?? "", lastName: chosen.lastName ?? "", phone: chosen.phone } : {
+      firstName: chosen.signatory_first_name ?? "",
+      lastName: chosen.signatory_last_name ?? "",
+      phone: chosen.phone
     };
   }
   var init_federal_formation_mapper = __esm({

package/package.json

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