PartialTargetDesc => PartialTargetDescriptor

Author: pokey

src/core/commandRunner/command.types.ts

@@ -1,4 +1,4 @@
-import { PartialTargetDesc } from "../../typings/targetDescriptor.types";
+import { PartialTargetDescriptor } from "../../typings/targetDescriptor.types";
 import { ActionType } from "../../actions/actions.types";
 import {
   CommandV0,
@@ -53,5 +53,5 @@ export interface CommandV2 {
    * A list of targets expected by the action. Inference will be run on the
    * targets
    */
-  targets: PartialTargetDesc[];
+  targets: PartialTargetDescriptor[];
 }

src/typings/targetDescriptor.types.ts

@@ -187,7 +187,7 @@ export interface PositionModifier {
   position: Position;
 }
 
-export interface PartialPrimitiveTargetDesc {
+export interface PartialPrimitiveTargetDescriptor {
   type: "primitive";
   mark?: Mark;
   modifiers?: Modifier[];
@@ -207,26 +207,27 @@ export type Modifier =
   | TrailingModifier
   | RawSelectionModifier;
 
-export interface PartialRangeTargetDesc {
+export interface PartialRangeTargetDescriptor {
   type: "range";
-  anchor: PartialPrimitiveTargetDesc;
-  active: PartialPrimitiveTargetDesc;
+  anchor: PartialPrimitiveTargetDescriptor;
+  active: PartialPrimitiveTargetDescriptor;
   excludeAnchor: boolean;
   excludeActive: boolean;
   rangeType?: RangeType;
 }
 
-export interface PartialListTargetDesc {
+export interface PartialListTargetDescriptor {
   type: "list";
-  elements: (PartialPrimitiveTargetDesc | PartialRangeTargetDesc)[];
+  elements: (PartialPrimitiveTargetDescriptor | PartialRangeTargetDescriptor)[];
 }
 
-export type PartialTargetDesc =
-  | PartialPrimitiveTargetDesc
-  | PartialRangeTargetDesc
-  | PartialListTargetDesc;
+export type PartialTargetDescriptor =
+  | PartialPrimitiveTargetDescriptor
+  | PartialRangeTargetDescriptor
+  | PartialListTargetDescriptor;
 
-export interface PrimitiveTargetDescriptor extends PartialPrimitiveTargetDesc {
+export interface PrimitiveTargetDescriptor
+  extends PartialPrimitiveTargetDescriptor {
   /**
    * The mark, eg "air", "this", "that", etc
    */

src/util/getPrimitiveTargets.ts

@@ -1,7 +1,7 @@
 import {
-  PartialPrimitiveTargetDesc,
-  PartialRangeTargetDesc,
-  PartialTargetDesc,
+  PartialPrimitiveTargetDescriptor,
+  PartialRangeTargetDescriptor,
+  PartialTargetDescriptor,
   PrimitiveTargetDescriptor,
   TargetDescriptor,
 } from "../typings/targetDescriptor.types";
@@ -13,13 +13,13 @@ import {
  * @param targets The targets to extract from
  * @returns A list of primitive targets
  */
-export function getPartialPrimitiveTargets(targets: PartialTargetDesc[]) {
+export function getPartialPrimitiveTargets(targets: PartialTargetDescriptor[]) {
   return targets.flatMap(getPartialPrimitiveTargetsHelper);
 }
 
 function getPartialPrimitiveTargetsHelper(
-  target: PartialTargetDesc
-): PartialPrimitiveTargetDesc[] {
+  target: PartialTargetDescriptor
+): PartialPrimitiveTargetDescriptor[] {
   switch (target.type) {
     case "primitive":
       return [target];
@@ -61,18 +61,22 @@ function getPrimitiveTargetsHelper(
  * @returns A list of primitive targets
  */
 export function transformPartialPrimitiveTargets(
-  targets: PartialTargetDesc[],
-  func: (target: PartialPrimitiveTargetDesc) => PartialPrimitiveTargetDesc
+  targets: PartialTargetDescriptor[],
+  func: (
+    target: PartialPrimitiveTargetDescriptor
+  ) => PartialPrimitiveTargetDescriptor
 ) {
   return targets.map((target) =>
     transformPartialPrimitiveTargetsHelper(target, func)
   );
 }
 
 function transformPartialPrimitiveTargetsHelper(
-  target: PartialTargetDesc,
-  func: (target: PartialPrimitiveTargetDesc) => PartialPrimitiveTargetDesc
-): PartialTargetDesc {
+  target: PartialTargetDescriptor,
+  func: (
+    target: PartialPrimitiveTargetDescriptor
+  ) => PartialPrimitiveTargetDescriptor
+): PartialTargetDescriptor {
   switch (target.type) {
     case "primitive":
       return func(target);
@@ -82,8 +86,8 @@ function transformPartialPrimitiveTargetsHelper(
         elements: target.elements.map(
           (element) =>
             transformPartialPrimitiveTargetsHelper(element, func) as
-              | PartialPrimitiveTargetDesc
-              | PartialRangeTargetDesc
+              | PartialPrimitiveTargetDescriptor
+              | PartialRangeTargetDescriptor
         ),
       };
     case "range":