Skip to content

added functionality #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
topsinoty merged 2 commits into from
Apr 9, 2025
Merged

added functionality #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb9af77
fixed tag suggestions, dafts and favorites page...format
topsinoty Apr 9, 2025
967c809
fixed weird css on input
topsinoty Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,493 changes: 3,741 additions & 1,752 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

70 changes: 35 additions & 35 deletions src/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export class Api {
method: string,
endpoint: string,
response: Response,
duration: number
duration: number,
) {
if (!this.debugMode) return;

Expand All @@ -65,15 +65,15 @@ export class Api {
headers: Object.fromEntries(response.headers.entries()),
statusText: response.statusText,
body: await response.clone().json(),
}
},
);
}

private logError(
method: string,
endpoint: string,
error: Error,
duration: number
duration: number,
) {
if (!this.debugMode) return;

Expand All @@ -88,39 +88,39 @@ export class Api {
endpoint: string,
options: RequestInit,
schema: SchemaType,
includeHeaders: true
includeHeaders: true,
): Promise<{ data: ZodInfer<SchemaType>; headers: Headers }>;

async request<SchemaType extends ZodSchema>(
endpoint: string,
options: RequestInit,
schema: SchemaType,
includeHeaders?: false
includeHeaders?: false,
): Promise<ZodInfer<SchemaType>>;

async request(
endpoint: string,
options: RequestInit,
includeHeaders: true
includeHeaders: true,
): Promise<{ data: unknown; headers: Headers }>;

async request<DataType extends object>(
endpoint: string,
options: RequestInit,
includeHeaders: true
includeHeaders: true,
): Promise<{ data: DataType; headers: Headers }>;

async request(
endpoint: string,
options?: RequestInit,
includeHeaders?: boolean
includeHeaders?: boolean,
): Promise<unknown>;

async request<SchemaType extends ZodSchema>(
endpoint: string,
options: RequestInit = {},
schemaOrIncludeHeaders?: SchemaType | boolean,
includeHeadersFlag?: boolean
includeHeadersFlag?: boolean,
): Promise<unknown> {
const url = new URL(endpoint, this.baseUrl);
const controller = new AbortController();
Expand Down Expand Up @@ -170,7 +170,7 @@ export class Api {
throw new ApiError(
`Non-JSON response from ${url.href}`,
500,
"Invalid Content-Type"
"Invalid Content-Type",
);
}

Expand All @@ -183,7 +183,7 @@ export class Api {
if (!parseResult.success) {
throw new ValidationError(
`Response validation failed for ${url.href}`,
parseResult.error.issues
parseResult.error.issues,
);
}
parsedData = parseResult.data;
Expand Down Expand Up @@ -212,7 +212,7 @@ export class Api {
"Unknown error occurred",
0,
"UNKNOWN_ERROR",
String(error)
String(error),
);
} finally {
controller.abort();
Expand All @@ -223,25 +223,25 @@ export class Api {

async get<T>(
endpoint: string,
options: RequestInit & { includeHeaders: true }
options: RequestInit & { includeHeaders: true },
): Promise<{ data: T; headers: Headers }>;

async get<T>(
endpoint: string,
schema: ZodSchema<T>,
options?: RequestInit
options?: RequestInit,
): Promise<T>;

async get<T>(
endpoint: string,
schema: ZodSchema<T>,
options: RequestInit & { includeHeaders: true }
options: RequestInit & { includeHeaders: true },
): Promise<{ data: T; headers: Headers }>;

async get<T>(
endpoint: string,
arg1?: ZodSchema<T> | RequestInit,
arg2?: RequestInit
arg2?: RequestInit,
): Promise<T | { data: T; headers: Headers }> {
let options: RequestInit = {};
let includeHeaders = false;
Expand All @@ -264,34 +264,34 @@ export class Api {
async post<T>(
endpoint: string,
body: BodyInit | Record<string, unknown>,
options?: RequestInit
options?: RequestInit,
): Promise<T>;

async post<T>(
endpoint: string,
body: BodyInit | Record<string, unknown>,
options: RequestInit & { includeHeaders: true }
options: RequestInit & { includeHeaders: true },
): Promise<{ data: T; headers: Headers }>;

async post<T>(
endpoint: string,
body: BodyInit | Record<string, unknown>,
schema: ZodSchema<T>,
options?: RequestInit
options?: RequestInit,
): Promise<T>;

async post<T>(
endpoint: string,
body: BodyInit | Record<string, unknown>,
schema: ZodSchema<T>,
options: RequestInit & { includeHeaders: true }
options: RequestInit & { includeHeaders: true },
): Promise<{ data: T; headers: Headers }>;

async post<T>(
endpoint: string,
body: BodyInit | Record<string, unknown>,
arg1?: ZodSchema<T> | RequestInit,
arg2?: RequestInit
arg2?: RequestInit,
): Promise<T | { data: T; headers: Headers }> {
let schema: ZodSchema<T> | undefined;
let options: RequestInit = {};
Expand All @@ -312,7 +312,7 @@ export class Api {
this.cleanHeaders({
...this.defaultOptions.headers,
...options.headers,
})
}),
);

const isJson = !(body instanceof FormData) && !headers.has("Content-Type");
Expand All @@ -337,34 +337,34 @@ export class Api {
async put<T>(
endpoint: string,
body: BodyInit | Record<string, unknown>,
options?: RequestInit
options?: RequestInit,
): Promise<T>;

async put<T>(
endpoint: string,
body: BodyInit | Record<string, unknown>,
options: RequestInit & { includeHeaders: true }
options: RequestInit & { includeHeaders: true },
): Promise<{ data: T; headers: Headers }>;

async put<T>(
endpoint: string,
body: BodyInit | Record<string, unknown>,
schema: ZodSchema<T>,
options?: RequestInit
options?: RequestInit,
): Promise<T>;

async put<T>(
endpoint: string,
body: BodyInit | Record<string, unknown>,
schema: ZodSchema<T>,
options: RequestInit & { includeHeaders: true }
options: RequestInit & { includeHeaders: true },
): Promise<{ data: T; headers: Headers }>;

async put<T>(
endpoint: string,
body: BodyInit | Record<string, unknown>,
arg1?: ZodSchema<T> | RequestInit,
arg2?: RequestInit
arg2?: RequestInit,
): Promise<T | { data: T; headers: Headers }> {
let schema: ZodSchema<T> | undefined;
let options: RequestInit = {};
Expand All @@ -385,7 +385,7 @@ export class Api {
this.cleanHeaders({
...this.defaultOptions.headers,
...options.headers,
})
}),
);

const isJson = !(body instanceof FormData) && !headers.has("Content-Type");
Expand All @@ -411,25 +411,25 @@ export class Api {

async delete<T>(
endpoint: string,
options: RequestInit & { includeHeaders: true }
options: RequestInit & { includeHeaders: true },
): Promise<{ data: T; headers: Headers }>;

async delete<T>(
endpoint: string,
schema: ZodSchema<T>,
options?: RequestInit
options?: RequestInit,
): Promise<T>;

async delete<T>(
endpoint: string,
schema: ZodSchema<T>,
options: RequestInit & { includeHeaders: true }
options: RequestInit & { includeHeaders: true },
): Promise<{ data: T; headers: Headers }>;

async delete<T>(
endpoint: string,
arg1?: ZodSchema<T> | RequestInit,
arg2?: RequestInit
arg2?: RequestInit,
): Promise<T | { data: T; headers: Headers }> {
let schema: ZodSchema<T> | undefined;
let options: RequestInit = {};
Expand All @@ -449,20 +449,20 @@ export class Api {
return this.request(
endpoint,
{ ...options, method: "DELETE" },
includeHeaders
includeHeaders,
) as Promise<T | { data: T; headers: Headers }>;
}

private cleanHeaders(
headers: Record<string, unknown>
headers: Record<string, unknown>,
): Record<string, string> {
return Object.fromEntries(
Object.entries(headers)
.filter(([_, value]) => value !== undefined && value !== null)
.map(([key, value]) => [
key,
String(value as NonNullable<typeof value>),
])
]),
);
}
}
Expand Down
Loading
Loading