npm - @pdtf/schemas - Versions diffs - 3.6.0-dev.3 → 3.6.0-dev.4 - Mend

@pdtf/schemas 3.6.0-dev.3 → 3.6.0-dev.4

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 (263) hide show

package/src/schemas/v3/overlays/piq.json CHANGED Viewed

@@ -1634,7 +1634,8 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "Yes"
+                                    "Yes",
+                                    "Not known"
                                   ]
                                 }
                               }
@@ -1949,7 +1950,8 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not applicable"
                       ]
                     }
                   }
@@ -2017,7 +2019,8 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -2341,8 +2344,7 @@
                   "properties": {
                     "riskIndicator": {
                       "enum": [
-                        "No",
-                        "Not known"
+                        "No"
                       ]
                     }
                   }

package/src/schemas/v3/overlays/rds.json CHANGED Viewed

@@ -1946,7 +1946,8 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "Yes"
+                                    "Yes",
+                                    "Not known"
                                   ]
                                 }
                               }
@@ -2128,7 +2129,8 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not applicable"
                       ]
                     }
                   }
@@ -2180,7 +2182,8 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -2572,8 +2575,7 @@
                   "properties": {
                     "riskIndicator": {
                       "enum": [
-                        "No",
-                        "Not known"
+                        "No"
                       ]
                     }
                   }
@@ -3009,7 +3011,8 @@
                     "yesNo": {
                       "enum": [
                         "No",
-                        "Not applicable"
+                        "Not applicable",
+                        "Not known"
                       ]
                     }
                   }

package/src/schemas/v3/overlays/ta10.json CHANGED Viewed

@@ -1498,15 +1498,6 @@
                             }
                           }
                         }
-                      },
-                      {
-                        "properties": {
-                          "isIncludedOrExcluded": {
-                            "enum": [
-                              "None"
-                            ]
-                          }
-                        }
                       }
                     ],
                     "required": [

package/src/schemas/v3/overlays/ta6.json CHANGED Viewed

@@ -2263,7 +2263,8 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "Yes"
+                                    "Yes",
+                                    "Not known"
                                   ]
                                 }
                               }
@@ -2717,7 +2718,8 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not applicable"
                       ]
                     }
                   }
@@ -2797,7 +2799,8 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -3533,7 +3536,8 @@
                     "yesNo": {
                       "enum": [
                         "No",
-                        "Not applicable"
+                        "Not applicable",
+                        "Not known"
                       ]
                     }
                   }

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

@@ -3951,7 +3951,8 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "No"
+                                    "No",
+                                    "Not known"
                                   ]
                                 }
                               }
@@ -4001,7 +4002,8 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "Yes"
+                                    "Yes",
+                                    "Not known"
                                   ]
                                 }
                               }

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

@@ -7028,7 +7028,7 @@
                                               "assessmentsCarriedOut": {
                                                 "enum": [
                                                   "Fire risk assessment",
-                                                  "External Wall fire risk assessment",
+                                                  "External wall fire risk assessment",
                                                   "Both"
                                                 ]
                                               },
@@ -8951,7 +8951,9 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not applicable",
+                        "Not known"
                       ]
                     }
                   }
@@ -14791,15 +14793,6 @@
                             }
                           }
                         }
-                      },
-                      {
-                        "properties": {
-                          "isIncludedOrExcluded": {
-                            "enum": [
-                              "None"
-                            ]
-                          }
-                        }
                       }
                     ]
                   }
@@ -20283,7 +20276,8 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "No"
+                                    "No",
+                                    "Not known"
                                   ]
                                 }
                               }
@@ -20350,7 +20344,8 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "Yes"
+                                    "Yes",
+                                    "Not known"
                                   ]
                                 }
                               }
@@ -21083,7 +21078,8 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not applicable"
                       ]
                     }
                   }
@@ -21249,7 +21245,8 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -23199,8 +23196,7 @@
                   "properties": {
                     "riskIndicator": {
                       "enum": [
-                        "No",
-                        "Not known"
+                        "No"
                       ]
                     }
                   }
@@ -24110,7 +24106,8 @@
                     "yesNo": {
                       "enum": [
                         "No",
-                        "Not applicable"
+                        "Not applicable",
+                        "Not known"
                       ]
                     }
                   }

package/src/utils/extractExtensionOverlays.js CHANGED Viewed

@@ -575,7 +575,16 @@ function addIntermediateRefs(overlay, schema, refConfig) {
       const schemaPath = "/" + this.path.join("/");
       try {
         const schemaNode = jp.get(schema, schemaPath);
-        if (schemaNode && schemaNode[refConfig.ref]) {
+        if (!schemaNode) return;
+        // When the output key differs from the source key (e.g. sef25Ref -> ntsRef),
+        // prefer the schema's existing outputRef on intermediate parents so we
+        // don't clobber legitimate NTS refs when the extension is later merged.
+        if (
+          refConfig.ref !== refConfig.outputRef &&
+          schemaNode[refConfig.outputRef]
+        ) {
+          node[refConfig.outputRef] = schemaNode[refConfig.outputRef];
+        } else if (schemaNode[refConfig.ref]) {
           node[refConfig.outputRef] = schemaNode[refConfig.ref];
         }
       } catch (err) {