@bedrockio/yada 1.6.0 → 1.7.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.7.0
+
+- Partial revert of 1.6.0. Dot syntax expanding no longer default but enabled.
+- Expanding flat syntax is now `expandFlatKeys`.
+- Flat syntax can also now be allowed without being expanded with
+  `allowFlatKeys`.
+- Checks on flat key syntax (array, object presence, etc).
+
+## 1.6.1
+
+- Fixed empty string not allowed when enum provided.
+- Some development version bumps.
+
 ## 1.6.0
 
 - Make `expandDotSyntax` option default and rename inverse option to

package/README.md

@@ -230,6 +230,10 @@ const schema = yd.string().options({
 });
 ```
 
+### String Schema Options
+
+- `allowEmpty` - Allows empty strings.
+
 ### Number
 
 Numbers have a handful of useful valiadtions:
@@ -431,6 +435,13 @@ const newSchema = yd.object({
 });
 ```
 
+### Object Schema Options
+
+- `stripEmpty` - Removes properties that are empty strings.
+- `stripUnknown` - Removes properties not in the schema.
+- `allowFlatKeys` - Allows "flat" keys like `profile.name`.
+- `expendFlatKeys` - Expands "flat" keys into nested objects.
+
 ## Date
 
 Dates are similar to the basic types with the exception that in addition to date
@@ -777,12 +788,11 @@ await schema
 
 #### Options:
 
-- `stripUnknown` - Strips unknown fields on object schemas which otherwise would
-  throw an error.
 - `cast` - Casts input to its associated type. For strings and numbers this
   performs a simple type coercion. For booleans `"true"` or `"1"` will be
   considered `true` and `"false"` or `"0"` will be considered `false`. This
   option is useful to convert query strings.
