Clean up legacy types

Author: pokey

packages/common/src/index.ts

@@ -73,6 +73,7 @@ export * from "./types/command/legacy/CommandV4.types";
 export * from "./types/command/legacy/targetDescriptorV2.types";
 export * from "./types/command/CommandV5.types";
 export * from "./types/command/legacy/PartialTargetDescriptorV3.types";
+export * from "./types/command/legacy/PartialTargetDescriptorV4.types";
 export * from "./types/CommandServerApi";
 export * from "./util/itertools";
 export * from "./extensionDependencies";

packages/common/src/types/command/legacy/PartialTargetDescriptorV4.types.ts

@@ -253,7 +253,7 @@ interface PositionModifier {
   position: TargetPosition;
 }
 
-interface PartialPrimitiveTargetDescriptor {
+export interface PartialPrimitiveTargetDescriptorV4 {
   type: "primitive";
   mark?: Mark;
   modifiers?: Modifier[];
@@ -326,26 +326,29 @@ type Modifier =
 // vertical puts a selection on each line vertically between the two targets
 type RangeType = "continuous" | "vertical";
 
-interface PartialRangeTargetDescriptor {
+export interface PartialRangeTargetDescriptorV4 {
   type: "range";
-  anchor: PartialPrimitiveTargetDescriptor | ImplicitTargetDescriptor;
-  active: PartialPrimitiveTargetDescriptor;
+  anchor: PartialPrimitiveTargetDescriptorV4 | ImplicitTargetDescriptor;
+  active: PartialPrimitiveTargetDescriptorV4;
   excludeAnchor: boolean;
   excludeActive: boolean;
   rangeType?: RangeType;
 }
 
 interface PartialListTargetDescriptor {
   type: "list";
-  elements: (PartialPrimitiveTargetDescriptor | PartialRangeTargetDescriptor)[];
+  elements: (
+    | PartialPrimitiveTargetDescriptorV4
+    | PartialRangeTargetDescriptorV4
+  )[];
 }
 
 interface ImplicitTargetDescriptor {
   type: "implicit";
 }
 
 export type PartialTargetDescriptorV4 =
-  | PartialPrimitiveTargetDescriptor
-  | PartialRangeTargetDescriptor
+  | PartialPrimitiveTargetDescriptorV4
+  | PartialRangeTargetDescriptorV4
   | PartialListTargetDescriptor
   | ImplicitTargetDescriptor;

packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV3ToV4/upgradeV3ToV4.ts

@@ -2,11 +2,11 @@ import {
   CommandV3,
   CommandV4,
   ImplicitTargetDescriptor,
-  PartialPrimitiveTargetDescriptor,
   PartialPrimitiveTargetDescriptorV3,
-  PartialRangeTargetDescriptor,
-  PartialTargetDescriptor,
+  PartialPrimitiveTargetDescriptorV4,
+  PartialRangeTargetDescriptorV4,
   PartialTargetDescriptorV3,
+  PartialTargetDescriptorV4,
 } from "@cursorless/common";
 
 export function upgradeV3ToV4(command: CommandV3): CommandV4 {
@@ -19,7 +19,7 @@ export function upgradeV3ToV4(command: CommandV3): CommandV4 {
 
 function upgradeTarget(
   target: PartialTargetDescriptorV3,
-): PartialTargetDescriptor {
+): PartialTargetDescriptorV4 {
   switch (target.type) {
     case "primitive":
       return upgradePrimitiveTarget(target);
@@ -36,8 +36,8 @@ function upgradeTarget(
       return {
         ...rest,
         elements: elements.map(upgradeTarget) as (
-          | PartialPrimitiveTargetDescriptor
-          | PartialRangeTargetDescriptor
+          | PartialPrimitiveTargetDescriptorV4
+          | PartialRangeTargetDescriptorV4
         )[],
       };
     }
@@ -46,7 +46,7 @@ function upgradeTarget(
 
 function upgradePrimitiveTarget(
   target: PartialPrimitiveTargetDescriptorV3,
-): PartialPrimitiveTargetDescriptor | ImplicitTargetDescriptor {
+): PartialPrimitiveTargetDescriptorV4 | ImplicitTargetDescriptor {
   if ((target.mark == null && target.modifiers == null) || target.isImplicit) {
     return { type: "implicit" };
   }