@pdtf/schemas 0.6.7 → 0.6.10

package/index.js

@@ -41,7 +41,18 @@ const getSubschema = (path) => {
   }
   return pathArray.reduce((schema, pathElement) => {
     if (schema.type === "array") return schema.items;
-    return schema.properties[pathElement];
+    if (schema.properties[pathElement]) return schema.properties[pathElement];
+    const dependencies = schema.dependencies;
+    if (dependencies) {
+      // only single dependency discriminator, oneOf keyword is supported
+      const dependencyDiscriminator = Object.keys(dependencies)[0];
+      const oneOfs = dependencies[dependencyDiscriminator].oneOf;
+      const matchingOneOf = oneOfs.find(
+        (oneOf) => oneOf["properties"][pathElement]
+      );
+      if (matchingOneOf) return matchingOneOf["properties"][pathElement];
+    }
+    return undefined;
   }, transactionSchema);
 };
 

package/package.json

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

package/src/tests/transactionSchema.test.js

@@ -81,6 +81,35 @@ test("correctly gets another subschema through an arrays element", () => {
   expect(subschema.title).toBe("First name");
 });
 
+test("correctly gets a subschema through a dependency", () => {
+  const subschema = getSubschema(
+    "/propertyPack/materialFacts/delayFactors/hasDelayFactors/details"
+  );
+  expect(subschema.title).toBe("Details");
+});
+
+test("correctly gets another subschema through a dependency", () => {
+  const subschema = getSubschema(
+    "/propertyPack/materialFacts/ownership/leaseholdDetails/lengthOfLeaseInYears"
+  );
+  expect(subschema.title).toBe("Length of lease (years)");
+});
+
+test("correctly gets yet another subschema through a dependency", () => {
+  const subschema = getSubschema(
+    "/propertyPack/materialFacts/ownership/leaseholdDetails/rentIncrease/details"
+  );
+  expect(subschema.title).toBe("Details");
+});
+
+test("correctly gets yet, yet another subschema through a dependency", () => {
+  const subschema = getSubschema(
+    "/propertyPack/materialFacts/listingAndConservation/isConservationArea/yesNo"
+  );
+  expect(subschema.type).toBe("string");
+  expect(subschema.enum).toStrictEqual(["Yes", "No"]);
+});
+
 test("correctly gets a subschema validator which is already cached", () => {
   const validator = getSubschemaValidator(
     "/propertyPack/energyPerformanceCertificate"