Fixed import logic to support cloud files

kevinwang5658 · kevinwang5658 · commit 59763463d2b2 · 2025-09-06T10:49:24.000-04:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -18,6 +18,8 @@
     "unicorn/no-array-for-each": "off",
     "unicorn/prefer-object-from-entries": "off",
     "unicorn/prefer-type-error": "off",
+    "unicorn/no-static-only-class": "off",
+    "@typescript-eslint/no-duplicate-enum-values": "off",
     "quotes": [
       "error",
       "single"
diff --git a/src/api/dashboard/index.ts b/src/api/dashboard/index.ts
@@ -40,5 +40,14 @@ export const DashboardApiClient = {
     // }
 
     return '1b80818e-5304-4158-80a3-82e17ff2c79e';
+  },
+
+  async saveDocumentUpdate(id: string, contents: string): Promise<void> {
+    const login = LoginHelper.get()?.credentials;
+    if (!login) {
+      throw new Error('Not logged in');
+    }
+
+
   }
 }
diff --git a/src/entities/project.ts b/src/entities/project.ts
@@ -1,4 +1,5 @@
 import { PlanRequestData, ResourceOperation, ValidateResponseData } from 'codify-schemas';
+import { validate } from 'uuid'
 
 import { PluginValidationError, PluginValidationErrorParams, TypeNotFoundError } from '../common/errors.js';
 import { ctx } from '../events/context.js';
