Browse Source

errors,repl: migrate to use internal/errors.js

PR-URL: https://github.com/nodejs/node/pull/13299
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
v6
sreepurnajasti 8 years ago
committed by James M Snell
parent
commit
28227963fa
  1. 4
      lib/internal/errors.js
  2. 6
      lib/internal/repl.js

4
lib/internal/errors.js

@ -134,11 +134,15 @@ E('ERR_INVALID_TUPLE', '%s must be an iterable %s tuple');
E('ERR_INVALID_URL', 'Invalid URL: %s'); E('ERR_INVALID_URL', 'Invalid URL: %s');
E('ERR_INVALID_URL_SCHEME', E('ERR_INVALID_URL_SCHEME',
(expected) => `The URL must be ${oneOf(expected, 'scheme')}`); (expected) => `The URL must be ${oneOf(expected, 'scheme')}`);
E('ERR_INVALID_REPL_HISTORY',
(repl_history) => `Expected array, got ${repl_history}`);
E('ERR_IPC_CHANNEL_CLOSED', 'channel closed'); E('ERR_IPC_CHANNEL_CLOSED', 'channel closed');
E('ERR_IPC_DISCONNECTED', 'IPC channel is already disconnected'); E('ERR_IPC_DISCONNECTED', 'IPC channel is already disconnected');
E('ERR_IPC_ONE_PIPE', 'Child process can have only one IPC pipe'); E('ERR_IPC_ONE_PIPE', 'Child process can have only one IPC pipe');
E('ERR_IPC_SYNC_FORK', 'IPC cannot be used with synchronous forks'); E('ERR_IPC_SYNC_FORK', 'IPC cannot be used with synchronous forks');
E('ERR_MISSING_ARGS', missingArgs); E('ERR_MISSING_ARGS', missingArgs);
E('ERR_PARSE_HISTORY_DATA',
(oldHistoryPath) => `Could not parse history data in ${oldHistoryPath}`);
E('ERR_STDERR_CLOSE', 'process.stderr cannot be closed'); E('ERR_STDERR_CLOSE', 'process.stderr cannot be closed');
E('ERR_STDOUT_CLOSE', 'process.stdout cannot be closed'); E('ERR_STDOUT_CLOSE', 'process.stdout cannot be closed');
E('ERR_UNKNOWN_BUILTIN_MODULE', (id) => `No such built-in module: ${id}`); E('ERR_UNKNOWN_BUILTIN_MODULE', (id) => `No such built-in module: ${id}`);

6
lib/internal/repl.js

@ -7,6 +7,7 @@ const fs = require('fs');
const os = require('os'); const os = require('os');
const util = require('util'); const util = require('util');
const debug = util.debuglog('repl'); const debug = util.debuglog('repl');
const errors = require('internal/errors');
module.exports = Object.create(REPL); module.exports = Object.create(REPL);
module.exports.createInternalRepl = createRepl; module.exports.createInternalRepl = createRepl;
@ -153,13 +154,14 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
if (oldReplJSONHistory) repl.history = JSON.parse(oldReplJSONHistory); if (oldReplJSONHistory) repl.history = JSON.parse(oldReplJSONHistory);
if (!Array.isArray(repl.history)) { if (!Array.isArray(repl.history)) {
throw new Error('Expected array, got ' + typeof repl.history); throw new errors.TypeError('ERR_INVALID_ARG_TYPE',
typeof repl.history, 'Array');
} }
repl.history = repl.history.slice(0, repl.historySize); repl.history = repl.history.slice(0, repl.historySize);
} catch (err) { } catch (err) {
if (err.code !== 'ENOENT') { if (err.code !== 'ENOENT') {
return ready( return ready(
new Error(`Could not parse history data in ${oldHistoryPath}.`)); new errors.Error('ERR_PARSE_HISTORY_DATA', oldHistoryPath));
} }
} }
} }

Loading…
Cancel
Save