feat: update toJSON method

Author: Groupguanfang

.changeset/hip-webs-invite.md

@@ -0,0 +1,5 @@
+---
+"@arkts/image-manager": minor
+---
+
+feat: update toJSON method

src/images/image.ts

@@ -24,12 +24,27 @@ export interface BaseImage {
   createDownloader(signal?: AbortSignal): Promise<ImageDownloader<this> | RequestUrlError>
 }
 
+export namespace BaseImage {
+  export interface Stringifiable {
+    imageType: ImageType
+    arch: 'arm' | 'x86' | (string & {})
+    path: string
+    checksum: string
+    fsPath: string
+    version: string
+    apiVersion: string
+    targetOS: string
+    targetVersion: string
+    deviceType: DeviceType | (string & {})
+    snakecaseDeviceType: SnakecaseDeviceType | (string & {})
+  }
+}
+
 export type Image = LocalImage | RemoteImage
 export type ImageType = 'local' | 'remote'
 
-export abstract class ImageBase<T> implements BaseImage, Stringifiable<T> {
+export abstract class ImageBase<T extends BaseImage.Stringifiable> implements BaseImage, Stringifiable<T> {
   abstract imageType: ImageType
-  abstract toJSON(): T
 
   constructor(
     private readonly response: any,
@@ -125,4 +140,20 @@ export abstract class ImageBase<T> implements BaseImage, Stringifiable<T> {
       return new RequestUrlError(error.message, error.code, error)
     }
   }
+
+  toJSON(): T {
+    return {
+      imageType: this.imageType,
+      arch: this.getArch(),
+      path: this.getPath(),
+      checksum: this.getChecksum(),
+      fsPath: this.getFsPath(),
+      version: this.getVersion(),
+      apiVersion: this.getApiVersion(),
+      targetOS: this.getTargetOS(),
+      targetVersion: this.getTargetVersion(),
+      deviceType: this.getDeviceType(),
+      snakecaseDeviceType: this.getSnakecaseDeviceType(),
+    } as T
+  }
 }

src/images/local-image.ts

@@ -18,13 +18,9 @@ export interface LocalImage extends BaseImage, Stringifiable<LocalImage.Stringif
 }
 
 export namespace LocalImage {
-  export interface Stringifiable {
+  export interface Stringifiable extends Omit<BaseImage.Stringifiable, 'imageType'> {
     imageType: 'local'
-    path: string
-    version: string
-    apiVersion: string
-    targetVersion: string
-    checksum: string
+    executablePath: string
   }
 }
 
@@ -105,12 +101,8 @@ export class LocalImageImpl extends ImageBase<LocalImage.Stringifiable> implemen
 
   toJSON(): LocalImage.Stringifiable {
     return {
-      imageType: this.imageType,
-      path: this.getPath(),
-      version: this.getVersion(),
-      apiVersion: this.getApiVersion(),
-      targetVersion: this.getTargetVersion(),
-      checksum: this.getChecksum(),
+      ...super.toJSON(),
+      executablePath: this.getExecutablePath(),
     }
   }
 }

src/images/remote-image.ts

@@ -7,23 +7,15 @@ export interface RemoteImage extends BaseImage, Stringifiable<RemoteImage.String
 }
 
 export namespace RemoteImage {
-  export interface Stringifiable {
+  export interface Stringifiable extends Omit<BaseImage.Stringifiable, 'imageType'> {
     imageType: 'remote'
-    path: string
-    apiVersion: string
-    checksum: string
   }
 }
 
 export class RemoteImageImpl extends ImageBase<RemoteImage.Stringifiable> implements RemoteImage {
   imageType = 'remote' as const
 
   toJSON(): RemoteImage.Stringifiable {
-    return {
-      imageType: this.imageType,
-      path: this.getPath(),
-      apiVersion: this.getApiVersion(),
-      checksum: this.getChecksum(),
-    }
+    return super.toJSON()
   }
 }