@nuggetslife/vc 0.1.0 → 0.3.0

package/src/jsonld.rs

@@ -2,17 +2,14 @@ use serde_json::{json, Value};
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use vc::{
-  document_loader::nuggets::DocumentLoader,
-  jsonld::{self, context_resolver::ContextResolver},
-};
+use vc::document_loader::nuggets::DocumentLoader;
 
 use crate::ld_signatures::create_document_loader;
 
 /// JSON-LD processor — drop-in replacement for the jsonld.js API.
 ///
-/// Holds a `DocumentLoader` and `ContextResolver` internally so they are
-/// created once and reused across all method calls.
+/// Holds a `DocumentLoader` internally so it is created once and reused
+/// across all method calls.
 ///
 /// ```js
 /// const jsonld = new JsonLd({ contexts: { "https://example.org/ctx": {...} } });
@@ -22,7 +19,6 @@ use crate::ld_signatures::create_document_loader;
 #[napi]
 pub struct JsonLd {
   loader: Arc<DocumentLoader>,
-  cr: Arc<ContextResolver>,
   additional_contexts: Arc<HashMap<String, Value>>,
 }
 
@@ -47,10 +43,9 @@ impl JsonLd {
       .and_then(|v| v.as_object())
       .map(|obj| obj.iter().map(|(k, v)| (k.clone(), v.clone())).collect())
       .unwrap_or_default();
-    let (loader, cr) = create_document_loader(additional_contexts.clone());
+    let loader = create_document_loader(additional_contexts.clone());
     Self {
       loader,
-      cr,
       additional_contexts: Arc::new(additional_contexts),
     }
   }
@@ -64,15 +59,9 @@ impl JsonLd {
   #[napi]
   pub async fn expand(&self, input: Value, options: Option<Value>) -> napi::Result<Value> {
     let opts = options.unwrap_or(json!({}));
-    if vc::jsonld_v2::use_v2() {
-      let additional = self.additional_contexts();
-      vc::jsonld_v2::expand_v2_sync(input, &additional, opts)
-        .map_err(|e| napi::Error::from_reason(format!("expand (v2) failed: {e}")))
-    } else {
-      jsonld::expand(input, self.loader.clone(), self.cr.clone(), opts)
-        .await
-        .map_err(|e| napi::Error::from_reason(format!("expand failed: {e}")))
-    }
+    let additional = self.additional_contexts();
+    vc::jsonld_v2::expand_v2_sync(input, &additional, opts)
+      .map_err(|e| napi::Error::from_reason(format!("expand failed: {e}")))
   }
 
   /// Compact a JSON-LD document using a context.
@@ -90,15 +79,9 @@ impl JsonLd {
     options: Option<Value>,
   ) -> napi::Result<Value> {
     let opts = options.unwrap_or(json!({}));
-    if vc::jsonld_v2::use_v2() {
-      let additional = self.additional_contexts();
-      vc::jsonld_v2::compact_v2_sync(input, ctx, &additional, opts)
-        .map_err(|e| napi::Error::from_reason(format!("compact (v2) failed: {e}")))
-    } else {
-      jsonld::compact_api(input, ctx, self.loader.clone(), self.cr.clone(), opts)
-        .await
-        .map_err(|e| napi::Error::from_reason(format!("compact failed: {e}")))
-    }
+    let additional = self.additional_contexts();
+    vc::jsonld_v2::compact_v2_sync(input, ctx, &additional, opts)
+      .map_err(|e| napi::Error::from_reason(format!("compact failed: {e}")))
   }
 
   /// Flatten a JSON-LD document.
@@ -118,15 +101,9 @@ impl JsonLd {
     let opts = options.unwrap_or(json!({}));
     // Filter out null ctx (JS passes null, Rust expects None)
     let ctx = ctx.filter(|v| !v.is_null());
-    if vc::jsonld_v2::use_v2() {
-      let additional = self.additional_contexts();
-      vc::jsonld_v2::flatten_v2_sync(input, ctx, &additional, opts)
-        .map_err(|e| napi::Error::from_reason(format!("flatten (v2) failed: {e}")))
-    } else {
-      jsonld::flatten(input, ctx, self.loader.clone(), self.cr.clone(), opts)
-        .await
-        .map_err(|e| napi::Error::from_reason(format!("flatten failed: {e}")))
-    }
+    let additional = self.additional_contexts();
+    vc::jsonld_v2::flatten_v2_sync(input, ctx, &additional, opts)
+      .map_err(|e| napi::Error::from_reason(format!("flatten failed: {e}")))
   }
 
   /// Frame a JSON-LD document.
@@ -144,25 +121,16 @@ impl JsonLd {
     options: Option<Value>,
   ) -> napi::Result<Value> {
     let opts = options.unwrap_or(json!({}));
-    if vc::jsonld_v2::use_v2() {
-      // Sprint 3 Phase D cutover: V2 frame is always the native typed-tree
-      // walker. CLIENTFFI_FRAME_NATIVE / CLIENTFFI_FRAME_FAST flags are no
-      // longer consulted — frame_v2 / frame_v2_fast public APIs were
-      // retired in this commit.
-      let loader = self.loader.clone();
-      let cr = self.cr.clone();
-      let join = tokio::task::spawn_blocking(move || {
-        vc::jsonld_v2::frame_native_sync(input, frame, loader, cr, opts)
-          .map_err(|e| napi::Error::from_reason(format!("frame (native) failed: {e}")))
-      });
-      join
-        .await
-        .map_err(|e| napi::Error::from_reason(format!("frame (v2) join: {e}")))?
-    } else {
-      jsonld::frame(input, frame, self.loader.clone(), self.cr.clone(), opts)
-        .await
+    // V2 frame is the native typed-tree walker (Sprint 3 Phase D cutover).
+    let loader = self.loader.clone();
+    let additional = self.additional_contexts();
+    let join = tokio::task::spawn_blocking(move || {
+      vc::jsonld_v2::frame_native_sync(input, frame, loader, opts, &additional)
         .map_err(|e| napi::Error::from_reason(format!("frame failed: {e}")))
-    }
+    });
+    join
+      .await
+      .map_err(|e| napi::Error::from_reason(format!("frame join: {e}")))?
   }
 
   /// Convert a JSON-LD document to an RDF dataset.
@@ -174,22 +142,23 @@ impl JsonLd {
   #[napi(js_name = "toRDF")]
   pub async fn to_rdf(&self, input: Value, options: Option<Value>) -> napi::Result<Value> {
     let opts = options.unwrap_or(json!({}));
-    // v2 only produces N-Quads string output. If caller expects
-    // a quads-array (default when format is omitted), fall back to v1.
+    // The N-Quads output path is the V2 fast path (string output);
+    // otherwise return the dataset as a JSON quads array.
     let wants_nquads = opts
       .get("format")
       .and_then(|v| v.as_str())
       .map(|s| s == "application/n-quads")
       .unwrap_or(false);
-    if vc::jsonld_v2::use_v2() && wants_nquads {
-      let additional = self.additional_contexts();
+    let additional = self.additional_contexts();
+    if wants_nquads {
       let nquads = vc::jsonld_v2::to_nquads_v2_sync(input, &additional, opts)
-        .map_err(|e| napi::Error::from_reason(format!("toRDF (v2) failed: {e}")))?;
+        .map_err(|e| napi::Error::from_reason(format!("toRDF failed: {e}")))?;
       Ok(Value::String(nquads))
     } else {
-      jsonld::to_rdf(input, self.loader.clone(), self.cr.clone(), opts)
-        .await
-        .map_err(|e| napi::Error::from_reason(format!("toRDF failed: {e}")))
+      let quads = vc::jsonld_v2::to_quads_v2_sync(input, &additional, opts)
+        .map_err(|e| napi::Error::from_reason(format!("toRDF failed: {e}")))?;
+      serde_json::to_value(&quads)
+        .map_err(|e| napi::Error::from_reason(format!("toRDF serialize failed: {e}")))
     }
   }
 
@@ -202,7 +171,7 @@ impl JsonLd {
   #[napi(js_name = "fromRDF")]
   pub fn from_rdf(&self, dataset: Value, options: Option<Value>) -> napi::Result<Value> {
     let opts = options.unwrap_or(json!({}));
-    jsonld::from_rdf_api(dataset, opts)
+    vc::jsonld_v2::from_rdf_sync(dataset, opts)
       .map_err(|e| napi::Error::from_reason(format!("fromRDF failed: {e}")))
   }
 
@@ -228,20 +197,16 @@ impl JsonLd {
       .and_then(|v| v.as_str())
       .map(|s| s == "application/n-quads")
       .unwrap_or(false);
-    let result = if vc::jsonld_v2::use_v2() && !input_is_nquads {
-      let additional = self.additional_contexts();
-      vc::jsonld_v2::canonize_v2_sync(
-        input,
-        &additional,
-        self.loader.clone(),
-        self.cr.clone(),
-        opts,
-      )
-      .map_err(|e| napi::Error::from_reason(format!("canonize (v2) failed: {e}")))?
-    } else {
-      jsonld::canonize(input, self.loader.clone(), self.cr.clone(), opts)
+    let result = if input_is_nquads {
+      // canonize_v2 always runs expand+to_rdf and would mis-treat an
+      // N-Quads string as JSON-LD; route directly through RDF canonicalize.
+      vc::rdf_canonize::canonize(input, opts)
         .await
         .map_err(|e| napi::Error::from_reason(format!("canonize failed: {e}")))?
+    } else {
+      let additional = self.additional_contexts();
+      vc::jsonld_v2::canonize_v2_sync(input, &additional, self.loader.clone(), opts)
+        .map_err(|e| napi::Error::from_reason(format!("canonize failed: {e}")))?
     };
     Ok(Value::String(result))
   }