@open-press/core 0.6.0 → 0.7.0

package/src/openpress/workbench.tsx

@@ -33,18 +33,14 @@ import {
   ProjectEntryPanel,
   type ProjectMentionItem,
 } from "./projectWorkspace";
-import { paginateSourcePages, type PaginatedPage } from "./pagination";
+import { createAnchorPageMap, resolveAnchorPageIndex } from "./anchorMap";
 import { scheduleBrowserFrame } from "./frameScheduler";
 import {
-  createAnchorPageMap,
-  numberSourceHeadings,
   PUBLIC_DRAWER_BREAKPOINT,
   PublicPage,
-  resolveAnchorPageIndex,
   useViewMode,
 } from "./publicPage";
 import { getProjectIdentity } from "./projectIdentity";
-import { hasBuildTimePagination } from "./reactDocumentMetadata";
 import { buildPublicPreviewHref, isLocalWorkspaceHost } from "./runtimeMode";
 import { useReaderRuntime } from "./readerRuntime";
 import type { DeploymentInfo, ReaderDocument, HtmlPageBlock, SourceBlock } from "./types";
@@ -123,14 +119,9 @@ export function HtmlWorkbench({
   deploymentInfo: DeploymentInfo;
 }) {
   const sourceContainerRef = useRef<HTMLDivElement | null>(null);
-  const numberedPages = useMemo(() => numberSourceHeadings(pages), [pages]);
+  const displayPages = pages;
   const viewModeState = useViewMode();
   const { viewMode } = viewModeState;
-  const buildTimePaginated = hasBuildTimePagination(document);
-  const [paginatedPages, setPaginatedPages] = useState<PaginatedPage[] | null>(null);
-  const displayPages: DisplayPage[] = viewMode === "paged" && !buildTimePaginated
-    ? (paginatedPages ?? numberedPages)
-    : numberedPages;
   const mediaAssets = useMemo(() => collectMediaAssetIndex(displayPages), [displayPages]);
   const anchorPageMap = useMemo(() => createAnchorPageMap(displayPages), [displayPages]);
   const projectComponentUsages = useMemo(() => createProjectComponentUsages(displayPages), [displayPages]);
@@ -163,7 +154,6 @@ export function HtmlWorkbench({
   const pdfButtonText = workbenchPdfButtonText(localDeployEnabled, pdfActionStatus, staticPdfHref);
   const pdfStatusMessage = workbenchPdfStatusMessage(localDeployEnabled, pdfActionStatus);
   const pdfButtonDisabled = localDeployEnabled ? pdfActionStatus === "generating" || pdfActionStatus === "opening" : !staticPdfHref;
-  const activePaginatedReady = viewMode === "reading" || buildTimePaginated || Boolean(paginatedPages);
   const inspectorSelectionLabel = formatInspectorSelection(inspector.selectedBlock);
   const activeInlineSavedComment = getInlineSavedCommentForTarget(inlineSavedComment, inspector.selectedTarget);
   const inspectorCommentDisabled = !inspector.selectedBlock || !inspectorCommentText.trim() || inspectorCommentStatus === "submitting";
@@ -392,10 +382,6 @@ export function HtmlWorkbench({
     scheduleBrowserFrame(() => reader.setPage(reader.currentPageIndex, { behavior: "auto" }));
   };
 
-  useLayoutEffect(() => {
-    setPaginatedPages(null);
-  }, [numberedPages]);
-
   useEffect(() => {
     setInspectorCommentStatus("idle");
     setInspectorCommentError("");
@@ -407,24 +393,6 @@ export function HtmlWorkbench({
     void refreshPendingComments();
   }, [devMode, refreshPendingComments, workspaceView]);
 
-  useLayoutEffect(() => {
-    if (buildTimePaginated) return undefined;
-    if (viewMode !== "paged" || paginatedPages) return undefined;
-    const sourceContainer = sourceContainerRef.current;
-    if (!sourceContainer) return undefined;
-
-    let cancelled = false;
-    const cancelFrame = scheduleBrowserFrame(() => {
-      const nextPages = paginateSourcePages(sourceContainer, numberedPages);
-      if (!cancelled) setPaginatedPages(nextPages);
-    });
-
-    return () => {
-      cancelled = true;
-      cancelFrame();
-    };
-  }, [buildTimePaginated, numberedPages, paginatedPages, viewMode]);
-
   const actionSection = (
     <section className="openpress-public-action-section" aria-label="輸出">
       <span className="openpress-public-action-heading">輸出</span>
@@ -512,7 +480,6 @@ export function HtmlWorkbench({
         className={`reader-app openpress-reader-app openpress-public-viewer openpress-dev-public-viewer is-ready${reader.rightPanelOpen ? "" : " is-closed-right"}`}
         data-openpress-react-runtime="true"
         data-openpress-view-mode={viewMode}
-        data-openpress-pagination={activePaginatedReady ? "ready" : "pending"}
         data-openpress-inspector-mode={inspector.inspectorMode ? "on" : "off"}
         data-active-workspace={workspaceView}
       >
@@ -533,7 +500,6 @@ export function HtmlWorkbench({
               pages={displayPages}
               currentPageIndex={reader.currentPageIndex}
               devMode={devMode}
-              paginatedReady={activePaginatedReady}
               sourceContainerRef={sourceContainerRef}
               registerPage={reader.registerPage}
               exposeSourceData={devMode}

package/src/styles/openpress/responsive.css

@@ -269,12 +269,6 @@
     box-shadow: none;
   }
 
-  .openpress-public-viewer.openpress-reader-app[data-openpress-pagination="pending"] .openpress-public-navigation {
-    transform: translateX(-110%);
-    pointer-events: none;
-    box-shadow: none;
-  }
-
   .openpress-public-viewer.openpress-reader-app .openpress-public-scrim {
     position: fixed;
     inset: 0;
@@ -309,14 +303,6 @@
     display: block;
   }
 
-  .openpress-public-viewer.openpress-reader-app[data-openpress-pagination="pending"] .openpress-public-scrim {
-    display: none;
-  }
-
-  .openpress-public-viewer.openpress-reader-app[data-openpress-pagination="pending"] .openpress-public-fab {
-    display: flex;
-  }
-
   .openpress-public-viewer[data-openpress-view-mode="paged"] .reader-pages {
     --openpress-public-page-width: min(
       var(--openpress-page-width),

package/tsconfig.json

@@ -17,7 +17,10 @@
     "noEmit": true,
     "jsx": "react-jsx",
     "paths": {
-      "@openpress/core": ["./src/openpress/core/index.tsx"],
+      "@open-press/core": ["./src/openpress/core/index.tsx"],
+      "@open-press/core/mdx": ["./src/openpress/mdx/index.ts"],
+      "@open-press/core/manuscript": ["./src/openpress/manuscript/index.tsx"],
+      "@open-press/core/numbering": ["./src/openpress/numbering/index.ts"],
       "@/components": ["./document/components/index.ts", "./document/components/index.tsx"],
       "@/components/*": ["./document/components/*"],
       "@/*": ["./src/*"]

package/vite.config.ts

@@ -5,7 +5,7 @@ import path from "node:path";
 import type { IncomingMessage, ServerResponse } from "node:http";
 import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
-import { loadConfig, publicPdfHref } from "./engine/config.mjs";
+import { loadConfig, publicPdfHref } from "./engine/runtime/config.mjs";
 import { handleCommentRequest } from "./engine/react/comment-endpoint.mjs";
 import { handleProjectAssetRequest } from "./engine/react/project-asset-endpoint.mjs";
 
@@ -15,8 +15,11 @@ const workspaceRoot = process.env.OPENPRESS_WORKSPACE_ROOT
   : frameworkRoot;
 const sourceRoot = path.join(frameworkRoot, "src");
 const openpressCliPath = path.join(frameworkRoot, "engine", "cli.mjs");
-const staticServerPath = path.join(frameworkRoot, "engine", "static-server.mjs");
+const staticServerPath = path.join(frameworkRoot, "engine", "output", "static-server.mjs");
 const openpressCoreEntry = path.join(frameworkRoot, "src", "openpress", "core", "index.tsx");
+const openpressMdxEntry = path.join(frameworkRoot, "src", "openpress", "mdx", "index.ts");
+const openpressManuscriptEntry = path.join(frameworkRoot, "src", "openpress", "manuscript", "index.tsx");
+const openpressNumberingEntry = path.join(frameworkRoot, "src", "openpress", "numbering", "index.ts");
 const openpressConfig = await loadConfig(workspaceRoot);
 const outputDir = openpressConfig.paths.outputDir;
 const reactDocumentRoot = openpressConfig.paths.documentRoot;
@@ -55,7 +58,11 @@ export default defineConfig({
   resolve: {
     dedupe: ["react", "react-dom", "@mdx-js/react"],
     alias: {
-      "@openpress/core": openpressCoreEntry,
+      // Subpaths must come before the base path so resolution matches longest first.
+      "@open-press/core/mdx": openpressMdxEntry,
+      "@open-press/core/manuscript": openpressManuscriptEntry,
+      "@open-press/core/numbering": openpressNumberingEntry,
+      "@open-press/core": openpressCoreEntry,
       "@/components": reactDocumentComponentsRoot,
       "@": sourceRoot,
       ...workspaceAliases,

package/engine/commands/migrate-to-react.mjs

@@ -1,27 +0,0 @@
-import { migrateLegacyWorkspaceToReact } from "../react/migrate-to-react.mjs";
-import { validateWorkspace } from "../validation.mjs";
-
-export async function run({ root, config, options }) {
-  const result = await migrateLegacyWorkspaceToReact(root, config, {
-    dryRun: options.dryRun,
-    force: options.force,
-  });
-
-  if (options.json) {
-    console.log(JSON.stringify(result, null, 2));
-    return 0;
-  }
-
-  const verb = options.dryRun ? "would create" : "created";
-  console.log(`OpenPress migrate-to-react ${verb} ${result.files.length} paths from ${result.sourceFiles} legacy files:`);
-  for (const file of result.files) {
-    console.log(`  ${file.action.padEnd(5)} ${file.path}`);
-  }
-
-  if (!options.dryRun) {
-    const report = await validateWorkspace(root);
-    console.log(report.ok ? `OpenPress validation OK\nChecked: ${report.checked.join(", ")}` : report.format());
-    return report.ok ? 0 : 1;
-  }
-  return 0;
-}

package/engine/page-renderer.mjs

@@ -1,217 +0,0 @@
-const TOC_ENTRIES_PER_PAGE = 24;
-
-function renderPageShell(sectionClass, bodyHtml, attrs = "", { kind, footer = true } = {}) {
-  const className = footer === false ? addClass(sectionClass, "no-footer") : sectionClass;
-  const attrsPart = pageAttrs(attrs, { kind, footer });
-  const footerHtml = footer === false ? "" : `
-    <footer class="page-footer" aria-hidden="true"></footer>`;
-  return `<section class="${className}"${attrsPart}>
-  <div class="page-frame">
-    <header class="page-header" aria-hidden="true"></header>
-    <main class="page-body">
-${bodyHtml.trim()}
-    </main>${footerHtml}
-  </div>
-</section>`;
-}
-
-export function renderToc({ title, items, className } = {}) {
-  const headingText = typeof title === "string" && title.trim() ? title.trim() : "Contents";
-  const tocItems = Array.isArray(items) ? items : [];
-  const tocChunks = tocItems.length > 0 ? chunkArray(tocItems, TOC_ENTRIES_PER_PAGE) : [[]];
-
-  return tocChunks.map((chunk, pageIndex) => {
-    const isContinuation = pageIndex > 0;
-    const pageId = pageIndex === 0 ? "toc" : `toc-${String(pageIndex + 1).padStart(2, "0")}`;
-    const headingId = pageIndex === 0 ? "toc-title" : `${pageId}-title`;
-    const pageHeadingText = isContinuation ? tocContinuationTitle(headingText) : headingText;
-    const headingClass = isContinuation ? ` class="toc-heading toc-heading--continuation"` : ` class="toc-heading"`;
-    const tocList = chunk.length > 0
-      ? `
-  <ol class="toc-list">
-${chunk.map((item, index) => {
-  const level = item.level === 3 ? 3 : 2;
-  const absoluteIndex = pageIndex * TOC_ENTRIES_PER_PAGE + index;
-  const label = item.label || (level === 2 ? `#${absoluteIndex + 1}` : "");
-  const targetPageIndex = Math.max(0, Number(item.pageNumber || 1) - 1);
-  return `    <li class="toc-level-${level}"><a href="#${escapeAttr(item.id)}" data-openpress-anchor="${escapeAttr(item.id)}" data-openpress-target-page-index="${targetPageIndex}"><span class="toc-index" data-toc-index="${escapeAttr(label)}">${escapeHtml(label)}</span><span class="toc-title">${escapeHtml(item.title)}</span><span class="toc-page">${String(item.pageNumber).padStart(2, "0")}</span></a></li>`;
-}).join("\n")}
-  </ol>
-`
-      : "";
-    return renderPageShell(
-      tocPageClassName(className, isContinuation),
-      `
-  <h2 id="${headingId}"${headingClass}>${escapeHtml(pageHeadingText)}</h2>
-${tocList}
-`,
-      [
-        `id="${pageId}"`,
-        `data-page-title="${escapeAttr(headingText)}"`,
-        `data-toc-continuation="${isContinuation ? "true" : "false"}"`,
-        `aria-labelledby="${headingId}"`,
-      ].filter(Boolean).join(" "),
-      { kind: "toc", footer: false },
-    );
-  }).join("\n\n");
-}
-
-function tocContinuationTitle(title) {
-  return title === "目錄" ? "目錄續" : `${title} continued`;
-}
-
-function pageAttrs(attrs, { kind, footer } = {}) {
-  const parts = [];
-  if (attrs.trim()) parts.push(attrs.trim());
-  if (kind && !hasAttr(attrs, "data-page-kind")) parts.push(`data-page-kind="${escapeAttr(kind)}"`);
-  if (footer === false && !hasAttr(attrs, "data-page-footer")) parts.push('data-page-footer="false"');
-  return parts.length ? ` ${parts.join(" ")}` : "";
-}
-
-function hasAttr(attrs, name) {
-  return new RegExp(`\\b${name}=`).test(attrs);
-}
-
-function addClass(className, extraClass) {
-  const classes = className.split(/\s+/).filter(Boolean);
-  if (!classes.includes(extraClass)) classes.push(extraClass);
-  return classes.join(" ");
-}
-
-export function injectStaticToc(pages) {
-  const tocItems = collectTocItems(pages);
-  if (tocItems.length === 0) return pages;
-  const tocIndex = pages.findIndex((page) => hasPageKind(page.match(/^<section[^>]*>/i)?.[0] ?? "", "toc"));
-  const tocPageCount = Math.max(1, Math.ceil(tocItems.length / TOC_ENTRIES_PER_PAGE));
-  const tocPageNumber = tocIndex + 1;
-  const adjustedTocItems = tocPageCount > 1 && tocIndex >= 0
-    ? tocItems.map((item) => ({
-      ...item,
-      pageNumber: item.pageNumber > tocPageNumber ? item.pageNumber + tocPageCount - 1 : item.pageNumber,
-    }))
-    : tocItems;
-
-  return pages.map((page) => {
-    const openingTag = page.match(/^<section[^>]*>/i)?.[0] ?? "";
-    if (!hasPageKind(openingTag, "toc")) return page;
-    const title = extractAttr(openingTag, "data-page-title");
-    return renderToc({ title, items: adjustedTocItems, className: extractAttr(openingTag, "class") });
-  });
-}
-
-function tocPageClassName(className, isContinuation) {
-  const classes = new Set(String(className || "reader-page reader-page--toc").split(/\s+/).filter(Boolean));
-  classes.delete("toc");
-  classes.add("reader-page");
-  classes.add("reader-page--toc");
-  if (isContinuation) classes.add("toc-continuation");
-  else classes.delete("toc-continuation");
-  return [...classes].join(" ");
-}
-
-function extractAttr(openingTag, name) {
-  const re = new RegExp(`${name}="([^"]*)"`);
-  return openingTag.match(re)?.[1];
-}
-
-function collectTocItems(pages) {
-  const items = [];
-  let chapterIndex = 0;
-  let sectionIndex = 0;
-  let pendingChapterOpener;
-
-  pages.forEach((page, index) => {
-    const openingTag = page.match(/^<section[^>]*>/i)?.[0] ?? "";
-    if (hasPageKind(openingTag, "chapter-opener")) {
-      pendingChapterOpener = extractChapterOpenerTarget(page, index);
-      return;
-    }
-
-    if (!hasContentPageKind(openingTag)) return;
-
-    let pageStartedChapter = false;
-    const headings = [...page.matchAll(/<h([23])\b[^>]*\bid="([^"]+)"[^>]*>([\s\S]*?)<\/h\1>/gi)];
-    headings.forEach((heading) => {
-      const level = Number(heading[1]);
-      if (level === 2) {
-        const opener = pendingChapterOpener;
-        pendingChapterOpener = undefined;
-        pageStartedChapter = true;
-        chapterIndex += 1;
-        sectionIndex = 0;
-        items.push({
-          id: opener?.id ?? heading[2],
-          title: htmlToText(heading[3]),
-          pageNumber: opener?.pageNumber ?? index + 1,
-          level: 2,
-          label: `#${chapterIndex}`,
-        });
-        return;
-      }
-
-      if (level === 3 && chapterIndex > 0) {
-        sectionIndex += 1;
-        items.push({
-          id: heading[2],
-          title: htmlToText(heading[3]),
-          pageNumber: index + 1,
-          level: 3,
-          label: `${chapterIndex}.${sectionIndex}`,
-        });
-      }
-    });
-    if (!pageStartedChapter) pendingChapterOpener = undefined;
-  });
-  return items;
-}
-
-function extractChapterOpenerTarget(page, index) {
-  const heading = page.match(/<h2\b[^>]*\bid="([^"]+)"[^>]*>([\s\S]*?)<\/h2>/i);
-  if (!heading?.[1]) return undefined;
-  return {
-    id: heading[1],
-    pageNumber: index + 1,
-  };
-}
-
-function htmlToText(html) {
-  return html
-    .replace(/<[^>]+>/g, "")
-    .replaceAll("&nbsp;", " ")
-    .replaceAll("&amp;", "&")
-    .replaceAll("&lt;", "<")
-    .replaceAll("&gt;", ">")
-    .replaceAll("&quot;", '"')
-    .trim();
-}
-
-function hasPageKind(openingTag, kind) {
-  return extractAttr(openingTag, "data-page-kind") === kind;
-}
-
-function hasContentPageKind(openingTag) {
-  return extractAttr(openingTag, "data-page-kind") === "content";
-}
-
-function escapeAttr(value) {
-  return String(value)
-    .replaceAll("&", "&amp;")
-    .replaceAll('"', "&quot;")
-    .replaceAll("<", "&lt;")
-    .replaceAll(">", "&gt;");
-}
-
-function escapeHtml(value) {
-  return String(value)
-    .replaceAll("&", "&amp;")
-    .replaceAll("<", "&lt;")
-    .replaceAll(">", "&gt;");
-}
-
-function chunkArray(items, size) {
-  const chunks = [];
-  for (let index = 0; index < items.length; index += size) {
-    chunks.push(items.slice(index, index + size));
-  }
-  return chunks;
-}