@pdtf/schemas 3.6.0-12 → 3.6.0-14

package/src/schemas/v3/pdtf-transaction.json

@@ -8460,7 +8460,7 @@
                               ]
                             },
                             "details": {
-                              "description": "Specify any relevant local authority licence or terms and conditions",
+                              "title": "Specify any relevant local authority licence or terms and conditions",
                               "type": "string",
                               "minLength": 1
                             }
@@ -12486,18 +12486,9 @@
               ]
             },
             "japaneseKnotweed": {
-              "title": "To your knowledge, is the property or neighbouring land, affected by Japanese knotweed or other invasive species?",
+              "title": "Japanese Knotweed",
               "type": "object",
               "properties": {
-                "yesNo": {
-                  "type": "string",
-                  "title": "",
-                  "enum": [
-                    "Yes",
-                    "No",
-                    "Not known"
-                  ]
-                },
                 "knotweedSurveyCarriedOut": {
                   "title": "Has a Japanese knotweed survey been carried out in relation to the property?",
                   "type": "object",
@@ -12531,7 +12522,7 @@
                           ]
                         },
                         "attachments": {
-                          "title": "If yes, provide a copy of the survey.",
+                          "title": "Provide a copy of the survey.",
                           "type": "string",
                           "enum": [
                             "Attached",
@@ -12541,6 +12532,15 @@
                       }
                     }
                   ]
+                },
+                "yesNo": {
+                  "type": "string",
+                  "title": "To your knowledge, is the property or neighbouring land, affected by Japanese knotweed or other invasive species?",
+                  "enum": [
+                    "Yes",
+                    "No",
+                    "Not known"
+                  ]
                 }
               },
               "oneOf": [
@@ -17694,7 +17694,7 @@
                         "mpan": {
                           "title": "Meter Point Administration Number (MPAN)",
                           "description": "Your MPAN is on your electricity or dual fuel bill, usually in a box marked 'Supply Number'. It's 21 digits long and begins with 'S'. You'll only need the last 12 or 13 digits.",
-                          "type": "integer"
+                          "type": "string"
                         }
                       }
                     }
@@ -19504,7 +19504,7 @@
                                     "mprn": {
                                       "title": "Meter Point Reference Number (MPRN)",
                                       "description": "You can find your property's MPRN on your gas or dual fuel bill. It's usually marked 'Meter Point Reference Number' and is between six and 10 digits long.",
-                                      "type": "integer"
+                                      "type": "string"
                                     }
                                   }
                                 }
@@ -20462,6 +20462,7 @@
                               ]
                             },
                             "details": {
+                              "title": "Provide details",
                               "type": "string",
                               "minLength": 1
                             }
@@ -20954,6 +20955,7 @@
                           ]
                         },
                         "details": {
+                          "title": "Details",
                           "type": "string",
                           "minLength": 1
                         }
@@ -23540,7 +23542,8 @@
                       "type": "string",
                       "enum": [
                         "Attached",
-                        "To follow"
+                        "To follow",
+                        "Not available"
                       ]
                     }
                   }
@@ -23605,7 +23608,8 @@
                           "type": "string",
                           "enum": [
                             "Attached",
-                            "To follow"
+                            "To follow",
+                            "Not available"
                           ]
                         }
                       }
@@ -24742,9 +24746,6 @@
                     "Yes",
                     "No"
                   ]
-                },
-                "details": {
-                  "type": "string"
                 }
               },
               "oneOf": [
@@ -24765,6 +24766,7 @@
                       ]
                     },
                     "details": {
+                      "title": "Please provide details",
                       "type": "string"
                     }
                   }

package/src/schemas/v3/skeleton.json

