ghost 6.56.0 → 6.57.1

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,
@@ -409,18 +413,16 @@ class MemberWelcomeEmailService {
             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;
@@ -430,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];
 
@@ -651,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),

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);

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

@@ -99,8 +99,7 @@ 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.
+// them, touching only the parts the row named, both on the row's transaction.
 export interface CustomFieldsImport {
     activeFields(): Promise<CsvField[]>;
     planWrite(values: Record<string, unknown>): Promise<CustomFieldPlan[]>;
@@ -333,7 +332,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(fieldValuesFromCsvRow(activeCustomFields, row, stripFormulaGuard))
+                    ? await namingTheColumn(() => this._customFields.planWrite(fieldValuesFromCsvRow(activeCustomFields, row, stripFormulaGuard)))
                     : [];
 
                 trx = await this._knex.transaction(undefined, {doNotRejectOnRollback: false});
@@ -433,15 +432,16 @@ class MembersCSVImporter {
                 imported += 1;
             } catch (error) {
                 const errorList: unknown[] = 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): message is string => 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});
             }
         }
 
@@ -458,6 +458,26 @@ class MembersCSVImporter {
     }
 }
 
+// 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<T>(plan: () => Promise<T>): Promise<T> {
+    try {
+        return await plan();
+    } catch (error) {
+        const {property, message} = (error ?? {}) as {property?: unknown; message?: unknown};
+        const namesAField = typeof property === 'string' && property.includes('.');
+        if (!namesAField || typeof message !== 'string') {
+            throw error;
+        }
+        throw new errors.DataImportError({message: `${property}: ${message}`});
+    }
+}
+
 function wrapGiftError(error: unknown) {
     const err = error as {message?: unknown};
     const message = (err && typeof err.message === 'string' && err.message) || tpl(messages.giftReassignFailed);

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

@@ -42,7 +42,11 @@ export type MemberImportRow = z.infer<typeof memberImportRowSchema>;
 
 // A row that failed to import, carrying the raw message that stopped it. The message is
 // left raw here; turning it into human copy is a presentation concern.
-export type ImportErrorRow = MemberImportRow & {error: string};
+// A row can fail for more than one reason. `errors` is the list; `error` is that list
+// written out for the error report's single cell. Two fields because a reason may quote a
+// cell the publisher wrote, and a CSV cell legally holds commas and newlines, so no
+// separator survives being split back apart.
+export type ImportErrorRow = MemberImportRow & {error: string; errors: string[]};
 
 // The persisted import label as plain data -- taken off the Bookshelf model before it
 // leaves the kernel, so the result and the email carry only what they show.

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

@@ -52,11 +52,7 @@ function makeImporter(deps) {
     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 })
+        applyWrite: (memberId, plan, executor) => deps.customFields.values.applyWrite(memberId, plan, { executor })
     };
     return new importer_1.default({
         knex: deps.knex,

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

@@ -33,7 +33,7 @@ interface ImporterServices {
         definitions: {browse(): Promise<CsvField[]>};
         values: {
             planWrite(values: Record<string, unknown>): Promise<unknown[]>;
-            applyWrite(memberId: string, plan: unknown[], executor: Knex, options?: {mergeComposites?: boolean}): Promise<void>;
+            applyWrite(memberId: string, plan: unknown[], options?: {executor?: Knex}): Promise<void>;
         };
     };
 }
@@ -87,11 +87,7 @@ export function makeImporter(deps: ImporterServices) {
     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})
