chore(internal): Upgrade Prettier & replace import sort (#5526)

Upgrade Prettier & replace import sort

.prettierrc.json

@@ -9,5 +9,9 @@
         "tabWidth": 2
       }
     }
-  ]
+  ],
+  "importOrder": ["^@fern-api(.*)$", "^@fern-fern(.*)$", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true,
+  "plugins": ["@trivago/prettier-plugin-sort-imports"]
 }

generators/base/package.json

@@ -24,7 +24,6 @@
     "lint:eslint:fix": "yarn lint:eslint --fix",
     "format": "prettier --write --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"",
     "format:check": "prettier --check --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"",
-    "organize-imports": "organize-imports-cli tsconfig.json",
     "depcheck": "depcheck"
   },
   "dependencies": {
@@ -45,8 +44,8 @@
     "depcheck": "^1.4.7",
     "eslint": "^9.16.0",
     "vitest": "^2.1.8",
-    "organize-imports-cli": "^0.10.0",
-    "prettier": "^2.7.1",
+    "@trivago/prettier-plugin-sort-imports": "^5.2.1",
+    "prettier": "^3.4.2",
     "typescript": "5.7.2"
   }
 }

generators/base/src/AbstractGeneratorAgent.ts

@@ -1,10 +1,13 @@
-import { Logger } from "@fern-api/logger";
-import { AbstractGeneratorContext, FernGeneratorExec } from "@fern-api/browser-compatible-base-generator";
-import { GeneratorAgentClient } from "./GeneratorAgentClient";
-import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk";
 import { readFile } from "fs/promises";
 import yaml from "js-yaml";
 import path from "path";
+
+import { AbstractGeneratorContext, FernGeneratorExec } from "@fern-api/browser-compatible-base-generator";
+import { Logger } from "@fern-api/logger";
+
+import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk";
+
+import { GeneratorAgentClient } from "./GeneratorAgentClient";
 import { ReferenceConfigBuilder } from "./reference";
 
 const DOCKER_FEATURES_CONFIG_PATH = "/assets/features.yml";

generators/base/src/AbstractGeneratorCli.ts

@@ -1,12 +1,13 @@
 /* eslint-disable no-console */
-import { assertNever } from "@fern-api/core-utils";
 import { readFile } from "fs/promises";
+
 import {
     AbstractGeneratorContext,
     FernGeneratorExec,
     GeneratorExecParsing,
     GeneratorNotificationService
 } from "@fern-api/browser-compatible-base-generator";
+import { assertNever } from "@fern-api/core-utils";
 
 export abstract class AbstractGeneratorCli<
     CustomConfig,

generators/base/src/GeneratorAgentClient.ts

@@ -1,9 +1,10 @@
-import { AbsoluteFilePath } from "@fern-api/fs-utils";
-import { Logger } from "@fern-api/logger";
-import { createLoggingExecutable, LoggingExecutable } from "@fern-api/logging-execa";
 import { writeFile } from "fs/promises";
 import tmp from "tmp-promise";
 