@@ -1,7 +1,9 @@
 {
   "transactionId": "string",
   "externalIds": {
-    "*": {}
+    "*": {
+      "*": {}
+    }
   },
   "status": "string",
   "participants": [
@@ -33,7 +35,9 @@
       "organisationReference": "string",
       "role": "variant",
       "externalIds": {
-        "*": {}
+        "*": {
+          "*": {}
+        }
       },
       "participantStatus": "string",
       "verification": {
@@ -1053,7 +1057,10 @@
                 "yesNo": "variant",
                 "riskAssessments": {
                   "assessmentsCarriedOut": "variant",
-                  "urgentWorksRecommended": "string"
+                  "urgentWorksRecommended": "variant",
+                  "urgentWorksCarriedOut": "string",
+                  "outstandingEnforcementAction": "variant",
+                  "dateRemedialActionRequired": "string"
                 }
               },
               "standardTermsAvailable": {
@@ -1735,12 +1742,13 @@
         "attachments": "string"
       },
       "japaneseKnotweed": {
-        "yesNo": "variant",
         "knotweedSurveyCarriedOut": {
           "yesNo": "variant",
           "attachments": "string"
         },
-        "managementPlanInPlace": "string"
+        "yesNo": "variant",
+        "managementPlanInPlace": "variant",
+        "attachments": "string"
       },
       "subsidenceOrStructuralFault": {
         "yesNo": "variant",
@@ -2349,7 +2357,7 @@
         "electricityMeter": {
           "location": "string",
           "attachments": "string",
-          "mpan": "integer"
+          "mpan": "string"
         },
         "dateToBeConnected": "string"
       },
@@ -2551,7 +2559,7 @@
             "gasMeter": {
               "location": "string",
               "attachments": "string",
-              "mprn": "integer"
+              "mprn": "string"
             },
             "otherCentralHeatingFuelType": "string"
           },
@@ -3323,7 +3331,9 @@
           "name": "string",
           "signedOn": "string",
           "externalIds": {
-            "*": {}
+            "*": {
+              "*": {}
+            }
           }
         }
       ]
@@ -4632,7 +4642,9 @@
         "mimeType": "string",
         "documentType": "string",
         "externalIds": {
-          "*": {}
+          "*": {
+            "*": {}
+          }
         },
         "isDeleted": "boolean",
         "summary": {}
@@ -5494,7 +5506,9 @@
           "name": "string",
           "url": "string",
           "externalIds": {
-            "*": {}
+            "*": {
+              "*": {}
+            }
           },
           "requiredSignatories": [
             {
@@ -5510,7 +5524,9 @@
           "name": "string",
           "signedOn": "string",
           "externalIds": {
-            "*": {}
+            "*": {
+              "*": {}
+            }
           }
         }
       ]
@@ -5521,7 +5537,9 @@
       {
         "transactionId": "string",
         "externalIds": {
-          "*": {}
+          "*": {
+            "*": {}
+          }
         },
         "address": {
           "buildingNumber": "string",
@@ -5586,7 +5604,9 @@
         "string"
       ],
       "externalIds": {
-        "*": {}
+        "*": {
+          "*": {}
+        }
       },
       "buyerCircumstances": {
         "intendedUse": "string",
@@ -5633,7 +5653,9 @@
         }
       },
       "externalIds": {
-        "*": {}
+        "*": {
+          "*": {}
+        }
       },
       "resolutionCondition": "string"
     }

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

@@ -203,14 +203,18 @@ describe("TA6 Edition 6 overlay", () => {
       expect(parkingValidator(data)).toBe(true);
     });
 
