Merge branch 'main' into dl/schema-fields

Author: dlarocque

.changeset/eighty-starfishes-listen.md

@@ -0,0 +1,5 @@
+---
+"@firebase/firestore": patch
+---
+
+Clean up leaked WebChannel instances when the Firestore instance is terminated.

.changeset/fast-mangos-chew.md

@@ -0,0 +1,6 @@
+---
+'firebase': minor
+'@firebase/ai': minor
+---
+
+Add `title`, `maximum`, `minimum`, `propertyOrdering` to Schema builder

.changeset/ninety-ways-dress.md

@@ -72,6 +72,7 @@ jobs:
         NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
         NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
         NPM_TOKEN_AI: ${{secrets.NPM_TOKEN_AI}}
+        NPM_TOKEN_VERTEXAI: ${{secrets.NPM_TOKEN_VERTEXAI}}
         NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
         NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
         NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}

.changeset/perfect-camels-try.md

@@ -75,6 +75,7 @@ jobs:
             NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
             NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
             NPM_TOKEN_AI: ${{secrets.NPM_TOKEN_AI}}
+            NPM_TOKEN_VERTEXAI: ${{secrets.NPM_TOKEN_VERTEXAI}}
             NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
             NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
             NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}

.changeset/spotty-ghosts-kneel.md

@@ -85,6 +85,7 @@ jobs:
         NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
         NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
         NPM_TOKEN_AI: ${{secrets.NPM_TOKEN_AI}}
+        NPM_TOKEN_VERTEXAI: ${{secrets.NPM_TOKEN_VERTEXAI}}
         NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
         NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
         NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}

.changeset/tall-zoos-stare.md

@@ -30,6 +30,7 @@ on:
         options:
         - main
         - v8
+        - at-11-7-1
       verbose:
         description: 'Enable verbose logging'
         type: boolean
@@ -111,6 +112,7 @@ jobs:
         NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
         NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
         NPM_TOKEN_AI: ${{secrets.NPM_TOKEN_AI}}
+        NPM_TOKEN_VERTEXAI: ${{secrets.NPM_TOKEN_VERTEXAI}}
         NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
         NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
         NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}

.changeset/three-singers-wonder.md

@@ -518,7 +518,8 @@ export enum HarmBlockThreshold {
     BLOCK_LOW_AND_ABOVE = "BLOCK_LOW_AND_ABOVE",
     BLOCK_MEDIUM_AND_ABOVE = "BLOCK_MEDIUM_AND_ABOVE",
     BLOCK_NONE = "BLOCK_NONE",
-    BLOCK_ONLY_HIGH = "BLOCK_ONLY_HIGH"
+    BLOCK_ONLY_HIGH = "BLOCK_ONLY_HIGH",
+    OFF = "OFF"
 }
 
 // @public
@@ -834,12 +835,16 @@ export interface SchemaShared<T> {
     example?: unknown;
     format?: string;
     items?: T;
+    maximum?: number;
     maxItems?: number;
+    minimum?: number;
     minItems?: number;
     nullable?: boolean;
     properties?: {
         [k: string]: T;
     };
+    propertyOrdering?: string[];
+    title?: string;
 }
 
 // @public

.changeset/tricky-years-pump.md

