Fix codegen, update API codes

sugyan · Feb 8, 2024 · 3bf79c5 · 3bf79c5
1 parent ad02a16
commit 3bf79c5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/atrium-api/src/com/atproto/label/subscribe_labels.rs b/atrium-api/src/com/atproto/label/subscribe_labels.rs
@@ -1,5 +1,6 @@
 // This file is generated by atrium-codegen. DO NOT EDIT.
 //!Definitions for the `com.atproto.label.subscribeLabels` namespace.
+pub const NSID: &str = "com.atproto.label.subscribeLabels";
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct Parameters {

diff --git a/atrium-api/src/com/atproto/sync/subscribe_repos.rs b/atrium-api/src/com/atproto/sync/subscribe_repos.rs
@@ -1,5 +1,6 @@
 // This file is generated by atrium-codegen. DO NOT EDIT.
 //!Definitions for the `com.atproto.sync.subscribeRepos` namespace.
+pub const NSID: &str = "com.atproto.sync.subscribeRepos";
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct Parameters {
@@ -16,14 +17,14 @@ pub enum Error {
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct Commit {
-    pub blobs: Vec<cid::Cid>,
+    pub blobs: Vec<crate::types::CidLink>,
     ///CAR file containing relevant blocks.
     #[serde(with = "serde_bytes")]
     pub blocks: Vec<u8>,
-    pub commit: cid::Cid,
+    pub commit: crate::types::CidLink,
     pub ops: Vec<RepoOp>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub prev: Option<cid::Cid>,
+    pub prev: Option<crate::types::CidLink>,
     pub rebase: bool,
     pub repo: String,
     ///The rev of the emitted commit.
@@ -65,7 +66,7 @@ pub struct Migrate {
 pub struct RepoOp {
     pub action: String,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cid: Option<cid::Cid>,
+    pub cid: Option<crate::types::CidLink>,
     pub path: String,
 }
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]

diff --git a/atrium-codegen/src/generator.rs b/atrium-codegen/src/generator.rs
@@ -24,8 +24,15 @@ pub(crate) fn generate_schemas(
     if let Some(basename) = paths.pop() {
         let mut tokens = Vec::new();
         let mut names = Vec::new();
-        // main def
         for (name, def) in &schema.defs {
+            // NSID (for XrpcSubscription only)
+            if let LexUserType::XrpcSubscription(_) = &def {
+                let nsid = schema.id.clone();
+                tokens.push(quote! {
+                    pub const NSID: &str = #nsid;
+                });
+            }
+            // main def
             if name == "main" {
                 tokens.push(user_type(def, basename, true)?);
             } else {

diff --git a/atrium-codegen/src/token_stream.rs b/atrium-codegen/src/token_stream.rs
@@ -182,7 +182,6 @@ fn lex_subscription(subscription: &LexXrpcSubscription) -> Result<TokenStream> {
         } else {
             quote!()
         };
-    // TODO: message
     let errors = xrpc_errors(&subscription.errors)?;
     Ok(quote! {
         #params
@@ -328,7 +327,7 @@ fn bytes_type(bytes: &LexBytes) -> Result<(TokenStream, TokenStream)> {
 
 fn cid_link_type(cid_link: &LexCidLink) -> Result<(TokenStream, TokenStream)> {
     let description = description(&cid_link.description);
-    Ok((description, quote!(cid::Cid)))
+    Ok((description, quote!(crate::types::CidLink)))
 }
 
 fn array_type(