@merchi/sdk 1.42.21 → 1.42.23

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { Address } from './entities/address.js';
 import { AgentConversation } from './entities/agent_conversation.js';
 import { AgentTokenUsage } from './entities/agent_token_usage.js';
 export type { AgentTokenAnalyticsSummary, AgentTokenAnalyticsTimeseries, AgentTokenUsageRecordPayload, AgentTokenUsageRecordResponse, CompanyAnalyticsResponse, DomainAnalyticsResponse, ProfileAnalyticsSummaryMetric, } from './entities/agent_token_analytics.js';
+export type { JobFollowupUpdate, ScheduledJobFollowup, } from './entities/job_followup.js';
 import { AgentSkill } from './entities/agent_skill.js';
 import { AgentSkillVersion } from './entities/agent_skill_version.js';
 import { AgentSkillApproval } from './entities/agent_skill_approval.js';
@@ -41,6 +42,8 @@ import { Invoice } from './entities/invoice.js';
 import { Item } from './entities/item.js';
 import { Job } from './entities/job.js';
 import { JobComment } from './entities/job_comment.js';
+import { JobFollowup } from './entities/job_followup.js';
+import { JobFollowupTemplate } from './entities/job_followup_template.js';
 import { JobNote } from './entities/job_note.js';
 import { JobOperationLog } from './entities/job_operation_log.js';
 import { MatchingInventory } from './entities/matching_inventory.js';
@@ -85,4 +88,4 @@ import * as request from './request.js';
 import * as util from './util/index.js';
 import * as pricing from './pricing/index.js';
 import { toastNotifications } from './toasts.js';
-export { constants, request, util, pricing, toastNotifications, Address, AgentConversation, AgentTokenUsage, AgentSkill, AgentSkillVersion, AgentSkillApproval, DomainChatSettings, SupportConversation, SupportMessage, Assignment, AutomaticPaymentRelationship, Bank, Cart, CartItem, CartShipmentGroup, CartShipmentQuote, Category, Company, CompanyInvitation, ProductForm, ProductFormVersion, CountryTax, Discount, DiscountGroup, Domain, DomainInvitation, DomainTag, Draft, DraftComment, DraftTemplate, EmailAddress, EmailCounter, EnrolledDomain, Entity, EmbedDescriptor, ExchangeRate, InternalTag, Inventory, InventoryUnitVariation, Invoice, Item, Job, JobComment, JobNote, JobOperationLog, MatchingInventory, Merchi, MerchiFile, Notification, Payment, PaymentDevice, PhoneNumber, Product, ProductReview, ProductionComment, Quote, QuoteItem, Reminder, RequestOptions, apiFetch, apiFetchWithProgress, Session, Shipment, ShipmentLog, ShipmentItem, ShipmentItemFulfillment, ShipmentMethod, ShipmentMethodVariation, ShortUrl, SubscriptionPlan, SupplyDomain, SystemRole, Theme, ThemeCssSetting, User, UserCompany, Variation, VariationField, VariationFieldsOption, VariationOption, VariationsGroup, generateUUID, getCookie };
+export { constants, request, util, pricing, toastNotifications, Address, AgentConversation, AgentTokenUsage, AgentSkill, AgentSkillVersion, AgentSkillApproval, DomainChatSettings, SupportConversation, SupportMessage, Assignment, AutomaticPaymentRelationship, Bank, Cart, CartItem, CartShipmentGroup, CartShipmentQuote, Category, Company, CompanyInvitation, ProductForm, ProductFormVersion, CountryTax, Discount, DiscountGroup, Domain, DomainInvitation, DomainTag, Draft, DraftComment, DraftTemplate, EmailAddress, EmailCounter, EnrolledDomain, Entity, EmbedDescriptor, ExchangeRate, InternalTag, Inventory, InventoryUnitVariation, Invoice, Item, Job, JobComment, JobFollowup, JobFollowupTemplate, JobNote, JobOperationLog, MatchingInventory, Merchi, MerchiFile, Notification, Payment, PaymentDevice, PhoneNumber, Product, ProductReview, ProductionComment, Quote, QuoteItem, Reminder, RequestOptions, apiFetch, apiFetchWithProgress, Session, Shipment, ShipmentLog, ShipmentItem, ShipmentItemFulfillment, ShipmentMethod, ShipmentMethodVariation, ShortUrl, SubscriptionPlan, SupplyDomain, SystemRole, Theme, ThemeCssSetting, User, UserCompany, Variation, VariationField, VariationFieldsOption, VariationOption, VariationsGroup, generateUUID, getCookie };

