@pdtf/schemas 2.0.0-31 → 2.0.0-33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/package.json +1 -2
  2. package/src/schemas/v2/combined.json +30 -18
  3. package/src/schemas/v2/overlays/baspi.json +29 -8
  4. package/src/schemas/v2/overlays/ta6.json +38 -15
  5. package/src/schemas/v2/pdtf-transaction.json +21 -8
  6. package/src/schemas/v2/skeleton.json +3 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pdtf/schemas",
3
- "version": "2.0.0-31",
3
+ "version": "2.0.0-33",
4
4
  "description": "Property Data Trust Framework Schemas and Utilities",
5
5
  "main": "index.js",
6
6
  "directories": {
@@ -26,7 +26,6 @@
26
26
  "homepage": "https://github.com/Property-Data-Trust-Framework/schemas#readme",
27
27
  "dependencies": {
28
28
  "@jdw/jst": "^2.0.0-beta.15",
29
- "@pdtf/schemas": "^2.0.0-30",
30
29
  "ajv": "^8.12.0",
31
30
  "ajv-formats": "^2.1.1",
32
31
  "deepmerge": "^4.3.1",
package/src/schemas/v2/combined.json CHANGED
@@ -7486,7 +7486,8 @@
7486
7486
  ]
7487
7487
  }
7488
7488
  },
7489
- "required": ["workCarriedOut"]
7489
+ "baspiRequired": ["workCarriedOut"],
7490
+ "ta6Required": ["workCarriedOut"]
7490
7491
  }
7491
7492
  ]
7492
7493
  }
@@ -17828,7 +17829,7 @@
17828
17829
  "centralHeatingInstalled": {
17829
17830
  "baspiRef": "A7.4.1",
17830
17831
  "rdsRef": "Objects/Installed",
17831
- "ta6Ref": "12.3b",
17832
+ "ta6Ref": "12.3b1",
17832
17833
  "title": "When was the heating system installed?",
17833
17834
  "type": "string",
17834
17835
  "format": "date"
@@ -17836,13 +17837,13 @@
17836
17837
  "boilerInstallationCertificate": {
17837
17838
  "baspiRef": "A7.4.1.1",
17838
17839
  "rdsRef": "Objects/Installation,Objects/Certificates",
17839
- "ta6Ref": "12.3b",
17840
+ "ta6Ref": "12.3b2",
17840
17841
  "title": "Was a gas boiler installed after 1st April 2005, or a solid fuel or oil boiler installed after 1st October 2010?",
17841
17842
  "type": "object",
17842
17843
  "properties": {
17843
17844
  "yesNo": {
17844
17845
  "baspiRef": "A10.1.1",
17845
- "ta6Ref": "12.3b1",
17846
+ "ta6Ref": "12.3b3",
17846
17847
  "type": "string",
17847
17848
  "title": "",
17848
17849
  "enum": ["Yes", "No"]
@@ -17868,7 +17869,7 @@
17868
17869
  },
17869
17870
  "attachments": {
17870
17871
  "baspiRef": "A7.4.1.2",
17871
- "ta6Ref": "12.3b2",
17872
+ "ta6Ref": "12.3b4",
17872
17873
  "title": "Please supply a copy of the installation completion certificate from a competent person qualified under the relevant self-certification scheme e.g. HETAS etc",
17873
17874
  "type": "string",
17874
17875
  "enum": ["Attached", "To follow"]
@@ -19001,7 +19002,7 @@
19001
19002
  "title": "Environmental Issues Affecting the Property",
19002
19003
  "type": "object",
19003
19004
  "baspiRequired": ["flooding", "radon", "otherEnvironmental"],
19004
- "ta6Required": ["flooding", "radon", "otherEnvironmental"],
19005
+ "ta6Required": ["flooding", "radon"],
19005
19006
  "properties": {
19006
19007
  "flooding": {
19007
19008
  "baspiRef": "A11.1.1",
@@ -19245,7 +19246,7 @@
19245
19246
  "details": {
19246
19247
  "baspiRef": "A11.1.3.2",
19247
19248
  "ta6Ref": "7.4b",
19248
- "title": "Was the test result was below the recommended level?",
19249
+ "title": "Was the test result was below the recommended action level?",
19249
19250
  "type": "string",
19250
19251
  "enum": ["Yes", "No"]
19251
19252
  },
@@ -19732,6 +19733,7 @@
19732
19733
  "baspiRef": "B1",
19733
19734
  "title": "Legal Owners",
19734
19735
  "type": "object",
19736
+ "baspiRequired": ["namesOfLegalOwners"],
19735
19737
  "properties": {
19736
19738
  "namesOfLegalOwners": {
19737
19739
  "baspiRef": "B1.1",
@@ -20309,6 +20311,7 @@
20309
20311
  },
20310
20312
  "attachments": {
20311
20313
  "baspiRef": "B3.3.3",
20314
+ "ta6Ref": "8.9.3",
20312
20315
  "title": "Attachments",
20313
20316
  "type": "string",
20314
20317
  "enum": ["Attached", "To follow"]
@@ -20424,7 +20427,7 @@
20424
20427
  },
20425
20428
  "yearWorkCarriedOut": {
20426
20429
  "baspiRef": "B4.2.2",
20427
- "title": "State the year the work was carried",
20430
+ "title": "State the year the work was carried out",
20428
20431
  "type": "integer"
20429
20432
  },
20430
20433
  "details": {
@@ -20433,20 +20436,29 @@
20433
20436
  "type": "string",
20434
20437
  "minLength": 1
20435
20438
  },
20436
- "attachments": {
20437
- "baspiRef": "B4.2.4",
20438
- "ta6Ref": "12.2.2",
20439
- "title": "Please supply the signed Electrical Safety Certificate (BS7671) and Building Regulations Compliance Certificate (or equivalent)",
20439
+ "electricalSafetyCertificate": {
20440
+ "baspiRef": "B4.2.4.1",
20441
+ "ta6Ref": "12.2.2a",
20442
+ "title": "Please provide a signed Electrical Safety Certificate (BS7671)",
20443
+ "type": "string",
20444
+ "enum": ["Attached", "To follow"]
20445
+ },
20446
+ "buildingRegulationsComplianceCertificate": {
20447
+ "baspiRef": "B4.2.4.2",
20448
+ "ta6Ref": "12.2.2b",
20449
+ "title": "or a Building Regulations Compliance Certificate (or equivalent)",
20450
+ "type": "string",
20451
+ "enum": ["Attached", "To follow"]
20452
+ },
20453
+ "buildingControlCompletionCertificate": {
20454
+ "baspiRef": "B4.2.4.3",
20455
+ "ta6Ref": "12.2.2c",
20456
+ "title": "or a Building Control Completion Certificate",
20440
20457
  "type": "string",
20441
20458
  "enum": ["Attached", "To follow"]
20442
20459
  }
20443
20460
  },
20444
- "baspiRequired": [
20445
- "yearWorkCarriedOut",
20446
- "details",
20447
- "attachments"
20448
- ],
20449
- "ta6Required": ["attachments"]
20461
+ "baspiRequired": ["yearWorkCarriedOut", "details"]
20450
20462
  }
20451
20463
  ]
20452
20464
  },
package/src/schemas/v2/overlays/baspi.json CHANGED
@@ -1480,7 +1480,10 @@
1480
1480
  }
1481
1481
  }
1482
1482
  }
1483
- }
1483
+ },
1484
+ "required": [
1485
+ "workCarriedOut"
1486
+ ]
1484
1487
  }
1485
1488
  ],
1486
1489
  "required": [
@@ -7004,7 +7007,7 @@
7004
7007
  },