@@ -68,7 +68,7 @@ const config = {
   // test results reporter to use
   // possible values: 'dots', 'progress'
   // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-  reporters: ['mocha', 'coverage-istanbul'],
+  reporters: ['coverage-istanbul', 'mocha'],
 
   // web server port
   port: 8089,

.github/workflows/canary-deploy.yml

@@ -448,13 +448,13 @@ export declare const enum AIErrorCode
 |  INVALID\_CONTENT | <code>&quot;invalid-content&quot;</code> | An error associated with a Content object. |
 |  INVALID\_SCHEMA | <code>&quot;invalid-schema&quot;</code> | An error due to invalid Schema input. |
 |  NO\_API\_KEY | <code>&quot;no-api-key&quot;</code> | An error occurred due to a missing Firebase API key. |
-|  NO\_APP\_ID | <code>&quot;no-app-id&quot;</code> | An error occured due to a missing Firebase app ID. |
+|  NO\_APP\_ID | <code>&quot;no-app-id&quot;</code> | An error occurred due to a missing Firebase app ID. |
 |  NO\_MODEL | <code>&quot;no-model&quot;</code> | An error occurred due to a model name not being specified during initialization. |
 |  NO\_PROJECT\_ID | <code>&quot;no-project-id&quot;</code> | An error occurred due to a missing project ID. |
 |  PARSE\_FAILED | <code>&quot;parse-failed&quot;</code> | An error occurred while parsing. |
 |  REQUEST\_ERROR | <code>&quot;request-error&quot;</code> | An error occurred in a request. |
 |  RESPONSE\_ERROR | <code>&quot;response-error&quot;</code> | An error occurred in a response. |
-|  UNSUPPORTED | <code>&quot;unsupported&quot;</code> | An error occured due an attempt to use an unsupported feature. |
+|  UNSUPPORTED | <code>&quot;unsupported&quot;</code> | An error occurred due an attempt to use an unsupported feature. |
 
 ## BlockReason
 
@@ -551,6 +551,7 @@ export declare enum HarmBlockThreshold
 |  BLOCK\_MEDIUM\_AND\_ABOVE | <code>&quot;BLOCK_MEDIUM_AND_ABOVE&quot;</code> | Content with <code>NEGLIGIBLE</code> and <code>LOW</code> will be allowed. |
 |  BLOCK\_NONE | <code>&quot;BLOCK_NONE&quot;</code> | All content will be allowed. |
 |  BLOCK\_ONLY\_HIGH | <code>&quot;BLOCK_ONLY_HIGH&quot;</code> | Content with <code>NEGLIGIBLE</code>, <code>LOW</code>, and <code>MEDIUM</code> will be allowed. |
+|  OFF | <code>&quot;OFF&quot;</code> | All content will be allowed. This is the same as <code>BLOCK_NONE</code>, but the metadata corresponding to the [HarmCategory](./ai.md#harmcategory) will not be present in the response. |
 
 ## HarmCategory
 

.github/workflows/prerelease-manual-deploy.yml

@@ -27,10 +27,14 @@ export interface SchemaShared<T>
 |  [example](./ai.schemashared.md#schemasharedexample) | unknown | Optional. The example of the property. |
 |  [format](./ai.schemashared.md#schemasharedformat) | string | Optional. The format of the property. When using the Gemini Developer API ([GoogleAIBackend](./ai.googleaibackend.md#googleaibackend_class)<!-- -->), this must be either <code>'enum'</code> or <code>'date-time'</code>, otherwise requests will fail. |
 |  [items](./ai.schemashared.md#schemashareditems) | T | Optional. The items of the property. |
+|  [maximum](./ai.schemashared.md#schemasharedmaximum) | number | The maximum value of a numeric type. |
 |  [maxItems](./ai.schemashared.md#schemasharedmaxitems) | number | The maximum number of items (elements) in a schema of type [SchemaType.ARRAY](./ai.md#schematypearray_enummember)<!-- -->. |
+|  [minimum](./ai.schemashared.md#schemasharedminimum) | number | The minimum value of a numeric type. |
 |  [minItems](./ai.schemashared.md#schemasharedminitems) | number | The minimum number of items (elements) in a schema of type [SchemaType.ARRAY](./ai.md#schematypearray_enummember)<!-- -->. |
 |  [nullable](./ai.schemashared.md#schemasharednullable) | boolean | Optional. Whether the property is nullable. |
 |  [properties](./ai.schemashared.md#schemasharedproperties) | { \[k: string\]: T; } | Optional. Map of <code>Schema</code> objects. |
+|  [propertyOrdering](./ai.schemashared.md#schemasharedpropertyordering) | string\[\] | A hint suggesting the order in which the keys should appear in the generated JSON string. |
+|  [title](./ai.schemashared.md#schemasharedtitle) | string | The title of the property. This helps document the schema's purpose but does not typically constrain the generated value. It can subtly guide the model by clarifying the intent of a field. |
 
 ## SchemaShared.description
 
@@ -82,6 +86,16 @@ Optional. The items of the property.
 items?: T;
 ```
 
+## SchemaShared.maximum
+
+The maximum value of a numeric type.
+
+<b>Signature:</b>
+
+```typescript
+maximum?: number;
+```
+
 ## SchemaShared.maxItems
 
 The maximum number of items (elements) in a schema of type [SchemaType.ARRAY](./ai.md#schematypearray_enummember)<!-- -->.
@@ -92,6 +106,16 @@ The maximum number of items (elements) in a schema of type [SchemaType.ARRAY](./
 maxItems?: number;
 ```
 
+## SchemaShared.minimum
+
+The minimum value of a numeric type.
+
+<b>Signature:</b>
+
+```typescript
+minimum?: number;
+```
+
 ## SchemaShared.minItems
 
 The minimum number of items (elements) in a schema of type [SchemaType.ARRAY](./ai.md#schematypearray_enummember)<!-- -->.
@@ -123,3 +147,23 @@ properties?: {
         [k: string]: T;
     };
 ```
+
+## SchemaShared.propertyOrdering
+
+A hint suggesting the order in which the keys should appear in the generated JSON string.
+
+<b>Signature:</b>
+
+```typescript
+propertyOrdering?: string[];
+```
+
+## SchemaShared.title
+
+The title of the property. This helps document the schema's purpose but does not typically constrain the generated value. It can subtly guide the model by clarifying the intent of a field.
+
+<b>Signature:</b>
+
+```typescript
+title?: string;
+```

.github/workflows/release-prod.yml

@@ -17,7 +17,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "firebase": "11.3.0"
+    "firebase": "^11.8.0-20250512211235"
   },
   "devDependencies": {
     "@babel/core": "7.26.8",

.github/workflows/release-staging.yml

@@ -58,7 +58,7 @@ import {
   onValue,
   off
 } from 'firebase/database';
-import { getGenerativeModel, getVertexAI, VertexAI } from 'firebase/vertexai';
+import { getGenerativeModel, getAI, VertexAIBackend } from 'firebase/ai';
 import { getDataConnect, DataConnect } from 'firebase/data-connect';
 
 /**
@@ -307,15 +307,15 @@ function callPerformance(app) {
 }
 
 /**
- * VertexAI smoke test.
+ * AI smoke test.
  * Just make sure some functions can be called without obvious errors.
  */
-async function callVertexAI(app) {
-  console.log('[VERTEXAI] start');
-  const vertexAI = getVertexAI(app);
-  const model = getGenerativeModel(vertexAI, { model: 'gemini-1.5-flash' });
+async function callAI(app) {
+  console.log('[AI] start');
+  const ai = getAI(app, { backend: new VertexAIBackend() });
+  const model = getGenerativeModel(ai, { model: 'gemini-1.5-flash' });
   const result = await model.countTokens('abcdefg');
-  console.log(`[VERTEXAI] counted tokens: ${result.totalTokens}`);
+  console.log(`[AI] counted tokens: ${result.totalTokens}`);
 }
 
 /**
@@ -350,7 +350,7 @@ async function main() {
   callAnalytics(app);
   callPerformance(app);
   await callFunctions(app);
-  await callVertexAI(app);
+  await callAI(app);
   callDataConnect(app);
   await authLogout(app);
   console.log('DONE');

common/api-review/ai.api.md

@@ -86,7 +86,12 @@ import {
   StorageReference,
   deleteObject
 } from 'firebase/storage';
-import { getGenerativeModel, getVertexAI, VertexAI } from 'firebase/vertexai';
+import {
+  getGenerativeModel,
+  getAI,
+  AI,
+  VertexAIBackend
+} from 'firebase/vertexai';
 import { getDataConnect, DataConnect } from 'firebase/data-connect';
 import { config, testAccount } from '../firebase-config';
 import 'jest';
@@ -307,13 +312,13 @@ describe('MODULAR', () => {
     });
   });
 
-  describe('VERTEXAI', () => {
-    let vertexAI: VertexAI;
+  describe('AI', () => {
+    let ai: AI;
     it('getVertexAI()', () => {
-      vertexAI = getVertexAI(app);
+      ai = getAI(app, { backend: new VertexAIBackend() });
     });
     it('getGenerativeModel() and countTokens()', async () => {
-      const model = getGenerativeModel(vertexAI, { model: 'gemini-1.5-flash' });
+      const model = getGenerativeModel(ai, { model: 'gemini-1.5-flash' });
       expect(model.model).toMatch(/gemini-1.5-flash$/);
       const result = await model.countTokens('abcdefg');
       expect(result.totalTokens).toBeTruthy;