@@ -60,6 +61,11 @@ ${JSON.stringify(projectConfigs, null, 2)}`);
     return this.stateConfigs !== null && this.stateConfigs !== undefined && this.stateConfigs.length > 0;
   }
 
+  // TODO: Update to a more robust method in the future
+  isCloud(): boolean {
+    return validate(this.codifyFiles[0])
+  }
+
   filter(ids: string[]): Project {
     this.resourceConfigs = this.resourceConfigs.filter((r) => ids.find((id) => r.id.includes(id)));
     this.stateConfigs = this.stateConfigs?.filter((s) => ids.includes(s.id)) ?? null;
diff --git a/src/generators/file-modification-calculator.ts b/src/generators/file-modification-calculator.ts
@@ -1,40 +1,24 @@
-import { ResourceConfig } from '../entities/resource-config.js';
-
-import * as jsonSourceMap from 'json-source-map';
+import detectIndent from 'detect-indent';
 import jju from 'jju'
 
-import { FileType, InMemoryFile } from '../parser/entities.js';
-import { SourceMap, SourceMapCache } from '../parser/source-maps.js';
-import detectIndent from 'detect-indent';
 import { Project } from '../entities/project.js';
 import { ProjectConfig } from '../entities/project-config.js';
+import { ResourceConfig } from '../entities/resource-config.js';
+import { FileType, InMemoryFile } from '../parser/entities.js';
+import { SourceMap } from '../parser/source-maps.js';
 import { prettyFormatFileDiff } from '../ui/file-diff-pretty-printer.js';
-import { deepEqual } from './index.js';
-
-export enum ModificationType {
-  INSERT_OR_UPDATE,
-  DELETE
-}
-
-export interface ModifiedResource {
-  resource: ResourceConfig;
-  modification: ModificationType
-}
-
-export interface FileModificationResult {
-  newFile: string;
-  diff: string;
-}
+import { deepEqual } from '../utils/index.js';
+import { FileModificationResult, ModificationType, ModifiedResource } from './index.js';
 
 export class FileModificationCalculator {
-  private existingFile: InMemoryFile;
+  private readonly existingFile: InMemoryFile;
   private existingConfigs: ResourceConfig[];
-  private sourceMap: SourceMap;
+  private readonly sourceMap: SourceMap;
   private totalConfigLength: number;
-  private indentString: string;
+  private readonly indentString: string;
 
   constructor(existing: Project) {
-    const { file, sourceMap } = existing.sourceMaps?.getSourceMap(existing.codifyFiles[0])!;
+    const { file, sourceMap } = existing.sourceMaps!.getSourceMap(existing.codifyFiles[0])!;
     this.existingFile = file;
     this.sourceMap = sourceMap;
     this.existingConfigs = [...existing.resourceConfigs];
@@ -69,12 +53,11 @@ export class FileModificationCalculator {
         continue;
       }
 
-      const duplicateSourceKey = existing.sourceMapKey?.split('#').at(1)!;
-      const sourceIndex = Number.parseInt(duplicateSourceKey.split('/').at(1)!)
-      const isOnly = this.totalConfigLength === 1;
+      const duplicateSourceKey = existing.sourceMapKey!.split('#').at(1)!;
+      const sourceIndex = Number.parseInt(duplicateSourceKey.split('/').at(1)!, 10)
 
       if (modified.modification === ModificationType.DELETE) {
-        newFile = this.remove(newFile, this.sourceMap, sourceIndex, isOnly);
+        newFile = this.remove(newFile, sourceIndex);
         this.totalConfigLength -= 1;
 
         continue;
@@ -99,7 +82,7 @@ export class FileModificationCalculator {
     }
 
     return {
-      newFile: newFile,
+      newFile,
       diff: prettyFormatFileDiff(this.existingFile.contents, newFile),
     }
   }
@@ -110,7 +93,7 @@ export class FileModificationCalculator {
       return;
     }
 
-    if (this.existingFile?.fileType !== FileType.JSON && this.existingFile?.fileType !== FileType.JSON5 && this.existingFile?.fileType !== FileType.JSONC) {
+    if (this.existingFile?.fileType !== FileType.JSON && this.existingFile?.fileType !== FileType.JSON5 && this.existingFile?.fileType !== FileType.JSONC && this.existingFile?.fileType !== FileType.CLOUD) {
       throw new Error(`Only updating .json, .json5, and .jsonc files are currently supported. Found ${this.existingFile?.filePath}`);
     }
 
@@ -167,9 +150,7 @@ export class FileModificationCalculator {
 
   private remove(
     file: string,
-    sourceMap: SourceMap,
     sourceIndex: number,
-    isOnly: boolean,
   ): string {
     const isLast = sourceIndex === this.totalConfigLength - 1;
     const isFirst = sourceIndex === 0;
@@ -200,42 +181,18 @@ export class FileModificationCalculator {
   ): string {
     // Updates: for now let's remove and re-add the entire object. Only two formatting availalbe either same line or multi-line
     const { value, valueEnd } = this.sourceMap.lookup(`/${sourceIndex}`)!;
-    const isFirst = sourceIndex === 0;
     const sortedResource = this.sortKeys(resource.raw, existing.raw);
 
-    let content = jju.update(file.slice(value.position, valueEnd.position), sortedResource)
-    return this.splice(file, value?.position!, valueEnd.position - value.position, content);
-  }
-
-  /** Attempt to make arrays and objects oneliners if they were before. It does this by creating a new source map */
-  private updateParamsToOnelineIfNeeded(content: string, sourceMap: SourceMap, sourceIndex: number): string {
-    // Attempt to make arrays and objects oneliners if they were before. It does this by creating a new source map
-    const parsedContent = JSON.parse(content);
-    const parsedPointers = jsonSourceMap.parse(content);
-    const parsedSourceMap = new SourceMapCache()
-    parsedSourceMap.addSourceMap({ filePath: '', fileType: FileType.JSON, contents: parsedContent }, parsedPointers);
-
-    for (const [key, value] of Object.entries(parsedContent)) {
-      const source = sourceMap.lookup(`/${sourceIndex}/${key}`);
-      if ((Array.isArray(value) || typeof value === 'object') && source && source.value.line === source.valueEnd.line) {
-        const { value, valueEnd } = parsedSourceMap.lookup(`#/${key}`)!
-        content = this.splice(
-          content,
-          value.position, valueEnd.position - value.position,
-          JSON.stringify(parsedContent[key]).replaceAll('\n', '').replaceAll(/}$/g, ' }')
-        )
-      }
-    }
-
-    return content;
+    const content = jju.update(file.slice(value.position, valueEnd.position), sortedResource)
+    return this.splice(file, value.position!, valueEnd.position - value.position, content);
   }
 
   private splice(s: string, start: number, deleteCount = 0, insert = '') {
-    return s.substring(0, start) + insert + s.substring(start + deleteCount);
+    return s.slice(0, start) + insert + s.slice(start + deleteCount);
   }
 
   private removeSlice(s: string, start: number, end: number) {
-    return s.substring(0, start) + s.substring(end);
+    return s.slice(0, start) + s.slice(end);
   }
 
   private isResourceConfig(config: ProjectConfig | ResourceConfig): config is ResourceConfig {
@@ -244,7 +201,7 @@ export class FileModificationCalculator {
 
   private sortKeys(obj: Record<string, unknown>, referenceOrder?: Record<string, unknown>): Record<string, unknown> {
     const reference = Object.keys(referenceOrder
-      ?? Object.fromEntries([...Object.keys(obj)].sort().map((k) => [k, undefined]))
+      ?? Object.fromEntries(Object.keys(obj).sort().map((k) => [k, undefined]))
     );
 
     return Object.fromEntries(
@@ -262,7 +219,7 @@ export class FileModificationCalculator {
     )
   }
 
-  private fileTypeString(fileType: FileType): 'json' | 'json5' | 'cjson' {
+  private fileTypeString(fileType: FileType): 'cjson' | 'json' | 'json5' {
     if (fileType === FileType.JSON) {
       return 'json'
     }
@@ -275,6 +232,10 @@ export class FileModificationCalculator {
       return 'cjson'
     }
 
+    if (fileType === FileType.CLOUD) {
+      return 'cjson'
+    }
+
     throw new Error(`Unsupported file type ${fileType} when trying to generate new configs`);
   }
 }
diff --git a/src/generators/index.ts b/src/generators/index.ts
@@ -0,0 +1,16 @@
+import { ResourceConfig } from '../entities/resource-config.js';
+
+export enum ModificationType {
+  INSERT_OR_UPDATE,
+  DELETE
+}
+
+export interface ModifiedResource {
+  resource: ResourceConfig;
+  modification: ModificationType
+}
+
+export interface FileModificationResult {
+  newFile: string;
+  diff: string;
+}
diff --git a/src/generators/writer.ts b/src/generators/writer.ts
@@ -0,0 +1,16 @@
+import { validate } from 'uuid'
+
+import { DashboardApiClient } from '../api/dashboard/index.js';
+import { FileUtils } from '../utils/file.js';
+
+export class FileUpdater {
+  static async write(filePath: string, content: string) {
+    // Cloud file
+    if (validate(filePath)) {
+      return DashboardApiClient.saveDocumentUpdate(filePath, content);
+    }
+
+    return FileUtils.writeFile(filePath, content);
+  }
+
+}
diff --git a/src/orchestrators/import.ts b/src/orchestrators/import.ts
@@ -5,12 +5,14 @@ import { Project } from '../entities/project.js';
 import { ResourceConfig } from '../entities/resource-config.js';
 import { ResourceInfo } from '../entities/resource-info.js';
 import { ProcessName, SubProcessName, ctx } from '../events/context.js';
+import { FileModificationCalculator } from '../generators/file-modification-calculator.js';
+import { ModificationType } from '../generators/index.js';
+import { FileUpdater } from '../generators/writer.js';
 import { CodifyParser } from '../parser/index.js';
 import { DependencyMap, PluginManager } from '../plugins/plugin-manager.js';
 import { prettyFormatFileDiff } from '../ui/file-diff-pretty-printer.js';
 import { PromptType, Reporter } from '../ui/reporters/reporter.js';
 import { FileUtils } from '../utils/file.js';
-import { FileModificationCalculator, ModificationType } from '../utils/file-modification-calculator.js';
 import { groupBy, sleep } from '../utils/index.js';
 import { wildCardMatch } from '../utils/wild-card-match.js';
 
@@ -308,7 +310,7 @@ ${JSON.stringify(unsupportedTypeIds)}`);
     }
 
     for (const diff of diffs) {
-      await FileUtils.writeFile(diff.file, diff.modification.newFile);
+      await FileUpdater.write(diff.file, diff.modification.newFile);
     }
 
     reporter.displayMessage('\n🎉 Imported completed and saved to file 🎉');
@@ -332,7 +334,7 @@ ${JSON.stringify(unsupportedTypeIds)}`);
       return;
     }
 
-    await FileUtils.writeFile(filePath, newFile);
+    await FileUpdater.write(filePath, newFile);
 
     reporter.displayMessage('\n🎉 Imported completed and saved to file 🎉');
 
diff --git a/src/parser/cloud/cloud-parser.ts b/src/parser/cloud/cloud-parser.ts
@@ -1,4 +1,5 @@
 import { Config } from 'codify-schemas';
+import jsonSourceMap from 'json-source-map';
 
 import { InMemoryFile, LanguageSpecificParser, ParsedConfig } from '../entities.js';
 import { SourceMapCache } from '../source-maps.js';
@@ -7,11 +8,15 @@ export class CloudParser implements LanguageSpecificParser {
   parse(file: InMemoryFile, sourceMaps: SourceMapCache): ParsedConfig[] {
     const contents = JSON.parse(file.contents) as Array<Config>;
 
-    return contents.map((content) => {
-      const { id, type, ...config } = content;
+    if (sourceMaps) {
+      sourceMaps.addSourceMap(file, jsonSourceMap.parse(file.contents));
+    }
+
+    return contents.map((content, idx) => {
+      const { type, ...config } = content;
       return {
         contents: { type, ...config },
-        sourceMapKey: id as string,
+        sourceMapKey: SourceMapCache.constructKey(file.filePath, `/${idx}`),
       }
     })
   }

Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,14 @@ export const DashboardApiClient = {`
`40`	`40`	`// }`
`41`	`41`
`42`	`42`	`return '1b80818e-5304-4158-80a3-82e17ff2c79e';`
	`43`	`+ },`
	`44`	`+`
	`45`	`+ async saveDocumentUpdate(id: string, contents: string): Promise<void> {`
	`46`	`+ const login = LoginHelper.get()?.credentials;`
	`47`	`+ if (!login) {`
	`48`	`+ throw new Error('Not logged in');`
	`49`	`+ }`
	`50`	`+`
	`51`	`+`
`43`	`52`	`}`
`44`	`53`	`}`