Skip to content

Remove the systemFetch export from platform_node #1963

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
merged 2 commits into from
Sep 3, 2019
Merged

Remove the systemFetch export from platform_node #1963

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
cf6af68
Remove the systemFetch export from platform_node
Sep 3, 2019
6fc9a2a
save
Sep 3, 2019
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
14 changes: 13 additions & 1 deletion tfjs-core/src/platforms/platform_node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,19 @@ export const getNodeFetch = {
importFetch: () => require('node-fetch')
};

export let systemFetch: (url: string, init?: RequestInit) => Promise<Response>;
type FetchFn = (url: string, init?: RequestInit) => Promise<Response>;
let systemFetch: FetchFn;
// These getters and setters are for testing so we don't export a mutable
// variable.
export function resetSystemFetch() {
systemFetch = null;
}
export function setSystemFetch(fetchFn: FetchFn) {
systemFetch = fetchFn;
}
export function getSystemFetch(): FetchFn {
return systemFetch;
}

export class PlatformNode implements Platform {
private textEncoder: TextEncoder;
Expand Down
8 changes: 3 additions & 5 deletions tfjs-core/src/platforms/platform_node_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,10 @@ describeWithFlags('PlatformNode', NODE_ENVS, () => {

const platform = new PlatformNode();

const savedFetch = platform_node.systemFetch;
const savedFetch = platform_node.getSystemFetch();

// Null out the system fetch so we force it to require node-fetch.
// @ts-ignore
platform_node.systemFetch = null;
platform_node.resetSystemFetch();

const testFetch = {fetch: (url: string, init: RequestInit) => {}};

Expand All @@ -63,8 +62,7 @@ describeWithFlags('PlatformNode', NODE_ENVS, () => {
expect(platform_node.getNodeFetch.importFetch).toHaveBeenCalled();
expect(testFetch.fetch).toHaveBeenCalledWith('test/url', {method: 'GET'});

// @ts-ignore
platform_node.systemFetch = savedFetch;
platform_node.setSystemFetch(savedFetch);
ENV.global.fetch = globalFetch;
});

Expand Down