graphile-presigned-url-plugin 0.14.0 → 0.15.0

package/esm/plugin.js

@@ -171,10 +171,21 @@ export function createPresignedUrlPlugin(options) {
                         for (const filesCodec of fileCodecs) {
                             const filesTypeName = build.inflection.tableType(filesCodec);
                             const filesSchemaName = filesCodec.extensions?.pg?.schemaName;
-                            // Find the matching bucket codec by schema name
-                            const matchingBucketCodec = bucketCodecs.find((bc) => bc.extensions?.pg?.schemaName === filesSchemaName);
+                            // Find the matching bucket codec by table name prefix.
+                            // Schema-name matching is ambiguous when multiple storage modules share
+                            // the same PG schema (e.g. app_files + data_room_files both in storage_public).
+                            // Instead, derive the prefix from the raw SQL table name:
+                            //   "data_room_files" → prefix "data_room" → matches "data_room_buckets"
+                            //   "app_files"       → prefix "app"       → matches "app_buckets"
+                            const filesRawName = filesCodec.extensions?.pg?.name;
+                            const filesPrefix = filesRawName?.replace(/_files$/, '');
+                            const matchingBucketCodec = bucketCodecs.find((bc) => {
+                                const bucketRawName = bc.extensions?.pg?.name;
+                                const bucketPrefix = bucketRawName?.replace(/_buckets$/, '');
+                                return bucketPrefix === filesPrefix;
+                            });
                             if (!matchingBucketCodec) {
-                                log.debug(`Skipping create mutation for ${filesCodec.name}: no matching bucket codec in schema ${filesSchemaName}`);
+                                log.debug(`Skipping upload mutation for ${filesCodec.name}: no matching bucket codec with prefix "${filesPrefix}"`);
                                 continue;
                             }
                             const hasOwnerId = !!matchingBucketCodec.attributes.owner_id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-presigned-url-plugin",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Presigned URL upload plugin for PostGraphile v5 — requestUploadUrl mutation and downloadUrl computed field",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/constructive",
@@ -42,7 +42,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1009.0",
     "@aws-sdk/s3-request-presigner": "^3.1009.0",
-    "@pgpmjs/logger": "^2.8.0",
+    "@pgpmjs/logger": "^2.9.0",
     "@pgsql/quotes": "^17.1.0",
     "lru-cache": "^11.2.7"
   },
@@ -56,9 +56,9 @@
     "postgraphile": "5.0.0"
   },
   "devDependencies": {
-    "@constructive-io/s3-utils": "^2.14.0",
+    "@constructive-io/s3-utils": "^2.15.0",
     "@types/node": "^22.19.11",
     "makage": "^0.1.10"
   },
-  "gitHead": "c1ecb2b54ea2bd12e2edeecc4ec721ccf93a67bf"
+  "gitHead": "0538fe39630e6bafd228cb3f2b114fff4f9a61aa"
 }

package/plugin.js

@@ -175,10 +175,21 @@ function createPresignedUrlPlugin(options) {
                         for (const filesCodec of fileCodecs) {
                             const filesTypeName = build.inflection.tableType(filesCodec);
                             const filesSchemaName = filesCodec.extensions?.pg?.schemaName;
-                            // Find the matching bucket codec by schema name
-                            const matchingBucketCodec = bucketCodecs.find((bc) => bc.extensions?.pg?.schemaName === filesSchemaName);
+                            // Find the matching bucket codec by table name prefix.
+                            // Schema-name matching is ambiguous when multiple storage modules share
+                            // the same PG schema (e.g. app_files + data_room_files both in storage_public).
+                            // Instead, derive the prefix from the raw SQL table name:
+                            //   "data_room_files" → prefix "data_room" → matches "data_room_buckets"
+                            //   "app_files"       → prefix "app"       → matches "app_buckets"
+                            const filesRawName = filesCodec.extensions?.pg?.name;
+                            const filesPrefix = filesRawName?.replace(/_files$/, '');
+                            const matchingBucketCodec = bucketCodecs.find((bc) => {
+                                const bucketRawName = bc.extensions?.pg?.name;
+                                const bucketPrefix = bucketRawName?.replace(/_buckets$/, '');
+                                return bucketPrefix === filesPrefix;
+                            });
                             if (!matchingBucketCodec) {
-                                log.debug(`Skipping create mutation for ${filesCodec.name}: no matching bucket codec in schema ${filesSchemaName}`);
+                                log.debug(`Skipping upload mutation for ${filesCodec.name}: no matching bucket codec with prefix "${filesPrefix}"`);
                                 continue;
                             }
                             const hasOwnerId = !!matchingBucketCodec.attributes.owner_id;