@adecore/editor-react 0.31.12 → 0.33.0

package/dist/patch-layout.js

@@ -1,125 +1,184 @@
 import { parseHunkHeader } from '@adecore/merge';
-export const DEFAULT_PATCH_LIMITS = { maxLines: 50_000, maxCharacters: 4_000_000 };
-const OTHER = { role: 'other', old: null, new: null };
-const FILE_HEADER = { role: 'file-header', old: null, new: null };
-const HUNK_HEADER = { role: 'hunk-header', old: null, new: null };
-const NO_NEWLINE = { role: 'no-newline', old: null, new: null };
-const BINARY = { role: 'binary', old: null, new: null };
+export const DEFAULT_PATCH_LIMITS = {
+  maxLines: 50_000,
+  maxCharacters: 4_000_000
+};
+const OTHER = {
+  role: 'other',
+  old: null,
+  new: null
+};
+const FILE_HEADER = {
+  role: 'file-header',
+  old: null,
+  new: null
+};
+const HUNK_HEADER = {
+  role: 'hunk-header',
+  old: null,
+  new: null
+};
+const NO_NEWLINE = {
+  role: 'no-newline',
+  old: null,
+  new: null
+};
+const BINARY = {
+  role: 'binary',
+  old: null,
+  new: null
+};
 const GIT_HEADERS = /^(?:index |old mode |new mode |deleted file mode |new file mode |similarity index |dissimilarity index |rename from |rename to |copy from |copy to )/;
