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.

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

Allow component names to contain underscores #268

Merged
merged 8 commits into from
Sep 9, 2024
Merged

Allow component names to contain underscores #268

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
741dae0
Allow component names to contain underscores
augustuswm Sep 9, 2024
a72cb90
Update name regex to match spec
augustuswm Sep 9, 2024
4635ff9
Autogenerate config update
github-actions[bot] Sep 9, 2024
4b29475
Lint fix
augustuswm Sep 9, 2024
2263899
Merge branch 'allow-underscore_in_name' of github.com:oxidecomputer/o…
augustuswm Sep 9, 2024
266386c
Do not specify ending
augustuswm Sep 9, 2024
9c45597
Autogenerate config update
github-actions[bot] Sep 9, 2024
b37cb84
dummy commit to trigger CI
david-crespo Sep 9, 2024
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
2 changes: 1 addition & 1 deletion oxide-openapi-gen-ts/src/client/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const getSortedSchemas = (spec: OpenAPIV3.Document) => {
Object.keys(spec.components?.schemas || {}).map((name) => [
name,
JSON.stringify(spec.components!.schemas![name])
.match(/#\/components\/schemas\/[A-Za-z0-9]+/g)
.match(/#\/components\/schemas\/[A-Za-z0-9_]+/g)
Copy link
Collaborator

@david-crespo david-crespo Sep 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Maybe this could just be like .+? or \w+. or even .startsWith('#/components/schemas/')? No need to be this specific to begin with

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense to me. I can see if the Open API spec has any guidance on allowed characters.

Copy link
Contributor Author

@augustuswm augustuswm Sep 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I think this answers it:

All the fixed fields declared above are objects that MUST use keys that match the regular expression: ^[a-zA-Z0-9\.\-_]+$.

?.map((s) => s.replace("#/components/schemas/", "")),
])
);
Expand Down
Loading