@porulle/core 0.63.0 → 0.65.0

package/src/modules/cart/service.ts

@@ -14,18 +14,12 @@ import {
   toCommerceError,
 } from "../../kernel/errors.js";
 import { runAfterHooks, runBeforeHooks } from "../../kernel/hooks/executor.js";
-import { createHookContext } from "../../kernel/hooks/create-context.js";
-import type {
-  AfterHook,
-  BeforeHook,
-  HookContext,
-} from "../../kernel/hooks/types.js";
+import { createModuleHookContext } from "../../kernel/hooks/create-context.js";
+import type { AfterHook, BeforeHook } from "../../kernel/hooks/types.js";
 import type { HookRegistry } from "../../kernel/hooks/registry.js";
 import { Err, Ok, type Result } from "../../kernel/result.js";
-import { createLogger } from "../../utils/logger.js";
 import { paginate, type Pagination } from "../../utils/pagination.js";
 import type { DatabaseAdapter } from "../../kernel/database/adapter.js";
-import type { PluginDb } from "../../kernel/database/plugin-types.js";
 import type { TxContext } from "../../kernel/database/tx-context.js";
 import { CartRepository, type Cart, type CartLineItem } from "./repository/index.js";
 import type { CatalogRepository } from "../catalog/repository/index.js";
@@ -61,23 +55,6 @@ type CartRemoveAfterHook = AfterHook<CartLineItem>;
 type CartUpdateBeforeHook = BeforeHook<UpdateCartItemInput>;
 type CartUpdateAfterHook = AfterHook<CartLineItem>;
 
-function makeContext(
-  actor: Actor | null,
-  services: Record<string, unknown>,
-  database: DatabaseAdapter,
-  config: CommerceConfig,
-  tx: unknown = null,
-): HookContext {
-  return createHookContext({
-    actor,
-    tx,
-    logger: createLogger("cart"),
-    services,
-    context: { moduleName: "cart" },
-    database: { db: database.db as PluginDb },
-    commerceConfig: config,
-  });
-}
 
 function isExpired(cart: Cart): boolean {
   return cart.expiresAt.getTime() < Date.now();
@@ -283,7 +260,7 @@ export class CartService {
       );
     }
 
-    const context = makeContext(actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx);
+    const context = createModuleHookContext("cart", this.deps, actor ?? null, ctx?.tx);
     const beforeHooks = this.deps.hooks.resolve(
       "cart.beforeAddItem",
     ) as CartAddBeforeHook[];
@@ -448,7 +425,7 @@ export class CartService {
       return Err(new CommerceNotFoundError("Cart item not found."));
     }
 
-    const context = makeContext(actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx);
+    const context = createModuleHookContext("cart", this.deps, actor ?? null, ctx?.tx);
     const beforeHooks = this.deps.hooks.resolve(
       "cart.beforeRemoveItem",
     ) as CartRemoveBeforeHook[];
@@ -496,7 +473,7 @@ export class CartService {
       );
     }
 
-    const context = makeContext(actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx);
+    const context = createModuleHookContext("cart", this.deps, actor ?? null, ctx?.tx);
     const beforeHooks = this.deps.hooks.resolve(
       "cart.beforeUpdateQuantity",
     ) as CartUpdateBeforeHook[];
