@mastra/pg 0.11.1-alpha.1 → 0.11.1-alpha.2

package/src/vector/filter.ts

@@ -1,5 +1,34 @@
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
-import type { FieldCondition, VectorFilter, OperatorSupport } from '@mastra/core/vector/filter';
+import type {
+  VectorFilter,
+  OperatorSupport,
+  OperatorValueMap,
+  LogicalOperatorValueMap,
+  BlacklistedRootOperators,
+  VectorFieldValue,
+} from '@mastra/core/vector/filter';
+
+type PGOperatorValueMap = Omit<OperatorValueMap, '$in' | '$all' | '$nin' | '$eq' | '$ne'> & {
+  $size: number;
+  $contains: VectorFieldValue | Record<string, unknown>;
+  $all: VectorFieldValue;
+  $in: VectorFieldValue;
+  $nin: VectorFieldValue;
+  $eq: VectorFieldValue;
+  $ne: VectorFieldValue;
+};
+
+type PGBlacklisted = BlacklistedRootOperators | '$contains' | '$size';
+
+type PGFilterValue = VectorFieldValue | RegExp;
+
+export type PGVectorFilter = VectorFilter<
+  keyof PGOperatorValueMap,
+  PGOperatorValueMap,
+  LogicalOperatorValueMap,
+  PGBlacklisted,
+  PGFilterValue
+>;
 
 /**
  * Translates MongoDB-style filters to PG compatible filters.
@@ -11,7 +40,7 @@ import type { FieldCondition, VectorFilter, OperatorSupport } from '@mastra/core
  * - Can take either a single condition or an array of conditions
  *
  */
-export class PGFilterTranslator extends BaseFilterTranslator {
+export class PGFilterTranslator extends BaseFilterTranslator<PGVectorFilter> {
   protected override getSupportedOperators(): OperatorSupport {
     return {
       ...BaseFilterTranslator.DEFAULT_OPERATORS,
@@ -19,7 +48,7 @@ export class PGFilterTranslator extends BaseFilterTranslator {
     };
   }
 
-  translate(filter?: VectorFilter): VectorFilter {
+  translate(filter?: PGVectorFilter): PGVectorFilter {
     if (this.isEmpty(filter)) {
       return filter;
     }
@@ -27,7 +56,7 @@ export class PGFilterTranslator extends BaseFilterTranslator {
     return this.translateNode(filter);
   }
 
-  private translateNode(node: VectorFilter | FieldCondition, currentPath: string = ''): any {
+  private translateNode(node: PGVectorFilter, currentPath: string = ''): any {
     // Helper to wrap result with path if needed
     const withPath = (result: any) => (currentPath ? { [currentPath]: result } : result);
 
@@ -49,14 +78,14 @@ export class PGFilterTranslator extends BaseFilterTranslator {
     const entries = Object.entries(node as Record<string, any>);
     const result: Record<string, any> = {};
 
-    if ('$options' in node && !('$regex' in node)) {
+    if (node && '$options' in node && !('$regex' in node)) {
       throw new Error('$options is not valid without $regex');
     }
 
     // Handle special regex object format
-    if ('$regex' in node) {
+    if (node && '$regex' in node) {
       const options = (node as any).$options || '';
-      return withPath(this.translateRegexPattern(node.$regex, options));
+      return withPath(this.translateRegexPattern((node as any).$regex, options));
     }
 
     // Process remaining entries

package/src/vector/index.test.ts

@@ -1288,7 +1288,7 @@ describe('PgVector', () => {
           vectorDB.query({
             indexName,
             queryVector: [1, 0, 0],
-            filter: { price: { $invalid: 100 } },
+            filter: { price: { $invalid: 100 } } as any,
           }),
         ).rejects.toThrow('Unsupported operator: $invalid');
       });
@@ -1567,7 +1567,7 @@ describe('PgVector', () => {
           vectorDB.query({
             indexName,
             queryVector: [1, 0, 0],
-            filter: { price: { $invalid: 100 } },
+            filter: { price: { $invalid: 100 } } as any,
           }),
         ).rejects.toThrow('Unsupported operator: $invalid');
       });

package/src/vector/index.ts

@@ -12,12 +12,12 @@ import type {
   DeleteVectorParams,
   UpdateVectorParams,
 } from '@mastra/core/vector';
-import type { VectorFilter } from '@mastra/core/vector/filter';
 import { Mutex } from 'async-mutex';
 import pg from 'pg';
 import xxhash from 'xxhash-wasm';
 
 import { PGFilterTranslator } from './filter';
+import type { PGVectorFilter } from './filter';
 import { buildFilterQuery } from './sql-builder';
 import type { IndexConfig, IndexType } from './types';
 
@@ -31,7 +31,7 @@ export interface PGIndexStats extends IndexStats {
   };
 }
 
-interface PgQueryVectorParams extends QueryVectorParams {
+interface PgQueryVectorParams extends QueryVectorParams<PGVectorFilter> {
   minScore?: number;
   /**
    * HNSW search parameter. Controls the size of the dynamic candidate
@@ -56,7 +56,7 @@ interface PgDefineIndexParams {
   indexConfig: IndexConfig;
 }
 
-export class PgVector extends MastraVector {
+export class PgVector extends MastraVector<PGVectorFilter> {
   private pool: pg.Pool;
   private describeIndexCache: Map<string, PGIndexStats> = new Map();
   private createdIndexes = new Map<string, number>();
@@ -153,7 +153,7 @@ export class PgVector extends MastraVector {
     return this.schema ? `"${parseSqlIdentifier(this.schema, 'schema name')}"` : undefined;
   }
 
-  transformFilter(filter?: VectorFilter) {
+  transformFilter(filter?: PGVectorFilter) {
     const translator = new PGFilterTranslator();
     return translator.translate(filter);
   }

package/src/vector/sql-builder.ts

@@ -8,6 +8,7 @@ import type {
   RegexOperator,
   VectorFilter,
 } from '@mastra/core/vector/filter';
+import type { PGVectorFilter } from './filter';
 
 type OperatorType =
   | BasicOperator
@@ -250,7 +251,7 @@ function escapeLikePattern(str: string): string {
   return str.replace(/([%_\\])/g, '\\$1');
 }
 
-export function buildFilterQuery(filter: VectorFilter, minScore: number, topK: number): FilterResult {
+export function buildFilterQuery(filter: PGVectorFilter, minScore: number, topK: number): FilterResult {
   const values = [minScore, topK];
 
   function buildCondition(key: string, value: any, parentPath: string): string {