@mastra/pg 1.6.0 → 1.6.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @mastra/pg
 
+## 1.6.1
+
+### Patch Changes
+
+- Fixed non-deterministic query ordering by adding secondary sort on id for dataset and dataset item queries. ([#13399](https://github.com/mastra-ai/mastra/pull/13399))
+
+- Prompt blocks can now define their own variables schema (`requestContextSchema`), allowing you to create reusable prompt blocks with typed variable placeholders. The server now correctly computes and returns draft/published status for prompt blocks. Existing databases are automatically migrated when upgrading. ([#13351](https://github.com/mastra-ai/mastra/pull/13351))
+
+- Updated dependencies [[`24284ff`](https://github.com/mastra-ai/mastra/commit/24284ffae306ddf0ab83273e13f033520839ef40), [`f5097cc`](https://github.com/mastra-ai/mastra/commit/f5097cc8a813c82c3378882c31178320cadeb655), [`71e237f`](https://github.com/mastra-ai/mastra/commit/71e237fa852a3ad9a50a3ddb3b5f3b20b9a8181c), [`13a291e`](https://github.com/mastra-ai/mastra/commit/13a291ebb9f9bca80befa0d9166b916bb348e8e9), [`397af5a`](https://github.com/mastra-ai/mastra/commit/397af5a69f34d4157f51a7c8da3f1ded1e1d611c), [`d4701f7`](https://github.com/mastra-ai/mastra/commit/d4701f7e24822b081b70f9c806c39411b1a712e7), [`2b40831`](https://github.com/mastra-ai/mastra/commit/2b40831dcca2275c9570ddf09b7f25ba3e8dc7fc), [`6184727`](https://github.com/mastra-ai/mastra/commit/6184727e812bf7a65cee209bacec3a2f5a16e923), [`0c338b8`](https://github.com/mastra-ai/mastra/commit/0c338b87362dcd95ff8191ca00df645b6953f534), [`6f6385b`](https://github.com/mastra-ai/mastra/commit/6f6385be5b33687cd21e71fc27e972e6928bb34c), [`14aba61`](https://github.com/mastra-ai/mastra/commit/14aba61b9cff76d72bc7ef6f3a83ae2c5d059193), [`dd9dd1c`](https://github.com/mastra-ai/mastra/commit/dd9dd1c9ae32ae79093f8c4adde1732ac6357233)]:
+  - @mastra/core@1.7.0
+
+## 1.6.1-alpha.0
+
+### Patch Changes
+
+- Fixed non-deterministic query ordering by adding secondary sort on id for dataset and dataset item queries. ([#13399](https://github.com/mastra-ai/mastra/pull/13399))
+
+- Prompt blocks can now define their own variables schema (`requestContextSchema`), allowing you to create reusable prompt blocks with typed variable placeholders. The server now correctly computes and returns draft/published status for prompt blocks. Existing databases are automatically migrated when upgrading. ([#13351](https://github.com/mastra-ai/mastra/pull/13351))
+
+- Updated dependencies [[`24284ff`](https://github.com/mastra-ai/mastra/commit/24284ffae306ddf0ab83273e13f033520839ef40), [`f5097cc`](https://github.com/mastra-ai/mastra/commit/f5097cc8a813c82c3378882c31178320cadeb655), [`71e237f`](https://github.com/mastra-ai/mastra/commit/71e237fa852a3ad9a50a3ddb3b5f3b20b9a8181c), [`13a291e`](https://github.com/mastra-ai/mastra/commit/13a291ebb9f9bca80befa0d9166b916bb348e8e9), [`397af5a`](https://github.com/mastra-ai/mastra/commit/397af5a69f34d4157f51a7c8da3f1ded1e1d611c), [`d4701f7`](https://github.com/mastra-ai/mastra/commit/d4701f7e24822b081b70f9c806c39411b1a712e7), [`2b40831`](https://github.com/mastra-ai/mastra/commit/2b40831dcca2275c9570ddf09b7f25ba3e8dc7fc), [`6184727`](https://github.com/mastra-ai/mastra/commit/6184727e812bf7a65cee209bacec3a2f5a16e923), [`6f6385b`](https://github.com/mastra-ai/mastra/commit/6f6385be5b33687cd21e71fc27e972e6928bb34c), [`14aba61`](https://github.com/mastra-ai/mastra/commit/14aba61b9cff76d72bc7ef6f3a83ae2c5d059193), [`dd9dd1c`](https://github.com/mastra-ai/mastra/commit/dd9dd1c9ae32ae79093f8c4adde1732ac6357233)]:
+  - @mastra/core@1.7.0-alpha.0
+
 ## 1.6.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -4365,7 +4365,7 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const limitValue = perPageInput === false ? total : perPage;
       const rows = await this.#db.client.manyOrNone(
-        `SELECT * FROM ${tableName} ORDER BY "createdAt" DESC LIMIT $1 OFFSET $2`,
+        `SELECT * FROM ${tableName} ORDER BY "createdAt" DESC, "id" ASC LIMIT $1 OFFSET $2`,
         [limitValue, offset]
       );
       return {
@@ -4769,7 +4769,7 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
     try {
       const tableName = getTableName2({ indexName: storage.TABLE_DATASET_ITEMS, schemaName: getSchemaName2(this.#schema) });
       const rows = await this.#db.client.manyOrNone(
-        `SELECT * FROM ${tableName} WHERE "datasetId" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $3) AND "isDeleted" = false ORDER BY "createdAt" DESC`,
+        `SELECT * FROM ${tableName} WHERE "datasetId" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $3) AND "isDeleted" = false ORDER BY "createdAt" DESC, "id" ASC`,
         [datasetId, version, version]
       );
       return (rows || []).map((row) => this.transformItemRow(row));
@@ -4840,7 +4840,7 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const limitValue = perPageInput === false ? total : perPage;
       const rows = await this.#db.client.manyOrNone(
-        `SELECT * FROM ${tableName} ${whereClause} ORDER BY "createdAt" DESC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`,
+        `SELECT * FROM ${tableName} ${whereClause} ORDER BY "createdAt" DESC, "id" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`,
         [...queryParams, limitValue, offset]
       );
       return {
@@ -9444,7 +9444,7 @@ var ObservabilityPG = class _ObservabilityPG extends storage.ObservabilityStorag
     }
   }
 };
-var SNAPSHOT_FIELDS3 = ["name", "description", "content", "rules"];
+var SNAPSHOT_FIELDS3 = ["name", "description", "content", "rules", "requestContextSchema"];
 var PromptBlocksPG = class _PromptBlocksPG extends storage.PromptBlocksStorage {
   #db;
   #schema;
@@ -9517,6 +9517,11 @@ var PromptBlocksPG = class _PromptBlocksPG extends storage.PromptBlocksStorage {
       tableName: storage.TABLE_PROMPT_BLOCK_VERSIONS,
       schema: storage.TABLE_SCHEMAS[storage.TABLE_PROMPT_BLOCK_VERSIONS]
     });
+    await this.#db.alterTable({
+      tableName: storage.TABLE_PROMPT_BLOCK_VERSIONS,
+      schema: storage.TABLE_SCHEMAS[storage.TABLE_PROMPT_BLOCK_VERSIONS],
+      ifNotExists: ["requestContextSchema"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -9708,7 +9713,7 @@ var PromptBlocksPG = class _PromptBlocksPG extends storage.PromptBlocksStorage {
     }
   }
   async list(args) {
-    const { page = 0, perPage: perPageInput, orderBy, authorId, metadata, status = "published" } = args || {};
+    const { page = 0, perPage: perPageInput, orderBy, authorId, metadata, status } = args || {};
     const { field, direction } = this.parseOrderBy(orderBy);
     if (page < 0) {
       throw new error.MastraError(
@@ -9728,8 +9733,10 @@ var PromptBlocksPG = class _PromptBlocksPG extends storage.PromptBlocksStorage {
       const conditions = [];
       const queryParams = [];
       let paramIdx = 1;
-      conditions.push(`status = $${paramIdx++}`);
-      queryParams.push(status);
+      if (status) {
+        conditions.push(`status = $${paramIdx++}`);
+        queryParams.push(status);
+      }
       if (authorId !== void 0) {
         conditions.push(`"authorId" = $${paramIdx++}`);
         queryParams.push(authorId);
@@ -9738,7 +9745,7 @@ var PromptBlocksPG = class _PromptBlocksPG extends storage.PromptBlocksStorage {
         conditions.push(`metadata @> $${paramIdx++}::jsonb`);
         queryParams.push(JSON.stringify(metadata));
       }
-      const whereClause = `WHERE ${conditions.join(" AND ")}`;
+      const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
       const countResult = await this.#db.client.one(
         `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
         queryParams
@@ -9792,10 +9799,10 @@ var PromptBlocksPG = class _PromptBlocksPG extends storage.PromptBlocksStorage {
       await this.#db.client.none(
         `INSERT INTO ${tableName} (
           id, "blockId", "versionNumber",
-          name, description, content, rules,
+          name, description, content, rules, "requestContextSchema",
           "changedFields", "changeMessage",
           "createdAt", "createdAtZ"
-        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)`,
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)`,
         [
           input.id,
           input.blockId,
@@ -9804,6 +9811,7 @@ var PromptBlocksPG = class _PromptBlocksPG extends storage.PromptBlocksStorage {
           input.description ?? null,
           input.content,
           input.rules ? JSON.stringify(input.rules) : null,
+          input.requestContextSchema ? JSON.stringify(input.requestContextSchema) : null,
           input.changedFields ? JSON.stringify(input.changedFields) : null,
           input.changeMessage ?? null,
           nowIso,
@@ -10075,6 +10083,7 @@ var PromptBlocksPG = class _PromptBlocksPG extends storage.PromptBlocksStorage {
       description: row.description,
       content: row.content,
       rules: this.parseJson(row.rules, "rules"),
+      requestContextSchema: this.parseJson(row.requestContextSchema, "requestContextSchema"),
       changedFields: this.parseJson(row.changedFields, "changedFields"),
       changeMessage: row.changeMessage,
       createdAt: new Date(row.createdAtZ || row.createdAt)