prostgles-server 4.2.625 → 4.2.627

package/lib/StorageClient/setupFileServeHandler.ts

@@ -6,9 +6,11 @@ import type { DB } from "../initProstgles";
 import type { Prostgles } from "../Prostgles";
 import type { FileTableConfig } from "../ProstglesTypes";
 import { runClientRequest } from "../runClientRequest";
-import type { StorageClient } from "./StorageClientTypes";
-import type { FileTableRow } from "./getFileTableConfig";
+import type { FileVersionTableRow } from "./fileTableDefinitions";
+import { getFileVersionTableName } from "./fileVersionUtils";
 import { getFileStorageKey } from "./getFileStorageKey";
+import type { FileTableRow } from "./getFileTableConfig";
+import type { StorageClient } from "./StorageClientTypes";
 
 export const getFileServeRoute = (config: FileTableConfig) => {
   const fileTableName = config.tableName;
@@ -36,22 +38,39 @@ export const setupFileServeHandler = (
       if (typeof id !== "string" || !id) {
         throw "Invalid media name";
       }
+      const versionParam = req.query.version;
+      const version = typeof versionParam === "string" ? Number(versionParam) : undefined;
+      if (
+        versionParam !== undefined &&
+        (typeof versionParam !== "string" ||
+          !Number.isInteger(version) ||
+          version! < 1 ||
+          String(version) !== versionParam)
+      ) {
+        throw "Invalid file version";
+      }
+
+      if (version && !config.versioning) {
+        throw "File version requested but versioning is not enabled";
+      }
+
+      const select = {
+        id: 1,
+        storage_key: 1,
+        signed_url: 1,
+        signed_url_expires: 1,
+        content_type: 1,
+      } satisfies
+        Partial<Record<keyof FileTableRow, 1>> | Partial<Record<keyof FileVersionTableRow, 1>>;
 
-      const selectParams = {
-        select: {
-          id: 1,
-          storage_key: 1,
-          signed_url: 1,
-          signed_url_expires: 1,
-          content_type: 1,
-        },
-      };
       const file = (await runClientRequest.bind(prg)(
         {
           command: "findOne",
-          tableName: fileTableName,
-          param1: { id },
-          param2: selectParams,
+          tableName: version === undefined ? fileTableName : getFileVersionTableName(config),
+          param1: version === undefined ? { id } : { file_id: id, version },
+          param2: {
+            select,
+          },
           param3: undefined,
         },
         {
@@ -59,16 +78,18 @@ export const setupFileServeHandler = (
           httpReq: req,
         },
         undefined,
-      )) as FileTableRow | undefined;
+      )) as Pick<FileTableRow, keyof typeof select> | undefined;
 
       if (!file) {
-        res.status(HTTP_FAIL_CODES.NOT_FOUND).send("File not found or not allowed");
+        res
+          .status(HTTP_FAIL_CODES.NOT_FOUND)
+          .send(version === undefined ? "File not found or not allowed" : "File version not found");
         return;
       }
 
       if (storageClient.type === "cloud") {
-        let url = file.signed_url;
-        const expires = +(file.signed_url_expires || 0);
+        let url = version === undefined ? file.signed_url : undefined;
+        const expires = version === undefined ? +(file.signed_url_expires || 0) : 0;
 
         const HOUR = 3600 * 1000;
         const EXPIRES = Date.now() + HOUR;
@@ -76,20 +97,22 @@ export const setupFileServeHandler = (
           url = await storageClient.getSignedUrlForDownload(getFileStorageKey(file), 60 * 60);
 
           // Match the storage key to avoid caching a stale URL after replacement; NULL matches legacy files.
-          await db.any(
-            "UPDATE ${fileTableName:name} \
+          if (version === undefined) {
+            await db.any(
+              "UPDATE ${fileTableName:name} \
               SET signed_url = ${signed_url}, \
               signed_url_expires = ${signed_url_expires} \
             WHERE id = ${id} \
             AND storage_key IS NOT DISTINCT FROM ${storage_key}::uuid",
-            {
-              fileTableName,
-              id: file.id,
-              storage_key: file.storage_key,
-              signed_url: url,
-              signed_url_expires: EXPIRES,
-            },
-          );
+              {
+                fileTableName,
+                id: file.id,
+                storage_key: file.storage_key,
+                signed_url: url,
+                signed_url_expires: EXPIRES,
+              },
+            );
+          }
         }
 
         res.redirect(url);

package/lib/TableConfig/TableRowFromColumnDefinitions.ts

@@ -1,25 +1,49 @@
 import type { JSONB } from "prostgles-types";
 
+type ColumnDefinition =
+  | string
+  | { enum: readonly (string | number)[]; nullable?: boolean }
+  | { jsonbSchema: JSONB.JSONBSchema; nullable?: boolean };
+
 /** Row types for the column definitions used by managed tables. */
 export type TableRowFromColumnDefinitions<
-  T extends Record<
-    string,
-    | string
-    | { enum: readonly (string | number)[]; nullable?: boolean }
-    | { jsonbSchema: JSONB.JSONBSchema; nullable?: boolean }
-  >,
-> = {
-  [K in keyof T]: T[K] extends { jsonbSchema: infer S extends JSONB.JSONBSchema }
+  T extends Record<string, ColumnDefinition>,
+> = Omit<TableRow<T>, GeneratedColumnNames<T>> &
+  Partial<Pick<TableRow<T>, GeneratedColumnNames<T>>>;
+
+type TableRow<T extends Record<string, ColumnDefinition>> = {
+  [K in keyof T]: T[K] extends {
+    jsonbSchema: infer S extends JSONB.JSONBSchema;
+  }
     ? JSONB.GetType<S> | (T[K] extends { nullable: true } ? null : never)
     : T[K] extends { enum: readonly (infer V)[] }
       ? V | (T[K] extends { nullable: true } ? null : never)
-      : | (T[K] extends `BYTEA${string}`
-            ? Buffer
-            : T[K] extends `JSONB${string}`
-              ? Record<string, unknown>
-              : string)
+      : | ColumnValue<T[K]>
         | (T[K] extends
             `${string} NOT NULL${string}` | `${string}PRIMARY KEY${string}`
             ? never
             : null);
 };
+
+type GeneratedColumnNames<T extends Record<string, ColumnDefinition>> = {
+  [K in keyof T]: T[K] extends string
+    ? T[K] extends
+        | `${string}DEFAULT${string}`
+        | `${string}SERIAL${string}`
+        | `${string}GENERATED${string}AS IDENTITY${string}`
+      ? K
+      : never
+    : never;
+}[keyof T];
+
+type ColumnValue<T> = T extends `BYTEA${string}`
+  ? Buffer
+  : T extends `JSONB${string}`
+    ? Record<string, unknown>
+    : T extends `${"SMALLINT" | "INTEGER" | "SERIAL"}${string}`
+      ? number
+      : T extends `${"BIGINT" | "BIGSERIAL" | "NUMERIC" | "DECIMAL"}${string}`
+        ? string | number
+        : T extends `${"REAL" | "DOUBLE PRECISION"}${string}`
+          ? number
+          : string;

package/lib/TableConfig/initTableConfig.ts

@@ -215,17 +215,16 @@ export const initTableConfig = async function (this: TableConfigurator) {
 
       /** Add missing named constraints */
       constraintDefs?.forEach((c) => {
-        if (c.name && !currCons.some((cc) => cc.name === c.name)) {
-          const fc = futureCons.find((nc) => nc.name === c.name);
-          if (fc) {
-            queries.push(`${ALTER_TABLE_Q} ADD CONSTRAINT ${asName(c.name)} ${c.content};`);
-          }
+        if (!c.name) return;
+        const fc = futureCons.find((nc) => nc.name === c.name);
+        if (fc && !currCons.some((cc) => cc.name === c.name && cc.definition === fc.definition)) {
+          queries.push(`${ALTER_TABLE_Q} ADD CONSTRAINT ${asName(c.name)} ${c.content};`);
         }
       });
 
       /** Add remaining missing constraints */
       futureCons
-        .filter((nc) => !currCons.some((c) => c.definition === nc.definition))
+        .filter((nc) => !nc.isNamed && !currCons.some((c) => c.definition === nc.definition))
         .forEach((c) => {
           queries.push(`${ALTER_TABLE_Q} ADD ${c.definition};`);
         });

package/lib/index.ts

@@ -52,11 +52,12 @@ export type * from "./TableHooks/TableHooks";
 export * from "./Auth/utils/upsertNamedExpressMiddleware";
 export type { RequestWithUser } from "./Auth/middleware/userContextMiddleware";
 export default prostgles;
-export type { FileTableRow } from "./StorageClient/getFileTableConfig";
+export type { FileTableInsertRow, FileTableRow } from "./StorageClient/getFileTableConfig";
 export { defineJoin };
 export {
   AUDIT_TABLE_COLUMN_DEFINITIONS,
   AUDIT_TABLE_COLUMN_NAMES,
   AUDIT_TABLE_COLUMNS,
+  type AuditTableInsertRow,
   type AuditTableRow,
 } from "./Audit/AuditTable";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.625",
+  "version": "4.2.627",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "pg": "^8.23.0",
     "pg-cursor": "^2.22.0",
     "pg-promise": "^12.7.1",
-    "prostgles-types": "^4.0.285"
+    "prostgles-types": "^4.0.289"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",