Skip to content

Commit 29e907c

Browse files
fern-supportfern-support
committed
Revert "Release 0.0.12"
This reverts commit 18b679f.
1 parent 18b679f commit 29e907c

19 files changed

+288
-378
lines changed

‎src/Client.ts

+74-81
Large diffs are not rendered by default.

‎src/api/client/requests/ConvertDocxRequest.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* This file was auto-generated by Fern from our API Definition.
33
*/
44

5-
import * as Fileforge from "../../index";
5+
import * as FileForge from "../../index";
66

77
/**
88
* @example
@@ -34,5 +34,5 @@ export interface ConvertDocxRequest {
3434
*
3535
* There will not be an error if a variable is not found in the document, nor if variables found in the document are not in the options.
3636
*/
37-
options: Fileforge.ConvertDocxRequestOptions;
37+
options: FileForge.ConvertDocxRequestOptions;
3838
}

‎src/api/client/requests/GenerateRequest.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
* This file was auto-generated by Fern from our API Definition.
33
*/
44

5-
import * as Fileforge from "../../index";
5+
import * as FileForge from "../../index";
66

77
/**
88
* @example
99
* {}
1010
*/
1111
export interface GenerateRequest {
1212
/** Conversion options. This field is required even if empty. */
13-
options: Fileforge.GenerateRequestOptions;
13+
options: FileForge.GenerateRequestOptions;
1414
}

‎src/api/client/requests/MergeRequest.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
* This file was auto-generated by Fern from our API Definition.
33
*/
44

5-
import * as Fileforge from "../../index";
5+
import * as FileForge from "../../index";
66

77
/**
88
* @example
99
* {}
1010
*/
1111
export interface MergeRequest {
12-
options: Fileforge.MergeRequestOptions;
12+
options: FileForge.MergeRequestOptions;
1313
}

‎src/api/errors/BadGatewayError.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
*/
44

55
import * as errors from "../../errors/index";
6-
import * as Fileforge from "../index";
6+
import * as FileForge from "../index";
77

