ghost 6.55.0 → 6.57.0

package/core/server/services/gifts/gift.ts

@@ -1,7 +1,7 @@
 import {GIFT_EXPIRY_DAYS} from './constants';
+import type {GiftCadence, GiftData, GiftStatus} from './gift-schema';
 
-export type GiftStatus = 'purchased' | 'redeemed' | 'consumed' | 'expired' | 'refunded';
-export type GiftCadence = 'month' | 'year';
+export type {GiftCadence, GiftStatus} from './gift-schema';
 
 export type RedeemableCheckFailureReason = 'redeemed' | 'consumed' | 'expired' | 'refunded' | 'paid-member';
 export type RedeemableCheckResult =
@@ -13,43 +13,20 @@ export type ReassignableCheckResult =
     | {reassignable: true}
     | {reassignable: false; reason: ReassignableCheckFailureReason};
 
-interface GiftData {
-    token: string;
-    buyerEmail: string;
-    buyerMemberId: string | null;
-    redeemerMemberId: string | null;
-    tierId: string;
-    cadence: GiftCadence;
-    duration: number;
-    currency: string;
-    amount: number;
-    stripeCheckoutSessionId: string;
-    stripePaymentIntentId: string;
-    consumesAt: Date | null;
-    expiresAt: Date;
-    status: GiftStatus;
-    purchasedAt: Date;
-    redeemedAt: Date | null;
-    consumedAt: Date | null;
-    expiredAt: Date | null;
-    refundedAt: Date | null;
-    consumesSoonReminderSentAt: Date | null;
-}
-
-export interface GiftFromPurchaseData {
-    token: string;
-    buyerEmail: string;
-    buyerMemberId: string | null;
-    tierId: string;
-    cadence: GiftCadence;
-    duration: number;
-    currency: string;
-    amount: number;
-    stripeCheckoutSessionId: string;
-    stripePaymentIntentId: string;
-}
-
-export class Gift {
+export type GiftFromPurchaseData = Pick<GiftData,
+    | 'token'
+    | 'buyerEmail'
+    | 'buyerMemberId'
+    | 'tierId'
+    | 'cadence'
+    | 'duration'
+    | 'currency'
+    | 'amount'
+    | 'stripeCheckoutSessionId'
+    | 'stripePaymentIntentId'
+>;
+
+export class Gift implements GiftData {
     token: string;
     buyerEmail: string;
     buyerMemberId: string | null;

package/core/server/services/indexnow-ping/indexnow-ping-service.js

@@ -94,7 +94,7 @@ class IndexNowPingService {
         // publishing.
         let url = null;
         try {
-            url = this.urlService.facade.getUrlForResource({ ...post, type: 'posts' }, { absolute: true });
+            url = this.urlService.getUrlForResource({ ...post, type: 'posts' }, { absolute: true });
             if (!url || url.endsWith('/404/')) {
                 this.logging.warn({
                     event: { name: 'indexnow.unresolved_url' },

package/core/server/services/indexnow-ping/indexnow-ping-service.ts

@@ -44,9 +44,7 @@ type Labs = {
 };
 
 type UrlService = {
-    facade: {
-        getUrlForResource(resource: Record<string, unknown>, options: {absolute: boolean}): string | null;
-    };
+    getUrlForResource(resource: Record<string, unknown>, options: {absolute: boolean}): string | null;
 };
 
 type UrlUtils = {
@@ -170,7 +168,7 @@ export class IndexNowPingService {
         // publishing.
         let url: string | null = null;
         try {
-            url = this.urlService.facade.getUrlForResource({...post, type: 'posts'}, {absolute: true});
+            url = this.urlService.getUrlForResource({...post, type: 'posts'}, {absolute: true});
 
             if (!url || url.endsWith('/404/')) {
                 this.logging.warn({

package/core/server/services/lib/mailgun-client.js

@@ -85,9 +85,9 @@ module.exports = class MailgunClient {
                 messageData['v:email-id'] = message.id;
             }
 
-            const tags = ['bulk-email', 'ghost-email'];
-            if (bulkEmailConfig?.mailgun?.tag) {
-                tags.push(bulkEmailConfig.mailgun.tag);
+            const tags = ['ghost-email'];
+            if (Array.isArray(message.tags)) {
+                tags.push(...message.tags);
             }
             messageData['o:tag'] = tags;
 

package/core/server/services/link-tracking/link-click-repository.js

@@ -32,7 +32,12 @@ module.exports = class LinkClickRepository {
 
         // Memoize the findOne function
         this.memoizedFindOne = _.memoize(async (uuid, options) => {
-            return await this.#Member.findOne({uuid}, options);
+            try {
+                return await this.#Member.findOne({uuid}, options);
+            } catch (error) {
+                this.memoizedFindOne.cache.delete(uuid);
+                throw error;
+            }
         });
     }
 

package/core/server/services/link-tracking/link-click-tracking-service.js

@@ -4,6 +4,7 @@ const PostLink = require('./post-link');
 const ObjectID = require('bson-objectid').default;
 const errors = require('@tryghost/errors');
 const nql = require('@tryghost/nql');
+const {escapeNqlString} = require('@tryghost/nql-string');
 const _ = require('lodash');
 const tpl = require('@tryghost/tpl');
 const moment = require('moment');
@@ -174,7 +175,11 @@ class LinkClickTrackingService {
 
         // manages transformation of current url to relative for comparision
         const transformedOldUrl = this.#urlUtils.absoluteToTransformReady(redirectUrl.href);
-        const filterQuery = `post_id:'${postId}'+to:'${transformedOldUrl}'`;
+        // the url is re-serialised into NQL here, so it needs escaping again -
+        // quotes are legal in a URL and would otherwise break the filter.
+        // postId is String()d because nql parses an unquoted `post_id:123` to a
+        // number, and escapeNqlString operates on strings
+        const filterQuery = `post_id:${escapeNqlString(String(postId))}+to:${escapeNqlString(transformedOldUrl)}`;
 
         const updatedFilterOptions = {
             ...filterOptions,
@@ -245,13 +250,15 @@ class LinkClickTrackingService {
      * Add first-party tracking to a URL in an automation email
      * @param {Readonly<URL>} url
      * @param {string} automationActionRevisionId
+     * @param {string} automationRunStepId
      * @param {string} memberUuid
      * @return {Promise<URL>}
      */
-    async addAutomationTrackingToUrl(url, automationActionRevisionId, memberUuid) {
+    async addAutomationTrackingToUrl(url, automationActionRevisionId, automationRunStepId, memberUuid) {
         const redirect = await this.#linkRedirectService.getOrAddAutomationRedirect(automationActionRevisionId, url);
         const trackedUrl = new URL(redirect.from.href);
         trackedUrl.searchParams.set('m', memberUuid);
+        trackedUrl.searchParams.set('step', automationRunStepId);
         return trackedUrl;
     }
 
@@ -269,7 +276,8 @@ class LinkClickTrackingService {
             });
 
             const automationActionRevisionId = event.data.link.automationActionRevisionId;
-            if (!automationActionRevisionId) {
+            const automationRunStepId = event.data.url.searchParams.get('step');
+            if (!automationActionRevisionId || !automationRunStepId) {
                 await this.#linkClickRepository.save(click);
                 return;
             }
@@ -282,6 +290,7 @@ class LinkClickTrackingService {
 
                 await this.#automationsApi.trackEmailClicked({
                     automationActionRevisionId,
+                    automationRunStepId,
                     memberId,
                     clickedAt: event.timestamp
                 }, {transacting});

package/core/server/services/media-inliner/external-media-inliner.js

@@ -5,7 +5,6 @@ const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 const string = require('@tryghost/string');
 const path = require('path');
-const convert = require('heic-convert');
 
 let fileTypeFromBuffer;
 
@@ -102,20 +101,25 @@ class ExternalMediaInliner {
         }
 
         // If the file is heic or heif, attempt to convert it to jpeg
-        try {
-            if (extension === 'heic' || extension === 'heif') {
+        if (extension === 'heic' || extension === 'heif') {
+            // Lazy: pulls in libheif-js, a WASM codec costing ~50ms to load at boot.
+            // Deliberately outside the try — a missing codec is not a conversion error,
+            // and swallowing it would store an unconvertible .heic in its place.
+            const convert = require('heic-convert');
+
+            try {
                 body = await convert({
                     buffer: body,
                     format: 'JPEG'
                 });
 
                 extension = 'jpg';
+            } catch (error) {
+                logging.error(`Error converting file to JPEG: ${requestURL}`);
+                logging.error(new errors.DataImportError({
+                    err: error
+                }));
             }
-        } catch (error) {
-            logging.error(`Error converting file to JPEG: ${requestURL}`);
-            logging.error(new errors.DataImportError({
-                err: error
-            }));
         }
 
         const removeExtRegExp = new RegExp(`.${extension}`, '');

package/core/server/services/member-attribution/url-translator.js

@@ -1,9 +1,7 @@
 /**
  * @typedef {Object} UrlService
- * @prop {{
- *   getUrlForResource: (resource: Object, options: Object) => string,
- *   resolveUrl: (path: string) => Promise<Object | null>
- * }} facade
+ * @prop {(resource: Object, options: Object) => string} getUrlForResource
+ * @prop {(path: string) => Promise<Object | null>} resolveUrl
  */
 
 const {toPlain} = require('../../lib/common/to-plain');
@@ -106,7 +104,7 @@ class UrlTranslator {
         // surface as an error.
         let resource;
         try {
-            resource = await this.urlService.facade.resolveUrl(path);
+            resource = await this.urlService.resolveUrl(path);
         } catch (err) {
             return;
         }
@@ -155,10 +153,10 @@ class UrlTranslator {
         }
         // Lazy URL service evaluates permalink templates against resource fields
         // (slug, published_at, primary_tag, ...). Caller already loaded the model,
-        // so spread its plain data so those fields reach the facade.
+        // so spread its plain data so those fields reach the URL service.
         const data = toPlain(model);
         const resource = {...data, id, type: TYPE_TO_RESOURCE[type]};
-        return this.urlService.facade.getUrlForResource(resource, {absolute});
+        return this.urlService.getUrlForResource(resource, {absolute});
     }
 
     async getResourceById(id, type) {

package/core/server/services/member-welcome-emails/member-welcome-email-renderer.js

@@ -119,9 +119,10 @@ class MemberWelcomeEmailRenderer {
      * @param {string} [options.unsubscribeUrl] - When set, the footer shows an "Unsubscribe from these emails" link instead of "Manage your preferences"
      * @param {boolean} [options.trackClicks]
      * @param {string | null} [options.automationActionRevisionId]
+     * @param {string | null} [options.automationRunStepId]
      * @returns {Promise<{html: string, text: string, subject: string}>}
      */
-    async render({lexical, subject, designSettings, member, siteSettings, unsubscribeUrl, trackClicks = false, automationActionRevisionId = null}) {
+    async render({lexical, subject, designSettings, member, siteSettings, unsubscribeUrl, trackClicks = false, automationActionRevisionId = null, automationRunStepId = null}) {
         designSettings = designSettings || {};
 
         const design = emailDesign.getEmailDesign({
@@ -171,9 +172,9 @@ class MemberWelcomeEmailRenderer {
                 return originalPath;
             }
             const isTrackable = ['http:', 'https:'].includes(url.protocol);
-            if (trackClicks && automationActionRevisionId && member.uuid && isTrackable) {
+            if (trackClicks && automationActionRevisionId && automationRunStepId && member.uuid && isTrackable) {
                 await linkTracking.init();
-                return await linkTracking.service.addAutomationTrackingToUrl(url, automationActionRevisionId, member.uuid);
+                return await linkTracking.service.addAutomationTrackingToUrl(url, automationActionRevisionId, automationRunStepId, member.uuid);
             }
             return url;
         }, {base: siteSettings.url});

package/core/server/services/member-welcome-emails/service.js

@@ -9,6 +9,8 @@ const emailAddressService = require('../email-address');
 const settingsHelpers = require('../settings-helpers');
 const EmailAddressParser = require('../email-address/email-address-parser');
 const mail = require('../mail');
+const MailgunClient = require('../lib/mailgun-client');
+const config = require('../../../shared/config');
 const labs = require('../../../shared/labs');
 const {Automation, EmailDesignSetting, Newsletter} = require('../../models');
 const MemberWelcomeEmailRenderer = require('./member-welcome-email-renderer');
@@ -46,7 +48,8 @@ const getSenderDetails = (designSettingsJson) => {
 };
 
 class MemberWelcomeEmailService {
-    #mailer;
+    #transactionalMailer;
+    #bulkMailer;
     #renderer;
     #magicLinkService;
     #memberWelcomeEmails = {free: null, paid: null};
@@ -54,7 +57,8 @@ class MemberWelcomeEmailService {
 
     constructor({t, dir, singleUseTokenProvider}) {
         emailAddressService.init();
-        this.#mailer = new mail.GhostMailer();
+        this.#transactionalMailer = new mail.GhostMailer();
+        this.#bulkMailer = new MailgunClient({config, settings: settingsCache});
         this.#renderer = new MemberWelcomeEmailRenderer({t, dir});
 
         const getSigninURL = (token) => {
@@ -306,7 +310,7 @@ class MemberWelcomeEmailService {
                     logging.warn(message.text);
                 }
 
-                return this.#mailer.send({
+                return this.#transactionalMailer.send({
                     from: fromEmail,
                     subject: 'Verify email address',
                     forceTextContent: true,
@@ -370,10 +374,11 @@ class MemberWelcomeEmailService {
      * @param {boolean} [options.trackOpens]
      * @param {boolean} [options.trackClicks]
      * @param {string | null} [options.automationActionRevisionId]
+     * @param {string | null} [options.automationRunStepId]
      * @param {null | {url: string, oneClickUrl: string}} [options.unsubscribe] - When set, the footer links to an unsubscribe URL and the email carries one-click List-Unsubscribe headers
      * @returns {Promise<unknown>}
      */
-    async #sendEmail({member, memberStatus, email, emailType, trackOpens, trackClicks = false, automationActionRevisionId = null, unsubscribe = null}) {
+    async #sendEmail({member, memberStatus, email, emailType, trackOpens, trackClicks = false, automationActionRevisionId = null, automationRunStepId = null, unsubscribe = null}) {
         if (!member.email) {
             throw new errors.IncorrectUsageError({
                 message: MESSAGES.MISSING_RECIPIENT_EMAIL
@@ -400,25 +405,24 @@ class MemberWelcomeEmailService {
             siteSettings: this.#getSiteSettings(),
             unsubscribeUrl: unsubscribe?.url,
             trackClicks,
-            automationActionRevisionId
+            automationActionRevisionId,
+            automationRunStepId
         });
 
         const senderOptions = await this.#getEffectiveSenderOptions(
             getSenderDetails(email.designSettings)
         );
 
-        const headers = unsubscribe?.oneClickUrl ? {
-            'List-Unsubscribe': `<${unsubscribe.oneClickUrl}>`,
-            'List-Unsubscribe-Post': 'List-Unsubscribe=One-Click'
-        } : undefined;
-
         /** @type {string[]} */ let tags;
+        let sendEmail;
         switch (emailType) {
         case 'welcome':
             tags = [MEMBER_WELCOME_EMAIL_TAG];
+            sendEmail = this.#sendTransactionalEmail.bind(this);
             break;
         case 'automation':
             tags = [AUTOMATION_EMAIL_TAG];
+            sendEmail = this.#sendBulkEmail.bind(this);
             break;
         default: {
             /** @type {never} */ const _exhaustive = emailType;
@@ -428,19 +432,78 @@ class MemberWelcomeEmailService {
         }
         }
 
-        return await this.#mailer.send({
+        return await sendEmail({
             to: member.email,
             subject,
             html,
             text,
+            tags,
+            trackOpens,
+            listUnsubscribe: unsubscribe?.oneClickUrl,
+            ...senderOptions
+        });
+    }
+
+    /**
+     * @param {object} options
+     * @param {string} options.to
+     * @param {string} options.subject
+     * @param {string} options.html
+     * @param {string} options.text
+     * @param {string} options.from
+     * @param {string} [options.replyTo]
+     * @param {string[]} [options.tags]
+     * @param {boolean} [options.trackOpens]
+     * @param {string} [options.listUnsubscribe]
+     * @returns {Promise<unknown>}
+     */
+    async #sendTransactionalEmail({to, subject, html, text, from, replyTo, tags, trackOpens, listUnsubscribe}) {
+        const headers = listUnsubscribe ? {
+            'List-Unsubscribe': `<${listUnsubscribe}>`,
+            'List-Unsubscribe-Post': 'List-Unsubscribe=One-Click'
+        } : undefined;
+
+        return await this.#transactionalMailer.send({
+            to,
+            subject,
+            html,
+            text,
             forceTextContent: true,
             tags,
             ...(headers ? {headers} : {}),
             ...(typeof trackOpens === 'boolean' ? {trackOpens} : {}),
-            ...senderOptions
+            from,
+            replyTo
         });
     }
 
+    /**
+     * @param {object} options
+     * @param {string} options.to
+     * @param {string} options.subject
+     * @param {string} options.html
+     * @param {string} options.text
+     * @param {string} options.from
+     * @param {string} [options.replyTo]
+     * @param {string[]} [options.tags]
+     * @param {boolean} [options.trackOpens]
+     * @param {string} [options.listUnsubscribe]
+     * @returns {Promise<unknown>}
+     */
+    async #sendBulkEmail({to, subject, html, text, from, replyTo, tags, trackOpens, listUnsubscribe}) {
+        return await this.#bulkMailer.send({
+            subject,
+            html,
+            plaintext: text,
+            from,
+            replyTo,
+            tags,
+            ...(typeof trackOpens === 'boolean' ? {track_opens: trackOpens} : {})
+        }, {
+            [to]: listUnsubscribe ? {list_unsubscribe: listUnsubscribe} : {}
+        }, []);
+    }
+
     async send({member, memberStatus}) {
         const email = this.#memberWelcomeEmails[memberStatus];
 
@@ -480,9 +543,10 @@ class MemberWelcomeEmailService {
      * @param {boolean} options.trackOpens
      * @param {boolean} options.trackClicks
      * @param {string} options.automationActionRevisionId
+     * @param {string} options.automationRunStepId
      * @returns {Promise<unknown>}
      */
-    async sendAutomationEmail({email, member, memberStatus, trackOpens, trackClicks, automationActionRevisionId}) {
+    async sendAutomationEmail({email, member, memberStatus, trackOpens, trackClicks, automationActionRevisionId, automationRunStepId}) {
         const designSettings = email.designSettingId ?
             await EmailDesignSetting.findOne({id: email.designSettingId}) :
             null;
@@ -510,6 +574,7 @@ class MemberWelcomeEmailService {
             trackOpens,
             trackClicks,
             automationActionRevisionId,
+            automationRunStepId,
             unsubscribe
         });
     }
@@ -647,12 +712,11 @@ class MemberWelcomeEmailService {
             getSenderDetails(designSettingsJson)
         );
 
-        await this.#mailer.send({
+        await this.#sendTransactionalEmail({
             to: email,
             subject: `[Test] ${renderedSubject}`,
             html,
             text,
-            forceTextContent: true,
             ...senderOptions
         });
     }

package/core/server/services/members/api.js

@@ -54,7 +54,7 @@ function trimLeadingWhitespace(strings, ...values) {
 
 function createApiInstance(config) {
     const membersApiInstance = MembersApi({
-        urlService: urlService.facade,
+        urlService,
         tokenConfig: config.getTokenConfig(),
         auth: {
             getSigninURL: config.getSigninURL.bind(config),
@@ -244,8 +244,7 @@ function createApiInstance(config) {
             EmailSpamComplaintEvent: models.EmailSpamComplaintEvent,
             Automation: models.Automation,
             WelcomeEmailAutomationRun: models.WelcomeEmailAutomationRun,
-            AutomatedEmailRecipient: models.AutomatedEmailRecipient,
-            Gift: models.Gift
+            AutomatedEmailRecipient: models.AutomatedEmailRecipient
         },
         stripeAPIService: stripeService.api,
         tiersService: tiersService,

package/core/server/services/members/import-export/import/completion-email.js

@@ -6,14 +6,18 @@ const csv_2 = require("@tryghost/custom-field-types/csv");
 const emailTemplate = require('./email-template');
 // Turn an ORM validation error into copy a member manager can act on. Presentation
 // only: the API response keeps the raw messages, and just the emailed report is
-// rewritten.
-function humaniseError(message) {
+// rewritten. Takes one reason at a time, so a rewrite matching to the end of its input
+// cannot consume the reason after it.
+function humaniseReason(message) {
     return message
         .replace('Value in [members.email] cannot be blank.', 'Missing email address')
         .replace('Value in [members.note] exceeds maximum length of 2000 characters.', '"Note" exceeds maximum length of 2000 characters')
         .replace('Value in [members.subscribed] must be one of true, false, 0 or 1.', 'Value in "Subscribed to emails" must be "true" or "false"')
         .replace('Validation (isEmail) failed for email', 'Invalid email address')
-        .replace(/No such customer:[^,]*/, 'Could not find Stripe customer');
+        .replace(/No such customer:[\s\S]*/, 'Could not find Stripe customer');
+}
+function humaniseError(row) {
+    return row.errors.map(humaniseReason).join('\n');
 }
 function stringifyLabels(labels) {
     return labels.map(label => (typeof label === 'string' ? label : label.name)).join(',');
@@ -40,7 +44,7 @@ function toErrorReportRow(row) {
         labels: stringifyLabels(row.labels),
         tiers: '',
         gift_id: row.gift_id || null,
-        error: humaniseError(row.error)
+        error: humaniseError(row)
     };
 }
 // The error report attached to the completion email: the failed rows as CSV. It shares

package/core/server/services/members/import-export/import/completion-email.ts

@@ -34,14 +34,19 @@ interface EmailPayload {
 
 // Turn an ORM validation error into copy a member manager can act on. Presentation
 // only: the API response keeps the raw messages, and just the emailed report is
-// rewritten.
-function humaniseError(message: string): string {
+// rewritten. Takes one reason at a time, so a rewrite matching to the end of its input
+// cannot consume the reason after it.
+function humaniseReason(message: string): string {
     return message
         .replace('Value in [members.email] cannot be blank.', 'Missing email address')
         .replace('Value in [members.note] exceeds maximum length of 2000 characters.', '"Note" exceeds maximum length of 2000 characters')
         .replace('Value in [members.subscribed] must be one of true, false, 0 or 1.', 'Value in "Subscribed to emails" must be "true" or "false"')
         .replace('Validation (isEmail) failed for email', 'Invalid email address')
-        .replace(/No such customer:[^,]*/, 'Could not find Stripe customer');
+        .replace(/No such customer:[\s\S]*/, 'Could not find Stripe customer');
+}
+
+function humaniseError(row: ImportErrorRow): string {
+    return row.errors.map(humaniseReason).join('\n');
 }
 
 // One row of the fixed, member-vocabulary part of the error report, in emit order.
@@ -93,7 +98,7 @@ function toErrorReportRow(row: ImportErrorRow): ErrorReportRow {
         labels: stringifyLabels(row.labels),
         tiers: '',
         gift_id: row.gift_id || null,
-        error: humaniseError(row.error)
+        error: humaniseError(row)
     };
 }
 

package/core/server/services/members/import-export/import/importer.js

@@ -165,7 +165,7 @@ class MembersCSVImporter {
                 // before any member write -- so there is no reason to hold a transaction
                 // across it, and doing so would deadlock the single-connection SQLite pool.
                 const customFieldPlan = activeCustomFields.length > 0
-                    ? await this._customFields.planWrite((0, csv_2.fieldValuesFromCsvRow)(activeCustomFields, row, csv_1.stripFormulaGuard))
+                    ? await namingTheColumn(() => this._customFields.planWrite((0, csv_2.fieldValuesFromCsvRow)(activeCustomFields, row, csv_1.stripFormulaGuard)))
                     : [];
                 trx = await this._knex.transaction(undefined, { doNotRejectOnRollback: false });
                 const options = { transacting: trx, context: IMPORT_CONTEXT };
@@ -265,15 +265,16 @@ class MembersCSVImporter {
             }
             catch (error) {
                 const errorList = Array.isArray(error) ? error : [error];
-                const errorMessage = errorList
+                const reasons = errorList
                     .map(e => (typeof e === 'object' && e !== null && 'message' in e ? e.message : undefined))
-                    .join(', ');
+                    .filter((message) => typeof message === 'string');
+                const errorMessage = reasons.join('\n');
                 // trx is unset if the row failed before the transaction opened (a bad
                 // custom field value or gift combination).
                 if (trx) {
                     await trx.rollback();
                 }
-                importErrors.push({ ...row, error: errorMessage });
+                importErrors.push({ ...row, error: errorMessage, errors: reasons });
             }
         }
         await Promise.all(archivableStripePriceIds.map(id => this._stripe.archivePrice(id)));
@@ -287,6 +288,26 @@ class MembersCSVImporter {
         return { imported: 0, errors: importErrors };
     }
 }
+// A row error is read next to a spreadsheet, and a value rejection states only what the
+// value should be — the same sentence Admin shows under a single input, where the field is
+// already on screen. `property` is the dotted path a default export writes as its column
+// header, so prefixing with it names the column a publisher has to go and fix.
+//
+// A rejection about the whole request carries the bare namespace and names no field after
+// it, so it is left alone rather than made to point at a column that does not exist.
+async function namingTheColumn(plan) {
+    try {
+        return await plan();
+    }
+    catch (error) {
+        const { property, message } = (error ?? {});
+        const namesAField = typeof property === 'string' && property.includes('.');
+        if (!namesAField || typeof message !== 'string') {
+            throw error;
+        }
+        throw new errors.DataImportError({ message: `${property}: ${message}` });
+    }
+}
 function wrapGiftError(error) {
     const err = error;
     const message = (err && typeof err.message === 'string' && err.message) || tpl(messages.giftReassignFailed);