+import { AbsoluteFilePath } from "@fern-api/fs-utils";
+import { Logger } from "@fern-api/logger";
+import { LoggingExecutable, createLoggingExecutable } from "@fern-api/logging-execa";
+
 const GENERATOR_AGENT_NPM_PACKAGE = "@fern-api/generator-cli";
 
 export class GeneratorAgentClient {

generators/base/src/SourceFetcher.ts

@@ -1,10 +1,11 @@
-import { AbsoluteFilePath, join, relative, RelativeFilePath } from "@fern-api/fs-utils";
-import { loggingExeca } from "@fern-api/logging-execa";
 import { createWriteStream } from "fs";
 import { mkdir, readdir } from "fs/promises";
 import { pipeline } from "stream";
 import { promisify } from "util";
+
 import { AbstractGeneratorContext } from "@fern-api/browser-compatible-base-generator";
+import { AbsoluteFilePath, RelativeFilePath, join, relative } from "@fern-api/fs-utils";
+import { loggingExeca } from "@fern-api/logging-execa";
 
 const LOCAL_FILE_SCHEME = "file:///";
 const PROTOBUF_ZIP_FILENAME = "proto.zip";

generators/base/src/__test__/SourceFetcher.test.ts

@@ -1,6 +1,8 @@
-import { AbsoluteFilePath, getDirectoryContents, getDirectoryContentsForSnapshot } from "@fern-api/fs-utils";
 import path from "path";
+
 import { AbstractGeneratorContext } from "@fern-api/browser-compatible-base-generator";
+import { AbsoluteFilePath, getDirectoryContents, getDirectoryContentsForSnapshot } from "@fern-api/fs-utils";
+
 import { SourceFetcher } from "../SourceFetcher";
 
 const AWS_BUCKET_NAME = "fdr-api-definition-source-test";

generators/base/src/project/AbstractProject.ts

@@ -1,5 +1,6 @@
 import { AbstractGeneratorContext } from "@fern-api/browser-compatible-base-generator";
 import { AbsoluteFilePath } from "@fern-api/fs-utils";
+
 import { File } from "./File";
 
 export abstract class AbstractProject<GeneratorContext extends AbstractGeneratorContext> {

generators/base/src/project/File.ts

@@ -1,7 +1,8 @@
-import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils";
 import { mkdir, writeFile } from "fs/promises";
 import path from "path";
 
+import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils";
+
 export class File {
     public filename: string;
     public directory: RelativeFilePath;

generators/base/src/readme/AbstractReadmeSnippetBuilder.ts

@@ -1,6 +1,7 @@
-import { FernGeneratorExec } from "@fern-api/browser-compatible-base-generator";
 import { camelCase } from "lodash-es";
 
+import { FernGeneratorExec } from "@fern-api/browser-compatible-base-generator";
+
 export abstract class AbstractReadmeSnippetBuilder {
     private endpointSnippets: FernGeneratorExec.Endpoint[];
 

generators/base/src/utils/parseGeneratorConfig.ts

@@ -1,6 +1,7 @@
-import { FernGeneratorExec, GeneratorExecParsing } from "@fern-api/browser-compatible-base-generator";
 import { readFile } from "fs/promises";
 
+import { FernGeneratorExec, GeneratorExecParsing } from "@fern-api/browser-compatible-base-generator";
+
 export async function parseGeneratorConfig(pathToConfig: string): Promise<FernGeneratorExec.GeneratorConfig> {
     const configStr = await readFile(pathToConfig);
     // eslint-disable-next-line no-console

generators/browser-compatible-base/package.json

@@ -24,7 +24,6 @@
     "lint:eslint:fix": "yarn lint:eslint --fix",
     "format": "prettier --write --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"",
     "format:check": "prettier --check --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"",
-    "organize-imports": "organize-imports-cli tsconfig.json",
     "depcheck": "depcheck"
   },
   "dependencies": {
@@ -38,8 +37,8 @@
     "depcheck": "^1.4.7",
     "eslint": "^9.16.0",
     "vitest": "^2.1.8",
-    "organize-imports-cli": "^0.10.0",
-    "prettier": "^2.7.1",
+    "@trivago/prettier-plugin-sort-imports": "^5.2.1",
+    "prettier": "^3.4.2",
     "typescript": "5.7.2"
   }
 }

generators/browser-compatible-base/src/AbstractGeneratorContext.ts

@@ -1,4 +1,5 @@
-import { CONSOLE_LOGGER, createLogger, Logger, LogLevel } from "@fern-api/logger";
+import { CONSOLE_LOGGER, LogLevel, Logger, createLogger } from "@fern-api/logger";
+
 import { FernGeneratorExec, GeneratorNotificationService } from "./GeneratorNotificationService";
 import { getSdkVersion } from "./utils";
 

generators/browser-compatible-base/src/dynamic-snippets/AbstractDynamicSnippetsGeneratorContext.ts

@@ -1,10 +1,11 @@
 import { assertNever } from "@fern-api/core-utils";
-import { FernGeneratorExec } from "../GeneratorNotificationService";
 import { FernIr } from "@fern-api/dynamic-ir-sdk";
 import { HttpEndpointReferenceParser } from "@fern-api/fern-definition-schema";
-import { TypeInstance } from "./TypeInstance";
+
+import { FernGeneratorExec } from "../GeneratorNotificationService";
 import { DiscriminatedUnionTypeInstance } from "./DiscriminatedUnionTypeInstance";
 import { ErrorReporter, Severity } from "./ErrorReporter";
+import { TypeInstance } from "./TypeInstance";
 
 export abstract class AbstractDynamicSnippetsGeneratorContext {
     public config: FernGeneratorExec.GeneratorConfig;

generators/browser-compatible-base/src/dynamic-snippets/ErrorReporter.ts

@@ -8,7 +8,7 @@ export declare namespace ErrorReporter {
 
     type PathItem = string | ArrayPathItem;
 
-    type Severity = typeof Severity[keyof typeof Severity];
+    type Severity = (typeof Severity)[keyof typeof Severity];
 
     interface ArrayPathItem {
         index: number;

generators/browser-compatible-base/src/dynamic-snippets/Result.ts

@@ -1,6 +1,7 @@
+import { FernIr } from "@fern-api/dynamic-ir-sdk";
+
 import { AbstractDynamicSnippetsGeneratorContext } from "./AbstractDynamicSnippetsGeneratorContext";
 import { ErrorReporter } from "./ErrorReporter";
-import { FernIr } from "@fern-api/dynamic-ir-sdk";
 
 export class Result {
     public reporter: ErrorReporter | undefined;

generators/browser-compatible-base/src/dynamic-snippets/Scope.ts

@@ -5,4 +5,4 @@ export const Scope = {
     RequestBody: "requestBody"
 } as const;
 
-export type Scope = typeof Scope[keyof typeof Scope];
+export type Scope = (typeof Scope)[keyof typeof Scope];

generators/csharp/codegen/package.json

@@ -23,7 +23,6 @@
     "lint:eslint:fix": "yarn lint:eslint --fix",
     "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"",
     "format:check": "prettier --check --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"",
-    "organize-imports": "organize-imports-cli tsconfig.json",
     "depcheck": "depcheck"
   },
   "dependencies": {
@@ -41,8 +40,8 @@
     "@types/node": "18.15.3",
     "depcheck": "^1.4.7",
     "eslint": "^9.16.0",
-    "organize-imports-cli": "^0.10.0",
-    "prettier": "^2.7.1",
+    "@trivago/prettier-plugin-sort-imports": "^5.2.1",
+    "prettier": "^3.4.2",
     "typescript": "5.7.2",
     "vitest": "^2.0.5"
   }

generators/csharp/codegen/src/FileGenerator.ts

@@ -1,7 +1,8 @@
+import { File } from "@fern-api/base-generator";
 import { RelativeFilePath } from "@fern-api/fs-utils";
+
 import { AbstractCsharpGeneratorContext } from "./cli";
 import { BaseCsharpCustomConfigSchema } from "./custom-config";
-import { File } from "@fern-api/base-generator";
 
 export abstract class FileGenerator<
     GeneratedFile extends File,

generators/csharp/codegen/src/TestFileGenerator.ts

@@ -1,7 +1,9 @@
-import { join, RelativeFilePath } from "@fern-api/fs-utils";
-import { csharp, CSharpFile, dependencies, FileGenerator } from ".";
+import { RelativeFilePath, join } from "@fern-api/fs-utils";
+
+import { CSharpFile, FileGenerator, csharp, dependencies } from ".";
 import { AbstractCsharpGeneratorContext } from "./cli";
 import { BaseCsharpCustomConfigSchema } from "./custom-config";
+
 export class TestFileGenerator extends FileGenerator<
     CSharpFile,
     BaseCsharpCustomConfigSchema,

generators/csharp/codegen/src/ast/Access.ts

@@ -5,4 +5,4 @@ export const Access = {
     Internal: "internal"
 } as const;
 
-export type Access = typeof Access[keyof typeof Access];
+export type Access = (typeof Access)[keyof typeof Access];

generators/csharp/codegen/src/ast/Annotation.ts

@@ -1,5 +1,5 @@
-import { AstNode } from "./core/AstNode";
 import { ClassReference } from "./ClassReference";
+import { AstNode } from "./core/AstNode";
 import { Writer } from "./core/Writer";
 
 export declare namespace Annotation {

generators/csharp/codegen/src/ast/Class.ts

@@ -3,18 +3,18 @@ import { Annotation } from "./Annotation";
 import { ClassInstantiation } from "./ClassInstantiation";
 import { ClassReference } from "./ClassReference";
 import { CodeBlock } from "./CodeBlock";
-import { AstNode } from "./core/AstNode";
-import { DocXmlWriter } from "./core/DocXmlWriter";
-import { Writer } from "./core/Writer";
 import { Field } from "./Field";
 import { Interface } from "./Interface";
 import { Method } from "./Method";
 import { MethodInvocation } from "./MethodInvocation";
 import { Parameter } from "./Parameter";
 import { Type } from "./Type";
+import { AstNode } from "./core/AstNode";
+import { DocXmlWriter } from "./core/DocXmlWriter";
+import { Writer } from "./core/Writer";
 
 export declare namespace Class {
-    type ClassType = typeof Class.ClassType[keyof typeof Class.ClassType];
+    type ClassType = (typeof Class.ClassType)[keyof typeof Class.ClassType];
     interface Args {
         /* The name of the C# class */
         name: string;

generators/csharp/codegen/src/ast/ClassInstantiation.ts

@@ -1,4 +1,5 @@
 import { Arguments, hasNamedArgument, isNamedArgument } from "@fern-api/base-generator";
+
 import { ClassReference } from "./ClassReference";
 import { AstNode } from "./core/AstNode";
 import { Writer } from "./core/Writer";

generators/csharp/codegen/src/ast/CodeBlock.ts

@@ -1,4 +1,5 @@
 import { CodeBlock as CommonCodeBlock } from "@fern-api/base-generator";
+
 import { AstNode, Writer } from "../csharp";
 
 export declare namespace CodeBlock {

generators/csharp/codegen/src/ast/Dictionary.ts

@@ -1,8 +1,9 @@
-import { assertNever } from "@fern-api/core-utils";
 import { UnnamedArgument } from "@fern-api/base-generator";
+import { assertNever } from "@fern-api/core-utils";
+
+import { Type } from "./Type";
 import { AstNode } from "./core/AstNode";
 import { Writer } from "./core/Writer";
-import { Type } from "./Type";
 
 export declare namespace Dictionary {
     interface Args {

generators/csharp/codegen/src/ast/Field.ts

@@ -2,10 +2,10 @@ import { Access } from "./Access";
 import { Annotation } from "./Annotation";
 import { ClassReference } from "./ClassReference";
 import { CodeBlock } from "./CodeBlock";
+import { Type } from "./Type";
 import { AstNode } from "./core/AstNode";
 import { DocXmlWriter } from "./core/DocXmlWriter";
 import { Writer } from "./core/Writer";
-import { Type } from "./Type";
 
 export declare namespace Field {
     interface Args {

generators/csharp/codegen/src/ast/Interface.ts

@@ -1,9 +1,9 @@
-import { Writer } from "./core/Writer";
-import { ClassReference } from "./ClassReference";
 import { Access } from "./Access";
-import { AstNode } from "./core/AstNode";
+import { ClassReference } from "./ClassReference";
 import { Field } from "./Field";
 import { Method } from "./Method";
+import { AstNode } from "./core/AstNode";
+import { Writer } from "./core/Writer";
 
 export declare namespace Interface {
     interface Args {

generators/csharp/codegen/src/ast/List.ts

@@ -1,6 +1,6 @@
+import { Type } from "./Type";
 import { AstNode } from "./core/AstNode";
 import { Writer } from "./core/Writer";
-import { Type } from "./Type";
 
 export declare namespace List {
     interface Args {

generators/csharp/codegen/src/ast/Method.ts

@@ -2,11 +2,11 @@ import { Access } from "./Access";
 import { Annotation } from "./Annotation";
 import { ClassReference } from "./ClassReference";
 import { CodeBlock } from "./CodeBlock";
+import { Parameter } from "./Parameter";
+import { Type } from "./Type";
 import { AstNode } from "./core/AstNode";
 import { DocXmlWriter } from "./core/DocXmlWriter";
 import { Writer } from "./core/Writer";
-import { Parameter } from "./Parameter";
-import { Type } from "./Type";
 
 export enum MethodType {
     INSTANCE,

generators/csharp/codegen/src/ast/Parameter.ts

@@ -1,6 +1,6 @@
+import { Type } from "./Type";
 import { AstNode } from "./core/AstNode";
 import { Writer } from "./core/Writer";
-import { Type } from "./Type";
 
 export declare namespace Parameter {
     interface Args {

generators/csharp/codegen/src/ast/ReadOnlymemory.ts

@@ -1,6 +1,6 @@
+import { Type } from "./Type";
 import { AstNode } from "./core/AstNode";
 import { Writer } from "./core/Writer";
-import { Type } from "./Type";
 
 export declare namespace ReadOnlyMemory {
     interface Args {

generators/csharp/codegen/src/ast/Set.ts

@@ -1,6 +1,6 @@
+import { Type } from "./Type";
 import { AstNode } from "./core/AstNode";
 import { Writer } from "./core/Writer";
-import { Type } from "./Type";
 
 export declare namespace Set {
     interface Args {

generators/csharp/codegen/src/ast/Ternary.ts

@@ -1,4 +1,5 @@
 import { Ternary as CommonTernary } from "@fern-api/base-generator";
+
 import { AstNode } from "./core/AstNode";
 import { Writer } from "./core/Writer";
 

generators/csharp/codegen/src/ast/TestClass.ts

@@ -3,9 +3,9 @@ import { Annotation } from "./Annotation";
 import { Class } from "./Class";
 import { ClassReference } from "./ClassReference";
 import { CodeBlock } from "./CodeBlock";
+import { Method } from "./Method";
 import { AstNode } from "./core/AstNode";
 import { Writer } from "./core/Writer";
-import { Method } from "./Method";
 
 export declare namespace TestClass {
     interface Args {