fix(fields): share section pages resolver

Author: luccas-harbour

packages/super-editor/src/editors/v1/document-api-adapters/helpers/section-page-count.ts

@@ -0,0 +1,16 @@
+import { formatPageNumber, type PageNumberFormat } from '@superdoc/contracts';
+import type { Editor } from '../../core/Editor.js';
+
+export function resolveSectionPageCountFieldValue(
+  editor: Editor,
+  node: { attrs?: Record<string, unknown> },
+): string | null {
+  const sectionPageCount = editor.options?.sectionPageCount;
+  if (sectionPageCount == null) return null;
+
+  const pageNumberFormat = node.attrs?.pageNumberFormat;
+  if (typeof pageNumberFormat === 'string' && pageNumberFormat) {
+    return formatPageNumber(Number(sectionPageCount) || 1, pageNumberFormat as PageNumberFormat);
+  }
+  return String(sectionPageCount);
+}

packages/super-editor/src/editors/v1/document-api-adapters/plan-engine/field-wrappers.section-pages.test.ts

@@ -33,9 +33,13 @@ const schema = new Schema({
   },
 });
 
-function createEditorWithSectionPageCount(sectionPageCount?: number, initialValue = '1'): Editor {
+function createEditorWithSectionPageCount(
+  sectionPageCount?: number,
+  initialValue = '1',
+  pageNumberFormat?: string,
+): Editor {
   const field = schema.nodes['section-page-count'].create(
-    { instruction: 'SECTIONPAGES', resolvedText: initialValue },
+    { instruction: 'SECTIONPAGES', resolvedText: initialValue, pageNumberFormat },
     schema.text(initialValue),
   );
   const paragraph = schema.nodes.paragraph.create({ sdBlockId: 'block-1' }, field);
@@ -70,6 +74,20 @@ describe('fieldsRebuildWrapper SECTIONPAGES fields', () => {
     expect(updatedField?.textContent).toBe('4');
   });
 
+  it('formats rebuilt section-page-count values with pageNumberFormat', () => {
+    const editor = createEditorWithSectionPageCount(4, '1', 'upperRoman');
+
+    const result = fieldsRebuildWrapper(editor, {
+      target: { kind: 'field', blockId: 'block-1', occurrenceIndex: 0, nestingDepth: 0 },
+    });
+
+    expect(result.success).toBe(true);
+    const updatedField = editor.state.doc.nodeAt(1);
+    expect(updatedField?.type.name).toBe('section-page-count');
+    expect(updatedField?.attrs.resolvedText).toBe('IV');
+    expect(updatedField?.textContent).toBe('IV');
+  });
+
   it('preserves existing section-page-count text when section page context is unavailable', () => {
     const editor = createEditorWithSectionPageCount(undefined, '3');
 

packages/super-editor/src/editors/v1/document-api-adapters/plan-engine/field-wrappers.ts

@@ -3,7 +3,6 @@
  */
 
 import type { Editor } from '../../core/Editor.js';
-import { formatPageNumber, type PageNumberFormat } from '@superdoc/contracts';
 import type {
   FieldListInput,
   FieldGetInput,
@@ -30,6 +29,7 @@ import { rejectTrackedMode } from '../helpers/mutation-helpers.js';
 import { clearIndexCache } from '../helpers/index-cache.js';
 import { DocumentApiAdapterError } from '../errors.js';
 import { getWordStatistics, resolveDocumentStatFieldValue, resolveMainBodyEditor } from '../helpers/word-statistics.js';
+import { resolveSectionPageCountFieldValue } from '../helpers/section-page-count.js';
 
 // ---------------------------------------------------------------------------
 // Result helpers
@@ -404,17 +404,6 @@ function rebuildSectionPageCount(
   return fieldSuccess(address);
 }
 
-function resolveSectionPageCountFieldValue(editor: Editor, node: { attrs?: Record<string, unknown> }): string | null {
-  const sectionPageCount = editor.options?.sectionPageCount;
-  if (sectionPageCount == null) return null;
-
-  const pageNumberFormat = node.attrs?.pageNumberFormat;
-  if (typeof pageNumberFormat === 'string' && pageNumberFormat) {
-    return formatPageNumber(Number(sectionPageCount) || 1, pageNumberFormat as PageNumberFormat);
-  }
-  return String(sectionPageCount);
-}
-
 export function fieldsRemoveWrapper(
   editor: Editor,
   input: FieldRemoveInput,

packages/super-editor/src/editors/v1/extensions/field-update/field-update.js

@@ -6,7 +6,7 @@ import {
   resolveDocumentStatFieldValue,
   resolveMainBodyEditor,
 } from '../../document-api-adapters/helpers/word-statistics.js';
-import { formatPageNumber } from '@superdoc/contracts';
+import { resolveSectionPageCountFieldValue } from '../../document-api-adapters/helpers/section-page-count.js';
 
 /** Stat-field types refreshed by F9 when the doc has no TOCs. */
 const UPDATABLE_FIELD_TYPES = new Set(['NUMWORDS', 'NUMCHARS', 'NUMPAGES', 'SECTIONPAGES']);
@@ -142,13 +142,3 @@ export const FieldUpdate = Extension.create({
     };
   },
 });
-
-function resolveSectionPageCountFieldValue(editor, node) {
-  const sectionPageCount = editor?.options?.sectionPageCount;
-  if (sectionPageCount == null) return null;
-
-  if (node?.attrs?.pageNumberFormat) {
-    return formatPageNumber(Number(sectionPageCount) || 1, node.attrs.pageNumberFormat);
-  }
-  return String(sectionPageCount);
-}