@bedrockio/yada 1.0.5 → 1.0.7

package/.eslintignore

@@ -0,0 +1 @@
+dist

package/dist/cjs/Schema.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.default = void 0;
 exports.isSchema = isSchema;
 var _errors = require("./errors");

package/dist/cjs/TypeSchema.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.default = void 0;
 var _Schema = _interopRequireDefault(require("./Schema"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/cjs/array.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.default = void 0;
 var _Schema = _interopRequireDefault(require("./Schema"));
 var _errors = require("./errors");
@@ -60,6 +62,17 @@ class ArraySchema extends _Schema.default {
       });
     }
   }
+  length(length) {
+    return this.clone().assert('length', arr => {
+      if (arr.length !== length) {
+        const s = length === 1 ? '' : 's';
+        throw new _errors.LocalizedError('Must contain exactly {length} element{s}.', {
+          length,
+          s
+        });
+      }
+    });
+  }
   min(length) {
     return this.clone().assert('length', arr => {
       if (arr.length < length) {

package/dist/cjs/boolean.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.default = void 0;
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");

package/dist/cjs/date.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.default = void 0;
 var _validator = _interopRequireDefault(require("validator"));
 var _utils = require("./utils");

package/dist/cjs/errors.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.ValidationError = exports.LocalizedError = exports.FieldError = exports.ElementError = exports.AssertionError = exports.ArrayError = void 0;
 exports.isSchemaError = isSchemaError;
 var _messages = require("./messages");

package/dist/cjs/index.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.default = void 0;
 var _array = _interopRequireDefault(require("./array"));
 var _boolean = _interopRequireDefault(require("./boolean"));

package/dist/cjs/localization.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getLocalized = getLocalized;
 exports.getLocalizerTemplates = getLocalizerTemplates;
 exports.localize = localize;

package/dist/cjs/messages.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getFullMessage = getFullMessage;
 var _errors = require("./errors");
 var _localization = require("./localization");

package/dist/cjs/number.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.default = void 0;
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");

package/dist/cjs/object.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.default = void 0;
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");

package/dist/cjs/password.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.PASSWORD_DEFAULTS = void 0;
 exports.validateLength = validateLength;
 exports.validateUppercase = exports.validateSymbols = exports.validateNumbers = exports.validateLowercase = void 0;

package/dist/cjs/string.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.default = void 0;
 var _validator = _interopRequireDefault(require("validator"));
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
@@ -9,6 +11,7 @@ var _utils = require("./utils");
 var _password = require("./password");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const SLUG_REG = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+const PHONE_REG = /^\+?[1-9]\d{1,14}$/;
 class StringSchema extends _TypeSchema.default {
   constructor() {
     super(String);
@@ -90,6 +93,13 @@ class StringSchema extends _TypeSchema.default {
       }
     });
   }
+  phone() {
+    return this.format('phone', str => {
+      if (!PHONE_REG.test(str)) {
+        throw new _errors.LocalizedError('Must be a valid phone number.');
+      }
+    });
+  }
   hex() {
     return this.format('hex', str => {
       if (!_validator.default.isHexadecimal(str)) {

package/dist/cjs/utils.js

@@ -1,14 +1,25 @@
 "use strict";
 
-exports.__esModule = true;
-exports.isSchemaError = exports.isSchema = void 0;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "isSchema", {
+  enumerable: true,
+  get: function () {
+    return _Schema.isSchema;
+  }
+});
+Object.defineProperty(exports, "isSchemaError", {
+  enumerable: true,
+  get: function () {
+    return _errors.isSchemaError;
+  }
+});
 exports.wrapAny = wrapAny;
 exports.wrapArgs = wrapArgs;
 exports.wrapSchema = wrapSchema;
 var _Schema = _interopRequireWildcard(require("./Schema"));
-exports.isSchema = _Schema.isSchema;
 var _errors = require("./errors");
-exports.isSchemaError = _errors.isSchemaError;
 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 wrapSchema(Class) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@bedrockio/yada",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Validation library inspired by Joi.",
   "scripts": {
-    "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest",
+    "test": "jest",
     "lint": "eslint",
     "build": "scripts/build",
     "prepublishOnly": "npm run build"

package/src/array.js

@@ -59,6 +59,18 @@ class ArraySchema extends Schema {
     }
   }
 
+  length(length) {
+    return this.clone().assert('length', (arr) => {
+      if (arr.length !== length) {
+        const s = length === 1 ? '' : 's';
+        throw new LocalizedError('Must contain exactly {length} element{s}.', {
+          length,
+          s,
+        });
+      }
+    });
+  }
+
   min(length) {
     return this.clone().assert('length', (arr) => {
       if (arr.length < length) {

package/src/string.js

@@ -12,6 +12,7 @@ import {
 } from './password';
 
 const SLUG_REG = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+const PHONE_REG = /^\+?[1-9]\d{1,14}$/;
 
 class StringSchema extends TypeSchema {
   constructor() {
@@ -98,6 +99,14 @@ class StringSchema extends TypeSchema {
     });
   }
 
+  phone() {
+    return this.format('phone', (str) => {
+      if (!PHONE_REG.test(str)) {
+        throw new LocalizedError('Must be a valid phone number.');
+      }
+    });
+  }
+
   hex() {
     return this.format('hex', (str) => {
       if (!validator.isHexadecimal(str)) {

package/test/all.test.js

@@ -83,6 +83,14 @@ describe('string', () => {
     await assertFail(schema, 'foo@bar', ['Must be an email address.']);
   });
 
+  it('should validate an E.164 phone number', async () => {
+    const schema = yd.string().phone();
+    await assertPass(schema, undefined);
+    await assertPass(schema, '+16175551212');
+    await assertFail(schema, '+1', ['Must be a valid phone number.']);
+    await assertFail(schema, 'foo', ['Must be a valid phone number.']);
+  });
+
   it('should validate a regex pattern', async () => {
     expect(() => {
       yd.string().match();
@@ -762,6 +770,13 @@ describe('array', () => {
     await assertFail(schema, [{ bar: 'hi' }], ['Unknown field "bar".']);
   });
 
+  it('should validate a fixed length', async () => {
+    const schema = yd.array().length(2);
+    await assertFail(schema, [1], ['Must contain exactly 2 elements.']);
+    await assertPass(schema, [1, 2]);
+    await assertFail(schema, [1, 2, 3], ['Must contain exactly 2 elements.']);
+  });
+
   it('should validate a minimum length', async () => {
     const schema = yd.array().min(1);
     await assertPass(schema, ['one']);