@@ -652,7 +629,7 @@ export class CartService {
       null,
       updated ?? cart,
       "recover",
-      makeContext(actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null),
+      createModuleHookContext("cart", this.deps, actor ?? null, ctx?.tx ?? null),
     );
 
     return Ok({

package/src/modules/catalog/entity-service.ts

@@ -12,17 +12,14 @@ import {
   runAfterHooks,
   runBeforeHooks,
 } from "../../kernel/hooks/executor.js";
-import { createHookContext } from "../../kernel/hooks/create-context.js";
+import { createModuleHookContext } from "../../kernel/hooks/create-context.js";
 import type {
   AfterHook,
   BeforeHook,
   HookContext,
 } from "../../kernel/hooks/types.js";
 import { Err, Ok, type Result } from "../../kernel/result.js";
-import { createLogger } from "../../utils/logger.js";
 import { paginate } from "../../utils/pagination.js";
-import type { JobsAdapter } from "../../kernel/jobs/adapter.js";
-import type { PluginDb } from "../../kernel/database/plugin-types.js";
 import type { CatalogWriteContext, TxContext } from "../../kernel/database/tx-context.js";
 import { createTxContext, isWriteContextTransactional } from "../../kernel/database/tx-context.js";
 import { canReadUnpublishedCatalog, isCatalogEntityVisible } from "./read-policy.js";
@@ -52,9 +49,6 @@ import type {
   Variant,
 } from "./repository/index.js";
 
-function hookDatabaseArg(database: CatalogServiceDeps["database"]): { database: { db: PluginDb } } {
-  return { database: { db: database.db as PluginDb } };
-}
 
 const attributeFields = ["title", "subtitle", "description", "richDescription", "seoTitle", "seoDescription"] as const;
 
@@ -64,15 +58,9 @@ export function catalogHookContext(
   ctx: CatalogWriteContext | undefined,
   operation: string,
 ): HookContext {
-  return createHookContext({
-    actor,
-    tx: isWriteContextTransactional(ctx) ? ctx.tx : null,
-    logger: createLogger(`catalog.${operation}`),
-    services: deps.services,
-    ...(deps.services.jobs ? { jobs: deps.services.jobs as JobsAdapter } : {}),
-    context: { moduleName: "catalog", ...(ctx?.hookContext ?? {}) },
-    ...hookDatabaseArg(deps.database),
-    commerceConfig: deps.config,
+  return createModuleHookContext("catalog", deps, actor, isWriteContextTransactional(ctx) ? ctx.tx : null, {
+    logScope: `catalog.${operation}`,
+    ...(ctx?.hookContext ? { context: ctx.hookContext } : {}),
   });
 }
 
@@ -336,13 +324,15 @@ export class EntityService {
     await this.repo.deleteVariantOptionValuesByEntityId(id, ctx);
     await this.repo.deleteVariantsByEntityId(id, ctx);
     await this.repo.deleteEntity(id, ctx);
+    const afterHooks = this.deps.hooks.resolve("catalog.afterDelete") as AfterHook<SellableEntity>[];
+    await runAfterHooks(afterHooks, existing, existing, "delete", catalogHookContext(this.deps, actor, ctx, "delete"), (hook) => this.deps.hooks.runsInTransaction(hook));
     return Ok(undefined);
   } catch (error) { return Err(toCommerceError(error)); } }
 
   async getById(id: string, options: GetOptions | undefined, actor: Actor | null, ctx?: TxContext): Promise<Result<CatalogEntityHydrated>> {
     const resolvedActor = actor ?? ctx?.actor ?? null;
     const orgId = resolveOrgIdForCommerce(resolvedActor, this.deps.config);
-    const context: HookContext = createHookContext({ actor: resolvedActor, tx: ctx?.tx ?? null, logger: createLogger("catalog.read"), services: this.deps.services, context: { moduleName: "catalog" }, ...hookDatabaseArg(this.deps.database), commerceConfig: this.deps.config });
+    const context: HookContext = createModuleHookContext("catalog", this.deps, resolvedActor, ctx?.tx ?? null, { logScope: "catalog.read" });
     const globalBeforeHooks = this.deps.hooks.resolve("catalog.beforeRead") as CatalogReadBeforeHook[];
     const globalAfterHooks = this.deps.hooks.resolve("catalog.afterRead") as CatalogReadAfterHook[];
     let processed = await runBeforeHooks(globalBeforeHooks, { id, ...(options !== undefined ? { options } : {}) }, "read", context);
@@ -389,7 +379,7 @@ export class EntityService {
   }
 
   async getBySlug(slug: string, options: GetOptions | undefined, actor: Actor | null, ctx?: TxContext): Promise<Result<CatalogEntityHydrated>> {
-    const context: HookContext = createHookContext({ actor: actor ?? null, tx: ctx?.tx ?? null, logger: createLogger("catalog.read"), services: this.deps.services, context: { moduleName: "catalog" }, ...hookDatabaseArg(this.deps.database), commerceConfig: this.deps.config });
+    const context: HookContext = createModuleHookContext("catalog", this.deps, actor ?? null, ctx?.tx ?? null, { logScope: "catalog.read" });
     const globalBeforeHooks = this.deps.hooks.resolve("catalog.beforeRead") as CatalogReadBeforeHook[];
     const globalAfterHooks = this.deps.hooks.resolve("catalog.afterRead") as CatalogReadAfterHook[];
     let processed = await runBeforeHooks(globalBeforeHooks, { slug, ...(options !== undefined ? { options } : {}) }, "read", context);
@@ -424,7 +414,7 @@ export class EntityService {
 
   async list(params: ListParams, actor: Actor | null, ctx?: TxContext): Promise<Result<CatalogListResult>> {
     const resolvedActor = actor ?? ctx?.actor ?? null;
-    const context: HookContext = createHookContext({ actor: resolvedActor, tx: ctx?.tx ?? null, logger: createLogger("catalog.list"), services: this.deps.services, context: { moduleName: "catalog" }, ...hookDatabaseArg(this.deps.database), commerceConfig: this.deps.config });
+    const context: HookContext = createModuleHookContext("catalog", this.deps, resolvedActor, ctx?.tx ?? null, { logScope: "catalog.list" });
     const globalBeforeHooks = this.deps.hooks.resolve("catalog.beforeList") as CatalogListBeforeHook[];
     const globalAfterHooks = this.deps.hooks.resolve("catalog.afterList") as CatalogListAfterHook[];
     let processed = await runBeforeHooks(globalBeforeHooks, params, "list", context);

package/src/modules/catalog/import-service.ts

@@ -29,6 +29,8 @@ import {
 import { prices } from "../pricing/schema.js";
 import { catalogHookContext } from "./entity-service.js";
 import type { CatalogServiceDeps } from "./service.js";
+import { isUniqueViolation } from "../../kernel/database/unique-violation.js";
+import { normalizeCurrency } from "../../utils/money.js";
 
 /**
  * The import fast path: a PAGE of new products lands in one transaction.
@@ -147,12 +149,6 @@ function failed(ref: string, code: ImportRowFailureCode, error: string): ImportP
   return { ref, status: "failed", code, error };
 }
 
-function isUniqueViolation(error: unknown): boolean {
-  if (typeof error !== "object" || error === null) return false;
-  const value = error as { code?: unknown; cause?: unknown };
-  if (value.code === "23505") return true;
-  return isUniqueViolation(value.cause);
-}
 
 /**
  * A row's failure names the constraint, not the statement: Drizzle's message carries the whole
@@ -169,9 +165,6 @@ function describeWriteError(error: unknown): string {
   return message.split("\n", 1)[0] ?? message;
 }
 
-function normaliseCurrency(currency: string): string {
-  return currency.trim().toUpperCase();
-}
 
 /** Everything that can be known wrong without a database. */
 function validateInMemory(page: ImportProduct[]): Map<number, Failure> {
@@ -215,7 +208,7 @@ function validateInMemory(page: ImportProduct[]): Map<number, Failure> {
       }
       for (const price of variant.prices ?? []) {
         if (!Number.isInteger(price.amount) || price.amount < 0) fail(`Variant "${variant.ref}" has a non-integer or negative amount for ${price.currency}.`);
-        if (normaliseCurrency(price.currency).length === 0) fail(`Variant "${variant.ref}" has a price with no currency.`);
+        if (normalizeCurrency(price.currency).length === 0) fail(`Variant "${variant.ref}" has a price with no currency.`);
       }
     }
     for (const path of item.ownedFieldPaths ?? []) {
@@ -382,7 +375,7 @@ async function writeItem(
         organizationId: orgId,
         entityId,
         variantId,
-        currency: normaliseCurrency(price.currency),
+        currency: normalizeCurrency(price.currency),
         amount: price.amount,
         ...(price.compareAtAmount !== undefined ? { compareAtAmount: price.compareAtAmount } : {}),
       };

package/src/modules/catalog/service.ts

@@ -60,6 +60,7 @@ import { EntityService } from "./entity-service.js";
 import { CategoryService } from "./category-service.js";
 import { BrandService } from "./brand-service.js";
 import { CatalogImportService, type ImportProduct, type ImportProductsOptions, type ImportProductsReport } from "./import-service.js";
+import { isUniqueViolation } from "../../kernel/database/unique-violation.js";
 
 // ─── Hand-written types (not derivable from a single z.infer) ───────────────
 
@@ -151,285 +152,6 @@ export interface CatalogEntityHydrated extends SellableEntity {
   pricing?: Array<{ id: string; currency: string; amount: number; compareAtAmount?: number | null; createdAt: Date }>;
 }
 
-export interface CatalogService {
-  readonly repository: CatalogRepository;
-  create(
-    input: CreateEntityInput,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CatalogEntityHydrated>>;
-  update(
-    id: string,
-    input: UpdateEntityInput,
-    actor: Actor | null,
-    ctx?: CatalogWriteContext,
-  ): Promise<Result<CatalogEntityHydrated>>;
-  delete(
-    id: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<void>>;
-  getById(
-    id: string,
-    options: GetOptions | undefined,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CatalogEntityHydrated>>;
-  getByIdForInternalUse(
-    id: string,
-    organizationId: string,
-    options?: GetOptions,
-    ctx?: TxContext,
-  ): Promise<Result<CatalogEntityHydrated>>;
-  getBySlug(
-    slug: string,
-    options: GetOptions | undefined,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CatalogEntityHydrated>>;
-  list(params: ListParams, actor: Actor | null, ctx?: TxContext): Promise<Result<CatalogListResult>>;
-  /** Returns undefined when no concrete ownership row applies to the field. */
-  resolveFieldOwner(
-    entityId: string,
-    fieldPath: FieldPath,
-    storeId: string,
-    ctx?: TxContext,
-    variantId?: string | null,
-  ): Promise<FieldOwner | undefined>;
-  /** Entity-level bulk resolution: variant-scoped ownership rows are not consulted. */
-  resolveFieldOwners(
-    entityId: string,
-    storeId: string,
-    ctx?: TxContext,
-  ): Promise<Map<FieldPath, FieldOwner>>;
-  setFieldOwner(
-    entityId: string,
-    fieldPath: FieldPath,
-    storeId: string | null,
-    owner: FieldOwner,
-    actor: Actor | null,
-    ctx?: TxContext,
-    variantId?: string | null,
-  ): Promise<Result<void>>;
-  listFieldOwnership(
-    entityId: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-    storeId?: string,
-  ): Promise<Result<CatalogFieldOwnership[]>>;
-  seedImportedFieldOwnership(
-    entityId: string,
-    storeId: string,
-    fieldPaths: FieldPath[],
-    ctx?: TxContext,
-  ): Promise<Result<void>>;
-  publish(
-    id: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CatalogEntityHydrated>>;
-  archive(
-    id: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CatalogEntityHydrated>>;
-  /**
-   * The import fast path: a page of NEW products in one transaction, per-item savepoints, one
-   * revision per item, one `catalog.afterImport` hook per page. See `import-service.ts`.
-   */
-  importProducts(
-    page: ImportProduct[],
-    options: ImportProductsOptions,
-    actor: Actor | null,
-    ctx?: CatalogWriteContext,
-  ): Promise<Result<ImportProductsReport>>;
-  discontinue(
-    id: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CatalogEntityHydrated>>;
-  setAttributes(
-    entityId: string,
-    locale: string,
-    attrs: SetAttributesInput,
-    actor: Actor | null,
-    ctx?: CatalogWriteContext,
-  ): Promise<Result<void>>;
-  approveCustomField(
-    entityId: string,
-    fieldName: string,
-    locale: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<SellableCustomField>>;
-  rejectCustomField(
-    entityId: string,
-    fieldName: string,
-    locale: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<SellableCustomField>>;
-  getAttributes(
-    entityId: string,
-    locale: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<SellableAttribute>>;
-  listCategories(
-    ctx?: TxContext,
-    opts?: { includeArchived?: boolean },
-  ): Promise<Result<CategorySummary[]>>;
-  createCategory(
-    input: CreateCategoryInput,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CategorySummary>>;
-  archiveCategory(
-    id: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CategorySummary>>;
-  restoreCategory(
-    id: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CategorySummary>>;
-  updateCategory(
-    id: string,
-    input: UpdateCategoryInput,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CategorySummary>>;
-  deleteCategory(
-    id: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<void>>;
-  addToCategory(
-    entityId: string,
-    categoryId: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<void>>;
-  removeFromCategory(
-    entityId: string,
-    categoryId: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<void>>;
-  listBrands(ctx?: TxContext): Promise<Result<Brand[]>>;
-  createBrand(
-    input: CreateBrandInput,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<Brand>>;
-  updateBrand(
-    id: string,
-    input: UpdateBrandInput,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<Brand>>;
-  deleteBrand(
-    id: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<void>>;
-  addToBrand(
-    entityId: string,
-    brandId: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<void>>;
-  removeFromBrand(
-    entityId: string,
-    brandId: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<void>>;
-  createOptionType(
-    input: CreateOptionTypeInput,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<OptionType>>;
-  createOptionValue(
-    input: CreateOptionValueInput,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<OptionValue>>;
-  createVariant(
-    input: CreateVariantInput,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<Variant>>;
-  generateVariants(
-    entityId: string,
-    strategy: VariantGenerationStrategy,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<Variant[]>>;
-  quickCreateVariant(
-    entityId: string,
-    input: { options: Record<string, string>; sku?: string | undefined; barcode?: string | undefined },
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<{ variant: Variant; created: boolean }>>;
-  bulkCreateVariants(
-    entityId: string,
-    input: { axes: Array<{ name: string; values: string[] }>; skuPrefix?: string | undefined },
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<{ created: Variant[]; skipped: number }>>;
-  /**
-   * Move the entity's `updated_at` and fire `catalog.afterUpdate` for a change to rows RELATED to
-   * it (links, media) — the versioning contract consumers rely on to re-read a product.
-   */
-  notifyEntityChanged(
-    entityId: string,
-    changedFieldPaths: readonly string[],
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<void>;
-  recordEntityRevision(
-    entityId: string,
-    actor: Actor | null,
-    reason?: SellableEntityRevisionReason,
-    ctx?: TxContext,
-  ): Promise<Result<SellableEntityRevision>>;
-  restoreEntityRevision(
-    entityId: string,
-    revisionId: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<CatalogEntityHydrated>>;
-  trimEntityRevisions(
-    actor: Actor | null,
-    olderThanDays?: number,
-    ctx?: TxContext,
-  ): Promise<Result<number>>;
-  listEntityFieldDefinitions(
-    actor?: Actor | null,
-    entityType?: string,
-    ctx?: TxContext,
-  ): Promise<Result<EntityFieldDefinitionRecord[]>>;
-  createEntityFieldDefinition(
-    input: CreateEntityFieldDefinitionInput,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<EntityFieldDefinitionRecord>>;
-  updateEntityFieldDefinition(
-    id: string,
-    input: UpdateEntityFieldDefinitionInput,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<EntityFieldDefinitionRecord>>;
-  archiveEntityFieldDefinition(
-    id: string,
-    actor: Actor | null,
-    ctx?: TxContext,
-  ): Promise<Result<EntityFieldDefinitionRecord>>;
-  resolveEntityFieldDefinitions: EntityFieldDefinitionResolver;
-}
-
 export interface CatalogServiceDeps {
   repository: CatalogRepository;
   hooks: HookRegistry;
@@ -452,14 +174,8 @@ export type CategorySummary = {
   metadata: Record<string, unknown>;
 };
 
-function isUniqueViolation(error: unknown): boolean {
-  if (error == null || typeof error !== "object") return false;
-  const value = error as { code?: unknown; cause?: unknown };
-  if (value.code === "23505") return true;
-  return isUniqueViolation(value.cause);
-}
 
-export class CatalogServiceImpl implements CatalogService {
+export class CatalogServiceImpl {
   readonly repository: CatalogRepository;
   private readonly database: DatabaseAdapter;
   private readonly config: CommerceConfig;

package/src/modules/customers/service.ts

@@ -4,14 +4,12 @@ import type { Actor } from "../../auth/types.js";
 import type { CommerceConfig } from "../../config/types.js";
 import { CommerceNotFoundError, toCommerceError } from "../../kernel/errors.js";
 import { runAfterHooks } from "../../kernel/hooks/executor.js";
-import { createHookContext } from "../../kernel/hooks/create-context.js";
+import { createModuleHookContext } from "../../kernel/hooks/create-context.js";
 import type { HookRegistry } from "../../kernel/hooks/registry.js";
-import type { AfterHook, HookContext } from "../../kernel/hooks/types.js";
+import type { AfterHook } from "../../kernel/hooks/types.js";
 import { Err, Ok, type Result } from "../../kernel/result.js";
 import type { DatabaseAdapter } from "../../kernel/database/adapter.js";
-import type { PluginDb } from "../../kernel/database/plugin-types.js";
 import type { TxContext } from "../../kernel/database/tx-context.js";
-import { createLogger } from "../../utils/logger.js";
 import type {
   CustomersRepository,
   Customer,
@@ -28,23 +26,6 @@ interface CustomerServiceDeps {
   database: DatabaseAdapter;
 }
 
-function hookContext(
-  actor: Actor | null,
-  services: Record<string, unknown>,
-  database: DatabaseAdapter,
-  config: CommerceConfig,
-  tx: unknown,
-): HookContext {
-  return createHookContext({
-    actor,
-    tx,
-    logger: createLogger("customers"),
-    services,
-    context: { moduleName: "customers" },
-    database: { db: database.db as PluginDb },
-    commerceConfig: config,
-  });
-}
 
 export class CustomerService {
   private readonly repo: CustomersRepository;
@@ -101,7 +82,7 @@ export class CustomerService {
     const afterHooks = this.deps.hooks.resolve(
       "customers.afterCreate",
     ) as AfterHook<Customer>[];
-    const hctx = hookContext(actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null);
+    const hctx = createModuleHookContext("customers", this.deps, actor ?? null, ctx?.tx ?? null);
     await runAfterHooks(afterHooks, null, customer, "create", hctx, (hook) => this.deps.hooks.runsInTransaction(hook));
 
     return Ok(customer);
@@ -202,7 +183,7 @@ export class CustomerService {
     const afterHooks = this.deps.hooks.resolve(
       "customers.afterCreate",
     ) as AfterHook<Customer>[];
-    const hctx = hookContext(actor, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null);
+    const hctx = createModuleHookContext("customers", this.deps, actor, ctx?.tx ?? null);
     await runAfterHooks(afterHooks, null, customer, "create", hctx, (hook) => this.deps.hooks.runsInTransaction(hook));
 
     return customer;
@@ -282,9 +263,7 @@ export class CustomerService {
     const afterHooks = this.deps.hooks.resolve(
       "customers.afterUpdate",
     ) as AfterHook<Customer>[];
-    const hctx = hookContext(
-      actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null,
-    );
+    const hctx = createModuleHookContext("customers", this.deps, actor ?? ctx?.actor ?? null, ctx?.tx ?? null);
     await runAfterHooks(afterHooks, existing, updated, "update", hctx, (hook) => this.deps.hooks.runsInTransaction(hook));
 
     return Ok(updated);
@@ -315,7 +294,7 @@ export class CustomerService {
     const afterHooks = this.deps.hooks.resolve(
       "customers.afterUpdate",
     ) as AfterHook<Customer>[];
-    const hctx = hookContext(resolvedActor, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null);
+    const hctx = createModuleHookContext("customers", this.deps, resolvedActor, ctx?.tx ?? null);
     await runAfterHooks(afterHooks, customer, updated, "update", hctx, (hook) => this.deps.hooks.runsInTransaction(hook));
 
     return Ok(updated);

package/src/modules/documents/render.ts

@@ -1,5 +1,7 @@
 import type { HydratedOrder } from "../orders/service.js";
 import { A4, type PdfTextOp } from "./pdf.js";
+import { escapeHtml } from "../../utils/escape-html.js";
+import { formatAmount } from "../../utils/money.js";
 
 /** Branding values read from the settings module's `branding` group. */
 export interface DocumentBranding {
@@ -19,25 +21,6 @@ export interface DocumentContext {
   invoiceNumber: string;
 }
 
-export function escapeHtml(value: unknown): string {
-  return String(value ?? "")
-    .replaceAll("&", "&")
-    .replaceAll("<", "&lt;")
-    .replaceAll(">", "&gt;")
-    .replaceAll('"', "&quot;")
-    .replaceAll("'", "&#39;");
-}
-
-/** Minor units → "1,234.50 LKR". */
-export function formatAmount(minor: number, currency: string): string {
-  const major = minor / 100;
-  const formatted = major.toLocaleString("en-US", {
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 2,
-  });
-  return `${formatted} ${currency}`;
-}
-
 function formatDate(date: Date | string | null | undefined): string {
   if (!date) return "";
   const d = typeof date === "string" ? new Date(date) : date;