Skip to content

Commit 78781b9

Browse files
author
Vladimir Enchev
committed
fetch exposed in global context
1 parent 272597f commit 78781b9

File tree

5 files changed

+101
-112
lines changed

5 files changed

+101
-112
lines changed

‎CrossPlatformModules.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@
300300
</TypeScriptCompile>
301301
<TypeScriptCompile Include="es-collections.d.ts" />
302302
<TypeScriptCompile Include="es6-promise.d.ts" />
303-
<TypeScriptCompile Include="fetch\fetch.d.ts" />
304303
<TypeScriptCompile Include="file-system\file-name-resolver.d.ts" />
305304
<TypeScriptCompile Include="file-system\file-name-resolver.ts">
306305
<DependentUpon>file-name-resolver.d.ts</DependentUpon>
@@ -1734,9 +1733,7 @@
17341733
<ItemGroup>
17351734
<Content Include="js-libs\esprima\README.md" />
17361735
</ItemGroup>
1737-
<ItemGroup>
1738-
<Folder Include="apps\list-view-demo\" />
1739-
</ItemGroup>
1736+
<ItemGroup />
17401737
<!-- To save maintenance effort, the Visual Studio build does not rely on the Microsoft targets.
17411738
Instead, it calls the Grunt build.
17421739
-->
@@ -1787,7 +1784,7 @@
17871784
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
17881785
</WebProjectProperties>
17891786
</FlavorProperties>
1790-
<UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
1787+
<UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
17911788
</VisualStudio>
17921789
</ProjectExtensions>
17931790
</Project>

‎apps/tests/fetch-tests.ts‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* tslint:disable:no-unused-variable */
22
import TKUnit = require("./TKUnit");
3-
import fetchModule = require("fetch");
43
import types = require("utils/types");
54

65
// <snippet module="fetch" title="fetch">
@@ -12,18 +11,18 @@ import types = require("utils/types");
1211
// </snippet>
1312

1413
export var test_fetch_defined = function () {
15-
TKUnit.assert(types.isDefined((fetchModule.fetch)), "Method fetch() should be defined!");
14+
TKUnit.assert(types.isDefined((fetch)), "Method fetch() should be defined!");
1615
};
1716

