Skip to content

Commit 931972d

Browse files
committed
Merge branch 'main' into dl/abort-signal
2 parents 0096b9a + 40be2db commit 931972d

File tree

44 files changed

+478
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+478
-232
lines changed

.changeset/spotty-ghosts-kneel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/firestore": patch
3+
---
4+
5+
Clean up leaked WebChannel instances when the Firestore instance is terminated.

.changeset/tricky-years-pump.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'firebase': minor
3+
'@firebase/ai': minor
4+
---
5+
6+
Add `title`, `maximum`, `minimum`, `propertyOrdering` to Schema builder

common/api-review/ai.api.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,8 @@ export enum HarmBlockThreshold {
518518
BLOCK_LOW_AND_ABOVE = "BLOCK_LOW_AND_ABOVE",
519519
BLOCK_MEDIUM_AND_ABOVE = "BLOCK_MEDIUM_AND_ABOVE",
520520
BLOCK_NONE = "BLOCK_NONE",
521-
BLOCK_ONLY_HIGH = "BLOCK_ONLY_HIGH"
521+
BLOCK_ONLY_HIGH = "BLOCK_ONLY_HIGH",
522+
OFF = "OFF"
522523
}
523524

524525
// @public
@@ -831,10 +832,14 @@ export interface SchemaShared<T> {
831832
example?: unknown;
832833
format?: string;
833834
items?: T;
835+
maximum?: number;
836+
minimum?: number;
834837
nullable?: boolean;
835838
properties?: {
836839
[k: string]: T;
837840
};
841+
propertyOrdering?: string[];
842+
title?: string;
838843
}
839844

840845
// @public