7005
7008
  "details": {
7006
7009
  "baspiRef": "A11.1.3.2",
7007
- "title": "Was the test result was below the recommended level?",
7010
+ "title": "Was the test result was below the recommended action level?",
7008
7011
  "enum": [
7009
7012
  "Yes",
7010
7013
  "No"
@@ -7536,6 +7539,9 @@
7536
7539
  "legalOwners": {
7537
7540
  "baspiRef": "B1",
7538
7541
  "title": "Legal Owners",
7542
+ "required": [
7543
+ "namesOfLegalOwners"
7544
+ ],
7539
7545
  "properties": {
7540
7546
  "namesOfLegalOwners": {
7541
7547
  "baspiRef": "B1.1",
@@ -8226,15 +8232,31 @@
8226
8232
  },
8227
8233
  "yearWorkCarriedOut": {
8228
8234
  "baspiRef": "B4.2.2",
8229
- "title": "State the year the work was carried"
8235
+ "title": "State the year the work was carried out"
8230
8236
  },
8231
8237
  "details": {
8232
8238
  "baspiRef": "B4.2.3",
8233
8239
  "title": "Provide details"
8234
8240
  },
8235
- "attachments": {
8236
- "baspiRef": "B4.2.4",
8237
- "title": "Please supply the signed Electrical Safety Certificate (BS7671) and Building Regulations Compliance Certificate (or equivalent)",
8241
+ "electricalSafetyCertificate": {
8242
+ "baspiRef": "B4.2.4.1",
8243
+ "title": "Please provide a signed Electrical Safety Certificate (BS7671)",
8244
+ "enum": [
8245
+ "Attached",
8246
+ "To follow"
8247
+ ]
8248
+ },
8249
+ "buildingRegulationsComplianceCertificate": {
8250
+ "baspiRef": "B4.2.4.2",
8251
+ "title": "or a Building Regulations Compliance Certificate (or equivalent)",
8252
+ "enum": [
8253
+ "Attached",
8254
+ "To follow"
8255
+ ]
8256
+ },
8257
+ "buildingControlCompletionCertificate": {
8258
+ "baspiRef": "B4.2.4.3",
8259
+ "title": "or a Building Control Completion Certificate",
8238
8260
  "enum": [
8239
8261
  "Attached",
8240
8262
  "To follow"
@@ -8243,8 +8265,7 @@
8243
8265
  },
8244
8266
  "required": [
8245
8267
  "yearWorkCarriedOut",
8246
- "details",
8247
- "attachments"
8268
+ "details"
8248
8269
  ]
8249
8270
  }
8250
8271
  ],
package/src/schemas/v2/overlays/ta6.json CHANGED
@@ -372,7 +372,10 @@
372
372
  }
373
373
  }
374
374
  }
375
- }
375
+ },
376
+ "required": [
377
+ "workCarriedOut"
378
+ ]
376
379
  }
377
380
  ],
378
381
  "required": [
@@ -2603,11 +2606,11 @@
2603
2606
  }
2604
2607
  },
2605
2608
  "centralHeatingInstalled": {
2606
- "ta6Ref": "12.3b",
2609
+ "ta6Ref": "12.3b1",
2607
2610
  "title": "When was the heating system installed?"
2608
2611
  },
2609
2612
  "boilerInstallationCertificate": {
2610
- "ta6Ref": "12.3b",
2613
+ "ta6Ref": "12.3b2",
2611
2614
  "title": "Was a gas boiler installed after 1st April 2005, or a solid fuel or oil boiler installed after 1st October 2010?",
2612
2615
  "discriminator": {
2613
2616
  "propertyName": "yesNo"
@@ -2630,7 +2633,7 @@
2630
2633
  ]
2631
2634
  },
