feat: use github.ts for fetchGistAndLoad() and getGistRevisions() (#1941)

* refactor: use GITHUB_GIST_LOAD in fetchGistAndLoad()

* refactor: use GITHUB_GIST_LIST_COMMITS in getGistRevisions()

Author: ckerr

src/ambient.d.ts

@@ -7,6 +7,9 @@ import {
   FiddleEvent,
   FileTransformOperation,
   Files,
+  GistLoadParams,
+  GistLoadResult,
+  GistRevision,
   IPackageManager,
   InstallState,
   InstallStateEvent,
@@ -104,6 +107,8 @@ declare global {
       ): Promise<void>;
       fetchVersions(): Promise<Version[]>;
       fetchExample(ref: string, path: string): Promise<EditorValues>;
+      gistListCommits(gistId: string): Promise<GistRevision[]>;
+      gistLoad(params: GistLoadParams): Promise<GistLoadResult>;
       getAvailableThemes(): Promise<Array<LoadedFiddleTheme>>;
       getElectronTypes(ver: RunnableVersion): Promise<string | undefined>;
       getIsPackageManagerInstalled(

src/interfaces.ts

@@ -217,6 +217,17 @@ export interface GistRevision {
   };
 }
 
+export interface GistLoadParams {
+  gistId: string;
+  revision?: string;
+}
+
+export interface GistLoadResult {
+  files: Record<string, { filename: string; content: string }>;
+  id: string;
+  revision?: string;
+}
+
 export enum GlobalSetting {
   acceleratorsToBlock = 'acceleratorsToBlock',
   channelsToShow = 'channelsToShow',

src/main/github.ts

@@ -6,7 +6,7 @@ import { IpcMainInvokeEvent, app, safeStorage } from 'electron';
 
 import { getTemplate } from './content';
 import { ipcMainManager } from './ipc';
-import { EditorValues, GistRevision } from '../interfaces';
+import { EditorValues, GistLoadResult, GistRevision } from '../interfaces';
 import { IpcEvents } from '../ipc-events';
 import { isSupportedFile } from '../utils/editor-utils';
 
@@ -284,15 +284,6 @@ async function handleGistDelete(
   return { success: true };
 }
 
-interface GistLoadResult {
-  files: Record<
-    string,
-    { filename: string; content: string; truncated: boolean; rawUrl?: string }
-  >;
-  id: string;
-  revision?: string;
-}
-
 async function handleGistLoad(
   _event: IpcMainInvokeEvent,
   params: unknown,
@@ -328,8 +319,6 @@ async function handleGistLoad(
     files[id] = {
       filename: data.filename ?? id,
       content,
-      truncated: false,
-      rawUrl: data.raw_url ?? undefined,
     };
   }
 

src/preload/preload.ts

@@ -7,6 +7,7 @@ import {
   FiddleEvent,
   FileTransformOperation,
   Files,
+  GistLoadParams,
   IPackageManager,
   MessageOptions,
   PMOperationOptions,
@@ -109,6 +110,10 @@ export async function setupFiddleGlobal() {
     },
     fetchExample: (ref: string, path: string) =>
       ipcRenderer.invoke(IpcEvents.GITHUB_FETCH_EXAMPLE, { ref, path }),
+    gistListCommits: (gistId: string) =>
+      ipcRenderer.invoke(IpcEvents.GITHUB_GIST_LIST_COMMITS, gistId),
+    gistLoad: (params: GistLoadParams) =>
+      ipcRenderer.invoke(IpcEvents.GITHUB_GIST_LOAD, params),
     getElectronTypes(ver: RunnableVersion) {
       return ipcRenderer.invoke(IpcEvents.GET_ELECTRON_TYPES, ver);
     },

src/renderer/remote-loader.ts

@@ -3,7 +3,6 @@ import semver from 'semver';
 import { AppState } from './state';
 import { disableDownload } from './utils/disable-download';
 import { isKnownFile, isSupportedFile } from './utils/editor-utils';
-import { getOctokit } from './utils/octokit';
 import { getReleaseChannel } from './versions';
 import {
   EditorValues,
@@ -80,31 +79,7 @@ export class RemoteLoader {
 
   public async getGistRevisions(gistId: string): Promise<GistRevision[]> {
     try {
-      const octo = await getOctokit(this.appState);
-      const { data: revisions } = await octo.gists.listCommits({
-        gist_id: gistId,
-      });
-
-      const oldestRevision = revisions[revisions.length - 1];
-      const nonEmptyRevisions = revisions.filter(
-        (r) =>
-          r === oldestRevision ||
-          (r.change_status.additions ?? 0) > 0 ||
-          (r.change_status.deletions ?? 0) > 0,
-      );
-
-      return nonEmptyRevisions.reverse().map((r, i) => {
-        return {
-          sha: r.version,
-          date: r.committed_at,
-          changes: {
-            total: r.change_status.total ?? 0,
-            additions: r.change_status.additions ?? 0,
-            deletions: r.change_status.deletions ?? 0,
-          },
-          title: i === 0 ? 'Created' : `Revision ${i}`,
-        };
-      });
+      return await window.ElectronFiddle.gistListCommits(gistId);
     } catch (error: any) {
       this.handleLoadingFailed(error);
       return [];
@@ -119,18 +94,12 @@ export class RemoteLoader {
     revision?: string,
   ): Promise<boolean> {
     try {
-      const octo = await getOctokit(this.appState);
-      const gist = revision
-        ? await octo.gists.getRevision({ gist_id: gistId, sha: revision })
-        : await octo.gists.get({ gist_id: gistId });
+      const gist = await window.ElectronFiddle.gistLoad({ gistId, revision });
 
       const values: EditorValues = {};
 
-      for (const [id, data] of Object.entries(gist.data.files ?? {})) {
-        if (!data) continue;
-        const content = data.truncated
-          ? await fetch(data.raw_url!).then((r) => r.text())
-          : data.content!;
+      for (const [id, data] of Object.entries(gist.files)) {
+        const { content } = data;
 
         if (id === PACKAGE_NAME) {
           const deps: Record<string, string> = {};
@@ -205,7 +174,7 @@ export class RemoteLoader {
       const result = await this.handleLoadingSuccess(values, gistId);
 
       // Set the active revision - either the specified revision or the latest one
-      const activeRevision = revision || gist.data.history?.[0]?.version;
+      const activeRevision = revision || gist.revision;
       if (activeRevision) {
         this.appState.activeGistRevision = activeRevision;
       }

tests/main/github.spec.ts

@@ -606,7 +606,6 @@ describe('github', () => {
         'https://gist.githubusercontent.com/raw/large.js',
       );
       expect(result.files['large.js'].content).toBe(fullContent);
-      expect(result.files['large.js'].truncated).toBe(false);
 
       fetchSpy.mockRestore();
     });
@@ -626,6 +625,71 @@ describe('github', () => {
       expect(result[1].title).toBe('Revision 1');
     });
 
+    it('always keeps the initial revision even with empty change_status', async () => {
+      await handleTokenSignOut(MOCK_EVENT);
+      mockOctokitInstance({
+        gists: {
+          listCommits: vi.fn().mockResolvedValue({
+            data: [
+              {
+                version: 'sha2',
+                committed_at: '2026-02-05T12:00:00Z',
+                change_status: { additions: 5, deletions: 2, total: 7 },
+              },
+              {
+                version: 'sha1',
+                committed_at: '2026-02-01T10:00:00Z',
+                change_status: { additions: 0, deletions: 0, total: 0 },
+              },
+            ],
+          }),
+        },
+      });
+      await handleTokenSignIn(MOCK_EVENT, VALID_GHP_TOKEN);
+
+      const result = await handleGistListCommits(MOCK_EVENT, VALID_GIST_ID);
+
+      // The initial revision should NOT be filtered out.
+      expect(result).toHaveLength(2);
+      expect(result[0].sha).toBe('sha1');
+      expect(result[0].title).toBe('Created');
+    });
+
+    it('filters out empty revisions except the initial one', async () => {
+      await handleTokenSignOut(MOCK_EVENT);
+      mockOctokitInstance({
+        gists: {
+          listCommits: vi.fn().mockResolvedValue({
+            data: [
+              {
+                version: 'sha3',
+                committed_at: '2026-02-10T12:00:00Z',
+                change_status: { additions: 3, deletions: 1, total: 4 },
+              },
+              {
+                version: 'sha2',
+                committed_at: '2026-02-05T12:00:00Z',
+                change_status: { additions: 0, deletions: 0, total: 0 },
+              },
+              {
+                version: 'sha1',
+                committed_at: '2026-02-01T10:00:00Z',
+                change_status: { additions: 0, deletions: 0, total: 0 },
+              },
+            ],
+          }),
+        },
+      });
+      await handleTokenSignIn(MOCK_EVENT, VALID_GHP_TOKEN);
+
+      const result = await handleGistListCommits(MOCK_EVENT, VALID_GIST_ID);
+
+      // sha2 (empty, not initial) is dropped; sha1 (initial) and sha3 are kept.
+      expect(result).toHaveLength(2);
+      expect(result[0].sha).toBe('sha1');
+      expect(result[1].sha).toBe('sha3');
+    });
+
     it('rejects invalid gist IDs', async () => {
       for (const gistId of INVALID_GIST_IDS) {
         await expect(handleGistListCommits(MOCK_EVENT, gistId)).rejects.toThrow(

tests/mocks/electron-fiddle.ts

@@ -12,6 +12,8 @@ export class ElectronFiddleMock {
   public downloadVersion = vi.fn();
   public fetchExample = vi.fn();
   public fetchVersions = vi.fn();
+  public gistListCommits = vi.fn();
+  public gistLoad = vi.fn();
   public getAvailableThemes = vi.fn();
   public getElectronTypes = vi.fn();
   public getIsPackageManagerInstalled = vi.fn();