+        applyWrite: (memberId, plan, executor) => deps.customFields.values.applyWrite(memberId, plan, {executor})
     };
 
     return new MembersCSVImporter({

package/core/server/services/members/members-api/repositories/member-repository.js

@@ -1256,6 +1256,11 @@ module.exports = class MemberRepository {
         };
         let eventData = {};
 
+        // A cancellation (or reactivation) changes no `members` column, so the member
+        // model event would be suppressed by `wasChanged()`. Remember the pre-update
+        // subscription so the event can be marked and carry its prior state.
+        let subscriptionBeforeCancelFlagChange = null;
+
         const stripeCustomerSubscriptionModelShouldBeDeleted = stripeSubscriptionData.metadata && !!stripeSubscriptionData.metadata.ghost_migrated_to && stripeSubscriptionData.status === 'canceled';
         if (stripeCustomerSubscriptionModelShouldBeDeleted) {
             logging.warn(`Subscription ${subscriptionData.subscription_id} is marked for deletion, skipping linking.`);
@@ -1300,6 +1305,10 @@ module.exports = class MemberRepository {
                 this.dispatchEvent(offerRedemptionEvent, options);
             }
 
+            if (stripeCustomerSubscriptionModel.get('cancel_at_period_end') !== updatedStripeCustomerSubscriptionModel.get('cancel_at_period_end')) {
+                subscriptionBeforeCancelFlagChange = stripeCustomerSubscriptionModel;
+            }
+
             if (stripeCustomerSubscriptionModel.get('mrr') !== updatedStripeCustomerSubscriptionModel.get('mrr') || stripeCustomerSubscriptionModel.get('plan_id') !== updatedStripeCustomerSubscriptionModel.get('plan_id') || stripeCustomerSubscriptionModel.get('status') !== updatedStripeCustomerSubscriptionModel.get('status') || stripeCustomerSubscriptionModel.get('cancel_at_period_end') !== updatedStripeCustomerSubscriptionModel.get('cancel_at_period_end')) {
                 const originalMrrDelta = stripeCustomerSubscriptionModel.get('mrr');
                 const updatedMrrDelta = updatedStripeCustomerSubscriptionModel.get('mrr');
@@ -1550,6 +1559,48 @@ module.exports = class MemberRepository {
             updatedMember = await this._Member.edit({status: status}, {...options, id: data.id});
         }
 
+        // Cancelling (or reactivating) touches no `members` column, so mark the
+        // subscription relation as the change and carry its prior state. This lets the
+        // webhook payload express before/after — see `services/webhooks/serialize.js`.
+        //
+        // No explicit `emitChange` is needed, and adding one would emit twice: inside a
+        // transaction `emitChange` queues onto the `committed` handler and defers its
+        // `wasChanged()` check to commit time (see `models/base/plugins/events.js`), so
+        // the event already queued by `_Member.edit` above is still pending and setting
+        // `_changed` here is what lets it through. The e2e test asserting exactly one
+        // `member.edited` per cancellation guards this.
+        if (subscriptionBeforeCancelFlagChange && updatedMember) {
+            // Price/tier relations are needed for the serialized subscription shape
+            // to match the Admin API member resource (price, tier, plan)
+            await updatedMember.load([
+                'stripeSubscriptions',
+                'stripeSubscriptions.stripePrice',
+                'stripeSubscriptions.stripePrice.stripeProduct',
+                'stripeSubscriptions.stripePrice.stripeProduct.product'
+            ], options);
+            await subscriptionBeforeCancelFlagChange.load([
+                'stripePrice',
+                'stripePrice.stripeProduct',
+                'stripePrice.stripeProduct.product'
+            ], options);
+            updatedMember._changed = {
+                ...updatedMember._changed,
+                stripeSubscriptions: {
+                    cancel_at_period_end: subscriptionBeforeCancelFlagChange.get('cancel_at_period_end')
+                }
+            };
+            // `previous` must be the full collection — a member can have multiple
+            // subscriptions — with only the changed one swapped for its prior state
+            updatedMember._previousRelations = {
+                ...updatedMember._previousRelations,
+                stripeSubscriptions: {
+                    models: updatedMember.related('stripeSubscriptions').models.map((subscription) => {
+                        return subscription.id === subscriptionBeforeCancelFlagChange.id ? subscriptionBeforeCancelFlagChange : subscription;
+                    })
+                }
+            };
+        }
+
         const newMemberProductIds = memberProducts.map(product => product.id);
         const oldMemberProductIds = oldMemberProducts.map(product => product.id);
 

package/core/server/services/members-custom-fields/queries.js

@@ -3,19 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.activeFields = activeFields;
 const schema_1 = require("./schema");
 const FIELDS_TABLE = 'members_custom_fields';
-// Shared query builders over the field definitions, used by both the definitions
-// service and the values service.
-//
-// The `status = 'active'` filter is the one invariant worth centralising: archived
-// fields must stay out of every read and every write, and that's enforced by a
-// filter, not a database constraint — nothing stops a value row referencing an
-// archived field, so a query that forgets the filter is a silent bug. Keeping the
-// filter in one builder means there's one place to get it right.
-/**
- * The active field definitions. Takes the executor — a knex instance or a
- * transaction — so the same query runs standalone or inside a write's
- * transaction; callers chain their own `select`/`orderBy`/`whereIn` onto it.
- */
+// Archived fields must stay out of every read and write, and nothing in the database
+// enforces that — no constraint stops a value row referencing an archived field. A query
+// that forgets the filter is a silent bug, so the filter lives in one place.
+/** Takes the executor so the same query runs standalone or inside a write's transaction. */
 function activeFields(db) {
     return db(FIELDS_TABLE).where('status', schema_1.FIELD_STATUS.active);
 }

package/core/server/services/members-custom-fields/queries.ts

@@ -3,20 +3,11 @@ import {FIELD_STATUS} from './schema';
 
 const FIELDS_TABLE = 'members_custom_fields';
 
-// Shared query builders over the field definitions, used by both the definitions
-// service and the values service.
-//
-// The `status = 'active'` filter is the one invariant worth centralising: archived
-// fields must stay out of every read and every write, and that's enforced by a
-// filter, not a database constraint — nothing stops a value row referencing an
-// archived field, so a query that forgets the filter is a silent bug. Keeping the
-// filter in one builder means there's one place to get it right.
+// Archived fields must stay out of every read and write, and nothing in the database
+// enforces that — no constraint stops a value row referencing an archived field. A query
+// that forgets the filter is a silent bug, so the filter lives in one place.
 
-/**
- * The active field definitions. Takes the executor — a knex instance or a
- * transaction — so the same query runs standalone or inside a write's
- * transaction; callers chain their own `select`/`orderBy`/`whereIn` onto it.
- */
+/** Takes the executor so the same query runs standalone or inside a write's transaction. */
 export function activeFields(db: Knex) {
     return db(FIELDS_TABLE).where('status', FIELD_STATUS.active);
 }

package/core/server/services/members-custom-fields/schema.js

@@ -1,21 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DbCustomFieldValueWithField = exports.StoredCompositeValue = exports.DbCustomFieldValue = exports.DbCustomField = exports.FieldStatusSchema = exports.FIELD_STATUS = void 0;
+exports.DbCustomFieldLeaf = exports.DbCustomFieldValue = exports.DbCustomField = exports.FieldStatusSchema = exports.FIELD_STATUS = void 0;
 const zod_1 = require("zod");
 const custom_field_types_1 = require("@tryghost/custom-field-types");
 const db_date_1 = require("../../lib/db-date");
-// A field's lifecycle state. `archived` is a soft state: the field drops out of
-// the values path but stays visible in the definition list (with its status) so
-// admins can find, rename, restore, or permanently delete it. The values mirror
-// schema.js's `isIn` constraint on the column — which is static config and can't
-// import this, so that one stays literal with a pointer back here.
+// `archived` is soft: the field drops out of the values path but stays in the definition
+// list so it can be renamed, restored or deleted. Mirrors schema.js's `isIn` on the
+// column, which is static config and cannot import this.
 exports.FIELD_STATUS = { active: 'active', archived: 'archived' };
 exports.FieldStatusSchema = zod_1.z.enum([exports.FIELD_STATUS.active, exports.FIELD_STATUS.archived]);
-// The members_custom_fields row: the single source for the read projection and the
-// knex table type below. `type` is validated as the field-type enum here (the DB
-// only stores registered types), so the row already carries the narrow type and
-// the definition codec needs no cast. `status` travels with the row: it's part of
-// the read projection so the definition list can group active vs archived.
+// The single source for the read projection and the knex table type below. `type` parses
+// as the field-type enum, so the row carries the narrow type and no codec needs a cast.
 exports.DbCustomField = zod_1.z.object({
     id: zod_1.z.string(),
     key: zod_1.z.string(),
@@ -25,32 +20,28 @@ exports.DbCustomField = zod_1.z.object({
     created_at: db_date_1.DbDate,
     updated_at: db_date_1.DbDate.nullable()
 });
-// A member's stored value for one field. `value_text`/`value_json` are the raw
-// columns — which one carries the value, and how it decodes, is the storage
-// codec's business (see storage.ts), so they're plain nullable strings here.
+// One part of a member's value. What a `path` means is storage.ts's business, so the row
+// carries it as a plain string.
 exports.DbCustomFieldValue = zod_1.z.object({
     id: zod_1.z.string(),
     custom_field_id: zod_1.z.string(),
     member_id: zod_1.z.string(),
+    path: zod_1.z.string(),
+    // Nullable like the column, though nothing here writes a null: a part with no value
+    // has no row.
     value_text: zod_1.z.string().nullable(),
-    value_json: zod_1.z.string().nullable(),
     created_at: db_date_1.DbDate,
     updated_at: db_date_1.DbDate.nullable()
 });
-// A composite value once decoded: sub-field keys to values, and no narrower. Which
-// sub-fields a composite has is its field type's business, not the row's.
+// The field's key travels with the row so a value assembles without a second lookup.
 //
-// It doubles as the guard on a stored blob. A JSON column can just as easily hold an
-// array, a null or a bare number, and a record rejects all three — so parsing against
-// this is what narrows the type, with no assertion needed.
-exports.StoredCompositeValue = zod_1.z.record(zod_1.z.string(), zod_1.z.unknown());
-// The value join a read needs: the field's identity and type travel with the
-// stored columns, so a row can be decoded without a second lookup. `type` is
-// parsed as the field-type enum, which narrows it with no cast.
-exports.DbCustomFieldValueWithField = zod_1.z.object({
+// `type` takes no part in the assembly and is here as a gate: a value whose type has left
+// the catalog is one the definitions list no longer returns either, so failing to parse
+// is what drops it.
+exports.DbCustomFieldLeaf = zod_1.z.object({
     member_id: zod_1.z.string(),
     key: zod_1.z.string(),
     type: custom_field_types_1.FieldTypeSchema,
-    value_text: zod_1.z.string().nullable(),
-    value_json: zod_1.z.string().nullable()
+    path: zod_1.z.string(),
+    value_text: zod_1.z.string()
 });