Skip to content
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

test_runner: refactor tap_parser to use more primordials #45745

Merged
merged 2 commits into from
Dec 11, 2022
Merged

test_runner: refactor tap_parser to use more primordials #45745

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e24478e
test_runner: refactor `tap_parser` to use more primordials
aduh95 Dec 5, 2022
d339cb8
Update lib/internal/test_runner/tap_parser.js
aduh95 Dec 6, 2022
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
54 changes: 30 additions & 24 deletions lib/internal/test_runner/tap_parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
'use strict';

const Transform = require('internal/streams/transform');
const { TapLexer, TokenKind } = require('internal/test_runner/tap_lexer');
const { TapChecker } = require('internal/test_runner/tap_checker');
const {
codes: { ERR_TAP_VALIDATION_ERROR, ERR_TAP_PARSER_ERROR },
} = require('internal/errors');
const { kEmptyObject } = require('internal/util');
const {
ArrayPrototypeFilter,
ArrayPrototypeForEach,
ArrayPrototypeIncludes,
ArrayPrototypeJoin,
ArrayPrototypeMap,
ArrayPrototypePop,
ArrayPrototypePush,
ArrayPrototypeIncludes,
ArrayPrototypeSplice,
Boolean,
Number,
RegExpPrototypeExec,
RegExpPrototypeSymbolReplace,
String,
StringPrototypeTrim,
StringPrototypeEndsWith,
StringPrototypeReplaceAll,
StringPrototypeSlice,
StringPrototypeSplit,
StringPrototypeTrim,
} = primordials;
const Transform = require('internal/streams/transform');
const { TapLexer, TokenKind } = require('internal/test_runner/tap_lexer');
const { TapChecker } = require('internal/test_runner/tap_checker');
const {
codes: { ERR_TAP_VALIDATION_ERROR, ERR_TAP_PARSER_ERROR },
} = require('internal/errors');
const { kEmptyObject } = require('internal/util');
/**
*
* TAP14 specifications
Expand Down Expand Up @@ -149,22 +151,26 @@ class TapParser extends Transform {
processChunk(chunk) {
const str = this.#lastLine + chunk.toString('utf8');
const lines = StringPrototypeSplit(str, '\n');
this.#lastLine = ArrayPrototypeSplice(lines, lines.length - 1, 1)[0];
this.#lastLine = ArrayPrototypePop(lines);

let chunkAsString = lines.join('\n');
let chunkAsString = ArrayPrototypeJoin(lines, '\n');
// Special case where chunk is emitted by a child process
chunkAsString = RegExpPrototypeSymbolReplace(
/\[out\] /g,
chunkAsString = StringPrototypeReplaceAll(
chunkAsString,
'[out] ',
''
);
chunkAsString = RegExpPrototypeSymbolReplace(
/\[err\] /g,
chunkAsString = StringPrototypeReplaceAll(
chunkAsString,
'[err] ',
''
);
chunkAsString = RegExpPrototypeSymbolReplace(/\n$/, chunkAsString, '');
chunkAsString = RegExpPrototypeSymbolReplace(/EOF$/, chunkAsString, '');
if (StringPrototypeEndsWith(chunkAsString, '\n')) {
chunkAsString = StringPrototypeSlice(chunkAsString, 0, chunkAsString.length - 1);
}
if (StringPrototypeEndsWith(chunkAsString, 'EOF')) {
chunkAsString = StringPrototypeSlice(chunkAsString, 0, chunkAsString.length - 3);
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
}

return chunkAsString;
}
Expand Down Expand Up @@ -371,7 +377,7 @@ class TapParser extends Transform {
}

#addDiagnosticsToLastTestPoint(currentNode) {
const lastTestPoint = this.#bufferedTestPoints.at(-1);
const { length, [length - 1]: lastTestPoint } = this.#bufferedTestPoints;

// Diagnostic nodes are only added to Test points of the same nesting level
if (lastTestPoint && lastTestPoint.nesting === currentNode.nesting) {
Expand All @@ -396,7 +402,7 @@ class TapParser extends Transform {

#flushBufferedTestPointNode(shouldClearBuffer = true) {
if (this.#bufferedTestPoints.length > 0) {
this.#emit(this.#bufferedTestPoints.at(0));
this.#emit(this.#bufferedTestPoints[0]);

if (shouldClearBuffer) {
this.#bufferedTestPoints = [];
Expand Down Expand Up @@ -797,7 +803,7 @@ class TapParser extends Transform {

const commentContent = this.#peek();
if (commentContent) {
if (/^Subtest:/i.test(commentContent.value)) {
if (RegExpPrototypeExec(/^Subtest:/i, commentContent.value) !== null) {
this.#next(); // skip subtest keyword
const name = StringPrototypeTrim(this.#readNextLiterals());
const node = {
Expand Down Expand Up @@ -898,7 +904,7 @@ class TapParser extends Transform {
// YAMLLine := " " (YAML)* "\n"
#YAMLLine() {
const yamlLiteral = this.#readNextLiterals();
const { 0: key, 1: value } = StringPrototypeSplit(yamlLiteral, ':');
const { 0: key, 1: value } = StringPrototypeSplit(yamlLiteral, ':', 2);

// Note that this.#lastTestPointDetails has been cleared when we encounter a YAML start marker

Expand Down Expand Up @@ -960,7 +966,7 @@ class TapParser extends Transform {

// In some cases, pragma key can be followed by a comma separator,
// so we need to remove it
pragmaKey = RegExpPrototypeSymbolReplace(/,/g, pragmaKey, '');
pragmaKey = StringPrototypeReplaceAll(pragmaKey, ',', '');

pragmas[pragmaKey] = isEnabled;
nextToken = this.#peek();
Expand Down