@lvce-editor/shared-process 0.86.4 → 0.86.6

package/src/parts/ExtensionList/ExtensionList.js

@@ -1,10 +1,10 @@
 import { basename } from 'node:path'
+import * as BuiltinExtensionsPath from '../BuiltinExtensionsPath/BuiltinExtensionsPath.js'
 import * as ExtensionManifestInputType from '../ExtensionManifestInputType/ExtensionManifestInputType.js'
-import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js'
 import * as ExtensionManifests from '../ExtensionManifests/ExtensionManifests.js'
+import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js'
 import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import * as TransientLinkedExtensions from '../TransientLinkedExtensions/TransientLinkedExtensions.js'
-import * as BuiltinExtensionsPath from '../BuiltinExtensionsPath/BuiltinExtensionsPath.js'
 import { VError } from '../VError/VError.js'
 
 const getManifestVersion = (json) => {
@@ -34,8 +34,8 @@ const getManifestInfo = (json) => {
   const symlink = getSymlink(json)
   return {
     id,
-    version,
     symlink,
+    version,
   }
 }
 
@@ -52,23 +52,23 @@ export const list = async () => {
   try {
     const transientLinkedExtensions = TransientLinkedExtensions.getLinkedExtensions().map((link) => {
       return {
-        type: ExtensionManifestInputType.LinkedExtension,
         path: link.resolvedPath,
+        type: ExtensionManifestInputType.LinkedExtension,
       }
     })
     const manifests = await ExtensionManifests.getAll([
       ...transientLinkedExtensions,
       {
-        type: ExtensionManifestInputType.LinkedExtensionsFolder,
         path: PlatformPaths.getLinkedExtensionsPath(),
+        type: ExtensionManifestInputType.LinkedExtensionsFolder,
       },
       {
-        type: ExtensionManifestInputType.Folder,
         path: PlatformPaths.getExtensionsPath(),
+        type: ExtensionManifestInputType.Folder,
       },
       {
-        type: ExtensionManifestInputType.Folder,
         path: BuiltinExtensionsPath.getBuiltinExtensionsPath(),
+        type: ExtensionManifestInputType.Folder,
       },
     ])
     const infos = getManifestInfos(manifests)

package/src/parts/ExtensionManagement/ExtensionManagement.ipc.js

@@ -1,8 +1,8 @@
 import * as ExtensionHostIconTheme from '../ExtensionManagement/ExtensionManagementIconTheme.js'
+import * as WatchForHotReload from '../WatchForHotReload/WatchForHotReload.js'
 import * as ExtensionManagement from './ExtensionManagement.js'
 import * as ExtensionHostColorTheme from './ExtensionManagementColorTheme.js'
 import * as ExtensionHostLanguages from './ExtensionManagementLanguages.js'
-import * as WatchForHotReload from '../WatchForHotReload/WatchForHotReload.js'
 
 // prettier-ignore
 export const Commands = {
@@ -13,11 +13,11 @@ export const Commands = {
   'ExtensionHost.getLanguages': ExtensionHostLanguages.getLanguages,
   'ExtensionHost.getWebViews': ExtensionHostLanguages.getWebViews,
   'ExtensionHost.watchColorTheme': ExtensionHostColorTheme.watch,
+  'ExtensionHost.watchForHotReload': WatchForHotReload.watchForHotReload,
   'ExtensionManagement.disable': ExtensionManagement.disable,
   'ExtensionManagement.enable': ExtensionManagement.enable,
   'ExtensionManagement.getAllExtensions': ExtensionManagement.getExtensions,
   'ExtensionManagement.getExtensions': ExtensionManagement.getExtensions,
-  'ExtensionManagement.uninstall': ExtensionManagement.uninstall,
   'ExtensionManagement.getExtensionsEtag': ExtensionManagement.getExtensionsEtag,
-  'ExtensionHost.watchForHotReload': WatchForHotReload.watchForHotReload,
+  'ExtensionManagement.uninstall': ExtensionManagement.uninstall,
 }

package/src/parts/ExtensionManagement/ExtensionManagement.js

@@ -75,8 +75,8 @@ export const getBuiltinExtensions = () => {
   return ExtensionManifests.getAll(
     [
       {
-        type: ExtensionManifestInputType.Folder,
         path: BuiltinExtensionsPath.getBuiltinExtensionsPath(),
+        type: ExtensionManifestInputType.Folder,
       },
     ],
     BuiltinExtensionsPath.getBuiltinExtensionsPath(),
@@ -87,8 +87,8 @@ export const getInstalledExtensions = () => {
   return ExtensionManifests.getAll(
     [
       {
-        type: ExtensionManifestInputType.Folder,
         path: PlatformPaths.getExtensionsPath(),
+        type: ExtensionManifestInputType.Folder,
       },
     ],
     BuiltinExtensionsPath.getBuiltinExtensionsPath(),
@@ -98,28 +98,28 @@ export const getInstalledExtensions = () => {
 export const getExtensions = () => {
   const transientLinkedExtensions = TransientLinkedExtensions.getLinkedExtensions().map((link) => {
     return {
-      type: ExtensionManifestInputType.LinkedExtension,
       path: link.resolvedPath,
+      type: ExtensionManifestInputType.LinkedExtension,
     }
   })
   return ExtensionManifests.getAll(
     [
       {
-        type: ExtensionManifestInputType.OnlyExtension,
         path: PlatformPaths.getOnlyExtensionPath(),
+        type: ExtensionManifestInputType.OnlyExtension,
       },
       ...transientLinkedExtensions,
       {
-        type: ExtensionManifestInputType.Folder,
         path: PlatformPaths.getLinkedExtensionsPath(),
+        type: ExtensionManifestInputType.Folder,
       },
       {
-        type: ExtensionManifestInputType.Folder,
         path: PlatformPaths.getExtensionsPath(),
+        type: ExtensionManifestInputType.Folder,
       },
       {
-        type: ExtensionManifestInputType.Folder,
         path: BuiltinExtensionsPath.getBuiltinExtensionsPath(),
+        type: ExtensionManifestInputType.Folder,
       },
     ],
     BuiltinExtensionsPath.getBuiltinExtensionsPath(),
@@ -129,27 +129,27 @@ export const getExtensions = () => {
 export const getExtensionsEtag = async () => {
   const transientLinkedExtensions = TransientLinkedExtensions.getLinkedExtensions().map((link) => {
     return {
-      type: ExtensionManifestInputType.LinkedExtension,
       path: link.resolvedPath,
+      type: ExtensionManifestInputType.LinkedExtension,
     }
   })
   const stats = await GetExtensionEtags.getExtensionEtags([
     {
-      type: ExtensionManifestInputType.OnlyExtension,
       path: PlatformPaths.getOnlyExtensionPath(),
+      type: ExtensionManifestInputType.OnlyExtension,
     },
     ...transientLinkedExtensions,
     {
-      type: ExtensionManifestInputType.Folder,
       path: PlatformPaths.getLinkedExtensionsPath(),
+      type: ExtensionManifestInputType.Folder,
     },
     {
-      type: ExtensionManifestInputType.Folder,
       path: PlatformPaths.getExtensionsPath(),
+      type: ExtensionManifestInputType.Folder,
     },
     {
-      type: ExtensionManifestInputType.Folder,
       path: BuiltinExtensionsPath.getBuiltinExtensionsPath(),
+      type: ExtensionManifestInputType.Folder,
     },
   ])
   const etag = GetEtagFromStats.getEtagFromStats(stats)
@@ -160,8 +160,8 @@ export const getDisabledExtensions = () => {
   return ExtensionManifests.getAll(
     [
       {
-        type: ExtensionManifestInputType.Folder,
         path: PlatformPaths.getDisabledExtensionsPath(),
+        type: ExtensionManifestInputType.Folder,
       },
     ],
     BuiltinExtensionsPath.getBuiltinExtensionsPath(),

package/src/parts/ExtensionManifest/ExtensionManifest.js

@@ -21,8 +21,8 @@ export const get = async (path) => {
     return {
       ...json,
       path,
-      uri,
       status: ExtensionManifestStatus.Resolved,
+      uri,
     }
   } catch (error) {
     const id = InferExtensionId.inferExtensionId(path)
@@ -40,8 +40,8 @@ export const get = async (path) => {
         return {
           ...json,
           path: extensionPath,
-          uri,
           status: ExtensionManifestStatus.Resolved,
+          uri,
         }
       } catch {}
       // @ts-ignore
@@ -54,8 +54,8 @@ export const get = async (path) => {
     }
     return {
       path,
-      status: ExtensionManifestStatus.Rejected,
       reason: enhancedError,
+      status: ExtensionManifestStatus.Rejected,
     }
   }
 }

package/src/parts/ExtensionManifests/ExtensionManifests.js

@@ -10,12 +10,12 @@ const getModule = (type) => {
   switch (type) {
     case ExtensionManifestInputType.Folder:
       return ExtensionManifestsGetFromFolder
-    case ExtensionManifestInputType.OnlyExtension:
-      return ExtensionManifestsGetFromOnlyExtension
     case ExtensionManifestInputType.LinkedExtension:
       return ExtensionManifestsGetFromLinkedExtension
     case ExtensionManifestInputType.LinkedExtensionsFolder:
       return ExtensionManifestsGetFromLinkedExtensionsFolder
+    case ExtensionManifestInputType.OnlyExtension:
+      return ExtensionManifestsGetFromOnlyExtension
     default:
       throw new Error('unsupported input type')
   }

package/src/parts/ExtensionManifests/ExtensionManifestsFromFolder.js

@@ -1,5 +1,5 @@
-import * as ExtensionManifest from '../ExtensionManifest/ExtensionManifest.js'
 import * as DirentType from '../DirentType/DirentType.js'
+import * as ExtensionManifest from '../ExtensionManifest/ExtensionManifest.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import * as ToAbsolutePaths from '../ToAbsolutePaths/ToAbsolutePaths.js'

package/src/parts/ExtensionManifests/ExtensionManifestsFromLinkedExtensionsFolder.js

@@ -1,6 +1,6 @@
 import { readlink } from 'node:fs/promises'
-import * as ExtensionManifest from '../ExtensionManifest/ExtensionManifest.js'
 import * as DirentType from '../DirentType/DirentType.js'
+import * as ExtensionManifest from '../ExtensionManifest/ExtensionManifest.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import * as MergeWithSymlinks from '../MergeWithSymlinks/MergeWithSymlinks.js'

package/src/parts/FileSystem/FileSystem.ipc.js

@@ -24,6 +24,7 @@ export const Commands = {
   ensureFile: FileSystem.ensureFile,
   getPathSeparator: FileSystem.getPathSeparator,
   getRealPath: FileSystem.getRealPath,
+  getRealUri: FileSystem.getRealUri,
   mkdir: FileSystem.mkdir,
   readDirWithFileTypes: FileSystem.readDirWithFileTypes,
   readFile: FileSystem.readFile,
@@ -33,5 +34,4 @@ export const Commands = {
   rename: FileSystem.rename,
   stat: FileSystem.stat,
   writeFile: FileSystem.writeFile,
-  getRealUri: FileSystem.getRealUri,
 }

package/src/parts/FileSystem/FileSystem.js

@@ -1,6 +1,8 @@
 // TODO lazyload chokidar and trash (but doesn't work currently because of bug with jest)
 import * as fs from 'node:fs/promises'
 import * as os from 'node:os'
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import * as Assert from '../Assert/Assert.js'
 import * as EncodingType from '../EncodingType/EncodingType.js'
 import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
@@ -11,8 +13,6 @@ import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
 import * as Trash from '../Trash/Trash.js'
 import { VError } from '../VError/VError.js'
-import { fileURLToPath } from 'node:url'
-import { join } from 'node:path'
 
 export const state      = {
   watcherMap: Object.create(null),

package/src/parts/FileSystemDisk/FileSystemDisk.ipc.js

@@ -5,6 +5,7 @@ export const name = 'FileSystemDisk'
 export const Commands = {
   chmod: FileSystemDisk.chmod,
   copy: FileSystemDisk.copy,
+  getFolderSize: FileSystemDisk.getFolderSize,
   getPathSeparator: FileSystemDisk.getPathSeparator,
   mkdir: FileSystemDisk.mkdir,
   readDirWithFileTypes: FileSystemDisk.readDirWithFileTypes,
@@ -14,5 +15,4 @@ export const Commands = {
   rename: FileSystemDisk.rename,
   stat: FileSystemDisk.stat,
   writeFile: FileSystemDisk.writeFile,
-  getFolderSize: FileSystemDisk.getFolderSize,
 }

package/src/parts/FileSystemDisk/FileSystemDisk.js

@@ -1,17 +1,17 @@
 // TODO lazyload chokidar and trash (but doesn't work currently because of bug with jest)
 import * as fs from 'node:fs/promises'
 import * as os from 'node:os'
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import * as Assert from '../Assert/Assert.js'
 import * as EncodingType from '../EncodingType/EncodingType.js'
 import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import { FileNotFoundError } from '../FileNotFoundError/FileNotFoundError.js'
 import * as GetDirentType from '../GetDirentType/GetDirentType.js'
+import * as GetFolderSizeInternal from '../GetFolderSizeInternal/GetFolderSizeInternal.js'
 import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import * as Trash from '../Trash/Trash.js'
-import * as GetFolderSizeInternal from '../GetFolderSizeInternal/GetFolderSizeInternal.js'
 import { VError } from '../VError/VError.js'
-import { fileURLToPath } from 'node:url'
-import { join } from 'node:path'
 
 const assertUri = (uri) => {
   if (!uri.startsWith('file://')) {

package/src/parts/FileSystemProcess/FileSystemProcess.js

@@ -1,5 +1,5 @@
-import * as LaunchFileSystemProcess from '../LaunchFileSystemProcess/LaunchFileSystemProcess.js'
 import * as JsonRpc from '../JsonRpc/JsonRpc.js'
+import * as LaunchFileSystemProcess from '../LaunchFileSystemProcess/LaunchFileSystemProcess.js'
 
 export const state      = {
   /**

package/src/parts/FileWatcher/FileWatcher.ipc.js

@@ -3,7 +3,7 @@ import * as FileWatcher from '../FileWatcher/FileWatcher.js'
 export const name = 'FileWatcher'
 
 export const Commands = {
+  handleChange: FileWatcher.handleChange,
   watch: FileWatcher.watch,
   watchFile2: FileWatcher.watchFile2,
-  handleChange: FileWatcher.handleChange,
 }

package/src/parts/FileWatcher/FileWatcher.js

@@ -10,13 +10,13 @@ const handleEvents = (id, ipc, event) => {
 // TODO remove ipc and dispose file watcher when socket / messageport closes
 const internalIdMap = Object.create(null)
 
-export const watch = async (ipc, id, { roots, exclude }     ) => {
+export const watch = async (ipc, id, { exclude, roots }     ) => {
   const internalId = Id.create()
   internalIdMap[internalId] = { id, ipc }
   await FileWatcherProcess.invoke('FileWatcher.watchFolders', {
+    exclude,
     id: internalId,
     roots,
-    exclude,
   })
 }
 

package/src/parts/GetAppWindowOptions/GetAppWindowOptions.js

@@ -1,5 +1,5 @@
-import * as GetBrowserWindowOptions from '../GetBrowserWindowOptions/GetBrowserWindowOptions.js'
 import * as ExtensionManagementColorTheme from '../ExtensionManagement/ExtensionManagementColorTheme.js'
+import * as GetBrowserWindowOptions from '../GetBrowserWindowOptions/GetBrowserWindowOptions.js'
 import * as Platform from '../Platform/Platform.js'
 
 const fallbackBackground = '#1e2324'
@@ -26,7 +26,7 @@ const getColorThemeJson = async (preferences) => {
   }
 }
 
-export const getAppWindowOptions = async ({ preferences, screenWidth, screenHeight, preloadUrl }     ) => {
+export const getAppWindowOptions = async ({ preferences, preloadUrl, screenHeight, screenWidth }     ) => {
   const colorThemeJson = await getColorThemeJson(preferences)
   const colors = colorThemeJson.colors && typeof colorThemeJson.colors === 'object' ? colorThemeJson.colors : {}
   const background = getColor(colors, ['MainBackground'], fallbackBackground)
@@ -47,20 +47,20 @@ export const getAppWindowOptions = async ({ preferences, screenWidth, screenHeig
   const titleBarOverlay = windowControlsOverlayPreference
     ? {
         color: titleBarBackground,
-        symbolColor: titleBarSymbolColor,
         height: 29,
+        symbolColor: titleBarSymbolColor,
       }
     : undefined
 
   return GetBrowserWindowOptions.getBrowserWindowOptions({
-    y: 0,
-    x: screenWidth - 800,
-    width: 800,
-    height: screenHeight,
     background,
-    titleBarStyle,
     frame,
-    titleBarOverlay,
+    height: screenHeight,
     preloadUrl,
+    titleBarOverlay,
+    titleBarStyle,
+    width: 800,
+    x: screenWidth - 800,
+    y: 0,
   })
 }

package/src/parts/GetBrowserWindowOptions/GetBrowserWindowOptions.js

@@ -5,28 +5,28 @@ import * as GetIcon from '../GetIcon/GetIcon.js'
  *
  * @returns {any}
  */
-export const getBrowserWindowOptions = ({ x, y, width, height, titleBarStyle, titleBarOverlay, frame, background, preloadUrl }     ) => {
+export const getBrowserWindowOptions = ({ background, frame, height, preloadUrl, titleBarOverlay, titleBarStyle, width, x, y }     ) => {
   const icon = GetIcon.getIcon()
   return {
-    x,
-    y,
-    width,
-    height,
     autoHideMenuBar: true,
-    titleBarStyle,
-    titleBarOverlay,
+    backgroundColor: background,
     frame,
+    height,
+    icon,
+    show: false,
+    titleBarOverlay,
+    titleBarStyle,
     webPreferences: {
+      additionalArguments: [],
+      contextIsolation: true,
       enableWebSQL: false,
-      spellcheck: false,
+      preload: preloadUrl,
       sandbox: true,
-      contextIsolation: true,
+      spellcheck: false,
       v8CacheOptions: BrowserWindowV8CacheOptions.browserWindowV8CacheOptions,
-      preload: preloadUrl,
-      additionalArguments: [],
     },
-    backgroundColor: background,
-    show: false,
-    icon,
+    width,
+    x,
+    y,
   }
 }

package/src/parts/GetContentResponse/GetContentResponse.js

@@ -4,8 +4,8 @@ export const getContentResponse = async (content, headers      = {}) => {
   return {
     body: content,
     init: {
-      status: HttpStatusCode.Ok,
       headers,
+      status: HttpStatusCode.Ok,
     },
   }
 }

package/src/parts/GetContentSecurityPolicy/GetContentSecurityPolicy.js

@@ -1,5 +1,5 @@
-import * as Character from '../Character/Character.js'
 import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
+import * as Character from '../Character/Character.js'
 
 export const getContentSecurityPolicy = (items) => {
   return items.map(AddSemiColon.addSemicolon).join(Character.Space)

package/src/parts/GetExtensionEtags/GetExtensionEtags.js

@@ -59,8 +59,8 @@ const get = (input) => {
     case ExtensionManifestInputType.Folder:
     case ExtensionManifestInputType.LinkedExtensionsFolder:
       return getFolder(input.path)
-    case ExtensionManifestInputType.OnlyExtension:
     case ExtensionManifestInputType.LinkedExtension:
+    case ExtensionManifestInputType.OnlyExtension:
       return getOnly(input.path)
     default:
       return []

package/src/parts/GetFirstEvent/GetFirstEvent.js

@@ -1,7 +1,7 @@
 import * as Promises from '../Promises/Promises.js'
 
 export const getFirstEvent = (eventEmitter, eventMap) => {
-  const { resolve, promise } = Promises.withResolvers()
+  const { promise, resolve } = Promises.withResolvers()
   const listenerMap = Object.create(null)
   const cleanup = (value) => {
     for (const event of Object.keys(eventMap)) {
@@ -12,8 +12,8 @@ export const getFirstEvent = (eventEmitter, eventMap) => {
   for (const [event, type] of Object.entries(eventMap)) {
     const listener = (event) => {
       cleanup({
-        type,
         event,
+        type,
       })
     }
     eventEmitter.on(event, listener)

package/src/parts/GetFirstSpawnedProcessEvent/GetFirstSpawnedProcessEvent.js

@@ -1,5 +1,5 @@
-import * as GetFirstEvent from '../GetFirstEvent/GetFirstEvent.js'
 import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
+import * as GetFirstEvent from '../GetFirstEvent/GetFirstEvent.js'
 
 export const getFirstSpawnedProcessEvent = (childProcess) => {
   return GetFirstEvent.getFirstEvent(childProcess, {

package/src/parts/GetHeaders/GetHeaders.js

@@ -1,8 +1,8 @@
 import { extname } from 'path'
+import * as ContentSecurityPolicyState from '../ContentSecurityPolicyState/ContentSecurityPolicyState.js'
 import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js'
 import * as CrossOriginResourcePolicy from '../CrossOriginResourcePolicy/CrossOriginResourcePolicy.js'
 import * as GetExtraHeaders from '../GetExtraHeaders/GetExtraHeaders.js'
-import * as ContentSecurityPolicyState from '../ContentSecurityPolicyState/ContentSecurityPolicyState.js'
 import * as GetMimeType from '../GetMimeType/GetMimeType.js'
 import * as HttpHeader from '../HttpHeader/HttpHeader.js'
 
@@ -10,16 +10,16 @@ export const getHeaders = async (absolutePath, pathName, etag, url, size) => {
   const extension = extname(absolutePath)
   const mime = GetMimeType.getMimeType(extension)
   const headers                      = {
-    [HttpHeader.ContentType]: mime,
     [HttpHeader.ContentLength]: `${size}`,
-    [HttpHeader.CrossOriginResourcePolicy]: CrossOriginResourcePolicy.value,
+    [HttpHeader.ContentType]: mime,
     [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
+    [HttpHeader.CrossOriginResourcePolicy]: CrossOriginResourcePolicy.value,
   }
   const extraHeaders = await GetExtraHeaders.getExtraHeaders({
     absolutePath,
-    pathName,
     etag,
     isForElectronProduction: false,
+    pathName,
   })
   const dynamicCsp = ContentSecurityPolicyState.get(url)
   if (dynamicCsp) {

package/src/parts/GetMimeType/GetMimeType.js

@@ -2,29 +2,29 @@ import * as MimeType from '../MimeType/MimeType.js'
 
 export const getMimeType = (fileExtension) => {
   switch (fileExtension) {
-    case '.html':
-      return MimeType.TextHtml
     case '.css':
       return MimeType.TextCss
-    case '.ttf':
-      return MimeType.FontTtf
+    case '.html':
+      return MimeType.TextHtml
     case '.js':
     case '.mjs':
     case '.ts':
       return MimeType.TextJavaScript
-    case '.svg':
-      return MimeType.ImageSvgXml
-    case '.png':
-      return MimeType.ImagePng
     case '.json':
     case '.map':
       return MimeType.ApplicationJson
+    case '.md':
+      return MimeType.Markdown
     case '.mp3':
       return MimeType.AudioMpeg
+    case '.png':
+      return MimeType.ImagePng
+    case '.svg':
+      return MimeType.ImageSvgXml
+    case '.ttf':
+      return MimeType.FontTtf
     case '.webm':
       return MimeType.VideoWebm
-    case '.md':
-      return MimeType.Markdown
     default:
       console.warn(`[shared-process] unsupported file extension: ${fileExtension}`)
       return ''

package/src/parts/GetMultipleChoiceResponse/GetMultipleChoiceResponse.js

@@ -4,8 +4,8 @@ export const getMultipleChoiceResponse = async (content, headers      = {}) => {
   return {
     body: content,
     init: {
-      status: HttpStatusCode.MultipleChoices,
       headers,
+      status: HttpStatusCode.MultipleChoices,
     },
   }
 }

package/src/parts/GetNotFoundResponse/GetNotFoundResponse.js

@@ -4,9 +4,9 @@ export const getNotFoundResponse = () => {
   return {
     body: 'not-found',
     init: {
+      headers: {},
       status: HttpStatusCode.NotFound,
       statusText: 'not-found',
-      headers: {},
     },
   }
 }

package/src/parts/GetNotModifiedResponse/GetNotModifiedResponse.js

@@ -4,8 +4,8 @@ export const getNotModifiedResponse = async (headers      = {}) => {
   return {
     body: '',
     init: {
-      status: HttpStatusCode.NotModifed,
       headers,
+      status: HttpStatusCode.NotModifed,
     },
   }
 }

package/src/parts/GetServerErrorResponse/GetServerErrorResponse.js

@@ -4,9 +4,9 @@ export const getServerErrorResponse = () => {
   return {
     body: 'server-error',
     init: {
+      headers: {},
       status: HttpStatusCode.ServerError,
       statusText: 'server-error',
-      headers: {},
     },
   }
 }

package/src/parts/GetStatusString/GetStatusString.js

@@ -1,23 +1,22 @@
 import * as Os from 'node:os'
-import * as Platform from '../Platform/Platform.js'
 import * as ByteSize from '../ByteSize/ByteSize.js'
+import * as Platform from '../Platform/Platform.js'
 
 const UiStrings = {
-  OsVersion: 'Os Version',
   Cpus: 'CPUs',
   Memory: 'Memory (System)',
+  OsVersion: 'Os Version',
 }
 
 const visitVersion = {
-  key: UiStrings.OsVersion,
   getValue()      {
     const { version } = Platform
     return version
   },
+  key: UiStrings.OsVersion,
 }
 
 const visitCpus = {
-  key: UiStrings.Cpus,
   getValue()      {
     const cpus = Os.cpus()
     if (!cpus || cpus.length === 0) {
@@ -29,10 +28,10 @@ const visitCpus = {
     const { speed } = firstCpu
     return `${model} (${cpuLength} x ${speed})`
   },
+  key: UiStrings.Cpus,
 }
 
 const visitMemory = {
-  key: UiStrings.Memory,
   getValue()      {
     const totalMemory = Os.totalmem()
     const freeMemory = Os.freemem()
@@ -42,6 +41,7 @@ const visitMemory = {
     const freeGbShort = freeGb.toFixed(2)
     return `${totalGbShort} GB (${freeGbShort} GB free)`
   },
+  key: UiStrings.Memory,
 }
 
 const getKeyLength = (visitor) => {