Merge pull request #54 from GW2Treasures/feature/undefined-schema

Fix type resolution for undefined schema
GW2Treasures · Jul 22, 2024 · d925819 · d925819
2 parents 7644f93 + 900aefc
commit d925819
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/.changeset/red-hornets-help.md b/.changeset/red-hornets-help.md
@@ -0,0 +1,5 @@
+---
+"@gw2api/types": patch
+---
+
+Fix type resolution for undefined schema
diff --git a/packages/types/data/account.ts b/packages/types/data/account.ts
@@ -1,6 +1,7 @@
 import type { SchemaAfter, SchemaVersion } from "../schema";
 
 export type Account<Schema extends SchemaVersion = undefined> =
+  Schema extends undefined ? AccountBase :
   Schema extends SchemaAfter<'2019-12-19T00:00:00.000Z'> | 'latest' ? Account_2019_12_19 :
   Schema extends SchemaAfter<'2019-02-21T00:00:00.000Z'> ? Account_2019_02_21 :
   AccountBase;

diff --git a/packages/types/data/item.ts b/packages/types/data/item.ts
@@ -1,6 +1,7 @@
 import type { SchemaAfter, SchemaVersion } from "../schema";
 
 export type Item<Schema extends SchemaVersion = undefined> =
+  Schema extends undefined ? ItemBase :
   Schema extends SchemaAfter<'2020-11-17T00:30:00.000Z'> | 'latest' ? Item_2020_11_17 :
   ItemBase;
 

diff --git a/packages/types/data/tokeninfo.ts b/packages/types/data/tokeninfo.ts
@@ -1,6 +1,7 @@
 import type { SchemaAfter, SchemaVersion } from "../schema";
 
 export type Tokeninfo<Schema extends SchemaVersion = undefined> =
+  Schema extends undefined ? TokeninfoBase :
   Schema extends SchemaAfter<'2019-05-22T00:00:00.000Z'> | 'latest' ? Tokeninfo_2019_05_22 :
   TokeninfoBase;