@tanishqkancharla/diffmap 0.1.4 → 0.2.0

package/src/viewer/sourceNavigation.ts

@@ -1,10 +1,10 @@
-import { useEffect, useState } from "react";
-import type { CodeViewDiffItem, CodeViewLineSelection } from "@pierre/diffs";
+import { useEffect, useMemo, useState } from "react";
 import type { SourceReference } from "../annotations.js";
 import type { SourceDefinition, DefinitionResponse } from "../definitions.js";
 import { DiffmapDefinitionError } from "../errors.js";
 import { useGitHubPin } from "../github/pin.ts";
 import { fetchPinnedBlob, findSymbolLineRange } from "../github/fetchRepo.ts";
+import { useHostFiles } from "../host/files.ts";
 import { useViewerMode } from "./viewerMode.ts";
 
 export async function requestSource(
@@ -46,10 +46,15 @@ export function useSourceReference(reference: SourceReference | undefined) {
     result: SourceDefinition | Error;
   }>();
   const pin = useGitHubPin();
+  const hostFiles = useHostFiles();
   const mode = useViewerMode();
+  const hostResult = useMemo(() => {
+    if (reference?.kind !== "file" || hostFiles === undefined) return undefined;
+    return readHostFileReference(hostFiles, reference);
+  }, [reference, hostFiles]);
   useEffect(() => {
     if (reference?.kind !== "file") return;
-    if (mode === "gist") return;
+    if (hostFiles !== undefined) return;
     let active = true;
     if (pin !== undefined) {
       // Pinned GitHub spec: load this path at the spec commit SHA, never main.
@@ -89,6 +94,7 @@ export function useSourceReference(reference: SourceReference | undefined) {
         active = false;
       };
     }
+    if (mode !== "local") return;
     const params = new URLSearchParams({ path: reference.path });
     if (reference.symbol !== undefined) params.set("symbol", reference.symbol);
     if (reference.start !== undefined)
@@ -101,48 +107,33 @@ export function useSourceReference(reference: SourceReference | undefined) {
     return () => {
       active = false;
     };
-  }, [reference, pin, mode]);
+  }, [reference, pin, mode, hostFiles]);
+  if (hostResult !== undefined) return hostResult;
   return resolution?.reference === reference ? resolution?.result : undefined;
 }
 
