@byline/richtext-lexical 3.21.0 → 4.1.0

package/dist/field/extensions/link/floating-link-editor.js

@@ -1,7 +1,7 @@
 "use client";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { getClientConfig, resolveRoutes } from "@byline/core";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { getClientConfig } from "@byline/core";
 import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
 import { $findMatchingParent, mergeRegister } from "@lexical/utils";
 import { $getSelection, $isLineBreakNode, $isRangeSelection, COMMAND_PRIORITY_CRITICAL, COMMAND_PRIORITY_HIGH, COMMAND_PRIORITY_LOW, KEY_ESCAPE_COMMAND, SELECTION_CHANGE_COMMAND } from "lexical";
@@ -20,7 +20,7 @@ function FloatingLinkEditor({ editor, isLink, setIsLink, anchorElem }) {
     });
     const [linkModalData, setLinkModalData] = useState(void 0);
     const [modalOpen, setModalOpen] = useState(false);
-    const adminRoute = useMemo(()=>resolveRoutes(getClientConfig().routes).admin, []);
+    const adminRoute = getClientConfig().routes.admin;
     const $updateLinkEditor = useCallback(()=>{
         const selection = $getSelection();
         if ($isRangeSelection(selection)) {

package/dist/field/extensions/link/link-node.js

@@ -1,11 +1,11 @@
-import { getClientConfig, resolveRoutes } from "@byline/core";
+import { getClientConfig } from "@byline/core";
 import { addClassNamesToElement, isHTMLAnchorElement } from "@lexical/utils";
 import { $applyNodeReplacement, $createTextNode, $getSelection, $isElementNode, $isRangeSelection, ElementNode, createCommand } from "lexical";
 import { sanitizeUrl } from "../../utils/url.js";
 function adminHref(attrs) {
     if (null == attrs || 'internal' !== attrs.linkType) return '#';
     const internal = attrs;
-    const { admin } = resolveRoutes(getClientConfig().routes);
+    const { admin } = getClientConfig().routes;
     return `${admin}/collections/${internal.targetCollectionPath}/${internal.targetDocumentId}`;
 }
 class LinkNode extends ElementNode {

package/dist/field/lexical-populate-shared.d.ts

@@ -15,8 +15,7 @@
  * Pure / framework-agnostic. No React, no DOM, no Lexical runtime — safe
  * to import from the package's `server` entry.
  */
-import type { BylineClient } from '@byline/client';
-import type { ReadContext } from '@byline/core';
+import type { ReadContext, RichTextReadDocumentsFn } from '@byline/core';
 /**
  * Lexical-shaped node — only the fields the visitors need to read or
  * mutate. Carries an unknown `children` array because nodes nest
@@ -82,8 +81,8 @@ export interface LexicalNodeVisitor {
     match: (node: LexicalNodeLike) => PendingHydration | null;
 }
 interface RunPopulateOptions {
-    client: BylineClient;
     readContext: ReadContext;
+    readDocuments: RichTextReadDocumentsFn;
     visitors: LexicalNodeVisitor[];
     /**
      * One or more rich-text values to walk. The framework's read pipeline
@@ -99,13 +98,9 @@ interface RunPopulateOptions {
  * hydrations across all visitors, batch-fetch by source collection, and
  * apply.
  *
- * `readContext` is accepted (factories thread it through from
- * `RichTextPopulateContext` / `RichTextEmbedContext`) but currently unused —
- * the batch fetch goes straight to `getDocumentsByDocumentIds` and doesn't
- * recurse into populate or `afterRead`, so there's no visited-set or
- * read-budget state to share. Retained on the options shape so a future
- * visitor that performs nested populate can opt back in without another
- * contract churn.
+ * Callers provide the framework-owned `readDocuments` function, which enforces
+ * target abilities and `beforeRead` predicates for both read-time populate and
+ * write-time embed refreshes.
  */
 export declare function runLexicalPopulate(options: RunPopulateOptions): Promise<void>;
 export {};

package/dist/field/lexical-populate-shared.js

@@ -17,7 +17,7 @@ function* iterAllNodes(node) {
     if (Array.isArray(node.children)) for (const child of node.children)yield* iterAllNodes(child);
 }
 async function runLexicalPopulate(options) {
-    const { client, visitors, values } = options;
+    const { visitors, values, readDocuments } = options;
     const pending = [];
     for (const value of values){
         const root = getLexicalRoot(value);
@@ -39,11 +39,9 @@ async function runLexicalPopulate(options) {
     const fetched = new Map();
     await Promise.all(Array.from(idsByCollection.entries()).map(async ([collectionPath, idSet])=>{
         const ids = Array.from(idSet);
-        const collectionId = await client.resolveCollectionId(collectionPath);
-        const rawDocs = await client.db.queries.documents.getDocumentsByDocumentIds({
-            collection_id: collectionId,
-            document_ids: ids,
-            readMode: 'published'
+        const rawDocs = await readDocuments({
+            collectionPath,
+            documentIds: ids
         });
         const byId = new Map();
         for (const raw of rawDocs)if ('string' == typeof raw.document_id) byId.set(raw.document_id, {

package/dist/server.js

@@ -10,8 +10,8 @@ function lexicalEditorPopulateServer(options) {
     ];
     return async (ctx)=>{
         await runLexicalPopulate({
-            client: options.getClient(),
             readContext: ctx.readContext,
+            readDocuments: ctx.readDocuments,
             visitors,
             values: [
                 ctx.value
@@ -32,8 +32,8 @@ function lexicalEditorEmbedServer(options) {
     ];
     return async (ctx)=>{
         await runLexicalPopulate({
-            client: options.getClient(),
             readContext: ctx.readContext,
+            readDocuments: ctx.readDocuments,
             visitors,
             values: [
                 ctx.value

package/package.json

@@ -3,7 +3,7 @@
   "private": false,
   "type": "module",
   "license": "MPL-2.0",
-  "version": "3.21.0",
+  "version": "4.1.0",
   "engines": {
     "node": ">=20.9.0"
   },
@@ -73,10 +73,10 @@
     "lexical": "0.46.0",
     "npm-run-all": "^4.1.5",
     "react-error-boundary": "^6.1.2",
-    "@byline/admin": "3.21.0",
-    "@byline/core": "3.21.0",
-    "@byline/client": "3.21.0",
-    "@byline/ui": "3.21.0"
+    "@byline/admin": "4.1.0",
+    "@byline/ui": "4.1.0",
+    "@byline/core": "4.1.0",
+    "@byline/client": "4.1.0"
   },
   "peerDependencies": {
     "react": "^19.0.0",

package/src/field/extensions/link/floating-link-editor.tsx

@@ -11,9 +11,9 @@
  */
 
 import type * as React from 'react'
-import { type Dispatch, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { type Dispatch, useCallback, useEffect, useRef, useState } from 'react'
 
-import { getClientConfig, resolveRoutes } from '@byline/core'
+import { getClientConfig } from '@byline/core'
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'
 import { $findMatchingParent, mergeRegister } from '@lexical/utils'
 import {
@@ -70,7 +70,7 @@ function FloatingLinkEditor({
   })
   const [linkModalData, setLinkModalData] = useState<LinkData | undefined>(undefined)
   const [modalOpen, setModalOpen] = useState(false)
-  const adminRoute = useMemo(() => resolveRoutes(getClientConfig().routes).admin, [])
+  const adminRoute = getClientConfig().routes.admin
 
   const $updateLinkEditor = useCallback(() => {
     const selection = $getSelection()

package/src/field/extensions/link/link-node.ts

@@ -6,7 +6,7 @@
  *
  */
 
-import { getClientConfig, resolveRoutes } from '@byline/core'
+import { getClientConfig } from '@byline/core'
 import { addClassNamesToElement, isHTMLAnchorElement } from '@lexical/utils'
 import {
   $applyNodeReplacement,
@@ -33,7 +33,7 @@ import type { InternalLinkAttributes, LinkAttributes, SerializedLinkNode } from
 function adminHref(attrs: LinkAttributes | null | undefined): string {
   if (attrs == null || attrs.linkType !== 'internal') return '#'
   const internal = attrs as InternalLinkAttributes
-  const { admin } = resolveRoutes(getClientConfig().routes)
+  const { admin } = getClientConfig().routes
   return `${admin}/collections/${internal.targetCollectionPath}/${internal.targetDocumentId}`
 }
 

package/src/field/lexical-populate-shared.test.node.ts

@@ -0,0 +1,34 @@
+import { createReadContext } from '@byline/core'
+import { describe, expect, it, vi } from 'vitest'
+
+import { type LexicalNodeVisitor, runLexicalPopulate } from './lexical-populate-shared.js'
+
+describe('runLexicalPopulate secure reader', () => {
+  it('uses the framework reader instead of direct adapter access', async () => {
+    const apply = vi.fn()
+    const visitor: LexicalNodeVisitor = {
+      match: (node) =>
+        node.type === 'target' ? { node, collectionPath: 'media', documentId: 'm1', apply } : null,
+    }
+    const readDocuments = vi
+      .fn()
+      .mockResolvedValue([
+        { document_id: 'm1', path: 'asset', status: 'published', fields: { title: 'Asset' } },
+      ])
+
+    await runLexicalPopulate({
+      readContext: createReadContext(),
+      readDocuments,
+      visitors: [visitor],
+      values: [{ root: { type: 'root', children: [{ type: 'target' }] } }],
+    })
+
+    expect(readDocuments).toHaveBeenCalledWith({
+      collectionPath: 'media',
+      documentIds: ['m1'],
+    })
+    expect(apply).toHaveBeenCalledWith(
+      expect.objectContaining({ id: 'm1', fields: { title: 'Asset' } })
+    )
+  })
+})

package/src/field/lexical-populate-shared.ts

@@ -17,8 +17,7 @@
  * to import from the package's `server` entry.
  */
 
-import type { BylineClient } from '@byline/client'
-import type { ReadContext } from '@byline/core'
+import type { ReadContext, RichTextReadDocumentsFn } from '@byline/core'
 
 /**
  * Lexical-shaped node — only the fields the visitors need to read or
@@ -124,8 +123,8 @@ export interface LexicalNodeVisitor {
 }
 
 interface RunPopulateOptions {
-  client: BylineClient
   readContext: ReadContext
+  readDocuments: RichTextReadDocumentsFn
   visitors: LexicalNodeVisitor[]
   /**
    * One or more rich-text values to walk. The framework's read pipeline
@@ -142,16 +141,12 @@ interface RunPopulateOptions {
  * hydrations across all visitors, batch-fetch by source collection, and
  * apply.
  *
- * `readContext` is accepted (factories thread it through from
- * `RichTextPopulateContext` / `RichTextEmbedContext`) but currently unused —
- * the batch fetch goes straight to `getDocumentsByDocumentIds` and doesn't
- * recurse into populate or `afterRead`, so there's no visited-set or
- * read-budget state to share. Retained on the options shape so a future
- * visitor that performs nested populate can opt back in without another
- * contract churn.
+ * Callers provide the framework-owned `readDocuments` function, which enforces
+ * target abilities and `beforeRead` predicates for both read-time populate and
+ * write-time embed refreshes.
  */
 export async function runLexicalPopulate(options: RunPopulateOptions): Promise<void> {
-  const { client, visitors, values } = options
+  const { visitors, values, readDocuments } = options
 
   const pending: PendingHydration[] = []
   for (const value of values) {
@@ -178,21 +173,11 @@ export async function runLexicalPopulate(options: RunPopulateOptions): Promise<v
     bucket.add(p.documentId)
   }
 
-  // Fetch directly through the adapter rather than the client's `find()` —
-  // `parseWhere` has no handler for `id`, so `find({ where: { id: { $in } } })`
-  // silently dropped the filter and returned arbitrary docs ordered by
-  // `created_at desc`. This is the same primitive relation populate uses
-  // (`packages/core/src/services/populate.ts`) when it batches by document id.
   const fetched = new Map<string, Map<string, Record<string, any>>>()
   await Promise.all(
     Array.from(idsByCollection.entries()).map(async ([collectionPath, idSet]) => {
       const ids = Array.from(idSet)
-      const collectionId = await client.resolveCollectionId(collectionPath)
-      const rawDocs = await client.db.queries.documents.getDocumentsByDocumentIds({
-        collection_id: collectionId,
-        document_ids: ids,
-        readMode: 'published',
-      })
+      const rawDocs = await readDocuments({ collectionPath, documentIds: ids })
       const byId = new Map<string, Record<string, any>>()
       for (const raw of rawDocs as Array<Record<string, any>>) {
         if (typeof raw.document_id !== 'string') continue

package/src/server.ts

@@ -115,8 +115,8 @@ export function lexicalEditorPopulateServer(options: LexicalServerOptions): Rich
   const visitors = options.visitors ?? [inlineImageVisitor, linkVisitor]
   return async (ctx: RichTextPopulateContext): Promise<void> => {
     await runLexicalPopulate({
-      client: options.getClient(),
       readContext: ctx.readContext,
+      readDocuments: ctx.readDocuments,
       visitors,
       values: [ctx.value],
     })
@@ -165,8 +165,8 @@ export function lexicalEditorEmbedServer(options: LexicalServerOptions): RichTex
   const visitors = options.visitors ?? [inlineImageVisitor, linkVisitor]
   return async (ctx: RichTextEmbedContext): Promise<void> => {
     await runLexicalPopulate({
-      client: options.getClient(),
       readContext: ctx.readContext,
+      readDocuments: ctx.readDocuments,
       visitors,
       values: [ctx.value],
     })