@pdtf/schemas 3.6.0-4 → 3.6.0-41

package/src/tests/v3/extensionOverlays.test.js

@@ -2,6 +2,7 @@ const {
   getTransactionSchema,
   extensionOverlays,
   getValidator,
+  getSubschemaValidator,
 } = require("../../../index.js");
 
 const schemaId =
@@ -142,6 +143,73 @@ describe("Extension Overlays", () => {
     });
   });
 
+  describe("SEF25 extension leaf annotations", () => {
+    test("wg: every W1.x subsection exposes a yesNo ntsRef", () => {
+      const schema = getTransactionSchema(schemaId, ["nts2023", "wg"]);
+      const subsections =
+        schema.properties?.propertyPack?.properties
+          ?.guaranteesWarrantiesAndIndemnityInsurances?.oneOf?.[1]?.properties;
+
+      expect(subsections).toBeDefined();
+
+      const discriminated = Object.entries(subsections).filter(
+        ([, sub]) => sub?.discriminator?.propertyName === "yesNo"
+      );
+      expect(discriminated.length).toBeGreaterThan(0);
+
+      for (const [key, sub] of discriminated) {
+        expect(sub.ntsRef).toMatch(/^W1\.\d+$/);
+        expect(sub.properties?.yesNo?.ntsRef).toMatch(/^W1\.\d+\.1$/);
+        expect(sub.required).toContain("yesNo");
+      }
+    });
+
+    test("ic: insuranceClaims exposes a yesNo ntsRef", () => {
+      const schema = getTransactionSchema(schemaId, ["nts2023", "ic"]);
+      const icProp =
+        schema.properties?.propertyPack?.properties?.insurance?.oneOf?.[1]
+          ?.properties?.insuranceClaims;
+
+      expect(icProp).toBeDefined();
+      expect(icProp.ntsRef).toBe("I1.1");
+      expect(icProp.properties?.yesNo?.ntsRef).toBe("I1.1.1");
+      expect(icProp.required).toContain("yesNo");
+    });
+
+    test("nd: neighbourDevelopment N1.1 marker merges with nts yesNo ref", () => {
+      // nd extension only carries the parent N1.1 marker; the yesNo leaf
+      // annotation comes from the nts overlay (C4.1.1), which is required
+      // alongside nd for the field to render.
+      const schema = getTransactionSchema(schemaId, ["nts2023", "nd"]);
+      const ndProp =
+        schema.properties?.propertyPack?.properties?.notices?.properties
+          ?.neighbourDevelopment;
+
+      expect(ndProp).toBeDefined();
+      expect(ndProp.ntsRef).toBe("N1.1");
+      expect(ndProp.properties?.yesNo?.ntsRef).toBe("C4.1.1");
+      expect(ndProp.required).toContain("yesNo");
+    });
+
+    test("mi: otherMaterialIssue exposes yesNo and details ntsRef", () => {
+      const schema = getTransactionSchema(schemaId, ["nts2023", "mi"]);
+      const miProp =
+        schema.properties?.propertyPack?.properties?.additionalInformation
+          ?.properties?.otherMaterialIssue;
+
+      expect(miProp).toBeDefined();
+      expect(miProp.ntsRef).toBe("M1.1");
+      expect(miProp.properties?.yesNo?.ntsRef).toBe("M1.1.1");
+      expect(miProp.required).toContain("yesNo");
+
+      const yesBranch = miProp.oneOf?.find((branch) =>
+        branch.required?.includes("details")
+      );
+      expect(yesBranch).toBeDefined();
+      expect(yesBranch.properties?.details?.ntsRef).toBe("M1.1.2");
+    });
+  });
+
   describe("Extension overlay availability", () => {
     test("should export all extension overlays", () => {
       const expectedKeys = [
@@ -161,6 +229,18 @@ describe("Extension Overlays", () => {
         "hi",
         "fd", // Utilities & Services
         "oc", // Transaction
+        "sc",
+        "pc",
+        "ph", // SEF25
+        "dk",
+        "rw",
+        "sd",
+        "lc",
+        "wg",
+        "ic",
+        "nd",
+        "mi",
+        "tr", // SEF25 (new)
       ];
 
       expect(Object.keys(extensionOverlays).sort()).toEqual(
@@ -469,6 +549,109 @@ describe("Extension Overlays", () => {
       ).toBeTruthy();
     });
 
+    test("should merge supply costs extension into mainsWater No branch", () => {
+      const schema = getTransactionSchema(schemaId, ["sc"]);
+      const mainsWater =
+        schema.properties?.propertyPack?.properties?.waterAndDrainage
+          ?.properties?.water?.properties?.mainsWater;
+
+      expect(mainsWater?.oneOf).toBeDefined();
+
+      // Branch 0 is yesNo="No" — should now contain associatedCost
+      const noBranch = mainsWater.oneOf[0];
+      const cost = noBranch?.properties?.associatedCost;
+      expect(cost).toBeDefined();
+      expect(cost.ntsRef).toBe("U1.1");
+      expect(cost.required).toEqual(["frequency"]);
+      expect(cost.properties.frequency.type).toBe("string");
+      // amount now lives inside the frequency-discriminator's "Per month"/"Per year" branch
+      const costBranch = cost.oneOf?.find((b) =>
+        b.properties?.frequency?.enum?.includes("Per month")
+      );
+      expect(costBranch?.properties?.amount?.type).toBe("number");
+      expect(costBranch?.required).toEqual(["amount"]);
+    });
+
+    test("should merge supply costs extension into mainsFoulDrainage No/Not known branch", () => {
+      const schema = getTransactionSchema(schemaId, ["sc"]);
+      const mainsFoul =
+        schema.properties?.propertyPack?.properties?.waterAndDrainage
+          ?.properties?.drainage?.properties?.mainsFoulDrainage;
+
+      expect(mainsFoul?.oneOf).toBeDefined();
+
+      // Branch 2 is yesNo="No"/"Not known" — should now contain associatedCost
+      const noBranch = mainsFoul.oneOf[2];
+      const cost = noBranch?.properties?.associatedCost;
+      expect(cost).toBeDefined();
+      expect(cost.ntsRef).toBe("U1.2");
+      expect(cost.required).toEqual(["frequency"]);
+      // amount now lives inside the frequency-discriminator's "Per month"/"Per year" branch
+      const costBranch = cost.oneOf?.find((b) =>
+        b.properties?.frequency?.enum?.includes("Per month")
+      );
+      expect(costBranch?.properties?.amount?.type).toBe("number");
+      expect(costBranch?.required).toEqual(["amount"]);
+    });
+
+    test("should merge parking permit cost and frequency into controlledParking Yes branch", () => {
+      const schema = getTransactionSchema(schemaId, ["pc"]);
+      const controlled =
+        schema.properties?.propertyPack?.properties?.parking?.properties
+          ?.controlledParking;
+
+      expect(controlled?.oneOf).toBeDefined();
+
+      // Branch 1 is yesNo="Yes"
+      const yesBranch = controlled.oneOf[1];
+      const cost = yesBranch?.properties?.costOfPermit;
+      expect(cost).toBeDefined();
+      expect(cost.ntsRef).toBe("P1.1");
+      expect(cost.type).toBe("number");
+
+      const freq = yesBranch?.properties?.costOfPermitFrequency;
+      expect(freq).toBeDefined();
+      expect(freq.ntsRef).toBe("P1.2");
+      expect(freq.type).toBe("string");
+    });
+
+    test("should merge all 4 property hazard fields into specialistIssues", () => {
+      const schema = getTransactionSchema(schemaId, ["ph"]);
+      const si =
+        schema.properties?.propertyPack?.properties?.specialistIssues
+          ?.properties;
+
+      const expectedFields = [
+        { key: "wellsDitchesShaft", ref: "H1.1" },
+        { key: "damagedOrExposedElectrics", ref: "H1.2" },
+        { key: "damageToFlooringOrStaircases", ref: "H1.3" },
+        { key: "knownAreasInPoorCondition", ref: "H1.4" },
+      ];
+
+      expectedFields.forEach(({ key, ref }) => {
+        expect(si[key]).toBeDefined();
+        expect(si[key].ntsRef).toBe(ref);
+        expect(si[key].required).toContain("yesNo");
+        expect(si[key].discriminator?.propertyName).toBe("yesNo");
+        expect(si[key].oneOf).toHaveLength(2);
+
+        // "No" branch should not require details
+        const noBranch = si[key].oneOf.find((b) =>
+          b.properties?.yesNo?.enum?.includes("No")
+        );
+        expect(noBranch).toBeDefined();
+        expect(noBranch.required).toBeUndefined();
+
+        // "Yes" branch should require details
+        const yesBranch = si[key].oneOf.find((b) =>
+          b.properties?.yesNo?.enum?.includes("Yes")
+        );
+        expect(yesBranch).toBeDefined();
+        expect(yesBranch.required).toContain("details");
+        expect(yesBranch.properties.details.minLength).toBe(1);
+      });
+    });
+
     test("should not require additional fields when 'No' is selected in extension overlays", () => {
       // Test the 'as' (additional searches) extension overlay
       const schema = getTransactionSchema(schemaId, ["as"]);
@@ -522,4 +705,732 @@ describe("Extension Overlays", () => {
       }
     });
   });
+
+  describe("SEF25 extension validation", () => {
+    describe("Supply costs (sc)", () => {
+      const overlays = ["baspiV5", "sc"];
+
+      test("should validate valid private water cost", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/waterAndDrainage/water/mainsWater",
+          schemaId,
+          overlays
+        );
+
+        const result = validator({
+          yesNo: "No",
+          details: "Private borehole",
+          associatedCost: {
+            amount: 50,
+            frequency: "Per month",
+          },
+        });
+
+        expect(result).toBe(true);
+      });
+
+      test("should validate private water with no associated costs", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/waterAndDrainage/water/mainsWater",
+          schemaId,
+          overlays
+        );
+
+        const result = validator({
+          yesNo: "No",
+          details: "Private borehole",
+          associatedCost: {
+            amount: 0,
+            frequency: "Not applicable",
+          },
+        });
+
+        expect(result).toBe(true);
+      });
+
+      test("should require associated cost for private water supply", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/waterAndDrainage/water/mainsWater",
+          schemaId,
+          overlays
+        );
+
+        const result = validator({
+          yesNo: "No",
+          details: "Private well",
+        });
+
+        // associatedCost is required by the sc extension
+        expect(result).toBe(false);
+      });
+
+      test("should reject invalid frequency value for water cost", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/waterAndDrainage/water/mainsWater",
+          schemaId,
+          overlays
+        );
+
+        const result = validator({
+          yesNo: "No",
+          details: "Borehole",
+          associatedCost: {
+            amount: 100,
+            frequency: "Weekly",
+          },
+        });
+
+        expect(result).toBe(false);
+      });
+
+      test("should reject non-numeric amount for water cost", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/waterAndDrainage/water/mainsWater",
+          schemaId,
+          overlays
+        );
+
+        const result = validator({
+          yesNo: "No",
+          details: "Borehole",
+          associatedCost: {
+            amount: "fifty pounds",
+            frequency: "Per month",
+          },
+        });
+
+        expect(result).toBe(false);
+      });
+
+      test("should validate valid private sewerage cost", () => {
+        // Use sc without baspiV5 to avoid strict offMainsDrainageSystem requirements
+        const validator = getSubschemaValidator(
+          "/propertyPack/waterAndDrainage/drainage/mainsFoulDrainage",
+          schemaId,
+          ["sc"]
+        );
+
+        const result = validator({
+          yesNo: "No",
+          associatedCost: {
+            amount: 200,
+            frequency: "Per year",
+          },
+        });
+
+        expect(result).toBe(true);
+      });
+
+      test("should reject invalid frequency for sewerage cost", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/waterAndDrainage/drainage/mainsFoulDrainage",
+          schemaId,
+          ["sc"]
+        );
+
+        const result = validator({
+          yesNo: "No",
+          associatedCost: {
+            amount: 200,
+            frequency: "Quarterly",
+          },
+        });
+
+        expect(result).toBe(false);
+      });
+
+      test("should not allow associated cost when mains water is Yes", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/waterAndDrainage/water/mainsWater",
+          schemaId,
+          overlays
+        );
+
+        // When yesNo="Yes", associatedCost should cause validation failure
+        // because it's only defined in the "No" oneOf branch
+        const result = validator({
+          yesNo: "Yes",
+          supplier: "Thames Water",
+          associatedCost: {
+            amount: 50,
+            frequency: "Per month",
+          },
+        });
+
+        expect(result).toBe(false);
+      });
+    });
+
+    describe("Parking permit cost (pc)", () => {
+      const overlays = ["baspiV5", "pc"];
+
+      test("should validate valid parking permit with frequency", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/parking/controlledParking",
+          schemaId,
+          overlays
+        );
+
+        const result = validator({
+          yesNo: "Yes",
+          costOfPermit: 150,
+          costOfPermitFrequency: "Per year",
+        });
+
+        expect(result).toBe(true);
+      });
+
+      test("should validate parking permit with monthly frequency", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/parking/controlledParking",
+          schemaId,
+          overlays
+        );
+
+        const result = validator({
+          yesNo: "Yes",
+          costOfPermit: 12.50,
+          costOfPermitFrequency: "Per month",
+        });
+
+        expect(result).toBe(true);
+      });
+
+      test("should reject invalid frequency for parking permit", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/parking/controlledParking",
+          schemaId,
+          overlays
+        );
+
+        const result = validator({
+          yesNo: "Yes",
+          costOfPermit: 150,
+          costOfPermitFrequency: "Per quarter",
+        });
+
+        expect(result).toBe(false);
+      });
+
+      test("should validate No answer without cost fields", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/parking/controlledParking",
+          schemaId,
+          overlays
+        );
+
+        const result = validator({
+          yesNo: "No",
+        });
+
+        expect(result).toBe(true);
+      });
+    });
+
+    describe("Property hazards (ph)", () => {
+      const overlays = ["ph"];
+      const hazardFields = [
+        "wellsDitchesShaft",
+        "damagedOrExposedElectrics",
+        "damageToFlooringOrStaircases",
+        "knownAreasInPoorCondition",
+      ];
+
+      hazardFields.forEach((field) => {
+        test(`${field}: should validate "No" answer`, () => {
+          const validator = getSubschemaValidator(
+            `/propertyPack/specialistIssues/${field}`,
+            schemaId,
+            overlays
+          );
+
+          const result = validator({ yesNo: "No" });
+          expect(result).toBe(true);
+        });
+
+        test(`${field}: should validate "Yes" with details`, () => {
+          const validator = getSubschemaValidator(
+            `/propertyPack/specialistIssues/${field}`,
+            schemaId,
+            overlays
+          );
+
+          const result = validator({
+            yesNo: "Yes",
+            details: "Some description of the issue",
+          });
+          expect(result).toBe(true);
+        });
+
+        test(`${field}: should reject "Yes" without details`, () => {
+          const validator = getSubschemaValidator(
+            `/propertyPack/specialistIssues/${field}`,
+            schemaId,
+            overlays
+          );
+
+          const result = validator({ yesNo: "Yes" });
+          expect(result).toBe(false);
+        });
+
+        test(`${field}: should reject "Yes" with empty details`, () => {
+          const validator = getSubschemaValidator(
+            `/propertyPack/specialistIssues/${field}`,
+            schemaId,
+            overlays
+          );
+
+          const result = validator({ yesNo: "Yes", details: "" });
+          expect(result).toBe(false);
+        });
+
+        test(`${field}: should reject invalid yesNo value`, () => {
+          const validator = getSubschemaValidator(
+            `/propertyPack/specialistIssues/${field}`,
+            schemaId,
+            overlays
+          );
+
+          const result = validator({ yesNo: "Maybe" });
+          expect(result).toBe(false);
+        });
+      });
+    });
+
+    describe("Combined SEF25 extensions", () => {
+      test("should load all three SEF25 extensions together", () => {
+        const schema = getTransactionSchema(schemaId, [
+          "baspiV5",
+          "sc",
+          "pc",
+          "ph",
+        ]);
+
+        // Supply costs
+        const waterCost =
+          schema.properties?.propertyPack?.properties?.waterAndDrainage
+            ?.properties?.water?.properties?.mainsWater?.oneOf?.[0]?.properties
+            ?.associatedCost;
+        expect(waterCost).toBeDefined();
+
+        const sewerageCost =
+          schema.properties?.propertyPack?.properties?.waterAndDrainage
+            ?.properties?.drainage?.properties?.mainsFoulDrainage?.oneOf?.[2]
+            ?.properties?.associatedCost;
+        expect(sewerageCost).toBeDefined();
+
+        // Parking
+        const parkingFreq =
+          schema.properties?.propertyPack?.properties?.parking?.properties
+            ?.controlledParking?.oneOf?.[1]?.properties?.costOfPermitFrequency;
+        expect(parkingFreq).toBeDefined();
+
+        // Hazards
+        const si =
+          schema.properties?.propertyPack?.properties?.specialistIssues
+            ?.properties;
+        expect(si?.wellsDitchesShaft).toBeDefined();
+        expect(si?.damagedOrExposedElectrics).toBeDefined();
+        expect(si?.damageToFlooringOrStaircases).toBeDefined();
+        expect(si?.knownAreasInPoorCondition).toBeDefined();
+      });
+
+      test("should not interfere with existing NTS2 extensions", () => {
+        const schema = getTransactionSchema(schemaId, [
+          "nts2023",
+          "jk",
+          "hs",
+          "sc",
+          "pc",
+          "ph",
+        ]);
+
+        const si =
+          schema.properties?.propertyPack?.properties?.specialistIssues;
+
+        // Existing NTS2 extensions still work
+        expect(si?.properties?.japaneseKnotweed?.ntsRef).toBe("A5.3");
+        expect(si?.properties?.ongoingHealthOrSafetyIssue?.ntsRef).toBe(
+          "A5.5"
+        );
+        expect(si?.required).toContain("japaneseKnotweed");
+        expect(si?.required).toContain("ongoingHealthOrSafetyIssue");
+
+        // SEF25 hazards also present (remapped to ntsRef in extension overlays)
+        expect(si?.properties?.wellsDitchesShaft?.ntsRef).toBe("H1.1");
+        expect(si?.properties?.knownAreasInPoorCondition?.ntsRef).toBe(
+          "H1.4"
+        );
+      });
+    });
+
+    describe("Dropped kerb (dk)", () => {
+      test("should validate Yes answer", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/parking/droppedKerbAccess",
+          schemaId,
+          ["dk"]
+        );
+        expect(validator({ yesNo: "Yes" })).toBe(true);
+      });
+
+      test("should validate No answer", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/parking/droppedKerbAccess",
+          schemaId,
+          ["dk"]
+        );
+        expect(validator({ yesNo: "No" })).toBe(true);
+      });
+
+      test("should reject invalid value", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/parking/droppedKerbAccess",
+          schemaId,
+          ["dk"]
+        );
+        expect(validator({ yesNo: "Maybe" })).toBe(false);
+      });
+
+      test("should not be required without dk overlay", () => {
+        const schema = getTransactionSchema(schemaId, ["baspiV5"]);
+        const parking = schema.properties?.propertyPack?.properties?.parking;
+        expect(parking?.required || []).not.toContain("droppedKerbAccess");
+      });
+
+      test("should be required with dk overlay", () => {
+        const schema = getTransactionSchema(schemaId, ["dk"]);
+        const parking = schema.properties?.propertyPack?.properties?.parking;
+        expect(parking?.required).toContain("droppedKerbAccess");
+      });
+    });
+
+    describe("Private right of way (rw)", () => {
+      test("should validate No answer", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/rightsAndInformalArrangements/rightsOrArrangements/privateRightOfWay",
+          schemaId,
+          ["rw"]
+        );
+        expect(validator({ yesNo: "No" })).toBe(true);
+      });
+
+      test("should validate Yes with details", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/rightsAndInformalArrangements/rightsOrArrangements/privateRightOfWay",
+          schemaId,
+          ["rw"]
+        );
+        expect(validator({ yesNo: "Yes", details: "Neighbour has access through garden" })).toBe(true);
+      });
+
+      test("should reject Yes without details", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/rightsAndInformalArrangements/rightsOrArrangements/privateRightOfWay",
+          schemaId,
+          ["rw"]
+        );
+        expect(validator({ yesNo: "Yes" })).toBe(false);
+      });
+
+      test("should reject Yes with empty details", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/rightsAndInformalArrangements/rightsOrArrangements/privateRightOfWay",
+          schemaId,
+          ["rw"]
+        );
+        expect(validator({ yesNo: "Yes", details: "" })).toBe(false);
+      });
+
+      test("should not be required without rw overlay", () => {
+        const schema = getTransactionSchema(schemaId, ["baspiV5"]);
+        const rights = schema.properties?.propertyPack?.properties?.rightsAndInformalArrangements
+          ?.properties?.rightsOrArrangements;
+        expect(rights?.required || []).not.toContain("privateRightOfWay");
+      });
+
+      test("should be required with rw overlay", () => {
+        const schema = getTransactionSchema(schemaId, ["rw"]);
+        const rights = schema.properties?.propertyPack?.properties?.rightsAndInformalArrangements
+          ?.properties?.rightsOrArrangements;
+        expect(rights?.required).toContain("privateRightOfWay");
+      });
+    });
+
+    describe("Storm/fire/flood damage (sd)", () => {
+      test("should validate No answer", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/environmentalIssues/stormFireFloodDamage",
+          schemaId,
+          ["sd"]
+        );
+        expect(validator({ yesNo: "No" })).toBe(true);
+      });
+
+      test("should validate Yes with details", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/environmentalIssues/stormFireFloodDamage",
+          schemaId,
+          ["sd"]
+        );
+        expect(validator({ yesNo: "Yes", details: "Flood damage in 2020" })).toBe(true);
+      });
+
+      test("should reject Yes without details", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/environmentalIssues/stormFireFloodDamage",
+          schemaId,
+          ["sd"]
+        );
+        expect(validator({ yesNo: "Yes" })).toBe(false);
+      });
+
+      test("should not be required without sd overlay", () => {
+        const schema = getTransactionSchema(schemaId, ["baspiV5"]);
+        const env = schema.properties?.propertyPack?.properties?.environmentalIssues;
+        expect(env?.required || []).not.toContain("stormFireFloodDamage");
+      });
+
+      test("should be required with sd overlay", () => {
+        const schema = getTransactionSchema(schemaId, ["sd"]);
+        const env = schema.properties?.propertyPack?.properties?.environmentalIssues;
+        expect(env?.required).toContain("stormFireFloodDamage");
+      });
+    });
+
+    describe("Solar lease costs (lc)", () => {
+      test("should validate Not applicable frequency", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/electricity/solarPanels/panelsOwnedOutright/associatedCost",
+          schemaId,
+          ["lc"]
+        );
+        expect(validator({ amount: 0, frequency: "Not applicable" })).toBe(true);
+      });
+
+      test("should validate amount and frequency", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/electricity/solarPanels/panelsOwnedOutright/associatedCost",
+          schemaId,
+          ["lc"]
+        );
+        expect(validator({ amount: 75, frequency: "Per month" })).toBe(true);
+      });
+
+      test("should reject missing amount", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/electricity/solarPanels/panelsOwnedOutright/associatedCost",
+          schemaId,
+          ["lc"]
+        );
+        expect(validator({ frequency: "Per month" })).toBe(false);
+      });
+
+      test("should reject missing frequency", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/electricity/solarPanels/panelsOwnedOutright/associatedCost",
+          schemaId,
+          ["lc"]
+        );
+        expect(validator({ amount: 75 })).toBe(false);
+      });
+
+      test("should reject invalid frequency", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/electricity/solarPanels/panelsOwnedOutright/associatedCost",
+          schemaId,
+          ["lc"]
+        );
+        expect(validator({ amount: 75, frequency: "Weekly" })).toBe(false);
+      });
+    });
+
+    describe("Warranties and guarantees (wg)", () => {
+      const warrantyCategoryPaths = [
+        { path: "newHomeWarranty", ref: "W1.1" },
+        { path: "roofingWork", ref: "W1.2" },
+        { path: "dampProofingTreatment", ref: "W1.3" },
+        { path: "centralHeatingAndorPlumbing", ref: "W1.4" },
+        { path: "electricalRepairOrInstallation", ref: "W1.5" },
+        { path: "subsidenceWork", ref: "W1.6" },
+        { path: "otherGuarantees", ref: "W1.7" },
+      ];
+
+      test("should have ntsRef on all warranty categories when wg overlay loaded", () => {
+        const schema = getTransactionSchema(schemaId, ["baspiV5", "wg"]);
+        const warranties =
+          schema.properties?.propertyPack?.properties?.guaranteesWarrantiesAndIndemnityInsurances;
+
+        // Warranty fields are in oneOf[1] (hasValidGuaranteesOrWarranties = Yes)
+        const yesBranch = warranties.oneOf[1];
+
+        warrantyCategoryPaths.forEach(({ path, ref }) => {
+          expect(yesBranch.properties[path]?.ntsRef).toBe(ref);
+        });
+      });
+
+      test("should mark warranty categories as required when wg overlay loaded", () => {
+        const schema = getTransactionSchema(schemaId, ["baspiV5", "wg"]);
+        const warranties =
+          schema.properties?.propertyPack?.properties?.guaranteesWarrantiesAndIndemnityInsurances;
+
+        const yesBranch = warranties.oneOf[1];
+        warrantyCategoryPaths.forEach(({ path }) => {
+          expect(yesBranch.required).toContain(path);
+        });
+      });
+
+      test("should not require warranty categories without any overlay", () => {
+        const schema = getTransactionSchema(schemaId, []);
+        const warranties =
+          schema.properties?.propertyPack?.properties?.guaranteesWarrantiesAndIndemnityInsurances;
+
+        const yesBranch = warranties.oneOf[1];
+        // Without any overlay, warranty categories should not be in required
+        expect(yesBranch.required || []).not.toContain("newHomeWarranty");
+        expect(yesBranch.required || []).not.toContain("electricalRepairOrInstallation");
+      });
+    });
+
+    describe("Insurance claims (ic)", () => {
+      test("should mark insuranceClaims as required in isInsured=Yes branch", () => {
+        const schema = getTransactionSchema(schemaId, ["ic"]);
+        const insurance = schema.properties?.propertyPack?.properties?.insurance;
+        // oneOf[1] is isInsured=Yes
+        const yesBranch = insurance.oneOf[1];
+        expect(yesBranch?.required).toContain("insuranceClaims");
+      });
+
+      test("should validate insuranceClaims No answer", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/insurance/insuranceClaims",
+          schemaId,
+          ["baspiV5", "ic"]
+        );
+        expect(validator({ yesNo: "No" })).toBe(true);
+      });
+
+      test("should validate insuranceClaims Yes with details", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/insurance/insuranceClaims",
+          schemaId,
+          ["baspiV5", "ic"]
+        );
+        expect(validator({ yesNo: "Yes", details: "Storm damage claim in 2019" })).toBe(true);
+      });
+    });
+
+    describe("Neighbour development (nd)", () => {
+      test("should add ntsRef to neighbourDevelopment", () => {
+        const schema = getTransactionSchema(schemaId, ["nd"]);
+        const nd = schema.properties?.propertyPack?.properties?.notices
+          ?.properties?.neighbourDevelopment;
+        expect(nd?.ntsRef).toBe("N1.1");
+      });
+
+      test("should add ntsRef via nd overlay", () => {
+        const schema = getTransactionSchema(schemaId, ["nd"]);
+        const notices = schema.properties?.propertyPack?.properties?.notices;
+        expect(notices?.ntsRef).toBe("N1");
+      });
+
+      test("should validate No answer", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/notices/neighbourDevelopment",
+          schemaId,
+          ["baspiV5", "nd"]
+        );
+        expect(validator({ yesNo: "No" })).toBe(true);
+      });
+    });
+
+    describe("Other material issue (mi)", () => {
+      test("should mark otherMaterialIssue as required", () => {
+        const schema = getTransactionSchema(schemaId, ["mi"]);
+        const additional = schema.properties?.propertyPack?.properties?.additionalInformation;
+        expect(additional?.required).toContain("otherMaterialIssue");
+      });
+
+      test("should not require otherMaterialIssue without mi overlay", () => {
+        const schema = getTransactionSchema(schemaId, []);
+        const additional = schema.properties?.propertyPack?.properties?.additionalInformation;
+        expect(additional?.required || []).not.toContain("otherMaterialIssue");
+      });
+
+      test("should validate No answer", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/additionalInformation/otherMaterialIssue",
+          schemaId,
+          ["baspiV5", "mi"]
+        );
+        expect(validator({ yesNo: "No" })).toBe(true);
+      });
+
+      test("should validate Yes with details", () => {
+        const validator = getSubschemaValidator(
+          "/propertyPack/additionalInformation/otherMaterialIssue",
+          schemaId,
+          ["baspiV5", "mi"]
+        );
+        expect(validator({ yesNo: "Yes", details: "Previous subsidence issues" })).toBe(true);
+      });
+    });
+
+    describe("Title restrictions (tr)", () => {
+      test("should require titleRestrictions in freehold branch with tr overlay", () => {
+        const schema = getTransactionSchema(schemaId, ["tr"]);
+        const items = schema.properties?.propertyPack?.properties?.ownership
+          ?.properties?.ownershipsToBeTransferred?.items;
+        // oneOf[0] is Freehold
+        const freeholdBranch = items.oneOf[0];
+        expect(freeholdBranch?.properties?.titleRestrictions).toBeDefined();
+        expect(freeholdBranch?.required).toContain("titleRestrictions");
+      });
+
+      test("should not require titleRestrictions without tr overlay", () => {
+        const schema = getTransactionSchema(schemaId, ["baspiV5"]);
+        const items = schema.properties?.propertyPack?.properties?.ownership
+          ?.properties?.ownershipsToBeTransferred?.items;
+        const freeholdBranch = items.oneOf[0];
+        expect(freeholdBranch?.required || []).not.toContain("titleRestrictions");
+      });
+
+      test("should have correct ntsRef", () => {
+        const schema = getTransactionSchema(schemaId, ["tr"]);
+        const items = schema.properties?.propertyPack?.properties?.ownership
+          ?.properties?.ownershipsToBeTransferred?.items;
+        const freeholdBranch = items.oneOf[0];
+        expect(freeholdBranch?.properties?.titleRestrictions?.ntsRef).toBe("T1.1");
+      });
+    });
+
+    describe("All SEF25 extensions combined", () => {
+      const allSef25 = ["sc", "pc", "ph", "dk", "rw", "sd", "lc", "wg", "ic", "nd", "mi", "tr"];
+
+      test("should load all SEF25 extensions together without error", () => {
+        const schema = getTransactionSchema(schemaId, ["baspiV5", ...allSef25]);
+        expect(schema).toBeDefined();
+        expect(schema.properties?.propertyPack).toBeDefined();
+      });
+
+      test("should not interfere with existing NTS2 extensions when combined", () => {
+        const schema = getTransactionSchema(schemaId, ["nts2025", ...allSef25]);
+
+        // NTS2 fields still work
+        const si = schema.properties?.propertyPack?.properties?.specialistIssues;
+        expect(si?.properties?.wellsDitchesShaft?.ntsRef).toBe("H1.1");
+
+        // New SEF25 fields present
+        const parking = schema.properties?.propertyPack?.properties?.parking?.properties;
+        expect(parking?.droppedKerbAccess).toBeDefined();
+
+        const env = schema.properties?.propertyPack?.properties?.environmentalIssues?.properties;
+        expect(env?.stormFireFloodDamage).toBeDefined();
+
+        const rights = schema.properties?.propertyPack?.properties?.rightsAndInformalArrangements
+          ?.properties?.rightsOrArrangements?.properties;
+        expect(rights?.privateRightOfWay).toBeDefined();
+      });
+    });
+  });
 });