add support for arrays to LiteralToBroad, fix static and dynamic abi …

…to primitive
latticexyz · Jun 23, 2023 · ce9f69e · ce9f69e
1 parent 942eff9
commit ce9f69e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/packages/schema-type/src/typescript/dynamicAbiTypes.ts b/packages/schema-type/src/typescript/dynamicAbiTypes.ts
@@ -1,5 +1,6 @@
 import { Hex } from "viem";
 import { StaticAbiType, DynamicAbiType } from "./schemaAbiTypes";
+import { LiteralToBroad } from "./utils";
 
 // Variable-length ABI types, where their lengths are encoded by a PackedCounter within the record
 
@@ -112,8 +113,9 @@ export const dynamicAbiTypeToDefaultValue = {
   string: "",
 } as const satisfies Record<DynamicAbiType, DynamicPrimitiveType>;
 
-export type DynamicAbiTypeToPrimitiveType<TDynamicAbiType extends DynamicAbiType = DynamicAbiType> =
-  (typeof dynamicAbiTypeToDefaultValue)[TDynamicAbiType];
+export type DynamicAbiTypeToPrimitiveType<TDynamicAbiType extends DynamicAbiType = DynamicAbiType> = LiteralToBroad<
+  (typeof dynamicAbiTypeToDefaultValue)[TDynamicAbiType]
+>;
 
 export type ArrayAbiTypeToStaticAbiType<T extends string> = T extends `${infer StaticAbiType}[]`
   ? StaticAbiType

diff --git a/packages/schema-type/src/typescript/schemaAbiTypeToPrimitiveType.ts b/packages/schema-type/src/typescript/schemaAbiTypeToPrimitiveType.ts
@@ -1,18 +1,6 @@
-import { Hex } from "viem";
 import { schemaAbiTypeToDefaultValue } from "./schemaAbiTypeToDefaultValue";
 import { SchemaAbiType } from "./schemaAbiTypes";
-
-type LiteralToBroad<T> = T extends number
-  ? number
-  : T extends bigint
-  ? bigint
-  : T extends Hex
-  ? Hex
-  : T extends boolean
-  ? boolean
-  : T extends string
-  ? string
-  : never;
+import { LiteralToBroad } from "./utils";
 
 export type SchemaAbiTypeToPrimitiveType<T extends SchemaAbiType> = LiteralToBroad<
   (typeof schemaAbiTypeToDefaultValue)[T]

diff --git a/packages/schema-type/src/typescript/staticAbiTypes.ts b/packages/schema-type/src/typescript/staticAbiTypes.ts
@@ -1,5 +1,6 @@
 import { Hex } from "viem";
 import { StaticAbiType } from "./schemaAbiTypes";
+import { LiteralToBroad } from "./utils";
 
 // Fixed-length ABI types
 
@@ -109,8 +110,9 @@ export const staticAbiTypeToDefaultValue = {
   address: "0x0000000000000000000000000000000000000000",
 } as const satisfies Record<StaticAbiType, StaticPrimitiveType>;
 
-export type StaticAbiTypeToPrimitiveType<TStaticAbiType extends StaticAbiType = StaticAbiType> =
-  (typeof staticAbiTypeToDefaultValue)[TStaticAbiType];
+export type StaticAbiTypeToPrimitiveType<TStaticAbiType extends StaticAbiType = StaticAbiType> = LiteralToBroad<
+  (typeof staticAbiTypeToDefaultValue)[TStaticAbiType]
+>;
 
 export const staticAbiTypeToByteLength = {
   uint8: 1,

diff --git a/packages/schema-type/src/typescript/utils.ts b/packages/schema-type/src/typescript/utils.ts
@@ -1,5 +1,21 @@
+import { Hex } from "viem";
+
 export type TupleSplit<T, N extends number, O extends readonly any[] = readonly []> = O["length"] extends N
   ? [O, T]
   : T extends readonly [infer F, ...infer R]
   ? TupleSplit<readonly [...R], N, readonly [...O, F]>
   : [O, T];
+
+export type LiteralToBroad<T> = T extends Array<infer Element>
+  ? LiteralToBroad<Element>[]
+  : T extends number
+  ? number
+  : T extends bigint
+  ? bigint
+  : T extends Hex
+  ? Hex
+  : T extends boolean
+  ? boolean
+  : T extends string
+  ? string
+  : never;