@adecore/editor-react 0.31.12 → 0.33.0

package/dist/workspace-edit.js

@@ -1,159 +1,178 @@
 import { fileUriToPath, planWorkspaceOperations } from '@adecore/lsp';
 import { messageOf } from './error-message.js';
 function refused(failureReason) {
-    return { applied: false, failureReason };
+  return {
+    applied: false,
+    failureReason
+  };
 }
 /* The text edits of an edit per document, as the entries a document has in it, whatever else the edit does. */
 export function textEntriesOf(edit) {
-    const entries = new Map();
-    const add = (uri, edits) => {
-        entries.set(uri, [...(entries.get(uri) ?? []), edits]);
-    };
-    if (edit.documentChanges === undefined) {
-        for (const [uri, edits] of Object.entries(edit.changes ?? {})) {
-            add(uri, edits);
-        }
-        return entries;
-    }
-    for (const change of edit.documentChanges) {
-        if ('textDocument' in change) {
-            add(change.textDocument.uri, change.edits);
-        }
+  const entries = new Map();
+  const add = (uri, edits) => {
+    entries.set(uri, [...(entries.get(uri) ?? []), edits]);
+  };
+  if (edit.documentChanges === undefined) {
+    for (const [uri, edits] of Object.entries(edit.changes ?? {})) {
+      add(uri, edits);
     }
     return entries;
+  }
+  for (const change of edit.documentChanges) {
+    if ('textDocument' in change) {
+      add(change.textDocument.uri, change.edits);
+    }
+  }
+  return entries;
 }
 /* The text edits of an edit per document, as the entries a document has in it; null when it deletes a file. */
 export function entriesOf(edit) {
-    return (edit.documentChanges ?? []).some((change) => 'kind' in change && change.kind === 'delete') ? null : textEntriesOf(edit);
+  return (edit.documentChanges ?? []).some(change => 'kind' in change && change.kind === 'delete') ? null : textEntriesOf(edit);
 }
 /* The files an edit moves, which a preview of lines cannot show. */
 export function renamesOf(edit) {
-    return (edit.documentChanges ?? []).filter((change) => 'kind' in change && change.kind === 'rename');
+  return (edit.documentChanges ?? []).filter(change => 'kind' in change && change.kind === 'rename');
 }
 /* Every file an edit makes, moves or deletes, in the order it says. */
 export function resourceOperationsOf(edit) {
-    const operations = [];
-    for (const change of edit.documentChanges ?? []) {
-        if ('textDocument' in change) {
-            continue;
-        }
-        operations.push(change.kind === 'rename' ? { kind: 'rename', uri: change.oldUri, newUri: change.newUri } : { kind: change.kind, uri: change.uri });
-    }
-    return operations;
+  const operations = [];
+  for (const change of edit.documentChanges ?? []) {
+    if ('textDocument' in change) {
+      continue;
+    }
+    operations.push(change.kind === 'rename' ? {
+      kind: 'rename',
+      uri: change.oldUri,
+      newUri: change.newUri
+    } : {
+      kind: change.kind,
+      uri: change.uri
+    });
+  }
+  return operations;
 }
 function contentChangeOf(edit) {
-    return { range: edit.range, text: edit.newText };
+  return {
+    range: edit.range,
+    text: edit.newText
+  };
 }
 /* The resource operations a project has a way to carry out; pass it as the session's `resourceOperations` so servers only ask for what can be done. */
 export function supportedResourceOperations(files) {
-    const operations = [];
-    if (files?.create !== undefined) {
-        operations.push('create');
-    }
-    if (files?.rename !== undefined) {
-        operations.push('rename');
-    }
-    if (files?.delete !== undefined) {
-        operations.push('delete');
-    }
-    return operations;
+  const operations = [];
+  if (files?.create !== undefined) {
+    operations.push('create');
+  }
+  if (files?.rename !== undefined) {
+    operations.push('rename');
+  }
+  if (files?.delete !== undefined) {
+    operations.push('delete');
+  }
+  return operations;
 }
 function within(uri, folder) {
-    return uri.startsWith(`${folder}/`);
+  return uri.startsWith(`${folder}/`);
 }
 /* Where a deleted URI stood before the renames that ran ahead of it, and what was moved into it: the places unsaved work can be. */
 function placesOf(uri, renames) {
-    const found = new Set([uri]);
-    for (let i = renames.length - 1; i >= 0; i--) {
-        const { oldUri, newUri } = renames[i];
-        for (const place of [...found]) {
-            if (place === newUri || within(place, newUri)) {
-                found.add(oldUri + place.slice(newUri.length));
-            }
-            else if (within(newUri, place)) {
-                found.add(oldUri);
-            }
-        }
-    }
-    return [...found];
+  const found = new Set([uri]);
+  for (let i = renames.length - 1; i >= 0; i--) {
+    const {
+      oldUri,
+      newUri
+    } = renames[i];
+    for (const place of [...found]) {
+      if (place === newUri || within(place, newUri)) {
+        found.add(oldUri + place.slice(newUri.length));
+      } else if (within(newUri, place)) {
+        found.add(oldUri);
+      }
+    }
+  }
+  return [...found];
 }
 /* Whether deleting or replacing loses work nobody saved at any of the places. Without `isUnsaved` that is an editor on, or under, a place. A `recursive` one may be a folder. */
 function losesWork(recursive, places, host) {
-    const files = host.files;
-    if (files.isUnsaved !== undefined) {
-        return places.some((place) => {
-            const path = fileUriToPath(place);
-            return path !== null && files.isUnsaved(path);
-        });
-    }
-    if (host.openUris === undefined && recursive) {
-        return true;
-    }
-    const open = host.openUris?.() ?? [];
-    return places.some((place) => host.editorOf(place) !== undefined || open.some((uri) => uri === place || within(uri, place)));
+  const files = host.files;
+  if (files.isUnsaved !== undefined) {
+    return places.some(place => {
+      const path = fileUriToPath(place);
+      return path !== null && files.isUnsaved(path);
+    });
+  }
+  if (host.openUris === undefined && recursive) {
+    return true;
+  }
+  const open = host.openUris?.() ?? [];
+  return places.some(place => host.editorOf(place) !== undefined || open.some(uri => uri === place || within(uri, place)));
 }
 function readOnlyAt(host, uri, editor) {
-    return host.isReadOnly?.(uri) ?? editor?.isReadOnly?.() ?? false;
+  return host.isReadOnly?.(uri) ?? editor?.isReadOnly?.() ?? false;
 }
 /* Why a create or move over a file that is there is refused; null when the host can replace it without losing work. */
 function overwriteProblem(step, target, places, host, reads) {
-    const path = fileUriToPath(target);
-    if (host.files?.supportsOverwrite !== true) {
-        return `${path} already exists`;
-    }
-    // A target no text was read from may be a folder, with unsaved work anywhere under it.
-    const isText = step.kind === 'create' || reads.open.has(target) || reads.disks.has(target);
-    if (losesWork(!isText, places, host)) {
-        return `${path} has changes that are not saved`;
-    }
-    const editor = host.editorOf(target);
-    return editor !== undefined && step.kind === 'create' && readOnlyAt(host, target, editor) ? `${path} is read only` : null;
+  const path = fileUriToPath(target);
+  if (host.files?.supportsOverwrite !== true) {
+    return `${path} already exists`;
+  }
+  // A target no text was read from may be a folder, with unsaved work anywhere under it.
+  const isText = step.kind === 'create' || reads.open.has(target) || reads.disks.has(target);
+  if (losesWork(!isText, places, host)) {
+    return `${path} has changes that are not saved`;
+  }
+  const editor = host.editorOf(target);
+  return editor !== undefined && step.kind === 'create' && readOnlyAt(host, target, editor) ? `${path} is read only` : null;
 }
 /* Checks a plan against what only the host can see: paths, overwrites, unsaved work and the editors it touches. Null when it fits. */
 function problemWith(steps, host, reads) {
-    const renames = [];
-    for (const step of steps) {
-        if (step.kind === 'edits') {
-            if (step.open && readOnlyAt(host, step.readUri, host.editorOf(step.readUri))) {
-                return `${step.uri} is read only`;
-            }
-            continue;
-        }
-        const uris = step.kind === 'rename' ? [step.oldUri, step.newUri] : [step.uri];
-        const paths = uris.map((uri) => fileUriToPath(uri));
-        if (paths.includes(null)) {
-            return `${uris[0]} cannot be changed from here`;
-        }
-        if ((step.kind === 'create' || step.kind === 'rename') && step.overwrite) {
-            const target = step.kind === 'create' ? step.uri : step.newUri;
-            const refusal = overwriteProblem(step, target, placesOf(target, renames), host, reads);
-            if (refusal !== null) {
-                return refusal;
-            }
-        }
-        if (step.kind === 'rename') {
-            renames.push({ kind: 'rename', oldUri: step.oldUri, newUri: step.newUri });
-        }
-        if (step.kind === 'delete' && losesWork(step.recursive, placesOf(step.uri, renames), host)) {
-            return `${paths[0]} has changes that are not saved`;
-        }
-    }
-    for (const [uri, planned] of reads.open) {
-        const editor = host.editorOf(uri);
-        if (editor === undefined || editor.getText() !== planned.text) {
-            return `${uri} changed while the edit was being prepared`;
-        }
-        const version = host.versionOf?.(uri) ?? null;
-        if (planned.version !== null && version !== planned.version) {
-            return `${uri} changed while the edit was being prepared`;
-        }
+  const renames = [];
+  for (const step of steps) {
+    if (step.kind === 'edits') {
+      if (step.open && readOnlyAt(host, step.readUri, host.editorOf(step.readUri))) {
+        return `${step.uri} is read only`;
+      }
+      continue;
+    }
+    const uris = step.kind === 'rename' ? [step.oldUri, step.newUri] : [step.uri];
+    const paths = uris.map(uri => fileUriToPath(uri));
+    if (paths.includes(null)) {
+      return `${uris[0]} cannot be changed from here`;
+    }
+    if ((step.kind === 'create' || step.kind === 'rename') && step.overwrite) {
+      const target = step.kind === 'create' ? step.uri : step.newUri;
+      const refusal = overwriteProblem(step, target, placesOf(target, renames), host, reads);
+      if (refusal !== null) {
+        return refusal;
+      }
     }
-    for (const uri of reads.disks.keys()) {
-        if (host.editorOf(uri) !== undefined) {
-            return `${uri} was opened while the edit was being prepared`;
-        }
-    }
-    return null;
+    if (step.kind === 'rename') {
+      renames.push({
+        kind: 'rename',
+        oldUri: step.oldUri,
+        newUri: step.newUri
+      });
+    }
+    if (step.kind === 'delete' && losesWork(step.recursive, placesOf(step.uri, renames), host)) {
+      return `${paths[0]} has changes that are not saved`;
+    }
+  }
+  for (const [uri, planned] of reads.open) {
+    const editor = host.editorOf(uri);
+    if (editor === undefined || editor.getText() !== planned.text) {
+      return `${uri} changed while the edit was being prepared`;
+    }
+    const version = host.versionOf?.(uri) ?? null;
+    if (planned.version !== null && version !== planned.version) {
+      return `${uri} changed while the edit was being prepared`;
+    }
+  }
+  for (const uri of reads.disks.keys()) {
+    if (host.editorOf(uri) !== undefined) {
+      return `${uri} was opened while the edit was being prepared`;
+    }
+  }
+  return null;
 }
 /*
  * Applies an LSP workspace edit step by step, after planning it against every text (`planWorkspaceOperations`)
@@ -173,152 +192,184 @@ function problemWith(steps, host, reads) {
  * looked for where it was and refused.
  */
 export async function applyWorkspaceEdit(edit, host) {
-    const reads = { open: new Map(), disks: new Map() };
-    const files = host.files;
-    let steps;
-    try {
-        ({ steps } = await planWorkspaceOperations(edit, {
-            operations: supportedResourceOperations(files),
-            read: async (uri) => {
-                const editor = host.editorOf(uri);
-                if (editor !== undefined) {
-                    const text = editor.getText();
-                    const version = host.versionOf?.(uri) ?? null;
-                    reads.open.set(uri, { text, version });
-                    return { text, version, open: true };
-                }
-                const path = fileUriToPath(uri);
-                const disk = path === null || files === null ? null : await files.read(path);
-                if (disk === null) {
-                    return null;
-                }
-                reads.disks.set(uri, disk);
-                return { text: disk.text, version: null, open: false };
-            },
-            ...(files?.exists === undefined
-                ? {}
-                : {
-                    exists: async (uri) => {
-                        const path = fileUriToPath(uri);
-                        return path !== null && (await files.exists(path));
-                    }
-                }),
-            ...(files?.isFolder === undefined
-                ? {}
-                : {
-                    isFolder: async (uri) => {
-                        const path = fileUriToPath(uri);
-                        return path === null || (await files.isFolder(path));
-                    }
-                })
-        }));
-    }
-    catch (error) {
-        return refused(messageOf(error));
-    }
-    const problem = problemWith(steps, host, reads);
-    if (problem !== null) {
-        return refused(problem);
-    }
-    const running = { ahead: [], reads, saving: steps.some((step) => step.kind === 'rename'), staged: [], touched: new Set() };
-    for (const [index, step] of steps.entries()) {
-        running.ahead = steps.slice(index + 1);
-        const reason = await run(step, host, running);
-        if (reason !== null) {
-            return refused(reason);
+  const reads = {
+    open: new Map(),
+    disks: new Map()
+  };
+  const files = host.files;
+  let steps;
+  try {
+    ({
+      steps
+    } = await planWorkspaceOperations(edit, {
+      operations: supportedResourceOperations(files),
+      read: async uri => {
+        const editor = host.editorOf(uri);
+        if (editor !== undefined) {
+          const text = editor.getText();
+          const version = host.versionOf?.(uri) ?? null;
+          reads.open.set(uri, {
+            text,
+            version
+          });
+          return {
+            text,
+            version,
+            open: true
+          };
         }
-    }
-    if (running.staged.length > 0) {
-        files?.stage(running.staged);
-    }
-    return { applied: true };
+        const path = fileUriToPath(uri);
+        const disk = path === null || files === null ? null : await files.read(path);
+        if (disk === null) {
+          return null;
+        }
+        reads.disks.set(uri, disk);
+        return {
+          text: disk.text,
+          version: null,
+          open: false
+        };
+      },
+      ...(files?.exists === undefined ? {} : {
+        exists: async uri => {
+          const path = fileUriToPath(uri);
+          return path !== null && (await files.exists(path));
+        }
+      }),
+      ...(files?.isFolder === undefined ? {} : {
+        isFolder: async uri => {
+          const path = fileUriToPath(uri);
+          return path === null || (await files.isFolder(path));
+        }
+      })
+    }));
+  } catch (error) {
+    return refused(messageOf(error));
+  }
+  const problem = problemWith(steps, host, reads);
+  if (problem !== null) {
+    return refused(problem);
+  }
+  const running = {
+    ahead: [],
+    reads,
+    saving: steps.some(step => step.kind === 'rename'),
+    staged: [],
+    touched: new Set()
+  };
+  for (const [index, step] of steps.entries()) {
+    running.ahead = steps.slice(index + 1);
+    const reason = await run(step, host, running);
+    if (reason !== null) {
+      return refused(reason);
+    }
+  }
+  if (running.staged.length > 0) {
+    files?.stage(running.staged);
+  }
+  return {
+    applied: true
+  };
 }
 /* Why a text step no longer fits its editor, now that the steps before it ran; null when it does. */
 function driftOf(step, host, uri, editor, touched) {
-    if (editor.getText() !== step.before) {
-        return `${step.uri} changed while the edit was being applied`;
-    }
-    const version = uri === step.readUri && !touched.has(editor) ? host.versionOf?.(uri) : undefined;
-    if (version !== undefined && step.version !== null && version !== step.version) {
-        return `${step.uri} changed while the edit was being applied`;
-    }
-    return readOnlyAt(host, uri, editor) ? `${step.uri} is read only` : null;
+  if (editor.getText() !== step.before) {
+    return `${step.uri} changed while the edit was being applied`;
+  }
+  const version = uri === step.readUri && !touched.has(editor) ? host.versionOf?.(uri) : undefined;
+  if (version !== undefined && step.version !== null && version !== step.version) {
+    return `${step.uri} changed while the edit was being applied`;
+  }
+  return readOnlyAt(host, uri, editor) ? `${step.uri} is read only` : null;
 }
 /* Does one step; the reason it could not, or null. */
 async function run(step, host, running) {
-    const files = host.files;
-    if (step.kind === 'create') {
-        return step.overwrite ? overwriteFile(step, host) : files.create(fileUriToPath(step.uri), step.text);
-    }
-    if (step.kind === 'rename') {
-        const [from, to] = [fileUriToPath(step.oldUri), fileUriToPath(step.newUri)];
-        if (!step.overwrite) {
-            return files.rename(from, to);
-        }
-        // The steps before this one ran, so the unsaved work at the target is looked for once more.
-        return losesWork(!running.reads.disks.has(step.newUri) && !running.reads.open.has(step.newUri), [step.newUri], host)
-            ? `${to} has changes that are not saved`
-            : files.rename(from, to, { overwrite: true });
-    }
-    if (step.kind === 'delete') {
-        const path = fileUriToPath(step.uri);
-        if (losesWork(step.recursive, [step.uri], host)) {
-            return `${path} has changes that are not saved`;
-        }
-        return files.delete(path, { recursive: step.recursive });
-    }
-    if (step.after === step.before) {
-        return null;
-    }
-    if (step.open) {
-        const uri = host.editorOf(step.uri) === undefined ? step.readUri : step.uri;
-        return editOpen(step, host, running, uri, host.editorOf(uri));
-    }
-    return runDraft(step, host, running);
+  const files = host.files;
+  if (step.kind === 'create') {
+    return step.overwrite ? overwriteFile(step, host) : files.create(fileUriToPath(step.uri), step.text);
+  }
+  if (step.kind === 'rename') {
+    const [from, to] = [fileUriToPath(step.oldUri), fileUriToPath(step.newUri)];
+    if (!step.overwrite) {
+      return files.rename(from, to);
+    }
+    // The steps before this one ran, so the unsaved work at the target is looked for once more.
+    return losesWork(!running.reads.disks.has(step.newUri) && !running.reads.open.has(step.newUri), [step.newUri], host) ? `${to} has changes that are not saved` : files.rename(from, to, {
+      overwrite: true
+    });
+  }
+  if (step.kind === 'delete') {
+    const path = fileUriToPath(step.uri);
+    if (losesWork(step.recursive, [step.uri], host)) {
+      return `${path} has changes that are not saved`;
+    }
+    return files.delete(path, {
+      recursive: step.recursive
+    });
+  }
+  if (step.after === step.before) {
+    return null;
+  }
+  if (step.open) {
+    const uri = host.editorOf(step.uri) === undefined ? step.readUri : step.uri;
+    return editOpen(step, host, running, uri, host.editorOf(uri));
+  }
+  return runDraft(step, host, running);
 }
 /* Empties a file that is there and gives it its text; the editor that still holds it is set to the same text. */
 async function overwriteFile(step, host) {
-    const path = fileUriToPath(step.uri);
-    if (losesWork(false, [step.uri], host)) {
-        return `${path} has changes that are not saved`;
-    }
-    const reason = await host.files.create(path, step.text, { overwrite: true });
-    if (reason === null) {
-        host.editorOf(step.uri)?.setText(step.text);
-    }
-    return reason;
+  const path = fileUriToPath(step.uri);
+  if (losesWork(false, [step.uri], host)) {
+    return `${path} has changes that are not saved`;
+  }
+  const reason = await host.files.create(path, step.text, {
+    overwrite: true
+  });
+  if (reason === null) {
+    host.editorOf(step.uri)?.setText(step.text);
+  }
+  return reason;
 }
 function editOpen(step, host, running, uri, editor) {
-    if (editor === undefined) {
-        return `${step.uri} is not open any more`;
-    }
-    const drift = driftOf(step, host, uri, editor, running.touched);
-    if (drift !== null) {
-        return drift;
-    }
-    running.touched.add(editor);
-    // The edits stay apart, so the caret and what is drawn over the text stay where they were between them.
-    return editor.applyEdits(step.edits.map(contentChangeOf)) ? null : `${step.uri} is read only`;
+  if (editor === undefined) {
+    return `${step.uri} is not open any more`;
+  }
+  const drift = driftOf(step, host, uri, editor, running.touched);
+  if (drift !== null) {
+    return drift;
+  }
+  running.touched.add(editor);
+  // The edits stay apart, so the caret and what is drawn over the text stay where they were between them.
+  return editor.applyEdits(step.edits.map(contentChangeOf)) ? null : `${step.uri} is read only`;
 }
 /* Whether a later step deletes the file or a folder around it, so a draft or a save of it would only bring it back. */
 function deletedAhead(uri, ahead) {
-    return ahead.some((step) => step.kind === 'delete' && (step.uri === uri || within(uri, step.uri.replace(/\/$/, ''))));
+  return ahead.some(step => step.kind === 'delete' && (step.uri === uri || within(uri, step.uri.replace(/\/$/, ''))));
 }
 async function runDraft(step, host, running) {
-    const { reads, saving, staged, ahead } = running;
-    const uri = [step.uri, step.readUri].find((candidate) => host.editorOf(candidate) !== undefined);
-    if (uri !== undefined) {
-        return editOpen(step, host, running, uri, host.editorOf(uri));
-    }
-    const path = fileUriToPath(step.uri);
-    const disk = reads.disks.get(step.readUri);
-    if (path === null || disk === undefined || deletedAhead(step.uri, ahead)) {
-        return null;
-    }
-    const file = { path, disk, text: step.after };
-    if (!saving) {
-        staged.push(file);
-        return null;
-    }
-    return host.files.save([file]);
-}
+  const {
+    reads,
+    saving,
+    staged,
+    ahead
+  } = running;
+  const uri = [step.uri, step.readUri].find(candidate => host.editorOf(candidate) !== undefined);
+  if (uri !== undefined) {
+    return editOpen(step, host, running, uri, host.editorOf(uri));
+  }
+  const path = fileUriToPath(step.uri);
+  const disk = reads.disks.get(step.readUri);
+  if (path === null || disk === undefined || deletedAhead(step.uri, ahead)) {
+    return null;
+  }
+  const file = {
+    path,
+    disk,
+    text: step.after
+  };
+  if (!saving) {
+    staged.push(file);
+    return null;
+  }
+  return host.files.save([file]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor-react",
-  "version": "0.31.12",
+  "version": "0.33.0",
   "type": "module",
   "description": "Language-enabled editors, feature coordination and React popups over injected language services.",
   "license": "FSL-1.1-MIT",
@@ -62,9 +62,9 @@
     "test": "bun test --conditions=source"
   },
   "dependencies": {
-    "@adecore/editor": "0.31.12",
-    "@adecore/lsp": "0.31.12",
-    "@adecore/merge": "0.31.12",
+    "@adecore/editor": "0.33.0",
+    "@adecore/lsp": "0.33.0",
+    "@adecore/merge": "0.33.0",
     "lucide-react": "^1.47.0",
     "react-markdown": "^10.1.0",
     "remark-breaks": "^4.0.0",
@@ -72,14 +72,14 @@
     "zustand": "^5.0.15"
   },
   "peerDependencies": {
-    "@adecore/ui": "^0.31.12",
+    "@adecore/ui": "^0.33.0",
     "i18next": "^26.4.2",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
     "react-i18next": "^17.0.15"
   },
   "devDependencies": {
-    "@adecore/ui": "0.31.12",
+    "@adecore/ui": "0.33.0",
     "@types/bun": "^1.4.2",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",