8-
export class BadGatewayError extends errors.FileforgeError {
9-
constructor(body: Fileforge.ErrorSchema) {
8+
export class BadGatewayError extends errors.FileForgeError {
9+
constructor(body: FileForge.ErrorSchema) {
1010
super({
1111
message: "BadGatewayError",
1212
statusCode: 502,

‎src/api/errors/BadRequestError.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
*/
44

55
import * as errors from "../../errors/index";
6-
import * as Fileforge from "../index";
6+
import * as FileForge from "../index";
77

8-
export class BadRequestError extends errors.FileforgeError {
9-
constructor(body: Fileforge.ErrorSchema) {
8+
export class BadRequestError extends errors.FileForgeError {
9+
constructor(body: FileForge.ErrorSchema) {
1010
super({
1111
message: "BadRequestError",
1212
statusCode: 400,

‎src/api/errors/InternalServerError.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import * as errors from "../../errors/index";
66

7-
export class InternalServerError extends errors.FileforgeError {
7+
export class InternalServerError extends errors.FileForgeError {
88
constructor(body?: unknown) {
99
super({
1010
message: "InternalServerError",

‎src/api/errors/UnauthorizedError.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
*/
44

55
import * as errors from "../../errors/index";
6-
import * as Fileforge from "../index";
6+
import * as FileForge from "../index";
77

8-
export class UnauthorizedError extends errors.FileforgeError {
9-
constructor(body: Fileforge.ErrorSchema) {
8+
export class UnauthorizedError extends errors.FileForgeError {
9+
constructor(body: FileForge.ErrorSchema) {
1010
super({
1111
message: "UnauthorizedError",
1212
statusCode: 401,

‎src/core/fetcher/Fetcher.ts

+14-88
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { default as FormData } from "form-data";
12
import qs from "qs";
23
import { RUNTIME } from "../runtime";
34
import { APIResponse } from "./APIResponse";
@@ -15,7 +16,6 @@ export declare namespace Fetcher {
1516
timeoutMs?: number;
1617
maxRetries?: number;
1718
withCredentials?: boolean;
18-
abortSignal?: AbortSignal;
1919
responseType?: "json" | "blob" | "streaming" | "text";
2020
}
2121

@@ -67,28 +67,13 @@ async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIResponse
6767
: args.url;
6868

6969
let body: BodyInit | undefined = undefined;
70-
const maybeStringifyBody = (body: any) => {
71-
if (body instanceof Uint8Array) {
72-
return body;
73-
} else {
74-
return JSON.stringify(body);
75-
}
76-
};
77-
78-
if (RUNTIME.type === "node") {
79-
if (args.body instanceof (await import("formdata-node")).FormData) {
80-
// @ts-expect-error
81-
body = args.body;
82-
} else {
83-
body = maybeStringifyBody(args.body);
84-
}
70+
if (args.body instanceof FormData) {
71+
// @ts-expect-error
72+
body = args.body;
73+
} else if (args.body instanceof Uint8Array) {
74+
body = args.body;
8575
} else {
86-
if (args.body instanceof (await import("form-data")).default) {
87-
// @ts-expect-error
88-
body = args.body;
89-
} else {
90-
body = maybeStringifyBody(args.body);
91-
}
76+
body = JSON.stringify(args.body);
9277
}
9378

9479
// In Node.js environments, the SDK always uses`node-fetch`.
@@ -104,33 +89,21 @@ async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIResponse
10489
: ((await import("node-fetch")).default as any);
10590

10691
const makeRequest = async (): Promise<Response> => {
107-
const signals: AbortSignal[] = [];
108-
109-
// Add timeout signal
110-
let timeoutAbortId: NodeJS.Timeout | undefined = undefined;
92+
const controller = new AbortController();
93+
let abortId = undefined;
11194
if (args.timeoutMs != null) {
112-
const { signal, abortId } = getTimeoutSignal(args.timeoutMs);
113-
timeoutAbortId = abortId;
114-
signals.push(signal);
95+
abortId = setTimeout(() => controller.abort(), args.timeoutMs);
11596
}
116-
117-
// Add arbitrary signal
118-
if (args.abortSignal != null) {
119-
signals.push(args.abortSignal);
120-
}
121-
12297
const response = await fetchFn(url, {
12398
method: args.method,
12499
headers,
125100
body,
126-
signal: anySignal(signals),
101+
signal: controller.signal,
127102
credentials: args.withCredentials ? "include" : undefined,
128103
});
129-
130-
if (timeoutAbortId != null) {
131-
clearTimeout(timeoutAbortId);
104+
if (abortId != null) {
105+
clearTimeout(abortId);
132106
}
133-
134107
return response;
135108
};
136109

@@ -194,15 +167,7 @@ async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIResponse
194167
};
195168
}
196169
} catch (error) {
197-
if (args.abortSignal != null && args.abortSignal.aborted) {
198-
return {
199-
ok: false,
200-
error: {
201-
reason: "unknown",
202-
errorMessage: "The user aborted a request",
203-
},
204-
};
205-
} else if (error instanceof Error && error.name === "AbortError") {
170+
if (error instanceof Error && error.name === "AbortError") {
206171
return {
207172
ok: false,
208173
error: {
@@ -229,43 +194,4 @@ async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIResponse
229194
}
230195
}
231196

232-
const TIMEOUT = "timeout";
233-
234-
function getTimeoutSignal(timeoutMs: number): { signal: AbortSignal; abortId: NodeJS.Timeout } {
235-
const controller = new AbortController();
236-
const abortId = setTimeout(() => controller.abort(TIMEOUT), timeoutMs);
237-
return { signal: controller.signal, abortId };
238-
}
239-
240-
/**
241-
* Returns an abort signal that is getting aborted when
242-
* at least one of the specified abort signals is aborted.
243-
*
244-
* Requires at least node.js 18.
245-
*/
246-
function anySignal(...args: AbortSignal[] | [AbortSignal[]]): AbortSignal {
247-
// Allowing signals to be passed either as array
248-
// of signals or as multiple arguments.
249-
const signals = <AbortSignal[]>(args.length === 1 && Array.isArray(args[0]) ? args[0] : args);
250-
251-
const controller = new AbortController();
252-
253-
for (const signal of signals) {
254-
if (signal.aborted) {
255-
// Exiting early if one of the signals
256-
// is already aborted.
257-
controller.abort((signal as any)?.reason);
258-
break;
259-
}
260-
261-
// Listening for signals and removing the listeners
262-
// when at least one symbol is aborted.
263-
signal.addEventListener("abort", () => controller.abort((signal as any)?.reason), {
264-
signal: controller.signal,
265-
});
266-
}
267-
268-
return controller.signal;
269-
}
270-
271197
export const fetcher: FetchFunction = fetcherImpl;

‎src/environments.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* This file was auto-generated by Fern from our API Definition.
33
*/
44

5-
export const FileforgeEnvironment = {
5+
export const FileForgeEnvironment = {
66
Default: "https://api.fileforge.com",
77
} as const;
88

9-
export type FileforgeEnvironment = typeof FileforgeEnvironment.Default;
9+
export type FileForgeEnvironment = typeof FileForgeEnvironment.Default;

‎src/errors/FileforgeError.ts renamed to ‎src/errors/FileForgeError.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
* This file was auto-generated by Fern from our API Definition.
33
*/
44

5-
export class FileforgeError extends Error {
5+
export class FileForgeError extends Error {
66
readonly statusCode?: number;
77
readonly body?: unknown;
88

99
constructor({ message, statusCode, body }: { message?: string; statusCode?: number; body?: unknown }) {
1010
super(buildMessage({ message, statusCode, body }));
11-
Object.setPrototypeOf(this, FileforgeError.prototype);
11+
Object.setPrototypeOf(this, FileForgeError.prototype);
1212
if (statusCode != null) {
1313
this.statusCode = statusCode;
1414
}

‎src/errors/FileforgeTimeoutError.ts renamed to ‎src/errors/FileForgeTimeoutError.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* This file was auto-generated by Fern from our API Definition.
33
*/
44

5-
export class FileforgeTimeoutError extends Error {
5+
export class FileForgeTimeoutError extends Error {
66
constructor() {
77
super("Timeout");
8-
Object.setPrototypeOf(this, FileforgeTimeoutError.prototype);
8+
Object.setPrototypeOf(this, FileForgeTimeoutError.prototype);
99
}
1010
}

‎src/errors/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
export { FileforgeError } from "./FileforgeError";
2-
export { FileforgeTimeoutError } from "./FileforgeTimeoutError";
1+
export { FileForgeError } from "./FileForgeError";
2+
export { FileForgeTimeoutError } from "./FileForgeTimeoutError";

‎src/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export * as Fileforge from "./api";
2-
export { FileforgeClient } from "./Client";
3-
export { FileforgeEnvironment } from "./environments";
4-
export { FileforgeError, FileforgeTimeoutError } from "./errors";
1+
export * as FileForge from "./api";
2+
export { FileForgeClient } from "./Client";
3+
export { FileForgeEnvironment } from "./environments";
4+
export { FileForgeError, FileForgeTimeoutError } from "./errors";

‎src/serialization/types/ConvertDocxRequestOptions.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*/
44

55
import * as serializers from "../index";
6-
import * as Fileforge from "../../api/index";
6+
import * as FileForge from "../../api/index";
77
import * as core from "../../core";
88

99
export const ConvertDocxRequestOptions: core.serialization.ObjectSchema<
1010
serializers.ConvertDocxRequestOptions.Raw,
11-
Fileforge.ConvertDocxRequestOptions
11+
FileForge.ConvertDocxRequestOptions
1212
> = core.serialization.object({
1313
templateLiterals: core.serialization.record(core.serialization.string(), core.serialization.string()).optional(),
1414
});

‎src/serialization/types/ErrorSchema.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
*/
44

55
import * as serializers from "../index";
6-
import * as Fileforge from "../../api/index";
6+
import * as FileForge from "../../api/index";
77
import * as core from "../../core";
88

9-
export const ErrorSchema: core.serialization.ObjectSchema<serializers.ErrorSchema.Raw, Fileforge.ErrorSchema> =
9+
export const ErrorSchema: core.serialization.ObjectSchema<serializers.ErrorSchema.Raw, FileForge.ErrorSchema> =
1010
core.serialization.object({
1111
statusCode: core.serialization.number(),
1212
code: core.serialization.string(),

‎src/serialization/types/GenerateRequestOptions.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*/
44

55
import * as serializers from "../index";
6-
import * as Fileforge from "../../api/index";
6+
import * as FileForge from "../../api/index";
77
import * as core from "../../core";
88

99
export const GenerateRequestOptions: core.serialization.ObjectSchema<
1010
serializers.GenerateRequestOptions.Raw,
11-
Fileforge.GenerateRequestOptions
11+
FileForge.GenerateRequestOptions
1212
> = core.serialization.object({
1313
test: core.serialization.boolean().optional(),
1414
host: core.serialization.boolean().optional(),

‎src/serialization/types/MergeRequestOptions.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
*/
44

55
import * as serializers from "../index";
6-
import * as Fileforge from "../../api/index";
6+
import * as FileForge from "../../api/index";
77
import * as core from "../../core";
88

99
export const MergeRequestOptions: core.serialization.ObjectSchema<
1010
serializers.MergeRequestOptions.Raw,
11-
Fileforge.MergeRequestOptions
11+
FileForge.MergeRequestOptions
1212
> = core.serialization.object({});
1313

1414
export declare namespace MergeRequestOptions {

0 commit comments

Comments
 (0)