Skip to content

module: improve named cjs import errors #35453

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

Closed
ctavan wants to merge 11 commits into from
Closed

module: improve named cjs import errors #35453

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
22f700c
module: improve named cjs import errors
ctavan Oct 1, 2020
e4a018a
Update lib/internal/modules/esm/module_job.js
ctavan Oct 2, 2020
75c84fd
Update lib/internal/modules/esm/module_job.js
ctavan Oct 2, 2020
757d643
Apply suggestions from code review
ctavan Oct 2, 2020
1fcb340
Fix syntax errors introduced by commit suggestions
ctavan Oct 2, 2020
368305c
Apply suggestions from code review
ctavan Oct 16, 2020
0677559
Add long multiline test with comment
ctavan Oct 16, 2020
ae0a8ee
Fail if import example cannot be extracted
ctavan Oct 16, 2020
4d11c44
fixup! Add long multiline test with comment
ctavan Jan 29, 2021
182245f
Satisfy eslint
ctavan Jan 29, 2021
533560f
Revert "module: improve named cjs import errors"
ctavan Jan 29, 2021
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
Prev Previous commit
Next Next commit
Fix syntax errors introduced by commit suggestions
  • Loading branch information
@ctavan
ctavan committed Jan 29, 2021
commit 1fcb340bf90420fe057f679130eebb5a300d91cd
7 changes: 5 additions & 2 deletions lib/internal/modules/esm/module_job.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function extractExample(file, lineNumber) {
const imports = ArrayPrototypeMap(
ArrayPrototypeFilter(
node.node.specifiers,
(specifier) => specifier.type === 'ImportSpecifier')
(specifier) => (specifier.type === 'ImportSpecifier'),
),
(specifier) => {
const statement =
Expand All @@ -81,7 +81,10 @@ function extractExample(file, lineNumber) {

const boilerplate = `const { } = ${defaultImport};`;
const destructuringAssignment = totalLength > 80 - boilerplate.length ?
Copy link
Copy Markdown
Contributor Author

@ctavan ctavan Oct 1, 2020

Choose a reason for hiding this comment

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

My line splitting logic is pretty "simplistic"… Any idea on how to do this better?

Copy link
Copy Markdown
Contributor

@bcoe bcoe Oct 21, 2020

Choose a reason for hiding this comment

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

I wonder if we do anything similar elsewhere? a nice to have would be checking the terminal width, rather than assuming 80.

`\n${ArrayPrototypeJoin(ArrayPrototypeMap(imports, (i) => ` ${i}`), ',\n')}\n` :
`\n${ArrayPrototypeJoin(
ArrayPrototypeMap(imports, (i) => ` ${i}`),
',\n',
)}\n` :
` ${imports.join(joinString)} `;

return `\n\nimport ${defaultImport} from '${node.node.source.value}';\n` +
Expand Down