ghost 6.54.1 → 6.56.0

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

@@ -368,10 +368,13 @@ class MemberWelcomeEmailService {
      * @param {null | object} options.email.designSettings
      * @param {'welcome' | 'automation'} options.emailType
      * @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, 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
@@ -396,7 +399,10 @@ class MemberWelcomeEmailService {
                 uuid: member.uuid
             },
             siteSettings: this.#getSiteSettings(),
-            unsubscribeUrl: unsubscribe?.url
+            unsubscribeUrl: unsubscribe?.url,
+            trackClicks,
+            automationActionRevisionId,
+            automationRunStepId
         });
 
         const senderOptions = await this.#getEffectiveSenderOptions(
@@ -474,9 +480,12 @@ class MemberWelcomeEmailService {
      * @param {string} options.member.uuid
      * @param {'free' | 'paid'} options.memberStatus
      * @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}) {
+    async sendAutomationEmail({email, member, memberStatus, trackOpens, trackClicks, automationActionRevisionId, automationRunStepId}) {
         const designSettings = email.designSettingId ?
             await EmailDesignSetting.findOne({id: email.designSettingId}) :
             null;
@@ -502,6 +511,9 @@ class MemberWelcomeEmailService {
                 designSettings: designSettingsJson
             },
             trackOpens,
+            trackClicks,
+            automationActionRevisionId,
+            automationRunStepId,
             unsubscribe
         });
     }

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

@@ -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/csv/formula.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripFormulaGuard = stripFormulaGuard;
+// The export writes with papaparse's escapeFormulae on (see serialize), which prefixes a
+// cell starting with one of these with an apostrophe so a spreadsheet won't read it as a
+// formula: `=SUM(A1)` is written as `'=SUM(A1)`.
+const FORMULA_TRIGGERS = ['=', '+', '-', '@', '\t', '\r'];
+// Strip that guard back off, so a re-imported value doesn't gain an apostrophe on every
+// round trip. Only a lone apostrophe before a trigger is the guard; one before anything
+// else is a character the value actually starts with, and is left alone.
+function stripFormulaGuard(cell) {
+    if (cell.charAt(0) === '\'' && FORMULA_TRIGGERS.includes(cell.charAt(1))) {
+        return cell.slice(1);
+    }
+    return cell;
+}

package/core/server/services/members/import-export/csv/formula.ts

@@ -0,0 +1,14 @@
+// The export writes with papaparse's escapeFormulae on (see serialize), which prefixes a
+// cell starting with one of these with an apostrophe so a spreadsheet won't read it as a
+// formula: `=SUM(A1)` is written as `'=SUM(A1)`.
+const FORMULA_TRIGGERS = ['=', '+', '-', '@', '\t', '\r'];
+
+// Strip that guard back off, so a re-imported value doesn't gain an apostrophe on every
+// round trip. Only a lone apostrophe before a trigger is the guard; one before anything
+// else is a character the value actually starts with, and is left alone.
+export function stripFormulaGuard(cell: string): string {
+    if (cell.charAt(0) === '\'' && FORMULA_TRIGGERS.includes(cell.charAt(1))) {
+        return cell.slice(1);
+    }
+    return cell;
+}

package/core/server/services/members/import-export/csv/index.js

@@ -3,8 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serialize = exports.parse = void 0;
+exports.stripFormulaGuard = exports.serialize = exports.parse = void 0;
 var parse_1 = require("./parse");
 Object.defineProperty(exports, "parse", { enumerable: true, get: function () { return __importDefault(parse_1).default; } });
 var serialize_1 = require("./serialize");
 Object.defineProperty(exports, "serialize", { enumerable: true, get: function () { return __importDefault(serialize_1).default; } });
+var formula_1 = require("./formula");
+Object.defineProperty(exports, "stripFormulaGuard", { enumerable: true, get: function () { return formula_1.stripFormulaGuard; } });

package/core/server/services/members/import-export/csv/index.ts

@@ -1,2 +1,3 @@
 export {default as parse, type Row} from './parse';
 export {default as serialize} from './serialize';
