fix(cli): use pre-separated fixture for continuePrevious/join conformance tests

Author: harbournick

apps/cli/src/__tests__/conformance/harness.ts

@@ -2,7 +2,12 @@ import { copyFile, mkdtemp, mkdir, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { run } from '../../index';
-import { resolveListDocFixture, resolveSourceDocFixture, resolveTocDocFixture } from '../fixtures';
+import {
+  resolveListDocFixture,
+  resolvePreSeparatedListFixture,
+  resolveSourceDocFixture,
+  resolveTocDocFixture,
+} from '../fixtures';
 
 type RunResult = {
   code: number;
@@ -125,6 +130,12 @@ export class ConformanceHarness {
     return filePath;
   }
 
+  async copyPreSeparatedListDoc(label: string): Promise<string> {
+    const filePath = path.join(this.docsDir, `${this.nextId()}-${label}.docx`);
+    await copyFile(await resolvePreSeparatedListFixture(), filePath);
+    return filePath;
+  }
+
   async copyTocFixtureDoc(label: string, stateDir: string): Promise<string> {
     const filePath = path.join(this.docsDir, `${this.nextId()}-${label}.docx`);
 

apps/cli/src/__tests__/conformance/scenarios.ts

@@ -156,56 +156,34 @@ type ListTargetPreparation = {
   target: Record<string, unknown>;
 };
 
+/**
+ * Load a pre-separated list fixture (two adjacent lists that share the same
+ * abstractNumId) and resolve the second list item as the target.
+ *
+ * This avoids a runtime `lists separate` → DOCX export → re-import round-trip
+ * which can lose numbering definition compatibility on some platforms.
+ */
 async function prepareSeparatedSecondListTarget(
   harness: ConformanceHarness,
   stateDir: string,
   label: string,
 ): Promise<ListTargetPreparation> {
-  const sourceDoc = await harness.copyListFixtureDoc(`${label}-source`);
+  const docPath = await harness.copyPreSeparatedListDoc(label);
+  const items = await listDiscoveryItems(harness, stateDir, docPath, 10);
 
-  // Discover source items for diagnostics.
-  const sourceItems = await listDiscoveryItems(harness, stateDir, sourceDoc, 10);
-  if (sourceItems.length < 2) {
+  if (items.length < 2) {
     throw new Error(
-      `[${label}] Source fixture has fewer than 2 list items (found ${sourceItems.length}). ` +
-        `Items: ${JSON.stringify(sourceItems)}`,
+      `[${label}] Pre-separated fixture has fewer than 2 list items (found ${items.length}). ` +
+        `Items: ${JSON.stringify(items)}`,
     );
   }
 
-  const secondItem = sourceItems[1]?.address;
-  if (!secondItem || typeof secondItem !== 'object') {
-    throw new Error(`[${label}] Second list item has no address. Items: ${JSON.stringify(sourceItems)}`);
+  const target = items[1]?.address;
+  if (!target || typeof target !== 'object') {
+    throw new Error(`[${label}] Second list item has no address. Items: ${JSON.stringify(items)}`);
   }
 
-  const separatedDoc = harness.createOutputPath(`${label}-separated`);
-  const separated = await harness.runCli(
-    ['lists', 'separate', sourceDoc, '--target-json', JSON.stringify(secondItem), '--out', separatedDoc],
-    stateDir,
-  );
-  if (separated.result.code !== 0 || separated.envelope.ok !== true) {
-    throw new Error(
-      `[${label}] lists separate failed. code=${separated.result.code} ` +
-        `envelope=${JSON.stringify(separated.envelope)} ` +
-        `target=${JSON.stringify(secondItem)} ` +
-        `stderr=${separated.result.stderr.trim() || '<empty>'}`,
-    );
-  }
-
-  // Re-resolve from the output document (node IDs may change across write/reload).
-  const postItems = await listDiscoveryItems(harness, stateDir, separatedDoc, 10);
-  if (postItems.length < 2) {
-    throw new Error(
-      `[${label}] Post-separation doc has fewer than 2 list items (found ${postItems.length}). ` +
-        `Items: ${JSON.stringify(postItems)}`,
-    );
-  }
-
-  const separatedSecondItem = postItems[1]?.address;
-  if (!separatedSecondItem || typeof separatedSecondItem !== 'object') {
-    throw new Error(`[${label}] Post-separation second item has no address. Items: ${JSON.stringify(postItems)}`);
-  }
-
-  return { docPath: separatedDoc, target: separatedSecondItem };
+  return { docPath, target };
 }
 
 function sectionMutationScenario(

apps/cli/src/__tests__/fixtures.ts

@@ -15,6 +15,10 @@ const LIST_SOURCE_DOC_CANDIDATES = [
   path.join(REPO_ROOT, 'e2e-tests/test-data/basic-documents/lists-complex-items.docx'),
 ];
 
+const PRE_SEPARATED_LIST_CANDIDATES = [
+  path.join(REPO_ROOT, 'packages/super-editor/src/tests/data/pre-separated-list.docx'),
+];
+
 const TOC_SOURCE_DOC_CANDIDATES = [
   path.join(REPO_ROOT, 'test-corpus/basic/table-of-contents.docx'),
   path.join(REPO_ROOT, 'test-corpus/basic/table-of-contents-sdt.docx'),
@@ -23,6 +27,7 @@ const TOC_SOURCE_DOC_CANDIDATES = [
 
 let resolvedSourceDoc: string | null = null;
 let resolvedListSourceDoc: string | null = null;
+let resolvedPreSeparatedListDoc: string | null = null;
 let resolvedTocSourceDoc: string | null = null;
 
 async function resolveFixture(candidates: string[], fixtureLabel: string): Promise<string> {
@@ -50,6 +55,12 @@ export async function resolveListDocFixture(): Promise<string> {
   return resolvedListSourceDoc;
 }
 
+export async function resolvePreSeparatedListFixture(): Promise<string> {
+  if (resolvedPreSeparatedListDoc != null) return resolvedPreSeparatedListDoc;
+  resolvedPreSeparatedListDoc = await resolveFixture(PRE_SEPARATED_LIST_CANDIDATES, 'pre-separated list');
+  return resolvedPreSeparatedListDoc;
+}
+
 export async function resolveTocDocFixture(): Promise<string> {
   if (resolvedTocSourceDoc != null) return resolvedTocSourceDoc;
   resolvedTocSourceDoc = await resolveFixture(TOC_SOURCE_DOC_CANDIDATES, 'table-of-contents');