convention_builder 1.2.2 → 1.2.3

package/dist/module/index.js

@@ -8792,8 +8792,10 @@ var require_schema_utilities = __commonJS({
       return output;
     }
     __name(flattenObjectBranch, "flattenObjectBranch");
+    var nameRegex = /[0-9a-zA-Z_]*$/;
+    var overlayRegex = /[0-9a-zA-Z-_]*/;
     function checkRequiredInSchema(path, schema) {
-      let attributeName = path.match(/[a-zA-Z_]*$/)[0];
+      let attributeName = path.match(nameRegex)[0];
       let pathFormat = new RegExp(`properties.${attributeName}`).test(path);
       if (!pathFormat) {
         throw new Error(`Attribute paths have a format in which the second to last property is 'properties' such as 'properties.attributes.properties.date' for a field named 'date'. This one seems to have another format. Provided path is ${path} .`);
@@ -8830,14 +8832,14 @@ var require_schema_utilities = __commonJS({
         let entry = {
           path: attr,
           path_simplified: attr.replace(/\.properties/g, "").replace(/properties\./, ""),
-          name: attr.match(/[a-zA-Z_]*$/)[0],
+          name: attr.match(nameRegex)[0],
           required: isRequired
         };
         if (isConvention) {
-          entry.overlay = entry.path_simplified.match(/[a-zA-Z-_]*/)[0];
+          entry.overlay = entry.path_simplified.match(overlayRegex)[0];
         }
         ;
-        allFlattenedPaths.filter((d) => d.path.includes(`${attr}.`)).forEach((d) => {
+        allFlattenedPaths.filter((d) => d.path.includes(`${attr}.`) && !d.path.includes("items")).forEach((d) => {
           let key = d.path.replace(`${attr}.`, "");
           let value = d.value;
           entry[key] = value;
@@ -8849,10 +8851,10 @@ var require_schema_utilities = __commonJS({
         let entry = {
           path: rel,
           path_simplified: rel.replace(/\.properties/g, "").replace(/properties\./, ""),
-          name: rel.match(/[a-zA-Z]*$/)[0]
+          name: rel.match(nameRegex)[0]
         };
         if (isConvention) {
-          entry.overlay = entry.path_simplified.match(/[a-zA-Z-_]*/)[0];
+          entry.overlay = entry.path_simplified.match(overlayRegex)[0];
           let relatedDataPaths = dig(
             schema,
             `${rel}.properties.data.contains.anyOf`

package/dist/node/index.js

@@ -8785,8 +8785,10 @@ var require_schema_utilities = __commonJS({
       return output;
     }
     __name(flattenObjectBranch, "flattenObjectBranch");
+    var nameRegex = /[0-9a-zA-Z_]*$/;
+    var overlayRegex = /[0-9a-zA-Z-_]*/;
     function checkRequiredInSchema(path, schema) {
-      let attributeName = path.match(/[a-zA-Z_]*$/)[0];
+      let attributeName = path.match(nameRegex)[0];
       let pathFormat = new RegExp(`properties.${attributeName}`).test(path);
       if (!pathFormat) {
         throw new Error(`Attribute paths have a format in which the second to last property is 'properties' such as 'properties.attributes.properties.date' for a field named 'date'. This one seems to have another format. Provided path is ${path} .`);
@@ -8823,14 +8825,14 @@ var require_schema_utilities = __commonJS({
         let entry = {
           path: attr,
           path_simplified: attr.replace(/\.properties/g, "").replace(/properties\./, ""),
-          name: attr.match(/[a-zA-Z_]*$/)[0],
+          name: attr.match(nameRegex)[0],
           required: isRequired
         };
         if (isConvention) {
-          entry.overlay = entry.path_simplified.match(/[a-zA-Z-_]*/)[0];
+          entry.overlay = entry.path_simplified.match(overlayRegex)[0];
         }
         ;
-        allFlattenedPaths.filter((d) => d.path.includes(`${attr}.`)).forEach((d) => {
+        allFlattenedPaths.filter((d) => d.path.includes(`${attr}.`) && !d.path.includes("items")).forEach((d) => {
           let key = d.path.replace(`${attr}.`, "");
           let value = d.value;
           entry[key] = value;
@@ -8842,10 +8844,10 @@ var require_schema_utilities = __commonJS({
         let entry = {
           path: rel,
           path_simplified: rel.replace(/\.properties/g, "").replace(/properties\./, ""),
-          name: rel.match(/[a-zA-Z]*$/)[0]
+          name: rel.match(nameRegex)[0]
         };
         if (isConvention) {
-          entry.overlay = entry.path_simplified.match(/[a-zA-Z-_]*/)[0];
+          entry.overlay = entry.path_simplified.match(overlayRegex)[0];
           let relatedDataPaths = dig(
             schema,
             `${rel}.properties.data.contains.anyOf`

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "convention_builder",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "description": "Helper tools that offer a high level interface that transforms a convention description into it's json schema.",
     "main": "./dist/node/index.js",
     "browser": "./dist/browser/index.js",