Handle more parsing cases (int and str formats, additional props: fix #10, #11 and #13) #12
Conversation
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
smondet
changed the title
enum and field-mask formats (#10 and #11)
smondet
force-pushed
the
smondet-I10-enum-int-format
branch
from
112cc1a to
8b34166
Compare
smondet
force-pushed
the
smondet-I10-enum-int-format
branch
from
8b34166 to
ce6759d
Compare
ixzzd
reviewed
Dec 27, 2024
| ) | ||
| $ Arg.( | ||
| value (opt_all string [] (info [ "only-matching" ] ~docv:"REGEXP" ~doc:"Only output types matching REGEXP.")) | ||
| ) |
There was a problem hiding this comment.
I thinking this is a nice addition, thank you @smondet
Could you please add also tests for this one and mention it in the doc?
ixzzd
reviewed
Dec 27, 2024
ixzzd
reviewed
Dec 27, 2024
| value | ||
| (opt (t3 ~sep:':' keyword string string) Generator.default_state.json_ocaml_type | ||
| (info [ "json-ocaml-type" ] ~docv:"KEYWORD:MODULE.PATH:TYPE-NAME" | ||
| ~doc:"Use an alternate Mod.type for `json`, e.g. from:My_mod.Submod:json_type." |
ixzzd
reviewed
Dec 27, 2024
lib/generator.ml
Outdated
| | None -> | ||
| (* fallback to untyped if schema type is not defined *) | ||
| maybe_nullable "json" | ||
| Printf.ksprintf maybe_nullable "json (* %s *)" (String.concat "/" (List.rev ancestors)) |
There was a problem hiding this comment.
Not sure about ancestors lists here, for example:
type dynamicConfigValue = {
~id <ocaml default="\"\"">: string;
- ?value : json option;
+ ?value : json (* DynamicConfigValue/value *) option;
} https://github.com/ahrefs/jsonschema2atd/actions/runs/12166801073/job/33933871312#step:6:77
Looks like the comment is a bit redundant here. Do you have an example in mind which would illustrate the reason of having this comment?
There was a problem hiding this comment.
I've improved the comments but in that case, there is nothing in the JSON to display for "value" :)
"DynamicConfigValue": {
"type": "object",
"required": [
"id"
],
"properties": {
"id": {
"type": "string",
"default": ""
},
"value": {}
},
"$schema": "http://json-schema.org/draft-04/schema#"
},
Co-authored-by: Egor Chemokhonenko <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.