-const ESCAPES = { a: 7, b: 8, f: 12, n: 10, r: 13, t: 9, v: 11, '"': 34, '\\': 92 };
+const ESCAPES = {
+  a: 7,
+  b: 8,
+  f: 12,
+  n: 10,
+  r: 13,
+  t: 9,
+  v: 11,
+  '"': 34,
+  '\\': 92
+};
 /* Reads a path as git writes it: bare, or in quotes with C escapes and octal bytes. */
 function unquote(raw) {
-    if (raw.length < 2 || !raw.startsWith('"') || !raw.endsWith('"')) {
-        return raw;
+  if (raw.length < 2 || !raw.startsWith('"') || !raw.endsWith('"')) {
+    return raw;
+  }
+  const bytes = [];
+  const encoder = new TextEncoder();
+  const body = raw.slice(1, -1);
+  for (let i = 0; i < body.length; i++) {
+    if (body[i] !== '\\') {
+      const point = String.fromCodePoint(body.codePointAt(i));
+      bytes.push(...encoder.encode(point));
+      i += point.length - 1;
+      continue;
     }
-    const bytes = [];
-    const encoder = new TextEncoder();
-    const body = raw.slice(1, -1);
-    for (let i = 0; i < body.length; i++) {
-        if (body[i] !== '\\') {
-            const point = String.fromCodePoint(body.codePointAt(i));
-            bytes.push(...encoder.encode(point));
-            i += point.length - 1;
-            continue;
-        }
-        const octal = /^[0-3][0-7]{2}/.exec(body.slice(i + 1, i + 4));
-        const escaped = ESCAPES[body[i + 1] ?? ''];
-        if (octal !== null) {
-            bytes.push(Number.parseInt(octal[0], 8));
-            i += 3;
-        }
-        else if (escaped !== undefined) {
-            bytes.push(escaped);
-            i++;
-        }
-        else {
-            bytes.push(92);
-        }
+    const octal = /^[0-3][0-7]{2}/.exec(body.slice(i + 1, i + 4));
+    const escaped = ESCAPES[body[i + 1] ?? ''];
+    if (octal !== null) {
+      bytes.push(Number.parseInt(octal[0], 8));
+      i += 3;
+    } else if (escaped !== undefined) {
+      bytes.push(escaped);
+      i++;
+    } else {
+      bytes.push(92);
     }
-    return new TextDecoder().decode(new Uint8Array(bytes));
+  }
+  return new TextDecoder().decode(new Uint8Array(bytes));
 }
 /* The name on a `---`, `+++`, `rename` or `copy` line: a timestamp after a tab goes, and `/dev/null` is no file. */
 function pathOf(raw) {
-    const tab = raw.indexOf('\t');
-    const name = unquote(tab === -1 ? raw : raw.slice(0, tab));
-    return name === '/dev/null' ? null : name;
+  const tab = raw.indexOf('\t');
+  const name = unquote(tab === -1 ? raw : raw.slice(0, tab));
+  return name === '/dev/null' ? null : name;
 }
 function stripPrefix(path, prefix) {
-    return path !== null && path.startsWith(prefix) ? path.slice(2) : path;
+  return path !== null && path.startsWith(prefix) ? path.slice(2) : path;
 }
 /* The two names of a `diff --git a/x b/y` line; with spaces in an unquoted name, the split that gives both halves the same name wins. */
 function gitPaths(rest) {
-    if (rest.startsWith('"')) {
-        const end = rest.indexOf('" ', 1);
-        if (end !== -1) {
-            const oldName = unquote(rest.slice(0, end + 1));
-            const newName = unquote(rest.slice(end + 2));
-            const prefixed = oldName.startsWith('a/') && newName.startsWith('b/');
-            return prefixed ? { oldPath: oldName.slice(2), newPath: newName.slice(2), prefixed } : { oldPath: oldName, newPath: newName, prefixed };
-        }
+  if (rest.startsWith('"')) {
+    const end = rest.indexOf('" ', 1);
+    if (end !== -1) {
+      const oldName = unquote(rest.slice(0, end + 1));
+      const newName = unquote(rest.slice(end + 2));
+      const prefixed = oldName.startsWith('a/') && newName.startsWith('b/');
+      return prefixed ? {
+        oldPath: oldName.slice(2),
+        newPath: newName.slice(2),
+        prefixed
+      } : {
+        oldPath: oldName,
+        newPath: newName,
+        prefixed
+      };
     }
-    const middle = rest.indexOf(' b/');
-    if (rest.startsWith('a/') && middle !== -1) {
-        for (let at = middle; at !== -1; at = rest.indexOf(' b/', at + 1)) {
-            if (rest.slice(2, at) === rest.slice(at + 3)) {
-                return { oldPath: rest.slice(2, at), newPath: rest.slice(at + 3), prefixed: true };
-            }
-        }
-        return { oldPath: rest.slice(2, middle), newPath: unquote(rest.slice(middle + 3)), prefixed: true };
+  }
+  const middle = rest.indexOf(' b/');
+  if (rest.startsWith('a/') && middle !== -1) {
+    for (let at = middle; at !== -1; at = rest.indexOf(' b/', at + 1)) {
+      if (rest.slice(2, at) === rest.slice(at + 3)) {
+        return {
+          oldPath: rest.slice(2, at),
+          newPath: rest.slice(at + 3),
+          prefixed: true
+        };
+      }
     }
-    const split = rest.indexOf(' ');
-    return split === -1
-        ? { oldPath: unquote(rest), newPath: null, prefixed: false }
-        : { oldPath: unquote(rest.slice(0, split)), newPath: unquote(rest.slice(split + 1)), prefixed: false };
-}
-function emptySection(firstLine, git) {
     return {
-        oldPath: null,
-        newPath: null,
-        git,
-        created: false,
-        deleted: false,
-        renamed: false,
-        copied: false,
-        binary: false,
-        firstLine,
-        lastLine: firstLine,
-        added: 0,
-        removed: 0,
-        hunks: [],
-        named: false,
-        prefixed: false
+      oldPath: rest.slice(2, middle),
+      newPath: unquote(rest.slice(middle + 3)),
+      prefixed: true
     };
+  }
+  const split = rest.indexOf(' ');
+  return split === -1 ? {
+    oldPath: unquote(rest),
+    newPath: null,
+    prefixed: false
+  } : {
+    oldPath: unquote(rest.slice(0, split)),
+    newPath: unquote(rest.slice(split + 1)),
+    prefixed: false
+  };
+}
+function emptySection(firstLine, git) {
+  return {
+    oldPath: null,
+    newPath: null,
+    git,
+    created: false,
+    deleted: false,
+    renamed: false,
+    copied: false,
+    binary: false,
+    firstLine,
+    lastLine: firstLine,
+    added: 0,
+    removed: 0,
+    hunks: [],
+    named: false,
+    prefixed: false
+  };
 }
 function statusOf(section) {
-    if (section.binary) {
-        return 'binary';
-    }
-    if (section.created || (!section.git && section.oldPath === null && section.newPath !== null)) {
-        return 'added';
-    }
-    if (section.deleted || (!section.git && section.newPath === null && section.oldPath !== null)) {
-        return 'deleted';
-    }
-    if (section.renamed) {
-        return 'renamed';
-    }
-    return section.copied ? 'copied' : 'modified';
+  if (section.binary) {
+    return 'binary';
+  }
+  if (section.created || !section.git && section.oldPath === null && section.newPath !== null) {
+    return 'added';
+  }
+  if (section.deleted || !section.git && section.newPath === null && section.oldPath !== null) {
+    return 'deleted';
+  }
+  if (section.renamed) {
+    return 'renamed';
+  }
+  return section.copied ? 'copied' : 'modified';
 }
 function linesOf(text, limits) {
-    const lines = [];
-    let start = 0;
-    while (lines.length < limits.maxLines && start <= limits.maxCharacters) {
-        const end = text.indexOf('\n', start);
-        if (end === -1) {
-            lines.push(text.slice(start).replace(/\r$/, ''));
-            return { lines, truncated: false };
-        }
-        lines.push(text.slice(start, end).replace(/\r$/, ''));
-        start = end + 1;
+  const lines = [];
+  let start = 0;
+  while (lines.length < limits.maxLines && start <= limits.maxCharacters) {
+    const end = text.indexOf('\n', start);
+    if (end === -1) {
+      lines.push(text.slice(start).replace(/\r$/, ''));
+      return {
+        lines,
+        truncated: false
+      };
     }
-    // Stopping right after a final newline leaves nothing unread.
-    return { lines, truncated: start < text.length };
+    lines.push(text.slice(start, end).replace(/\r$/, ''));
+    start = end + 1;
+  }
+  // Stopping right after a final newline leaves nothing unread.
+  return {
+    lines,
+    truncated: start < text.length
+  };
 }
 /*
  * What every line of a patch is, with the file numbers of its lines and the files it touches. It reads
@@ -128,177 +187,187 @@ function linesOf(text, limits) {
  * and says so in `truncated`.
  */
 export function patchLayoutOf(text, limits = {}) {
-    const { lines: source, truncated } = linesOf(text, { ...DEFAULT_PATCH_LIMITS, ...limits });
-    const lines = [];
-    const sections = [];
-    let section;
-    let hunk;
-    let binaryData = false;
-    const seal = () => {
-        if (hunk !== undefined && (hunk.oldLeft > 0 || hunk.newLeft > 0)) {
-            hunk.layout.consistent = false;
-        }
-        hunk = undefined;
-    };
-    const open = (line, git) => {
-        seal();
-        binaryData = false;
-        section = emptySection(line, git);
-        sections.push(section);
-        return section;
-    };
-    // A removed line can read `-- x`, so `---` starts a file only with `+++` under it.
-    const startsFile = (index) => source[index].startsWith('--- ') && (source[index + 1]?.startsWith('+++ ') ?? false);
-    const push = (line, index) => {
-        lines.push(line);
-        if (section !== undefined) {
-            section.lastLine = index;
-        }
-    };
-    for (let index = 0; index < source.length; index++) {
-        const line = source[index];
-        const remaining = hunk !== undefined && (hunk.oldLeft > 0 || hunk.newLeft > 0);
-        const gitStart = line.startsWith('diff --git ');
-        const header = line.startsWith('@@') ? parseHunkHeader(line) : undefined;
-        const fileStart = startsFile(index) && (!remaining || source[index + 2]?.startsWith('@@') === true);
-        if (remaining && !gitStart && header === undefined && !fileStart) {
-            if (isContent(line) || line === '' || line.startsWith('\\')) {
-                push(contentLine(line, hunk, section), index);
-            }
-            else {
-                hunk.layout.consistent = false;
-                push(OTHER, index);
-            }
-            continue;
-        }
-        if (gitStart) {
-            const created = open(index, true);
-            ({ oldPath: created.oldPath, newPath: created.newPath, prefixed: created.prefixed } = gitPaths(line.slice('diff --git '.length)));
-            push(FILE_HEADER, index);
-            continue;
-        }
-        if (fileStart) {
-            const reuse = section !== undefined && section.git && !section.named && section.hunks.length === 0;
-            const target = reuse ? section : open(index, false);
-            seal();
-            nameSides(target, line, source[index + 1]);
-            push(FILE_HEADER, index);
-            push(FILE_HEADER, index + 1);
-            index++;
-            continue;
-        }
-        if (header !== undefined) {
-            seal();
-            const target = section ?? open(index, false);
-            const layout = { line: index, ...header, consistent: true };
-            target.hunks.push(layout);
-            hunk = { layout, oldLeft: header.oldCount, newLeft: header.newCount, oldNumber: header.oldStart, newNumber: header.newStart };
-            push(HUNK_HEADER, index);
-            continue;
-        }
-        if (section === undefined) {
-            push(OTHER, index);
-        }
-        else if (hunk !== undefined && line.startsWith('\\')) {
-            push(NO_NEWLINE, index);
-        }
-        else if (hunk !== undefined && isContent(line) && line !== '-- ') {
-            // The counts ran out, so a line a person typed below the hunk extends it. The `-- ` of a mail signature does not.
-            hunk.layout.consistent = false;
-            push(contentLine(line, hunk, section), index);
-        }
-        else if (hunk === undefined && section.git && GIT_HEADERS.test(line)) {
-            readGitHeader(section, line);
-            push(FILE_HEADER, index);
-        }
-        else if (/^Binary files .* differ$/.test(line) || line === 'GIT binary patch') {
-            section.binary = true;
-            binaryData = line === 'GIT binary patch';
-            push(BINARY, index);
-        }
-        else if (binaryData && line !== '') {
-            push(BINARY, index);
-        }
-        else if (line === '') {
-            lines.push(OTHER);
-        }
-        else {
-            push(OTHER, index);
-        }
+  const {
+    lines: source,
+    truncated
+  } = linesOf(text, {
+    ...DEFAULT_PATCH_LIMITS,
+    ...limits
+  });
+  const lines = [];
+  const sections = [];
+  let section;
+  let hunk;
+  let binaryData = false;
+  const seal = () => {
+    if (hunk !== undefined && (hunk.oldLeft > 0 || hunk.newLeft > 0)) {
+      hunk.layout.consistent = false;
     }
+    hunk = undefined;
+  };
+  const open = (line, git) => {
     seal();
-    return {
-        lines,
-        truncated,
-        files: sections.map((entry) => ({
-            oldPath: entry.oldPath,
-            newPath: entry.newPath,
-            status: statusOf(entry),
-            firstLine: entry.firstLine,
-            lastLine: entry.lastLine,
-            added: entry.added,
-            removed: entry.removed,
-            hunks: entry.hunks
-        }))
-    };
-}
-function isContent(line) {
-    return line.startsWith('+') || line.startsWith('-') || line.startsWith(' ');
-}
-/* A line under a hunk header; an empty line is a context line whose space an editor trimmed. */
-function contentLine(line, hunk, section) {
-    if (line.startsWith('\\')) {
-        return NO_NEWLINE;
+    binaryData = false;
+    section = emptySection(line, git);
+    sections.push(section);
+    return section;
+  };
+  // A removed line can read `-- x`, so `---` starts a file only with `+++` under it.
+  const startsFile = index => source[index].startsWith('--- ') && (source[index + 1]?.startsWith('+++ ') ?? false);
+  const push = (line, index) => {
+    lines.push(line);
+    if (section !== undefined) {
+      section.lastLine = index;
     }
-    const kind = line.startsWith('+') ? 'added' : line.startsWith('-') ? 'removed' : 'context';
-    const takesOld = kind !== 'added';
-    const takesNew = kind !== 'removed';
-    if ((takesOld && hunk.oldLeft === 0) || (takesNew && hunk.newLeft === 0)) {
+  };
+  for (let index = 0; index < source.length; index++) {
+    const line = source[index];
+    const remaining = hunk !== undefined && (hunk.oldLeft > 0 || hunk.newLeft > 0);
+    const gitStart = line.startsWith('diff --git ');
+    const header = line.startsWith('@@') ? parseHunkHeader(line) : undefined;
+    const fileStart = startsFile(index) && (!remaining || source[index + 2]?.startsWith('@@') === true);
+    if (remaining && !gitStart && header === undefined && !fileStart) {
+      if (isContent(line) || line === '' || line.startsWith('\\')) {
+        push(contentLine(line, hunk, section), index);
+      } else {
         hunk.layout.consistent = false;
+        push(OTHER, index);
+      }
+      continue;
+    }
+    if (gitStart) {
+      const created = open(index, true);
+      ({
+        oldPath: created.oldPath,
+        newPath: created.newPath,
+        prefixed: created.prefixed
+      } = gitPaths(line.slice('diff --git '.length)));
+      push(FILE_HEADER, index);
+      continue;
+    }
+    if (fileStart) {
+      const reuse = section !== undefined && section.git && !section.named && section.hunks.length === 0;
+      const target = reuse ? section : open(index, false);
+      seal();
+      nameSides(target, line, source[index + 1]);
+      push(FILE_HEADER, index);
+      push(FILE_HEADER, index + 1);
+      index++;
+      continue;
     }
-    if (kind === 'added') {
-        section.added++;
+    if (header !== undefined) {
+      seal();
+      const target = section ?? open(index, false);
+      const layout = {
+        line: index,
+        ...header,
+        consistent: true
+      };
+      target.hunks.push(layout);
+      hunk = {
+        layout,
+        oldLeft: header.oldCount,
+        newLeft: header.newCount,
+        oldNumber: header.oldStart,
+        newNumber: header.newStart
+      };
+      push(HUNK_HEADER, index);
+      continue;
     }
-    else if (kind === 'removed') {
-        section.removed++;
+    if (section === undefined) {
+      push(OTHER, index);
+    } else if (hunk !== undefined && line.startsWith('\\')) {
+      push(NO_NEWLINE, index);
+    } else if (hunk !== undefined && isContent(line) && line !== '-- ') {
+      // The counts ran out, so a line a person typed below the hunk extends it. The `-- ` of a mail signature does not.
+      hunk.layout.consistent = false;
+      push(contentLine(line, hunk, section), index);
+    } else if (hunk === undefined && section.git && GIT_HEADERS.test(line)) {
+      readGitHeader(section, line);
+      push(FILE_HEADER, index);
+    } else if (/^Binary files .* differ$/.test(line) || line === 'GIT binary patch') {
+      section.binary = true;
+      binaryData = line === 'GIT binary patch';
+      push(BINARY, index);
+    } else if (binaryData && line !== '') {
+      push(BINARY, index);
+    } else if (line === '') {
+      lines.push(OTHER);
+    } else {
+      push(OTHER, index);
     }
-    const oldNumber = takesOld ? hunk.oldNumber++ : null;
-    const newNumber = takesNew ? hunk.newNumber++ : null;
-    hunk.oldLeft = takesOld ? Math.max(0, hunk.oldLeft - 1) : hunk.oldLeft;
-    hunk.newLeft = takesNew ? Math.max(0, hunk.newLeft - 1) : hunk.newLeft;
-    return { role: kind, old: oldNumber, new: newNumber };
+  }
+  seal();
+  return {
+    lines,
+    truncated,
+    files: sections.map(entry => ({
+      oldPath: entry.oldPath,
+      newPath: entry.newPath,
+      status: statusOf(entry),
+      firstLine: entry.firstLine,
+      lastLine: entry.lastLine,
+      added: entry.added,
+      removed: entry.removed,
+      hunks: entry.hunks
+    }))
+  };
+}
+function isContent(line) {
+  return line.startsWith('+') || line.startsWith('-') || line.startsWith(' ');
+}
+/* A line under a hunk header; an empty line is a context line whose space an editor trimmed. */
+function contentLine(line, hunk, section) {
+  if (line.startsWith('\\')) {
+    return NO_NEWLINE;
+  }
+  const kind = line.startsWith('+') ? 'added' : line.startsWith('-') ? 'removed' : 'context';
+  const takesOld = kind !== 'added';
+  const takesNew = kind !== 'removed';
+  if (takesOld && hunk.oldLeft === 0 || takesNew && hunk.newLeft === 0) {
+    hunk.layout.consistent = false;
+  }
+  if (kind === 'added') {
+    section.added++;
+  } else if (kind === 'removed') {
+    section.removed++;
+  }
+  const oldNumber = takesOld ? hunk.oldNumber++ : null;
+  const newNumber = takesNew ? hunk.newNumber++ : null;
+  hunk.oldLeft = takesOld ? Math.max(0, hunk.oldLeft - 1) : hunk.oldLeft;
+  hunk.newLeft = takesNew ? Math.max(0, hunk.newLeft - 1) : hunk.newLeft;
+  return {
+    role: kind,
+    old: oldNumber,
+    new: newNumber
+  };
 }
 function nameSides(section, oldLine, newLine) {
-    const oldName = pathOf(oldLine.slice(4));
-    const newName = pathOf(newLine.slice(4));
-    const prefixed = section.git ? section.prefixed : (oldName?.startsWith('a/') ?? false) && (newName?.startsWith('b/') ?? false);
-    section.oldPath = prefixed ? stripPrefix(oldName, 'a/') : oldName;
-    section.newPath = prefixed ? stripPrefix(newName, 'b/') : newName;
-    section.created ||= oldName === null;
-    section.deleted ||= newName === null;
-    section.named = true;
+  const oldName = pathOf(oldLine.slice(4));
+  const newName = pathOf(newLine.slice(4));
+  const prefixed = section.git ? section.prefixed : (oldName?.startsWith('a/') ?? false) && (newName?.startsWith('b/') ?? false);
+  section.oldPath = prefixed ? stripPrefix(oldName, 'a/') : oldName;
+  section.newPath = prefixed ? stripPrefix(newName, 'b/') : newName;
+  section.created ||= oldName === null;
+  section.deleted ||= newName === null;
+  section.named = true;
 }
 function readGitHeader(section, line) {
-    if (line.startsWith('new file mode ')) {
-        section.created = true;
-    }
-    else if (line.startsWith('deleted file mode ')) {
-        section.deleted = true;
-    }
-    else if (line.startsWith('rename from ')) {
-        section.renamed = true;
-        section.oldPath = pathOf(line.slice('rename from '.length));
-    }
-    else if (line.startsWith('rename to ')) {
-        section.renamed = true;
-        section.newPath = pathOf(line.slice('rename to '.length));
-    }
-    else if (line.startsWith('copy from ')) {
-        section.copied = true;
-        section.oldPath = pathOf(line.slice('copy from '.length));
-    }
-    else if (line.startsWith('copy to ')) {
-        section.copied = true;
-        section.newPath = pathOf(line.slice('copy to '.length));
-    }
-}
+  if (line.startsWith('new file mode ')) {
+    section.created = true;
+  } else if (line.startsWith('deleted file mode ')) {
+    section.deleted = true;
+  } else if (line.startsWith('rename from ')) {
+    section.renamed = true;
+    section.oldPath = pathOf(line.slice('rename from '.length));
+  } else if (line.startsWith('rename to ')) {
+    section.renamed = true;
+    section.newPath = pathOf(line.slice('rename to '.length));
+  } else if (line.startsWith('copy from ')) {
+    section.copied = true;
+    section.oldPath = pathOf(line.slice('copy from '.length));
+  } else if (line.startsWith('copy to ')) {
+    section.copied = true;
+    section.newPath = pathOf(line.slice('copy to '.length));
+  }
+}

package/dist/paths.js

@@ -1,7 +1,7 @@
 /* A path inside `folder` relative to it; any other path as it is. */
 export function relativeTo(path, folder) {
-    return path.startsWith(`${folder}/`) ? path.slice(folder.length + 1) : path;
+  return path.startsWith(`${folder}/`) ? path.slice(folder.length + 1) : path;
 }
 export function basenameOf(path) {
-    return path.replaceAll('\\', '/').split('/').at(-1) ?? path;
-}
+  return path.replaceAll('\\', '/').split('/').at(-1) ?? path;
+}