@brickset-api/types 0.0.8 → 0.0.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @brickset-api/types
 
+## 0.0.9
+
+### Patch Changes
+
+- 92ab17b: Update types
+
 ## 0.0.8
 
 ### Patch Changes

package/data/get-sets.ts

@@ -1,4 +1,4 @@
-export type GetSets = GetSets_Response;
+export type GetSets = GetSetsResponse;
 
 export type Item = ItemBase;
 
@@ -23,7 +23,7 @@ export type GetSetsOptions = {
   extendedData?: boolean;
 };
 
-interface GetSets_Response {
+interface GetSetsResponse {
   message?: string;
   status: string;
   matches?: number;

package/endpoints.ts

@@ -1,13 +1,10 @@
 import type { GetSets } from "./data/get-sets";
 
-// options
-type Options = {};
-
 export type KnownAuthenticatedEndpoint =
-  | '/v3.asmx/setCollection';
+  | '/setCollection';
 
 export type KnownUnauthorizedEndpoint =
-  | '/v3.asmx/getSets';
+  | '/getSets';
 
 export type KnownEndpoint = KnownAuthenticatedEndpoint | KnownUnauthorizedEndpoint;
 
@@ -17,9 +14,19 @@ type CombineParameters<P1 extends string, P2 extends string> = `${P1}&${P2}` | `
 type WithParameters<Url extends string, Parameters extends string | undefined> =
   Parameters extends undefined ? Url : `${Url}?${Parameters}`;
 
-  // helper for paginated endpoints
-  type PaginationParameters = `pageNumber=${number}` | CombineParameters<`pageNumber=${number}`, `pageSize=${number}`>;
-  type PaginatedEndpointUrl<Endpoint extends KnownEndpoint> = Endpoint | WithParameters<Endpoint, PaginationParameters>;
+// helper for paginated endpoints
+type PaginationParameters = `pageNumber=${number}` | CombineParameters<`pageNumber=${number}`, `pageSize=${number}`>;
+type PaginatedEndpointUrl<Endpoint extends KnownEndpoint> = Endpoint | WithParameters<Endpoint, PaginationParameters>;
+
+// helper for endpoints with parameters
+type ParamsParameter = `params=${string}`;
+type EndpointWithParams<Endpoint extends KnownEndpoint> = WithParameters<Endpoint, ParamsParameter>;
+
+type BulkExpandedManyEndpointUrl<Endpoint extends KnownEndpoint> = EndpointWithParams<Endpoint>;
+type BulkExpandedEndpointUrl<Endpoint extends KnownEndpoint> = BulkExpandedManyEndpointUrl<Endpoint> | Endpoint;
+
+// options
+type Options = {};
 
 export type ApiKeyOptions = {
   apiKey: string;
@@ -30,13 +37,15 @@ export type AuthenticatedOptions = ApiKeyOptions &{
 };
 
 export type OptionsByEndpoint<Endpoint extends string> =
+  Endpoint extends BulkExpandedEndpointUrl<KnownEndpoint & KnownUnauthorizedEndpoint> ? Options & ApiKeyOptions :
   Endpoint extends KnownAuthenticatedEndpoint ? Options & AuthenticatedOptions :
   Endpoint extends KnownUnauthorizedEndpoint ? Options & ApiKeyOptions :
+  Endpoint extends KnownEndpoint ? Options & ApiKeyOptions :
   ApiKeyOptions & Partial<AuthenticatedOptions>;
 
 // result type for endpoint
 export type EndpointType<Url extends KnownEndpoint | (string & {})> =
-  Url extends '/v3.asmx/getSets' ? GetSets :
+  Url extends BulkExpandedEndpointUrl<'/getSets'> ? GetSets :
   unknown;
 
 export type ValidateEndpointUrl<T extends string> = unknown extends EndpointType<T> ? 'unknown endpoint url' : T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brickset-api/types",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "TypeScript types for all datastructures used by the Brickset API",
   "license": "MIT",
   "repository": {