@pdtf/schemas 1.1.1 → 1.1.2

package/index.js

@@ -48,16 +48,19 @@ const getSubschema = (path) => {
   const pathArray = path.split("/").slice(1);
   if (pathArray.length < 1) return transactionSchema;
   return pathArray.reduce((schema, pathElement) => {
-    if (schema.type === "array") return schema.items;
-    if (schema.properties[pathElement]) return schema.properties[pathElement];
-    const discriminator = schema.discriminator?.propertyName;
-    if (discriminator) {
-      // only single dependency discriminator, oneOf keyword is supported
-      const oneOfs = schema.oneOf;
-      const matchingOneOf = oneOfs.find(
-        (oneOf) => oneOf["properties"][pathElement]
-      );
-      if (matchingOneOf) return matchingOneOf["properties"][pathElement];
+    const { type, items, properties, oneOf } = schema;
+    if (type === "array") return items;
+    if (properties?.[pathElement]) return properties[pathElement];
+    if (oneOf) {
+      let matchingProperty;
+      oneOf.forEach((aOneOf) => {
+        if (aOneOf.type === "array" && !Number.isNaN(pathElement)) {
+          matchingProperty = aOneOf.items;
+        } else if (aOneOf.properties?.[pathElement]) {
+          matchingProperty = aOneOf.properties?.[pathElement];
+        }
+      });
+      if (matchingProperty) return matchingProperty;
     }
     return undefined;
   }, transactionSchema);

package/package.json

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

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

@@ -19,6 +19,9 @@
       "title": "UUID for the transaction",
       "type": "string"
     },
+    "externalIds": {
+      "type": "object"
+    },
     "status": {
       "type": "string",
       "enum": ["active", "cancelled", "completed"]

package/src/tests/transactionSchema.test.js

@@ -118,6 +118,27 @@ test("correctly gets yet, yet, yet another subschema through a dependency", () =
   expect(subschema.enum).toStrictEqual(["Yes", "No"]);
 });
 
+test("correctly gets yet, yet, yet another subschema through a second item dependency", () => {
+  const subschema = getSubschema(
+    "/propertyPack/materialFacts/otherIssues/flooding/typeOfFlooding"
+  );
+  expect(subschema.type).toBe("object");
+});
+
+test("correctly gets yes another subschema but through a non-baspi oneOf structure", () => {
+  const subschema = getSubschema(
+    "/propertyPack/titlesToBeSold/0/registerExtract/OCSummaryData/RestrictionDetails/RestrictionEntry/ChargeRestriction/EntryDetails/EntryText"
+  );
+  expect(subschema).toEqual({ type: "string" });
+});
+
+test("correctly gets yes another subschema but through a non-baspi oneOf structure with array option", () => {
+  const subschema = getSubschema(
+    "/propertyPack/titlesToBeSold/0/registerExtract/OCSummaryData/RestrictionDetails/RestrictionEntry/0/ChargeRestriction/EntryDetails/EntryText"
+  );
+  expect(subschema).toEqual({ type: "string" });
+});
+
 test("correctly gets a subschema validator which is already cached", () => {
   const validator = getSubschemaValidator(
     "/propertyPack/energyPerformanceCertificate"