config/karma.base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const config = {
6868
// test results reporter to use
6969
// possible values: 'dots', 'progress'
7070
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
71-
reporters: ['mocha', 'coverage-istanbul'],
71+
reporters: ['coverage-istanbul', 'mocha'],
7272

7373
// web server port
7474
port: 8089,

docs-devsite/ai.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,13 +449,13 @@ export declare const enum AIErrorCode
449449
| INVALID\_CONTENT | <code>&quot;invalid-content&quot;</code> | An error associated with a Content object. |
450450
| INVALID\_SCHEMA | <code>&quot;invalid-schema&quot;</code> | An error due to invalid Schema input. |
451451
| NO\_API\_KEY | <code>&quot;no-api-key&quot;</code> | An error occurred due to a missing Firebase API key. |
452-
| NO\_APP\_ID | <code>&quot;no-app-id&quot;</code> | An error occured due to a missing Firebase app ID. |
452+
| NO\_APP\_ID | <code>&quot;no-app-id&quot;</code> | An error occurred due to a missing Firebase app ID. |
453453
| NO\_MODEL | <code>&quot;no-model&quot;</code> | An error occurred due to a model name not being specified during initialization. |
454454
| NO\_PROJECT\_ID | <code>&quot;no-project-id&quot;</code> | An error occurred due to a missing project ID. |
455455
| PARSE\_FAILED | <code>&quot;parse-failed&quot;</code> | An error occurred while parsing. |
456456
| REQUEST\_ERROR | <code>&quot;request-error&quot;</code> | An error occurred in a request. |
457457
| RESPONSE\_ERROR | <code>&quot;response-error&quot;</code> | An error occurred in a response. |
458-
| UNSUPPORTED | <code>&quot;unsupported&quot;</code> | An error occured due an attempt to use an unsupported feature. |
458+
| UNSUPPORTED | <code>&quot;unsupported&quot;</code> | An error occurred due an attempt to use an unsupported feature. |
459459

460460
## BlockReason
461461

@@ -552,6 +552,7 @@ export declare enum HarmBlockThreshold
552552
| BLOCK\_MEDIUM\_AND\_ABOVE | <code>&quot;BLOCK_MEDIUM_AND_ABOVE&quot;</code> | Content with <code>NEGLIGIBLE</code> and <code>LOW</code> will be allowed. |
553553
| BLOCK\_NONE | <code>&quot;BLOCK_NONE&quot;</code> | All content will be allowed. |
554554
| 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. |
555+
| 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. |
555556

556557
## HarmCategory
557558

docs-devsite/ai.schemashared.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ export interface SchemaShared<T>
2727
| [example](./ai.schemashared.md#schemasharedexample) | unknown | Optional. The example of the property. |
2828
| [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. |
2929
| [items](./ai.schemashared.md#schemashareditems) | T | Optional. The items of the property. |
30+
| [maximum](./ai.schemashared.md#schemasharedmaximum) | number | The maximum value of a numeric type. |
31+
| [minimum](./ai.schemashared.md#schemasharedminimum) | number | The minimum value of a numeric type. |
3032
| [nullable](./ai.schemashared.md#schemasharednullable) | boolean | Optional. Whether the property is nullable. |
3133
| [properties](./ai.schemashared.md#schemasharedproperties) | { \[k: string\]: T; } | Optional. Map of <code>Schema</code> objects. |
34+
| [propertyOrdering](./ai.schemashared.md#schemasharedpropertyordering) | string\[\] | A hint suggesting the order in which the keys should appear in the generated JSON string. |
35+
| [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. |
3236

3337
## SchemaShared.description
3438

@@ -80,6 +84,26 @@ Optional. The items of the property.
8084
items?: T;
8185
```
8286

87+
## SchemaShared.maximum
88+
89+
The maximum value of a numeric type.
90+
91+
<b>Signature:</b>
92+
93+
```typescript
94+
maximum?: number;
95+
```
96+
97+
## SchemaShared.minimum
98+
99+
The minimum value of a numeric type.
100+
101+
<b>Signature:</b>
102+
103+
```typescript
104+
minimum?: number;
105+
```
106+
83107
## SchemaShared.nullable
84108

85109
Optional. Whether the property is nullable.
@@ -101,3 +125,23 @@ properties?: {
101125
[k: string]: T;
102126
};
103127
```
128+
129+
## SchemaShared.propertyOrdering
130+
131+
A hint suggesting the order in which the keys should appear in the generated JSON string.
132+
133+
<b>Signature:</b>
134+
135+
```typescript
136+
propertyOrdering?: string[];
137+
```
138+
139+
## SchemaShared.title
140+
141+
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.
142+
143+
<b>Signature:</b>
144+
145+
```typescript
146+
title?: string;
147+
```

integration/compat-interop/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"@firebase/app-compat": "0.4.0",
1313
"@firebase/analytics": "0.10.16",
1414
"@firebase/analytics-compat": "0.2.22",
15-
"@firebase/auth": "1.10.5",
16-
"@firebase/auth-compat": "0.5.25",
17-
"@firebase/functions": "0.12.7",
18-
"@firebase/functions-compat": "0.3.24",
15+
"@firebase/auth": "1.10.6",
16+
"@firebase/auth-compat": "0.5.26",
17+
"@firebase/functions": "0.12.8",
18+
"@firebase/functions-compat": "0.3.25",
1919
"@firebase/messaging": "0.12.21",
2020
"@firebase/messaging-compat": "0.2.21",
2121
"@firebase/performance": "0.7.6",

integration/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"dependencies": {
1717
"@firebase/app": "0.13.0",
18-
"@firebase/firestore": "4.7.15"
18+
"@firebase/firestore": "4.7.16"
1919
},
2020
"devDependencies": {
2121
"@types/mocha": "9.1.1",

integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test:manual": "mocha --exit"
1010
},
1111
"devDependencies": {
12-
"firebase": "11.8.0",
12+
"firebase": "11.8.1",
1313
"chai": "4.5.0",
1414
"chromedriver": "119.0.1",
1515
"express": "4.21.2",

0 commit comments

Comments
 (0)