(third) Refactor PluralValue to store the computed plural category

Author: stasm

experiments/stasm/third/example/example_list.ts

@@ -51,7 +51,10 @@ REGISTRY["PLURAL_LEN"] = function (
 		throw new TypeError();
 	}
 
-	return new PluralValue(elements.value.length);
+	// TODO(stasm): Cache PluralRules.
+	let pr = new Intl.PluralRules(ctx.locale);
+	let category = pr.select(elements.value.length);
+	return new PluralValue(category, elements.value.length);
 };
 
 REGISTRY["PEOPLE_LIST"] = function (

experiments/stasm/third/impl/context.ts

@@ -56,41 +56,35 @@ export class FormattingContext {
 	}
 
 	selectVariant(variants: Array<Variant>, selectors: Array<Selector>): Variant {
-		interface ResolvedSelector<T> {
-			value: T | null;
-			string: string | null;
+		interface ResolvedSelector {
+			value: RuntimeValue<unknown> | null;
 			default: string;
 		}
 
-		let resolved_selectors: Array<ResolvedSelector<unknown>> = [];
+		let resolved_selectors: Array<ResolvedSelector> = [];
 		for (let selector of selectors) {
 			if (selector.expr === null) {
 				// A special selector which only selects its default value. Used in the
 				// data model of single-variant messages.
 				resolved_selectors.push({
 					value: null,
-					string: null,
 					default: selector.default.value,
 				});
 				continue;
 			}
 
 			switch (selector.expr.type) {
 				case "VariableReference": {
-					let value = this.vars[selector.expr.name];
 					resolved_selectors.push({
-						value: value.value,
-						string: value.formatToString(this),
+						value: this.vars[selector.expr.name],
 						default: selector.default.value,
 					});
 					break;
 				}
 				case "FunctionCall": {
 					let callable = REGISTRY[selector.expr.name];
-					let value = callable(this, selector.expr.args, selector.expr.opts);
 					resolved_selectors.push({
-						value: value.value,
-						string: value.formatToString(this),
+						value: callable(this, selector.expr.args, selector.expr.opts),
 						default: selector.default.value,
 					});
 					break;
@@ -104,7 +98,7 @@ export class FormattingContext {
 		// TODO(stasm): Add NumberLiterals as keys (maybe).
 		function matches_corresponding_selector(key: StringLiteral, idx: number) {
 			return (
-				key.value === resolved_selectors[idx].string ||
+				key.value === resolved_selectors[idx].value?.value ||
 				key.value === resolved_selectors[idx].default
 			);
 		}

experiments/stasm/third/impl/registry.ts

@@ -25,7 +25,10 @@ function select_plural(
 		throw new TypeError();
 	}
 
-	return new PluralValue(count.value);
+	// TODO(stasm): Cache PluralRules.
+	let pr = new Intl.PluralRules(ctx.locale);
+	let category = pr.select(count.value);
+	return new PluralValue(category, count.value);
 }
 
 function get_phrase(

experiments/stasm/third/impl/runtime.ts

@@ -56,22 +56,20 @@ export class NumberValue extends RuntimeValue<number> {
 	}
 }
 
-export class PluralValue extends RuntimeValue<number> {
-	private opts: Intl.PluralRulesOptions;
+export class PluralValue extends RuntimeValue<Intl.LDMLPluralRule> {
+	private count: number;
 
-	constructor(value: number, opts: Intl.PluralRulesOptions = {}) {
+	constructor(value: Intl.LDMLPluralRule, count: number) {
 		super(value);
-		this.opts = opts;
+		this.count = count;
 	}
 
 	formatToString(ctx: FormattingContext): string {
-		// TODO(stasm): Cache PluralRules.
-		let pr = new Intl.PluralRules(ctx.locale, this.opts);
-		return pr.select(this.value);
+		throw new TypeError("PluralValue is not formattable.");
 	}
 
 	*formatToParts(ctx: FormattingContext): IterableIterator<FormattedPart> {
-		throw new TypeError("Pluralvalue is not formattable to parts.");
+		throw new TypeError("PluralValue is not formattable.");
 	}
 }