Skip to content

CommonJS example: make difference smaller #5

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

Open
mathiasbynens wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CommonJS example: make difference smaller #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 47 additions & 47 deletions source/cjs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ JavaScript Next.

```js
var bytes = require("bytes");
var iconv = require("iconv-lite");
var getCodec = require("iconv-lite").getCodec;
Copy link
Copy Markdown
Author

@mathiasbynens mathiasbynens Jul 2, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There’s no reason to do this in the ES6 version but not here, IMHO.

Copy link
Copy Markdown
Owner

@wycats wycats Jul 2, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason was purely because that is how it was done in the original source. But you're right, this is an example and parity is useful.

I'll noodle on it.


module.exports = function(stream, options, done) {
// ...
}
};

// ...

function getDecoder(encoding) {
if (!encoding) return null;

try {
return iconv.getCodec(encoding).decoder()
return getCodec(encoding).decoder();
} catch(e) {
// ...
}
Expand All @@ -48,7 +48,7 @@ function getDecoder (encoding) {
if (!encoding) return null;

try {
return getCodec(encoding).decoder()
return getCodec(encoding).decoder();
} catch(e) {
// ...
}
Expand All @@ -65,20 +65,20 @@ function getDecoder (encoding) {
var cookies = require('./lib/cookies')
, copy = require('./lib/copy')
, Request = require('./request')
, util = require('util')
, _extend = require('util')._extend
Copy link
Copy Markdown
Author

@mathiasbynens mathiasbynens Jul 2, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

;

function initParams(uri, options, callback) {
// ...
opts = util._extend({}, options);
opts = _extend({}, options);
// ...
}

// ...

function request (uri, options, callback) {
function request(uri, options, callback) {
// ...
opts = util._extend({}, options);
opts = _extend({}, options);
// ...
}

Expand All @@ -89,62 +89,62 @@ request.Request = Request;
request.debug = process.env.NODE_DEBUG &&
/request/.test(process.env.NODE_DEBUG);

request.initParams = initParams
request.initParams = initParams;

request.defaults = function (options, requester) {
// ...

de.get = def(request.get)
de.patch = def(request.patch)
de.post = def(request.post)
de.put = def(request.put)
de.head = def(request.head)
de.del = def(request.del)
de.cookie = def(request.cookie)
de.jar = request.jar
de.get = def(request.get);
de.patch = def(request.patch);
de.post = def(request.post);
de.put = def(request.put);
de.head = def(request.head);
de.del = def(request.del);
de.cookie = def(request.cookie);
de.jar = request.jar;

return de
return de;
}

// ...

request.forever = function (agentOptions, optionsArg) {
// ...

return request.defaults(options)
}
return request.defaults(options);
};

request.get = function (uri, options, callback) {
// ...
}
};

request.post = function (uri, options, callback) {
// ...
}
};

request.put = function (uri, options, callback) {
// ...
}
};

request.patch = function (uri, options, callback) {
// ...
}
};

request.head = function (uri, options, callback) {
// ...
}
};

request.del = function (uri, options, callback) {
// ...
}
};

request.jar = function (uri, options, callback) {
// ...
}
};

request.cookie = function (uri, options, callback) {
// ...
}
};
```

```js
Expand Down Expand Up @@ -175,29 +175,29 @@ export { Request };
export var debug = process.env.NODE_DEBUG &&
/request/.test(process.env.NODE_DEBUG);

export var initParams = initParams
export var initParams = initParams;

export function defaults (options, requester) {
// ...

de.get = def(get)
de.patch = def(patch)
de.post = def(post)
de.put = def(put)
de.head = def(head)
de.del = def(del)
de.cookie = def(cookie)
de.jar = jar
de.get = def(get);
de.patch = def(patch);
de.post = def(post);
de.put = def(put);
de.head = def(head);
de.del = def(del);
de.cookie = def(cookie);
de.jar = jar;

return de
return de;
}

// ...

export function forever (agentOptions, optionsArg) {
// ...

return defaults(options)
return defaults(options);
}

export function get (uri, options, callback) {
Expand Down Expand Up @@ -243,16 +243,16 @@ diff](https://gist.github.com/wycats/4353447a213d3060e23f/revisions)
* Module dependencies
*/

var bytes = require('bytes')
var read = require('./read')
var typer = require('media-typer')
var typeis = require('type-is')
var bytes = require('bytes');
var read = require('./read');
var typer = require('media-typer');
var typeis = require('type-is');

/**
* Module exports
*/

module.exports = json
module.exports = json;

// ...

Expand Down Expand Up @@ -302,7 +302,7 @@ function mkdirP (p, opts, f, made) {
// ...
mkdirP(path.dirname(p), opts, function (er, made) {
// ...
})
});
// ...
}

Expand All @@ -314,7 +314,7 @@ mkdirP.sync = function sync (p, opts, made) {
// ...
made = sync(path.dirname(p), opts, made);
// ...
}
};
```

```js
Expand All @@ -330,7 +330,7 @@ export default function mkdirP (p, opts, f, made) {
// ...
mkdirP(dirname(p), opts, function (er, made) {
// ...
})
});
// ...
}

Expand Down