Skip to content

Commit

Permalink
remove non default export to another file
Browse files Browse the repository at this point in the history
  • Loading branch information
jkalis-rm committed Feb 18, 2020
1 parent ecfc94f commit ac63b91
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 48 deletions.
20 changes: 2 additions & 18 deletions src/index.mjs
@@ -1,20 +1,6 @@
import response from './lib/response';

const regex = /^(.*?):[^\S\n]*([\s\S]*?)$/gm;
const response = (request, headers) => ({
ok: (request.status/100|0) == 2, // 200-299
statusText: request.statusText,
status: request.status,
url: request.responseURL,
text: () => Promise.resolve(request.responseText),
json: () => Promise.resolve(JSON.parse(request.responseText)),
blob: () => Promise.resolve(new Blob([request.response])),
clone: () => response(request, headers),
headers: {
keys: () => headers.keys,
entries: () => headers.all,
get: n => headers.raw[n.toLowerCase()],
has: n => n.toLowerCase() in headers.raw
}
});

export default function(url, options) {
options = options || {};
Expand Down Expand Up @@ -44,5 +30,3 @@ export default function(url, options) {
request.send(options.body || null);
});
}

export { response };
18 changes: 18 additions & 0 deletions src/lib/response.mjs
@@ -0,0 +1,18 @@
export default function response (request, headers) {
return {
ok: (request.status/100|0) == 2, // 200-299
statusText: request.statusText,
status: request.status,
url: request.responseURL,
text: () => Promise.resolve(request.responseText),
json: () => Promise.resolve(JSON.parse(request.responseText)),
blob: () => Promise.resolve(new Blob([request.response])),
clone: () => response(request, headers),
headers: {
keys: () => headers.keys,
entries: () => headers.all,
get: n => headers.raw[n.toLowerCase()],
has: n => n.toLowerCase() in headers.raw
}
};
}
31 changes: 1 addition & 30 deletions test/index.js
@@ -1,4 +1,4 @@
import fetch, { response } from '../src/index.mjs';
import fetch from '../src/index.mjs';
import fetchDist from '..';

describe('unfetch', () => {
Expand Down Expand Up @@ -81,33 +81,4 @@ describe('unfetch', () => {
return p;
});
});

describe('response()', () => {
it('returns text()', () => response({ responseText: 'A passing test.' })
.text()
.then((text) => expect(text).toBe('A passing test.'))
);

it('returns blob()', () => response({ response: 'A passing test.' })
.blob()
.then((text) => expect(text.toString()).toBe(new Blob(['A passing test.']).toString()))
);

it('returns headers', () => {
const all = [['x-foo', 'bar'], ['x-baz', 'boo']];
const result = response({}, { all }).headers.entries();
expect(result).toEqual(all);
});

it('returns header keys', () => {
const result = response({}, { keys: ['x-foo'] }).headers.keys();
expect(result).toEqual(['x-foo']);
});

it('returns headers has', () => {
const raw = { 'x-foo': 'bar', 'x-baz': 'boo' };
const test = response({}, { raw }).headers;
expect(test.has('x-foo')).toBe(true);
});
});
});
30 changes: 30 additions & 0 deletions test/lib/response.js
@@ -0,0 +1,30 @@
import response from '../../src/lib/response.mjs';

describe('response()', () => {
it('returns text()', () => response({ responseText: 'A passing test.' })
.text()
.then((text) => expect(text).toBe('A passing test.'))
);

it('returns blob()', () => response({ response: 'A passing test.' })
.blob()
.then((text) => expect(text.toString()).toBe(new Blob(['A passing test.']).toString()))
);

it('returns headers', () => {
const all = [['x-foo', 'bar'], ['x-baz', 'boo']];
const result = response({}, { all }).headers.entries();
expect(result).toEqual(all);
});

it('returns header keys', () => {
const result = response({}, { keys: ['x-foo'] }).headers.keys();
expect(result).toEqual(['x-foo']);
});

it('returns headers has', () => {
const raw = { 'x-foo': 'bar', 'x-baz': 'boo' };
const test = response({}, { raw }).headers;
expect(test.has('x-foo')).toBe(true);
});
});

0 comments on commit ac63b91

Please sign in to comment.