@bedrockio/yada 1.0.19 → 1.0.20

package/dist/cjs/object.js

@@ -15,10 +15,11 @@ const BASE_ASSERTIONS = ['type', 'transform', 'field'];
  */
 
 class ObjectSchema extends _TypeSchema.default {
-  constructor(fields) {
+  constructor(fields, meta) {
     super(Object, {
-      message: 'Object failed validation.',
-      fields
+      ...meta,
+      fields,
+      message: 'Object failed validation.'
     });
     this.setup();
   }
@@ -35,10 +36,14 @@ class ObjectSchema extends _TypeSchema.default {
     this.transform((obj, options) => {
       const {
         fields,
-        stripUnknown
+        stripUnknown,
+        expandDotSyntax
       } = options;
       if (obj) {
         const result = {};
+        if (expandDotSyntax) {
+          obj = expandDotProperties(obj);
+        }
         for (let key of Object.keys(obj)) {
           if (!fields || key in fields) {
             result[key] = obj[key];
@@ -120,7 +125,10 @@ class ObjectSchema extends _TypeSchema.default {
       ...this.meta.fields,
       ...schema.meta.fields
     };
-    const merged = new ObjectSchema(fields);
+    const merged = new ObjectSchema(fields, {
+      ...this.meta,
+      ...schema.meta
+    });
     const assertions = [...this.assertions, ...schema.assertions];
     for (let assertion of assertions) {
       const {
@@ -145,6 +153,27 @@ class ObjectSchema extends _TypeSchema.default {
     };
   }
 }
+function expandDotProperties(obj) {
+  const result = {};
+  for (let [key, val] of Object.entries(obj || {})) {
+    const split = key.split('.');
+    if (split.length > 1) {
+      let node = result;
+      for (let i = 0; i < split.length; i++) {
+        const token = split[i];
+        if (i === split.length - 1) {
+          node[token] = val;
+        } else {
+          node[token] = {};
+        }
+        node = node[token];
+      }
+    } else {
+      result[key] = val;
+    }
+  }
+  return result;
+}
 
 /**
  * Creates an [object schema](https://github.com/bedrockio/yada#object).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/yada",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "Validation library inspired by Joi.",
   "scripts": {
     "test": "jest",

package/src/object.js

@@ -9,8 +9,12 @@ const BASE_ASSERTIONS = ['type', 'transform', 'field'];
  */
 
 class ObjectSchema extends TypeSchema {
-  constructor(fields) {
-    super(Object, { message: 'Object failed validation.', fields });
+  constructor(fields, meta) {
+    super(Object, {
+      ...meta,
+      fields,
+      message: 'Object failed validation.',
+    });
     this.setup();
   }
 
@@ -24,9 +28,12 @@ class ObjectSchema extends TypeSchema {
       }
     });
     this.transform((obj, options) => {
-      const { fields, stripUnknown } = options;
+      const { fields, stripUnknown, expandDotSyntax } = options;
       if (obj) {
         const result = {};
+        if (expandDotSyntax) {
+          obj = expandDotProperties(obj);
+        }
         for (let key of Object.keys(obj)) {
           if (!fields || key in fields) {
             result[key] = obj[key];
@@ -110,7 +117,10 @@ class ObjectSchema extends TypeSchema {
       ...schema.meta.fields,
     };
 
-    const merged = new ObjectSchema(fields);
+    const merged = new ObjectSchema(fields, {
+      ...this.meta,
+      ...schema.meta,
+    });
 
     const assertions = [...this.assertions, ...schema.assertions];
     for (let assertion of assertions) {
@@ -137,6 +147,28 @@ class ObjectSchema extends TypeSchema {
   }
 }
 
+function expandDotProperties(obj) {
+  const result = {};
+  for (let [key, val] of Object.entries(obj || {})) {
+    const split = key.split('.');
+    if (split.length > 1) {
+      let node = result;
+      for (let i = 0; i < split.length; i++) {
+        const token = split[i];
+        if (i === split.length - 1) {
+          node[token] = val;
+        } else {
+          node[token] = {};
+        }
+        node = node[token];
+      }
+    } else {
+      result[key] = val;
+    }
+  }
+  return result;
+}
+
 /**
  * Creates an [object schema](https://github.com/bedrockio/yada#object).
  *

package/types/object.d.ts

@@ -13,7 +13,6 @@ export type SchemaMap = {} | {
  * @typedef {{ [key: string]: Schema } | {}} SchemaMap
  */
 declare class ObjectSchema extends TypeSchema {
-    constructor(fields: any);
     /**
      * @private
      */

package/types/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AA2IA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAMnB;;;;AA9ID;;GAEG;AAEH;IACE,yBAGC;IAED;;OAEG;IACH,cA+DC;IAED;;OAEG;IACH,kBAEC;IAED;;OAEG;IAEH,YAHW,SAAS,GAAC,MAAM,gBA+B1B;CAcF"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AA2KA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAMnB;;;;AA9KD;;GAEG;AAEH;IAUE;;OAEG;IACH,cAkEC;IAED;;OAEG;IACH,kBAEC;IAED;;OAEG;IAEH,YAHW,SAAS,GAAC,MAAM,gBAkC1B;CAcF"}