fix: load about metadata from config

packages/about-view/src/parts/AboutState/AboutState.ts

@@ -3,5 +3,4 @@ export interface AboutState {
   readonly lines: readonly string[]
   readonly productName: string
   readonly uid: number
-  readonly useNewLoadConfig: boolean
 }

packages/about-view/src/parts/Create/Create.ts

@@ -1,13 +1,12 @@
 import type { AboutState } from '../AboutState/AboutState.ts'
 import * as AboutStates from '../AboutStates/AboutStates.ts'
 
-export const create = (uid: number, useNewLoadConfig = false): void => {
+export const create = (uid: number): void => {
   const state: AboutState = {
     focusId: 0,
     lines: [],
     productName: '',
     uid,
-    useNewLoadConfig,
   }
   AboutStates.set(uid, state, state)
 }

packages/about-view/src/parts/GetAboutDetailString/GetAboutDetailString.ts

@@ -1,23 +1,20 @@
-/* eslint-disable @typescript-eslint/await-thenable */
+import type { Config } from '../LoadConfig/LoadConfig.ts'
 import * as FormatAboutDate from '../FormatAboutDate/FormatAboutDate.ts'
 import * as JoinLines from '../JoinLines/JoinLines.ts'
 import * as Process from '../Process/Process.ts'
 
-export const getDetailString = async (): Promise<string> => {
-  const [electronVersion, nodeVersion, chromeVersion, version, commit, v8Version, date] = await Promise.all([
+export const getDetailString = async (config: Config): Promise<string> => {
+  const [electronVersion, nodeVersion, chromeVersion, v8Version] = await Promise.all([
     Process.getElectronVersion(),
     Process.getNodeVersion(),
     Process.getChromeVersion(),
-    Process.getVersion(),
-    Process.getCommit(),
     Process.getV8Version(),
-    Process.getDate(),
   ])
   const now = Date.now()
-  const formattedDate = FormatAboutDate.formatAboutDate(date, now)
+  const formattedDate = FormatAboutDate.formatAboutDate(config.date, now)
   const lines = [
-    `Version: ${version}`,
-    `Commit: ${commit}`,
+    `Version: ${config.version}`,
+    `Commit: ${config.commit}`,
     `Date: ${formattedDate}`,
     `Electron: ${electronVersion}`,
     `Chromium: ${chromeVersion}`,

packages/about-view/src/parts/GetAboutDetailStringWeb/GetAboutDetailStringWeb.ts

@@ -1,13 +1,11 @@
-import { commit } from '../Commit/Commit.ts'
-import { commitDate } from '../CommitDate/CommitDate.ts'
+import type { Config } from '../LoadConfig/LoadConfig.ts'
 import * as FormatAboutDate from '../FormatAboutDate/FormatAboutDate.ts'
 import * as GetBrowser from '../GetBrowser/GetBrowser.ts'
-import { version } from '../Version/Version.ts'
 
-export const getDetailStringWeb = (): readonly string[] => {
+export const getDetailStringWeb = (config: Config): readonly string[] => {
   const now = Date.now()
-  const formattedDate = FormatAboutDate.formatAboutDate(commitDate, now)
+  const formattedDate = FormatAboutDate.formatAboutDate(config.date, now)
   const browser = GetBrowser.getBrowser()
-  const lines = [`Version: ${version}`, `Commit: ${commit}`, `Date: ${formattedDate}`, `Browser: ${browser}`]
+  const lines = [`Version: ${config.version}`, `Commit: ${config.commit}`, `Date: ${formattedDate}`, `Browser: ${browser}`]
   return lines
 }

packages/about-view/src/parts/LoadConfig/LoadConfig.ts

@@ -1,5 +1,4 @@
 import { FileSystemWorker } from '@lvce-editor/rpc-registry'
-import type { AboutState } from '../AboutState/AboutState.ts'
 import * as GetConfigJsonPath from '../GetConfigJsonPath/GetConfigJsonPath.ts'
 
 export interface Config {
@@ -17,7 +16,7 @@ const getString = (config: Record<string, unknown>, key: string): string => {
   return value
 }
 
-export const loadConfig = async (_state?: AboutState): Promise<Config> => {
+export const loadConfig = async (): Promise<Config> => {
   const configJsonPath = await GetConfigJsonPath.getConfigJsonPath()
   // FileSystemWorker.readFile is a custom RPC that already returns a string.
   // eslint-disable-next-line unicorn/consistent-json-file-read

packages/about-view/src/parts/LoadContent2/LoadContent2.ts

@@ -1,50 +1,14 @@
 import type { AboutState } from '../AboutState/AboutState.ts'
 import * as AboutFocusId from '../AboutFocusId/AboutFocusId.ts'
-import { commit } from '../Commit/Commit.ts'
-import { commitDate } from '../CommitDate/CommitDate.ts'
-import * as FormatAboutDate from '../FormatAboutDate/FormatAboutDate.ts'
 import * as GetAboutDetailStringWeb from '../GetAboutDetailStringWeb/GetAboutDetailStringWeb.ts'
-import * as GetBrowser from '../GetBrowser/GetBrowser.ts'
 import * as LoadConfig from '../LoadConfig/LoadConfig.ts'
-import { version } from '../Version/Version.ts'
-
-interface Content {
-  readonly lines: readonly string[]
-  readonly productName: string
-}
-
-const getContentFromConfig = async (state: AboutState): Promise<Content> => {
-  const now = Date.now()
-  try {
-    const config = await LoadConfig.loadConfig(state)
-    const resolvedVersion = config.version || version
-    const resolvedCommit = config.commit || commit
-    const resolvedDate = config.date || commitDate
-    const formattedDate = FormatAboutDate.formatAboutDate(resolvedDate, now)
-    const browser = GetBrowser.getBrowser()
-    return {
-      lines: [`Version: ${resolvedVersion}`, `Commit: ${resolvedCommit}`, `Date: ${formattedDate}`, `Browser: ${browser}`],
-      productName: config.productName || state.productName,
-    }
-  } catch {
-    return {
-      lines: GetAboutDetailStringWeb.getDetailStringWeb(),
-      productName: state.productName,
-    }
-  }
-}
 
 export const loadContent2 = async (state: AboutState): Promise<AboutState> => {
-  const content = state.useNewLoadConfig
-    ? await getContentFromConfig(state)
-    : {
-        lines: GetAboutDetailStringWeb.getDetailStringWeb(),
-        productName: state.productName,
-      }
+  const config = await LoadConfig.loadConfig()
   return {
     ...state,
     focusId: AboutFocusId.Ok,
-    lines: content.lines,
-    productName: content.productName,
+    lines: GetAboutDetailStringWeb.getDetailStringWeb(config),
+    productName: config.productName,
   }
 }

packages/about-view/src/parts/Process/Process.ts

@@ -1,24 +1,9 @@
 import { RendererWorker } from '@lvce-editor/rpc-registry'
-import { commit } from '../Commit/Commit.ts'
-import { commitDate } from '../CommitDate/CommitDate.ts'
-import { version } from '../Version/Version.ts'
 
 export const getElectronVersion = RendererWorker.getElectronVersion
 
 export const getNodeVersion = RendererWorker.getNodeVersion
 
 export const getChromeVersion = RendererWorker.getChromeVersion
 
-export const getVersion = async (): Promise<string> => {
-  return version
-}
-
-export const getCommit = async (): Promise<string> => {
-  return commit
-}
-
 export const getV8Version = RendererWorker.getV8Version
-
-export const getDate = (): string => {
-  return commitDate
-}

packages/about-view/src/parts/ShowAboutElectron/ShowAboutElectron.ts

@@ -6,15 +6,10 @@ import * as GetAboutDetailString from '../GetAboutDetailString/GetAboutDetailStr
 import * as GetWindowId from '../GetWindowId/GetWindowId.ts'
 import * as LoadConfig from '../LoadConfig/LoadConfig.ts'
 
-const getProductName = async (): Promise<string> => {
-  const config = await LoadConfig.loadConfig()
-  return config.productName
-}
-
 export const showAboutElectron = async (): Promise<void> => {
-  const windowId = await GetWindowId.getWindowId()
-  const detail = await GetAboutDetailString.getDetailString()
-  const productName = await getProductName()
+  const [windowId, config] = await Promise.all([GetWindowId.getWindowId(), LoadConfig.loadConfig()])
+  const detail = await GetAboutDetailString.getDetailString(config)
+  const { productName } = config
   const options = {
     buttons: [AboutStrings.copy(), AboutStrings.ok()],
     detail,

packages/about-view/test/AboutStates.test.ts

@@ -13,14 +13,12 @@ test('set and get state', () => {
     lines: ['line 1', 'line 2'],
     productName: 'Test App',
     uid: 1,
-    useNewLoadConfig: false,
   }
   const newState: AboutState = {
     focusId: 1,
     lines: ['line 1', 'line 2', 'line 3'],
     productName: 'Test App',
     uid: 1,
-    useNewLoadConfig: false,
   }
 
   AboutStates.set(uid, oldState, newState)
@@ -46,7 +44,6 @@ test('getKeys returns all state keys', () => {
     lines: ['line 1'],
     productName: 'Test App',
     uid: 1,
-    useNewLoadConfig: false,
   }
 
   AboutStates.set(uid1, state, state)

packages/about-view/test/Create.test.ts

@@ -17,51 +17,18 @@ test('create initializes state with default values', () => {
       lines: [],
       productName: '',
       uid: 123,
-      useNewLoadConfig: false,
     },
     oldState: {
       focusId: 0,
       lines: [],
       productName: '',
       uid: 123,
-      useNewLoadConfig: false,
     },
     scheduledState: {
       focusId: 0,
       lines: [],
       productName: '',
       uid: 123,
-      useNewLoadConfig: false,
-    },
-  })
-})
-
-test('create initializes state with useNewLoadConfig', () => {
-  const uid = 123
-  Create.create(uid, true)
-  const result = AboutStates.get(uid)
-
-  expect(result).toEqual({
-    newState: {
-      focusId: 0,
-      lines: [],
-      productName: '',
-      uid: 123,
-      useNewLoadConfig: true,
-    },
-    oldState: {
-      focusId: 0,
-      lines: [],
-      productName: '',
-      uid: 123,
-      useNewLoadConfig: true,
-    },
-    scheduledState: {
-      focusId: 0,
-      lines: [],
-      productName: '',
-      uid: 123,
-      useNewLoadConfig: true,
     },
   })
 })

packages/about-view/test/Diff2.test.ts

@@ -14,14 +14,12 @@ test('diff2 returns diff between old and new state', () => {
     lines: ['line 1', 'line 2'],
     productName: 'Test App',
     uid: 1,
-    useNewLoadConfig: false,
   }
   const newState: AboutState = {
     focusId: 0,
     lines: ['line 1', 'line 3'],
     productName: 'Test App',
     uid: 1,
-    useNewLoadConfig: false,
   }
 
   AboutStates.set(uid, oldState, newState)

packages/about-view/test/Dispose.test.ts

@@ -14,7 +14,6 @@ test('dispose', () => {
     lines: ['test'],
     productName: 'Test',
     uid: 1,
-    useNewLoadConfig: false,
   }
   AboutStates.set(uid, state, state)
   expect(AboutStates.get(uid)).toBeDefined()

packages/about-view/test/FocusNext.test.ts

@@ -9,14 +9,12 @@ test('focusNext - from Ok to Copy', () => {
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   }
   expect(FocusNext.focusNext(state)).toEqual({
     focusId: AboutFocusId.Copy,
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   })
 })
 
@@ -26,14 +24,12 @@ test('focusNext - from Copy to Ok', () => {
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   }
   expect(FocusNext.focusNext(state)).toEqual({
     focusId: AboutFocusId.Ok,
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   })
 })
 
@@ -43,13 +39,11 @@ test('focusNext - from None stays None', () => {
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   }
   expect(FocusNext.focusNext(state)).toEqual({
     focusId: AboutFocusId.None,
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   })
 })

packages/about-view/test/FocusPrevious.test.ts

@@ -9,15 +9,13 @@ test('focusPrevious - from Ok to Copy', () => {
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   }
   expect(FocusPrevious.focusPrevious(state)).toEqual({
     focusId: AboutFocusId.Copy,
     lines: [],
     productName: 'Test Product',
 
     uid: 1,
-    useNewLoadConfig: false,
   })
 })
 
@@ -27,14 +25,12 @@ test('focusPrevious - from Copy to Ok', () => {
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   }
   expect(FocusPrevious.focusPrevious(state)).toEqual({
     focusId: AboutFocusId.Ok,
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   })
 })
 
@@ -44,13 +40,11 @@ test('focusPrevious - from None stays None', () => {
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   }
   expect(FocusPrevious.focusPrevious(state)).toEqual({
     focusId: AboutFocusId.None,
     lines: [],
     productName: 'Test Product',
     uid: 1,
-    useNewLoadConfig: false,
   })
 })

packages/about-view/test/GetAboutDetailString.test.ts

@@ -2,7 +2,7 @@ import { expect, test } from '@jest/globals'
 import { RendererWorker } from '@lvce-editor/rpc-registry'
 import * as GetAboutDetailString from '../src/parts/GetAboutDetailString/GetAboutDetailString.ts'
 
-test('getDetailStringWeb', async () => {
+test('getDetailString', async () => {
   RendererWorker.registerMockRpc({
     'Process.getChromeVersion'(): string {
       return '0.0.0-dev'
@@ -17,7 +17,13 @@ test('getDetailStringWeb', async () => {
       return '0.0.0-dev'
     },
   })
-  expect(await GetAboutDetailString.getDetailString()).toBe(
-    `Version: 0.0.0-dev\nCommit: unknown commit\nDate: unknown\nElectron: 0.0.0-dev\nChromium: 0.0.0-dev\nNode: 0.0.0-dev\nV8: 0.0.0-dev`,
+  const config = {
+    commit: 'abc123',
+    date: '',
+    productName: 'Test Editor',
+    version: '1.2.3',
+  }
+  expect(await GetAboutDetailString.getDetailString(config)).toBe(
+    `Version: 1.2.3\nCommit: abc123\nDate: unknown\nElectron: 0.0.0-dev\nChromium: 0.0.0-dev\nNode: 0.0.0-dev\nV8: 0.0.0-dev`,
   )
 })