@mastra/pg 0.1.6-alpha.1 → 0.1.6-alpha.3

package/dist/index.d.cts

@@ -0,0 +1,4 @@
+export { PGIndexStats } from './_tsup-dts-rollup.cjs';
+export { PgVector } from './_tsup-dts-rollup.cjs';
+export { PostgresConfig } from './_tsup-dts-rollup.cjs';
+export { PostgresStore } from './_tsup-dts-rollup.cjs';

package/dist/index.js

@@ -1,6 +1,6 @@
 import { MastraVector } from '@mastra/core/vector';
 import pg from 'pg';
-import { BaseFilterTranslator } from '@mastra/core/filter';
+import { BaseFilterTranslator } from '@mastra/core/vector/filter';
 import { MastraStorage } from '@mastra/core/storage';
 import pgPromise from 'pg-promise';
 
@@ -264,7 +264,7 @@ function buildFilterQuery(filter, minScore) {
     }
     const joinOperator = key === "$or" || key === "$nor" ? "OR" : "AND";
     const conditions2 = value.map((f) => {
-      const entries = Object.entries(f);
+      const entries = Object.entries(f || {});
       if (entries.length === 0) return "";
       const [firstKey, firstValue] = entries[0] || [];
       if (["$and", "$or", "$not", "$nor"].includes(firstKey)) {
@@ -307,9 +307,8 @@ var PgVector = class extends MastraVector {
     }) ?? basePool;
   }
   transformFilter(filter) {
-    const pgFilter = new PGFilterTranslator();
-    const translatedFilter = pgFilter.translate(filter ?? {});
-    return translatedFilter;
+    const translator = new PGFilterTranslator();
+    return translator.translate(filter);
   }
   async getIndexInfo(indexName) {
     if (!this.indexCache.has(indexName)) {
@@ -317,7 +316,9 @@ var PgVector = class extends MastraVector {
     }
     return this.indexCache.get(indexName);
   }
-  async query(indexName, queryVector, topK = 10, filter, includeVector = false, minScore = 0, options) {
+  async query(...args) {
+    const params = this.normalizeArgs("query", args, ["minScore", "ef", "probes"]);
+    const { indexName, queryVector, topK = 10, filter, includeVector = false, minScore = 0, ef, probes } = params;
     const client = await this.pool.connect();
     try {
       const vectorStr = `[${queryVector.join(",")}]`;
@@ -325,12 +326,12 @@ var PgVector = class extends MastraVector {
       const { sql: filterQuery, values: filterValues } = buildFilterQuery(translatedFilter, minScore);
       const indexInfo = await this.getIndexInfo(indexName);
       if (indexInfo.type === "hnsw") {
-        const calculatedEf = options?.ef ?? Math.max(topK, (indexInfo?.config?.m ?? 16) * topK);
+        const calculatedEf = ef ?? Math.max(topK, (indexInfo?.config?.m ?? 16) * topK);
         const searchEf = Math.min(1e3, Math.max(1, calculatedEf));
         await client.query(`SET LOCAL hnsw.ef_search = ${searchEf}`);
       }
-      if (indexInfo.type === "ivfflat" && options?.probes) {
-        await client.query(`SET LOCAL ivfflat.probes = ${options.probes}`);
+      if (indexInfo.type === "ivfflat" && probes) {
+        await client.query(`SET LOCAL ivfflat.probes = ${probes}`);
       }
       const query = `
         WITH vector_scores AS (
@@ -358,7 +359,9 @@ var PgVector = class extends MastraVector {
       client.release();
     }
   }
-  async upsert(indexName, vectors, metadata, ids) {
+  async upsert(...args) {
+    const params = this.normalizeArgs("upsert", args);
+    const { indexName, vectors, metadata, ids } = params;
     const client = await this.pool.connect();
     try {
       await client.query("BEGIN");
@@ -384,7 +387,9 @@ var PgVector = class extends MastraVector {
       client.release();
     }
   }
-  async createIndex(indexName, dimension, metric = "cosine", indexConfig = {}, defineIndex = true) {
+  async createIndex(...args) {
+    const params = this.normalizeArgs("createIndex", args, ["indexConfig", "buildIndex"]);
+    const { indexName, dimension, metric = "cosine", indexConfig = {}, buildIndex = true } = params;
     const client = await this.pool.connect();
     try {
       if (!indexName.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/)) {
@@ -410,8 +415,8 @@ var PgVector = class extends MastraVector {
           metadata JSONB DEFAULT '{}'::jsonb
         );
       `);
-      if (defineIndex) {
-        await this.defineIndex(indexName, metric, indexConfig);
+      if (buildIndex) {
+        await this.buildIndex({ indexName, metric, indexConfig });
       }
     } catch (error) {
       console.error("Failed to create vector table:", error);
@@ -424,9 +429,11 @@ var PgVector = class extends MastraVector {
    * @deprecated This function is deprecated. Use buildIndex instead
    */
   async defineIndex(indexName, metric = "cosine", indexConfig) {
-    return this.buildIndex(indexName, metric, indexConfig);
+    return this.buildIndex({ indexName, metric, indexConfig });
   }
-  async buildIndex(indexName, metric = "cosine", indexConfig) {
+  async buildIndex(...args) {
+    const params = this.normalizeArgs("buildIndex", args, ["metric", "indexConfig"]);
+    const { indexName, metric = "cosine", indexConfig } = params;
     const client = await this.pool.connect();
     try {
       await client.query(`DROP INDEX IF EXISTS ${indexName}_vector_idx`);
@@ -898,10 +905,10 @@ var PostgresStore = class extends MastraStorage {
             WHERE target.id = ANY($2)
             AND (
               -- Get previous messages based on the max withPreviousMessages
-              (m.row_num >= target.row_num - $3 AND m.row_num < target.row_num)
+              (m.row_num <= target.row_num + $3 AND m.row_num > target.row_num)
               OR
               -- Get next messages based on the max withNextMessages
-              (m.row_num <= target.row_num + $4 AND m.row_num > target.row_num)
+              (m.row_num >= target.row_num - $4 AND m.row_num < target.row_num)
             )
           )
           ORDER BY m."createdAt" DESC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/pg",
-  "version": "0.1.6-alpha.1",
+  "version": "0.1.6-alpha.3",
   "description": "Postgres provider for Mastra - includes both vector and db storage capabilities",
   "type": "module",
   "main": "dist/index.js",
@@ -10,6 +10,10 @@
       "import": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
       }
     },
     "./package.json": "./package.json"
@@ -17,7 +21,7 @@
   "dependencies": {
     "pg": "^8.13.1",
     "pg-promise": "^11.5.4",
-    "@mastra/core": "^0.4.3-alpha.1"
+    "@mastra/core": "^0.4.3-alpha.3"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.49.2",
@@ -30,7 +34,7 @@
     "@internal/lint": "0.0.0"
   },
   "scripts": {
-    "build": "tsup src/index.ts --format esm --experimental-dts --clean --treeshake",
+    "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake",
     "build:watch": "pnpm build --watch",
     "pretest": "docker compose up -d && (for i in $(seq 1 30); do docker compose exec -T db pg_isready -U postgres && break || (sleep 1; [ $i -eq 30 ] && exit 1); done)",
     "test": "vitest run",

package/src/storage/index.ts

@@ -429,10 +429,10 @@ export class PostgresStore extends MastraStorage {
             WHERE target.id = ANY($2)
             AND (
               -- Get previous messages based on the max withPreviousMessages
-              (m.row_num >= target.row_num - $3 AND m.row_num < target.row_num)
+              (m.row_num <= target.row_num + $3 AND m.row_num > target.row_num)
               OR
               -- Get next messages based on the max withNextMessages
-              (m.row_num <= target.row_num + $4 AND m.row_num > target.row_num)
+              (m.row_num >= target.row_num - $4 AND m.row_num < target.row_num)
             )
           )
           ORDER BY m."createdAt" DESC

package/src/vector/filter.ts

@@ -1,5 +1,5 @@
-import { BaseFilterTranslator } from '@mastra/core/filter';
-import type { FieldCondition, Filter, OperatorSupport } from '@mastra/core/filter';
+import { BaseFilterTranslator } from '@mastra/core/vector/filter';
+import type { FieldCondition, VectorFilter, OperatorSupport } from '@mastra/core/vector/filter';
 
 /**
  * Translates MongoDB-style filters to PG compatible filters.
@@ -19,7 +19,7 @@ export class PGFilterTranslator extends BaseFilterTranslator {
     };
   }
 
-  translate(filter: Filter): Filter {
+  translate(filter?: VectorFilter): VectorFilter {
     if (this.isEmpty(filter)) {
       return filter;
     }
@@ -27,7 +27,7 @@ export class PGFilterTranslator extends BaseFilterTranslator {
     return this.translateNode(filter);
   }
 
-  private translateNode(node: Filter | FieldCondition, currentPath: string = ''): any {
+  private translateNode(node: VectorFilter | FieldCondition, currentPath: string = ''): any {
     // Helper to wrap result with path if needed
     const withPath = (result: any) => (currentPath ? { [currentPath]: result } : result);
 
@@ -68,7 +68,7 @@ export class PGFilterTranslator extends BaseFilterTranslator {
 
       if (this.isLogicalOperator(key)) {
         result[key] = Array.isArray(value)
-          ? value.map((filter: Filter) => this.translateNode(filter))
+          ? value.map((filter: VectorFilter) => this.translateNode(filter))
           : this.translateNode(value);
       } else if (this.isOperator(key)) {
         if (this.isArrayOperator(key) && !Array.isArray(value) && key !== '$elemMatch') {