+export {stripFormulaGuard} from './formula';

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = buildCompletionEmail;
 const csv_1 = require("../csv");
+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
@@ -17,6 +18,14 @@ function humaniseError(message) {
 function stringifyLabels(labels) {
     return labels.map(label => (typeof label === 'string' ? label : label.name)).join(',');
 }
+// The custom_fields.* cells a submitted row carried, echoed untouched so a manager can
+// fix a failed row and re-upload the values they mapped.
+function customFieldCells(row) {
+    return Object.fromEntries(Object.entries(row).filter(([column]) => (0, csv_2.isCustomFieldColumn)(column)));
+}
+// Shape a failed import row into its fixed error-report cells, with the raw ORM message
+// rewritten into copy the member manager can act on. Custom field cells are merged on by
+// buildErrorReport, which owns the dynamic column set.
 function toErrorReportRow(row) {
     return {
         id: row.id,
@@ -34,10 +43,20 @@ function toErrorReportRow(row) {
         error: humaniseError(row.error)
     };
 }
-// The error report attached to the completion email: the failed rows as CSV. No column
-// list is passed -- the typed ErrorReportRow defines the columns.
+// The error report attached to the completion email: the failed rows as CSV. It shares
+// the serialiser with the export but not the shaping -- the export writes db members,
+// this echoes submitted rows. Member columns come from the shaper's keys (so the type
+// stays the single source); the custom_fields.* columns across the rows are threaded in
+// before the last error column, and each row's custom cells merged on.
 function buildErrorReport(errors) {
-    return (0, csv_1.serialize)(errors.map(toErrorReportRow));
+    if (errors.length === 0) {
+        return (0, csv_1.serialize)([]);
+    }
+    const memberColumns = Object.keys(toErrorReportRow(errors[0])).filter(column => column !== 'error');
+    const customColumns = [...new Set(errors.flatMap(row => Object.keys(customFieldCells(row))))];
+    const columns = [...memberColumns, ...customColumns, 'error'];
+    const rows = errors.map(row => ({ ...toErrorReportRow(row), ...customFieldCells(row) }));
+    return (0, csv_1.serialize)(rows, { columns });
 }
 // Compose the completion email for a finished import: the summary and its links,
 // plus the attached error report. Owns how the outcome is presented, so the

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

@@ -1,4 +1,5 @@
 import {serialize} from '../csv';
+import {isCustomFieldColumn} from '@tryghost/custom-field-types/csv';
 import type {MemberImportRow, ImportErrorRow, ImportLabel, Label} from './row';
 
 const emailTemplate = require('./email-template');
@@ -43,10 +44,12 @@ function humaniseError(message: string): string {
         .replace(/No such customer:[^,]*/, 'Could not find Stripe customer');
 }
 
-// One row of the attached error report, in emit order. papaparse takes the columns from
-// these keys, so the report cannot drift from the shaper -- a new column must be added
-// here or the shaper stops compiling. tiers and deleted_at are export-vocabulary columns
-// an import never fills; kept always-empty so the report matches the members export CSV.
+// One row of the fixed, member-vocabulary part of the error report, in emit order.
+// papaparse takes the fixed columns from these keys, so the report cannot drift from the
+// shaper -- a new member column must be added here or the shaper stops compiling. tiers
+// and deleted_at are export-vocabulary columns an import never fills; kept always-empty
+// so the report matches the members export CSV. Any custom_fields.* columns a submitted
+// row carried are dynamic, so they are threaded in separately by buildErrorReport.
 type ErrorReportRow = {
     id: MemberImportRow['id'];
     email: MemberImportRow['email'];
@@ -67,6 +70,15 @@ function stringifyLabels(labels: Array<string | Label>): string {
     return labels.map(label => (typeof label === 'string' ? label : label.name)).join(',');
 }
 
+// The custom_fields.* cells a submitted row carried, echoed untouched so a manager can
+// fix a failed row and re-upload the values they mapped.
+function customFieldCells(row: ImportErrorRow): Record<string, unknown> {
+    return Object.fromEntries(Object.entries(row).filter(([column]) => isCustomFieldColumn(column)));
+}
+
+// Shape a failed import row into its fixed error-report cells, with the raw ORM message
+// rewritten into copy the member manager can act on. Custom field cells are merged on by
+// buildErrorReport, which owns the dynamic column set.
 function toErrorReportRow(row: ImportErrorRow): ErrorReportRow {
     return {
         id: row.id,
@@ -85,10 +97,20 @@ function toErrorReportRow(row: ImportErrorRow): ErrorReportRow {
     };
 }
 
-// The error report attached to the completion email: the failed rows as CSV. No column
-// list is passed -- the typed ErrorReportRow defines the columns.
+// The error report attached to the completion email: the failed rows as CSV. It shares
+// the serialiser with the export but not the shaping -- the export writes db members,
+// this echoes submitted rows. Member columns come from the shaper's keys (so the type
+// stays the single source); the custom_fields.* columns across the rows are threaded in
+// before the last error column, and each row's custom cells merged on.
 function buildErrorReport(errors: ImportErrorRow[]): string {
-    return serialize(errors.map(toErrorReportRow));
+    if (errors.length === 0) {
+        return serialize([]);
+    }
+    const memberColumns = Object.keys(toErrorReportRow(errors[0])).filter(column => column !== 'error');
+    const customColumns = [...new Set(errors.flatMap(row => Object.keys(customFieldCells(row))))];
+    const columns = [...memberColumns, ...customColumns, 'error'];
+    const rows = errors.map(row => ({...toErrorReportRow(row), ...customFieldCells(row)}));
+    return serialize(rows, {columns});
 }
 
 // Compose the completion email for a finished import: the summary and its links,

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

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
 const completion_email_1 = __importDefault(require("./completion-email"));
+const csv_1 = require("../csv");
+const csv_2 = require("@tryghost/custom-field-types/csv");
 const metrics = require('@tryghost/metrics');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
@@ -47,11 +49,12 @@ class MembersCSVImporter {
     _tiers;
     _stripe;
     _gifts;
+    _customFields;
     _email;
     _addJob;
     _getTimezone;
     _getInlineThreshold;
-    constructor({ knex, readRows, spool, members, tiers, stripe, gifts, email, addJob, getTimezone, getInlineThreshold }) {
+    constructor({ knex, readRows, spool, members, tiers, stripe, gifts, customFields, email, addJob, getTimezone, getInlineThreshold }) {
         this._knex = knex;
         this._readRows = readRows;
         this._spool = spool;
@@ -59,6 +62,7 @@ class MembersCSVImporter {
         this._tiers = tiers;
         this._stripe = stripe;
         this._gifts = gifts;
+        this._customFields = customFields;
         this._email = email;
         this._addJob = addJob;
         this._getTimezone = getTimezone;
@@ -132,6 +136,9 @@ class MembersCSVImporter {
         const globalLabels = [importLabel, ...extraLabels];
         const performStart = Date.now();
         const defaultTier = await this._tiers.getDefault();
+        // The field set a custom_fields.* column is read against; empty when the feature
+        // is off, so a carried-through column is dropped and the write boundary stays shut.
+        const activeCustomFields = await this._customFields.activeFields();
         const tierIdCache = new Map();
         const archivableStripePriceIds = [];
         // Copied per row: the member model stamps ids and trims names onto these in
@@ -143,8 +150,7 @@ class MembersCSVImporter {
         let imported = 0;
         const importErrors = [];
         for (const row of rows) {
-            const trx = await this._knex.transaction(undefined, { doNotRejectOnRollback: false });
-            const options = { transacting: trx, context: IMPORT_CONTEXT };
+            let trx;
             try {
                 if (row.gift_id) {
                     if (row.import_tier) {
@@ -154,6 +160,15 @@ class MembersCSVImporter {
                         throw wrapGiftError(new errors.DataImportError({ message: tpl(messages.giftCannotCombineWithComplimentary) }));
                     }
                 }
+                // Validate the row's custom field values before the transaction opens.
+                // planWrite only reads, and it throws on an invalid value to fail the row
+                // 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))
+                    : [];
+                trx = await this._knex.transaction(undefined, { doNotRejectOnRollback: false });
+                const options = { transacting: trx, context: IMPORT_CONTEXT };
                 const createdAt = (row.created_at && (0, moment_timezone_1.default)(row.created_at).isAfter((0, moment_timezone_1.default)())) ? (0, moment_timezone_1.default)().toDate() : row.created_at;
                 const memberValues = {
                     email: row.email,
@@ -243,6 +258,8 @@ class MembersCSVImporter {
                         throw wrapGiftError(giftError);
                     }
                 }
+                // On the row's transaction, so the values commit or roll back with the member.
+                await this._customFields.applyWrite(member.id, customFieldPlan, trx);
                 await trx.commit();
                 imported += 1;
             }
@@ -251,7 +268,11 @@ class MembersCSVImporter {
                 const errorMessage = errorList
                     .map(e => (typeof e === 'object' && e !== null && 'message' in e ? e.message : undefined))
                     .join(', ');
-                await trx.rollback();
+                // 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 });
             }
         }

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

@@ -1,5 +1,7 @@
 import moment from 'moment-timezone';
 import buildCompletionEmail from './completion-email';
+import {stripFormulaGuard} from '../csv';
+import {fieldValuesFromCsvRow, type CsvField} from '@tryghost/custom-field-types/csv';
 import type {Knex} from 'knex';
 import type {MemberImportRow, ImportErrorRow, ImportLabel, Label} from './row';
 import type {RowSpool, SpooledRows} from './spool';
@@ -80,7 +82,7 @@ interface StripeSubscriptions {
 
 // Gifts: reassigning a redeemed gift to the imported member.
 export interface GiftService {
-    reassignRedeemer(giftId: string, memberId: string, options: object): Promise<void>;
+    reassignRedeemer(giftId: string, memberId: string, options: {transacting?: Knex.Transaction}): Promise<void>;
 }
 
 // The completion email concern: who it goes to, the links it carries, and sending
@@ -91,6 +93,20 @@ export interface EmailNotifications {
     urlFor(type: string, data: unknown, absolute: boolean): string;
 }
 
+// Opaque to the import: planWrite produces it, applyWrite consumes it.
+type CustomFieldPlan = unknown;
+
+// The custom fields collaborator as the import needs it. activeFields is the field set a
+// custom_fields.* column is read against, empty when the feature is off; planWrite
+// validates a row's values (throwing so the row fails whole) and applyWrite persists
+// them, merging a composite's sub-fields into whatever is already stored, both on the
+// row's transaction.
+export interface CustomFieldsImport {
+    activeFields(): Promise<CsvField[]>;
+    planWrite(values: Record<string, unknown>): Promise<CustomFieldPlan[]>;
+    applyWrite(memberId: string, plan: CustomFieldPlan[], executor: Knex): Promise<void>;
+}
+
 // The collaborators the import depends on, one per concern.
 interface ImporterDeps {
     knex: Knex;
@@ -100,6 +116,7 @@ interface ImporterDeps {
     tiers: TiersRepository;
     stripe: StripeSubscriptions;
     gifts: GiftService;
+    customFields: CustomFieldsImport;
     email: EmailNotifications;
     addJob: (job: {job: () => Promise<void>; offloaded: boolean; name: string}) => void;
     getTimezone: () => string;
@@ -183,12 +200,13 @@ class MembersCSVImporter {
     private _tiers: TiersRepository;
     private _stripe: StripeSubscriptions;
     private _gifts: GiftService;
+    private _customFields: CustomFieldsImport;
     private _email: EmailNotifications;
     private _addJob: (job: {job: () => Promise<void>; offloaded: boolean; name: string}) => void;
     private _getTimezone: () => string;
     private _getInlineThreshold: () => number;
 
-    constructor({knex, readRows, spool, members, tiers, stripe, gifts, email, addJob, getTimezone, getInlineThreshold}: ImporterDeps) {
+    constructor({knex, readRows, spool, members, tiers, stripe, gifts, customFields, email, addJob, getTimezone, getInlineThreshold}: ImporterDeps) {
         this._knex = knex;
         this._readRows = readRows;
         this._spool = spool;
@@ -196,6 +214,7 @@ class MembersCSVImporter {
         this._tiers = tiers;
         this._stripe = stripe;
         this._gifts = gifts;
+        this._customFields = customFields;
         this._email = email;
         this._addJob = addJob;
         this._getTimezone = getTimezone;
@@ -283,6 +302,9 @@ class MembersCSVImporter {
         const globalLabels: Label[] = [importLabel, ...extraLabels];
         const performStart = Date.now();
         const defaultTier = await this._tiers.getDefault();
+        // The field set a custom_fields.* column is read against; empty when the feature
+        // is off, so a carried-through column is dropped and the write boundary stays shut.
+        const activeCustomFields = await this._customFields.activeFields();
         const tierIdCache = new Map();
         const archivableStripePriceIds: string[] = [];
         // Copied per row: the member model stamps ids and trims names onto these in
@@ -295,8 +317,7 @@ class MembersCSVImporter {
         let imported = 0;
         const importErrors: ImportErrorRow[] = [];
         for (const row of rows) {
-            const trx = await this._knex.transaction(undefined, {doNotRejectOnRollback: false});
-            const options = {transacting: trx, context: IMPORT_CONTEXT};
+            let trx: Knex.Transaction | undefined;
             try {
                 if (row.gift_id) {
                     if (row.import_tier) {
@@ -307,6 +328,17 @@ class MembersCSVImporter {
                     }
                 }
 
+                // Validate the row's custom field values before the transaction opens.
+                // planWrite only reads, and it throws on an invalid value to fail the row
+                // 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(fieldValuesFromCsvRow(activeCustomFields, row, stripFormulaGuard))
+                    : [];
+
+                trx = await this._knex.transaction(undefined, {doNotRejectOnRollback: false});
+                const options = {transacting: trx, context: IMPORT_CONTEXT};
+
                 const createdAt = (row.created_at && moment(row.created_at).isAfter(moment())) ? moment().toDate() : row.created_at;
                 const memberValues: MemberImportValues = {
                     email: row.email,
@@ -394,6 +426,9 @@ class MembersCSVImporter {
                     }
                 }
 
+                // On the row's transaction, so the values commit or roll back with the member.
+                await this._customFields.applyWrite(member.id, customFieldPlan, trx);
+
                 await trx.commit();
                 imported += 1;
             } catch (error) {
@@ -401,7 +436,11 @@ class MembersCSVImporter {
                 const errorMessage = errorList
                     .map(e => (typeof e === 'object' && e !== null && 'message' in e ? e.message : undefined))
                     .join(', ');
-                await trx.rollback();
+                // 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});
             }
         }

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

@@ -40,7 +40,23 @@ function makeImporter(deps) {
     // Gifts is initialised at boot and always present at request time; the getter
     // resolves it lazily so the ready service is picked up whenever a row uses it.
     const gifts = {
-        reassignRedeemer: (giftId, memberId, options) => deps.getGiftService().reassignRedeemer(giftId, memberId, options)
+        reassignRedeemer: (giftId, memberId, options) => deps.getGiftService().reassignRedeemer({
+            giftId,
+            memberId,
+            transacting: options.transacting
+        })
+    };
+    // Gated by the same labs flag as the export, so the two halves round-trip or stay
+    // silent together: off, activeFields resolves empty and every custom_fields.* column
+    // is dropped.
+    const customFields = {
+        activeFields: async () => (labs.isSet('membersCustomFields') ? deps.customFields.definitions.browse() : []),
+        planWrite: values => deps.customFields.values.planWrite(values),
+        // mergeComposites: a sub-field is a field, so a row writes the sub-fields it fills
+        // and leaves the rest alone, the same rule a blank `name` column follows. Without
+        // it a file naming one address column would replace the whole address, clearing
+        // five sub-fields it never mentioned.
+        applyWrite: (memberId, plan, executor) => deps.customFields.values.applyWrite(memberId, plan, executor, { mergeComposites: true })
     };
     return new importer_1.default({
         knex: deps.knex,
@@ -56,6 +72,7 @@ function makeImporter(deps) {
             productRepository: deps.productRepository
         }),
         gifts,
+        customFields,
         email,
         addJob: deps.addJob,
         getTimezone: deps.getTimezone,

package/core/server/services/members/import-export/index.ts

@@ -1,5 +1,6 @@
 import type {Knex} from 'knex';
-import MembersCSVImporter, {type MembersRepository, type GiftService, type EmailNotifications, type Tier} from './import/importer';
+import type {CsvField} from '@tryghost/custom-field-types/csv';
+import MembersCSVImporter, {type MembersRepository, type GiftService, type EmailNotifications, type Tier, type CustomFieldsImport} from './import/importer';
 import readMemberRows from './import/reader';
 import {createRowSpool} from './import/spool';
 import MembersCSVExporter, {type ExportOptions, type CustomFieldDefinition} from './export/exporter';
@@ -17,7 +18,9 @@ interface ImporterServices {
     getMembersRepository(): Promise<Omit<MembersRepository, 'getImportLabel'>>;
     getDefaultTier(): Promise<Tier>;
     getTierByName(name: string): Promise<Tier | null>;
-    getGiftService(): GiftService;
+    getGiftService(): {
+        reassignRedeemer(input: {giftId: string; memberId: string; transacting?: Knex.Transaction}): Promise<void>;
+    };
     sendEmail: EmailNotifications['send'];
     urlFor: EmailNotifications['urlFor'];
     addJob(job: {job: () => Promise<void>; offloaded: boolean; name: string}): void;
@@ -25,6 +28,14 @@ interface ImporterServices {
     getInlineThreshold(): number;
     stripeAPIService: unknown;
     productRepository: unknown;
+    // The custom fields services the members service hands the import composition root.
+    customFields: {
+        definitions: {browse(): Promise<CsvField[]>};
+        values: {
+            planWrite(values: Record<string, unknown>): Promise<unknown[]>;
+            applyWrite(memberId: string, plan: unknown[], executor: Knex, options?: {mergeComposites?: boolean}): Promise<void>;
+        };
+    };
 }
 
 // The custom fields services the members service hands the export composition root.
@@ -63,7 +74,24 @@ export function makeImporter(deps: ImporterServices) {
     // Gifts is initialised at boot and always present at request time; the getter
     // resolves it lazily so the ready service is picked up whenever a row uses it.
     const gifts: GiftService = {
-        reassignRedeemer: (giftId, memberId, options) => deps.getGiftService().reassignRedeemer(giftId, memberId, options)
+        reassignRedeemer: (giftId, memberId, options) => deps.getGiftService().reassignRedeemer({
+            giftId,
+            memberId,
+            transacting: options.transacting
+        })
+    };
+
+    // Gated by the same labs flag as the export, so the two halves round-trip or stay
+    // silent together: off, activeFields resolves empty and every custom_fields.* column
+    // is dropped.
+    const customFields: CustomFieldsImport = {
+        activeFields: async () => (labs.isSet('membersCustomFields') ? deps.customFields.definitions.browse() : []),
+        planWrite: values => deps.customFields.values.planWrite(values),
+        // mergeComposites: a sub-field is a field, so a row writes the sub-fields it fills
+        // and leaves the rest alone, the same rule a blank `name` column follows. Without
+        // it a file naming one address column would replace the whole address, clearing
+        // five sub-fields it never mentioned.
+        applyWrite: (memberId, plan, executor) => deps.customFields.values.applyWrite(memberId, plan, executor, {mergeComposites: true})
     };
 
     return new MembersCSVImporter({
@@ -80,6 +108,7 @@ export function makeImporter(deps: ImporterServices) {
             productRepository: deps.productRepository
         }),
         gifts,
+        customFields,
         email,
         addJob: deps.addJob,
         getTimezone: deps.getTimezone,