Remove type casting

elastic · Jul 25, 2024 · a5b2628 · a5b2628
1 parent 63262b0
commit a5b2628
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/...gine/prebuilt_rules/logic/diff/calculation/algorithms/multi_line_string_diff_algorithm.ts b/...gine/prebuilt_rules/logic/diff/calculation/algorithms/multi_line_string_diff_algorithm.ts
@@ -38,8 +38,7 @@ export const multiLineStringDiffAlgorithm = (
   const hasBaseVersion = baseVersion !== MissingVersion;
 
   const { mergeOutcome, conflict, mergedVersion } = mergeVersions({
-    hasBaseVersion,
-    baseVersion,
+    baseVersion: hasBaseVersion ? baseVersion : undefined,
     currentVersion,
     targetVersion,
     diffOutcome,
@@ -66,15 +65,13 @@ interface MergeResult {
 }
 
 interface MergeArgs {
-  hasBaseVersion: boolean;
-  baseVersion: string | MissingVersion;
+  baseVersion: string | undefined;
   currentVersion: string;
   targetVersion: string;
   diffOutcome: ThreeWayDiffOutcome;
 }
 
 const mergeVersions = ({
-  hasBaseVersion,
   baseVersion,
   currentVersion,
   targetVersion,
@@ -104,7 +101,7 @@ const mergeVersions = ({
     case ThreeWayDiffOutcome.CustomizedValueCanUpdate: {
       // TS does not realize that in ABC scenario, baseVersion cannot be missing
       // Missing baseVersion scenarios were handled as -AA and -AB.
-      const mergedVersion = merge(currentVersion, baseVersion as string, targetVersion, {
+      const mergedVersion = merge(currentVersion, baseVersion ?? '', targetVersion, {
         stringSeparator: /(\S+|\s+)/g, // Retains all whitespace, which we keep to preserve formatting
       });
 

diff --git a/...on_engine/prebuilt_rules/logic/diff/calculation/algorithms/scalar_array_diff_algorithm.ts b/...on_engine/prebuilt_rules/logic/diff/calculation/algorithms/scalar_array_diff_algorithm.ts
@@ -40,7 +40,6 @@ export const scalarArrayDiffAlgorithm = <TValue>(
   const hasBaseVersion = baseVersion !== MissingVersion;
 
   const { mergeOutcome, conflict, mergedVersion } = mergeVersions({
-    hasBaseVersion,
     baseVersion: hasBaseVersion ? baseVersion : undefined,
     currentVersion,
     targetVersion,
@@ -68,15 +67,13 @@ interface MergeResult<TValue> {
 }
 
 interface MergeArgs<TValue> {
-  hasBaseVersion: boolean;
   baseVersion: TValue[] | undefined;
   currentVersion: TValue[];
   targetVersion: TValue[];
   diffOutcome: ThreeWayDiffOutcome;
 }
 
 const mergeVersions = <TValue>({
-  hasBaseVersion,
   baseVersion,
   currentVersion,
   targetVersion,
@@ -108,10 +105,10 @@ const mergeVersions = <TValue>({
     }
 
     case ThreeWayDiffOutcome.CustomizedValueCanUpdate: {
-      const addedCurrent = difference(dedupedCurrentVersion, dedupedBaseVersion as TValue[]);
+      const addedCurrent = difference(dedupedCurrentVersion, dedupedBaseVersion);
       const removedCurrent = difference(dedupedBaseVersion, dedupedCurrentVersion);
 
-      const addedTarget = difference(dedupedTargetVersion, dedupedBaseVersion as TValue[]);
+      const addedTarget = difference(dedupedTargetVersion, dedupedBaseVersion);
       const removedTarget = difference(dedupedBaseVersion, dedupedTargetVersion);
 
       const bothAdded = union(addedCurrent, addedTarget);
@@ -125,7 +122,6 @@ const mergeVersions = <TValue>({
         mergeOutcome: ThreeWayMergeOutcome.Merged,
       };
     }
-
     // Scenario -AB is treated as scenario ABC, but marked as
     // SOLVABLE, and returns the target version as the merged version
     // https://github.com/elastic/kibana/pull/184889#discussion_r1636421293