package/dist/index.js

@@ -40,6 +40,8 @@ import { Invoice } from './entities/invoice.js';
 import { Item } from './entities/item.js';
 import { Job } from './entities/job.js';
 import { JobComment } from './entities/job_comment.js';
+import { JobFollowup } from './entities/job_followup.js';
+import { JobFollowupTemplate } from './entities/job_followup_template.js';
 import { JobNote } from './entities/job_note.js';
 import { JobOperationLog } from './entities/job_operation_log.js';
 import { MatchingInventory } from './entities/matching_inventory.js';
@@ -83,4 +85,4 @@ import * as request from './request.js';
 import * as util from './util/index.js';
 import * as pricing from './pricing/index.js';
 import { toastNotifications } from './toasts.js';
-export { constants, request, util, pricing, toastNotifications, Address, AgentConversation, AgentTokenUsage, AgentSkill, AgentSkillVersion, AgentSkillApproval, DomainChatSettings, SupportConversation, SupportMessage, Assignment, AutomaticPaymentRelationship, Bank, Cart, CartItem, CartShipmentGroup, CartShipmentQuote, Category, Company, CompanyInvitation, ProductForm, ProductFormVersion, CountryTax, Discount, DiscountGroup, Domain, DomainInvitation, DomainTag, Draft, DraftComment, DraftTemplate, EmailAddress, EmailCounter, EnrolledDomain, Entity, ExchangeRate, InternalTag, Inventory, InventoryUnitVariation, Invoice, Item, Job, JobComment, JobNote, JobOperationLog, MatchingInventory, Merchi, MerchiFile, Notification, Payment, PaymentDevice, PhoneNumber, Product, ProductReview, ProductionComment, Quote, QuoteItem, Reminder, apiFetch, apiFetchWithProgress, Session, Shipment, ShipmentLog, ShipmentItem, ShipmentItemFulfillment, ShipmentMethod, ShipmentMethodVariation, ShortUrl, SubscriptionPlan, SupplyDomain, SystemRole, Theme, ThemeCssSetting, User, UserCompany, Variation, VariationField, VariationFieldsOption, VariationOption, VariationsGroup, generateUUID, getCookie };
+export { constants, request, util, pricing, toastNotifications, Address, AgentConversation, AgentTokenUsage, AgentSkill, AgentSkillVersion, AgentSkillApproval, DomainChatSettings, SupportConversation, SupportMessage, Assignment, AutomaticPaymentRelationship, Bank, Cart, CartItem, CartShipmentGroup, CartShipmentQuote, Category, Company, CompanyInvitation, ProductForm, ProductFormVersion, CountryTax, Discount, DiscountGroup, Domain, DomainInvitation, DomainTag, Draft, DraftComment, DraftTemplate, EmailAddress, EmailCounter, EnrolledDomain, Entity, ExchangeRate, InternalTag, Inventory, InventoryUnitVariation, Invoice, Item, Job, JobComment, JobFollowup, JobFollowupTemplate, JobNote, JobOperationLog, MatchingInventory, Merchi, MerchiFile, Notification, Payment, PaymentDevice, PhoneNumber, Product, ProductReview, ProductionComment, Quote, QuoteItem, Reminder, apiFetch, apiFetchWithProgress, Session, Shipment, ShipmentLog, ShipmentItem, ShipmentItemFulfillment, ShipmentMethod, ShipmentMethodVariation, ShortUrl, SubscriptionPlan, SupplyDomain, SystemRole, Theme, ThemeCssSetting, User, UserCompany, Variation, VariationField, VariationFieldsOption, VariationOption, VariationsGroup, generateUUID, getCookie };

