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.

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

Admin-Generator: Fix problems when formatting Source Code #3566

Open
wants to merge 2 commits into
base: next
Choose a base branch
from
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,24 @@ export async function writeGenerated(filePath: string, contents: string): Promis
cwd: process.cwd(),
fix: true,
});

// Write not linted generated code into file. This is necessary to avoid linting errors like: Parsing error: file/path/file.tsx was not found by the project service.
await fs.writeFile(filePath, contents);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
await fs.writeFile(filePath, contents);
await fs.writeFile(filePath, header + contents);

(was also wrong in line 33)


const lintResult = await eslint.lintText(header + contents, {
filePath,
});

if (lintResult[0].errorCount > 0 || lintResult[0].fatalErrorCount > 0) {
const errorMessage = lintResult[0].messages
.map((message) => {
return message.message;
})
.join(".");

console.log(`❌ Linting error in ${filePath}: \n${errorMessage}`);
}

const output = lintResult[0] && lintResult[0].output ? lintResult[0].output : lintResult[0].source;
await fs.writeFile(filePath, output ?? contents);
Comment on lines 32 to 33
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the unlinted file is already written above, no need to fallback to contents (which was missing header)

Suggested change
const output = lintResult[0] && lintResult[0].output ? lintResult[0].output : lintResult[0].source;
await fs.writeFile(filePath, output ?? contents);
const lintOutput = lintResult[0] && lintResult[0].output ? lintResult[0].output : lintResult[0].source;
if (lintOutput) {
await fs.writeFile(filePath, lintOutput);
}

alternatively you could switch from eslint.lintText to eslint.lintFiles

console.log(`generated ${filePath}`);
Expand Down