refactor: Restoring value matcher functionality

src/actions.ts

@@ -1,6 +1,6 @@
 import { IntentsBuilder } from './intents';
 import { Language } from './language/language';
-import { LanguageSpecificValue, NodeConvertable } from './values/base';
+import { Value } from './values/base';
 import { Matcher, EncounterOptions } from './graph/matching';
 import { ResolvedIntent } from './resolver/resolved-intent';
 import { ResolvedIntents } from './resolver/ResolvedIntents';
@@ -54,7 +54,7 @@ export class ActionsBuilder {
 }
 
 export interface ActionBuilder {
-	value(id: string, type: LanguageSpecificValue | NodeConvertable): this;
+	value(id: string, type: Value): this;
 
 	add(...args: string[]): this;
 

src/intents.ts

@@ -1,6 +1,6 @@
 import { ResolverBuilder } from './resolver/builder';
 import { Language } from './language/language';
-import { NodeConvertable, LanguageSpecificValue } from './values/base';
+import { Value } from './values/base';
 
 export class IntentsBuilder {
 	private language: Language;
@@ -24,7 +24,7 @@ export class IntentsBuilder {
 		const self = this;
 		const instance = new ResolverBuilder(this.language, id);
 		return {
-			value(id: string, type: LanguageSpecificValue | NodeConvertable) {
+			value(id: string, type: Value) {
 				instance.value(id, type);
 				return this;
 			},
@@ -47,7 +47,7 @@ export class IntentsBuilder {
 }
 
 export interface IntentBuilder {
-	value(id: string, type: LanguageSpecificValue | NodeConvertable): this;
+	value(id: string, type: Value): this;
 
 	add(...args: string[]): this;
 

src/resolver/builder.ts

@@ -46,7 +46,7 @@ export class ResolverBuilder {
 		};
 	}
 
-	public value(id: string, type: LanguageSpecificValue | NodeConvertable) {
+	public value(id: string, type: LanguageSpecificValue<any> | NodeConvertable) {
 		this.parser.value(id, type);
 		return this;
 	}

src/resolver/parser.ts

@@ -4,7 +4,7 @@ import { Matcher, MatcherOptions, EncounterOptions } from '../graph/matching';
 import { TokenNode } from '../graph/token';
 import { ValueNode } from './value';
 
-import { LanguageSpecificValue, NodeConvertable } from '../values/base';
+import { LanguageSpecificValue, NodeConvertable, Value } from '../values/base';
 import { isDeepEqual } from '../utils/equality';
 import { Node } from '../graph/node';
 import { Language } from '../language/language';
@@ -29,7 +29,7 @@ export class ResolverParser<V, M=V[]> extends GraphBuilder<V, M> {
 		this.allowPartial();
 	}
 
-	public value(id: string, type: LanguageSpecificValue | NodeConvertable): this {
+	public value(id: string, type: Value): this {
 		let factory = type;
 		if(factory instanceof LanguageSpecificValue) {
 			factory = factory.create(this.language);

src/values/base.ts

@@ -2,7 +2,7 @@ import { ValueParserNode, ValueParserOptions } from '../resolver/value-parser';
 import { ValueNode, ValueNodeOptions } from '../resolver/value';
 import { Language } from '../language/language';
 import { Node } from '../graph/node';
-import { Matcher } from '../graph/matching';
+import { Matcher, EncounterOptions } from '../graph/matching';
 
 /**
  * Object that can be converted into a node within a graph.
@@ -14,12 +14,14 @@ export interface NodeConvertable {
 /**
  * Function that creates a convertable item for the given language.
  */
-export type LanguageSpecificFactory = (language: Language) => NodeConvertable;
+export type LanguageSpecificFactory<V> = (language: Language) => ParsingValue<V>;
 
-export class LanguageSpecificValue {
-	private factory: LanguageSpecificFactory;
+export type Value = LanguageSpecificValue<any> | NodeConvertable;
 
-	constructor(factory: LanguageSpecificFactory) {
+export class LanguageSpecificValue<V> {
+	private factory: LanguageSpecificFactory<V>;
+
+	constructor(factory: LanguageSpecificFactory<V>) {
 		this.factory = factory;
 	}
 
@@ -33,29 +35,25 @@ export class LanguageSpecificValue {
 	 * @param {Language} language
 	 */
 	public matcher(language: Language) {
-		/*
-		const parser = this.factory(language).parser;
-
-		return function(text, options) {
-			if(typeof text !== 'string') return Promise.resolve(null);
+		const value = this.factory(language);
 
-			return parser.match(text, options);
+		return function(text: string, options?: EncounterOptions) {
+			return value.matcher.match(text, options);
 		};
-		*/
 	}
 }
 
-export class ParsingValue {
-	private parser: Matcher<any>;
+export class ParsingValue<V> {
+	public matcher: Matcher<V>;
 	private options: ValueParserOptions;
 
-	constructor(parser: Matcher<any>, options?: ValueParserOptions) {
-		this.parser = parser;
+	constructor(parser: Matcher<V>, options?: ValueParserOptions) {
+		this.matcher = parser;
 		this.options = options || {};
 	}
 
 	public toNode(id: string) {
-		return new ValueParserNode(id, this.parser, this.options);
+		return new ValueParserNode(id, this.matcher, this.options);
 	}
 }
 

src/values/index.ts

@@ -1,6 +1,8 @@
 /**
  * Re-export all of the types of values available.
  */
+export * from './base';
+
 export * from './any';
 export * from './boolean';
 export * from './custom';

src/values/options.ts

@@ -1,7 +1,7 @@
 import { GraphBuilder } from '../graph/builder';
 import { ResolverBuilder } from '../resolver/builder';
 
-import { LanguageSpecificValue, ParsingValue, NodeConvertable } from './base';
+import { LanguageSpecificValue, ParsingValue, NodeConvertable, Value } from './base';
 import { ValueParserOptions } from '../resolver/value-parser';
 import { ResolvedIntent } from '../resolver/resolved-intent';
 import { ExpressionPart } from '../resolver/expression/ExpressionPart';
@@ -96,15 +96,15 @@ export function optionsValue(options: OptionBuilderOptions={}) {
 }
 
 export interface OptionBuilder {
-	value(id: string, type: LanguageSpecificValue | NodeConvertable): this;
+	value(id: string, type: Value): this;
 
 	add(...args: string[]): this;
 
 	done(): OptionsBuilder;
 }
 
 interface OptionData {
-	values: Record<string, LanguageSpecificValue | NodeConvertable>;
+	values: Record<string, Value>;
 	phrases: any[];
 }
 

test/value-matchers.test.ts

@@ -0,0 +1,18 @@
+import { en } from '../src/language/en';
+import { booleanValue } from '../src/values';
+
+describe('Value: Matchers', () => {
+
+	it('Can parse string', () => {
+		const matcher = booleanValue().matcher(en);
+		return matcher('yes')
+			.then(v => expect(v).toEqual(true));
+	});
+
+	it('Can handle invalid value', () => {
+		const matcher = booleanValue().matcher(en);
+		return matcher('cookies')
+			.then(v => expect(v).toEqual(null));
+	});
+
+});