@pdtf/schemas 3.6.0-dev.13 → 3.6.0-dev.15

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

@@ -344,7 +344,8 @@
                                 "properties": {
                                   "isGroundRentPayable": {
                                     "enum": [
-                                      "No"
+                                      "No",
+                                      "Not applicable"
                                     ]
                                   }
                                 }

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

@@ -566,7 +566,8 @@
                                 "properties": {
                                   "isGroundRentPayable": {
                                     "enum": [
-                                      "No"
+                                      "No",
+                                      "Not applicable"
                                     ]
                                   }
                                 }

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

@@ -517,6 +517,10 @@
                         "title": "Company number",
                         "type": "string"
                       },
+                      "directorOrAuthorisedPerson": {
+                        "title": "Director/authorised person",
+                        "type": "string"
+                      },
                       "countryOfIncorporation": {
                         "title": "Country of incorporation",
                         "type": "string"
@@ -5613,7 +5617,8 @@
                                 "type": "string",
                                 "enum": [
                                   "Yes",
-                                  "No"
+                                  "No",
+                                  "Not applicable"
                                 ]
                               }
                             },
@@ -5622,7 +5627,8 @@
                                 "properties": {
                                   "isGroundRentPayable": {
                                     "enum": [
-                                      "No"
+                                      "No",
+                                      "Not applicable"
                                     ]
                                   }
                                 }
@@ -6460,7 +6466,14 @@
                                         "properties": {
                                           "year": {
                                             "title": "Year",
-                                            "type": "integer"
+                                            "oneOf": [
+                                              {
+                                                "type": "integer"
+                                              },
+                                              {
+                                                "const": "Not known"
+                                              }
+                                            ]
                                           },
                                           "from": {
                                             "title": "To",
@@ -6480,7 +6493,14 @@
                                         "properties": {
                                           "year": {
                                             "title": "Year",
-                                            "type": "integer"
+                                            "oneOf": [
+                                              {
+                                                "type": "integer"
+                                              },
+                                              {
+                                                "const": "Not known"
+                                              }
+                                            ]
                                           },
                                           "from": {
                                             "title": "To",
@@ -8807,7 +8827,8 @@
                           "title": "",
                           "enum": [
                             "Yes",
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         },
                         "detailsAnalysis": {
@@ -8821,7 +8842,8 @@
                           "properties": {
                             "yesNo": {
                               "enum": [
-                                "No"
+                                "No",
+                                "Not known"
                               ]
                             }
                           }
@@ -9742,11 +9764,89 @@
                         "Yes"
                       ]
                     },
+                    "alterationTypes": {
+                      "title": "Which of the following alterations have been made to the property?",
+                      "type": "array",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "Replacement windows, roof windows, roof lights, glazed doors since 1 April 2002",
+                          "Extension",
+                          "Conservatory",
+                          "Loft conversion",
+                          "Garage conversion",
+                          "Removal of internal walls",
+                          "Removal of chimney breast",
+                          "Insulation",
+                          "Other building works or changes to the property"
+                        ]
+                      }
+                    },
                     "details": {
                       "title": "Please give details including dates of all work undertaken",
                       "type": "string",
                       "minLength": 1
                     },
+                    "workCompleted": {
+                      "title": "Has all this work been completed?",
+                      "type": "object",
+                      "properties": {
+                        "yesNo": {
+                          "type": "string",
+                          "title": "",
+                          "enum": [
+                            "Yes",
+                            "No"
+                          ]
+                        }
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            },
+                            "details": {
+                              "title": "Give details of what remains to be completed",
+                              "type": "string",
+                              "minLength": 1
+                            }
+                          }
+                        }
+                      ]
+                    },
+                    "documents": {
+                      "title": "Supply copies of the planning permissions, building regulations approvals, completion certificates or competent person certificates for the work if you have them",
+                      "type": "string",
+                      "enum": [
+                        "Attached",
+                        "To follow",
+                        "Not available"
+                      ]
+                    },
+                    "approvalsObtained": {
+                      "title": "If any of the work was undertaken during your ownership, did you get planning permissions, building regulations approvals, completion certificates or competent person certificates when necessary?",
+                      "type": "string",
+                      "enum": [
+                        "Yes",
+                        "No"
+                      ]
+                    },
+                    "approvalsNotRequiredReason": {
+                      "title": "If planning permissions, building regulations approvals, completion certificates or competent person certificates were not required, explain why",
+                      "type": "string"
+                    },
                     "buildingRegApproval": {
                       "title": "Was Building Regulation approval and a completion certificate obtained or an equivalent Competent Person Scheme Certificate?",
                       "type": "object",
@@ -19432,14 +19532,6 @@
                                   }
                                 }
                               ]
-                            },
-                            "permitDocuments": {
-                              "title": "Please supply a copy of any permit or other documents relating to the sewerage system.",
-                              "type": "string",
-                              "enum": [
-                                "Attached",
-                                "To follow"
-                              ]
                             }
                           },
                           "oneOf": [
@@ -19487,6 +19579,14 @@
                                   "title": "Date last emptied",
                                   "type": "string",
                                   "format": "date"
+                                },
+                                "permitDocuments": {
+                                  "title": "Please supply a copy of any permit or other documents relating to the sewerage system.",
+                                  "type": "string",
+                                  "enum": [
+                                    "Attached",
+                                    "To follow"
+                                  ]
                                 }
                               }
                             },
@@ -19525,6 +19625,14 @@
                                   "title": "Date last emptied",
                                   "type": "string",
                                   "format": "date"
+                                },
+                                "permitDocuments": {
+                                  "title": "Please supply a copy of any permit or other documents relating to the sewerage system.",
+                                  "type": "string",
+                                  "enum": [
+                                    "Attached",
+                                    "To follow"
+                                  ]
                                 }
                               }
                             },
@@ -19584,6 +19692,14 @@
                                     "To follow",
                                     "Not applicable"
                                   ]
+                                },
+                                "permitDocuments": {
+                                  "title": "Please supply a copy of any permit or other documents relating to the sewerage system.",
+                                  "type": "string",
+                                  "enum": [
+                                    "Attached",
+                                    "To follow"
+                                  ]
                                 }
                               }
                             },
@@ -19598,6 +19714,14 @@
                                 "details": {
                                   "title": "Details",
                                   "type": "string"
+                                },
+                                "permitDocuments": {
+                                  "title": "Please supply a copy of any permit or other documents relating to the sewerage system.",
+                                  "type": "string",
+                                  "enum": [
+                                    "Attached",
+                                    "To follow"
+                                  ]
                                 }
                               }
                             }
@@ -20395,6 +20519,110 @@
                 }
               ]
             },
+            "mainHeatingTypes": {
+              "title": "How is the property heated?",
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "Mains gas",
+                  "Oil",
+                  "Heat pumps",
+                  "Liquid gas",
+                  "Electricity",
+                  "Underfloor",
+                  "Woodburning / multi-fuel stove",
+                  "Other"
+                ]
+              }
+            },
+            "mainHeatingTypesOtherDetails": {
+              "title": "If you selected 'Other', give details",
+              "type": "string"
+            },
+            "heatingInstalledDate": {
+              "title": "When was the heating system installed?",
+              "type": "string",
+              "oneOf": [
+                {
+                  "format": "date"
+                },
+                {
+                  "enum": [
+                    "Not known"
+                  ]
+                }
+              ]
+            },
+            "boilerInstalledDate": {
+              "title": "If there is a boiler (of any kind) when was it installed?",
+              "type": "string",
+              "oneOf": [
+                {
+                  "format": "date"
+                },
+                {
+                  "enum": [
+                    "Not known"
+                  ]
+                }
+              ]
+            },
+            "heatingSystemReplaced": {
+              "title": "Has there been any replacement to the heating system (other than replacement of a boiler)?",
+              "type": "string",
+              "enum": [
+                "Yes",
+                "No",
+                "Not known"
+              ]
+            },
+            "complianceCertificates": {
+              "title": "Supply compliance certificates or documentation for the installation or alteration of each heating system",
+              "type": "string",
+              "enum": [
+                "Attached",
+                "To follow",
+                "None"
+              ]
+            },
+            "inspectionReport": {
+              "title": "Supply a copy of the latest inspection report",
+              "type": "string",
+              "enum": [
+                "Attached",
+                "To follow",
+                "None"
+              ]
+            },
+            "inGoodWorkingOrder": {
+              "title": "Is the boiler and heating system working?",
+              "type": "string",
+              "enum": [
+                "Yes",
+                "No",
+                "Not known"
+              ]
+            },
+            "lastServicedYear": {
+              "title": "In what year was the boiler and heating system last serviced or maintained?",
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "const": "Not known"
+                }
+              ]
+            },
+            "lastServicedReport": {
+              "title": "Supply a copy of the service report",
+              "type": "string",
+              "enum": [
+                "Attached",
+                "To follow"
+              ]
+            },
             "otherHeatingFeatures": {
               "title": "What other heating features does the property have?",
               "type": "array",
@@ -21981,7 +22209,8 @@
                       "type": "string",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   },
