Skip to content

Commit

Permalink
refactor lib/ underscore files into directories
Browse files Browse the repository at this point in the history
this is really just a small cleanup, no actual functionality was
changed. I think this would mostly be a nice change for people who are
new to the node.js source, as peeking into /lib with all that can be a
bit confusing unless you understand how NativeModule's builtin resolving works.
  • Loading branch information
devsnek committed Nov 4, 2017
1 parent 92f8663 commit 4a81a01
Show file tree
Hide file tree
Showing 49 changed files with 90 additions and 90 deletions.
2 changes: 1 addition & 1 deletion benchmark/http/check_invalid_header_char.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const common = require('../common.js');
const _checkInvalidHeaderChar = require('_http_common')._checkInvalidHeaderChar;
const _checkInvalidHeaderChar = require('http/common')._checkInvalidHeaderChar;

const bench = common.createBenchmark(main, {
key: [
Expand Down
2 changes: 1 addition & 1 deletion benchmark/http/check_is_http_token.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const common = require('../common.js');
const _checkIsHttpToken = require('_http_common')._checkIsHttpToken;
const _checkIsHttpToken = require('http/common')._checkIsHttpToken;

const bench = common.createBenchmark(main, {
key: [
Expand Down
12 changes: 6 additions & 6 deletions lib/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

'use strict';

const agent = require('_http_agent');
const { ClientRequest } = require('_http_client');
const common = require('_http_common');
const incoming = require('_http_incoming');
const outgoing = require('_http_outgoing');
const server = require('_http_server');
const agent = require('http/agent');
const { ClientRequest } = require('http/client');
const common = require('http/common');
const incoming = require('http/incoming');
const outgoing = require('http/outgoing');
const server = require('http/server');

const { Server } = server;

Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions lib/_http_client.js → lib/http/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ const {
freeParser,
httpSocketSetup,
parsers
} = require('_http_common');
const { OutgoingMessage } = require('_http_outgoing');
const Agent = require('_http_agent');
} = require('http/common');
const { OutgoingMessage } = require('http/outgoing');
const Agent = require('http/agent');
const { Buffer } = require('buffer');
const { urlToOptions, searchParamsSymbol } = require('internal/url');
const { outHeadersKey } = require('internal/http');
Expand Down
2 changes: 1 addition & 1 deletion lib/_http_common.js → lib/http/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const { methods, HTTPParser } = binding;

const FreeList = require('internal/freelist');
const { ondrain } = require('internal/http');
const incoming = require('_http_incoming');
const incoming = require('http/incoming');
const { emitDestroy } = require('async_hooks');
const {
IncomingMessage,
Expand Down
2 changes: 1 addition & 1 deletion lib/_http_incoming.js → lib/http/incoming.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function IncomingMessage(socket) {

// Set this to `true` so that stream.Readable won't attempt to read more
// data on `IncomingMessage#push` (see `maybeReadMore` in
// `_stream_readable.js`). This is important for proper tracking of
// `stream/readable.js`). This is important for proper tracking of
// `IncomingMessage#_consuming` which is used to dump requests that users
// haven't attempted to read.
this._readableState.readingMore = true;
Expand Down
2 changes: 1 addition & 1 deletion lib/_http_outgoing.js → lib/http/outgoing.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const util = require('util');
const internalUtil = require('internal/util');
const internalHttp = require('internal/http');
const { Buffer } = require('buffer');
const common = require('_http_common');
const common = require('http/common');
const checkIsHttpToken = common._checkIsHttpToken;
const checkInvalidHeaderChar = common._checkInvalidHeaderChar;
const { outHeadersKey } = require('internal/http');
Expand Down
4 changes: 2 additions & 2 deletions lib/_http_server.js → lib/http/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ const {
chunkExpression,
httpSocketSetup,
_checkInvalidHeaderChar: checkInvalidHeaderChar
} = require('_http_common');
const { OutgoingMessage } = require('_http_outgoing');
} = require('http/common');
const { OutgoingMessage } = require('http/outgoing');
const { outHeadersKey, ondrain } = require('internal/http');
const errors = require('internal/errors');
const Buffer = require('buffer').Buffer;
Expand Down
6 changes: 3 additions & 3 deletions lib/https.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ require('internal/util').assertCrypto();
const tls = require('tls');
const url = require('url');
const util = require('util');
const { Agent: HttpAgent } = require('_http_agent');
const { Agent: HttpAgent } = require('http/agent');
const {
Server: HttpServer,
_connectionListener
} = require('_http_server');
const { ClientRequest } = require('_http_client');
} = require('http/server');
const { ClientRequest } = require('http/client');
const { inherits } = util;
const debug = util.debuglog('https');
const { urlToOptions, searchParamsSymbol } = require('internal/url');
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/http2/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const tls = require('tls');
const util = require('util');
const fs = require('fs');
const errors = require('internal/errors');
const { StreamWrap } = require('_stream_wrap');
const { StreamWrap } = require('stream/wrap');
const { Duplex } = require('stream');
const { URL } = require('url');
const { onServerStream,
Expand Down
10 changes: 5 additions & 5 deletions lib/stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ const { Buffer } = require('buffer');
// to avoid a cross-reference(require) issues
const Stream = module.exports = require('internal/streams/legacy');

Stream.Readable = require('_stream_readable');
Stream.Writable = require('_stream_writable');
Stream.Duplex = require('_stream_duplex');
Stream.Transform = require('_stream_transform');
Stream.PassThrough = require('_stream_passthrough');
Stream.Readable = require('stream/readable');
Stream.Writable = require('stream/writable');
Stream.Duplex = require('stream/duplex');
Stream.Transform = require('stream/transform');
Stream.PassThrough = require('stream/passthrough');

// Backwards-compat with node 0.4.x
Stream.Stream = Stream;
Expand Down
4 changes: 2 additions & 2 deletions lib/_stream_duplex.js → lib/stream/duplex.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
module.exports = Duplex;

const util = require('util');
const Readable = require('_stream_readable');
const Writable = require('_stream_writable');
const Readable = require('stream/readable');
const Writable = require('stream/writable');

util.inherits(Duplex, Readable);

Expand Down
2 changes: 1 addition & 1 deletion lib/_stream_passthrough.js → lib/stream/passthrough.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

module.exports = PassThrough;

const Transform = require('_stream_transform');
const Transform = require('stream/transform');
const util = require('util');
util.inherits(PassThrough, Transform);

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/_stream_transform.js → lib/stream/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

module.exports = Transform;
const errors = require('internal/errors');
const Duplex = require('_stream_duplex');
const Duplex = require('stream/duplex');
const util = require('util');
util.inherits(Transform, Duplex);

Expand Down
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions lib/tls.js
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,12 @@ exports.parseCertString = internalUtil.deprecate(
'DEP0076');

// Public API
exports.createSecureContext = require('_tls_common').createSecureContext;
exports.SecureContext = require('_tls_common').SecureContext;
exports.TLSSocket = require('_tls_wrap').TLSSocket;
exports.Server = require('_tls_wrap').Server;
exports.createServer = require('_tls_wrap').createServer;
exports.connect = require('_tls_wrap').connect;
exports.createSecureContext = require('tls/common').createSecureContext;
exports.SecureContext = require('tls/common').SecureContext;
exports.TLSSocket = require('tls/wrap').TLSSocket;
exports.Server = require('tls/wrap').Server;
exports.createServer = require('tls/wrap').createServer;
exports.connect = require('tls/wrap').connect;

// Deprecated: DEP0064
exports.createSecurePair = require('_tls_legacy').createSecurePair;
exports.createSecurePair = require('tls/legacy').createSecurePair;
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/_tls_legacy.js → lib/tls/legacy.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ internalUtil.assertCrypto();

const assert = require('assert');
const { Buffer } = require('buffer');
const common = require('_tls_common');
const common = require('tls/common');
const { Connection } = process.binding('crypto');
const EventEmitter = require('events');
const stream = require('stream');
Expand Down
4 changes: 2 additions & 2 deletions lib/_tls_wrap.js → lib/tls/wrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ const crypto = require('crypto');
const net = require('net');
const tls = require('tls');
const util = require('util');
const common = require('_tls_common');
const { StreamWrap } = require('_stream_wrap');
const common = require('tls/common');
const { StreamWrap } = require('stream/wrap');
const { Buffer } = require('buffer');
const debug = util.debuglog('tls');
const { Timer } = process.binding('timer_wrap');
Expand Down
2 changes: 1 addition & 1 deletion lib/zlib.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
'use strict';

const errors = require('internal/errors');
const Transform = require('_stream_transform');
const Transform = require('stream/transform');
const { _extend } = require('util');
const { isArrayBufferView } = require('internal/util/types');
const binding = process.binding('zlib');
Expand Down
30 changes: 15 additions & 15 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
'lib/fs.js',
'lib/http.js',
'lib/http2.js',
'lib/_http_agent.js',
'lib/_http_client.js',
'lib/_http_common.js',
'lib/_http_incoming.js',
'lib/_http_outgoing.js',
'lib/_http_server.js',
'lib/http/agent.js',
'lib/http/client.js',
'lib/http/common.js',
'lib/http/incoming.js',
'lib/http/outgoing.js',
'lib/http/server.js',
'lib/https.js',
'lib/inspector.js',
'lib/module.js',
Expand All @@ -57,19 +57,19 @@
'lib/readline.js',
'lib/repl.js',
'lib/stream.js',
'lib/_stream_readable.js',
'lib/_stream_writable.js',
'lib/_stream_duplex.js',
'lib/_stream_transform.js',
'lib/_stream_passthrough.js',
'lib/_stream_wrap.js',
'lib/stream/readable.js',
'lib/stream/writable.js',
'lib/stream/duplex.js',
'lib/stream/transform.js',
'lib/stream/passthrough.js',
'lib/stream/wrap.js',
'lib/string_decoder.js',
'lib/sys.js',
'lib/timers.js',
'lib/tls.js',
'lib/_tls_common.js',
'lib/_tls_legacy.js',
'lib/_tls_wrap.js',
'lib/tls/common.js',
'lib/tls/legacy.js',
'lib/tls/wrap.js',
'lib/tty.js',
'lib/url.js',
'lib/util.js',
Expand Down
8 changes: 4 additions & 4 deletions test/message/stdin_messages.out
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SyntaxError: Strict mode code may not include a with statement
at Socket.<anonymous> (bootstrap_node.js:*:*)
at emitNone (events.js:*:*)
at Socket.emit (events.js:*:*)
at endReadableNT (_stream_readable.js:*:*)
at endReadableNT (stream/readable.js:*:*)
at _combinedTickCallback (internal/process/next_tick.js:*:*)
42
42
Expand All @@ -29,7 +29,7 @@ Error: hello
at Socket.<anonymous> (bootstrap_node.js:*:*)
at emitNone (events.js:*:*)
at Socket.emit (events.js:*:*)
at endReadableNT (_stream_readable.js:*:*)
at endReadableNT (stream/readable.js:*:*)
[stdin]:1
throw new Error("hello")
^
Expand All @@ -44,7 +44,7 @@ Error: hello
at Socket.<anonymous> (bootstrap_node.js:*:*)
at emitNone (events.js:*:*)
at Socket.emit (events.js:*:*)
at endReadableNT (_stream_readable.js:*:*)
at endReadableNT (stream/readable.js:*:*)
100
[stdin]:1
var x = 100; y = x;
Expand All @@ -60,7 +60,7 @@ ReferenceError: y is not defined
at Socket.<anonymous> (bootstrap_node.js:*:*)
at emitNone (events.js:*:*)
at Socket.emit (events.js:*:*)
at endReadableNT (_stream_readable.js:*:*)
at endReadableNT (stream/readable.js:*:*)

[stdin]:1
var ______________________________________________; throw 10
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http-agent-keepalive.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
const common = require('../common');
const assert = require('assert');
const http = require('http');
const Agent = require('_http_agent').Agent;
const Agent = require('http/agent').Agent;

let name;

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http-common.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
require('../common');
const assert = require('assert');
const httpCommon = require('_http_common');
const httpCommon = require('http/common');
const checkIsHttpToken = httpCommon._checkIsHttpToken;
const checkInvalidHeaderChar = httpCommon._checkInvalidHeaderChar;

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http-invalidheaderfield2.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require('../common');
const assert = require('assert');
const inspect = require('util').inspect;
const { _checkIsHttpToken, _checkInvalidHeaderChar } = require('_http_common');
const { _checkIsHttpToken, _checkInvalidHeaderChar } = require('http/common');

// Good header field names
[
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-outgoing-message-pipe.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
const assert = require('assert');
const common = require('../common');
const OutgoingMessage = require('_http_outgoing').OutgoingMessage;
const OutgoingMessage = require('http/outgoing').OutgoingMessage;

// Verify that an error is thrown upon a call to `OutgoingMessage.pipe`.

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-stream-pipe-after-end.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const Readable = require('_stream_readable');
const Writable = require('_stream_writable');
const Readable = require('stream/readable');
const Writable = require('stream/writable');
const util = require('util');

util.inherits(TestReadable, Readable);
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-stream-wrap-encoding.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
const common = require('../common');

const StreamWrap = require('_stream_wrap');
const StreamWrap = require('stream/wrap');
const Duplex = require('stream').Duplex;

{
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-stream-wrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const common = require('../common');
const assert = require('assert');

const StreamWrap = require('_stream_wrap');
const StreamWrap = require('stream/wrap');
const Duplex = require('stream').Duplex;
const ShutdownWrap = process.binding('stream_wrap').ShutdownWrap;

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-stream2-base64-single-char-read-end.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

'use strict';
require('../common');
const R = require('_stream_readable');
const W = require('_stream_writable');
const R = require('stream/readable');
const W = require('stream/writable');
const assert = require('assert');

const src = new R({ encoding: 'base64' });
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-stream2-basic.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
'use strict';

const common = require('../common');
const R = require('_stream_readable');
const R = require('stream/readable');
const assert = require('assert');

const util = require('util');
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-stream2-compatibility.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

'use strict';
require('../common');
const R = require('_stream_readable');
const W = require('_stream_writable');
const R = require('stream/readable');
const W = require('stream/writable');
const assert = require('assert');

const util = require('util');
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-stream2-decode-partial.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';
require('../common');
const Readable = require('_stream_readable');
const Readable = require('stream/readable');
const assert = require('assert');

let buf = '';
Expand Down
Loading

0 comments on commit 4a81a01

Please sign in to comment.