-
-
Notifications
You must be signed in to change notification settings - Fork 31
Add example URLs to JSDoc comments #214
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
Merged
Merged
Changes from 9 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
29bace4
Initial plan
Copilot 4f5a347
Add script to include example URLs in JSDocs for index.d.ts
Copilot a6156af
Fix linting issues in add-examples-to-dts.ts script
Copilot 41cf558
Address code review feedback: add tsx as devDependency and improve co…
Copilot 8d74970
Use node --import tsx instead of tsx directly, add as postbuild:types…
Copilot 04a039d
Remove accidentally committed build artifacts (.d.ts files)
Copilot 6bc42f0
Remove tsx, use Node's native TypeScript execution, commit distributi…
Copilot 730d749
Extend existing JSDoc blocks and add validations to add-examples-to-d…
Copilot 4e23b8a
Merge branch 'main' into copilot/include-example-urls-jsdocs
fregante 0513c34
Remove --experimental-strip-types flag and hashbang
Copilot 34ebeb4
Add actions/setup-node with node-version-file to all workflow jobs
Copilot 99b8c15
Discard changes to .github/workflows/esm-lint.yml
fregante 6d38ee7
Discard changes to .github/workflows/demo.yml
fregante 65e3e42
Discard changes to .github/workflows/ci.yml
fregante f6694e6
Merge branch 'main' into copilot/include-example-urls-jsdocs
fregante 3e9eb42
Add distribution folder back to .gitignore and remove tracked files
Copilot 8a4d8b5
Add actions/setup-node to esm-lint Pack job only
Copilot 05a2e67
Fix build and lint errors for Node 24 compatibility
Copilot 4d8dadc
Revert incorrect changes and properly fix ESLint issues
Copilot dbbf883
Fix what copilot couldn't
fregante 3853999
Anytime now
fregante 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 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 |
|---|---|---|
|
|
@@ -8,7 +8,6 @@ Thumbs.db | |
| *.log | ||
| logs | ||
| *.map | ||
| distribution | ||
| dist | ||
| .cache | ||
| .parcel-cache | ||
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,155 @@ | ||
| #!/usr/bin/env node --experimental-strip-types | ||
| /* eslint-disable n/prefer-global/process */ | ||
| import {readFileSync, writeFileSync} from 'node:fs'; | ||
| import {execSync} from 'node:child_process'; | ||
| // Import index.ts to populate the test data via side effect | ||
| // eslint-disable-next-line import/no-unassigned-import, n/file-extension-in-import | ||
| import './index.ts'; | ||
| // eslint-disable-next-line n/file-extension-in-import | ||
| import {getTests} from './collector.ts'; | ||
|
|
||
| // Read the generated .d.ts file | ||
| const dtsPath = './distribution/index.d.ts'; | ||
| const dtsContent = readFileSync(dtsPath, 'utf8'); | ||
|
|
||
| // Check if script has already been run | ||
| const marker = '/* Examples added by add-examples-to-dts.ts */'; | ||
| if (dtsContent.includes(marker)) { | ||
| console.error('❌ Error: Examples have already been added to this file'); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| // Process each exported function | ||
| const lines = dtsContent.split('\n'); | ||
| const outputLines: string[] = []; | ||
| let examplesAdded = 0; | ||
|
|
||
| for (const line of lines) { | ||
| // Check if this is a function declaration | ||
| const match = /^export declare const (\w+):/.exec(line); | ||
| if (match) { | ||
| const functionName = match[1]; | ||
|
|
||
| // Get the tests/examples for this function | ||
| const examples = getTests(functionName); | ||
|
|
||
| // Only add examples if they exist and aren't the special 'combinedTestOnly' marker | ||
| if (examples && examples.length > 0 && examples[0] !== 'combinedTestOnly') { | ||
| // Filter to only include actual URLs (not references to other functions) | ||
| const urlExamples = examples.filter((url: string) => url.startsWith('http')); | ||
|
|
||
| if (urlExamples.length > 0) { | ||
| // Check if there's an existing JSDoc block immediately before this line | ||
| let jsDocumentEndIndex = -1; | ||
| let jsDocumentStartIndex = -1; | ||
| let isSingleLineJsDocument = false; | ||
|
|
||
| // Look backwards from outputLines to find JSDoc | ||
| for (let index = outputLines.length - 1; index >= 0; index--) { | ||
| const previousLine = outputLines[index]; | ||
| const trimmed = previousLine.trim(); | ||
|
|
||
| if (trimmed === '') { | ||
| continue; // Skip empty lines | ||
| } | ||
|
|
||
| // Check for single-line JSDoc: /** ... */ | ||
| if (trimmed.startsWith('/**') && trimmed.endsWith('*/') && trimmed.length > 5) { | ||
| jsDocumentStartIndex = index; | ||
| jsDocumentEndIndex = index; | ||
| isSingleLineJsDocument = true; | ||
| break; | ||
| } | ||
|
|
||
| // Check for multi-line JSDoc ending | ||
| if (trimmed === '*/') { | ||
| jsDocumentEndIndex = index; | ||
| // Now find the start of this JSDoc | ||
| for (let k = index - 1; k >= 0; k--) { | ||
| if (outputLines[k].trim().startsWith('/**')) { | ||
| jsDocumentStartIndex = k; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| break; | ||
| } | ||
|
|
||
| // If we hit a non-JSDoc line, there's no JSDoc block | ||
| break; | ||
| } | ||
|
|
||
| if (jsDocumentStartIndex >= 0 && jsDocumentEndIndex >= 0) { | ||
| // Extend existing JSDoc block | ||
| if (isSingleLineJsDocument) { | ||
| // Convert single-line to multi-line and add examples | ||
| const singleLineContent = outputLines[jsDocumentStartIndex]; | ||
| // Extract the comment text without /** and */ | ||
| const commentText = singleLineContent.trim().slice(3, -2).trim(); | ||
|
|
||
| // Replace the single line with multi-line format | ||
| outputLines[jsDocumentStartIndex] = '/**'; | ||
| if (commentText) { | ||
| outputLines.splice(jsDocumentStartIndex + 1, 0, ` * ${commentText}`); | ||
| } | ||
|
|
||
| // Add examples after the existing content | ||
| const insertIndex = jsDocumentStartIndex + (commentText ? 2 : 1); | ||
| for (const url of urlExamples) { | ||
| outputLines.splice(insertIndex + urlExamples.indexOf(url), 0, ` * @example ${url}`); | ||
| } | ||
|
|
||
| outputLines.splice(insertIndex + urlExamples.length, 0, ' */'); | ||
| examplesAdded += urlExamples.length; | ||
| } else { | ||
| // Insert @example lines before the closing */ | ||
| for (const url of urlExamples) { | ||
| outputLines.splice(jsDocumentEndIndex, 0, ` * @example ${url}`); | ||
| } | ||
|
|
||
| examplesAdded += urlExamples.length; | ||
| } | ||
| } else { | ||
| // Add new JSDoc comment with examples before the declaration | ||
| outputLines.push('/**'); | ||
| for (const url of urlExamples) { | ||
| outputLines.push(` * @example ${url}`); | ||
| } | ||
|
|
||
| outputLines.push(' */'); | ||
| examplesAdded += urlExamples.length; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| outputLines.push(line); | ||
| } | ||
|
|
||
| // Add marker at the beginning | ||
| const finalContent = `${marker}\n${outputLines.join('\n')}`; | ||
|
|
||
| // Validate that we added some examples | ||
| if (examplesAdded === 0) { | ||
| console.error('❌ Error: No examples were added. This likely indicates a problem with the script.'); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| // Write the modified content back | ||
| writeFileSync(dtsPath, finalContent, 'utf8'); | ||
|
|
||
| console.log(`✓ Added ${examplesAdded} example URLs to index.d.ts`); | ||
|
|
||
| // Validate with TypeScript | ||
| try { | ||
| execSync('npx tsc --noEmit distribution/index.d.ts', { | ||
| cwd: process.cwd(), | ||
| stdio: 'pipe', | ||
| }); | ||
| console.log('✓ TypeScript validation passed'); | ||
| } catch (error: unknown) { | ||
| console.error('❌ TypeScript validation failed:'); | ||
| const execError = error as {stdout?: Uint8Array; stderr?: Uint8Array; message?: string}; | ||
| console.error(execError.stdout?.toString() ?? execError.stderr?.toString() ?? execError.message); | ||
| process.exit(1); | ||
| } |
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,5 @@ | ||
| /** @file This needs to be in a separate file so it can bee tree-shaken before being published, while still being importable by tests */ | ||
| export declare const testableUrls: Map<string, string[]>; | ||
| export declare function addTests(test: string, urls: string[]): void; | ||
| export declare function getTests(detectName: string): string[]; | ||
| export declare function getAllUrls(): Set<string>; |
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.
Uh oh!
There was an error while loading. Please reload this page.