+- [Object Schema Options](#object-schema-options)
 
 ## Error Messages
 

package/dist/cjs/Schema.js

@@ -7,6 +7,7 @@ exports.default = void 0;
 exports.isSchema = isSchema;
 var _lodash = require("lodash");
 var _errors = require("./errors");
+var _utils = require("./utils");
 const INITIAL_TYPES = ['default', 'required', 'type', 'transform', 'empty'];
 const REQUIRED_TYPES = ['default', 'required', 'missing'];
 function isSchema(arg) {
@@ -351,6 +352,9 @@ class Schema {
     return this.clone({
       enum: set
     }).assert('enum', async (val, options) => {
+      if (val === '' && (0, _utils.canAllowEmptyString)(options)) {
+        return;
+      }
       if (val !== undefined) {
         let captured = [];
         for (let el of set) {

package/dist/cjs/errors.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ValidationError = exports.TypeError = exports.LocalizedError = exports.FormatError = exports.FieldError = exports.ElementError = exports.AssertionError = exports.ArrayError = exports.AllowedError = void 0;
 exports.isSchemaError = isSchemaError;
-var _messages = require("./messages");
 var _localization = require("./localization");
+var _messages = require("./messages");
 class LocalizedError extends Error {
   constructor(message, values = {}) {
     super((0, _localization.localize)(message, values));

package/dist/cjs/index.js

@@ -80,19 +80,19 @@ Object.defineProperty(exports, "useLocalizer", {
     return _localization.useLocalizer;
   }
 });
-var _string = _interopRequireDefault(require("./string"));
-var _number = _interopRequireDefault(require("./number"));
+var _Schema = _interopRequireWildcard(require("./Schema"));
+var _array = _interopRequireDefault(require("./array"));
 var _boolean = _interopRequireDefault(require("./boolean"));
 var _date = _interopRequireDefault(require("./date"));
+var _errors = require("./errors");
+var _localization = require("./localization");
+var _number = _interopRequireDefault(require("./number"));
 var _object = _interopRequireDefault(require("./object"));
-var _array = _interopRequireDefault(require("./array"));
+var _string = _interopRequireDefault(require("./string"));
 var _tuple = _interopRequireDefault(require("./tuple"));
-var _Schema = _interopRequireWildcard(require("./Schema"));
-var _localization = require("./localization");
-var _errors = require("./errors");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Accepts anything.
  */

package/dist/cjs/object.js

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 var _lodash = require("lodash");
+var _Schema = _interopRequireWildcard(require("./Schema"));
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");
-var _Schema = _interopRequireWildcard(require("./Schema"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const APPEND_ASSERTION_TYPES = ['required', 'type', 'custom'];
+const INTEGER_REG = /^\d+$/;
 
 /**
  * @typedef {{ [key: string]: Schema } | {}} SchemaMap
@@ -30,19 +31,15 @@ class ObjectSchema extends _TypeSchema.default {
     });
     this.transform((obj, options) => {
       const {
-        fields,
         stripUnknown,
-        stripEmpty,
-        preserveKeys
+        stripEmpty
       } = options;
       if (obj) {
         const result = {};
-        if (!preserveKeys) {
-          obj = expandKeys(obj);
-        }
+        obj = expandFlatSyntax(obj, options);
         for (let key of Object.keys(obj)) {
           const value = obj[key];
-          const isUnknown = !!fields && !(key in fields);
+          const isUnknown = !isKnownKey(key, this, options);
           if (value === '' && stripEmpty || isUnknown && stripUnknown) {
             continue;
           } else if (isUnknown) {
@@ -262,12 +259,14 @@ class ObjectSchema extends _TypeSchema.default {
   /**
    * `stripEmpty` - Removes properties that are empty strings.
    * `stripUnknown` - Removes properties not in the schema.
-   * `preserveKeys` - Prevents expansion of "flat" keys using dot syntax.
+   * `allowFlatKeys` - Allows "flat" keys like `profile.name`.
+   * `expendFlatKeys` - Expands "flat" keys into nested objects.
    *
    * @param {Object} [options]
    * @param {boolean} [options.stripEmpty]
    * @param {boolean} [options.stripUnknown]
-   * @param {boolean} [options.preserveKeys]
+   * @param {boolean} [options.allowFlatKeys]
+   * @param {boolean} [options.expandFlatKeys]
    */
   options(options) {
     return super.options(options);
@@ -297,7 +296,10 @@ class ObjectSchema extends _TypeSchema.default {
     };
   }
 }
-function expandKeys(obj) {
+function expandFlatSyntax(obj, options) {
+  if (!options.expandFlatKeys) {
+    return obj;
+  }
   const result = {
     ...obj
   };
@@ -309,6 +311,66 @@ function expandKeys(obj) {
   }
   return result;
 }
+function isKnownKey(key, schema, options) {
+  const {
+    fields
+  } = schema.meta;
+  const {
+    allowFlatKeys
+  } = options;
+  if (!fields) {
+    // No fields defined -> all keys are "known".
+    return true;
+  } else if (key in fields) {
+    // Exact match -> key is known.
+    return true;
+  } else if (allowFlatKeys && key.includes('.')) {
+    // Flat syntax "foo.bar".
+    const [base, ...rest] = key.split('.');
+    let subschema = fields[base];
+    if (!subschema) {
+      return false;
+    }
+    const {
+      type,
+      schemas
+    } = subschema.meta;
+    let subkey;
+    if (type === 'array') {
+      // If the subschema is an array then take the first of
+      // its defined schemas as we can safely assume that an
+      // array of objects will be defined as a single element
+      // or multiple schemas will only set the base property.
+      // Test that the element key is valid and take any
+      // further properties as the subkey. Examples:
+      // - profiles.0.name (array of objects)
+      // - profiles.0 (array of stringsmk)
+      const [index, ...other] = rest;
+      if (!INTEGER_REG.test(index)) {
+        return false;
+      }
+      subschema = schemas[0];
+      subkey = other.join('.');
+    } else if (type === 'object') {
+      // If the subschema is an object then simply take any
+      // further properties as the subkey. Example:
+      // - profile.name
+      subkey = rest.join('.');
+    } else {
+      // If the subschema is anything else then disallow it
+      // further properties as the subkey. Example:
+      // - profile.name
+      return false;
+    }
+    if (subschema.meta.type === 'object') {
+      return isKnownKey(subkey, subschema, options);
+    } else {
+      return !subkey;
+    }
+  } else {
+    return false;
+  }
+}
 function mergeFields(aFields, bFields) {
   if (!aFields || !bFields) {
     return aFields || bFields;

package/dist/cjs/string.js

@@ -8,6 +8,7 @@ var _validator = _interopRequireDefault(require("validator"));
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");
 var _password = require("./password");
+var _utils = require("./utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const SLUG_REG = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 const PHONE_REG = /^\+\d{1,3}\d{3,14}$/;
@@ -31,11 +32,7 @@ class StringSchema extends _TypeSchema.default {
       return val;
     });
     this.assert('empty', (val, options) => {
-      const {
-        required,
-        allowEmpty
-      } = options;
-      if (val === '' && (required || allowEmpty === false)) {
+      if (val === '' && !(0, _utils.canAllowEmptyString)(options)) {
         throw new _errors.LocalizedError('Value is required.');
       }
       return val;
@@ -411,10 +408,7 @@ class StringSchema extends _TypeSchema.default {
     return this.clone({
       format: name
     }).assert('format', function (val, options) {
-      const {
-        allowEmpty
-      } = options;
-      if (val === '' && allowEmpty !== false) {
+      if (val === '' && (0, _utils.canAllowEmptyString)(options)) {
         return;
       }
       fn(val, options);

package/dist/cjs/utils.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.canAllowEmptyString = canAllowEmptyString;
+function canAllowEmptyString(options) {
+  const {
+    type,
+    required,
+    allowEmpty = true
+  } = options;
+  return type === 'string' && !required && allowEmpty;
+}

package/eslint.config.js

@@ -1,3 +1,3 @@
-import { jest, recommended, nodeImports } from '@bedrockio/eslint-plugin';
+import { jest, nodeImports, recommended } from '@bedrockio/eslint-plugin';
 
 export default [jest, recommended, nodeImports];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/yada",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Validation library inspired by Joi.",
   "scripts": {
     "test": "jest",
@@ -24,12 +24,12 @@
     "@babel/cli": "^7.20.7",
     "@babel/core": "^7.20.12",
     "@babel/preset-env": "^7.20.2",
-    "@bedrockio/eslint-plugin": "^1.1.7",
-    "@bedrockio/prettier-config": "^1.0.2",
+    "@bedrockio/eslint-plugin": "^1.2.2",
+    "@bedrockio/prettier-config": "^1.1.1",
     "babel-plugin-add-module-exports": "^1.0.4",
-    "eslint": "^9.19.0",
-    "jest": "^29.6.2",
-    "prettier": "^3.4.2",
+    "eslint": "^9.36.0",
+    "jest": "^30.1.3",
+    "prettier": "^3.6.2",
     "typescript": "^5.7.2"
   },
   "prettier": "@bedrockio/prettier-config",

package/src/Schema.js

@@ -1,14 +1,16 @@
 import { omit, uniqBy } from 'lodash';
 
 import {
-  TypeError,
-  FormatError,
   AllowedError,
   AssertionError,
+  FormatError,
   LocalizedError,
+  TypeError,
   ValidationError,
 } from './errors';
 
+import { canAllowEmptyString } from './utils';
+
 const INITIAL_TYPES = ['default', 'required', 'type', 'transform', 'empty'];
 const REQUIRED_TYPES = ['default', 'required', 'missing'];
 
@@ -329,6 +331,9 @@ export default class Schema {
       set = set[0];
     }
     return this.clone({ enum: set }).assert('enum', async (val, options) => {
+      if (val === '' && canAllowEmptyString(options)) {
+        return;
+      }
       if (val !== undefined) {
         let captured = [];
 

package/src/errors.js

@@ -1,5 +1,5 @@
-import { getFullMessage } from './messages';
 import { localize } from './localization';
+import { getFullMessage } from './messages';
 
 export class LocalizedError extends Error {
   constructor(message, values = {}) {

package/src/index.js

@@ -1,17 +1,15 @@
-import string from './string';
-import number from './number';
+import Schema from './Schema';
+import { isSchema } from './Schema';
+import array from './array';
 import boolean from './boolean';
 import date from './date';
-import object from './object';
-import array from './array';
-import tuple from './tuple';
-
-import Schema from './Schema';
-import { useLocalizer, getLocalizedMessages } from './localization';
 import { LocalizedError } from './errors';
-
-import { isSchema } from './Schema';
 import { isSchemaError } from './errors';
+import { getLocalizedMessages, useLocalizer } from './localization';
+import number from './number';
+import object from './object';
+import string from './string';
+import tuple from './tuple';
 
 /**
  * Accepts anything.
@@ -43,22 +41,22 @@ function custom(fn) {
 }
 
 export {
+  LocalizedError,
+  allow,
+  any,
   array,
   boolean,
+  custom,
   date,
+  getLocalizedMessages,
+  isSchema,
+  isSchemaError,
   number,
   object,
+  reject,
   string,
   tuple,
-  any,
-  allow,
-  reject,
-  custom,
-  isSchema,
-  isSchemaError,
   useLocalizer,
-  getLocalizedMessages,
-  LocalizedError,
 };
 
 export default {

package/src/object.js

@@ -1,11 +1,13 @@
-import { set, pick, omit } from 'lodash';
+import { omit, pick, set } from 'lodash';
 
+import Schema, { isSchema } from './Schema';
 import TypeSchema from './TypeSchema';
 import { FieldError, LocalizedError } from './errors';
-import Schema, { isSchema } from './Schema';
 
 const APPEND_ASSERTION_TYPES = ['required', 'type', 'custom'];
 
+const INTEGER_REG = /^\d+$/;
+
 /**
  * @typedef {{ [key: string]: Schema } | {}} SchemaMap
  */
@@ -23,15 +25,15 @@ class ObjectSchema extends TypeSchema {
       }
     });
     this.transform((obj, options) => {
-      const { fields, stripUnknown, stripEmpty, preserveKeys } = options;
+      const { stripUnknown, stripEmpty } = options;
       if (obj) {
         const result = {};
-        if (!preserveKeys) {
-          obj = expandKeys(obj);
-        }
+
+        obj = expandFlatSyntax(obj, options);
+
         for (let key of Object.keys(obj)) {
           const value = obj[key];
-          const isUnknown = !!fields && !(key in fields);
+          const isUnknown = !isKnownKey(key, this, options);
 
           if ((value === '' && stripEmpty) || (isUnknown && stripUnknown)) {
             continue;
@@ -253,12 +255,14 @@ class ObjectSchema extends TypeSchema {
   /**
    * `stripEmpty` - Removes properties that are empty strings.
    * `stripUnknown` - Removes properties not in the schema.
-   * `preserveKeys` - Prevents expansion of "flat" keys using dot syntax.
+   * `allowFlatKeys` - Allows "flat" keys like `profile.name`.
+   * `expendFlatKeys` - Expands "flat" keys into nested objects.
    *
    * @param {Object} [options]
    * @param {boolean} [options.stripEmpty]
    * @param {boolean} [options.stripUnknown]
-   * @param {boolean} [options.preserveKeys]
+   * @param {boolean} [options.allowFlatKeys]
+   * @param {boolean} [options.expandFlatKeys]
    */
   options(options) {
     return super.options(options);
@@ -288,7 +292,11 @@ class ObjectSchema extends TypeSchema {
   }
 }
 
-function expandKeys(obj) {
+function expandFlatSyntax(obj, options) {
+  if (!options.expandFlatKeys) {
+    return obj;
+  }
+
   const result = { ...obj };
   for (let [key, value] of Object.entries(result)) {
     if (key.includes('.')) {
@@ -299,6 +307,65 @@ function expandKeys(obj) {
   return result;
 }
 
+function isKnownKey(key, schema, options) {
+  const { fields } = schema.meta;
+  const { allowFlatKeys } = options;
+  if (!fields) {
+    // No fields defined -> all keys are "known".
+    return true;
+  } else if (key in fields) {
+    // Exact match -> key is known.
+    return true;
+  } else if (allowFlatKeys && key.includes('.')) {
+    // Flat syntax "foo.bar".
+    const [base, ...rest] = key.split('.');
+    let subschema = fields[base];
+
+    if (!subschema) {
+      return false;
+    }
+
+    const { type, schemas } = subschema.meta;
+
+    let subkey;
+
+    if (type === 'array') {
+      // If the subschema is an array then take the first of
+      // its defined schemas as we can safely assume that an
+      // array of objects will be defined as a single element
+      // or multiple schemas will only set the base property.
+      // Test that the element key is valid and take any
+      // further properties as the subkey. Examples:
+      // - profiles.0.name (array of objects)
+      // - profiles.0 (array of stringsmk)
+      const [index, ...other] = rest;
+      if (!INTEGER_REG.test(index)) {
+        return false;
+      }
+      subschema = schemas[0];
+      subkey = other.join('.');
+    } else if (type === 'object') {
+      // If the subschema is an object then simply take any
+      // further properties as the subkey. Example:
+      // - profile.name
+      subkey = rest.join('.');
+    } else {
+      // If the subschema is anything else then disallow it
+      // further properties as the subkey. Example:
+      // - profile.name
+      return false;
+    }
+
+    if (subschema.meta.type === 'object') {
+      return isKnownKey(subkey, subschema, options);
+    } else {
+      return !subkey;
+    }
+  } else {
+    return false;
+  }
+}
+
 function mergeFields(aFields, bFields) {
   if (!aFields || !bFields) {
     return aFields || bFields;

package/src/string.js

@@ -2,15 +2,18 @@ import validator from 'validator';
 
 import TypeSchema from './TypeSchema';
 import { LocalizedError } from './errors';
+
 import {
+  getPasswordOptions,
   validateLength,
   validateLowercase,
-  validateUppercase,
   validateNumbers,
   validateSymbols,
-  getPasswordOptions,
+  validateUppercase,
 } from './password';
 
+import { canAllowEmptyString } from './utils';
+
 const SLUG_REG = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 const PHONE_REG = /^\+\d{1,3}\d{3,14}$/;
 const NANP_REG = /^\+1[2-9]\d{2}[2-9]\d{6}$/;
@@ -37,8 +40,7 @@ class StringSchema extends TypeSchema {
       return val;
     });
     this.assert('empty', (val, options) => {
-      const { required, allowEmpty } = options;
-      if (val === '' && (required || allowEmpty === false)) {
+      if (val === '' && !canAllowEmptyString(options)) {
         throw new LocalizedError('Value is required.');
       }
       return val;
@@ -429,8 +431,7 @@ class StringSchema extends TypeSchema {
     return this.clone({ format: name }).assert(
       'format',
       function (val, options) {
-        const { allowEmpty } = options;
-        if (val === '' && allowEmpty !== false) {
+        if (val === '' && canAllowEmptyString(options)) {
           return;
         }
         fn(val, options);

package/src/utils.js

@@ -0,0 +1,4 @@
+export function canAllowEmptyString(options) {
+  const { type, required, allowEmpty = true } = options;
+  return type === 'string' && !required && allowEmpty;
+}

package/types/Schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.js"],"names":[],"mappings":"AAcA,kDAEC;AAED;IACE,uBAGC;IAFC,kBAAoB;IACpB,SAAgB;IAKlB;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,mBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,sBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,uBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,mBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,sBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,uBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,YAFa,IAAI,CAIhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED;;OAEG;IACH,gBAFa,IAAI,CAShB;IAED;;OAEG;IACH,+BAFa,IAAI,CAMhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED,iDAwCC;IAED;;OAEG;IACH,kBAFa,IAAI,CAOhB;IAED;;;OAGG;IACH,qBAFa,MAAM,CAMlB;IAED;;;;;OAKG;IACH,yBAWC;IAED;;;OAGG;IACH,gCAEC;IAED;;MAOC;IAED;;;;MASC;IAED;;MAOC;IAED,eAsCC;IAED,4BAMC;IAED,kBAEC;IAED,YAGC;IAID;;OAEG;IACH,kCAFa,IAAI,CAmDhB;IAED;;OAEG;IACH,4BAFa,IAAI,CAUhB;IAED,oCAKC;IAED,gEAQC;IAED;;OAEG;IACH,oBAFa,IAAI,CAShB;IAED,gCAGC;IAED,qEAYC;CACF"}
+{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.js"],"names":[],"mappings":"AAgBA,kDAEC;AAED;IACE,uBAGC;IAFC,kBAAoB;IACpB,SAAgB;IAKlB;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,mBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,sBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,uBAFa,IAAI,CAShB;IAED;;;;OAIG;IACH,mBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,sBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,uBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,YAFa,IAAI,CAIhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED;;OAEG;IACH,gBAFa,IAAI,CAShB;IAED;;OAEG;IACH,+BAFa,IAAI,CAMhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED,iDAwCC;IAED;;OAEG;IACH,kBAFa,IAAI,CAOhB;IAED;;;OAGG;IACH,qBAFa,MAAM,CAMlB;IAED;;;;;OAKG;IACH,yBAWC;IAED;;;OAGG;IACH,gCAEC;IAED;;MAOC;IAED;;;;MASC;IAED;;MAOC;IAED,eAsCC;IAED,4BAMC;IAED,kBAEC;IAED,YAGC;IAID;;OAEG;IACH,kCAFa,IAAI,CAsDhB;IAED;;OAEG;IACH,4BAFa,IAAI,CAUhB;IAED,oCAKC;IAED,gEAQC;IAED;;OAEG;IACH,oBAFa,IAAI,CAShB;IAED,gCAGC;IAED,qEAYC;CACF"}

package/types/index.d.ts

@@ -17,35 +17,35 @@ declare namespace _default {
     export { LocalizedError };
 }
 export default _default;
-import array from './array';
-import boolean from './boolean';
-import date from './date';
-import number from './number';
-import object from './object';
-import string from './string';
-import tuple from './tuple';
-/**
- * Accepts anything.
- */
-export function any(): Schema;
+import { LocalizedError } from './errors';
 /**
  * Accept values or schemas. [Link](https://github.com/bedrockio/yada#allow)
  */
 export function allow(...args: any[]): Schema;
 /**
- * Reject values or schemas. [Link](https://github.com/bedrockio/yada#reject)
+ * Accepts anything.
  */
-export function reject(...args: any[]): Schema;
+export function any(): Schema;
+import array from './array';
+import boolean from './boolean';
 /**
  * Validate by a custom function. [Link](https://github.com/bedrockio/yada#custom)
  * @param {Function} fn
  */
 export function custom(fn: Function): Schema;
+import date from './date';
+import { getLocalizedMessages } from './localization';
 import { isSchema } from './Schema';
 import { isSchemaError } from './errors';
+import number from './number';
+import object from './object';
+/**
+ * Reject values or schemas. [Link](https://github.com/bedrockio/yada#reject)
+ */
+export function reject(...args: any[]): Schema;
+import string from './string';
+import tuple from './tuple';
 import { useLocalizer } from './localization';
-import { getLocalizedMessages } from './localization';
-import { LocalizedError } from './errors';
 import Schema from './Schema';
-export { array, boolean, date, number, object, string, tuple, isSchema, isSchemaError, useLocalizer, getLocalizedMessages, LocalizedError };
+export { LocalizedError, array, boolean, date, getLocalizedMessages, isSchema, isSchemaError, number, object, string, tuple, useLocalizer };
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;kBAKkB,SAAS;oBAHP,WAAW;iBACd,QAAQ;mBAFN,UAAU;mBAGV,UAAU;mBAJV,UAAU;kBAMX,SAAS;AAS3B;;GAEG;AACH,8BAEC;AAED;;GAEG;AACH,8CAEC;AAED;;GAEG;AACH,+CAEC;AAED;;;GAGG;AACH,6CAEC;yBA9BwB,UAAU;8BACL,UAAU;6BAJW,gBAAgB;qCAAhB,gBAAgB;+BACpC,UAAU;mBAFtB,UAAU"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;+BAK+B,UAAU;AAezC;;GAEG;AACH,8CAEC;AAZD;;GAEG;AACH,8BAEC;kBAhBiB,SAAS;oBACP,WAAW;AA+B/B;;;GAGG;AACH,6CAEC;iBApCgB,QAAQ;qCAG0B,gBAAgB;yBAN1C,UAAU;8BAKL,UAAU;mBAErB,UAAU;mBACV,UAAU;AAkB7B;;GAEG;AACH,+CAEC;mBAtBkB,UAAU;kBACX,SAAS;6BAJwB,gBAAgB;mBAPhD,UAAU"}

package/types/object.d.ts

@@ -74,17 +74,20 @@ declare class ObjectSchema extends TypeSchema {
     /**
      * `stripEmpty` - Removes properties that are empty strings.
      * `stripUnknown` - Removes properties not in the schema.
-     * `preserveKeys` - Prevents expansion of "flat" keys using dot syntax.
+     * `allowFlatKeys` - Allows "flat" keys like `profile.name`.
+     * `expendFlatKeys` - Expands "flat" keys into nested objects.
      *
      * @param {Object} [options]
      * @param {boolean} [options.stripEmpty]
      * @param {boolean} [options.stripUnknown]
-     * @param {boolean} [options.preserveKeys]
+     * @param {boolean} [options.allowFlatKeys]
+     * @param {boolean} [options.expandFlatKeys]
      */
     options(options?: {
         stripEmpty?: boolean;
         stripUnknown?: boolean;
-        preserveKeys?: boolean;
+        allowFlatKeys?: boolean;
+        expandFlatKeys?: boolean;
     }): this;
 }
 import Schema from './Schema';

package/types/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AA+TA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAQnB;wBAjUY;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,EAAE;AAD3C;;GAEG;AAEH;IACE,uBAGC;IAED,cA8EC;IAED;;;;;;OAMG;IACH,WAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAsB9B;IAED;;;;;;OAMG;IACH,cAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAY9B;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;;;;OAOG;IACH,mBAHc,MAAM,EAAA,gBAmBnB;IAED;;;;;;OAMG;IACH,cAEC;IAED;;;;;;;;;OASG;IACH,YAFW,SAAS,GAAC,MAAM,gBA+B1B;IAED;;;;;;;;;OASG;IACH,kBAJG;QAA0B,UAAU,GAA5B,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,YAAY,GAA9B,OAAO;KAAwB,QAIzC;CAwBF;mBA5RgC,UAAU;uBAFpB,cAAc"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AAkYA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAQnB;wBAlYY;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,EAAE;AAD3C;;GAEG;AAEH;IACE,uBAGC;IAED,cA8EC;IAED;;;;;;OAMG;IACH,WAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAsB9B;IAED;;;;;;OAMG;IACH,cAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAY9B;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;;;;OAOG;IACH,mBAHc,MAAM,EAAA,gBAmBnB;IAED;;;;;;OAMG;IACH,cAEC;IAED;;;;;;;;;OASG;IACH,YAFW,SAAS,GAAC,MAAM,gBA+B1B;IAED;;;;;;;;;;;OAWG;IACH,kBALG;QAA0B,UAAU,GAA5B,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,aAAa,GAA/B,OAAO;QACW,cAAc,GAAhC,OAAO;KAA0B,QAI3C;CAwBF;mBAlSgC,UAAU;uBACpB,cAAc"}

package/types/string.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../src/string.js"],"names":[],"mappings":"AAwcA;;GAEG;AACH,iDAEC;AArbD;IACE,cAoBC;IAED;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;OAEG;IACH,eAFW,MAAM,QAUhB;IAED;;OAEG;IACH,YAFW,MAAM,QAUhB;IAED;;OAEG;IACH,YAFW,MAAM,QAUhB;IAED,aAIC;IAED;;OAEG;IACH,mBAFW,OAAO,QAYjB;IAED;;OAEG;IACH,mBAFW,OAAO,QAYjB;IAED;;OAEG;IACH,WAFW,MAAM,QAahB;IAED,cAMC;IAED,uBASC;IAED,YAMC;IAED,YAMC;IAED,aAMC;IAED,cAMC;IAED;;;OAGG;IACH,iBAFG;QAA0B,OAAO,GAAzB,OAAO;KAAmB,QAQpC;IAED,mBAMC;IAED,WAMC;IAED,gBAMC;IAED,eAMC;IAED,YAMC;IAED,aAOC;IAED,eAMC;IAED;;OAEG;IACH,oBAFW,MAAM,QAQhB;IAED,gBAMC;IAED;;;;;;;OAOG;IACH,mBANG;QAAyB,SAAS,GAA1B,MAAM;QACW,UAAU,GAA3B,MAAM;QACW,UAAU,GAA3B,MAAM;QACW,YAAY,GAA7B,MAAM;QACW,YAAY,GAA7B,MAAM;KAAwB,QA+BxC;IAED;;;;;;;;;;;OAWG;IACH,cAVG;QAA0B,gBAAgB,GAAlC,OAAO;QACW,sBAAsB,GAAxC,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,4BAA4B,GAA9C,OAAO;QACW,eAAe,GAAjC,OAAO;QACW,sBAAsB,GAAxC,OAAO;QACW,eAAe,GAAjC,OAAO;QACY,SAAS,GAA5B,MAAM,EAAE;KAAqB,QAQvC;IAED;;;;;;;;OAQG;IACH,iBAPG;QAA0B,WAAW,GAA7B,OAAO;QACW,iBAAiB,GAAnC,OAAO;QACW,kBAAkB,GAApC,OAAO;QACW,iBAAiB,GAAnC,OAAO;QACW,cAAc,GAAhC,OAAO;QACW,iBAAiB,GAAnC,OAAO;KAAmC,QAQpD;IAED;;OAEG;IACH,eAFW,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,QAQ3B;IAED,YAMC;IAED,YAMC;IAED,cAMC;IAED,cAMC;IAED;;;;;;;;;;;OAWG;IACH,iBAMC;IAED,iCAWC;CAgBF;uBApcsB,cAAc"}
+{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../src/string.js"],"names":[],"mappings":"AAycA;;GAEG;AACH,iDAEC;AAnbD;IACE,cAmBC;IAED;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;OAEG;IACH,eAFW,MAAM,QAUhB;IAED;;OAEG;IACH,YAFW,MAAM,QAUhB;IAED;;OAEG;IACH,YAFW,MAAM,QAUhB;IAED,aAIC;IAED;;OAEG;IACH,mBAFW,OAAO,QAYjB;IAED;;OAEG;IACH,mBAFW,OAAO,QAYjB;IAED;;OAEG;IACH,WAFW,MAAM,QAahB;IAED,cAMC;IAED,uBASC;IAED,YAMC;IAED,YAMC;IAED,aAMC;IAED,cAMC;IAED;;;OAGG;IACH,iBAFG;QAA0B,OAAO,GAAzB,OAAO;KAAmB,QAQpC;IAED,mBAMC;IAED,WAMC;IAED,gBAMC;IAED,eAMC;IAED,YAMC;IAED,aAOC;IAED,eAMC;IAED;;OAEG;IACH,oBAFW,MAAM,QAQhB;IAED,gBAMC;IAED;;;;;;;OAOG;IACH,mBANG;QAAyB,SAAS,GAA1B,MAAM;QACW,UAAU,GAA3B,MAAM;QACW,UAAU,GAA3B,MAAM;QACW,YAAY,GAA7B,MAAM;QACW,YAAY,GAA7B,MAAM;KAAwB,QA+BxC;IAED;;;;;;;;;;;OAWG;IACH,cAVG;QAA0B,gBAAgB,GAAlC,OAAO;QACW,sBAAsB,GAAxC,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,4BAA4B,GAA9C,OAAO;QACW,eAAe,GAAjC,OAAO;QACW,sBAAsB,GAAxC,OAAO;QACW,eAAe,GAAjC,OAAO;QACY,SAAS,GAA5B,MAAM,EAAE;KAAqB,QAQvC;IAED;;;;;;;;OAQG;IACH,iBAPG;QAA0B,WAAW,GAA7B,OAAO;QACW,iBAAiB,GAAnC,OAAO;QACW,kBAAkB,GAApC,OAAO;QACW,iBAAiB,GAAnC,OAAO;QACW,cAAc,GAAhC,OAAO;QACW,iBAAiB,GAAnC,OAAO;KAAmC,QAQpD;IAED;;OAEG;IACH,eAFW,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,QAQ3B;IAED,YAMC;IAED,YAMC;IAED,cAMC;IAED,cAMC;IAED;;;;;;;;;;;OAWG;IACH,iBAMC;IAED,iCAUC;CAgBF;uBArcsB,cAAc"}

package/types/utils.d.ts

@@ -1,5 +1,2 @@
-export function pick(obj: any, keys: any): {};
-export function omit(obj: any, keys: any): {};
-export { isSchema } from "./Schema";
-export { isSchemaError } from "./errors";
+export function canAllowEmptyString(options: any): any;
 //# sourceMappingURL=utils.d.ts.map

package/types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.js"],"names":[],"mappings":"AAGA,8CAMC;AAED,8CAQC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.js"],"names":[],"mappings":"AAAA,uDAGC"}