Fix tests

Author: pokey

packages/cursorless-engine/src/DefaultSpokenFormMap.ts

@@ -1,5 +1,6 @@
 import { mapValues } from "lodash";
 import {
+  PartialSpokenFormTypes,
   SpokenFormMap,
   SpokenFormMapEntry,
   SpokenFormMapKeyTypes,
@@ -153,9 +154,11 @@ export interface DefaultSpokenFormMapEntry {
 }
 
 export type DefaultSpokenFormMap = {
-  readonly [K in keyof SpokenFormMapKeyTypes]: Readonly<
-    Record<SpokenFormMapKeyTypes[K], DefaultSpokenFormMapEntry>
-  >;
+  readonly [K in keyof SpokenFormMapKeyTypes]: K extends PartialSpokenFormTypes
+    ? Readonly<
+        Partial<Record<SpokenFormMapKeyTypes[K], DefaultSpokenFormMapEntry>>
+      >
+    : Record<SpokenFormMapKeyTypes[K], DefaultSpokenFormMapEntry>;
 };
 
 // FIXME: Don't cast here; need to make our own mapValues with stronger typing

packages/cursorless-engine/src/SpokenFormMap.ts

@@ -58,6 +58,13 @@ export interface SpokenFormMapKeyTypes {
 
 export type SpokenFormType = keyof SpokenFormMapKeyTypes;
 
+/**
+ * These are the types of spoken forms that are not total mappings, eg if you
+ * look up a string in `spokenFormMap.customRegex`, you might get `undefined`,
+ * even though technically the identifier type is `string`.
+ */
+export type PartialSpokenFormTypes = "customRegex";
+
 export interface SpokenFormMapEntry {
   /**
    * The spoken forms for this entry. These could either be a user's custom
@@ -102,7 +109,7 @@ export interface SpokenFormMapEntry {
  * the value is a map of identifiers to {@link SpokenFormMapEntry}s.
  */
 export type SpokenFormMap = {
-  readonly [K in keyof SpokenFormMapKeyTypes]: Readonly<
-    Record<SpokenFormMapKeyTypes[K], SpokenFormMapEntry>
-  >;
+  readonly [K in keyof SpokenFormMapKeyTypes]: K extends PartialSpokenFormTypes
+    ? Readonly<Partial<Record<SpokenFormMapKeyTypes[K], SpokenFormMapEntry>>>
+    : Readonly<Record<SpokenFormMapKeyTypes[K], SpokenFormMapEntry>>;
 };

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

@@ -1,15 +1,15 @@
 import {
+  PartialSpokenFormMapKeys,
   SpokenFormMap,
   SpokenFormMapEntry,
   SpokenFormMapKeyTypes,
   SpokenFormType,
 } from "../SpokenFormMap";
 
 export type GeneratorSpokenFormMap = {
-  readonly [K in keyof SpokenFormMapKeyTypes]: Record<
-    SpokenFormMapKeyTypes[K],
-    SingleTermSpokenForm
-  >;
+  readonly [K in keyof SpokenFormMapKeyTypes]: K extends PartialSpokenFormMapKeys
+    ? Partial<Record<SpokenFormMapKeyTypes[K], SingleTermSpokenForm>>
+    : Record<SpokenFormMapKeyTypes[K], SingleTermSpokenForm>;
 };
 
 export interface SingleTermSpokenForm {

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

@@ -229,8 +229,14 @@ export class PrimitiveTargetSpokenFormGenerator {
       case "customRegex":
         return (
           this.spokenFormMap.customRegex[scopeType.regex] ?? {
-            type: "singleTerm",
-            spokenForms: [],
+            type: "customizable",
+            spokenForms: {
+              spokenForms: [],
+              isCustom: true,
+              defaultSpokenForms: [],
+              requiresTalonUpdate: false,
+              isSecret: false,
+            },
             spokenFormType: "customRegex",
             id: scopeType.regex,
           }