2632
2635
  "attachments": {
2633
- "ta6Ref": "12.3b2",
2636
+ "ta6Ref": "12.3b4",
2634
2637
  "title": "Please supply a copy of the installation completion certificate from a competent person qualified under the relevant self-certification scheme e.g. HETAS etc",
2635
2638
  "enum": [
2636
2639
  "Attached",
@@ -2648,7 +2651,7 @@
2648
2651
  ],
2649
2652
  "properties": {
2650
2653
  "yesNo": {
2651
- "ta6Ref": "12.3b1",
2654
+ "ta6Ref": "12.3b3",
2652
2655
  "enum": [
2653
2656
  "Yes",
2654
2657
  "No"
@@ -3537,8 +3540,7 @@
3537
3540
  "title": "Environmental Issues Affecting the Property",
3538
3541
  "required": [
3539
3542
  "flooding",
3540
- "radon",
3541
- "otherEnvironmental"
3543
+ "radon"
3542
3544
  ],
3543
3545
  "properties": {
3544
3546
  "flooding": {
@@ -3773,7 +3775,7 @@
3773
3775
  },
3774
3776
  "details": {
3775
3777
  "ta6Ref": "7.4b",
3776
- "title": "Was the test result was below the recommended level?",
3778
+ "title": "Was the test result was below the recommended action level?",
3777
3779
  "enum": [
3778
3780
  "Yes",
3779
3781
  "No"
@@ -4266,6 +4268,14 @@
4266
4268
  "details": {
4267
4269
  "ta6Ref": "8.9.2",
4268
4270
  "title": "Please provide details"
4271
+ },
4272
+ "attachments": {
4273
+ "ta6Ref": "8.9.3",
4274
+ "title": "Attachments",
4275
+ "enum": [
4276
+ "Attached",
4277
+ "To follow"
4278
+ ]
4269
4279
  }
4270
4280
  },
4271
4281
  "required": [
@@ -4377,18 +4387,31 @@
4377
4387
  "Yes"
4378
4388
  ]
4379
4389
  },
4380
- "attachments": {
4381
- "ta6Ref": "12.2.2",
4382
- "title": "Please supply the signed Electrical Safety Certificate (BS7671) and Building Regulations Compliance Certificate (or equivalent)",
4390
+ "electricalSafetyCertificate": {
4391
+ "ta6Ref": "12.2.2a",
4392
+ "title": "Please provide a signed Electrical Safety Certificate (BS7671)",
4393
+ "enum": [
4394
+ "Attached",
4395
+ "To follow"
4396
+ ]
4397
+ },
4398
+ "buildingRegulationsComplianceCertificate": {
4399
+ "ta6Ref": "12.2.2b",
4400
+ "title": "or a Building Regulations Compliance Certificate (or equivalent)",
4401
+ "enum": [
4402
+ "Attached",
4403
+ "To follow"
4404
+ ]
4405
+ },
4406
+ "buildingControlCompletionCertificate": {
4407
+ "ta6Ref": "12.2.2c",
4408
+ "title": "or a Building Control Completion Certificate",
4383
4409
  "enum": [
4384
4410
  "Attached",
4385
4411
  "To follow"
4386
4412
  ]
4387
4413
  }
4388
- },
4389
- "required": [
4390
- "attachments"
4391
- ]
4414
+ }
4392
4415
  }
4393
4416
  ],
4394
4417
  "required": [
package/src/schemas/v2/pdtf-transaction.json CHANGED
@@ -6552,10 +6552,7 @@
6552
6552
  }
6553
6553
  ]
6554
6554
  }
6555
- },
6556
- "required": [
6557
- "workCarriedOut"
6558
- ]
6555
+ }
6559
6556
  }
6560
6557
  ]
6561
6558
  }
@@ -17558,7 +17555,7 @@
17558
17555
  ]
17559
17556
  },
17560
17557
  "details": {
17561
- "title": "Was the test result was below the recommended level?",
17558
+ "title": "Was the test result was below the recommended action level?",
17562
17559
  "type": "string",
17563
17560
  "enum": [
17564
17561
  "Yes",
@@ -18590,7 +18587,7 @@
18590
18587
  ]
18591
18588
  },
18592
18589
  "yearWorkCarriedOut": {
18593
- "title": "State the year the work was carried",
18590
+ "title": "State the year the work was carried out",
18594
18591
  "type": "integer"
18595
18592
  },
18596
18593
  "details": {
@@ -18598,8 +18595,24 @@
18598
18595
  "type": "string",
18599
18596
  "minLength": 1
18600
18597
  },
18601
- "attachments": {
18602
- "title": "Please supply the signed Electrical Safety Certificate (BS7671) and Building Regulations Compliance Certificate (or equivalent)",
18598
+ "electricalSafetyCertificate": {
18599
+ "title": "Please provide a signed Electrical Safety Certificate (BS7671)",
18600
+ "type": "string",
18601
+ "enum": [
18602
+ "Attached",
18603
+ "To follow"
18604
+ ]
18605
+ },
18606
+ "buildingRegulationsComplianceCertificate": {
18607
+ "title": "or a Building Regulations Compliance Certificate (or equivalent)",
18608
+ "type": "string",
18609
+ "enum": [
18610
+ "Attached",
18611
+ "To follow"
18612
+ ]
18613
+ },
18614
+ "buildingControlCompletionCertificate": {
18615
+ "title": "or a Building Control Completion Certificate",
18603
18616
  "type": "string",
18604
18617
  "enum": [
18605
18618
  "Attached",
package/src/schemas/v2/skeleton.json CHANGED
@@ -2199,7 +2199,9 @@
2199
2199
  "yesNo": {},
2200
2200
  "yearWorkCarriedOut": {},
2201
2201
  "details": {},
2202
- "attachments": {}
2202
+ "electricalSafetyCertificate": {},
2203
+ "buildingRegulationsComplianceCertificate": {},
2204
+ "buildingControlCompletionCertificate": {}
2203
2205
  },
2204
2206
  "solarPanels": {
2205
2207
  "hasSolarPanels": {},