Migrate to schemars version 1.0 (#33635)
The major change in schemars 1.0 is that now schemas are represented as plain json values instead of specialized datatypes. This allows for more concise construction and manipulation. This change also improves how settings schemas are generated. Each top level settings type was being generated as a full root schema including the definitions it references, and then these were merged. This meant generating all shared definitions multiple times, and might have bugs in cases where there are two types with the same names. Now instead the schemar generator's `definitions` are built up as they normally are and the `Settings` trait no longer has a special `json_schema` method. To handle types that have schema that vary at runtime (`FontFamilyName`, `ThemeName`, etc), values of `ParameterizedJsonSchema` are collected by `inventory`, and the schema definitions for these types are replaced. To help check that this doesn't break anything, I tried to minimize the overall [schema diff](https://gist.github.com/mgsloan/1de549def20399d6f37943a3c1583ee7) with some patches to make the order more consistent + schemas also sorted with `jq -S .`. A skim of the diff shows that the diffs come from: * `enum: ["value"]` turning into `const: "value"` * Differences in handling of newlines for "description" * Schemas for generic types no longer including the parameter name, now all disambiguation is with numeric suffixes * Enums now using `oneOf` instead of `anyOf`. Release Notes: - N/A
This commit is contained in:
parent
a2e786e0f9
commit
5fafab6e52
42 changed files with 714 additions and 963 deletions
|
@ -287,7 +287,8 @@ pub struct DebugTaskFile(pub Vec<DebugScenario>);
|
|||
|
||||
impl DebugTaskFile {
|
||||
pub fn generate_json_schema(schemas: &AdapterSchemas) -> serde_json_lenient::Value {
|
||||
let build_task_schema = schemars::schema_for!(BuildTaskDefinition);
|
||||
let mut generator = schemars::generate::SchemaSettings::draft07().into_generator();
|
||||
let build_task_schema = generator.root_schema_for::<BuildTaskDefinition>();
|
||||
let mut build_task_value =
|
||||
serde_json_lenient::to_value(&build_task_schema).unwrap_or_default();
|
||||
|
||||
|
|
|
@ -1,33 +1,6 @@
|
|||
use schemars::{
|
||||
SchemaGenerator,
|
||||
schema::{ArrayValidation, InstanceType, Schema, SchemaObject, SingleOrVec, StringValidation},
|
||||
};
|
||||
use serde::de::{self, Deserializer, Visitor};
|
||||
use std::fmt;
|
||||
|
||||
/// Generates a JSON schema for a non-empty string array.
|
||||
pub fn non_empty_string_vec_json_schema(_: &mut SchemaGenerator) -> Schema {
|
||||
Schema::Object(SchemaObject {
|
||||
instance_type: Some(InstanceType::Array.into()),
|
||||
array: Some(Box::new(ArrayValidation {
|
||||
unique_items: Some(true),
|
||||
items: Some(SingleOrVec::Single(Box::new(Schema::Object(
|
||||
SchemaObject {
|
||||
instance_type: Some(InstanceType::String.into()),
|
||||
string: Some(Box::new(StringValidation {
|
||||
min_length: Some(1), // Ensures string in the array is non-empty
|
||||
..Default::default()
|
||||
})),
|
||||
..Default::default()
|
||||
},
|
||||
)))),
|
||||
..Default::default()
|
||||
})),
|
||||
format: Some("vec-of-non-empty-strings".to_string()), // Use a custom format keyword
|
||||
..Default::default()
|
||||
})
|
||||
}
|
||||
|
||||
/// Deserializes a non-empty string array.
|
||||
pub fn non_empty_string_vec<'de, D>(deserializer: D) -> Result<Vec<String>, D::Error>
|
||||
where
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use anyhow::{Context as _, bail};
|
||||
use collections::{HashMap, HashSet};
|
||||
use schemars::{JsonSchema, r#gen::SchemaSettings};
|
||||
use schemars::JsonSchema;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sha2::{Digest, Sha256};
|
||||
use std::path::PathBuf;
|
||||
|
@ -9,8 +9,7 @@ use util::{ResultExt, truncate_and_remove_front};
|
|||
|
||||
use crate::{
|
||||
AttachRequest, ResolvedTask, RevealTarget, Shell, SpawnInTerminal, TaskContext, TaskId,
|
||||
VariableName, ZED_VARIABLE_NAME_PREFIX,
|
||||
serde_helpers::{non_empty_string_vec, non_empty_string_vec_json_schema},
|
||||
VariableName, ZED_VARIABLE_NAME_PREFIX, serde_helpers::non_empty_string_vec,
|
||||
};
|
||||
|
||||
/// A template definition of a Zed task to run.
|
||||
|
@ -61,7 +60,7 @@ pub struct TaskTemplate {
|
|||
/// Represents the tags which this template attaches to.
|
||||
/// Adding this removes this task from other UI and gives you ability to run it by tag.
|
||||
#[serde(default, deserialize_with = "non_empty_string_vec")]
|
||||
#[schemars(schema_with = "non_empty_string_vec_json_schema")]
|
||||
#[schemars(length(min = 1))]
|
||||
pub tags: Vec<String>,
|
||||
/// Which shell to use when spawning the task.
|
||||
#[serde(default)]
|
||||
|
@ -116,10 +115,9 @@ pub struct TaskTemplates(pub Vec<TaskTemplate>);
|
|||
impl TaskTemplates {
|
||||
/// Generates JSON schema of Tasks JSON template format.
|
||||
pub fn generate_json_schema() -> serde_json_lenient::Value {
|
||||
let schema = SchemaSettings::draft07()
|
||||
.with(|settings| settings.option_add_null_type = false)
|
||||
let schema = schemars::generate::SchemaSettings::draft07()
|
||||
.into_generator()
|
||||
.into_root_schema_for::<Self>();
|
||||
.root_schema_for::<Self>();
|
||||
|
||||
serde_json_lenient::to_value(schema).unwrap()
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue