feat: addIngredient

.changeset/cute-coins-clean.md

@@ -0,0 +1,6 @@
+---
+'@contentauth/c2pa-wasm': patch
+'@contentauth/c2pa-web': patch
+---
+
+Add Builder method to add ingredient json only

packages/c2pa-wasm/src/wasm_builder.rs

@@ -7,7 +7,7 @@
 
 use std::io::Cursor;
 
-use c2pa::{assertions::Action, Builder, BuilderIntent};
+use c2pa::{assertions::Action, Builder, BuilderIntent, Ingredient};
 use js_sys::{Error as JsError, JsString, Uint8Array};
 use serde::{Deserialize, Serialize};
 use serde_wasm_bindgen::Serializer;
@@ -119,6 +119,18 @@ impl WasmBuilder {
         Ok(())
     }
 
+    /// Add an ingredient to the manifest from a JSON ingredient definition without a blob
+    ///
+    /// # Arguments
+    /// * `ingredient_json` - A JSON string representing the ingredient.
+    #[wasm_bindgen(js_name = addIngredient)]
+    pub fn add_ingredient(&mut self, json: &str) -> Result<(), JsError> {
+        let ingredient = Ingredient::from_json(json).map_err(WasmError::from)?;
+        self.builder.add_ingredient(ingredient);
+
+        Ok(())
+    }
+
     /// Add an ingredient to the manifest from a JSON ingredient definition and a [`Blob`].
     ///
     /// # Arguments

packages/c2pa-web/src/lib/builder.spec.ts

@@ -8,7 +8,7 @@
  */
 
 import { test, describe, expect } from 'test/methods.js';
-import { ManifestDefinition } from '@contentauth/c2pa-types';
+import { ManifestDefinition, Ingredient } from '@contentauth/c2pa-types';
 
 describe('builder', () => {
   describe('creation', () => {
@@ -122,6 +122,64 @@ describe('builder', () => {
           });
         });
       });
+
+      describe('addIngredient', () => {
+        test('should add the provided ingredient', async ({ c2pa }) => {
+          const builder = await c2pa.builder.new();
+
+          const ingredient: Ingredient = {
+            title: 'source-image.jpg',
+            format: 'image/jpeg',
+            instance_id: 'ingredient-instance-123',
+            document_id: 'ingredient-doc-456',
+          };
+
+          await builder.addIngredient(ingredient);
+
+          const definition = await builder.getDefinition();
+
+          expect(definition.ingredients).toHaveLength(1);
+          expect(definition.ingredients[0]).toMatchObject({
+            title: 'source-image.jpg',
+            format: 'image/jpeg',
+            instance_id: 'ingredient-instance-123',
+            document_id: 'ingredient-doc-456',
+          });
+        });
+
+        test('should add multiple ingredients', async ({ c2pa }) => {
+          const builder = await c2pa.builder.new();
+
+          const ingredient1: Ingredient = {
+            title: 'source-image-1.jpg',
+            format: 'image/jpeg',
+            instance_id: 'ingredient-instance-1',
+          };
+
+          const ingredient2: Ingredient = {
+            title: 'source-image-2.jpg',
+            format: 'image/png',
+            instance_id: 'ingredient-instance-2',
+          };
+
+          await builder.addIngredient(ingredient1);
+          await builder.addIngredient(ingredient2);
+
+          const definition = await builder.getDefinition();
+
+          expect(definition.ingredients).toHaveLength(2);
+          expect(definition.ingredients[0]).toMatchObject({
+            title: 'source-image-1.jpg',
+            format: 'image/jpeg',
+            instance_id: 'ingredient-instance-1',
+          });
+          expect(definition.ingredients[1]).toMatchObject({
+            title: 'source-image-2.jpg',
+            format: 'image/png',
+            instance_id: 'ingredient-instance-2',
+          });
+        });
+      });
     });
   });
 });

packages/c2pa-web/src/lib/builder.ts

@@ -85,11 +85,18 @@ export interface Builder {
    */
   setThumbnailFromBlob: (format: string, blob: Blob) => Promise<void>;
 
+  /**
+   * Add an ingredient to the builder from a definition only.
+   *
+   * @param ingredientDefinition {@link Ingredient} definition.
+   */
+  addIngredient: (ingredientDefinition: Ingredient) => Promise<void>;
+
   /**
    * Add an ingredient to the builder from a definition, format, and blob.
    * Values specified in the ingredient definition will be merged with the ingredient, and these values take precendence.
    *
-   * @param ingredientDefinition Ingredient definition.
+   * @param ingredientDefinition {@link Ingredient} definition.
    * @param format Format of the ingredient.
    * @param blob Blob of the ingredient's bytes.
    */
@@ -231,6 +238,11 @@ function createBuilder(
       await tx.builder_setThumbnailFromBlob(id, format, blob);
     },
 
+    async addIngredient(ingredientDefinition: Ingredient) {
+      const json = JSON.stringify(ingredientDefinition);
+      await tx.builder_addIngredient(id, json);
+    },
+
     async addIngredientFromBlob(
       ingredientDefinition: Ingredient,
       format: string,

packages/c2pa-web/src/lib/worker.ts

@@ -102,6 +102,10 @@ rx({
     const builder = builderMap.get(builderId);
     builder.setThumbnailFromBlob(format, blob);
   },
+  builder_addIngredient(builderId, json) {
+    const builder = builderMap.get(builderId);
+    builder.addIngredient(json);
+  },
   builder_addIngredientFromBlob(builderId, json, format, blob) {
     const builder = builderMap.get(builderId);
     builder.addIngredientFromBlob(json, format, blob);

packages/c2pa-web/src/lib/worker/rpc.ts

@@ -51,6 +51,10 @@ const { createTx, rx } = channel<{
     format: string,
     blob: Blob
   ) => void;
+  builder_addIngredient: (
+    builderId: number,
+    json: string
+  ) => void;
   builder_addIngredientFromBlob: (
     builderId: number,
     json: string,