graphile-settings 6.11.10 → 6.12.0

package/esm/presets/constructive-preset.js

@@ -13,7 +13,7 @@ import { createMatchesOperatorFactory, createTrgmOperatorFactories, UnifiedSearc
 import { UploadPreset } from 'graphile-upload-plugin';
 import { getBucketProvisionerConnection } from '../bucket-provisioner-resolver';
 import { ConflictDetectorPreset, EnableAllFilterColumnsPreset, InflectorLoggerPreset, InflektPreset, ManyToManyOptInPreset, MetaSchemaPreset, MinimalPreset, NoUniqueLookupPreset, PgTypeMappingsPreset, RequiredInputPreset } from '../plugins';
-import { createBucketNameResolver, createEnsureBucketProvisioned, getAllowedOrigins, getPresignedUrlS3Config } from '../presigned-url-resolver';
+import { createBucketNameResolver, createEnsureBucketProvisioned, createProvisionerBucketNameResolver, getAllowedOrigins, getPresignedUrlS3Config } from '../presigned-url-resolver';
 import { constructiveUploadFieldDefinitions } from '../upload-resolver';
 /**
  * grafast / @dataplan/pg require Node >= 22 (they call Promise.withResolvers()
@@ -144,7 +144,17 @@ export function createConstructivePreset(options) {
             ensureBucketProvisioned: createEnsureBucketProvisioned()
         }), BucketProvisionerPreset({
             connection: getBucketProvisionerConnection,
-            allowedOrigins: getAllowedOrigins()
+            allowedOrigins: getAllowedOrigins(),
+            // Same tenant-aware naming policy as the presigned (lazy) path, so the
+            // eager provisionBucket mutation mints the identical physical name
+            // (`{prefix}-{bucketKey}-{databaseId}`) instead of falling back to the
+            // bare logical bucket key.
+            resolveBucketName: createProvisionerBucketNameResolver(),
+            // S3 buckets are provisioned lazily (on first upload) or explicitly via
+            // the provisionBucket mutation. Disable the auto-provision-on-create
+            // hook so a createBucket GraphQL mutation records the row without
+            // eagerly minting an S3 bucket that may never receive an upload.
+            autoProvision: false
         }));
     }
     if (opts.enableAggregates) {

package/esm/presigned-url-resolver.d.ts

@@ -10,6 +10,7 @@
  *
  * Follows the same lazy-init pattern as upload-resolver.ts.
  */
+import type { BucketNameResolver as ProvisionerBucketNameResolver } from 'graphile-bucket-provisioner-plugin';
 import type { BucketNameResolver, EnsureBucketProvisioned, S3Config } from 'graphile-presigned-url-plugin';
 /**
  * Lazily initialize and return the S3Config for the presigned URL plugin.
@@ -24,16 +25,26 @@ import type { BucketNameResolver, EnsureBucketProvisioned, S3Config } from 'grap
  */
 export declare function getPresignedUrlS3Config(): S3Config;
 /**
- * Create a per-(database, bucketKey) bucket name resolver.
+ * Create a per-(database, bucketKey) bucket name resolver for the presigned
+ * URL plugin (argument order: `(databaseId, bucketKey)`).
  *
- * Uses the BUCKET_NAME env var as a prefix. For each (database, bucketKey)
- * pair, the S3 bucket name becomes `{prefix}-{bucketKey}-{databaseId}`
- * (e.g., "myapp-public-abc123def456").
+ * Uses CDN_BUCKET_NAME as a prefix. For each (database, bucketKey) pair, the
+ * S3 bucket name becomes `{prefix}-{bucketKey}-{databaseId}`.
  *
  * This aligns with the bucket provisioner plugin which creates separate
  * S3 buckets per logical bucket key.
  */
 export declare function createBucketNameResolver(): BucketNameResolver;
+/**
+ * Create the bucket name resolver for the bucket provisioner plugin
+ * (argument order: `(bucketKey, databaseId)`).
+ *
+ * Produces the exact same physical name as createBucketNameResolver()
+ * (`{prefix}-{bucketKey}-{databaseId}`) so the eager `provisionBucket`
+ * mutation mints the identical tenant-aware name that the lazy first-upload
+ * path would. Throws on a missing prefix — no default bucket name.
+ */
+export declare function createProvisionerBucketNameResolver(): ProvisionerBucketNameResolver;
 /**
  * Resolve CORS allowed origins from the env/config system.
  *

package/esm/presigned-url-resolver.js

@@ -64,25 +64,55 @@ export function getPresignedUrlS3Config() {
     return s3Config;
 }
 /**
- * Create a per-(database, bucketKey) bucket name resolver.
+ * Read the configured physical-bucket-name prefix (CDN_BUCKET_NAME).
  *
- * Uses the BUCKET_NAME env var as a prefix. For each (database, bucketKey)
- * pair, the S3 bucket name becomes `{prefix}-{bucketKey}-{databaseId}`
- * (e.g., "myapp-public-abc123def456").
- *
- * This aligns with the bucket provisioner plugin which creates separate
- * S3 buckets per logical bucket key.
+ * There is no default: a missing prefix throws, mirroring
+ * getPresignedUrlS3Config, so an untenanted bucket name can never be minted.
  */
-export function createBucketNameResolver() {
+function getBucketNamePrefix() {
     const { cdn } = getEnvOptions();
     const prefix = cdn?.bucketName;
     if (!prefix) {
         throw new Error('[presigned-url-resolver] Missing CDN bucket name prefix. ' +
             'Set CDN_BUCKET_NAME environment variable; there is no default bucket name.');
     }
-    return (databaseId, bucketKey) => {
-        return `${prefix}-${bucketKey}-${databaseId}`;
-    };
+    return prefix;
+}
+/**
+ * The single physical-bucket naming policy: `{prefix}-{bucketKey}-{databaseId}`
+ * (e.g., "myapp-public-abc123def456"). Both the presigned-upload (lazy) path
+ * and the bucket-provisioner (eager) path derive names from this one function
+ * so a bucket's physical name is identical regardless of which path mints it.
+ */
+function mintPhysicalBucketName(prefix, databaseId, bucketKey) {
+    return `${prefix}-${bucketKey}-${databaseId}`;
+}
+/**
+ * Create a per-(database, bucketKey) bucket name resolver for the presigned
+ * URL plugin (argument order: `(databaseId, bucketKey)`).
+ *
+ * Uses CDN_BUCKET_NAME as a prefix. For each (database, bucketKey) pair, the
+ * S3 bucket name becomes `{prefix}-{bucketKey}-{databaseId}`.
+ *
+ * This aligns with the bucket provisioner plugin which creates separate
+ * S3 buckets per logical bucket key.
+ */
+export function createBucketNameResolver() {
+    const prefix = getBucketNamePrefix();
+    return (databaseId, bucketKey) => mintPhysicalBucketName(prefix, databaseId, bucketKey);
+}
+/**
+ * Create the bucket name resolver for the bucket provisioner plugin
+ * (argument order: `(bucketKey, databaseId)`).
+ *
+ * Produces the exact same physical name as createBucketNameResolver()
+ * (`{prefix}-{bucketKey}-{databaseId}`) so the eager `provisionBucket`
+ * mutation mints the identical tenant-aware name that the lazy first-upload
+ * path would. Throws on a missing prefix — no default bucket name.
+ */
+export function createProvisionerBucketNameResolver() {
+    const prefix = getBucketNamePrefix();
+    return (bucketKey, databaseId) => mintPhysicalBucketName(prefix, databaseId, bucketKey);
 }
 /**
  * Resolve CORS allowed origins from the env/config system.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-settings",
-  "version": "6.11.10",
+  "version": "6.12.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "graphile settings",
   "main": "index.js",
@@ -46,7 +46,7 @@
     "express": "^5.2.1",
     "grafast": "1.0.2",
     "grafserv": "1.0.0",
-    "graphile-bucket-provisioner-plugin": "1.10.0",
+    "graphile-bucket-provisioner-plugin": "1.11.0",
     "graphile-build": "5.0.2",
     "graphile-build-pg": "5.0.2",
     "graphile-bulk-mutations": "^1.10.9",
@@ -91,5 +91,5 @@
     "constructive",
     "graphql"
   ],
-  "gitHead": "c438821362ceaf70b2a20d74ecf25ad4191c1748"
+  "gitHead": "247e48d25b13524d992f00c1b2dc063884d1deb1"
 }

package/presets/constructive-preset.js

@@ -148,7 +148,17 @@ function createConstructivePreset(options) {
             ensureBucketProvisioned: (0, presigned_url_resolver_1.createEnsureBucketProvisioned)()
         }), (0, graphile_bucket_provisioner_plugin_1.BucketProvisionerPreset)({
             connection: bucket_provisioner_resolver_1.getBucketProvisionerConnection,
-            allowedOrigins: (0, presigned_url_resolver_1.getAllowedOrigins)()
+            allowedOrigins: (0, presigned_url_resolver_1.getAllowedOrigins)(),
+            // Same tenant-aware naming policy as the presigned (lazy) path, so the
+            // eager provisionBucket mutation mints the identical physical name
+            // (`{prefix}-{bucketKey}-{databaseId}`) instead of falling back to the
+            // bare logical bucket key.
+            resolveBucketName: (0, presigned_url_resolver_1.createProvisionerBucketNameResolver)(),
+            // S3 buckets are provisioned lazily (on first upload) or explicitly via
+            // the provisionBucket mutation. Disable the auto-provision-on-create
+            // hook so a createBucket GraphQL mutation records the row without
+            // eagerly minting an S3 bucket that may never receive an upload.
+            autoProvision: false
         }));
     }
     if (opts.enableAggregates) {

package/presigned-url-resolver.d.ts

@@ -10,6 +10,7 @@
  *
  * Follows the same lazy-init pattern as upload-resolver.ts.
  */
+import type { BucketNameResolver as ProvisionerBucketNameResolver } from 'graphile-bucket-provisioner-plugin';
 import type { BucketNameResolver, EnsureBucketProvisioned, S3Config } from 'graphile-presigned-url-plugin';
 /**
  * Lazily initialize and return the S3Config for the presigned URL plugin.
@@ -24,16 +25,26 @@ import type { BucketNameResolver, EnsureBucketProvisioned, S3Config } from 'grap
  */
 export declare function getPresignedUrlS3Config(): S3Config;
 /**
- * Create a per-(database, bucketKey) bucket name resolver.
+ * Create a per-(database, bucketKey) bucket name resolver for the presigned
+ * URL plugin (argument order: `(databaseId, bucketKey)`).
  *
- * Uses the BUCKET_NAME env var as a prefix. For each (database, bucketKey)
- * pair, the S3 bucket name becomes `{prefix}-{bucketKey}-{databaseId}`
- * (e.g., "myapp-public-abc123def456").
+ * Uses CDN_BUCKET_NAME as a prefix. For each (database, bucketKey) pair, the
+ * S3 bucket name becomes `{prefix}-{bucketKey}-{databaseId}`.
  *
  * This aligns with the bucket provisioner plugin which creates separate
  * S3 buckets per logical bucket key.
  */
 export declare function createBucketNameResolver(): BucketNameResolver;
+/**
+ * Create the bucket name resolver for the bucket provisioner plugin
+ * (argument order: `(bucketKey, databaseId)`).
+ *
+ * Produces the exact same physical name as createBucketNameResolver()
+ * (`{prefix}-{bucketKey}-{databaseId}`) so the eager `provisionBucket`
+ * mutation mints the identical tenant-aware name that the lazy first-upload
+ * path would. Throws on a missing prefix — no default bucket name.
+ */
+export declare function createProvisionerBucketNameResolver(): ProvisionerBucketNameResolver;
 /**
  * Resolve CORS allowed origins from the env/config system.
  *

package/presigned-url-resolver.js

@@ -14,6 +14,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPresignedUrlS3Config = getPresignedUrlS3Config;
 exports.createBucketNameResolver = createBucketNameResolver;
+exports.createProvisionerBucketNameResolver = createProvisionerBucketNameResolver;
 exports.getAllowedOrigins = getAllowedOrigins;
 exports.createEnsureBucketProvisioned = createEnsureBucketProvisioned;
 const bucket_provisioner_1 = require("@constructive-io/bucket-provisioner");
@@ -70,25 +71,55 @@ function getPresignedUrlS3Config() {
     return s3Config;
 }
 /**
- * Create a per-(database, bucketKey) bucket name resolver.
+ * Read the configured physical-bucket-name prefix (CDN_BUCKET_NAME).
  *
- * Uses the BUCKET_NAME env var as a prefix. For each (database, bucketKey)
- * pair, the S3 bucket name becomes `{prefix}-{bucketKey}-{databaseId}`
- * (e.g., "myapp-public-abc123def456").
- *
- * This aligns with the bucket provisioner plugin which creates separate
- * S3 buckets per logical bucket key.
+ * There is no default: a missing prefix throws, mirroring
+ * getPresignedUrlS3Config, so an untenanted bucket name can never be minted.
  */
-function createBucketNameResolver() {
+function getBucketNamePrefix() {
     const { cdn } = (0, graphql_env_1.getEnvOptions)();
     const prefix = cdn?.bucketName;
     if (!prefix) {
         throw new Error('[presigned-url-resolver] Missing CDN bucket name prefix. ' +
             'Set CDN_BUCKET_NAME environment variable; there is no default bucket name.');
     }
-    return (databaseId, bucketKey) => {
-        return `${prefix}-${bucketKey}-${databaseId}`;
-    };
+    return prefix;
+}
+/**
+ * The single physical-bucket naming policy: `{prefix}-{bucketKey}-{databaseId}`
+ * (e.g., "myapp-public-abc123def456"). Both the presigned-upload (lazy) path
+ * and the bucket-provisioner (eager) path derive names from this one function
+ * so a bucket's physical name is identical regardless of which path mints it.
+ */
+function mintPhysicalBucketName(prefix, databaseId, bucketKey) {
+    return `${prefix}-${bucketKey}-${databaseId}`;
+}
+/**
+ * Create a per-(database, bucketKey) bucket name resolver for the presigned
+ * URL plugin (argument order: `(databaseId, bucketKey)`).
+ *
+ * Uses CDN_BUCKET_NAME as a prefix. For each (database, bucketKey) pair, the
+ * S3 bucket name becomes `{prefix}-{bucketKey}-{databaseId}`.
+ *
+ * This aligns with the bucket provisioner plugin which creates separate
+ * S3 buckets per logical bucket key.
+ */
+function createBucketNameResolver() {
+    const prefix = getBucketNamePrefix();
+    return (databaseId, bucketKey) => mintPhysicalBucketName(prefix, databaseId, bucketKey);
+}
+/**
+ * Create the bucket name resolver for the bucket provisioner plugin
+ * (argument order: `(bucketKey, databaseId)`).
+ *
+ * Produces the exact same physical name as createBucketNameResolver()
+ * (`{prefix}-{bucketKey}-{databaseId}`) so the eager `provisionBucket`
+ * mutation mints the identical tenant-aware name that the lazy first-upload
+ * path would. Throws on a missing prefix — no default bucket name.
+ */
+function createProvisionerBucketNameResolver() {
+    const prefix = getBucketNamePrefix();
+    return (bucketKey, databaseId) => mintPhysicalBucketName(prefix, databaseId, bucketKey);
 }
 /**
  * Resolve CORS allowed origins from the env/config system.