feat(elysia): add isolated Elysia 2 integration #12
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -39,6 +39,7 @@ coverage/ | |
| .cache/ | ||
| .temp/ | ||
| tmp/ | ||
| .bun-test/ | ||
|
|
||
| # Framework build output | ||
| .next/ | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,82 @@ | ||
| import { readFile, writeFile } from 'node:fs/promises'; | ||
| import { pathToFileURL } from 'node:url'; | ||
| import ts from 'typescript'; | ||
|
|
||
| const declarationPaths = ['dist/next.d.ts', 'dist/next.d.cts']; | ||
| const developmentAlias = 'elysia-next'; | ||
| const publishedSpecifier = 'elysia'; | ||
|
|
||
| function isDevelopmentAlias(specifier) { | ||
| return specifier === developmentAlias || specifier.startsWith(`${developmentAlias}/`); | ||
| } | ||
|
|
||
| function aliasReplacement(specifier) { | ||
| return specifier === developmentAlias | ||
| ? publishedSpecifier | ||
| : `${publishedSpecifier}${specifier.slice(developmentAlias.length)}`; | ||
| } | ||
|
|
||
| function aliasSpecifiers(sourceFile) { | ||
| const specifiers = []; | ||
|
|
||
| function addSpecifier(node) { | ||
| if (!node || !ts.isStringLiteral(node) || !isDevelopmentAlias(node.text)) return; | ||
|
|
||
| const start = node.getStart(sourceFile) + 1; | ||
| const end = node.getEnd() - 1; | ||
| specifiers.push({ start, end, replacement: aliasReplacement(node.text) }); | ||
| } | ||
|
|
||
| function visit(node) { | ||
|
Contributor
There was a problem hiding this comment. The visitor misses
Contributor
Author
There was a problem hiding this comment. Fixed in |
||
| if (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) { | ||
| addSpecifier(node.moduleSpecifier); | ||
| } else if (ts.isImportTypeNode(node) && ts.isLiteralTypeNode(node.argument)) { | ||
| addSpecifier(node.argument.literal); | ||
| } else if (ts.isExternalModuleReference(node)) { | ||
| addSpecifier(node.expression); | ||
| } | ||
|
|
||
| ts.forEachChild(node, visit); | ||
| } | ||
|
|
||
| ts.forEachChild(sourceFile, visit); | ||
| return specifiers; | ||
| } | ||
|
|
||
| function patchDeclaration(declaration) { | ||
| const sourceFile = ts.createSourceFile('next.d.ts', declaration, ts.ScriptTarget.Latest, false); | ||
| const replacements = aliasSpecifiers(sourceFile); | ||
|
|
||
| return replacements | ||
| .reverse() | ||
| .reduce( | ||
| (patched, { start, end, replacement }) => | ||
| `${patched.slice(0, start)}${replacement}${patched.slice(end)}`, | ||
| declaration | ||
| ); | ||
| } | ||
|
|
||
| export async function patchNextDeclarations(paths = declarationPaths) { | ||
| const patchedDeclarations = []; | ||
|
|
||
| for (const path of paths) { | ||
| const declaration = await readFile(path, 'utf8'); | ||
| const patched = patchDeclaration(declaration); | ||
|
|
||
| if (new RegExp(`\\b${developmentAlias}\\b`).test(patched)) { | ||
| throw new Error(`Expected ${path} to contain no elysia-next development alias after patching`); | ||
| } | ||
|
|
||
| patchedDeclarations.push([path, patched, declaration]); | ||
| } | ||
|
|
||
| for (const [path, patched, declaration] of patchedDeclarations) { | ||
| if (patched !== declaration) { | ||
| await writeFile(path, patched); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) { | ||
| await patchNextDeclarations(); | ||
| } | ||
This file contains hidden or 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,55 @@ | ||
| import { readFileSync } from 'node:fs'; | ||
| import { dirname, resolve } from 'node:path'; | ||
| import ts from 'typescript'; | ||
|
|
||
| const fixtureConfigPath = 'tests/fixtures/next-declarations-consumer/tsconfig.json'; | ||
| const declarationPaths = ['dist/next.d.ts', 'dist/next.d.cts']; | ||
|
|
||
| function readCompilerOptions(configPath) { | ||
| const config = ts.readConfigFile(configPath, ts.sys.readFile); | ||
| if (config.error) throw new Error(ts.flattenDiagnosticMessageText(config.error.messageText, '\n')); | ||
|
|
||
| return ts.parseJsonConfigFileContent(config.config, ts.sys, dirname(configPath)).options; | ||
| } | ||
|
|
||
| function moduleSpecifiers(sourceFile) { | ||
| const specifiers = new Set(); | ||
|
|
||
| function addSpecifier(node) { | ||
| if (node && ts.isStringLiteral(node)) specifiers.add(node.text); | ||
| } | ||
|
|
||
| function visit(node) { | ||
| if (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) { | ||
| addSpecifier(node.moduleSpecifier); | ||
| } else if (ts.isImportTypeNode(node) && ts.isLiteralTypeNode(node.argument)) { | ||
| addSpecifier(node.argument.literal); | ||
| } else if (ts.isExternalModuleReference(node)) { | ||
| addSpecifier(node.expression); | ||
| } | ||
|
|
||
| ts.forEachChild(node, visit); | ||
| } | ||
|
|
||
| ts.forEachChild(sourceFile, visit); | ||
| return specifiers; | ||
| } | ||
|
|
||
| export function validateNextDeclarations(paths = declarationPaths, fixtureConfig = fixtureConfigPath) { | ||
| const compilerOptions = readCompilerOptions(fixtureConfig); | ||
| const host = ts.sys; | ||
|
|
||
| for (const path of paths) { | ||
| const declaration = readFileSync(path, 'utf8'); | ||
| const sourceFile = ts.createSourceFile(path, declaration, ts.ScriptTarget.Latest, false); | ||
|
|
||
| for (const specifier of moduleSpecifiers(sourceFile)) { | ||
| const resolved = ts.resolveModuleName(specifier, resolve(path), compilerOptions, host).resolvedModule; | ||
| if (!resolved) { | ||
| throw new Error(`Unable to resolve ${JSON.stringify(specifier)} from ${path}`); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| validateNextDeclarations(); |
This file contains hidden or 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 @@ | ||
| export { logtide, type LogtideElysiaOptions } from './plugin-next'; |
Oops, something went wrong.
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.
No CI step semantically validates the patched
dist/next.d.ts:skipLibCheckis on repo-wide and the patch test only checks string rewriting, so an unresolvable specifier in the shipped declarations would go unnoticed. A smalltscfixture over the built d.ts (orattw) would catch 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.
Fixed in
4a45003.test:declarationscompiles a consumer fixture that imports the builtdist/next.d.ts, then TypeScript's module resolver checks every import, export, and import-type specifier in the ESM and CJS declarations. CI runs it after the build.