Indexes 2: Add new_unchecked() constructors to spk schema objects

crates/parsedbuf/src/lib.rs

@@ -99,7 +99,7 @@ macro_rules! parsed {
             }
         }
 
-        // Allow tests to manufacture owned instances with known good values.
+        // Allow tests and indexes to manufacture owned instances with known good values.
         #[allow(dead_code)]
         impl $owned_type_name {
             $crate::paste::paste! {

crates/spk-schema/crates/foundation/src/ident_build/build_id.rs

@@ -16,6 +16,13 @@ impl BuildId {
         Self(chars)
     }
 
+    /// Make a new BuildId from a list of chars without checking them
+    pub fn new_unchecked(value: Vec<char>) -> Self {
+        let mut chars = [0 as char; Self::SIZE];
+        chars.copy_from_slice(&value);
+        Self::new(chars)
+    }
+
     pub fn new_from_bytes(bytes: &[u8]) -> Self {
         let encoded = data_encoding::BASE32.encode(bytes);
         Self(

crates/spk-schema/crates/foundation/src/ident_ops/parsing/ident.rs

@@ -45,6 +45,10 @@ impl NormalizedVersionString {
     pub fn as_str(&self) -> &str {
         &self.0
     }
+
+    pub fn new_unchecked(normalized_version_string: String) -> Self {
+        Self(normalized_version_string)
+    }
 }
 
 impl std::fmt::Display for NormalizedVersionString {

crates/spk-schema/crates/foundation/src/ident_ops/parsing/mod.rs

@@ -30,7 +30,13 @@ use crate::version::parsing::{version, version_str};
 mod ident;
 mod request;
 
-pub use ident::{IdentParts, IdentPartsBuf, ident_parts, ident_parts_with_components};
+pub use ident::{
+    IdentParts,
+    IdentPartsBuf,
+    NormalizedVersionString,
+    ident_parts,
+    ident_parts_with_components,
+};
 pub use request::{range_ident_pkg_name, request_pkg_name_and_version};
 
 pub static KNOWN_REPOSITORY_NAMES: Lazy<HashSet<&'static str>> = Lazy::new(|| {

crates/spk-schema/crates/foundation/src/version/compat/mod.rs

@@ -55,12 +55,20 @@
     Binary,
 }
 
+// TODO: CompatRules that allow ::None are used in Compat
+// structs. CompatRules that do not allow ::None are used in
+// required_compat's in Requests. They should be separate types,
+// perhaps one wrapping the other, to clarify where ::None is and is
+// not a valid value.
 impl std::fmt::Display for CompatRule {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         if f.alternate() {
             // Request for alternate (long form) names.
             f.write_str(match self {
-                CompatRule::None => unreachable!(),
+                CompatRule::None => unreachable!(
+                    "CompatRule '{}' fmt() cannot be displayed when using the alternate flag",
+                    self
+                ),
                 CompatRule::API => API_STR,
                 CompatRule::Binary => BINARY_STR,
             })
@@ -690,6 +698,14 @@
         }
     }
 
+    /// Create a compat from the given string without checking it. For
+    /// internal use only for data from a index.
+    pub fn new_unchecked(compat: &str) -> Result<Self> {
+        // TODO: change this to be more direct once Compats are
+        // directly represented in indexes.
+        Self::from_str(compat)
+    }
+
     /// Return true if the two versions are api compatible by this compat rule.
     pub fn is_api_compatible(&self, base: &Version, other: &Version) -> Compatibility {
         self.check_compat(base, other, CompatRule::API)

crates/spk-schema/crates/foundation/src/version/mod.rs

@@ -392,6 +392,10 @@ impl Version {
         }
     }
 
+    pub fn new_unchecked(version_str: &str) -> Result<Self> {
+        Version::try_from(version_str)
+    }
+
     /// The major version number (first component)
     pub fn major(&self) -> u32 {
         self.parts.first().copied().unwrap_or_default()

crates/spk-schema/crates/foundation/src/version_range/mod.rs

@@ -1208,6 +1208,12 @@ impl VersionFilter {
         }
     }
 
+    /// Makes a VersionFilter from the given string, without checking
+    /// that it is valid. This is used by indexing.
+    pub fn new_unchecked(filter_string: &str) -> Self {
+        VersionFilter::from_str(filter_string).unwrap()
+    }
+
     pub fn single(item: VersionRange) -> Self {
         let mut filter = Self::default();
         filter.rules.insert(item);

crates/spk-schema/src/component_embedded_packages.rs

@@ -35,6 +35,12 @@ impl ComponentEmbeddedPackage {
         }
     }
 
+    /// Create a new `ComponentEmbeddedPackage` directly from the
+    /// given pieces without checking them.
+    pub fn new_unchecked(pkg: OptVersionIdent, components: BTreeSet<Component>) -> Self {
+        Self { pkg, components }
+    }
+
     #[inline]
     pub fn components(&self) -> &BTreeSet<Component> {
         &self.components

crates/spk-schema/src/component_spec.rs

@@ -11,7 +11,7 @@ use spk_schema_foundation::name::PkgName;
 use spk_schema_foundation::option_map::OptionMap;
 use spk_schema_foundation::spec_ops::{ComponentFileMatchMode, HasBuildIdent};
 
-use super::RequirementsList;
+use super::{ComponentEmbeddedPackagesList, RequirementsList};
 use crate::component_spec_list::ComponentSpecDefaults;
 use crate::foundation::ident_component::Component;
 use crate::foundation::spec_ops::{ComponentOps, FileMatcher};
@@ -32,7 +32,7 @@ struct RawComponentSpec {
     #[serde(default)]
     requirements: super::RequirementsList<PinnedRequest>,
     #[serde(default)]
-    embedded: super::ComponentEmbeddedPackagesList,
+    embedded: ComponentEmbeddedPackagesList,
     #[serde(default)]
     file_match_mode: ComponentFileMatchMode,
 }
@@ -72,7 +72,7 @@ pub struct ComponentSpec {
         default,
         skip_serializing_if = "super::ComponentEmbeddedPackagesList::is_fabricated"
     )]
-    pub embedded: super::ComponentEmbeddedPackagesList,
+    pub embedded: ComponentEmbeddedPackagesList,
 
     #[serde(default)]
     pub file_match_mode: ComponentFileMatchMode,
@@ -193,6 +193,29 @@ impl ComponentSpec {
             file_match_mode,
         })
     }
+
+    /// Create a component spec from parts without checking them.
+    #[allow(clippy::too_many_arguments)]
+    pub fn new_unchecked(
+        name: Component,
+        uses: Vec<Component>,
+        // This is needed because some cases call for empty rules and
+        // others for a single wild card rule.
+        files: FileMatcher,
+        options: &OptionMap,
+        requirements: RequirementsList<PinnedRequest>,
+        embedded: ComponentEmbeddedPackagesList,
+    ) -> ComponentSpec {
+        ComponentSpec {
+            name,
+            uses,
+            files,
+            requirements_with_options: (options.iter(), &requirements).into(),
+            requirements,
+            embedded,
+            file_match_mode: Default::default(),
+        }
+    }
 }
 
 impl ComponentSpecDefaults for ComponentSpec {

crates/spk-schema/src/component_spec_list.rs

@@ -58,6 +58,10 @@ impl<ComponentSpecT> ComponentSpecList<ComponentSpecT>
 where
     ComponentSpecT: ComponentOps,
 {
+    pub fn new(component_specs: Vec<ComponentSpecT>) -> Self {
+        ComponentSpecList(component_specs)
+    }
+
     /// Collect the names of all components in this list
     pub fn names(&self) -> HashSet<&Component> {
         self.iter().map(|i| i.name()).collect()

crates/spk-schema/src/lib.rs

@@ -30,7 +30,7 @@ pub mod variant;
 
 pub use arc_compat::is_default_arc_compat;
 pub use build_spec::BuildSpec;
-pub use component_embedded_packages::ComponentEmbeddedPackagesList;
+pub use component_embedded_packages::{ComponentEmbeddedPackage, ComponentEmbeddedPackagesList};
 pub use component_spec::ComponentSpec;
 pub use component_spec_list::ComponentSpecList;
 pub use deprecate::{Deprecate, DeprecateMut};

crates/spk-schema/src/option.rs

@@ -522,6 +522,26 @@ impl VarOpt {
         })
     }
 
+    /// Create a VarOpt from the given pieces without checking them
+    pub fn new_unchecked<S: AsRef<str>>(
+        var: S,
+        inheritance: Inheritance,
+        compat: Option<Compat>,
+        required: bool,
+        value: Option<String>,
+    ) -> Self {
+        Self {
+            var: unsafe { OptNameBuf::from_string(var.as_ref().to_string()) },
+            default: String::default(),
+            choices: IndexSet::default(),
+            inheritance,
+            description: None,
+            compat,
+            required,
+            value,
+        }
+    }
+
     pub fn get_value(&self, given: Option<&str>) -> Option<String> {
         if let Some(v) = &self.value
             && !v.is_empty()
@@ -668,6 +688,24 @@ impl PkgOpt {
         })
     }
 
+    /// Create a PkgOpt from the given pieces without checking them
+    pub fn new_unchecked(
+        name: PkgNameBuf,
+        components: ComponentBTreeSetBuf,
+        prerelease_policy: Option<PreReleasePolicy>,
+        value: Option<String>,
+        required_compat: Option<CompatRule>,
+    ) -> Self {
+        Self {
+            pkg: name,
+            components,
+            default: String::default(),
+            prerelease_policy,
+            value,
+            required_compat,
+        }
+    }
+
     pub fn get_value(&self, given: Option<&str>) -> Option<String> {
         if let Some(v) = &self.value {
             Some(v.clone())

crates/spk-schema/src/requirements_list.rs

@@ -430,6 +430,12 @@ impl RequirementsList<RequestWithOptions> {
         }
         Ok(out)
     }
+
+    /// Construct a RequirementsList from a RequestWithOptions list,
+    /// without checking them, or merging them together.
+    pub fn new_checked(requests_with_options: Vec<RequestWithOptions>) -> Self {
+        Self(requests_with_options)
+    }
 }
 
 impl<R> std::fmt::Display for RequirementsList<R>

crates/spk-schema/src/v0/embedded_package_spec.rs

@@ -111,6 +111,27 @@ impl EmbeddedPackageSpec {
         }
     }
 
+    /// Create a spec for the identified package from the given values
+    /// without checking them
+    pub fn new_unchecked(
+        ident: BuildIdent,
+        build: EmbeddedBuildSpec,
+        requirements_with_options: RequirementsList<RequestWithOptions>,
+        install: EmbeddedInstallSpec,
+    ) -> Self {
+        EmbeddedPackageSpec {
+            pkg: ident,
+            meta: Meta::default(),
+            compat: Arc::new(Compat::default()),
+            deprecated: bool::default(),
+            sources: Vec::new(),
+            build,
+            tests: Vec::new(),
+            install,
+            install_requirements_with_options: requirements_with_options,
+        }
+    }
+
     /// Read-only access to the build spec
     #[inline]
     pub fn build(&self) -> &EmbeddedBuildSpec {