@@ -21990,7 +22219,8 @@
                       "properties": {
                         "hasFloodDefences": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }

package/src/schemas/v3/skeleton.json

@@ -82,6 +82,7 @@
         "attachments": "string",
         "companyName": "string",
         "companyNumber": "string",
+        "directorOrAuthorisedPerson": "string",
         "countryOfIncorporation": "string"
       },
       "dateBecameOwnerOrAuthority": "string"
@@ -1004,12 +1005,12 @@
               },
               "lastDecoratedPeriod": {
                 "externally": {
-                  "year": "integer",
+                  "year": {},
                   "from": "string",
                   "to": "string"
                 },
                 "internally": {
-                  "year": "integer",
+                  "year": {},
                   "from": "string",
                   "to": "string"
                 }
@@ -1460,7 +1461,17 @@
       "hasStructuralAlterations": {
         "yesNo": "variant",
         "detailsAnalysis": {},
+        "alterationTypes": [
+          "string"
+        ],
         "details": "string",
+        "workCompleted": {
+          "yesNo": "variant",
+          "details": "string"
+        },
+        "documents": "string",
+        "approvalsObtained": "string",
+        "approvalsNotRequiredReason": "string",
         "buildingRegApproval": {
           "yesNo": "variant",
           "detailsAnalysis": {},
@@ -2559,11 +2570,11 @@
               },
               "dischargeCompliesWithGBR": "string"
             },
-            "permitDocuments": "string",
             "dateDischargeCommenced": {},
             "dateInstalled": "string",
             "dateReplaced": "string",
             "dateLastEmptied": "string",
+            "permitDocuments": "string",
             "supplier": "string",
             "makeModel": "string",
             "serviceProviderName": "string",
@@ -2658,6 +2669,18 @@
         },
         "details": "string"
       },
+      "mainHeatingTypes": [
+        "string"
+      ],
+      "mainHeatingTypesOtherDetails": "string",
+      "heatingInstalledDate": {},
+      "boilerInstalledDate": {},
+      "heatingSystemReplaced": "string",
+      "complianceCertificates": "string",
+      "inspectionReport": "string",
+      "inGoodWorkingOrder": "string",
+      "lastServicedYear": {},
+      "lastServicedReport": "string",
       "otherHeatingFeatures": [
         "string"
       ],

package/src/utils/extractOverlay.js

