@pdtf/schemas 3.5.1-7 → 3.5.1-9

package/index.js

@@ -104,7 +104,7 @@ const transactionSchemas = {
 };
 
 // Custom array merge function for oneOf arrays
-const arrayMerge = (target, source) => {
+const arrayMerge = (target, source, options) => {
   // For string arrays (enum, required, etc.)
   if (
     target.length > 0 &&
@@ -114,16 +114,23 @@ const arrayMerge = (target, source) => {
     source[0] &&
     typeof source[0] === "string"
   ) {
-    // For required arrays, combine them (remove duplicates)
-    // Check if this looks like a required array (contains field names, not enum values)
-    const isRequiredArray = target.some(
+    // Detect if this is a required array by checking the parent key
+    // Required arrays are property names (camelCase, no spaces)
+    // Enum arrays are values (can contain spaces, capitals, etc.)
+    const isRequiredArray = target.every(
       (item) =>
         typeof item === "string" &&
         item.length > 0 &&
-        !item.includes("Yes") &&
-        !item.includes("No") &&
-        !item.includes("Not known") &&
-        !item.includes("To be connected")
+        // Required field names are typically camelCase without spaces
+        !item.includes(" ") &&
+        // First character is usually lowercase for field names
+        (item[0] === item[0].toLowerCase() || item.startsWith("is") || item.startsWith("has"))
+    ) && source.every(
+      (item) =>
+        typeof item === "string" &&
+        item.length > 0 &&
+        !item.includes(" ") &&
+        (item[0] === item[0].toLowerCase() || item.startsWith("is") || item.startsWith("has"))
     );
 
     if (isRequiredArray) {
@@ -137,7 +144,7 @@ const arrayMerge = (target, source) => {
       return combined;
     }
 
-    // For other string arrays (like enum), use source if it exists, otherwise use target
+    // For other string arrays (like enum), replace with source
     return source.length > 0 ? source : target;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pdtf/schemas",
-  "version": "3.5.1-7",
+  "version": "3.5.1-9",
   "description": "Property Data Trust Framework Schemas and Utilities",
   "main": "index.js",
   "directories": {

package/src/schemas/v3/combined.json

@@ -4246,14 +4246,22 @@
                         "properties": {
                           "typeOfLeasehold": {
                             "ta7Ref": "1.1",
-                            "title": "What type of leasehold property does the seller own?",
-                            "description": "'Flat'includes maisonette and apartment.",
-                            "type": "string",
-                            "enum": [
-                              "Flat",
-                              "Shared ownership",
-                              "Long leasehold house"
-                            ]
+                            "title": "Type of leasehold property",
+                            "type": "object",
+                            "ta7Required": ["leaseholdType"],
+                            "properties": {
+                              "leaseholdType": {
+                                "ta7Ref": "1.1.1",
+                                "title": "What type of leasehold property does the seller own?",
+                                "description": "'Flat'includes maisonette and apartment.",
+                                "type": "string",
+                                "enum": [
+                                  "Flat",
+                                  "Shared ownership",
+                                  "Long leasehold house"
+                                ]
+                              }
+                            }
                           },
                           "sharedOwnership": {
                             "baspi4Ref": "A1.3.1",

package/src/schemas/v3/compactSkeleton.txt

@@ -424,6 +424,7 @@
             capacity
         leaseholdInformation
           typeOfLeasehold
+            leaseholdType
           sharedOwnership
             isSharedOwnership
             sharedOwnershipPercentage

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

@@ -86,7 +86,15 @@
                         ],
                         "properties": {
                           "typeOfLeasehold": {
-                            "ta7Ref": "1.1"
+                            "ta7Ref": "1.1",
+                            "required": [
+                              "leaseholdType"
+                            ],
+                            "properties": {
+                              "leaseholdType": {
+                                "ta7Ref": "1.1.1"
+                              }
+                            }
                           },
                           "sharedOwnership": {
                             "required": [

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

@@ -3517,14 +3517,20 @@
                         "type": "object",
                         "properties": {
                           "typeOfLeasehold": {
-                            "title": "What type of leasehold property does the seller own?",
-                            "description": "'Flat'includes maisonette and apartment.",
-                            "type": "string",
-                            "enum": [
-                              "Flat",
-                              "Shared ownership",
-                              "Long leasehold house"
-                            ]
+                            "title": "Type of leasehold property",
+                            "type": "object",
+                            "properties": {
+                              "leaseholdType": {
+                                "title": "What type of leasehold property does the seller own?",
+                                "description": "'Flat'includes maisonette and apartment.",
+                                "type": "string",
+                                "enum": [
+                                  "Flat",
+                                  "Shared ownership",
+                                  "Long leasehold house"
+                                ]
+                              }
+                            }
                           },
                           "sharedOwnership": {
                             "type": "object",

package/src/schemas/v3/skeleton.json

@@ -538,7 +538,9 @@
             }
           },
           "leaseholdInformation": {
-            "typeOfLeasehold": "string",
+            "typeOfLeasehold": {
+              "leaseholdType": "string"
+            },
             "sharedOwnership": {
               "isSharedOwnership": "variant",
               "sharedOwnershipPercentage": "number",

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

@@ -591,3 +591,25 @@ test("waterAndDrainage state with mainsFoulDrainage No missing offMainsDrainageS
   );
   expect(relevantError).toBeDefined();
 });
+
+test("TA7 overlay organisesBuildingInsurance enum has exactly three items", () => {
+  const schema = getTransactionSchema(schemaId, ["ta7ed3"]);
+
+  // Navigate to the organisesBuildingInsurance property in the merged schema
+  const organisesBuildingInsurance =
+    schema.properties?.propertyPack?.properties?.ownership?.properties
+      ?.ownershipsToBeTransferred?.items?.oneOf?.[2]?.properties
+      ?.leaseholdInformation?.properties?.contactDetails?.properties
+      ?.serviceContactAssignments?.properties?.organisesBuildingInsurance;
+
+  expect(organisesBuildingInsurance).toBeDefined();
+  expect(organisesBuildingInsurance.enum).toBeDefined();
+
+  // The TA7 overlay defines exactly 3 enum values, which should replace the base schema's 6 values
+  expect(organisesBuildingInsurance.enum).toHaveLength(3);
+  expect(organisesBuildingInsurance.enum).toEqual([
+    "the Lessees",
+    "Management Company",
+    "Landlord",
+  ]);
+});