mirror of
https://github.com/gosticks/DefinitelyTyped.git
synced 2026-10-05 07:17:04 +00:00
Revert "node-fetch: Is itself a function, not an object with a 'default' property (#30503)" (#30549)
This reverts commit d8af87d9b5.
This commit is contained in:
Niklas Lindgren
committed by
Pranav Senthilnathan
Pranav Senthilnathan
parent
c723eb35e4
commit
48841fc882
@@ -2,7 +2,7 @@ import FormData = require('form-data');
|
||||
import fs = require('fs');
|
||||
import http = require('http');
|
||||
import request = require('request');
|
||||
import fetch = require('node-fetch');
|
||||
import fetch from 'node-fetch';
|
||||
|
||||
import * as ImportUsingES6Syntax from 'form-data';
|
||||
|
||||
|
||||
Vendored
+160
-163
@@ -9,169 +9,166 @@
|
||||
import { Agent } from "http";
|
||||
import { URLSearchParams } from "url";
|
||||
|
||||
declare namespace fetch {
|
||||
class Request extends Body {
|
||||
constructor(input: string | { href: string } | Request, init?: RequestInit);
|
||||
clone(): Request;
|
||||
context: RequestContext;
|
||||
headers: Headers;
|
||||
method: string;
|
||||
redirect: RequestRedirect;
|
||||
referrer: string;
|
||||
url: string;
|
||||
export class Request extends Body {
|
||||
constructor(input: string | { href: string } | Request, init?: RequestInit);
|
||||
clone(): Request;
|
||||
context: RequestContext;
|
||||
headers: Headers;
|
||||
method: string;
|
||||
redirect: RequestRedirect;
|
||||
referrer: string;
|
||||
url: string;
|
||||
|
||||
// node-fetch extensions to the whatwg/fetch spec
|
||||
agent?: Agent;
|
||||
compress: boolean;
|
||||
counter: number;
|
||||
follow: number;
|
||||
hostname: string;
|
||||
port?: number;
|
||||
protocol: string;
|
||||
size: number;
|
||||
timeout: number;
|
||||
}
|
||||
|
||||
interface RequestInit {
|
||||
// whatwg/fetch standard options
|
||||
body?: BodyInit;
|
||||
headers?: HeaderInit | { [index: string]: string };
|
||||
method?: string;
|
||||
redirect?: RequestRedirect;
|
||||
|
||||
// node-fetch extensions
|
||||
agent?: Agent; // =null http.Agent instance, allows custom proxy, certificate etc.
|
||||
compress?: boolean; // =true support gzip/deflate content encoding. false to disable
|
||||
follow?: number; // =20 maximum redirect count. 0 to not follow redirect
|
||||
size?: number; // =0 maximum response body size in bytes. 0 to disable
|
||||
timeout?: number; // =0 req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies)
|
||||
|
||||
// node-fetch does not support mode, cache or credentials options
|
||||
}
|
||||
|
||||
type RequestContext =
|
||||
"audio"
|
||||
| "beacon"
|
||||
| "cspreport"
|
||||
| "download"
|
||||
| "embed"
|
||||
| "eventsource"
|
||||
| "favicon"
|
||||
| "fetch"
|
||||
| "font"
|
||||
| "form"
|
||||
| "frame"
|
||||
| "hyperlink"
|
||||
| "iframe"
|
||||
| "image"
|
||||
| "imageset"
|
||||
| "import"
|
||||
| "internal"
|
||||
| "location"
|
||||
| "manifest"
|
||||
| "object"
|
||||
| "ping"
|
||||
| "plugin"
|
||||
| "prefetch"
|
||||
| "script"
|
||||
| "serviceworker"
|
||||
| "sharedworker"
|
||||
| "style"
|
||||
| "subresource"
|
||||
| "track"
|
||||
| "video"
|
||||
| "worker"
|
||||
| "xmlhttprequest"
|
||||
| "xslt";
|
||||
type RequestMode = "cors" | "no-cors" | "same-origin";
|
||||
type RequestRedirect = "error" | "follow" | "manual";
|
||||
type RequestCredentials = "omit" | "include" | "same-origin";
|
||||
|
||||
type RequestCache =
|
||||
"default"
|
||||
| "force-cache"
|
||||
| "no-cache"
|
||||
| "no-store"
|
||||
| "only-if-cached"
|
||||
| "reload";
|
||||
|
||||
class Headers implements Iterable<[string, string]> {
|
||||
constructor(init?: Headers | { [k: string]: string });
|
||||
forEach(callback: (value: string, name: string) => void): void;
|
||||
append(name: string, value: string): void;
|
||||
delete(name: string): void;
|
||||
get(name: string): string | null;
|
||||
getAll(name: string): string[];
|
||||
has(name: string): boolean;
|
||||
raw(): { [k: string]: string[] };
|
||||
set(name: string, value: string): void;
|
||||
|
||||
// Iterator methods
|
||||
entries(): Iterator<[string, string]>;
|
||||
keys(): Iterator<string>;
|
||||
values(): Iterator<[string]>;
|
||||
[Symbol.iterator](): Iterator<[string, string]>;
|
||||
}
|
||||
|
||||
class Blob {
|
||||
type: string;
|
||||
size: number;
|
||||
slice(start?: number, end?: number): Blob;
|
||||
}
|
||||
|
||||
class Body {
|
||||
constructor(body?: any, opts?: { size?: number; timeout?: number });
|
||||
arrayBuffer(): Promise<ArrayBuffer>;
|
||||
blob(): Promise<Buffer>;
|
||||
body: NodeJS.ReadableStream;
|
||||
bodyUsed: boolean;
|
||||
buffer(): Promise<Buffer>;
|
||||
json(): Promise<any>;
|
||||
text(): Promise<string>;
|
||||
textConverted(): Promise<string>;
|
||||
}
|
||||
|
||||
class FetchError extends Error {
|
||||
name: "FetchError";
|
||||
constructor(message: string, type: string, systemError: string);
|
||||
}
|
||||
|
||||
class Response extends Body {
|
||||
constructor(body?: BodyInit, init?: ResponseInit);
|
||||
static error(): Response;
|
||||
static redirect(url: string, status: number): Response;
|
||||
clone(): Response;
|
||||
headers: Headers;
|
||||
ok: boolean;
|
||||
size: number;
|
||||
status: number;
|
||||
statusText: string;
|
||||
timeout: number;
|
||||
type: ResponseType;
|
||||
url: string;
|
||||
}
|
||||
|
||||
type ResponseType =
|
||||
"basic"
|
||||
| "cors"
|
||||
| "default"
|
||||
| "error"
|
||||
| "opaque"
|
||||
| "opaqueredirect";
|
||||
|
||||
interface ResponseInit {
|
||||
headers?: HeaderInit;
|
||||
status: number;
|
||||
statusText?: string;
|
||||
}
|
||||
|
||||
type HeaderInit = Headers | string[];
|
||||
type BodyInit = ArrayBuffer | ArrayBufferView | NodeJS.ReadableStream | string | URLSearchParams;
|
||||
type RequestInfo = string | Request;
|
||||
// node-fetch extensions to the whatwg/fetch spec
|
||||
agent?: Agent;
|
||||
compress: boolean;
|
||||
counter: number;
|
||||
follow: number;
|
||||
hostname: string;
|
||||
port?: number;
|
||||
protocol: string;
|
||||
size: number;
|
||||
timeout: number;
|
||||
}
|
||||
|
||||
declare function fetch(
|
||||
url: string | fetch.Request,
|
||||
init?: fetch.RequestInit
|
||||
): Promise<fetch.Response>;
|
||||
export = fetch;
|
||||
export interface RequestInit {
|
||||
// whatwg/fetch standard options
|
||||
body?: BodyInit;
|
||||
headers?: HeaderInit | { [index: string]: string };
|
||||
method?: string;
|
||||
redirect?: RequestRedirect;
|
||||
|
||||
// node-fetch extensions
|
||||
agent?: Agent; // =null http.Agent instance, allows custom proxy, certificate etc.
|
||||
compress?: boolean; // =true support gzip/deflate content encoding. false to disable
|
||||
follow?: number; // =20 maximum redirect count. 0 to not follow redirect
|
||||
size?: number; // =0 maximum response body size in bytes. 0 to disable
|
||||
timeout?: number; // =0 req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies)
|
||||
|
||||
// node-fetch does not support mode, cache or credentials options
|
||||
}
|
||||
|
||||
export type RequestContext =
|
||||
"audio"
|
||||
| "beacon"
|
||||
| "cspreport"
|
||||
| "download"
|
||||
| "embed"
|
||||
| "eventsource"
|
||||
| "favicon"
|
||||
| "fetch"
|
||||
| "font"
|
||||
| "form"
|
||||
| "frame"
|
||||
| "hyperlink"
|
||||
| "iframe"
|
||||
| "image"
|
||||
| "imageset"
|
||||
| "import"
|
||||
| "internal"
|
||||
| "location"
|
||||
| "manifest"
|
||||
| "object"
|
||||
| "ping"
|
||||
| "plugin"
|
||||
| "prefetch"
|
||||
| "script"
|
||||
| "serviceworker"
|
||||
| "sharedworker"
|
||||
| "style"
|
||||
| "subresource"
|
||||
| "track"
|
||||
| "video"
|
||||
| "worker"
|
||||
| "xmlhttprequest"
|
||||
| "xslt";
|
||||
export type RequestMode = "cors" | "no-cors" | "same-origin";
|
||||
export type RequestRedirect = "error" | "follow" | "manual";
|
||||
export type RequestCredentials = "omit" | "include" | "same-origin";
|
||||
|
||||
export type RequestCache =
|
||||
"default"
|
||||
| "force-cache"
|
||||
| "no-cache"
|
||||
| "no-store"
|
||||
| "only-if-cached"
|
||||
| "reload";
|
||||
|
||||
export class Headers implements Iterable<[string, string]> {
|
||||
constructor(init?: Headers | { [k: string]: string });
|
||||
forEach(callback: (value: string, name: string) => void): void;
|
||||
append(name: string, value: string): void;
|
||||
delete(name: string): void;
|
||||
get(name: string): string | null;
|
||||
getAll(name: string): string[];
|
||||
has(name: string): boolean;
|
||||
raw(): { [k: string]: string[] };
|
||||
set(name: string, value: string): void;
|
||||
|
||||
// Iterator methods
|
||||
entries(): Iterator<[string, string]>;
|
||||
keys(): Iterator<string>;
|
||||
values(): Iterator<[string]>;
|
||||
[Symbol.iterator](): Iterator<[string, string]>;
|
||||
}
|
||||
|
||||
export class Blob {
|
||||
type: string;
|
||||
size: number;
|
||||
slice(start?: number, end?: number): Blob;
|
||||
}
|
||||
|
||||
export class Body {
|
||||
constructor(body?: any, opts?: { size?: number; timeout?: number });
|
||||
arrayBuffer(): Promise<ArrayBuffer>;
|
||||
blob(): Promise<Buffer>;
|
||||
body: NodeJS.ReadableStream;
|
||||
bodyUsed: boolean;
|
||||
buffer(): Promise<Buffer>;
|
||||
json(): Promise<any>;
|
||||
text(): Promise<string>;
|
||||
textConverted(): Promise<string>;
|
||||
}
|
||||
|
||||
export class FetchError extends Error {
|
||||
name: "FetchError";
|
||||
constructor(message: string, type: string, systemError: string);
|
||||
}
|
||||
|
||||
export class Response extends Body {
|
||||
constructor(body?: BodyInit, init?: ResponseInit);
|
||||
static error(): Response;
|
||||
static redirect(url: string, status: number): Response;
|
||||
clone(): Response;
|
||||
headers: Headers;
|
||||
ok: boolean;
|
||||
size: number;
|
||||
status: number;
|
||||
statusText: string;
|
||||
timeout: number;
|
||||
type: ResponseType;
|
||||
url: string;
|
||||
}
|
||||
|
||||
export type ResponseType =
|
||||
"basic"
|
||||
| "cors"
|
||||
| "default"
|
||||
| "error"
|
||||
| "opaque"
|
||||
| "opaqueredirect";
|
||||
|
||||
export interface ResponseInit {
|
||||
headers?: HeaderInit;
|
||||
status: number;
|
||||
statusText?: string;
|
||||
}
|
||||
|
||||
export type HeaderInit = Headers | string[];
|
||||
export type BodyInit = ArrayBuffer | ArrayBufferView | NodeJS.ReadableStream | string | URLSearchParams;
|
||||
export type RequestInfo = string | Request;
|
||||
|
||||
export default function fetch(
|
||||
url: string | Request,
|
||||
init?: RequestInit
|
||||
): Promise<Response>;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import fetch = require("node-fetch");
|
||||
import { Headers, Request, RequestInit, Response } from 'node-fetch';
|
||||
import fetch, { Headers, Request, RequestInit, Response } from 'node-fetch';
|
||||
import { Agent } from "http";
|
||||
|
||||
function test_fetchUrlWithOptions() {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import pRetry = require('p-retry');
|
||||
import fetch = require('node-fetch');
|
||||
import fetch from 'node-fetch';
|
||||
|
||||
const run = () => fetch('https://sindresorhus.com/unicorn')
|
||||
.then(response => {
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
// TypeScript Version: 2.3
|
||||
|
||||
import { Tracer } from 'zipkin';
|
||||
import fetch = require('node-fetch');
|
||||
import fetch from 'node-fetch';
|
||||
|
||||
interface Options {
|
||||
tracer: Tracer;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import wrapFetch = require('zipkin-instrumentation-fetch');
|
||||
import fetch = require('node-fetch');
|
||||
import fetch from 'node-fetch';
|
||||
|
||||
import {
|
||||
Tracer,
|
||||
|
||||
Reference in New Issue
Block a user