@@ -30,6 +30,7 @@ const extractFields = [
   "ntsl2",
   "ta6",
   "ta6ed6",
+  "ta6ed6v2",
   "ta7",
   "ta7ed5",
   "ta10",

package/src/utils/syncTa6ed6v2Markers.js

@@ -0,0 +1,92 @@
+#!/usr/bin/env node
+/**
+ * Sync ta6ed6v2 markers from ta6ed6 across combined.json.
+ *
+ * ta6ed6v2 is a "full marker set" twin of ta6ed6: every shared field carries its
+ * own `ta6ed6v2*` markers so that inclusion is presence and suppression is the
+ * ABSENCE of a v2 ref (see src/tests/v3/ta6ed6v2.test.js — the drift-lint).
+ *
+ * Two subtrees intentionally diverge (their v2 shape is hand-authored) and are
+ * excluded from sync: propertyPack.heating and propertyPack.alterationsAndChanges.
+ *
+ * For every OTHER node, this tool guarantees each `ta6ed6<Suffix>` marker has a
+ * matching `ta6ed6v2<Suffix>` marker of equal value — adding missing twins and
+ * repairing drifted values. Edits are minimal text splices that preserve the
+ * file's existing formatting.
+ *
+ *   node src/utils/syncTa6ed6v2Markers.js          # apply (write)
+ *   node src/utils/syncTa6ed6v2Markers.js --check   # exit 1 if out of sync (CI)
+ *
+ * After running, regenerate overlays: node src/utils/extractOverlay.js
+ */
+const fs = require("fs");
+const path = require("path");
+
+const FILE = process.env.COMBINED_PATH || path.resolve(__dirname, "../schemas/v3/combined.json");
+const CHECK = process.argv.includes("--check");
+
+const MARKER_RE = /^ta6ed6(Ref|Required|Title|Description|Enum|EnumNames)$/;
+const v2Of = (k) => k.replace(/^ta6ed6/, "ta6ed6v2");
+// NOTE: array indices are numbers in the tokenizer path (strict-equal), so use 2 not "2".
+const COMPANY = ["properties", "participants", "items", "oneOf", 2, "properties", "sellersCapacity", "oneOf", 2, "properties"];
+const EXCLUDED_PREFIXES = [
+  ["properties", "propertyPack", "properties", "heating"],
+  ["properties", "propertyPack", "properties", "alterationsAndChanges"],
+  // §1.6 company seller fields: v2 realigns refs to the form (companyNumber→1.6.1,
+  // directorOrAuthorisedPerson→1.6.2) while ed6 keeps its existing refs — hand-authored.
+  [...COMPANY, "companyName"],
+  [...COMPANY, "companyNumber"],
+  [...COMPANY, "directorOrAuthorisedPerson"],
+];
+const isExcluded = (p) => EXCLUDED_PREFIXES.some((pre) => pre.every((seg, i) => p[i] === seg));
+
+// minimal position-tracking JSON tokenizer
+function tokenize(text) {
+  let i = 0; const n = text.length; const members = [];
+  const ws = () => { while (i < n && /\s/.test(text[i])) i++; };
+  const str = () => { i++; while (i < n) { const c = text[i]; if (c === "\\") { i += 2; continue; } if (c === '"') { i++; break; } i++; } };
+  const val = (p) => { ws(); const c = text[i]; if (c === "{") obj(p); else if (c === "[") arr(p); else if (c === '"') str(); else { while (i < n && !/[,}\]\s]/.test(text[i])) i++; } };
+  function obj(p) { i++; ws(); if (text[i] === "}") { i++; return; } while (i < n) { ws(); const ks = i; str(); const key = JSON.parse(text.slice(ks, i)); ws(); i++; ws(); const vs = i; val(p.concat(key)); members.push({ path: p.concat(key), key, keyStart: ks, valueStart: vs, valueEnd: i }); ws(); if (text[i] === ",") { i++; continue; } if (text[i] === "}") { i++; break; } break; } }
+  function arr(p) { i++; ws(); if (text[i] === "]") { i++; return; } let k = 0; while (i < n) { ws(); val(p.concat(k)); k++; ws(); if (text[i] === ",") { i++; continue; } if (text[i] === "]") { i++; break; } break; } }
+  ws(); val([]); return members;
+}
+
+let text = fs.readFileSync(FILE, "utf8");
+const members = tokenize(text);
+const owner = (m) => m.path.slice(0, -1).join("/");
+const keysByOwner = new Map();
+for (const m of members) { const o = owner(m); if (!keysByOwner.has(o)) keysByOwner.set(o, new Map()); keysByOwner.get(o).set(m.key, m); }
+const indentAt = (off) => text.slice(text.lastIndexOf("\n", off - 1) + 1, off);
+
+const edits = []; // {at, end, text}  (end omitted => pure insert)
+const adds = [], fixes = [];
+for (const m of members) {
+  if (!MARKER_RE.test(m.key)) continue;
+  if (isExcluded(m.path)) continue;
+  const v2 = v2Of(m.key);
+  const siblings = keysByOwner.get(owner(m));
+  const ed6Val = text.slice(m.valueStart, m.valueEnd);
+  if (!siblings.has(v2)) {
+    const indent = indentAt(m.keyStart);
+    edits.push({ at: m.valueEnd, text: `,\n${indent}"${v2}": ${ed6Val}` });
+    adds.push("/" + m.path.join("/"));
+  } else {
+    const tw = siblings.get(v2);
+    const v2Val = text.slice(tw.valueStart, tw.valueEnd);
+    if (JSON.stringify(JSON.parse(v2Val)) !== JSON.stringify(JSON.parse(ed6Val))) {
+      edits.push({ at: tw.valueStart, end: tw.valueEnd, text: ed6Val });
+      fixes.push("/" + tw.path.join("/"));
+    }
+  }
+}
+
+if (!edits.length) { console.log("ta6ed6v2 markers in sync — nothing to do."); process.exit(0); }
+console.log(`Out of sync: ${adds.length} missing twin(s), ${fixes.length} drifted value(s).`);
+[...adds, ...fixes].slice(0, 20).forEach((p) => console.log("  " + p));
+if (CHECK) process.exit(1);
+
+edits.sort((a, b) => b.at - a.at);
+for (const e of edits) text = text.slice(0, e.at) + e.text + text.slice(e.end ?? e.at);
+JSON.parse(text); // guard
+fs.writeFileSync(FILE, text);
+console.log(`Applied ${edits.length} edit(s) to ${FILE}. Now run: node src/utils/extractOverlay.js`);