-
-
Notifications
You must be signed in to change notification settings - Fork 624
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
chore(build): validate if exporting is correct in package.json
and jsr.json
#3638
Merged
+91
−5
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
52c1ab4
feat(build): for both exports to be the same
EdamAme-x 94c0c73
Merge branch 'honojs:main' into feat-build-both
EdamAme-x ddcf4e6
some fix
EdamAme-x 13ad404
fix exclude of coverage
EdamAme-x 945f549
update
EdamAme-x fbd1265
stylish error message and add comment
EdamAme-x b754cee
revert auto lint
EdamAme-x efa95f0
chore: format
EdamAme-x File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
/// <reference types="vitest/globals" /> | ||
|
||
import { validateExports } from './validate-exports' | ||
|
||
const mockExports1 = { | ||
'./a': './a.ts', | ||
'./b': './b.ts', | ||
'./c/a': './c.ts', | ||
'./d/*': './d/*.ts', | ||
} | ||
|
||
const mockExports2 = { | ||
'./a': './a.ts', | ||
'./b': './b.ts', | ||
'./c/a': './c.ts', | ||
'./d/a': './d/a.ts', | ||
} | ||
|
||
const mockExports3 = { | ||
'./a': './a.ts', | ||
'./c/a': './c.ts', | ||
'./d/*': './d/*.ts', | ||
} | ||
|
||
describe('validateExports', () => { | ||
it('Works', async () => { | ||
expect(() => validateExports(mockExports1, mockExports1, 'package.json')).not.toThrowError() | ||
expect(() => validateExports(mockExports1, mockExports2, 'jsr.json')).not.toThrowError() | ||
expect(() => validateExports(mockExports1, mockExports3, 'package.json')).toThrowError() | ||
}) | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
export const validateExports = ( | ||
source: Record<string, unknown>, | ||
target: Record<string, unknown>, | ||
fileName: string | ||
) => { | ||
const isEntryInTarget = (entry: string): boolean => { | ||
if (entry in target) { | ||
return true | ||
} | ||
|
||
// e.g., "./utils/*" -> "./utils" | ||
const wildcardPrefix = entry.replace(/\/\*$/, '') | ||
if (entry.endsWith('/*')) { | ||
return Object.keys(target).some( | ||
(targetEntry) => | ||
targetEntry.startsWith(wildcardPrefix + '/') && targetEntry !== wildcardPrefix | ||
) | ||
} | ||
|
||
const separatedEntry = entry.split('/') | ||
while (separatedEntry.length > 0) { | ||
const pattern = `${separatedEntry.join('/')}/*` | ||
if (pattern in target) { | ||
return true | ||
} | ||
separatedEntry.pop() | ||
} | ||
|
||
return false | ||
} | ||
|
||
Object.keys(source).forEach((sourceEntry) => { | ||
if (!isEntryInTarget(sourceEntry)) { | ||
throw new Error(`Missing "${sourceEntry}" in '${fileName}'`) | ||
} | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it also should validate
typesVersions
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, will work on it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nakasyou Ah, you are right. But perhaps validating
typeVersions
is another issue? We can check whether it's correct withoutjsr.json
.@EdamAme-x What do you think of it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was able to write the code, but you are right, it may be another problem.
I will consider this after this PR is merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay. Let's merge this first.