graphile-presigned-url-plugin 1.18.0 → 1.18.1

package/download-url-field.d.ts

@@ -21,5 +21,14 @@
 import 'graphile-build';
 import type { GraphileConfig } from 'graphile-config';
 import type { PresignedUrlPluginOptions } from './types';
+/**
+ * Creates the downloadUrl computed field plugin.
+ *
+ * This is a separate plugin from the main presigned URL plugin because it
+ * uses the GraphQLObjectType_fields hook (low-level) rather than extendSchema.
+ * The downloadUrl field needs to be added dynamically to whatever table is
+ * the storage module's files table, which we discover at schema-build time
+ * via the `@storageFiles` smart tag.
+ */
 export declare function createDownloadUrlPlugin(options: PresignedUrlPluginOptions): GraphileConfig.Plugin;
 export default createDownloadUrlPlugin;

package/download-url-field.js

@@ -25,6 +25,7 @@ require("graphile-build");
 const logger_1 = require("@pgpmjs/logger");
 const grafast_1 = require("grafast");
 const graphile_storage_registry_1 = require("graphile-storage-registry");
+const physical_bucket_1 = require("./physical-bucket");
 const request_pg_client_1 = require("./request-pg-client");
 const s3_signer_1 = require("./s3-signer");
 const storage_module_cache_1 = require("./storage-module-cache");
@@ -38,37 +39,6 @@ const log = new logger_1.Logger('graphile-presigned-url:download-url');
  * the storage module's files table, which we discover at schema-build time
  * via the `@storageFiles` smart tag.
  */
-/**
- * Resolve the S3 config from the options. If the option is a lazy getter
- * function, call it (and cache the result).
- */
-function resolveS3(options) {
-    if (typeof options.s3 === 'function') {
-        const resolved = options.s3();
-        options.s3 = resolved;
-        return resolved;
-    }
-    return options.s3;
-}
-/**
- * Build a per-database S3Config for a *known* physical bucket. `physicalName`
- * is required — the stored coordinate on the bucket row is the only source;
- * no name is ever recomputed here. Same logic as plugin.ts resolveS3ForDatabase.
- */
-function resolveS3ForDatabase(options, storageConfig, physicalName) {
-    const globalS3 = resolveS3(options);
-    const publicUrlPrefix = storageConfig.publicUrlPrefix != null
-        ? storageConfig.publicUrlPrefix
-        : globalS3.publicUrlPrefix;
-    if (physicalName === globalS3.bucket && publicUrlPrefix === globalS3.publicUrlPrefix) {
-        return globalS3;
-    }
-    return {
-        ...globalS3,
-        bucket: physicalName,
-        ...(publicUrlPrefix != null ? { publicUrlPrefix } : {}),
-    };
-}
 function createDownloadUrlPlugin(options) {
     return {
         name: 'PresignedUrlDownloadPlugin',
@@ -113,7 +83,7 @@ function createDownloadUrlPlugin(options) {
                                 return (0, grafast_1.lambda)($combined, async ({ key, isPublic, filename, bucketId, withPgClient, pgSettings }) => {
                                     if (!key)
                                         return null;
-                                    let s3ForDb = resolveS3(options);
+                                    let s3ForDb = (0, physical_bucket_1.resolveS3)(options);
                                     let downloadUrlExpirySeconds = 3600;
                                     try {
                                         if (withPgClient && pgSettings) {
@@ -145,7 +115,7 @@ function createDownloadUrlPlugin(options) {
                                                     return null;
                                                 }
                                                 downloadUrlExpirySeconds = resolved.config.downloadUrlExpirySeconds;
-                                                s3ForDb = resolveS3ForDatabase(options, resolved.config, resolved.physicalName);
+                                                s3ForDb = (0, physical_bucket_1.resolveS3ForDatabase)(options, resolved.config, resolved.physicalName);
                                             }
                                         }
                                     }

package/esm/download-url-field.d.ts

@@ -21,5 +21,14 @@
 import 'graphile-build';
 import type { GraphileConfig } from 'graphile-config';
 import type { PresignedUrlPluginOptions } from './types';
+/**
+ * Creates the downloadUrl computed field plugin.
+ *
+ * This is a separate plugin from the main presigned URL plugin because it
+ * uses the GraphQLObjectType_fields hook (low-level) rather than extendSchema.
+ * The downloadUrl field needs to be added dynamically to whatever table is
+ * the storage module's files table, which we discover at schema-build time
+ * via the `@storageFiles` smart tag.
+ */
 export declare function createDownloadUrlPlugin(options: PresignedUrlPluginOptions): GraphileConfig.Plugin;
 export default createDownloadUrlPlugin;

package/esm/download-url-field.js

@@ -22,6 +22,7 @@ import 'graphile-build';
 import { Logger } from '@pgpmjs/logger';
 import { context as grafastContext, lambda, object } from 'grafast';
 import { DOWNLOAD_URL_FIELD } from 'graphile-storage-registry';
+import { resolveS3, resolveS3ForDatabase } from './physical-bucket';
 import { withRequestPgClient } from './request-pg-client';
 import { generatePresignedGetUrl } from './s3-signer';
 import { loadAllStorageModules, resolveStorageConfigFromCodec, storedPhysicalName } from './storage-module-cache';
@@ -35,37 +36,6 @@ const log = new Logger('graphile-presigned-url:download-url');
  * the storage module's files table, which we discover at schema-build time
  * via the `@storageFiles` smart tag.
  */
-/**
- * Resolve the S3 config from the options. If the option is a lazy getter
- * function, call it (and cache the result).
- */
-function resolveS3(options) {
-    if (typeof options.s3 === 'function') {
-        const resolved = options.s3();
-        options.s3 = resolved;
-        return resolved;
-    }
-    return options.s3;
-}
-/**
- * Build a per-database S3Config for a *known* physical bucket. `physicalName`
- * is required — the stored coordinate on the bucket row is the only source;
- * no name is ever recomputed here. Same logic as plugin.ts resolveS3ForDatabase.
- */
-function resolveS3ForDatabase(options, storageConfig, physicalName) {
-    const globalS3 = resolveS3(options);
-    const publicUrlPrefix = storageConfig.publicUrlPrefix != null
-        ? storageConfig.publicUrlPrefix
-        : globalS3.publicUrlPrefix;
-    if (physicalName === globalS3.bucket && publicUrlPrefix === globalS3.publicUrlPrefix) {
-        return globalS3;
-    }
-    return {
-        ...globalS3,
-        bucket: physicalName,
-        ...(publicUrlPrefix != null ? { publicUrlPrefix } : {}),
-    };
-}
 export function createDownloadUrlPlugin(options) {
     return {
         name: 'PresignedUrlDownloadPlugin',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-presigned-url-plugin",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "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",
@@ -62,5 +62,5 @@
     "@types/node": "^22.19.11",
     "makage": "^0.3.0"
   },
-  "gitHead": "77d58bb93796be91d4e00156bb6847392584d3bc"
+  "gitHead": "9a919ff3f7ec90eab2d510bb6682ce5209e53198"
 }