Merge pull request 'release/0.0.5' (#14) from release/0.0.5 into master

CHANGELOG.md

@@ -1,5 +1,18 @@
 # ChangeLog
 
+## 2020-06-11 (0.0.5)
+
+- modify types require method
+
+## 2020-06-11 (0.0.4)
+
+- modify types export
+- add package repository
+
+## 2020-06-10 (0.0.3)
+
+- add types init value
+
 ## 2020-06-10 (0.0.2)
 
 - add string type pattern check function

index.js

@@ -1,14 +1,19 @@
-const types = require('./types/index.js')
+const TypeBase = require('./types/base.js')
+const TypeString = require('./types/string.js')
+const TypeNumber = require('./types/number.js')
+const TypeBoolean = require('./types/boolean.js')
+const TypeArray = require('./types/array.js')
+const TypeObject = require('./types/object.js')
 const validate = require('./validate.js')
 const validator = {}
 module.exports = validator
 
-validator.Base = types.Base
-validator.string = () => new types.StringType()
-validator.number = () => new types.NumberType()
-validator.boolean = () => new types.BooleanType()
-validator.array = () => new types.ArrayType()
-validator.object = () => new types.ObjectType()
+validator.Base = TypeBase
+validator.string = (...args) => new TypeString(...args)
+validator.number = (...args) => new TypeNumber(...args)
+validator.boolean = (...args) => new TypeBoolean(...args)
+validator.array = (...args) => new TypeArray(...args)
+validator.object = (...args) => new TypeObject(...args)
 
 /**
  * validate

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mtfos-validator",
-  "version": "0.0.2",
+  "version": "0.0.5",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -12,5 +12,9 @@
   "devDependencies": {
     "jest": "^26.0.1",
     "standard": "^12.0.1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://git.trj.tw/nodejs/validator.git"
   }
 }

types/index.js

@@ -1,15 +1,8 @@
-const Base = require('./base.js')
-const StringType = require('./string.js')
-const NumberType = require('./number.js')
-const BooleanType = require('./boolean.js')
-const ObjectType = require('./object.js')
-const ArrayType = require('./array.js')
-
-module.exports = {
-  Base,
-  StringType,
-  NumberType,
-  BooleanType,
-  ObjectType,
-  ArrayType
-}
+const types = {}
+module.exports = types
+types.Base = require('./base.js')
+types.StringType = require('./string.js')
+types.NumberType = require('./number.js')
+types.BooleanType = require('./boolean.js')
+types.ObjectType = require('./object.js')
+types.ArrayType = require('./array.js')

types/object.test.js

@@ -24,5 +24,7 @@ describe('test validate type schema object', () => {
     }).required()
 
     throwFunc(obj.validate({ name: 'asd' }))
+
+    expect(throwFunc(obj.validate({ name: 123 }))).toThrow()
   })
 })

validator.test.js

@@ -23,4 +23,21 @@ describe('test validator validate', () => {
 
     expect(() => validator.validate(data, schema)).toThrow()
   })
+
+  test('validate test 3', () => {
+    const data = {
+      str: '123',
+      strWithPattern: 'asd',
+      objWithChild: {
+        name: 'asd'
+      }
+    }
+    const schema = {
+      str: validator.string().required(),
+      strWithPattern: validator.string().pattern(/^asd$/).required(),
+      objWithChild: validator.object({ name: validator.string().required() }).required()
+    }
+
+    validator.validate(data, schema)
+  })
 })