wip

LuvDaSun · Feb 20, 2024 · 2d88c33 · 2d88c33
1 parent 2d6643a
commit 2d88c33
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 17 deletions.
diff --git a/packages/cargo/jns42-generator/src/documents/draft_04/document.rs b/packages/cargo/jns42-generator/src/documents/draft_04/document.rs
@@ -1,10 +1,20 @@
+use serde_json::Value;
+use url::Url;
+
+#[allow(dead_code)]
 pub struct Document {
-    //
+    antecedent_url: Option<Url>,
+    document_node_url: Url,
+    document_node: Value,
 }
 
 impl Document {
-    pub fn new() -> Self {
-        Self {}
+    pub fn new(given_url: Url, antecedent_url: Option<Url>, document_node: Value) -> Self {
+        Self {
+            antecedent_url,
+            document_node,
+            document_node_url: given_url,
+        }
     }
 }
 

diff --git a/packages/cargo/jns42-generator/src/documents/draft_06/document.rs b/packages/cargo/jns42-generator/src/documents/draft_06/document.rs
@@ -1,10 +1,20 @@
+use serde_json::Value;
+use url::Url;
+
+#[allow(dead_code)]
 pub struct Document {
-    //
+    antecedent_url: Option<Url>,
+    document_node_url: Url,
+    document_node: Value,
 }
 
 impl Document {
-    pub fn new() -> Self {
-        Self {}
+    pub fn new(given_url: Url, antecedent_url: Option<Url>, document_node: Value) -> Self {
+        Self {
+            antecedent_url,
+            document_node,
+            document_node_url: given_url,
+        }
     }
 }
 

diff --git a/packages/cargo/jns42-generator/src/documents/draft_07/document.rs b/packages/cargo/jns42-generator/src/documents/draft_07/document.rs
@@ -1,10 +1,20 @@
+use serde_json::Value;
+use url::Url;
+
+#[allow(dead_code)]
 pub struct Document {
-    //
+    antecedent_url: Option<Url>,
+    document_node_url: Url,
+    document_node: Value,
 }
 
 impl Document {
-    pub fn new() -> Self {
-        Self {}
+    pub fn new(given_url: Url, antecedent_url: Option<Url>, document_node: Value) -> Self {
+        Self {
+            antecedent_url,
+            document_node,
+            document_node_url: given_url,
+        }
     }
 }
 

diff --git a/packages/cargo/jns42-generator/src/documents/draft_2019_09/document.rs b/packages/cargo/jns42-generator/src/documents/draft_2019_09/document.rs
@@ -1,10 +1,20 @@
+use serde_json::Value;
+use url::Url;
+
+#[allow(dead_code)]
 pub struct Document {
-    //
+    antecedent_url: Option<Url>,
+    document_node_url: Url,
+    document_node: Value,
 }
 
 impl Document {
-    pub fn new() -> Self {
-        Self {}
+    pub fn new(given_url: Url, antecedent_url: Option<Url>, document_node: Value) -> Self {
+        Self {
+            antecedent_url,
+            document_node,
+            document_node_url: given_url,
+        }
     }
 }
 

diff --git a/packages/cargo/jns42-generator/src/documents/draft_2020_12/document.rs b/packages/cargo/jns42-generator/src/documents/draft_2020_12/document.rs
@@ -1,7 +1,7 @@
-use crate::documents::document_context::DocumentContext;
 use serde_json::Value;
 use url::Url;
 
+#[allow(dead_code)]
 pub struct Document {
     antecedent_url: Option<Url>,
     document_node_url: Url,

diff --git a/packages/cargo/jns42-generator/src/programs/package.rs b/packages/cargo/jns42-generator/src/programs/package.rs
@@ -51,19 +51,43 @@ pub async fn run_command(options: CommandOptions) -> Result<(), Box<dyn Error>>
     );
     context.register_factory(
         &MetaSchemaId::Draft201909,
-        Box::new(|initializer| Rc::new(draft_2019_09::document::Document::new())),
+        Box::new(|initializer| {
+            Rc::new(draft_2019_09::document::Document::new(
+                initializer.given_url.clone(),
+                initializer.antecedent_url.cloned(),
+                initializer.document_node.clone(),
+            ))
+        }),
     );
     context.register_factory(
         &MetaSchemaId::Draft07,
-        Box::new(|initializer| Rc::new(draft_07::document::Document::new())),
+        Box::new(|initializer| {
+            Rc::new(draft_07::document::Document::new(
+                initializer.given_url.clone(),
+                initializer.antecedent_url.cloned(),
+                initializer.document_node.clone(),
+            ))
+        }),
     );
     context.register_factory(
         &MetaSchemaId::Draft06,
-        Box::new(|initializer| Rc::new(draft_06::document::Document::new())),
+        Box::new(|initializer| {
+            Rc::new(draft_06::document::Document::new(
+                initializer.given_url.clone(),
+                initializer.antecedent_url.cloned(),
+                initializer.document_node.clone(),
+            ))
+        }),
     );
     context.register_factory(
         &MetaSchemaId::Draft04,
-        Box::new(|initializer| Rc::new(draft_04::document::Document::new())),
+        Box::new(|initializer| {
+            Rc::new(draft_04::document::Document::new(
+                initializer.given_url.clone(),
+                initializer.antecedent_url.cloned(),
+                initializer.document_node.clone(),
+            ))
+        }),
     );
 
     context