- fix token pattern

- add tests to have more code coverage

.gitignore

@@ -1 +1,3 @@
 /node_modules
+/coverage
+/.nyc_output

CHANGELOG.md

@@ -11,6 +11,7 @@
   * add support for "invalid" method - `joi.string().invalid('A','B','C')`
   * add add support for "uuid" format for string type
   * add support for ES6 default import syntax
+  * fix string token pattern
 
 3.3.0 / 2019-10-18
 ==================

README.md

@@ -130,8 +130,7 @@ J2S returns a result object containing `swagger` and `components` properties. `s
 
 - `any.example()` sets the `"example"` or `"examples"`.
   - `.example('hi')` -> `"example": "hi"`
-  - joi < v14: `.example('hi').example('hey')` -> `"examples": ["hi", "hey"]`
-  - joi v14: `.example('hi', 'hey')` -> `"examples": ["hi", "hey"]`
+  - `.example('hi', 'hey')` -> `"examples": ["hi", "hey"]`
 
 - `joi.any()`
 - `.meta({ swaggerType: 'file' }).description('simpleFile')` add a file to the swagger structure

index.js

@@ -7,6 +7,7 @@ const patterns = {
 	alphanum: '^[a-zA-Z0-9]*$',
 	alphanumLower: '^[a-z0-9]*$',
 	alphanumUpper: '^[A-Z0-9]*$',
+	token: '^[a-zA-Z0-9_]*$',
 };
 
 function meta (schema, key) {
@@ -151,7 +152,7 @@ const parseAsType = {
 		}
 
 		if (find(schema._rules, { name: 'token' })) {
-			swagger.pattern = patterns[`alphanum${getCaseSuffix(schema)}`];
+			swagger.pattern = patterns.token;
 		}
 
 		if (find(schema._rules, { name: 'email' })) {
@@ -329,7 +330,6 @@ function parse (schema, existingComponents) {
 		return { swagger: refDef(metaDefType, metaDefName) };
 	}
 
-	// TODO: test forbidden
 	if (get(schema, '_flags.presence') === 'forbidden') {
 		return false;
 	}

package.json

@@ -6,6 +6,7 @@
   "types": "index.d.ts",
   "scripts": {
     "test": "tap tests.js",
+    "test:debug": "tap --node-arg=--inspect --no-timeout tests.js",
     "test:travis": "tap --reporter=tap tests.js",
     "lint": "eslint ./"
   },
@@ -31,12 +32,12 @@
     "eslint-config-twipped": "~3.3.0",
     "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-promise": "^4.2.1",
-    "@hapi/joi": "^16.1.7",
+    "@hapi/joi": "^17.1.0",
     "tap": "^14.7.2",
     "tapsuite": "^2.0.1"
   },
   "peerDependencies": {
-    "@hapi/joi": "*"
+    "@hapi/joi": ">=16"
   },
   "files": [
     "index.js",