Skip to content

fix: replacements splitted between chunks W-20635868 #1699

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
Bartheleway wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: replacements splitted between chunks W-20635868 #1699

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
29 changes: 23 additions & 6 deletions src/convert/replacements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export class ReplacementStream extends Transform {
private readonly foundReplacements = new Set<string>();
private readonly allReplacements: MarkedReplacement[];
private readonly lifecycleInstance = Lifecycle.getInstance();
private leftover: string = '';

public constructor(private readonly replacements: MarkedReplacement[]) {
super({ objectMode: true });
Expand All @@ -66,16 +67,32 @@ export class ReplacementStream extends Transform {
encoding: string,
callback: (error?: Error, data?: Buffer) => void
): Promise<void> {
let error: Error | undefined;
const { output, found } = await replacementIterations(chunk.toString(), this.replacements);
for (const foundKey of found) {
this.foundReplacements.add(foundKey);
const combined = this.leftover + chunk.toString();
const lastNewlineIndex = combined.lastIndexOf('\n');
const safeLength = lastNewlineIndex === -1 ? combined.length : lastNewlineIndex + 1;

this.leftover = combined.slice(safeLength);

if (safeLength > 0) {
const { output, found } = await replacementIterations(combined.slice(0, safeLength), this.replacements);
for (const foundKey of found) {
this.foundReplacements.add(foundKey);
}
callback(undefined, Buffer.from(output));
} else {
callback();
}
callback(error, Buffer.from(output));
}

public async _flush(callback: (error?: Error) => void): Promise<void> {
// At the end of the stream, emit warnings for replacements not found
if (this.leftover.length > 0) {
const { output, found } = await replacementIterations(this.leftover, this.replacements);
for (const foundKey of found) {
this.foundReplacements.add(foundKey);
}
this.push(Buffer.from(output));
}

for (const replacement of this.allReplacements) {
const key = replacement.toReplace.toString();
if (replacement.singleFile && !this.foundReplacements.has(key)) {
Expand Down