From 4b6c4c35e1f0df571dfcded715ecae44066c5002 Mon Sep 17 00:00:00 2001 From: LimpidCrypto Date: Mon, 23 Dec 2024 16:25:05 +0000 Subject: [PATCH] support both definitions and keywords --- .devcontainer/devcontainer.json | 31 +++++++++++++++++++++++++++++++ typify-impl/src/lib.rs | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..f8fff109 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,31 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/rust +{ + "name": "Rust", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "image": "mcr.microsoft.com/devcontainers/rust:1-1-bullseye" + + // Use 'mounts' to make the cargo cache persistent in a Docker Volume. + // "mounts": [ + // { + // "source": "devcontainer-cargo-cache-${devcontainerId}", + // "target": "/usr/local/cargo", + // "type": "volume" + // } + // ] + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "rustc --version", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/typify-impl/src/lib.rs b/typify-impl/src/lib.rs index bc2dbbec..c8faedfc 100644 --- a/typify-impl/src/lib.rs +++ b/typify-impl/src/lib.rs @@ -1258,7 +1258,7 @@ fn fetch_defenition( if fragment.is_empty() { return Schema::Object(base_schema.schema.clone()); } - let definition_schema = if fragment[0] == "definitions" { + let definition_schema = if ["definitions", "$defs"].contains(&fragment[0].as_str()) { base_schema .definitions .get(