@pdtf/schemas 3.6.0-41 → 3.6.0-44

package/src/schemas/v3/overlays/ta6ed6.json

@@ -117,7 +117,12 @@
         ],
         "required": [
           "role"
-        ]
+        ],
+        "properties": {
+          "role": {
+            "ta6ed6Ref": "1"
+          }
+        }
       }
     },
     "propertyPack": {
@@ -838,7 +843,12 @@
                       ],
                       "required": [
                         "yesNo"
-                      ]
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "ta6ed6Ref": "5.1a(f)"
+                        }
+                      }
                     },
                     "deedRestrictionConsent": {
                       "ta6ed6Ref": "5.1a(g)",
@@ -868,7 +878,12 @@
                       ],
                       "required": [
                         "yesNo"
-                      ]
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "ta6ed6Ref": "5.1a(g)"
+                        }
+                      }
                     },
                     "workCompleted": {
                       "ta6ed6Ref": "5.1a(b)",
@@ -1255,7 +1270,12 @@
                       ],
                       "required": [
                         "yesNo"
-                      ]
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "ta6ed6Ref": "5.1c(f)"
+                        }
+                      }
                     },
                     "deedRestrictionConsent": {
                       "ta6ed6Ref": "5.1c(g)",
@@ -1285,7 +1305,12 @@
                       ],
                       "required": [
                         "yesNo"
-                      ]
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "ta6ed6Ref": "5.1c(g)"
+                        }
+                      }
                     },
                     "workCompleted": {
                       "ta6ed6Ref": "5.1c(b)",
@@ -2895,7 +2920,12 @@
                       ],
                       "required": [
                         "yesNo"
-                      ]
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "ta6ed6Ref": "5.6c"
+                        }
+                      }
                     },
                     "panelProviderLease": {
                       "ta6ed6Ref": "5.6d",
@@ -3367,6 +3397,7 @@
                   ],
                   "properties": {
                     "yesNo": {
+                      "ta6ed6Ref": "11.5b",
                       "enum": [
                         "Yes",
                         "No",
@@ -3655,7 +3686,12 @@
                               ],
                               "required": [
                                 "yesNo"
-                              ]
+                              ],
+                              "properties": {
+                                "yesNo": {
+                                  "ta6ed6Ref": "11.7j"
+                                }
+                              }
                             },
                             "plantDrainsIntoWaterway": {
                               "ta6ed6Ref": "11.7f",
@@ -4210,8 +4246,7 @@
           ],
           "required": [
             "isInsured",
-            "difficultiesObtainingInsurance",
-            "insuranceClaims"
+            "difficultiesObtainingInsurance"
           ],
           "properties": {
             "difficultiesObtainingInsurance": {
@@ -4483,12 +4518,7 @@
               "description": "If yes, give details of how much, how often and who you pay:",
               "properties": {
                 "yesNo": {
-                  "ta6ed6Ref": "9.2.1",
-                  "enum": [
-                    "Yes",
-                    "No",
-                    "Not applicable"
-                  ]
+                  "ta6ed6Ref": "9.2.1"
                 }
               }
             },
@@ -6288,7 +6318,12 @@
                               "ta6ed6Ref": "13.6a",
                               "required": [
                                 "yesNo"
-                              ]
+                              ],
+                              "properties": {
+                                "yesNo": {
+                                  "ta6ed6Ref": "13.6a"
+                                }
+                              }
                             },
                             "aged17OrOverWillSignToConfirmWillVacate": {
                               "ta6ed6Ref": "13.6b",
@@ -6377,19 +6412,19 @@
               "properties": {
                 "removeRubbish": {
                   "ta6ed6Ref": "14.2a",
-                  "title": "(a) all rubbish is removed from the property (including from the loft, garden, outbuildings, garages and sheds) and that the property will be left in a clean and tidy condition?"
+                  "title": "All rubbish is removed from the property (including from the loft, garden, outbuildings, garages and sheds) and that the property will be left in a clean and tidy condition?"
                 },
                 "replaceLightFittings": {
                   "ta6ed6Ref": "14.2b",
-                  "title": "(b) if light fittings are removed, the fittings will be replaced with ceiling rose, flex, bulb holder and bulb?"
+                  "title": "If light fittings are removed, the fittings will be replaced with ceiling rose, flex, bulb holder and bulb?"
                 },
                 "takeReasonableCare": {
                   "ta6ed6Ref": "14.2c",
-                  "title": "(c) reasonable care will be taken when removing any other fittings or contents?"
+                  "title": "Reasonable care will be taken when removing any other fittings or contents?"
                 },
                 "leaveKeys": {
                   "ta6ed6Ref": "14.2d",
-                  "title": "(d) keys to all windows and doors and details of codes for alarms and any other equipment will be left at the property or with the estate agent?"
+                  "title": "Keys to all windows and doors and details of codes for alarms and any other equipment will be left at the property or with the estate agent?"
                 }
               }
             },