1817
export var test_fetch = function (done: (err: Error, res?: string) => void) {
1918
var result;
2019
// <snippet module="fetch" title="fetch">
2120
// ### Get Response from URL
2221
// ``` JavaScript
23-
fetchModule.fetch("https://httpbin.org/get").then(function (r) {
22+
fetch("https://httpbin.org/get").then(function (r) {
2423
//// Argument (r) is Response!
2524
// <hide>
26-
TKUnit.assert(r instanceof fetchModule.Response, "Result from fetch() should be valid Response object! Actual result is: " + result);
25+
TKUnit.assert(r instanceof Response, "Result from fetch() should be valid Response object! Actual result is: " + result);
2726
done(null);
2827
// </hide>
2928
}, function (e) {
@@ -42,7 +41,7 @@ export var test_fetch_text = function (done: (err: Error, res?: string) => void)
4241
// <snippet module="fetch" title="fetch">
4342
// ### Get string from URL
4443
// ``` JavaScript
45-
fetchModule.fetch("https://httpbin.org/get").then(response => { return response.text(); }).then(function (r) {
44+
fetch("https://httpbin.org/get").then(response => { return response.text(); }).then(function (r) {
4645
//// Argument (r) is string!
4746
// <hide>
4847
TKUnit.assert(types.isString(r), "Result from text() should be string! Actual result is: " + r);
@@ -64,7 +63,7 @@ export var test_fetch_json = function (done: (err: Error, res?: string) => void)
6463
// <snippet module="fetch" title="fetch">
6564
// ### Get JSON from URL
6665
// ``` JavaScript
67-
fetchModule.fetch("https://httpbin.org/get").then(response => { return response.json(); }).then(function (r) {
66+
fetch("https://httpbin.org/get").then(response => { return response.json(); }).then(function (r) {
6867
//// Argument (r) is JSON object!
6968
// <hide>
7069
TKUnit.assert(types.isString(JSON.stringify(r)), "Result from json() should be JSON object! Actual result is: " + r);
@@ -86,7 +85,7 @@ export var test_fetch_blob = function (done: (err: Error, res?: string) => void)
8685
// <snippet module="fetch" title="fetch">
8786
// ### Get Blob from URL
8887
// ``` JavaScript
89-
fetchModule.fetch("https://httpbin.org/get").then(response => { return response.blob(); }).then(function (r) {
88+
fetch("https://httpbin.org/get").then(response => { return response.blob(); }).then(function (r) {
9089
//// Argument (r) is Blob object!
9190
// <hide>
9291
TKUnit.assert(r instanceof Blob, "Result from blob() should be Blob object! Actual result is: " + r);
@@ -108,7 +107,7 @@ export var test_fetch_arrayBuffer = function (done: (err: Error, res?: string) =
108107
// <snippet module="fetch" title="fetch">
109108
// ### Get ArrayBuffer from URL
110109
// ``` JavaScript
111-
fetchModule.fetch("https://httpbin.org/get").then(response => { return response.arrayBuffer(); }).then(function (r) {
110+
fetch("https://httpbin.org/get").then(response => { return response.arrayBuffer(); }).then(function (r) {
112111
//// Argument (r) is ArrayBuffer object!
113112
// <hide>
114113
TKUnit.assert(r instanceof ArrayBuffer, "Result from arrayBuffer() should be ArrayBuffer object! Actual result is: " + r);
@@ -131,7 +130,7 @@ export var test_fetch_formData = function (done: (err: Error, res?: string) => v
131130
// <snippet module="fetch" title="fetch">
132131
// ### Get FormData from URL
133132
// ``` JavaScript
134-
fetchModule.fetch("https://httpbin.org/get").then(response => { return response.formData(); }).then(function (r) {
133+
fetch("https://httpbin.org/get").then(response => { return response.formData(); }).then(function (r) {
135134
//// Argument (r) is FormData object!
136135
// <hide>
137136
TKUnit.assert(r instanceof FormData, "Result from formData() should be FormData object! Actual result is: " + r);
@@ -151,7 +150,7 @@ export var test_fetch_fail_invalid_url = function (done) {
151150
var completed: boolean;
152151
var isReady = function () { return completed; }
153152

154-
fetchModule.fetch("hgfttp://httpbin.org/get").catch(function (e) {
153+
fetch("hgfttp://httpbin.org/get").catch(function (e) {
155154
completed = true;
156155
done(null)
157156
});
@@ -162,7 +161,7 @@ export var test_fetch_response_status = function (done) {
162161
// <snippet module="fetch" title="fetch">
163162
// ### Get Response status
164163
// ``` fetch
165-
fetchModule.fetch("https://httpbin.org/get").then(function (response) {
164+
fetch("https://httpbin.org/get").then(function (response) {
166165
//// Argument (response) is Response!
167166
var statusCode = response.status;
168167
// <hide>
@@ -189,7 +188,7 @@ export var test_fetch_response_headers = function (done) {
189188
// <snippet module="fetch" title="fetch">
190189
// ### Get response headers
191190
// ``` JavaScript
192-
fetchModule.fetch("https://httpbin.org/get").then(function (response) {
191+
fetch("https://httpbin.org/get").then(function (response) {
193192
//// Argument (response) is Response!
194193
// var all = response.headers.getAll();
195194
// <hide>
@@ -212,9 +211,9 @@ export var test_fetch_response_headers = function (done) {
212211
};
213212

214213
export var test_fetch_headers_sent = function (done) {
215-
var result: fetchModule.Headers;
214+
var result: Headers;
216215

217-
fetchModule.fetch("https://httpbin.org/get", {
216+
fetch("https://httpbin.org/get", {
218217
method: "GET",
219218
headers: { "Content-Type": "application/json" }
220219
}).then(function (response) {
@@ -236,7 +235,7 @@ export var test_fetch_post_form_data = function (done) {
236235
data.append("MyVariableOne", "ValueOne");
237236
data.append("MyVariableTwo", "ValueTwo");
238237

239-
fetchModule.fetch("https://httpbin.org/post", {
238+
fetch("https://httpbin.org/post", {
240239
method: "POST",
241240
headers: { "Content-Type": "application/x-www-form-urlencoded" },
242241
body: data
@@ -259,7 +258,7 @@ export var test_fetch_post_json = function (done) {
259258
// <snippet module="fetch" title="fetch">
260259
// ### Post JSON
261260
// ``` JavaScript
262-
fetchModule.fetch("https://httpbin.org/post", {
261+
fetch("https://httpbin.org/post", {
263262
method: "POST",
264263
headers: { "Content-Type": "application/json" },
265264
body: JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" })

‎declarations.d.ts‎

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,85 @@
11
/* tslint:disable:no-unused-variable */
2-
interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
2+
declare class Request {
3+
constructor(input: string|Request, init?: RequestInit);
4+
method: string;
5+
url: string;
6+
headers: Headers;
7+
context: RequestContext;
8+
referrer: string;
9+
mode: RequestMode;
10+
credentials: RequestCredentials;
11+
cache: RequestCache;
12+
}
13+
14+
interface RequestInit {
15+
method?: string;
16+
headers?: HeaderInit|{ [index: string]: string };
17+
body?: BodyInit;
18+
mode?: RequestMode;
19+
credentials?: RequestCredentials;
20+
cache?: RequestCache;
21+
}
22+
23+
declare enum RequestContext {
24+
"audio", "beacon", "cspreport", "download", "embed", "eventsource", "favicon", "fetch",
25+
"font", "form", "frame", "hyperlink", "iframe", "image", "imageset", "import",
26+
"internal", "location", "manifest", "object", "ping", "plugin", "prefetch", "script",
27+
"serviceworker", "sharedworker", "subresource", "style", "track", "video", "worker",
28+
"xmlhttprequest", "xslt"
29+
}
30+
31+
declare enum RequestMode { "same-origin", "no-cors", "cors" }
32+
declare enum RequestCredentials { "omit", "same-origin", "include" }
33+
declare enum RequestCache { "default", "no-store", "reload", "no-cache", "force-cache", "only-if-cached" }
34+
35+
declare class Headers {
36+
append(name: string, value: string): void;
37+
delete(name: string): void;
38+
get(name: string): string;
39+
getAll(name: string): Array<string>;
40+
has(name: string): boolean;
41+
set(name: string, value: string): void;
42+
}
43+
44+
declare class Body {
45+
bodyUsed: boolean;
46+
/*
47+
arrayBuffer(): Promise<ArrayBuffer>;
48+
blob(): Promise<Blob>;
49+
*/
50+
formData(): Promise<FormData>;
51+
json(): Promise<any>;
52+
text(): Promise<string>;
53+
}
54+
55+
declare class Response extends Body {
56+
constructor(body?: BodyInit, init?: ResponseInit);
57+
error(): Response;
58+
redirect(url: string, status: number): Response;
59+
type: ResponseType;
60+
url: string;
61+
status: number;
62+
ok: boolean;
63+
statusText: string;
64+
headers: Headers;
65+
clone(): Response;
66+
}
67+
68+
declare enum ResponseType { "basic", "cors", "default", "error", "opaque" }
69+
70+
declare class ResponseInit {
71+
status: number;
72+
statusText: string;
73+
headers: HeaderInit;
74+
}
75+
76+
declare type HeaderInit = Headers|Array<string>;
77+
declare type BodyInit = Blob|FormData|string;
78+
declare type RequestInfo = Request|string;
79+
80+
declare function fetch(url: string, init?: RequestInit): Promise<Response>;
81+
82+
interface XMLHttpRequest {
383
send(data?: FormData): void;
484
}
585

‎fetch/fetch.d.ts‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎globals/globals.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ global.XMLHttpRequest = xhr.XMLHttpRequest;
1818
global.FormData = xhr.FormData;
1919
global.alert = dialogs.alert;
2020

21+
var fetchModule = require("fetch");
22+
require("utils/module-merge").merge(fetchModule, global);
23+
2124
export function Deprecated(target: Object, key?: string | symbol, descriptor?: any) {
2225
if (descriptor) {
2326
var originalMethod = descriptor.value;

0 commit comments

Comments
 (0)