-export function matchingSourceDiff(
-  source: SourceDefinition,
-  items: CodeViewDiffItem[],
-): CodeViewLineSelection | undefined {
-  const lines = source.contents.split(/\r?\n/);
-  for (const item of items) {
-    const diff = item.fileDiff;
-    if (diff.name !== source.path) continue;
-    const ranges = diff.hunks.flatMap((hunk) => {
-      const start = Math.max(source.start, hunk.additionStart);
-      const end = Math.min(
-        source.end,
-        hunk.additionStart + hunk.additionCount - 1,
-      );
-      return start <= end ? [{ start, end, hunk }] : [];
+function readHostFileReference(
+  files: Record<string, string>,
+  reference: Extract<SourceReference, { kind: "file" }>,
+): SourceDefinition | Error {
+  const contents = files[reference.path];
+  if (contents === undefined) {
+    return new DiffmapDefinitionError({
+      reason: `No hosted file for ${reference.path}.`,
     });
-    if (ranges.length === 0) continue;
-    const matches = ranges.every(({ start, end, hunk }) => {
-      for (let line = start; line <= end; line++) {
-        const index = diff.isPartial
-          ? hunk.additionLineIndex + line - hunk.additionStart
-          : line - 1;
-        if (
-          diff.additionLines[index]?.replace(/\r?\n$/, "") !== lines[line - 1]
-        )
-          return false;
-      }
-      return true;
-    });
-    if (!matches) continue;
-    return {
-      id: item.id,
-      range: {
-        start: Math.min(...ranges.map((range) => range.start)),
-        end: Math.max(...ranges.map((range) => range.end)),
-        side: "additions",
-      },
-    };
   }
-  return undefined;
+  const lineCount = Math.max(1, contents.split(/\r?\n/).length);
+  const range =
+    reference.symbol !== undefined
+      ? findSymbolLineRange(contents, reference.symbol)
+      : {
+          start: reference.start ?? 1,
+          end: reference.end ?? lineCount,
+        };
+  return {
+    path: reference.path,
+    contents,
+    start: range.start,
+    end: range.end,
+  };
 }

package/src/viewer/viewerMode.ts

@@ -1,6 +1,6 @@
 import { createContext, useContext } from "react";
 
-export type ViewerMode = "local" | "gist" | "github";
+export type ViewerMode = "local" | "gist" | "github" | "host";
 
 export const ViewerModeContext = createContext<ViewerMode>("local");
 

package/vite.config.ts

@@ -22,6 +22,7 @@ export default defineConfig(({ command }) => {
         "react-dom",
         "react/jsx-dev-runtime",
         "maui",
+        "motion/react",
         "purse-styles",
         "@pierre/diffs/react",
         "beautiful-mermaid",
@@ -34,7 +35,7 @@ export default defineConfig(({ command }) => {
     },
     clearScreen: false,
     server: {
-      port: 4177,
+      port: 0,
       strictPort: false,
     },
   };

package/vite.gist.config.ts

@@ -0,0 +1,57 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import react from "@vitejs/plugin-react";
+import { defineConfig, type UserConfig } from "vite";
+
+const packageRoot = path.dirname(fileURLToPath(import.meta.url));
+const gistRoot = path.join(packageRoot, "gist");
+
+/** Production / preview: static gist viewer. Never pulls `virtual:diffmap`. */
+export function gistAppConfig(): UserConfig {
+  return {
+    root: gistRoot,
+    cacheDir: path.join(packageRoot, "node_modules/.vite-gist"),
+    publicDir: false,
+    optimizeDeps: {
+      include: [
+        "react",
+        "react-dom",
+        "react/jsx-dev-runtime",
+        "maui",
+        "motion/react",
+        "purse-styles",
+        "@pierre/diffs/react",
+        "beautiful-mermaid",
+        "errore",
+        "md4x/standalone",
+      ],
+    },
+    plugins: [react()],
+    appType: "spa",
+    resolve: {
+      alias: {
+        "md4x/napi": path.join(
+          packageRoot,
+          "node_modules/md4x/lib/standalone.mjs",
+        ),
+      },
+      dedupe: ["react", "react-dom", "purse-styles"],
+    },
+    server: {
+      fs: {
+        allow: [packageRoot],
+      },
+    },
+    preview: {
+      host: "127.0.0.1",
+      port: 4178,
+    },
+    build: {
+      outDir: path.join(packageRoot, "dist"),
+      emptyOutDir: true,
+    },
+    clearScreen: false,
+  };
+}
+
+export default defineConfig(gistAppConfig());

package/src/viewer/Check.tsx

@@ -1,24 +0,0 @@
-import type { SVGProps } from "react";
-
-export function Check(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      focusable="false"
-      aria-hidden="true"
-      role="img"
-      width={24}
-      height={24}
-      fill="none"
-      viewBox="0 0 24 24"
-      {...props}
-    >
-      <path
-        stroke="currentColor"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        strokeWidth={1.5}
-        d="M5.75 12.5L10 16.75L18.25 7.25"
-      />
-    </svg>
-  );
-}

package/src/viewer/DoneButton.tsx

@@ -1,32 +0,0 @@
-import { Button, background, colors, iconSizeValues, text } from "maui";
-import { style, useStyles } from "purse-styles";
-import { Check } from "./Check.tsx";
-
-const checkIcon = style({
-  width: iconSizeValues.sm,
-  height: iconSizeValues.sm,
-});
-
-export function DoneButton(props: { onClick?: () => void }) {
-  const checkClass = useStyles(checkIcon);
-  const primaryClass = useStyles(primaryButtonClass);
-  return (
-    <Button className={primaryClass} onClick={props.onClick}>
-      <Check className={checkClass} />
-      Done
-    </Button>
-  );
-}
-
-const primaryButtonClass = style(
-  background.accent,
-  text({ size: "xs", fontWeight: 400, color: "onAccent" }),
-  {
-    "&:hover": {
-      backgroundColor: colors.accent[10],
-    },
-    "&:active": {
-      backgroundColor: colors.accent[11],
-    },
-  },
-);