fix: Comment incorporation

Author: cdmurph32

README.md

@@ -47,29 +47,6 @@ This command will download precompiled binaries for the following systems:
 
 ## Components
 
-### Builder
-
-The `Builder` class is the main component for creating and signing C2PA manifests. It provides methods to add assertions, resources, and ingredients to manifests, and handles the signing process.
-
-```javascript
-import { Builder } from '@contentauth/c2pa-node';
-
-// Create a new builder
-const builder = Builder.new();
-
-// Or create from an existing manifest definition
-const builder = Builder.withJson(manifestDefinition);
-
-// Add assertions to the manifest
-builder.addAssertion('c2pa.actions', actionsAssertion);
-
-// Add resources
-await builder.addResource('resource://example', resourceAsset);
-
-// Sign the manifest
-const manifest = builder.sign(signer, inputAsset, outputAsset);
-```
-
 ### Reader
 
 The `Reader` class is used to read and validate C2PA manifests from media files. It can parse embedded manifests or fetch remote manifests.
@@ -96,6 +73,29 @@ const isEmbedded = reader.isEmbedded();
 const remoteUrl = reader.remoteUrl();
 ```
 
+### Builder
+
+The `Builder` class is the main component for creating and signing C2PA manifests. It provides methods to add assertions, resources, and ingredients to manifests, and handles the signing process. Use the `Signer` class to sign the manifests.
+
+```javascript
+import { Builder } from '@contentauth/c2pa-node';
+
+// Create a new builder
+const builder = Builder.new();
+
+// Or create from an existing manifest definition
+const builder = Builder.withJson(manifestDefinition);
+
+// Add assertions to the manifest
+builder.addAssertion('c2pa.actions', actionsAssertion);
+
+// Add resources
+await builder.addResource('resource://example', resourceAsset);
+
+// Sign the manifest
+const manifest = builder.sign(signer, inputAsset, outputAsset);
+```
+
 ### Signers
 
 The library provides several types of signers for different use cases:
@@ -131,7 +131,7 @@ const signer = CallbackSigner.newSigner(
   {
     alg: 'es256',
     certs: [certificateBuffer],
-    reserveSize: 1024,
+    reserveSize: 1024, // Reserved size in bytes for the C2PA Claim Signature box.
     tsaUrl: 'https://timestamp.example.com'
   },
   async (data) => {
@@ -154,8 +154,8 @@ import { IdentityAssertionBuilder, CallbackCredentialHolder } from '@contentauth
 
 // Create a credential holder
 const credentialHolder = CallbackCredentialHolder.newCallbackCredentialHolder(
-  1024,
-  'es256',
+  1024,     // reserveSize
+  'es256',  // sigType
   async (payload) => {
     // Custom signing logic for identity assertions
     return await signIdentityPayload(payload);

js-src/Settings.ts

@@ -88,33 +88,33 @@ export function getSettingsJson(): string {
  * @param trustConfig The trust configuration object
  */
 export function loadTrustConfig(trustConfig: TrustConfig): void {
-  // Convert camelCase to snake_case for Rust compatibility
+  // Convert settings to snake_case for the neon Rust code.
   // Explicitly set undefined fields to null to ensure they are cleared
-  const rustConfig = {
+  const config = {
     verify_trust_list: trustConfig.verifyTrustList,
     user_anchors: trustConfig.userAnchors ?? null,
     trust_anchors: trustConfig.trustAnchors ?? null,
     trust_config: trustConfig.trustConfig ?? null,
     allowed_list: trustConfig.allowedList ?? null,
   };
-  neon.loadTrustConfig(JSON.stringify(rustConfig));
+  neon.loadTrustConfig(JSON.stringify(config));
 }
 
 /**
  * Load trust configuration into the CAWG trust settings.
  * @param trustConfig The trust configuration object
  */
 export function loadCawgTrustConfig(trustConfig: TrustConfig): void {
-  // Convert camelCase to snake_case for Rust compatibility
+  // Convert settings to snake_case for the neon Rust code
   // Explicitly set undefined fields to null to ensure they are cleared
-  const rustConfig = {
+  const config = {
     verify_trust_list: trustConfig.verifyTrustList,
     user_anchors: trustConfig.userAnchors ?? null,
     trust_anchors: trustConfig.trustAnchors ?? null,
     trust_config: trustConfig.trustConfig ?? null,
     allowed_list: trustConfig.allowedList ?? null,
   };
-  neon.loadCawgTrustConfig(JSON.stringify(rustConfig));
+  neon.loadCawgTrustConfig(JSON.stringify(config));
 }
 
 /**
@@ -160,8 +160,8 @@ export function getCawgTrustConfig(): TrustConfig {
  * @param verifyConfig The verify configuration object
  */
 export function loadVerifyConfig(verifyConfig: VerifyConfig): void {
-  // Convert camelCase to snake_case for Rust compatibility
-  const rustConfig = {
+  // Convert camelCase to snake_case for the neon Rust code
+  const config = {
     verify_after_reading: verifyConfig.verifyAfterReading,
     verify_after_sign: verifyConfig.verifyAfterSign,
     verify_trust: verifyConfig.verifyTrust,
@@ -173,7 +173,7 @@ export function loadVerifyConfig(verifyConfig: VerifyConfig): void {
       verifyConfig.skipIngredientConflictResolution,
     strict_v1_validation: verifyConfig.strictV1Validation,
   };
-  neon.loadVerifyConfig(JSON.stringify(rustConfig));
+  neon.loadVerifyConfig(JSON.stringify(config));
 }
 
 /**

js-src/assertions.ts

@@ -15,11 +15,14 @@
 
 export function isActionsAssertion(
   obj: unknown,
-): obj is { data: { actions: Array<{ action: string }> } } {
+): obj is { label: string; data: { actions: Array<{ action: string }> } } {
   return (
     typeof obj === "object" &&
     obj !== null &&
+    "label" in obj &&
     "data" in obj &&
+    typeof (obj as any).label === "string" &&
+    ((obj as any).label === "c2pa.actions" || (obj as any).label === "c2pa.actions.v2") &&
     typeof (obj as any).data === "object" &&
     (obj as any).data !== null &&
     Array.isArray((obj as any).data.actions)