@lapis-notes/history 0.1.2 → 0.2.0

package/dist/repository/components/blame/blame-view.js

@@ -0,0 +1,73 @@
+import { historySource, } from "../../controllers/history-source.js";
+import { View } from "@lapis-notes/api";
+import { mount, unmount } from "svelte";
+import RepositoryBlamePanel from "./RepositoryBlamePanel.svelte";
+export class BlameView extends View {
+    plugin;
+    #source = "backup";
+    #selection;
+    #controller;
+    #component;
+    constructor(leaf, plugin) {
+        super(leaf);
+        this.plugin = plugin;
+    }
+    getViewType() {
+        return "repository-file-blame";
+    }
+    getDisplayText() {
+        return this.#selection ? `Blame · ${this.#selection.path}` : "File blame";
+    }
+    getIcon() {
+        return "git-merge-conflict";
+    }
+    getState() {
+        return { ...this.#selection, source: this.#source };
+    }
+    async setState(state) {
+        const source = historySource(state);
+        if (this.#controller && source !== this.#source)
+            throw new Error("Open a separate tab to change history source");
+        this.#source = source;
+        this.#selection =
+            typeof state.operation === "string" &&
+                typeof state.commit === "string" &&
+                typeof state.path === "string"
+                ? { operation: state.operation, commit: state.commit, path: state.path }
+                : undefined;
+        if (this.#controller && this.#selection)
+            await this.#controller.open(this.#selection);
+        await super.setState(state);
+    }
+    async onOpen() { }
+    async onClose() { }
+    onload() {
+        const controller = (this.#controller = this.plugin.createBlameController(this.#source));
+        this.#component = mount(RepositoryBlamePanel, {
+            target: this.containerEl,
+            props: {
+                controller,
+                copyText: (value) => this.plugin.copyIdentifier(value),
+                onOpen: (commit) => {
+                    const operation = controller.state.selection?.operation;
+                    if (operation)
+                        void this.plugin
+                            .open(operation, commit, this.#source)
+                            .catch((error) => this.plugin.report(error));
+                },
+            },
+        });
+        if (this.#selection)
+            void controller.open(this.#selection);
+    }
+    onunload() {
+        if (this.#component)
+            void unmount(this.#component);
+        this.#component = undefined;
+        if (this.#controller)
+            void this.plugin
+                .release(this.#controller)
+                .catch((error) => this.plugin.report(error));
+        this.#controller = undefined;
+    }
+}

package/dist/repository/components/blame/editor-actions.d.ts

@@ -0,0 +1,3 @@
+import type { RepositoryPlugin } from "../repository-plugin.js";
+/** The enabled plugin owns editor contributions and their read-only controllers. */
+export declare function registerBlameEditorActions(plugin: RepositoryPlugin): void;

package/dist/repository/components/blame/editor-actions.js

@@ -0,0 +1,53 @@
+import { FileView } from "@lapis-notes/api";
+/** The enabled plugin owns editor contributions and their read-only controllers. */
+export function registerBlameEditorActions(plugin) {
+    const app = plugin.app;
+    const actions = new Map();
+    let disposed = false;
+    const sync = () => {
+        if (disposed)
+            return;
+        app.workspace.iterateRootLeaves((leaf) => {
+            const view = leaf.view;
+            if (!(view instanceof FileView))
+                return;
+            const installed = actions.get(view);
+            if (installed && view.actions.includes(installed))
+                return;
+            view.addAction("git-merge-conflict", "Blame file", async () => {
+                if (disposed || !view.file)
+                    return;
+                const path = view.file.path;
+                const controller = plugin.createFileHistoryController();
+                try {
+                    await controller.follow(path);
+                    const { operation, workspaceCommit: commit } = controller.state;
+                    if (!disposed && view.file?.path === path && operation && commit)
+                        await plugin.openBlame(operation, commit, path);
+                }
+                catch (error) {
+                    if (!disposed)
+                        plugin.report(error);
+                }
+                finally {
+                    await plugin.release(controller);
+                }
+            });
+            actions.set(view, view.actions.at(-1));
+        });
+    };
+    const fileOpen = app.workspace.on("file-open", sync);
+    const leafChange = app.workspace.on("active-leaf-change", sync);
+    const layoutChange = app.workspace.on("layout-change", sync);
+    plugin.register(() => {
+        disposed = true;
+        app.workspace.offref(fileOpen);
+        app.workspace.offref(leafChange);
+        app.workspace.offref(layoutChange);
+        for (const [view, action] of actions)
+            view.actions = view.actions.filter((value) => value !== action);
+        actions.clear();
+    });
+    app.workspace.onLayoutReady(sync);
+    sync();
+}

package/dist/repository/components/conflicts/RepositoryConflictActions.svelte

@@ -0,0 +1,83 @@
+<script lang="ts">
+  import { Button } from "@lapismd/design-core/shadcn/button";
+  import Trash2Icon from "@lucide/svelte/icons/trash-2";
+  import FileCheck2Icon from "@lucide/svelte/icons/file-check-2";
+  import EyeIcon from "@lucide/svelte/icons/eye";
+  import ArrowLeftIcon from "@lucide/svelte/icons/arrow-left";
+  import CheckIcon from "@lucide/svelte/icons/check";
+  let {
+    preview,
+    resolution,
+    selectedCount,
+    pathCount,
+    onDelete,
+    onStage,
+    onPreview,
+    onBack,
+  }: {
+    preview: boolean;
+    resolution?: "delete" | "uploaded_file";
+    selectedCount: number;
+    pathCount: number;
+    onDelete(): void;
+    onStage(): void;
+    onPreview(): void;
+    onBack(): void;
+  } = $props();
+</script>
+
+<div
+  class="store-conflict-editor__actions"
+  role="group"
+  aria-label="Conflict actions"
+>
+  {#if !preview}
+    <Button
+      type="button"
+      size="sm"
+      variant={resolution === "delete" ? "destructive" : "outline"}
+      aria-label="Delete path"
+      title="Delete path"
+      aria-pressed={resolution === "delete"}
+      onclick={onDelete}
+    >
+      <Trash2Icon data-icon="inline-start" aria-hidden="true" />
+      <span class="store-conflict-editor__action-label">Delete path</span>
+    </Button>
+    {#if resolution === "uploaded_file"}
+      <span class="store-conflict-editor__staged" role="status"
+        >Merged file staged</span
+      >
+    {/if}
+    <Button
+      type="button"
+      size="sm"
+      variant="outline"
+      aria-label="Stage merged file"
+      title="Stage merged file"
+      onclick={onStage}
+    >
+      <FileCheck2Icon data-icon="inline-start" aria-hidden="true" />
+      <span class="store-conflict-editor__action-label">Stage merged file</span>
+    </Button>
+    <Button
+      type="button"
+      size="sm"
+      disabled={selectedCount === 0}
+      onclick={onPreview}
+    >
+      <EyeIcon data-icon="inline-start" aria-hidden="true" />Preview {selectedCount}/{pathCount}
+    </Button>
+  {:else}
+    <Button type="button" size="sm" variant="outline" onclick={onBack}>
+      <ArrowLeftIcon data-icon="inline-start" aria-hidden="true" />Back
+    </Button>
+    <Button
+      size="sm"
+      disabled
+      title="Native conflict commands are not connected in this preview"
+    >
+      <CheckIcon data-icon="inline-start" aria-hidden="true" />Apply resolution
+    </Button>
+  {/if}
+</div>

package/dist/repository/components/conflicts/RepositoryConflictActions.svelte.d.ts

@@ -0,0 +1,13 @@
+type $$ComponentProps = {
+    preview: boolean;
+    resolution?: "delete" | "uploaded_file";
+    selectedCount: number;
+    pathCount: number;
+    onDelete(): void;
+    onStage(): void;
+    onPreview(): void;
+    onBack(): void;
+};
+declare const RepositoryConflictActions: import("svelte").Component<$$ComponentProps, {}, "">;
+type RepositoryConflictActions = ReturnType<typeof RepositoryConflictActions>;
+export default RepositoryConflictActions;

package/dist/repository/components/conflicts/RepositoryConflictBody.svelte

@@ -0,0 +1,93 @@
+<script lang="ts">
+  import { AppShell, AppShellController } from "@lapismd/design-core/shell";
+  import type { FileListingViewMode } from "@lapismd/design-core/diff";
+  import { onDestroy, type Snippet } from "svelte";
+  import RepositoryConflictFileTree from "./RepositoryConflictFileTree.svelte";
+
+  let {
+    height,
+    files,
+    activePath,
+    browserOpen,
+    compact,
+    locked,
+    onSelect,
+    children,
+  }: {
+    height: number;
+    files: readonly { path: string }[];
+    activePath: string;
+    browserOpen: boolean;
+    compact: boolean;
+    locked: boolean;
+    onSelect: (path: string) => void;
+    children: Snippet;
+  } = $props();
+  const shell = new AppShellController();
+  onDestroy(() => void shell.dispose());
+  let mode = $state<FileListingViewMode>("tree");
+  let collapsed = $state(new Set<string>());
+  function toggleDirectory(path: string) {
+    const next = new Set(collapsed);
+    if (!next.delete(path)) next.add(path);
+    collapsed = next;
+  }
+</script>
+
+<AppShell.Root
+  controller={shell}
+  displayMode="desktop"
+  desktopMinMainWidth={0}
+  class="store-conflict-editor__body-shell"
+  style={`--ui-shell-height:${height}px`}
+>
+  <AppShell.Main>
+    <AppShell.Body
+      layout="regions"
+      element="section"
+      label="Conflict editor body"
+    >
+      <AppShell.Body.Sidebar
+        id="conflict-file-browser"
+        panelId="conflict-file-browser"
+        side="left"
+        label="Conflict file browser"
+        open={browserOpen}
+        scrollbarVisibility="hover"
+        class="community-projects__file-tree-region"
+        style={`--ui-shell-body-sidebar-width: ${compact ? "100%" : "15rem"}`}
+      >
+        <div
+          class="store-conflict-editor__file-browser"
+          inert={locked}
+          aria-disabled={locked}
+        >
+          <RepositoryConflictFileTree
+            {files}
+            {mode}
+            collapsedDirectoryPaths={collapsed}
+            selectedPath={activePath}
+            onSelectPath={(path) => {
+              if (!locked) onSelect(path);
+            }}
+            onModeChange={(next) => (mode = next)}
+            onDirectoryToggle={toggleDirectory}
+          />
+        </div>
+      </AppShell.Body.Sidebar>
+      <AppShell.Body.Content
+        label="Conflict merge content"
+        scrollbarVisibility="hover"
+        class="store-conflict-editor__content"
+        hidden={compact && browserOpen}
+      >
+        <div
+          class="store-conflict-editor__content-body"
+          style={`height:${height}px`}
+        >
+          {@render children()}
+        </div>
+      </AppShell.Body.Content>
+    </AppShell.Body>
+  </AppShell.Main>
+</AppShell.Root>

package/dist/repository/components/conflicts/RepositoryConflictBody.svelte.d.ts

@@ -0,0 +1,16 @@
+import { type Snippet } from "svelte";
+type $$ComponentProps = {
+    height: number;
+    files: readonly {
+        path: string;
+    }[];
+    activePath: string;
+    browserOpen: boolean;
+    compact: boolean;
+    locked: boolean;
+    onSelect: (path: string) => void;
+    children: Snippet;
+};
+declare const RepositoryConflictBody: import("svelte").Component<$$ComponentProps, {}, "">;
+type RepositoryConflictBody = ReturnType<typeof RepositoryConflictBody>;
+export default RepositoryConflictBody;

package/dist/repository/components/conflicts/RepositoryConflictFileTree.svelte

@@ -0,0 +1,84 @@
+<script lang="ts">
+  import type { Snippet } from "svelte";
+  import {
+    FileListing,
+    FileListingViewModeToggle,
+    FileChangeStats,
+    type FileListingFile,
+    type FileListingDirectory,
+    type FileListingViewMode,
+  } from "@lapismd/design-core/diff";
+  import "./repository-conflict-file-tree.css";
+
+  let {
+    files,
+    directories = [],
+    mode = "tree",
+    collapsedDirectoryPaths,
+    selectedPath = "",
+    hasMore = false,
+    loading = false,
+    showChangeStats = false,
+    onSelectPath,
+    onLoadMore,
+    onModeChange,
+    onDirectoryToggle,
+    empty,
+  }: {
+    files: readonly FileListingFile[];
+    directories?: readonly FileListingDirectory[];
+    mode?: FileListingViewMode;
+    collapsedDirectoryPaths?: ReadonlySet<string>;
+    selectedPath?: string | undefined;
+    hasMore?: boolean;
+    loading?: boolean;
+    showChangeStats?: boolean;
+    onSelectPath: (path: string) => void;
+    onLoadMore?: () => void;
+    onModeChange?: (mode: FileListingViewMode) => void;
+    onDirectoryToggle?: (path: string) => void;
+    empty?: Snippet;
+  } = $props();
+</script>
+
+<div class="community-projects__file-tree">
+  <div class="community-projects__file-tree-actions">
+    <span class="community-projects__file-tree-title">Files</span>
+    <span class="community-projects__file-tree-count">{files.length}</span>
+    <FileListingViewModeToggle {mode} {onModeChange} />
+  </div>
+  {#if !files.length && !directories.length && empty}
+    {@render empty()}
+  {:else}
+    <div class="review-conflict-file-list">
+      <FileListing
+        files={[...files]}
+        directories={[...directories]}
+        {mode}
+        {collapsedDirectoryPaths}
+        selectedPath={selectedPath || null}
+        virtualize
+        {hasMore}
+        {loading}
+        loadingLabel="Loading more repository files"
+        {onSelectPath}
+        {onLoadMore}
+        {onDirectoryToggle}
+      >
+        {#snippet fileLabel({ name })}<span class="review-conflict-file-label"
+            >{name}</span
+          >{/snippet}
+        {#snippet fileMeta({ file })}
+          {#if showChangeStats}
+            {#if typeof file.additions === "number" && typeof file.deletions === "number"}
+              <FileChangeStats
+                additions={file.additions}
+                deletions={file.deletions}
+              />
+            {:else}<span class="sr-only">Line counts unavailable</span>{/if}
+          {:else}<span class="sr-only">Repository file</span>{/if}
+        {/snippet}
+      </FileListing>
+    </div>
+  {/if}
+</div>

package/dist/repository/components/conflicts/RepositoryConflictFileTree.svelte.d.ts

@@ -0,0 +1,21 @@
+import type { Snippet } from "svelte";
+import { type FileListingFile, type FileListingDirectory, type FileListingViewMode } from "@lapismd/design-core/diff";
+import "./repository-conflict-file-tree.css";
+type $$ComponentProps = {
+    files: readonly FileListingFile[];
+    directories?: readonly FileListingDirectory[];
+    mode?: FileListingViewMode;
+    collapsedDirectoryPaths?: ReadonlySet<string>;
+    selectedPath?: string | undefined;
+    hasMore?: boolean;
+    loading?: boolean;
+    showChangeStats?: boolean;
+    onSelectPath: (path: string) => void;
+    onLoadMore?: () => void;
+    onModeChange?: (mode: FileListingViewMode) => void;
+    onDirectoryToggle?: (path: string) => void;
+    empty?: Snippet;
+};
+declare const RepositoryConflictFileTree: import("svelte").Component<$$ComponentProps, {}, "">;
+type RepositoryConflictFileTree = ReturnType<typeof RepositoryConflictFileTree>;
+export default RepositoryConflictFileTree;

package/dist/repository/components/conflicts/RepositoryConflictPath.svelte

@@ -0,0 +1,35 @@
+<script lang="ts">
+  import { untrack } from "svelte";
+  import type { LocalConflictDescriptor } from "@lapismd/jj-history";
+  import RepositoryConflictText from "./RepositoryConflictText.svelte";
+  let {
+    conflict,
+    draft,
+    onChange,
+  }: {
+    conflict: LocalConflictDescriptor;
+    draft?: string;
+    onChange(content: string): void;
+  } = $props();
+  // This seed belongs to this mounted path; keystrokes must not rebuild the editor.
+  const seed = untrack(
+    () =>
+      draft ??
+      (conflict.editor.status === "text" ? conflict.editor.contents[1] : ""),
+  );
+</script>
+
+<section class="store-conflict-path" aria-label={`Conflict ${conflict.path}`}>
+  {#if conflict.editor.status === "text" && conflict.editor.contents.length === 3}
+    <div class="store-conflict-path__editor">
+      <RepositoryConflictText
+        path={conflict.path}
+        left={conflict.editor.contents[0]}
+        base={seed}
+        right={conflict.editor.contents[2]}
+        editable
+        onResolvedChange={({ content }) => onChange(content)}
+      />
+    </div>
+  {:else}<p>Merge editor unavailable for this native conflict shape.</p>{/if}
+</section>

package/dist/repository/components/conflicts/RepositoryConflictPath.svelte.d.ts

@@ -0,0 +1,9 @@
+import type { LocalConflictDescriptor } from "@lapismd/jj-history";
+type $$ComponentProps = {
+    conflict: LocalConflictDescriptor;
+    draft?: string;
+    onChange(content: string): void;
+};
+declare const RepositoryConflictPath: import("svelte").Component<$$ComponentProps, {}, "">;
+type RepositoryConflictPath = ReturnType<typeof RepositoryConflictPath>;
+export default RepositoryConflictPath;

package/dist/repository/components/conflicts/RepositoryConflictResolution.svelte

@@ -0,0 +1,133 @@
+<script lang="ts">
+  import RepositorySkeleton from "../RepositorySkeleton.svelte";
+  import { untrack } from "svelte";
+  import { MediaQuery } from "svelte/reactivity";
+  import type { LocalConflictDescriptor } from "@lapismd/jj-history";
+  import { Button } from "@lapismd/design-core/shadcn/button";
+  import RepositoryConflictSurface from "./RepositoryConflictSurface.svelte";
+  import RepositoryConflictActions from "./RepositoryConflictActions.svelte";
+  import RepositoryConflictPath from "./RepositoryConflictPath.svelte";
+  let {
+    open,
+    conflicts,
+    ready,
+    busy,
+    onLoad,
+    onClose,
+  }: {
+    open: boolean;
+    conflicts: readonly LocalConflictDescriptor[];
+    ready: boolean;
+    busy: boolean;
+    onLoad(): void;
+    onClose(): void;
+  } = $props();
+  const compact = new MediaQuery("(max-width: 700px)");
+  let browserOpen = $state(true),
+    activePath = $state("");
+  let drafts = $state<Record<string, string>>({});
+  let staged = $state<
+    Record<string, { type: "delete" } | { type: "uploaded_file"; text: string }>
+  >({});
+  let preview = $state(false);
+  let requested = $state(false);
+  const active = $derived(
+    conflicts.find((c) => c.path === activePath) ?? conflicts[0],
+  );
+  const selected = $derived(active ? staged[active.path] : undefined);
+  $effect(() => {
+    if (compact.current) browserOpen = false;
+  });
+  $effect(() => {
+    if (open && !requested) {
+      requested = true;
+      untrack(() => onLoad());
+    }
+  });
+  function stage() {
+    if (active?.editor.status !== "text") return;
+    staged[active.path] = {
+      type: "uploaded_file",
+      text: drafts[active.path] ?? active.editor.contents[1] ?? "",
+    };
+  }
+</script>
+
+<RepositoryConflictSurface
+  {open}
+  label="Resolve native conflicts"
+  {busy}
+  locked={busy || preview}
+  bind:browserOpen
+  compact={compact.current}
+  files={conflicts}
+  activePath={active?.path ?? ""}
+  onSelect={(path) => {
+    activePath = path;
+    if (compact.current) browserOpen = false;
+  }}
+  {onClose}
+>
+  {#snippet actions()}
+    {#if ready && active}<RepositoryConflictActions
+        {preview}
+        resolution={selected?.type}
+        selectedCount={Object.keys(staged).length}
+        pathCount={conflicts.length}
+        onDelete={() => {
+          if (!active) return;
+          if (selected?.type === "delete") delete staged[active.path];
+          else staged[active.path] = { type: "delete" };
+        }}
+        onStage={stage}
+        onPreview={() => {
+          if (Object.keys(staged).length) preview = true;
+        }}
+        onBack={() => (preview = false)}
+      />{/if}
+  {/snippet}
+  {#if !ready}
+    {#if busy}<RepositorySkeleton
+        kind="conflicts"
+        label="Loading native conflict details…"
+      />
+    {:else}<p role="status">Conflict details are unavailable.</p>
+      <Button variant="outline" size="sm" onclick={onLoad}
+        >Retry conflict details</Button
+      >
+    {/if}
+  {:else if !conflicts.length}<p>
+      No conflict descriptors are available for this revision.
+    </p>
+  {:else if preview}
+    <section
+      class="store-conflict-preview"
+      aria-label="Conflict resolution preview"
+    >
+      <h2>Resolution draft</h2>
+      {#each Object.entries(staged) as [path, resolution] (path)}
+        <p>{resolution.type === "delete" ? "Delete" : "Replace"} {path}</p>
+        {#if resolution.type === "uploaded_file"}<pre><code
+              >{resolution.text}</code
+            ></pre>{/if}
+      {/each}
+      <p>
+        Draft retained locally while this revision stays selected. Applying
+        repository changes is unavailable in this read-only plugin.
+      </p>
+    </section>
+  {:else if active}
+    <div class="store-conflict-editor__path">
+      {#key active.path}<RepositoryConflictPath
+          conflict={active}
+          draft={drafts[active.path]}
+          onChange={(content) => {
+            drafts[active.path] = content;
+            const current = staged[active.path];
+            if (current?.type === "uploaded_file" && current.text !== content)
+              delete staged[active.path];
+          }}
+        />{/key}
+    </div>
+  {/if}
+</RepositoryConflictSurface>

package/dist/repository/components/conflicts/RepositoryConflictResolution.svelte.d.ts

@@ -0,0 +1,12 @@
+import type { LocalConflictDescriptor } from "@lapismd/jj-history";
+type $$ComponentProps = {
+    open: boolean;
+    conflicts: readonly LocalConflictDescriptor[];
+    ready: boolean;
+    busy: boolean;
+    onLoad(): void;
+    onClose(): void;
+};
+declare const RepositoryConflictResolution: import("svelte").Component<$$ComponentProps, {}, "">;
+type RepositoryConflictResolution = ReturnType<typeof RepositoryConflictResolution>;
+export default RepositoryConflictResolution;