From 1b7a36bb9e6f982f508989d04adec7ccd419cd89 Mon Sep 17 00:00:00 2001
From: gvergnaud <gabriel.vergnaud@gmail.com>
Date: Wed, 12 Jul 2023 19:46:05 +0200
Subject: [PATCH] refactoring: simplify selection types

---
 src/internals/helpers.ts  |  2 +-
 src/types/FindSelected.ts | 55 ++++++++++++++-------------------------
 src/types/Pattern.ts      |  2 +-
 src/types/helpers.ts      |  2 +-
 4 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/src/internals/helpers.ts b/src/internals/helpers.ts
index 4c188988..3b36160b 100644
--- a/src/internals/helpers.ts
+++ b/src/internals/helpers.ts
@@ -138,4 +138,4 @@ export const getSelectionKeys = (pattern: any): string[] => {
 export const flatMap = <a, b>(
   xs: readonly a[],
   f: (v: a) => readonly b[]
-): b[] => xs.reduce<b[]>((acc, p) => acc.concat(f(p)), []);
+): b[] => xs.reduce<b[]>((acc, x) => acc.concat(f(x)), []);
diff --git a/src/types/FindSelected.ts b/src/types/FindSelected.ts
index ec813459..c2ac5b92 100644
--- a/src/types/FindSelected.ts
+++ b/src/types/FindSelected.ts
@@ -1,6 +1,12 @@
 import type * as symbols from '../internals/symbols';
 import type { AnyMatcher, Matcher, Pattern } from './Pattern';
-import type { Equal, Primitives, ValueOf, UnionToTuple } from './helpers';
+import type {
+  Equal,
+  Primitives,
+  ValueOf,
+  MergeUnion,
+  IsUnion,
+} from './helpers';
 
 type SelectionsRecord = Record<string, [unknown, unknown[]]>;
 
@@ -39,7 +45,7 @@ type FindSelectionUnionInArray<
   p,
   path extends any[] = [],
   output = never
-> = i extends readonly (infer ii)[]
+> = i extends readonly (infer iItem)[]
   ? p extends readonly []
     ? output
     : p extends readonly [infer p1, ...infer pRest]
@@ -51,10 +57,10 @@ type FindSelectionUnionInArray<
           output | FindSelectionUnion<i1, p1, [...path, p['length']]>
         >
       : FindSelectionUnionInArray<
-          ii[],
+          iItem[],
           pRest,
           [...path, p['length']],
-          output | FindSelectionUnion<ii, p1, [...path, p['length']]>
+          output | FindSelectionUnion<iItem, p1, [...path, p['length']]>
         >
     : p extends readonly [...infer pInit, infer p1]
     ? i extends readonly [...infer iInit, infer i1]
@@ -65,10 +71,10 @@ type FindSelectionUnionInArray<
           output | FindSelectionUnion<i1, p1, [...path, p['length']]>
         >
       : FindSelectionUnionInArray<
-          ii[],
+          iItem[],
           pInit,
           [...path, p['length']],
-          output | FindSelectionUnion<ii, p1, [...path, p['length']]>
+          output | FindSelectionUnion<iItem, p1, [...path, p['length']]>
         >
     : // If P is a matcher, in this case, it's likely an array matcher
     p extends readonly [...(readonly (infer pRest & AnyMatcher)[])]
@@ -76,7 +82,7 @@ type FindSelectionUnionInArray<
     :
         | output
         | FindSelectionUnion<
-            ii,
+            iItem,
             ValueOf<p>,
             [...path, Extract<p, readonly any[]>['length']]
           >
@@ -100,8 +106,8 @@ export type FindSelectionUnion<
       select: sel extends Some<infer k>
         ? { [kk in k]: [i, path] } | FindSelectionUnion<i, pattern, path>
         : never;
-      array: i extends readonly (infer ii)[]
-        ? MapList<FindSelectionUnion<ii, pattern>>
+      array: i extends readonly (infer iItem)[]
+        ? MapList<FindSelectionUnion<iItem, pattern>>
         : never;
       // FIXME: selection for map and set is supported at the value level
       map: never;
@@ -141,42 +147,19 @@ export type MixedNamedAndAnonymousSelectError<
 
 export type SelectionToArgs<selections extends SelectionsRecord> =
   symbols.anonymousSelectKey extends keyof selections
-    ? // If the path is never, it means several anonymous patterns were `&` together
-      [selections[symbols.anonymousSelectKey][1]] extends [never]
+    ? // if there are several different paths for anonymous selections
+      // it means that P.select() has been used more than once.
+      IsUnion<selections[symbols.anonymousSelectKey][1]> extends true
       ? SeveralAnonymousSelectError
       : keyof selections extends symbols.anonymousSelectKey
       ? selections[symbols.anonymousSelectKey][0]
       : MixedNamedAndAnonymousSelectError
     : { [k in keyof selections]: selections[k][0] };
 
-type ConcatSelections<
-  a extends SelectionsRecord,
-  b extends SelectionsRecord
-> = {
-  // keys both on output and sel
-  [k in keyof a & keyof b]: [a[k][0] | b[k][0], a[k][1] & b[k][1]]; // the path has to be the same
-} & {
-  // keys of a
-  [k in Exclude<keyof a, keyof b>]: a[k];
-} & {
-  // keyso of b
-  [k in Exclude<keyof b, keyof a>]: b[k];
-};
-
-type ReduceToRecord<
-  selections extends any[],
-  output extends SelectionsRecord = {}
-> = selections extends [infer sel, ...infer rest]
-  ? ReduceToRecord<
-      rest,
-      ConcatSelections<Extract<sel, SelectionsRecord>, output>
-    >
-  : output;
-
 export type Selections<i, p> = FindSelectionUnion<i, p> extends infer u
   ? [u] extends [never]
     ? i
-    : SelectionToArgs<ReduceToRecord<UnionToTuple<u>>>
+    : SelectionToArgs<Extract<MergeUnion<u>, SelectionsRecord>>
   : i;
 
 export type FindSelected<i, p> =
diff --git a/src/types/Pattern.ts b/src/types/Pattern.ts
index 8e18d8fe..2f752204 100644
--- a/src/types/Pattern.ts
+++ b/src/types/Pattern.ts
@@ -157,7 +157,7 @@ type KnownPatternInternal<
 > =
   | primitives
   | PatternMatcher<a>
-  | ([objs] extends [never] ? never : ObjectPattern<MergeUnion<objs>>)
+  | ([objs] extends [never] ? never : ObjectPattern<Readonly<MergeUnion<objs>>>)
   | ([arrays] extends [never] ? never : ArrayPattern<arrays>);
 
 type ObjectPattern<a> =
diff --git a/src/types/helpers.ts b/src/types/helpers.ts
index f106820e..db41be64 100644
--- a/src/types/helpers.ts
+++ b/src/types/helpers.ts
@@ -226,7 +226,7 @@ type AllKeys<a> = a extends any ? keyof a : never;
 // Merge unions of objects into a single object with unions of keys
 export type MergeUnion<a> =
   | {
-      readonly [k in AllKeys<a>]: a extends any
+      [k in AllKeys<a>]: a extends any
         ? k extends keyof a
           ? a[k]
           : never