@tanishqkancharla/diffmap 0.1.3 → 0.1.5

package/src/viewer/sourceNavigation.ts

@@ -1,8 +1,12 @@
-import { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import type { CodeViewDiffItem, CodeViewLineSelection } from "@pierre/diffs";
 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(
   endpoint: "source" | "definition",
@@ -42,14 +46,61 @@ export function useSourceReference(reference: SourceReference | undefined) {
     reference: SourceReference;
     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 (hostFiles !== undefined) return;
+    let active = true;
+    if (pin !== undefined) {
+      // Pinned GitHub spec: load this path at the spec commit SHA, never main.
+      // oxlint-disable-next-line typescript/no-floating-promises -- The effect owns its asynchronous source result.
+      void fetchPinnedBlob(pin, reference.path).then((contents) => {
+        if (!active) return;
+        if (contents instanceof Error) {
+          const message =
+            contents.message === "not-found"
+              ? `Could not read ${reference.path} at this commit.`
+              : contents.message;
+          setResolution({
+            reference,
+            result: new DiffmapDefinitionError({ reason: message }),
+          });
+          return;
+        }
+        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,
+              };
+        setResolution({
+          reference,
+          result: {
+            path: reference.path,
+            contents,
+            start: range.start,
+            end: range.end,
+          },
+        });
+      });
+      return () => {
+        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)
       params.set("start", String(reference.start));
     if (reference.end !== undefined) params.set("end", String(reference.end));
-    let active = true;
     // oxlint-disable-next-line typescript/no-floating-promises -- The effect owns its asynchronous source result.
     void requestSource("source", params).then((result) => {
       if (active) setResolution({ reference, result });
@@ -57,10 +108,37 @@ export function useSourceReference(reference: SourceReference | undefined) {
     return () => {
       active = false;
     };
-  }, [reference]);
+  }, [reference, pin, mode, hostFiles]);
+  if (hostResult !== undefined) return hostResult;
   return resolution?.reference === reference ? resolution?.result : undefined;
 }
 
+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}.`,
+    });
+  }
+  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,
+  };
+}
+
 export function matchingSourceDiff(
   source: SourceDefinition,
   items: CodeViewDiffItem[],

package/src/viewer/viewerMode.ts

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

package/src/viewer/vite-env.d.ts

@@ -1,4 +1,5 @@
 declare module "virtual:diffmap" {
   import type { ViewerDocument } from "../parseViewer.js";
-  export const viewerDocument: ViewerDocument;
+  export const viewerDocument: ViewerDocument | null;
+  export const parseError: string | null;
 }

package/vite.config.ts

@@ -34,7 +34,7 @@ export default defineConfig(({ command }) => {
     },
     clearScreen: false,
     server: {
-      port: 4177,
+      port: 0,
       strictPort: false,
     },
   };

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],
-    },
-  },
-);