@restura/core 2.1.0 → 2.1.2

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import * as express from 'express';
 import { IncomingHttpHeaders } from 'http2';
 import { QueryResultRow, QueryConfigValues, QueryResult, PoolConfig, Pool, ClientConfig, Client } from 'pg';
-import peg from 'pegjs';
+import * as pegjs from 'pegjs';
 
 type LogLevel = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace';
 interface ResturaLogger {
@@ -1155,7 +1155,7 @@ declare class ResturaEngine {
 }
 declare const restura: ResturaEngine;
 
-declare const filterPsqlParser: peg.Parser;
+declare const filterPsqlParser: pegjs.Parser;
 
 declare abstract class SqlEngine {
     runQueryForRoute(req: RsRequest<unknown>, routeData: StandardRouteData, schema: ResturaSchema): Promise<DynamicObject | any[] | boolean>;
@@ -1358,6 +1358,7 @@ interface TriggerSqlOptions {
     delivery?: 'direct' | 'outbox';
     channel?: string;
     tableColumns?: string[];
+    columnTypes?: Record<string, string>;
 }
 interface SchemaGenerationOptions {
     eventDelivery?: 'direct' | 'outbox';

package/dist/index.js

@@ -259,7 +259,7 @@ var SqlUtils = class _SqlUtils {
     if (type.startsWith("decimal") || type.startsWith("numeric")) return "string";
     if (type.indexOf("int") > -1 || type.startsWith("double") || type.startsWith("float") || type.indexOf("serial") > -1 || type.startsWith("real") || type.startsWith("double precision"))
       return "number";
-    if (type === "json") {
+    if (type === "json" || type === "jsonb") {
       if (!value) return "object";
       return value.split(",").map((val) => {
         return val.replace(/['"]/g, "");
@@ -2359,23 +2359,31 @@ CREATE INDEX IF NOT EXISTS "${OUTBOX_TABLE_NAME}_processedOn_index" ON "${OUTBOX
 }
 function resolveNotifyColumns(tableName, notify, tableColumns) {
   if (!notify) return [];
+  let columns;
   if (notify === "ALL") {
     if (!tableColumns) {
       throw new Error(
         `notify: "ALL" on table "${tableName}" requires tableColumns so the sensitive-column denylist can be applied. Pass options.tableColumns or list columns explicitly.`
       );
     }
-    return tableColumns.filter((column) => !isSensitiveColumnName(column));
+    columns = tableColumns.filter((column) => !isSensitiveColumnName(column));
+  } else {
+    columns = notify.map((entry) => {
+      if (entry.startsWith("!")) return entry.slice(1);
+      if (isSensitiveColumnName(entry)) {
+        throw new Error(
+          `Refusing to include sensitive column "${tableName}"."${entry}" in notify trigger payloads. Remove it from the notify list or prefix it with '!' to force-include it.`
+        );
+      }
+      return entry;
+    });
   }
-  return notify.map((entry) => {
-    if (entry.startsWith("!")) return entry.slice(1);
-    if (isSensitiveColumnName(entry)) {
-      throw new Error(
-        `Refusing to include sensitive column "${tableName}"."${entry}" in notify trigger payloads. Remove it from the notify list or prefix it with '!' to force-include it.`
-      );
-    }
-    return entry;
-  });
+  if (!columns.length) {
+    throw new Error(
+      `notify config on table "${tableName}" resolves to no columns \u2014 remove the notify key or list at least one column.`
+    );
+  }
+  return columns;
 }
 function sqlStringLiteral(value) {
   return value.replace(/'/g, "''");
@@ -2425,7 +2433,14 @@ function buildTriggerFunctionSql(tableName, operation, notify, options) {
   const outboxDeclare = delivery === "outbox" ? "\n	outbox_id BIGINT;" : "";
   const legacyDrop = operation === "update" && tableName !== tableName.toLowerCase() ? `DROP TRIGGER IF EXISTS ${tableName}_update ON "${tableName}";
 ` : "";
-  const updateGuard = operation === "update" ? "\n	WHEN (OLD.* IS DISTINCT FROM NEW.*)" : "";
+  let updateScope = "";
+  let updateGuard = "";
+  if (operation === "update") {
+    updateScope = ` OF ${columns.map((column) => `"${column}"`).join(", ")}`;
+    const columnComparison = (column) => options?.columnTypes?.[column] === "JSON" ? `OLD."${column}"::jsonb IS DISTINCT FROM NEW."${column}"::jsonb` : `OLD."${column}" IS DISTINCT FROM NEW."${column}"`;
+    updateGuard = `
+	WHEN (${columns.map(columnComparison).join(" OR ")})`;
+  }
   return `
 CREATE OR REPLACE FUNCTION ${functionName}()
 	RETURNS TRIGGER AS $$
@@ -2440,7 +2455,7 @@ END;
 $$ LANGUAGE plpgsql;
 
 ${legacyDrop}CREATE OR REPLACE TRIGGER "${tableName}_${operation}"
-	AFTER ${operation.toUpperCase()} ON "${tableName}"
+	AFTER ${operation.toUpperCase()}${updateScope} ON "${tableName}"
 	FOR EACH ROW${updateGuard}
 EXECUTE FUNCTION ${functionName}();
 `;
@@ -2465,7 +2480,8 @@ function generateNotifyTriggersSql(schema, options) {
     const triggerOptions = {
       delivery: options?.eventDelivery,
       channel: options?.outboxChannel,
-      tableColumns: table.columns.map((column) => column.name)
+      tableColumns: table.columns.map((column) => column.name),
+      columnTypes: Object.fromEntries(table.columns.map((column) => [column.name, column.type]))
     };
     statements.push(createInsertTriggerSql(table.name, table.notify, triggerOptions));
     statements.push(createUpdateTriggerSql(table.name, table.notify, triggerOptions));
@@ -2796,7 +2812,26 @@ var EventOutboxConsumer = class {
 };
 
 // src/restura/sql/filterPsqlParser.ts
+import format2 from "pg-format";
+
+// src/restura/sql/compilePegParser.ts
 import peg from "pegjs";
+function compilePegParser(grammar, dependencies, modules) {
+  const parserSource = peg.generate(grammar, {
+    output: "source",
+    format: "commonjs",
+    dependencies
+  });
+  const moduleShim = { exports: {} };
+  const requireShim = (moduleId) => {
+    if (moduleId in modules) return modules[moduleId];
+    throw new Error(`compilePegParser: no module provided for dependency '${moduleId}'`);
+  };
+  new Function("module", "exports", "require", parserSource)(moduleShim, moduleShim.exports, requireShim);
+  return moduleShim.exports;
+}
+
+// src/restura/sql/filterPsqlParser.ts
 var initializers = `
     // Quotes a SQL identifier (column/table name) with double quotes, escaping any embedded quotes
     function quoteSqlIdentity(value) {
@@ -3132,10 +3167,7 @@ ValueWithPipesChar
     / c:":" !":"  { return c; }
 `;
 var fullGrammar = entryGrammar + oldGrammar + newGrammar;
-var filterPsqlParser = peg.generate(fullGrammar, {
-  format: "commonjs",
-  dependencies: { format: "pg-format" }
-});
+var filterPsqlParser = compilePegParser(fullGrammar, { format: "pg-format" }, { "pg-format": format2 });
 var filterPsqlParser_default = filterPsqlParser;
 
 // src/restura/sql/PsqlEngine.ts