(third) Use an empty keys array in single-variant messages

Author: stasm

experiments/stasm/third/example/example_glossary.ts

@@ -111,10 +111,10 @@ console.log("==== English ====");
 		lang: "en",
 		id: "accord",
 		phrases: {},
-		selectors: [{expr: null, default: {type: "StringLiteral", value: "default"}}],
+		selectors: [],
 		variants: [
 			{
-				keys: [{type: "StringLiteral", value: "default"}],
+				keys: [],
 				value: [
 					{type: "StringLiteral", value: "The "},
 					{
@@ -157,10 +157,10 @@ console.log("==== English ====");
 		lang: "en",
 		id: "you-see",
 		phrases: {},
-		selectors: [{expr: null, default: {type: "StringLiteral", value: "default"}}],
+		selectors: [],
 		variants: [
 			{
-				keys: [{type: "StringLiteral", value: "default"}],
+				keys: [],
 				value: [
 					{type: "StringLiteral", value: "You see "},
 					{
@@ -188,10 +188,10 @@ console.log("==== English ====");
 		lang: "en",
 		id: "they-wave",
 		phrases: {},
-		selectors: [{expr: null, default: {type: "StringLiteral", value: "default"}}],
+		selectors: [],
 		variants: [
 			{
-				keys: [{type: "StringLiteral", value: "default"}],
+				keys: [],
 				value: [
 					{
 						type: "FunctionCall",
@@ -221,10 +221,10 @@ console.log("==== polski ====");
 		lang: "pl",
 		id: "accord",
 		phrases: {},
-		selectors: [{expr: null, default: {type: "StringLiteral", value: "default"}}],
+		selectors: [],
 		variants: [
 			{
-				keys: [{type: "StringLiteral", value: "default"}],
+				keys: [],
 				value: [
 					{
 						type: "FunctionCall",
@@ -261,10 +261,10 @@ console.log("==== polski ====");
 		lang: "pl",
 		id: "you-see",
 		phrases: {},
-		selectors: [{expr: null, default: {type: "StringLiteral", value: "default"}}],
+		selectors: [],
 		variants: [
 			{
-				keys: [{type: "StringLiteral", value: "default"}],
+				keys: [],
 				value: [
 					{type: "StringLiteral", value: "Widzisz "},
 					{
@@ -292,10 +292,10 @@ console.log("==== polski ====");
 		lang: "pl",
 		id: "they-wave",
 		phrases: {},
-		selectors: [{expr: null, default: {type: "StringLiteral", value: "default"}}],
+		selectors: [],
 		variants: [
 			{
-				keys: [{type: "StringLiteral", value: "default"}],
+				keys: [],
 				value: [
 					{
 						type: "FunctionCall",

experiments/stasm/third/example/example_number.ts

@@ -9,15 +9,10 @@ console.log("==== English ====");
 		lang: "en",
 		id: "transferred",
 		phrases: {},
-		selectors: [
-			{
-				expr: null,
-				default: {type: "StringLiteral", value: "default"},
-			},
-		],
+		selectors: [],
 		variants: [
 			{
-				keys: [{type: "StringLiteral", value: "default"}],
+				keys: [],
 				value: [
 					{type: "StringLiteral", value: "Transferred "},
 					{
@@ -49,15 +44,10 @@ console.log("==== French ====");
 		lang: "fr",
 		id: "transferred",
 		phrases: {},
-		selectors: [
-			{
-				expr: null,
-				default: {type: "StringLiteral", value: "default"},
-			},
-		],
+		selectors: [],
 		variants: [
 			{
-				keys: [{type: "StringLiteral", value: "default"}],
+				keys: [],
 				value: [
 					{
 						type: "FunctionCall",

experiments/stasm/third/example/example_opaque.ts

@@ -24,15 +24,10 @@ console.log("==== English ====");
 		lang: "en",
 		id: "submit",
 		phrases: {},
-		selectors: [
-			{
-				expr: null,
-				default: {type: "StringLiteral", value: "default"},
-			},
-		],
+		selectors: [],
 		variants: [
 			{
-				keys: [{type: "StringLiteral", value: "default"}],
+				keys: [],
 				value: [
 					{type: "StringLiteral", value: "Ready? Then  "},
 					{

experiments/stasm/third/example/example_phrases.ts

@@ -58,10 +58,10 @@ console.log("==== English ====");
 				],
 			},
 		},
-		selectors: [{expr: null, default: {type: "StringLiteral", value: "default"}}],
+		selectors: [],
 		variants: [
 			{
-				keys: [{type: "StringLiteral", value: "default"}],
+				keys: [],
 				value: [
 					{type: "VariableReference", name: "userName"},
 					{type: "StringLiteral", value: " "},

experiments/stasm/third/impl/context.ts

@@ -65,22 +65,12 @@ export class FormattingContext {
 
 	selectVariant(variants: Array<Variant>, selectors: Array<Selector>): Variant {
 		interface ResolvedSelector {
-			value: RuntimeValue<unknown> | null;
+			value: RuntimeValue<unknown>;
 			default: string;
 		}
 
 		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,
-					default: selector.default.value,
-				});
-				continue;
-			}
-
 			switch (selector.expr.type) {
 				case "VariableReference": {
 					resolved_selectors.push({
@@ -107,7 +97,7 @@ export class FormattingContext {
 			let selector = resolved_selectors[idx];
 			switch (key.type) {
 				case "StringLiteral": {
-					if (key.value === selector.value?.value) {
+					if (key.value === selector.value.value) {
 						return true;
 					}
 					break;
@@ -131,6 +121,8 @@ export class FormattingContext {
 		}
 
 		for (let variant of variants) {
+			// When keys is an empty array, every() always returns true. This is
+			// used single-variant messages to return their only variant.
 			if (variant.keys.every(matches_corresponding_selector)) {
 				return variant;
 			}

experiments/stasm/third/impl/model.ts

@@ -12,7 +12,7 @@ export interface Phrase {
 }
 
 export interface Selector {
-	expr: VariableReference | FunctionCall | null;
+	expr: VariableReference | FunctionCall;
 	default: StringLiteral;
 }