package/dist/merchi.d.ts

@@ -2,6 +2,8 @@ import { Entity, EmbedDescriptor } from './entity.js';
 import { AutomaticPaymentRelationship } from './entities/automatic_payment_relationship.js';
 import { Session } from './entities/session.js';
 import { JobComment } from './entities/job_comment.js';
+import { JobFollowup } from './entities/job_followup.js';
+import { JobFollowupTemplate } from './entities/job_followup_template.js';
 import { JobNote } from './entities/job_note.js';
 import { JobOperationLog } from './entities/job_operation_log.js';
 import { Domain } from './entities/domain.js';
@@ -105,6 +107,8 @@ export declare class Merchi {
     Inventory: typeof Inventory;
     InventoryGroup: typeof InventoryGroup;
     JobComment: typeof JobComment;
+    JobFollowup: typeof JobFollowup;
+    JobFollowupTemplate: typeof JobFollowupTemplate;
     JobNote: typeof JobNote;
     JobOperationLog: typeof JobOperationLog;
     VariationOption: typeof VariationOption;

package/dist/merchi.js

@@ -12,6 +12,8 @@ var __assign = (this && this.__assign) || function () {
 import { AutomaticPaymentRelationship } from './entities/automatic_payment_relationship.js';
 import { Session } from './entities/session.js';
 import { JobComment } from './entities/job_comment.js';
+import { JobFollowup } from './entities/job_followup.js';
+import { JobFollowupTemplate } from './entities/job_followup_template.js';
 import { JobNote } from './entities/job_note.js';
 import { JobOperationLog } from './entities/job_operation_log.js';
 import { Domain } from './entities/domain.js';
@@ -280,6 +282,8 @@ var Merchi = /** @class */ (function () {
         this.MerchiFile = this.setupClass(MerchiFile);
         this.User = this.setupClass(User);
         this.JobComment = this.setupClass(JobComment);
+        this.JobFollowup = this.setupClass(JobFollowup);
+        this.JobFollowupTemplate = this.setupClass(JobFollowupTemplate);
         this.JobNote = this.setupClass(JobNote);
         this.JobOperationLog = this.setupClass(JobOperationLog);
         this.VariationOption = this.setupClass(VariationOption);

package/dist/request.d.ts

@@ -1,4 +1,3 @@
-import { ErrorType } from './constants/errors.js';
 export interface RequestOptions extends RequestInit {
     query?: string[][];
 }
@@ -37,7 +36,8 @@ export interface ApiErrorDetails {
 }
 export declare class ApiError extends Error {
     statusCode?: number;
-    errorCode?: ErrorType;
+    /** Numeric API code, including values added after this SDK was published. */
+    errorCode?: number;
     errorMessage: string;
     /**
      * Structured context the API may include alongside the error

package/dist/request.js

@@ -71,7 +71,6 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
-// eslint-disable-next-line no-unused-vars
 import { getErrorFromCode } from './constants/errors.js';
 function resolveApiErrorMessage(err) {
     if (err && typeof err === 'object' && typeof err.message === 'string' && err.message) {

package/dist/request.test.js

@@ -83,6 +83,41 @@ test('will get default errorCode', function () {
         expect(e.message).toBe('just a test');
     });
 });
+test('lead spam rejection keeps its API code through apiFetch', function () { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                mockFetch(false, {
+                    statusCode: 400,
+                    errorCode: 227,
+                    message: 'Invalid submission',
+                }, 400);
+                return [4 /*yield*/, expect(apiFetch('https://api.merchi.co/', '/create_new_lead/', {
+                        method: 'POST',
+                    })).rejects.toMatchObject({
+                        name: 'ApiError',
+                        statusCode: 400,
+                        errorCode: 227,
+                        message: 'Invalid submission',
+                        errorMessage: 'Invalid submission',
+                    })];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); });
+test.each([226, 1000])('ApiError preserves new numeric API code %s', function (errorCode) {
+    var error = new ApiError({ statusCode: 400, errorCode: errorCode, message: 'Rejected' });
+    expect(error.errorCode).toBe(errorCode);
+    expect(error.original.errorCode).toBe(errorCode);
+});
+test.each(['227', 'INVALID_PHONE_NUMBER', NaN, -1])('ApiError rejects malformed API code %p', function (errorCode) {
+    var error = new ApiError({ statusCode: 400, errorCode: errorCode, message: 'Rejected' });
+    expect(error.errorCode).toBe(ErrorType.UNKNOWN_ERROR);
+    expect(error.statusCode).toBe(400);
+    expect(error.message).toBe('Rejected');
+});
 test('ApiError keeps plain string messages', function () {
     var e = new ApiError('empty response');
     expect(e.message).toBe('empty response');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merchi/sdk",
-  "version": "1.42.21",
+  "version": "1.42.23",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/constants/errors.test.ts

@@ -0,0 +1,23 @@
+import { ErrorType, getErrorFromCode } from './errors.js';
+
+test.each([ErrorType.UNKNOWN_ERROR, ErrorType.INVALID_PHONE_NUMBER, ErrorType.DOMAIN_NOT_FOUND])(
+  'preserves known API error code %s', code => {
+    expect(getErrorFromCode(code)).toBe(code);
+  },
+);
+
+// INVALID_HCAPTCHA and SPAM_DETECTED exist in the API's Python SDK but not
+// this SDK's legacy enum. Future codes must remain diagnosable too.
+test.each([226, 227, 1000, Number.MAX_SAFE_INTEGER])(
+  'preserves forward-compatible numeric API error code %s', code => {
+    expect(getErrorFromCode(code)).toBe(code);
+  },
+);
+
+test.each([
+  undefined, null, -1, 1.5, NaN, Infinity, -Infinity,
+  Number.MAX_SAFE_INTEGER + 1, '227', 'INVALID_PHONE_NUMBER',
+  'toString', '__proto__', true, {}, [],
+])('uses UNKNOWN_ERROR for malformed API code %p', code => {
+  expect(getErrorFromCode(code)).toBe(ErrorType.UNKNOWN_ERROR);
+});

package/src/constants/errors.ts

@@ -24,8 +24,10 @@ export enum ErrorType {
   DOMAIN_NOT_FOUND = 22,
 }
 
-export function getErrorFromCode(code: number): ErrorType {
-  if (code in ErrorType) {
+export function getErrorFromCode(code: unknown): number {
+  // The API can add error codes before this SDK's named constants are updated.
+  // Preserve those numeric diagnostics instead of turning them into UNKNOWN.
+  if (typeof code === 'number' && Number.isSafeInteger(code) && code >= 0) {
     return code;
   }
   return ErrorType.UNKNOWN_ERROR;

package/src/constants/index.ts

@@ -17,6 +17,7 @@ import * as production_status from './job/production_status.js';
 import * as shipment_status from './job/shipment_status.js';
 import * as call_to_actions from './call_to_actions.js';
 import * as domain_types from './domain_types.js';
+import * as job_followup_types from './job_followup_types.js';
 import * as job_status from './job_status.js';
 import * as white_label_accessibilities from './white_label_accessibilities.js';
 import * as robots_meta_directives from './robots_meta_directives.js';
@@ -41,6 +42,7 @@ export {
   auto_assign_production_on_actions,
   product_types,
   drafting_status,
+  job_followup_types,
   job_types,
   payment_status,
   production_status,

package/src/constants/job_followup_types.ts

@@ -0,0 +1,9 @@
+export enum JobFollowupType {
+  COMPLETION = 0,
+  REVIEW_REQUEST = 1,
+  REORDER = 2,
+  FEEDBACK = 3,
+  CUSTOM = 4,
+}
+
+export type JobFollowupStatus = 'pending' | 'sent' | 'cancelled' | 'failed';

package/src/constants/notification_types.ts

@@ -98,4 +98,5 @@ export enum NotificationType {
   REFERRER_JOB_PAID = 106,
   REFERRER_JOB_RECEIVED = 107,
   FULFILLMENT_PARTNER_INVITED = 108,
+  JOB_FOLLOWUP = 109,
 }

package/src/entities/domain.ts

@@ -16,6 +16,7 @@ import { Job } from './job.js';
 import { User } from './user.js';
 import { Notification } from './notification.js';
 import { Product } from './product.js';
+import { JobFollowupTemplate } from './job_followup_template.js';
 import { Reminder } from './reminder.js';
 import { Session } from './session.js';
 import { SupplyDomain } from './supply_domain.js';
@@ -684,6 +685,9 @@ export class Domain extends Entity {
   @Domain.property({arrayType: 'Reminder'})
   public reminders?: Reminder[];
 
+  @Domain.property({arrayType: 'JobFollowupTemplate'})
+  public jobFollowupTemplates?: JobFollowupTemplate[];
+
   @Domain.property({arrayType: 'Product'})
   public products?: Product[];
 

package/src/entities/job.ts

@@ -13,6 +13,7 @@ import { MatchingInventory } from './matching_inventory.js';
 import { InternalTag } from './internal_tag.js';
 import { Invoice } from './invoice.js';
 import { JobComment } from './job_comment.js';
+import { JobFollowup, JobFollowupUpdate, ScheduledJobFollowup } from './job_followup.js';
 import { JobNote } from './job_note.js';
 import { JobOperationLog } from './job_operation_log.js';
 import { Notification } from './notification.js';
@@ -375,6 +376,9 @@ export class Job extends Entity {
   @Job.property({arrayType: 'Reminder'})
   public reminders?: Reminder[];
 
+  @Job.property({arrayType: 'JobFollowup'})
+  public jobFollowups?: JobFollowup[];
+
   @Job.property()
   public supplyAssignment?: Assignment;
 
@@ -440,4 +444,56 @@ export class Job extends Entity {
     }
     return this.deduct(this.matchingInventories);
   };
+
+  private jobResourceId = () => {
+    if (this.id === undefined || this.id === null) {
+      throw new Error('id is undefined, did you forget to set it?');
+    }
+    return this.id;
+  };
+
+  private readFollowups = (data: any): JobFollowup[] => {
+    const rows = data?.jobFollowups ?? [];
+    return rows.map((row: any) => new this.merchi.JobFollowup().fromJson(row));
+  };
+
+  private readFollowup = (data: any): JobFollowup => {
+    return new this.merchi.JobFollowup().fromJson(data?.jobFollowup ?? data);
+  };
+
+  public listFollowups = () => {
+    const resource = `/jobs/${this.jobResourceId()}/followups/`;
+    const fetchOptions: RequestOptions = {method: 'GET', query: []};
+    return this.merchi.authenticatedFetch(resource, fetchOptions).
+      then((data: any) => this.readFollowups(data));
+  };
+
+  public complete = (followups: ScheduledJobFollowup[] = []) => {
+    const resource = `/jobs/${this.jobResourceId()}/complete/`;
+    const data = new FormData();
+    data.append('followups', JSON.stringify(followups));
+    const fetchOptions: RequestOptions = {method: 'POST', body: data, query: []};
+    return this.merchi.authenticatedFetch(resource, fetchOptions).
+      then((payload: any) => this.readFollowups(payload));
+  };
+
+  public updateFollowup = (followupId: number, changes: JobFollowupUpdate) => {
+    const resource = `/jobs/${this.jobResourceId()}/followups/${followupId}/`;
+    const fetchOptions: RequestOptions = {
+      method: 'PATCH',
+      headers: {'Content-Type': 'application/json'},
+      body: JSON.stringify(changes),
+      query: [],
+    };
+    return this.merchi.authenticatedFetch(resource, fetchOptions).
+      then((data: any) => this.readFollowup(data));
+  };
+
+  public cancelFollowup = (followupId: number) => {
+    const resource =
+      `/jobs/${this.jobResourceId()}/followups/${followupId}/cancel/`;
+    const fetchOptions: RequestOptions = {method: 'POST', query: []};
+    return this.merchi.authenticatedFetch(resource, fetchOptions).
+      then((data: any) => this.readFollowup(data));
+  };
 }

package/src/entities/job_followup.test.ts

@@ -0,0 +1,99 @@
+import { NotificationType } from '../constants/notification_types.js';
+import { JobFollowupType } from '../constants/job_followup_types.js';
+import { Merchi } from '../merchi.js';
+
+test('job follow-up notification type is 109', () => {
+  expect(NotificationType.JOB_FOLLOWUP).toBe(109);
+});
+
+test('can make a follow-up template', () => {
+  const merchi = new Merchi();
+  const template = new merchi.JobFollowupTemplate();
+  template.fromJson({
+    id: 11,
+    name: 'Completion',
+    followupType: JobFollowupType.COMPLETION,
+    defaultKey: 'completion',
+    subject: 'Your order is complete',
+    body: 'Hi {{client_first_name}}',
+  });
+  expect(template.name).toBe('Completion');
+  expect(template.followupType).toBe(0);
+  expect(template.defaultKey).toBe('completion');
+});
+
+test('job complete posts the follow-up sequence', async () => {
+  const merchi = new Merchi();
+  const job = new merchi.Job();
+  job.id = 85;
+  const fetch = jest.spyOn(merchi, 'authenticatedFetch').mockResolvedValue({
+    jobFollowups: [{
+      id: 4,
+      jobId: 85,
+      templateId: 11,
+      templateName: 'Review request',
+      followupType: JobFollowupType.REVIEW_REQUEST,
+      subject: 'How did we do?',
+      sendAt: '2026-11-04T09:00:00Z',
+      sendEmail: true,
+      sendSms: false,
+      status: 'pending',
+      sentAt: null,
+    }],
+  });
+
+  const rows = await job.complete([{
+    templateId: 11,
+    sendAt: '2026-11-04T09:00',
+    timezone: 'Australia/Melbourne',
+    sendEmail: true,
+    sendSms: false,
+  }]);
+
+  expect(fetch).toHaveBeenCalledWith(
+    '/jobs/85/complete/',
+    expect.objectContaining({method: 'POST'})
+  );
+  const body = fetch.mock.calls[0][1].body as FormData;
+  expect(JSON.parse(String(body.get('followups')))).toEqual([{
+    templateId: 11,
+    sendAt: '2026-11-04T09:00',
+    timezone: 'Australia/Melbourne',
+    sendEmail: true,
+    sendSms: false,
+  }]);
+  expect(rows).toHaveLength(1);
+  expect(rows[0].sendAt).toBe('2026-11-04T09:00:00Z');
+  expect(rows[0].status).toBe('pending');
+  expect(rows[0].templateName).toBe('Review request');
+});
+
+test('can update and cancel a pending follow-up', async () => {
+  const merchi = new Merchi();
+  const job = new merchi.Job();
+  job.id = 85;
+  const fetch = jest.spyOn(merchi, 'authenticatedFetch').mockResolvedValue({
+    jobFollowup: {
+      id: 4,
+      status: 'cancelled',
+      sendAt: '2026-12-01T09:00:00Z',
+    },
+  });
+
+  const updated = await job.updateFollowup(4, {
+    sendAt: '2026-12-01T09:00',
+    timezone: 'Australia/Melbourne',
+  });
+  expect(fetch).toHaveBeenCalledWith(
+    '/jobs/85/followups/4/',
+    expect.objectContaining({method: 'PATCH'})
+  );
+  expect(updated.sendAt).toBe('2026-12-01T09:00:00Z');
+
+  const cancelled = await job.cancelFollowup(4);
+  expect(fetch).toHaveBeenCalledWith(
+    '/jobs/85/followups/4/cancel/',
+    expect.objectContaining({method: 'POST'})
+  );
+  expect(cancelled.status).toBe('cancelled');
+});

package/src/entities/job_followup.ts

@@ -0,0 +1,91 @@
+import type { Domain } from './domain.js';
+import { Entity } from '../entity.js';
+import type { Job } from './job.js';
+import type { JobFollowupTemplate } from './job_followup_template.js';
+import type { JobFollowupStatus } from '../constants/job_followup_types.js';
+import type { User } from './user.js';
+
+export interface ScheduledJobFollowup {
+  templateId: number;
+  sendAt: string;
+  timezone: string;
+  sendEmail: boolean;
+  sendSms: boolean;
+  subject?: string;
+  body?: string;
+}
+
+export interface JobFollowupUpdate {
+  sendAt?: string;
+  timezone?: string;
+  sendEmail?: boolean;
+  sendSms?: boolean;
+  subject?: string;
+  body?: string;
+}
+
+export class JobFollowup extends Entity {
+  // Scheduled rows are listed and updated under /jobs/<id>/followups/,
+  // not this collection path.
+  protected static resourceName = 'job_followups';
+  protected static singularName = 'jobFollowup';
+  protected static pluralName = 'jobFollowups';
+
+  @JobFollowup.property()
+  public id?: number;
+
+  @JobFollowup.property()
+  public jobId?: number;
+
+  @JobFollowup.property()
+  public domainId?: number;
+
+  @JobFollowup.property({type: Number})
+  public templateId?: number | null;
+
+  @JobFollowup.property()
+  public templateName?: string;
+
+  @JobFollowup.property()
+  public followupType?: number;
+
+  @JobFollowup.property()
+  public subject?: string;
+
+  @JobFollowup.property()
+  public body?: string;
+
+  // The job follow-up endpoints return an ISO timestamp, not unix seconds.
+  @JobFollowup.property()
+  public sendAt?: string;
+
+  @JobFollowup.property()
+  public sendEmail?: boolean;
+
+  @JobFollowup.property()
+  public sendSms?: boolean;
+
+  @JobFollowup.property({type: String})
+  public status?: JobFollowupStatus;
+
+  @JobFollowup.property({type: String})
+  public sentAt?: string | null;
+
+  @JobFollowup.property({type: String})
+  public lastError?: string | null;
+
+  @JobFollowup.property({type: Date})
+  public created?: Date;
+
+  @JobFollowup.property({type: 'Job'})
+  public job?: Job;
+
+  @JobFollowup.property({type: 'Domain'})
+  public domain?: Domain;
+
+  @JobFollowup.property({type: 'JobFollowupTemplate'})
+  public template?: JobFollowupTemplate;
+
+  @JobFollowup.property({type: 'User'})
+  public createdBy?: User;
+}

package/src/entities/job_followup_template.ts

@@ -0,0 +1,45 @@
+import type { Domain } from './domain.js';
+import { Entity } from '../entity.js';
+import type { User } from './user.js';
+
+export class JobFollowupTemplate extends Entity {
+  protected static resourceName = 'job_followup_templates';
+  protected static singularName = 'jobFollowupTemplate';
+  protected static pluralName = 'jobFollowupTemplates';
+
+  @JobFollowupTemplate.property({type: Date})
+  public archived?: Date | null;
+
+  @JobFollowupTemplate.property()
+  public id?: number;
+
+  @JobFollowupTemplate.property()
+  public name?: string;
+
+  @JobFollowupTemplate.property()
+  public followupType?: number;
+
+  @JobFollowupTemplate.property({type: String})
+  public defaultKey?: string | null;
+
+  @JobFollowupTemplate.property()
+  public subject?: string;
+
+  @JobFollowupTemplate.property()
+  public body?: string;
+
+  @JobFollowupTemplate.property({type: Date})
+  public created?: Date;
+
+  @JobFollowupTemplate.property({type: Date})
+  public updated?: Date;
+
+  @JobFollowupTemplate.property({type: Date})
+  public removed?: Date | null;
+
+  @JobFollowupTemplate.property({type: 'Domain'})
+  public domain?: Domain;
+
+  @JobFollowupTemplate.property({type: 'User'})
+  public createdBy?: User;
+}

package/src/index.ts

@@ -10,6 +10,10 @@ export type {
   DomainAnalyticsResponse,
   ProfileAnalyticsSummaryMetric,
 } from './entities/agent_token_analytics.js';
+export type {
+  JobFollowupUpdate,
+  ScheduledJobFollowup,
+} from './entities/job_followup.js';
 import { AgentSkill } from './entities/agent_skill.js';
 import { AgentSkillVersion } from './entities/agent_skill_version.js';
 import { AgentSkillApproval } from './entities/agent_skill_approval.js';
@@ -49,6 +53,8 @@ import { Invoice } from './entities/invoice.js';
 import { Item } from './entities/item.js';
 import { Job } from './entities/job.js';
 import { JobComment } from './entities/job_comment.js';
+import { JobFollowup } from './entities/job_followup.js';
+import { JobFollowupTemplate } from './entities/job_followup_template.js';
 import { JobNote } from './entities/job_note.js';
 import { JobOperationLog } from './entities/job_operation_log.js';
 import { MatchingInventory } from './entities/matching_inventory.js';
@@ -146,6 +152,8 @@ export {
   Item,
   Job,
   JobComment,
+  JobFollowup,
+  JobFollowupTemplate,
   JobNote,
   JobOperationLog,
   MatchingInventory,

package/src/merchi.ts

@@ -6,6 +6,8 @@ import {
 import { AutomaticPaymentRelationship } from './entities/automatic_payment_relationship.js';
 import { Session } from './entities/session.js';
 import { JobComment } from './entities/job_comment.js';
+import { JobFollowup } from './entities/job_followup.js';
+import { JobFollowupTemplate } from './entities/job_followup_template.js';
 import { JobNote } from './entities/job_note.js';
 import { JobOperationLog } from './entities/job_operation_log.js';
 import { Domain } from './entities/domain.js';
@@ -130,6 +132,8 @@ export class Merchi {
   public Inventory: typeof Inventory;
   public InventoryGroup: typeof InventoryGroup;
   public JobComment: typeof JobComment;
+  public JobFollowup: typeof JobFollowup;
+  public JobFollowupTemplate: typeof JobFollowupTemplate;
   public JobNote: typeof JobNote;
   public JobOperationLog: typeof JobOperationLog;
   public VariationOption: typeof VariationOption;
@@ -365,6 +369,10 @@ export class Merchi {
     this.MerchiFile = this.setupClass(MerchiFile) as typeof MerchiFile;
     this.User = this.setupClass(User) as typeof User;
     this.JobComment = this.setupClass(JobComment) as typeof JobComment;
+    this.JobFollowup = this.setupClass(JobFollowup) as typeof JobFollowup;
+    this.JobFollowupTemplate = this.setupClass(
+      JobFollowupTemplate
+    ) as typeof JobFollowupTemplate;
     this.JobNote = this.setupClass(JobNote) as typeof JobNote;
     this.JobOperationLog = this.setupClass(JobOperationLog) as typeof JobOperationLog;
     this.VariationOption = this.setupClass(

package/src/request.test.ts

@@ -43,6 +43,38 @@ test('will get default errorCode', () => {
   });
 });
 
+test('lead spam rejection keeps its API code through apiFetch', async () => {
+  mockFetch(false, {
+    statusCode: 400,
+    errorCode: 227,
+    message: 'Invalid submission',
+  }, 400);
+  await expect(apiFetch('https://api.merchi.co/', '/create_new_lead/', {
+    method: 'POST',
+  })).rejects.toMatchObject({
+    name: 'ApiError',
+    statusCode: 400,
+    errorCode: 227,
+    message: 'Invalid submission',
+    errorMessage: 'Invalid submission',
+  });
+});
+
+test.each([226, 1000])('ApiError preserves new numeric API code %s', errorCode => {
+  const error = new ApiError({ statusCode: 400, errorCode, message: 'Rejected' });
+  expect(error.errorCode).toBe(errorCode);
+  expect(error.original.errorCode).toBe(errorCode);
+});
+
+test.each(['227', 'INVALID_PHONE_NUMBER', NaN, -1])(
+  'ApiError rejects malformed API code %p', errorCode => {
+    const error = new ApiError({ statusCode: 400, errorCode, message: 'Rejected' });
+    expect(error.errorCode).toBe(ErrorType.UNKNOWN_ERROR);
+    expect(error.statusCode).toBe(400);
+    expect(error.message).toBe('Rejected');
+  },
+);
+
 test('ApiError keeps plain string messages', () => {
   const e = new ApiError('empty response');
   expect(e.message).toBe('empty response');