refactor(experimental): use DrainOuterGeneric helper on codec type ma…

…ppings
solana-labs · Mar 15, 2024 · 2206d24 · 2206d24
1 parent cbebf37
commit 2206d24
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/packages/codecs-data-structures/src/data-enum.ts b/packages/codecs-data-structures/src/data-enum.ts
@@ -17,7 +17,7 @@ import {
     SolanaError,
 } from '@solana/errors';
 
-import { getMaxSize, maxCodecSizes, sumCodecSizes } from './utils';
+import { DrainOuterGeneric, getMaxSize, maxCodecSizes, sumCodecSizes } from './utils';
 
 /**
  * Defines a data enum using discriminated union types.
@@ -74,21 +74,21 @@ export type DataEnumCodecConfig<TDiscriminator = NumberCodec | NumberDecoder | N
 type Variants<T> = readonly (readonly [string, T])[];
 type ArrayIndices<T extends readonly unknown[]> = Exclude<Partial<T>['length'], T['length']> & number;
 
-type GetEncoderTypeFromVariants<TVariants extends Variants<Encoder<any>>> = {
+type GetEncoderTypeFromVariants<TVariants extends Variants<Encoder<any>>> = DrainOuterGeneric<{
     [I in ArrayIndices<TVariants>]: (TVariants[I][1] extends Encoder<infer TFrom>
         ? TFrom extends object
             ? TFrom
             : object
         : never) & { __kind: TVariants[I][0] };
-}[ArrayIndices<TVariants>];
+}>[ArrayIndices<TVariants>];
 
-type GetDecoderTypeFromVariants<TVariants extends Variants<Decoder<any>>> = {
+type GetDecoderTypeFromVariants<TVariants extends Variants<Decoder<any>>> = DrainOuterGeneric<{
     [I in ArrayIndices<TVariants>]: (TVariants[I][1] extends Decoder<infer TTo>
         ? TTo extends object
             ? TTo
             : object
         : never) & { __kind: TVariants[I][0] };
-}[ArrayIndices<TVariants>];
+}>[ArrayIndices<TVariants>];
 
 /**
  * Creates a data enum encoder.

diff --git a/packages/codecs-data-structures/src/struct.ts b/packages/codecs-data-structures/src/struct.ts
@@ -15,18 +15,18 @@ import {
     VariableSizeEncoder,
 } from '@solana/codecs-core';
 
-import { getFixedSize, getMaxSize, sumCodecSizes } from './utils';
+import { DrainOuterGeneric, getFixedSize, getMaxSize, sumCodecSizes } from './utils';
 
 type Fields<T> = readonly (readonly [string, T])[];
 type ArrayIndices<T extends readonly unknown[]> = Exclude<Partial<T>['length'], T['length']> & number;
 
-type GetEncoderTypeFromFields<TFields extends Fields<Encoder<any>>> = {
+type GetEncoderTypeFromFields<TFields extends Fields<Encoder<any>>> = DrainOuterGeneric<{
     [I in ArrayIndices<TFields> as TFields[I][0]]: TFields[I][1] extends Encoder<infer TFrom> ? TFrom : never;
-};
+}>;
 
-type GetDecoderTypeFromFields<TFields extends Fields<Decoder<any>>> = {
+type GetDecoderTypeFromFields<TFields extends Fields<Decoder<any>>> = DrainOuterGeneric<{
     [I in ArrayIndices<TFields> as TFields[I][0]]: TFields[I][1] extends Decoder<infer TTo> ? TTo : never;
-};
+}>;
 
 /**
  * Creates a encoder for a custom object.

diff --git a/packages/codecs-data-structures/src/utils.ts b/packages/codecs-data-structures/src/utils.ts
@@ -1,5 +1,7 @@
 import { isFixedSize } from '@solana/codecs-core';
 
+export type DrainOuterGeneric<T> = [T] extends [unknown] ? T : never;
+
 export function maxCodecSizes(sizes: (number | null)[]): number | null {
     return sizes.reduce(
         (all, size) => (all === null || size === null ? null : Math.max(all, size)),