Fixes

Author: pokey

packages/cursorless-engine/src/generateSpokenForm/generateSpokenForm.ts

@@ -5,8 +5,8 @@ import {
   InsertionMode,
   PartialTargetDescriptor,
   ScopeType,
+  camelCaseToAllDown,
 } from "@cursorless/common";
-import { RecursiveArray } from "lodash";
 import { NoSpokenFormError } from "./NoSpokenFormError";
 import { actions } from "./defaultSpokenForms/actions";
 import { connectives } from "./defaultSpokenForms/connectives";
@@ -173,9 +173,7 @@ export class SpokenFormGenerator {
     }
   }
 
-  private handleTarget(
-    target: PartialTargetDescriptor,
-  ): RecursiveArray<string> {
+  private handleTarget(target: PartialTargetDescriptor): SpokenFormComponent {
     switch (target.type) {
       case "list":
         if (target.elements.length < 2) {
@@ -209,7 +207,7 @@ export class SpokenFormGenerator {
 
   private handleDestination(
     destination: DestinationDescriptor,
-  ): RecursiveArray<string> {
+  ): SpokenFormComponent {
     switch (destination.type) {
       case "list":
         if (destination.destinations.length < 2) {
@@ -251,12 +249,41 @@ function constructSpokenForms(component: SpokenFormComponent): string[] {
   }
 
   if (Array.isArray(component)) {
-    return constructSpokenFormsArray(component);
+    return cartesianProduct(component.map(constructSpokenForms)).map((words) =>
+      words.join(" "),
+    );
   }
+
+  if (component.spokenForms.length === 0) {
+    throw new NoSpokenFormError(
+      `${camelCaseToAllDown(component.spokenFormType)} with id ${
+        component.id
+      }; please see https://www.cursorless.org/docs/user/customization/ for more information`,
+    );
+  }
+
+  return component.spokenForms;
 }
 
-function cartesianProduct<T>(...arrays: T[][]): T[] {
-  return arrays.reduce((acc, val) =>
-    acc.flatMap((x) => val.map((y) => [...x, y])),
+/**
+ * Given an array of arrays, constructs all possible combinations of the
+ * elements of the arrays. For example, given [[1, 2], [3, 4]], returns [[1, 3],
+ * [1, 4], [2, 3], [2, 4]]. If any of the arrays are empty, returns an empty
+ * array.
+ * @param arrays The arrays to take the cartesian product of
+ */
+function cartesianProduct<T>(arrays: T[][]): T[][] {
+  if (arrays.length === 0) {
+    return [];
+  }
+
+  if (arrays.length === 1) {
+    return arrays[0].map((element) => [element]);
+  }
+
+  const [first, ...rest] = arrays;
+  const restCartesianProduct = cartesianProduct(rest);
+  return first.flatMap((element) =>
+    restCartesianProduct.map((restElement) => [element, ...restElement]),
   );
 }

packages/cursorless-engine/src/generateSpokenForm/primitiveTargetToSpokenForm.ts

@@ -20,7 +20,6 @@ import {
   numberToSpokenForm,
   ordinalToSpokenForm,
 } from "./defaultSpokenForms/numbers";
-import { surroundingPairNameToSpokenForm } from "./defaultSpokenForms/modifiers";
 import { characterToSpokenForm } from "./defaultSpokenForms/characters";
 import {
   GeneratorSpokenFormMap,
@@ -35,7 +34,7 @@ export class PrimitiveTargetSpokenFormGenerator {
   handlePrimitiveTarget(
     target: PartialPrimitiveTargetDescriptor,
   ): SpokenFormComponent {
-    const components: SpokenFormComponents = [];
+    const components: SpokenFormComponent[] = [];
     if (target.modifiers != null) {
       components.push(target.modifiers.map(this.handleModifier));
     }
@@ -147,7 +146,7 @@ export class PrimitiveTargetSpokenFormGenerator {
 
   private handleRelativeScopeInclusive(
     modifier: RelativeScopeModifier,
-  ): SpokenFormComponents {
+  ): SpokenFormComponent {
     const scope = this.handleScopeType(modifier.scopeType);
 
     if (modifier.length === 1) {
@@ -175,7 +174,7 @@ export class PrimitiveTargetSpokenFormGenerator {
 
   private handleRelativeScopeExclusive(
     modifier: RelativeScopeModifier,
-  ): SpokenFormComponents {
+  ): SpokenFormComponent {
     const scope = this.handleScopeType(modifier.scopeType);
     const direction =
       modifier.direction === "forward"
@@ -207,7 +206,7 @@ export class PrimitiveTargetSpokenFormGenerator {
     );
   }
 
-  handleScopeType(scopeType: ScopeType): SpokenForms {
+  handleScopeType(scopeType: ScopeType): SpokenFormComponent {
     switch (scopeType.type) {
       case "oneOf":
       case "customRegex":
@@ -220,10 +219,7 @@ export class PrimitiveTargetSpokenFormGenerator {
             `Scope type '${scopeType.type}' with delimiter 'collectionBoundary'`,
           );
         }
-        const pair = surroundingPairNameToSpokenForm(
-          this.spokenFormMap,
-          scopeType.delimiter,
-        );
+        const pair = this.spokenFormMap.pairedDelimiter[scopeType.delimiter];
         if (scopeType.forceDirection != null) {
           const direction =
             scopeType.forceDirection === "left"
@@ -239,7 +235,7 @@ export class PrimitiveTargetSpokenFormGenerator {
     }
   }
 
-  private handleMark(mark: PartialMark): SpokenFormComponents {
+  private handleMark(mark: PartialMark): SpokenFormComponent {
     switch (mark.type) {
       case "decoratedSymbol": {
         const [color, shape] = mark.symbolColor.split("-");
@@ -314,7 +310,28 @@ export class PrimitiveTargetSpokenFormGenerator {
   }
 }
 
+function pluralize(name: SpokenFormComponent): SpokenFormComponent {
+  if (typeof name === "string") {
+    return pluralizeString(name);
+  }
+
+  if (Array.isArray(name)) {
+    if (name.length === 0) {
+      return name;
+    }
+
+    const last = name[name.length - 1];
+
+    return [...name.slice(0, -1), pluralize(last)];
+  }
+
+  return {
+    ...name,
+    spokenForms: name.spokenForms.map(pluralizeString),
+  };
+}
+
 // FIXME: Properly pluralize
-function pluralize(name: string): string {
+function pluralizeString(name: string): string {
   return `${name}s`;
 }