fix file parsing when writing content (#141)

Author: RuntimeTerror10

src/renderer/actions/local-sync/file-types/file-type.interface.ts

@@ -7,5 +7,5 @@ export abstract class FileType<V extends TSchema> {
   abstract validator: V;
 
   // eslint-disable-next-line no-unused-vars
-  abstract parse(content: any): ContentParseResult<Static<V>>;
+  abstract parse(content: string): ContentParseResult<Static<V>>;
 }

src/renderer/actions/local-sync/file-types/file-types.ts

@@ -10,7 +10,6 @@ import {
   Variables,
 } from "../schemas";
 import { FileTypeEnum } from "../types";
-import { TUnknown, Type } from "@sinclair/typebox";
 import { parseJsonContent, parseRaw } from "../common-utils";
 
 export class ApiRecordFileType extends FileType<typeof ApiRecord> {
@@ -77,17 +76,7 @@ export class GlobalConfigRecordFileType extends FileType<typeof GlobalConfig> {
   }
 }
 
-export class UnknownFileType extends FileType<TUnknown> {
-  validator = Type.Unknown();
-
-  type = FileTypeEnum.UNKNOWN;
-
-  parse(content: string) {
-    return parseRaw(content, this.validator);
-  }
-}
-
-export function parseFileType(type: string): FileType<any> {
+export function parseFileType(type: string) {
   switch (type) {
     case FileTypeEnum.API:
       return new ApiRecordFileType();
@@ -101,9 +90,7 @@ export function parseFileType(type: string): FileType<any> {
       return new AuthRecordFileType();
     case FileTypeEnum.GLOBAL_CONFIG:
       return new GlobalConfigRecordFileType();
-    case FileTypeEnum.UNKNOWN:
-      return new UnknownFileType();
     default:
-      throw new Error("Invalid file type!");
+      throw new Error(`${type} is an invalid file type`);
   }
 }

src/renderer/actions/local-sync/fs-manager.ts

@@ -37,6 +37,7 @@ import {
   rename,
   sanitizeFsResourceList,
   writeContent,
+  writeContentRaw,
 } from "./fs-utils";
 import {
   ApiRecord,
@@ -885,12 +886,27 @@ export class FsManager {
     rawfileType: string
   ): Promise<FileSystemResult<unknown>> {
     try {
-      const fileType = parseFileType(rawfileType);
       const fileResource = this.createResource({
         id,
         type: "file",
       });
-      const writeResult = await writeContent(fileResource, rawRecord, fileType);
+      const fileType = parseFileType(rawfileType);
+      const parsedRecord = fileType.parse(rawRecord);
+      if (parsedRecord.type === "error") {
+        return {
+          type: "error",
+          error: {
+            message: parsedRecord.error.message,
+            path: fileResource.path,
+            fileType: fileType.type,
+          },
+        };
+      }
+
+      const writeResult = await writeContentRaw(
+        fileResource,
+        parsedRecord.content
+      );
       return writeResult;
     } catch (e: any) {
       return {

src/renderer/actions/local-sync/fs-utils.ts

@@ -18,6 +18,7 @@ import {
   getIdFromPath,
   getNameOfResource,
   getNormalizedPath,
+  parseRaw,
 } from "./common-utils";
 import {
   COLLECTION_AUTH_FILE,
@@ -227,7 +228,7 @@ export async function writeContent(
   fileType: FileType<any>
 ): Promise<FileSystemResult<{ resource: FileResource }>> {
   try {
-    const parsedContentResult = fileType.parse(content);
+    const parsedContentResult = parseRaw(content, fileType.validator);
     if (parsedContentResult.type === "error") {
       return {
         type: "error",