Ensure create and request options are deeply merged

Author: erikeldridge

packages/ai/package.json

@@ -52,6 +52,7 @@
     "@firebase/component": "0.6.14",
     "@firebase/logger": "0.4.4",
     "@firebase/util": "1.11.1",
+    "deepmerge": "4.3.1",
     "tslib": "^2.1.0"
   },
   "license": "Apache-2.0",

packages/ai/src/methods/chrome-adapter.test.ts

@@ -275,7 +275,7 @@ describe('ChromeAdapter', () => {
         })
       ).to.be.false;
     });
-    it('extracts expected inputs from the request', async () => {
+    it('extracts and merges expected inputs from the request', async () => {
       const languageModelProvider = {
         availability: () => Promise.resolve(Availability.available)
       } as LanguageModel;
@@ -285,7 +285,12 @@ describe('ChromeAdapter', () => {
       ).resolves(Availability.available);
       const adapter = new ChromeAdapter(
         languageModelProvider,
-        'prefer_on_device'
+        'prefer_on_device',
+        {
+          createOptions: {
+            expectedInputs: [{ type: 'text' }]
+          }
+        }
       );
       await adapter.isAvailable({
         contents: [
@@ -300,7 +305,7 @@ describe('ChromeAdapter', () => {
         ]
       });
       expect(availabilityStub).to.have.been.calledWith({
-        expectedInputs: [{ type: 'image' }]
+        expectedInputs: [{ type: 'text' }, { type: 'image' }]
       });
     });
   });

packages/ai/src/methods/chrome-adapter.ts

@@ -37,7 +37,7 @@ import {
   LanguageModelMessageRole,
   LanguageModelMessageType
 } from '../types/language-model';
-import { deepExtend } from '@firebase/util';
+import deepMerge from 'deepmerge';
 
 /**
  * Defines an inference "backend" that uses Chrome's on-device model,
@@ -203,10 +203,7 @@ export class ChromeAdapter {
   private mergeCreateOptions(
     requestOptions: LanguageModelCreateOptions
   ): LanguageModelCreateOptions {
-    return deepExtend(
-      this.onDeviceParams.createOptions,
-      requestOptions
-    ) as LanguageModelCreateOptions;
+    return deepMerge(this.onDeviceParams.createOptions || {}, requestOptions);
   }
 
   /**

yarn.lock

@@ -6250,7 +6250,7 @@ deep-is@^0.1.3:
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.2.2:
+deepmerge@4.3.1, deepmerge@^4.2.2:
   version "4.3.1"
   resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==