package/src/schemas/v3/overlays/ta7ed5.json

@@ -74,8 +74,6 @@
                         "ta7ed5Ref": "2",
                         "required": [
                           "typeOfLeasehold",
-                          "sharedOwnership",
-                          "leaseTerm",
                           "contactDetails",
                           "consents",
                           "groundRent",
@@ -84,8 +82,6 @@
                           "disputes",
                           "buildingSafetyAct",
                           "enfranchisement",
-                          "buildingSafety",
-                          "general",
                           "requiredDocuments",
                           "additionalInformation",
                           "confirmationOfAccuracy"
@@ -1451,6 +1447,17 @@
                                 "ta7ed5Ref": "12.2"
                               }
                             }
+                          },
+                          "confirmationOfAccuracy": {
+                            "ta7ed5Ref": "13",
+                            "required": [
+                              "confirmation"
+                            ],
+                            "properties": {
+                              "confirmation": {
+                                "ta7ed5Ref": "13.1"
+                              }
+                            }
                           }
                         }
                       }
@@ -1472,7 +1479,12 @@
                 "ta7ed5Ref": "2",
                 "required": [
                   "ownershipType"
-                ]
+                ],
+                "properties": {
+                  "ownershipType": {
+                    "ta7ed5Ref": "2"
+                  }
+                }
               }
             }
           }

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

@@ -241,6 +241,8 @@ describe("Extension Overlays", () => {
         "nd",
         "mi",
         "tr", // SEF25 (new)
+        "ac", // SEF25 (new)
+        "ta", // Compatibility
       ];
 
       expect(Object.keys(extensionOverlays).sort()).toEqual(
@@ -258,6 +260,65 @@ describe("Extension Overlays", () => {
     });
   });
 
