Skip to content

Commit 0e84007

Browse files
committed
errors,tools: ASCIIbetical instead of alphabetical
PR-URL: nodejs#15578 Fixes: nodejs#15576 Reviewed-By: Luigi Pinca <[email protected]>
1 parent b22014e commit 0e84007

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

lib/internal/errors.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,6 @@ E('ERR_ENCODING_INVALID_ENCODED_DATA',
125125
E('ERR_ENCODING_NOT_SUPPORTED',
126126
(enc) => `The "${enc}" encoding is not supported`);
127127
E('ERR_FALSY_VALUE_REJECTION', 'Promise was rejected with falsy value');
128-
E('ERR_HTTP_HEADERS_SENT',
129-
'Cannot render headers after they are sent to the client');
130-
E('ERR_HTTP_INVALID_CHAR', 'Invalid character in statusMessage.');
131-
E('ERR_HTTP_INVALID_STATUS_CODE',
132-
(originalStatusCode) => `Invalid status code: ${originalStatusCode}`);
133-
E('ERR_HTTP_TRAILER_INVALID',
134-
'Trailers are invalid with this transfer encoding');
135128
E('ERR_HTTP2_CONNECT_AUTHORITY',
136129
':authority header is required for CONNECT requests');
137130
E('ERR_HTTP2_CONNECT_PATH',
@@ -146,14 +139,14 @@ E('ERR_HTTP2_FRAME_ERROR',
146139
msg += ` with code ${code}`;
147140
return msg;
148141
});
149-
E('ERR_HTTP2_HEADER_REQUIRED',
150-
(name) => `The ${name} header is required`);
151-
E('ERR_HTTP2_HEADER_SINGLE_VALUE',
152-
(name) => `Header field "${name}" must have only a single value`);
153142
E('ERR_HTTP2_HEADERS_AFTER_RESPOND',
154143
'Cannot specify additional headers after response initiated');
155144
E('ERR_HTTP2_HEADERS_OBJECT', 'Headers must be an object');
156145
E('ERR_HTTP2_HEADERS_SENT', 'Response has already been initiated.');
146+
E('ERR_HTTP2_HEADER_REQUIRED',
147+
(name) => `The ${name} header is required`);
148+
E('ERR_HTTP2_HEADER_SINGLE_VALUE',
149+
(name) => `Header field "${name}" must have only a single value`);
157150
E('ERR_HTTP2_INFO_HEADERS_AFTER_RESPOND',
158151
'Cannot send informational headers after the HTTP message has been sent');
159152
E('ERR_HTTP2_INFO_STATUS_NOT_ALLOWED',
@@ -192,6 +185,13 @@ E('ERR_HTTP2_STREAM_ERROR',
192185
E('ERR_HTTP2_STREAM_SELF_DEPENDENCY', 'A stream cannot depend on itself');
193186
E('ERR_HTTP2_UNSUPPORTED_PROTOCOL',
194187
(protocol) => `protocol "${protocol}" is unsupported.`);
188+
E('ERR_HTTP_HEADERS_SENT',
189+
'Cannot render headers after they are sent to the client');
190+
E('ERR_HTTP_INVALID_CHAR', 'Invalid character in statusMessage.');
191+
E('ERR_HTTP_INVALID_STATUS_CODE',
192+
(originalStatusCode) => `Invalid status code: ${originalStatusCode}`);
193+
E('ERR_HTTP_TRAILER_INVALID',
194+
'Trailers are invalid with this transfer encoding');
195195
E('ERR_INDEX_OUT_OF_RANGE', 'Index out of range');
196196
E('ERR_INVALID_ARG_TYPE', invalidArgType);
197197
E('ERR_INVALID_ARRAY_LENGTH',
@@ -255,7 +255,6 @@ E('ERR_UNKNOWN_STDIN_TYPE', 'Unknown stdin file type');
255255
E('ERR_UNKNOWN_STREAM_TYPE', 'Unknown stream file type');
256256
E('ERR_VALID_PERFORMANCE_ENTRY_TYPE',
257257
'At least one valid performance entry type is required');
258-
// Add new errors from here...
259258

260259
function invalidArgType(name, expected, actual) {
261260
internalAssert(name, 'name is required');

tools/eslint-rules/alphabetize-errors.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
'use strict';
22

3-
const message = 'Errors in lib/internal/errors.js must be alphabetized';
3+
const prefix = 'Out of ASCIIbetical order - ';
4+
const opStr = ' >= ';
45

56
function errorForNode(node) {
67
return node.expression.arguments[0].value;
78
}
89

9-
function isAlphabetized(previousNode, node) {
10-
return errorForNode(previousNode).localeCompare(errorForNode(node)) < 0;
11-
}
12-
1310
function isDefiningError(node) {
1411
return node.expression &&
1512
node.expression.type === 'CallExpression' &&
@@ -19,16 +16,20 @@ function isDefiningError(node) {
1916

2017
module.exports = {
2118
create: function(context) {
22-
var previousNode;
23-
19+
let previousNode;
2420
return {
2521
ExpressionStatement: function(node) {
26-
if (isDefiningError(node)) {
27-
if (previousNode && !isAlphabetized(previousNode, node)) {
28-
context.report({ node: node, message: message });
29-
}
30-
22+
if (!isDefiningError(node)) return;
23+
if (!previousNode) {
3124
previousNode = node;
25+
return;
26+
}
27+
const prev = errorForNode(previousNode);
28+
const curr = errorForNode(node);
29+
previousNode = node;
30+
if (prev >= curr) {
31+
const message = [prefix, prev, opStr, curr].join('');
32+
context.report({ node, message });
3233
}
3334
}
3435
};

0 commit comments

Comments
 (0)