refactor: keep template setup internals private

Author: ryan-di

src/platform/workflow/templates/types/templateDetail.ts

@@ -1,11 +1,11 @@
 import type { TemplateModelDownloadState } from '@/platform/workflow/templates/utils/templateModelDownloadState'
 
-export interface TemplateDetailLink {
+interface TemplateDetailLink {
   label: string
   href: string
 }
 
-export type TemplateDetailRowStatus =
+type TemplateDetailRowStatus =
   | {
       kind: 'installed'
       label: string

src/platform/workflow/templates/utils/templateCustomNodeAvailability.ts

@@ -8,7 +8,7 @@ export type TemplateCustomNodeManagerCapability =
   | 'legacy'
   | 'incompatible'
 
-export type TemplateCustomNodeUnavailableReason =
+type TemplateCustomNodeUnavailableReason =
   | 'manager-disabled'
   | 'manager-legacy'
   | 'manager-incompatible'

src/platform/workflow/templates/utils/templateModelAvailability.ts

@@ -1,11 +1,8 @@
 import type { ModelFile } from '@/platform/workflow/validation/schemas/workflowSchema'
 
-export type TemplateModelAvailabilityStatus =
-  | 'installed'
-  | 'missing'
-  | 'unknown'
+type TemplateModelAvailabilityStatus = 'installed' | 'missing' | 'unknown'
 
-export type TemplateModelInventoryEntry = {
+type TemplateModelInventoryEntry = {
   directory: string
   name: string
 }

src/platform/workflow/templates/utils/templateModelDownloadState.ts

@@ -1,6 +1,6 @@
-export type TemplateModelDownloadActivity = 'active' | 'paused'
+type TemplateModelDownloadActivity = 'active' | 'paused'
 
-export type TemplateModelDownloadFailureReason = 'error' | 'cancelled'
+type TemplateModelDownloadFailureReason = 'error' | 'cancelled'
 
 export type TemplateModelDownloadState =
   | { status: 'idle'; attempt: 0 }

src/platform/workflow/templates/utils/templateModelSetup.ts

@@ -7,22 +7,22 @@ import type { ResolvedTemplateModelAvailability } from '@/platform/workflow/temp
 import type { TemplateModelRequirementDetail } from '@/platform/workflow/templates/utils/templateModelRequirements'
 import type { ModelFile } from '@/platform/workflow/validation/schemas/workflowSchema'
 
-export type TemplateModelSetupStatus =
+type TemplateModelSetupStatus =
   | 'installed'
   | 'downloadable'
   | 'manual'
   | 'unavailable'
   | 'unknown'
 
-export type TemplateModelTypeKey =
+type TemplateModelTypeKey =
   | 'model'
   | 'checkpoint'
   | 'diffusionModel'
   | 'textEncoder'
   | 'vae'
   | 'lora'
 
-export type TemplateModelType =
+type TemplateModelType =
   | { kind: 'known'; key: TemplateModelTypeKey }
   | { kind: 'directory'; raw: string }
 
@@ -42,7 +42,7 @@ export type TemplateModelSetupRow =
       status: Exclude<TemplateModelSetupStatus, 'manual'>
     })
 
-export type TemplateModelSetupTotal = {
+type TemplateModelSetupTotal = {
   bytes: number
   isComplete: boolean
 }

src/stores/electronDownloadStore.test.ts

@@ -27,16 +27,6 @@ type ElectronDownload = {
   totalBytes?: number
 }
 
-type NormalizedElectronDownload = ElectronDownload & {
-  status: DownloadStatus
-  receivedBytes: number
-  totalBytes: number
-}
-
-type NormalizeElectronDownloadState = (
-  download: DownloadState
-) => NormalizedElectronDownload
-
 type ElectronDownloadStore = {
   findByUrl: (url: string) => ElectronDownload | undefined
   initialize: () => Promise<void>
@@ -46,7 +36,6 @@ type ElectronDownloadStore = {
 }
 
 type ElectronDownloadStoreModule = {
-  normalizeElectronDownloadState: NormalizeElectronDownloadState
   useElectronDownloadStore: () => ElectronDownloadStore
 }
 
@@ -56,8 +45,6 @@ function isElectronDownloadStoreModule(
   return (
     typeof value === 'object' &&
     value !== null &&
-    'normalizeElectronDownloadState' in value &&
-    typeof value.normalizeElectronDownloadState === 'function' &&
     'useElectronDownloadStore' in value &&
     typeof value.useElectronDownloadStore === 'function'
   )
@@ -108,37 +95,6 @@ function progressUpdate(overrides: Partial<ElectronDownload> = {}) {
   }
 }
 
-describe('normalizeElectronDownloadState', () => {
-  it('maps restored state, bytes, and a valid byte fraction', () => {
-    expect(
-      getModule().normalizeElectronDownloadState(
-        downloadState({ state: DownloadStatus.PAUSED })
-      )
-    ).toEqual({
-      url: 'https://example.com/model.safetensors',
-      filename: 'model.safetensors',
-      status: DownloadStatus.PAUSED,
-      receivedBytes: 256,
-      totalBytes: 1024,
-      progress: 0.25
-    })
-  })
-
-  it('keeps restored bytes without inventing a fraction for an empty total', () => {
-    expect(
-      getModule().normalizeElectronDownloadState(
-        downloadState({ receivedBytes: 0, totalBytes: 0 })
-      )
-    ).toEqual({
-      url: 'https://example.com/model.safetensors',
-      filename: 'model.safetensors',
-      status: DownloadStatus.IN_PROGRESS,
-      receivedBytes: 0,
-      totalBytes: 0
-    })
-  })
-})
-
 describe('useElectronDownloadStore progress observation', () => {
   let emitProgress: ((download: ElectronDownload) => void) | undefined
 
@@ -153,6 +109,41 @@ describe('useElectronDownloadStore progress observation', () => {
       })
   })
 
+  it('restores status, bytes, and a valid byte fraction', async () => {
+    downloadManager.getAllDownloads.mockResolvedValueOnce([
+      downloadState({ state: DownloadStatus.PAUSED })
+    ])
+    const store = getModule().useElectronDownloadStore()
+
+    await vi.waitFor(() => {
+      expect(store.findByUrl('https://example.com/model.safetensors')).toEqual({
+        url: 'https://example.com/model.safetensors',
+        filename: 'model.safetensors',
+        status: DownloadStatus.PAUSED,
+        receivedBytes: 256,
+        totalBytes: 1024,
+        progress: 0.25
+      })
+    })
+  })
+
+  it('keeps restored bytes without inventing a fraction for an empty total', async () => {
+    downloadManager.getAllDownloads.mockResolvedValueOnce([
+      downloadState({ receivedBytes: 0, totalBytes: 0 })
+    ])
+    const store = getModule().useElectronDownloadStore()
+
+    await vi.waitFor(() => {
+      expect(store.findByUrl('https://example.com/model.safetensors')).toEqual({
+        url: 'https://example.com/model.safetensors',
+        filename: 'model.safetensors',
+        status: DownloadStatus.IN_PROGRESS,
+        receivedBytes: 0,
+        totalBytes: 0
+      })
+    })
+  })
+
   it('installs the live listener before awaiting the restored snapshot', () => {
     downloadManager.getAllDownloads.mockReturnValueOnce(
       deferred<DownloadState[]>().promise

src/stores/electronDownloadStore.ts

@@ -17,7 +17,7 @@ export interface ElectronDownload extends Pick<
   totalBytes?: number
 }
 
-export function normalizeElectronDownloadState({
+function normalizeElectronDownloadState({
   url,
   filename,
   state,