-    test("electricVehicleChargingPoint Yes without additional details is valid", () => {
-      // The ta6ed6 overlay does not require chargerDetails etc. in the Yes branch
+    test("electricVehicleChargingPoint Yes without additional details is invalid", () => {
       const data = {
         parkingArrangements: ["Driveway"],
         controlledParking: { yesNo: "No" },
         electricVehicleChargingPoint: { yesNo: "Yes" },
       };
-      expect(parkingValidator(data)).toBe(true);
+      expect(parkingValidator(data)).toBe(false);
+      expect(
+        parkingValidator.errors.some((e) =>
+          e.message.includes("'chargerDetails'")
+        )
+      ).toBe(true);
     });
 
     test("electricVehicleChargingPoint Yes with all required details is valid", () => {
@@ -834,6 +838,7 @@ describe("TA6 Edition 6 overlay", () => {
         neighbouringLandRights: { yesNo: "No" },
         sharedContributions: { yesNo: "No" },
         rightsOrArrangements: {
+          publicRightOfWay: { yesNo: "No" },
           rightsOfLight: { yesNo: "No" },
           rightsOfSupport: { yesNo: "No" },
           rightsCreatedThroughCustom: { yesNo: "No" },
@@ -1625,7 +1630,7 @@ describe("TA6 Edition 6 overlay", () => {
         mainsElectricity: {
           yesNo: "Yes",
           supplier: "British Gas",
-          electricityMeter: { location: "Hall cupboard" },
+          electricityMeter: { location: "Hall cupboard", mpan: "1234567890123" },
         },
         solarPanels: { yesNo: "No" },
       };
@@ -1637,7 +1642,7 @@ describe("TA6 Edition 6 overlay", () => {
         mainsElectricity: {
           yesNo: "Yes",
           supplier: "British Gas",
-          electricityMeter: { location: "Hall cupboard" },
+          electricityMeter: { location: "Hall cupboard", mpan: "1234567890123" },
         },
         solarPanels: { yesNo: "Yes" },
       };
@@ -1654,7 +1659,7 @@ describe("TA6 Edition 6 overlay", () => {
         mainsElectricity: {
           yesNo: "Yes",
           supplier: "British Gas",
-          electricityMeter: { location: "Hall cupboard" },
+          electricityMeter: { location: "Hall cupboard", mpan: "1234567890123" },
         },
         solarPanels: {
           yesNo: "Yes",
@@ -1676,7 +1681,7 @@ describe("TA6 Edition 6 overlay", () => {
         mainsElectricity: {
           yesNo: "Yes",
           supplier: "British Gas",
-          electricityMeter: { location: "Hall cupboard" },
+          electricityMeter: { location: "Hall cupboard", mpan: "1234567890123" },
         },
         solarPanels: {
           yesNo: "Yes",

package/src/utils/extractOverlay.js

@@ -85,23 +85,21 @@ const flattenSkeleton = (schema) => {
     });
   }
 
-  // Handle oneOf - merge all possible properties
+  // Handle oneOf - merge all possible properties (recursively handles nested oneOf)
   if (schema.oneOf) {
     schema.oneOf.forEach((aOneOf) => {
-      if (aOneOf.properties) {
-        Object.entries(aOneOf.properties).forEach(([key, value]) => {
-          // If property already exists and differs, mark as variant
-          const newValue = flattenSkeleton(value);
-          if (returnStructure[key] && JSON.stringify(returnStructure[key]) !== JSON.stringify(newValue)) {
-            // For primitive types, just mark as variant type
-            if (typeof returnStructure[key] === "string" || typeof newValue === "string") {
+      const variantResult = flattenSkeleton(aOneOf);
+      if (variantResult && typeof variantResult === "object" && !Array.isArray(variantResult)) {
+        Object.entries(variantResult).forEach(([key, value]) => {
+          if (key === "_variants") return;
+          if (returnStructure[key] && JSON.stringify(returnStructure[key]) !== JSON.stringify(value)) {
+            if (typeof returnStructure[key] === "string" || typeof value === "string") {
               returnStructure[key] = "variant";
             } else {
-              // For complex types, merge properties
-              returnStructure[key] = { ...returnStructure[key], ...newValue, _variants: true };
+              returnStructure[key] = { ...returnStructure[key], ...value, _variants: true };
             }
           } else {
-            returnStructure[key] = newValue;
+            returnStructure[key] = value;
           }
         });
       }
@@ -333,8 +331,8 @@ const toCompact = (obj, indent = "") => {
     // Check if this is a keyed object (has "*" key)
     if (keys.length === 1 && keys[0] === "*") {
       const inner = toCompact(obj["*"], indent);
-      if (inner === "") {
-        return "{*}"; // Keyed object of primitives
+      if (inner === "" || inner === "{*}") {
+        return "{*}"; // Keyed object of primitives (or nested keyed objects with no structure)
       }
       return `{*}\n${inner}`;
     }