Skip to content

Commit 910d1ad

Browse files
authored
Merge pull request #5307 from nagraham/agraham/VS-461/fix-vectorize-filter-op-types
VS-461: Fix Vectorize Metadata filter type definitions
2 parents c37190b + fef571b commit 910d1ad

File tree

6 files changed

+88
-7
lines changed

6 files changed

+88
-7
lines changed

src/cloudflare/internal/vectorize.d.ts

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44

55
/*****************************
66
*
7-
* NOTE: this is copy & pasted from the types/ folder, as when bazel
8-
* runs it doesn't have access to that directly and thusly is sad.
7+
* !!! WARNING !!!
8+
* Changes should be made in `types/defines/vectorize.d.ts`
9+
* and then synced back here.
10+
*
11+
* This files was is copy & pasted from the types/ folder 2 years ago
12+
* because when bazel runs it doesn't have access to that directly (and thusly is sad).
913
* TODO: come up with a better system for this.
1014
*
1115
****************************** /
@@ -291,3 +295,15 @@ declare abstract class Vectorize {
291295
*/
292296
getByIds(ids: string[]): Promise<VectorizeVector[]>;
293297
}
298+
299+
/*****************************
300+
*
301+
* !!! WARNING !!!
302+
* Changes should be made in `types/defines/vectorize.d.ts`
303+
* and then synced back here.
304+
*
305+
* This files was is copy & pasted from the types/ folder 2 years ago
306+
* because when bazel runs it doesn't have access to that directly (and thusly is sad).
307+
* TODO: come up with a better system for this.
308+
*
309+
******************************/

types/defines/vectorize.d.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,14 @@ interface VectorizeError {
2525
*
2626
* This list is expected to grow as support for more operations are released.
2727
*/
28-
type VectorizeVectorMetadataFilterOp = "$eq" | "$ne";
28+
type VectorizeVectorMetadataFilterOp =
29+
| '$eq'
30+
| '$ne'
31+
| '$lt'
32+
| '$lte'
33+
| '$gt'
34+
| '$gte';
35+
type VectorizeVectorMetadataFilterCollectionOp = '$in' | '$nin';
2936

3037
/**
3138
* Filter criteria for vector metadata used to limit the retrieved query result set.
@@ -39,6 +46,12 @@ type VectorizeVectorMetadataFilter = {
3946
VectorizeVectorMetadataValue,
4047
string[]
4148
> | null;
49+
}
50+
| {
51+
[Op in VectorizeVectorMetadataFilterCollectionOp]?: Exclude<
52+
VectorizeVectorMetadataValue,
53+
string[]
54+
>[];
4255
};
4356
};
4457

types/generated-snapshot/experimental/index.d.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10573,7 +10573,14 @@ interface VectorizeError {
1057310573
*
1057410574
* This list is expected to grow as support for more operations are released.
1057510575
*/
10576-
type VectorizeVectorMetadataFilterOp = "$eq" | "$ne";
10576+
type VectorizeVectorMetadataFilterOp =
10577+
| "$eq"
10578+
| "$ne"
10579+
| "$lt"
10580+
| "$lte"
10581+
| "$gt"
10582+
| "$gte";
10583+
type VectorizeVectorMetadataFilterCollectionOp = "$in" | "$nin";
1057710584
/**
1057810585
* Filter criteria for vector metadata used to limit the retrieved query result set.
1057910586
*/
@@ -10586,6 +10593,12 @@ type VectorizeVectorMetadataFilter = {
1058610593
VectorizeVectorMetadataValue,
1058710594
string[]
1058810595
> | null;
10596+
}
10597+
| {
10598+
[Op in VectorizeVectorMetadataFilterCollectionOp]?: Exclude<
10599+
VectorizeVectorMetadataValue,
10600+
string[]
10601+
>[];
1058910602
};
1059010603
};
1059110604
/**

types/generated-snapshot/experimental/index.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10540,7 +10540,14 @@ export interface VectorizeError {
1054010540
*
1054110541
* This list is expected to grow as support for more operations are released.
1054210542
*/
10543-
export type VectorizeVectorMetadataFilterOp = "$eq" | "$ne";
10543+
export type VectorizeVectorMetadataFilterOp =
10544+
| "$eq"
10545+
| "$ne"
10546+
| "$lt"
10547+
| "$lte"
10548+
| "$gt"
10549+
| "$gte";
10550+
export type VectorizeVectorMetadataFilterCollectionOp = "$in" | "$nin";
1054410551
/**
1054510552
* Filter criteria for vector metadata used to limit the retrieved query result set.
1054610553
*/
@@ -10553,6 +10560,12 @@ export type VectorizeVectorMetadataFilter = {
1055310560
VectorizeVectorMetadataValue,
1055410561
string[]
1055510562
> | null;
10563+
}
10564+
| {
10565+
[Op in VectorizeVectorMetadataFilterCollectionOp]?: Exclude<
10566+
VectorizeVectorMetadataValue,
10567+
string[]
10568+
>[];
1055610569
};
1055710570
};
1055810571
/**

types/generated-snapshot/latest/index.d.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9966,7 +9966,14 @@ interface VectorizeError {
99669966
*
99679967
* This list is expected to grow as support for more operations are released.
99689968
*/
9969-
type VectorizeVectorMetadataFilterOp = "$eq" | "$ne";
9969+
type VectorizeVectorMetadataFilterOp =
9970+
| "$eq"
9971+
| "$ne"
9972+
| "$lt"
9973+
| "$lte"
9974+
| "$gt"
9975+
| "$gte";
9976+
type VectorizeVectorMetadataFilterCollectionOp = "$in" | "$nin";
99709977
/**
99719978
* Filter criteria for vector metadata used to limit the retrieved query result set.
99729979
*/
@@ -9979,6 +9986,12 @@ type VectorizeVectorMetadataFilter = {
99799986
VectorizeVectorMetadataValue,
99809987
string[]
99819988
> | null;
9989+
}
9990+
| {
9991+
[Op in VectorizeVectorMetadataFilterCollectionOp]?: Exclude<
9992+
VectorizeVectorMetadataValue,
9993+
string[]
9994+
>[];
99829995
};
99839996
};
99849997
/**

types/generated-snapshot/latest/index.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9931,7 +9931,14 @@ export interface VectorizeError {
99319931
*
99329932
* This list is expected to grow as support for more operations are released.
99339933
*/
9934-
export type VectorizeVectorMetadataFilterOp = "$eq" | "$ne";
9934+
export type VectorizeVectorMetadataFilterOp =
9935+
| "$eq"
9936+
| "$ne"
9937+
| "$lt"
9938+
| "$lte"
9939+
| "$gt"
9940+
| "$gte";
9941+
export type VectorizeVectorMetadataFilterCollectionOp = "$in" | "$nin";
99359942
/**
99369943
* Filter criteria for vector metadata used to limit the retrieved query result set.
99379944
*/
@@ -9944,6 +9951,12 @@ export type VectorizeVectorMetadataFilter = {
99449951
VectorizeVectorMetadataValue,
99459952
string[]
99469953
> | null;
9954+
}
9955+
| {
9956+
[Op in VectorizeVectorMetadataFilterCollectionOp]?: Exclude<
9957+
VectorizeVectorMetadataValue,
9958+
string[]
9959+
>[];
99479960
};
99489961
};
99499962
/**

0 commit comments

Comments
 (0)