+  describe("TA6 edition 6 compatibility extension", () => {
+    test("keeps parking enum strict to TA6 edition 6 when compatibility is applied", () => {
+      const ta6Validator = getSubschemaValidator(
+        "/propertyPack/parking/controlledParking",
+        schemaId,
+        ["ta6ed6"]
+      );
+      expect(ta6Validator({ yesNo: "Not known" })).toBe(false);
+
+      const compatValidator = getSubschemaValidator(
+        "/propertyPack/parking/controlledParking",
+        schemaId,
+        ["nts2025", "ta"]
+      );
+      expect(compatValidator({ yesNo: "Not known" })).toBe(false);
+      expect(compatValidator({ yesNo: "No" })).toBe(true);
+    });
+
+    test("applies TA6 edition 6 selector values on shared rights and boundaries paths", () => {
+      const schema = getTransactionSchema(schemaId, [
+        "nts2025",
+        "ta",
+      ]);
+      const propertyPack = schema.properties.propertyPack.properties;
+
+      expect(
+        propertyPack.rightsAndInformalArrangements.properties
+          .sharedContributions.oneOf[0].properties.yesNo.enum
+      ).toEqual(["No", "Not applicable"]);
+
+      expect(
+        propertyPack.rightsAndInformalArrangements.properties
+          .accessRestrictionAttempts.oneOf[0].properties.yesNo.enum
+      ).toEqual(["No", "Not known"]);
+
+      expect(
+        propertyPack.legalBoundaries.properties.flyingFreehold.oneOf[0]
+          .properties.yesNo.enum
+      ).toEqual(["No", "Not known"]);
+    });
+
+    test("applies TA6 edition 6 heating values and report enum when compatibility is applied", () => {
+      const heatingFeatures = getSubschemaValidator(
+        "/propertyPack/heating/otherHeatingFeatures",
+        schemaId,
+        ["nts2025", "ta"]
+      );
+      expect(heatingFeatures(["Mains gas", "LPG", "Biomass"])).toBe(true);
+
+      const compatReport = getSubschemaValidator(
+        "/propertyPack/heating/heatingSystem/centralHeatingDetails/heatingLastServicedReport",
+        schemaId,
+        ["nts2025", "ta"]
+      );
+      expect(compatReport("Not available")).toBe(false);
+      expect(compatReport("Attached")).toBe(true);
+    });
+  });
+
   describe("NTS2 equivalence test", () => {
     test("should produce equivalent result to nts2 when all relevant extensions are combined", () => {
       // Get the full NTS2 schema
@@ -1404,8 +1465,110 @@ describe("Extension Overlays", () => {
       });
     });
 
+    describe("Alterations and changes (ac)", () => {
+      const alterationFields = [
+        "extension",
+        "loftConversion",
+        "garageConversion",
+        "removalOfInternalWalls",
+        "changeOfUse",
+      ];
+
+      test("should expose only selected alterations and changes fields", () => {
+        const schema = getTransactionSchema(schemaId, ["ac"]);
+        const alterations =
+          schema.properties?.propertyPack?.properties?.alterationsAndChanges;
+        const acOverlayAlterations =
+          extensionOverlays.ac.properties?.propertyPack?.properties
+            ?.alterationsAndChanges;
+
+        expect(alterations?.ntsRef).toBe("A1");
+        expect(alterations?.required).toEqual(
+          expect.arrayContaining(alterationFields)
+        );
+        expect(Object.keys(acOverlayAlterations?.properties || {}).sort()).toEqual(
+          alterationFields.slice().sort()
+        );
+
+        alterationFields.forEach((field) => {
+          const fieldSchema = alterations.properties?.[field];
+          const yesBranch = fieldSchema?.oneOf?.[1];
+          const planningPermission =
+            yesBranch?.properties?.planningPermission;
+          const buildingRegApproval =
+            yesBranch?.properties?.buildingRegApproval;
+          const overlayFieldSchema = acOverlayAlterations.properties?.[field];
+          const overlayYesBranch =
+            overlayFieldSchema?.oneOf?.[1];
+          const overlayPlanningPermission =
+            overlayYesBranch?.properties?.planningPermission;
+          const overlayBuildingRegApproval =
+            overlayYesBranch?.properties?.buildingRegApproval;
+
+          expect(fieldSchema?.required).toContain("yesNo");
+          expect(fieldSchema?.discriminator).toEqual({
+            propertyName: "yesNo",
+          });
+          expect(overlayFieldSchema?.discriminator).toEqual({
+            propertyName: "yesNo",
+          });
+          expect(fieldSchema?.properties?.yesNo?.ntsRef).toMatch(/^A1\./);
+          expect(yesBranch?.required).toEqual(
+            expect.arrayContaining([
+              "details",
+              "planningPermission",
+              "buildingRegApproval",
+            ])
+          );
+          expect(Object.keys(overlayYesBranch?.properties || {}).sort()).toEqual([
+            "buildingRegApproval",
+            "details",
+            "planningPermission",
+          ]);
+          expect(planningPermission?.discriminator).toEqual({
+            propertyName: "yesNo",
+          });
+          expect(buildingRegApproval?.discriminator).toEqual({
+            propertyName: "yesNo",
+          });
+          expect(overlayPlanningPermission?.discriminator).toEqual({
+            propertyName: "yesNo",
+          });
+          expect(overlayBuildingRegApproval?.discriminator).toEqual({
+            propertyName: "yesNo",
+          });
+          expect(yesBranch?.properties?.workCompleted?.ntsRef).toBeUndefined();
+          expect(yesBranch?.properties?.documents?.ntsRef).toBeUndefined();
+          expect(yesBranch?.properties?.yearCompleted?.ntsRef).toBeUndefined();
+          expect(yesBranch?.properties?.listedBuildingConsent?.ntsRef).toBeUndefined();
+          expect(yesBranch?.properties?.deedRestrictionConsent?.ntsRef).toBeUndefined();
+        });
+      });
+
+      test("should require details and consent yesNo fields for Yes answers", () => {
+        alterationFields.forEach((field) => {
+          const validator = getSubschemaValidator(
+            `/propertyPack/alterationsAndChanges/${field}`,
+            schemaId,
+            ["ac"]
+          );
+
+          expect(validator({ yesNo: "No" })).toBe(true);
+          expect(validator({ yesNo: "Yes" })).toBe(false);
+          expect(
+            validator({
+              yesNo: "Yes",
+              details: `${field} details`,
+              planningPermission: { yesNo: "Not required" },
+              buildingRegApproval: { yesNo: "Yes" },
+            })
+          ).toBe(true);
+        });
+      });
+    });
+
     describe("All SEF25 extensions combined", () => {
-      const allSef25 = ["sc", "pc", "ph", "dk", "rw", "sd", "lc", "wg", "ic", "nd", "mi", "tr"];
+      const allSef25 = ["sc", "pc", "ph", "dk", "rw", "sd", "lc", "wg", "ic", "nd", "mi", "tr", "ac"];
 
       test("should load all SEF25 extensions together without error", () => {
         const schema = getTransactionSchema(schemaId, ["baspiV5", ...allSef25]);

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

@@ -2,10 +2,38 @@ const {
   getTransactionSchema,
   getSubschemaValidator,
 } = require("../../../index.js");
+const ta6ed6Overlay = require("../../schemas/v3/overlays/ta6ed6.json");
 
 const schemaId =
   "https://trust.propdata.org.uk/schemas/v3/pdtf-transaction.json";
 
+const collectRequiredWithoutPropertyIssues = (schema) => {
+  const issues = [];
+
+  const walk = (node, path = "#") => {
+    if (!node || typeof node !== "object") return;
+
+    if (Array.isArray(node.required)) {
+      node.required.forEach((propertyName) => {
+        if (!node.properties?.[propertyName]) {
+          issues.push(`${path} requires ${propertyName}`);
+        }
+      });
+    }
+
+    Object.entries(node.properties || {}).forEach(([key, value]) =>
+      walk(value, `${path}/properties/${key}`)
+    );
+    (node.oneOf || []).forEach((value, index) =>
+      walk(value, `${path}/oneOf/${index}`)
+    );
+    if (node.items) walk(node.items, `${path}/items`);
+  };
+
+  walk(schema);
+  return issues;
+};
+
 describe("TA6 Edition 6 overlay", () => {
   describe("Schema merging", () => {
     test("merged schema contains ta6ed6Ref annotations", () => {
@@ -21,6 +49,10 @@ describe("TA6 Edition 6 overlay", () => {
       ).toBe("11");
     });
 
+    test("generated overlay exposes every TA6 edition 6 required property", () => {
+      expect(collectRequiredWithoutPropertyIssues(ta6ed6Overlay)).toEqual([]);
+    });
+
     test("merged schema has all 22 ta6ed6 required propertyPack sections", () => {
       const schema = getTransactionSchema(schemaId, ["ta6ed6"]);
       const required = schema.properties.propertyPack.required;
@@ -751,11 +783,26 @@ describe("TA6 Edition 6 overlay", () => {
           refused: { yesNo: "No" },
         },
         whoInsures: "Landlord insures the building",
-        insuranceClaims: { yesNo: "No" },
       };
       expect(validator(data)).toBe(true);
     });
 
+    test("isInsured Yes without insuranceClaims is invalid", () => {
+      const data = {
+        isInsured: "Yes",
+        difficultiesObtainingInsurance: {
+          abnormalRiseInPremiums: { yesNo: "No" },
+          subjectToHighExcesses: { yesNo: "No" },
+          subjectToUnusualConditions: { yesNo: "No" },
+          refused: { yesNo: "No" },
+        },
+      };
+      expect(validator(data)).toBe(false);
+      expect(
+        validator.errors.some((e) => e.message.includes("'insuranceClaims'"))
+      ).toBe(true);
+    });
+
     test("isInsured No without whoInsures is invalid", () => {
       const data = {
         isInsured: "No",
@@ -1585,6 +1632,16 @@ describe("TA6 Edition 6 overlay", () => {
       expect(mfd.discriminator).toBeDefined();
     });
 
+    test("plant registered yesNo carries TA6 edition 6 ref", () => {
+      const schema = getTransactionSchema(schemaId, ["ta6ed6"]);
+      const plantRegistered =
+        schema.properties.propertyPack.properties.waterAndDrainage.properties
+          .drainage.properties.mainsFoulDrainage.oneOf[2].properties
+          .offMainsDrainageSystem.properties.plantRegistered;
+      expect(plantRegistered.ta6ed6Ref).toBe("11.7j");
+      expect(plantRegistered.properties.yesNo.ta6ed6Ref).toBe("11.7j");
+    });
+
     test("mainsFoulDrainage No with object is accepted", () => {
       const data = {
         water: {

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

@@ -2,12 +2,40 @@ const {
   getTransactionSchema,
   getSubschemaValidator,
 } = require("../../../index.js");
+const ta7ed5Overlay = require("../../schemas/v3/overlays/ta7ed5.json");
 
 const schemaId =
   "https://trust.propdata.org.uk/schemas/v3/pdtf-transaction.json";
 
 const overlays = ["ta7ed5"];
 
+const collectRequiredWithoutPropertyIssues = (schema) => {
+  const issues = [];
+
+  const walk = (node, path = "#") => {
+    if (!node || typeof node !== "object") return;
+
+    if (Array.isArray(node.required)) {
+      node.required.forEach((propertyName) => {
+        if (!node.properties?.[propertyName]) {
+          issues.push(`${path} requires ${propertyName}`);
+        }
+      });
+    }
+
+    Object.entries(node.properties || {}).forEach(([key, value]) =>
+      walk(value, `${path}/properties/${key}`)
+    );
+    (node.oneOf || []).forEach((value, index) =>
+      walk(value, `${path}/oneOf/${index}`)
+    );
+    if (node.items) walk(node.items, `${path}/items`);
+  };
+
+  walk(schema);
+  return issues;
+};
+
 // Helper: navigate to a deeply nested property in the merged schema
 const getSchemaProperty = (schema, dotPath) => {
   return dotPath.split(".").reduce((obj, key) => obj?.[key], schema);
@@ -37,7 +65,11 @@ describe("TA7 5th edition overlay", () => {
       expect(required).toContain("ownership");
     });
 
-    test("leasehold branch requires the 15 ta7ed5 sections", () => {
+    test("generated overlay exposes every TA7 edition 5 required property", () => {
+      expect(collectRequiredWithoutPropertyIssues(ta7ed5Overlay)).toEqual([]);
+    });
+
+    test("leasehold branch requires the referenced ta7ed5 sections", () => {
       const leaseholdOneOf =
         schema.properties?.propertyPack?.properties?.ownership?.properties
           ?.ownershipsToBeTransferred?.items?.oneOf;
@@ -60,6 +92,7 @@ describe("TA7 5th edition overlay", () => {
       expect(required).toContain("requiredDocuments");
       expect(required).toContain("additionalInformation");
       expect(required).toContain("confirmationOfAccuracy");
+      expect(required).not.toContain("buildingSafety");
     });
   });
 

package/src/utils/extractExtensionOverlays.js

@@ -307,10 +307,59 @@ const extensionMappings = {
       "/properties/propertyPack/properties/ownership/properties/ownershipsToBeTransferred/items/oneOf/0/properties/titleRestrictions",
     ],
   },
+
+  // Alterations and changes
+  ac: {
+    name: "alterationsAndChanges",
+    description: "Selected alterations and changes fields for SEF25",
+    refType: "sef25Ref",
+    preserveDiscriminators: true,
+    paths: [
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/extension/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/extension/oneOf/1/properties/details",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/extension/oneOf/1/properties/planningPermission/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/extension/oneOf/1/properties/buildingRegApproval/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/loftConversion/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/loftConversion/oneOf/1/properties/details",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/loftConversion/oneOf/1/properties/planningPermission/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/loftConversion/oneOf/1/properties/buildingRegApproval/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/garageConversion/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/garageConversion/oneOf/1/properties/details",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/garageConversion/oneOf/1/properties/planningPermission/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/garageConversion/oneOf/1/properties/buildingRegApproval/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/removalOfInternalWalls/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/removalOfInternalWalls/oneOf/1/properties/details",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/removalOfInternalWalls/oneOf/1/properties/planningPermission/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/removalOfInternalWalls/oneOf/1/properties/buildingRegApproval/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/changeOfUse/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/changeOfUse/oneOf/1/properties/details",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/changeOfUse/oneOf/1/properties/planningPermission/properties/yesNo",
+      "/properties/propertyPack/properties/alterationsAndChanges/properties/changeOfUse/oneOf/1/properties/buildingRegApproval/properties/yesNo",
+    ],
+  },
+
+  // TA6 edition 6 compatibility for shared MI/NTS validation
+  ta: {
+    name: "ta6Ed6Compatibility",
+    description:
+      "Compatibility enum ranges for validating shared PDTF state containing TA6 edition 6 answers",
+    refType: "ta6ed6CompatRef",
+    paths: [
+      "/properties/propertyPack/properties/parking",
+      "/properties/propertyPack/properties/heating",
+      "/properties/propertyPack/properties/rightsAndInformalArrangements",
+      "/properties/propertyPack/properties/legalBoundaries",
+    ],
+  },
 };
 
 // Function to extract properties at specific paths with given ref type
-function extractPathsWithRef(schema, paths, refConfig) {
+function extractPathsWithRef(
+  schema,
+  paths,
+  refConfig,
+  preserveDiscriminators = false
+) {
   const result = {};
 
   paths.forEach((path) => {
@@ -319,6 +368,9 @@ function extractPathsWithRef(schema, paths, refConfig) {
       if (value && hasRef(value, refConfig)) {
         // Set the value at the same path in result
         jp.set(result, path, extractRefProperties(value, refConfig));
+        if (preserveDiscriminators) {
+          addAncestorDiscriminators(result, schema, path);
+        }
       }
     } catch (err) {
       console.warn(`Path not found: ${path}`);
@@ -328,6 +380,26 @@ function extractPathsWithRef(schema, paths, refConfig) {
   return result;
 }
 
+function addAncestorDiscriminators(result, schema, path) {
+  const parts = path.split("/").filter(Boolean);
+
+  for (let index = 1; index <= parts.length; index += 1) {
+    const ancestorPath = `/${parts.slice(0, index).join("/")}`;
+
+    try {
+      const schemaNode = jp.get(schema, ancestorPath);
+      if (!schemaNode?.discriminator) continue;
+
+      const resultNode = jp.get(result, ancestorPath);
+      if (resultNode && typeof resultNode === "object") {
+        resultNode.discriminator = schemaNode.discriminator;
+      }
+    } catch (err) {
+      // Ancestor was not materialised by this selected path.
+    }
+  }
+}
+
 // Check if an object or its descendants have the specified ref
 function hasRef(obj, refConfig) {
   let found = false;
@@ -522,7 +594,12 @@ Object.entries(extensionMappings).forEach(([code, config]) => {
   console.log(`\nGenerating extension overlay: ${code} (${config.name}) [${refType}]`);
 
   // Extract the specific paths
-  let overlay = extractPathsWithRef(combinedSchema, config.paths, refConfig);
+  let overlay = extractPathsWithRef(
+    combinedSchema,
+    config.paths,
+    refConfig,
+    config.preserveDiscriminators
+  );
 
   // Add required arrays where needed
   overlay = addRequiredArrays(overlay, combinedSchema, refConfig);