diff --git a/.prettierrc.json b/.prettierrc.json index b64fa24b030..27d23abfbe1 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -9,5 +9,9 @@ "tabWidth": 2 } } - ] + ], + "importOrder": ["^@fern-api(.*)$", "^@fern-fern(.*)$", "^[./]"], + "importOrderSeparation": true, + "importOrderSortSpecifiers": true, + "plugins": ["@trivago/prettier-plugin-sort-imports"] } diff --git a/generators/base/package.json b/generators/base/package.json index d8a64c194d0..344d65290e0 100644 --- a/generators/base/package.json +++ b/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" } } \ No newline at end of file diff --git a/generators/base/src/AbstractGeneratorAgent.ts b/generators/base/src/AbstractGeneratorAgent.ts index 4cc95838ec8..a9b63aa93ba 100644 --- a/generators/base/src/AbstractGeneratorAgent.ts +++ b/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"; diff --git a/generators/base/src/AbstractGeneratorCli.ts b/generators/base/src/AbstractGeneratorCli.ts index 2bb77eda4e3..a12ee1b47aa 100644 --- a/generators/base/src/AbstractGeneratorCli.ts +++ b/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, diff --git a/generators/base/src/GeneratorAgentClient.ts b/generators/base/src/GeneratorAgentClient.ts index 0b0ac306dba..e8f269ea708 100644 --- a/generators/base/src/GeneratorAgentClient.ts +++ b/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 { diff --git a/generators/base/src/SourceFetcher.ts b/generators/base/src/SourceFetcher.ts index f1e78ee8795..4c8c0deee0c 100644 --- a/generators/base/src/SourceFetcher.ts +++ b/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"; diff --git a/generators/base/src/__test__/SourceFetcher.test.ts b/generators/base/src/__test__/SourceFetcher.test.ts index be36a4591eb..604c89ebbf4 100644 --- a/generators/base/src/__test__/SourceFetcher.test.ts +++ b/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"; diff --git a/generators/base/src/project/AbstractProject.ts b/generators/base/src/project/AbstractProject.ts index 7d2b4a615e3..9946ffc177e 100644 --- a/generators/base/src/project/AbstractProject.ts +++ b/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 { diff --git a/generators/base/src/project/File.ts b/generators/base/src/project/File.ts index 5e093592fd9..d03d47b7e31 100644 --- a/generators/base/src/project/File.ts +++ b/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; diff --git a/generators/base/src/readme/AbstractReadmeSnippetBuilder.ts b/generators/base/src/readme/AbstractReadmeSnippetBuilder.ts index bcfa9260246..139464b5074 100644 --- a/generators/base/src/readme/AbstractReadmeSnippetBuilder.ts +++ b/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[]; diff --git a/generators/base/src/utils/parseGeneratorConfig.ts b/generators/base/src/utils/parseGeneratorConfig.ts index 588dc33b94c..ab222ed6916 100644 --- a/generators/base/src/utils/parseGeneratorConfig.ts +++ b/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 { const configStr = await readFile(pathToConfig); // eslint-disable-next-line no-console diff --git a/generators/browser-compatible-base/package.json b/generators/browser-compatible-base/package.json index f6a44278103..35bb2a2f685 100644 --- a/generators/browser-compatible-base/package.json +++ b/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" } } \ No newline at end of file diff --git a/generators/browser-compatible-base/src/AbstractGeneratorContext.ts b/generators/browser-compatible-base/src/AbstractGeneratorContext.ts index f5d0521712a..78e9ff572f3 100644 --- a/generators/browser-compatible-base/src/AbstractGeneratorContext.ts +++ b/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"; diff --git a/generators/browser-compatible-base/src/dynamic-snippets/AbstractDynamicSnippetsGeneratorContext.ts b/generators/browser-compatible-base/src/dynamic-snippets/AbstractDynamicSnippetsGeneratorContext.ts index 6a8e38e1f2c..d7aa269f0ff 100644 --- a/generators/browser-compatible-base/src/dynamic-snippets/AbstractDynamicSnippetsGeneratorContext.ts +++ b/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; diff --git a/generators/browser-compatible-base/src/dynamic-snippets/ErrorReporter.ts b/generators/browser-compatible-base/src/dynamic-snippets/ErrorReporter.ts index 73cf131c5e2..d811e7eee03 100644 --- a/generators/browser-compatible-base/src/dynamic-snippets/ErrorReporter.ts +++ b/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; diff --git a/generators/browser-compatible-base/src/dynamic-snippets/Result.ts b/generators/browser-compatible-base/src/dynamic-snippets/Result.ts index c0d09a46126..7aa04816079 100644 --- a/generators/browser-compatible-base/src/dynamic-snippets/Result.ts +++ b/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; diff --git a/generators/browser-compatible-base/src/dynamic-snippets/Scope.ts b/generators/browser-compatible-base/src/dynamic-snippets/Scope.ts index bdadfccf1b0..179caa24472 100644 --- a/generators/browser-compatible-base/src/dynamic-snippets/Scope.ts +++ b/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]; diff --git a/generators/csharp/codegen/package.json b/generators/csharp/codegen/package.json index 8104fd5eb1c..caba089ed81 100644 --- a/generators/csharp/codegen/package.json +++ b/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" } diff --git a/generators/csharp/codegen/src/FileGenerator.ts b/generators/csharp/codegen/src/FileGenerator.ts index 7f5e8c45571..3581c834617 100644 --- a/generators/csharp/codegen/src/FileGenerator.ts +++ b/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, diff --git a/generators/csharp/codegen/src/TestFileGenerator.ts b/generators/csharp/codegen/src/TestFileGenerator.ts index 7ad120c968b..57861a924e3 100644 --- a/generators/csharp/codegen/src/TestFileGenerator.ts +++ b/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, diff --git a/generators/csharp/codegen/src/ast/Access.ts b/generators/csharp/codegen/src/ast/Access.ts index 4ed7c8ea574..eeb4dbcbfe1 100644 --- a/generators/csharp/codegen/src/ast/Access.ts +++ b/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]; diff --git a/generators/csharp/codegen/src/ast/Annotation.ts b/generators/csharp/codegen/src/ast/Annotation.ts index 418c6a1864f..0ff8637b564 100644 --- a/generators/csharp/codegen/src/ast/Annotation.ts +++ b/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 { diff --git a/generators/csharp/codegen/src/ast/Class.ts b/generators/csharp/codegen/src/ast/Class.ts index 3c093b6dd1a..914af990390 100644 --- a/generators/csharp/codegen/src/ast/Class.ts +++ b/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; diff --git a/generators/csharp/codegen/src/ast/ClassInstantiation.ts b/generators/csharp/codegen/src/ast/ClassInstantiation.ts index af2484b43a7..3fcf4dd30ac 100644 --- a/generators/csharp/codegen/src/ast/ClassInstantiation.ts +++ b/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"; diff --git a/generators/csharp/codegen/src/ast/CodeBlock.ts b/generators/csharp/codegen/src/ast/CodeBlock.ts index 951ae1090ab..c03198ef2d9 100644 --- a/generators/csharp/codegen/src/ast/CodeBlock.ts +++ b/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 { diff --git a/generators/csharp/codegen/src/ast/Dictionary.ts b/generators/csharp/codegen/src/ast/Dictionary.ts index 596273d4540..ba1131d83cb 100644 --- a/generators/csharp/codegen/src/ast/Dictionary.ts +++ b/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 { diff --git a/generators/csharp/codegen/src/ast/Field.ts b/generators/csharp/codegen/src/ast/Field.ts index 16970cebfcc..32aea83ec95 100644 --- a/generators/csharp/codegen/src/ast/Field.ts +++ b/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 { diff --git a/generators/csharp/codegen/src/ast/Interface.ts b/generators/csharp/codegen/src/ast/Interface.ts index c219515ff81..904fb734e32 100644 --- a/generators/csharp/codegen/src/ast/Interface.ts +++ b/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 { diff --git a/generators/csharp/codegen/src/ast/List.ts b/generators/csharp/codegen/src/ast/List.ts index c04ab9b9ffd..b85cac9a040 100644 --- a/generators/csharp/codegen/src/ast/List.ts +++ b/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 { diff --git a/generators/csharp/codegen/src/ast/Method.ts b/generators/csharp/codegen/src/ast/Method.ts index 23ca649d7ee..55d5f7f3475 100644 --- a/generators/csharp/codegen/src/ast/Method.ts +++ b/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, diff --git a/generators/csharp/codegen/src/ast/Parameter.ts b/generators/csharp/codegen/src/ast/Parameter.ts index 2c3258273c3..244ae918ae7 100644 --- a/generators/csharp/codegen/src/ast/Parameter.ts +++ b/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 { diff --git a/generators/csharp/codegen/src/ast/ReadOnlymemory.ts b/generators/csharp/codegen/src/ast/ReadOnlymemory.ts index a4965be22e9..88823d2d302 100644 --- a/generators/csharp/codegen/src/ast/ReadOnlymemory.ts +++ b/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 { diff --git a/generators/csharp/codegen/src/ast/Set.ts b/generators/csharp/codegen/src/ast/Set.ts index 4e8382a0494..ad724c7e700 100644 --- a/generators/csharp/codegen/src/ast/Set.ts +++ b/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 { diff --git a/generators/csharp/codegen/src/ast/Ternary.ts b/generators/csharp/codegen/src/ast/Ternary.ts index b5efa4ca54b..d8eb62d0957 100644 --- a/generators/csharp/codegen/src/ast/Ternary.ts +++ b/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"; diff --git a/generators/csharp/codegen/src/ast/TestClass.ts b/generators/csharp/codegen/src/ast/TestClass.ts index 0dae60e0b4f..4f19aaeba8c 100644 --- a/generators/csharp/codegen/src/ast/TestClass.ts +++ b/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 { diff --git a/generators/csharp/codegen/src/ast/Type.ts b/generators/csharp/codegen/src/ast/Type.ts index ebf666e4788..f23ba1b8b64 100644 --- a/generators/csharp/codegen/src/ast/Type.ts +++ b/generators/csharp/codegen/src/ast/Type.ts @@ -1,16 +1,18 @@ import { assertNever } from "@fern-api/core-utils"; + +import { PrimitiveTypeV1 } from "@fern-fern/ir-sdk/api"; + +import { BaseCsharpCustomConfigSchema } from "../custom-config"; +import { Namespace } from "../project/CSharpFile"; import { ClassReference, OneOfBaseClassReference, OneOfClassReference, StringEnumClassReference } from "./ClassReference"; +import { CoreClassReference } from "./CoreClassReference"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { CoreClassReference } from "./CoreClassReference"; -import { PrimitiveTypeV1 } from "@fern-fern/ir-sdk/api"; -import { BaseCsharpCustomConfigSchema } from "../custom-config"; -import { Namespace } from "../project/CSharpFile"; type InternalType = | Integer diff --git a/generators/csharp/codegen/src/ast/core/AstNode.ts b/generators/csharp/codegen/src/ast/core/AstNode.ts index 051012f02f8..3b9da6b6ac7 100644 --- a/generators/csharp/codegen/src/ast/core/AstNode.ts +++ b/generators/csharp/codegen/src/ast/core/AstNode.ts @@ -1,5 +1,7 @@ -import { AbstractAstNode } from "@fern-api/base-generator"; import { execSync } from "child_process"; + +import { AbstractAstNode } from "@fern-api/base-generator"; + import { BaseCsharpCustomConfigSchema } from "../../custom-config"; import { Writer } from "./Writer"; diff --git a/generators/csharp/codegen/src/ast/core/Writer.ts b/generators/csharp/codegen/src/ast/core/Writer.ts index f52568c94af..0ce61f4ee6b 100644 --- a/generators/csharp/codegen/src/ast/core/Writer.ts +++ b/generators/csharp/codegen/src/ast/core/Writer.ts @@ -1,4 +1,5 @@ import { AbstractWriter } from "@fern-api/base-generator"; + import { ClassReference } from ".."; import { csharp } from "../.."; import { BaseCsharpCustomConfigSchema } from "../../custom-config"; diff --git a/generators/csharp/codegen/src/cli/AbstractCsharpGeneratorCli.ts b/generators/csharp/codegen/src/cli/AbstractCsharpGeneratorCli.ts index d9e5bb32f3b..3dc8432a56d 100644 --- a/generators/csharp/codegen/src/cli/AbstractCsharpGeneratorCli.ts +++ b/generators/csharp/codegen/src/cli/AbstractCsharpGeneratorCli.ts @@ -1,8 +1,11 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { readFile } from "fs/promises"; + import { AbstractGeneratorCli, parseIR } from "@fern-api/base-generator"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; -import { readFile } from "fs/promises"; + import { AbstractCsharpGeneratorContext } from "../context/AbstractCsharpGeneratorContext"; import { BaseCsharpCustomConfigSchema } from "../custom-config/BaseCsharpCustomConfigSchema"; diff --git a/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts b/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts index 916d3572d8e..0713726ae6c 100644 --- a/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts +++ b/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts @@ -1,5 +1,8 @@ -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { camelCase, upperFirst } from "lodash-es"; + import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService } from "@fern-api/base-generator"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { FernFilepath, HttpHeader, @@ -12,16 +15,16 @@ import { TypeReference, UndiscriminatedUnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; -import { camelCase, upperFirst } from "lodash-es"; + import { convertReadOnlyPrimitiveTypes, csharp } from ".."; import { COLLECTION_ITEM_SERIALIZER_CLASS_NAME, CONSTANTS_CLASS_NAME, DATETIME_SERIALIZER_CLASS_NAME, + ENUM_SERIALIZER_CLASS_NAME, JSON_UTILS_CLASS_NAME, ONE_OF_SERIALIZER_CLASS_NAME, - STRING_ENUM_SERIALIZER_CLASS_NAME, - ENUM_SERIALIZER_CLASS_NAME + STRING_ENUM_SERIALIZER_CLASS_NAME } from "../AsIs"; import { Type } from "../ast"; import { BaseCsharpCustomConfigSchema } from "../custom-config/BaseCsharpCustomConfigSchema"; diff --git a/generators/csharp/codegen/src/context/CsharpTypeMapper.ts b/generators/csharp/codegen/src/context/CsharpTypeMapper.ts index 586301aeb9c..4afbd8772cb 100644 --- a/generators/csharp/codegen/src/context/CsharpTypeMapper.ts +++ b/generators/csharp/codegen/src/context/CsharpTypeMapper.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { ContainerType, DeclaredTypeName, @@ -9,6 +10,7 @@ import { TypeId, TypeReference } from "@fern-fern/ir-sdk/api"; + import { csharp } from "../"; import { ClassReference, Type } from "../ast"; import { BaseCsharpCustomConfigSchema } from "../custom-config/BaseCsharpCustomConfigSchema"; diff --git a/generators/csharp/codegen/src/custom-config/validateReadOnlyMemoryTypes.ts b/generators/csharp/codegen/src/custom-config/validateReadOnlyMemoryTypes.ts index a2ef9ac0d95..abe21d292a0 100644 --- a/generators/csharp/codegen/src/custom-config/validateReadOnlyMemoryTypes.ts +++ b/generators/csharp/codegen/src/custom-config/validateReadOnlyMemoryTypes.ts @@ -1,5 +1,5 @@ -import { BaseCsharpCustomConfigSchema } from "./BaseCsharpCustomConfigSchema"; import { VALID_READ_ONLY_MEMORY_TYPES } from "../ast"; +import { BaseCsharpCustomConfigSchema } from "./BaseCsharpCustomConfigSchema"; export function validateReadOnlyMemoryTypes(customConfig: BaseCsharpCustomConfigSchema): void { const readOnlyMemoryTypes = customConfig["read-only-memory-types"]; diff --git a/generators/csharp/codegen/src/project/CSharpFile.ts b/generators/csharp/codegen/src/project/CSharpFile.ts index cbb86962b8b..e9646c486b7 100644 --- a/generators/csharp/codegen/src/project/CSharpFile.ts +++ b/generators/csharp/codegen/src/project/CSharpFile.ts @@ -1,9 +1,12 @@ +import path from "path"; + +import { File } from "@fern-api/base-generator"; import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { FernFilepath } from "@fern-fern/ir-sdk/api"; -import path from "path"; + import { Class, Enum, Interface } from "../ast"; import { BaseCsharpCustomConfigSchema } from "../custom-config"; -import { File } from "@fern-api/base-generator"; export type Namespace = string; diff --git a/generators/csharp/codegen/src/project/CsharpProject.ts b/generators/csharp/codegen/src/project/CsharpProject.ts index 1d57d40e4e9..22e4a9603c1 100644 --- a/generators/csharp/codegen/src/project/CsharpProject.ts +++ b/generators/csharp/codegen/src/project/CsharpProject.ts @@ -1,9 +1,11 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { SourceFetcher, File, AbstractProject, FernGeneratorExec } from "@fern-api/base-generator"; -import { loggingExeca } from "@fern-api/logging-execa"; import { mkdir, readFile, writeFile } from "fs/promises"; import { template } from "lodash-es"; import path from "path"; + +import { AbstractProject, FernGeneratorExec, File, SourceFetcher } from "@fern-api/base-generator"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { loggingExeca } from "@fern-api/logging-execa"; + import { AsIsFiles } from "../AsIs"; import { AbstractCsharpGeneratorContext } from "../cli"; import { BaseCsharpCustomConfigSchema } from "../custom-config"; diff --git a/generators/csharp/codegen/src/project/PrebuiltUtilities.ts b/generators/csharp/codegen/src/project/PrebuiltUtilities.ts index 765f9120c86..5594680df27 100644 --- a/generators/csharp/codegen/src/project/PrebuiltUtilities.ts +++ b/generators/csharp/codegen/src/project/PrebuiltUtilities.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; -import { Annotation, ClassReference } from "../ast"; + import { File } from "@fern-api/base-generator"; +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + +import { Annotation, ClassReference } from "../ast"; export class PrebuiltUtilities { private utilitiesDirectory = RelativeFilePath.of("Utilities"); diff --git a/generators/csharp/codegen/src/proto/CsharpProtobufTypeMapper.ts b/generators/csharp/codegen/src/proto/CsharpProtobufTypeMapper.ts index 79a9ccefd8e..7d856c29a9d 100644 --- a/generators/csharp/codegen/src/proto/CsharpProtobufTypeMapper.ts +++ b/generators/csharp/codegen/src/proto/CsharpProtobufTypeMapper.ts @@ -1,5 +1,7 @@ import { assertNever } from "@fern-api/core-utils"; + import { ContainerType, Literal, MapType, NamedType, PrimitiveType, TypeReference } from "@fern-fern/ir-sdk/api"; + import { csharp } from "../"; import { CodeBlock, MethodType } from "../ast"; import { AbstractCsharpGeneratorContext } from "../context/AbstractCsharpGeneratorContext"; diff --git a/generators/csharp/codegen/src/proto/ProtobufResolver.ts b/generators/csharp/codegen/src/proto/ProtobufResolver.ts index d21f6c561e8..d3aea17f89f 100644 --- a/generators/csharp/codegen/src/proto/ProtobufResolver.ts +++ b/generators/csharp/codegen/src/proto/ProtobufResolver.ts @@ -6,11 +6,12 @@ import { TypeId, WellKnownProtobufType } from "@fern-fern/ir-sdk/api"; + import { csharp } from ".."; +import { ResolvedWellKnownProtobufType } from "../ResolvedWellKnownProtobufType"; import { AbstractCsharpGeneratorContext } from "../context/AbstractCsharpGeneratorContext"; import { CsharpTypeMapper } from "../context/CsharpTypeMapper"; import { BaseCsharpCustomConfigSchema } from "../custom-config/BaseCsharpCustomConfigSchema"; -import { ResolvedWellKnownProtobufType } from "../ResolvedWellKnownProtobufType"; export class ProtobufResolver { private context: AbstractCsharpGeneratorContext; diff --git a/generators/csharp/model/package.json b/generators/csharp/model/package.json index 3d9313a82e5..be192effc18 100644 --- a/generators/csharp/model/package.json +++ b/generators/csharp/model/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", "dist:cli": "pnpm compile && tsup ./src/cli.ts --format cjs && cp -R ../codegen/src/asIs dist", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -41,8 +40,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.3.5", "typescript": "5.7.2", "vitest": "^2.0.5" diff --git a/generators/csharp/model/src/ModelGeneratorCli.ts b/generators/csharp/model/src/ModelGeneratorCli.ts index e8384e04f48..d039fce3c98 100644 --- a/generators/csharp/model/src/ModelGeneratorCli.ts +++ b/generators/csharp/model/src/ModelGeneratorCli.ts @@ -1,11 +1,13 @@ -import { AbstractCsharpGeneratorCli, validateReadOnlyMemoryTypes } from "@fern-api/csharp-codegen"; import { FernGeneratorExec, GeneratorNotificationService } from "@fern-api/base-generator"; +import { AbstractCsharpGeneratorCli, validateReadOnlyMemoryTypes } from "@fern-api/csharp-codegen"; + import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; -import { generateModels } from "./generateModels"; -import { generateWellKnownProtobufFiles } from "./generateWellKnownProtobufFiles"; -import { generateVersion } from "./generateVersion"; + import { ModelCustomConfigSchema } from "./ModelCustomConfig"; import { ModelGeneratorContext } from "./ModelGeneratorContext"; +import { generateModels } from "./generateModels"; +import { generateVersion } from "./generateVersion"; +import { generateWellKnownProtobufFiles } from "./generateWellKnownProtobufFiles"; export class ModelGeneratorCLI extends AbstractCsharpGeneratorCli { protected constructContext({ diff --git a/generators/csharp/model/src/ModelGeneratorContext.ts b/generators/csharp/model/src/ModelGeneratorContext.ts index 48184491762..36e6099c130 100644 --- a/generators/csharp/model/src/ModelGeneratorContext.ts +++ b/generators/csharp/model/src/ModelGeneratorContext.ts @@ -1,6 +1,8 @@ import { AbstractCsharpGeneratorContext, AsIsFiles } from "@fern-api/csharp-codegen"; import { RelativeFilePath } from "@fern-api/fs-utils"; + import { FernFilepath, TypeId } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "./ModelCustomConfig"; export class ModelGeneratorContext extends AbstractCsharpGeneratorContext { diff --git a/generators/csharp/model/src/enum/EnumGenerator.ts b/generators/csharp/model/src/enum/EnumGenerator.ts index ecd35501e27..289fcd51d38 100644 --- a/generators/csharp/model/src/enum/EnumGenerator.ts +++ b/generators/csharp/model/src/enum/EnumGenerator.ts @@ -1,6 +1,8 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { EnumTypeDeclaration, TypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "../ModelCustomConfig"; import { ModelGeneratorContext } from "../ModelGeneratorContext"; diff --git a/generators/csharp/model/src/enum/StringEnumGenerator.ts b/generators/csharp/model/src/enum/StringEnumGenerator.ts index 183c123daf9..00270702a5f 100644 --- a/generators/csharp/model/src/enum/StringEnumGenerator.ts +++ b/generators/csharp/model/src/enum/StringEnumGenerator.ts @@ -1,6 +1,8 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { EnumTypeDeclaration, NameAndWireValue, TypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "../ModelCustomConfig"; import { ModelGeneratorContext } from "../ModelGeneratorContext"; diff --git a/generators/csharp/model/src/generateModels.ts b/generators/csharp/model/src/generateModels.ts index 7b5564247d2..c8aed98943d 100644 --- a/generators/csharp/model/src/generateModels.ts +++ b/generators/csharp/model/src/generateModels.ts @@ -1,9 +1,11 @@ import { CSharpFile } from "@fern-api/csharp-codegen"; + import { EnumTypeDeclaration } from "@fern-fern/ir-sdk/api"; -import { StringEnumGenerator } from "./enum/StringEnumGenerator"; + import { ModelGeneratorContext } from "./ModelGeneratorContext"; -import { ObjectGenerator } from "./object/ObjectGenerator"; import { EnumGenerator } from "./enum/EnumGenerator"; +import { StringEnumGenerator } from "./enum/StringEnumGenerator"; +import { ObjectGenerator } from "./object/ObjectGenerator"; export function generateModels({ context }: { context: ModelGeneratorContext }): CSharpFile[] { const files: CSharpFile[] = []; @@ -15,7 +17,7 @@ export function generateModels({ context }: { context: ModelGeneratorContext }): const file = typeDeclaration.shape._visit({ alias: () => undefined, enum: (etd: EnumTypeDeclaration) => { - return context.customConfig["experimental-enable-forward-compatible-enums"] ?? false + return (context.customConfig["experimental-enable-forward-compatible-enums"] ?? false) ? new StringEnumGenerator(context, typeDeclaration, etd).generate() : new EnumGenerator(context, typeDeclaration, etd).generate(); }, diff --git a/generators/csharp/model/src/generateTests.ts b/generators/csharp/model/src/generateTests.ts index 97a97a89ac4..0089f8f271d 100644 --- a/generators/csharp/model/src/generateTests.ts +++ b/generators/csharp/model/src/generateTests.ts @@ -1,4 +1,5 @@ import { CSharpFile } from "@fern-api/csharp-codegen"; + import { ModelGeneratorContext } from "./ModelGeneratorContext"; import { ObjectGenerator } from "./object/ObjectGenerator"; import { ObjectSerializationTestGenerator } from "./object/ObjectSerializationTestGenerator"; diff --git a/generators/csharp/model/src/generateVersion.ts b/generators/csharp/model/src/generateVersion.ts index 8f88465cfd1..31881a20847 100644 --- a/generators/csharp/model/src/generateVersion.ts +++ b/generators/csharp/model/src/generateVersion.ts @@ -1,4 +1,5 @@ import { CSharpFile } from "@fern-api/csharp-codegen"; + import { ModelGeneratorContext } from "./ModelGeneratorContext"; import { VersionGenerator } from "./version/VersionGenerator"; diff --git a/generators/csharp/model/src/generateWellKnownProtobufFiles.ts b/generators/csharp/model/src/generateWellKnownProtobufFiles.ts index d7f6194f6f2..ca14806e35c 100644 --- a/generators/csharp/model/src/generateWellKnownProtobufFiles.ts +++ b/generators/csharp/model/src/generateWellKnownProtobufFiles.ts @@ -1,5 +1,7 @@ import { CSharpFile } from "@fern-api/csharp-codegen"; + import { WellKnownProtobufType } from "@fern-fern/ir-sdk/api"; + import { ModelGeneratorContext } from "./ModelGeneratorContext"; import { WellKnownProtoStructGenerator } from "./proto/WellKnownProtoStructGenerator"; import { WellKnownProtoValueGenerator } from "./proto/WellKnownProtoValueGenerator"; diff --git a/generators/csharp/model/src/object/ObjectGenerator.ts b/generators/csharp/model/src/object/ObjectGenerator.ts index 74293b5a3ff..4a049a1c444 100644 --- a/generators/csharp/model/src/object/ObjectGenerator.ts +++ b/generators/csharp/model/src/object/ObjectGenerator.ts @@ -1,5 +1,6 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ExampleObjectType, NameAndWireValue, @@ -7,6 +8,7 @@ import { ObjectTypeDeclaration, TypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "../ModelCustomConfig"; import { ModelGeneratorContext } from "../ModelGeneratorContext"; import { ExampleGenerator } from "../snippets/ExampleGenerator"; diff --git a/generators/csharp/model/src/object/ObjectSerializationTestGenerator.ts b/generators/csharp/model/src/object/ObjectSerializationTestGenerator.ts index a74455d6968..916a191d482 100644 --- a/generators/csharp/model/src/object/ObjectSerializationTestGenerator.ts +++ b/generators/csharp/model/src/object/ObjectSerializationTestGenerator.ts @@ -1,8 +1,11 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { TypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "../ModelCustomConfig"; import { ModelGeneratorContext } from "../ModelGeneratorContext"; + import TestInput = TestClass.TestInput; export declare namespace TestClass { diff --git a/generators/csharp/model/src/proto/WellKnownProtoStructGenerator.ts b/generators/csharp/model/src/proto/WellKnownProtoStructGenerator.ts index a1d76a31a74..ccc77a7ce25 100644 --- a/generators/csharp/model/src/proto/WellKnownProtoStructGenerator.ts +++ b/generators/csharp/model/src/proto/WellKnownProtoStructGenerator.ts @@ -1,6 +1,8 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { TypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "../ModelCustomConfig"; import { ModelGeneratorContext } from "../ModelGeneratorContext"; import { EXTERNAL_PROTO_STRUCT_CLASS_REFERENCE } from "./constants"; diff --git a/generators/csharp/model/src/proto/WellKnownProtoValueGenerator.ts b/generators/csharp/model/src/proto/WellKnownProtoValueGenerator.ts index b0431c19de6..28f4070e08a 100644 --- a/generators/csharp/model/src/proto/WellKnownProtoValueGenerator.ts +++ b/generators/csharp/model/src/proto/WellKnownProtoValueGenerator.ts @@ -1,6 +1,8 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { TypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "../ModelCustomConfig"; import { ModelGeneratorContext } from "../ModelGeneratorContext"; import { EXTERNAL_PROTO_LIST_VALUE_CLASS_REFERENCE, EXTERNAL_PROTO_VALUE_CLASS_REFERENCE } from "./constants"; diff --git a/generators/csharp/model/src/snippets/ExampleGenerator.ts b/generators/csharp/model/src/snippets/ExampleGenerator.ts index ebc5681e689..7b3957740a8 100644 --- a/generators/csharp/model/src/snippets/ExampleGenerator.ts +++ b/generators/csharp/model/src/snippets/ExampleGenerator.ts @@ -1,4 +1,5 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { ExampleContainer, ExampleNamedType, @@ -8,6 +9,7 @@ import { ExampleUndiscriminatedUnionType, ExampleUnionType } from "@fern-fern/ir-sdk/api"; + import { ModelGeneratorContext } from "../ModelGeneratorContext"; import { ObjectGenerator } from "../object/ObjectGenerator"; diff --git a/generators/csharp/model/src/undiscriminated-union/getUndiscriminatedUnionSerializerAnnotation.ts b/generators/csharp/model/src/undiscriminated-union/getUndiscriminatedUnionSerializerAnnotation.ts index 8248424ee6f..9b05544afc7 100644 --- a/generators/csharp/model/src/undiscriminated-union/getUndiscriminatedUnionSerializerAnnotation.ts +++ b/generators/csharp/model/src/undiscriminated-union/getUndiscriminatedUnionSerializerAnnotation.ts @@ -1,4 +1,5 @@ import { AbstractCsharpGeneratorContext, csharp } from "@fern-api/csharp-codegen"; + import { UndiscriminatedUnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; /** diff --git a/generators/csharp/model/src/version/VersionGenerator.ts b/generators/csharp/model/src/version/VersionGenerator.ts index d8112a644c6..5873f92d2dd 100644 --- a/generators/csharp/model/src/version/VersionGenerator.ts +++ b/generators/csharp/model/src/version/VersionGenerator.ts @@ -1,5 +1,6 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ModelCustomConfigSchema } from "../ModelCustomConfig"; import { ModelGeneratorContext } from "../ModelGeneratorContext"; diff --git a/generators/csharp/sdk/package.json b/generators/csharp/sdk/package.json index a4a6c0ea047..462e360d4f1 100644 --- a/generators/csharp/sdk/package.json +++ b/generators/csharp/sdk/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", "dist:cli": "rm -rf ./lib && rm -rf ./dist && pnpm compile && tsup ./src/cli.ts --format cjs && cp -R ../codegen/src/asIs dist", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -49,8 +48,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.3.5", "typescript": "5.7.2", "vitest": "^2.0.5" diff --git a/generators/csharp/sdk/src/CsharpGeneratorAgent.ts b/generators/csharp/sdk/src/CsharpGeneratorAgent.ts index 708d4eb9f95..9b7e9f4ffab 100644 --- a/generators/csharp/sdk/src/CsharpGeneratorAgent.ts +++ b/generators/csharp/sdk/src/CsharpGeneratorAgent.ts @@ -1,9 +1,11 @@ import { AbstractGeneratorAgent } from "@fern-api/base-generator"; import { Logger } from "@fern-api/logger"; + import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk"; import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import { ReadmeConfigBuilder } from "./readme/ReadmeConfigBuilder"; + import { SdkGeneratorContext } from "./SdkGeneratorContext"; +import { ReadmeConfigBuilder } from "./readme/ReadmeConfigBuilder"; export class CsharpGeneratorAgent extends AbstractGeneratorAgent { private readmeConfigBuilder: ReadmeConfigBuilder; diff --git a/generators/csharp/sdk/src/SdkGeneratorCli.ts b/generators/csharp/sdk/src/SdkGeneratorCli.ts index e2f7dba7761..e0b9f3c5144 100644 --- a/generators/csharp/sdk/src/SdkGeneratorCli.ts +++ b/generators/csharp/sdk/src/SdkGeneratorCli.ts @@ -1,14 +1,21 @@ +import { writeFile } from "fs/promises"; + +import { File, GeneratorNotificationService } from "@fern-api/base-generator"; import { AbstractCsharpGeneratorCli, TestFileGenerator, validateReadOnlyMemoryTypes } from "@fern-api/csharp-codegen"; import { - generateModels, generateTests as generateModelTests, - generateWellKnownProtobufFiles, - generateVersion + generateModels, + generateVersion, + generateWellKnownProtobufFiles } from "@fern-api/fern-csharp-model"; -import { File, GeneratorNotificationService } from "@fern-api/base-generator"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; +import * as FernGeneratorExecSerializers from "@fern-fern/generator-exec-sdk/serialization"; import { HttpService, IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; -import { writeFile } from "fs/promises"; + +import { SdkCustomConfigSchema } from "./SdkCustomConfig"; +import { SdkGeneratorContext } from "./SdkGeneratorContext"; import { SnippetJsonGenerator } from "./endpoint/snippets/SnippetJsonGenerator"; import { MultiUrlEnvironmentGenerator } from "./environment/MultiUrlEnvironmentGenerator"; import { SingleUrlEnvironmentGenerator } from "./environment/SingleUrlEnvironmentGenerator"; @@ -16,21 +23,17 @@ import { BaseApiExceptionGenerator } from "./error/BaseApiExceptionGenerator"; import { BaseExceptionGenerator } from "./error/BaseExceptionGenerator"; import { ErrorGenerator } from "./error/ErrorGenerator"; import { generateSdkTests } from "./generateSdkTests"; +import { OauthTokenProviderGenerator } from "./oauth/OauthTokenProviderGenerator"; import { BaseOptionsGenerator } from "./options/BaseOptionsGenerator"; import { ClientOptionsGenerator } from "./options/ClientOptionsGenerator"; +import { IdempotentRequestOptionsGenerator } from "./options/IdempotentRequestOptionsGenerator"; +import { IdempotentRequestOptionsInterfaceGenerator } from "./options/IdempotentRequestOptionsInterfaceGenerator"; import { RequestOptionsGenerator } from "./options/RequestOptionsGenerator"; +import { RequestOptionsInterfaceGenerator } from "./options/RequestOptionsInterfaceGenerator"; +import { buildReference } from "./reference/buildReference"; import { RootClientGenerator } from "./root-client/RootClientGenerator"; -import { SdkCustomConfigSchema } from "./SdkCustomConfig"; -import { SdkGeneratorContext } from "./SdkGeneratorContext"; import { SubPackageClientGenerator } from "./subpackage-client/SubPackageClientGenerator"; import { WrappedRequestGenerator } from "./wrapped-request/WrappedRequestGenerator"; -import * as FernGeneratorExecSerializers from "@fern-fern/generator-exec-sdk/serialization"; -import { RelativeFilePath } from "@fern-api/fs-utils"; -import { buildReference } from "./reference/buildReference"; -import { OauthTokenProviderGenerator } from "./oauth/OauthTokenProviderGenerator"; -import { IdempotentRequestOptionsGenerator } from "./options/IdempotentRequestOptionsGenerator"; -import { IdempotentRequestOptionsInterfaceGenerator } from "./options/IdempotentRequestOptionsInterfaceGenerator"; -import { RequestOptionsInterfaceGenerator } from "./options/RequestOptionsInterfaceGenerator"; export class SdkGeneratorCLI extends AbstractCsharpGeneratorCli { protected constructContext({ diff --git a/generators/csharp/sdk/src/SdkGeneratorContext.ts b/generators/csharp/sdk/src/SdkGeneratorContext.ts index 23b9cffd14d..87f6797f75f 100644 --- a/generators/csharp/sdk/src/SdkGeneratorContext.ts +++ b/generators/csharp/sdk/src/SdkGeneratorContext.ts @@ -1,6 +1,9 @@ +import { camelCase, upperFirst } from "lodash-es"; + +import { GeneratorNotificationService } from "@fern-api/base-generator"; import { AbstractCsharpGeneratorContext, AsIsFiles, csharp } from "@fern-api/csharp-codegen"; import { RelativeFilePath } from "@fern-api/fs-utils"; -import { GeneratorNotificationService } from "@fern-api/base-generator"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { DeclaredErrorName, @@ -19,24 +22,24 @@ import { SubpackageId, TypeId } from "@fern-fern/ir-sdk/api"; -import { camelCase, upperFirst } from "lodash-es"; -import { EndpointSnippetsGenerator } from "./endpoint/snippets/EndpointSnippetsGenerator"; + import { CsharpGeneratorAgent } from "./CsharpGeneratorAgent"; -import { ReadmeConfigBuilder } from "./readme/ReadmeConfigBuilder"; +import { SdkCustomConfigSchema } from "./SdkCustomConfig"; +import { EndpointGenerator } from "./endpoint/EndpointGenerator"; +import { EndpointSnippetsGenerator } from "./endpoint/snippets/EndpointSnippetsGenerator"; import { GrpcClientInfo } from "./grpc/GrpcClientInfo"; import { CLIENT_OPTIONS_CLASS_NAME } from "./options/ClientOptionsGenerator"; -import { REQUEST_OPTIONS_CLASS_NAME } from "./options/RequestOptionsGenerator"; import { IDEMPOTENT_REQUEST_OPTIONS_CLASS_NAME } from "./options/IdempotentRequestOptionsGenerator"; -import { SdkCustomConfigSchema } from "./SdkCustomConfig"; -import { EndpointGenerator } from "./endpoint/EndpointGenerator"; import { IDEMPOTENT_REQUEST_OPTIONS_INTERFACE_NAME, IDEMPOTENT_REQUEST_OPTIONS_PARAMETER_NAME } from "./options/IdempotentRequestOptionsInterfaceGenerator"; +import { REQUEST_OPTIONS_CLASS_NAME } from "./options/RequestOptionsGenerator"; import { REQUEST_OPTIONS_INTERFACE_NAME, REQUEST_OPTIONS_PARAMETER_NAME } from "./options/RequestOptionsInterfaceGenerator"; +import { ReadmeConfigBuilder } from "./readme/ReadmeConfigBuilder"; const TYPES_FOLDER_NAME = "Types"; const EXCEPTIONS_FOLDER_NAME = "Exceptions"; @@ -409,7 +412,7 @@ export class SdkGeneratorContext extends AbstractCsharpGeneratorContext }; diff --git a/generators/csharp/sdk/src/endpoint/EndpointGenerator.ts b/generators/csharp/sdk/src/endpoint/EndpointGenerator.ts index 9631084ef6e..af0cde0d9a7 100644 --- a/generators/csharp/sdk/src/endpoint/EndpointGenerator.ts +++ b/generators/csharp/sdk/src/endpoint/EndpointGenerator.ts @@ -1,7 +1,9 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { HttpEndpoint, ServiceId } from "@fern-fern/ir-sdk/api"; -import { GrpcClientInfo } from "../grpc/GrpcClientInfo"; + import { SdkGeneratorContext } from "../SdkGeneratorContext"; +import { GrpcClientInfo } from "../grpc/GrpcClientInfo"; import { AbstractEndpointGenerator } from "./AbstractEndpointGenerator"; import { GrpcEndpointGenerator } from "./grpc/GrpcEndpointGenerator"; import { HttpEndpointGenerator } from "./http/HttpEndpointGenerator"; diff --git a/generators/csharp/sdk/src/endpoint/EndpointSignatureInfo.ts b/generators/csharp/sdk/src/endpoint/EndpointSignatureInfo.ts index 024dd9a4568..7d43094b0f3 100644 --- a/generators/csharp/sdk/src/endpoint/EndpointSignatureInfo.ts +++ b/generators/csharp/sdk/src/endpoint/EndpointSignatureInfo.ts @@ -1,4 +1,5 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { EndpointRequest } from "./request/EndpointRequest"; export interface EndpointSignatureInfo { diff --git a/generators/csharp/sdk/src/endpoint/grpc/GrpcEndpointGenerator.ts b/generators/csharp/sdk/src/endpoint/grpc/GrpcEndpointGenerator.ts index bf1533e695f..ae00aeb0c55 100644 --- a/generators/csharp/sdk/src/endpoint/grpc/GrpcEndpointGenerator.ts +++ b/generators/csharp/sdk/src/endpoint/grpc/GrpcEndpointGenerator.ts @@ -1,7 +1,9 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { ExampleEndpointCall, HttpEndpoint, ServiceId } from "@fern-fern/ir-sdk/api"; -import { GrpcClientInfo } from "../../grpc/GrpcClientInfo"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; +import { GrpcClientInfo } from "../../grpc/GrpcClientInfo"; import { AbstractEndpointGenerator } from "../AbstractEndpointGenerator"; import { EndpointSignatureInfo } from "../EndpointSignatureInfo"; import { EndpointRequest } from "../request/EndpointRequest"; diff --git a/generators/csharp/sdk/src/endpoint/http/HttpEndpointGenerator.ts b/generators/csharp/sdk/src/endpoint/http/HttpEndpointGenerator.ts index 925a1bfaefe..a6d1a76c449 100644 --- a/generators/csharp/sdk/src/endpoint/http/HttpEndpointGenerator.ts +++ b/generators/csharp/sdk/src/endpoint/http/HttpEndpointGenerator.ts @@ -1,4 +1,6 @@ +import { assertNever } from "@fern-api/core-utils"; import { csharp } from "@fern-api/csharp-codegen"; + import { CursorPagination, ExampleEndpointCall, @@ -9,12 +11,12 @@ import { ResponseProperty, ServiceId } from "@fern-fern/ir-sdk/api"; -import { RawClient } from "./RawClient"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; -import { getEndpointReturnType } from "../utils/getEndpointReturnType"; import { AbstractEndpointGenerator } from "../AbstractEndpointGenerator"; import { SingleEndpointSnippet } from "../snippets/EndpointSnippetsGenerator"; -import { assertNever } from "@fern-api/core-utils"; +import { getEndpointReturnType } from "../utils/getEndpointReturnType"; +import { RawClient } from "./RawClient"; export declare namespace EndpointGenerator { export interface Args { diff --git a/generators/csharp/sdk/src/endpoint/http/RawClient.ts b/generators/csharp/sdk/src/endpoint/http/RawClient.ts index ddb3080ec3e..c941a3e790d 100644 --- a/generators/csharp/sdk/src/endpoint/http/RawClient.ts +++ b/generators/csharp/sdk/src/endpoint/http/RawClient.ts @@ -1,6 +1,8 @@ import { Arguments } from "@fern-api/base-generator"; import { csharp } from "@fern-api/csharp-codegen"; + import { HttpEndpoint, HttpMethod } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { getContentTypeFromRequestBody } from "../utils/getContentTypeFromRequestBody"; diff --git a/generators/csharp/sdk/src/endpoint/request/BytesOnlyEndpointRequest.ts b/generators/csharp/sdk/src/endpoint/request/BytesOnlyEndpointRequest.ts index 9ffc31e3f23..9640f1bd8a7 100644 --- a/generators/csharp/sdk/src/endpoint/request/BytesOnlyEndpointRequest.ts +++ b/generators/csharp/sdk/src/endpoint/request/BytesOnlyEndpointRequest.ts @@ -1,5 +1,7 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { HttpEndpoint, SdkRequest } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { RawClient } from "../http/RawClient"; import { diff --git a/generators/csharp/sdk/src/endpoint/request/EndpointRequest.ts b/generators/csharp/sdk/src/endpoint/request/EndpointRequest.ts index 3520a34a8e1..9cdb40b3d99 100644 --- a/generators/csharp/sdk/src/endpoint/request/EndpointRequest.ts +++ b/generators/csharp/sdk/src/endpoint/request/EndpointRequest.ts @@ -1,5 +1,7 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { HttpEndpoint, SdkRequest } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { RawClient } from "../http/RawClient"; diff --git a/generators/csharp/sdk/src/endpoint/request/EndpointRequestFactory.ts b/generators/csharp/sdk/src/endpoint/request/EndpointRequestFactory.ts index a859cff0093..ebc954063d0 100644 --- a/generators/csharp/sdk/src/endpoint/request/EndpointRequestFactory.ts +++ b/generators/csharp/sdk/src/endpoint/request/EndpointRequestFactory.ts @@ -1,4 +1,5 @@ import { HttpEndpoint, SdkRequest, ServiceId } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { BytesOnlyEndpointRequest } from "./BytesOnlyEndpointRequest"; import { EndpointRequest } from "./EndpointRequest"; diff --git a/generators/csharp/sdk/src/endpoint/request/ReferencedEndpointRequest.ts b/generators/csharp/sdk/src/endpoint/request/ReferencedEndpointRequest.ts index 82c918d2e27..f8cd7c580b5 100644 --- a/generators/csharp/sdk/src/endpoint/request/ReferencedEndpointRequest.ts +++ b/generators/csharp/sdk/src/endpoint/request/ReferencedEndpointRequest.ts @@ -1,5 +1,7 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { HttpEndpoint, SdkRequest, TypeReference } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { RawClient } from "../http/RawClient"; import { diff --git a/generators/csharp/sdk/src/endpoint/request/WrappedEndpointRequest.ts b/generators/csharp/sdk/src/endpoint/request/WrappedEndpointRequest.ts index 18298bd6bf1..dc0680e3650 100644 --- a/generators/csharp/sdk/src/endpoint/request/WrappedEndpointRequest.ts +++ b/generators/csharp/sdk/src/endpoint/request/WrappedEndpointRequest.ts @@ -1,4 +1,5 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { HttpEndpoint, HttpHeader, @@ -10,6 +11,7 @@ import { ServiceId, TypeReference } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { RawClient } from "../http/RawClient"; import { diff --git a/generators/csharp/sdk/src/endpoint/snippets/EndpointSnippetsGenerator.ts b/generators/csharp/sdk/src/endpoint/snippets/EndpointSnippetsGenerator.ts index 0295001a70b..1774fa15f84 100644 --- a/generators/csharp/sdk/src/endpoint/snippets/EndpointSnippetsGenerator.ts +++ b/generators/csharp/sdk/src/endpoint/snippets/EndpointSnippetsGenerator.ts @@ -1,4 +1,5 @@ import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { GrpcEndpointGenerator } from "../grpc/GrpcEndpointGenerator"; import { HttpEndpointGenerator } from "../http/HttpEndpointGenerator"; diff --git a/generators/csharp/sdk/src/endpoint/snippets/SnippetJsonGenerator.ts b/generators/csharp/sdk/src/endpoint/snippets/SnippetJsonGenerator.ts index 4bffa42f182..e884349d474 100644 --- a/generators/csharp/sdk/src/endpoint/snippets/SnippetJsonGenerator.ts +++ b/generators/csharp/sdk/src/endpoint/snippets/SnippetJsonGenerator.ts @@ -1,8 +1,10 @@ +import urlJoin from "url-join"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { Endpoint } from "@fern-fern/generator-exec-sdk/api"; import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; -import urlJoin from "url-join"; import { RootClientGenerator } from "../../root-client/RootClientGenerator"; import { SingleEndpointSnippet } from "./EndpointSnippetsGenerator"; diff --git a/generators/csharp/sdk/src/endpoint/utils/getEndpointRequest.ts b/generators/csharp/sdk/src/endpoint/utils/getEndpointRequest.ts index be1d18cb408..fcba72d9f44 100644 --- a/generators/csharp/sdk/src/endpoint/utils/getEndpointRequest.ts +++ b/generators/csharp/sdk/src/endpoint/utils/getEndpointRequest.ts @@ -1,4 +1,5 @@ import { HttpEndpoint, ServiceId } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { EndpointRequest } from "../request/EndpointRequest"; import { createEndpointRequest } from "../request/EndpointRequestFactory"; diff --git a/generators/csharp/sdk/src/endpoint/utils/getEndpointReturnType.ts b/generators/csharp/sdk/src/endpoint/utils/getEndpointReturnType.ts index b768d3ecfd6..e53e50ac93c 100644 --- a/generators/csharp/sdk/src/endpoint/utils/getEndpointReturnType.ts +++ b/generators/csharp/sdk/src/endpoint/utils/getEndpointReturnType.ts @@ -1,5 +1,7 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; export function getEndpointReturnType({ diff --git a/generators/csharp/sdk/src/environment/MultiUrlEnvironmentGenerator.ts b/generators/csharp/sdk/src/environment/MultiUrlEnvironmentGenerator.ts index a813dd4bbd9..288d8513b2a 100644 --- a/generators/csharp/sdk/src/environment/MultiUrlEnvironmentGenerator.ts +++ b/generators/csharp/sdk/src/environment/MultiUrlEnvironmentGenerator.ts @@ -1,6 +1,8 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { MultipleBaseUrlsEnvironments } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; @@ -35,7 +37,7 @@ export class MultiUrlEnvironmentGenerator extends FileGenerator< csharp.field({ access: csharp.Access.Public, name: - this.context.customConfig["pascal-case-environments"] ?? true + (this.context.customConfig["pascal-case-environments"] ?? true) ? environment.name.pascalCase.safeName : environment.name.screamingSnakeCase.safeName, static_: true, diff --git a/generators/csharp/sdk/src/environment/SingleUrlEnvironmentGenerator.ts b/generators/csharp/sdk/src/environment/SingleUrlEnvironmentGenerator.ts index d1f9ae1d10d..04e59ece789 100644 --- a/generators/csharp/sdk/src/environment/SingleUrlEnvironmentGenerator.ts +++ b/generators/csharp/sdk/src/environment/SingleUrlEnvironmentGenerator.ts @@ -1,6 +1,8 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { SingleBaseUrlEnvironments } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; @@ -35,7 +37,7 @@ export class SingleUrlEnvironmentGenerator extends FileGenerator< csharp.field({ access: csharp.Access.Public, name: - this.context.customConfig["pascal-case-environments"] ?? true + (this.context.customConfig["pascal-case-environments"] ?? true) ? environment.name.pascalCase.safeName : environment.name.screamingSnakeCase.safeName, static_: true, diff --git a/generators/csharp/sdk/src/error/BaseApiExceptionGenerator.ts b/generators/csharp/sdk/src/error/BaseApiExceptionGenerator.ts index 712ada53e75..edf2bcd80ab 100644 --- a/generators/csharp/sdk/src/error/BaseApiExceptionGenerator.ts +++ b/generators/csharp/sdk/src/error/BaseApiExceptionGenerator.ts @@ -1,5 +1,6 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; diff --git a/generators/csharp/sdk/src/error/BaseExceptionGenerator.ts b/generators/csharp/sdk/src/error/BaseExceptionGenerator.ts index cfe0beedefb..112f36ff187 100644 --- a/generators/csharp/sdk/src/error/BaseExceptionGenerator.ts +++ b/generators/csharp/sdk/src/error/BaseExceptionGenerator.ts @@ -1,5 +1,6 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; diff --git a/generators/csharp/sdk/src/error/ErrorGenerator.ts b/generators/csharp/sdk/src/error/ErrorGenerator.ts index 7a491845297..39a4a16913a 100644 --- a/generators/csharp/sdk/src/error/ErrorGenerator.ts +++ b/generators/csharp/sdk/src/error/ErrorGenerator.ts @@ -1,13 +1,18 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; export class ErrorGenerator extends FileGenerator { readonly classReference; - constructor(context: SdkGeneratorContext, readonly errorDeclaration: ErrorDeclaration) { + constructor( + context: SdkGeneratorContext, + readonly errorDeclaration: ErrorDeclaration + ) { super(context); this.classReference = this.context.getExceptionClassReference(this.errorDeclaration.name); } diff --git a/generators/csharp/sdk/src/generateSdkTests.ts b/generators/csharp/sdk/src/generateSdkTests.ts index 55d04226f55..83df931b3b6 100644 --- a/generators/csharp/sdk/src/generateSdkTests.ts +++ b/generators/csharp/sdk/src/generateSdkTests.ts @@ -1,5 +1,7 @@ import { CSharpFile } from "@fern-api/csharp-codegen"; + import { ExampleEndpointCall, HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "./SdkGeneratorContext"; import { BaseMockServerTestGenerator } from "./test-generation/mock-server/BaseMockServerTestGenerator"; import { MockServerTestGenerator } from "./test-generation/mock-server/MockServerTestGenerator"; diff --git a/generators/csharp/sdk/src/grpc/GrpcClientInfo.ts b/generators/csharp/sdk/src/grpc/GrpcClientInfo.ts index 409289a177a..ab431ecae30 100644 --- a/generators/csharp/sdk/src/grpc/GrpcClientInfo.ts +++ b/generators/csharp/sdk/src/grpc/GrpcClientInfo.ts @@ -1,4 +1,5 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { ProtobufService } from "@fern-fern/ir-sdk/api"; /** diff --git a/generators/csharp/sdk/src/oauth/OauthTokenProviderGenerator.ts b/generators/csharp/sdk/src/oauth/OauthTokenProviderGenerator.ts index 508d71dd3a3..a527db68618 100644 --- a/generators/csharp/sdk/src/oauth/OauthTokenProviderGenerator.ts +++ b/generators/csharp/sdk/src/oauth/OauthTokenProviderGenerator.ts @@ -1,17 +1,19 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { EndpointId, EndpointReference, ExampleRequestBody, - http, HttpEndpoint, HttpService, Name, OAuthScheme, ObjectProperty, - ResponseProperty + ResponseProperty, + http } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; diff --git a/generators/csharp/sdk/src/options/BaseOptionsGenerator.ts b/generators/csharp/sdk/src/options/BaseOptionsGenerator.ts index 8bef6e16877..130a00bd082 100644 --- a/generators/csharp/sdk/src/options/BaseOptionsGenerator.ts +++ b/generators/csharp/sdk/src/options/BaseOptionsGenerator.ts @@ -1,4 +1,5 @@ import { csharp } from "@fern-api/csharp-codegen"; + import { SdkGeneratorContext } from "../SdkGeneratorContext"; export const BASE_URL_FIELD_NAME = "BaseUrl"; diff --git a/generators/csharp/sdk/src/options/ClientOptionsGenerator.ts b/generators/csharp/sdk/src/options/ClientOptionsGenerator.ts index befa8472e65..37fb0f07a78 100644 --- a/generators/csharp/sdk/src/options/ClientOptionsGenerator.ts +++ b/generators/csharp/sdk/src/options/ClientOptionsGenerator.ts @@ -1,9 +1,11 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { Name } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; -import { BaseOptionsGenerator, BASE_URL_FIELD_NAME, BASE_URL_SUMMARY, OptionArgs } from "./BaseOptionsGenerator"; +import { BASE_URL_FIELD_NAME, BASE_URL_SUMMARY, BaseOptionsGenerator, OptionArgs } from "./BaseOptionsGenerator"; export const CLIENT_OPTIONS_CLASS_NAME = "ClientOptions"; export const GLOBAL_TEST_SETUP_NAME = "GlobalTestSetup"; @@ -80,7 +82,7 @@ export class ClientOptionsGenerator extends FileGenerator { private readonly rootClientGenerator: RootClientGenerator; diff --git a/generators/csharp/sdk/src/test-generation/mock-server/MockServerTestGenerator.ts b/generators/csharp/sdk/src/test-generation/mock-server/MockServerTestGenerator.ts index 45e30a2c3c5..b5f7e59afae 100644 --- a/generators/csharp/sdk/src/test-generation/mock-server/MockServerTestGenerator.ts +++ b/generators/csharp/sdk/src/test-generation/mock-server/MockServerTestGenerator.ts @@ -1,8 +1,10 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ExampleEndpointCall, ExampleTypeReference, HttpEndpoint, ServiceId } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../../SdkCustomConfig"; -import { SdkGeneratorContext, MOCK_SERVER_TEST_FOLDER } from "../../SdkGeneratorContext"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { MOCK_SERVER_TEST_FOLDER, SdkGeneratorContext } from "../../SdkGeneratorContext"; import { HttpEndpointGenerator } from "../../endpoint/http/HttpEndpointGenerator"; import { getContentTypeFromRequestBody } from "../../endpoint/utils/getContentTypeFromRequestBody"; diff --git a/generators/csharp/sdk/src/wrapped-request/WrappedRequestGenerator.ts b/generators/csharp/sdk/src/wrapped-request/WrappedRequestGenerator.ts index 492c96140bf..7ac39a88564 100644 --- a/generators/csharp/sdk/src/wrapped-request/WrappedRequestGenerator.ts +++ b/generators/csharp/sdk/src/wrapped-request/WrappedRequestGenerator.ts @@ -1,6 +1,7 @@ -import { csharp, CSharpFile, FileGenerator } from "@fern-api/csharp-codegen"; +import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen"; import { ExampleGenerator, getUndiscriminatedUnionSerializerAnnotation } from "@fern-api/fern-csharp-model"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ContainerType, ExampleEndpointCall, @@ -10,6 +11,7 @@ import { ServiceId, TypeReference } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; diff --git a/generators/go-v2/ast/package.json b/generators/go-v2/ast/package.json index 1b4d1bff18c..f6c4424f7a2 100644 --- a/generators/go-v2/ast/package.json +++ b/generators/go-v2/ast/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/jest": "^29.5.14", "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.1.8", "zod": "^3.22.3" diff --git a/generators/go-v2/ast/src/ast/CodeBlock.ts b/generators/go-v2/ast/src/ast/CodeBlock.ts index 4f36f8efffe..9adbf3be1e9 100644 --- a/generators/go-v2/ast/src/ast/CodeBlock.ts +++ b/generators/go-v2/ast/src/ast/CodeBlock.ts @@ -1,4 +1,5 @@ import { CodeBlock as CommonCodeBlock } from "@fern-api/browser-compatible-base-generator"; + import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; diff --git a/generators/go-v2/ast/src/ast/Field.ts b/generators/go-v2/ast/src/ast/Field.ts index 2e988f4c0be..1307c433186 100644 --- a/generators/go-v2/ast/src/ast/Field.ts +++ b/generators/go-v2/ast/src/ast/Field.ts @@ -1,7 +1,7 @@ +import { Comment } from "./Comment"; +import { Type } from "./Type"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Type } from "./Type"; -import { Comment } from "./Comment"; export declare namespace Field { export interface Args { diff --git a/generators/go-v2/ast/src/ast/Func.ts b/generators/go-v2/ast/src/ast/Func.ts index 994ecd97f51..aa328a55ed0 100644 --- a/generators/go-v2/ast/src/ast/Func.ts +++ b/generators/go-v2/ast/src/ast/Func.ts @@ -1,9 +1,9 @@ import { CodeBlock } from "./CodeBlock"; -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; import { Method } from "./Method"; import { Parameter } from "./Parameter"; import { Type } from "./Type"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; export declare namespace Func { type Args = Omit; diff --git a/generators/go-v2/ast/src/ast/FuncInvocation.ts b/generators/go-v2/ast/src/ast/FuncInvocation.ts index 87d2643855b..7aea423dbd0 100644 --- a/generators/go-v2/ast/src/ast/FuncInvocation.ts +++ b/generators/go-v2/ast/src/ast/FuncInvocation.ts @@ -1,5 +1,5 @@ -import { AstNode } from "./core/AstNode"; import { GoTypeReference } from "./GoTypeReference"; +import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; import { writeArguments } from "./utils/writeArguments"; diff --git a/generators/go-v2/ast/src/ast/Method.ts b/generators/go-v2/ast/src/ast/Method.ts index 9ecce680bef..95b3ddaa1cf 100644 --- a/generators/go-v2/ast/src/ast/Method.ts +++ b/generators/go-v2/ast/src/ast/Method.ts @@ -1,10 +1,10 @@ -import { GoTypeReference } from "./GoTypeReference"; -import { Comment } from "./Comment"; import { CodeBlock } from "./CodeBlock"; -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; +import { Comment } from "./Comment"; +import { GoTypeReference } from "./GoTypeReference"; import { Parameter } from "./Parameter"; import { Type } from "./Type"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; export declare namespace Method { interface Args { diff --git a/generators/go-v2/ast/src/ast/Parameter.ts b/generators/go-v2/ast/src/ast/Parameter.ts index 84d48d30991..59260a3eb21 100644 --- a/generators/go-v2/ast/src/ast/Parameter.ts +++ b/generators/go-v2/ast/src/ast/Parameter.ts @@ -1,7 +1,7 @@ +import { Comment } from "./Comment"; +import { Type } from "./Type"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Type } from "./Type"; -import { Comment } from "./Comment"; export declare namespace Parameter { interface Args { diff --git a/generators/go-v2/ast/src/ast/Struct.ts b/generators/go-v2/ast/src/ast/Struct.ts index 6140c7c54a1..5d10d57dd6a 100644 --- a/generators/go-v2/ast/src/ast/Struct.ts +++ b/generators/go-v2/ast/src/ast/Struct.ts @@ -1,8 +1,8 @@ -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; +import { Comment } from "./Comment"; import { Field } from "./Field"; import { Method } from "./Method"; -import { Comment } from "./Comment"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; export declare namespace Struct { interface Args { diff --git a/generators/go-v2/ast/src/ast/Type.ts b/generators/go-v2/ast/src/ast/Type.ts index 2b156b1cae7..b720a1532d3 100644 --- a/generators/go-v2/ast/src/ast/Type.ts +++ b/generators/go-v2/ast/src/ast/Type.ts @@ -1,7 +1,8 @@ import { assertNever } from "@fern-api/core-utils"; + +import { GoTypeReference } from "./GoTypeReference"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { GoTypeReference } from "./GoTypeReference"; type InternalType = | Any_ diff --git a/generators/go-v2/ast/src/ast/TypeInstantiation.ts b/generators/go-v2/ast/src/ast/TypeInstantiation.ts index 571802202b1..163105b958e 100644 --- a/generators/go-v2/ast/src/ast/TypeInstantiation.ts +++ b/generators/go-v2/ast/src/ast/TypeInstantiation.ts @@ -1,11 +1,12 @@ import { assertNever } from "@fern-api/core-utils"; + import { CodeBlock } from "./CodeBlock"; -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; import { FuncInvocation } from "./FuncInvocation"; import { GoTypeReference } from "./GoTypeReference"; import { MethodInvocation } from "./MethodInvocation"; import { Type } from "./Type"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; type InternalTypeInstantiation = | Any_ diff --git a/generators/go-v2/ast/src/ast/__test__/Snippets.test.ts b/generators/go-v2/ast/src/ast/__test__/Snippets.test.ts index b3dc14d0909..ec41539b733 100644 --- a/generators/go-v2/ast/src/ast/__test__/Snippets.test.ts +++ b/generators/go-v2/ast/src/ast/__test__/Snippets.test.ts @@ -1,8 +1,8 @@ +import { GoTypeReference } from "../GoTypeReference"; +import { Type } from "../Type"; import { TypeInstantiation } from "../TypeInstantiation"; -import { GoFile } from "../core/GoFile"; import { AstNode } from "../core/AstNode"; -import { Type } from "../Type"; -import { GoTypeReference } from "../GoTypeReference"; +import { GoFile } from "../core/GoFile"; interface TestCase { description: string; diff --git a/generators/go-v2/ast/src/ast/core/AstNode.ts b/generators/go-v2/ast/src/ast/core/AstNode.ts index 8168319fa26..31f1c7e6576 100644 --- a/generators/go-v2/ast/src/ast/core/AstNode.ts +++ b/generators/go-v2/ast/src/ast/core/AstNode.ts @@ -1,4 +1,5 @@ import { AbstractAstNode, AbstractFormatter } from "@fern-api/browser-compatible-base-generator"; + import { BaseGoCustomConfigSchema } from "../../custom-config/BaseGoCustomConfigSchema"; import { GoFile } from "./GoFile"; diff --git a/generators/go-v2/ast/src/ast/core/Writer.ts b/generators/go-v2/ast/src/ast/core/Writer.ts index ae572bb06cf..27a666edf77 100644 --- a/generators/go-v2/ast/src/ast/core/Writer.ts +++ b/generators/go-v2/ast/src/ast/core/Writer.ts @@ -1,7 +1,8 @@ import { AbstractFormatter, AbstractWriter, NopFormatter } from "@fern-api/browser-compatible-base-generator"; -import { BaseGoCustomConfigSchema } from "../../custom-config/BaseGoCustomConfigSchema"; import { basename } from "@fern-api/path-utils"; +import { BaseGoCustomConfigSchema } from "../../custom-config/BaseGoCustomConfigSchema"; + type Alias = string; type ImportPath = string; diff --git a/generators/go-v2/ast/src/ast/utils/writeArguments.ts b/generators/go-v2/ast/src/ast/utils/writeArguments.ts index 83fdaf38d18..ab1061779f4 100644 --- a/generators/go-v2/ast/src/ast/utils/writeArguments.ts +++ b/generators/go-v2/ast/src/ast/utils/writeArguments.ts @@ -1,6 +1,7 @@ import { Argument, Arguments, isNamedArgument } from "@fern-api/browser-compatible-base-generator"; -import { Writer } from "../core/Writer"; + import { TypeInstantiation } from "../TypeInstantiation"; +import { Writer } from "../core/Writer"; export function writeArguments({ writer, arguments_ }: { writer: Writer; arguments_: Arguments }): void { const filteredArguments = filterNopArguments(arguments_); diff --git a/generators/go-v2/ast/src/context/AbstractGoGeneratorContext.ts b/generators/go-v2/ast/src/context/AbstractGoGeneratorContext.ts index 260a8b1319d..3ff864ac8c5 100644 --- a/generators/go-v2/ast/src/context/AbstractGoGeneratorContext.ts +++ b/generators/go-v2/ast/src/context/AbstractGoGeneratorContext.ts @@ -3,24 +3,26 @@ import { FernGeneratorExec, GeneratorNotificationService } from "@fern-api/browser-compatible-base-generator"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { + FernFilepath, IntermediateRepresentation, Literal, Name, - TypeReference, - TypeId, - TypeDeclaration, + PrimitiveTypeV1, Subpackage, SubpackageId, - FernFilepath, - PrimitiveTypeV1 + TypeDeclaration, + TypeId, + TypeReference } from "@fern-fern/ir-sdk/api"; -import { BaseGoCustomConfigSchema } from "../custom-config/BaseGoCustomConfigSchema"; -import { GoTypeMapper } from "./GoTypeMapper"; -import { RelativeFilePath } from "@fern-api/path-utils"; + import { go } from ".."; import { TimeTypeReference, UuidTypeReference } from "../ast/Type"; +import { BaseGoCustomConfigSchema } from "../custom-config/BaseGoCustomConfigSchema"; import { resolveRootImportPath } from "../custom-config/resolveRootImportPath"; +import { GoTypeMapper } from "./GoTypeMapper"; export interface FileLocation { importPath: string; diff --git a/generators/go-v2/ast/src/context/GoTypeMapper.ts b/generators/go-v2/ast/src/context/GoTypeMapper.ts index 194d3f13083..3fa4335cc31 100644 --- a/generators/go-v2/ast/src/context/GoTypeMapper.ts +++ b/generators/go-v2/ast/src/context/GoTypeMapper.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { ContainerType, DeclaredTypeName, @@ -9,6 +10,7 @@ import { TypeId, TypeReference } from "@fern-fern/ir-sdk/api"; + import { go } from "../"; import { GoTypeReference, Type } from "../ast"; import { BaseGoCustomConfigSchema } from "../custom-config/BaseGoCustomConfigSchema"; diff --git a/generators/go-v2/ast/src/custom-config/BaseGoCustomConfigSchema.ts b/generators/go-v2/ast/src/custom-config/BaseGoCustomConfigSchema.ts index 9f0379fa900..a27b7088550 100644 --- a/generators/go-v2/ast/src/custom-config/BaseGoCustomConfigSchema.ts +++ b/generators/go-v2/ast/src/custom-config/BaseGoCustomConfigSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { ModuleConfigSchema } from "./ModuleConfigSchema"; export const BaseGoCustomConfigSchema = z.object({ diff --git a/generators/go-v2/ast/src/custom-config/resolveRootImportPath.ts b/generators/go-v2/ast/src/custom-config/resolveRootImportPath.ts index 2e7ee7d6662..576dbad6f1a 100644 --- a/generators/go-v2/ast/src/custom-config/resolveRootImportPath.ts +++ b/generators/go-v2/ast/src/custom-config/resolveRootImportPath.ts @@ -1,5 +1,6 @@ import { FernGeneratorExec } from "@fern-api/browser-compatible-base-generator"; import { basename } from "@fern-api/path-utils"; + import { BaseGoCustomConfigSchema } from "./BaseGoCustomConfigSchema"; const DEFAULT_MODULE_PATH = "sdk"; diff --git a/generators/go-v2/base/package.json b/generators/go-v2/base/package.json index b601e479336..5d096fea9b9 100644 --- a/generators/go-v2/base/package.json +++ b/generators/go-v2/base/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", "dist:cli": "pnpm compile && tsup ./src/cli.ts --format cjs", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -38,8 +37,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.0.2", "typescript": "5.7.2", "vitest": "^2.0.5" diff --git a/generators/go-v2/base/src/FileGenerator.ts b/generators/go-v2/base/src/FileGenerator.ts index 762d9b6723e..4afb288085c 100644 --- a/generators/go-v2/base/src/FileGenerator.ts +++ b/generators/go-v2/base/src/FileGenerator.ts @@ -1,6 +1,6 @@ +import { File } from "@fern-api/base-generator"; import { RelativeFilePath } from "@fern-api/fs-utils"; import { AbstractGoGeneratorContext, BaseGoCustomConfigSchema } from "@fern-api/go-ast"; -import { File } from "@fern-api/base-generator"; export abstract class FileGenerator< GeneratedFile extends File, diff --git a/generators/go-v2/dynamic-snippets/package.json b/generators/go-v2/dynamic-snippets/package.json index 2039b9e3b41..7ec7dcf5b5d 100644 --- a/generators/go-v2/dynamic-snippets/package.json +++ b/generators/go-v2/dynamic-snippets/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", "dist": "pnpm compile && node build.cjs" }, @@ -39,8 +38,8 @@ "@types/jest": "^29.5.14", "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", "string.prototype.replaceall": "^1.0.10", "tsup": "^8.3.5", "typescript": "5.7.2", diff --git a/generators/go-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts b/generators/go-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts index 9631058c324..98fb578391d 100644 --- a/generators/go-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts +++ b/generators/go-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts @@ -4,9 +4,10 @@ import { FernGeneratorExec, Result } from "@fern-api/browser-compatible-base-generator"; -import { DynamicSnippetsGeneratorContext } from "./context/DynamicSnippetsGeneratorContext"; import { FernIr } from "@fern-api/dynamic-ir-sdk"; + import { EndpointSnippetGenerator } from "./EndpointSnippetGenerator"; +import { DynamicSnippetsGeneratorContext } from "./context/DynamicSnippetsGeneratorContext"; export class DynamicSnippetsGenerator extends AbstractDynamicSnippetsGenerator< DynamicSnippetsGeneratorContext, diff --git a/generators/go-v2/dynamic-snippets/src/EndpointSnippetGenerator.ts b/generators/go-v2/dynamic-snippets/src/EndpointSnippetGenerator.ts index 410af60309a..da7aa6c9e5d 100644 --- a/generators/go-v2/dynamic-snippets/src/EndpointSnippetGenerator.ts +++ b/generators/go-v2/dynamic-snippets/src/EndpointSnippetGenerator.ts @@ -1,8 +1,9 @@ +import { AbstractFormatter, Scope, Severity } from "@fern-api/browser-compatible-base-generator"; +import { FernIr } from "@fern-api/dynamic-ir-sdk"; import { go } from "@fern-api/go-ast"; + import { DynamicSnippetsGeneratorContext } from "./context/DynamicSnippetsGeneratorContext"; -import { FernIr } from "@fern-api/dynamic-ir-sdk"; import { FilePropertyInfo } from "./context/FilePropertyMapper"; -import { AbstractFormatter, Scope, Severity } from "@fern-api/browser-compatible-base-generator"; const SNIPPET_PACKAGE_NAME = "example"; const SNIPPET_IMPORT_PATH = "fern"; diff --git a/generators/go-v2/dynamic-snippets/src/__test__/examples.test.ts b/generators/go-v2/dynamic-snippets/src/__test__/examples.test.ts index 2306bd0c1c5..b69a0744440 100644 --- a/generators/go-v2/dynamic-snippets/src/__test__/examples.test.ts +++ b/generators/go-v2/dynamic-snippets/src/__test__/examples.test.ts @@ -1,8 +1,9 @@ -import { buildDynamicSnippetsGenerator } from "./utils/buildDynamicSnippetsGenerator"; -import { DYNAMIC_IR_TEST_DEFINITIONS_DIRECTORY } from "./utils/constant"; -import { buildGeneratorConfig } from "./utils/buildGeneratorConfig"; import { AbsoluteFilePath } from "@fern-api/path-utils"; + import { TestCase } from "./utils/TestCase"; +import { buildDynamicSnippetsGenerator } from "./utils/buildDynamicSnippetsGenerator"; +import { buildGeneratorConfig } from "./utils/buildGeneratorConfig"; +import { DYNAMIC_IR_TEST_DEFINITIONS_DIRECTORY } from "./utils/constant"; describe("examples", () => { const testCases: TestCase[] = [ diff --git a/generators/go-v2/dynamic-snippets/src/__test__/exhaustive.test.ts b/generators/go-v2/dynamic-snippets/src/__test__/exhaustive.test.ts index 3fc59c6e570..efe0511d0aa 100644 --- a/generators/go-v2/dynamic-snippets/src/__test__/exhaustive.test.ts +++ b/generators/go-v2/dynamic-snippets/src/__test__/exhaustive.test.ts @@ -1,8 +1,9 @@ -import { buildDynamicSnippetsGenerator } from "./utils/buildDynamicSnippetsGenerator"; import { AbsoluteFilePath } from "@fern-api/path-utils"; -import { DYNAMIC_IR_TEST_DEFINITIONS_DIRECTORY } from "./utils/constant"; -import { buildGeneratorConfig } from "./utils/buildGeneratorConfig"; + import { TestCase } from "./utils/TestCase"; +import { buildDynamicSnippetsGenerator } from "./utils/buildDynamicSnippetsGenerator"; +import { buildGeneratorConfig } from "./utils/buildGeneratorConfig"; +import { DYNAMIC_IR_TEST_DEFINITIONS_DIRECTORY } from "./utils/constant"; describe("exhaustive", () => { const testCases: TestCase[] = [ diff --git a/generators/go-v2/dynamic-snippets/src/__test__/file-upload.test.ts b/generators/go-v2/dynamic-snippets/src/__test__/file-upload.test.ts index fe75078fa91..f874ea64ad3 100644 --- a/generators/go-v2/dynamic-snippets/src/__test__/file-upload.test.ts +++ b/generators/go-v2/dynamic-snippets/src/__test__/file-upload.test.ts @@ -1,8 +1,9 @@ +import { AbsoluteFilePath } from "@fern-api/path-utils"; + +import { TestCase } from "./utils/TestCase"; import { buildDynamicSnippetsGenerator } from "./utils/buildDynamicSnippetsGenerator"; -import { DYNAMIC_IR_TEST_DEFINITIONS_DIRECTORY } from "./utils/constant"; import { buildGeneratorConfig } from "./utils/buildGeneratorConfig"; -import { TestCase } from "./utils/TestCase"; -import { AbsoluteFilePath } from "@fern-api/path-utils"; +import { DYNAMIC_IR_TEST_DEFINITIONS_DIRECTORY } from "./utils/constant"; describe("file-upload (success)", () => { const testCases: TestCase[] = [ diff --git a/generators/go-v2/dynamic-snippets/src/__test__/imdb.test.ts b/generators/go-v2/dynamic-snippets/src/__test__/imdb.test.ts index 138f1054799..81f7dc90736 100644 --- a/generators/go-v2/dynamic-snippets/src/__test__/imdb.test.ts +++ b/generators/go-v2/dynamic-snippets/src/__test__/imdb.test.ts @@ -1,8 +1,9 @@ +import { AbsoluteFilePath } from "@fern-api/path-utils"; + +import { TestCase } from "./utils/TestCase"; import { buildDynamicSnippetsGenerator } from "./utils/buildDynamicSnippetsGenerator"; -import { DYNAMIC_IR_TEST_DEFINITIONS_DIRECTORY } from "./utils/constant"; import { buildGeneratorConfig } from "./utils/buildGeneratorConfig"; -import { TestCase } from "./utils/TestCase"; -import { AbsoluteFilePath } from "@fern-api/path-utils"; +import { DYNAMIC_IR_TEST_DEFINITIONS_DIRECTORY } from "./utils/constant"; describe("imdb (success)", () => { const testCases: TestCase[] = [ diff --git a/generators/go-v2/dynamic-snippets/src/__test__/single-url-environment-default.test.ts b/generators/go-v2/dynamic-snippets/src/__test__/single-url-environment-default.test.ts index 55643bd9798..cd6f27546fe 100644 --- a/generators/go-v2/dynamic-snippets/src/__test__/single-url-environment-default.test.ts +++ b/generators/go-v2/dynamic-snippets/src/__test__/single-url-environment-default.test.ts @@ -1,7 +1,8 @@ +import { AbsoluteFilePath } from "@fern-api/path-utils"; + import { buildDynamicSnippetsGenerator } from "./utils/buildDynamicSnippetsGenerator"; -import { DYNAMIC_IR_TEST_DEFINITIONS_DIRECTORY } from "./utils/constant"; import { buildGeneratorConfig } from "./utils/buildGeneratorConfig"; -import { AbsoluteFilePath } from "@fern-api/path-utils"; +import { DYNAMIC_IR_TEST_DEFINITIONS_DIRECTORY } from "./utils/constant"; describe("single-url-environment-default", () => { it("production environment", async () => { diff --git a/generators/go-v2/dynamic-snippets/src/__test__/utils/buildDynamicSnippetsGenerator.ts b/generators/go-v2/dynamic-snippets/src/__test__/utils/buildDynamicSnippetsGenerator.ts index 6d4646db7ce..57eec8067c3 100644 --- a/generators/go-v2/dynamic-snippets/src/__test__/utils/buildDynamicSnippetsGenerator.ts +++ b/generators/go-v2/dynamic-snippets/src/__test__/utils/buildDynamicSnippetsGenerator.ts @@ -1,8 +1,10 @@ -import { AbsoluteFilePath } from "@fern-api/path-utils"; -import { DynamicSnippetsGenerator } from "../../DynamicSnippetsGenerator"; -import { FernGeneratorExec } from "@fern-api/browser-compatible-base-generator"; import { readFileSync } from "fs"; + +import { FernGeneratorExec } from "@fern-api/browser-compatible-base-generator"; import { GoFormatter } from "@fern-api/go-formatter"; +import { AbsoluteFilePath } from "@fern-api/path-utils"; + +import { DynamicSnippetsGenerator } from "../../DynamicSnippetsGenerator"; export function buildDynamicSnippetsGenerator({ irFilepath, diff --git a/generators/go-v2/dynamic-snippets/src/context/DynamicSnippetsGeneratorContext.ts b/generators/go-v2/dynamic-snippets/src/context/DynamicSnippetsGeneratorContext.ts index ceb4fecb100..faf89b215fb 100644 --- a/generators/go-v2/dynamic-snippets/src/context/DynamicSnippetsGeneratorContext.ts +++ b/generators/go-v2/dynamic-snippets/src/context/DynamicSnippetsGeneratorContext.ts @@ -1,13 +1,14 @@ -import { assertNever } from "@fern-api/core-utils"; import { AbstractDynamicSnippetsGeneratorContext, FernGeneratorExec } from "@fern-api/browser-compatible-base-generator"; -import { BaseGoCustomConfigSchema, resolveRootImportPath } from "@fern-api/go-ast"; +import { assertNever } from "@fern-api/core-utils"; import { FernIr } from "@fern-api/dynamic-ir-sdk"; -import { DynamicTypeMapper } from "./DynamicTypeMapper"; -import { DynamicTypeInstantiationMapper } from "./DynamicTypeInstantiationMapper"; +import { BaseGoCustomConfigSchema, resolveRootImportPath } from "@fern-api/go-ast"; import { go } from "@fern-api/go-ast"; + +import { DynamicTypeInstantiationMapper } from "./DynamicTypeInstantiationMapper"; +import { DynamicTypeMapper } from "./DynamicTypeMapper"; import { FilePropertyMapper } from "./FilePropertyMapper"; export class DynamicSnippetsGeneratorContext extends AbstractDynamicSnippetsGeneratorContext { diff --git a/generators/go-v2/dynamic-snippets/src/context/DynamicTypeInstantiationMapper.ts b/generators/go-v2/dynamic-snippets/src/context/DynamicTypeInstantiationMapper.ts index 88ffb224180..8516a7b0758 100644 --- a/generators/go-v2/dynamic-snippets/src/context/DynamicTypeInstantiationMapper.ts +++ b/generators/go-v2/dynamic-snippets/src/context/DynamicTypeInstantiationMapper.ts @@ -1,8 +1,9 @@ -import { go } from "@fern-api/go-ast"; -import { DynamicSnippetsGeneratorContext } from "./DynamicSnippetsGeneratorContext"; -import { FernIr } from "@fern-api/dynamic-ir-sdk"; import { DiscriminatedUnionTypeInstance, Severity } from "@fern-api/browser-compatible-base-generator"; import { assertNever } from "@fern-api/core-utils"; +import { FernIr } from "@fern-api/dynamic-ir-sdk"; +import { go } from "@fern-api/go-ast"; + +import { DynamicSnippetsGeneratorContext } from "./DynamicSnippetsGeneratorContext"; export declare namespace DynamicTypeInstantiationMapper { interface Args { diff --git a/generators/go-v2/dynamic-snippets/src/context/DynamicTypeMapper.ts b/generators/go-v2/dynamic-snippets/src/context/DynamicTypeMapper.ts index 838bedc64a1..6788f94e926 100644 --- a/generators/go-v2/dynamic-snippets/src/context/DynamicTypeMapper.ts +++ b/generators/go-v2/dynamic-snippets/src/context/DynamicTypeMapper.ts @@ -1,7 +1,8 @@ import { assertNever } from "@fern-api/core-utils"; +import { FernIr } from "@fern-api/dynamic-ir-sdk"; import { go } from "@fern-api/go-ast"; + import { DynamicSnippetsGeneratorContext } from "./DynamicSnippetsGeneratorContext"; -import { FernIr } from "@fern-api/dynamic-ir-sdk"; export declare namespace DynamicTypeMapper { interface Args { diff --git a/generators/go-v2/dynamic-snippets/src/context/FilePropertyMapper.ts b/generators/go-v2/dynamic-snippets/src/context/FilePropertyMapper.ts index 18e99f84f66..22ed11e79e0 100644 --- a/generators/go-v2/dynamic-snippets/src/context/FilePropertyMapper.ts +++ b/generators/go-v2/dynamic-snippets/src/context/FilePropertyMapper.ts @@ -1,8 +1,9 @@ +import { Severity } from "@fern-api/browser-compatible-base-generator"; +import { assertNever } from "@fern-api/core-utils"; +import { FernIr } from "@fern-api/dynamic-ir-sdk"; import { go } from "@fern-api/go-ast"; + import { DynamicSnippetsGeneratorContext } from "./DynamicSnippetsGeneratorContext"; -import { FernIr } from "@fern-api/dynamic-ir-sdk"; -import { assertNever } from "@fern-api/core-utils"; -import { Severity } from "@fern-api/browser-compatible-base-generator"; export interface FilePropertyInfo { fileFields: go.StructField[]; diff --git a/generators/go-v2/formatter/package.json b/generators/go-v2/formatter/package.json index b97721ad5c5..cafdce8300b 100644 --- a/generators/go-v2/formatter/package.json +++ b/generators/go-v2/formatter/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": { @@ -36,8 +35,8 @@ "@types/node": "^18.7.18", "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" } diff --git a/generators/go-v2/formatter/src/GoFormatter.ts b/generators/go-v2/formatter/src/GoFormatter.ts index c0e4616cd48..72b1a44b89e 100644 --- a/generators/go-v2/formatter/src/GoFormatter.ts +++ b/generators/go-v2/formatter/src/GoFormatter.ts @@ -1,6 +1,7 @@ -import { AbstractFormatter } from "@fern-api/base-generator"; import init, { format } from "@wasm-fmt/gofmt"; +import { AbstractFormatter } from "@fern-api/base-generator"; + export class GoFormatter extends AbstractFormatter { public async format(content: string): Promise { await init(); diff --git a/generators/go-v2/model/package.json b/generators/go-v2/model/package.json index dfa01321ab3..8516498094f 100644 --- a/generators/go-v2/model/package.json +++ b/generators/go-v2/model/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", "dist:cli": "pnpm compile && tsup ./src/cli.ts --format cjs", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -35,8 +34,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.0.2", "typescript": "5.7.2", "vitest": "^2.0.5" diff --git a/generators/go-v2/sdk/package.json b/generators/go-v2/sdk/package.json index 3f473abcea1..c97250139b4 100644 --- a/generators/go-v2/sdk/package.json +++ b/generators/go-v2/sdk/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", "dist:cli": "pnpm compile && tsup ./src/cli.ts --format cjs", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -35,8 +34,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.0.2", "typescript": "5.7.2", "vitest": "^2.0.5" diff --git a/generators/openapi/package.json b/generators/openapi/package.json index 82e7118205e..8d991e22447 100644 --- a/generators/openapi/package.json +++ b/generators/openapi/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", "dist:cli": "pnpm compile && tsup ./src/cli.ts --format cjs", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -48,8 +47,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.3.5", "typescript": "5.7.2", "vitest": "^2.0.5" diff --git a/generators/openapi/src/convertToOpenApi.ts b/generators/openapi/src/convertToOpenApi.ts index 9e8923d4ce4..f22bc7e0047 100644 --- a/generators/openapi/src/convertToOpenApi.ts +++ b/generators/openapi/src/convertToOpenApi.ts @@ -1,3 +1,5 @@ +import { OpenAPIV3 } from "openapi-types"; + import { DeclaredErrorName, DeclaredTypeName, @@ -5,7 +7,7 @@ import { IntermediateRepresentation, TypeDeclaration } from "@fern-fern/ir-sdk/api"; -import { OpenAPIV3 } from "openapi-types"; + import { convertServices } from "./converters/servicesConverter"; import { convertType } from "./converters/typeConverter"; import { constructEndpointSecurity, constructSecuritySchemes } from "./security"; diff --git a/generators/openapi/src/converters/convertObject.ts b/generators/openapi/src/converters/convertObject.ts index 64c0afa107e..d85f72165e7 100644 --- a/generators/openapi/src/converters/convertObject.ts +++ b/generators/openapi/src/converters/convertObject.ts @@ -1,3 +1,5 @@ +import { OpenAPIV3 } from "openapi-types"; + import { DeclaredTypeName, ExampleInlinedRequestBodyProperty, @@ -5,8 +7,8 @@ import { NameAndWireValue, TypeReference } from "@fern-fern/ir-sdk/api"; -import { OpenAPIV3 } from "openapi-types"; -import { convertTypeReference, getReferenceFromDeclaredTypeName, OpenApiComponentSchema } from "./typeConverter"; + +import { OpenApiComponentSchema, convertTypeReference, getReferenceFromDeclaredTypeName } from "./typeConverter"; export interface ObjectProperty { docs: string | undefined; diff --git a/generators/openapi/src/converters/servicesConverter.ts b/generators/openapi/src/converters/servicesConverter.ts index 9fd5ad44c50..4dc08fa0987 100644 --- a/generators/openapi/src/converters/servicesConverter.ts +++ b/generators/openapi/src/converters/servicesConverter.ts @@ -1,3 +1,9 @@ +import { isEqual, size } from "lodash-es"; +import { OpenAPIV3 } from "openapi-types"; +import urlJoin from "url-join"; + +import { isNonNullish } from "@fern-api/core-utils"; + import { ContainerType, EnvironmentsConfig, @@ -23,14 +29,11 @@ import { TypeDeclaration, TypeReference } from "@fern-fern/ir-sdk/api"; -import { isEqual, size } from "lodash-es"; -import { OpenAPIV3 } from "openapi-types"; -import urlJoin from "url-join"; -import { isNonNullish } from "@fern-api/core-utils"; + import { getDeclaredTypeNameKey, getErrorTypeNameKey } from "../convertToOpenApi"; import { Mode } from "../writeOpenApi"; import { convertObject } from "./convertObject"; -import { convertTypeReference, OpenApiComponentSchema } from "./typeConverter"; +import { OpenApiComponentSchema, convertTypeReference } from "./typeConverter"; export function convertServices({ ir, @@ -151,8 +154,8 @@ function convertHttpEndpoint({ const tag = mode === "stoplight" - ? httpService.displayName ?? - httpService.name.fernFilepath.allParts.map((name) => name.originalName).join(" ") + ? (httpService.displayName ?? + httpService.name.fernFilepath.allParts.map((name) => name.originalName).join(" ")) : httpService.name.fernFilepath.allParts.map((name) => name.pascalCase.unsafeName).join(""); const operationObject: OpenAPIV3.OperationObject = { description: httpEndpoint.docs ?? undefined, diff --git a/generators/openapi/src/converters/typeConverter.ts b/generators/openapi/src/converters/typeConverter.ts index 88487df724c..88a37ad983d 100644 --- a/generators/openapi/src/converters/typeConverter.ts +++ b/generators/openapi/src/converters/typeConverter.ts @@ -1,3 +1,6 @@ +import isEqual from "lodash-es/isEqual"; +import { OpenAPIV3 } from "openapi-types"; + import { AliasTypeDeclaration, ContainerType, @@ -18,8 +21,7 @@ import { UndiscriminatedUnionTypeDeclaration, UnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; -import isEqual from "lodash-es/isEqual"; -import { OpenAPIV3 } from "openapi-types"; + import { convertObject } from "./convertObject"; export interface ConvertedType { diff --git a/generators/openapi/src/security.ts b/generators/openapi/src/security.ts index ab72c0f8ab4..9871efc182c 100644 --- a/generators/openapi/src/security.ts +++ b/generators/openapi/src/security.ts @@ -1,6 +1,7 @@ -import { ApiAuth, AuthScheme, AuthSchemesRequirement } from "@fern-fern/ir-sdk/api"; import { OpenAPIV3 } from "openapi-types"; +import { ApiAuth, AuthScheme, AuthSchemesRequirement } from "@fern-fern/ir-sdk/api"; + export function constructEndpointSecurity(apiAuth: ApiAuth): OpenAPIV3.SecurityRequirementObject[] { return AuthSchemesRequirement._visit(apiAuth.requirement, { all: () => { diff --git a/generators/openapi/src/writeOpenApi.ts b/generators/openapi/src/writeOpenApi.ts index c16d686d677..6ca06166ff7 100644 --- a/generators/openapi/src/writeOpenApi.ts +++ b/generators/openapi/src/writeOpenApi.ts @@ -1,19 +1,22 @@ -import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; -import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; import { writeFile } from "fs/promises"; import yaml from "js-yaml"; import path from "path"; -import { convertToOpenApi } from "./convertToOpenApi"; -import { getCustomConfig } from "./customConfig"; + import { + ExitStatusUpdate, GeneratorNotificationService, GeneratorUpdate, - ExitStatusUpdate, parseGeneratorConfig, parseIR } from "@fern-api/base-generator"; -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { mergeWithOverrides } from "@fern-api/core-utils"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + +import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; +import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; + +import { convertToOpenApi } from "./convertToOpenApi"; +import { getCustomConfig } from "./customConfig"; export type Mode = "stoplight" | "openapi"; diff --git a/generators/php/codegen/package.json b/generators/php/codegen/package.json index 7911f232026..b6f4474f0e0 100644 --- a/generators/php/codegen/package.json +++ b/generators/php/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": { @@ -46,8 +45,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" } diff --git a/generators/php/codegen/src/FileGenerator.ts b/generators/php/codegen/src/FileGenerator.ts index 476e86c8239..29c984be575 100644 --- a/generators/php/codegen/src/FileGenerator.ts +++ b/generators/php/codegen/src/FileGenerator.ts @@ -1,7 +1,8 @@ +import { File } from "@fern-api/base-generator"; import { RelativeFilePath } from "@fern-api/fs-utils"; + import { AbstractPhpGeneratorContext } from "./context/AbstractPhpGeneratorContext"; import { BasePhpCustomConfigSchema } from "./custom-config/BasePhpCustomConfigSchema"; -import { File } from "@fern-api/base-generator"; export abstract class FileGenerator< GeneratedFile extends File, diff --git a/generators/php/codegen/src/ast/Attribute.ts b/generators/php/codegen/src/ast/Attribute.ts index 5b5d1b45d5a..ead86ae944f 100644 --- a/generators/php/codegen/src/ast/Attribute.ts +++ b/generators/php/codegen/src/ast/Attribute.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 Attribute { diff --git a/generators/php/codegen/src/ast/Class.ts b/generators/php/codegen/src/ast/Class.ts index 0daf64b3cba..6371fd3142d 100644 --- a/generators/php/codegen/src/ast/Class.ts +++ b/generators/php/codegen/src/ast/Class.ts @@ -1,14 +1,14 @@ -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; -import { CodeBlock } from "./CodeBlock"; -import { Parameter } from "./Parameter"; import { Access } from "./Access"; +import { ClassReference } from "./ClassReference"; +import { CodeBlock } from "./CodeBlock"; +import { Comment } from "./Comment"; import { Field } from "./Field"; import { Method } from "./Method"; -import { Comment } from "./Comment"; -import { orderByAccess } from "./utils/orderByAccess"; -import { ClassReference } from "./ClassReference"; +import { Parameter } from "./Parameter"; import { Trait } from "./Trait"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; +import { orderByAccess } from "./utils/orderByAccess"; export declare namespace Class { interface Args { diff --git a/generators/php/codegen/src/ast/ClassInstantiation.ts b/generators/php/codegen/src/ast/ClassInstantiation.ts index 22126ee9af3..df7e92f4ab2 100644 --- a/generators/php/codegen/src/ast/ClassInstantiation.ts +++ b/generators/php/codegen/src/ast/ClassInstantiation.ts @@ -1,4 +1,5 @@ import { Arguments } from "@fern-api/base-generator"; + import { ClassReference } from "./ClassReference"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; diff --git a/generators/php/codegen/src/ast/CodeBlock.ts b/generators/php/codegen/src/ast/CodeBlock.ts index 17ffd153f0c..d277733b1c6 100644 --- a/generators/php/codegen/src/ast/CodeBlock.ts +++ b/generators/php/codegen/src/ast/CodeBlock.ts @@ -1,4 +1,5 @@ import { CodeBlock as CommonCodeBlock } from "@fern-api/base-generator"; + import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; diff --git a/generators/php/codegen/src/ast/Comment.ts b/generators/php/codegen/src/ast/Comment.ts index 0803ef8e164..e5388302b50 100644 --- a/generators/php/codegen/src/ast/Comment.ts +++ b/generators/php/codegen/src/ast/Comment.ts @@ -1,6 +1,6 @@ +import { Type } from "./Type"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Type } from "./Type"; import { convertToPhpVariableName } from "./utils/convertToPhpVariableName"; export type TagType = "param" | "return" | "throws" | "var"; diff --git a/generators/php/codegen/src/ast/DataClass.ts b/generators/php/codegen/src/ast/DataClass.ts index f2e4b3a6f8c..ecf11cdccf8 100644 --- a/generators/php/codegen/src/ast/DataClass.ts +++ b/generators/php/codegen/src/ast/DataClass.ts @@ -1,16 +1,16 @@ -import { AstNode } from "./core/AstNode"; +import { php } from ".."; +import { ClassReference } from "../php"; import { Class } from "./Class"; -import { Writer } from "./core/Writer"; import { CodeBlock } from "./CodeBlock"; -import { Parameter } from "./Parameter"; import { Field } from "./Field"; import { Method } from "./Method"; +import { Parameter } from "./Parameter"; +import { Trait } from "./Trait"; import { Type } from "./Type"; -import { orderByAccess } from "./utils/orderByAccess"; -import { php } from ".."; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; import { convertFromPhpVariableName } from "./utils/convertFromPhpVariableName"; -import { Trait } from "./Trait"; -import { ClassReference } from "../php"; +import { orderByAccess } from "./utils/orderByAccess"; const CONSTRUCTOR_PARAMETER_NAME = "values"; @@ -47,7 +47,7 @@ export class DataClass extends AstNode { ({ ...field, name: convertFromPhpVariableName(field.name) - } as Field) + }) as Field ); if (orderedFields.length > 0) { this.class_.addConstructor({ diff --git a/generators/php/codegen/src/ast/Enum.ts b/generators/php/codegen/src/ast/Enum.ts index 6dfb665efa1..46b7bc0b6d8 100644 --- a/generators/php/codegen/src/ast/Enum.ts +++ b/generators/php/codegen/src/ast/Enum.ts @@ -1,10 +1,10 @@ import { ClassReference } from "./ClassReference"; import { CodeBlock } from "./CodeBlock"; import { Comment } from "./Comment"; -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; import { Method } from "./Method"; import { Type } from "./Type"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; export declare namespace Enum { interface Args { diff --git a/generators/php/codegen/src/ast/Field.ts b/generators/php/codegen/src/ast/Field.ts index fd836a7f359..970331ffe24 100644 --- a/generators/php/codegen/src/ast/Field.ts +++ b/generators/php/codegen/src/ast/Field.ts @@ -1,10 +1,10 @@ import { Access } from "./Access"; +import { Attribute } from "./Attribute"; import { CodeBlock } from "./CodeBlock"; +import { Comment } from "./Comment"; +import { Type } from "./Type"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Type } from "./Type"; -import { Comment } from "./Comment"; -import { Attribute } from "./Attribute"; import { convertToPhpVariableName } from "./utils/convertToPhpVariableName"; export declare namespace Field { diff --git a/generators/php/codegen/src/ast/Method.ts b/generators/php/codegen/src/ast/Method.ts index b641c288e79..a54c8a6c597 100644 --- a/generators/php/codegen/src/ast/Method.ts +++ b/generators/php/codegen/src/ast/Method.ts @@ -1,11 +1,11 @@ import { Access } from "./Access"; import { ClassReference } from "./ClassReference"; -import { Comment } from "./Comment"; import { CodeBlock } from "./CodeBlock"; -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; +import { Comment } from "./Comment"; import { Parameter } from "./Parameter"; import { Type } from "./Type"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; export declare namespace Method { interface Args { diff --git a/generators/php/codegen/src/ast/MethodInvocation.ts b/generators/php/codegen/src/ast/MethodInvocation.ts index 3e922b786ad..5301ef3fd55 100644 --- a/generators/php/codegen/src/ast/MethodInvocation.ts +++ b/generators/php/codegen/src/ast/MethodInvocation.ts @@ -1,5 +1,6 @@ -import { AstNode } from "./core/AstNode"; import { Arguments } from "@fern-api/base-generator"; + +import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; import { writeArguments } from "./utils/writeArguments"; diff --git a/generators/php/codegen/src/ast/Parameter.ts b/generators/php/codegen/src/ast/Parameter.ts index 1eee74f5d33..163bad117e3 100644 --- a/generators/php/codegen/src/ast/Parameter.ts +++ b/generators/php/codegen/src/ast/Parameter.ts @@ -1,9 +1,9 @@ -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; -import { Type } from "./Type"; import { Access } from "./Access"; import { CodeBlock } from "./CodeBlock"; import { Comment } from "./Comment"; +import { Type } from "./Type"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; import { convertToPhpVariableName } from "./utils/convertToPhpVariableName"; export declare namespace Parameter { diff --git a/generators/php/codegen/src/ast/Trait.ts b/generators/php/codegen/src/ast/Trait.ts index a3a10a2264b..44962d297c5 100644 --- a/generators/php/codegen/src/ast/Trait.ts +++ b/generators/php/codegen/src/ast/Trait.ts @@ -1,10 +1,10 @@ -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; +import { ClassReference } from "./ClassReference"; +import { Comment } from "./Comment"; import { Field } from "./Field"; import { Method } from "./Method"; -import { Comment } from "./Comment"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; import { orderByAccess } from "./utils/orderByAccess"; -import { ClassReference } from "./ClassReference"; export declare namespace Trait { interface Args { diff --git a/generators/php/codegen/src/ast/Type.ts b/generators/php/codegen/src/ast/Type.ts index e0783e2a849..b924d5f46a9 100644 --- a/generators/php/codegen/src/ast/Type.ts +++ b/generators/php/codegen/src/ast/Type.ts @@ -1,8 +1,9 @@ import { assertNever } from "@fern-api/core-utils"; + +import { ClassReference } from "./ClassReference"; import { AstNode } from "./core/AstNode"; import { GLOBAL_NAMESPACE } from "./core/Constant"; import { Writer } from "./core/Writer"; -import { ClassReference } from "./ClassReference"; type InternalType = | Int diff --git a/generators/php/codegen/src/ast/core/AstNode.ts b/generators/php/codegen/src/ast/core/AstNode.ts index 6db5e4b343a..f4158d0e158 100644 --- a/generators/php/codegen/src/ast/core/AstNode.ts +++ b/generators/php/codegen/src/ast/core/AstNode.ts @@ -1,4 +1,5 @@ import { AbstractAstNode } from "@fern-api/base-generator"; + import { BasePhpCustomConfigSchema } from "../../custom-config/BasePhpCustomConfigSchema"; import { Writer } from "./Writer"; diff --git a/generators/php/codegen/src/ast/core/Writer.ts b/generators/php/codegen/src/ast/core/Writer.ts index 9b2adfe4d8e..644d5c5c307 100644 --- a/generators/php/codegen/src/ast/core/Writer.ts +++ b/generators/php/codegen/src/ast/core/Writer.ts @@ -1,4 +1,5 @@ import { AbstractWriter } from "@fern-api/base-generator"; + import { BasePhpCustomConfigSchema } from "../../custom-config/BasePhpCustomConfigSchema"; import { ClassReference } from "../ClassReference"; import { GLOBAL_NAMESPACE } from "./Constant"; diff --git a/generators/php/codegen/src/ast/utils/writeArguments.ts b/generators/php/codegen/src/ast/utils/writeArguments.ts index d404a41cec4..09a41b9ee2f 100644 --- a/generators/php/codegen/src/ast/utils/writeArguments.ts +++ b/generators/php/codegen/src/ast/utils/writeArguments.ts @@ -1,4 +1,5 @@ import { Argument, Arguments, isNamedArgument } from "@fern-api/base-generator"; + import { Writer } from "../core/Writer"; export function writeArguments({ diff --git a/generators/php/codegen/src/cli/AbstractPhpGeneratorCli.ts b/generators/php/codegen/src/cli/AbstractPhpGeneratorCli.ts index a3fbe15eeb6..e7691b8e6bf 100644 --- a/generators/php/codegen/src/cli/AbstractPhpGeneratorCli.ts +++ b/generators/php/codegen/src/cli/AbstractPhpGeneratorCli.ts @@ -1,8 +1,11 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { readFile } from "fs/promises"; + import { AbstractGeneratorCli, parseIR } from "@fern-api/base-generator"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; -import { readFile } from "fs/promises"; + import { AbstractPhpGeneratorContext } from "../context/AbstractPhpGeneratorContext"; import { BasePhpCustomConfigSchema } from "../custom-config/BasePhpCustomConfigSchema"; diff --git a/generators/php/codegen/src/context/AbstractPhpGeneratorContext.ts b/generators/php/codegen/src/context/AbstractPhpGeneratorContext.ts index 37484cb6975..fbe443ace7b 100644 --- a/generators/php/codegen/src/context/AbstractPhpGeneratorContext.ts +++ b/generators/php/codegen/src/context/AbstractPhpGeneratorContext.ts @@ -1,33 +1,36 @@ +import { camelCase, upperFirst } from "lodash-es"; + import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService } from "@fern-api/base-generator"; +import { assertNever } from "@fern-api/core-utils"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { + ContainerType, + FernFilepath, IntermediateRepresentation, Literal, + MapType, Name, - TypeReference, - TypeId, - TypeDeclaration, - Subpackage, - SubpackageId, - FernFilepath, - PrimitiveTypeV1, - ObjectTypeDeclaration, - ContainerType, NamedType, + ObjectTypeDeclaration, PrimitiveType, - MapType + PrimitiveTypeV1, + Subpackage, + SubpackageId, + TypeDeclaration, + TypeId, + TypeReference } from "@fern-fern/ir-sdk/api"; -import { BasePhpCustomConfigSchema } from "../custom-config/BasePhpCustomConfigSchema"; -import { PhpProject } from "../project"; -import { camelCase, upperFirst } from "lodash-es"; -import { PhpTypeMapper } from "./PhpTypeMapper"; -import { PhpAttributeMapper } from "./PhpAttributeMapper"; -import { AsIsFiles } from "../AsIs"; -import { RelativeFilePath } from "@fern-api/fs-utils"; + import { php } from ".."; +import { AsIsFiles } from "../AsIs"; +import { Type } from "../ast"; import { GLOBAL_NAMESPACE } from "../ast/core/Constant"; import { TRAITS_DIRECTORY } from "../constants"; -import { Type } from "../ast"; -import { assertNever } from "@fern-api/core-utils"; +import { BasePhpCustomConfigSchema } from "../custom-config/BasePhpCustomConfigSchema"; +import { PhpProject } from "../project"; +import { PhpAttributeMapper } from "./PhpAttributeMapper"; +import { PhpTypeMapper } from "./PhpTypeMapper"; export interface FileLocation { namespace: string; diff --git a/generators/php/codegen/src/context/PhpAttributeMapper.ts b/generators/php/codegen/src/context/PhpAttributeMapper.ts index e2ff7d2b83a..a83ef05330b 100644 --- a/generators/php/codegen/src/context/PhpAttributeMapper.ts +++ b/generators/php/codegen/src/context/PhpAttributeMapper.ts @@ -1,7 +1,10 @@ -import { assertNever } from "@fern-api/core-utils"; +import { isEqual, uniq, uniqWith } from "lodash-es"; + import { Arguments, UnnamedArgument } from "@fern-api/base-generator"; +import { assertNever } from "@fern-api/core-utils"; + import { ObjectProperty } from "@fern-fern/ir-sdk/api"; -import { isEqual, uniq, uniqWith } from "lodash-es"; + import { php } from ".."; import { ClassInstantiation } from "../ast"; import { BasePhpCustomConfigSchema } from "../custom-config/BasePhpCustomConfigSchema"; diff --git a/generators/php/codegen/src/context/PhpTypeMapper.ts b/generators/php/codegen/src/context/PhpTypeMapper.ts index ba5d9b4780e..788bfc2f344 100644 --- a/generators/php/codegen/src/context/PhpTypeMapper.ts +++ b/generators/php/codegen/src/context/PhpTypeMapper.ts @@ -1,4 +1,7 @@ +import { isEqual, uniqWith } from "lodash-es"; + import { assertNever } from "@fern-api/core-utils"; + import { ContainerType, DeclaredTypeName, @@ -9,7 +12,7 @@ import { TypeId, TypeReference } from "@fern-fern/ir-sdk/api"; -import { isEqual, uniqWith } from "lodash-es"; + import { php } from "../"; import { ClassReference, Type } from "../ast"; import { BasePhpCustomConfigSchema } from "../custom-config/BasePhpCustomConfigSchema"; diff --git a/generators/php/codegen/src/php.ts b/generators/php/codegen/src/php.ts index 2ae639450e2..d6b0ea806f1 100644 --- a/generators/php/codegen/src/php.ts +++ b/generators/php/codegen/src/php.ts @@ -1,9 +1,9 @@ import { Ternary } from "@fern-api/base-generator"; + import { Array as Array_, Attribute, Class, - Trait, ClassInstantiation, ClassReference, CodeBlock, @@ -12,7 +12,8 @@ import { Map, Method, MethodInvocation, - Parameter + Parameter, + Trait } from "./ast"; import { DataClass } from "./ast/DataClass"; diff --git a/generators/php/codegen/src/project/PhpFile.ts b/generators/php/codegen/src/project/PhpFile.ts index cf5b8ff57bb..3224fc6dbfe 100644 --- a/generators/php/codegen/src/project/PhpFile.ts +++ b/generators/php/codegen/src/project/PhpFile.ts @@ -1,11 +1,14 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; -import { FernFilepath } from "@fern-fern/ir-sdk/api"; import path from "path"; -import { BasePhpCustomConfigSchema } from "../custom-config/BasePhpCustomConfigSchema"; + import { File } from "@fern-api/base-generator"; -import { Class } from "../ast/Class"; +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + +import { FernFilepath } from "@fern-fern/ir-sdk/api"; + import { Enum, Trait } from "../ast"; +import { Class } from "../ast/Class"; import { DataClass } from "../ast/DataClass"; +import { BasePhpCustomConfigSchema } from "../custom-config/BasePhpCustomConfigSchema"; export type Namespace = string; diff --git a/generators/php/codegen/src/project/PhpProject.ts b/generators/php/codegen/src/project/PhpProject.ts index 6bf632bca3f..914ab9f3c17 100644 --- a/generators/php/codegen/src/project/PhpProject.ts +++ b/generators/php/codegen/src/project/PhpProject.ts @@ -1,9 +1,11 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { AbstractProject, File } from "@fern-api/base-generator"; -import { loggingExeca } from "@fern-api/logging-execa"; import { mkdir, readFile, writeFile } from "fs/promises"; import { template } from "lodash-es"; import path from "path"; + +import { AbstractProject, File } from "@fern-api/base-generator"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { loggingExeca } from "@fern-api/logging-execa"; + import { AsIsFiles } from "../AsIs"; import { AbstractPhpGeneratorContext } from "../context/AbstractPhpGeneratorContext"; import { BasePhpCustomConfigSchema } from "../custom-config/BasePhpCustomConfigSchema"; diff --git a/generators/php/model/package.json b/generators/php/model/package.json index 9009961f018..332c9465c7c 100644 --- a/generators/php/model/package.json +++ b/generators/php/model/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", "dist:cli": "pnpm compile && tsup ./src/cli.ts && cp -R ../codegen/src/asIs dist", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -40,8 +39,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.3.5", "typescript": "5.7.2", "vitest": "^2.1.8", diff --git a/generators/php/model/src/ModelGeneratorCli.ts b/generators/php/model/src/ModelGeneratorCli.ts index 58f87a49e9d..1a6c39d8272 100644 --- a/generators/php/model/src/ModelGeneratorCli.ts +++ b/generators/php/model/src/ModelGeneratorCli.ts @@ -1,6 +1,8 @@ import { GeneratorConfig, GeneratorNotificationService } from "@fern-api/base-generator"; import { AbstractPhpGeneratorCli } from "@fern-api/php-codegen"; + import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "./ModelCustomConfig"; import { ModelGeneratorContext } from "./ModelGeneratorContext"; import { generateModels } from "./generateModels"; diff --git a/generators/php/model/src/ModelGeneratorContext.ts b/generators/php/model/src/ModelGeneratorContext.ts index 7d24177337b..d74c3611262 100644 --- a/generators/php/model/src/ModelGeneratorContext.ts +++ b/generators/php/model/src/ModelGeneratorContext.ts @@ -1,5 +1,6 @@ import { RelativeFilePath } from "@fern-api/fs-utils"; import { AbstractPhpGeneratorContext, AsIsFiles, FileLocation } from "@fern-api/php-codegen"; + import { ModelCustomConfigSchema } from "./ModelCustomConfig"; export class ModelGeneratorContext extends AbstractPhpGeneratorContext { diff --git a/generators/php/model/src/enum/EnumGenerator.ts b/generators/php/model/src/enum/EnumGenerator.ts index 5d986b2ba9f..bd9748ab302 100644 --- a/generators/php/model/src/enum/EnumGenerator.ts +++ b/generators/php/model/src/enum/EnumGenerator.ts @@ -1,6 +1,8 @@ import { RelativeFilePath } from "@fern-api/fs-utils"; -import { FileGenerator, php, PhpFile } from "@fern-api/php-codegen"; +import { FileGenerator, PhpFile, php } from "@fern-api/php-codegen"; + import { EnumTypeDeclaration, TypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "../ModelCustomConfig"; import { ModelGeneratorContext } from "../ModelGeneratorContext"; diff --git a/generators/php/model/src/generateModels.ts b/generators/php/model/src/generateModels.ts index c3d7066d3e8..4e08cbf9552 100644 --- a/generators/php/model/src/generateModels.ts +++ b/generators/php/model/src/generateModels.ts @@ -1,7 +1,9 @@ import { PhpFile } from "@fern-api/php-codegen"; + import { EnumTypeDeclaration } from "@fern-fern/ir-sdk/api"; -import { EnumGenerator } from "./enum/EnumGenerator"; + import { ModelGeneratorContext } from "./ModelGeneratorContext"; +import { EnumGenerator } from "./enum/EnumGenerator"; import { ObjectGenerator } from "./object/ObjectGenerator"; export function generateModels(context: ModelGeneratorContext): void { diff --git a/generators/php/model/src/object/ObjectGenerator.ts b/generators/php/model/src/object/ObjectGenerator.ts index 33cabfa8c45..36532cb3bd8 100644 --- a/generators/php/model/src/object/ObjectGenerator.ts +++ b/generators/php/model/src/object/ObjectGenerator.ts @@ -1,8 +1,10 @@ -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; import { PhpFile } from "@fern-api/php-codegen"; import { FileGenerator } from "@fern-api/php-codegen"; import { php } from "@fern-api/php-codegen"; + import { ObjectProperty, ObjectTypeDeclaration, TypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "../ModelCustomConfig"; import { ModelGeneratorContext } from "../ModelGeneratorContext"; diff --git a/generators/php/model/src/trait/TraitGenerator.ts b/generators/php/model/src/trait/TraitGenerator.ts index e06ab5e80db..dec2403d479 100644 --- a/generators/php/model/src/trait/TraitGenerator.ts +++ b/generators/php/model/src/trait/TraitGenerator.ts @@ -1,8 +1,10 @@ -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; import { PhpFile } from "@fern-api/php-codegen"; import { FileGenerator } from "@fern-api/php-codegen"; import { php } from "@fern-api/php-codegen"; + import { ObjectTypeDeclaration, TypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { ModelCustomConfigSchema } from "../ModelCustomConfig"; import { ModelGeneratorContext } from "../ModelGeneratorContext"; diff --git a/generators/php/sdk/package.json b/generators/php/sdk/package.json index 2799277c59a..52990f2f5e5 100644 --- a/generators/php/sdk/package.json +++ b/generators/php/sdk/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", "dist:cli": "pnpm compile && tsup ./src/cli.ts && cp -R ../codegen/src/asIs dist", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -45,8 +44,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.3.5", "typescript": "5.7.2", "vitest": "^2.1.8", diff --git a/generators/php/sdk/src/SdkGeneratorCli.ts b/generators/php/sdk/src/SdkGeneratorCli.ts index da1fa3ea184..550ef8ac68c 100644 --- a/generators/php/sdk/src/SdkGeneratorCli.ts +++ b/generators/php/sdk/src/SdkGeneratorCli.ts @@ -1,16 +1,18 @@ -import { AbstractPhpGeneratorCli } from "@fern-api/php-codegen"; import { GeneratorNotificationService } from "@fern-api/base-generator"; +import { AbstractPhpGeneratorCli } from "@fern-api/php-codegen"; +import { generateModels, generateTraits } from "@fern-api/php-model"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { HttpService, IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "./SdkCustomConfig"; import { SdkGeneratorContext } from "./SdkGeneratorContext"; -import { generateModels, generateTraits } from "@fern-api/php-model"; -import { RootClientGenerator } from "./root-client/RootClientGenerator"; -import { SubPackageClientGenerator } from "./subpackage-client/SubPackageClientGenerator"; import { WrappedEndpointRequestGenerator } from "./endpoint/request/WrappedEndpointRequestGenerator"; import { EnvironmentGenerator } from "./environment/EnvironmentGenerator"; -import { BaseExceptionGenerator } from "./error/BaseExceptionGenerator"; import { BaseApiExceptionGenerator } from "./error/BaseApiExceptionGenerator"; +import { BaseExceptionGenerator } from "./error/BaseExceptionGenerator"; +import { RootClientGenerator } from "./root-client/RootClientGenerator"; +import { SubPackageClientGenerator } from "./subpackage-client/SubPackageClientGenerator"; export class SdkGeneratorCLI extends AbstractPhpGeneratorCli { protected constructContext({ diff --git a/generators/php/sdk/src/SdkGeneratorContext.ts b/generators/php/sdk/src/SdkGeneratorContext.ts index 5cfe26fa8c0..d43214b5331 100644 --- a/generators/php/sdk/src/SdkGeneratorContext.ts +++ b/generators/php/sdk/src/SdkGeneratorContext.ts @@ -1,25 +1,28 @@ +import { camelCase, upperFirst } from "lodash-es"; + +import { GeneratorNotificationService } from "@fern-api/base-generator"; +import { AbstractPhpGeneratorContext, FileLocation } from "@fern-api/php-codegen"; +import { AsIsFiles, php } from "@fern-api/php-codegen"; + +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { - Name, HttpEndpoint, + HttpMethod, HttpService, + Name, ServiceId, Subpackage, SubpackageId, - TypeId, - HttpMethod + TypeId } from "@fern-fern/ir-sdk/api"; -import { AbstractPhpGeneratorContext, FileLocation } from "@fern-api/php-codegen"; -import { GeneratorNotificationService } from "@fern-api/base-generator"; -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; +import { ErrorDeclaration, ErrorId } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "./SdkCustomConfig"; -import { AsIsFiles, php } from "@fern-api/php-codegen"; -import { camelCase, upperFirst } from "lodash-es"; +import { EXCEPTIONS_DIRECTORY, REQUESTS_DIRECTORY, RESERVED_METHOD_NAMES, TYPES_DIRECTORY } from "./constants"; import { RawClient } from "./core/RawClient"; -import { GuzzleClient } from "./external/GuzzleClient"; -import { ErrorId, ErrorDeclaration } from "@fern-fern/ir-sdk/api"; -import { EXCEPTIONS_DIRECTORY, TYPES_DIRECTORY, REQUESTS_DIRECTORY, RESERVED_METHOD_NAMES } from "./constants"; import { EndpointGenerator } from "./endpoint/EndpointGenerator"; +import { GuzzleClient } from "./external/GuzzleClient"; export class SdkGeneratorContext extends AbstractPhpGeneratorContext { public endpointGenerator: EndpointGenerator; diff --git a/generators/php/sdk/src/core/RawClient.ts b/generators/php/sdk/src/core/RawClient.ts index c5943b62724..3b2335a9ee1 100644 --- a/generators/php/sdk/src/core/RawClient.ts +++ b/generators/php/sdk/src/core/RawClient.ts @@ -1,8 +1,10 @@ -import { SdkGeneratorContext } from "../SdkGeneratorContext"; -import { php } from "@fern-api/php-codegen"; import { Arguments, NamedArgument } from "@fern-api/base-generator"; +import { php } from "@fern-api/php-codegen"; + import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; +import { SdkGeneratorContext } from "../SdkGeneratorContext"; + export declare namespace RawClient { export interface SendRequestArgs { /** The endpoint for the endpoint */ diff --git a/generators/php/sdk/src/endpoint/AbstractEndpointGenerator.ts b/generators/php/sdk/src/endpoint/AbstractEndpointGenerator.ts index 94d226099e5..1bc9639381f 100644 --- a/generators/php/sdk/src/endpoint/AbstractEndpointGenerator.ts +++ b/generators/php/sdk/src/endpoint/AbstractEndpointGenerator.ts @@ -1,9 +1,11 @@ import { php } from "@fern-api/php-codegen"; + import { HttpEndpoint, ServiceId } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../SdkGeneratorContext"; +import { EndpointSignatureInfo } from "./EndpointSignatureInfo"; import { getEndpointRequest } from "./utils/getEndpointRequest"; import { getEndpointReturnType } from "./utils/getEndpointReturnType"; -import { EndpointSignatureInfo } from "./EndpointSignatureInfo"; export abstract class AbstractEndpointGenerator { protected readonly context: SdkGeneratorContext; diff --git a/generators/php/sdk/src/endpoint/EndpointGenerator.ts b/generators/php/sdk/src/endpoint/EndpointGenerator.ts index aadb325bac0..fbbc9dfff85 100644 --- a/generators/php/sdk/src/endpoint/EndpointGenerator.ts +++ b/generators/php/sdk/src/endpoint/EndpointGenerator.ts @@ -1,5 +1,7 @@ import { php } from "@fern-api/php-codegen"; + import { HttpEndpoint, ServiceId } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../SdkGeneratorContext"; import { AbstractEndpointGenerator } from "./AbstractEndpointGenerator"; import { HttpEndpointGenerator } from "./http/HttpEndpointGenerator"; diff --git a/generators/php/sdk/src/endpoint/EndpointSignatureInfo.ts b/generators/php/sdk/src/endpoint/EndpointSignatureInfo.ts index 5686dd1d699..e8b75ad61ad 100644 --- a/generators/php/sdk/src/endpoint/EndpointSignatureInfo.ts +++ b/generators/php/sdk/src/endpoint/EndpointSignatureInfo.ts @@ -1,4 +1,5 @@ import { php } from "@fern-api/php-codegen"; + import { EndpointRequest } from "./request/EndpointRequest"; export interface EndpointSignatureInfo { diff --git a/generators/php/sdk/src/endpoint/http/HttpEndpointGenerator.ts b/generators/php/sdk/src/endpoint/http/HttpEndpointGenerator.ts index 265677be684..722967e780a 100644 --- a/generators/php/sdk/src/endpoint/http/HttpEndpointGenerator.ts +++ b/generators/php/sdk/src/endpoint/http/HttpEndpointGenerator.ts @@ -1,4 +1,8 @@ +import { upperFirst } from "lodash-es"; + +import { Arguments, UnnamedArgument } from "@fern-api/base-generator"; import { php } from "@fern-api/php-codegen"; + import { BytesRequest, FileUploadRequest, @@ -8,11 +12,10 @@ import { InlinedRequestBody, ServiceId } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; -import { getEndpointReturnType } from "../utils/getEndpointReturnType"; import { AbstractEndpointGenerator } from "../AbstractEndpointGenerator"; -import { Arguments, UnnamedArgument } from "@fern-api/base-generator"; -import { upperFirst } from "lodash-es"; +import { getEndpointReturnType } from "../utils/getEndpointReturnType"; export declare namespace EndpointGenerator { export interface Args { diff --git a/generators/php/sdk/src/endpoint/request/EndpointRequest.ts b/generators/php/sdk/src/endpoint/request/EndpointRequest.ts index 3bd9d09d521..a07dad551de 100644 --- a/generators/php/sdk/src/endpoint/request/EndpointRequest.ts +++ b/generators/php/sdk/src/endpoint/request/EndpointRequest.ts @@ -1,6 +1,8 @@ import { UnnamedArgument } from "@fern-api/base-generator"; import { php } from "@fern-api/php-codegen"; + import { HttpEndpoint, SdkRequest } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; export interface QueryParameterCodeBlock { diff --git a/generators/php/sdk/src/endpoint/request/EndpointRequestFactory.ts b/generators/php/sdk/src/endpoint/request/EndpointRequestFactory.ts index 03ccb544538..36c98aff182 100644 --- a/generators/php/sdk/src/endpoint/request/EndpointRequestFactory.ts +++ b/generators/php/sdk/src/endpoint/request/EndpointRequestFactory.ts @@ -1,4 +1,5 @@ import { HttpEndpoint, SdkRequest, ServiceId } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { EndpointRequest } from "./EndpointRequest"; import { ReferencedEndpointRequest } from "./ReferencedEndpointRequest"; diff --git a/generators/php/sdk/src/endpoint/request/ReferencedEndpointRequest.ts b/generators/php/sdk/src/endpoint/request/ReferencedEndpointRequest.ts index 5ecea3de81f..42eb0567e12 100644 --- a/generators/php/sdk/src/endpoint/request/ReferencedEndpointRequest.ts +++ b/generators/php/sdk/src/endpoint/request/ReferencedEndpointRequest.ts @@ -1,5 +1,7 @@ import { php } from "@fern-api/php-codegen"; + import { HttpEndpoint, SdkRequest, TypeReference } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { EndpointRequest, diff --git a/generators/php/sdk/src/endpoint/request/WrappedEndpointRequest.ts b/generators/php/sdk/src/endpoint/request/WrappedEndpointRequest.ts index 4fb5027bb29..56b7bfc8d2e 100644 --- a/generators/php/sdk/src/endpoint/request/WrappedEndpointRequest.ts +++ b/generators/php/sdk/src/endpoint/request/WrappedEndpointRequest.ts @@ -1,4 +1,7 @@ +import { CodeBlock } from "@fern-api/base-generator"; +import { assertNever } from "@fern-api/core-utils"; import { php } from "@fern-api/php-codegen"; + import { BytesRequest, ContainerType, @@ -24,6 +27,8 @@ import { ServiceId, TypeReference } from "@fern-fern/ir-sdk/api"; +import { FileUploadBodyProperty } from "@fern-fern/ir-sdk/serialization"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { EndpointRequest, @@ -31,9 +36,6 @@ import { QueryParameterCodeBlock, RequestBodyCodeBlock } from "./EndpointRequest"; -import { CodeBlock } from "@fern-api/base-generator"; -import { assertNever } from "@fern-api/core-utils"; -import { FileUploadBodyProperty } from "@fern-fern/ir-sdk/serialization"; export declare namespace WrappedEndpointRequest { interface Args { diff --git a/generators/php/sdk/src/endpoint/request/WrappedEndpointRequestGenerator.ts b/generators/php/sdk/src/endpoint/request/WrappedEndpointRequestGenerator.ts index 49168ea2028..9551d412b56 100644 --- a/generators/php/sdk/src/endpoint/request/WrappedEndpointRequestGenerator.ts +++ b/generators/php/sdk/src/endpoint/request/WrappedEndpointRequestGenerator.ts @@ -1,5 +1,7 @@ -import { php, PhpFile, FileGenerator, FileLocation } from "@fern-api/php-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { assertNever } from "@fern-api/core-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; +import { FileGenerator, FileLocation, PhpFile, php } from "@fern-api/php-codegen"; + import { FileProperty, FilePropertyArray, @@ -10,9 +12,9 @@ import { SdkRequestWrapper, ServiceId } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../../SdkCustomConfig"; import { SdkGeneratorContext } from "../../SdkGeneratorContext"; -import { assertNever } from "@fern-api/core-utils"; export declare namespace WrappedEndpointRequestGenerator { export interface Args { diff --git a/generators/php/sdk/src/endpoint/utils/getEndpointRequest.ts b/generators/php/sdk/src/endpoint/utils/getEndpointRequest.ts index be1d18cb408..fcba72d9f44 100644 --- a/generators/php/sdk/src/endpoint/utils/getEndpointRequest.ts +++ b/generators/php/sdk/src/endpoint/utils/getEndpointRequest.ts @@ -1,4 +1,5 @@ import { HttpEndpoint, ServiceId } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { EndpointRequest } from "../request/EndpointRequest"; import { createEndpointRequest } from "../request/EndpointRequestFactory"; diff --git a/generators/php/sdk/src/endpoint/utils/getEndpointReturnType.ts b/generators/php/sdk/src/endpoint/utils/getEndpointReturnType.ts index 40d0ba589ed..7f202ee5a66 100644 --- a/generators/php/sdk/src/endpoint/utils/getEndpointReturnType.ts +++ b/generators/php/sdk/src/endpoint/utils/getEndpointReturnType.ts @@ -1,5 +1,7 @@ import { php } from "@fern-api/php-codegen"; + import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { SdkGeneratorContext } from "../../SdkGeneratorContext"; export function getEndpointReturnType({ diff --git a/generators/php/sdk/src/environment/EnvironmentGenerator.ts b/generators/php/sdk/src/environment/EnvironmentGenerator.ts index 14ff912928e..92d4a91ffbc 100644 --- a/generators/php/sdk/src/environment/EnvironmentGenerator.ts +++ b/generators/php/sdk/src/environment/EnvironmentGenerator.ts @@ -1,6 +1,6 @@ import { SdkGeneratorContext } from "../SdkGeneratorContext"; -import { SingleUrlEnvironmentGenerator } from "./SingleUrlEnvironmentGenerator"; import { MultiUrlEnvironmentGenerator } from "./MultiUrlEnvironmentGenerator"; +import { SingleUrlEnvironmentGenerator } from "./SingleUrlEnvironmentGenerator"; export class EnvironmentGenerator { private context: SdkGeneratorContext; diff --git a/generators/php/sdk/src/environment/MultiUrlEnvironmentGenerator.ts b/generators/php/sdk/src/environment/MultiUrlEnvironmentGenerator.ts index 479a01b980d..7956ed22cf8 100644 --- a/generators/php/sdk/src/environment/MultiUrlEnvironmentGenerator.ts +++ b/generators/php/sdk/src/environment/MultiUrlEnvironmentGenerator.ts @@ -1,6 +1,8 @@ import { RelativeFilePath } from "@fern-api/fs-utils"; -import { PhpFile, FileGenerator } from "@fern-api/php-codegen"; +import { FileGenerator, PhpFile } from "@fern-api/php-codegen"; + import { MultipleBaseUrlsEnvironments } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; diff --git a/generators/php/sdk/src/environment/SingleUrlEnvironmentGenerator.ts b/generators/php/sdk/src/environment/SingleUrlEnvironmentGenerator.ts index e5ff46e24a3..9e7fcbede22 100644 --- a/generators/php/sdk/src/environment/SingleUrlEnvironmentGenerator.ts +++ b/generators/php/sdk/src/environment/SingleUrlEnvironmentGenerator.ts @@ -1,6 +1,8 @@ -import { php, PhpFile, FileGenerator } from "@fern-api/php-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; +import { FileGenerator, PhpFile, php } from "@fern-api/php-codegen"; + import { SingleBaseUrlEnvironments } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; diff --git a/generators/php/sdk/src/error/BaseApiExceptionGenerator.ts b/generators/php/sdk/src/error/BaseApiExceptionGenerator.ts index 3808778ef72..b3dd1a98a2f 100644 --- a/generators/php/sdk/src/error/BaseApiExceptionGenerator.ts +++ b/generators/php/sdk/src/error/BaseApiExceptionGenerator.ts @@ -1,5 +1,6 @@ -import { php, PhpFile, FileGenerator } from "@fern-api/php-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; +import { FileGenerator, PhpFile, php } from "@fern-api/php-codegen"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; diff --git a/generators/php/sdk/src/error/BaseExceptionGenerator.ts b/generators/php/sdk/src/error/BaseExceptionGenerator.ts index 50bd2966eed..7c7eb446fcf 100644 --- a/generators/php/sdk/src/error/BaseExceptionGenerator.ts +++ b/generators/php/sdk/src/error/BaseExceptionGenerator.ts @@ -1,5 +1,6 @@ -import { php, PhpFile, FileGenerator } from "@fern-api/php-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; +import { FileGenerator, PhpFile, php } from "@fern-api/php-codegen"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; diff --git a/generators/php/sdk/src/external/GuzzleClient.ts b/generators/php/sdk/src/external/GuzzleClient.ts index 541755e6ea1..1892b4142a3 100644 --- a/generators/php/sdk/src/external/GuzzleClient.ts +++ b/generators/php/sdk/src/external/GuzzleClient.ts @@ -1,6 +1,7 @@ -import { SdkGeneratorContext } from "../SdkGeneratorContext"; import { php } from "@fern-api/php-codegen"; +import { SdkGeneratorContext } from "../SdkGeneratorContext"; + /** * The Guzzle HTTP client. */ diff --git a/generators/php/sdk/src/root-client/RootClientGenerator.ts b/generators/php/sdk/src/root-client/RootClientGenerator.ts index 8dc1d26d61c..64c91742d8c 100644 --- a/generators/php/sdk/src/root-client/RootClientGenerator.ts +++ b/generators/php/sdk/src/root-client/RootClientGenerator.ts @@ -1,6 +1,7 @@ import { assertNever } from "@fern-api/core-utils"; -import { php, FileGenerator, PhpFile } from "@fern-api/php-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; +import { FileGenerator, PhpFile, php } from "@fern-api/php-codegen"; + import { AuthScheme, ContainerType, @@ -10,6 +11,7 @@ import { Subpackage, TypeReference } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; diff --git a/generators/php/sdk/src/subpackage-client/SubPackageClientGenerator.ts b/generators/php/sdk/src/subpackage-client/SubPackageClientGenerator.ts index 73b2a5e7a05..9c663a77a42 100644 --- a/generators/php/sdk/src/subpackage-client/SubPackageClientGenerator.ts +++ b/generators/php/sdk/src/subpackage-client/SubPackageClientGenerator.ts @@ -1,6 +1,8 @@ -import { php, PhpFile, FileGenerator } from "@fern-api/php-codegen"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; +import { FileGenerator, PhpFile, php } from "@fern-api/php-codegen"; + import { HttpService, ServiceId, Subpackage } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfigSchema } from "../SdkCustomConfig"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; diff --git a/generators/postman/package.json b/generators/postman/package.json index f6656611ef0..5cd1e08c308 100644 --- a/generators/postman/package.json +++ b/generators/postman/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", "dist:cli": "pnpm compile && tsup ./src/cli.ts", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -46,8 +45,8 @@ "esbuild": "^0.24.0", "eslint": "^9.16.0", "lodash": "^4.17.21", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "tsup": "^8.3.5", "typescript": "5.7.2", "vitest": "^2.1.8", diff --git a/generators/postman/src/auth.ts b/generators/postman/src/auth.ts index 1b8865f082f..935b3bfbcd5 100644 --- a/generators/postman/src/auth.ts +++ b/generators/postman/src/auth.ts @@ -1,5 +1,6 @@ import { AuthScheme, HeaderAuthScheme } from "@fern-fern/ir-sdk/api"; import { PostmanHeader, PostmanRequestAuth, PostmanVariable } from "@fern-fern/postman-sdk/api"; + import { getReferenceToVariable } from "./utils"; const BASIC_AUTH_USERNAME_VARIABLE = "username"; diff --git a/generators/postman/src/config/schemas/PostmanGeneratorConfigSchema.ts b/generators/postman/src/config/schemas/PostmanGeneratorConfigSchema.ts index 1aa0daed950..52394df835d 100644 --- a/generators/postman/src/config/schemas/PostmanGeneratorConfigSchema.ts +++ b/generators/postman/src/config/schemas/PostmanGeneratorConfigSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { PublishConfigSchema } from "./PublishConfigSchema"; export const PostmanGeneratorConfigSchema = z.union([ diff --git a/generators/postman/src/convertExampleEndpointCall.ts b/generators/postman/src/convertExampleEndpointCall.ts index 0b61ea04065..010cec9e90a 100644 --- a/generators/postman/src/convertExampleEndpointCall.ts +++ b/generators/postman/src/convertExampleEndpointCall.ts @@ -1,3 +1,5 @@ +import { isEqual, startCase, values } from "lodash"; + import { ErrorDeclaration, ExampleEndpointCall, @@ -7,7 +9,7 @@ import { TypeDeclaration } from "@fern-fern/ir-sdk/api"; import { PostmanExampleResponse, PostmanHeader } from "@fern-fern/postman-sdk/api"; -import { isEqual, startCase, values } from "lodash"; + import { GeneratedExampleRequest } from "./request/GeneratedExampleRequest"; export function convertExampleEndpointCall({ diff --git a/generators/postman/src/convertToPostmanCollection.ts b/generators/postman/src/convertToPostmanCollection.ts index 8af9c0ad58a..cf62018eea8 100644 --- a/generators/postman/src/convertToPostmanCollection.ts +++ b/generators/postman/src/convertToPostmanCollection.ts @@ -1,3 +1,7 @@ +import { startCase } from "lodash"; + +import { isNonNullish } from "@fern-api/core-utils"; + import { ApiAuth, AuthScheme, @@ -14,8 +18,7 @@ import { PostmanCollectionSchema, PostmanHeader } from "@fern-fern/postman-sdk/api"; -import { startCase } from "lodash"; -import { isNonNullish } from "@fern-api/core-utils"; + import { convertAuth, getAuthHeaders, getVariablesForAuthScheme } from "./auth"; import { convertExampleEndpointCall } from "./convertExampleEndpointCall"; import { GeneratedExampleRequest } from "./request/GeneratedExampleRequest"; diff --git a/generators/postman/src/request/AbstractGeneratedRequest.ts b/generators/postman/src/request/AbstractGeneratedRequest.ts index bfa80e015b1..3188036f0b3 100644 --- a/generators/postman/src/request/AbstractGeneratedRequest.ts +++ b/generators/postman/src/request/AbstractGeneratedRequest.ts @@ -15,7 +15,8 @@ import { PostmanRequestBodyMode, PostmanUrlVariable } from "@fern-fern/postman-sdk/api"; -import { getReferenceToVariable, ORIGIN_VARIABLE_NAME } from "../utils"; + +import { ORIGIN_VARIABLE_NAME, getReferenceToVariable } from "../utils"; import { GeneratedRequest } from "./GeneratedRequest"; export declare namespace AbstractGeneratedRequest { diff --git a/generators/postman/src/request/GeneratedExampleRequest.ts b/generators/postman/src/request/GeneratedExampleRequest.ts index 51b8f4cb868..1dd0d64eeb8 100644 --- a/generators/postman/src/request/GeneratedExampleRequest.ts +++ b/generators/postman/src/request/GeneratedExampleRequest.ts @@ -6,6 +6,7 @@ import { PathParameter } from "@fern-fern/ir-sdk/api"; import { PostmanHeader, PostmanUrlVariable } from "@fern-fern/postman-sdk/api"; + import { AbstractGeneratedRequest } from "./AbstractGeneratedRequest"; export declare namespace GeneratedExampleRequest { diff --git a/generators/postman/src/writePostmanCollection.ts b/generators/postman/src/writePostmanCollection.ts index cc760b806ec..f2ec380901d 100644 --- a/generators/postman/src/writePostmanCollection.ts +++ b/generators/postman/src/writePostmanCollection.ts @@ -1,24 +1,27 @@ -import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; -import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; -import { FernPostmanClient } from "@fern-fern/postman-sdk"; -import * as PostmanParsing from "@fern-fern/postman-sdk/serialization"; import { readFile, writeFile } from "fs/promises"; +import { startCase } from "lodash"; import path from "path"; -import { PostmanGeneratorConfigSchema } from "./config/schemas/PostmanGeneratorConfigSchema"; -import { PublishConfigSchema } from "./config/schemas/PublishConfigSchema"; -import { convertToPostmanCollection } from "./convertToPostmanCollection"; + import { - GeneratorNotificationService, ExitStatusUpdate, + GeneratorNotificationService, GeneratorUpdate, LogLevel, parseGeneratorConfig, parseIR } from "@fern-api/base-generator"; -import { writePostmanGithubWorkflows } from "./writePostmanGithubWorkflows"; -import { startCase } from "lodash"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; +import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; +import { FernPostmanClient } from "@fern-fern/postman-sdk"; +import * as PostmanParsing from "@fern-fern/postman-sdk/serialization"; + +import { PostmanGeneratorConfigSchema } from "./config/schemas/PostmanGeneratorConfigSchema"; +import { PublishConfigSchema } from "./config/schemas/PublishConfigSchema"; +import { convertToPostmanCollection } from "./convertToPostmanCollection"; +import { writePostmanGithubWorkflows } from "./writePostmanGithubWorkflows"; + const DEFAULT_COLLECTION_OUTPUT_FILENAME = "collection.json"; export const getCollectionOutputFilename = (postmanGeneratorConfig?: PostmanGeneratorConfigSchema): string => { diff --git a/generators/postman/src/writePostmanGithubWorkflows.ts b/generators/postman/src/writePostmanGithubWorkflows.ts index 1d3c5b73566..13c046b6eb5 100644 --- a/generators/postman/src/writePostmanGithubWorkflows.ts +++ b/generators/postman/src/writePostmanGithubWorkflows.ts @@ -1,7 +1,9 @@ -import { GeneratorConfig, GithubOutputMode } from "@fern-api/base-generator"; import endent from "endent"; import { mkdir, writeFile } from "fs/promises"; import path from "path"; + +import { GeneratorConfig, GithubOutputMode } from "@fern-api/base-generator"; + import { PostmanGeneratorConfigSchema } from "./config/schemas/PostmanGeneratorConfigSchema"; import { getCollectionOutputFilename } from "./writePostmanCollection"; diff --git a/generators/python-v2/ast/package.json b/generators/python-v2/ast/package.json index b2912df5555..337f4a39d1b 100644 --- a/generators/python-v2/ast/package.json +++ b/generators/python-v2/ast/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": { @@ -35,8 +34,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" } diff --git a/generators/python-v2/ast/src/BaseInvocation.ts b/generators/python-v2/ast/src/BaseInvocation.ts index 1dadcd8934b..2b68efc077a 100644 --- a/generators/python-v2/ast/src/BaseInvocation.ts +++ b/generators/python-v2/ast/src/BaseInvocation.ts @@ -1,7 +1,7 @@ -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; import { MethodArgument } from "./MethodArgument"; import { Reference } from "./Reference"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; export declare namespace BaseInvocation { interface Args { diff --git a/generators/python-v2/ast/src/Class.ts b/generators/python-v2/ast/src/Class.ts index 21444f51c36..075e838fa55 100644 --- a/generators/python-v2/ast/src/Class.ts +++ b/generators/python-v2/ast/src/Class.ts @@ -1,8 +1,8 @@ +import { Decorator } from "./Decorator"; +import { Field } from "./Field"; import { Reference } from "./Reference"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Decorator } from "./Decorator"; -import { Field } from "./Field"; export declare namespace Class { interface Args { diff --git a/generators/python-v2/ast/src/ClassInstantiation.ts b/generators/python-v2/ast/src/ClassInstantiation.ts index 7ba4b08a12b..90b709e48d5 100644 --- a/generators/python-v2/ast/src/ClassInstantiation.ts +++ b/generators/python-v2/ast/src/ClassInstantiation.ts @@ -1,5 +1,5 @@ -import { Reference } from "./Reference"; import { BaseInvocation } from "./BaseInvocation"; +import { Reference } from "./Reference"; export declare namespace ClassInstantiation { interface Args extends Omit { diff --git a/generators/python-v2/ast/src/CodeBlock.ts b/generators/python-v2/ast/src/CodeBlock.ts index 17ffd153f0c..d277733b1c6 100644 --- a/generators/python-v2/ast/src/CodeBlock.ts +++ b/generators/python-v2/ast/src/CodeBlock.ts @@ -1,4 +1,5 @@ import { CodeBlock as CommonCodeBlock } from "@fern-api/base-generator"; + import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; diff --git a/generators/python-v2/ast/src/Field.ts b/generators/python-v2/ast/src/Field.ts index 412ddb73eae..1453d26cf8f 100644 --- a/generators/python-v2/ast/src/Field.ts +++ b/generators/python-v2/ast/src/Field.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 Field { export interface BaseArgs { diff --git a/generators/python-v2/ast/src/Method.ts b/generators/python-v2/ast/src/Method.ts index c26a628343a..8678ff106bb 100644 --- a/generators/python-v2/ast/src/Method.ts +++ b/generators/python-v2/ast/src/Method.ts @@ -1,10 +1,10 @@ -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; -import { Type } from "./Type"; -import { CodeBlock } from "./CodeBlock"; -import { Parameter } from "./Parameter"; import { python } from "."; +import { CodeBlock } from "./CodeBlock"; import { Decorator } from "./Decorator"; +import { Parameter } from "./Parameter"; +import { Type } from "./Type"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; export enum ClassMethodType { STATIC, diff --git a/generators/python-v2/ast/src/MethodInvocation.ts b/generators/python-v2/ast/src/MethodInvocation.ts index bc193e0fcd7..7dad5fa68ea 100644 --- a/generators/python-v2/ast/src/MethodInvocation.ts +++ b/generators/python-v2/ast/src/MethodInvocation.ts @@ -1,5 +1,5 @@ -import { Reference } from "./Reference"; import { BaseInvocation } from "./BaseInvocation"; +import { Reference } from "./Reference"; export declare namespace MethodInvocation { interface Args extends Omit { diff --git a/generators/python-v2/ast/src/Operator.ts b/generators/python-v2/ast/src/Operator.ts index a2537699051..51608e713bd 100644 --- a/generators/python-v2/ast/src/Operator.ts +++ b/generators/python-v2/ast/src/Operator.ts @@ -1,7 +1,8 @@ -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; import { assertNever } from "@fern-api/core-utils"; + import { OperatorType } from "./OperatorType"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; export declare namespace Operator { interface Args { diff --git a/generators/python-v2/ast/src/Parameter.ts b/generators/python-v2/ast/src/Parameter.ts index 6cad3418578..965ced25fc1 100644 --- a/generators/python-v2/ast/src/Parameter.ts +++ b/generators/python-v2/ast/src/Parameter.ts @@ -1,7 +1,7 @@ import { CodeBlock } from "./CodeBlock"; +import { Type } from "./Type"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Type } from "./Type"; export declare namespace Parameter { interface Args { diff --git a/generators/python-v2/ast/src/PythonFile.ts b/generators/python-v2/ast/src/PythonFile.ts index 558bde6b910..2f90e2e2d56 100644 --- a/generators/python-v2/ast/src/PythonFile.ts +++ b/generators/python-v2/ast/src/PythonFile.ts @@ -1,13 +1,13 @@ -import { AstNode } from "./core/AstNode"; +import { Class } from "./Class"; import { Comment } from "./Comment"; -import { Writer } from "./core/Writer"; +import { Field } from "./Field"; +import { Method } from "./Method"; import { Reference } from "./Reference"; -import { ImportedName, ModulePath } from "./core/types"; import { StarImport } from "./StarImport"; -import { Class } from "./Class"; -import { Method } from "./Method"; -import { Field } from "./Field"; import { Type } from "./Type"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; +import { ImportedName, ModulePath } from "./core/types"; import { createPythonClassName } from "./core/utils"; interface UniqueReferenceValue { diff --git a/generators/python-v2/ast/src/Reference.ts b/generators/python-v2/ast/src/Reference.ts index 26b5d9b4e48..a617d9a8161 100644 --- a/generators/python-v2/ast/src/Reference.ts +++ b/generators/python-v2/ast/src/Reference.ts @@ -1,6 +1,6 @@ import { AstNode } from "./core/AstNode"; -import { AttrPath, ModulePath } from "./core/types"; import { Writer } from "./core/Writer"; +import { AttrPath, ModulePath } from "./core/types"; export declare namespace Reference { interface Args { diff --git a/generators/python-v2/ast/src/StarImport.ts b/generators/python-v2/ast/src/StarImport.ts index 50b1cf28f85..d9ec3ed14e2 100644 --- a/generators/python-v2/ast/src/StarImport.ts +++ b/generators/python-v2/ast/src/StarImport.ts @@ -1,5 +1,5 @@ -import { Writer } from "./core/Writer"; import { Reference } from "./Reference"; +import { Writer } from "./core/Writer"; export declare namespace StarImport { interface Args extends Pick {} diff --git a/generators/python-v2/ast/src/Type.ts b/generators/python-v2/ast/src/Type.ts index d3ebda14da5..e1a4fe64441 100644 --- a/generators/python-v2/ast/src/Type.ts +++ b/generators/python-v2/ast/src/Type.ts @@ -1,8 +1,9 @@ import { assertNever } from "@fern-api/core-utils"; + import { python } from "."; +import { Reference } from "./Reference"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Reference } from "./Reference"; type InternalType = | Int diff --git a/generators/python-v2/ast/src/TypeInstantiation.ts b/generators/python-v2/ast/src/TypeInstantiation.ts index 3bb56543d8f..3c5fb707270 100644 --- a/generators/python-v2/ast/src/TypeInstantiation.ts +++ b/generators/python-v2/ast/src/TypeInstantiation.ts @@ -1,8 +1,9 @@ import { assertNever } from "@fern-api/core-utils"; + +import { Reference } from "./Reference"; +import { Type } from "./Type"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Type } from "./Type"; -import { Reference } from "./Reference"; type InternalTypeInstantiation = Int | Float | Bool | Str | Bytes | List | Set | Tuple | Dict | None | Uuid; diff --git a/generators/python-v2/ast/src/__test__/ClassInstantiation.test.ts b/generators/python-v2/ast/src/__test__/ClassInstantiation.test.ts index 193f06b4c9d..22518dc2378 100644 --- a/generators/python-v2/ast/src/__test__/ClassInstantiation.test.ts +++ b/generators/python-v2/ast/src/__test__/ClassInstantiation.test.ts @@ -1,5 +1,5 @@ -import { Writer } from "../core/Writer"; import { python } from ".."; +import { Writer } from "../core/Writer"; describe("ClassInstantiation", () => { let writer: Writer; diff --git a/generators/python-v2/ast/src/__test__/Method.test.ts b/generators/python-v2/ast/src/__test__/Method.test.ts index 66c7f817dde..d44791198dc 100644 --- a/generators/python-v2/ast/src/__test__/Method.test.ts +++ b/generators/python-v2/ast/src/__test__/Method.test.ts @@ -1,5 +1,5 @@ -import { ClassMethodType } from "../Method"; import { python } from ".."; +import { ClassMethodType } from "../Method"; import { Writer } from "../core/Writer"; describe("Method", () => { diff --git a/generators/python-v2/ast/src/__test__/MethodInvocation.test.ts b/generators/python-v2/ast/src/__test__/MethodInvocation.test.ts index b05fe88b285..e02610d14c1 100644 --- a/generators/python-v2/ast/src/__test__/MethodInvocation.test.ts +++ b/generators/python-v2/ast/src/__test__/MethodInvocation.test.ts @@ -1,5 +1,5 @@ -import { Writer } from "../core/Writer"; import { python } from ".."; +import { Writer } from "../core/Writer"; describe("MethodInvocation", () => { let writer: Writer; diff --git a/generators/python-v2/ast/src/__test__/Operator.test.ts b/generators/python-v2/ast/src/__test__/Operator.test.ts index d2f741b88e0..8895d399c86 100644 --- a/generators/python-v2/ast/src/__test__/Operator.test.ts +++ b/generators/python-v2/ast/src/__test__/Operator.test.ts @@ -1,7 +1,6 @@ import { python } from ".."; -import { Writer } from "../core/Writer"; - import { OperatorType } from "../OperatorType"; +import { Writer } from "../core/Writer"; describe("Operator", () => { let writer: Writer; diff --git a/generators/python-v2/ast/src/__test__/PythonFile.test.ts b/generators/python-v2/ast/src/__test__/PythonFile.test.ts index 4cfac924fc5..ad5f0fb0107 100644 --- a/generators/python-v2/ast/src/__test__/PythonFile.test.ts +++ b/generators/python-v2/ast/src/__test__/PythonFile.test.ts @@ -1,8 +1,9 @@ +import { expect } from "vitest"; + import { python } from ".."; -import { Writer } from "../core/Writer"; -import { Method } from "../Method"; import { CodeBlock } from "../CodeBlock"; -import { expect } from "vitest"; +import { Method } from "../Method"; +import { Writer } from "../core/Writer"; describe("PythonFile", () => { let writer: Writer; diff --git a/generators/python-v2/ast/src/__test__/TypeInstantiation.test.ts b/generators/python-v2/ast/src/__test__/TypeInstantiation.test.ts index ecbed3d37d4..eb4effd644f 100644 --- a/generators/python-v2/ast/src/__test__/TypeInstantiation.test.ts +++ b/generators/python-v2/ast/src/__test__/TypeInstantiation.test.ts @@ -1,6 +1,6 @@ +import { python } from ".."; import { TypeInstantiation } from "../TypeInstantiation"; import { Writer } from "../core/Writer"; -import { python } from ".."; describe("TypeInstantiation", () => { let writer: Writer; diff --git a/generators/python-v2/ast/src/core/AstNode.ts b/generators/python-v2/ast/src/core/AstNode.ts index a0578c4205c..8f636315a72 100644 --- a/generators/python-v2/ast/src/core/AstNode.ts +++ b/generators/python-v2/ast/src/core/AstNode.ts @@ -1,7 +1,9 @@ +import { Config } from "@wasm-fmt/ruff_fmt"; + import { AbstractAstNode } from "@fern-api/base-generator"; -import { Writer } from "./Writer"; + import { Reference } from "../Reference"; -import { Config } from "@wasm-fmt/ruff_fmt"; +import { Writer } from "./Writer"; export abstract class AstNode extends AbstractAstNode { protected references: Reference[] = []; diff --git a/generators/python-v2/ast/src/core/Writer.ts b/generators/python-v2/ast/src/core/Writer.ts index 1726f404910..eb38f80cb23 100644 --- a/generators/python-v2/ast/src/core/Writer.ts +++ b/generators/python-v2/ast/src/core/Writer.ts @@ -1,5 +1,7 @@ -import { AbstractWriter } from "@fern-api/base-generator"; import { Config } from "@wasm-fmt/ruff_fmt"; + +import { AbstractWriter } from "@fern-api/base-generator"; + import { Reference } from "../Reference"; import { ImportedName } from "./types"; diff --git a/generators/python-v2/ast/src/python.ts b/generators/python-v2/ast/src/python.ts index 9b9c3c4fe32..acd38519ee3 100644 --- a/generators/python-v2/ast/src/python.ts +++ b/generators/python-v2/ast/src/python.ts @@ -7,9 +7,9 @@ import { Field } from "./Field"; import { Method } from "./Method"; import { MethodArgument } from "./MethodArgument"; import { MethodInvocation } from "./MethodInvocation"; +import { Operator } from "./Operator"; import { Parameter } from "./Parameter"; import { PythonFile } from "./PythonFile"; -import { Operator } from "./Operator"; import { Reference } from "./Reference"; import { StarImport } from "./StarImport"; diff --git a/generators/python-v2/base/package.json b/generators/python-v2/base/package.json index c3ea1a0cd3e..695de083ec6 100644 --- a/generators/python-v2/base/package.json +++ b/generators/python-v2/base/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" } diff --git a/generators/python-v2/base/src/cli/AbstractPythonGeneratorCli.ts b/generators/python-v2/base/src/cli/AbstractPythonGeneratorCli.ts index 219ff05642f..25de945e310 100644 --- a/generators/python-v2/base/src/cli/AbstractPythonGeneratorCli.ts +++ b/generators/python-v2/base/src/cli/AbstractPythonGeneratorCli.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { AbstractGeneratorCli, parseIR } from "@fern-api/base-generator"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; + import { AbstractPythonGeneratorContext } from "../context/AbstractPythonGeneratorContext"; import { BasePythonCustomConfigSchema } from "../custom-config/BasePythonCustomConfigSchema"; diff --git a/generators/python-v2/base/src/context/AbstractPythonGeneratorContext.ts b/generators/python-v2/base/src/context/AbstractPythonGeneratorContext.ts index cc521da2d91..e338aa056e6 100644 --- a/generators/python-v2/base/src/context/AbstractPythonGeneratorContext.ts +++ b/generators/python-v2/base/src/context/AbstractPythonGeneratorContext.ts @@ -1,6 +1,9 @@ +import { snakeCase } from "lodash-es"; + import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService } from "@fern-api/base-generator"; + import { IntermediateRepresentation, Name, TypeDeclaration, TypeId, TypeReference } from "@fern-fern/ir-sdk/api"; -import { snakeCase } from "lodash-es"; + import { BasePythonCustomConfigSchema } from "../custom-config/BasePythonCustomConfigSchema"; import { PythonProject } from "../project"; import { PythonTypeMapper } from "./PythonTypeMapper"; diff --git a/generators/python-v2/base/src/context/PythonTypeMapper.ts b/generators/python-v2/base/src/context/PythonTypeMapper.ts index 5d3be9393b0..0b5b66a75a4 100644 --- a/generators/python-v2/base/src/context/PythonTypeMapper.ts +++ b/generators/python-v2/base/src/context/PythonTypeMapper.ts @@ -1,4 +1,6 @@ import { assertNever } from "@fern-api/core-utils"; +import { python } from "@fern-api/python-ast"; + import { ContainerType, DeclaredTypeName, @@ -9,9 +11,9 @@ import { TypeId, TypeReference } from "@fern-fern/ir-sdk/api"; + import { BasePythonCustomConfigSchema } from "../custom-config/BasePythonCustomConfigSchema"; import { AbstractPythonGeneratorContext } from "./AbstractPythonGeneratorContext"; -import { python } from "@fern-api/python-ast"; export declare namespace PythonTypeMapper { interface Args { diff --git a/generators/python-v2/base/src/project/PythonProject.ts b/generators/python-v2/base/src/project/PythonProject.ts index 1cbcca7001c..828698472b7 100644 --- a/generators/python-v2/base/src/project/PythonProject.ts +++ b/generators/python-v2/base/src/project/PythonProject.ts @@ -1,8 +1,9 @@ import { AbstractProject } from "@fern-api/base-generator"; +import { loggingExeca } from "@fern-api/logging-execa"; + import { AbstractPythonGeneratorContext } from "../cli"; import { BasePythonCustomConfigSchema } from "../custom-config"; import { WriteablePythonFile } from "./WriteablePythonFile"; -import { loggingExeca } from "@fern-api/logging-execa"; /** * In memory representation of a Python project. diff --git a/generators/python-v2/base/src/project/WriteablePythonFile.ts b/generators/python-v2/base/src/project/WriteablePythonFile.ts index 61663cad1eb..4adfc4f3360 100644 --- a/generators/python-v2/base/src/project/WriteablePythonFile.ts +++ b/generators/python-v2/base/src/project/WriteablePythonFile.ts @@ -1,5 +1,5 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { File } from "@fern-api/base-generator"; +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { python } from "@fern-api/python-ast"; export declare namespace WriteablePythonFile { diff --git a/generators/python-v2/fastapi/package.json b/generators/python-v2/fastapi/package.json index e113b32b752..60c6d277f42 100644 --- a/generators/python-v2/fastapi/package.json +++ b/generators/python-v2/fastapi/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", "dist:cli": "pnpm compile && tsup ./src/cli.ts --format cjs", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -35,8 +34,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.3.5", "typescript": "5.7.2", "vitest": "^2.0.5" diff --git a/generators/python-v2/pydantic-model/package.json b/generators/python-v2/pydantic-model/package.json index d93a5a18165..96fffef0823 100644 --- a/generators/python-v2/pydantic-model/package.json +++ b/generators/python-v2/pydantic-model/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", "dist:cli": "pnpm compile && node build.cjs", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -43,8 +42,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.3.5", "typescript": "5.7.2", "vitest": "^2.0.5" diff --git a/generators/python-v2/pydantic-model/src/ModelGeneratorCli.ts b/generators/python-v2/pydantic-model/src/ModelGeneratorCli.ts index 3b190ef9f50..e9f939d465f 100644 --- a/generators/python-v2/pydantic-model/src/ModelGeneratorCli.ts +++ b/generators/python-v2/pydantic-model/src/ModelGeneratorCli.ts @@ -1,10 +1,12 @@ +import { GeneratorNotificationService } from "@fern-api/base-generator"; import { AbstractPythonGeneratorCli } from "@fern-api/base-python-generator"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { PydanticModelCustomConfigSchema } from "./ModelCustomConfig"; import { PydanticModelGeneratorContext } from "./ModelGeneratorContext"; import { generateV2Models } from "./v2/generateV2Models"; -import { GeneratorNotificationService } from "@fern-api/base-generator"; export class ModelGeneratorCLI extends AbstractPythonGeneratorCli< PydanticModelCustomConfigSchema, diff --git a/generators/python-v2/pydantic-model/src/ModelGeneratorContext.ts b/generators/python-v2/pydantic-model/src/ModelGeneratorContext.ts index 7133e94d1da..a3ff21b5d07 100644 --- a/generators/python-v2/pydantic-model/src/ModelGeneratorContext.ts +++ b/generators/python-v2/pydantic-model/src/ModelGeneratorContext.ts @@ -1,4 +1,5 @@ import { AbstractPythonGeneratorContext } from "@fern-api/base-python-generator"; + import { PydanticModelCustomConfigSchema } from "./ModelCustomConfig"; export class PydanticModelGeneratorContext extends AbstractPythonGeneratorContext { diff --git a/generators/python-v2/pydantic-model/src/v2/ObjectGenerator.ts b/generators/python-v2/pydantic-model/src/v2/ObjectGenerator.ts index cef0230701c..2fa0169a8d7 100644 --- a/generators/python-v2/pydantic-model/src/v2/ObjectGenerator.ts +++ b/generators/python-v2/pydantic-model/src/v2/ObjectGenerator.ts @@ -1,8 +1,10 @@ -import { WriteablePythonFile, pydantic, core, dt } from "@fern-api/base-python-generator"; +import { WriteablePythonFile, core, dt, pydantic } from "@fern-api/base-python-generator"; +import { RelativeFilePath } from "@fern-api/fs-utils"; import { python } from "@fern-api/python-ast"; + import { NameAndWireValue, ObjectTypeDeclaration, TypeDeclaration, TypeId } from "@fern-fern/ir-sdk/api"; + import { PydanticModelGeneratorContext } from "../ModelGeneratorContext"; -import { RelativeFilePath } from "@fern-api/fs-utils"; export class ObjectGenerator { constructor( diff --git a/generators/python-v2/pydantic-model/src/v2/WrappedAliasGenerator.ts b/generators/python-v2/pydantic-model/src/v2/WrappedAliasGenerator.ts index 5ccdc2a73a7..3db4fc0669c 100644 --- a/generators/python-v2/pydantic-model/src/v2/WrappedAliasGenerator.ts +++ b/generators/python-v2/pydantic-model/src/v2/WrappedAliasGenerator.ts @@ -1,9 +1,11 @@ -import { WriteablePythonFile, pydantic, core, dt } from "@fern-api/base-python-generator"; +import { WriteablePythonFile, core, dt, pydantic } from "@fern-api/base-python-generator"; +import { assertNever } from "@fern-api/core-utils"; +import { RelativeFilePath } from "@fern-api/fs-utils"; import { python } from "@fern-api/python-ast"; + import { AliasTypeDeclaration, PrimitiveTypeV1, TypeDeclaration, TypeId, TypeReference } from "@fern-fern/ir-sdk/api"; + import { PydanticModelGeneratorContext } from "../ModelGeneratorContext"; -import { RelativeFilePath } from "@fern-api/fs-utils"; -import { assertNever } from "@fern-api/core-utils"; export class WrappedAliasGenerator { private readonly className: string; diff --git a/generators/python-v2/pydantic-model/src/v2/generateV2Models.ts b/generators/python-v2/pydantic-model/src/v2/generateV2Models.ts index 967b01b485b..82399438316 100644 --- a/generators/python-v2/pydantic-model/src/v2/generateV2Models.ts +++ b/generators/python-v2/pydantic-model/src/v2/generateV2Models.ts @@ -1,4 +1,5 @@ import { WriteablePythonFile } from "@fern-api/base-python-generator"; + import { PydanticModelGeneratorContext } from "../ModelGeneratorContext"; import { ObjectGenerator } from "./ObjectGenerator"; import { WrappedAliasGenerator } from "./WrappedAliasGenerator"; diff --git a/generators/ruby/cli/package.json b/generators/ruby/cli/package.json index 3e81f6a7642..eeacbbe2c0a 100644 --- a/generators/ruby/cli/package.json +++ b/generators/ruby/cli/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": { @@ -41,8 +40,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" } } \ No newline at end of file diff --git a/generators/ruby/cli/src/AbstractGeneratorCli.ts b/generators/ruby/cli/src/AbstractGeneratorCli.ts index 1ba49b1b70f..aef339e5481 100644 --- a/generators/ruby/cli/src/AbstractGeneratorCli.ts +++ b/generators/ruby/cli/src/AbstractGeneratorCli.ts @@ -1,16 +1,20 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { cp, readdir } from "fs/promises"; +import tmp from "tmp-promise"; + import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService, parseGeneratorConfig } from "@fern-api/base-generator"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { Logger } from "@fern-api/logger"; import { createLoggingExecutable } from "@fern-api/logging-execa"; + import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; -import { cp, readdir } from "fs/promises"; -import tmp from "tmp-promise"; + import { loadIntermediateRepresentation } from "./loadIntermediateRepresentation"; + export abstract class AbstractGeneratorCli { public async runCli(): Promise { const pathToConfig = process.argv[process.argv.length - 1]; diff --git a/generators/ruby/cli/src/loadIntermediateRepresentation.ts b/generators/ruby/cli/src/loadIntermediateRepresentation.ts index cbca0512add..11cb2137edb 100644 --- a/generators/ruby/cli/src/loadIntermediateRepresentation.ts +++ b/generators/ruby/cli/src/loadIntermediateRepresentation.ts @@ -1,5 +1,6 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { parseIR } from "@fern-api/base-generator"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; diff --git a/generators/ruby/codegen/package.json b/generators/ruby/codegen/package.json index a54c3066f5e..02fb09c5edd 100644 --- a/generators/ruby/codegen/package.json +++ b/generators/ruby/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": { @@ -40,8 +39,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" } diff --git a/generators/ruby/codegen/src/ast/ExampleGenerator.ts b/generators/ruby/codegen/src/ast/ExampleGenerator.ts index 7c749bec5f7..07382841033 100644 --- a/generators/ruby/codegen/src/ast/ExampleGenerator.ts +++ b/generators/ruby/codegen/src/ast/ExampleGenerator.ts @@ -1,4 +1,8 @@ +import path from "path"; +import urlJoin from "url-join"; + import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { ExampleContainer, @@ -8,11 +12,13 @@ import { ExampleTypeShape, HttpEndpoint } from "@fern-fern/ir-sdk/api"; -import path from "path"; -import urlJoin from "url-join"; + import { GeneratedFile } from "../utils/GeneratedFile"; import { generateEnumNameFromValues } from "../utils/NamingUtilities"; import { Argument } from "./Argument"; +import { ExampleNode } from "./ExampleNode"; +import { Import } from "./Import"; +import { Property } from "./Property"; import { ArrayInstance, ClassReferenceFactory, @@ -23,12 +29,9 @@ import { } from "./classes/ClassReference"; import { Class_ } from "./classes/Class_"; import { AstNode } from "./core/AstNode"; -import { ExampleNode } from "./ExampleNode"; import { Expression } from "./expressions/Expression"; import { FunctionInvocation } from "./functions/FunctionInvocation"; import { Function_ } from "./functions/Function_"; -import { Import } from "./Import"; -import { Property } from "./Property"; export declare namespace ExampleGenerator { export interface Init { diff --git a/generators/ruby/codegen/src/ast/ExampleNode.ts b/generators/ruby/codegen/src/ast/ExampleNode.ts index daf100d6375..057a27100f0 100644 --- a/generators/ruby/codegen/src/ast/ExampleNode.ts +++ b/generators/ruby/codegen/src/ast/ExampleNode.ts @@ -1,5 +1,5 @@ -import { AstNode } from "./core/AstNode"; import { Import } from "./Import"; +import { AstNode } from "./core/AstNode"; export declare namespace ExampleNode { export interface Init extends AstNode.Init { diff --git a/generators/ruby/codegen/src/ast/Import.ts b/generators/ruby/codegen/src/ast/Import.ts index 52135c62a98..8f01f192b75 100644 --- a/generators/ruby/codegen/src/ast/Import.ts +++ b/generators/ruby/codegen/src/ast/Import.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, relative, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join, relative } from "@fern-api/fs-utils"; + import { AstNode } from "./core/AstNode"; export declare namespace Import { diff --git a/generators/ruby/codegen/src/ast/Module_.ts b/generators/ruby/codegen/src/ast/Module_.ts index 82287134609..4e419fcb378 100644 --- a/generators/ruby/codegen/src/ast/Module_.ts +++ b/generators/ruby/codegen/src/ast/Module_.ts @@ -1,10 +1,11 @@ import { FernFilepath } from "@fern-fern/ir-sdk/api"; + import { LocationGenerator } from "../utils/LocationGenerator"; import { BLOCK_END } from "../utils/RubyConstants"; +import { Import } from "./Import"; import { ClassReference } from "./classes/ClassReference"; import { Class_ } from "./classes/Class_"; import { AstNode } from "./core/AstNode"; -import { Import } from "./Import"; export declare namespace Module_ { export interface Init extends AstNode.Init { diff --git a/generators/ruby/codegen/src/ast/Parameter.ts b/generators/ruby/codegen/src/ast/Parameter.ts index b8300fd6a0f..7d029c82d25 100644 --- a/generators/ruby/codegen/src/ast/Parameter.ts +++ b/generators/ruby/codegen/src/ast/Parameter.ts @@ -1,8 +1,8 @@ import { Argument } from "./Argument"; -import { ClassReference, NilValue, OmittedValue } from "./classes/ClassReference"; -import { AstNode } from "./core/AstNode"; import { Import } from "./Import"; import { Variable, VariableType } from "./Variable"; +import { ClassReference, NilValue, OmittedValue } from "./classes/ClassReference"; +import { AstNode } from "./core/AstNode"; export declare namespace Parameter { export interface Init extends AstNode.Init { @@ -48,7 +48,7 @@ export class Parameter extends AstNode { this.type = type instanceof ClassReference ? [type] : type; this.defaultValue = isBlock ? undefined - : defaultValue ?? (isOptional ? (shouldOmitOptional ? OmittedValue : NilValue) : undefined); + : (defaultValue ?? (isOptional ? (shouldOmitOptional ? OmittedValue : NilValue) : undefined)); this.isNamed = isNamed || isBlock || this.defaultValue !== undefined; this.describeAsHashInYardoc = describeAsHashInYardoc; diff --git a/generators/ruby/codegen/src/ast/Property.ts b/generators/ruby/codegen/src/ast/Property.ts index ac2716f6791..8bbcb2e3d21 100644 --- a/generators/ruby/codegen/src/ast/Property.ts +++ b/generators/ruby/codegen/src/ast/Property.ts @@ -1,10 +1,11 @@ import { Name } from "@fern-fern/ir-sdk/api"; + import { Argument } from "./Argument"; -import { ClassReference } from "./classes/ClassReference"; -import { AstNode } from "./core/AstNode"; import { Import } from "./Import"; import { Parameter } from "./Parameter"; import { Variable, VariableType } from "./Variable"; +import { ClassReference } from "./classes/ClassReference"; +import { AstNode } from "./core/AstNode"; export declare namespace Property { export interface Init extends AstNode.Init { diff --git a/generators/ruby/codegen/src/ast/Yardoc.ts b/generators/ruby/codegen/src/ast/Yardoc.ts index b857f6e6955..d912e34796a 100644 --- a/generators/ruby/codegen/src/ast/Yardoc.ts +++ b/generators/ruby/codegen/src/ast/Yardoc.ts @@ -1,4 +1,8 @@ import { ObjectProperty, TypeId } from "@fern-fern/ir-sdk/api"; + +import { ExampleGenerator } from "./ExampleGenerator"; +import { Parameter } from "./Parameter"; +import { Property } from "./Property"; import { ArrayReference, ClassReference, @@ -6,10 +10,7 @@ import { DiscriminatedUnionClassReference } from "./classes/ClassReference"; import { AstNode } from "./core/AstNode"; -import { ExampleGenerator } from "./ExampleGenerator"; import { Function_ } from "./functions/Function_"; -import { Parameter } from "./Parameter"; -import { Property } from "./Property"; export interface YardocDocString { readonly name: "docString"; @@ -168,10 +169,10 @@ export class Yardoc extends AstNode { private getTypeHint(cr: ClassReference): string { return this.crf !== undefined - ? this.crf.resolvedReferences + ? (this.crf.resolvedReferences .get(cr.resolvedTypeId ?? "") ?.map((innerCr) => innerCr.typeHint) - ?.join(", ") ?? cr.typeHint + ?.join(", ") ?? cr.typeHint) : cr.typeHint; } @@ -190,8 +191,8 @@ export class Yardoc extends AstNode { this.reference.type instanceof Property ? this.reference.type.type.flatMap((prop) => this.getTypeHint(prop)).join(", ") : this.reference.type instanceof ClassReference - ? this.getTypeHint(this.reference.type) - : this.reference.type; + ? this.getTypeHint(this.reference.type) + : this.reference.type; this.addText({ stringContent: typeName, templateString: "# @return [%s] ", startingTabSpaces }); this.writeMultilineYardocComment( this.reference.type instanceof Property ? this.reference.type.documentation : [] diff --git a/generators/ruby/codegen/src/ast/abstractions/CaseStatement.ts b/generators/ruby/codegen/src/ast/abstractions/CaseStatement.ts index 1bcedc28754..5c73584bdd9 100644 --- a/generators/ruby/codegen/src/ast/abstractions/CaseStatement.ts +++ b/generators/ruby/codegen/src/ast/abstractions/CaseStatement.ts @@ -1,8 +1,8 @@ import { BLOCK_END } from "../../utils/RubyConstants"; +import { Import } from "../Import"; import { AstNode } from "../core/AstNode"; import { Expression } from "../expressions/Expression"; import { FunctionInvocation } from "../functions/FunctionInvocation"; -import { Import } from "../Import"; export declare namespace CaseStatement { export interface Init extends AstNode.Init { diff --git a/generators/ruby/codegen/src/ast/abstractions/ConditionalStatement.ts b/generators/ruby/codegen/src/ast/abstractions/ConditionalStatement.ts index 63019ca47d2..dc301fcbc50 100644 --- a/generators/ruby/codegen/src/ast/abstractions/ConditionalStatement.ts +++ b/generators/ruby/codegen/src/ast/abstractions/ConditionalStatement.ts @@ -1,7 +1,7 @@ import { BLOCK_END } from "../../utils/RubyConstants"; +import { Import } from "../Import"; import { Class_ } from "../classes/Class_"; import { AstNode } from "../core/AstNode"; -import { Import } from "../Import"; export interface Condition { rightSide?: string | AstNode; diff --git a/generators/ruby/codegen/src/ast/abstractions/DiscriminatedUnion.ts b/generators/ruby/codegen/src/ast/abstractions/DiscriminatedUnion.ts index c4a033d92a7..008ae0d44e4 100644 --- a/generators/ruby/codegen/src/ast/abstractions/DiscriminatedUnion.ts +++ b/generators/ruby/codegen/src/ast/abstractions/DiscriminatedUnion.ts @@ -1,5 +1,8 @@ import { NameAndWireValue, SingleUnionTypeProperties, SingleUnionTypeProperty } from "@fern-fern/ir-sdk/api"; + import { Argument } from "../Argument"; +import { Parameter } from "../Parameter"; +import { Property } from "../Property"; import { BooleanClassReference, ClassReference, @@ -14,8 +17,6 @@ import { AstNode } from "../core/AstNode"; import { Expression } from "../expressions/Expression"; import { FunctionInvocation } from "../functions/FunctionInvocation"; import { Function_ } from "../functions/Function_"; -import { Parameter } from "../Parameter"; -import { Property } from "../Property"; import { CaseStatement } from "./CaseStatement"; export declare namespace DiscriminatedUnion { diff --git a/generators/ruby/codegen/src/ast/abstractions/Enum.ts b/generators/ruby/codegen/src/ast/abstractions/Enum.ts index c5f404e1114..336548af704 100644 --- a/generators/ruby/codegen/src/ast/abstractions/Enum.ts +++ b/generators/ruby/codegen/src/ast/abstractions/Enum.ts @@ -1,4 +1,5 @@ import { EnumTypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { generateEnumName, generateEnumValue } from "../../utils/NamingUtilities"; import { Class_ } from "../classes/Class_"; import { Expression } from "../expressions/Expression"; diff --git a/generators/ruby/codegen/src/ast/abstractions/RescueStatement.ts b/generators/ruby/codegen/src/ast/abstractions/RescueStatement.ts index 2bf4182ecf7..66cdcd42023 100644 --- a/generators/ruby/codegen/src/ast/abstractions/RescueStatement.ts +++ b/generators/ruby/codegen/src/ast/abstractions/RescueStatement.ts @@ -1,6 +1,6 @@ import { BLOCK_END } from "../../utils/RubyConstants"; -import { AstNode } from "../core/AstNode"; import { Import } from "../Import"; +import { AstNode } from "../core/AstNode"; export declare namespace RescueStatement { export interface Init extends AstNode.Init { diff --git a/generators/ruby/codegen/src/ast/abstractions/SerializableObject.ts b/generators/ruby/codegen/src/ast/abstractions/SerializableObject.ts index 88e95b32835..f5afb6741ba 100644 --- a/generators/ruby/codegen/src/ast/abstractions/SerializableObject.ts +++ b/generators/ruby/codegen/src/ast/abstractions/SerializableObject.ts @@ -1,4 +1,7 @@ import { Argument } from "../Argument"; +import { Parameter } from "../Parameter"; +import { Property } from "../Property"; +import { Variable, VariableType } from "../Variable"; import { AliasReference, ArrayReference, @@ -18,9 +21,6 @@ import { AstNode } from "../core/AstNode"; import { Expression } from "../expressions/Expression"; import { FunctionInvocation } from "../functions/FunctionInvocation"; import { Function_ } from "../functions/Function_"; -import { Parameter } from "../Parameter"; -import { Property } from "../Property"; -import { Variable, VariableType } from "../Variable"; import { ConditionalStatement } from "./ConditionalStatement"; export const AdditionalPropertiesProperty = new Property({ diff --git a/generators/ruby/codegen/src/ast/abstractions/UndiscriminatedUnion.ts b/generators/ruby/codegen/src/ast/abstractions/UndiscriminatedUnion.ts index 012f5e60d2a..98b49d58263 100644 --- a/generators/ruby/codegen/src/ast/abstractions/UndiscriminatedUnion.ts +++ b/generators/ruby/codegen/src/ast/abstractions/UndiscriminatedUnion.ts @@ -1,4 +1,5 @@ import { Argument } from "../Argument"; +import { Parameter } from "../Parameter"; import { ClassReference, GenericClassReference, @@ -10,7 +11,6 @@ import { Class_ } from "../classes/Class_"; import { Expression } from "../expressions/Expression"; import { FunctionInvocation } from "../functions/FunctionInvocation"; import { Function_ } from "../functions/Function_"; -import { Parameter } from "../Parameter"; import { ConditionalStatement } from "./ConditionalStatement"; import { RescueStatement } from "./RescueStatement"; diff --git a/generators/ruby/codegen/src/ast/classes/ClassReference.ts b/generators/ruby/codegen/src/ast/classes/ClassReference.ts index 34dd0ba2415..20b614544d8 100644 --- a/generators/ruby/codegen/src/ast/classes/ClassReference.ts +++ b/generators/ruby/codegen/src/ast/classes/ClassReference.ts @@ -1,3 +1,5 @@ +import { format } from "util"; + import { AliasTypeDeclaration, ContainerType, @@ -16,17 +18,17 @@ import { TypeReference, UndiscriminatedUnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; -import { format } from "util"; + import { LocationGenerator } from "../../utils/LocationGenerator"; -import { ConditionalStatement } from "../abstractions/ConditionalStatement"; import { Argument } from "../Argument"; +import { Import } from "../Import"; +import { Property } from "../Property"; +import { Variable } from "../Variable"; +import { ConditionalStatement } from "../abstractions/ConditionalStatement"; import { AstNode } from "../core/AstNode"; import { Expression } from "../expressions/Expression"; import { FunctionInvocation } from "../functions/FunctionInvocation"; import { Function_ } from "../functions/Function_"; -import { Import } from "../Import"; -import { Property } from "../Property"; -import { Variable } from "../Variable"; enum RubyClass { INTEGER = "Integer", diff --git a/generators/ruby/codegen/src/ast/classes/Class_.ts b/generators/ruby/codegen/src/ast/classes/Class_.ts index d4bef1968e6..31d6a9ca781 100644 --- a/generators/ruby/codegen/src/ast/classes/Class_.ts +++ b/generators/ruby/codegen/src/ast/classes/Class_.ts @@ -1,12 +1,12 @@ import { BLOCK_END } from "../../utils/RubyConstants"; import { Argument } from "../Argument"; +import { Import } from "../Import"; +import { Property } from "../Property"; +import { Yardoc } from "../Yardoc"; import { AstNode } from "../core/AstNode"; import { Expression } from "../expressions/Expression"; import { FunctionInvocation } from "../functions/FunctionInvocation"; import { Function_ } from "../functions/Function_"; -import { Import } from "../Import"; -import { Property } from "../Property"; -import { Yardoc } from "../Yardoc"; import { ClassReference } from "./ClassReference"; export declare namespace Class_ { @@ -87,7 +87,7 @@ export class Class_ extends AstNode { } this.functions = functions; this.expressions = expressions; - this.children = children instanceof AstNode ? [children] : children ?? []; + this.children = children instanceof AstNode ? [children] : (children ?? []); this.yardoc = this.documentation != null diff --git a/generators/ruby/codegen/src/ast/core/AstNode.ts b/generators/ruby/codegen/src/ast/core/AstNode.ts index 300f3c72b3e..646eb0ea0bd 100644 --- a/generators/ruby/codegen/src/ast/core/AstNode.ts +++ b/generators/ruby/codegen/src/ast/core/AstNode.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { format } from "util"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { Import } from "../Import"; export enum NewLinePlacement { @@ -91,8 +93,8 @@ export abstract class AstNode { filePath !== undefined ? i.writeRelative(startingTabSpaces, filePath) : pathPrefix !== undefined - ? i.writeAbsolute(startingTabSpaces, pathPrefix) - : i.write({ startingTabSpaces }), + ? i.writeAbsolute(startingTabSpaces, pathPrefix) + : i.write({ startingTabSpaces }), startingTabSpaces }) ); diff --git a/generators/ruby/codegen/src/ast/expressions/Expression.ts b/generators/ruby/codegen/src/ast/expressions/Expression.ts index 9815d88346e..44d2db71af3 100644 --- a/generators/ruby/codegen/src/ast/expressions/Expression.ts +++ b/generators/ruby/codegen/src/ast/expressions/Expression.ts @@ -1,6 +1,6 @@ -import { AstNode } from "../core/AstNode"; import { Import } from "../Import"; import { Yardoc } from "../Yardoc"; +import { AstNode } from "../core/AstNode"; export declare namespace Expression { export interface Init extends AstNode.Init { diff --git a/generators/ruby/codegen/src/ast/functions/FunctionInvocation.ts b/generators/ruby/codegen/src/ast/functions/FunctionInvocation.ts index cad89319a36..1ac0c3ed98b 100644 --- a/generators/ruby/codegen/src/ast/functions/FunctionInvocation.ts +++ b/generators/ruby/codegen/src/ast/functions/FunctionInvocation.ts @@ -1,9 +1,9 @@ import { BLOCK_END } from "../../utils/RubyConstants"; import { Argument } from "../Argument"; -import { Class_ } from "../classes/Class_"; -import { AstNode } from "../core/AstNode"; import { Import } from "../Import"; import { Variable } from "../Variable"; +import { Class_ } from "../classes/Class_"; +import { AstNode } from "../core/AstNode"; import { Function_ } from "./Function_"; export interface BlockConfiguration { diff --git a/generators/ruby/codegen/src/ast/functions/Function_.ts b/generators/ruby/codegen/src/ast/functions/Function_.ts index b0d61f1810c..cfc15bf3e2a 100644 --- a/generators/ruby/codegen/src/ast/functions/Function_.ts +++ b/generators/ruby/codegen/src/ast/functions/Function_.ts @@ -1,13 +1,14 @@ import { ObjectProperty, TypeId } from "@fern-fern/ir-sdk/api"; + import { BLOCK_END } from "../../utils/RubyConstants"; import { Argument } from "../Argument"; -import { ClassReference, ClassReferenceFactory } from "../classes/ClassReference"; -import { Class_ } from "../classes/Class_"; -import { AstNode } from "../core/AstNode"; import { ExampleGenerator } from "../ExampleGenerator"; import { Import } from "../Import"; import { Parameter } from "../Parameter"; import { Yardoc } from "../Yardoc"; +import { ClassReference, ClassReferenceFactory } from "../classes/ClassReference"; +import { Class_ } from "../classes/Class_"; +import { AstNode } from "../core/AstNode"; import { FunctionInvocation } from "./FunctionInvocation"; export declare namespace Function_ { @@ -122,8 +123,8 @@ export class Function_ extends AstNode { return this.invocationName != null ? this.invocationName : fullPath - ? [...this.packagePath, this.name].join(".") - : this.name; + ? [...this.packagePath, this.name].join(".") + : this.name; } public generateSnippet(clientName: string): AstNode | string | undefined { diff --git a/generators/ruby/codegen/src/ast/gem/Gemspec.ts b/generators/ruby/codegen/src/ast/gem/Gemspec.ts index 27f6a387e6a..830c350191b 100644 --- a/generators/ruby/codegen/src/ast/gem/Gemspec.ts +++ b/generators/ruby/codegen/src/ast/gem/Gemspec.ts @@ -1,12 +1,11 @@ // Note a gemspec for us is just a Ruby class and we configure - import { MINIMUM_RUBY_VERSION } from "../../utils/RubyUtilities"; +import { ExternalDependency } from "../ExternalDependency"; +import { Import } from "../Import"; import { ClassReference } from "../classes/ClassReference"; import { Expression } from "../expressions/Expression"; -import { ExternalDependency } from "../ExternalDependency"; import { FunctionInvocation } from "../functions/FunctionInvocation"; import { Function_ } from "../functions/Function_"; -import { Import } from "../Import"; export declare namespace Gemspec { export interface Init { diff --git a/generators/ruby/codegen/src/utils/GeneratedFile.ts b/generators/ruby/codegen/src/utils/GeneratedFile.ts index 3b7bec7ce7f..bb73db27be3 100644 --- a/generators/ruby/codegen/src/utils/GeneratedFile.ts +++ b/generators/ruby/codegen/src/utils/GeneratedFile.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 GeneratedFile { public filename: string; public directory: RelativeFilePath | AbsoluteFilePath; diff --git a/generators/ruby/codegen/src/utils/GeneratedRubyFile.ts b/generators/ruby/codegen/src/utils/GeneratedRubyFile.ts index e5d6ffc0550..b512c864ae4 100644 --- a/generators/ruby/codegen/src/utils/GeneratedRubyFile.ts +++ b/generators/ruby/codegen/src/utils/GeneratedRubyFile.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import path from "path"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { AstNode } from "../ast/core/AstNode"; import { GeneratedFile } from "./GeneratedFile"; import { FROZEN_STRING_PREFIX } from "./RubyConstants"; diff --git a/generators/ruby/codegen/src/utils/LocationGenerator.ts b/generators/ruby/codegen/src/utils/LocationGenerator.ts index fcdd20483ba..df05f530df6 100644 --- a/generators/ruby/codegen/src/utils/LocationGenerator.ts +++ b/generators/ruby/codegen/src/utils/LocationGenerator.ts @@ -1,5 +1,7 @@ -import { DeclaredServiceName, DeclaredTypeName, FernFilepath } from "@fern-fern/ir-sdk/api"; import { snakeCase } from "lodash-es"; + +import { DeclaredServiceName, DeclaredTypeName, FernFilepath } from "@fern-fern/ir-sdk/api"; + import { TYPES_DIRECTORY, TYPES_MODULE } from "./RubyConstants"; export class LocationGenerator { diff --git a/generators/ruby/codegen/src/utils/RubyUtilities.ts b/generators/ruby/codegen/src/utils/RubyUtilities.ts index e50466974b5..8cfbb727558 100644 --- a/generators/ruby/codegen/src/utils/RubyUtilities.ts +++ b/generators/ruby/codegen/src/utils/RubyUtilities.ts @@ -1,12 +1,15 @@ +import { camelCase, snakeCase, upperFirst } from "lodash-es"; + import { RelativeFilePath } from "@fern-api/fs-utils"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { BasicLicense, CustomLicense } from "@fern-fern/generator-exec-sdk/api"; import { FernFilepath } from "@fern-fern/ir-sdk/api"; -import { camelCase, snakeCase, upperFirst } from "lodash-es"; -import { Expression } from "../ast/expressions/Expression"; + import { ExternalDependency } from "../ast/ExternalDependency"; -import { Gemspec } from "../ast/gem/Gemspec"; import { Module_ } from "../ast/Module_"; +import { Expression } from "../ast/expressions/Expression"; +import { Gemspec } from "../ast/gem/Gemspec"; import { GeneratedFile } from "./GeneratedFile"; import { GeneratedRubyFile } from "./GeneratedRubyFile"; diff --git a/generators/ruby/model/package.json b/generators/ruby/model/package.json index 65e0708d72d..b4699b08bb1 100644 --- a/generators/ruby/model/package.json +++ b/generators/ruby/model/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", "dist:cli": "pnpm compile && tsup ./src/cli.ts --format cjs", "publish:cli": "pnpm dist:cli && cd dist && yarn npm publish", @@ -44,8 +43,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "ts-loader": "^9.3.1", "tsup": "^8.3.5", "typescript": "5.7.2", diff --git a/generators/ruby/model/src/AbstractionUtilities.ts b/generators/ruby/model/src/AbstractionUtilities.ts index 37573526ecb..458465c6728 100644 --- a/generators/ruby/model/src/AbstractionUtilities.ts +++ b/generators/ruby/model/src/AbstractionUtilities.ts @@ -8,6 +8,7 @@ import { SerializableObject, UndiscriminatedUnion } from "@fern-api/ruby-codegen"; + import { AliasTypeDeclaration, EnumTypeDeclaration, diff --git a/generators/ruby/model/src/CustomConfig.ts b/generators/ruby/model/src/CustomConfig.ts index ee495bbb574..904215bb860 100644 --- a/generators/ruby/model/src/CustomConfig.ts +++ b/generators/ruby/model/src/CustomConfig.ts @@ -1,6 +1,7 @@ -import { BaseGeneratorConfigSchema } from "@fern-api/ruby-codegen"; import { z } from "zod"; +import { BaseGeneratorConfigSchema } from "@fern-api/ruby-codegen"; + export type RubyModelCustomConfig = z.infer; export const RubyModelCustomConfigSchema = BaseGeneratorConfigSchema.extend({}); diff --git a/generators/ruby/model/src/GeneratorCli.ts b/generators/ruby/model/src/GeneratorCli.ts index 9e9660f0dce..9df4b57fc12 100644 --- a/generators/ruby/model/src/GeneratorCli.ts +++ b/generators/ruby/model/src/GeneratorCli.ts @@ -1,10 +1,12 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { cp } from "fs/promises"; + import { AbstractGeneratorContext, getPackageName, getSdkVersion } from "@fern-api/base-generator"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { loggingExeca } from "@fern-api/logging-execa"; import { + GeneratedFile, generateBasicRakefile, generateBasicTests, - GeneratedFile, generateGemConfig, generateGemfile, generateGemspec, @@ -16,10 +18,11 @@ import { getGemName } from "@fern-api/ruby-codegen"; import { AbstractGeneratorCli } from "@fern-api/ruby-generator-cli"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; -import { cp } from "fs/promises"; -import { parseCustomConfig, RubyModelCustomConfig } from "./CustomConfig"; + +import { RubyModelCustomConfig, parseCustomConfig } from "./CustomConfig"; import { TypesGenerator } from "./TypesGenerator"; export class RubyModelGeneratorCli extends AbstractGeneratorCli { diff --git a/generators/ruby/model/src/TypesGenerator.ts b/generators/ruby/model/src/TypesGenerator.ts index 0baf6f7ddd6..ff4ad966e94 100644 --- a/generators/ruby/model/src/TypesGenerator.ts +++ b/generators/ruby/model/src/TypesGenerator.ts @@ -1,5 +1,6 @@ import { AbstractGeneratorContext } from "@fern-api/base-generator"; import { ClassReferenceFactory, Class_, GeneratedRubyFile, LocationGenerator, Module_ } from "@fern-api/ruby-codegen"; + import { AliasTypeDeclaration, DeclaredTypeName, @@ -14,6 +15,7 @@ import { UndiscriminatedUnionTypeDeclaration, UnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { generateAliasDefinitionFromTypeDeclaration, generateEnumDefinitionFromTypeDeclaration, @@ -84,7 +86,7 @@ export class TypesGenerator { const td = this.types.get(typeId); return td === undefined ? [] - : this.flattenedProperties.get(typeId) ?? + : (this.flattenedProperties.get(typeId) ?? td.shape._visit({ alias: (atd: AliasTypeDeclaration) => { return atd.aliasOf._visit({ @@ -122,7 +124,7 @@ export class TypesGenerator { _other: () => { throw new Error("Attempting to type declaration for an unknown type."); } - }); + })); } // Create a main file for the gem, this just contains imports to all the types diff --git a/generators/ruby/sdk/package.json b/generators/ruby/sdk/package.json index 4a338c86b93..deec4b91488 100644 --- a/generators/ruby/sdk/package.json +++ b/generators/ruby/sdk/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", "env:prod": "env-cmd -r .env-cmdrc.cjs -e prod", "dist:cli": "pnpm compile && tsup ./src/cli.ts --format cjs", @@ -46,8 +45,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.3.5", "typescript": "5.7.2", "vitest": "^2.1.8", diff --git a/generators/ruby/sdk/src/AbstractionUtilities.ts b/generators/ruby/sdk/src/AbstractionUtilities.ts index 0d854da2364..1b15a7ca0c6 100644 --- a/generators/ruby/sdk/src/AbstractionUtilities.ts +++ b/generators/ruby/sdk/src/AbstractionUtilities.ts @@ -1,3 +1,5 @@ +import { format } from "util"; + import { Argument, AstNode, @@ -11,7 +13,6 @@ import { Function_, GeneratedRubyFile, GenericClassReference, - getBreadcrumbsFromFilepath, HashInstance, HashReference, Import, @@ -21,8 +22,10 @@ import { Property, StringClassReference, Variable, - VariableType + VariableType, + getBreadcrumbsFromFilepath } from "@fern-api/ruby-codegen"; + import { EnvironmentId, EnvironmentsConfig, @@ -42,14 +45,14 @@ import { Subpackage, TypeId } from "@fern-fern/ir-sdk/api"; -import { format } from "util"; + import { ArtifactRegistry } from "./utils/ArtifactRegistry"; import { EndpointGenerator } from "./utils/EndpointGenerator"; import { FileUploadUtility } from "./utils/FileUploadUtility"; import { HeadersGenerator } from "./utils/HeadersGenerator"; import { IdempotencyRequestOptions } from "./utils/IdempotencyRequestOptionsClass"; -import { OauthFunction, OauthTokenProvider } from "./utils/oauth/OauthTokenProvider"; import { RequestOptions } from "./utils/RequestOptionsClass"; +import { OauthFunction, OauthTokenProvider } from "./utils/oauth/OauthTokenProvider"; export interface ClientClassPair { subpackageName: Name; diff --git a/generators/ruby/sdk/src/ClientsGenerator.ts b/generators/ruby/sdk/src/ClientsGenerator.ts index 4e248eb1bf5..3e5b225f2c7 100644 --- a/generators/ruby/sdk/src/ClientsGenerator.ts +++ b/generators/ruby/sdk/src/ClientsGenerator.ts @@ -10,6 +10,7 @@ import { Module_, Property } from "@fern-api/ruby-codegen"; + import { HttpService, IntermediateRepresentation, @@ -21,6 +22,7 @@ import { SubpackageId, TypeId } from "@fern-fern/ir-sdk/api"; + import { ClientClassPair, generateDummyRootClient, @@ -39,10 +41,10 @@ import { ArtifactRegistry } from "./utils/ArtifactRegistry"; import { FileUploadUtility } from "./utils/FileUploadUtility"; import { HeadersGenerator } from "./utils/HeadersGenerator"; import { IdempotencyRequestOptions } from "./utils/IdempotencyRequestOptionsClass"; -import { AccessToken } from "./utils/oauth/AccessToken"; -import { OauthTokenProvider } from "./utils/oauth/OauthTokenProvider"; import { RequestOptions } from "./utils/RequestOptionsClass"; import { RootImportsFile } from "./utils/RootImportsFile"; +import { AccessToken } from "./utils/oauth/AccessToken"; +import { OauthTokenProvider } from "./utils/oauth/OauthTokenProvider"; // TODO: This (as an abstract class) will probably be used across CLIs export class ClientsGenerator { diff --git a/generators/ruby/sdk/src/CustomConfig.ts b/generators/ruby/sdk/src/CustomConfig.ts index 4df593641ba..b387d9afa68 100644 --- a/generators/ruby/sdk/src/CustomConfig.ts +++ b/generators/ruby/sdk/src/CustomConfig.ts @@ -1,6 +1,7 @@ -import { BaseGeneratorConfigSchema, ExtraDependenciesSchema } from "@fern-api/ruby-codegen"; import { z } from "zod"; +import { BaseGeneratorConfigSchema, ExtraDependenciesSchema } from "@fern-api/ruby-codegen"; + export type RubySdkCustomConfig = z.infer; export const RubySdkCustomConfigSchema = BaseGeneratorConfigSchema.extend({ defaultTimeoutInSeconds: z.optional(z.union([z.literal("infinity"), z.number()])), diff --git a/generators/ruby/sdk/src/GeneratorCli.ts b/generators/ruby/sdk/src/GeneratorCli.ts index 586fcdaa9e2..9bdaedcc36e 100644 --- a/generators/ruby/sdk/src/GeneratorCli.ts +++ b/generators/ruby/sdk/src/GeneratorCli.ts @@ -1,14 +1,17 @@ +import { cp } from "fs/promises"; + +import { AbstractGeneratorContext, getPackageName, getSdkVersion } from "@fern-api/base-generator"; import { TypesGenerator } from "@fern-api/fern-ruby-model"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { AbstractGeneratorContext, getPackageName, getSdkVersion } from "@fern-api/base-generator"; import { loggingExeca } from "@fern-api/logging-execa"; import { ClassReferenceFactory, Class_, ExternalDependency, + GeneratedFile, + LocationGenerator, generateBasicRakefile, generateBasicTests, - GeneratedFile, generateGemConfig, generateGemfile, generateGemspec, @@ -17,15 +20,15 @@ import { generateReadme, generateRubocopConfig, getClientName, - getGemName, - LocationGenerator + getGemName } from "@fern-api/ruby-codegen"; import { AbstractGeneratorCli } from "@fern-api/ruby-generator-cli"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { IntermediateRepresentation, ObjectProperty, TypeId } from "@fern-fern/ir-sdk/api"; -import { cp } from "fs/promises"; + import { ClientsGenerator } from "./ClientsGenerator"; -import { parseCustomConfig, RubySdkCustomConfigConsumed } from "./CustomConfig"; +import { RubySdkCustomConfigConsumed, parseCustomConfig } from "./CustomConfig"; export class RubySdkGeneratorCli extends AbstractGeneratorCli { generatedFiles: GeneratedFile[] = []; diff --git a/generators/ruby/sdk/src/utils/ArtifactRegistry.ts b/generators/ruby/sdk/src/utils/ArtifactRegistry.ts index 4e20cf56229..8d483e81ad2 100644 --- a/generators/ruby/sdk/src/utils/ArtifactRegistry.ts +++ b/generators/ruby/sdk/src/utils/ArtifactRegistry.ts @@ -1,4 +1,5 @@ import { ClassReference, Function_ } from "@fern-api/ruby-codegen"; + import { EndpointId } from "@fern-fern/ir-sdk/api"; // Note we currently only register the sync endpoint and sync client for the below, for simplicity. diff --git a/generators/ruby/sdk/src/utils/EndpointGenerator.ts b/generators/ruby/sdk/src/utils/EndpointGenerator.ts index 605890a974b..2db89213fd3 100644 --- a/generators/ruby/sdk/src/utils/EndpointGenerator.ts +++ b/generators/ruby/sdk/src/utils/EndpointGenerator.ts @@ -28,6 +28,7 @@ import { VariableType, VoidClassReference } from "@fern-api/ruby-codegen"; + import { BytesRequest, ExampleEndpointCall, @@ -42,6 +43,7 @@ import { TypeId, TypeReference } from "@fern-fern/ir-sdk/api"; + import { FileUploadUtility } from "./FileUploadUtility"; import { IdempotencyRequestOptions } from "./IdempotencyRequestOptionsClass"; import { RequestOptions } from "./RequestOptionsClass"; diff --git a/generators/ruby/sdk/src/utils/HeadersGenerator.ts b/generators/ruby/sdk/src/utils/HeadersGenerator.ts index 38e235d3644..e858a29c90e 100644 --- a/generators/ruby/sdk/src/utils/HeadersGenerator.ts +++ b/generators/ruby/sdk/src/utils/HeadersGenerator.ts @@ -12,6 +12,7 @@ import { Property, StringClassReference } from "@fern-api/ruby-codegen"; + import { ApiAuth, AuthSchemesRequirement, @@ -21,8 +22,9 @@ import { HttpHeader, OAuthScheme } from "@fern-fern/ir-sdk/api"; -import { OauthTokenProvider } from "./oauth/OauthTokenProvider"; + import { isTypeOptional } from "./TypeUtilities"; +import { OauthTokenProvider } from "./oauth/OauthTokenProvider"; export interface BasicAuth { username: string; diff --git a/generators/ruby/sdk/src/utils/IdempotencyRequestOptionsClass.ts b/generators/ruby/sdk/src/utils/IdempotencyRequestOptionsClass.ts index 7108d559a06..4ca4ebb1acc 100644 --- a/generators/ruby/sdk/src/utils/IdempotencyRequestOptionsClass.ts +++ b/generators/ruby/sdk/src/utils/IdempotencyRequestOptionsClass.ts @@ -7,7 +7,9 @@ import { Property, Variable } from "@fern-api/ruby-codegen"; + import { HttpHeader } from "@fern-fern/ir-sdk/api"; + import { RequestOptions } from "./RequestOptionsClass"; export declare namespace IdempotencyRequestOptions { diff --git a/generators/ruby/sdk/src/utils/RequestOptionsClass.ts b/generators/ruby/sdk/src/utils/RequestOptionsClass.ts index 14ac4694d29..767f513c24e 100644 --- a/generators/ruby/sdk/src/utils/RequestOptionsClass.ts +++ b/generators/ruby/sdk/src/utils/RequestOptionsClass.ts @@ -12,6 +12,7 @@ import { StringClassReference, Variable } from "@fern-api/ruby-codegen"; + import { HeadersGenerator } from "./HeadersGenerator"; export declare namespace RequestOptions { diff --git a/generators/ruby/sdk/src/utils/oauth/AccessToken.ts b/generators/ruby/sdk/src/utils/oauth/AccessToken.ts index ffb4f6f1198..406240817de 100644 --- a/generators/ruby/sdk/src/utils/oauth/AccessToken.ts +++ b/generators/ruby/sdk/src/utils/oauth/AccessToken.ts @@ -6,6 +6,7 @@ import { StringClassReference, TimeClassReference } from "@fern-api/ruby-codegen"; + import { OAuthConfiguration } from "@fern-fern/ir-sdk/api"; export class AccessToken extends Class_ { diff --git a/generators/ruby/sdk/src/utils/oauth/OauthTokenProvider.ts b/generators/ruby/sdk/src/utils/oauth/OauthTokenProvider.ts index c1a803e8944..f19536735df 100644 --- a/generators/ruby/sdk/src/utils/oauth/OauthTokenProvider.ts +++ b/generators/ruby/sdk/src/utils/oauth/OauthTokenProvider.ts @@ -12,6 +12,7 @@ import { Property, StringClassReference } from "@fern-api/ruby-codegen"; + import { OAuthAccessTokenProperties, ResponseProperty } from "@fern-fern/ir-sdk/api"; export interface OauthFunction { diff --git a/generators/swift/codegen/package.json b/generators/swift/codegen/package.json index e19fa90fd5d..0ca3f819dde 100644 --- a/generators/swift/codegen/package.json +++ b/generators/swift/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": { @@ -38,8 +37,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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" } diff --git a/generators/swift/codegen/src/ast/Enum.ts b/generators/swift/codegen/src/ast/Enum.ts index da68c79a907..bfdb9207ba7 100644 --- a/generators/swift/codegen/src/ast/Enum.ts +++ b/generators/swift/codegen/src/ast/Enum.ts @@ -1,5 +1,5 @@ -import { AstNode, Writer } from "./core"; import Swift, { AccessLevel, EnumCase, Type } from ".."; +import { AstNode, Writer } from "./core"; export declare namespace Enum { interface Args { diff --git a/generators/swift/codegen/src/ast/EnumCase.ts b/generators/swift/codegen/src/ast/EnumCase.ts index 955d4c598de..bc45ba0c5ea 100644 --- a/generators/swift/codegen/src/ast/EnumCase.ts +++ b/generators/swift/codegen/src/ast/EnumCase.ts @@ -1,5 +1,5 @@ -import { AstNode, Writer } from "./core"; import Swift from ".."; +import { AstNode, Writer } from "./core"; export declare namespace EnumCase { interface Args { diff --git a/generators/swift/codegen/src/ast/Field.ts b/generators/swift/codegen/src/ast/Field.ts index 9c4214245d5..ed7ff61d41a 100644 --- a/generators/swift/codegen/src/ast/Field.ts +++ b/generators/swift/codegen/src/ast/Field.ts @@ -1,6 +1,6 @@ -import { AstNode, Writer } from "./core"; import Swift, { AccessLevel, Type } from ".."; import { VariableType } from "./VariableType"; +import { AstNode, Writer } from "./core"; export declare namespace Field { interface Args { diff --git a/generators/swift/codegen/src/ast/File.ts b/generators/swift/codegen/src/ast/File.ts index fceafdca260..893bc0dbfa4 100644 --- a/generators/swift/codegen/src/ast/File.ts +++ b/generators/swift/codegen/src/ast/File.ts @@ -1,5 +1,5 @@ -import { AstNode, Writer } from "./core"; import Swift, { FileHeader, Import } from "../"; +import { AstNode, Writer } from "./core"; export declare namespace File { interface Args { diff --git a/generators/swift/codegen/src/ast/FileHeader.ts b/generators/swift/codegen/src/ast/FileHeader.ts index c953b272f1f..f01a77ce71e 100644 --- a/generators/swift/codegen/src/ast/FileHeader.ts +++ b/generators/swift/codegen/src/ast/FileHeader.ts @@ -1,5 +1,5 @@ -import { AstNode, Writer } from "./core"; import Swift from ".."; +import { AstNode, Writer } from "./core"; export declare namespace FileHeader { interface Args { diff --git a/generators/swift/codegen/src/ast/Func.ts b/generators/swift/codegen/src/ast/Func.ts index 9d7f9132817..f3f4e81762d 100644 --- a/generators/swift/codegen/src/ast/Func.ts +++ b/generators/swift/codegen/src/ast/Func.ts @@ -1,5 +1,5 @@ -import { AstNode, Writer } from "./core"; import Swift, { AccessLevel, FunctionModifier, Param, Type } from ".."; +import { AstNode, Writer } from "./core"; /* diff --git a/generators/swift/codegen/src/ast/Import.ts b/generators/swift/codegen/src/ast/Import.ts index 25d49cb04e5..a621acdcc42 100644 --- a/generators/swift/codegen/src/ast/Import.ts +++ b/generators/swift/codegen/src/ast/Import.ts @@ -1,5 +1,5 @@ -import { AstNode, Writer } from "./core"; import Swift from ".."; +import { AstNode, Writer } from "./core"; export declare namespace Import { interface Args { diff --git a/generators/swift/codegen/src/ast/Param.ts b/generators/swift/codegen/src/ast/Param.ts index 202695f2bbf..b6159bacd0e 100644 --- a/generators/swift/codegen/src/ast/Param.ts +++ b/generators/swift/codegen/src/ast/Param.ts @@ -1,5 +1,5 @@ -import { AstNode, Writer } from "./core"; import Swift, { Type } from ".."; +import { AstNode, Writer } from "./core"; /* diff --git a/generators/swift/codegen/src/ast/Primative.ts b/generators/swift/codegen/src/ast/Primative.ts index 732d3549e89..bdfc9a274b3 100644 --- a/generators/swift/codegen/src/ast/Primative.ts +++ b/generators/swift/codegen/src/ast/Primative.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { Type } from "./Type"; /* diff --git a/generators/swift/codegen/src/ast/Struct.ts b/generators/swift/codegen/src/ast/Struct.ts index e9cd3487158..fbcd6fc340c 100644 --- a/generators/swift/codegen/src/ast/Struct.ts +++ b/generators/swift/codegen/src/ast/Struct.ts @@ -1,6 +1,6 @@ -import { AstNode, Writer } from "./core"; import Swift, { AccessLevel, Type } from ".."; import { Field } from "./Field"; +import { AstNode, Writer } from "./core"; /* diff --git a/generators/swift/codegen/src/ast/Type.ts b/generators/swift/codegen/src/ast/Type.ts index 9e96384d2fa..acb4492e379 100644 --- a/generators/swift/codegen/src/ast/Type.ts +++ b/generators/swift/codegen/src/ast/Type.ts @@ -1,6 +1,6 @@ -import { AstNode, Writer } from "./core"; import Swift, { AccessLevel, ClassLevel, Enum, Func } from ".."; import { Field } from "./Field"; +import { AstNode, Writer } from "./core"; /* diff --git a/generators/swift/codegen/src/ast/TypeAlias.ts b/generators/swift/codegen/src/ast/TypeAlias.ts index ee8d33f0f9d..35052a0e2a9 100644 --- a/generators/swift/codegen/src/ast/TypeAlias.ts +++ b/generators/swift/codegen/src/ast/TypeAlias.ts @@ -1,7 +1,7 @@ -import { AstNode, Writer } from "./core"; import Swift from ".."; import { AccessLevel } from "./AccessLevel"; import { Type } from "./Type"; +import { AstNode, Writer } from "./core"; export declare namespace TypeAlias { interface Args { diff --git a/generators/swift/codegen/src/ast/core/AstNode.ts b/generators/swift/codegen/src/ast/core/AstNode.ts index c7cb2ff69ef..0705da8120f 100644 --- a/generators/swift/codegen/src/ast/core/AstNode.ts +++ b/generators/swift/codegen/src/ast/core/AstNode.ts @@ -1,4 +1,5 @@ import { AbstractAstNode } from "@fern-api/base-generator"; + import { Writer } from "./Writer"; export abstract class AstNode extends AbstractAstNode { diff --git a/generators/swift/codegen/src/project/SwiftFile.ts b/generators/swift/codegen/src/project/SwiftFile.ts index 198f11014d4..1f2d636ea79 100644 --- a/generators/swift/codegen/src/project/SwiftFile.ts +++ b/generators/swift/codegen/src/project/SwiftFile.ts @@ -1,5 +1,6 @@ import { File } from "@fern-api/base-generator"; import { RelativeFilePath } from "@fern-api/fs-utils"; + import { Enum } from "../ast/Enum"; import { Struct } from "../ast/Struct"; diff --git a/generators/typescript-v2/ast/package.json b/generators/typescript-v2/ast/package.json index a8390eec36b..7739ac06f37 100644 --- a/generators/typescript-v2/ast/package.json +++ b/generators/typescript-v2/ast/package.json @@ -22,19 +22,22 @@ "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": { + "prettier2": "npm:prettier@^2.7.1" + }, "devDependencies": { "@fern-api/browser-compatible-base-generator": "workspace:*", "@fern-api/core-utils": "workspace:*", "@fern-fern/ir-sdk": "53.23.0", "@types/jest": "^29.5.14", "@types/node": "18.15.3", + "@types/prettier2": "npm:@types/prettier@^2.7.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" } diff --git a/generators/typescript-v2/ast/src/ast/ClassInstantiation.ts b/generators/typescript-v2/ast/src/ast/ClassInstantiation.ts index 7b211e8ffba..ecac97d5535 100644 --- a/generators/typescript-v2/ast/src/ast/ClassInstantiation.ts +++ b/generators/typescript-v2/ast/src/ast/ClassInstantiation.ts @@ -1,6 +1,6 @@ +import { Reference } from "./Reference"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Reference } from "./Reference"; export declare namespace ClassInstantiation { interface Args { diff --git a/generators/typescript-v2/ast/src/ast/CodeBlock.ts b/generators/typescript-v2/ast/src/ast/CodeBlock.ts index 3ca51ecfc80..a5c08119ce1 100644 --- a/generators/typescript-v2/ast/src/ast/CodeBlock.ts +++ b/generators/typescript-v2/ast/src/ast/CodeBlock.ts @@ -1,4 +1,5 @@ import { CodeBlock as CommonCodeBlock } from "@fern-api/browser-compatible-base-generator"; + import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; diff --git a/generators/typescript-v2/ast/src/ast/FunctionInvocation.ts b/generators/typescript-v2/ast/src/ast/FunctionInvocation.ts index f29797fc112..bbac0e75f42 100644 --- a/generators/typescript-v2/ast/src/ast/FunctionInvocation.ts +++ b/generators/typescript-v2/ast/src/ast/FunctionInvocation.ts @@ -1,6 +1,6 @@ +import { Reference } from "./Reference"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Reference } from "./Reference"; export declare namespace FunctionInvocation { interface Args { diff --git a/generators/typescript-v2/ast/src/ast/Method.ts b/generators/typescript-v2/ast/src/ast/Method.ts index 97804466ef3..37c74f8adac 100644 --- a/generators/typescript-v2/ast/src/ast/Method.ts +++ b/generators/typescript-v2/ast/src/ast/Method.ts @@ -1,9 +1,9 @@ import { CodeBlock } from "./CodeBlock"; import { Comment } from "./Comment"; -import { Parameter } from "./Parameter"; -import { Type } from "./Type"; import { Function } from "./Function"; +import { Parameter } from "./Parameter"; import { Reference } from "./Reference"; +import { Type } from "./Type"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; diff --git a/generators/typescript-v2/ast/src/ast/MethodInvocation.ts b/generators/typescript-v2/ast/src/ast/MethodInvocation.ts index a5a7904a957..bcb949c958c 100644 --- a/generators/typescript-v2/ast/src/ast/MethodInvocation.ts +++ b/generators/typescript-v2/ast/src/ast/MethodInvocation.ts @@ -1,7 +1,7 @@ -import { AstNode } from "./core/AstNode"; -import { Writer } from "./core/Writer"; import { Method } from "./Method"; import { Reference } from "./Reference"; +import { AstNode } from "./core/AstNode"; +import { Writer } from "./core/Writer"; export declare namespace MethodInvocation { interface Args { diff --git a/generators/typescript-v2/ast/src/ast/Parameter.ts b/generators/typescript-v2/ast/src/ast/Parameter.ts index 249fd4b9e55..86e6d1d9420 100644 --- a/generators/typescript-v2/ast/src/ast/Parameter.ts +++ b/generators/typescript-v2/ast/src/ast/Parameter.ts @@ -1,7 +1,7 @@ +import { Comment } from "./Comment"; +import { Type } from "./Type"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; -import { Type } from "./Type"; -import { Comment } from "./Comment"; export declare namespace Parameter { interface Args { diff --git a/generators/typescript-v2/ast/src/ast/Type.ts b/generators/typescript-v2/ast/src/ast/Type.ts index b192d4189b2..f16fbfcfdb7 100644 --- a/generators/typescript-v2/ast/src/ast/Type.ts +++ b/generators/typescript-v2/ast/src/ast/Type.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; diff --git a/generators/typescript-v2/ast/src/ast/TypeLiteral.ts b/generators/typescript-v2/ast/src/ast/TypeLiteral.ts index a6834eea1e2..91219368090 100644 --- a/generators/typescript-v2/ast/src/ast/TypeLiteral.ts +++ b/generators/typescript-v2/ast/src/ast/TypeLiteral.ts @@ -1,6 +1,7 @@ import { assertNever } from "@fern-api/core-utils"; -import { AstNode, Writer } from "./core"; + import { Type } from "./Type"; +import { AstNode, Writer } from "./core"; type InternalTypeLiteral = Array_ | Boolean_ | BigInt_ | Number_ | Object_ | ObjectField | String_ | Tuple | NoOp; diff --git a/generators/typescript-v2/ast/src/ast/core/AstNode.ts b/generators/typescript-v2/ast/src/ast/core/AstNode.ts index dbb61543387..79188a68900 100644 --- a/generators/typescript-v2/ast/src/ast/core/AstNode.ts +++ b/generators/typescript-v2/ast/src/ast/core/AstNode.ts @@ -1,6 +1,8 @@ +import * as prettier from "prettier2"; + import { AbstractAstNode } from "@fern-api/browser-compatible-base-generator"; + import { Writer } from "./Writer"; -import * as prettier from "prettier"; export abstract class AstNode extends AbstractAstNode { /** diff --git a/generators/typescript-v2/ast/src/ast/core/Writer.ts b/generators/typescript-v2/ast/src/ast/core/Writer.ts index d4229226e77..032680ccdac 100644 --- a/generators/typescript-v2/ast/src/ast/core/Writer.ts +++ b/generators/typescript-v2/ast/src/ast/core/Writer.ts @@ -1,4 +1,5 @@ import { AbstractWriter } from "@fern-api/browser-compatible-base-generator"; + import { Reference } from "../Reference"; type ModuleName = string; diff --git a/generators/typescript-v2/dynamic-snippets/package.json b/generators/typescript-v2/dynamic-snippets/package.json index 6a9aef233ef..75736ea7386 100644 --- a/generators/typescript-v2/dynamic-snippets/package.json +++ b/generators/typescript-v2/dynamic-snippets/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", "dist": "pnpm compile && node build.cjs" }, @@ -36,8 +35,8 @@ "@types/jest": "^29.5.12", "depcheck": "^1.4.6", "eslint": "^8.56.0", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "string.prototype.replaceall": "^1.0.10", "tsup": "^8.3.5", "typescript": "4.6.4", diff --git a/generators/typescript-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts b/generators/typescript-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts index 4aa2559f699..82ea4603883 100644 --- a/generators/typescript-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts +++ b/generators/typescript-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts @@ -1,7 +1,8 @@ import { AbstractDynamicSnippetsGenerator, FernGeneratorExec } from "@fern-api/browser-compatible-base-generator"; -import { DynamicSnippetsGeneratorContext } from "./context/DynamicSnippetsGeneratorContext"; import { FernIr } from "@fern-api/dynamic-ir-sdk"; +import { DynamicSnippetsGeneratorContext } from "./context/DynamicSnippetsGeneratorContext"; + export class DynamicSnippetsGenerator extends AbstractDynamicSnippetsGenerator< DynamicSnippetsGeneratorContext, FernIr.dynamic.EndpointSnippetRequest, diff --git a/generators/typescript/express/cli/package.json b/generators/typescript/express/cli/package.json index c0abfedb44f..25197b15803 100644 --- a/generators/typescript/express/cli/package.json +++ b/generators/typescript/express/cli/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", "build": "tsup ./src/cli.ts --format cjs", "dockerTagLocal": "./docker/create_docker.sh local", @@ -45,8 +44,8 @@ "eslint": "^9.16.0", "vitest": "^2.1.8", "lodash-es": "^4.17.21", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "ts-loader": "^9.3.1", "tsup": "^8.3.5", "typescript": "5.7.2", diff --git a/generators/typescript/express/cli/src/ExpressGeneratorCli.ts b/generators/typescript/express/cli/src/ExpressGeneratorCli.ts index 315a099a3b1..733d7e5ef18 100644 --- a/generators/typescript/express/cli/src/ExpressGeneratorCli.ts +++ b/generators/typescript/express/cli/src/ExpressGeneratorCli.ts @@ -1,10 +1,12 @@ -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratorCli } from "@fern-typescript/abstract-generator-cli"; import { NpmPackage, PersistedTypescriptProject } from "@fern-typescript/commons"; import { GeneratorContext } from "@fern-typescript/contexts"; import { ExpressGenerator } from "@fern-typescript/express-generator"; import { camelCase, upperFirst } from "lodash-es"; + +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; +import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { ExpressCustomConfig } from "./custom-config/ExpressCustomConfig"; import { ExpressCustomConfigSchema } from "./custom-config/schema/ExpressCustomConfigSchema"; diff --git a/generators/typescript/express/express-endpoint-type-schemas-generator/package.json b/generators/typescript/express/express-endpoint-type-schemas-generator/package.json index 12cc1d28538..d7f6767716a 100644 --- a/generators/typescript/express/express-endpoint-type-schemas-generator/package.json +++ b/generators/typescript/express/express-endpoint-type-schemas-generator/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": { @@ -40,8 +39,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" } } \ No newline at end of file diff --git a/generators/typescript/express/express-endpoint-type-schemas-generator/src/AbstractGeneratedEndpointTypeSchema.ts b/generators/typescript/express/express-endpoint-type-schemas-generator/src/AbstractGeneratedEndpointTypeSchema.ts index 3b561cbb03d..7600b57de87 100644 --- a/generators/typescript/express/express-endpoint-type-schemas-generator/src/AbstractGeneratedEndpointTypeSchema.ts +++ b/generators/typescript/express/express-endpoint-type-schemas-generator/src/AbstractGeneratedEndpointTypeSchema.ts @@ -1,7 +1,9 @@ -import { HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; import { PackageId, Reference } from "@fern-typescript/commons"; import { ExpressContext } from "@fern-typescript/contexts"; + +import { HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; + import { GeneratedEndpointTypeSchema } from "./GeneratedEndpointTypeSchema"; export declare namespace AbstractGeneratedEndpointTypeSchema { diff --git a/generators/typescript/express/express-endpoint-type-schemas-generator/src/ExpressEndpointTypeSchemasGenerator.ts b/generators/typescript/express/express-endpoint-type-schemas-generator/src/ExpressEndpointTypeSchemasGenerator.ts index 89b68b3aa11..a800b425895 100644 --- a/generators/typescript/express/express-endpoint-type-schemas-generator/src/ExpressEndpointTypeSchemasGenerator.ts +++ b/generators/typescript/express/express-endpoint-type-schemas-generator/src/ExpressEndpointTypeSchemasGenerator.ts @@ -1,6 +1,8 @@ -import { HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; import { GeneratedExpressEndpointTypeSchemas } from "@fern-typescript/contexts"; + +import { HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressEndpointTypeSchemasImpl } from "./GeneratedExpressEndpointTypeSchemasImpl"; export declare namespace ExpressEndpointTypeSchemasGenerator { diff --git a/generators/typescript/express/express-endpoint-type-schemas-generator/src/GeneratedEndpointTypeSchemaImpl.ts b/generators/typescript/express/express-endpoint-type-schemas-generator/src/GeneratedEndpointTypeSchemaImpl.ts index 40c4b3ae9e0..3c68be1e620 100644 --- a/generators/typescript/express/express-endpoint-type-schemas-generator/src/GeneratedEndpointTypeSchemaImpl.ts +++ b/generators/typescript/express/express-endpoint-type-schemas-generator/src/GeneratedEndpointTypeSchemaImpl.ts @@ -1,8 +1,10 @@ -import { TypeReference } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getTextOfTsNode, Zurg } from "@fern-typescript/commons"; +import { Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { ExpressContext } from "@fern-typescript/contexts"; import { ModuleDeclaration, ts } from "ts-morph"; + +import { TypeReference } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedEndpointTypeSchema } from "./AbstractGeneratedEndpointTypeSchema"; export declare namespace GeneratedEndpointTypeSchemaImpl { diff --git a/generators/typescript/express/express-endpoint-type-schemas-generator/src/GeneratedExpressEndpointTypeSchemasImpl.ts b/generators/typescript/express/express-endpoint-type-schemas-generator/src/GeneratedExpressEndpointTypeSchemasImpl.ts index d069462657e..717b618e005 100644 --- a/generators/typescript/express/express-endpoint-type-schemas-generator/src/GeneratedExpressEndpointTypeSchemasImpl.ts +++ b/generators/typescript/express/express-endpoint-type-schemas-generator/src/GeneratedExpressEndpointTypeSchemasImpl.ts @@ -1,8 +1,11 @@ -import { assertNever } from "@fern-api/core-utils"; -import { HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; -import { getSchemaOptions, PackageId } from "@fern-typescript/commons"; +import { PackageId, getSchemaOptions } from "@fern-typescript/commons"; import { ExpressContext, GeneratedExpressEndpointTypeSchemas } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + +import { assertNever } from "@fern-api/core-utils"; + +import { HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; + import { GeneratedEndpointTypeSchema } from "./GeneratedEndpointTypeSchema"; import { GeneratedEndpointTypeSchemaImpl } from "./GeneratedEndpointTypeSchemaImpl"; diff --git a/generators/typescript/express/express-error-generator/package.json b/generators/typescript/express/express-error-generator/package.json index ed7cf7cb2dd..0bfd7c409ac 100644 --- a/generators/typescript/express/express-error-generator/package.json +++ b/generators/typescript/express/express-error-generator/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/express/express-error-generator/src/ExpressErrorGenerator.ts b/generators/typescript/express/express-error-generator/src/ExpressErrorGenerator.ts index a0d24c45432..7e933566faf 100644 --- a/generators/typescript/express/express-error-generator/src/ExpressErrorGenerator.ts +++ b/generators/typescript/express/express-error-generator/src/ExpressErrorGenerator.ts @@ -1,5 +1,7 @@ -import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; import { GeneratedExpressError } from "@fern-typescript/contexts"; + +import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressErrorImpl } from "./GeneratedExpressErrorImpl"; export declare namespace ExpressErrorGenerator { diff --git a/generators/typescript/express/express-error-generator/src/GeneratedExpressErrorImpl.ts b/generators/typescript/express/express-error-generator/src/GeneratedExpressErrorImpl.ts index 9b4f77f58c8..d2f2c634596 100644 --- a/generators/typescript/express/express-error-generator/src/GeneratedExpressErrorImpl.ts +++ b/generators/typescript/express/express-error-generator/src/GeneratedExpressErrorImpl.ts @@ -1,4 +1,3 @@ -import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; import { AbstractErrorClassGenerator } from "@fern-typescript/abstract-error-class-generator"; import { getTextOfTsNode } from "@fern-typescript/commons"; import { ExpressContext, GeneratedExpressError } from "@fern-typescript/contexts"; @@ -11,6 +10,8 @@ import { ts } from "ts-morph"; +import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + export declare namespace GeneratedExpressErrorImpl { export interface Init { errorClassName: string; diff --git a/generators/typescript/express/express-error-schema-generator/package.json b/generators/typescript/express/express-error-schema-generator/package.json index 2cb22ee6eb7..67eff72375d 100644 --- a/generators/typescript/express/express-error-schema-generator/package.json +++ b/generators/typescript/express/express-error-schema-generator/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": { @@ -40,8 +39,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" } } \ No newline at end of file diff --git a/generators/typescript/express/express-error-schema-generator/src/ExpressErrorSchemaGenerator.ts b/generators/typescript/express/express-error-schema-generator/src/ExpressErrorSchemaGenerator.ts index f65e7a5182e..7f220d84fb9 100644 --- a/generators/typescript/express/express-error-schema-generator/src/ExpressErrorSchemaGenerator.ts +++ b/generators/typescript/express/express-error-schema-generator/src/ExpressErrorSchemaGenerator.ts @@ -1,5 +1,7 @@ -import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; import { GeneratedExpressErrorSchema } from "@fern-typescript/contexts"; + +import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressErrorSchemaImpl } from "./GeneratedExpressErrorSchemaImpl"; export declare namespace ExpressErrorSchemaGenerator { diff --git a/generators/typescript/express/express-error-schema-generator/src/GeneratedExpressErrorSchemaImpl.ts b/generators/typescript/express/express-error-schema-generator/src/GeneratedExpressErrorSchemaImpl.ts index 3482480ee70..fc3cfdf7522 100644 --- a/generators/typescript/express/express-error-schema-generator/src/GeneratedExpressErrorSchemaImpl.ts +++ b/generators/typescript/express/express-error-schema-generator/src/GeneratedExpressErrorSchemaImpl.ts @@ -1,10 +1,12 @@ -import { assertNever } from "@fern-api/core-utils"; -import { ErrorDeclaration, TypeReference } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getSchemaOptions, getTextOfTsNode, Reference, Zurg } from "@fern-typescript/commons"; +import { Reference, Zurg, getSchemaOptions, getTextOfTsNode } from "@fern-typescript/commons"; import { ExpressContext, GeneratedExpressErrorSchema } from "@fern-typescript/contexts"; import { ModuleDeclaration, ts } from "ts-morph"; +import { assertNever } from "@fern-api/core-utils"; + +import { ErrorDeclaration, TypeReference } from "@fern-fern/ir-sdk/api"; + export declare namespace GeneratedExpressErrorSchemaImpl { export interface Init { errorName: string; diff --git a/generators/typescript/express/express-inlined-request-body-generator/package.json b/generators/typescript/express/express-inlined-request-body-generator/package.json index 8e14d31c098..13190acb18b 100644 --- a/generators/typescript/express/express-inlined-request-body-generator/package.json +++ b/generators/typescript/express/express-inlined-request-body-generator/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": { @@ -37,8 +36,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" } } \ No newline at end of file diff --git a/generators/typescript/express/express-inlined-request-body-generator/src/ExpressInlinedRequestBodyGenerator.ts b/generators/typescript/express/express-inlined-request-body-generator/src/ExpressInlinedRequestBodyGenerator.ts index 0985a8db600..fb8625a883e 100644 --- a/generators/typescript/express/express-inlined-request-body-generator/src/ExpressInlinedRequestBodyGenerator.ts +++ b/generators/typescript/express/express-inlined-request-body-generator/src/ExpressInlinedRequestBodyGenerator.ts @@ -1,5 +1,7 @@ -import { InlinedRequestBody } from "@fern-fern/ir-sdk/api"; import { GeneratedExpressInlinedRequestBody } from "@fern-typescript/contexts"; + +import { InlinedRequestBody } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressInlinedRequestBodyImpl } from "./GeneratedExpressInlinedRequestBodyImpl"; export declare namespace ExpressInlinedRequestBodyGenerator { diff --git a/generators/typescript/express/express-inlined-request-body-generator/src/GeneratedExpressInlinedRequestBodyImpl.ts b/generators/typescript/express/express-inlined-request-body-generator/src/GeneratedExpressInlinedRequestBodyImpl.ts index 1535285f38b..a44022f9db2 100644 --- a/generators/typescript/express/express-inlined-request-body-generator/src/GeneratedExpressInlinedRequestBodyImpl.ts +++ b/generators/typescript/express/express-inlined-request-body-generator/src/GeneratedExpressInlinedRequestBodyImpl.ts @@ -1,7 +1,8 @@ -import { InlinedRequestBody, InlinedRequestBodyProperty } from "@fern-fern/ir-sdk/api"; import { getTextOfTsNode } from "@fern-typescript/commons"; import { ExpressContext, GeneratedExpressInlinedRequestBody } from "@fern-typescript/contexts"; +import { InlinedRequestBody, InlinedRequestBodyProperty } from "@fern-fern/ir-sdk/api"; + export declare namespace GeneratedExpressInlinedRequestBodyImpl { export interface Init { requestBody: InlinedRequestBody; diff --git a/generators/typescript/express/express-inlined-request-body-schema-generator/package.json b/generators/typescript/express/express-inlined-request-body-schema-generator/package.json index 67161a7a30e..bceb39b19d8 100644 --- a/generators/typescript/express/express-inlined-request-body-schema-generator/package.json +++ b/generators/typescript/express/express-inlined-request-body-schema-generator/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/express/express-inlined-request-body-schema-generator/src/ExpressInlinedRequestBodySchemaGenerator.ts b/generators/typescript/express/express-inlined-request-body-schema-generator/src/ExpressInlinedRequestBodySchemaGenerator.ts index ce3f3751ded..bcd697393f9 100644 --- a/generators/typescript/express/express-inlined-request-body-schema-generator/src/ExpressInlinedRequestBodySchemaGenerator.ts +++ b/generators/typescript/express/express-inlined-request-body-schema-generator/src/ExpressInlinedRequestBodySchemaGenerator.ts @@ -1,6 +1,8 @@ -import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; import { GeneratedExpressInlinedRequestBodySchema } from "@fern-typescript/contexts"; + +import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressInlinedRequestBodySchemaImpl } from "./GeneratedExpressInlinedRequestBodySchemaImpl"; export declare namespace ExpressInlinedRequestBodySchemaGenerator { diff --git a/generators/typescript/express/express-inlined-request-body-schema-generator/src/GeneratedExpressInlinedRequestBodySchemaImpl.ts b/generators/typescript/express/express-inlined-request-body-schema-generator/src/GeneratedExpressInlinedRequestBodySchemaImpl.ts index d94e7433a50..7cdca89c802 100644 --- a/generators/typescript/express/express-inlined-request-body-schema-generator/src/GeneratedExpressInlinedRequestBodySchemaImpl.ts +++ b/generators/typescript/express/express-inlined-request-body-schema-generator/src/GeneratedExpressInlinedRequestBodySchemaImpl.ts @@ -1,9 +1,10 @@ -import { HttpEndpoint, InlinedRequestBody } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getTextOfTsNode, PackageId, Reference, Zurg } from "@fern-typescript/commons"; +import { PackageId, Reference, Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { ExpressContext, GeneratedExpressInlinedRequestBodySchema } from "@fern-typescript/contexts"; import { ModuleDeclaration, ts } from "ts-morph"; +import { HttpEndpoint, InlinedRequestBody } from "@fern-fern/ir-sdk/api"; + export declare namespace GeneratedExpressInlinedRequestBodySchemaImpl { export interface Init extends AbstractGeneratedSchema.Init { packageId: PackageId; diff --git a/generators/typescript/express/express-register-generator/package.json b/generators/typescript/express/express-register-generator/package.json index 723306d84a3..5d966a3ad59 100644 --- a/generators/typescript/express/express-register-generator/package.json +++ b/generators/typescript/express/express-register-generator/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 @@ "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" } } \ No newline at end of file diff --git a/generators/typescript/express/express-register-generator/src/ExpressRegisterGenerator.ts b/generators/typescript/express/express-register-generator/src/ExpressRegisterGenerator.ts index 290a4013ef6..9558c7785e1 100644 --- a/generators/typescript/express/express-register-generator/src/ExpressRegisterGenerator.ts +++ b/generators/typescript/express/express-register-generator/src/ExpressRegisterGenerator.ts @@ -1,6 +1,8 @@ -import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { GeneratedExpressRegister } from "@fern-typescript/contexts"; import { PackageResolver } from "@fern-typescript/resolvers"; + +import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressRegisterImpl } from "./GeneratedExpressRegisterImpl"; export declare namespace ExpressRegisterGenerator { diff --git a/generators/typescript/express/express-register-generator/src/GeneratedExpressRegisterImpl.ts b/generators/typescript/express/express-register-generator/src/GeneratedExpressRegisterImpl.ts index 35e1b16c3af..a6dce184810 100644 --- a/generators/typescript/express/express-register-generator/src/GeneratedExpressRegisterImpl.ts +++ b/generators/typescript/express/express-register-generator/src/GeneratedExpressRegisterImpl.ts @@ -1,10 +1,11 @@ -import { IntermediateRepresentation, Name, Package } from "@fern-fern/ir-sdk/api"; -import { convertHttpPathToExpressRoute, getTextOfTsNode, PackageId } from "@fern-typescript/commons"; +import { PackageId, convertHttpPathToExpressRoute, getTextOfTsNode } from "@fern-typescript/commons"; import { ExpressContext, GeneratedExpressRegister } from "@fern-typescript/contexts"; import { PackageResolver } from "@fern-typescript/resolvers"; import { partition } from "lodash-es"; import { ts } from "ts-morph"; +import { IntermediateRepresentation, Name, Package } from "@fern-fern/ir-sdk/api"; + export declare namespace GeneratedExpressRegisterImpl { export interface Init { intermediateRepresentation: IntermediateRepresentation; diff --git a/generators/typescript/express/express-service-generator/package.json b/generators/typescript/express/express-service-generator/package.json index 3ffcc29b19d..dd236d35169 100644 --- a/generators/typescript/express/express-service-generator/package.json +++ b/generators/typescript/express/express-service-generator/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/express/express-service-generator/src/ExpressServiceGenerator.ts b/generators/typescript/express/express-service-generator/src/ExpressServiceGenerator.ts index 2e12d333ff7..f66d6e35767 100644 --- a/generators/typescript/express/express-service-generator/src/ExpressServiceGenerator.ts +++ b/generators/typescript/express/express-service-generator/src/ExpressServiceGenerator.ts @@ -1,7 +1,9 @@ -import { HttpService } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; import { GeneratedExpressService } from "@fern-typescript/contexts"; import { PackageResolver } from "@fern-typescript/resolvers"; + +import { HttpService } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressServiceImpl } from "./GeneratedExpressServiceImpl"; export declare namespace ExpressServiceGenerator { diff --git a/generators/typescript/express/express-service-generator/src/GeneratedExpressServiceImpl.ts b/generators/typescript/express/express-service-generator/src/GeneratedExpressServiceImpl.ts index 8991adf9530..3afe0871171 100644 --- a/generators/typescript/express/express-service-generator/src/GeneratedExpressServiceImpl.ts +++ b/generators/typescript/express/express-service-generator/src/GeneratedExpressServiceImpl.ts @@ -1,3 +1,7 @@ +import { PackageId, convertHttpPathToExpressRoute, getTextOfTsNode, maybeAddDocsNode } from "@fern-typescript/commons"; +import { ExpressContext, GeneratedExpressService } from "@fern-typescript/contexts"; +import { ClassDeclaration, InterfaceDeclaration, Scope, ts } from "ts-morph"; + import { HttpEndpoint, HttpMethod, @@ -7,9 +11,6 @@ import { Package, PathParameter } from "@fern-fern/ir-sdk/api"; -import { convertHttpPathToExpressRoute, getTextOfTsNode, maybeAddDocsNode, PackageId } from "@fern-typescript/commons"; -import { ExpressContext, GeneratedExpressService } from "@fern-typescript/contexts"; -import { ClassDeclaration, InterfaceDeclaration, Scope, ts } from "ts-morph"; export declare namespace GeneratedExpressServiceImpl { export interface Init { diff --git a/generators/typescript/express/generator/package.json b/generators/typescript/express/generator/package.json index 173bd0d8454..76e0112ce27 100644 --- a/generators/typescript/express/generator/package.json +++ b/generators/typescript/express/generator/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": { @@ -54,8 +53,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" } } \ No newline at end of file diff --git a/generators/typescript/express/generator/src/ExpressGenerator.ts b/generators/typescript/express/generator/src/ExpressGenerator.ts index fcdee92e88b..8b532c2cd29 100644 --- a/generators/typescript/express/generator/src/ExpressGenerator.ts +++ b/generators/typescript/express/generator/src/ExpressGenerator.ts @@ -1,7 +1,4 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { HttpService, IntermediateRepresentation, TypeDeclaration, TypeId } from "@fern-fern/ir-sdk/api"; import { - convertExportedFilePathToFilePath, CoreUtilitiesManager, DependencyManager, ExportedDirectory, @@ -11,7 +8,8 @@ import { NpmPackage, PackageId, SimpleTypescriptProject, - TypescriptProject + TypescriptProject, + convertExportedFilePathToFilePath } from "@fern-typescript/commons"; import { GeneratorContext } from "@fern-typescript/contexts"; import { ExpressEndpointTypeSchemasGenerator } from "@fern-typescript/express-endpoint-type-schemas-generator"; @@ -27,7 +25,12 @@ import { TypeGenerator } from "@fern-typescript/type-generator"; import { TypeReferenceExampleGenerator } from "@fern-typescript/type-reference-example-generator"; import { TypeSchemaGenerator } from "@fern-typescript/type-schema-generator"; import { Directory, Project, SourceFile } from "ts-morph"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { Logger } from "@fern-api/logger"; + +import { HttpService, IntermediateRepresentation, TypeDeclaration, TypeId } from "@fern-fern/ir-sdk/api"; + import { ExpressContextImpl } from "./contexts/ExpressContextImpl"; import { EndpointDeclarationReferencer } from "./declaration-referencers/EndpointDeclarationReferencer"; import { ExpressErrorDeclarationReferencer } from "./declaration-referencers/ExpressErrorDeclarationReferencer"; diff --git a/generators/typescript/express/generator/src/contexts/ExpressContextImpl.ts b/generators/typescript/express/generator/src/contexts/ExpressContextImpl.ts index e3a21c2957d..ece37291c79 100644 --- a/generators/typescript/express/generator/src/contexts/ExpressContextImpl.ts +++ b/generators/typescript/express/generator/src/contexts/ExpressContextImpl.ts @@ -1,10 +1,9 @@ -import { Constants } from "@fern-fern/ir-sdk/api"; import { CoreUtilitiesManager, - createExternalDependencies, DependencyManager, ExternalDependencies, - ImportsManager + ImportsManager, + createExternalDependencies } from "@fern-typescript/commons"; import { CoreUtilities } from "@fern-typescript/commons/src/core-utilities/CoreUtilities"; import { @@ -26,7 +25,11 @@ import { TypeGenerator } from "@fern-typescript/type-generator"; import { TypeReferenceExampleGenerator } from "@fern-typescript/type-reference-example-generator"; import { TypeSchemaGenerator } from "@fern-typescript/type-schema-generator"; import { SourceFile } from "ts-morph"; + import { Logger } from "@fern-api/logger"; + +import { Constants } from "@fern-fern/ir-sdk/api"; + import { EndpointDeclarationReferencer } from "../declaration-referencers/EndpointDeclarationReferencer"; import { ExpressErrorDeclarationReferencer } from "../declaration-referencers/ExpressErrorDeclarationReferencer"; import { ExpressInlinedRequestBodyDeclarationReferencer } from "../declaration-referencers/ExpressInlinedRequestBodyDeclarationReferencer"; diff --git a/generators/typescript/express/generator/src/contexts/express-endpoint-type-schemas/ExpressEndpointTypeSchemasContextImpl.ts b/generators/typescript/express/generator/src/contexts/express-endpoint-type-schemas/ExpressEndpointTypeSchemasContextImpl.ts index fa9457a8128..00973bc0369 100644 --- a/generators/typescript/express/generator/src/contexts/express-endpoint-type-schemas/ExpressEndpointTypeSchemasContextImpl.ts +++ b/generators/typescript/express/generator/src/contexts/express-endpoint-type-schemas/ExpressEndpointTypeSchemasContextImpl.ts @@ -1,9 +1,11 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { ImportsManager, PackageId, Reference } from "@fern-typescript/commons"; import { ExpressEndpointTypeSchemasContext, GeneratedExpressEndpointTypeSchemas } from "@fern-typescript/contexts"; import { ExpressEndpointTypeSchemasGenerator } from "@fern-typescript/express-endpoint-type-schemas-generator"; import { PackageResolver } from "@fern-typescript/resolvers"; import { SourceFile } from "ts-morph"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { EndpointDeclarationReferencer } from "../../declaration-referencers/EndpointDeclarationReferencer"; import { getSchemaImportStrategy } from "../getSchemaImportStrategy"; diff --git a/generators/typescript/express/generator/src/contexts/express-error-schema/ExpressErrorSchemaContextImpl.ts b/generators/typescript/express/generator/src/contexts/express-error-schema/ExpressErrorSchemaContextImpl.ts index 66b04bc117d..6d8972c1dea 100644 --- a/generators/typescript/express/generator/src/contexts/express-error-schema/ExpressErrorSchemaContextImpl.ts +++ b/generators/typescript/express/generator/src/contexts/express-error-schema/ExpressErrorSchemaContextImpl.ts @@ -1,10 +1,12 @@ -import { DeclaredErrorName } from "@fern-fern/ir-sdk/api"; import { ImportsManager, Reference, Zurg } from "@fern-typescript/commons"; import { CoreUtilities } from "@fern-typescript/commons/src/core-utilities/CoreUtilities"; import { ExpressErrorSchemaContext, GeneratedExpressErrorSchema } from "@fern-typescript/contexts"; import { ExpressErrorSchemaGenerator } from "@fern-typescript/express-error-schema-generator"; import { ErrorResolver } from "@fern-typescript/resolvers"; import { SourceFile } from "ts-morph"; + +import { DeclaredErrorName } from "@fern-fern/ir-sdk/api"; + import { ExpressErrorDeclarationReferencer } from "../../declaration-referencers/ExpressErrorDeclarationReferencer"; import { getSchemaImportStrategy } from "../getSchemaImportStrategy"; diff --git a/generators/typescript/express/generator/src/contexts/express-error/ExpressErrorContextImpl.ts b/generators/typescript/express/generator/src/contexts/express-error/ExpressErrorContextImpl.ts index c0ade11e403..14fbfa7ba62 100644 --- a/generators/typescript/express/generator/src/contexts/express-error/ExpressErrorContextImpl.ts +++ b/generators/typescript/express/generator/src/contexts/express-error/ExpressErrorContextImpl.ts @@ -1,9 +1,11 @@ -import { DeclaredErrorName, ErrorDeclaration } from "@fern-fern/ir-sdk/api"; import { ImportsManager, Reference } from "@fern-typescript/commons"; import { ExpressErrorContext, GeneratedExpressError } from "@fern-typescript/contexts"; import { ExpressErrorGenerator } from "@fern-typescript/express-error-generator"; import { ErrorResolver } from "@fern-typescript/resolvers"; import { SourceFile } from "ts-morph"; + +import { DeclaredErrorName, ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + import { ExpressErrorDeclarationReferencer } from "../../declaration-referencers/ExpressErrorDeclarationReferencer"; export declare namespace ExpressErrorContextImpl { diff --git a/generators/typescript/express/generator/src/contexts/express-inlined-request-body-schema/ExpressInlinedRequestBodySchemaContextImpl.ts b/generators/typescript/express/generator/src/contexts/express-inlined-request-body-schema/ExpressInlinedRequestBodySchemaContextImpl.ts index 8c3c3a4674d..29a6c376a6a 100644 --- a/generators/typescript/express/generator/src/contexts/express-inlined-request-body-schema/ExpressInlinedRequestBodySchemaContextImpl.ts +++ b/generators/typescript/express/generator/src/contexts/express-inlined-request-body-schema/ExpressInlinedRequestBodySchemaContextImpl.ts @@ -1,4 +1,3 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { ImportsManager, PackageId, Reference } from "@fern-typescript/commons"; import { ExpressInlinedRequestBodySchemaContext, @@ -7,6 +6,9 @@ import { import { ExpressInlinedRequestBodySchemaGenerator } from "@fern-typescript/express-inlined-request-schema-generator"; import { PackageResolver } from "@fern-typescript/resolvers"; import { SourceFile } from "ts-morph"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { ExpressInlinedRequestBodyDeclarationReferencer } from "../../declaration-referencers/ExpressInlinedRequestBodyDeclarationReferencer"; import { getSchemaImportStrategy } from "../getSchemaImportStrategy"; diff --git a/generators/typescript/express/generator/src/contexts/express-inlined-request-body/ExpressInlinedRequestBodyContextImpl.ts.ts b/generators/typescript/express/generator/src/contexts/express-inlined-request-body/ExpressInlinedRequestBodyContextImpl.ts.ts index bd633110abc..0c8f79e0fae 100644 --- a/generators/typescript/express/generator/src/contexts/express-inlined-request-body/ExpressInlinedRequestBodyContextImpl.ts.ts +++ b/generators/typescript/express/generator/src/contexts/express-inlined-request-body/ExpressInlinedRequestBodyContextImpl.ts.ts @@ -1,9 +1,11 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { ImportsManager, PackageId, Reference } from "@fern-typescript/commons"; import { ExpressInlinedRequestBodyContext, GeneratedExpressInlinedRequestBody } from "@fern-typescript/contexts"; import { ExpressInlinedRequestBodyGenerator } from "@fern-typescript/express-inlined-request-body-generator"; import { PackageResolver } from "@fern-typescript/resolvers"; import { SourceFile } from "ts-morph"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { ExpressInlinedRequestBodyDeclarationReferencer } from "../../declaration-referencers/ExpressInlinedRequestBodyDeclarationReferencer"; export declare namespace ExpressInlinedRequestBodyContextImpl { diff --git a/generators/typescript/express/generator/src/contexts/express-service/ExpressServiceContextImpl.ts.ts b/generators/typescript/express/generator/src/contexts/express-service/ExpressServiceContextImpl.ts.ts index 711dfae3cd6..16f1025d20b 100644 --- a/generators/typescript/express/generator/src/contexts/express-service/ExpressServiceContextImpl.ts.ts +++ b/generators/typescript/express/generator/src/contexts/express-service/ExpressServiceContextImpl.ts.ts @@ -3,6 +3,7 @@ import { ExpressServiceContext, GeneratedExpressService } from "@fern-typescript import { ExpressServiceGenerator } from "@fern-typescript/express-service-generator"; import { PackageResolver } from "@fern-typescript/resolvers"; import { SourceFile } from "ts-morph"; + import { ExpressServiceDeclarationReferencer } from "../../declaration-referencers/ExpressServiceDeclarationReferencer"; export declare namespace ExpressServiceContextImpl { diff --git a/generators/typescript/express/generator/src/contexts/generic-api-express-error/GenericAPIExpressErrorContextImpl.ts b/generators/typescript/express/generator/src/contexts/generic-api-express-error/GenericAPIExpressErrorContextImpl.ts index 5a44bf031f5..6d8ffea663d 100644 --- a/generators/typescript/express/generator/src/contexts/generic-api-express-error/GenericAPIExpressErrorContextImpl.ts +++ b/generators/typescript/express/generator/src/contexts/generic-api-express-error/GenericAPIExpressErrorContextImpl.ts @@ -2,6 +2,7 @@ import { ImportsManager, Reference } from "@fern-typescript/commons"; import { GeneratedGenericAPIExpressError, GenericAPIExpressErrorContext } from "@fern-typescript/contexts"; import { GenericAPIExpressErrorGenerator } from "@fern-typescript/generic-express-error-generators"; import { SourceFile } from "ts-morph"; + import { GenericAPIExpressErrorDeclarationReferencer } from "../../declaration-referencers/GenericAPIExpressErrorDeclarationReferencer"; export declare namespace GenericAPIExpressErrorContextImpl { diff --git a/generators/typescript/express/generator/src/contexts/type-schema/TypeSchemaContextImpl.ts b/generators/typescript/express/generator/src/contexts/type-schema/TypeSchemaContextImpl.ts index 817c3595b76..d1eeefa9d20 100644 --- a/generators/typescript/express/generator/src/contexts/type-schema/TypeSchemaContextImpl.ts +++ b/generators/typescript/express/generator/src/contexts/type-schema/TypeSchemaContextImpl.ts @@ -1,4 +1,3 @@ -import { DeclaredTypeName, ShapeType, TypeReference } from "@fern-fern/ir-sdk/api"; import { ImportsManager, Reference, TypeReferenceNode, Zurg } from "@fern-typescript/commons"; import { CoreUtilities } from "@fern-typescript/commons/src/core-utilities/CoreUtilities"; import { GeneratedTypeSchema, TypeSchemaContext } from "@fern-typescript/contexts"; @@ -10,6 +9,9 @@ import { } from "@fern-typescript/type-reference-converters"; import { TypeSchemaGenerator } from "@fern-typescript/type-schema-generator"; import { SourceFile, ts } from "ts-morph"; + +import { DeclaredTypeName, ShapeType, TypeReference } from "@fern-fern/ir-sdk/api"; + import { TypeDeclarationReferencer } from "../../declaration-referencers/TypeDeclarationReferencer"; import { getSchemaImportStrategy } from "../getSchemaImportStrategy"; diff --git a/generators/typescript/express/generator/src/contexts/type/TypeContextImpl.ts b/generators/typescript/express/generator/src/contexts/type/TypeContextImpl.ts index e2b627d0ec1..057fa7edd1c 100644 --- a/generators/typescript/express/generator/src/contexts/type/TypeContextImpl.ts +++ b/generators/typescript/express/generator/src/contexts/type/TypeContextImpl.ts @@ -1,11 +1,3 @@ -import { - DeclaredTypeName, - ExampleTypeReference, - ObjectProperty, - ResolvedTypeReference, - TypeDeclaration, - TypeReference -} from "@fern-fern/ir-sdk/api"; import { ImportsManager, Reference, TypeReferenceNode } from "@fern-typescript/commons"; import { BaseContext, GeneratedType, GeneratedTypeReferenceExample, TypeContext } from "@fern-typescript/contexts"; import { TypeResolver } from "@fern-typescript/resolvers"; @@ -16,6 +8,16 @@ import { } from "@fern-typescript/type-reference-converters"; import { TypeReferenceExampleGenerator } from "@fern-typescript/type-reference-example-generator"; import { SourceFile, ts } from "ts-morph"; + +import { + DeclaredTypeName, + ExampleTypeReference, + ObjectProperty, + ResolvedTypeReference, + TypeDeclaration, + TypeReference +} from "@fern-fern/ir-sdk/api"; + import { TypeDeclarationReferencer } from "../../declaration-referencers/TypeDeclarationReferencer"; export declare namespace TypeContextImpl { diff --git a/generators/typescript/express/generator/src/declaration-referencers/AbstractDeclarationReferencer.ts b/generators/typescript/express/generator/src/declaration-referencers/AbstractDeclarationReferencer.ts index e24803d6449..9b1c108459d 100644 --- a/generators/typescript/express/generator/src/declaration-referencers/AbstractDeclarationReferencer.ts +++ b/generators/typescript/express/generator/src/declaration-referencers/AbstractDeclarationReferencer.ts @@ -1,11 +1,13 @@ -import { assertNever } from "@fern-api/core-utils"; import { ExportedDirectory, ExportedFilePath, + Reference, getDirectReferenceToExport, - getReferenceToExportFromRoot, - Reference + getReferenceToExportFromRoot } from "@fern-typescript/commons"; + +import { assertNever } from "@fern-api/core-utils"; + import { DeclarationReferencer } from "./DeclarationReferencer"; export declare namespace AbstractDeclarationReferencer { diff --git a/generators/typescript/express/generator/src/declaration-referencers/AbstractExpressErrorDeclarationReferencer.ts b/generators/typescript/express/generator/src/declaration-referencers/AbstractExpressErrorDeclarationReferencer.ts index 67b6bb3853f..30c71b0ab5e 100644 --- a/generators/typescript/express/generator/src/declaration-referencers/AbstractExpressErrorDeclarationReferencer.ts +++ b/generators/typescript/express/generator/src/declaration-referencers/AbstractExpressErrorDeclarationReferencer.ts @@ -1,5 +1,6 @@ import { ExportedFilePath, ImportsManager, Reference } from "@fern-typescript/commons"; import { SourceFile } from "ts-morph"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; const ERRORS_DIRECTORY = "errors"; diff --git a/generators/typescript/express/generator/src/declaration-referencers/AbstractExpressServiceDeclarationReferencer.ts b/generators/typescript/express/generator/src/declaration-referencers/AbstractExpressServiceDeclarationReferencer.ts index e7cf7de6d12..6ff20a3f74a 100644 --- a/generators/typescript/express/generator/src/declaration-referencers/AbstractExpressServiceDeclarationReferencer.ts +++ b/generators/typescript/express/generator/src/declaration-referencers/AbstractExpressServiceDeclarationReferencer.ts @@ -1,13 +1,16 @@ -import { entries } from "@fern-api/core-utils"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; -import { FernFilepath } from "@fern-fern/ir-sdk/api"; import { ExportDeclaration, ExportedDirectory, - getExportedDirectoriesForFernFilepath, - PackageId + PackageId, + getExportedDirectoriesForFernFilepath } from "@fern-typescript/commons"; import { PackageResolver } from "@fern-typescript/resolvers"; + +import { entries } from "@fern-api/core-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + +import { FernFilepath } from "@fern-fern/ir-sdk/api"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; const SERVICE_DIRECTORY = "service"; diff --git a/generators/typescript/express/generator/src/declaration-referencers/EndpointDeclarationReferencer.ts b/generators/typescript/express/generator/src/declaration-referencers/EndpointDeclarationReferencer.ts index 40fc19b93ec..efccffc5bf3 100644 --- a/generators/typescript/express/generator/src/declaration-referencers/EndpointDeclarationReferencer.ts +++ b/generators/typescript/express/generator/src/declaration-referencers/EndpointDeclarationReferencer.ts @@ -1,5 +1,7 @@ -import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { ExportedFilePath, PackageId, Reference } from "@fern-typescript/commons"; + +import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { AbstractExpressServiceDeclarationReferencer } from "./AbstractExpressServiceDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; diff --git a/generators/typescript/express/generator/src/declaration-referencers/ExpressErrorDeclarationReferencer.ts b/generators/typescript/express/generator/src/declaration-referencers/ExpressErrorDeclarationReferencer.ts index 52bc12efb54..1459951f45c 100644 --- a/generators/typescript/express/generator/src/declaration-referencers/ExpressErrorDeclarationReferencer.ts +++ b/generators/typescript/express/generator/src/declaration-referencers/ExpressErrorDeclarationReferencer.ts @@ -1,6 +1,9 @@ +import { ExportedFilePath, Reference, getExportedDirectoriesForFernFilepath } from "@fern-typescript/commons"; + import { RelativeFilePath } from "@fern-api/fs-utils"; + import { DeclaredErrorName } from "@fern-fern/ir-sdk/api"; -import { ExportedFilePath, getExportedDirectoriesForFernFilepath, Reference } from "@fern-typescript/commons"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; diff --git a/generators/typescript/express/generator/src/declaration-referencers/ExpressInlinedRequestBodyDeclarationReferencer.ts b/generators/typescript/express/generator/src/declaration-referencers/ExpressInlinedRequestBodyDeclarationReferencer.ts index f0fcd2e77d9..4225b98ed2c 100644 --- a/generators/typescript/express/generator/src/declaration-referencers/ExpressInlinedRequestBodyDeclarationReferencer.ts +++ b/generators/typescript/express/generator/src/declaration-referencers/ExpressInlinedRequestBodyDeclarationReferencer.ts @@ -1,6 +1,9 @@ +import { ExportedFilePath, PackageId, Reference } from "@fern-typescript/commons"; + import { RelativeFilePath } from "@fern-api/fs-utils"; + import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; -import { ExportedFilePath, PackageId, Reference } from "@fern-typescript/commons"; + import { AbstractExpressServiceDeclarationReferencer } from "./AbstractExpressServiceDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; diff --git a/generators/typescript/express/generator/src/declaration-referencers/ExpressRegisterDeclarationReferencer.ts b/generators/typescript/express/generator/src/declaration-referencers/ExpressRegisterDeclarationReferencer.ts index b266365a432..3b9c938ded2 100644 --- a/generators/typescript/express/generator/src/declaration-referencers/ExpressRegisterDeclarationReferencer.ts +++ b/generators/typescript/express/generator/src/declaration-referencers/ExpressRegisterDeclarationReferencer.ts @@ -1,4 +1,5 @@ import { ExportedFilePath } from "@fern-typescript/commons"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; export class ExpressRegisterDeclarationReferencer extends AbstractDeclarationReferencer { diff --git a/generators/typescript/express/generator/src/declaration-referencers/ExpressServiceDeclarationReferencer.ts b/generators/typescript/express/generator/src/declaration-referencers/ExpressServiceDeclarationReferencer.ts index a1cefcf3ef1..add965e2473 100644 --- a/generators/typescript/express/generator/src/declaration-referencers/ExpressServiceDeclarationReferencer.ts +++ b/generators/typescript/express/generator/src/declaration-referencers/ExpressServiceDeclarationReferencer.ts @@ -1,4 +1,5 @@ import { ExportedFilePath, PackageId, Reference } from "@fern-typescript/commons"; + import { AbstractExpressServiceDeclarationReferencer } from "./AbstractExpressServiceDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; diff --git a/generators/typescript/express/generator/src/declaration-referencers/TypeDeclarationReferencer.ts b/generators/typescript/express/generator/src/declaration-referencers/TypeDeclarationReferencer.ts index 1f468479fb9..1b8d84b0feb 100644 --- a/generators/typescript/express/generator/src/declaration-referencers/TypeDeclarationReferencer.ts +++ b/generators/typescript/express/generator/src/declaration-referencers/TypeDeclarationReferencer.ts @@ -1,8 +1,12 @@ +import { ExportedFilePath, Reference, getExportedDirectoriesForFernFilepath } from "@fern-typescript/commons"; + import { RelativeFilePath } from "@fern-api/fs-utils"; + import { DeclaredTypeName } from "@fern-fern/ir-sdk/api"; -import { ExportedFilePath, getExportedDirectoriesForFernFilepath, Reference } from "@fern-typescript/commons"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; + export const TYPES_DIRECTORY_NAME = "types"; export class TypeDeclarationReferencer extends AbstractDeclarationReferencer { diff --git a/generators/typescript/express/generic-express-error-generators/package.json b/generators/typescript/express/generic-express-error-generators/package.json index 418b1e12741..87df6f1a24d 100644 --- a/generators/typescript/express/generic-express-error-generators/package.json +++ b/generators/typescript/express/generic-express-error-generators/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": { @@ -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" } } \ No newline at end of file diff --git a/generators/typescript/express/generic-express-error-generators/src/GenericAPIExpressErrorGenerator.ts b/generators/typescript/express/generic-express-error-generators/src/GenericAPIExpressErrorGenerator.ts index 0afad20d75a..2f376482ec3 100644 --- a/generators/typescript/express/generic-express-error-generators/src/GenericAPIExpressErrorGenerator.ts +++ b/generators/typescript/express/generic-express-error-generators/src/GenericAPIExpressErrorGenerator.ts @@ -1,4 +1,5 @@ import { GeneratedGenericAPIExpressError } from "@fern-typescript/contexts"; + import { GeneratedGenericAPIExpressErrorImpl } from "./GeneratedGenericAPIExpressErrorImpl"; export declare namespace GenericAPIExpressErrorGenerator { diff --git a/generators/typescript/model/type-generator/package.json b/generators/typescript/model/type-generator/package.json index 1156e4148a3..437945c140c 100644 --- a/generators/typescript/model/type-generator/package.json +++ b/generators/typescript/model/type-generator/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/model/type-generator/src/AbstractGeneratedType.ts b/generators/typescript/model/type-generator/src/AbstractGeneratedType.ts index 8529b489ae5..082c24f018a 100644 --- a/generators/typescript/model/type-generator/src/AbstractGeneratedType.ts +++ b/generators/typescript/model/type-generator/src/AbstractGeneratedType.ts @@ -1,7 +1,8 @@ -import { ExampleType, ExampleTypeShape, FernFilepath } from "@fern-fern/ir-sdk/api"; -import { GetReferenceOpts, getTextOfTsNode, Reference } from "@fern-typescript/commons"; +import { GetReferenceOpts, Reference, getTextOfTsNode } from "@fern-typescript/commons"; import { BaseContext, BaseGeneratedType } from "@fern-typescript/contexts"; -import { ModuleDeclarationStructure, StatementStructures, ts, WriterFunction } from "ts-morph"; +import { ModuleDeclarationStructure, StatementStructures, WriterFunction, ts } from "ts-morph"; + +import { ExampleType, ExampleTypeShape, FernFilepath } from "@fern-fern/ir-sdk/api"; export declare namespace AbstractGeneratedType { export interface Init { diff --git a/generators/typescript/model/type-generator/src/TypeGenerator.ts b/generators/typescript/model/type-generator/src/TypeGenerator.ts index 82791705f42..d6a845af3a6 100644 --- a/generators/typescript/model/type-generator/src/TypeGenerator.ts +++ b/generators/typescript/model/type-generator/src/TypeGenerator.ts @@ -1,3 +1,14 @@ +import { Reference } from "@fern-typescript/commons"; +import { + BaseContext, + GeneratedAliasType, + GeneratedEnumType, + GeneratedObjectType, + GeneratedType, + GeneratedUndiscriminatedUnionType, + GeneratedUnionType +} from "@fern-typescript/contexts"; + import { EnumTypeDeclaration, ExampleType, @@ -9,16 +20,7 @@ import { UndiscriminatedUnionTypeDeclaration, UnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; -import { Reference } from "@fern-typescript/commons"; -import { - GeneratedAliasType, - GeneratedEnumType, - GeneratedObjectType, - GeneratedType, - GeneratedUndiscriminatedUnionType, - GeneratedUnionType, - BaseContext -} from "@fern-typescript/contexts"; + import { GeneratedAliasTypeImpl } from "./alias/GeneratedAliasTypeImpl"; import { GeneratedBrandedStringAliasImpl } from "./alias/GeneratedBrandedStringAliasImpl"; import { GeneratedEnumTypeImpl } from "./enum/GeneratedEnumTypeImpl"; diff --git a/generators/typescript/model/type-generator/src/alias/GeneratedAliasTypeImpl.ts b/generators/typescript/model/type-generator/src/alias/GeneratedAliasTypeImpl.ts index 873abd928e3..322fd73bbb5 100644 --- a/generators/typescript/model/type-generator/src/alias/GeneratedAliasTypeImpl.ts +++ b/generators/typescript/model/type-generator/src/alias/GeneratedAliasTypeImpl.ts @@ -1,7 +1,6 @@ -import { ExampleTypeShape, TypeReference } from "@fern-fern/ir-sdk/api"; import { - generateInlineAliasModule, GetReferenceOpts, + generateInlineAliasModule, getTextOfTsNode, maybeAddDocsStructure } from "@fern-typescript/commons"; @@ -10,10 +9,13 @@ import { ModuleDeclarationStructure, StatementStructures, StructureKind, - ts, TypeAliasDeclarationStructure, - WriterFunction + WriterFunction, + ts } from "ts-morph"; + +import { ExampleTypeShape, TypeReference } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedType } from "../AbstractGeneratedType"; export class GeneratedAliasTypeImpl diff --git a/generators/typescript/model/type-generator/src/alias/GeneratedBrandedStringAliasImpl.ts b/generators/typescript/model/type-generator/src/alias/GeneratedBrandedStringAliasImpl.ts index e700272c7aa..8534793d42e 100644 --- a/generators/typescript/model/type-generator/src/alias/GeneratedBrandedStringAliasImpl.ts +++ b/generators/typescript/model/type-generator/src/alias/GeneratedBrandedStringAliasImpl.ts @@ -1,4 +1,3 @@ -import { ExampleTypeShape, TypeReference } from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts, getTextOfTsKeyword, @@ -7,16 +6,19 @@ import { maybeAddDocsStructure, writerToString } from "@fern-typescript/commons"; -import { BrandedGeneratedAliasType, BaseContext } from "@fern-typescript/contexts"; +import { BaseContext, BrandedGeneratedAliasType } from "@fern-typescript/contexts"; import { FunctionDeclarationStructure, ModuleDeclarationStructure, StatementStructures, StructureKind, - ts, TypeAliasDeclarationStructure, - WriterFunction + WriterFunction, + ts } from "ts-morph"; + +import { ExampleTypeShape, TypeReference } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedType } from "../AbstractGeneratedType"; export class GeneratedBrandedStringAliasImpl diff --git a/generators/typescript/model/type-generator/src/enum/GeneratedEnumTypeImpl.ts b/generators/typescript/model/type-generator/src/enum/GeneratedEnumTypeImpl.ts index 18eeb324c63..69dfebd3ba4 100644 --- a/generators/typescript/model/type-generator/src/enum/GeneratedEnumTypeImpl.ts +++ b/generators/typescript/model/type-generator/src/enum/GeneratedEnumTypeImpl.ts @@ -1,4 +1,3 @@ -import { EnumTypeDeclaration, EnumValue, ExampleTypeShape } from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts, getTextOfTsNode, @@ -12,13 +11,16 @@ import { PropertySignatureStructure, StatementStructures, StructureKind, - ts, TypeAliasDeclarationStructure, VariableDeclarationKind, VariableStatementStructure, WriterFunction, - WriterFunctionOrValue + WriterFunctionOrValue, + ts } from "ts-morph"; + +import { EnumTypeDeclaration, EnumValue, ExampleTypeShape } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedType } from "../AbstractGeneratedType"; export declare namespace GeneratedEnumTypeImpl { diff --git a/generators/typescript/model/type-generator/src/object/GeneratedObjectTypeImpl.ts b/generators/typescript/model/type-generator/src/object/GeneratedObjectTypeImpl.ts index 7582ae5bac9..9f57f60d210 100644 --- a/generators/typescript/model/type-generator/src/object/GeneratedObjectTypeImpl.ts +++ b/generators/typescript/model/type-generator/src/object/GeneratedObjectTypeImpl.ts @@ -1,21 +1,23 @@ -import { ExampleTypeShape, ObjectProperty, ObjectTypeDeclaration, TypeReference } from "@fern-fern/ir-sdk/api"; import { - generateInlinePropertiesModule, GetReferenceOpts, + TypeReferenceNode, + generateInlinePropertiesModule, getTextOfTsNode, - maybeAddDocsStructure, - TypeReferenceNode + maybeAddDocsStructure } from "@fern-typescript/commons"; -import { GeneratedObjectType, BaseContext } from "@fern-typescript/contexts"; +import { BaseContext, GeneratedObjectType } from "@fern-typescript/contexts"; import { InterfaceDeclarationStructure, ModuleDeclarationStructure, PropertySignatureStructure, StatementStructures, StructureKind, - ts, - WriterFunction + WriterFunction, + ts } from "ts-morph"; + +import { ExampleTypeShape, ObjectProperty, ObjectTypeDeclaration, TypeReference } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedType } from "../AbstractGeneratedType"; interface Property { diff --git a/generators/typescript/model/type-generator/src/undiscriminated-union/GeneratedUndiscriminatedUnionTypeImpl.ts b/generators/typescript/model/type-generator/src/undiscriminated-union/GeneratedUndiscriminatedUnionTypeImpl.ts index 655d8e0dd3a..3f2c8a0958e 100644 --- a/generators/typescript/model/type-generator/src/undiscriminated-union/GeneratedUndiscriminatedUnionTypeImpl.ts +++ b/generators/typescript/model/type-generator/src/undiscriminated-union/GeneratedUndiscriminatedUnionTypeImpl.ts @@ -1,23 +1,25 @@ -import { - ExampleTypeShape, - UndiscriminatedUnionMember, - UndiscriminatedUnionTypeDeclaration -} from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts, getWriterForMultiLineUnionType, maybeAddDocsNode, maybeAddDocsStructure } from "@fern-typescript/commons"; -import { GeneratedUndiscriminatedUnionType, BaseContext } from "@fern-typescript/contexts"; +import { BaseContext, GeneratedUndiscriminatedUnionType } from "@fern-typescript/contexts"; import { ModuleDeclarationStructure, StatementStructures, StructureKind, - ts, TypeAliasDeclarationStructure, - WriterFunction + WriterFunction, + ts } from "ts-morph"; + +import { + ExampleTypeShape, + UndiscriminatedUnionMember, + UndiscriminatedUnionTypeDeclaration +} from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedType } from "../AbstractGeneratedType"; export class GeneratedUndiscriminatedUnionTypeImpl diff --git a/generators/typescript/model/type-generator/src/union/GeneratedUnionTypeImpl.ts b/generators/typescript/model/type-generator/src/union/GeneratedUnionTypeImpl.ts index 90c632d2360..a670ef28e30 100644 --- a/generators/typescript/model/type-generator/src/union/GeneratedUnionTypeImpl.ts +++ b/generators/typescript/model/type-generator/src/union/GeneratedUnionTypeImpl.ts @@ -1,13 +1,15 @@ +import { GetReferenceOpts } from "@fern-typescript/commons"; +import { BaseContext, GeneratedUnion, GeneratedUnionType } from "@fern-typescript/contexts"; +import { GeneratedUnionImpl } from "@fern-typescript/union-generator"; +import { ModuleDeclarationStructure, StatementStructures, WriterFunction, ts } from "ts-morph"; + import { ExampleSingleUnionTypeProperties, ExampleTypeShape, SingleUnionTypeProperty, UnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; -import { GetReferenceOpts } from "@fern-typescript/commons"; -import { GeneratedUnion, GeneratedUnionType, BaseContext } from "@fern-typescript/contexts"; -import { GeneratedUnionImpl } from "@fern-typescript/union-generator"; -import { ModuleDeclarationStructure, StatementStructures, ts, WriterFunction } from "ts-morph"; + import { AbstractGeneratedType } from "../AbstractGeneratedType"; import { ParsedSingleUnionTypeForUnion } from "./ParsedSingleUnionTypeForUnion"; import { UnknownSingleUnionType } from "./UnknownSingleUnionType"; diff --git a/generators/typescript/model/type-generator/src/union/ParsedSingleUnionTypeForUnion.ts b/generators/typescript/model/type-generator/src/union/ParsedSingleUnionTypeForUnion.ts index 4c456fdbdba..71869cbf615 100644 --- a/generators/typescript/model/type-generator/src/union/ParsedSingleUnionTypeForUnion.ts +++ b/generators/typescript/model/type-generator/src/union/ParsedSingleUnionTypeForUnion.ts @@ -1,10 +1,3 @@ -import { - NameAndWireValue, - SingleUnionType, - SingleUnionTypeProperties, - SingleUnionTypeProperty, - UnionTypeDeclaration -} from "@fern-fern/ir-sdk/api"; import { BaseContext } from "@fern-typescript/contexts"; import { AbstractKnownSingleUnionType, @@ -12,6 +5,15 @@ import { SinglePropertySingleUnionTypeGenerator, SingleUnionTypeGenerator } from "@fern-typescript/union-generator"; + +import { + NameAndWireValue, + SingleUnionType, + SingleUnionTypeProperties, + SingleUnionTypeProperty, + UnionTypeDeclaration +} from "@fern-fern/ir-sdk/api"; + import { SamePropertiesAsObjectSingleUnionTypeGenerator } from "./SamePropertiesAsObjectSingleUnionTypeGenerator"; export declare namespace ParsedSingleUnionTypeForUnion { diff --git a/generators/typescript/model/type-generator/src/union/SamePropertiesAsObjectSingleUnionTypeGenerator.ts b/generators/typescript/model/type-generator/src/union/SamePropertiesAsObjectSingleUnionTypeGenerator.ts index 3ffa593082e..f6da76d0582 100644 --- a/generators/typescript/model/type-generator/src/union/SamePropertiesAsObjectSingleUnionTypeGenerator.ts +++ b/generators/typescript/model/type-generator/src/union/SamePropertiesAsObjectSingleUnionTypeGenerator.ts @@ -1,8 +1,9 @@ -import { DeclaredTypeName } from "@fern-fern/ir-sdk/api"; import { BaseContext } from "@fern-typescript/contexts"; import { SingleUnionTypeGenerator } from "@fern-typescript/union-generator"; import { ModuleDeclarationStructure, OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; +import { DeclaredTypeName } from "@fern-fern/ir-sdk/api"; + export declare namespace SamePropertiesAsObjectSingleUnionTypeGenerator { export interface Init { extended: DeclaredTypeName; diff --git a/generators/typescript/model/type-reference-converters/package.json b/generators/typescript/model/type-reference-converters/package.json index d0b4790dd6c..227e7a41afb 100644 --- a/generators/typescript/model/type-reference-converters/package.json +++ b/generators/typescript/model/type-reference-converters/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/model/type-reference-converters/src/AbstractTypeReferenceConverter.ts b/generators/typescript/model/type-reference-converters/src/AbstractTypeReferenceConverter.ts index e698ff62e20..70921baa531 100644 --- a/generators/typescript/model/type-reference-converters/src/AbstractTypeReferenceConverter.ts +++ b/generators/typescript/model/type-reference-converters/src/AbstractTypeReferenceConverter.ts @@ -1,3 +1,7 @@ +import { TypeReferenceNode } from "@fern-typescript/commons"; +import { TypeResolver } from "@fern-typescript/resolvers"; +import { ts } from "ts-morph"; + import { ContainerType, DeclaredTypeName, @@ -8,9 +12,6 @@ import { ShapeType, TypeReference } from "@fern-fern/ir-sdk/api"; -import { TypeReferenceNode } from "@fern-typescript/commons"; -import { TypeResolver } from "@fern-typescript/resolvers"; -import { ts } from "ts-morph"; export declare namespace AbstractTypeReferenceConverter { export interface Init { @@ -79,7 +80,7 @@ export namespace ConvertTypeReferenceParams { Map: "map", Set: "set" } as const; - export type GenericIn = typeof GenericIn[keyof typeof GenericIn]; + export type GenericIn = (typeof GenericIn)[keyof typeof GenericIn]; } const genericIn = ConvertTypeReferenceParams.GenericIn; diff --git a/generators/typescript/model/type-reference-converters/src/AbstractTypeReferenceToTypeNodeConverter.ts b/generators/typescript/model/type-reference-converters/src/AbstractTypeReferenceToTypeNodeConverter.ts index cde23630c92..4358405dbe1 100644 --- a/generators/typescript/model/type-reference-converters/src/AbstractTypeReferenceToTypeNodeConverter.ts +++ b/generators/typescript/model/type-reference-converters/src/AbstractTypeReferenceToTypeNodeConverter.ts @@ -1,9 +1,12 @@ -import { DeclaredTypeName, Literal, MapType, ResolvedTypeReference, TypeReference } from "@fern-fern/ir-sdk/api"; import { TypeReferenceNode } from "@fern-typescript/commons"; +import { InlineConsts } from "@fern-typescript/commons/src/codegen-utils/inlineConsts"; import { ts } from "ts-morph"; + import { assertNever } from "@fern-api/core-utils"; + +import { DeclaredTypeName, Literal, MapType, ResolvedTypeReference, TypeReference } from "@fern-fern/ir-sdk/api"; + import { AbstractTypeReferenceConverter, ConvertTypeReferenceParams } from "./AbstractTypeReferenceConverter"; -import { InlineConsts } from "@fern-typescript/commons/src/codegen-utils/inlineConsts"; export declare namespace AbstractTypeReferenceToTypeNodeConverter { export interface Init extends AbstractTypeReferenceConverter.Init { diff --git a/generators/typescript/model/type-reference-converters/src/TypeReferenceToParsedTypeNodeConverter.ts b/generators/typescript/model/type-reference-converters/src/TypeReferenceToParsedTypeNodeConverter.ts index 343fabec135..ddb0fa58ae5 100644 --- a/generators/typescript/model/type-reference-converters/src/TypeReferenceToParsedTypeNodeConverter.ts +++ b/generators/typescript/model/type-reference-converters/src/TypeReferenceToParsedTypeNodeConverter.ts @@ -1,6 +1,8 @@ -import { TypeReference } from "@fern-fern/ir-sdk/api"; import { TypeReferenceNode } from "@fern-typescript/commons"; import { ts } from "ts-morph"; + +import { TypeReference } from "@fern-fern/ir-sdk/api"; + import { ConvertTypeReferenceParams } from "./AbstractTypeReferenceConverter"; import { AbstractTypeReferenceToTypeNodeConverter } from "./AbstractTypeReferenceToTypeNodeConverter"; diff --git a/generators/typescript/model/type-reference-converters/src/TypeReferenceToRawTypeNodeConverter.ts b/generators/typescript/model/type-reference-converters/src/TypeReferenceToRawTypeNodeConverter.ts index aeb0d6ae57a..d99c2797bce 100644 --- a/generators/typescript/model/type-reference-converters/src/TypeReferenceToRawTypeNodeConverter.ts +++ b/generators/typescript/model/type-reference-converters/src/TypeReferenceToRawTypeNodeConverter.ts @@ -1,6 +1,8 @@ -import { TypeReference } from "@fern-fern/ir-sdk/api"; import { TypeReferenceNode } from "@fern-typescript/commons"; import { ts } from "ts-morph"; + +import { TypeReference } from "@fern-fern/ir-sdk/api"; + import { ConvertTypeReferenceParams } from "./AbstractTypeReferenceConverter"; import { AbstractTypeReferenceToTypeNodeConverter } from "./AbstractTypeReferenceToTypeNodeConverter"; diff --git a/generators/typescript/model/type-reference-converters/src/TypeReferenceToSchemaConverter.ts b/generators/typescript/model/type-reference-converters/src/TypeReferenceToSchemaConverter.ts index e3f96b82cea..2690ff2321c 100644 --- a/generators/typescript/model/type-reference-converters/src/TypeReferenceToSchemaConverter.ts +++ b/generators/typescript/model/type-reference-converters/src/TypeReferenceToSchemaConverter.ts @@ -1,5 +1,7 @@ -import { DeclaredTypeName, Literal, MapType, TypeReference } from "@fern-fern/ir-sdk/api"; import { Zurg } from "@fern-typescript/commons"; + +import { DeclaredTypeName, Literal, MapType, TypeReference } from "@fern-fern/ir-sdk/api"; + import { AbstractTypeReferenceConverter, ConvertTypeReferenceParams } from "./AbstractTypeReferenceConverter"; export declare namespace TypeReferenceToSchemaConverter { diff --git a/generators/typescript/model/type-reference-converters/src/TypeReferenceToStringExpressionConverter.ts b/generators/typescript/model/type-reference-converters/src/TypeReferenceToStringExpressionConverter.ts index 9effd39cfcf..37fc0351bfc 100644 --- a/generators/typescript/model/type-reference-converters/src/TypeReferenceToStringExpressionConverter.ts +++ b/generators/typescript/model/type-reference-converters/src/TypeReferenceToStringExpressionConverter.ts @@ -1,3 +1,5 @@ +import { ts } from "ts-morph"; + import { ContainerType, DeclaredTypeName, @@ -6,7 +8,7 @@ import { ShapeType, TypeReference } from "@fern-fern/ir-sdk/api"; -import { ts } from "ts-morph"; + import { AbstractTypeReferenceConverter, ConvertTypeReferenceParams } from "./AbstractTypeReferenceConverter"; export declare namespace TypeReferenceToStringExpressionConverter { diff --git a/generators/typescript/model/type-reference-example-generator/package.json b/generators/typescript/model/type-reference-example-generator/package.json index 402ff85e200..40ea1bcd5aa 100644 --- a/generators/typescript/model/type-reference-example-generator/package.json +++ b/generators/typescript/model/type-reference-example-generator/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/model/type-reference-example-generator/src/GeneratedTypeReferenceExampleImpl.ts b/generators/typescript/model/type-reference-example-generator/src/GeneratedTypeReferenceExampleImpl.ts index ae783aafa9b..5a535a94c28 100644 --- a/generators/typescript/model/type-reference-example-generator/src/GeneratedTypeReferenceExampleImpl.ts +++ b/generators/typescript/model/type-reference-example-generator/src/GeneratedTypeReferenceExampleImpl.ts @@ -1,13 +1,15 @@ +import { GetReferenceOpts } from "@fern-typescript/commons"; +import { BaseContext, GeneratedTypeReferenceExample } from "@fern-typescript/contexts"; +import { ts } from "ts-morph"; + import { assertNever } from "@fern-api/core-utils"; + import { ExampleContainer, ExamplePrimitive, ExampleTypeReference, ExampleTypeReferenceShape } from "@fern-fern/ir-sdk/api"; -import { GetReferenceOpts } from "@fern-typescript/commons"; -import { GeneratedTypeReferenceExample, BaseContext } from "@fern-typescript/contexts"; -import { ts } from "ts-morph"; export declare namespace GeneratedTypeReferenceExampleImpl { export interface Init { diff --git a/generators/typescript/model/type-reference-example-generator/src/TypeReferenceExampleGenerator.ts b/generators/typescript/model/type-reference-example-generator/src/TypeReferenceExampleGenerator.ts index e1f1fa83001..aab18d5ed91 100644 --- a/generators/typescript/model/type-reference-example-generator/src/TypeReferenceExampleGenerator.ts +++ b/generators/typescript/model/type-reference-example-generator/src/TypeReferenceExampleGenerator.ts @@ -1,5 +1,7 @@ -import { ExampleTypeReference } from "@fern-fern/ir-sdk/api"; import { GeneratedTypeReferenceExample } from "@fern-typescript/contexts"; + +import { ExampleTypeReference } from "@fern-fern/ir-sdk/api"; + import { GeneratedTypeReferenceExampleImpl } from "./GeneratedTypeReferenceExampleImpl"; export class TypeReferenceExampleGenerator { diff --git a/generators/typescript/model/type-schema-generator/package.json b/generators/typescript/model/type-schema-generator/package.json index d3ce256aa35..ab7412a895e 100644 --- a/generators/typescript/model/type-schema-generator/package.json +++ b/generators/typescript/model/type-schema-generator/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": { @@ -40,8 +39,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" } } \ No newline at end of file diff --git a/generators/typescript/model/type-schema-generator/src/TypeSchemaGenerator.ts b/generators/typescript/model/type-schema-generator/src/TypeSchemaGenerator.ts index 42789ab505c..69bd96a0cc7 100644 --- a/generators/typescript/model/type-schema-generator/src/TypeSchemaGenerator.ts +++ b/generators/typescript/model/type-schema-generator/src/TypeSchemaGenerator.ts @@ -1,11 +1,3 @@ -import { - AliasTypeDeclaration, - EnumTypeDeclaration, - ObjectTypeDeclaration, - Type, - UndiscriminatedUnionTypeDeclaration, - UnionTypeDeclaration -} from "@fern-fern/ir-sdk/api"; import { Reference } from "@fern-typescript/commons"; import { GeneratedAliasTypeSchema, @@ -17,6 +9,16 @@ import { ModelContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + +import { + AliasTypeDeclaration, + EnumTypeDeclaration, + ObjectTypeDeclaration, + Type, + UndiscriminatedUnionTypeDeclaration, + UnionTypeDeclaration +} from "@fern-fern/ir-sdk/api"; + import { GeneratedAliasTypeSchemaImpl } from "./alias/GeneratedAliasTypeSchemaImpl"; import { GeneratedEnumTypeSchemaImpl } from "./enum/GeneratedEnumTypeSchemaImpl"; import { GeneratedObjectTypeSchemaImpl } from "./object/GeneratedObjectTypeSchemaImpl"; diff --git a/generators/typescript/model/type-schema-generator/src/alias/GeneratedAliasTypeSchemaImpl.ts b/generators/typescript/model/type-schema-generator/src/alias/GeneratedAliasTypeSchemaImpl.ts index d5db13d42d7..affeb00e426 100644 --- a/generators/typescript/model/type-schema-generator/src/alias/GeneratedAliasTypeSchemaImpl.ts +++ b/generators/typescript/model/type-schema-generator/src/alias/GeneratedAliasTypeSchemaImpl.ts @@ -1,8 +1,10 @@ -import { AliasTypeDeclaration, ShapeType } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getTextOfTsNode, Zurg } from "@fern-typescript/commons"; +import { Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { GeneratedAliasTypeSchema, ModelContext } from "@fern-typescript/contexts"; import { ModuleDeclaration, ts } from "ts-morph"; + +import { AliasTypeDeclaration, ShapeType } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedTypeSchema } from "../AbstractGeneratedTypeSchema"; export class GeneratedAliasTypeSchemaImpl diff --git a/generators/typescript/model/type-schema-generator/src/enum/GeneratedEnumTypeSchemaImpl.ts b/generators/typescript/model/type-schema-generator/src/enum/GeneratedEnumTypeSchemaImpl.ts index 24caf1004bc..cffc48f6685 100644 --- a/generators/typescript/model/type-schema-generator/src/enum/GeneratedEnumTypeSchemaImpl.ts +++ b/generators/typescript/model/type-schema-generator/src/enum/GeneratedEnumTypeSchemaImpl.ts @@ -1,8 +1,10 @@ -import { EnumTypeDeclaration } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getTextOfTsNode, Zurg } from "@fern-typescript/commons"; +import { Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { BaseContext, GeneratedEnumTypeSchema } from "@fern-typescript/contexts"; import { ModuleDeclaration, ts } from "ts-morph"; + +import { EnumTypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedTypeSchema } from "../AbstractGeneratedTypeSchema"; export class GeneratedEnumTypeSchemaImpl diff --git a/generators/typescript/model/type-schema-generator/src/object/GeneratedObjectTypeSchemaImpl.ts b/generators/typescript/model/type-schema-generator/src/object/GeneratedObjectTypeSchemaImpl.ts index c3c7f157b70..057410b6e3a 100644 --- a/generators/typescript/model/type-schema-generator/src/object/GeneratedObjectTypeSchemaImpl.ts +++ b/generators/typescript/model/type-schema-generator/src/object/GeneratedObjectTypeSchemaImpl.ts @@ -1,8 +1,10 @@ -import { ObjectTypeDeclaration } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getTextOfTsNode, Zurg } from "@fern-typescript/commons"; +import { Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { GeneratedObjectTypeSchema, ModelContext } from "@fern-typescript/contexts"; import { ModuleDeclaration, ts } from "ts-morph"; + +import { ObjectTypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedTypeSchema } from "../AbstractGeneratedTypeSchema"; export class GeneratedObjectTypeSchemaImpl diff --git a/generators/typescript/model/type-schema-generator/src/undiscriminated-union/GeneratedUndiscriminatedUnionTypeSchemaImpl.ts b/generators/typescript/model/type-schema-generator/src/undiscriminated-union/GeneratedUndiscriminatedUnionTypeSchemaImpl.ts index c0a214b8521..59c76f03a0d 100644 --- a/generators/typescript/model/type-schema-generator/src/undiscriminated-union/GeneratedUndiscriminatedUnionTypeSchemaImpl.ts +++ b/generators/typescript/model/type-schema-generator/src/undiscriminated-union/GeneratedUndiscriminatedUnionTypeSchemaImpl.ts @@ -1,8 +1,10 @@ -import { UndiscriminatedUnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getTextOfTsNode, Zurg } from "@fern-typescript/commons"; +import { Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { GeneratedUndiscriminatedUnionTypeSchema, ModelContext } from "@fern-typescript/contexts"; import { ModuleDeclaration, ts } from "ts-morph"; + +import { UndiscriminatedUnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedTypeSchema } from "../AbstractGeneratedTypeSchema"; export class GeneratedUndiscriminatedUnionTypeSchemaImpl diff --git a/generators/typescript/model/type-schema-generator/src/union/GeneratedUnionTypeSchemaImpl.ts b/generators/typescript/model/type-schema-generator/src/union/GeneratedUnionTypeSchemaImpl.ts index fa2cf0c591f..f201db6b481 100644 --- a/generators/typescript/model/type-schema-generator/src/union/GeneratedUnionTypeSchemaImpl.ts +++ b/generators/typescript/model/type-schema-generator/src/union/GeneratedUnionTypeSchemaImpl.ts @@ -1,4 +1,3 @@ -import { SingleUnionTypeProperties, UnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; import { Zurg } from "@fern-typescript/commons"; import { GeneratedUnionType, GeneratedUnionTypeSchema, ModelContext } from "@fern-typescript/contexts"; import { @@ -7,6 +6,9 @@ import { RawSingleUnionType } from "@fern-typescript/union-schema-generator"; import { ModuleDeclaration, ts } from "ts-morph"; + +import { SingleUnionTypeProperties, UnionTypeDeclaration } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedTypeSchema } from "../AbstractGeneratedTypeSchema"; import { RawSamePropertiesAsObjectSingleUnionType } from "./RawSamePropertiesAsObjectSingleUnionType"; import { RawSinglePropertySingleUnionType } from "./RawSinglePropertySingleUnionType"; diff --git a/generators/typescript/model/type-schema-generator/src/union/RawSamePropertiesAsObjectSingleUnionType.ts b/generators/typescript/model/type-schema-generator/src/union/RawSamePropertiesAsObjectSingleUnionType.ts index 63cc1fb9c13..92bfd6cf1cd 100644 --- a/generators/typescript/model/type-schema-generator/src/union/RawSamePropertiesAsObjectSingleUnionType.ts +++ b/generators/typescript/model/type-schema-generator/src/union/RawSamePropertiesAsObjectSingleUnionType.ts @@ -1,9 +1,10 @@ -import { DeclaredTypeName } from "@fern-fern/ir-sdk/api"; import { Zurg } from "@fern-typescript/commons"; import { ModelContext } from "@fern-typescript/contexts"; import { AbstractRawSingleUnionType } from "@fern-typescript/union-schema-generator"; import { OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; +import { DeclaredTypeName } from "@fern-fern/ir-sdk/api"; + export declare namespace RawSamePropertiesAsObjectSingleUnionType { export interface Init extends AbstractRawSingleUnionType.Init { extended: DeclaredTypeName; diff --git a/generators/typescript/model/type-schema-generator/src/union/RawSinglePropertySingleUnionType.ts b/generators/typescript/model/type-schema-generator/src/union/RawSinglePropertySingleUnionType.ts index b0c62db8000..213899b34f1 100644 --- a/generators/typescript/model/type-schema-generator/src/union/RawSinglePropertySingleUnionType.ts +++ b/generators/typescript/model/type-schema-generator/src/union/RawSinglePropertySingleUnionType.ts @@ -1,9 +1,10 @@ -import { SingleUnionTypeProperty } from "@fern-fern/ir-sdk/api"; -import { getTextOfTsNode, Zurg } from "@fern-typescript/commons"; +import { Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { GeneratedType, ModelContext } from "@fern-typescript/contexts"; import { AbstractRawSingleUnionType } from "@fern-typescript/union-schema-generator"; import { OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; +import { SingleUnionTypeProperty } from "@fern-fern/ir-sdk/api"; + export declare namespace RawSinglePropertySingleUnionType { export interface Init extends AbstractRawSingleUnionType.Init { singleProperty: SingleUnionTypeProperty; diff --git a/generators/typescript/model/union-generator/package.json b/generators/typescript/model/union-generator/package.json index 9f2bd408862..71dbbbbf23f 100644 --- a/generators/typescript/model/union-generator/package.json +++ b/generators/typescript/model/union-generator/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/model/union-generator/src/GeneratedUnionImpl.ts b/generators/typescript/model/union-generator/src/GeneratedUnionImpl.ts index b01c5f539a2..1c1707b1d42 100644 --- a/generators/typescript/model/union-generator/src/GeneratedUnionImpl.ts +++ b/generators/typescript/model/union-generator/src/GeneratedUnionImpl.ts @@ -1,11 +1,10 @@ -import { ObjectProperty } from "@fern-fern/ir-sdk/api"; import { FernWriters, + ObjectWriter, + Reference, getTextOfTsNode, getWriterForMultiLineUnionType, - maybeAddDocsStructure, - ObjectWriter, - Reference + maybeAddDocsStructure } from "@fern-typescript/commons"; import { GeneratedUnion, ModelContext } from "@fern-typescript/contexts"; import { @@ -15,12 +14,15 @@ import { PropertySignatureStructure, StatementStructures, StructureKind, - ts, TypeAliasDeclarationStructure, VariableDeclarationKind, VariableStatementStructure, - WriterFunction + WriterFunction, + ts } from "ts-morph"; + +import { ObjectProperty } from "@fern-fern/ir-sdk/api"; + import { KnownSingleUnionType } from "./known-single-union-type/KnownSingleUnionType"; import { ParsedSingleUnionType } from "./parsed-single-union-type/ParsedSingleUnionType"; diff --git a/generators/typescript/model/union-generator/src/known-single-union-type/AbstractKnownSingleUnionType.ts b/generators/typescript/model/union-generator/src/known-single-union-type/AbstractKnownSingleUnionType.ts index f956e711d69..b638a826553 100644 --- a/generators/typescript/model/union-generator/src/known-single-union-type/AbstractKnownSingleUnionType.ts +++ b/generators/typescript/model/union-generator/src/known-single-union-type/AbstractKnownSingleUnionType.ts @@ -1,6 +1,8 @@ -import { assertNever } from "@fern-api/core-utils"; import { ModelContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + +import { assertNever } from "@fern-api/core-utils"; + import { GeneratedUnionImpl } from "../GeneratedUnionImpl"; import { AbstractParsedSingleUnionType } from "../parsed-single-union-type/AbstractParsedSingleUnionType"; import { KnownSingleUnionType } from "./KnownSingleUnionType"; diff --git a/generators/typescript/model/union-generator/src/known-single-union-type/KnownSingleUnionType.ts b/generators/typescript/model/union-generator/src/known-single-union-type/KnownSingleUnionType.ts index 9f399fb14ef..17e72fd694c 100644 --- a/generators/typescript/model/union-generator/src/known-single-union-type/KnownSingleUnionType.ts +++ b/generators/typescript/model/union-generator/src/known-single-union-type/KnownSingleUnionType.ts @@ -1,4 +1,5 @@ import { ModelContext } from "@fern-typescript/contexts"; + import { ParsedSingleUnionType } from "../parsed-single-union-type/ParsedSingleUnionType"; export interface KnownSingleUnionType extends ParsedSingleUnionType { diff --git a/generators/typescript/model/union-generator/src/parsed-single-union-type/AbstractParsedSingleUnionType.ts b/generators/typescript/model/union-generator/src/parsed-single-union-type/AbstractParsedSingleUnionType.ts index 45a77a93ef3..9ff808df756 100644 --- a/generators/typescript/model/union-generator/src/parsed-single-union-type/AbstractParsedSingleUnionType.ts +++ b/generators/typescript/model/union-generator/src/parsed-single-union-type/AbstractParsedSingleUnionType.ts @@ -1,6 +1,7 @@ import { getTextOfTsNode } from "@fern-typescript/commons"; import { ModelContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + import { GeneratedUnionImpl } from "../GeneratedUnionImpl"; import { SingleUnionTypeGenerator } from "../single-union-type-generator/SingleUnionTypeGenerator"; import { ParsedSingleUnionType } from "./ParsedSingleUnionType"; diff --git a/generators/typescript/model/union-generator/src/parsed-single-union-type/ParsedSingleUnionType.ts b/generators/typescript/model/union-generator/src/parsed-single-union-type/ParsedSingleUnionType.ts index bc6c380516d..e5a80f4cef7 100644 --- a/generators/typescript/model/union-generator/src/parsed-single-union-type/ParsedSingleUnionType.ts +++ b/generators/typescript/model/union-generator/src/parsed-single-union-type/ParsedSingleUnionType.ts @@ -1,5 +1,6 @@ import { ModelContext } from "@fern-typescript/contexts"; import { ModuleDeclarationStructure, OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; + import { GeneratedUnionImpl } from "../GeneratedUnionImpl"; export interface ParsedSingleUnionType { diff --git a/generators/typescript/model/union-generator/src/single-union-type-generator/common/NoPropertiesSingleUnionTypeGenerator.ts b/generators/typescript/model/union-generator/src/single-union-type-generator/common/NoPropertiesSingleUnionTypeGenerator.ts index 4c54e02ad50..1098a31f6dc 100644 --- a/generators/typescript/model/union-generator/src/single-union-type-generator/common/NoPropertiesSingleUnionTypeGenerator.ts +++ b/generators/typescript/model/union-generator/src/single-union-type-generator/common/NoPropertiesSingleUnionTypeGenerator.ts @@ -1,4 +1,5 @@ import { ModuleDeclarationStructure, OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; + import { SingleUnionTypeGenerator } from "../SingleUnionTypeGenerator"; export class NoPropertiesSingleUnionTypeGenerator implements SingleUnionTypeGenerator { diff --git a/generators/typescript/model/union-generator/src/single-union-type-generator/common/SinglePropertySingleUnionTypeGenerator.ts b/generators/typescript/model/union-generator/src/single-union-type-generator/common/SinglePropertySingleUnionTypeGenerator.ts index 2ed14dec8e2..f7591d6e98d 100644 --- a/generators/typescript/model/union-generator/src/single-union-type-generator/common/SinglePropertySingleUnionTypeGenerator.ts +++ b/generators/typescript/model/union-generator/src/single-union-type-generator/common/SinglePropertySingleUnionTypeGenerator.ts @@ -1,8 +1,11 @@ -import { assertNever } from "@fern-api/core-utils"; -import { NamedType, ObjectProperty, SingleUnionTypeProperty, TypeReference } from "@fern-fern/ir-sdk/api"; -import { getTextOfTsNode, TypeReferenceNode } from "@fern-typescript/commons"; +import { TypeReferenceNode, getTextOfTsNode } from "@fern-typescript/commons"; import { ModelContext } from "@fern-typescript/contexts"; import { ModuleDeclarationStructure, OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; + +import { assertNever } from "@fern-api/core-utils"; + +import { NamedType, ObjectProperty, SingleUnionTypeProperty, TypeReference } from "@fern-fern/ir-sdk/api"; + import { SingleUnionTypeGenerator } from "../SingleUnionTypeGenerator"; export declare namespace SinglePropertySingleUnionTypeGenerator { diff --git a/generators/typescript/model/union-generator/src/unknown-single-union-type/AbstractUnknownSingleUnionType.ts b/generators/typescript/model/union-generator/src/unknown-single-union-type/AbstractUnknownSingleUnionType.ts index f43119ecc9e..e01cf3d1a21 100644 --- a/generators/typescript/model/union-generator/src/unknown-single-union-type/AbstractUnknownSingleUnionType.ts +++ b/generators/typescript/model/union-generator/src/unknown-single-union-type/AbstractUnknownSingleUnionType.ts @@ -1,5 +1,6 @@ import { ModelContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + import { AbstractParsedSingleUnionType } from "../parsed-single-union-type/AbstractParsedSingleUnionType"; export abstract class AbstractUnknownSingleUnionType< diff --git a/generators/typescript/model/union-schema-generator/package.json b/generators/typescript/model/union-schema-generator/package.json index 5d64180ec49..bb3a6a56996 100644 --- a/generators/typescript/model/union-schema-generator/package.json +++ b/generators/typescript/model/union-schema-generator/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/model/union-schema-generator/src/AbstractRawSingleUnionType.ts b/generators/typescript/model/union-schema-generator/src/AbstractRawSingleUnionType.ts index b3d6800fcbc..ee20cd90c8c 100644 --- a/generators/typescript/model/union-schema-generator/src/AbstractRawSingleUnionType.ts +++ b/generators/typescript/model/union-schema-generator/src/AbstractRawSingleUnionType.ts @@ -1,6 +1,8 @@ -import { NameAndWireValue } from "@fern-fern/ir-sdk/api"; -import { getTextOfTsNode, Zurg } from "@fern-typescript/commons"; +import { Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { InterfaceDeclarationStructure, OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; + +import { NameAndWireValue } from "@fern-fern/ir-sdk/api"; + import { RawSingleUnionType } from "./RawSingleUnionType"; export declare namespace AbstractRawSingleUnionType { diff --git a/generators/typescript/model/union-schema-generator/src/GeneratedUnionSchema.ts b/generators/typescript/model/union-schema-generator/src/GeneratedUnionSchema.ts index b9f5714c907..40988f70d78 100644 --- a/generators/typescript/model/union-schema-generator/src/GeneratedUnionSchema.ts +++ b/generators/typescript/model/union-schema-generator/src/GeneratedUnionSchema.ts @@ -1,8 +1,10 @@ -import { NameAndWireValue, ObjectProperty } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getTextOfTsNode, Reference, Zurg } from "@fern-typescript/commons"; +import { Reference, Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { GeneratedUnion, ModelContext } from "@fern-typescript/contexts"; -import { ModuleDeclaration, ts, VariableDeclarationKind } from "ts-morph"; +import { ModuleDeclaration, VariableDeclarationKind, ts } from "ts-morph"; + +import { NameAndWireValue, ObjectProperty } from "@fern-fern/ir-sdk/api"; + import { RawSingleUnionType } from "./RawSingleUnionType"; export declare namespace GeneratedUnionSchema { diff --git a/generators/typescript/model/union-schema-generator/src/RawNoPropertiesSingleUnionType.ts b/generators/typescript/model/union-schema-generator/src/RawNoPropertiesSingleUnionType.ts index 1a7fcf668ef..4612271381e 100644 --- a/generators/typescript/model/union-schema-generator/src/RawNoPropertiesSingleUnionType.ts +++ b/generators/typescript/model/union-schema-generator/src/RawNoPropertiesSingleUnionType.ts @@ -1,6 +1,7 @@ import { Zurg } from "@fern-typescript/commons"; import { BaseContext } from "@fern-typescript/contexts"; import { OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; + import { AbstractRawSingleUnionType } from "./AbstractRawSingleUnionType"; export class RawNoPropertiesSingleUnionType extends AbstractRawSingleUnionType { diff --git a/generators/typescript/playground/browser/index.html b/generators/typescript/playground/browser/index.html index 1d16004c08b..29279dbe21a 100644 --- a/generators/typescript/playground/browser/index.html +++ b/generators/typescript/playground/browser/index.html @@ -1,4 +1,4 @@ - + diff --git a/generators/typescript/playground/browser/package.json b/generators/typescript/playground/browser/package.json index 931b2f85c50..89394ecdeb4 100644 --- a/generators/typescript/playground/browser/package.json +++ b/generators/typescript/playground/browser/package.json @@ -26,7 +26,6 @@ "lint:style:fix": "yarn lint:style --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", "start": "pnpm compile && vite", "build": "pnpm compile && vite build", @@ -51,8 +50,8 @@ "@vitejs/plugin-react": "^4.2.1", "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", "sass": "^1.72.0", "stylelint": "^16.2.1", "typescript": "5.7.2", diff --git a/generators/typescript/playground/browser/src/App.tsx b/generators/typescript/playground/browser/src/App.tsx index 173d096f922..4f6bc0b449f 100644 --- a/generators/typescript/playground/browser/src/App.tsx +++ b/generators/typescript/playground/browser/src/App.tsx @@ -1,4 +1,5 @@ import { useEffect } from "react"; + import "./App.css"; // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types diff --git a/generators/typescript/playground/browser/src/main.tsx b/generators/typescript/playground/browser/src/main.tsx index cc8467f8702..9039c2dc8e6 100644 --- a/generators/typescript/playground/browser/src/main.tsx +++ b/generators/typescript/playground/browser/src/main.tsx @@ -1,5 +1,6 @@ import React from "react"; import ReactDOM from "react-dom/client"; + import App from "./App"; import "./index.css"; diff --git a/generators/typescript/sdk/cli/package.json b/generators/typescript/sdk/cli/package.json index 4f43d416286..bc6c42ee9b3 100644 --- a/generators/typescript/sdk/cli/package.json +++ b/generators/typescript/sdk/cli/package.json @@ -23,7 +23,6 @@ "lint:eslint:fix": "pnpm 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", "build:browser": "tsup ./src/browserCli.ts --format cjs", "build:node": "tsup ./src/nodeCli.ts --format cjs", @@ -49,8 +48,8 @@ "eslint": "^9.16.0", "vitest": "^2.1.8", "lodash-es": "^4.17.21", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "ts-loader": "^9.3.1", "tsup": "^8.3.5", "typescript": "5.7.2", diff --git a/generators/typescript/sdk/cli/src/SdkGeneratorCli.ts b/generators/typescript/sdk/cli/src/SdkGeneratorCli.ts index d8c61e01c62..9d1b06b9a89 100644 --- a/generators/typescript/sdk/cli/src/SdkGeneratorCli.ts +++ b/generators/typescript/sdk/cli/src/SdkGeneratorCli.ts @@ -1,13 +1,16 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { FernGeneratorExec } from "@fern-api/base-generator"; -import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratorCli } from "@fern-typescript/abstract-generator-cli"; import { JavaScriptRuntime, NpmPackage, PersistedTypescriptProject } from "@fern-typescript/commons"; import { GeneratorContext } from "@fern-typescript/contexts"; import { SdkGenerator } from "@fern-typescript/sdk-generator"; import { camelCase, upperFirst } from "lodash-es"; -import { SdkCustomConfigSchema } from "./custom-config/schema/SdkCustomConfigSchema"; + +import { FernGeneratorExec } from "@fern-api/base-generator"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + +import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { SdkCustomConfig } from "./custom-config/SdkCustomConfig"; +import { SdkCustomConfigSchema } from "./custom-config/schema/SdkCustomConfigSchema"; export declare namespace SdkGeneratorCli { export interface Init { @@ -172,7 +175,7 @@ export class SdkGeneratorCli extends AbstractGeneratorCli { return config.environment.type === "local" ? "local" : config.environment.coordinatorUrlV2.endsWith("dev2.buildwithfern.com") - ? "dev" - : "prod"; + ? "dev" + : "prod"; } } diff --git a/generators/typescript/sdk/cli/src/browserCli.ts b/generators/typescript/sdk/cli/src/browserCli.ts index cbf26b6aa40..8481b0fcfd2 100644 --- a/generators/typescript/sdk/cli/src/browserCli.ts +++ b/generators/typescript/sdk/cli/src/browserCli.ts @@ -1,4 +1,5 @@ import { JavaScriptRuntime } from "@fern-typescript/commons"; + import { SdkGeneratorCli } from "./SdkGeneratorCli"; void new SdkGeneratorCli({ targetRuntime: JavaScriptRuntime.BROWSER }).runCli(); diff --git a/generators/typescript/sdk/cli/src/nodeCli.ts b/generators/typescript/sdk/cli/src/nodeCli.ts index 5643fa13c67..6a9e48f98ef 100644 --- a/generators/typescript/sdk/cli/src/nodeCli.ts +++ b/generators/typescript/sdk/cli/src/nodeCli.ts @@ -1,4 +1,5 @@ import { JavaScriptRuntime } from "@fern-typescript/commons"; + import { SdkGeneratorCli } from "./SdkGeneratorCli"; void new SdkGeneratorCli({ targetRuntime: JavaScriptRuntime.NODE }).runCli(); diff --git a/generators/typescript/sdk/client-class-generator/package.json b/generators/typescript/sdk/client-class-generator/package.json index 0102314f401..9448c1b420d 100644 --- a/generators/typescript/sdk/client-class-generator/package.json +++ b/generators/typescript/sdk/client-class-generator/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 @@ "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" } } \ No newline at end of file diff --git a/generators/typescript/sdk/client-class-generator/src/GeneratedSdkClientClassImpl.ts b/generators/typescript/sdk/client-class-generator/src/GeneratedSdkClientClassImpl.ts index 21ecb9d72a7..c93038516cd 100644 --- a/generators/typescript/sdk/client-class-generator/src/GeneratedSdkClientClassImpl.ts +++ b/generators/typescript/sdk/client-class-generator/src/GeneratedSdkClientClassImpl.ts @@ -1,28 +1,11 @@ -import { assertNever, SetRequired } from "@fern-api/core-utils"; import { - AuthScheme, - BasicAuthScheme, - BearerAuthScheme, - ExampleEndpointCall, - HeaderAuthScheme, - HttpEndpoint, - HttpHeader, - HttpResponseBody, - IntermediateRepresentation, - OAuthScheme, - Package, - PathParameter, - VariableDeclaration, - VariableId -} from "@fern-fern/ir-sdk/api"; -import { - getParameterNameForRootPathParameter, - getTextOfTsNode, ImportsManager, JavaScriptRuntime, - maybeAddDocsStructure, NpmPackage, - PackageId + PackageId, + getParameterNameForRootPathParameter, + getTextOfTsNode, + maybeAddDocsStructure } from "@fern-typescript/commons"; import { GeneratedEndpointImplementation, GeneratedSdkClientClass, SdkContext } from "@fern-typescript/contexts"; import { ErrorResolver, PackageResolver } from "@fern-typescript/resolvers"; @@ -38,19 +21,39 @@ import { ts } from "ts-morph"; import { code } from "ts-poet"; + +import { SetRequired, assertNever } from "@fern-api/core-utils"; + +import { + AuthScheme, + BasicAuthScheme, + BearerAuthScheme, + ExampleEndpointCall, + HeaderAuthScheme, + HttpEndpoint, + HttpHeader, + HttpResponseBody, + IntermediateRepresentation, + OAuthScheme, + Package, + PathParameter, + VariableDeclaration, + VariableId +} from "@fern-fern/ir-sdk/api"; + +import { GeneratedHeader } from "./GeneratedHeader"; +import { GeneratedWrappedService } from "./GeneratedWrappedService"; import { GeneratedBytesEndpointRequest } from "./endpoint-request/GeneratedBytesEndpointRequest"; import { GeneratedDefaultEndpointRequest } from "./endpoint-request/GeneratedDefaultEndpointRequest"; import { GeneratedFileUploadEndpointRequest } from "./endpoint-request/GeneratedFileUploadEndpointRequest"; -import { GeneratedNonThrowingEndpointResponse } from "./endpoints/default/endpoint-response/GeneratedNonThrowingEndpointResponse"; -import { GeneratedThrowingEndpointResponse } from "./endpoints/default/endpoint-response/GeneratedThrowingEndpointResponse"; -import { GeneratedDefaultEndpointImplementation } from "./endpoints/default/GeneratedDefaultEndpointImplementation"; import { GeneratedFileDownloadEndpointImplementation } from "./endpoints/GeneratedFileDownloadEndpointImplementation"; import { GeneratedStreamingEndpointImplementation } from "./endpoints/GeneratedStreamingEndpointImplementation"; +import { GeneratedDefaultEndpointImplementation } from "./endpoints/default/GeneratedDefaultEndpointImplementation"; +import { GeneratedNonThrowingEndpointResponse } from "./endpoints/default/endpoint-response/GeneratedNonThrowingEndpointResponse"; +import { GeneratedThrowingEndpointResponse } from "./endpoints/default/endpoint-response/GeneratedThrowingEndpointResponse"; import { getNonVariablePathParameters } from "./endpoints/utils/getNonVariablePathParameters"; import { getLiteralValueForHeader, isLiteralHeader } from "./endpoints/utils/isLiteralHeader"; import { REQUEST_OPTIONS_PARAMETER_NAME } from "./endpoints/utils/requestOptionsParameter"; -import { GeneratedHeader } from "./GeneratedHeader"; -import { GeneratedWrappedService } from "./GeneratedWrappedService"; import { OAuthTokenProviderGenerator } from "./oauth-generator/OAuthTokenProviderGenerator"; export declare namespace GeneratedSdkClientClassImpl { diff --git a/generators/typescript/sdk/client-class-generator/src/GeneratedWrappedService.ts b/generators/typescript/sdk/client-class-generator/src/GeneratedWrappedService.ts index 3b75ce4aa79..e3844fa706f 100644 --- a/generators/typescript/sdk/client-class-generator/src/GeneratedWrappedService.ts +++ b/generators/typescript/sdk/client-class-generator/src/GeneratedWrappedService.ts @@ -1,8 +1,11 @@ -import { Subpackage, SubpackageId } from "@fern-fern/ir-sdk/api"; -import { getTextOfTsNode, Reference } from "@fern-typescript/commons"; -import { SetRequired } from "@fern-api/core-utils"; +import { Reference, getTextOfTsNode } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { ClassDeclarationStructure, Scope, ts } from "ts-morph"; + +import { SetRequired } from "@fern-api/core-utils"; + +import { Subpackage, SubpackageId } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkClientClassImpl } from "./GeneratedSdkClientClassImpl"; import { OAuthTokenProviderGenerator } from "./oauth-generator/OAuthTokenProviderGenerator"; diff --git a/generators/typescript/sdk/client-class-generator/src/SdkClientClassGenerator.ts b/generators/typescript/sdk/client-class-generator/src/SdkClientClassGenerator.ts index 745c02d9232..ef301bbd636 100644 --- a/generators/typescript/sdk/client-class-generator/src/SdkClientClassGenerator.ts +++ b/generators/typescript/sdk/client-class-generator/src/SdkClientClassGenerator.ts @@ -1,7 +1,9 @@ -import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { ImportsManager, JavaScriptRuntime, NpmPackage, PackageId } from "@fern-typescript/commons"; import { GeneratedSdkClientClass } from "@fern-typescript/contexts"; import { ErrorResolver, PackageResolver } from "@fern-typescript/resolvers"; + +import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkClientClassImpl } from "./GeneratedSdkClientClassImpl"; import { OAuthTokenProviderGenerator } from "./oauth-generator/OAuthTokenProviderGenerator"; diff --git a/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedBytesEndpointRequest.ts b/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedBytesEndpointRequest.ts index 8e4e7fff83c..5a48330f52d 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedBytesEndpointRequest.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedBytesEndpointRequest.ts @@ -1,28 +1,30 @@ -import { - ExampleEndpointCall, - HttpEndpoint, - HttpRequestBody, - HttpService, - IntermediateRepresentation -} from "@fern-fern/ir-sdk/api"; import { Fetcher, - getParameterNameForPositionalPathParameter, GetReferenceOpts, - getTextOfTsNode, ImportsManager, JavaScriptRuntime, PackageId, + getParameterNameForPositionalPathParameter, + getTextOfTsNode, visitJavaScriptRuntime } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; + +import { + ExampleEndpointCall, + HttpEndpoint, + HttpRequestBody, + HttpService, + IntermediateRepresentation +} from "@fern-fern/ir-sdk/api"; + +import { GeneratedSdkClientClassImpl } from "../GeneratedSdkClientClassImpl"; import { GeneratedQueryParams } from "../endpoints/utils/GeneratedQueryParams"; import { generateHeaders } from "../endpoints/utils/generateHeaders"; -import { GeneratedSdkClientClassImpl } from "../GeneratedSdkClientClassImpl"; +import { getPathParametersForEndpointSignature } from "../endpoints/utils/getPathParametersForEndpointSignature"; import { FileUploadRequestParameter } from "../request-parameter/FileUploadRequestParameter"; import { GeneratedEndpointRequest } from "./GeneratedEndpointRequest"; -import { getPathParametersForEndpointSignature } from "../endpoints/utils/getPathParametersForEndpointSignature"; export declare namespace GeneratedBytesEndpointRequest { export interface Init { diff --git a/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedDefaultEndpointRequest.ts b/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedDefaultEndpointRequest.ts index 747342a7a7d..416f1e8dd51 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedDefaultEndpointRequest.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedDefaultEndpointRequest.ts @@ -1,4 +1,15 @@ +import { + Fetcher, + GetReferenceOpts, + PackageId, + getParameterNameForPositionalPathParameter, + getTextOfTsNode +} from "@fern-typescript/commons"; +import { SdkContext } from "@fern-typescript/contexts"; +import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; + import { assertNever } from "@fern-api/core-utils"; + import { ExampleEndpointCall, HttpEndpoint, @@ -9,19 +20,11 @@ import { SdkRequest, SdkRequestShape } from "@fern-fern/ir-sdk/api"; -import { - Fetcher, - getParameterNameForPositionalPathParameter, - GetReferenceOpts, - getTextOfTsNode, - PackageId -} from "@fern-typescript/commons"; -import { SdkContext } from "@fern-typescript/contexts"; -import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; + +import { GeneratedSdkClientClassImpl } from "../GeneratedSdkClientClassImpl"; import { GeneratedQueryParams } from "../endpoints/utils/GeneratedQueryParams"; import { generateHeaders } from "../endpoints/utils/generateHeaders"; import { getPathParametersForEndpointSignature } from "../endpoints/utils/getPathParametersForEndpointSignature"; -import { GeneratedSdkClientClassImpl } from "../GeneratedSdkClientClassImpl"; import { RequestBodyParameter } from "../request-parameter/RequestBodyParameter"; import { RequestParameter } from "../request-parameter/RequestParameter"; import { RequestWrapperParameter } from "../request-parameter/RequestWrapperParameter"; @@ -286,8 +289,8 @@ export class GeneratedDefaultEndpointRequest implements GeneratedEndpointRequest typeof property.propertyValue === "string" ? ts.factory.createStringLiteral(property.propertyValue) : property.propertyValue - ? ts.factory.createTrue() - : ts.factory.createFalse() + ? ts.factory.createTrue() + : ts.factory.createFalse() ); }) ]); diff --git a/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedEndpointRequest.ts b/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedEndpointRequest.ts index 5b9cdd8e4f4..1bc256170b5 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedEndpointRequest.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedEndpointRequest.ts @@ -1,8 +1,9 @@ -import { ExampleEndpointCall } from "@fern-fern/ir-sdk/api"; import { Fetcher, GetReferenceOpts } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; +import { ExampleEndpointCall } from "@fern-fern/ir-sdk/api"; + export interface GeneratedEndpointRequest { getBuildRequestStatements: (context: SdkContext) => ts.Statement[]; getRequestParameter(context: SdkContext): ts.TypeNode | undefined; diff --git a/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedFileUploadEndpointRequest.ts b/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedFileUploadEndpointRequest.ts index b3ce4b0dc69..081cc2896ca 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedFileUploadEndpointRequest.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoint-request/GeneratedFileUploadEndpointRequest.ts @@ -1,29 +1,31 @@ -import { - ExampleEndpointCall, - FileProperty, - HttpEndpoint, - HttpRequestBody, - HttpService, - IntermediateRepresentation -} from "@fern-fern/ir-sdk/api"; import { Fetcher, - getParameterNameForPositionalPathParameter, GetReferenceOpts, - getTextOfTsNode, ImportsManager, JavaScriptRuntime, PackageId, + getParameterNameForPositionalPathParameter, + getTextOfTsNode, visitJavaScriptRuntime } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; -import { appendPropertyToFormData } from "../endpoints/utils/appendPropertyToFormData"; + +import { + ExampleEndpointCall, + FileProperty, + HttpEndpoint, + HttpRequestBody, + HttpService, + IntermediateRepresentation +} from "@fern-fern/ir-sdk/api"; + +import { GeneratedSdkClientClassImpl } from "../GeneratedSdkClientClassImpl"; import { GeneratedQueryParams } from "../endpoints/utils/GeneratedQueryParams"; +import { appendPropertyToFormData } from "../endpoints/utils/appendPropertyToFormData"; import { generateHeaders } from "../endpoints/utils/generateHeaders"; import { getParameterNameForFile } from "../endpoints/utils/getParameterNameForFile"; import { getPathParametersForEndpointSignature } from "../endpoints/utils/getPathParametersForEndpointSignature"; -import { GeneratedSdkClientClassImpl } from "../GeneratedSdkClientClassImpl"; import { FileUploadRequestParameter } from "../request-parameter/FileUploadRequestParameter"; import { GeneratedEndpointRequest } from "./GeneratedEndpointRequest"; diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedEndpointImplementation.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedEndpointImplementation.ts index 18bfbdfd461..198ca941c8f 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedEndpointImplementation.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedEndpointImplementation.ts @@ -1,7 +1,9 @@ -import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; + +import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { GeneratedEndpointResponse } from "./default/endpoint-response/GeneratedEndpointResponse"; export interface EndpointSignature { diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedFileDownloadEndpointImplementation.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedFileDownloadEndpointImplementation.ts index 1748120abab..99eca2c8b68 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedFileDownloadEndpointImplementation.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedFileDownloadEndpointImplementation.ts @@ -1,9 +1,11 @@ -import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { Fetcher, GetReferenceOpts, visitJavaScriptRuntime } from "@fern-typescript/commons"; import { EndpointSignature, GeneratedEndpointImplementation, SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; -import { GeneratedEndpointRequest } from "../endpoint-request/GeneratedEndpointRequest"; + +import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkClientClassImpl } from "../GeneratedSdkClientClassImpl"; +import { GeneratedEndpointRequest } from "../endpoint-request/GeneratedEndpointRequest"; import { GeneratedEndpointResponse } from "./default/endpoint-response/GeneratedEndpointResponse"; import { buildUrl } from "./utils/buildUrl"; import { diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedStreamingEndpointImplementation.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedStreamingEndpointImplementation.ts index b4607c9c1da..0d155f551b9 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedStreamingEndpointImplementation.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/GeneratedStreamingEndpointImplementation.ts @@ -1,9 +1,11 @@ -import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { Fetcher, GetReferenceOpts, PackageId } from "@fern-typescript/commons"; import { EndpointSignature, GeneratedEndpointImplementation, SdkContext } from "@fern-typescript/contexts"; import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; -import { GeneratedEndpointRequest } from "../endpoint-request/GeneratedEndpointRequest"; + +import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkClientClassImpl } from "../GeneratedSdkClientClassImpl"; +import { GeneratedEndpointRequest } from "../endpoint-request/GeneratedEndpointRequest"; import { GeneratedEndpointResponse } from "./default/endpoint-response/GeneratedEndpointResponse"; import { buildUrl } from "./utils/buildUrl"; import { diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/default/GeneratedDefaultEndpointImplementation.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/default/GeneratedDefaultEndpointImplementation.ts index 4f4138d187e..45a0c619ae4 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/default/GeneratedDefaultEndpointImplementation.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/default/GeneratedDefaultEndpointImplementation.ts @@ -1,16 +1,18 @@ -import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; -import { Fetcher, getExampleEndpointCalls, GetReferenceOpts, getTextOfTsNode } from "@fern-typescript/commons"; +import { Fetcher, GetReferenceOpts, getExampleEndpointCalls, getTextOfTsNode } from "@fern-typescript/commons"; import { EndpointSignature, GeneratedEndpointImplementation, SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; -import { GeneratedEndpointRequest } from "../../endpoint-request/GeneratedEndpointRequest"; + +import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkClientClassImpl } from "../../GeneratedSdkClientClassImpl"; +import { GeneratedEndpointRequest } from "../../endpoint-request/GeneratedEndpointRequest"; import { buildUrl } from "../utils/buildUrl"; import { + REQUEST_OPTIONS_PARAMETER_NAME, getAbortSignalExpression, getMaxRetriesExpression, getRequestOptionsParameter, - getTimeoutExpression, - REQUEST_OPTIONS_PARAMETER_NAME + getTimeoutExpression } from "../utils/requestOptionsParameter"; import { GeneratedEndpointResponse } from "./endpoint-response/GeneratedEndpointResponse"; diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/GeneratedNonThrowingEndpointResponse.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/GeneratedNonThrowingEndpointResponse.ts index 4a92b45e166..ae718caa8da 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/GeneratedNonThrowingEndpointResponse.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/GeneratedNonThrowingEndpointResponse.ts @@ -1,13 +1,15 @@ +import { PackageId } from "@fern-typescript/commons"; +import { GeneratedEndpointErrorUnion, GeneratedSdkEndpointTypeSchemas, SdkContext } from "@fern-typescript/contexts"; +import { ErrorResolver } from "@fern-typescript/resolvers"; +import { ts } from "ts-morph"; + import { ErrorDiscriminationByPropertyStrategy, ErrorDiscriminationStrategy, HttpEndpoint, HttpResponseBody } from "@fern-fern/ir-sdk/api"; -import { PackageId } from "@fern-typescript/commons"; -import { GeneratedEndpointErrorUnion, GeneratedSdkEndpointTypeSchemas, SdkContext } from "@fern-typescript/contexts"; -import { ErrorResolver } from "@fern-typescript/resolvers"; -import { ts } from "ts-morph"; + import { GeneratedEndpointResponse, PaginationResponseInfo } from "./GeneratedEndpointResponse"; import { getSuccessReturnType } from "./getSuccessReturnType"; diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/GeneratedThrowingEndpointResponse.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/GeneratedThrowingEndpointResponse.ts index 416b47590ba..08d6d674bdd 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/GeneratedThrowingEndpointResponse.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/GeneratedThrowingEndpointResponse.ts @@ -1,4 +1,10 @@ +import { PackageId, StreamingFetcher, getFullPathForEndpoint, getTextOfTsNode } from "@fern-typescript/commons"; +import { GeneratedSdkEndpointTypeSchemas, SdkContext } from "@fern-typescript/contexts"; +import { ErrorResolver } from "@fern-typescript/resolvers"; +import { ts } from "ts-morph"; + import { + ContainerType, CursorPagination, ErrorDiscriminationByPropertyStrategy, ErrorDiscriminationStrategy, @@ -7,15 +13,11 @@ import { Name, NameAndWireValue, OffsetPagination, + PrimitiveTypeV2, ResponseError, - TypeReference, - ContainerType, - PrimitiveTypeV2 + TypeReference } from "@fern-fern/ir-sdk/api"; -import { getFullPathForEndpoint, getTextOfTsNode, PackageId, StreamingFetcher } from "@fern-typescript/commons"; -import { GeneratedSdkEndpointTypeSchemas, SdkContext } from "@fern-typescript/contexts"; -import { ErrorResolver } from "@fern-typescript/resolvers"; -import { ts } from "ts-morph"; + import { GeneratedSdkClientClassImpl } from "../../../GeneratedSdkClientClassImpl"; import { GeneratedStreamingEndpointImplementation } from "../../GeneratedStreamingEndpointImplementation"; import { getAbortSignalExpression } from "../../utils/requestOptionsParameter"; @@ -24,8 +26,8 @@ import { CONTENT_LENGTH_RESPONSE_KEY, CONTENT_LENGTH_VARIABLE_NAME, CONTENT_TYPE_RESPONSE_KEY, - getSuccessReturnType, - READABLE_RESPONSE_KEY + READABLE_RESPONSE_KEY, + getSuccessReturnType } from "./getSuccessReturnType"; export declare namespace GeneratedThrowingEndpointResponse { diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/getSuccessReturnType.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/getSuccessReturnType.ts index 69f4b741e9e..2123bfbac36 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/getSuccessReturnType.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/default/endpoint-response/getSuccessReturnType.ts @@ -1,9 +1,11 @@ -import { assertNever } from "@fern-api/core-utils"; -import { HttpResponseBody, PrimitiveTypeV1, TypeReference } from "@fern-fern/ir-sdk/api"; import { JavaScriptRuntime, visitJavaScriptRuntime } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; +import { assertNever } from "@fern-api/core-utils"; + +import { HttpResponseBody, PrimitiveTypeV1, TypeReference } from "@fern-fern/ir-sdk/api"; + export function getSuccessReturnType( response: | HttpResponseBody.Json diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/GeneratedQueryParams.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/GeneratedQueryParams.ts index 232393b8b09..83242f28e1e 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/GeneratedQueryParams.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/GeneratedQueryParams.ts @@ -1,6 +1,8 @@ -import { DeclaredTypeName, QueryParameter, TypeReference } from "@fern-fern/ir-sdk/api"; import { SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + +import { DeclaredTypeName, QueryParameter, TypeReference } from "@fern-fern/ir-sdk/api"; + import { RequestParameter } from "../../request-parameter/RequestParameter"; export declare namespace GeneratedQueryParams { diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/appendPropertyToFormData.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/appendPropertyToFormData.ts index 38cfe41fcdf..6b1b8c51c19 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/appendPropertyToFormData.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/appendPropertyToFormData.ts @@ -1,6 +1,8 @@ -import { ContainerType, FileUploadRequestProperty, Type, TypeReference } from "@fern-fern/ir-sdk/api"; import { SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + +import { ContainerType, FileUploadRequestProperty, Type, TypeReference } from "@fern-fern/ir-sdk/api"; + import { FileUploadRequestParameter } from "../../request-parameter/FileUploadRequestParameter"; import { getParameterNameForFile } from "./getParameterNameForFile"; diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/buildUrl.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/buildUrl.ts index f037e6370e5..5cad27db107 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/buildUrl.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/buildUrl.ts @@ -1,8 +1,11 @@ -import { assertNever } from "@fern-api/core-utils"; -import { HttpEndpoint, PathParameter, PathParameterLocation } from "@fern-fern/ir-sdk/api"; import { getParameterNameForPositionalPathParameter } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + +import { assertNever } from "@fern-api/core-utils"; + +import { HttpEndpoint, PathParameter, PathParameterLocation } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkClientClassImpl } from "../../GeneratedSdkClientClassImpl"; export type GetReferenceToPathParameterVariableFromRequest = (pathParameter: PathParameter) => ts.Expression; diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/generateHeaders.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/generateHeaders.ts index c2edfddd7a3..109a17efbc2 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/generateHeaders.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/generateHeaders.ts @@ -1,6 +1,8 @@ -import { HttpEndpoint, HttpHeader, HttpService } from "@fern-fern/ir-sdk/api"; import { SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + +import { HttpEndpoint, HttpHeader, HttpService } from "@fern-fern/ir-sdk/api"; + import { GeneratedHeader } from "../../GeneratedHeader"; import { GeneratedSdkClientClassImpl } from "../../GeneratedSdkClientClassImpl"; import { RequestParameter } from "../../request-parameter/RequestParameter"; diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/getPathParametersForEndpointSignature.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/getPathParametersForEndpointSignature.ts index 4061dcca557..4a4dc264c41 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/getPathParametersForEndpointSignature.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/getPathParametersForEndpointSignature.ts @@ -1,5 +1,7 @@ -import { HttpEndpoint, HttpService, PathParameter } from "@fern-fern/ir-sdk/api"; import { SdkContext } from "@fern-typescript/contexts"; + +import { HttpEndpoint, HttpService, PathParameter } from "@fern-fern/ir-sdk/api"; + import { getNonVariablePathParameters } from "./getNonVariablePathParameters"; export function getPathParametersForEndpointSignature({ diff --git a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/isLiteralHeader.ts b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/isLiteralHeader.ts index ac86b46545e..544a2a9abd7 100644 --- a/generators/typescript/sdk/client-class-generator/src/endpoints/utils/isLiteralHeader.ts +++ b/generators/typescript/sdk/client-class-generator/src/endpoints/utils/isLiteralHeader.ts @@ -1,6 +1,8 @@ +import { SdkContext } from "@fern-typescript/contexts"; + import { assertNever } from "@fern-api/core-utils"; + import { HttpHeader } from "@fern-fern/ir-sdk/api"; -import { SdkContext } from "@fern-typescript/contexts"; export function isLiteralHeader(header: HttpHeader, context: SdkContext): boolean { return getLiteralValueForHeader(header, context) != null; diff --git a/generators/typescript/sdk/client-class-generator/src/oauth-generator/OAuthTokenProviderGenerator.ts b/generators/typescript/sdk/client-class-generator/src/oauth-generator/OAuthTokenProviderGenerator.ts index 42b45b3e872..2e94a20ec34 100644 --- a/generators/typescript/sdk/client-class-generator/src/oauth-generator/OAuthTokenProviderGenerator.ts +++ b/generators/typescript/sdk/client-class-generator/src/oauth-generator/OAuthTokenProviderGenerator.ts @@ -1,3 +1,7 @@ +import { ExportedFilePath, getTextOfTsNode } from "@fern-typescript/commons"; +import { SdkContext } from "@fern-typescript/contexts"; +import { Code, code } from "ts-poet"; + import { HttpEndpoint, HttpService, @@ -8,9 +12,6 @@ import { OAuthScheme, ResponseProperty } from "@fern-fern/ir-sdk/api"; -import { ExportedFilePath, getTextOfTsNode } from "@fern-typescript/commons"; -import { SdkContext } from "@fern-typescript/contexts"; -import { code, Code } from "ts-poet"; export class OAuthTokenProviderGenerator { public static OAUTH_TOKEN_PROVIDER_CLASS_NAME = "OAuthTokenProvider"; diff --git a/generators/typescript/sdk/client-class-generator/src/request-parameter/AbstractRequestParameter.ts b/generators/typescript/sdk/client-class-generator/src/request-parameter/AbstractRequestParameter.ts index 3c91f93cefe..0f1aeff2e6e 100644 --- a/generators/typescript/sdk/client-class-generator/src/request-parameter/AbstractRequestParameter.ts +++ b/generators/typescript/sdk/client-class-generator/src/request-parameter/AbstractRequestParameter.ts @@ -1,3 +1,7 @@ +import { GetReferenceOpts, PackageId, getTextOfTsNode } from "@fern-typescript/commons"; +import { SdkContext } from "@fern-typescript/contexts"; +import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; + import { ExampleEndpointCall, HttpEndpoint, @@ -6,9 +10,7 @@ import { QueryParameter, SdkRequest } from "@fern-fern/ir-sdk/api"; -import { GetReferenceOpts, getTextOfTsNode, PackageId } from "@fern-typescript/commons"; -import { SdkContext } from "@fern-typescript/contexts"; -import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; + import { RequestParameter } from "./RequestParameter"; export declare namespace AbstractRequestParameter { diff --git a/generators/typescript/sdk/client-class-generator/src/request-parameter/FileUploadRequestParameter.ts b/generators/typescript/sdk/client-class-generator/src/request-parameter/FileUploadRequestParameter.ts index 9c272b51836..3bdce0b9253 100644 --- a/generators/typescript/sdk/client-class-generator/src/request-parameter/FileUploadRequestParameter.ts +++ b/generators/typescript/sdk/client-class-generator/src/request-parameter/FileUploadRequestParameter.ts @@ -1,7 +1,9 @@ -import { ExampleEndpointCall, HttpHeader, InlinedRequestBodyProperty, QueryParameter } from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts } from "@fern-typescript/commons"; import { GeneratedRequestWrapper, SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + +import { ExampleEndpointCall, HttpHeader, InlinedRequestBodyProperty, QueryParameter } from "@fern-fern/ir-sdk/api"; + import { AbstractRequestParameter } from "./AbstractRequestParameter"; export class FileUploadRequestParameter extends AbstractRequestParameter { diff --git a/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestBodyParameter.ts b/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestBodyParameter.ts index 6d957efbca1..e033915a127 100644 --- a/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestBodyParameter.ts +++ b/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestBodyParameter.ts @@ -1,7 +1,9 @@ -import { ExampleEndpointCall, HttpRequestBodyReference, QueryParameter } from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + +import { ExampleEndpointCall, HttpRequestBodyReference, QueryParameter } from "@fern-fern/ir-sdk/api"; + import { AbstractRequestParameter } from "./AbstractRequestParameter"; export declare namespace RequestBodyParameter { diff --git a/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestParameter.ts b/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestParameter.ts index 89e41e43cdc..4179f80cf66 100644 --- a/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestParameter.ts +++ b/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestParameter.ts @@ -1,8 +1,9 @@ -import { ExampleEndpointCall, HttpHeader, QueryParameter } from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; +import { ExampleEndpointCall, HttpHeader, QueryParameter } from "@fern-fern/ir-sdk/api"; + export interface RequestParameter { getInitialStatements: (context: SdkContext, args: { variablesInScope: string[] }) => ts.Statement[]; getType(context: SdkContext): ts.TypeNode; diff --git a/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestWrapperParameter.ts b/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestWrapperParameter.ts index c8e237e3613..0ccb3a2741a 100644 --- a/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestWrapperParameter.ts +++ b/generators/typescript/sdk/client-class-generator/src/request-parameter/RequestWrapperParameter.ts @@ -1,7 +1,9 @@ -import { ExampleEndpointCall, HttpHeader, QueryParameter } from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts } from "@fern-typescript/commons"; import { GeneratedRequestWrapper, RequestWrapperNonBodyProperty, SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; + +import { ExampleEndpointCall, HttpHeader, QueryParameter } from "@fern-fern/ir-sdk/api"; + import { AbstractRequestParameter } from "./AbstractRequestParameter"; type DefaultNonBodyKeyName = string & { diff --git a/generators/typescript/sdk/endpoint-error-union-generator/package.json b/generators/typescript/sdk/endpoint-error-union-generator/package.json index 545f715c7cf..9d08e890902 100644 --- a/generators/typescript/sdk/endpoint-error-union-generator/package.json +++ b/generators/typescript/sdk/endpoint-error-union-generator/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": { @@ -40,8 +39,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" } } \ No newline at end of file diff --git a/generators/typescript/sdk/endpoint-error-union-generator/src/EndpointErrorUnionGenerator.ts b/generators/typescript/sdk/endpoint-error-union-generator/src/EndpointErrorUnionGenerator.ts index 7f20e8286d9..0cf415f3785 100644 --- a/generators/typescript/sdk/endpoint-error-union-generator/src/EndpointErrorUnionGenerator.ts +++ b/generators/typescript/sdk/endpoint-error-union-generator/src/EndpointErrorUnionGenerator.ts @@ -1,7 +1,9 @@ -import { HttpEndpoint, IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; import { GeneratedEndpointErrorUnion } from "@fern-typescript/contexts"; import { ErrorResolver } from "@fern-typescript/resolvers"; + +import { HttpEndpoint, IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { GeneratedEndpointErrorUnionImpl } from "./GeneratedEndpointErrorUnionImpl"; export declare namespace EndpointErrorUnionGenerator { diff --git a/generators/typescript/sdk/endpoint-error-union-generator/src/GeneratedEndpointErrorUnionImpl.ts b/generators/typescript/sdk/endpoint-error-union-generator/src/GeneratedEndpointErrorUnionImpl.ts index b8b173c9415..38df690f2be 100644 --- a/generators/typescript/sdk/endpoint-error-union-generator/src/GeneratedEndpointErrorUnionImpl.ts +++ b/generators/typescript/sdk/endpoint-error-union-generator/src/GeneratedEndpointErrorUnionImpl.ts @@ -1,8 +1,10 @@ -import { ErrorDiscriminationStrategy, HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; import { GeneratedEndpointErrorUnion, GeneratedUnion, SdkContext } from "@fern-typescript/contexts"; import { ErrorResolver } from "@fern-typescript/resolvers"; import { GeneratedUnionImpl } from "@fern-typescript/union-generator"; + +import { ErrorDiscriminationStrategy, HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { ParsedSingleUnionTypeForError } from "./error/ParsedSingleUnionTypeForError"; import { UnknownErrorSingleUnionType } from "./error/UnknownErrorSingleUnionType"; import { UnknownErrorSingleUnionTypeGenerator } from "./error/UnknownErrorSingleUnionTypeGenerator"; diff --git a/generators/typescript/sdk/endpoint-error-union-generator/src/error/ParsedSingleUnionTypeForError.ts b/generators/typescript/sdk/endpoint-error-union-generator/src/error/ParsedSingleUnionTypeForError.ts index c1a23e6cc40..59ec8ba10fb 100644 --- a/generators/typescript/sdk/endpoint-error-union-generator/src/error/ParsedSingleUnionTypeForError.ts +++ b/generators/typescript/sdk/endpoint-error-union-generator/src/error/ParsedSingleUnionTypeForError.ts @@ -1,4 +1,3 @@ -import { ErrorDeclaration, ErrorDiscriminationStrategy, ResponseError } from "@fern-fern/ir-sdk/api"; import { SdkContext } from "@fern-typescript/contexts"; import { ErrorResolver } from "@fern-typescript/resolvers"; import { @@ -8,6 +7,8 @@ import { SingleUnionTypeGenerator } from "@fern-typescript/union-generator"; +import { ErrorDeclaration, ErrorDiscriminationStrategy, ResponseError } from "@fern-fern/ir-sdk/api"; + export declare namespace ParsedSingleUnionTypeForError { export interface Init { error: ResponseError; diff --git a/generators/typescript/sdk/environments-generator/package.json b/generators/typescript/sdk/environments-generator/package.json index 7706fcd7e98..f7588b60649 100644 --- a/generators/typescript/sdk/environments-generator/package.json +++ b/generators/typescript/sdk/environments-generator/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": { @@ -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" } } \ No newline at end of file diff --git a/generators/typescript/sdk/environments-generator/src/EnvironmentsGenerator.ts b/generators/typescript/sdk/environments-generator/src/EnvironmentsGenerator.ts index b1206fe1546..ea82c96a47a 100644 --- a/generators/typescript/sdk/environments-generator/src/EnvironmentsGenerator.ts +++ b/generators/typescript/sdk/environments-generator/src/EnvironmentsGenerator.ts @@ -1,5 +1,7 @@ -import { Environments, EnvironmentsConfig } from "@fern-fern/ir-sdk/api"; import { GeneratedEnvironments } from "@fern-typescript/contexts"; + +import { Environments, EnvironmentsConfig } from "@fern-fern/ir-sdk/api"; + import { EmptyGeneratedEnvironmentsImpl } from "./EmptyGeneratedEnvironmentsImpl"; import { GeneratedMultipleUrlsEnvironmentsImpl } from "./GeneratedMultipleUrlsEnvironmentsImpl"; import { GeneratedSingleUrlEnvironmentsImpl } from "./GeneratedSingleUrlEnvironmentsImpl"; diff --git a/generators/typescript/sdk/environments-generator/src/GeneratedMultipleUrlsEnvironmentsImpl.ts b/generators/typescript/sdk/environments-generator/src/GeneratedMultipleUrlsEnvironmentsImpl.ts index 829a1b7b73f..1d6d079f272 100644 --- a/generators/typescript/sdk/environments-generator/src/GeneratedMultipleUrlsEnvironmentsImpl.ts +++ b/generators/typescript/sdk/environments-generator/src/GeneratedMultipleUrlsEnvironmentsImpl.ts @@ -1,3 +1,7 @@ +import { FernWriters, getTextOfTsNode } from "@fern-typescript/commons"; +import { GeneratedEnvironments, SdkContext } from "@fern-typescript/contexts"; +import { VariableDeclarationKind, ts } from "ts-morph"; + import { EnvironmentBaseUrlId, EnvironmentBaseUrlWithId, @@ -5,9 +9,6 @@ import { MultipleBaseUrlsEnvironment, MultipleBaseUrlsEnvironments } from "@fern-fern/ir-sdk/api"; -import { FernWriters, getTextOfTsNode } from "@fern-typescript/commons"; -import { GeneratedEnvironments, SdkContext } from "@fern-typescript/contexts"; -import { ts, VariableDeclarationKind } from "ts-morph"; export declare namespace GeneratedMultipleUrlsEnvironmentsImpl { export interface Init { diff --git a/generators/typescript/sdk/environments-generator/src/GeneratedSingleUrlEnvironmentsImpl.ts b/generators/typescript/sdk/environments-generator/src/GeneratedSingleUrlEnvironmentsImpl.ts index 32faf351b7e..d32a59a67ab 100644 --- a/generators/typescript/sdk/environments-generator/src/GeneratedSingleUrlEnvironmentsImpl.ts +++ b/generators/typescript/sdk/environments-generator/src/GeneratedSingleUrlEnvironmentsImpl.ts @@ -1,12 +1,13 @@ +import { FernWriters, getTextOfTsNode } from "@fern-typescript/commons"; +import { GeneratedEnvironments, SdkContext } from "@fern-typescript/contexts"; +import { VariableDeclarationKind, ts } from "ts-morph"; + import { EnvironmentBaseUrlId, EnvironmentId, SingleBaseUrlEnvironment, SingleBaseUrlEnvironments } from "@fern-fern/ir-sdk/api"; -import { FernWriters, getTextOfTsNode } from "@fern-typescript/commons"; -import { GeneratedEnvironments, SdkContext } from "@fern-typescript/contexts"; -import { ts, VariableDeclarationKind } from "ts-morph"; export declare namespace GeneratedSingleUrlEnvironmentsImpl { export interface Init { diff --git a/generators/typescript/sdk/generator/package.json b/generators/typescript/sdk/generator/package.json index 65a8f4b22e3..96224effb04 100644 --- a/generators/typescript/sdk/generator/package.json +++ b/generators/typescript/sdk/generator/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": { @@ -66,8 +65,8 @@ "depcheck": "^1.4.7", "eslint": "^9.16.0", "jest-specific-snapshot": "^8.0.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" } diff --git a/generators/typescript/sdk/generator/src/SdkGenerator.ts b/generators/typescript/sdk/generator/src/SdkGenerator.ts index feb374d8bb4..d1c91287295 100644 --- a/generators/typescript/sdk/generator/src/SdkGenerator.ts +++ b/generators/typescript/sdk/generator/src/SdkGenerator.ts @@ -1,33 +1,19 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; -import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk"; -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import * as FernGeneratorExecSerializers from "@fern-fern/generator-exec-sdk/serialization"; -import { - ExampleEndpointCall, - HttpEndpoint, - HttpService, - IntermediateRepresentation, - OAuthScheme, - TypeDeclaration, - TypeId -} from "@fern-fern/ir-sdk/api"; -import { FdrSnippetTemplate, FdrSnippetTemplateClient, FdrSnippetTemplateEnvironment } from "@fern-fern/snippet-sdk"; import { BundledTypescriptProject, - convertExportedFilePathToFilePath, CoreUtilitiesManager, DependencyManager, ExportedDirectory, ExportedFilePath, ExportsManager, - getFullPathForEndpoint, - getTextOfTsNode, ImportsManager, JavaScriptRuntime, NpmPackage, PackageId, SimpleTypescriptProject, - TypescriptProject + TypescriptProject, + convertExportedFilePathToFilePath, + getFullPathForEndpoint, + getTextOfTsNode } from "@fern-typescript/commons"; import { GeneratorContext } from "@fern-typescript/contexts"; import { EndpointErrorUnionGenerator } from "@fern-typescript/endpoint-error-union-generator"; @@ -47,6 +33,26 @@ import { TypeSchemaGenerator } from "@fern-typescript/type-schema-generator"; import { writeFile } from "fs/promises"; import { Directory, Project, SourceFile, ts } from "ts-morph"; import { v4 as uuidv4 } from "uuid"; + +import { ReferenceConfigBuilder } from "@fern-api/base-generator"; +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + +import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk"; +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; +import * as FernGeneratorExecSerializers from "@fern-fern/generator-exec-sdk/serialization"; +import { + ExampleEndpointCall, + HttpEndpoint, + HttpService, + IntermediateRepresentation, + OAuthScheme, + TypeDeclaration, + TypeId +} from "@fern-fern/ir-sdk/api"; +import { FdrSnippetTemplate, FdrSnippetTemplateClient, FdrSnippetTemplateEnvironment } from "@fern-fern/snippet-sdk"; + +import { TemplateGenerator } from "./TemplateGenerator"; +import { TypeScriptGeneratorAgent } from "./TypeScriptGeneratorAgent"; import { SdkContextImpl } from "./contexts/SdkContextImpl"; import { EndpointDeclarationReferencer } from "./declaration-referencers/EndpointDeclarationReferencer"; import { EnvironmentsDeclarationReferencer } from "./declaration-referencers/EnvironmentsDeclarationReferencer"; @@ -59,12 +65,9 @@ import { TimeoutSdkErrorDeclarationReferencer } from "./declaration-referencers/ import { TypeDeclarationReferencer } from "./declaration-referencers/TypeDeclarationReferencer"; import { VersionDeclarationReferencer } from "./declaration-referencers/VersionDeclarationReferencer"; import { ReadmeConfigBuilder } from "./readme/ReadmeConfigBuilder"; -import { ReferenceConfigBuilder } from "@fern-api/base-generator"; -import { TypeScriptGeneratorAgent } from "./TypeScriptGeneratorAgent"; -import { TemplateGenerator } from "./TemplateGenerator"; import { JestTestGenerator } from "./test-generator/JestTestGenerator"; -import { VersionGenerator } from "./version/VersionGenerator"; import { VersionFileGenerator } from "./version/VersionFileGenerator"; +import { VersionGenerator } from "./version/VersionGenerator"; const FILE_HEADER = `/** * This file was auto-generated by Fern from our API Definition. diff --git a/generators/typescript/sdk/generator/src/TemplateGenerator.ts b/generators/typescript/sdk/generator/src/TemplateGenerator.ts index 208f1042b54..1ac2c021469 100644 --- a/generators/typescript/sdk/generator/src/TemplateGenerator.ts +++ b/generators/typescript/sdk/generator/src/TemplateGenerator.ts @@ -1,3 +1,8 @@ +import { GetReferenceOpts, NpmPackage, PackageId, getTextOfTsNode } from "@fern-typescript/commons"; +import { GeneratedEnumType, SdkContext } from "@fern-typescript/contexts"; +import { OAuthTokenProviderGenerator } from "@fern-typescript/sdk-client-class-generator/src/oauth-generator/OAuthTokenProviderGenerator"; +import { Project } from "ts-morph"; + import { ApiAuth, AuthScheme, @@ -21,10 +26,6 @@ import { import { FdrSnippetTemplate } from "@fern-fern/snippet-sdk"; import { TemplateInput } from "@fern-fern/snippet-sdk/api"; import * as FDRAPIV1Read from "@fern-fern/snippet-sdk/api/resources/api/resources/v1/resources/read"; -import { GetReferenceOpts, getTextOfTsNode, NpmPackage, PackageId } from "@fern-typescript/commons"; -import { GeneratedEnumType, SdkContext } from "@fern-typescript/contexts"; -import { OAuthTokenProviderGenerator } from "@fern-typescript/sdk-client-class-generator/src/oauth-generator/OAuthTokenProviderGenerator"; -import { Project } from "ts-morph"; // Write this in the fern def to share between FE + BE const TEMPLATE_SENTINEL = "$FERN_INPUT"; diff --git a/generators/typescript/sdk/generator/src/TypeScriptGeneratorAgent.ts b/generators/typescript/sdk/generator/src/TypeScriptGeneratorAgent.ts index 075d2c3d9c1..9d07554a7ee 100644 --- a/generators/typescript/sdk/generator/src/TypeScriptGeneratorAgent.ts +++ b/generators/typescript/sdk/generator/src/TypeScriptGeneratorAgent.ts @@ -1,10 +1,13 @@ +import { ExportedFilePath } from "@fern-typescript/commons"; +import { SdkContext } from "@fern-typescript/contexts"; + import { AbstractGeneratorAgent } from "@fern-api/base-generator"; import { Logger } from "@fern-api/logger"; + import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk"; import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; + import { ReadmeConfigBuilder } from "./readme/ReadmeConfigBuilder"; -import { ExportedFilePath } from "@fern-typescript/commons"; -import { SdkContext } from "@fern-typescript/contexts"; export class TypeScriptGeneratorAgent extends AbstractGeneratorAgent { private readmeConfigBuilder: ReadmeConfigBuilder; diff --git a/generators/typescript/sdk/generator/src/__test__/__utils__/loadIntermediateRepresentation.ts b/generators/typescript/sdk/generator/src/__test__/__utils__/loadIntermediateRepresentation.ts index a449e1467b1..4cbf4a31dfd 100644 --- a/generators/typescript/sdk/generator/src/__test__/__utils__/loadIntermediateRepresentation.ts +++ b/generators/typescript/sdk/generator/src/__test__/__utils__/loadIntermediateRepresentation.ts @@ -1,6 +1,7 @@ +import { readFile } from "fs/promises"; + import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; -import { readFile } from "fs/promises"; export async function loadIntermediateRepresentation(pathToFile: string): Promise { const irString = (await readFile(pathToFile)).toString(); diff --git a/generators/typescript/sdk/generator/src/__test__/encodeURIComponent.test.ts b/generators/typescript/sdk/generator/src/__test__/encodeURIComponent.test.ts index 27600b8aa81..24a8eb4058f 100644 --- a/generators/typescript/sdk/generator/src/__test__/encodeURIComponent.test.ts +++ b/generators/typescript/sdk/generator/src/__test__/encodeURIComponent.test.ts @@ -1,5 +1,4 @@ /* eslint-disable jest/no-mocks-import */ - import urlJoin from "url-join"; require("jest-specific-snapshot"); diff --git a/generators/typescript/sdk/generator/src/contexts/SdkContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/SdkContextImpl.ts index 8ec589374bf..29780d2b773 100644 --- a/generators/typescript/sdk/generator/src/contexts/SdkContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/SdkContextImpl.ts @@ -1,15 +1,11 @@ -import { GeneratorNotificationService } from "@fern-api/base-generator"; -import { Logger } from "@fern-api/logger"; -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import { Constants, IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { CoreUtilitiesManager, - createExternalDependencies, DependencyManager, ExternalDependencies, ImportsManager, JavaScriptRuntime, - NpmPackage + NpmPackage, + createExternalDependencies } from "@fern-typescript/commons"; import { CoreUtilities } from "@fern-typescript/commons/src/core-utilities/CoreUtilities"; import { @@ -34,6 +30,13 @@ import { TypeGenerator } from "@fern-typescript/type-generator"; import { TypeReferenceExampleGenerator } from "@fern-typescript/type-reference-example-generator"; import { TypeSchemaGenerator } from "@fern-typescript/type-schema-generator"; import { SourceFile, ts } from "ts-morph"; + +import { GeneratorNotificationService } from "@fern-api/base-generator"; +import { Logger } from "@fern-api/logger"; + +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; +import { Constants, IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { EndpointDeclarationReferencer } from "../declaration-referencers/EndpointDeclarationReferencer"; import { EnvironmentsDeclarationReferencer } from "../declaration-referencers/EnvironmentsDeclarationReferencer"; import { GenericAPISdkErrorDeclarationReferencer } from "../declaration-referencers/GenericAPISdkErrorDeclarationReferencer"; diff --git a/generators/typescript/sdk/generator/src/contexts/base/BaseContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/base/BaseContextImpl.ts index 49cb2e6ec32..5809858baf2 100644 --- a/generators/typescript/sdk/generator/src/contexts/base/BaseContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/base/BaseContextImpl.ts @@ -1,16 +1,18 @@ -import { Logger } from "@fern-api/logger"; -import { Constants } from "@fern-fern/ir-sdk/api"; import { CoreUtilitiesManager, - createExternalDependencies, DependencyManager, ExternalDependencies, - ImportsManager + ImportsManager, + createExternalDependencies } from "@fern-typescript/commons"; import { CoreUtilities } from "@fern-typescript/commons/src/core-utilities/CoreUtilities"; import { BaseContext, TypeContext, TypeSchemaContext } from "@fern-typescript/contexts"; import { SourceFile } from "ts-morph"; +import { Logger } from "@fern-api/logger"; + +import { Constants } from "@fern-fern/ir-sdk/api"; + export declare namespace BaseContextImpl { export interface Init { logger: Logger; diff --git a/generators/typescript/sdk/generator/src/contexts/endpoint-error-union/EndpointErrorUnionContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/endpoint-error-union/EndpointErrorUnionContextImpl.ts index 0396fdd152c..eb12c7712a2 100644 --- a/generators/typescript/sdk/generator/src/contexts/endpoint-error-union/EndpointErrorUnionContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/endpoint-error-union/EndpointErrorUnionContextImpl.ts @@ -1,9 +1,11 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { ImportsManager, PackageId, Reference } from "@fern-typescript/commons"; import { EndpointErrorUnionContext, GeneratedEndpointErrorUnion } from "@fern-typescript/contexts"; import { EndpointErrorUnionGenerator } from "@fern-typescript/endpoint-error-union-generator"; import { PackageResolver } from "@fern-typescript/resolvers"; import { SourceFile } from "ts-morph"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { EndpointDeclarationReferencer } from "../../declaration-referencers/EndpointDeclarationReferencer"; export declare namespace EndpointErrorUnionContextImpl { diff --git a/generators/typescript/sdk/generator/src/contexts/environments/EnvironmentsContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/environments/EnvironmentsContextImpl.ts index bfbd730692e..571b941a645 100644 --- a/generators/typescript/sdk/generator/src/contexts/environments/EnvironmentsContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/environments/EnvironmentsContextImpl.ts @@ -1,8 +1,10 @@ -import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { ImportsManager, Reference } from "@fern-typescript/commons"; import { EnvironmentsContext, GeneratedEnvironments } from "@fern-typescript/contexts"; import { EnvironmentsGenerator } from "@fern-typescript/environments-generator"; import { SourceFile } from "ts-morph"; + +import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { EnvironmentsDeclarationReferencer } from "../../declaration-referencers/EnvironmentsDeclarationReferencer"; export declare namespace EnvironmentsContextImpl { diff --git a/generators/typescript/sdk/generator/src/contexts/generic-api-sdk-error/GenericAPISdkErrorContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/generic-api-sdk-error/GenericAPISdkErrorContextImpl.ts index 3f325ea3579..5bfb350dab0 100644 --- a/generators/typescript/sdk/generator/src/contexts/generic-api-sdk-error/GenericAPISdkErrorContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/generic-api-sdk-error/GenericAPISdkErrorContextImpl.ts @@ -2,6 +2,7 @@ import { ImportsManager, Reference } from "@fern-typescript/commons"; import { GeneratedGenericAPISdkError, GenericAPISdkErrorContext } from "@fern-typescript/contexts"; import { GenericAPISdkErrorGenerator } from "@fern-typescript/generic-sdk-error-generators"; import { SourceFile } from "ts-morph"; + import { GenericAPISdkErrorDeclarationReferencer } from "../../declaration-referencers/GenericAPISdkErrorDeclarationReferencer"; export declare namespace GenericAPISdkErrorContextImpl { diff --git a/generators/typescript/sdk/generator/src/contexts/request-wrapper/RequestWrapperContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/request-wrapper/RequestWrapperContextImpl.ts index 21a346200f0..59da575b5af 100644 --- a/generators/typescript/sdk/generator/src/contexts/request-wrapper/RequestWrapperContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/request-wrapper/RequestWrapperContextImpl.ts @@ -1,10 +1,13 @@ -import { assertNever } from "@fern-api/core-utils"; -import { Name, SdkRequest } from "@fern-fern/ir-sdk/api"; import { ImportsManager, PackageId } from "@fern-typescript/commons"; import { GeneratedRequestWrapper, RequestWrapperContext } from "@fern-typescript/contexts"; import { RequestWrapperGenerator } from "@fern-typescript/request-wrapper-generator"; import { PackageResolver } from "@fern-typescript/resolvers"; import { SourceFile, ts } from "ts-morph"; + +import { assertNever } from "@fern-api/core-utils"; + +import { Name, SdkRequest } from "@fern-fern/ir-sdk/api"; + import { RequestWrapperDeclarationReferencer } from "../../declaration-referencers/RequestWrapperDeclarationReferencer"; export declare namespace RequestWrapperContextImpl { diff --git a/generators/typescript/sdk/generator/src/contexts/sdk-client-class/SdkClientClassContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/sdk-client-class/SdkClientClassContextImpl.ts index 6613d98cb64..d7c2ea8c928 100644 --- a/generators/typescript/sdk/generator/src/contexts/sdk-client-class/SdkClientClassContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/sdk-client-class/SdkClientClassContextImpl.ts @@ -3,6 +3,7 @@ import { GeneratedSdkClientClass, SdkClientClassContext } from "@fern-typescript import { PackageResolver } from "@fern-typescript/resolvers"; import { SdkClientClassGenerator } from "@fern-typescript/sdk-client-class-generator"; import { SourceFile } from "ts-morph"; + import { SdkClientClassDeclarationReferencer } from "../../declaration-referencers/SdkClientClassDeclarationReferencer"; export declare namespace SdkClientClassContextImpl { diff --git a/generators/typescript/sdk/generator/src/contexts/sdk-endpoint-type-schemas/SdkEndpointTypeSchemasContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/sdk-endpoint-type-schemas/SdkEndpointTypeSchemasContextImpl.ts index 3b2f56179d4..980ff9cb0fa 100644 --- a/generators/typescript/sdk/generator/src/contexts/sdk-endpoint-type-schemas/SdkEndpointTypeSchemasContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/sdk-endpoint-type-schemas/SdkEndpointTypeSchemasContextImpl.ts @@ -1,9 +1,11 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { ImportsManager, PackageId, Reference } from "@fern-typescript/commons"; import { GeneratedSdkEndpointTypeSchemas, SdkEndpointTypeSchemasContext } from "@fern-typescript/contexts"; import { PackageResolver } from "@fern-typescript/resolvers"; import { SdkEndpointTypeSchemasGenerator } from "@fern-typescript/sdk-endpoint-type-schemas-generator"; import { SourceFile } from "ts-morph"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { EndpointDeclarationReferencer } from "../../declaration-referencers/EndpointDeclarationReferencer"; import { getSchemaImportStrategy } from "../getSchemaImportStrategy"; diff --git a/generators/typescript/sdk/generator/src/contexts/sdk-error-schema/SdkErrorSchemaContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/sdk-error-schema/SdkErrorSchemaContextImpl.ts index e2a30fddb43..cb6ee9bd8df 100644 --- a/generators/typescript/sdk/generator/src/contexts/sdk-error-schema/SdkErrorSchemaContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/sdk-error-schema/SdkErrorSchemaContextImpl.ts @@ -1,10 +1,12 @@ -import { DeclaredErrorName } from "@fern-fern/ir-sdk/api"; import { ImportsManager, Reference, Zurg } from "@fern-typescript/commons"; import { CoreUtilities } from "@fern-typescript/commons/src/core-utilities/CoreUtilities"; import { GeneratedSdkErrorSchema, SdkErrorSchemaContext } from "@fern-typescript/contexts"; import { ErrorResolver } from "@fern-typescript/resolvers"; import { SdkErrorSchemaGenerator } from "@fern-typescript/sdk-error-schema-generator"; import { SourceFile } from "ts-morph"; + +import { DeclaredErrorName } from "@fern-fern/ir-sdk/api"; + import { SdkErrorDeclarationReferencer } from "../../declaration-referencers/SdkErrorDeclarationReferencer"; import { getSchemaImportStrategy } from "../getSchemaImportStrategy"; diff --git a/generators/typescript/sdk/generator/src/contexts/sdk-error/SdkErrorContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/sdk-error/SdkErrorContextImpl.ts index c7959641971..27b674b26c3 100644 --- a/generators/typescript/sdk/generator/src/contexts/sdk-error/SdkErrorContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/sdk-error/SdkErrorContextImpl.ts @@ -1,9 +1,11 @@ -import { DeclaredErrorName, ErrorDeclaration } from "@fern-fern/ir-sdk/api"; import { ImportsManager, Reference } from "@fern-typescript/commons"; import { GeneratedSdkError, SdkErrorContext } from "@fern-typescript/contexts"; import { ErrorResolver } from "@fern-typescript/resolvers"; import { SdkErrorGenerator } from "@fern-typescript/sdk-error-generator"; import { SourceFile } from "ts-morph"; + +import { DeclaredErrorName, ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + import { SdkErrorDeclarationReferencer } from "../../declaration-referencers/SdkErrorDeclarationReferencer"; export declare namespace SdkErrorContextImpl { diff --git a/generators/typescript/sdk/generator/src/contexts/sdk-inlined-request-body-schema/SdkInlinedRequestBodySchemaContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/sdk-inlined-request-body-schema/SdkInlinedRequestBodySchemaContextImpl.ts index 214f00f31c7..eb8c4ec22e5 100644 --- a/generators/typescript/sdk/generator/src/contexts/sdk-inlined-request-body-schema/SdkInlinedRequestBodySchemaContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/sdk-inlined-request-body-schema/SdkInlinedRequestBodySchemaContextImpl.ts @@ -1,9 +1,11 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { ImportsManager, PackageId, Reference } from "@fern-typescript/commons"; import { GeneratedSdkInlinedRequestBodySchema, SdkInlinedRequestBodySchemaContext } from "@fern-typescript/contexts"; import { PackageResolver } from "@fern-typescript/resolvers"; import { SdkInlinedRequestBodySchemaGenerator } from "@fern-typescript/sdk-inlined-request-schema-generator"; import { SourceFile } from "ts-morph"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { SdkInlinedRequestBodyDeclarationReferencer } from "../../declaration-referencers/SdkInlinedRequestBodyDeclarationReferencer"; import { getSchemaImportStrategy } from "../getSchemaImportStrategy"; diff --git a/generators/typescript/sdk/generator/src/contexts/timeout-sdk-error/TimeoutSdkErrorContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/timeout-sdk-error/TimeoutSdkErrorContextImpl.ts index 0095208a838..5f512d9b8be 100644 --- a/generators/typescript/sdk/generator/src/contexts/timeout-sdk-error/TimeoutSdkErrorContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/timeout-sdk-error/TimeoutSdkErrorContextImpl.ts @@ -2,6 +2,7 @@ import { ImportsManager, Reference } from "@fern-typescript/commons"; import { GeneratedTimeoutSdkError, TimeoutSdkErrorContext } from "@fern-typescript/contexts"; import { TimeoutSdkErrorGenerator } from "@fern-typescript/generic-sdk-error-generators"; import { SourceFile } from "ts-morph"; + import { TimeoutSdkErrorDeclarationReferencer } from "../../declaration-referencers/TimeoutSdkErrorDeclarationReferencer"; export declare namespace TimeoutSdkErrorContextImpl { diff --git a/generators/typescript/sdk/generator/src/contexts/type-schema/TypeSchemaContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/type-schema/TypeSchemaContextImpl.ts index 9cd2f1b1449..35d5bd742ce 100644 --- a/generators/typescript/sdk/generator/src/contexts/type-schema/TypeSchemaContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/type-schema/TypeSchemaContextImpl.ts @@ -1,4 +1,3 @@ -import { DeclaredTypeName, ShapeType, TypeDeclaration, TypeReference } from "@fern-fern/ir-sdk/api"; import { ImportsManager, Reference, TypeReferenceNode, Zurg } from "@fern-typescript/commons"; import { CoreUtilities } from "@fern-typescript/commons/src/core-utilities/CoreUtilities"; import { GeneratedTypeSchema, TypeSchemaContext } from "@fern-typescript/contexts"; @@ -9,7 +8,10 @@ import { TypeReferenceToSchemaConverter } from "@fern-typescript/type-reference-converters"; import { TypeSchemaGenerator } from "@fern-typescript/type-schema-generator"; -import { ts, SourceFile } from "ts-morph"; +import { SourceFile, ts } from "ts-morph"; + +import { DeclaredTypeName, ShapeType, TypeDeclaration, TypeReference } from "@fern-fern/ir-sdk/api"; + import { TypeDeclarationReferencer } from "../../declaration-referencers/TypeDeclarationReferencer"; import { getSchemaImportStrategy } from "../getSchemaImportStrategy"; diff --git a/generators/typescript/sdk/generator/src/contexts/type/TypeContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/type/TypeContextImpl.ts index 8430bd866a1..de23861b23a 100644 --- a/generators/typescript/sdk/generator/src/contexts/type/TypeContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/type/TypeContextImpl.ts @@ -1,11 +1,3 @@ -import { - DeclaredTypeName, - ExampleTypeReference, - ObjectProperty, - ResolvedTypeReference, - TypeDeclaration, - TypeReference -} from "@fern-fern/ir-sdk/api"; import { ImportsManager, NpmPackage, Reference, TypeReferenceNode } from "@fern-typescript/commons"; import { BaseContext, GeneratedType, GeneratedTypeReferenceExample, TypeContext } from "@fern-typescript/contexts"; import { TypeResolver } from "@fern-typescript/resolvers"; @@ -17,6 +9,16 @@ import { import { ConvertTypeReferenceParams } from "@fern-typescript/type-reference-converters/src/AbstractTypeReferenceConverter"; import { TypeReferenceExampleGenerator } from "@fern-typescript/type-reference-example-generator"; import { SourceFile, ts } from "ts-morph"; + +import { + DeclaredTypeName, + ExampleTypeReference, + ObjectProperty, + ResolvedTypeReference, + TypeDeclaration, + TypeReference +} from "@fern-fern/ir-sdk/api"; + import { TypeDeclarationReferencer } from "../../declaration-referencers/TypeDeclarationReferencer"; export declare namespace TypeContextImpl { diff --git a/generators/typescript/sdk/generator/src/contexts/version/VersionContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/version/VersionContextImpl.ts index 4d6d3ecec95..a0db469d635 100644 --- a/generators/typescript/sdk/generator/src/contexts/version/VersionContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/version/VersionContextImpl.ts @@ -1,7 +1,9 @@ -import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { ImportsManager, Reference } from "@fern-typescript/commons"; import { GeneratedVersion, VersionContext } from "@fern-typescript/contexts"; import { SourceFile } from "ts-morph"; + +import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { VersionDeclarationReferencer } from "../../declaration-referencers/VersionDeclarationReferencer"; import { VersionGenerator } from "../../version/VersionGenerator"; diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/AbstractDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/AbstractDeclarationReferencer.ts index 182dc061937..a1a24727479 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/AbstractDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/AbstractDeclarationReferencer.ts @@ -1,12 +1,14 @@ -import { assertNever } from "@fern-api/core-utils"; import { ExportedDirectory, ExportedFilePath, + Reference, getDirectReferenceToExport, getReferenceToExportFromPackage, - getReferenceToExportFromRoot, - Reference + getReferenceToExportFromRoot } from "@fern-typescript/commons"; + +import { assertNever } from "@fern-api/core-utils"; + import { DeclarationReferencer } from "./DeclarationReferencer"; export declare namespace AbstractDeclarationReferencer { diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/AbstractSdkClientClassDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/AbstractSdkClientClassDeclarationReferencer.ts index c6ff8793ec7..e36a16d1183 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/AbstractSdkClientClassDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/AbstractSdkClientClassDeclarationReferencer.ts @@ -1,13 +1,16 @@ -import { entries } from "@fern-api/core-utils"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; -import { FernFilepath } from "@fern-fern/ir-sdk/api"; import { ExportDeclaration, ExportedDirectory, - getExportedDirectoriesForFernFilepath, - PackageId + PackageId, + getExportedDirectoriesForFernFilepath } from "@fern-typescript/commons"; import { PackageResolver } from "@fern-typescript/resolvers"; + +import { entries } from "@fern-api/core-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + +import { FernFilepath } from "@fern-fern/ir-sdk/api"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; const CLIENT_DIRECTORY = "client"; diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/AbstractSdkErrorDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/AbstractSdkErrorDeclarationReferencer.ts index c7a817f5a2c..bf5b491cc13 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/AbstractSdkErrorDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/AbstractSdkErrorDeclarationReferencer.ts @@ -1,5 +1,6 @@ import { ExportedFilePath, ImportsManager, Reference } from "@fern-typescript/commons"; import { SourceFile } from "ts-morph"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; const ERRORS_DIRECTORY = "errors"; diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/EndpointDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/EndpointDeclarationReferencer.ts index 952dba1e3c9..bb8b8bcb930 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/EndpointDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/EndpointDeclarationReferencer.ts @@ -1,5 +1,7 @@ -import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { ExportedFilePath, PackageId, Reference } from "@fern-typescript/commons"; + +import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { AbstractSdkClientClassDeclarationReferencer } from "./AbstractSdkClientClassDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/EnvironmentsDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/EnvironmentsDeclarationReferencer.ts index 0ebfe0ab104..cff09578283 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/EnvironmentsDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/EnvironmentsDeclarationReferencer.ts @@ -1,13 +1,15 @@ -import { EnvironmentsConfig, MultipleBaseUrlsEnvironments, SingleBaseUrlEnvironments } from "@fern-fern/ir-sdk/api"; import { ExportedFilePath, - getReferenceToExportFromPackage, - getReferenceToExportViaNamespaceImport, ImportsManager, NpmPackage, - Reference + Reference, + getReferenceToExportFromPackage, + getReferenceToExportViaNamespaceImport } from "@fern-typescript/commons"; import { SourceFile } from "ts-morph"; + +import { EnvironmentsConfig, MultipleBaseUrlsEnvironments, SingleBaseUrlEnvironments } from "@fern-fern/ir-sdk/api"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; export declare namespace EnvironmentsDeclarationReferencer { diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/RequestWrapperDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/RequestWrapperDeclarationReferencer.ts index 97d006d4ebe..e4ca7aaae2b 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/RequestWrapperDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/RequestWrapperDeclarationReferencer.ts @@ -1,7 +1,10 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; -import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { ExportedFilePath, PackageId } from "@fern-typescript/commons"; import { ts } from "ts-morph"; + +import { RelativeFilePath } from "@fern-api/fs-utils"; + +import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { AbstractSdkClientClassDeclarationReferencer } from "./AbstractSdkClientClassDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/SdkClientClassDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/SdkClientClassDeclarationReferencer.ts index a7d924540dc..779bbf36bd4 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/SdkClientClassDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/SdkClientClassDeclarationReferencer.ts @@ -1,4 +1,5 @@ import { ExportedFilePath, PackageId, Reference } from "@fern-typescript/commons"; + import { AbstractSdkClientClassDeclarationReferencer } from "./AbstractSdkClientClassDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; import { SdkRootClientClassDeclarationReferencer } from "./SdkRootClientClassDeclarationReferencer"; diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/SdkErrorDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/SdkErrorDeclarationReferencer.ts index 39257cfbad8..5b37be4a583 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/SdkErrorDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/SdkErrorDeclarationReferencer.ts @@ -1,6 +1,9 @@ +import { ExportedFilePath, Reference, getExportedDirectoriesForFernFilepath } from "@fern-typescript/commons"; + import { RelativeFilePath } from "@fern-api/fs-utils"; + import { DeclaredErrorName } from "@fern-fern/ir-sdk/api"; -import { ExportedFilePath, getExportedDirectoriesForFernFilepath, Reference } from "@fern-typescript/commons"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/SdkInlinedRequestBodyDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/SdkInlinedRequestBodyDeclarationReferencer.ts index f98716b56c2..7b061e86008 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/SdkInlinedRequestBodyDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/SdkInlinedRequestBodyDeclarationReferencer.ts @@ -1,6 +1,9 @@ +import { ExportedFilePath, PackageId, Reference } from "@fern-typescript/commons"; + import { RelativeFilePath } from "@fern-api/fs-utils"; + import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; -import { ExportedFilePath, PackageId, Reference } from "@fern-typescript/commons"; + import { AbstractSdkClientClassDeclarationReferencer } from "./AbstractSdkClientClassDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/SdkRootClientClassDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/SdkRootClientClassDeclarationReferencer.ts index 05c118dd584..449ecb18aa1 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/SdkRootClientClassDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/SdkRootClientClassDeclarationReferencer.ts @@ -1,4 +1,5 @@ import { ExportedFilePath, PackageId, Reference } from "@fern-typescript/commons"; + import { AbstractSdkClientClassDeclarationReferencer } from "./AbstractSdkClientClassDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/SdkSubpackageClientClassDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/SdkSubpackageClientClassDeclarationReferencer.ts index 9033315cb25..9a8df7cd1ab 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/SdkSubpackageClientClassDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/SdkSubpackageClientClassDeclarationReferencer.ts @@ -1,5 +1,7 @@ -import { SubpackageId } from "@fern-fern/ir-sdk/api"; import { ExportedFilePath, PackageId, Reference } from "@fern-typescript/commons"; + +import { SubpackageId } from "@fern-fern/ir-sdk/api"; + import { AbstractSdkClientClassDeclarationReferencer } from "./AbstractSdkClientClassDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/TypeDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/TypeDeclarationReferencer.ts index 235f4d99453..5b7d3c7e258 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/TypeDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/TypeDeclarationReferencer.ts @@ -1,8 +1,12 @@ +import { ExportedFilePath, Reference, getExportedDirectoriesForFernFilepath } from "@fern-typescript/commons"; + import { RelativeFilePath } from "@fern-api/fs-utils"; + import { DeclaredTypeName, ObjectProperty, TypeDeclaration } from "@fern-fern/ir-sdk/api"; -import { ExportedFilePath, getExportedDirectoriesForFernFilepath, Reference } from "@fern-typescript/commons"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; import { DeclarationReferencer } from "./DeclarationReferencer"; + export const TYPES_DIRECTORY_NAME = "types"; export class TypeDeclarationReferencer extends AbstractDeclarationReferencer { diff --git a/generators/typescript/sdk/generator/src/declaration-referencers/VersionDeclarationReferencer.ts b/generators/typescript/sdk/generator/src/declaration-referencers/VersionDeclarationReferencer.ts index c1e6e0d7a84..9035b2a40c3 100644 --- a/generators/typescript/sdk/generator/src/declaration-referencers/VersionDeclarationReferencer.ts +++ b/generators/typescript/sdk/generator/src/declaration-referencers/VersionDeclarationReferencer.ts @@ -1,11 +1,13 @@ -import { ApiVersionScheme } from "@fern-fern/ir-sdk/api"; import { ExportedFilePath, - getReferenceToExportViaNamespaceImport, ImportsManager, - Reference + Reference, + getReferenceToExportViaNamespaceImport } from "@fern-typescript/commons"; import { SourceFile, ts } from "ts-morph"; + +import { ApiVersionScheme } from "@fern-fern/ir-sdk/api"; + import { AbstractDeclarationReferencer } from "./AbstractDeclarationReferencer"; export declare namespace VersionDeclarationReferencer { diff --git a/generators/typescript/sdk/generator/src/readme/ReadmeConfigBuilder.ts b/generators/typescript/sdk/generator/src/readme/ReadmeConfigBuilder.ts index 2dfaf9c251e..2d1a922cb51 100644 --- a/generators/typescript/sdk/generator/src/readme/ReadmeConfigBuilder.ts +++ b/generators/typescript/sdk/generator/src/readme/ReadmeConfigBuilder.ts @@ -1,7 +1,9 @@ -import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk"; -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { NpmPackage } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; + +import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk"; +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; + import { ReadmeSnippetBuilder } from "./ReadmeSnippetBuilder"; export class ReadmeConfigBuilder { diff --git a/generators/typescript/sdk/generator/src/readme/ReadmeSnippetBuilder.ts b/generators/typescript/sdk/generator/src/readme/ReadmeSnippetBuilder.ts index 87dffb4715f..6f560817568 100644 --- a/generators/typescript/sdk/generator/src/readme/ReadmeSnippetBuilder.ts +++ b/generators/typescript/sdk/generator/src/readme/ReadmeSnippetBuilder.ts @@ -1,12 +1,14 @@ -import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk"; -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import { EndpointId, FeatureId, FernFilepath, HttpEndpoint, SdkRequestWrapper } from "@fern-fern/ir-sdk/api"; import { getTextOfTsNode } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; -import { code, Code } from "ts-poet"; +import { Code, code } from "ts-poet"; + import { AbstractReadmeSnippetBuilder } from "@fern-api/base-generator"; import { isNonNullish } from "@fern-api/core-utils"; +import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk"; +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; +import { EndpointId, FeatureId, FernFilepath, HttpEndpoint, SdkRequestWrapper } from "@fern-fern/ir-sdk/api"; + interface EndpointWithFilepath { endpoint: HttpEndpoint; fernFilepath: FernFilepath; diff --git a/generators/typescript/sdk/generator/src/test-generator/JestTestGenerator.ts b/generators/typescript/sdk/generator/src/test-generator/JestTestGenerator.ts index 6b2229aa2ba..f40d82148e1 100644 --- a/generators/typescript/sdk/generator/src/test-generator/JestTestGenerator.ts +++ b/generators/typescript/sdk/generator/src/test-generator/JestTestGenerator.ts @@ -1,5 +1,3 @@ -import { assertNever } from "@fern-api/core-utils"; -import * as IR from "@fern-fern/ir-sdk/api"; import { DependencyManager, DependencyType, @@ -11,7 +9,11 @@ import { GeneratedSdkClientClass, SdkContext } from "@fern-typescript/contexts"; import { OAuthTokenProviderGenerator } from "@fern-typescript/sdk-client-class-generator/src/oauth-generator/OAuthTokenProviderGenerator"; import path from "path"; import { Directory, ts } from "ts-morph"; -import { arrayOf, code, Code, conditionalOutput, literalOf } from "ts-poet"; +import { Code, arrayOf, code, conditionalOutput, literalOf } from "ts-poet"; + +import { assertNever } from "@fern-api/core-utils"; + +import * as IR from "@fern-fern/ir-sdk/api"; export declare namespace JestTestGenerator { interface Args { diff --git a/generators/typescript/sdk/generator/src/version/GeneratedVersionImpl.ts b/generators/typescript/sdk/generator/src/version/GeneratedVersionImpl.ts index 5e2e3a848dd..8b29768d5ec 100644 --- a/generators/typescript/sdk/generator/src/version/GeneratedVersionImpl.ts +++ b/generators/typescript/sdk/generator/src/version/GeneratedVersionImpl.ts @@ -1,8 +1,9 @@ -import { ApiVersionScheme, HttpHeader } from "@fern-fern/ir-sdk/api"; import { getTextOfTsNode } from "@fern-typescript/commons"; import { GeneratedVersion, SdkContext } from "@fern-typescript/contexts"; import { ts } from "ts-morph"; +import { ApiVersionScheme, HttpHeader } from "@fern-fern/ir-sdk/api"; + export class GeneratedVersionImpl implements GeneratedVersion { private apiVersion: ApiVersionScheme; private versionEnumName: string; diff --git a/generators/typescript/sdk/generator/src/version/VersionFileGenerator.ts b/generators/typescript/sdk/generator/src/version/VersionFileGenerator.ts index b7c1560d6d4..b82c09d9259 100644 --- a/generators/typescript/sdk/generator/src/version/VersionFileGenerator.ts +++ b/generators/typescript/sdk/generator/src/version/VersionFileGenerator.ts @@ -1,4 +1,5 @@ import { Directory } from "ts-morph"; + import { Writer, ts } from "@fern-api/typescript-ast"; export declare namespace VersionFileGenerator { diff --git a/generators/typescript/sdk/generator/src/version/VersionGenerator.ts b/generators/typescript/sdk/generator/src/version/VersionGenerator.ts index 8891a4696d8..1ed36a743d1 100644 --- a/generators/typescript/sdk/generator/src/version/VersionGenerator.ts +++ b/generators/typescript/sdk/generator/src/version/VersionGenerator.ts @@ -1,5 +1,7 @@ -import { ApiVersionScheme } from "@fern-fern/ir-sdk/api"; import { GeneratedVersion } from "@fern-typescript/contexts"; + +import { ApiVersionScheme } from "@fern-fern/ir-sdk/api"; + import { GeneratedVersionImpl } from "./GeneratedVersionImpl"; export declare namespace VersionGenerator { diff --git a/generators/typescript/sdk/generic-sdk-error-generators/package.json b/generators/typescript/sdk/generic-sdk-error-generators/package.json index fd954170e42..5286d5fa468 100644 --- a/generators/typescript/sdk/generic-sdk-error-generators/package.json +++ b/generators/typescript/sdk/generic-sdk-error-generators/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": { @@ -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" } } \ No newline at end of file diff --git a/generators/typescript/sdk/generic-sdk-error-generators/src/generic-api-error/GenericAPISdkErrorGenerator.ts b/generators/typescript/sdk/generic-sdk-error-generators/src/generic-api-error/GenericAPISdkErrorGenerator.ts index f76ee66f413..6b70c582104 100644 --- a/generators/typescript/sdk/generic-sdk-error-generators/src/generic-api-error/GenericAPISdkErrorGenerator.ts +++ b/generators/typescript/sdk/generic-sdk-error-generators/src/generic-api-error/GenericAPISdkErrorGenerator.ts @@ -1,4 +1,5 @@ import { GeneratedGenericAPISdkError } from "@fern-typescript/contexts"; + import { GeneratedGenericAPISdkErrorImpl } from "./GeneratedGenericAPISdkErrorImpl"; export declare namespace GenericAPISdkErrorGenerator { diff --git a/generators/typescript/sdk/generic-sdk-error-generators/src/timeout-error/TimeoutSdkErrorGenerator.ts b/generators/typescript/sdk/generic-sdk-error-generators/src/timeout-error/TimeoutSdkErrorGenerator.ts index 8e4527af687..8ff5d1b664d 100644 --- a/generators/typescript/sdk/generic-sdk-error-generators/src/timeout-error/TimeoutSdkErrorGenerator.ts +++ b/generators/typescript/sdk/generic-sdk-error-generators/src/timeout-error/TimeoutSdkErrorGenerator.ts @@ -1,4 +1,5 @@ import { GeneratedTimeoutSdkError } from "@fern-typescript/contexts"; + import { GeneratedTimeoutSdkErrorImpl } from "./GeneratedTimeoutSdkErrorImpl"; export declare namespace TimeoutSdkErrorGenerator { diff --git a/generators/typescript/sdk/request-wrapper-generator/package.json b/generators/typescript/sdk/request-wrapper-generator/package.json index 27e1bbef472..7e18afd0ed1 100644 --- a/generators/typescript/sdk/request-wrapper-generator/package.json +++ b/generators/typescript/sdk/request-wrapper-generator/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/sdk/request-wrapper-generator/src/GeneratedRequestWrapperExampleImpl.ts b/generators/typescript/sdk/request-wrapper-generator/src/GeneratedRequestWrapperExampleImpl.ts index a12a61182dd..6590f6dfde8 100644 --- a/generators/typescript/sdk/request-wrapper-generator/src/GeneratedRequestWrapperExampleImpl.ts +++ b/generators/typescript/sdk/request-wrapper-generator/src/GeneratedRequestWrapperExampleImpl.ts @@ -1,3 +1,7 @@ +import { GetReferenceOpts, PackageId } from "@fern-typescript/commons"; +import { GeneratedRequestWrapperExample, SdkContext } from "@fern-typescript/contexts"; +import { ts } from "ts-morph"; + import { ExampleEndpointCall, ExampleTypeReferenceShape, @@ -5,9 +9,6 @@ import { Name, TypeReference } from "@fern-fern/ir-sdk/api"; -import { GetReferenceOpts, PackageId } from "@fern-typescript/commons"; -import { GeneratedRequestWrapperExample, SdkContext } from "@fern-typescript/contexts"; -import { ts } from "ts-morph"; export declare namespace GeneratedRequestWrapperExampleImpl { export interface Init { diff --git a/generators/typescript/sdk/request-wrapper-generator/src/GeneratedRequestWrapperImpl.ts b/generators/typescript/sdk/request-wrapper-generator/src/GeneratedRequestWrapperImpl.ts index 64f26c27da9..48184103c2d 100644 --- a/generators/typescript/sdk/request-wrapper-generator/src/GeneratedRequestWrapperImpl.ts +++ b/generators/typescript/sdk/request-wrapper-generator/src/GeneratedRequestWrapperImpl.ts @@ -1,4 +1,23 @@ +import { + PackageId, + TypeReferenceNode, + generateInlinePropertiesModule, + getExampleEndpointCalls, + getParameterNameForPropertyPathParameterName, + getTextOfTsNode, + maybeAddDocsNode, + visitJavaScriptRuntime +} from "@fern-typescript/commons"; +import { + GeneratedRequestWrapper, + GeneratedRequestWrapperExample, + RequestWrapperNonBodyProperty, + SdkContext +} from "@fern-typescript/contexts"; +import { ModuleDeclarationStructure, OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; + import { noop } from "@fern-api/core-utils"; + import { ExampleEndpointCall, FileProperty, @@ -16,23 +35,7 @@ import { QueryParameter, TypeReference } from "@fern-fern/ir-sdk/api"; -import { - generateInlinePropertiesModule, - getExampleEndpointCalls, - getParameterNameForPropertyPathParameterName, - getTextOfTsNode, - maybeAddDocsNode, - PackageId, - TypeReferenceNode, - visitJavaScriptRuntime -} from "@fern-typescript/commons"; -import { - GeneratedRequestWrapper, - GeneratedRequestWrapperExample, - RequestWrapperNonBodyProperty, - SdkContext -} from "@fern-typescript/contexts"; -import { ModuleDeclarationStructure, OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; + import { RequestWrapperExampleGenerator } from "./RequestWrapperExampleGenerator"; export declare namespace GeneratedRequestWrapperImpl { diff --git a/generators/typescript/sdk/request-wrapper-generator/src/RequestWrapperExampleGenerator.ts b/generators/typescript/sdk/request-wrapper-generator/src/RequestWrapperExampleGenerator.ts index b74263bb070..5b1a1c41352 100644 --- a/generators/typescript/sdk/request-wrapper-generator/src/RequestWrapperExampleGenerator.ts +++ b/generators/typescript/sdk/request-wrapper-generator/src/RequestWrapperExampleGenerator.ts @@ -1,6 +1,8 @@ -import { ExampleEndpointCall, HttpRequestBody, Name } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; import { GeneratedRequestWrapperExample } from "@fern-typescript/contexts"; + +import { ExampleEndpointCall, HttpRequestBody, Name } from "@fern-fern/ir-sdk/api"; + import { GeneratedRequestWrapperExampleImpl } from "./GeneratedRequestWrapperExampleImpl"; export class RequestWrapperExampleGenerator { diff --git a/generators/typescript/sdk/request-wrapper-generator/src/RequestWrapperGenerator.ts b/generators/typescript/sdk/request-wrapper-generator/src/RequestWrapperGenerator.ts index 62e4078ff60..8b479c55458 100644 --- a/generators/typescript/sdk/request-wrapper-generator/src/RequestWrapperGenerator.ts +++ b/generators/typescript/sdk/request-wrapper-generator/src/RequestWrapperGenerator.ts @@ -1,6 +1,8 @@ -import { HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; import { GeneratedRequestWrapper } from "@fern-typescript/contexts"; + +import { HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; + import { GeneratedRequestWrapperImpl } from "./GeneratedRequestWrapperImpl"; export declare namespace RequestWrapperGenerator { diff --git a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/package.json b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/package.json index 6789c6a458d..41747a1eaae 100644 --- a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/package.json +++ b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/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": { @@ -42,8 +41,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" } } \ No newline at end of file diff --git a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/AbstractGeneratedEndpointTypeSchema.ts b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/AbstractGeneratedEndpointTypeSchema.ts index 20a9d2c5da3..a66be7f49f9 100644 --- a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/AbstractGeneratedEndpointTypeSchema.ts +++ b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/AbstractGeneratedEndpointTypeSchema.ts @@ -1,7 +1,9 @@ -import { HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; import { PackageId, Reference } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; + +import { HttpEndpoint, HttpService } from "@fern-fern/ir-sdk/api"; + import { GeneratedEndpointTypeSchema } from "./GeneratedEndpointTypeSchema"; export declare namespace AbstractGeneratedEndpointTypeSchema { diff --git a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedEndpointErrorSchemaImpl.ts b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedEndpointErrorSchemaImpl.ts index ff946ecf635..73b57bd23f2 100644 --- a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedEndpointErrorSchemaImpl.ts +++ b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedEndpointErrorSchemaImpl.ts @@ -1,9 +1,11 @@ -import { ErrorDiscriminationByPropertyStrategy, HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { PackageId, Zurg } from "@fern-typescript/commons"; import { GeneratedUnion, SdkContext } from "@fern-typescript/contexts"; import { ErrorResolver } from "@fern-typescript/resolvers"; import { GeneratedUnionSchema, RawNoPropertiesSingleUnionType } from "@fern-typescript/union-schema-generator"; import { ts } from "ts-morph"; + +import { ErrorDiscriminationByPropertyStrategy, HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { GeneratedEndpointErrorSchema } from "./GeneratedEndpointErrorSchema"; import { RawSinglePropertyErrorSingleUnionType } from "./RawSinglePropertyErrorSingleUnionType"; diff --git a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedEndpointTypeSchemaImpl.ts b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedEndpointTypeSchemaImpl.ts index 62be07e5772..069a5449403 100644 --- a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedEndpointTypeSchemaImpl.ts +++ b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedEndpointTypeSchemaImpl.ts @@ -1,8 +1,10 @@ -import { TypeReference } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getTextOfTsNode, Zurg } from "@fern-typescript/commons"; +import { Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { ModuleDeclaration, ts } from "ts-morph"; + +import { TypeReference } from "@fern-fern/ir-sdk/api"; + import { AbstractGeneratedEndpointTypeSchema } from "./AbstractGeneratedEndpointTypeSchema"; export declare namespace GeneratedEndpointTypeSchemaImpl { diff --git a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedSdkEndpointTypeSchemasImpl.ts b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedSdkEndpointTypeSchemasImpl.ts index 833fc5eb8c2..8e7496f9ada 100644 --- a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedSdkEndpointTypeSchemasImpl.ts +++ b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/GeneratedSdkEndpointTypeSchemasImpl.ts @@ -1,4 +1,10 @@ +import { PackageId, getSchemaOptions } from "@fern-typescript/commons"; +import { GeneratedSdkEndpointTypeSchemas, SdkContext } from "@fern-typescript/contexts"; +import { ErrorResolver } from "@fern-typescript/resolvers"; +import { ts } from "ts-morph"; + import { assertNever } from "@fern-api/core-utils"; + import { ErrorDiscriminationStrategy, HttpEndpoint, @@ -6,10 +12,7 @@ import { PrimitiveTypeV1, TypeReference } from "@fern-fern/ir-sdk/api"; -import { getSchemaOptions, PackageId } from "@fern-typescript/commons"; -import { GeneratedSdkEndpointTypeSchemas, SdkContext } from "@fern-typescript/contexts"; -import { ErrorResolver } from "@fern-typescript/resolvers"; -import { ts } from "ts-morph"; + import { GeneratedEndpointErrorSchema } from "./GeneratedEndpointErrorSchema"; import { GeneratedEndpointErrorSchemaImpl } from "./GeneratedEndpointErrorSchemaImpl"; import { GeneratedEndpointTypeSchema } from "./GeneratedEndpointTypeSchema"; diff --git a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/RawSinglePropertyErrorSingleUnionType.ts b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/RawSinglePropertyErrorSingleUnionType.ts index 941d52668a6..cff0e04a62c 100644 --- a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/RawSinglePropertyErrorSingleUnionType.ts +++ b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/RawSinglePropertyErrorSingleUnionType.ts @@ -1,9 +1,10 @@ -import { DeclaredErrorName, ErrorDiscriminationByPropertyStrategy } from "@fern-fern/ir-sdk/api"; -import { getTextOfTsNode, Zurg } from "@fern-typescript/commons"; +import { Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { AbstractRawSingleUnionType } from "@fern-typescript/union-schema-generator"; import { OptionalKind, PropertySignatureStructure, ts } from "ts-morph"; +import { DeclaredErrorName, ErrorDiscriminationByPropertyStrategy } from "@fern-fern/ir-sdk/api"; + export declare namespace RawSinglePropertyErrorSingleUnionType { export interface Init extends AbstractRawSingleUnionType.Init { errorName: DeclaredErrorName; diff --git a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/SdkEndpointTypeSchemasGenerator.ts b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/SdkEndpointTypeSchemasGenerator.ts index 46528b3909c..a016cdabccb 100644 --- a/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/SdkEndpointTypeSchemasGenerator.ts +++ b/generators/typescript/sdk/sdk-endpoint-type-schemas-generator/src/SdkEndpointTypeSchemasGenerator.ts @@ -1,7 +1,9 @@ -import { HttpEndpoint, HttpService, IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; import { GeneratedSdkEndpointTypeSchemas } from "@fern-typescript/contexts"; import { ErrorResolver } from "@fern-typescript/resolvers"; + +import { HttpEndpoint, HttpService, IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkEndpointTypeSchemasImpl } from "./GeneratedSdkEndpointTypeSchemasImpl"; export declare namespace SdkEndpointTypeSchemasGenerator { diff --git a/generators/typescript/sdk/sdk-error-generator/package.json b/generators/typescript/sdk/sdk-error-generator/package.json index d4a846823a8..8a2e3a14b1a 100644 --- a/generators/typescript/sdk/sdk-error-generator/package.json +++ b/generators/typescript/sdk/sdk-error-generator/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/sdk/sdk-error-generator/src/GeneratedSdkErrorClassImpl.ts b/generators/typescript/sdk/sdk-error-generator/src/GeneratedSdkErrorClassImpl.ts index 8860337ebf2..11af415ad5e 100644 --- a/generators/typescript/sdk/sdk-error-generator/src/GeneratedSdkErrorClassImpl.ts +++ b/generators/typescript/sdk/sdk-error-generator/src/GeneratedSdkErrorClassImpl.ts @@ -1,9 +1,10 @@ -import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; import { AbstractErrorClassGenerator } from "@fern-typescript/abstract-error-class-generator"; import { getTextOfTsNode } from "@fern-typescript/commons"; import { GeneratedSdkErrorClass, SdkContext } from "@fern-typescript/contexts"; import { OptionalKind, ParameterDeclarationStructure, PropertyDeclarationStructure, ts } from "ts-morph"; +import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + export declare namespace GeneratedSdkErrorClassImpl { export interface Init { errorClassName: string; diff --git a/generators/typescript/sdk/sdk-error-generator/src/SdkErrorGenerator.ts b/generators/typescript/sdk/sdk-error-generator/src/SdkErrorGenerator.ts index b74af2fbe74..fff1d6de6dc 100644 --- a/generators/typescript/sdk/sdk-error-generator/src/SdkErrorGenerator.ts +++ b/generators/typescript/sdk/sdk-error-generator/src/SdkErrorGenerator.ts @@ -1,5 +1,7 @@ -import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; import { GeneratedSdkError } from "@fern-typescript/contexts"; + +import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkErrorClassImpl } from "./GeneratedSdkErrorClassImpl"; export declare namespace SdkErrorGenerator { diff --git a/generators/typescript/sdk/sdk-error-schema-generator/package.json b/generators/typescript/sdk/sdk-error-schema-generator/package.json index bbbd4eac33e..9a8633a8a7d 100644 --- a/generators/typescript/sdk/sdk-error-schema-generator/package.json +++ b/generators/typescript/sdk/sdk-error-schema-generator/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": { @@ -40,8 +39,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" } } \ No newline at end of file diff --git a/generators/typescript/sdk/sdk-error-schema-generator/src/GeneratedSdkErrorSchemaImpl.ts b/generators/typescript/sdk/sdk-error-schema-generator/src/GeneratedSdkErrorSchemaImpl.ts index 84f12b5dc74..63004f174bd 100644 --- a/generators/typescript/sdk/sdk-error-schema-generator/src/GeneratedSdkErrorSchemaImpl.ts +++ b/generators/typescript/sdk/sdk-error-schema-generator/src/GeneratedSdkErrorSchemaImpl.ts @@ -1,10 +1,12 @@ -import { assertNever } from "@fern-api/core-utils"; -import { ErrorDeclaration, TypeReference } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getTextOfTsNode, Reference, Zurg } from "@fern-typescript/commons"; +import { Reference, Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { GeneratedSdkErrorSchema, SdkContext } from "@fern-typescript/contexts"; import { ModuleDeclaration, ts } from "ts-morph"; +import { assertNever } from "@fern-api/core-utils"; + +import { ErrorDeclaration, TypeReference } from "@fern-fern/ir-sdk/api"; + export declare namespace GeneratedSdkErrorSchemaImpl { export interface Init { errorName: string; diff --git a/generators/typescript/sdk/sdk-error-schema-generator/src/SdkErrorSchemaGenerator.ts b/generators/typescript/sdk/sdk-error-schema-generator/src/SdkErrorSchemaGenerator.ts index 995b7e67518..7eb7cf81084 100644 --- a/generators/typescript/sdk/sdk-error-schema-generator/src/SdkErrorSchemaGenerator.ts +++ b/generators/typescript/sdk/sdk-error-schema-generator/src/SdkErrorSchemaGenerator.ts @@ -1,5 +1,7 @@ -import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; import { GeneratedSdkErrorSchema } from "@fern-typescript/contexts"; + +import { ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkErrorSchemaImpl } from "./GeneratedSdkErrorSchemaImpl"; export declare namespace SdkErrorSchemaGenerator { diff --git a/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/package.json b/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/package.json index 7c6d88aa92c..7a06231746e 100644 --- a/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/package.json +++ b/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/src/GeneratedSdkInlinedRequestBodySchemaImpl.ts b/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/src/GeneratedSdkInlinedRequestBodySchemaImpl.ts index 0b1fda0f6f8..07502cde776 100644 --- a/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/src/GeneratedSdkInlinedRequestBodySchemaImpl.ts +++ b/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/src/GeneratedSdkInlinedRequestBodySchemaImpl.ts @@ -1,9 +1,10 @@ -import { HttpEndpoint, InlinedRequestBody, InlinedRequestBodyProperty } from "@fern-fern/ir-sdk/api"; import { AbstractGeneratedSchema } from "@fern-typescript/abstract-schema-generator"; -import { getSchemaOptions, getTextOfTsNode, PackageId, Reference, Zurg } from "@fern-typescript/commons"; +import { PackageId, Reference, Zurg, getSchemaOptions, getTextOfTsNode } from "@fern-typescript/commons"; import { GeneratedSdkInlinedRequestBodySchema, SdkContext } from "@fern-typescript/contexts"; import { ModuleDeclaration, ts } from "ts-morph"; +import { HttpEndpoint, InlinedRequestBody, InlinedRequestBodyProperty } from "@fern-fern/ir-sdk/api"; + export declare namespace GeneratedSdkInlinedRequestBodySchemaImpl { export interface Init extends AbstractGeneratedSchema.Init { packageId: PackageId; diff --git a/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/src/SdkInlinedRequestBodySchemaGenerator.ts b/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/src/SdkInlinedRequestBodySchemaGenerator.ts index 9fc6acbb6ba..335eb8c761d 100644 --- a/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/src/SdkInlinedRequestBodySchemaGenerator.ts +++ b/generators/typescript/sdk/sdk-inlined-request-body-schema-generator/src/SdkInlinedRequestBodySchemaGenerator.ts @@ -1,6 +1,8 @@ -import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; import { GeneratedSdkInlinedRequestBodySchema } from "@fern-typescript/contexts"; + +import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkInlinedRequestBodySchemaImpl } from "./GeneratedSdkInlinedRequestBodySchemaImpl"; export declare namespace SdkInlinedRequestBodySchemaGenerator { diff --git a/generators/typescript/utils/abstract-error-class-generator/package.json b/generators/typescript/utils/abstract-error-class-generator/package.json index eaeef558e0c..e7a9d436c79 100644 --- a/generators/typescript/utils/abstract-error-class-generator/package.json +++ b/generators/typescript/utils/abstract-error-class-generator/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": { @@ -37,8 +36,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" } } \ No newline at end of file diff --git a/generators/typescript/utils/abstract-generator-cli/package.json b/generators/typescript/utils/abstract-generator-cli/package.json index d9a7b7cec54..494d1df9055 100644 --- a/generators/typescript/utils/abstract-generator-cli/package.json +++ b/generators/typescript/utils/abstract-generator-cli/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 @@ "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" } } \ No newline at end of file diff --git a/generators/typescript/utils/abstract-generator-cli/src/AbstractGeneratorCli.ts b/generators/typescript/utils/abstract-generator-cli/src/AbstractGeneratorCli.ts index 848f3932340..15cca65e3f9 100644 --- a/generators/typescript/utils/abstract-generator-cli/src/AbstractGeneratorCli.ts +++ b/generators/typescript/utils/abstract-generator-cli/src/AbstractGeneratorCli.ts @@ -1,18 +1,21 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { NpmPackage, PersistedTypescriptProject } from "@fern-typescript/commons"; +import { GeneratorContext } from "@fern-typescript/contexts"; + import { FernGeneratorExec, GeneratorNotificationService, parseGeneratorConfig, parseIR } from "@fern-api/base-generator"; -import { CONSOLE_LOGGER, createLogger, Logger, LogLevel } from "@fern-api/logger"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { CONSOLE_LOGGER, LogLevel, Logger, createLogger } from "@fern-api/logger"; + import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; -import { NpmPackage, PersistedTypescriptProject } from "@fern-typescript/commons"; -import { GeneratorContext } from "@fern-typescript/contexts"; +import * as serializers from "@fern-fern/ir-sdk/serialization"; + import { constructNpmPackage } from "./constructNpmPackage"; import { publishPackage } from "./publishPackage"; import { writeGitHubWorkflows } from "./writeGitHubWorkflows"; -import * as serializers from "@fern-fern/ir-sdk/serialization"; const OUTPUT_ZIP_FILENAME = "output.zip"; @@ -180,7 +183,10 @@ export abstract class AbstractGeneratorCli { class GeneratorContextImpl implements GeneratorContext { private isSuccess = true; - constructor(public readonly logger: Logger, public readonly version: string | undefined) {} + constructor( + public readonly logger: Logger, + public readonly version: string | undefined + ) {} public fail(): void { this.isSuccess = false; diff --git a/generators/typescript/utils/abstract-generator-cli/src/constructNpmPackage.ts b/generators/typescript/utils/abstract-generator-cli/src/constructNpmPackage.ts index 39633eb2a17..bcaf4f224d2 100644 --- a/generators/typescript/utils/abstract-generator-cli/src/constructNpmPackage.ts +++ b/generators/typescript/utils/abstract-generator-cli/src/constructNpmPackage.ts @@ -1,6 +1,7 @@ -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { NpmPackage } from "@fern-typescript/commons"; +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; + export function constructNpmPackage({ generatorConfig, isPackagePrivate diff --git a/generators/typescript/utils/abstract-generator-cli/src/publishPackage.ts b/generators/typescript/utils/abstract-generator-cli/src/publishPackage.ts index 2b42ebe382e..90d8fb6b975 100644 --- a/generators/typescript/utils/abstract-generator-cli/src/publishPackage.ts +++ b/generators/typescript/utils/abstract-generator-cli/src/publishPackage.ts @@ -1,7 +1,9 @@ +import { NpmPackage, PersistedTypescriptProject } from "@fern-typescript/commons"; + import { GeneratorNotificationService } from "@fern-api/base-generator"; import { Logger } from "@fern-api/logger"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import { NpmPackage, PersistedTypescriptProject } from "@fern-typescript/commons"; export async function publishPackage({ generatorNotificationService, diff --git a/generators/typescript/utils/abstract-generator-cli/src/writeGitHubWorkflows.ts b/generators/typescript/utils/abstract-generator-cli/src/writeGitHubWorkflows.ts index 311098db246..1508266841d 100644 --- a/generators/typescript/utils/abstract-generator-cli/src/writeGitHubWorkflows.ts +++ b/generators/typescript/utils/abstract-generator-cli/src/writeGitHubWorkflows.ts @@ -1,8 +1,10 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { mkdir, writeFile } from "fs/promises"; import path from "path"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; + export async function writeGitHubWorkflows({ config, githubOutputMode, diff --git a/generators/typescript/utils/abstract-schema-generator/package.json b/generators/typescript/utils/abstract-schema-generator/package.json index 9a27aaf61df..74745a56c7e 100644 --- a/generators/typescript/utils/abstract-schema-generator/package.json +++ b/generators/typescript/utils/abstract-schema-generator/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": { @@ -37,8 +36,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" } } \ No newline at end of file diff --git a/generators/typescript/utils/abstract-schema-generator/src/AbstractGeneratedSchema.ts b/generators/typescript/utils/abstract-schema-generator/src/AbstractGeneratedSchema.ts index 651247c1d1f..1fcf8f96e0c 100644 --- a/generators/typescript/utils/abstract-schema-generator/src/AbstractGeneratedSchema.ts +++ b/generators/typescript/utils/abstract-schema-generator/src/AbstractGeneratedSchema.ts @@ -1,6 +1,6 @@ -import { getTextOfTsNode, Reference, Zurg } from "@fern-typescript/commons"; +import { Reference, Zurg, getTextOfTsNode } from "@fern-typescript/commons"; import { BaseContext } from "@fern-typescript/contexts"; -import { ModuleDeclaration, ts, VariableDeclarationKind } from "ts-morph"; +import { ModuleDeclaration, VariableDeclarationKind, ts } from "ts-morph"; export declare namespace AbstractGeneratedSchema { export interface Init { diff --git a/generators/typescript/utils/commons/package.json b/generators/typescript/utils/commons/package.json index 12ab4d26ab9..e626e3aaba0 100644 --- a/generators/typescript/utils/commons/package.json +++ b/generators/typescript/utils/commons/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": { @@ -57,8 +56,8 @@ "eslint": "^9.16.0", "vitest": "^2.1.8", "memfs": "^3.4.1", - "organize-imports-cli": "^0.10.0", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", "package-json-type": "^1.0.3", - "prettier": "^2.7.1" + "prettier": "^3.4.2" } } \ No newline at end of file diff --git a/generators/typescript/utils/commons/src/JavaScriptRuntime.ts b/generators/typescript/utils/commons/src/JavaScriptRuntime.ts index 011595b6505..cfc5c2f7940 100644 --- a/generators/typescript/utils/commons/src/JavaScriptRuntime.ts +++ b/generators/typescript/utils/commons/src/JavaScriptRuntime.ts @@ -1,4 +1,4 @@ -import { assertNever, Values } from "@fern-api/core-utils"; +import { Values, assertNever } from "@fern-api/core-utils"; export const JavaScriptRuntime = { NODE: "node", diff --git a/generators/typescript/utils/commons/src/codegen-utils/generateInlineModule.ts b/generators/typescript/utils/commons/src/codegen-utils/generateInlineModule.ts index af4728f0561..0ad7b55f5e0 100644 --- a/generators/typescript/utils/commons/src/codegen-utils/generateInlineModule.ts +++ b/generators/typescript/utils/commons/src/codegen-utils/generateInlineModule.ts @@ -1,5 +1,3 @@ -import { assertNever } from "@fern-api/core-utils"; -import { TypeReference, TypeDeclaration, MapType, NamedType, DeclaredTypeName } from "@fern-fern/ir-sdk/api"; import { ModuleDeclarationKind, ModuleDeclarationStructure, @@ -8,6 +6,11 @@ import { TypeAliasDeclarationStructure, WriterFunction } from "ts-morph"; + +import { assertNever } from "@fern-api/core-utils"; + +import { DeclaredTypeName, MapType, NamedType, TypeDeclaration, TypeReference } from "@fern-fern/ir-sdk/api"; + import { InlineConsts } from "./inlineConsts"; export function generateInlinePropertiesModule({ diff --git a/generators/typescript/utils/commons/src/codegen-utils/getTextOfTsKeyword.ts b/generators/typescript/utils/commons/src/codegen-utils/getTextOfTsKeyword.ts index 19117e38129..c4ded0c3fd3 100644 --- a/generators/typescript/utils/commons/src/codegen-utils/getTextOfTsKeyword.ts +++ b/generators/typescript/utils/commons/src/codegen-utils/getTextOfTsKeyword.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { getTextOfTsNode } from "./getTextOfTsNode"; export function getTextOfTsKeyword(keyword: ts.KeywordTypeSyntaxKind): string { diff --git a/generators/typescript/utils/commons/src/core-utilities/CoreUtilities.ts b/generators/typescript/utils/commons/src/core-utilities/CoreUtilities.ts index cc5f4e11660..4bfbe0bbdfc 100644 --- a/generators/typescript/utils/commons/src/core-utilities/CoreUtilities.ts +++ b/generators/typescript/utils/commons/src/core-utilities/CoreUtilities.ts @@ -4,11 +4,11 @@ import { CallbackQueue } from "./callback-queue/CallbackQueue"; import { Fetcher } from "./fetcher/Fetcher"; import { FormDataUtils } from "./form-data-utils/FormDataUtils"; import { Pagination } from "./pagination/Pagination"; +import { PromiseUtils } from "./promise/PromiseUtils"; import { Runtime } from "./runtime/Runtime"; import { StreamUtils } from "./stream-utils/StreamUtils"; import { Utils } from "./utils/Utils"; import { Zurg } from "./zurg/Zurg"; -import { PromiseUtils } from "./promise/PromiseUtils"; export interface CoreUtilities { zurg: Zurg; diff --git a/generators/typescript/utils/commons/src/core-utilities/CoreUtilitiesManager.ts b/generators/typescript/utils/commons/src/core-utilities/CoreUtilitiesManager.ts index 23f213c7c24..7857331bee9 100644 --- a/generators/typescript/utils/commons/src/core-utilities/CoreUtilitiesManager.ts +++ b/generators/typescript/utils/commons/src/core-utilities/CoreUtilitiesManager.ts @@ -1,33 +1,35 @@ +import { cp, mkdir, rm, writeFile } from "fs/promises"; +import { glob } from "glob"; +import path from "path"; +import { SourceFile } from "ts-morph"; + import { AbsoluteFilePath, - dirname, File, FileOrDirectory, + RelativeFilePath, + dirname, getDirectoryContents, - join, - RelativeFilePath + join } from "@fern-api/fs-utils"; -import { cp, mkdir, rm, writeFile } from "fs/promises"; -import { glob } from "glob"; -import path from "path"; -import { SourceFile } from "ts-morph"; + import { DependencyManager } from "../dependency-manager/DependencyManager"; import { ExportedDirectory, ExportsManager } from "../exports-manager"; import { ImportsManager } from "../imports-manager"; import { getReferenceToExportViaNamespaceImport } from "../referencing"; +import { CoreUtilities } from "./CoreUtilities"; +import { CoreUtility, CoreUtilityName } from "./CoreUtility"; import { AuthImpl } from "./auth/AuthImpl"; import { BaseCoreUtilitiesImpl } from "./base/BaseCoreUtilitiesImpl"; import { CallbackQueueImpl } from "./callback-queue/CallbackQueueImpl"; -import { CoreUtilities } from "./CoreUtilities"; -import { CoreUtility, CoreUtilityName } from "./CoreUtility"; import { FetcherImpl } from "./fetcher/FetcherImpl"; import { FormDataUtilsImpl } from "./form-data-utils/FormDataUtilsImpl"; import { PaginationImpl } from "./pagination/PaginationImpl"; +import { PromiseUtilsImpl } from "./promise/PromiseUtilsImpl"; import { RuntimeImpl } from "./runtime/RuntimeImpl"; import { StreamingUtilsImpl } from "./stream-utils/StreamUtilsImpl"; import { UtilsImpl } from "./utils/UtilsImpl"; import { ZurgImpl } from "./zurg/ZurgImpl"; -import { PromiseUtilsImpl } from "./promise/PromiseUtilsImpl"; export declare namespace CoreUtilitiesManager { namespace getCoreUtilities { diff --git a/generators/typescript/utils/commons/src/core-utilities/CoreUtility.ts b/generators/typescript/utils/commons/src/core-utilities/CoreUtility.ts index dc4b163b675..6eddc047913 100644 --- a/generators/typescript/utils/commons/src/core-utilities/CoreUtility.ts +++ b/generators/typescript/utils/commons/src/core-utilities/CoreUtility.ts @@ -1,4 +1,5 @@ import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { DependencyManager } from "../dependency-manager/DependencyManager"; import { ExportedDirectory } from "../exports-manager"; import { Reference } from "../referencing"; diff --git a/generators/typescript/utils/commons/src/core-utilities/auth/AuthImpl.ts b/generators/typescript/utils/commons/src/core-utilities/auth/AuthImpl.ts index ff70459c78d..87f44d57423 100644 --- a/generators/typescript/utils/commons/src/core-utilities/auth/AuthImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/auth/AuthImpl.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { DependencyManager } from "../../dependency-manager/DependencyManager"; import { CoreUtility } from "../CoreUtility"; import { Auth } from "./Auth"; diff --git a/generators/typescript/utils/commons/src/core-utilities/base/BaseCoreUtilitiesImpl.ts b/generators/typescript/utils/commons/src/core-utilities/base/BaseCoreUtilitiesImpl.ts index 6868cd49893..e6080ecbbf1 100644 --- a/generators/typescript/utils/commons/src/core-utilities/base/BaseCoreUtilitiesImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/base/BaseCoreUtilitiesImpl.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { CoreUtility } from "../CoreUtility"; import { BaseCoreUtilities } from "./BaseCoreUtilities"; diff --git a/generators/typescript/utils/commons/src/core-utilities/callback-queue/CallbackQueueImpl.ts b/generators/typescript/utils/commons/src/core-utilities/callback-queue/CallbackQueueImpl.ts index 85a30a6e511..5e2718346ae 100644 --- a/generators/typescript/utils/commons/src/core-utilities/callback-queue/CallbackQueueImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/callback-queue/CallbackQueueImpl.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { CoreUtility } from "../CoreUtility"; import { CallbackQueue } from "./CallbackQueue"; diff --git a/generators/typescript/utils/commons/src/core-utilities/fetcher/FetcherImpl.ts b/generators/typescript/utils/commons/src/core-utilities/fetcher/FetcherImpl.ts index e85310eb755..6f43cdd6108 100644 --- a/generators/typescript/utils/commons/src/core-utilities/fetcher/FetcherImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/fetcher/FetcherImpl.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { DependencyManager, DependencyType } from "../../dependency-manager/DependencyManager"; import { CoreUtility } from "../CoreUtility"; import { Fetcher } from "./Fetcher"; diff --git a/generators/typescript/utils/commons/src/core-utilities/form-data-utils/FormDataUtilsImpl.ts b/generators/typescript/utils/commons/src/core-utilities/form-data-utils/FormDataUtilsImpl.ts index e6d26703e41..75f7954687f 100644 --- a/generators/typescript/utils/commons/src/core-utilities/form-data-utils/FormDataUtilsImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/form-data-utils/FormDataUtilsImpl.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { DependencyManager } from "../../dependency-manager/DependencyManager"; import { CoreUtility } from "../CoreUtility"; import { FormDataUtils } from "./FormDataUtils"; diff --git a/generators/typescript/utils/commons/src/core-utilities/pagination/PaginationImpl.ts b/generators/typescript/utils/commons/src/core-utilities/pagination/PaginationImpl.ts index 68b77ce7f63..338e94e84b1 100644 --- a/generators/typescript/utils/commons/src/core-utilities/pagination/PaginationImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/pagination/PaginationImpl.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { CoreUtility } from "../CoreUtility"; import { Pagination } from "./Pagination"; diff --git a/generators/typescript/utils/commons/src/core-utilities/promise/PromiseUtilsImpl.ts b/generators/typescript/utils/commons/src/core-utilities/promise/PromiseUtilsImpl.ts index 85654d61894..aa94670f3d2 100644 --- a/generators/typescript/utils/commons/src/core-utilities/promise/PromiseUtilsImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/promise/PromiseUtilsImpl.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { DependencyManager } from "../../dependency-manager/DependencyManager"; import { CoreUtility } from "../CoreUtility"; import { PromiseUtils } from "./PromiseUtils"; diff --git a/generators/typescript/utils/commons/src/core-utilities/runtime/RuntimeImpl.ts b/generators/typescript/utils/commons/src/core-utilities/runtime/RuntimeImpl.ts index 6ca3bd4f336..30914b08ec8 100644 --- a/generators/typescript/utils/commons/src/core-utilities/runtime/RuntimeImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/runtime/RuntimeImpl.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { DependencyManager } from "../../dependency-manager/DependencyManager"; import { CoreUtility } from "../CoreUtility"; import { Runtime } from "./Runtime"; diff --git a/generators/typescript/utils/commons/src/core-utilities/stream-utils/StreamUtilsImpl.ts b/generators/typescript/utils/commons/src/core-utilities/stream-utils/StreamUtilsImpl.ts index 9cfcc175cea..e038a4e5b49 100644 --- a/generators/typescript/utils/commons/src/core-utilities/stream-utils/StreamUtilsImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/stream-utils/StreamUtilsImpl.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { CoreUtility } from "../CoreUtility"; -import { StreamingFetcher, StreamUtils } from "./StreamUtils"; +import { StreamUtils, StreamingFetcher } from "./StreamUtils"; export class StreamingUtilsImpl extends CoreUtility implements StreamUtils { public readonly MANIFEST = { diff --git a/generators/typescript/utils/commons/src/core-utilities/utils/UtilsImpl.ts b/generators/typescript/utils/commons/src/core-utilities/utils/UtilsImpl.ts index 7fbc73a3adf..8f300173463 100644 --- a/generators/typescript/utils/commons/src/core-utilities/utils/UtilsImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/utils/UtilsImpl.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { CoreUtility } from "../CoreUtility"; import { Utils } from "./Utils"; diff --git a/generators/typescript/utils/commons/src/core-utilities/zurg/ZurgImpl.ts b/generators/typescript/utils/commons/src/core-utilities/zurg/ZurgImpl.ts index 2c1c69ec6f5..bfdc83437cc 100644 --- a/generators/typescript/utils/commons/src/core-utilities/zurg/ZurgImpl.ts +++ b/generators/typescript/utils/commons/src/core-utilities/zurg/ZurgImpl.ts @@ -1,6 +1,8 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { SchemaOptions } from "@fern-typescript/zurg"; import { ts } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { Reference } from "../../referencing"; import { CoreUtility } from "../CoreUtility"; import { Zurg } from "./Zurg"; @@ -186,15 +188,15 @@ export class ZurgImpl extends CoreUtility implements Zurg { value ) : ts.isCallExpression(value) - ? ts.factory.createArrowFunction( - undefined, - undefined, - [], - undefined, - undefined, - value - ) - : value + ? ts.factory.createArrowFunction( + undefined, + undefined, + [], + undefined, + undefined, + value + ) + : value ); }), true diff --git a/generators/typescript/utils/commons/src/exports-manager/ExportedFilePath.ts b/generators/typescript/utils/commons/src/exports-manager/ExportedFilePath.ts index 7bc2c38647b..245abc58660 100644 --- a/generators/typescript/utils/commons/src/exports-manager/ExportedFilePath.ts +++ b/generators/typescript/utils/commons/src/exports-manager/ExportedFilePath.ts @@ -1,5 +1,7 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import path from "path"; + +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { ExportDeclaration } from "./ExportsManager"; export interface ExportedFilePath { diff --git a/generators/typescript/utils/commons/src/exports-manager/ExportsManager.ts b/generators/typescript/utils/commons/src/exports-manager/ExportsManager.ts index a11065fc655..a1402c13802 100644 --- a/generators/typescript/utils/commons/src/exports-manager/ExportsManager.ts +++ b/generators/typescript/utils/commons/src/exports-manager/ExportsManager.ts @@ -1,7 +1,8 @@ import path from "path"; import { Directory, SourceFile } from "ts-morph"; -import { getRelativePathAsModuleSpecifierTo, ModuleSpecifier } from "../referencing"; -import { convertExportedFilePathToFilePath, ExportedDirectory, ExportedFilePath } from "./ExportedFilePath"; + +import { ModuleSpecifier, getRelativePathAsModuleSpecifierTo } from "../referencing"; +import { ExportedDirectory, ExportedFilePath, convertExportedFilePathToFilePath } from "./ExportedFilePath"; export interface ExportDeclaration { exportAll?: boolean; diff --git a/generators/typescript/utils/commons/src/external-dependencies/blob/BlobImpl.ts b/generators/typescript/utils/commons/src/external-dependencies/blob/BlobImpl.ts index 23533d967e8..8611adf49b8 100644 --- a/generators/typescript/utils/commons/src/external-dependencies/blob/BlobImpl.ts +++ b/generators/typescript/utils/commons/src/external-dependencies/blob/BlobImpl.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { ExternalDependency } from "../ExternalDependency"; import { Blob_ } from "./Blob"; diff --git a/generators/typescript/utils/commons/src/external-dependencies/createExternalDependencies.ts b/generators/typescript/utils/commons/src/external-dependencies/createExternalDependencies.ts index c8b9d1769e8..a668831ec5c 100644 --- a/generators/typescript/utils/commons/src/external-dependencies/createExternalDependencies.ts +++ b/generators/typescript/utils/commons/src/external-dependencies/createExternalDependencies.ts @@ -1,8 +1,8 @@ import { DependencyManager } from "../dependency-manager/DependencyManager"; import { ImportsManager } from "../imports-manager"; +import { ExternalDependencies } from "./ExternalDependencies"; import { BlobImpl } from "./blob/BlobImpl"; import { ExpressImpl } from "./express/ExpressImpl"; -import { ExternalDependencies } from "./ExternalDependencies"; import { FsImpl } from "./fs/FsImpl"; import { StreamImpl } from "./stream/StreamImpl"; import { UrlJoinImpl } from "./url-join/UrlJoinImpl"; diff --git a/generators/typescript/utils/commons/src/external-dependencies/express/ExpressImpl.ts b/generators/typescript/utils/commons/src/external-dependencies/express/ExpressImpl.ts index 14fafaf72c5..c1a2791068b 100644 --- a/generators/typescript/utils/commons/src/external-dependencies/express/ExpressImpl.ts +++ b/generators/typescript/utils/commons/src/external-dependencies/express/ExpressImpl.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { ExternalDependency } from "../ExternalDependency"; import { Express, ExpressHttpVerb } from "./Express"; diff --git a/generators/typescript/utils/commons/src/external-dependencies/fs/FsImpl.ts b/generators/typescript/utils/commons/src/external-dependencies/fs/FsImpl.ts index 38d23329039..a6865573043 100644 --- a/generators/typescript/utils/commons/src/external-dependencies/fs/FsImpl.ts +++ b/generators/typescript/utils/commons/src/external-dependencies/fs/FsImpl.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { ExternalDependency } from "../ExternalDependency"; import { Fs } from "./Fs"; diff --git a/generators/typescript/utils/commons/src/external-dependencies/stream/StreamImpl.ts b/generators/typescript/utils/commons/src/external-dependencies/stream/StreamImpl.ts index 6142c58b7b7..743d037d134 100644 --- a/generators/typescript/utils/commons/src/external-dependencies/stream/StreamImpl.ts +++ b/generators/typescript/utils/commons/src/external-dependencies/stream/StreamImpl.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { ExternalDependency } from "../ExternalDependency"; import { Stream } from "./Stream"; diff --git a/generators/typescript/utils/commons/src/external-dependencies/url-join/UrlJoinImpl.ts b/generators/typescript/utils/commons/src/external-dependencies/url-join/UrlJoinImpl.ts index b34aaa0ae81..2f11fc3f14c 100644 --- a/generators/typescript/utils/commons/src/external-dependencies/url-join/UrlJoinImpl.ts +++ b/generators/typescript/utils/commons/src/external-dependencies/url-join/UrlJoinImpl.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { ExternalDependency } from "../ExternalDependency"; import { UrlJoin } from "./UrlJoin"; diff --git a/generators/typescript/utils/commons/src/getFullPathForEndpoint.ts b/generators/typescript/utils/commons/src/getFullPathForEndpoint.ts index de38379aca6..190c5b0b466 100644 --- a/generators/typescript/utils/commons/src/getFullPathForEndpoint.ts +++ b/generators/typescript/utils/commons/src/getFullPathForEndpoint.ts @@ -1,6 +1,7 @@ -import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; import urlJoin from "url-join"; +import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; + export function getFullPathForEndpoint(endpoint: HttpEndpoint): string { let url = ""; if (endpoint.fullPath.head.length > 0) { diff --git a/generators/typescript/utils/commons/src/imports-manager/ImportsManager.ts b/generators/typescript/utils/commons/src/imports-manager/ImportsManager.ts index af6d4f792a6..23cef570bc4 100644 --- a/generators/typescript/utils/commons/src/imports-manager/ImportsManager.ts +++ b/generators/typescript/utils/commons/src/imports-manager/ImportsManager.ts @@ -1,4 +1,5 @@ import { SourceFile } from "ts-morph"; + import { ModuleSpecifier } from "../referencing/ModuleSpecifier"; export interface ImportDeclaration { diff --git a/generators/typescript/utils/commons/src/referencing/getDirectReferenceToExport.ts b/generators/typescript/utils/commons/src/referencing/getDirectReferenceToExport.ts index 39454e0eded..6fa9fcf50ef 100644 --- a/generators/typescript/utils/commons/src/referencing/getDirectReferenceToExport.ts +++ b/generators/typescript/utils/commons/src/referencing/getDirectReferenceToExport.ts @@ -1,8 +1,9 @@ import { SourceFile, ts } from "ts-morph"; -import { convertExportedFilePathToFilePath, ExportedFilePath } from "../exports-manager/ExportedFilePath"; + +import { ExportedFilePath, convertExportedFilePathToFilePath } from "../exports-manager/ExportedFilePath"; import { ImportsManager } from "../imports-manager/ImportsManager"; -import { getRelativePathAsModuleSpecifierTo } from "./getRelativePathAsModuleSpecifierTo"; import { GetReferenceOpts, Reference } from "./Reference"; +import { getRelativePathAsModuleSpecifierTo } from "./getRelativePathAsModuleSpecifierTo"; export function getDirectReferenceToExport({ exportedName, diff --git a/generators/typescript/utils/commons/src/referencing/getEntityNameOfDirectory.ts b/generators/typescript/utils/commons/src/referencing/getEntityNameOfDirectory.ts index d3f5ba249a6..16971f064cf 100644 --- a/generators/typescript/utils/commons/src/referencing/getEntityNameOfDirectory.ts +++ b/generators/typescript/utils/commons/src/referencing/getEntityNameOfDirectory.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { ExportedDirectory } from "../exports-manager/ExportedFilePath"; import { getQualifiedNameOfDirectory } from "./getQualifiedNameOfDirectory"; diff --git a/generators/typescript/utils/commons/src/referencing/getExportedDirectoriesForFernFilepath.ts b/generators/typescript/utils/commons/src/referencing/getExportedDirectoriesForFernFilepath.ts index c0b06481342..933d1618e55 100644 --- a/generators/typescript/utils/commons/src/referencing/getExportedDirectoriesForFernFilepath.ts +++ b/generators/typescript/utils/commons/src/referencing/getExportedDirectoriesForFernFilepath.ts @@ -1,5 +1,7 @@ import { RelativeFilePath } from "@fern-api/fs-utils"; + import { FernFilepath, Name } from "@fern-fern/ir-sdk/api"; + import { ExportDeclaration } from "../exports-manager"; import { ExportedDirectory } from "../exports-manager/ExportedFilePath"; diff --git a/generators/typescript/utils/commons/src/referencing/getExpressionToDirectory.ts b/generators/typescript/utils/commons/src/referencing/getExpressionToDirectory.ts index 42cff00dc5d..41f12ffa299 100644 --- a/generators/typescript/utils/commons/src/referencing/getExpressionToDirectory.ts +++ b/generators/typescript/utils/commons/src/referencing/getExpressionToDirectory.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { ExportedDirectory } from "../exports-manager/ExportedFilePath"; import { getQualifiedNameOfDirectory } from "./getQualifiedNameOfDirectory"; diff --git a/generators/typescript/utils/commons/src/referencing/getQualifiedNameOfDirectory.ts b/generators/typescript/utils/commons/src/referencing/getQualifiedNameOfDirectory.ts index 3cb5459d058..45c338a6c6e 100644 --- a/generators/typescript/utils/commons/src/referencing/getQualifiedNameOfDirectory.ts +++ b/generators/typescript/utils/commons/src/referencing/getQualifiedNameOfDirectory.ts @@ -1,6 +1,8 @@ -import { keys } from "@fern-api/core-utils"; import path from "path"; -import { convertExportedDirectoryPathToFilePath, ExportedDirectory } from "../exports-manager/ExportedFilePath"; + +import { keys } from "@fern-api/core-utils"; + +import { ExportedDirectory, convertExportedDirectoryPathToFilePath } from "../exports-manager/ExportedFilePath"; export declare namespace getQualifiedNameOfDirectory { export interface Args { diff --git a/generators/typescript/utils/commons/src/referencing/getReferenceToExportFromPackage.ts b/generators/typescript/utils/commons/src/referencing/getReferenceToExportFromPackage.ts index 1e10f203a73..058ac98f382 100644 --- a/generators/typescript/utils/commons/src/referencing/getReferenceToExportFromPackage.ts +++ b/generators/typescript/utils/commons/src/referencing/getReferenceToExportFromPackage.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { ImportsManager } from "../imports-manager/ImportsManager"; import { GetReferenceOpts, Reference } from "./Reference"; diff --git a/generators/typescript/utils/commons/src/referencing/getReferenceToExportFromRoot.ts b/generators/typescript/utils/commons/src/referencing/getReferenceToExportFromRoot.ts index 7f2a2cf1c37..1c831fec039 100644 --- a/generators/typescript/utils/commons/src/referencing/getReferenceToExportFromRoot.ts +++ b/generators/typescript/utils/commons/src/referencing/getReferenceToExportFromRoot.ts @@ -1,17 +1,18 @@ import { SourceFile, ts } from "ts-morph"; + import { - convertExportedDirectoryPathToFilePath, - convertExportedFilePathToFilePath, ExportedDirectory, - ExportedFilePath + ExportedFilePath, + convertExportedDirectoryPathToFilePath, + convertExportedFilePathToFilePath } from "../exports-manager/ExportedFilePath"; import { ImportsManager } from "../imports-manager/ImportsManager"; +import { ModuleSpecifier } from "./ModuleSpecifier"; +import { GetReferenceOpts, Reference } from "./Reference"; import { getDirectReferenceToExport } from "./getDirectReferenceToExport"; import { getEntityNameOfDirectory } from "./getEntityNameOfDirectory"; import { getExpressionToDirectory } from "./getExpressionToDirectory"; import { getRelativePathAsModuleSpecifierTo } from "./getRelativePathAsModuleSpecifierTo"; -import { ModuleSpecifier } from "./ModuleSpecifier"; -import { GetReferenceOpts, Reference } from "./Reference"; export declare namespace getReferenceToExportFromRoot { export interface Args { diff --git a/generators/typescript/utils/commons/src/referencing/getReferenceToExportViaNamespaceImport.ts b/generators/typescript/utils/commons/src/referencing/getReferenceToExportViaNamespaceImport.ts index 28ce37a546c..12188c14e93 100644 --- a/generators/typescript/utils/commons/src/referencing/getReferenceToExportViaNamespaceImport.ts +++ b/generators/typescript/utils/commons/src/referencing/getReferenceToExportViaNamespaceImport.ts @@ -1,14 +1,15 @@ import { SourceFile, ts } from "ts-morph"; + import { - convertExportedFilePathToFilePath, ExportedDirectory, - ExportedFilePath + ExportedFilePath, + convertExportedFilePathToFilePath } from "../exports-manager/ExportedFilePath"; import { ImportsManager } from "../imports-manager/ImportsManager"; +import { GetReferenceOpts, Reference } from "./Reference"; import { getEntityNameOfDirectory } from "./getEntityNameOfDirectory"; import { getExpressionToDirectory } from "./getExpressionToDirectory"; import { getRelativePathAsModuleSpecifierTo } from "./getRelativePathAsModuleSpecifierTo"; -import { GetReferenceOpts, Reference } from "./Reference"; export function getReferenceToExportViaNamespaceImport({ exportedName, diff --git a/generators/typescript/utils/commons/src/typescript-project/BundledTypescriptProject.ts b/generators/typescript/utils/commons/src/typescript-project/BundledTypescriptProject.ts index ef169e05448..c2d0e47efbe 100644 --- a/generators/typescript/utils/commons/src/typescript-project/BundledTypescriptProject.ts +++ b/generators/typescript/utils/commons/src/typescript-project/BundledTypescriptProject.ts @@ -1,13 +1,15 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { produce } from "immer"; import yaml from "js-yaml"; import { IPackageJson } from "package-json-type"; import { CompilerOptions, ModuleKind, ModuleResolutionKind, ScriptTarget } from "ts-morph"; -import { DependencyType, PackageDependencies } from "../dependency-manager/DependencyManager"; + +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { NpmPackage } from "../NpmPackage"; +import { DependencyType, PackageDependencies } from "../dependency-manager/DependencyManager"; import { JSR } from "./JSR"; -import { mergeExtraConfigs } from "./mergeExtraConfigs"; import { TypescriptProject } from "./TypescriptProject"; +import { mergeExtraConfigs } from "./mergeExtraConfigs"; export declare namespace BundledTypescriptProject { export interface Init extends TypescriptProject.Init { diff --git a/generators/typescript/utils/commons/src/typescript-project/PersistedTypescriptProject.ts b/generators/typescript/utils/commons/src/typescript-project/PersistedTypescriptProject.ts index 76e59b990d9..154c0fa6280 100644 --- a/generators/typescript/utils/commons/src/typescript-project/PersistedTypescriptProject.ts +++ b/generators/typescript/utils/commons/src/typescript-project/PersistedTypescriptProject.ts @@ -1,10 +1,12 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { Logger } from "@fern-api/logger"; -import { createLoggingExecutable } from "@fern-api/logging-execa"; import decompress from "decompress"; import { cp, readdir, rm } from "fs/promises"; import tmp from "tmp-promise"; import urlJoin from "url-join"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { Logger } from "@fern-api/logger"; +import { createLoggingExecutable } from "@fern-api/logging-execa"; + import { PublishInfo } from "../NpmPackage"; export declare namespace PersistedTypescriptProject { diff --git a/generators/typescript/utils/commons/src/typescript-project/SimpleTypescriptProject.ts b/generators/typescript/utils/commons/src/typescript-project/SimpleTypescriptProject.ts index 73d55c92bf5..7e64db8b916 100644 --- a/generators/typescript/utils/commons/src/typescript-project/SimpleTypescriptProject.ts +++ b/generators/typescript/utils/commons/src/typescript-project/SimpleTypescriptProject.ts @@ -1,13 +1,15 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { produce } from "immer"; import yaml from "js-yaml"; import { IPackageJson } from "package-json-type"; import { CompilerOptions, ModuleKind, ModuleResolutionKind, ScriptTarget } from "ts-morph"; -import { DependencyType, PackageDependencies } from "../dependency-manager/DependencyManager"; + +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { NpmPackage } from "../NpmPackage"; +import { DependencyType, PackageDependencies } from "../dependency-manager/DependencyManager"; import { JSR } from "./JSR"; -import { mergeExtraConfigs } from "./mergeExtraConfigs"; import { TypescriptProject } from "./TypescriptProject"; +import { mergeExtraConfigs } from "./mergeExtraConfigs"; const FERN_IGNORE_FILENAME = ".fernignore"; diff --git a/generators/typescript/utils/commons/src/typescript-project/TypescriptProject.ts b/generators/typescript/utils/commons/src/typescript-project/TypescriptProject.ts index 8e4e1f59fc1..7fc05600af5 100644 --- a/generators/typescript/utils/commons/src/typescript-project/TypescriptProject.ts +++ b/generators/typescript/utils/commons/src/typescript-project/TypescriptProject.ts @@ -1,10 +1,12 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { mkdir, writeFile } from "fs/promises"; import Dirent from "memfs/lib/Dirent"; import { Volume } from "memfs/lib/volume"; import path from "path"; import tmp from "tmp-promise"; import { Project } from "ts-morph"; + +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { PersistedTypescriptProject } from "./PersistedTypescriptProject"; export declare namespace TypescriptProject { diff --git a/generators/typescript/utils/commons/src/writers/ObjectWriter.ts b/generators/typescript/utils/commons/src/writers/ObjectWriter.ts index 681a5fcd0d2..6f05ecaa55f 100644 --- a/generators/typescript/utils/commons/src/writers/ObjectWriter.ts +++ b/generators/typescript/utils/commons/src/writers/ObjectWriter.ts @@ -1,5 +1,7 @@ -import { assertNever } from "@fern-api/core-utils"; import { CodeBlockWriter, WriterFunction, WriterFunctionOrValue } from "ts-morph"; + +import { assertNever } from "@fern-api/core-utils"; + import { getPropertyKey } from "../codegen-utils/getPropertyKey"; const NEWLINE_REGEX = /^/gm; diff --git a/generators/typescript/utils/commons/src/writers/getWriterForMultiLineUnionType.ts b/generators/typescript/utils/commons/src/writers/getWriterForMultiLineUnionType.ts index 1bd1bff2361..e2312313bc8 100644 --- a/generators/typescript/utils/commons/src/writers/getWriterForMultiLineUnionType.ts +++ b/generators/typescript/utils/commons/src/writers/getWriterForMultiLineUnionType.ts @@ -1,4 +1,5 @@ -import { ts, WriterFunction } from "ts-morph"; +import { WriterFunction, ts } from "ts-morph"; + import { getTextOfTsKeyword } from "../codegen-utils/getTextOfTsKeyword"; import { getTextOfTsNode } from "../codegen-utils/getTextOfTsNode"; diff --git a/generators/typescript/utils/contexts/package.json b/generators/typescript/utils/contexts/package.json index 5ed33afc72c..aa377db8704 100644 --- a/generators/typescript/utils/contexts/package.json +++ b/generators/typescript/utils/contexts/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": { @@ -40,8 +39,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" } } \ No newline at end of file diff --git a/generators/typescript/utils/contexts/src/base-context/BaseContext.ts b/generators/typescript/utils/contexts/src/base-context/BaseContext.ts index 619cbc43c02..e82c69c619d 100644 --- a/generators/typescript/utils/contexts/src/base-context/BaseContext.ts +++ b/generators/typescript/utils/contexts/src/base-context/BaseContext.ts @@ -1,8 +1,11 @@ -import { Logger } from "@fern-api/logger"; -import { Constants } from "@fern-fern/ir-sdk/api"; import { ExternalDependencies } from "@fern-typescript/commons"; import { CoreUtilities } from "@fern-typescript/commons/src/core-utilities/CoreUtilities"; import { SourceFile } from "ts-morph"; + +import { Logger } from "@fern-api/logger"; + +import { Constants } from "@fern-fern/ir-sdk/api"; + import { TypeContext, TypeSchemaContext } from "../model-context"; export interface BaseContext { diff --git a/generators/typescript/utils/contexts/src/base-context/type-schema/BaseGeneratedTypeSchema.ts b/generators/typescript/utils/contexts/src/base-context/type-schema/BaseGeneratedTypeSchema.ts index ef655fa2638..85e1f8d24c2 100644 --- a/generators/typescript/utils/contexts/src/base-context/type-schema/BaseGeneratedTypeSchema.ts +++ b/generators/typescript/utils/contexts/src/base-context/type-schema/BaseGeneratedTypeSchema.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; export interface BaseGeneratedTypeSchema extends GeneratedFile { diff --git a/generators/typescript/utils/contexts/src/base-context/type-schema/TypeSchemaContext.ts b/generators/typescript/utils/contexts/src/base-context/type-schema/TypeSchemaContext.ts index ee9f186c825..75da0183ef4 100644 --- a/generators/typescript/utils/contexts/src/base-context/type-schema/TypeSchemaContext.ts +++ b/generators/typescript/utils/contexts/src/base-context/type-schema/TypeSchemaContext.ts @@ -1,5 +1,7 @@ -import { DeclaredTypeName, TypeReference } from "@fern-fern/ir-sdk/api"; import { Reference, TypeReferenceNode, Zurg } from "@fern-typescript/commons"; + +import { DeclaredTypeName, TypeReference } from "@fern-fern/ir-sdk/api"; + import { GeneratedTypeSchema } from "./GeneratedTypeSchema"; export interface TypeSchemaContext { diff --git a/generators/typescript/utils/contexts/src/base-context/type/BaseGeneratedType.ts b/generators/typescript/utils/contexts/src/base-context/type/BaseGeneratedType.ts index f2a69f75d11..8e53b27d23e 100644 --- a/generators/typescript/utils/contexts/src/base-context/type/BaseGeneratedType.ts +++ b/generators/typescript/utils/contexts/src/base-context/type/BaseGeneratedType.ts @@ -1,6 +1,8 @@ -import { ExampleTypeShape } from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts } from "@fern-typescript/commons"; import { ts } from "ts-morph"; + +import { ExampleTypeShape } from "@fern-fern/ir-sdk/api"; + import { GeneratedFile } from "../../commons"; import { GeneratedModule } from "../../commons/GeneratedModule"; import { GeneratedStatements } from "../../commons/GeneratedStatements"; diff --git a/generators/typescript/utils/contexts/src/base-context/type/GeneratedAliasType.ts b/generators/typescript/utils/contexts/src/base-context/type/GeneratedAliasType.ts index 5b30a89fefc..9363046b80e 100644 --- a/generators/typescript/utils/contexts/src/base-context/type/GeneratedAliasType.ts +++ b/generators/typescript/utils/contexts/src/base-context/type/GeneratedAliasType.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { BaseGeneratedType } from "./BaseGeneratedType"; export type GeneratedAliasType = BrandedGeneratedAliasType | NotBrandedGeneratedAliasType; diff --git a/generators/typescript/utils/contexts/src/base-context/type/GeneratedObjectType.ts b/generators/typescript/utils/contexts/src/base-context/type/GeneratedObjectType.ts index c9bc70c056a..e35790e336e 100644 --- a/generators/typescript/utils/contexts/src/base-context/type/GeneratedObjectType.ts +++ b/generators/typescript/utils/contexts/src/base-context/type/GeneratedObjectType.ts @@ -1,6 +1,8 @@ -import { ExampleTypeShape, TypeReference } from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts } from "@fern-typescript/commons"; import { InterfaceDeclarationStructure, PropertySignatureStructure, ts } from "ts-morph"; + +import { ExampleTypeShape, TypeReference } from "@fern-fern/ir-sdk/api"; + import { BaseGeneratedType } from "./BaseGeneratedType"; export interface GeneratedObjectType extends BaseGeneratedType { diff --git a/generators/typescript/utils/contexts/src/base-context/type/GeneratedTypeReferenceExample.ts b/generators/typescript/utils/contexts/src/base-context/type/GeneratedTypeReferenceExample.ts index 9df1addf9e8..1d2b9f7b036 100644 --- a/generators/typescript/utils/contexts/src/base-context/type/GeneratedTypeReferenceExample.ts +++ b/generators/typescript/utils/contexts/src/base-context/type/GeneratedTypeReferenceExample.ts @@ -1,5 +1,6 @@ import { GetReferenceOpts } from "@fern-typescript/commons"; import { ts } from "ts-morph"; + import { BaseContext } from "../../base-context"; export interface GeneratedTypeReferenceExample { diff --git a/generators/typescript/utils/contexts/src/base-context/type/GeneratedUnionType.ts b/generators/typescript/utils/contexts/src/base-context/type/GeneratedUnionType.ts index 98f17a3c2c0..a4c44171f62 100644 --- a/generators/typescript/utils/contexts/src/base-context/type/GeneratedUnionType.ts +++ b/generators/typescript/utils/contexts/src/base-context/type/GeneratedUnionType.ts @@ -1,4 +1,5 @@ import { SingleUnionTypeProperty } from "@fern-fern/ir-sdk/api"; + import { GeneratedUnion } from "../../commons/GeneratedUnion"; import { BaseGeneratedType } from "./BaseGeneratedType"; diff --git a/generators/typescript/utils/contexts/src/base-context/type/TypeContext.ts b/generators/typescript/utils/contexts/src/base-context/type/TypeContext.ts index 0c7af1da023..6ac192dacd3 100644 --- a/generators/typescript/utils/contexts/src/base-context/type/TypeContext.ts +++ b/generators/typescript/utils/contexts/src/base-context/type/TypeContext.ts @@ -1,3 +1,6 @@ +import { Reference, TypeReferenceNode } from "@fern-typescript/commons"; +import { ts } from "ts-morph"; + import { DeclaredTypeName, ExampleTypeReference, @@ -7,8 +10,7 @@ import { TypeId, TypeReference } from "@fern-fern/ir-sdk/api"; -import { Reference, TypeReferenceNode } from "@fern-typescript/commons"; -import { ts } from "ts-morph"; + import { GeneratedType } from "./GeneratedType"; import { GeneratedTypeReferenceExample } from "./GeneratedTypeReferenceExample"; diff --git a/generators/typescript/utils/contexts/src/express-context/express-endpoint-type-schemas/ExpressEndpointTypeSchemasContext.ts b/generators/typescript/utils/contexts/src/express-context/express-endpoint-type-schemas/ExpressEndpointTypeSchemasContext.ts index b273c04523b..5da4eddef35 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-endpoint-type-schemas/ExpressEndpointTypeSchemasContext.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-endpoint-type-schemas/ExpressEndpointTypeSchemasContext.ts @@ -1,5 +1,7 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { PackageId, Reference } from "@fern-typescript/commons"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressEndpointTypeSchemas } from "./GeneratedExpressEndpointTypeSchemas"; export interface ExpressEndpointTypeSchemasContext { diff --git a/generators/typescript/utils/contexts/src/express-context/express-endpoint-type-schemas/GeneratedExpressEndpointTypeSchemas.ts b/generators/typescript/utils/contexts/src/express-context/express-endpoint-type-schemas/GeneratedExpressEndpointTypeSchemas.ts index 726337304b8..65f525118e3 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-endpoint-type-schemas/GeneratedExpressEndpointTypeSchemas.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-endpoint-type-schemas/GeneratedExpressEndpointTypeSchemas.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { ExpressContext } from "../ExpressContext"; diff --git a/generators/typescript/utils/contexts/src/express-context/express-error-schema/ExpressErrorSchemaContext.ts b/generators/typescript/utils/contexts/src/express-context/express-error-schema/ExpressErrorSchemaContext.ts index fa3b726faa3..37bd93d5c23 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-error-schema/ExpressErrorSchemaContext.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-error-schema/ExpressErrorSchemaContext.ts @@ -1,5 +1,7 @@ -import { DeclaredErrorName } from "@fern-fern/ir-sdk/api"; import { Reference, Zurg } from "@fern-typescript/commons"; + +import { DeclaredErrorName } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressErrorSchema } from "./GeneratedExpressErrorSchema"; export interface ExpressErrorSchemaContext { diff --git a/generators/typescript/utils/contexts/src/express-context/express-error-schema/GeneratedExpressErrorSchema.ts b/generators/typescript/utils/contexts/src/express-context/express-error-schema/GeneratedExpressErrorSchema.ts index 61ceff16dc5..ac433ad15e4 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-error-schema/GeneratedExpressErrorSchema.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-error-schema/GeneratedExpressErrorSchema.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { ExpressContext } from "../ExpressContext"; diff --git a/generators/typescript/utils/contexts/src/express-context/express-error/ExpressErrorContext.ts b/generators/typescript/utils/contexts/src/express-context/express-error/ExpressErrorContext.ts index 165a6e225c8..d4f6cbefd16 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-error/ExpressErrorContext.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-error/ExpressErrorContext.ts @@ -1,5 +1,7 @@ -import { DeclaredErrorName, ErrorDeclaration } from "@fern-fern/ir-sdk/api"; import { Reference } from "@fern-typescript/commons"; + +import { DeclaredErrorName, ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressError } from "./GeneratedExpressError"; export interface ExpressErrorContext { diff --git a/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body-schema/ExpressInlinedRequestBodySchemaContext.ts b/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body-schema/ExpressInlinedRequestBodySchemaContext.ts index b8fae021a27..42c02a582d0 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body-schema/ExpressInlinedRequestBodySchemaContext.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body-schema/ExpressInlinedRequestBodySchemaContext.ts @@ -1,5 +1,7 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { PackageId, Reference } from "@fern-typescript/commons"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressInlinedRequestBodySchema } from "./GeneratedExpressInlinedRequestBodySchema"; export interface ExpressInlinedRequestBodySchemaContext { diff --git a/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body-schema/GeneratedExpressInlinedRequestBodySchema.ts b/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body-schema/GeneratedExpressInlinedRequestBodySchema.ts index fbb5e029828..2cd198d287a 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body-schema/GeneratedExpressInlinedRequestBodySchema.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body-schema/GeneratedExpressInlinedRequestBodySchema.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { ExpressContext } from "../ExpressContext"; diff --git a/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body/ExpressInlinedRequestBodyContext.ts b/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body/ExpressInlinedRequestBodyContext.ts index b072c7ffa9b..bf449901311 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body/ExpressInlinedRequestBodyContext.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body/ExpressInlinedRequestBodyContext.ts @@ -1,5 +1,7 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { PackageId, Reference } from "@fern-typescript/commons"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { GeneratedExpressInlinedRequestBody } from "./GeneratedExpressInlinedRequestBody"; export interface ExpressInlinedRequestBodyContext { diff --git a/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body/GeneratedExpressInlinedRequestBody.ts b/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body/GeneratedExpressInlinedRequestBody.ts index e5c37ac232f..64a993feb15 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body/GeneratedExpressInlinedRequestBody.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-inlined-request-body/GeneratedExpressInlinedRequestBody.ts @@ -1,4 +1,5 @@ import { InlinedRequestBodyProperty } from "@fern-fern/ir-sdk/api"; + import { ExpressContext } from ".."; import { GeneratedFile } from "../../commons/GeneratedFile"; diff --git a/generators/typescript/utils/contexts/src/express-context/express-service/ExpressServiceContext.ts b/generators/typescript/utils/contexts/src/express-context/express-service/ExpressServiceContext.ts index 0db265da68b..ec201506322 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-service/ExpressServiceContext.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-service/ExpressServiceContext.ts @@ -1,4 +1,5 @@ import { PackageId, Reference } from "@fern-typescript/commons"; + import { GeneratedExpressService } from "./GeneratedExpressService"; export interface ExpressServiceContext { diff --git a/generators/typescript/utils/contexts/src/express-context/express-service/GeneratedExpressService.ts b/generators/typescript/utils/contexts/src/express-context/express-service/GeneratedExpressService.ts index 7e51e9e9dce..c899e8bde73 100644 --- a/generators/typescript/utils/contexts/src/express-context/express-service/GeneratedExpressService.ts +++ b/generators/typescript/utils/contexts/src/express-context/express-service/GeneratedExpressService.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { ExpressContext } from "../ExpressContext"; diff --git a/generators/typescript/utils/contexts/src/express-context/generic-api-express-error/GeneratedGenericAPIExpressError.ts b/generators/typescript/utils/contexts/src/express-context/generic-api-express-error/GeneratedGenericAPIExpressError.ts index b34a2379e8d..c251852c1ca 100644 --- a/generators/typescript/utils/contexts/src/express-context/generic-api-express-error/GeneratedGenericAPIExpressError.ts +++ b/generators/typescript/utils/contexts/src/express-context/generic-api-express-error/GeneratedGenericAPIExpressError.ts @@ -1,4 +1,5 @@ import { MethodDeclarationStructure, OptionalKind, ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { ExpressContext } from "../ExpressContext"; diff --git a/generators/typescript/utils/contexts/src/express-context/generic-api-express-error/GenericAPIExpressErrorContext.ts b/generators/typescript/utils/contexts/src/express-context/generic-api-express-error/GenericAPIExpressErrorContext.ts index 9187e0acc90..f681fd02203 100644 --- a/generators/typescript/utils/contexts/src/express-context/generic-api-express-error/GenericAPIExpressErrorContext.ts +++ b/generators/typescript/utils/contexts/src/express-context/generic-api-express-error/GenericAPIExpressErrorContext.ts @@ -1,4 +1,5 @@ import { Reference } from "@fern-typescript/commons"; + import { GeneratedGenericAPIExpressError } from "./GeneratedGenericAPIExpressError"; export interface GenericAPIExpressErrorContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/SdkContext.ts b/generators/typescript/utils/contexts/src/sdk-context/SdkContext.ts index 30b31c48c44..62991d1fef0 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/SdkContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/SdkContext.ts @@ -1,7 +1,13 @@ -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { JavaScriptRuntime, NpmPackage } from "@fern-typescript/commons"; import { ts } from "ts-morph"; + +import { GeneratorNotificationService } from "@fern-api/base-generator"; +import { Logger } from "@fern-api/logger"; + +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; +import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; + +import { BaseContext } from "../base-context"; import { EndpointErrorUnionContext } from "./endpoint-error-union"; import { EnvironmentsContext } from "./environments"; import { GenericAPISdkErrorContext } from "./generic-api-sdk-error"; @@ -13,9 +19,6 @@ import { SdkErrorSchemaContext } from "./sdk-error-schema"; import { SdkInlinedRequestBodySchemaContext } from "./sdk-inlined-request-body-schema"; import { TimeoutSdkErrorContext } from "./timeout-sdk-error"; import { VersionContext } from "./version"; -import { GeneratorNotificationService } from "@fern-api/base-generator"; -import { Logger } from "@fern-api/logger"; -import { BaseContext } from "../base-context"; export interface SdkContext extends BaseContext { logger: Logger; diff --git a/generators/typescript/utils/contexts/src/sdk-context/endpoint-error-union/EndpointErrorUnionContext.ts b/generators/typescript/utils/contexts/src/sdk-context/endpoint-error-union/EndpointErrorUnionContext.ts index c64cf8cc188..c496e0dad90 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/endpoint-error-union/EndpointErrorUnionContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/endpoint-error-union/EndpointErrorUnionContext.ts @@ -1,5 +1,7 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { PackageId, Reference } from "@fern-typescript/commons"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { GeneratedEndpointErrorUnion } from "./GeneratedEndpointErrorUnion"; export interface EndpointErrorUnionContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/environments/EnvironmentsContext.ts b/generators/typescript/utils/contexts/src/sdk-context/environments/EnvironmentsContext.ts index 16e65b6493c..355f21de60f 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/environments/EnvironmentsContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/environments/EnvironmentsContext.ts @@ -1,4 +1,5 @@ import { Reference } from "@fern-typescript/commons"; + import { GeneratedEnvironments } from "./GeneratedEnvironments"; export interface EnvironmentsContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/environments/GeneratedEnvironments.ts b/generators/typescript/utils/contexts/src/sdk-context/environments/GeneratedEnvironments.ts index 301e73d080b..b369dfe12af 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/environments/GeneratedEnvironments.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/environments/GeneratedEnvironments.ts @@ -1,5 +1,7 @@ -import { EnvironmentBaseUrlId } from "@fern-fern/ir-sdk/api"; import { ts } from "ts-morph"; + +import { EnvironmentBaseUrlId } from "@fern-fern/ir-sdk/api"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { SdkContext } from "../SdkContext"; diff --git a/generators/typescript/utils/contexts/src/sdk-context/generic-api-sdk-error/GeneratedGenericAPISdkError.ts b/generators/typescript/utils/contexts/src/sdk-context/generic-api-sdk-error/GeneratedGenericAPISdkError.ts index 1b40e4ce493..480e5c2bf9c 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/generic-api-sdk-error/GeneratedGenericAPISdkError.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/generic-api-sdk-error/GeneratedGenericAPISdkError.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { SdkContext } from "../SdkContext"; diff --git a/generators/typescript/utils/contexts/src/sdk-context/generic-api-sdk-error/GenericAPISdkErrorContext.ts b/generators/typescript/utils/contexts/src/sdk-context/generic-api-sdk-error/GenericAPISdkErrorContext.ts index e867e9f1bac..a64cb26d70f 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/generic-api-sdk-error/GenericAPISdkErrorContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/generic-api-sdk-error/GenericAPISdkErrorContext.ts @@ -1,4 +1,5 @@ import { Reference } from "@fern-typescript/commons"; + import { GeneratedGenericAPISdkError } from "./GeneratedGenericAPISdkError"; export interface GenericAPISdkErrorContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/GeneratedRequestWrapper.ts b/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/GeneratedRequestWrapper.ts index 20be3a6cf39..2b341b62d5d 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/GeneratedRequestWrapper.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/GeneratedRequestWrapper.ts @@ -1,3 +1,5 @@ +import { ts } from "ts-morph"; + import { ExampleEndpointCall, FileProperty, @@ -8,7 +10,7 @@ import { PathParameter, QueryParameter } from "@fern-fern/ir-sdk/api"; -import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { SdkContext } from "../SdkContext"; import { GeneratedRequestWrapperExample } from "./GeneratedRequestWrapperExample"; diff --git a/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/GeneratedRequestWrapperExample.ts b/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/GeneratedRequestWrapperExample.ts index 2ef20098f01..e4172bb4c87 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/GeneratedRequestWrapperExample.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/GeneratedRequestWrapperExample.ts @@ -1,5 +1,6 @@ import { GetReferenceOpts } from "@fern-typescript/commons"; import { ts } from "ts-morph"; + import { SdkContext } from ".."; export interface GeneratedRequestWrapperExample { diff --git a/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/RequestWrapperContext.ts b/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/RequestWrapperContext.ts index 6e1b6841976..1f4c7eb4e76 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/RequestWrapperContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/request-wrapper/RequestWrapperContext.ts @@ -1,6 +1,8 @@ -import { Name, SdkRequest } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; import { ts } from "ts-morph"; + +import { Name, SdkRequest } from "@fern-fern/ir-sdk/api"; + import { GeneratedRequestWrapper } from "./GeneratedRequestWrapper"; export interface RequestWrapperContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/GeneratedEndpointImplementation.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/GeneratedEndpointImplementation.ts index 878836c98e9..567cec5961b 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/GeneratedEndpointImplementation.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/GeneratedEndpointImplementation.ts @@ -1,6 +1,8 @@ -import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { GetReferenceOpts } from "@fern-typescript/commons"; import { OptionalKind, ParameterDeclarationStructure, ts } from "ts-morph"; + +import { ExampleEndpointCall, HttpEndpoint } from "@fern-fern/ir-sdk/api"; + import { SdkContext } from "../SdkContext"; export interface EndpointSignature { diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/GeneratedSdkClientClass.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/GeneratedSdkClientClass.ts index f1116461a4e..a685b844934 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/GeneratedSdkClientClass.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/GeneratedSdkClientClass.ts @@ -1,6 +1,8 @@ -import { EndpointId, ExampleEndpointCall } from "@fern-fern/ir-sdk/api"; import { NpmPackage } from "@fern-typescript/commons"; import { ts } from "ts-morph"; + +import { EndpointId, ExampleEndpointCall } from "@fern-fern/ir-sdk/api"; + import { SdkContext } from ".."; import { GeneratedFile } from "../../commons/GeneratedFile"; import { GeneratedEndpointImplementation } from "./GeneratedEndpointImplementation"; diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/SdkClientClassContext.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/SdkClientClassContext.ts index 51c668f53f2..09ca13df160 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/SdkClientClassContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-client-class/SdkClientClassContext.ts @@ -1,4 +1,5 @@ import { NpmPackage, PackageId, Reference } from "@fern-typescript/commons"; + import { GeneratedSdkClientClass } from "./GeneratedSdkClientClass"; export interface SdkClientClassContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-endpoint-type-schemas/GeneratedSdkEndpointTypeSchemas.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-endpoint-type-schemas/GeneratedSdkEndpointTypeSchemas.ts index e65daccf166..0b8fd150a13 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-endpoint-type-schemas/GeneratedSdkEndpointTypeSchemas.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-endpoint-type-schemas/GeneratedSdkEndpointTypeSchemas.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { SdkContext } from "../SdkContext"; diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-endpoint-type-schemas/SdkEndpointTypeSchemasContext.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-endpoint-type-schemas/SdkEndpointTypeSchemasContext.ts index e0879773816..61b27c7221c 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-endpoint-type-schemas/SdkEndpointTypeSchemasContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-endpoint-type-schemas/SdkEndpointTypeSchemasContext.ts @@ -1,5 +1,7 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { PackageId, Reference } from "@fern-typescript/commons"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkEndpointTypeSchemas } from "./GeneratedSdkEndpointTypeSchemas"; export interface SdkEndpointTypeSchemasContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-error-schema/GeneratedSdkErrorSchema.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-error-schema/GeneratedSdkErrorSchema.ts index e147378f545..9a6562b0505 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-error-schema/GeneratedSdkErrorSchema.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-error-schema/GeneratedSdkErrorSchema.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { SdkContext } from "../SdkContext"; diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-error-schema/SdkErrorSchemaContext.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-error-schema/SdkErrorSchemaContext.ts index 6f961d19902..ab6a14c9e03 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-error-schema/SdkErrorSchemaContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-error-schema/SdkErrorSchemaContext.ts @@ -1,5 +1,7 @@ -import { DeclaredErrorName } from "@fern-fern/ir-sdk/api"; import { Reference, Zurg } from "@fern-typescript/commons"; + +import { DeclaredErrorName } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkErrorSchema } from "./GeneratedSdkErrorSchema"; export interface SdkErrorSchemaContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-error/GeneratedSdkError.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-error/GeneratedSdkError.ts index 6e7c3e27c13..0c0d5944cea 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-error/GeneratedSdkError.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-error/GeneratedSdkError.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { SdkContext } from "../SdkContext"; diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-error/SdkErrorContext.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-error/SdkErrorContext.ts index d8383543be4..6f2b3d1084b 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-error/SdkErrorContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-error/SdkErrorContext.ts @@ -1,5 +1,7 @@ -import { DeclaredErrorName, ErrorDeclaration } from "@fern-fern/ir-sdk/api"; import { Reference } from "@fern-typescript/commons"; + +import { DeclaredErrorName, ErrorDeclaration } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkError } from "./GeneratedSdkError"; export interface SdkErrorContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-inlined-request-body-schema/GeneratedSdkInlinedRequestBodySchema.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-inlined-request-body-schema/GeneratedSdkInlinedRequestBodySchema.ts index 5e94e53258b..d1623e2b57c 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-inlined-request-body-schema/GeneratedSdkInlinedRequestBodySchema.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-inlined-request-body-schema/GeneratedSdkInlinedRequestBodySchema.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { SdkContext } from "../SdkContext"; diff --git a/generators/typescript/utils/contexts/src/sdk-context/sdk-inlined-request-body-schema/SdkInlinedRequestBodySchemaContext.ts b/generators/typescript/utils/contexts/src/sdk-context/sdk-inlined-request-body-schema/SdkInlinedRequestBodySchemaContext.ts index 22e72415520..584af485f1d 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/sdk-inlined-request-body-schema/SdkInlinedRequestBodySchemaContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/sdk-inlined-request-body-schema/SdkInlinedRequestBodySchemaContext.ts @@ -1,5 +1,7 @@ -import { Name } from "@fern-fern/ir-sdk/api"; import { PackageId, Reference } from "@fern-typescript/commons"; + +import { Name } from "@fern-fern/ir-sdk/api"; + import { GeneratedSdkInlinedRequestBodySchema } from "./GeneratedSdkInlinedRequestBodySchema"; export interface SdkInlinedRequestBodySchemaContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/timeout-sdk-error/GeneratedTimeoutSdkError.ts b/generators/typescript/utils/contexts/src/sdk-context/timeout-sdk-error/GeneratedTimeoutSdkError.ts index 12c17ea448e..ee1cc0ba825 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/timeout-sdk-error/GeneratedTimeoutSdkError.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/timeout-sdk-error/GeneratedTimeoutSdkError.ts @@ -1,4 +1,5 @@ import { ts } from "ts-morph"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { SdkContext } from "../SdkContext"; diff --git a/generators/typescript/utils/contexts/src/sdk-context/timeout-sdk-error/TimeoutSdkErrorContext.ts b/generators/typescript/utils/contexts/src/sdk-context/timeout-sdk-error/TimeoutSdkErrorContext.ts index 9581394cd56..b1edae95d15 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/timeout-sdk-error/TimeoutSdkErrorContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/timeout-sdk-error/TimeoutSdkErrorContext.ts @@ -1,4 +1,5 @@ import { Reference } from "@fern-typescript/commons"; + import { GeneratedTimeoutSdkError } from "./GeneratedTimeoutSdkError"; export interface TimeoutSdkErrorContext { diff --git a/generators/typescript/utils/contexts/src/sdk-context/version/GeneratedVersion.ts b/generators/typescript/utils/contexts/src/sdk-context/version/GeneratedVersion.ts index bccfbc5058d..b9f961a1f80 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/version/GeneratedVersion.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/version/GeneratedVersion.ts @@ -1,4 +1,5 @@ import { HttpHeader } from "@fern-fern/ir-sdk/api"; + import { GeneratedFile } from "../../commons/GeneratedFile"; import { SdkContext } from "../SdkContext"; diff --git a/generators/typescript/utils/contexts/src/sdk-context/version/VersionContext.ts b/generators/typescript/utils/contexts/src/sdk-context/version/VersionContext.ts index c312ff25a85..e28d221387b 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/version/VersionContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/version/VersionContext.ts @@ -1,4 +1,5 @@ import { Reference } from "@fern-typescript/commons"; + import { GeneratedVersion } from "./GeneratedVersion"; export interface VersionContext { diff --git a/generators/typescript/utils/core-utilities/auth/package.json b/generators/typescript/utils/core-utilities/auth/package.json index 72a56002cb2..17192c4a82c 100644 --- a/generators/typescript/utils/core-utilities/auth/package.json +++ b/generators/typescript/utils/core-utilities/auth/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": { @@ -37,8 +36,8 @@ "eslint": "^9.16.0", "jest": "^29.7.0", "ts-jest": "^29.2.4", - "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" } } \ No newline at end of file diff --git a/generators/typescript/utils/core-utilities/base/package.json b/generators/typescript/utils/core-utilities/base/package.json index a90f46dc99e..9eb2491898a 100644 --- a/generators/typescript/utils/core-utilities/base/package.json +++ b/generators/typescript/utils/core-utilities/base/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" }, "devDependencies": { @@ -33,8 +32,8 @@ "eslint": "^9.16.0", "jest": "^29.7.0", "ts-jest": "^29.2.4", - "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" } } \ No newline at end of file diff --git a/generators/typescript/utils/core-utilities/callback-queue/package.json b/generators/typescript/utils/core-utilities/callback-queue/package.json index 283abc3ea4f..c1339ee72be 100644 --- a/generators/typescript/utils/core-utilities/callback-queue/package.json +++ b/generators/typescript/utils/core-utilities/callback-queue/package.json @@ -22,7 +22,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" }, "devDependencies": { @@ -31,8 +30,8 @@ "depcheck": "^1.4.7", "eslint": "^9.16.0", "jest": "^29.7.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" } } \ No newline at end of file diff --git a/generators/typescript/utils/core-utilities/fetcher/package.json b/generators/typescript/utils/core-utilities/fetcher/package.json index 5ff6d80f174..9fe4800fdd8 100644 --- a/generators/typescript/utils/core-utilities/fetcher/package.json +++ b/generators/typescript/utils/core-utilities/fetcher/package.json @@ -22,7 +22,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": { @@ -47,8 +46,8 @@ "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "multer": "^1.4.5-lts.1", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "ts-jest": "^29.2.4", "ts-loader": "^9.3.1", "typescript": "5.7.2", diff --git a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/__test__/Fetcher.test.ts b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/__test__/Fetcher.test.ts index 58de46dfe30..b4c8f2e7fcc 100644 --- a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/__test__/Fetcher.test.ts +++ b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/__test__/Fetcher.test.ts @@ -1,7 +1,8 @@ import fs from "fs"; -import { Fetcher, fetcherImpl } from "../Fetcher"; import { join } from "path"; +import { Fetcher, fetcherImpl } from "../Fetcher"; + describe("Test fetcherImpl", () => { it("should handle successful request", async () => { const mockArgs: Fetcher.Args = { diff --git a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/__test__/stream-wrappers/chooseStreamWrapper.test.ts b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/__test__/stream-wrappers/chooseStreamWrapper.test.ts index 75c831f720d..932ba3510de 100644 --- a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/__test__/stream-wrappers/chooseStreamWrapper.test.ts +++ b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/__test__/stream-wrappers/chooseStreamWrapper.test.ts @@ -1,8 +1,8 @@ import { RUNTIME } from "../../../runtime"; -import { chooseStreamWrapper } from "../../stream-wrappers/chooseStreamWrapper"; import { Node18UniversalStreamWrapper } from "../../stream-wrappers/Node18UniversalStreamWrapper"; import { NodePre18StreamWrapper } from "../../stream-wrappers/NodePre18StreamWrapper"; import { UndiciStreamWrapper } from "../../stream-wrappers/UndiciStreamWrapper"; +import { chooseStreamWrapper } from "../../stream-wrappers/chooseStreamWrapper"; describe("chooseStreamWrapper", () => { beforeEach(() => { diff --git a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/signals.ts b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/signals.ts index 779ef209515..9dd2047ee5c 100644 --- a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/signals.ts +++ b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/signals.ts @@ -15,7 +15,7 @@ export function getTimeoutSignal(timeoutMs: number): { signal: AbortSignal; abor export function anySignal(...args: AbortSignal[] | [AbortSignal[]]): AbortSignal { // Allowing signals to be passed either as array // of signals or as multiple arguments. - const signals = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args); + const signals = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args) as AbortSignal[]; const controller = new AbortController(); diff --git a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/Node18UniversalStreamWrapper.ts b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/Node18UniversalStreamWrapper.ts index 215e8f051ad..ebff83c4002 100644 --- a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/Node18UniversalStreamWrapper.ts +++ b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/Node18UniversalStreamWrapper.ts @@ -1,4 +1,5 @@ import type { Writable } from "readable-stream"; + import { EventCallback, StreamWrapper } from "./chooseStreamWrapper"; export class Node18UniversalStreamWrapper diff --git a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/NodePre18StreamWrapper.ts b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/NodePre18StreamWrapper.ts index 87fdd89611f..98b075b9c8d 100644 --- a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/NodePre18StreamWrapper.ts +++ b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/NodePre18StreamWrapper.ts @@ -1,4 +1,5 @@ import type { Readable, Writable } from "readable-stream"; + import { EventCallback, StreamWrapper } from "./chooseStreamWrapper"; export class NodePre18StreamWrapper implements StreamWrapper { diff --git a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/chooseStreamWrapper.ts b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/chooseStreamWrapper.ts index 2abd6b2ba1c..fd6f5f49f25 100644 --- a/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/chooseStreamWrapper.ts +++ b/generators/typescript/utils/core-utilities/fetcher/src/fetcher/stream-wrappers/chooseStreamWrapper.ts @@ -1,4 +1,5 @@ import type { Readable } from "readable-stream"; + import { RUNTIME } from "../../runtime"; export type EventCallback = (data?: any) => void; diff --git a/generators/typescript/utils/core-utilities/fetcher/src/form-data-utils/__private__test__/multipart.upload.test.ts b/generators/typescript/utils/core-utilities/fetcher/src/form-data-utils/__private__test__/multipart.upload.test.ts index 8df07437fd9..6403da7ef64 100644 --- a/generators/typescript/utils/core-utilities/fetcher/src/form-data-utils/__private__test__/multipart.upload.test.ts +++ b/generators/typescript/utils/core-utilities/fetcher/src/form-data-utils/__private__test__/multipart.upload.test.ts @@ -3,6 +3,7 @@ import express from "express"; import fs from "fs"; import { Server } from "http"; import multer from "multer"; + import { newFormData } from "../.."; import { getFetchFn } from "../../fetcher/getFetchFn"; import { RUNTIME } from "../../runtime"; diff --git a/generators/typescript/utils/core-utilities/fetcher/src/stream/Stream.ts b/generators/typescript/utils/core-utilities/fetcher/src/stream/Stream.ts index 7b97197531d..6f21f655373 100644 --- a/generators/typescript/utils/core-utilities/fetcher/src/stream/Stream.ts +++ b/generators/typescript/utils/core-utilities/fetcher/src/stream/Stream.ts @@ -1,4 +1,5 @@ import { Readable } from "stream"; + import { RUNTIME } from "../runtime"; export declare namespace Stream { diff --git a/generators/typescript/utils/core-utilities/utils/package.json b/generators/typescript/utils/core-utilities/utils/package.json index 114312ff0cc..eb6fc859581 100644 --- a/generators/typescript/utils/core-utilities/utils/package.json +++ b/generators/typescript/utils/core-utilities/utils/package.json @@ -22,7 +22,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" }, "devDependencies": { @@ -32,8 +31,8 @@ "eslint": "^9.16.0", "jest": "^29.7.0", "ts-jest": "^29.2.4", - "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" } } \ No newline at end of file diff --git a/generators/typescript/utils/core-utilities/zurg/package.json b/generators/typescript/utils/core-utilities/zurg/package.json index 0e2c61da8c3..e211b1adae4 100644 --- a/generators/typescript/utils/core-utilities/zurg/package.json +++ b/generators/typescript/utils/core-utilities/zurg/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" }, "devDependencies": { @@ -35,8 +34,8 @@ "eslint": "^9.16.0", "jest": "^29.7.0", "ts-jest": "^29.2.4", - "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" } } \ No newline at end of file diff --git a/generators/typescript/utils/core-utilities/zurg/src/Schema.ts b/generators/typescript/utils/core-utilities/zurg/src/Schema.ts index 5ec252fc953..bed20dff021 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/Schema.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/Schema.ts @@ -30,7 +30,7 @@ export const SchemaType = { UNDISCRIMINATED_UNION: "undiscriminatedUnion", OPTIONAL: "optional" } as const; -export type SchemaType = typeof SchemaType[keyof typeof SchemaType]; +export type SchemaType = (typeof SchemaType)[keyof typeof SchemaType]; export type MaybeValid = Valid | Invalid; diff --git a/generators/typescript/utils/core-utilities/zurg/src/__test__/skipValidation.test.ts b/generators/typescript/utils/core-utilities/zurg/src/__test__/skipValidation.test.ts index a590e72dbba..062c5bc3bbd 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/__test__/skipValidation.test.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/__test__/skipValidation.test.ts @@ -1,5 +1,4 @@ /* eslint-disable no-console */ - import { boolean, number, object, property, string, undiscriminatedUnion } from "../builders"; describe("skipValidation", () => { diff --git a/generators/typescript/utils/core-utilities/zurg/src/builders/lazy/lazyObject.ts b/generators/typescript/utils/core-utilities/zurg/src/builders/lazy/lazyObject.ts index 6f10ed2a290..3c3aa53c6c4 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/builders/lazy/lazyObject.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/builders/lazy/lazyObject.ts @@ -2,7 +2,7 @@ import { getObjectUtils } from "../object"; import { getObjectLikeUtils } from "../object-like"; import { BaseObjectSchema, ObjectSchema } from "../object/types"; import { getSchemaUtils } from "../schema-utils"; -import { constructLazyBaseSchema, getMemoizedSchema, SchemaGetter } from "./lazy"; +import { SchemaGetter, constructLazyBaseSchema, getMemoizedSchema } from "./lazy"; export function lazyObject(getter: SchemaGetter>): ObjectSchema { const baseSchema: BaseObjectSchema = { diff --git a/generators/typescript/utils/core-utilities/zurg/src/builders/object/object.ts b/generators/typescript/utils/core-utilities/zurg/src/builders/object/object.ts index 2934c7ca029..e663c422954 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/builders/object/object.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/builders/object/object.ts @@ -11,12 +11,12 @@ import { getSchemaUtils } from "../schema-utils"; import { isProperty } from "./property"; import { BaseObjectSchema, - inferObjectSchemaFromPropertySchemas, - inferParsedObjectFromPropertySchemas, - inferRawObjectFromPropertySchemas, ObjectSchema, ObjectUtils, - PropertySchemas + PropertySchemas, + inferObjectSchemaFromPropertySchemas, + inferParsedObjectFromPropertySchemas, + inferRawObjectFromPropertySchemas } from "./types"; interface ObjectPropertyWithRawKey { diff --git a/generators/typescript/utils/core-utilities/zurg/src/builders/object/objectWithoutOptionalProperties.ts b/generators/typescript/utils/core-utilities/zurg/src/builders/object/objectWithoutOptionalProperties.ts index a0951f48efc..468c8a4ebd1 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/builders/object/objectWithoutOptionalProperties.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/builders/object/objectWithoutOptionalProperties.ts @@ -1,5 +1,5 @@ import { object } from "./object"; -import { inferParsedPropertySchema, inferRawObjectFromPropertySchemas, ObjectSchema, PropertySchemas } from "./types"; +import { ObjectSchema, PropertySchemas, inferParsedPropertySchema, inferRawObjectFromPropertySchemas } from "./types"; export function objectWithoutOptionalProperties>( schemas: T diff --git a/generators/typescript/utils/core-utilities/zurg/src/builders/object/types.ts b/generators/typescript/utils/core-utilities/zurg/src/builders/object/types.ts index 9f87cbb787b..257b3e768f3 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/builders/object/types.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/builders/object/types.ts @@ -1,4 +1,4 @@ -import { BaseSchema, inferParsed, inferRaw, Schema } from "../../Schema"; +import { BaseSchema, Schema, inferParsed, inferRaw } from "../../Schema"; import { addQuestionMarksToNullableProperties } from "../../utils/addQuestionMarksToNullableProperties"; import { ObjectLikeUtils } from "../object-like"; import { SchemaUtils } from "../schema-utils"; @@ -23,9 +23,8 @@ export interface ObjectUtils { export type inferRawObject> = O extends ObjectSchema ? Raw : never; -export type inferParsedObject> = O extends ObjectSchema - ? Parsed - : never; +export type inferParsedObject> = + O extends ObjectSchema ? Parsed : never; export type inferObjectSchemaFromPropertySchemas> = ObjectSchema< inferRawObjectFromPropertySchemas, @@ -47,25 +46,11 @@ export type PropertySchemas = Recor Property | Schema >; -export type inferRawPropertySchema

| Schema> = P extends Property< - any, - infer Raw, - any -> - ? Raw - : P extends Schema - ? inferRaw

- : never; +export type inferRawPropertySchema

| Schema> = + P extends Property ? Raw : P extends Schema ? inferRaw

: never; -export type inferParsedPropertySchema

| Schema> = P extends Property< - any, - any, - infer Parsed -> - ? Parsed - : P extends Schema - ? inferParsed

- : never; +export type inferParsedPropertySchema

| Schema> = + P extends Property ? Parsed : P extends Schema ? inferParsed

: never; export type inferRawKey< ParsedKey extends string | number | symbol, diff --git a/generators/typescript/utils/core-utilities/zurg/src/builders/undiscriminated-union/types.ts b/generators/typescript/utils/core-utilities/zurg/src/builders/undiscriminated-union/types.ts index 43e7108a060..4f0888aaf52 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/builders/undiscriminated-union/types.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/builders/undiscriminated-union/types.ts @@ -1,4 +1,4 @@ -import { inferParsed, inferRaw, Schema } from "../../Schema"; +import { Schema, inferParsed, inferRaw } from "../../Schema"; export type UndiscriminatedUnionSchema = Schema< inferRawUnidiscriminatedUnionSchema, diff --git a/generators/typescript/utils/core-utilities/zurg/src/builders/union/types.ts b/generators/typescript/utils/core-utilities/zurg/src/builders/union/types.ts index 6f82c868b2d..7ac9d16d622 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/builders/union/types.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/builders/union/types.ts @@ -1,4 +1,4 @@ -import { inferParsedObject, inferRawObject, ObjectSchema } from "../object"; +import { ObjectSchema, inferParsedObject, inferRawObject } from "../object"; import { Discriminant } from "./discriminant"; export type UnionSubtypes = { @@ -16,11 +16,11 @@ export type inferParsedUnion, U extend export type inferRawDiscriminant> = D extends string ? D : D extends Discriminant - ? Raw - : never; + ? Raw + : never; export type inferParsedDiscriminant> = D extends string ? D : D extends Discriminant - ? Parsed - : never; + ? Parsed + : never; diff --git a/generators/typescript/utils/core-utilities/zurg/src/builders/union/union.ts b/generators/typescript/utils/core-utilities/zurg/src/builders/union/union.ts index 81521da1599..36b1bf7c1d9 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/builders/union/union.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/builders/union/union.ts @@ -5,10 +5,10 @@ import { keys } from "../../utils/keys"; import { maybeSkipValidation } from "../../utils/maybeSkipValidation"; import { enum_ } from "../enum"; import { ObjectSchema } from "../object"; -import { getObjectLikeUtils, ObjectLikeSchema } from "../object-like"; +import { ObjectLikeSchema, getObjectLikeUtils } from "../object-like"; import { getSchemaUtils } from "../schema-utils"; import { Discriminant } from "./discriminant"; -import { inferParsedDiscriminant, inferParsedUnion, inferRawDiscriminant, inferRawUnion, UnionSubtypes } from "./types"; +import { UnionSubtypes, inferParsedDiscriminant, inferParsedUnion, inferRawDiscriminant, inferRawUnion } from "./types"; export function union, U extends UnionSubtypes>( discriminant: D, diff --git a/generators/typescript/utils/core-utilities/zurg/src/utils/addQuestionMarksToNullableProperties.ts b/generators/typescript/utils/core-utilities/zurg/src/utils/addQuestionMarksToNullableProperties.ts index 4111d703cd0..5319cd2e281 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/utils/addQuestionMarksToNullableProperties.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/utils/addQuestionMarksToNullableProperties.ts @@ -6,10 +6,10 @@ export type OptionalKeys = { [K in keyof T]-?: undefined extends T[K] ? K : null extends T[K] - ? K - : 1 extends (any extends T[K] ? 0 : 1) - ? never - : K; + ? K + : 1 extends (any extends T[K] ? 0 : 1) + ? never + : K; }[keyof T]; export type RequiredKeys = Exclude>; diff --git a/generators/typescript/utils/core-utilities/zurg/src/utils/createIdentitySchemaCreator.ts b/generators/typescript/utils/core-utilities/zurg/src/utils/createIdentitySchemaCreator.ts index a98fb8f6d9b..1bfb66715ed 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/utils/createIdentitySchemaCreator.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/utils/createIdentitySchemaCreator.ts @@ -1,5 +1,5 @@ -import { getSchemaUtils } from "../builders/schema-utils"; import { BaseSchema, MaybeValid, Schema, SchemaOptions, SchemaType } from "../Schema"; +import { getSchemaUtils } from "../builders/schema-utils"; import { maybeSkipValidation } from "./maybeSkipValidation"; export function createIdentitySchemaCreator( diff --git a/generators/typescript/utils/core-utilities/zurg/src/utils/filterObject.ts b/generators/typescript/utils/core-utilities/zurg/src/utils/filterObject.ts index 571ef94fd04..8b171987c42 100644 --- a/generators/typescript/utils/core-utilities/zurg/src/utils/filterObject.ts +++ b/generators/typescript/utils/core-utilities/zurg/src/utils/filterObject.ts @@ -1,10 +1,13 @@ export function filterObject(obj: T, keysToInclude: K[]): Pick { const keysToIncludeSet = new Set(keysToInclude); - return Object.entries(obj).reduce((acc, [key, value]) => { - if (keysToIncludeSet.has(key as K)) { - acc[key as K] = value as T[K]; - } - return acc; - // eslint-disable-next-line @typescript-eslint/prefer-reduce-type-parameter - }, {} as Pick); + return Object.entries(obj).reduce( + (acc, [key, value]) => { + if (keysToIncludeSet.has(key as K)) { + acc[key as K] = value as T[K]; + } + return acc; + // eslint-disable-next-line @typescript-eslint/prefer-reduce-type-parameter + }, + {} as Pick + ); } diff --git a/generators/typescript/utils/resolvers/package.json b/generators/typescript/utils/resolvers/package.json index 1556049d299..1dfc64009c6 100644 --- a/generators/typescript/utils/resolvers/package.json +++ b/generators/typescript/utils/resolvers/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": { @@ -36,8 +35,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" } } \ No newline at end of file diff --git a/generators/typescript/utils/resolvers/src/PackageResolver.ts b/generators/typescript/utils/resolvers/src/PackageResolver.ts index af3f8e6a02a..cbd9cae728d 100644 --- a/generators/typescript/utils/resolvers/src/PackageResolver.ts +++ b/generators/typescript/utils/resolvers/src/PackageResolver.ts @@ -1,6 +1,7 @@ -import { HttpService, IntermediateRepresentation, Package, Subpackage, SubpackageId } from "@fern-fern/ir-sdk/api"; import { PackageId } from "@fern-typescript/commons"; +import { HttpService, IntermediateRepresentation, Package, Subpackage, SubpackageId } from "@fern-fern/ir-sdk/api"; + export class PackageResolver { constructor(private readonly intermediateRepresentation: IntermediateRepresentation) {} diff --git a/jest.config.ts b/jest.config.ts index 4c2fc452545..1fb331e5e12 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,4 +1,5 @@ import { Config } from "jest"; + import defaultConfig from "./shared/jest.config.shared"; export default async (): Promise => { diff --git a/package.json b/package.json index 106a6f32333..91e2e65ca86 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ "lint:staged": "lint-staged", "lint:style": "stylelint 'packages/**/src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "turbo organize-imports", "format": "prettier --write --ignore-unknown --ignore-path ./shared/.prettierignore \"**\"", "format:fix": "pnpm format --ignore-path ./shared/.prettierignore \"**\"", "format:check": "prettier --check --ignore-unknown --ignore-path ./shared/.prettierignore \"**\"", @@ -86,8 +85,8 @@ "jsonc-parser": "~3.3.1", "lint-staged": "^13.3.0", "lodash-es": "^4.17.21", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "react": "^18.2.0", "stylelint": "^14.11.0", "stylelint-config-prettier-scss": "^0.0.1", diff --git a/packages/cli/api-importers/commons/package.json b/packages/cli/api-importers/commons/package.json index b8e0ab6285c..16b4ccf8dc0 100644 --- a/packages/cli/api-importers/commons/package.json +++ b/packages/cli/api-importers/commons/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": { @@ -37,8 +36,8 @@ "devDependencies": { "@types/lodash-es": "^4.17.12", "depcheck": "^1.4.7", - "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.1.8" } diff --git a/packages/cli/api-importers/commons/src/FernDefinitionBuilder.ts b/packages/cli/api-importers/commons/src/FernDefinitionBuilder.ts index 600bcdea02d..25aacaf597c 100644 --- a/packages/cli/api-importers/commons/src/FernDefinitionBuilder.ts +++ b/packages/cli/api-importers/commons/src/FernDefinitionBuilder.ts @@ -1,7 +1,9 @@ +import { camelCase, isEqual } from "lodash-es"; + import { FERN_PACKAGE_MARKER_FILENAME, ROOT_API_FILENAME } from "@fern-api/configuration"; -import { AbsoluteFilePath, basename, dirname, join, relative, RelativeFilePath } from "@fern-api/path-utils"; import { RawSchemas, RootApiFileSchema, visitRawEnvironmentDeclaration } from "@fern-api/fern-definition-schema"; -import { camelCase, isEqual } from "lodash-es"; +import { AbsoluteFilePath, RelativeFilePath, basename, dirname, join, relative } from "@fern-api/path-utils"; + import { FernDefinitionDirectory } from "./utils/FernDefinitionDirectory"; export type HttpServiceInfo = Partial< diff --git a/packages/cli/api-importers/commons/src/__test__/FernDefinitionDirectory.test.ts b/packages/cli/api-importers/commons/src/__test__/FernDefinitionDirectory.test.ts index c15c26469c5..0e0615f90ff 100644 --- a/packages/cli/api-importers/commons/src/__test__/FernDefinitionDirectory.test.ts +++ b/packages/cli/api-importers/commons/src/__test__/FernDefinitionDirectory.test.ts @@ -1,5 +1,6 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; import { RelativeFilePath } from "@fern-api/path-utils"; + import { FernDefinitionDirectory } from "../utils/FernDefinitionDirectory"; interface TestCase { diff --git a/packages/cli/api-importers/commons/src/utils/FernDefinitionDirectory.ts b/packages/cli/api-importers/commons/src/utils/FernDefinitionDirectory.ts index 7dba483b24f..9dc4ac546d2 100644 --- a/packages/cli/api-importers/commons/src/utils/FernDefinitionDirectory.ts +++ b/packages/cli/api-importers/commons/src/utils/FernDefinitionDirectory.ts @@ -1,5 +1,5 @@ -import { RelativeFilePath, sep } from "@fern-api/path-utils"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath, sep } from "@fern-api/path-utils"; export class FernDefinitionDirectory { private files: Record = {}; diff --git a/packages/cli/api-importers/conjure/conjure-sdk/package.json b/packages/cli/api-importers/conjure/conjure-sdk/package.json index 437221a80f7..88ac455617f 100644 --- a/packages/cli/api-importers/conjure/conjure-sdk/package.json +++ b/packages/cli/api-importers/conjure/conjure-sdk/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", "generate": "fern generate --local" }, @@ -33,8 +32,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" } } \ No newline at end of file diff --git a/packages/cli/api-importers/conjure/conjure-to-fern-tests/__test__/conjure.test.ts b/packages/cli/api-importers/conjure/conjure-to-fern-tests/__test__/conjure.test.ts index d9eb136ab47..a53b54aec1b 100644 --- a/packages/cli/api-importers/conjure/conjure-to-fern-tests/__test__/conjure.test.ts +++ b/packages/cli/api-importers/conjure/conjure-to-fern-tests/__test__/conjure.test.ts @@ -1,4 +1,4 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createMockTaskContext } from "@fern-api/task-context"; import { loadAPIWorkspace } from "@fern-api/workspace-loader"; diff --git a/packages/cli/api-importers/conjure/conjure-to-fern-tests/package.json b/packages/cli/api-importers/conjure/conjure-to-fern-tests/package.json index 3772714257b..987bbca025a 100644 --- a/packages/cli/api-importers/conjure/conjure-to-fern-tests/package.json +++ b/packages/cli/api-importers/conjure/conjure-to-fern-tests/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": { @@ -36,8 +35,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" } diff --git a/packages/cli/api-importers/conjure/conjure-to-fern/package.json b/packages/cli/api-importers/conjure/conjure-to-fern/package.json index 12f213b05bc..d4d9b54d7c7 100644 --- a/packages/cli/api-importers/conjure/conjure-to-fern/package.json +++ b/packages/cli/api-importers/conjure/conjure-to-fern/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": { @@ -39,8 +38,8 @@ "@types/js-yaml": "^4.0.8", "@types/node": "18.15.3", "depcheck": "^1.4.7", - "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" } diff --git a/packages/cli/api-importers/conjure/conjure-to-fern/src/ConjureImporter.ts b/packages/cli/api-importers/conjure/conjure-to-fern/src/ConjureImporter.ts index 283aed15e88..d41a5516995 100644 --- a/packages/cli/api-importers/conjure/conjure-to-fern/src/ConjureImporter.ts +++ b/packages/cli/api-importers/conjure/conjure-to-fern/src/ConjureImporter.ts @@ -1,10 +1,11 @@ -import { AbsoluteFilePath, dirname, join, RelativeFilePath, relativize, getFilename } from "@fern-api/fs-utils"; import { DefinitionFile } from "@fern-api/conjure-sdk"; -import { APIDefinitionImporter, FernDefinitionBuilderImpl, HttpServiceInfo } from "@fern-api/importer-commons"; -import { visitConjureTypeDeclaration } from "./utils/visitConjureTypeDeclaration"; import { parseEndpointLocator, removeSuffix } from "@fern-api/core-utils"; -import { listConjureFiles } from "./utils/listConjureFiles"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { AbsoluteFilePath, RelativeFilePath, dirname, getFilename, join, relativize } from "@fern-api/fs-utils"; +import { APIDefinitionImporter, FernDefinitionBuilderImpl, HttpServiceInfo } from "@fern-api/importer-commons"; + +import { listConjureFiles } from "./utils/listConjureFiles"; +import { visitConjureTypeDeclaration } from "./utils/visitConjureTypeDeclaration"; export declare namespace ConjureImporter { interface Args { diff --git a/packages/cli/api-importers/conjure/conjure-to-fern/src/utils/listConjureFiles.ts b/packages/cli/api-importers/conjure/conjure-to-fern/src/utils/listConjureFiles.ts index 6e3345a6170..e2fd29268c7 100644 --- a/packages/cli/api-importers/conjure/conjure-to-fern/src/utils/listConjureFiles.ts +++ b/packages/cli/api-importers/conjure/conjure-to-fern/src/utils/listConjureFiles.ts @@ -1,8 +1,9 @@ -import { DefinitionFile, serialization } from "@fern-api/conjure-sdk"; -import { AbsoluteFilePath, listFiles, relative, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; import yaml from "js-yaml"; +import { DefinitionFile, serialization } from "@fern-api/conjure-sdk"; +import { AbsoluteFilePath, RelativeFilePath, listFiles, relative } from "@fern-api/fs-utils"; + export interface ConjureFile { fileContents: DefinitionFile; absoluteFilepath: AbsoluteFilePath; diff --git a/packages/cli/api-importers/conjure/conjure-to-fern/src/utils/visitConjureTypeDeclaration.ts b/packages/cli/api-importers/conjure/conjure-to-fern/src/utils/visitConjureTypeDeclaration.ts index 53481a7ce4c..76ba9cc5b8c 100644 --- a/packages/cli/api-importers/conjure/conjure-to-fern/src/utils/visitConjureTypeDeclaration.ts +++ b/packages/cli/api-importers/conjure/conjure-to-fern/src/utils/visitConjureTypeDeclaration.ts @@ -1,3 +1,4 @@ +import { assertNever } from "@fern-api//core-utils"; import { ConjureAliasDeclaration, ConjureEnumDeclaration, @@ -5,7 +6,6 @@ import { ConjureTypeDeclaration, ConjureUnionDeclaration } from "@fern-api/conjure-sdk"; -import { assertNever } from "@fern-api//core-utils"; export interface ConjureTypeDeclarationVisitor { alias: (value: ConjureAliasDeclaration) => R; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/package.json b/packages/cli/api-importers/openapi/openapi-ir-parser/package.json index 21b5a033df0..514cfd93a86 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/package.json +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/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": { @@ -42,8 +41,8 @@ "@types/lodash-es": "^4.17.12", "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" } diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/AsyncAPIParserContext.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/AsyncAPIParserContext.ts index 35b84d214d3..8335a5153f6 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/AsyncAPIParserContext.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/AsyncAPIParserContext.ts @@ -1,10 +1,12 @@ +import { OpenAPIV3 } from "openapi-types"; + import { Logger } from "@fern-api/logger"; import { Namespace, SdkGroup, SdkGroupName } from "@fern-api/openapi-ir"; import { TaskContext } from "@fern-api/task-context"; -import { OpenAPIV3 } from "openapi-types"; + import { ParseOpenAPIOptions } from "../options"; -import { SCHEMA_REFERENCE_PREFIX } from "../schema/convertSchemas"; import { SchemaParserContext } from "../schema/SchemaParserContext"; +import { SCHEMA_REFERENCE_PREFIX } from "../schema/convertSchemas"; import { isReferenceObject } from "../schema/utils/isReferenceObject"; import { AsyncAPIV2 } from "./v2"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/ExampleWebsocketSessionFactory.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/ExampleWebsocketSessionFactory.ts index a09d4439ff1..9d27d3d21df 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/ExampleWebsocketSessionFactory.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/ExampleWebsocketSessionFactory.ts @@ -8,6 +8,7 @@ import { WebsocketMessageExample, WebsocketSessionExample } from "@fern-api/openapi-ir"; + import { isExamplePrimitive } from "../openapi/v3/converters/ExampleEndpointFactory"; import { convertSchema } from "../schema/convertSchemas"; import { ExampleTypeFactory } from "../schema/examples/ExampleTypeFactory"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/parse.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/parse.ts index c0d769b47ab..7eb110906eb 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/parse.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/asyncapi/parse.ts @@ -1,30 +1,32 @@ +import { OpenAPIV3 } from "openapi-types"; + import { HeaderWithExample, PathParameterWithExample, PrimitiveSchemaValueWithExample, QueryParameterWithExample, SchemaId, - Schemas, SchemaWithExample, + Schemas, Source, WebsocketChannel, WebsocketSessionExample } from "@fern-api/openapi-ir"; import { TaskContext } from "@fern-api/task-context"; -import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../getExtension"; import { FernOpenAPIExtension } from "../openapi/v3/extensions/fernExtensions"; import { ParseOpenAPIOptions } from "../options"; import { convertAvailability } from "../schema/convertAvailability"; import { convertSchema } from "../schema/convertSchemas"; -import { convertUndiscriminatedOneOf, UndiscriminatedOneOfPrefix } from "../schema/convertUndiscriminatedOneOf"; +import { UndiscriminatedOneOfPrefix, convertUndiscriminatedOneOf } from "../schema/convertUndiscriminatedOneOf"; import { convertSchemaWithExampleToSchema } from "../schema/utils/convertSchemaWithExampleToSchema"; import { isReferenceObject } from "../schema/utils/isReferenceObject"; import { getSchemas } from "../utils/getSchemas"; import { AsyncAPIV2ParserContext } from "./AsyncAPIParserContext"; import { ExampleWebsocketSessionFactory } from "./ExampleWebsocketSessionFactory"; import { FernAsyncAPIExtension } from "./fernExtensions"; -import { getFernExamples, WebsocketSessionExampleExtension } from "./getFernExamples"; +import { WebsocketSessionExampleExtension, getFernExamples } from "./getFernExamples"; import { ParseAsyncAPIOptions } from "./options"; import { AsyncAPIV2 } from "./v2"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/getExtension.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/getExtension.ts index 16dac12baae..49068323526 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/getExtension.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/getExtension.ts @@ -1,6 +1,8 @@ -import { Logger } from "@fern-api/logger"; import { compact } from "lodash-es"; import { z } from "zod"; + +import { Logger } from "@fern-api/logger"; + import { OpenAPIExtension } from "./openapi/v3/extensions/extensions"; import { FernOpenAPIExtension } from "./openapi/v3/extensions/fernExtensions"; import { TypedExtensionId } from "./openapi/v3/extensions/id"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/AbstractOpenAPIV3ParserContext.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/AbstractOpenAPIV3ParserContext.ts index 8b67c262cd4..d9b4916175e 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/AbstractOpenAPIV3ParserContext.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/AbstractOpenAPIV3ParserContext.ts @@ -1,7 +1,9 @@ +import { OpenAPIV3 } from "openapi-types"; + import { Logger } from "@fern-api/logger"; import { Namespace, SchemaId, SdkGroup, SdkGroupName, Source } from "@fern-api/openapi-ir"; import { TaskContext } from "@fern-api/task-context"; -import { OpenAPIV3 } from "openapi-types"; + import { ParseOpenAPIOptions } from "../../options"; import { SchemaParserContext } from "../../schema/SchemaParserContext"; import { getReferenceOccurrences } from "../../schema/utils/getReferenceOccurrences"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/DummyOpenAPIV3ParserContext.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/DummyOpenAPIV3ParserContext.ts index 854dd399afa..535de82f6c8 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/DummyOpenAPIV3ParserContext.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/DummyOpenAPIV3ParserContext.ts @@ -1,6 +1,8 @@ +import { OpenAPIV3 } from "openapi-types"; + import { SchemaId, Source } from "@fern-api/openapi-ir"; import { TaskContext } from "@fern-api/task-context"; -import { OpenAPIV3 } from "openapi-types"; + import { ParseOpenAPIOptions } from "../../options"; import { SchemaParserContext } from "../../schema/SchemaParserContext"; import { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/OpenAPIFilter.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/OpenAPIFilter.ts index f53e7fd9d41..c10cdae82dd 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/OpenAPIFilter.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/OpenAPIFilter.ts @@ -1,8 +1,9 @@ -import { HttpMethod } from "@fern-api/openapi-ir"; -import { ParseOpenAPIOptions } from "../../options"; import { HttpEndpointReferenceParser } from "@fern-api/fern-definition-schema"; +import { HttpMethod } from "@fern-api/openapi-ir"; import { TaskContext } from "@fern-api/task-context"; +import { ParseOpenAPIOptions } from "../../options"; + export class OpenAPIFilter { public readonly endpoints: Set | undefined; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/OpenAPIV3ParserContext.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/OpenAPIV3ParserContext.ts index 22d03d1b4dc..bb34f0cf4ce 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/OpenAPIV3ParserContext.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/OpenAPIV3ParserContext.ts @@ -1,6 +1,8 @@ +import { OpenAPIV3 } from "openapi-types"; + import { SchemaId, Source } from "@fern-api/openapi-ir"; import { TaskContext } from "@fern-api/task-context"; -import { OpenAPIV3 } from "openapi-types"; + import { ParseOpenAPIOptions } from "../../options"; import { SchemaParserContext } from "../../schema/SchemaParserContext"; import { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/ExampleEndpointFactory.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/ExampleEndpointFactory.ts index 62408061be9..ac372a2b4a1 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/ExampleEndpointFactory.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/ExampleEndpointFactory.ts @@ -17,12 +17,13 @@ import { SchemaWithExample, SupportedSdkLanguage } from "@fern-api/openapi-ir"; + import { ExampleTypeFactory } from "../../../schema/examples/ExampleTypeFactory"; import { convertSchemaToSchemaWithExample } from "../../../schema/utils/convertSchemaToSchemaWithExample"; import { isSchemaRequired } from "../../../schema/utils/isSchemaRequired"; import { shouldSkipReadOnly } from "../../../utils/shouldSkipReadOnly"; -import { hasIncompleteExample } from "../hasIncompleteExample"; import { OpenAPIV3ParserContext } from "../OpenAPIV3ParserContext"; +import { hasIncompleteExample } from "../hasIncompleteExample"; export class ExampleEndpointFactory { private exampleTypeFactory: ExampleTypeFactory; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/contexts.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/contexts.ts index 9f5902cea95..2040dcc88f0 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/contexts.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/contexts.ts @@ -1,6 +1,7 @@ -import { EndpointSdkName, HttpMethod, Pagination } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; +import { EndpointSdkName, HttpMethod, Pagination } from "@fern-api/openapi-ir"; + export interface OpenAPIDocumentContext { document: OpenAPIV3.Document; } diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertPathItem.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertPathItem.ts index 812fe72a013..3259d2e86f5 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertPathItem.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertPathItem.ts @@ -1,5 +1,7 @@ -import { HttpMethod } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { HttpMethod } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../getExtension"; import { AbstractOpenAPIV3ParserContext } from "../AbstractOpenAPIV3ParserContext"; import { FernOpenAPIExtension } from "../extensions/fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertSecurityScheme.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertSecurityScheme.ts index 9fe924b0dfe..be0daf13fe7 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertSecurityScheme.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertSecurityScheme.ts @@ -1,5 +1,7 @@ -import { EnumSchema, SecurityScheme, Source } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { EnumSchema, SecurityScheme, Source } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../getExtension"; import { convertEnum } from "../../../schema/convertEnum"; import { convertSchemaWithExampleToSchema } from "../../../schema/utils/convertSchemaWithExampleToSchema"; @@ -8,9 +10,9 @@ import { OpenAPIExtension } from "../extensions/extensions"; import { FernOpenAPIExtension } from "../extensions/fernExtensions"; import { getBasicSecuritySchemeNames } from "../extensions/getBasicSecuritySchemeNames"; import { - getBasicSecuritySchemeNameAndEnvvar, HeaderSecuritySchemeNames, - SecuritySchemeNames + SecuritySchemeNames, + getBasicSecuritySchemeNameAndEnvvar } from "../extensions/getSecuritySchemeNameAndEnvvars"; export function convertSecurityScheme( diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertServer.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertServer.ts index 08585b93c70..4c3c6c586f6 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertServer.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/convertServer.ts @@ -1,5 +1,7 @@ -import { Server } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { Server } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "../extensions/fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertParameters.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertParameters.ts index eba3fb4b241..31267634215 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertParameters.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertParameters.ts @@ -1,3 +1,5 @@ +import { OpenAPIV3 } from "openapi-types"; + import { HeaderWithExample, HttpMethod, @@ -8,7 +10,7 @@ import { SchemaWithExample, Source } from "@fern-api/openapi-ir"; -import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../../getExtension"; import { convertAvailability } from "../../../../schema/convertAvailability"; import { convertSchema } from "../../../../schema/convertSchemas"; @@ -82,53 +84,53 @@ export function convertParameters({ }) ) : isRequired - ? SchemaWithExample.primitive({ - nameOverride: undefined, - generatedName, - title: undefined, - schema: PrimitiveSchemaValueWithExample.string({ - default: undefined, - pattern: undefined, - format: undefined, - minLength: undefined, - maxLength: undefined, - example: getExamplesString({ - schema: resolvedParameter, - logger: context.logger - }) - }), - description: undefined, - availability, - groupName: undefined - }) - : SchemaWithExample.optional({ - nameOverride: undefined, - generatedName, - title: undefined, - value: SchemaWithExample.primitive({ - nameOverride: undefined, - generatedName, - title: undefined, - schema: PrimitiveSchemaValueWithExample.string({ - default: undefined, - pattern: undefined, - format: undefined, - minLength: undefined, - maxLength: undefined, - example: getExamplesString({ - schema: resolvedParameter, - logger: context.logger - }) - }), - description: undefined, - availability: undefined, - groupName: undefined - }), - description: undefined, - availability, - groupName: undefined, - inline: undefined - }); + ? SchemaWithExample.primitive({ + nameOverride: undefined, + generatedName, + title: undefined, + schema: PrimitiveSchemaValueWithExample.string({ + default: undefined, + pattern: undefined, + format: undefined, + minLength: undefined, + maxLength: undefined, + example: getExamplesString({ + schema: resolvedParameter, + logger: context.logger + }) + }), + description: undefined, + availability, + groupName: undefined + }) + : SchemaWithExample.optional({ + nameOverride: undefined, + generatedName, + title: undefined, + value: SchemaWithExample.primitive({ + nameOverride: undefined, + generatedName, + title: undefined, + schema: PrimitiveSchemaValueWithExample.string({ + default: undefined, + pattern: undefined, + format: undefined, + minLength: undefined, + maxLength: undefined, + example: getExamplesString({ + schema: resolvedParameter, + logger: context.logger + }) + }), + description: undefined, + availability: undefined, + groupName: undefined + }), + description: undefined, + availability, + groupName: undefined, + inline: undefined + }); if ( resolvedParameter.in === "header" && resolvedParameter.schema != null && diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertRequest.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertRequest.ts index 6a3d3f3bcd1..f20f30b1fc5 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertRequest.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertRequest.ts @@ -1,14 +1,16 @@ +import { OpenAPIV3 } from "openapi-types"; + import { MediaType } from "@fern-api/core-utils"; import { MultipartRequestProperty, MultipartSchema, + NamedFullExample, RequestWithExample, - Source, - NamedFullExample + Source } from "@fern-api/openapi-ir"; -import { OpenAPIV3 } from "openapi-types"; + import { isAdditionalPropertiesAny } from "../../../../schema/convertAdditionalProperties"; -import { convertSchema, getSchemaIdFromReference, SCHEMA_REFERENCE_PREFIX } from "../../../../schema/convertSchemas"; +import { SCHEMA_REFERENCE_PREFIX, convertSchema, getSchemaIdFromReference } from "../../../../schema/convertSchemas"; import { isReferenceObject } from "../../../../schema/utils/isReferenceObject"; import { AbstractOpenAPIV3ParserContext } from "../../AbstractOpenAPIV3ParserContext"; import { getApplicationJsonSchemaMediaObject, getExamples } from "./getApplicationJsonSchema"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertResponse.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertResponse.ts index 2e41fa65272..baf0743ced8 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertResponse.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertResponse.ts @@ -1,6 +1,8 @@ -import { assertNever, MediaType } from "@fern-api/core-utils"; -import { FernOpenapiIr, ResponseWithExample, Source } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { MediaType, assertNever } from "@fern-api/core-utils"; +import { FernOpenapiIr, ResponseWithExample, Source } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../../getExtension"; import { convertSchema } from "../../../../schema/convertSchemas"; import { convertSchemaWithExampleToSchema } from "../../../../schema/utils/convertSchemaWithExampleToSchema"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/getApplicationJsonSchema.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/getApplicationJsonSchema.ts index 7d7a260b433..ff04fa008f1 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/getApplicationJsonSchema.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/getApplicationJsonSchema.ts @@ -1,5 +1,7 @@ -import { NamedFullExample } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { NamedFullExample } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../../getExtension"; import { isReferenceObject } from "../../../../schema/utils/isReferenceObject"; import { AbstractOpenAPIV3ParserContext } from "../../AbstractOpenAPIV3ParserContext"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/getAnyOfAsDiscriminatedUnions.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/getAnyOfAsDiscriminatedUnions.ts index f758f6f8451..d2034288a4d 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/getAnyOfAsDiscriminatedUnions.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/getAnyOfAsDiscriminatedUnions.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { isReferenceObject } from "../../../schema/utils/isReferenceObject"; import { AbstractOpenAPIV3ParserContext } from "../AbstractOpenAPIV3ParserContext"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertAsyncSyncOperation.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertAsyncSyncOperation.ts index 0701018e7fe..9dcc763c866 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertAsyncSyncOperation.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertAsyncSyncOperation.ts @@ -1,5 +1,7 @@ -import { EndpointWithExample, LiteralSchemaValue, SchemaWithExample, Source } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { EndpointWithExample, LiteralSchemaValue, SchemaWithExample, Source } from "@fern-api/openapi-ir"; + import { getGeneratedTypeName } from "../../../../schema/utils/getSchemaName"; import { isReferenceObject } from "../../../../schema/utils/isReferenceObject"; import { AbstractOpenAPIV3ParserContext } from "../../AbstractOpenAPIV3ParserContext"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertHttpOperation.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertHttpOperation.ts index c01c372bf7a..302a6d182d4 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertHttpOperation.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertHttpOperation.ts @@ -1,5 +1,7 @@ -import { EndpointWithExample, Source } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { EndpointWithExample, Source } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../../getExtension"; import { getGeneratedTypeName } from "../../../../schema/utils/getSchemaName"; import { AbstractOpenAPIV3ParserContext } from "../../AbstractOpenAPIV3ParserContext"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertOperation.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertOperation.ts index 996ed9dda72..a486191a0e3 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertOperation.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertOperation.ts @@ -1,3 +1,6 @@ +import { camelCase } from "lodash-es"; +import { OpenAPIV3 } from "openapi-types"; + import { EndpointSdkName, EndpointWithExample, @@ -5,8 +8,7 @@ import { SdkGroupName, WebhookWithExample } from "@fern-api/openapi-ir"; -import { camelCase } from "lodash-es"; -import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../../getExtension"; import { AbstractOpenAPIV3ParserContext } from "../../AbstractOpenAPIV3ParserContext"; import { FernOpenAPIExtension } from "../../extensions/fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertStreamingOperation.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertStreamingOperation.ts index 198ea241a43..56d05cc9b1f 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertStreamingOperation.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertStreamingOperation.ts @@ -1,7 +1,9 @@ -import { assertNever, MediaType } from "@fern-api/core-utils"; -import { EndpointExample, EndpointWithExample } from "@fern-api/openapi-ir"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import { OpenAPIV3 } from "openapi-types"; + +import { MediaType, assertNever } from "@fern-api/core-utils"; +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { EndpointExample, EndpointWithExample } from "@fern-api/openapi-ir"; + import { getSchemaIdFromReference } from "../../../../schema/convertSchemas"; import { isReferenceObject } from "../../../../schema/utils/isReferenceObject"; import { AbstractOpenAPIV3ParserContext } from "../../AbstractOpenAPIV3ParserContext"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertWebhookOperation.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertWebhookOperation.ts index 13968c1df3d..83fa583f1f3 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertWebhookOperation.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/converters/operation/convertWebhookOperation.ts @@ -1,4 +1,5 @@ import { NamedFullExample, Source, Webhook, WebhookExampleCall, WebhookWithExample } from "@fern-api/openapi-ir"; + import { convertToFullExample } from "../../../../schema/examples/convertToFullExample"; import { getGeneratedTypeName } from "../../../../schema/utils/getSchemaName"; import { AbstractOpenAPIV3ParserContext } from "../../AbstractOpenAPIV3ParserContext"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/fernExtensions.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/fernExtensions.ts index 145ac4ffeae..fbdca6cccbd 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/fernExtensions.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/fernExtensions.ts @@ -1,7 +1,9 @@ +import { Plugin } from "@redocly/openapi-core/lib/config"; +import { NodeType } from "@redocly/openapi-core/lib/types"; + import { Values } from "@fern-api/core-utils"; + import { TypedExtensionId } from "./id"; -import { NodeType } from "@redocly/openapi-core/lib/types"; -import { Plugin } from "@redocly/openapi-core/lib/config"; export const XFernStreaming: NodeType = { properties: { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getBasicSecuritySchemeNames.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getBasicSecuritySchemeNames.ts index 46f2bc98be4..e7891f09ece 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getBasicSecuritySchemeNames.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getBasicSecuritySchemeNames.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getExamples.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getExamples.ts index ac53194f831..cd3ce106dab 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getExamples.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getExamples.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; export function getExamples(schema: OpenAPIV3.SchemaObject | OpenAPIV3.ParameterObject): unknown[] { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getExamplesFromExtension.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getExamplesFromExtension.ts index 6bfa791538f..184175ef8d2 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getExamplesFromExtension.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getExamplesFromExtension.ts @@ -1,6 +1,8 @@ +import { OpenAPIV3 } from "openapi-types"; + import { RawSchemas } from "@fern-api/fern-definition-schema"; import { EndpointExample } from "@fern-api/openapi-ir"; -import { OpenAPIV3 } from "openapi-types"; + import { getExtension, getExtensionAndValidate } from "../../../getExtension"; import { AbstractOpenAPIV3ParserContext } from "../AbstractOpenAPIV3ParserContext"; import { OperationContext } from "../converters/contexts"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernAsyncExtension.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernAsyncExtension.ts index e7b86198f1a..aa0a07239d0 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernAsyncExtension.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernAsyncExtension.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernAvailability.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernAvailability.ts index 2d852d26a42..efed01e5de2 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernAvailability.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernAvailability.ts @@ -1,5 +1,7 @@ -import { Availability } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { Availability } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernBasePath.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernBasePath.ts index fc940bf5359..b3d85b8ef0e 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernBasePath.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernBasePath.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernEncoding.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernEncoding.ts index ca74fab470e..28fad27fae2 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernEncoding.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernEncoding.ts @@ -1,6 +1,8 @@ -import { Logger } from "@fern-api/logger"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import { OpenAPIV3 } from "openapi-types"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Logger } from "@fern-api/logger"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernEnum.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernEnum.ts index 6c3c7625ec2..b32666279dd 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernEnum.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernEnum.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernGroups.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernGroups.ts index 90e36b7e3fe..66c7dc1ce94 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernGroups.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernGroups.ts @@ -1,5 +1,6 @@ import { OpenAPIV3 } from "openapi-types"; import { z } from "zod"; + import { getExtensionAndValidate } from "../../../getExtension"; import { OpenAPIV3ParserContext } from "../OpenAPIV3ParserContext"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernResolutions.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernResolutions.ts index 050e936d82a..88e81b01c02 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernResolutions.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernResolutions.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernStreamingExtension.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernStreamingExtension.ts index 8772773aaa6..3ad25c0b40e 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernStreamingExtension.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernStreamingExtension.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernTypeExtension.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernTypeExtension.ts index 97f9f942c70..6e6dadaaab3 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernTypeExtension.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernTypeExtension.ts @@ -1,12 +1,14 @@ +import { OpenAPIV3 } from "openapi-types"; + import { assertNever } from "@fern-api/core-utils"; +import { recursivelyVisitRawTypeReference } from "@fern-api/fern-definition-schema"; import { Availability, LiteralSchemaValue, PrimitiveSchemaValueWithExample, SchemaWithExample } from "@fern-api/openapi-ir"; -import { recursivelyVisitRawTypeReference } from "@fern-api/fern-definition-schema"; -import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernVersion.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernVersion.ts index 7c3a16ba4d1..dbe443d1417 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernVersion.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getFernVersion.ts @@ -1,5 +1,7 @@ -import { RawSchemas } from "@fern-api/fern-definition-schema"; import { OpenAPIV3 } from "openapi-types"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { getExtension, getExtensionAndValidate } from "../../../getExtension"; import { OpenAPIV3ParserContext } from "../OpenAPIV3ParserContext"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getGlobalHeaders.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getGlobalHeaders.ts index 6b7ab9d6773..21373645454 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getGlobalHeaders.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getGlobalHeaders.ts @@ -1,5 +1,7 @@ -import { GlobalHeader } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { GlobalHeader } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; import { getSchemaFromFernType } from "./getFernTypeExtension"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getIdempotencyHeaders.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getIdempotencyHeaders.ts index 56ce5f8a97a..2da48d32ab9 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getIdempotencyHeaders.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getIdempotencyHeaders.ts @@ -1,5 +1,7 @@ -import { IdempotencyHeader } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { IdempotencyHeader } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; import { getSchemaFromFernType } from "./getFernTypeExtension"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getPaginationExtension.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getPaginationExtension.ts index 10b4dfe8cdd..ed616f147a6 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getPaginationExtension.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getPaginationExtension.ts @@ -1,5 +1,7 @@ -import { Pagination } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { Pagination } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getParameterName.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getParameterName.ts index 903fd09e788..8ef0546a3dd 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getParameterName.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getParameterName.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getReadmeCodeSamples.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getReadmeCodeSamples.ts index 8b2147d64de..45f79d31b72 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getReadmeCodeSamples.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getReadmeCodeSamples.ts @@ -1,7 +1,9 @@ +import { OpenAPIV3 } from "openapi-types"; + import { isPlainObject } from "@fern-api/core-utils"; -import { CustomCodeSample } from "@fern-api/openapi-ir"; import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { OpenAPIV3 } from "openapi-types"; +import { CustomCodeSample } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../getExtension"; import { ReadmeOpenAPIExtension } from "./readmeExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getSecuritySchemeNameAndEnvvars.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getSecuritySchemeNameAndEnvvars.ts index 6b0654e321c..eba7f0d1cac 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getSecuritySchemeNameAndEnvvars.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getSecuritySchemeNameAndEnvvars.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getVariableDefinitions.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getVariableDefinitions.ts index e6de1fe8d5a..5890f8908e3 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getVariableDefinitions.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getVariableDefinitions.ts @@ -1,5 +1,7 @@ -import { PrimitiveSchema, PrimitiveSchemaValue } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { PrimitiveSchema, PrimitiveSchemaValue } from "@fern-api/openapi-ir"; + import { getExtension } from "../../../getExtension"; import { getDefaultAsString } from "../../../schema/defaults/getDefault"; import { getGeneratedTypeName } from "../../../schema/utils/getSchemaName"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getVariableReference.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getVariableReference.ts index 65b024be425..ebc76a8d699 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getVariableReference.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/extensions/getVariableReference.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../../getExtension"; import { FernOpenAPIExtension } from "./fernExtensions"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/generateIr.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/generateIr.ts index c80e8302704..03b3ad2ffe4 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/generateIr.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/generateIr.ts @@ -1,3 +1,6 @@ +import { mapValues } from "lodash-es"; +import { OpenAPIV3 } from "openapi-types"; + import { assertNever, isNonNullish } from "@fern-api/core-utils"; import { Endpoint, @@ -19,21 +22,23 @@ import { WebhookWithExample } from "@fern-api/openapi-ir"; import { TaskContext } from "@fern-api/task-context"; -import { mapValues } from "lodash-es"; -import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../getExtension"; import { ParseOpenAPIOptions } from "../../options"; import { convertSchema } from "../../schema/convertSchemas"; +import { ExampleTypeFactory } from "../../schema/examples/ExampleTypeFactory"; import { convertToFullExample } from "../../schema/examples/convertToFullExample"; import { convertSchemaWithExampleToSchema } from "../../schema/utils/convertSchemaWithExampleToSchema"; import { getGeneratedTypeName } from "../../schema/utils/getSchemaName"; import { isReferenceObject } from "../../schema/utils/isReferenceObject"; +import { getSchemas } from "../../utils/getSchemas"; import { AbstractOpenAPIV3ParserContext } from "./AbstractOpenAPIV3ParserContext"; +import { OpenAPIV3ParserContext } from "./OpenAPIV3ParserContext"; +import { ExampleEndpointFactory } from "./converters/ExampleEndpointFactory"; import { convertPathItem, convertPathItemToWebhooks } from "./converters/convertPathItem"; import { convertSecurityScheme } from "./converters/convertSecurityScheme"; import { convertServer } from "./converters/convertServer"; import { ERROR_NAMES } from "./converters/convertToHttpError"; -import { ExampleEndpointFactory } from "./converters/ExampleEndpointFactory"; import { ConvertedOperation } from "./converters/operation/convertOperation"; import { FernOpenAPIExtension } from "./extensions/fernExtensions"; import { getFernBasePath } from "./extensions/getFernBasePath"; @@ -44,10 +49,7 @@ import { getIdempotencyHeaders } from "./extensions/getIdempotencyHeaders"; import { getVariableDefinitions } from "./extensions/getVariableDefinitions"; import { getWebhooksPathsObject } from "./getWebhookPathsObject"; import { hasIncompleteExample } from "./hasIncompleteExample"; -import { OpenAPIV3ParserContext } from "./OpenAPIV3ParserContext"; import { runResolutions } from "./runResolutions"; -import { getSchemas } from "../../utils/getSchemas"; -import { ExampleTypeFactory } from "../../schema/examples/ExampleTypeFactory"; export function generateIr({ openApi, diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/getWebhookPathsObject.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/getWebhookPathsObject.ts index e05c4699085..cd243f23e24 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/getWebhookPathsObject.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/getWebhookPathsObject.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../../getExtension"; // The standard webhooks syntax introduced in OpenAPI v3.1.0. diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/hasIncompleteExample.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/hasIncompleteExample.ts index 0bdb0bb3dd2..7807d997c5f 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/hasIncompleteExample.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/hasIncompleteExample.ts @@ -1,5 +1,5 @@ -import { EndpointExample } from "@fern-api/openapi-ir"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { EndpointExample } from "@fern-api/openapi-ir"; // this means the example only includes code samples and should be autogenerated export function hasIncompleteExample(example: EndpointExample): boolean { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/runResolutions.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/runResolutions.ts index 73de0df32dd..ba953fc880b 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/runResolutions.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/openapi/v3/runResolutions.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { getFernResolutions } from "./extensions/getFernResolutions"; export function runResolutions({ openapi }: { openapi: OpenAPIV3.Document }): OpenAPIV3.Document { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/parse.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/parse.ts index 52814a47357..926243c6762 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/parse.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/parse.ts @@ -1,12 +1,14 @@ +import { OpenAPIV3 } from "openapi-types"; + import { assertNever } from "@fern-api/core-utils"; -import { OpenApiIntermediateRepresentation, Schemas, Source as OpenApiIrSource } from "@fern-api/openapi-ir"; +import { OpenApiIntermediateRepresentation, Source as OpenApiIrSource, Schemas } from "@fern-api/openapi-ir"; import { TaskContext } from "@fern-api/task-context"; -import { OpenAPIV3 } from "openapi-types"; + import { DEFAULT_PARSE_ASYNCAPI_SETTINGS, ParseAsyncAPIOptions } from "./asyncapi/options"; import { parseAsyncAPI } from "./asyncapi/parse"; import { AsyncAPIV2 } from "./asyncapi/v2"; import { generateIr as generateIrFromV3 } from "./openapi/v3/generateIr"; -import { getParseOptions, ParseOpenAPIOptions } from "./options"; +import { ParseOpenAPIOptions, getParseOptions } from "./options"; export type Document = OpenAPIDocument | AsyncAPIDocument; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/SchemaParserContext.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/SchemaParserContext.ts index 8ba13001360..5a5a5f542b3 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/SchemaParserContext.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/SchemaParserContext.ts @@ -1,6 +1,8 @@ +import { OpenAPIV3 } from "openapi-types"; + import { Logger } from "@fern-api/logger"; import { SchemaId, SdkGroupName } from "@fern-api/openapi-ir"; -import { OpenAPIV3 } from "openapi-types"; + import { ParseOpenAPIOptions } from "../options"; export interface SchemaParserContext { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertAdditionalProperties.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertAdditionalProperties.ts index c2da91f6167..5fda18da519 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertAdditionalProperties.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertAdditionalProperties.ts @@ -1,3 +1,5 @@ +import { OpenAPIV3 } from "openapi-types"; + import { assertNever } from "@fern-api/core-utils"; import { Availability, @@ -8,9 +10,9 @@ import { SdkGroupName, Source } from "@fern-api/openapi-ir"; -import { OpenAPIV3 } from "openapi-types"; -import { convertSchema } from "./convertSchemas"; + import { SchemaParserContext } from "./SchemaParserContext"; +import { convertSchema } from "./convertSchemas"; import { isReferenceObject } from "./utils/isReferenceObject"; export function convertAdditionalProperties({ diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertArray.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertArray.ts index 3e5acaf1f82..5795fa0ccd5 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertArray.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertArray.ts @@ -1,7 +1,9 @@ -import { Availability, SchemaWithExample, SdkGroupName, Source } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; -import { convertSchema } from "./convertSchemas"; + +import { Availability, SchemaWithExample, SdkGroupName, Source } from "@fern-api/openapi-ir"; + import { SchemaParserContext } from "./SchemaParserContext"; +import { convertSchema } from "./convertSchemas"; export function convertArray({ nameOverride, diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertAvailability.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertAvailability.ts index ed3e45b4b6c..1e340788672 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertAvailability.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertAvailability.ts @@ -1,5 +1,7 @@ -import { Availability } from "@fern-api/openapi-ir"; import { OpenAPIV3 } from "openapi-types"; + +import { Availability } from "@fern-api/openapi-ir"; + import { getExtension } from "../getExtension"; import { FernOpenAPIExtension } from "../openapi/v3/extensions/fernExtensions"; import { isReferenceObject } from "./utils/isReferenceObject"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertDiscriminatedOneOf.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertDiscriminatedOneOf.ts index c1606ce6d33..b0e1cba06e0 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertDiscriminatedOneOf.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertDiscriminatedOneOf.ts @@ -1,3 +1,5 @@ +import { OpenAPIV3 } from "openapi-types"; + import { Availability, CommonPropertyWithExample, @@ -7,9 +9,9 @@ import { SdkGroupName, Source } from "@fern-api/openapi-ir"; -import { OpenAPIV3 } from "openapi-types"; -import { convertReferenceObject, convertSchema, convertSchemaObject } from "./convertSchemas"; + import { SchemaParserContext } from "./SchemaParserContext"; +import { convertReferenceObject, convertSchema, convertSchemaObject } from "./convertSchemas"; import { isReferenceObject } from "./utils/isReferenceObject"; export function convertDiscriminatedOneOf({ diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertEncoding.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertEncoding.ts index 970a1b59181..a2426883b7b 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertEncoding.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertEncoding.ts @@ -1,5 +1,5 @@ -import { Encoding } from "@fern-api/openapi-ir"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Encoding } from "@fern-api/openapi-ir"; export function convertEncoding(encodingSchema: RawSchemas.EncodingSchema): Encoding | undefined { if (encodingSchema.proto != null) { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertEnum.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertEnum.ts index 2127a32d556..7ae1a280f61 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertEnum.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertEnum.ts @@ -1,14 +1,15 @@ import { Availability, EnumValue, - generateEnumNameFromValue, SchemaWithExample, SdkGroupName, - Source + Source, + generateEnumNameFromValue } from "@fern-api/openapi-ir"; +import { VALID_ENUM_NAME_REGEX } from "@fern-api/openapi-ir"; + import { FernEnumConfig } from "../openapi/v3/extensions/getFernEnum"; import { SchemaParserContext } from "./SchemaParserContext"; -import { VALID_ENUM_NAME_REGEX } from "@fern-api/openapi-ir"; export function convertEnum({ nameOverride, diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertInteger.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertInteger.ts index 6b97c5afdee..f90d5c60dfc 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertInteger.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertInteger.ts @@ -1,4 +1,5 @@ import { Availability, PrimitiveSchemaValueWithExample, SchemaWithExample, SdkGroupName } from "@fern-api/openapi-ir"; + import { wrapPrimitive } from "./convertSchemas"; export function convertInteger({ diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertNumber.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertNumber.ts index 7cec8ed6018..6226b94b281 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertNumber.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertNumber.ts @@ -1,4 +1,5 @@ import { Availability, PrimitiveSchemaValueWithExample, SchemaWithExample, SdkGroupName } from "@fern-api/openapi-ir"; + import { wrapPrimitive } from "./convertSchemas"; export function convertNumber({ diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertObject.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertObject.ts index aaabbcb1280..56659c01e79 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertObject.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertObject.ts @@ -1,3 +1,5 @@ +import { OpenAPIV3 } from "openapi-types"; + import { AllOfPropertyConflict, Availability, @@ -11,13 +13,13 @@ import { SdkGroupName, Source } from "@fern-api/openapi-ir"; -import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../getExtension"; import { FernOpenAPIExtension } from "../openapi/v3/extensions/fernExtensions"; +import { SchemaParserContext } from "./SchemaParserContext"; import { isAdditionalPropertiesAny } from "./convertAdditionalProperties"; import { convertAvailability } from "./convertAvailability"; import { convertSchema, convertToReferencedSchema, getSchemaIdFromReference } from "./convertSchemas"; -import { SchemaParserContext } from "./SchemaParserContext"; import { getBreadcrumbsFromReference } from "./utils/getBreadcrumbsFromReference"; import { getGeneratedPropertyName } from "./utils/getSchemaName"; import { isReferenceObject } from "./utils/isReferenceObject"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertSchemas.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertSchemas.ts index e3a120a70bc..7059cc27c56 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertSchemas.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertSchemas.ts @@ -1,3 +1,6 @@ +import { size } from "lodash-es"; +import { OpenAPIV3 } from "openapi-types"; + import { Logger } from "@fern-api/logger"; import { Availability, @@ -11,8 +14,7 @@ import { SdkGroupName, Source } from "@fern-api/openapi-ir"; -import { size } from "lodash-es"; -import { OpenAPIV3 } from "openapi-types"; + import { getExtension } from "../getExtension"; import { OpenAPIExtension } from "../openapi/v3/extensions/extensions"; import { FernOpenAPIExtension } from "../openapi/v3/extensions/fernExtensions"; @@ -21,6 +23,7 @@ import { getFernEncoding } from "../openapi/v3/extensions/getFernEncoding"; import { getFernEnum } from "../openapi/v3/extensions/getFernEnum"; import { getFernTypeExtension } from "../openapi/v3/extensions/getFernTypeExtension"; import { getValueIfBoolean } from "../utils/getValue"; +import { SchemaParserContext } from "./SchemaParserContext"; import { convertAdditionalProperties, wrapMap } from "./convertAdditionalProperties"; import { convertArray } from "./convertArray"; import { convertAvailability } from "./convertAvailability"; @@ -37,7 +40,6 @@ import { } from "./convertUndiscriminatedOneOf"; import { getDefaultAsString } from "./defaults/getDefault"; import { getExampleAsArray, getExampleAsBoolean, getExampleAsNumber, getExamplesString } from "./examples/getExample"; -import { SchemaParserContext } from "./SchemaParserContext"; import { getBreadcrumbsFromReference } from "./utils/getBreadcrumbsFromReference"; import { getGeneratedTypeName } from "./utils/getSchemaName"; import { isReferenceObject } from "./utils/isReferenceObject"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertUndiscriminatedOneOf.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertUndiscriminatedOneOf.ts index 2a7392f9cb2..f119117d571 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertUndiscriminatedOneOf.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/convertUndiscriminatedOneOf.ts @@ -1,19 +1,21 @@ +import { difference } from "lodash-es"; +import { OpenAPIV3 } from "openapi-types"; + import { Availability, - convertNumberToSnakeCase, Encoding, - isSchemaEqual, LiteralSchemaValue, OneOfSchemaWithExample, SchemaWithExample, SdkGroupName, - Source + Source, + convertNumberToSnakeCase, + isSchemaEqual } from "@fern-api/openapi-ir"; -import { difference } from "lodash-es"; -import { OpenAPIV3 } from "openapi-types"; + +import { SchemaParserContext } from "./SchemaParserContext"; import { convertEnum } from "./convertEnum"; import { convertReferenceObject, convertSchema } from "./convertSchemas"; -import { SchemaParserContext } from "./SchemaParserContext"; import { getGeneratedTypeName } from "./utils/getSchemaName"; import { isReferenceObject } from "./utils/isReferenceObject"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/examples/ExampleTypeFactory.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/examples/ExampleTypeFactory.ts index f022bf5f2a8..4587ed39aef 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/examples/ExampleTypeFactory.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/examples/ExampleTypeFactory.ts @@ -1,4 +1,4 @@ -import { assertNever, Examples, isPlainObject } from "@fern-api/core-utils"; +import { Examples, assertNever, isPlainObject } from "@fern-api/core-utils"; import { EnumSchemaWithExample, FernOpenapiIr, @@ -11,6 +11,7 @@ import { SchemaId, SchemaWithExample } from "@fern-api/openapi-ir"; + import { SchemaParserContext } from "../SchemaParserContext"; import { convertToFullExample } from "./convertToFullExample"; import { getFullExampleAsArray, getFullExampleAsObject } from "./getFullExample"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/examples/getExample.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/examples/getExample.ts index d6341c95a26..fad1195bb8e 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/examples/getExample.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/examples/getExample.ts @@ -1,5 +1,7 @@ -import { Logger } from "@fern-api/logger"; import { OpenAPIV3 } from "openapi-types"; + +import { Logger } from "@fern-api/logger"; + import { getExtension } from "../../getExtension"; import { getExamples } from "../../openapi/v3/extensions/getExamples"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getReferenceOccurrences.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getReferenceOccurrences.ts index 4951f06da14..573200a2300 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getReferenceOccurrences.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getReferenceOccurrences.ts @@ -1,5 +1,7 @@ -import { MediaType } from "@fern-api/core-utils"; import { OpenAPIV3 } from "openapi-types"; + +import { MediaType } from "@fern-api/core-utils"; + import { isReferenceObject } from "./isReferenceObject"; export function getReferenceOccurrences(document: OpenAPIV3.Document): Record { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getRequestBodyIdFromReference.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getRequestBodyIdFromReference.ts index d269abc473c..c6c1d033598 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getRequestBodyIdFromReference.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getRequestBodyIdFromReference.ts @@ -1,4 +1,5 @@ import { OpenAPIV3 } from "openapi-types"; + import { REQUEST_BODY_REFERENCE_PREFIX } from "../../openapi/v3/AbstractOpenAPIV3ParserContext"; export function getRequestBodyIdFromReference(ref: OpenAPIV3.ReferenceObject): string { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getSchemaName.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getSchemaName.ts index 5c69902456e..96c31ec62f2 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getSchemaName.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getSchemaName.ts @@ -1,4 +1,5 @@ import { camelCase, upperFirst } from "lodash-es"; + import { replaceStartingNumber } from "@fern-api/openapi-ir"; export function getGeneratedTypeName(breadcrumbs: string[], useOriginalSchemaIds: boolean): string { diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/isSchemaWithExampleEqual.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/isSchemaWithExampleEqual.ts index 37fba54d58e..9b02e96bf9f 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/isSchemaWithExampleEqual.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/isSchemaWithExampleEqual.ts @@ -1,4 +1,5 @@ -import { isSchemaEqual, SchemaWithExample } from "@fern-api/openapi-ir"; +import { SchemaWithExample, isSchemaEqual } from "@fern-api/openapi-ir"; + import { convertSchemaWithExampleToSchema } from "./convertSchemaWithExampleToSchema"; // only diffs the schema, not the example diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern-tests/package.json b/packages/cli/api-importers/openapi/openapi-ir-to-fern-tests/package.json index 22d80e9d383..aaf41c0cecc 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern-tests/package.json +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern-tests/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": { @@ -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" } diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern-tests/src/__test__/openapi-ir.test.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern-tests/src/__test__/openapi-ir.test.ts index b68ad4200ab..a13af4d6bf6 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern-tests/src/__test__/openapi-ir.test.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern-tests/src/__test__/openapi-ir.test.ts @@ -1,12 +1,13 @@ -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; -import { loadAPIWorkspace } from "@fern-api/workspace-loader"; import { readdir } from "fs/promises"; -import { OSSWorkspace } from "@fern-api/lazy-fern-workspace"; -import { InMemoryOpenAPILoader } from "@fern-api/browser-compatible-fern-workspace"; import fs from "fs/promises"; -import { OpenAPI } from "openapi-types"; import yaml from "js-yaml"; +import { OpenAPI } from "openapi-types"; + +import { InMemoryOpenAPILoader } from "@fern-api/browser-compatible-fern-workspace"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { OSSWorkspace } from "@fern-api/lazy-fern-workspace"; +import { createMockTaskContext } from "@fern-api/task-context"; +import { loadAPIWorkspace } from "@fern-api/workspace-loader"; const FIXTURES_DIR = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); @@ -87,10 +88,10 @@ async function getTestFixturePath(fixtureFilePath: AbsoluteFilePath): Promise" + ) ?? "optional") : "optional" }; } diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildHeader.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildHeader.ts index 124aeae3504..421f584c711 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildHeader.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildHeader.ts @@ -1,9 +1,11 @@ -import { RelativeFilePath } from "@fern-api/path-utils"; -import { Header } from "@fern-api/openapi-ir"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import { camelCase } from "lodash-es"; -import { buildTypeReference } from "./buildTypeReference"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Header } from "@fern-api/openapi-ir"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; +import { buildTypeReference } from "./buildTypeReference"; import { convertAvailability } from "./utils/convertAvailability"; import { getTypeFromTypeReference } from "./utils/getTypeFromTypeReference"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildIdempotencyHeaders.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildIdempotencyHeaders.ts index f201d1f5046..f7700d5d02b 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildIdempotencyHeaders.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildIdempotencyHeaders.ts @@ -1,8 +1,9 @@ import { ROOT_API_FILENAME } from "@fern-api/configuration"; -import { RelativeFilePath } from "@fern-api/path-utils"; import { PrimitiveSchemaValue, Schema } from "@fern-api/openapi-ir"; -import { buildHeader } from "./buildHeader"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; +import { buildHeader } from "./buildHeader"; import { getGroupNameForSchema } from "./utils/getGroupNameForSchema"; import { getNamespaceFromGroup } from "./utils/getNamespaceFromGroup"; import { wrapTypeReferenceAsOptional } from "./utils/wrapTypeReferenceAsOptional"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildPathParameter.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildPathParameter.ts index 72a951ff3ca..129421141a0 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildPathParameter.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildPathParameter.ts @@ -1,8 +1,9 @@ -import { RelativeFilePath } from "@fern-api/path-utils"; -import { PathParameter } from "@fern-api/openapi-ir"; import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { buildTypeReference } from "./buildTypeReference"; +import { PathParameter } from "@fern-api/openapi-ir"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; +import { buildTypeReference } from "./buildTypeReference"; import { convertAvailability } from "./utils/convertAvailability"; import { getTypeFromTypeReference } from "./utils/getTypeFromTypeReference"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildQueryParameter.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildQueryParameter.ts index 1eb69827f02..8703af54b7c 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildQueryParameter.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildQueryParameter.ts @@ -1,12 +1,13 @@ import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration"; -import { RelativeFilePath } from "@fern-api/path-utils"; -import { QueryParameter, Schema } from "@fern-api/openapi-ir"; -import { generateEnumNameFromValue, VALID_ENUM_NAME_REGEX } from "@fern-api/openapi-ir"; import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { buildTypeReference } from "./buildTypeReference"; +import { QueryParameter, Schema } from "@fern-api/openapi-ir"; +import { VALID_ENUM_NAME_REGEX, generateEnumNameFromValue } from "@fern-api/openapi-ir"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; +import { buildTypeReference } from "./buildTypeReference"; import { convertAvailability } from "./utils/convertAvailability"; -import { getTypeFromTypeReference, getDefaultFromTypeReference } from "./utils/getTypeFromTypeReference"; +import { getDefaultFromTypeReference, getTypeFromTypeReference } from "./utils/getTypeFromTypeReference"; export function buildQueryParameter({ queryParameter, diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildServices.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildServices.ts index 26c45ce386d..ba86ee95368 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildServices.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildServices.ts @@ -1,7 +1,8 @@ import { FernOpenapiIr } from "@fern-api/openapi-ir"; -import { buildEndpoint } from "./buildEndpoint"; + import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; import { State } from "./State"; +import { buildEndpoint } from "./buildEndpoint"; import { convertToSourceSchema } from "./utils/convertToSourceSchema"; import { getEndpointLocation } from "./utils/getEndpointLocation"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildTypeDeclaration.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildTypeDeclaration.ts index 7643c919b10..9afe275efeb 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildTypeDeclaration.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildTypeDeclaration.ts @@ -1,5 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; -import { RelativeFilePath } from "@fern-api/path-utils"; +import { RawSchemas } from "@fern-api/fern-definition-schema"; import { ArraySchema, CasingOverrides, @@ -16,7 +16,10 @@ import { SchemaId, WithInline } from "@fern-api/openapi-ir"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/path-utils"; + +import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; +import { State } from "./State"; import { buildArrayTypeReference, buildLiteralTypeReference, @@ -27,12 +30,10 @@ import { buildTypeReference, buildUnknownTypeReference } from "./buildTypeReference"; -import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; import { convertAvailability } from "./utils/convertAvailability"; import { convertToEncodingSchema } from "./utils/convertToEncodingSchema"; import { convertToSourceSchema } from "./utils/convertToSourceSchema"; import { getTypeFromTypeReference } from "./utils/getTypeFromTypeReference"; -import { State } from "./State"; export interface ConvertedTypeDeclaration { name: string | undefined; @@ -487,7 +488,7 @@ export function buildEnumTypeDeclaration(schema: EnumSchema, declarationDepth: n source: schema.source != null ? convertToSourceSchema(schema.source) : undefined }; for (const enumValue of enumSchema.enum) { - const name = typeof enumValue === "string" ? enumValue : enumValue.name ?? enumValue.value; + const name = typeof enumValue === "string" ? enumValue : (enumValue.name ?? enumValue.value); if (!uniqueEnumName.has(name.toLowerCase())) { uniqueEnumSchema.enum.push(enumValue); uniqueEnumName.add(name.toLowerCase()); diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildTypeReference.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildTypeReference.ts index ad1f04ba5c7..a1d965b4a01 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildTypeReference.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildTypeReference.ts @@ -1,6 +1,8 @@ +import { camelCase } from "lodash-es"; + import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration"; import { assertNever } from "@fern-api/core-utils"; -import { RelativeFilePath } from "@fern-api/path-utils"; +import { RawSchemas } from "@fern-api/fern-definition-schema"; import { ArraySchema, DoubleSchema, @@ -18,14 +20,16 @@ import { SdkGroupName, StringSchema } from "@fern-api/openapi-ir"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { camelCase } from "lodash-es"; +import { RelativeFilePath } from "@fern-api/path-utils"; + +import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; import { buildEnumTypeDeclaration, buildObjectTypeDeclaration, buildOneOfTypeDeclaration } from "./buildTypeDeclaration"; -import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; +import { convertAvailability } from "./utils/convertAvailability"; +import { convertSdkGroupNameToFile } from "./utils/convertSdkGroupName"; import { convertToEncodingSchema } from "./utils/convertToEncodingSchema"; import { getGroupNameForSchema } from "./utils/getGroupNameForSchema"; import { @@ -34,8 +38,6 @@ import { getTypeFromTypeReference, getValidationFromTypeReference } from "./utils/getTypeFromTypeReference"; -import { convertSdkGroupNameToFile } from "./utils/convertSdkGroupName"; -import { convertAvailability } from "./utils/convertAvailability"; const MIN_INT_32 = -2147483648; const MAX_INT_32 = 2147483647; diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildVariables.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildVariables.ts index fc58e75d7c0..7219c87c187 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildVariables.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildVariables.ts @@ -1,8 +1,9 @@ import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration"; -import { RelativeFilePath } from "@fern-api/path-utils"; import { Schema } from "@fern-api/openapi-ir"; -import { buildTypeReference } from "./buildTypeReference"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; +import { buildTypeReference } from "./buildTypeReference"; import { getGroupNameForSchema } from "./utils/getGroupNameForSchema"; import { getNamespaceFromGroup } from "./utils/getNamespaceFromGroup"; import { getTypeFromTypeReference } from "./utils/getTypeFromTypeReference"; diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildWebhooks.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildWebhooks.ts index 45fc7c034d2..60e424028ef 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildWebhooks.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildWebhooks.ts @@ -1,14 +1,16 @@ +import { camelCase, isEqual } from "lodash-es"; + import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration"; -import { join, RelativeFilePath } from "@fern-api/path-utils"; -import { Webhook } from "@fern-api/openapi-ir"; import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { camelCase, isEqual } from "lodash-es"; +import { Webhook } from "@fern-api/openapi-ir"; +import { RelativeFilePath, join } from "@fern-api/path-utils"; + +import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; import { buildHeader } from "./buildHeader"; import { buildTypeReference } from "./buildTypeReference"; -import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; import { convertFullExample } from "./utils/convertFullExample"; -import { tokenizeString } from "./utils/getEndpointLocation"; import { convertEndpointSdkNameToFile } from "./utils/convertSdkGroupName"; +import { tokenizeString } from "./utils/getEndpointLocation"; import { getEndpointNamespace } from "./utils/getNamespaceFromGroup"; export function buildWebhooks(context: OpenApiIrConverterContext): void { diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildWebsocketSessionExample.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildWebsocketSessionExample.ts index c0128e0215e..a23ba41b577 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildWebsocketSessionExample.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildWebsocketSessionExample.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; +import { RawSchemas } from "@fern-api/fern-definition-schema"; import { FullExample, FullOneOfExample, @@ -7,7 +8,7 @@ import { PrimitiveExample, WebsocketSessionExample } from "@fern-api/openapi-ir"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { OpenApiIrConverterContext } from "./OpenApiIrConverterContext"; export function buildWebsocketSessionExample({ diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/convert.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/convert.ts index 597a1b38328..e3baab389c2 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/convert.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/convert.ts @@ -1,7 +1,8 @@ -import { RelativeFilePath } from "@fern-api/path-utils"; import { DefinitionFileSchema, PackageMarkerFileSchema, RootApiFileSchema } from "@fern-api/fern-definition-schema"; -import { buildFernDefinition } from "./buildFernDefinition"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { OpenApiIrConverterContext, OpenApiIrConverterContextOpts } from "./OpenApiIrConverterContext"; +import { buildFernDefinition } from "./buildFernDefinition"; export interface OpenApiConvertedFernDefinition { rootApiFile: RootApiFileSchema; diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertAvailability.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertAvailability.ts index b3d2dc80d17..f4ccee0ad6e 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertAvailability.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertAvailability.ts @@ -1,5 +1,5 @@ -import { Availability } from "@fern-api/openapi-ir"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Availability } from "@fern-api/openapi-ir"; export function convertAvailability( availability: Availability | undefined diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertFullExample.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertFullExample.ts index b9953934f5e..c348ed69973 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertFullExample.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertFullExample.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; +import { RawSchemas } from "@fern-api/fern-definition-schema"; import { EndpointResponseExample, FullExample, @@ -7,7 +8,6 @@ import { LiteralExample, PrimitiveExample } from "@fern-api/openapi-ir"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; export function convertFullExample(fullExample: FullExample): RawSchemas.ExampleTypeReferenceSchema { switch (fullExample.type) { diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertSdkGroupName.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertSdkGroupName.ts index 24950e08199..4ac55c57b75 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertSdkGroupName.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertSdkGroupName.ts @@ -1,8 +1,9 @@ +import { camelCase } from "lodash-es"; + import { FERN_PACKAGE_MARKER_FILENAME_NO_EXTENSION } from "@fern-api/configuration"; import { assertNever } from "@fern-api/core-utils"; -import { join, RelativeFilePath } from "@fern-api/path-utils"; import { EndpointSdkName, SdkGroupName } from "@fern-api/openapi-ir"; -import { camelCase } from "lodash-es"; +import { RelativeFilePath, join } from "@fern-api/path-utils"; function cleanSdkGroupName(groupName: SdkGroupName): SdkGroupName { const maybeNamespace = groupName.find((group) => typeof group === "object" && group.type === "namespace"); diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToEncodingSchema.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToEncodingSchema.ts index 8520c2176b0..8fafc397068 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToEncodingSchema.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToEncodingSchema.ts @@ -1,6 +1,6 @@ import { assertNever } from "@fern-api/core-utils"; -import { Encoding } from "@fern-api/openapi-ir"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Encoding } from "@fern-api/openapi-ir"; export function convertToEncodingSchema(encoding: Encoding): RawSchemas.EncodingSchema { switch (encoding.type) { diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToHttpMethod.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToHttpMethod.ts index b10338bbb23..b2d443f734a 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToHttpMethod.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToHttpMethod.ts @@ -1,5 +1,5 @@ -import { HttpMethod } from "@fern-api/openapi-ir"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { HttpMethod } from "@fern-api/openapi-ir"; export function convertToHttpMethod(httpMethod: HttpMethod): RawSchemas.HttpMethodSchema { return HttpMethod._visit(httpMethod, { diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToSourceSchema.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToSourceSchema.ts index 4b57569ac0e..8c30f19802d 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToSourceSchema.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/convertToSourceSchema.ts @@ -1,6 +1,6 @@ import { assertNever } from "@fern-api/core-utils"; -import { Source } from "@fern-api/openapi-ir"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Source } from "@fern-api/openapi-ir"; export function convertToSourceSchema(source: Source): RawSchemas.SourceSchema { switch (source.type) { diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getDeclarationFileForSchema.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getDeclarationFileForSchema.ts index aac39801c2c..b3d4b7b6943 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getDeclarationFileForSchema.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getDeclarationFileForSchema.ts @@ -1,8 +1,10 @@ +import { camelCase } from "lodash-es"; + import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration"; import { assertNever } from "@fern-api/core-utils"; -import { RelativeFilePath } from "@fern-api/path-utils"; import { Schema, SdkGroupName } from "@fern-api/openapi-ir"; -import { camelCase } from "lodash-es"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { convertSdkGroupNameToFile } from "./convertSdkGroupName"; const PACKAGE_MARKER_RELATIVE_FILEPATH = RelativeFilePath.of(FERN_PACKAGE_MARKER_FILENAME); diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getEndpointLocation.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getEndpointLocation.ts index e8513ba0cdc..0c341085197 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getEndpointLocation.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getEndpointLocation.ts @@ -1,7 +1,9 @@ +import { camelCase, compact, isEqual } from "lodash-es"; + import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration"; -import { join, RelativeFilePath } from "@fern-api/path-utils"; import { Endpoint, HttpMethod } from "@fern-api/openapi-ir"; -import { camelCase, compact, isEqual } from "lodash-es"; +import { RelativeFilePath, join } from "@fern-api/path-utils"; + import { convertEndpointSdkNameToFileWithoutExtension } from "./convertSdkGroupName"; export interface EndpointLocation { diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getNamespaceFromGroup.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getNamespaceFromGroup.ts index cd573e779a8..cd0e9fe625e 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getNamespaceFromGroup.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/getNamespaceFromGroup.ts @@ -1,4 +1,4 @@ -import { Namespace, SdkGroupName, EndpointSdkName } from "@fern-api/openapi-ir"; +import { EndpointSdkName, Namespace, SdkGroupName } from "@fern-api/openapi-ir"; export function getNamespaceFromGroup(groupName: SdkGroupName): string | undefined { return groupName.find((group): group is Namespace => typeof group !== "string" && group.type === "namespace")?.name; @@ -11,6 +11,6 @@ export function getEndpointNamespace( return namespaceOverride != null ? namespaceOverride : sdkName?.groupName != null - ? getNamespaceFromGroup(sdkName.groupName) - : undefined; + ? getNamespaceFromGroup(sdkName.groupName) + : undefined; } diff --git a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/wrapTypeReferenceAsOptional.ts b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/wrapTypeReferenceAsOptional.ts index b3ef4e47f99..7f7afec791a 100644 --- a/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/wrapTypeReferenceAsOptional.ts +++ b/packages/cli/api-importers/openapi/openapi-ir-to-fern/src/utils/wrapTypeReferenceAsOptional.ts @@ -1,4 +1,5 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { getTypeFromTypeReference } from "./getTypeFromTypeReference"; export function wrapTypeReferenceAsOptional( diff --git a/packages/cli/api-importers/openapi/openapi-ir/package.json b/packages/cli/api-importers/openapi/openapi-ir/package.json index 15031d4d0bf..4b447e84590 100644 --- a/packages/cli/api-importers/openapi/openapi-ir/package.json +++ b/packages/cli/api-importers/openapi/openapi-ir/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", "generate": "fern generate --local" }, @@ -37,8 +36,8 @@ "depcheck": "^1.4.6", "eslint": "^8.56.0", "vitest": "^2.1.4", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "typescript": "4.6.4" } } \ No newline at end of file diff --git a/packages/cli/auth/package.json b/packages/cli/auth/package.json index 7c52d464ce7..c933f3b6290 100644 --- a/packages/cli/auth/package.json +++ b/packages/cli/auth/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": { @@ -43,8 +42,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" } } \ No newline at end of file diff --git a/packages/cli/auth/src/orgs/createOrganizationIfDoesNotExist.ts b/packages/cli/auth/src/orgs/createOrganizationIfDoesNotExist.ts index 71614e0939d..87e829fb7b9 100644 --- a/packages/cli/auth/src/orgs/createOrganizationIfDoesNotExist.ts +++ b/packages/cli/auth/src/orgs/createOrganizationIfDoesNotExist.ts @@ -1,6 +1,7 @@ import { createVenusService } from "@fern-api/core"; import { TaskContext } from "@fern-api/task-context"; import { FernVenusApi } from "@fern-api/venus-api-sdk"; + import { FernUserToken } from "../FernToken"; import { getOrganizationNameValidationError } from "./getOrganizationNameValidationError"; diff --git a/packages/cli/auth/src/persistence/getPathToTokenFile.ts b/packages/cli/auth/src/persistence/getPathToTokenFile.ts index 18a2660e4d7..d8f12e5289c 100644 --- a/packages/cli/auth/src/persistence/getPathToTokenFile.ts +++ b/packages/cli/auth/src/persistence/getPathToTokenFile.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { homedir } from "os"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + const TOKEN_FILENAME = "token"; const LOCAL_STORAGE_FOLDER = process.env.LOCAL_STORAGE_FOLDER ?? ".fern"; diff --git a/packages/cli/auth/src/persistence/getToken.ts b/packages/cli/auth/src/persistence/getToken.ts index 000f9f286b1..b125f0d2056 100644 --- a/packages/cli/auth/src/persistence/getToken.ts +++ b/packages/cli/auth/src/persistence/getToken.ts @@ -1,5 +1,7 @@ -import { doesPathExist } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; + +import { doesPathExist } from "@fern-api/fs-utils"; + import { FernOrganizationToken, FernToken, FernUserToken } from "../FernToken"; import { getPathToTokenFile } from "./getPathToTokenFile"; diff --git a/packages/cli/auth/src/persistence/storeToken.ts b/packages/cli/auth/src/persistence/storeToken.ts index 1c0fb4091db..51c58be5dec 100644 --- a/packages/cli/auth/src/persistence/storeToken.ts +++ b/packages/cli/auth/src/persistence/storeToken.ts @@ -1,5 +1,6 @@ import { mkdir, writeFile } from "fs/promises"; import path from "path"; + import { getPathToTokenFile } from "./getPathToTokenFile"; export async function storeToken(token: string): Promise { diff --git a/packages/cli/auth/src/users/getCurrentUser.ts b/packages/cli/auth/src/users/getCurrentUser.ts index 8c61dfd03fc..ddfdf370b1e 100644 --- a/packages/cli/auth/src/users/getCurrentUser.ts +++ b/packages/cli/auth/src/users/getCurrentUser.ts @@ -1,6 +1,7 @@ import { createVenusService } from "@fern-api/core"; import { TaskContext } from "@fern-api/task-context"; import { FernVenusApi } from "@fern-api/venus-api-sdk"; + import { FernUserToken } from "../FernToken"; export async function getCurrentUser({ diff --git a/packages/cli/auth/src/verify/getPropertiesFromJwtToken.ts b/packages/cli/auth/src/verify/getPropertiesFromJwtToken.ts index c64d47cc3de..6fb05277f40 100644 --- a/packages/cli/auth/src/verify/getPropertiesFromJwtToken.ts +++ b/packages/cli/auth/src/verify/getPropertiesFromJwtToken.ts @@ -1,4 +1,5 @@ import jwt from "jsonwebtoken"; + import { FernUserToken } from "../FernToken"; export function getUserIdFromToken(token: FernUserToken): string | undefined { diff --git a/packages/cli/auth/src/verify/isLoggedIn.ts b/packages/cli/auth/src/verify/isLoggedIn.ts index 79a872faf5b..56558b240b2 100644 --- a/packages/cli/auth/src/verify/isLoggedIn.ts +++ b/packages/cli/auth/src/verify/isLoggedIn.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { getToken } from "../persistence/getToken"; import { verifyAccessToken } from "./verifyAccessToken"; import { verifyJwt } from "./verifyJwt"; diff --git a/packages/cli/auth/src/verify/verifyAccessToken.ts b/packages/cli/auth/src/verify/verifyAccessToken.ts index f339c81842b..fc684576e3b 100644 --- a/packages/cli/auth/src/verify/verifyAccessToken.ts +++ b/packages/cli/auth/src/verify/verifyAccessToken.ts @@ -1,4 +1,5 @@ import { createVenusService } from "@fern-api/core"; + import { FernOrganizationToken } from "../FernToken"; export async function verifyAccessToken(token: FernOrganizationToken): Promise { diff --git a/packages/cli/auth/src/verify/verifyJwt.ts b/packages/cli/auth/src/verify/verifyJwt.ts index 9cbf5352df7..a1f108e94b7 100644 --- a/packages/cli/auth/src/verify/verifyJwt.ts +++ b/packages/cli/auth/src/verify/verifyJwt.ts @@ -1,5 +1,6 @@ import jwt from "jsonwebtoken"; import jwksClient from "jwks-rsa"; + import { FernUserToken } from "../FernToken"; const client = jwksClient({ diff --git a/packages/cli/cli-logger/package.json b/packages/cli/cli-logger/package.json index 456d8108b88..c91a69e4004 100644 --- a/packages/cli/cli-logger/package.json +++ b/packages/cli/cli-logger/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": { @@ -36,8 +35,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" } } \ No newline at end of file diff --git a/packages/cli/cli-migrations/package.json b/packages/cli/cli-migrations/package.json index b3e6e959c96..b4fa8bb5b91 100644 --- a/packages/cli/cli-migrations/package.json +++ b/packages/cli/cli-migrations/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": { @@ -50,8 +49,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", "tmp-promise": "^3.0.3", "typescript": "5.7.2", "vitest": "^2.0.5" diff --git a/packages/cli/cli-migrations/src/__test__/migrations.test.ts b/packages/cli/cli-migrations/src/__test__/migrations.test.ts index 2bf396ded61..f07fe214379 100644 --- a/packages/cli/cli-migrations/src/__test__/migrations.test.ts +++ b/packages/cli/cli-migrations/src/__test__/migrations.test.ts @@ -1,6 +1,8 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { isVersionAhead } from "@fern-api/semver-utils"; import { readdir } from "fs/promises"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { isVersionAhead } from "@fern-api/semver-utils"; + import { ALL_MIGRATIONS } from "../migrations"; import { Migration } from "../types/Migration"; import { VersionMigrations } from "../types/VersionMigrations"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/__test__/discriminant.test.ts b/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/__test__/discriminant.test.ts index d6361b1e4f3..c682edf6ec9 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/__test__/discriminant.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/__test__/discriminant.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/getAllYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/getAllYamlFiles.ts index f0924c07854..ba1effd9e68 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/getAllYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/getAllYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/migration.ts b/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/migration.ts index 25ed1e69b95..ca54cb07eeb 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.191/discriminant/migration.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { readFile, writeFile } from "fs/promises"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { Migration } from "../../../types/Migration"; import { getAllYamlFiles } from "./getAllYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/__test__/union-single-property-key.test.ts b/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/__test__/union-single-property-key.test.ts index 0d9e83b9b57..af2248ef203 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/__test__/union-single-property-key.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/__test__/union-single-property-key.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/getAllYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/getAllYamlFiles.ts index f0924c07854..ba1effd9e68 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/getAllYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/getAllYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/migration.ts b/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/migration.ts index ed339b9325f..d7ed64b39fb 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.203/union-single-property-key/migration.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile, writeFile } from "fs/promises"; import YAML from "yaml"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { Migration } from "../../../types/Migration"; import { getAllYamlFiles } from "./getAllYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/__test__/add-mode-to-draft-generators.test.ts b/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/__test__/add-mode-to-draft-generators.test.ts index b539551ae2d..28b9da751fe 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/__test__/add-mode-to-draft-generators.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/__test__/add-mode-to-draft-generators.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/getAllGeneratorYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/getAllGeneratorYamlFiles.ts index 10b6ad8e8ed..770b392f590 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/getAllGeneratorYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/getAllGeneratorYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllGeneratorYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/migration.ts b/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/migration.ts index 87322ce4cbf..8bbf28e200b 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.207/add-mode-to-draft-generators/migration.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile, writeFile } from "fs/promises"; import YAML from "yaml"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { Migration } from "../../../types/Migration"; import { getAllGeneratorYamlFiles } from "./getAllGeneratorYamlFiles"; @@ -50,8 +52,8 @@ async function migrateGeneratorsYml(filepath: AbsoluteFilePath, context: TaskCon name.value.includes("openapi") ? "./generated-openapi" : name.value.includes("postman") - ? "./generated-postman" - : localOutput + ? "./generated-postman" + : localOutput ); } }); diff --git a/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/__test__/remove-inline-error-declarations.test.ts b/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/__test__/remove-inline-error-declarations.test.ts index 137892b48ab..0780d065271 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/__test__/remove-inline-error-declarations.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/__test__/remove-inline-error-declarations.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/getAllYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/getAllYamlFiles.ts index 421f1ed9382..4bac63a4f77 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/getAllYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/getAllYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/migration.ts b/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/migration.ts index 33e701f184a..8c2a9611bf7 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.210/remove-inline-error-declarations/migration.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile, writeFile } from "fs/promises"; import YAML from "yaml"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { Migration } from "../../../types/Migration"; import { getAllYamlFiles } from "./getAllYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/__test__/add-publishing-to-release-generators.test.ts b/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/__test__/add-publishing-to-release-generators.test.ts index b539551ae2d..28b9da751fe 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/__test__/add-publishing-to-release-generators.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/__test__/add-publishing-to-release-generators.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/getAllGeneratorYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/getAllGeneratorYamlFiles.ts index 77538eadc4a..92e7ca57638 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/getAllGeneratorYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/getAllGeneratorYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllGeneratorYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/migration.ts b/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/migration.ts index 186e6502110..0ba9b1f253b 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.212/add-publishing-to-release-generators/migration.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile, writeFile } from "fs/promises"; import YAML from "yaml"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { Migration } from "../../../types/Migration"; import { getAllGeneratorYamlFiles } from "./getAllGeneratorYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/__test__/rename-alias-key-to-type.test.ts b/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/__test__/rename-alias-key-to-type.test.ts index 7c9ca0433d7..6519755b367 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/__test__/rename-alias-key-to-type.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/__test__/rename-alias-key-to-type.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/getAllYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/getAllYamlFiles.ts index f0924c07854..ba1effd9e68 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/getAllYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/getAllYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/migration.ts b/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/migration.ts index b9738c609c9..40f3f14e7e1 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.220/rename-alias-key-to-type/migration.ts @@ -1,4 +1,5 @@ import { readFile, writeFile } from "fs/promises"; + import { Migration } from "../../../types/Migration"; import { getAllYamlFiles } from "./getAllYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/__test__/add-error-discriminant.test.ts b/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/__test__/add-error-discriminant.test.ts index c40cd25e6c3..b4749a67581 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/__test__/add-error-discriminant.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/__test__/add-error-discriminant.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/getAllRootApiYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/getAllRootApiYamlFiles.ts index 33a61abc0ac..5fab8f87e3e 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/getAllRootApiYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/getAllRootApiYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllRootApiYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/migration.ts b/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/migration.ts index 3e476b88aa1..1431670fd70 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.221/add-error-discriminant/migration.ts @@ -1,4 +1,5 @@ import { readFile, writeFile } from "fs/promises"; + import { Migration } from "../../../types/Migration"; import { getAllRootApiYamlFiles } from "./getAllRootApiYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/__test__/add-generator-groups.test.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/__test__/add-generator-groups.test.ts index 9febab37071..0e0e036383e 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/__test__/add-generator-groups.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/__test__/add-generator-groups.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/getAllGeneratorYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/getAllGeneratorYamlFiles.ts index 77538eadc4a..92e7ca57638 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/getAllGeneratorYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/getAllGeneratorYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllGeneratorYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/migration.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/migration.ts index 2561fdeb9b7..fd147528ffb 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/migration.ts @@ -1,7 +1,9 @@ -import { assertNever } from "@fern-api/core-utils"; -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { readFile, writeFile } from "fs/promises"; import yaml from "js-yaml"; + +import { assertNever } from "@fern-api/core-utils"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { Migration } from "../../../types/Migration"; import { getAllGeneratorYamlFiles } from "./getAllGeneratorYamlFiles"; import * as NewSchemas from "./new-generators-configuration"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorGroupSchema.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorGroupSchema.ts index 82e3317f0bc..682fd0f1c28 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorGroupSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorGroupSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GeneratorInvocationSchema } from "./GeneratorInvocationSchema"; export const GeneratorGroupSchema = z.strictObject({ diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorInvocationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorInvocationSchema.ts index e7bd9e0a65d..161dbf5f3d3 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorInvocationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorInvocationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GeneratorOutputSchema } from "./GeneratorOutputSchema"; import { GithubConfigurationSchema } from "./GithubConfigurationSchema"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorOutputSchema.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorOutputSchema.ts index 0f936010941..ccbe870acd3 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorOutputSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorOutputSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { LocalFileSystemOutputLocationSchema } from "./LocalFileSystemOutputLocationSchema"; import { MavenOutputLocationSchema } from "./MavenOutputLocationSchema"; import { NpmOutputLocationSchema } from "./NpmOutputLocationSchema"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorsConfigurationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorsConfigurationSchema.ts index adfb747483f..90c7f5933e4 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorsConfigurationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/new-generators-configuration/GeneratorsConfigurationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GeneratorGroupSchema } from "./GeneratorGroupSchema"; export const GeneratorsConfigurationSchema = z.strictObject({ diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/DraftGeneratorInvocationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/DraftGeneratorInvocationSchema.ts index 06ec8d9283a..f717da9453c 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/DraftGeneratorInvocationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/DraftGeneratorInvocationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { BaseGeneratorInvocationSchema } from "./BaseGeneratorInvocationSchema"; export const DraftGeneratorInvocationSchema = BaseGeneratorInvocationSchema.extend({ diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/GeneratorPublishingSchema.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/GeneratorPublishingSchema.ts index c8e6373ed2f..20d9a76e21c 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/GeneratorPublishingSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/GeneratorPublishingSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { MavenPublishingSchema } from "./MavenPublishingSchema"; import { NpmPublishingSchema } from "./NpmPublishingSchema"; import { PostmanPublishingSchema } from "./PostmanPublishingSchema"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/GeneratorsConfigurationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/GeneratorsConfigurationSchema.ts index c6d29615729..4dc4c291858 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/GeneratorsConfigurationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/GeneratorsConfigurationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { DraftGeneratorInvocationSchema } from "./DraftGeneratorInvocationSchema"; import { ReleaseGeneratorInvocationSchema } from "./ReleaseGeneratorInvocationSchema"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/MavenPublishingSchema.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/MavenPublishingSchema.ts index c8932d7c75f..d1005db5ba7 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/MavenPublishingSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/MavenPublishingSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { MavenRegistryOutputSchema } from "./MavenRegistryOutputSchema"; export const MavenPublishingSchema = z.strictObject({ diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/NpmPublishingSchema.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/NpmPublishingSchema.ts index ab7cc3251af..f8ccabe9658 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/NpmPublishingSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/NpmPublishingSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { NpmRegistryOutputSchema } from "./NpmRegistryOutputSchema"; export const NpmPublishingSchema = z.strictObject({ diff --git a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/ReleaseGeneratorInvocationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/ReleaseGeneratorInvocationSchema.ts index e77d0fcce6a..1496d0bf63f 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/ReleaseGeneratorInvocationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.241/add-generator-groups/old-generators-configuration/ReleaseGeneratorInvocationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { BaseGeneratorInvocationSchema } from "./BaseGeneratorInvocationSchema"; import { GeneratorPublishingSchema } from "./GeneratorPublishingSchema"; import { GithubRepositoryOutputSchema } from "./GithubRepositoryOutputSchema"; diff --git a/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/__test__/add-error-discrimination-config.test.ts b/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/__test__/add-error-discrimination-config.test.ts index 46b66ae0d7c..52f8a8e7f20 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/__test__/add-error-discrimination-config.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/__test__/add-error-discrimination-config.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/getAllRootApiYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/getAllRootApiYamlFiles.ts index 33a61abc0ac..5fab8f87e3e 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/getAllRootApiYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/getAllRootApiYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllRootApiYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/migration.ts b/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/migration.ts index 17af977e1d8..4b4a1a63288 100644 --- a/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.0.248/add-error-discrimination-config/migration.ts @@ -1,6 +1,8 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { readFile, writeFile } from "fs/promises"; import YAML from "yaml"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { Migration } from "../../../types/Migration"; import { getAllRootApiYamlFiles } from "./getAllRootApiYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/__test__/add-inline-requests.test.ts b/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/__test__/add-inline-requests.test.ts index 613a1d4a1b2..e37d28c39e5 100644 --- a/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/__test__/add-inline-requests.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/__test__/add-inline-requests.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/getAllYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/getAllYamlFiles.ts index f0924c07854..ba1effd9e68 100644 --- a/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/getAllYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/getAllYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/migration.ts b/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/migration.ts index 95e6736a495..d000b945c19 100644 --- a/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.1.3-rc3/add-inline-requests/migration.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile, writeFile } from "fs/promises"; import YAML from "yaml"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { Migration } from "../../../types/Migration"; import { getAllYamlFiles } from "./getAllYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/__test__/update-directory-structure.test.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/__test__/update-directory-structure.test.ts index 92f3a49a97b..2989b2e186e 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/__test__/update-directory-structure.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/__test__/update-directory-structure.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, getDirectoryContentsForSnapshot, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, getDirectoryContentsForSnapshot, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/docs-config/loadRawDocsConfiguration.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/docs-config/loadRawDocsConfiguration.ts index 210c251ff94..ec40b36e35c 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/docs-config/loadRawDocsConfiguration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/docs-config/loadRawDocsConfiguration.ts @@ -1,6 +1,8 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; import yaml from "js-yaml"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { LegacyDocs, LegacyDocsSerializers } from "."; export async function loadRawDocsConfiguration({ diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/convertLegacyGeneratorsConfiguration.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/convertLegacyGeneratorsConfiguration.ts index 28b1a38b929..67b6e7c629b 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/convertLegacyGeneratorsConfiguration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/convertLegacyGeneratorsConfiguration.ts @@ -1,5 +1,6 @@ import { assertNever } from "@fern-api/core-utils"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { LegacyGenerators, MigratedGenerators } from "."; import { DocsURL } from "../docs-config"; import { DEFAULT_GROUP_GENERATORS_CONFIG_KEY } from "./legacy/GeneratorsConfigurationSchema"; @@ -9,7 +10,7 @@ export interface ConvertedGeneratorsConfiguration { docsURLs: DocsURL[]; } -export type PathModificationStrategy = typeof PathModificationStrategy[keyof typeof PathModificationStrategy]; +export type PathModificationStrategy = (typeof PathModificationStrategy)[keyof typeof PathModificationStrategy]; export const PathModificationStrategy = { Nest: "Nest", MoveUp: "MoveUp" diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorGroupSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorGroupSchema.ts index d4cae463362..2c23ab9861f 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorGroupSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorGroupSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GeneratorGroupDocsConfigurationSchema } from "./GeneratorGroupDocsConfigurationSchema"; import { GeneratorInvocationSchema } from "./GeneratorInvocationSchema"; diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorInvocationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorInvocationSchema.ts index e7bd9e0a65d..161dbf5f3d3 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorInvocationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorInvocationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GeneratorOutputSchema } from "./GeneratorOutputSchema"; import { GithubConfigurationSchema } from "./GithubConfigurationSchema"; diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorOutputSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorOutputSchema.ts index e67a4cb06e2..f321a8af90e 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorOutputSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorOutputSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { LocalFileSystemOutputLocationSchema } from "./LocalFileSystemOutputLocationSchema"; import { MavenOutputLocationSchema } from "./MavenOutputLocationSchema"; import { NpmOutputLocationSchema } from "./NpmOutputLocationSchema"; diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorsConfigurationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorsConfigurationSchema.ts index 74301295d1d..02aa5c44813 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorsConfigurationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GeneratorsConfigurationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GeneratorGroupSchema } from "./GeneratorGroupSchema"; export const DEFAULT_GROUP_GENERATORS_CONFIG_KEY = "default-group"; diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GithubConfigurationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GithubConfigurationSchema.ts index a345b31a2d8..891c8aaf440 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GithubConfigurationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GithubConfigurationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GithubLicenseSchema } from "./GithubLicenseSchema"; export const GithubConfigurationSchema = z.strictObject({ diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GithubLicenseSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GithubLicenseSchema.ts index fc90abc02c0..f2b78cf4719 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GithubLicenseSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/legacy/GithubLicenseSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GithubLicenseCustomSchema } from "./GithubLicenseCustomSchema"; export const GithubLicenseSchema = z.union([z.enum(["MIT", "Apache-2.0"]), GithubLicenseCustomSchema]); diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/loadRawGeneratorsConfiguration.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/loadRawGeneratorsConfiguration.ts index 5364faab695..51c13f77768 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/loadRawGeneratorsConfiguration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/loadRawGeneratorsConfiguration.ts @@ -1,6 +1,8 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; import yaml from "js-yaml"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { LegacyGenerators } from "."; export async function loadRawGeneratorsConfiguration({ diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorGroupSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorGroupSchema.ts index 82e3317f0bc..682fd0f1c28 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorGroupSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorGroupSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GeneratorInvocationSchema } from "./GeneratorInvocationSchema"; export const GeneratorGroupSchema = z.strictObject({ diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorInvocationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorInvocationSchema.ts index e7bd9e0a65d..161dbf5f3d3 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorInvocationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorInvocationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GeneratorOutputSchema } from "./GeneratorOutputSchema"; import { GithubConfigurationSchema } from "./GithubConfigurationSchema"; diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorOutputSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorOutputSchema.ts index e67a4cb06e2..f321a8af90e 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorOutputSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorOutputSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { LocalFileSystemOutputLocationSchema } from "./LocalFileSystemOutputLocationSchema"; import { MavenOutputLocationSchema } from "./MavenOutputLocationSchema"; import { NpmOutputLocationSchema } from "./NpmOutputLocationSchema"; diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorsConfigurationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorsConfigurationSchema.ts index cb85eb3dfd0..0cf46619d50 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorsConfigurationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GeneratorsConfigurationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GeneratorGroupSchema } from "./GeneratorGroupSchema"; export const DEFAULT_GROUP_GENERATORS_CONFIG_KEY = "default-group"; diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GithubConfigurationSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GithubConfigurationSchema.ts index a345b31a2d8..891c8aaf440 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GithubConfigurationSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GithubConfigurationSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GithubLicenseSchema } from "./GithubLicenseSchema"; export const GithubConfigurationSchema = z.strictObject({ diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GithubLicenseSchema.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GithubLicenseSchema.ts index fc90abc02c0..f2b78cf4719 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GithubLicenseSchema.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/generators-configuration/migrated/GithubLicenseSchema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { GithubLicenseCustomSchema } from "./GithubLicenseCustomSchema"; export const GithubLicenseSchema = z.union([z.enum(["MIT", "Apache-2.0"]), GithubLicenseCustomSchema]); diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsAndMultipleAPIs.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsAndMultipleAPIs.ts index 50f29a332b2..00b61cc0fe1 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsAndMultipleAPIs.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsAndMultipleAPIs.ts @@ -1,7 +1,9 @@ -import { docsYml } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, join, moveFolder, RelativeFilePath } from "@fern-api/fs-utils"; import { mkdir, rm, writeFile } from "fs/promises"; import yaml from "js-yaml"; + +import { docsYml } from "@fern-api/configuration-loader"; +import { AbsoluteFilePath, RelativeFilePath, join, moveFolder } from "@fern-api/fs-utils"; + import { getAbsolutePathToDocsFolder, getAbsolutePathToDocsYaml, loadRawDocsConfiguration } from "./docs-config"; import { convertLegacyDocsConfig } from "./docs-config/convertLegacyDocsConfig"; import { diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsAndSingleAPI.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsAndSingleAPI.ts index d00efa0fb28..cea0bd8504f 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsAndSingleAPI.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsAndSingleAPI.ts @@ -1,7 +1,9 @@ -import { docsYml } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, moveFolder } from "@fern-api/fs-utils"; import { rm, writeFile } from "fs/promises"; import yaml from "js-yaml"; + +import { docsYml } from "@fern-api/configuration-loader"; +import { AbsoluteFilePath, moveFolder } from "@fern-api/fs-utils"; + import { getAbsolutePathToDocsFolder, getAbsolutePathToDocsYaml, loadRawDocsConfiguration } from "./docs-config"; import { convertLegacyDocsConfig } from "./docs-config/convertLegacyDocsConfig"; import { getAbsolutePathToGeneratorsConfiguration, loadRawGeneratorsConfiguration } from "./generators-configuration"; diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsInstances.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsInstances.ts index 3f3f6eb13de..0156ed41d5d 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsInstances.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateDocsInstances.ts @@ -1,4 +1,5 @@ import { docsYml } from "@fern-api/configuration-loader"; + import { DocsURL } from "./docs-config"; export function migrateDocsInstances(docsURLs: docsYml.RawSchemas.DocsInstance[]): DocsURL[] { diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateOnlyMultipleAPIs.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateOnlyMultipleAPIs.ts index 433c9d89793..80a31b8bb67 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateOnlyMultipleAPIs.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateOnlyMultipleAPIs.ts @@ -1,10 +1,12 @@ -import { AbsoluteFilePath, join, moveFolder, RelativeFilePath } from "@fern-api/fs-utils"; import { mkdir, rm, writeFile } from "fs/promises"; import yaml from "js-yaml"; + +import { AbsoluteFilePath, RelativeFilePath, join, moveFolder } from "@fern-api/fs-utils"; + import { getAbsolutePathToGeneratorsConfiguration, loadRawGeneratorsConfiguration } from "./generators-configuration"; import { - convertLegacyGeneratorsConfiguration, - PathModificationStrategy + PathModificationStrategy, + convertLegacyGeneratorsConfiguration } from "./generators-configuration/convertLegacyGeneratorsConfiguration"; const APIS_DIRECTORY = "apis"; diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateOnlySingleAPI.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateOnlySingleAPI.ts index af0a64c883a..d231beaa936 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateOnlySingleAPI.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migrateOnlySingleAPI.ts @@ -1,6 +1,8 @@ -import { AbsoluteFilePath, moveFolder } from "@fern-api/fs-utils"; import { rmdir, writeFile } from "fs/promises"; import yaml from "js-yaml"; + +import { AbsoluteFilePath, moveFolder } from "@fern-api/fs-utils"; + import { convertLegacyGeneratorsConfiguration, getAbsolutePathToGeneratorsConfiguration, diff --git a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migration.ts b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migration.ts index def8de5065d..503a12614a0 100644 --- a/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.15.0-rc0/update-directory-structure/migration.ts @@ -1,12 +1,14 @@ +import { findUp } from "find-up"; + import { AbsoluteFilePath, Directory, + RelativeFilePath, doesPathExist, getDirectoryContents, - join, - RelativeFilePath + join } from "@fern-api/fs-utils"; -import { findUp } from "find-up"; + import { Migration } from "../../../types/Migration"; import { getAbsolutePathToDocsYaml } from "./docs-config"; import { migrateDocsAndMultipleAPIs } from "./migrateDocsAndMultipleAPIs"; diff --git a/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/__test__/add-value-key-to-type-examples.test.ts b/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/__test__/add-value-key-to-type-examples.test.ts index 29a3ec37415..4219eb2ea44 100644 --- a/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/__test__/add-value-key-to-type-examples.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/__test__/add-value-key-to-type-examples.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/getAllYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/getAllYamlFiles.ts index f0924c07854..ba1effd9e68 100644 --- a/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/getAllYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/getAllYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/migration.ts b/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/migration.ts index 7023e94356d..3f0678e038a 100644 --- a/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.3.0-rc12/add-value-key-to-type-examples/migration.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile, writeFile } from "fs/promises"; import YAML from "yaml"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { Migration } from "../../../types/Migration"; import { getAllYamlFiles } from "./getAllYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/__test__/change-services-key-to-service.test.ts b/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/__test__/change-services-key-to-service.test.ts index 730931f55f5..a525621c06d 100644 --- a/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/__test__/change-services-key-to-service.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/__test__/change-services-key-to-service.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/getAllYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/getAllYamlFiles.ts index f0924c07854..ba1effd9e68 100644 --- a/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/getAllYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/getAllYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/migration.ts b/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/migration.ts index 4c9d8340fcb..9c51bc42593 100644 --- a/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.3.23/change-services-key-to-service/migration.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile, writeFile } from "fs/promises"; import YAML from "yaml"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { Migration } from "../../../types/Migration"; import { getAllYamlFiles } from "./getAllYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.41.0-rc0/require-generators-yml/__test__/require-generators-yml.test.ts b/packages/cli/cli-migrations/src/migrations/0.41.0-rc0/require-generators-yml/__test__/require-generators-yml.test.ts index ad19104bbae..bec236f8bd2 100644 --- a/packages/cli/cli-migrations/src/migrations/0.41.0-rc0/require-generators-yml/__test__/require-generators-yml.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.41.0-rc0/require-generators-yml/__test__/require-generators-yml.test.ts @@ -1,13 +1,15 @@ +import { cp } from "fs/promises"; +import tmp from "tmp-promise"; + import { AbsoluteFilePath, + RelativeFilePath, getDirectoryContents, getDirectoryContentsForSnapshot, - join, - RelativeFilePath + join } from "@fern-api/fs-utils"; import { createMockTaskContext } from "@fern-api/task-context"; -import { cp } from "fs/promises"; -import tmp from "tmp-promise"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.41.0-rc0/require-generators-yml/migration.ts b/packages/cli/cli-migrations/src/migrations/0.41.0-rc0/require-generators-yml/migration.ts index 9aec7a63781..c32223eaa53 100644 --- a/packages/cli/cli-migrations/src/migrations/0.41.0-rc0/require-generators-yml/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.41.0-rc0/require-generators-yml/migration.ts @@ -1,19 +1,21 @@ +import chalk from "chalk"; +import { writeFile } from "fs/promises"; +import yaml from "js-yaml"; +import YAML from "yaml"; + import { getFernDirectory } from "@fern-api/configuration-loader"; import { AbsoluteFilePath, Directory, File, + RelativeFilePath, getDirectoryContents, join, - RelativeFilePath, relativize } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; -import yaml from "js-yaml"; -import YAML from "yaml"; + import { Migration } from "../../../types/Migration"; -import { writeFile } from "fs/promises"; -import chalk from "chalk"; export const migration: Migration = { name: "require-generators-yml", diff --git a/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/__test__/move-service-docs-to-top-level.test.ts b/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/__test__/move-service-docs-to-top-level.test.ts index 730931f55f5..a525621c06d 100644 --- a/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/__test__/move-service-docs-to-top-level.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/__test__/move-service-docs-to-top-level.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/getAllYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/getAllYamlFiles.ts index f0924c07854..ba1effd9e68 100644 --- a/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/getAllYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/getAllYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/migration.ts b/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/migration.ts index bfae6462eed..daa0d0289bb 100644 --- a/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.5.4/move-service-docs-to-top-level/migration.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile, writeFile } from "fs/promises"; import YAML from "yaml"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { Migration } from "../../../types/Migration"; import { getAllYamlFiles } from "./getAllYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/__test__/add-suffix-to-docs-domain.test.ts b/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/__test__/add-suffix-to-docs-domain.test.ts index e963ecee281..f3eef30b14d 100644 --- a/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/__test__/add-suffix-to-docs-domain.test.ts +++ b/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/__test__/add-suffix-to-docs-domain.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { cp, readFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { migration } from "../migration"; const FIXTURES_PATH = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/getAllGeneratorYamlFiles.ts b/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/getAllGeneratorYamlFiles.ts index 77538eadc4a..92e7ca57638 100644 --- a/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/getAllGeneratorYamlFiles.ts +++ b/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/getAllGeneratorYamlFiles.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { findUp } from "find-up"; import { glob } from "glob"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + const FERN_DIRECTORY = "fern"; export async function getAllGeneratorYamlFiles(context: TaskContext): Promise { diff --git a/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/migration.ts b/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/migration.ts index 1742cc8ae21..ac269e7f771 100644 --- a/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/migration.ts +++ b/packages/cli/cli-migrations/src/migrations/0.9.10/add-suffix-to-docs-domain/migration.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { readFile, writeFile } from "fs/promises"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { Migration } from "../../../types/Migration"; import { getAllGeneratorYamlFiles } from "./getAllGeneratorYamlFiles"; diff --git a/packages/cli/cli-migrations/src/migrations/all.ts b/packages/cli/cli-migrations/src/migrations/all.ts index f568d35cee8..07e81a9a9e4 100644 --- a/packages/cli/cli-migrations/src/migrations/all.ts +++ b/packages/cli/cli-migrations/src/migrations/all.ts @@ -9,11 +9,11 @@ import migrations_0_0_221 from "./0.0.221"; import migrations_0_0_241 from "./0.0.241"; import migrations_0_0_248 from "./0.0.248"; import migrations_0_1_3_rc3 from "./0.1.3-rc3"; -import migrations_0_15_0_rc0 from "./0.15.0-rc0"; import migrations_0_3_0_rc12 from "./0.3.0-rc12"; import migrations_0_3_23 from "./0.3.23"; import migrations_0_5_4 from "./0.5.4"; import migrations_0_9_10 from "./0.9.10"; +import migrations_0_15_0_rc0 from "./0.15.0-rc0"; import migrations_0_41_0_rc0 from "./0.41.0-rc0"; export const ALL_MIGRATIONS: VersionMigrations[] = [ diff --git a/packages/cli/cli-migrations/src/migrations/getMigrationsToRun.ts b/packages/cli/cli-migrations/src/migrations/getMigrationsToRun.ts index 7d31ccdd0ff..ef62c69a06d 100644 --- a/packages/cli/cli-migrations/src/migrations/getMigrationsToRun.ts +++ b/packages/cli/cli-migrations/src/migrations/getMigrationsToRun.ts @@ -1,4 +1,5 @@ import { isVersionAhead } from "@fern-api/semver-utils"; + import { VersionMigrations } from "../types/VersionMigrations"; import { ALL_MIGRATIONS } from "./all"; diff --git a/packages/cli/cli-migrations/src/runMigrations.ts b/packages/cli/cli-migrations/src/runMigrations.ts index 310dcf08e30..19409cae284 100644 --- a/packages/cli/cli-migrations/src/runMigrations.ts +++ b/packages/cli/cli-migrations/src/runMigrations.ts @@ -1,7 +1,9 @@ -import { addPrefixToString } from "@fern-api/core-utils"; -import { InteractiveTaskContext, Startable, TaskContext, TaskResult } from "@fern-api/task-context"; import chalk from "chalk"; import inquirer from "inquirer"; + +import { addPrefixToString } from "@fern-api/core-utils"; +import { InteractiveTaskContext, Startable, TaskContext, TaskResult } from "@fern-api/task-context"; + import { getMigrationsToRun } from "./migrations/getMigrationsToRun"; import { Migration } from "./types/Migration"; import { VersionMigrations } from "./types/VersionMigrations"; diff --git a/packages/cli/cli-source-resolver/package.json b/packages/cli/cli-source-resolver/package.json index ee0a3b01e03..4755ce1a9b8 100644 --- a/packages/cli/cli-source-resolver/package.json +++ b/packages/cli/cli-source-resolver/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": { @@ -39,8 +38,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" } } \ No newline at end of file diff --git a/packages/cli/cli-source-resolver/src/SourceResolverImpl.ts b/packages/cli/cli-source-resolver/src/SourceResolverImpl.ts index 5a4975b9b23..7019e434f55 100644 --- a/packages/cli/cli-source-resolver/src/SourceResolverImpl.ts +++ b/packages/cli/cli-source-resolver/src/SourceResolverImpl.ts @@ -1,9 +1,10 @@ -import { AbsoluteFilePath, doesPathExistSync, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { isRawProtobufSourceSchema, RawSchemas } from "@fern-api/fern-definition-schema"; -import { ProtobufParser } from "./parsers/ProtobufParser"; +import { RawSchemas, isRawProtobufSourceSchema } from "@fern-api/fern-definition-schema"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExistSync, join } from "@fern-api/fs-utils"; import { ResolvedSource, SourceResolver } from "@fern-api/source-resolver"; +import { TaskContext } from "@fern-api/task-context"; + +import { ProtobufParser } from "./parsers/ProtobufParser"; export class SourceResolverImpl implements SourceResolver { private readonly context: TaskContext; diff --git a/packages/cli/cli-source-resolver/src/parsers/ProtobufParser.ts b/packages/cli/cli-source-resolver/src/parsers/ProtobufParser.ts index d3fd3f084c0..ff604caf9f8 100644 --- a/packages/cli/cli-source-resolver/src/parsers/ProtobufParser.ts +++ b/packages/cli/cli-source-resolver/src/parsers/ProtobufParser.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { readFileSync } from "fs"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + export interface ProtobufFileInfo { csharpNamespace: string | undefined; packageName: string | undefined; diff --git a/packages/cli/cli-source-resolver/src/parsers/__test__/protobufParser.test.ts b/packages/cli/cli-source-resolver/src/parsers/__test__/protobufParser.test.ts index 066dfcc98a0..c0ba5a6ef58 100644 --- a/packages/cli/cli-source-resolver/src/parsers/__test__/protobufParser.test.ts +++ b/packages/cli/cli-source-resolver/src/parsers/__test__/protobufParser.test.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import path from "path"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ProtobufFileInfo, ProtobufParser } from "../ProtobufParser"; const TEST_DEFINITIONS = AbsoluteFilePath.of(path.join(__dirname, "protobuf/test-definitions")); diff --git a/packages/cli/cli/package.json b/packages/cli/cli/package.json index 2580a95a45f..f6be0d990fd 100644 --- a/packages/cli/cli/package.json +++ b/packages/cli/cli/package.json @@ -29,7 +29,6 @@ "lint:eslint:fix": "pnpm 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", "dist:cli:dev": "pnpm compile && node build.dev.cjs", "dist:cli:local": "pnpm compile && node build.local.cjs", @@ -108,8 +107,8 @@ "lodash-es": "^4.17.21", "openapi-types": "^12.1.3", "ora": "^7.0.1", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "tar": "^6.2.1", "tmp-promise": "^3.0.3", "tsup": "^8.3.5", diff --git a/packages/cli/cli/src/__test__/checkOutputDirectory.test.ts b/packages/cli/cli/src/__test__/checkOutputDirectory.test.ts index a71ab2a30d6..ae36a7ffd2a 100644 --- a/packages/cli/cli/src/__test__/checkOutputDirectory.test.ts +++ b/packages/cli/cli/src/__test__/checkOutputDirectory.test.ts @@ -1,11 +1,13 @@ -import { AbsoluteFilePath, join, RelativeFilePath, isCI } from "@fern-api/fs-utils"; import { mkdir, writeFile } from "fs/promises"; import tmp from "tmp-promise"; +import { Mock, afterEach, beforeEach, describe, expect, it, vi } from "vitest"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + +import { CliContext } from "../cli-context/CliContext"; import { checkOutputDirectory } from "../commands/generate/checkOutputDirectory"; import { getOutputDirectories } from "../persistence/output-directories/getOutputDirectories"; import { storeOutputDirectories } from "../persistence/output-directories/storeOutputDirectories"; -import { describe, it, expect, beforeEach, vi, Mock, afterEach } from "vitest"; -import { CliContext } from "../cli-context/CliContext"; vi.mock("../utils/isCI", () => ({ isCI: vi.fn().mockReturnValue(false) diff --git a/packages/cli/cli/src/__test__/checkOutputDirectoryCI.test.ts b/packages/cli/cli/src/__test__/checkOutputDirectoryCI.test.ts index 3d4855d05a3..655f3ab5287 100644 --- a/packages/cli/cli/src/__test__/checkOutputDirectoryCI.test.ts +++ b/packages/cli/cli/src/__test__/checkOutputDirectoryCI.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { mkdir, writeFile } from "fs/promises"; import tmp from "tmp-promise"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { CliContext } from "../cli-context/CliContext"; import { checkOutputDirectory } from "../commands/generate/checkOutputDirectory"; diff --git a/packages/cli/cli/src/cli-context/CliContext.ts b/packages/cli/cli/src/cli-context/CliContext.ts index 88775645122..f1ac706e3ae 100644 --- a/packages/cli/cli/src/cli-context/CliContext.ts +++ b/packages/cli/cli/src/cli-context/CliContext.ts @@ -1,20 +1,22 @@ -import { createLogger, LogLevel, LOG_LEVELS, Logger } from "@fern-api/logger"; +import { confirm } from "@inquirer/prompts"; +import chalk from "chalk"; +import { maxBy } from "lodash-es"; + +import { LOG_LEVELS, LogLevel, Logger, createLogger } from "@fern-api/logger"; import { getPosthogManager } from "@fern-api/posthog-manager"; import { Project } from "@fern-api/project-loader"; import { isVersionAhead } from "@fern-api/semver-utils"; import { FernCliError, Finishable, PosthogEvent, Startable, TaskContext, TaskResult } from "@fern-api/task-context"; import { Workspace } from "@fern-api/workspace-loader"; -import chalk from "chalk"; -import { maxBy } from "lodash-es"; + import { CliEnvironment } from "./CliEnvironment"; import { Log } from "./Log"; -import { logErrorMessage } from "./logErrorMessage"; import { TaskContextImpl } from "./TaskContextImpl"; import { TtyAwareLogger } from "./TtyAwareLogger"; +import { logErrorMessage } from "./logErrorMessage"; import { getFernUpgradeMessage } from "./upgrade-utils/getFernUpgradeMessage"; import { FernGeneratorUpgradeInfo, getProjectGeneratorUpgrades } from "./upgrade-utils/getGeneratorVersions"; import { getLatestVersionOfCli } from "./upgrade-utils/getLatestVersionOfCli"; -import { confirm } from "@inquirer/prompts"; const WORKSPACE_NAME_COLORS = ["#2E86AB", "#A23B72", "#F18F01", "#C73E1D", "#CCE2A3"]; @@ -142,7 +144,7 @@ export class CliContext { private longestWorkspaceName: string | undefined; public registerWorkspaces(workspaces: readonly Workspace[]): void { const longestWorkspaceName = maxBy( - workspaces.map((workspace) => (workspace.type === "docs" ? "docs" : workspace.workspaceName ?? "api")), + workspaces.map((workspace) => (workspace.type === "docs" ? "docs" : (workspace.workspaceName ?? "api"))), (name) => name.length ); if (longestWorkspaceName != null) { @@ -207,7 +209,7 @@ export class CliContext { private constructTaskInitForWorkspace(workspace: Workspace): TaskContextImpl.Init { const prefixWithoutPadding = wrapWorkspaceNameForPrefix( - workspace.type === "docs" ? "docs" : workspace.workspaceName ?? "api" + workspace.type === "docs" ? "docs" : (workspace.workspaceName ?? "api") ); // we want all the prefixes to be the same length, so use this.longestWorkspaceName diff --git a/packages/cli/cli/src/cli-context/TaskContextImpl.ts b/packages/cli/cli/src/cli-context/TaskContextImpl.ts index d5fba34575b..6b4e280b586 100644 --- a/packages/cli/cli/src/cli-context/TaskContextImpl.ts +++ b/packages/cli/cli/src/cli-context/TaskContextImpl.ts @@ -1,5 +1,7 @@ +import chalk from "chalk"; + import { addPrefixToString } from "@fern-api/core-utils"; -import { createLogger, LogLevel } from "@fern-api/logger"; +import { LogLevel, createLogger } from "@fern-api/logger"; import { CreateInteractiveTaskParams, FernCliError, @@ -10,7 +12,7 @@ import { TaskContext, TaskResult } from "@fern-api/task-context"; -import chalk from "chalk"; + import { Log } from "./Log"; import { logErrorMessage } from "./logErrorMessage"; diff --git a/packages/cli/cli/src/cli-context/TtyAwareLogger.ts b/packages/cli/cli/src/cli-context/TtyAwareLogger.ts index 780e674e09a..6266cb7bc2d 100644 --- a/packages/cli/cli/src/cli-context/TtyAwareLogger.ts +++ b/packages/cli/cli/src/cli-context/TtyAwareLogger.ts @@ -1,9 +1,11 @@ -import { addPrefixToString, assertNever, noop } from "@fern-api/core-utils"; -import { LogLevel, LOG_LEVELS } from "@fern-api/logger"; import ansiEscapes from "ansi-escapes"; import chalk from "chalk"; import IS_CI from "is-ci"; import ora, { Ora } from "ora"; + +import { addPrefixToString, assertNever, noop } from "@fern-api/core-utils"; +import { LOG_LEVELS, LogLevel } from "@fern-api/logger"; + import { Log } from "./Log"; import { TaskContextImpl } from "./TaskContextImpl"; diff --git a/packages/cli/cli/src/cli-context/logErrorMessage.ts b/packages/cli/cli/src/cli-context/logErrorMessage.ts index 9f5e8b2cdf9..8cd1cf5600e 100644 --- a/packages/cli/cli/src/cli-context/logErrorMessage.ts +++ b/packages/cli/cli/src/cli-context/logErrorMessage.ts @@ -1,7 +1,8 @@ -import { Logger, LogLevel } from "@fern-api/logger"; -import { FernCliError } from "@fern-api/task-context"; import chalk from "chalk"; +import { LogLevel, Logger } from "@fern-api/logger"; +import { FernCliError } from "@fern-api/task-context"; + export function logErrorMessage({ message, error, diff --git a/packages/cli/cli/src/cli-context/upgrade-utils/doesVersionOfCliExist.ts b/packages/cli/cli/src/cli-context/upgrade-utils/doesVersionOfCliExist.ts index 40a91359643..883a71c70ff 100644 --- a/packages/cli/cli/src/cli-context/upgrade-utils/doesVersionOfCliExist.ts +++ b/packages/cli/cli/src/cli-context/upgrade-utils/doesVersionOfCliExist.ts @@ -1,4 +1,5 @@ import latestVersion from "latest-version"; + import { CliEnvironment } from "../CliEnvironment"; export async function doesVersionOfCliExist({ diff --git a/packages/cli/cli/src/cli-context/upgrade-utils/getFernUpgradeMessage.ts b/packages/cli/cli/src/cli-context/upgrade-utils/getFernUpgradeMessage.ts index e3c62e5400e..3f6a6a8ead6 100644 --- a/packages/cli/cli/src/cli-context/upgrade-utils/getFernUpgradeMessage.ts +++ b/packages/cli/cli/src/cli-context/upgrade-utils/getFernUpgradeMessage.ts @@ -1,9 +1,11 @@ import boxen from "boxen"; import chalk from "chalk"; + +import { FernRegistryClient } from "@fern-fern/generators-sdk"; + import { FernUpgradeInfo } from "../CliContext"; import { CliEnvironment } from "../CliEnvironment"; import { FernGeneratorUpgradeInfo } from "./getGeneratorVersions"; -import { FernRegistryClient } from "@fern-fern/generators-sdk"; function hasGeneratorUpgrade(generatorUpgradeInfo: FernGeneratorUpgradeInfo[]): boolean { return generatorUpgradeInfo.filter((gui) => gui.isUpgradeAvailable).length > 0; diff --git a/packages/cli/cli/src/cli-context/upgrade-utils/getGeneratorVersions.ts b/packages/cli/cli/src/cli-context/upgrade-utils/getGeneratorVersions.ts index 2142c7d455b..f25540e297c 100644 --- a/packages/cli/cli/src/cli-context/upgrade-utils/getGeneratorVersions.ts +++ b/packages/cli/cli/src/cli-context/upgrade-utils/getGeneratorVersions.ts @@ -1,7 +1,7 @@ import { generatorsYml, - getLatestGeneratorVersion, getGeneratorNameOrThrow, + getLatestGeneratorVersion, loadGeneratorsConfiguration } from "@fern-api/configuration-loader"; import { Logger } from "@fern-api/logger"; @@ -9,7 +9,9 @@ import { Project } from "@fern-api/project-loader"; import { isVersionAhead } from "@fern-api/semver-utils"; import { TaskContext } from "@fern-api/task-context"; import { AbstractAPIWorkspace } from "@fern-api/workspace-loader"; + import { ReleaseType } from "@fern-fern/generators-sdk/api/resources/generators"; + import { CliContext } from "../CliContext"; export interface FernGeneratorUpgradeInfo { diff --git a/packages/cli/cli/src/cli-context/upgrade-utils/getLatestVersionOfCli.ts b/packages/cli/cli/src/cli-context/upgrade-utils/getLatestVersionOfCli.ts index 4494df26ffa..2bbfd86b99f 100644 --- a/packages/cli/cli/src/cli-context/upgrade-utils/getLatestVersionOfCli.ts +++ b/packages/cli/cli/src/cli-context/upgrade-utils/getLatestVersionOfCli.ts @@ -1,4 +1,5 @@ import latestVersion from "latest-version"; + import { CliEnvironment } from "../CliEnvironment"; export async function getLatestVersionOfCli({ diff --git a/packages/cli/cli/src/cli.ts b/packages/cli/cli/src/cli.ts index 3c29bcaa5e4..843c75bb065 100644 --- a/packages/cli/cli/src/cli.ts +++ b/packages/cli/cli/src/cli.ts @@ -1,23 +1,24 @@ #!/usr/bin/env node +import { RUNTIME } from "@fern-typescript/fetcher"; +import getPort from "get-port"; +import { Argv } from "yargs"; +import { hideBin } from "yargs/helpers"; +import yargs from "yargs/yargs"; import { GENERATORS_CONFIGURATION_FILENAME, + PROJECT_CONFIG_FILENAME, generatorsYml, getFernDirectory, - loadProjectConfig, - PROJECT_CONFIG_FILENAME + loadProjectConfig } from "@fern-api/configuration-loader"; import { AbsoluteFilePath, cwd, doesPathExist, isURL, resolve } from "@fern-api/fs-utils"; import { initializeAPI, initializeDocs, initializeWithMintlify } from "@fern-api/init"; import { LOG_LEVELS, LogLevel } from "@fern-api/logger"; import { askToLogin, login } from "@fern-api/login"; import { FernCliError, LoggableFernCliError } from "@fern-api/task-context"; -import { RUNTIME } from "@fern-typescript/fetcher"; -import getPort from "get-port"; -import { Argv } from "yargs"; -import { hideBin } from "yargs/helpers"; -import yargs from "yargs/yargs"; -import { loadOpenAPIFromUrl, LoadOpenAPIStatus } from "../../init/src/utils/loadOpenApiFromUrl"; + +import { LoadOpenAPIStatus, loadOpenAPIFromUrl } from "../../init/src/utils/loadOpenApiFromUrl"; import { CliContext } from "./cli-context/CliContext"; import { getLatestVersionOfCli } from "./cli-context/upgrade-utils/getLatestVersionOfCli"; import { GlobalCliOptions, loadProjectAndRegisterWorkspacesWithContext } from "./cliCommons"; @@ -31,7 +32,7 @@ import { generateIrForWorkspaces } from "./commands/generate-ir/generateIrForWor import { generateOpenApiToFdrApiDefinitionForWorkspaces } from "./commands/generate-openapi-fdr/generateOpenApiToFdrApiDefinitionForWorkspaces"; import { generateOpenAPIIrForWorkspaces } from "./commands/generate-openapi-ir/generateOpenAPIIrForWorkspaces"; import { writeOverridesForWorkspaces } from "./commands/generate-overrides/writeOverridesForWorkspaces"; -import { generateAPIWorkspaces, GenerationMode } from "./commands/generate/generateAPIWorkspaces"; +import { GenerationMode, generateAPIWorkspaces } from "./commands/generate/generateAPIWorkspaces"; import { generateDocsWorkspace } from "./commands/generate/generateDocsWorkspace"; import { generateJsonschemaForWorkspaces } from "./commands/jsonschema/generateJsonschemaForWorkspace"; import { mockServer } from "./commands/mock/mockServer"; diff --git a/packages/cli/cli/src/cliCommons.ts b/packages/cli/cli/src/cliCommons.ts index cd92963df34..93b8c4f9ff5 100644 --- a/packages/cli/cli/src/cliCommons.ts +++ b/packages/cli/cli/src/cliCommons.ts @@ -1,5 +1,6 @@ import { LogLevel } from "@fern-api/logger"; -import { loadProject, Project } from "@fern-api/project-loader"; +import { Project, loadProject } from "@fern-api/project-loader"; + import { CliContext } from "./cli-context/CliContext"; export interface GlobalCliOptions { diff --git a/packages/cli/cli/src/cliV2.ts b/packages/cli/cli/src/cliV2.ts index dc4b1ffdff5..6787bc3ae68 100644 --- a/packages/cli/cli/src/cliV2.ts +++ b/packages/cli/cli/src/cliV2.ts @@ -1,15 +1,18 @@ -import { FernRegistry } from "@fern-fern/generators-sdk"; -import { GENERATORS_CONFIGURATION_FILENAME } from "@fern-api/configuration-loader"; +import { writeFile } from "fs/promises"; import { Argv } from "yargs"; + +import { GENERATORS_CONFIGURATION_FILENAME } from "@fern-api/configuration-loader"; + +import { FernRegistry } from "@fern-fern/generators-sdk"; + import { CliContext } from "./cli-context/CliContext"; +import { getGeneratorUpgradeMessage } from "./cli-context/upgrade-utils/getFernUpgradeMessage"; +import { getProjectGeneratorUpgrades } from "./cli-context/upgrade-utils/getGeneratorVersions"; import { GlobalCliOptions, loadProjectAndRegisterWorkspacesWithContext } from "./cliCommons"; -import { getGeneratorList, GenerationModeFilter } from "./commands/generator-list/getGeneratorList"; +import { GenerationModeFilter, getGeneratorList } from "./commands/generator-list/getGeneratorList"; import { getGeneratorMetadata } from "./commands/generator-metadata/getGeneratorMetadata"; import { getOrganziation } from "./commands/organization/getOrganization"; import { upgradeGenerator } from "./commands/upgrade/upgradeGenerator"; -import { getProjectGeneratorUpgrades } from "./cli-context/upgrade-utils/getGeneratorVersions"; -import { getGeneratorUpgradeMessage } from "./cli-context/upgrade-utils/getFernUpgradeMessage"; -import { writeFile } from "fs/promises"; export function addGetOrganizationCommand(cli: Argv, cliContext: CliContext): void { cli.command( @@ -305,8 +308,8 @@ export function addGeneratorCommands(cli: Argv, cliContext: Cl generator.outputMode.type === "github" ? generator.outputMode.repo : generator.outputMode.type === "githubV2" - ? generator.outputMode.githubV2.repo - : undefined; + ? generator.outputMode.githubV2.repo + : undefined; if (repository != null) { generatorMetadata.repository = repository; if (argv.output == null) { diff --git a/packages/cli/cli/src/commands/add-generator/addGeneratorToWorkspaces.ts b/packages/cli/cli/src/commands/add-generator/addGeneratorToWorkspaces.ts index 68d0ab1f4dd..7215044171f 100644 --- a/packages/cli/cli/src/commands/add-generator/addGeneratorToWorkspaces.ts +++ b/packages/cli/cli/src/commands/add-generator/addGeneratorToWorkspaces.ts @@ -1,12 +1,14 @@ +import chalk from "chalk"; +import { writeFile } from "fs/promises"; +import yaml from "js-yaml"; + import { addGenerator, getPathToGeneratorsConfiguration, loadRawGeneratorsConfiguration } from "@fern-api/configuration-loader"; import { Project } from "@fern-api/project-loader"; -import chalk from "chalk"; -import { writeFile } from "fs/promises"; -import yaml from "js-yaml"; + import { CliContext } from "../../cli-context/CliContext"; export async function addGeneratorToWorkspaces({ diff --git a/packages/cli/cli/src/commands/docs-dev/devDocsWorkspace.ts b/packages/cli/cli/src/commands/docs-dev/devDocsWorkspace.ts index 244231a0ac1..c650c79fadd 100644 --- a/packages/cli/cli/src/commands/docs-dev/devDocsWorkspace.ts +++ b/packages/cli/cli/src/commands/docs-dev/devDocsWorkspace.ts @@ -1,5 +1,6 @@ import { runPreviewServer } from "@fern-api/docs-preview"; import { Project } from "@fern-api/project-loader"; + import { CliContext } from "../../cli-context/CliContext"; import { validateAPIWorkspaceWithoutExiting } from "../validate/validateAPIWorkspaceAndLogIssues"; import { validateDocsWorkspaceWithoutExiting } from "../validate/validateDocsWorkspaceAndLogIssues"; diff --git a/packages/cli/cli/src/commands/format/formatWorkspaces.ts b/packages/cli/cli/src/commands/format/formatWorkspaces.ts index 64623914749..02d202bba65 100644 --- a/packages/cli/cli/src/commands/format/formatWorkspaces.ts +++ b/packages/cli/cli/src/commands/format/formatWorkspaces.ts @@ -1,6 +1,7 @@ -import { Project } from "@fern-api/project-loader"; -import { OSSWorkspace } from "@fern-api/lazy-fern-workspace"; import { formatWorkspace } from "@fern-api/fern-definition-formatter"; +import { OSSWorkspace } from "@fern-api/lazy-fern-workspace"; +import { Project } from "@fern-api/project-loader"; + import { CliContext } from "../../cli-context/CliContext"; export async function formatWorkspaces({ diff --git a/packages/cli/cli/src/commands/generate-dynamic-ir/generateDynamicIrForWorkspaces.ts b/packages/cli/cli/src/commands/generate-dynamic-ir/generateDynamicIrForWorkspaces.ts index e1d6bd7b25d..614f85d7218 100644 --- a/packages/cli/cli/src/commands/generate-dynamic-ir/generateDynamicIrForWorkspaces.ts +++ b/packages/cli/cli/src/commands/generate-dynamic-ir/generateDynamicIrForWorkspaces.ts @@ -1,7 +1,9 @@ +import path from "path"; + import { Audiences, generatorsYml } from "@fern-api/configuration-loader"; import { AbsoluteFilePath, streamObjectToFile, stringifyLargeObject } from "@fern-api/fs-utils"; import { Project } from "@fern-api/project-loader"; -import path from "path"; + import { CliContext } from "../../cli-context/CliContext"; import { generateIrForFernWorkspace } from "../generate-ir/generateIrForFernWorkspace"; diff --git a/packages/cli/cli/src/commands/generate-fdr/generateFdrApiDefinitionForWorkspaces.ts b/packages/cli/cli/src/commands/generate-fdr/generateFdrApiDefinitionForWorkspaces.ts index ea696e95f2c..0f094cc10ee 100644 --- a/packages/cli/cli/src/commands/generate-fdr/generateFdrApiDefinitionForWorkspaces.ts +++ b/packages/cli/cli/src/commands/generate-fdr/generateFdrApiDefinitionForWorkspaces.ts @@ -1,9 +1,11 @@ +import { writeFile } from "fs/promises"; +import path from "path"; + import { Audiences } from "@fern-api/configuration-loader"; import { AbsoluteFilePath, stringifyLargeObject } from "@fern-api/fs-utils"; import { Project } from "@fern-api/project-loader"; import { convertIrToFdrApi } from "@fern-api/register"; -import { writeFile } from "fs/promises"; -import path from "path"; + import { CliContext } from "../../cli-context/CliContext"; import { generateIrForFernWorkspace } from "../generate-ir/generateIrForFernWorkspace"; diff --git a/packages/cli/cli/src/commands/generate-ir/generateIrForFernWorkspace.ts b/packages/cli/cli/src/commands/generate-ir/generateIrForFernWorkspace.ts index 991bf62d31f..428231eec79 100644 --- a/packages/cli/cli/src/commands/generate-ir/generateIrForFernWorkspace.ts +++ b/packages/cli/cli/src/commands/generate-ir/generateIrForFernWorkspace.ts @@ -1,10 +1,11 @@ +import { FernWorkspace } from "@fern-api/api-workspace-commons"; +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { Audiences, generatorsYml } from "@fern-api/configuration-loader"; import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { IntermediateRepresentation } from "@fern-api/ir-sdk"; import { TaskContext } from "@fern-api/task-context"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; + import { validateAPIWorkspaceAndLogIssues } from "../validate/validateAPIWorkspaceAndLogIssues"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; export async function generateIrForFernWorkspace({ workspace, diff --git a/packages/cli/cli/src/commands/generate-ir/generateIrForWorkspaces.ts b/packages/cli/cli/src/commands/generate-ir/generateIrForWorkspaces.ts index fb06af2b50f..7d7cc63f720 100644 --- a/packages/cli/cli/src/commands/generate-ir/generateIrForWorkspaces.ts +++ b/packages/cli/cli/src/commands/generate-ir/generateIrForWorkspaces.ts @@ -1,11 +1,13 @@ +import path from "path"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { Audiences, generatorsYml } from "@fern-api/configuration-loader"; import { AbsoluteFilePath, streamObjectToFile, stringifyLargeObject } from "@fern-api/fs-utils"; import { migrateIntermediateRepresentationThroughVersion } from "@fern-api/ir-migrations"; import { serialization as IrSerialization } from "@fern-api/ir-sdk"; import { Project } from "@fern-api/project-loader"; import { TaskContext } from "@fern-api/task-context"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import path from "path"; + import { CliContext } from "../../cli-context/CliContext"; import { generateIrForFernWorkspace } from "./generateIrForFernWorkspace"; diff --git a/packages/cli/cli/src/commands/generate-openapi-fdr/generateOpenApiToFdrApiDefinitionForWorkspaces.ts b/packages/cli/cli/src/commands/generate-openapi-fdr/generateOpenApiToFdrApiDefinitionForWorkspaces.ts index d7df7f8c4f8..b7942228696 100644 --- a/packages/cli/cli/src/commands/generate-openapi-fdr/generateOpenApiToFdrApiDefinitionForWorkspaces.ts +++ b/packages/cli/cli/src/commands/generate-openapi-fdr/generateOpenApiToFdrApiDefinitionForWorkspaces.ts @@ -1,15 +1,17 @@ -import { AbsoluteFilePath, stringifyLargeObject } from "@fern-api/fs-utils"; -import { Project } from "@fern-api/project-loader"; import { writeFile } from "fs/promises"; +import { merge } from "lodash-es"; +import { OpenAPIV3_1 } from "openapi-types"; import path from "path"; -import { CliContext } from "../../cli-context/CliContext"; -import { getAllOpenAPISpecs, LazyFernWorkspace, OSSWorkspace, OpenAPILoader } from "@fern-api/lazy-fern-workspace"; + // TODO: clean up imports import { OpenApiDocumentConverterNode } from "@fern-api/docs-parsers"; import { ErrorCollector } from "@fern-api/docs-parsers"; import { BaseOpenApiV3_1ConverterNodeContext } from "@fern-api/docs-parsers"; -import { OpenAPIV3_1 } from "openapi-types"; -import { merge } from "lodash-es"; +import { AbsoluteFilePath, stringifyLargeObject } from "@fern-api/fs-utils"; +import { LazyFernWorkspace, OSSWorkspace, OpenAPILoader, getAllOpenAPISpecs } from "@fern-api/lazy-fern-workspace"; +import { Project } from "@fern-api/project-loader"; + +import { CliContext } from "../../cli-context/CliContext"; export async function generateOpenApiToFdrApiDefinitionForWorkspaces({ project, diff --git a/packages/cli/cli/src/commands/generate-openapi-ir/generateOpenAPIIrForWorkspaces.ts b/packages/cli/cli/src/commands/generate-openapi-ir/generateOpenAPIIrForWorkspaces.ts index 5ff19e80ca0..804574200f8 100644 --- a/packages/cli/cli/src/commands/generate-openapi-ir/generateOpenAPIIrForWorkspaces.ts +++ b/packages/cli/cli/src/commands/generate-openapi-ir/generateOpenAPIIrForWorkspaces.ts @@ -1,11 +1,13 @@ +import { writeFile } from "fs/promises"; +import path from "path"; + import { generatorsYml } from "@fern-api/configuration-loader"; import { AbsoluteFilePath, stringifyLargeObject } from "@fern-api/fs-utils"; +import { LazyFernWorkspace, OSSWorkspace, OpenAPILoader, getAllOpenAPISpecs } from "@fern-api/lazy-fern-workspace"; import { serialization } from "@fern-api/openapi-ir"; import { parse } from "@fern-api/openapi-ir-parser"; import { Project } from "@fern-api/project-loader"; -import { getAllOpenAPISpecs, LazyFernWorkspace, OpenAPILoader, OSSWorkspace } from "@fern-api/lazy-fern-workspace"; -import { writeFile } from "fs/promises"; -import path from "path"; + import { CliContext } from "../../cli-context/CliContext"; export async function generateOpenAPIIrForWorkspaces({ diff --git a/packages/cli/cli/src/commands/generate-overrides/writeOverridesForWorkspaces.ts b/packages/cli/cli/src/commands/generate-overrides/writeOverridesForWorkspaces.ts index e1da71a8b28..4c6762b63cd 100644 --- a/packages/cli/cli/src/commands/generate-overrides/writeOverridesForWorkspaces.ts +++ b/packages/cli/cli/src/commands/generate-overrides/writeOverridesForWorkspaces.ts @@ -1,12 +1,14 @@ -import { dirname, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { readFile, writeFile } from "fs/promises"; +import yaml from "js-yaml"; + +import { RelativeFilePath, dirname, join } from "@fern-api/fs-utils"; +import { OSSWorkspace, OpenAPILoader, getAllOpenAPISpecs } from "@fern-api/lazy-fern-workspace"; import { Schema } from "@fern-api/openapi-ir"; -import { getEndpointLocation } from "@fern-api/openapi-ir-to-fern"; import { parse } from "@fern-api/openapi-ir-parser"; +import { getEndpointLocation } from "@fern-api/openapi-ir-to-fern"; import { Project } from "@fern-api/project-loader"; import { TaskContext } from "@fern-api/task-context"; -import { getAllOpenAPISpecs, OpenAPILoader, OSSWorkspace } from "@fern-api/lazy-fern-workspace"; -import { readFile, writeFile } from "fs/promises"; -import yaml from "js-yaml"; + import { CliContext } from "../../cli-context/CliContext"; export async function writeOverridesForWorkspaces({ @@ -122,7 +124,7 @@ function writeModels(existingSchemas: Record>, s } // eslint-disable-next-line @typescript-eslint/no-explicit-any const typeNameOverride: Record = {}; - typeNameOverride["x-fern-type-name"] = "nameOverride" in schema ? schema.nameOverride ?? schemaId : schemaId; + typeNameOverride["x-fern-type-name"] = "nameOverride" in schema ? (schema.nameOverride ?? schemaId) : schemaId; existingSchemas[schemaId] = typeNameOverride; } } diff --git a/packages/cli/cli/src/commands/generate/checkOutputDirectory.ts b/packages/cli/cli/src/commands/generate/checkOutputDirectory.ts index 53009c36e60..44ecfc1efbc 100644 --- a/packages/cli/cli/src/commands/generate/checkOutputDirectory.ts +++ b/packages/cli/cli/src/commands/generate/checkOutputDirectory.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, doesPathExist, isCI } from "@fern-api/fs-utils"; import { readdir } from "fs/promises"; + +import { AbsoluteFilePath, doesPathExist, isCI } from "@fern-api/fs-utils"; + import { CliContext } from "../../cli-context/CliContext"; import { getOutputDirectories } from "../../persistence/output-directories/getOutputDirectories"; import { storeOutputDirectories } from "../../persistence/output-directories/storeOutputDirectories"; diff --git a/packages/cli/cli/src/commands/generate/generateAPIWorkspace.ts b/packages/cli/cli/src/commands/generate/generateAPIWorkspace.ts index c071e680c36..6b503b3b073 100644 --- a/packages/cli/cli/src/commands/generate/generateAPIWorkspace.ts +++ b/packages/cli/cli/src/commands/generate/generateAPIWorkspace.ts @@ -1,14 +1,15 @@ import { FernToken } from "@fern-api/auth"; import { DEFAULT_GROUP_GENERATORS_CONFIG_KEY, - fernConfigJson, - GENERATORS_CONFIGURATION_FILENAME + GENERATORS_CONFIGURATION_FILENAME, + fernConfigJson } from "@fern-api/configuration-loader"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { runLocalGenerationForWorkspace } from "@fern-api/local-workspace-runner"; import { runRemoteGenerationForAPIWorkspace } from "@fern-api/remote-workspace-runner"; import { TaskContext } from "@fern-api/task-context"; import { AbstractAPIWorkspace } from "@fern-api/workspace-loader"; + import { GROUP_CLI_OPTION } from "../../constants"; import { validateAPIWorkspaceAndLogIssues } from "../validate/validateAPIWorkspaceAndLogIssues"; import { GenerationMode } from "./generateAPIWorkspaces"; diff --git a/packages/cli/cli/src/commands/generate/generateAPIWorkspaces.ts b/packages/cli/cli/src/commands/generate/generateAPIWorkspaces.ts index b25b1ae1fd2..e8bac0057ab 100644 --- a/packages/cli/cli/src/commands/generate/generateAPIWorkspaces.ts +++ b/packages/cli/cli/src/commands/generate/generateAPIWorkspaces.ts @@ -1,8 +1,9 @@ -import { createOrganizationIfDoesNotExist, FernToken } from "@fern-api/auth"; +import { FernToken, createOrganizationIfDoesNotExist } from "@fern-api/auth"; import { Values } from "@fern-api/core-utils"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; import { askToLogin } from "@fern-api/login"; import { Project } from "@fern-api/project-loader"; + import { CliContext } from "../../cli-context/CliContext"; import { PREVIEW_DIRECTORY } from "../../constants"; import { checkOutputDirectory } from "./checkOutputDirectory"; diff --git a/packages/cli/cli/src/commands/generate/generateDocsWorkspace.ts b/packages/cli/cli/src/commands/generate/generateDocsWorkspace.ts index 1bc187b20e8..689d242d804 100644 --- a/packages/cli/cli/src/commands/generate/generateDocsWorkspace.ts +++ b/packages/cli/cli/src/commands/generate/generateDocsWorkspace.ts @@ -2,6 +2,7 @@ import { createOrganizationIfDoesNotExist } from "@fern-api/auth"; import { askToLogin } from "@fern-api/login"; import { Project } from "@fern-api/project-loader"; import { runRemoteGenerationForDocsWorkspace } from "@fern-api/remote-workspace-runner"; + import { CliContext } from "../../cli-context/CliContext"; import { validateDocsWorkspaceAndLogIssues } from "../validate/validateDocsWorkspaceAndLogIssues"; diff --git a/packages/cli/cli/src/commands/generator-list/getGeneratorList.ts b/packages/cli/cli/src/commands/generator-list/getGeneratorList.ts index 3bcfa6c9cc0..72c7fb00c4c 100644 --- a/packages/cli/cli/src/commands/generator-list/getGeneratorList.ts +++ b/packages/cli/cli/src/commands/generator-list/getGeneratorList.ts @@ -1,9 +1,11 @@ -import { generatorsYml, loadGeneratorsConfiguration } from "@fern-api/configuration-loader"; -import { Project } from "@fern-api/project-loader"; import { writeFile } from "fs/promises"; import yaml from "js-yaml"; -import { CliContext } from "../../cli-context/CliContext"; + +import { generatorsYml, loadGeneratorsConfiguration } from "@fern-api/configuration-loader"; import { Values, assertNever } from "@fern-api/core-utils"; +import { Project } from "@fern-api/project-loader"; + +import { CliContext } from "../../cli-context/CliContext"; export const GenerationModeFilter = { GitHub: "github", diff --git a/packages/cli/cli/src/commands/generator-metadata/getGeneratorMetadata.ts b/packages/cli/cli/src/commands/generator-metadata/getGeneratorMetadata.ts index e68bffdcb63..a02cb16d9a1 100644 --- a/packages/cli/cli/src/commands/generator-metadata/getGeneratorMetadata.ts +++ b/packages/cli/cli/src/commands/generator-metadata/getGeneratorMetadata.ts @@ -1,5 +1,6 @@ import { generatorsYml, loadGeneratorsConfiguration } from "@fern-api/configuration-loader"; import { Project } from "@fern-api/project-loader"; + import { CliContext } from "../../cli-context/CliContext"; export async function getGeneratorMetadata({ diff --git a/packages/cli/cli/src/commands/jsonschema/generateJsonschemaForWorkspace.ts b/packages/cli/cli/src/commands/jsonschema/generateJsonschemaForWorkspace.ts index 4367c0f4ff0..30172032265 100644 --- a/packages/cli/cli/src/commands/jsonschema/generateJsonschemaForWorkspace.ts +++ b/packages/cli/cli/src/commands/jsonschema/generateJsonschemaForWorkspace.ts @@ -1,17 +1,19 @@ +import chalk from "chalk"; +import { mkdir, writeFile } from "fs/promises"; + +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, doesPathExist, RelativeFilePath, dirname } from "@fern-api/fs-utils"; -import { Project } from "@fern-api/project-loader"; -import { CliContext } from "../../cli-context/CliContext"; -import { convertIRtoJsonSchema } from "@fern-api/ir-to-jsonschema"; +import { AbsoluteFilePath, RelativeFilePath, dirname, doesPathExist } from "@fern-api/fs-utils"; import { IdGenerator, - generateIntermediateRepresentation, constructCasingsGenerator, - convertToFernFilepath + convertToFernFilepath, + generateIntermediateRepresentation } from "@fern-api/ir-generator"; -import { mkdir, writeFile } from "fs/promises"; -import chalk from "chalk"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; +import { convertIRtoJsonSchema } from "@fern-api/ir-to-jsonschema"; +import { Project } from "@fern-api/project-loader"; + +import { CliContext } from "../../cli-context/CliContext"; export async function generateJsonschemaForWorkspaces({ typeLocator, diff --git a/packages/cli/cli/src/commands/mock/mockServer.ts b/packages/cli/cli/src/commands/mock/mockServer.ts index 3e227e5b6dd..199295dee9a 100644 --- a/packages/cli/cli/src/commands/mock/mockServer.ts +++ b/packages/cli/cli/src/commands/mock/mockServer.ts @@ -1,11 +1,12 @@ +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { MockServer } from "@fern-api/mock"; import { Project } from "@fern-api/project-loader"; import { AbstractAPIWorkspace, FernWorkspace } from "@fern-api/workspace-loader"; + import { CliContext } from "../../cli-context/CliContext"; import { API_CLI_OPTION } from "../../constants"; import { validateAPIWorkspaceAndLogIssues } from "../validate/validateAPIWorkspaceAndLogIssues"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; export async function mockServer({ cliContext, diff --git a/packages/cli/cli/src/commands/organization/getOrganization.ts b/packages/cli/cli/src/commands/organization/getOrganization.ts index 22d329e9fda..14c7e958c0e 100644 --- a/packages/cli/cli/src/commands/organization/getOrganization.ts +++ b/packages/cli/cli/src/commands/organization/getOrganization.ts @@ -1,5 +1,7 @@ -import { Project } from "@fern-api/project-loader"; import { writeFile } from "fs/promises"; + +import { Project } from "@fern-api/project-loader"; + import { CliContext } from "../../cli-context/CliContext"; export async function getOrganziation({ diff --git a/packages/cli/cli/src/commands/register/registerWorkspacesV1.ts b/packages/cli/cli/src/commands/register/registerWorkspacesV1.ts index dea51e5bcdb..baf2377c6e9 100644 --- a/packages/cli/cli/src/commands/register/registerWorkspacesV1.ts +++ b/packages/cli/cli/src/commands/register/registerWorkspacesV1.ts @@ -1,14 +1,17 @@ -import { createOrganizationIfDoesNotExist, FernToken } from "@fern-api/auth"; -import { createFiddleService } from "@fern-api/core"; -import { Project } from "@fern-api/project-loader"; -import { OSSWorkspace } from "@fern-api/lazy-fern-workspace"; -import { YAML_SCHEMA_VERSION } from "@fern-api/fern-definition-schema"; -import { FernFiddle } from "@fern-fern/fiddle-sdk"; import axios from "axios"; import { readFile } from "fs/promises"; import path from "path"; import { create as createTar } from "tar"; import tmp from "tmp-promise"; + +import { FernToken, createOrganizationIfDoesNotExist } from "@fern-api/auth"; +import { createFiddleService } from "@fern-api/core"; +import { YAML_SCHEMA_VERSION } from "@fern-api/fern-definition-schema"; +import { OSSWorkspace } from "@fern-api/lazy-fern-workspace"; +import { Project } from "@fern-api/project-loader"; + +import { FernFiddle } from "@fern-fern/fiddle-sdk"; + import { CliContext } from "../../cli-context/CliContext"; export async function registerWorkspacesV1({ diff --git a/packages/cli/cli/src/commands/register/registerWorkspacesV2.ts b/packages/cli/cli/src/commands/register/registerWorkspacesV2.ts index df857b64cb2..360243d0638 100644 --- a/packages/cli/cli/src/commands/register/registerWorkspacesV2.ts +++ b/packages/cli/cli/src/commands/register/registerWorkspacesV2.ts @@ -1,7 +1,9 @@ +import chalk from "chalk"; + import { FernToken } from "@fern-api/auth"; import { Project } from "@fern-api/project-loader"; import { registerApi } from "@fern-api/register"; -import chalk from "chalk"; + import { CliContext } from "../../cli-context/CliContext"; export async function registerWorkspacesV2({ diff --git a/packages/cli/cli/src/commands/test/testOutput.ts b/packages/cli/cli/src/commands/test/testOutput.ts index 9dff474a8ee..431a4cda172 100644 --- a/packages/cli/cli/src/commands/test/testOutput.ts +++ b/packages/cli/cli/src/commands/test/testOutput.ts @@ -1,13 +1,14 @@ +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { generatorsYml } from "@fern-api/configuration-loader"; import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { loggingExeca } from "@fern-api/logging-execa"; import { MockServer } from "@fern-api/mock"; import { Project } from "@fern-api/project-loader"; import { AbstractAPIWorkspace, FernWorkspace } from "@fern-api/workspace-loader"; + import { CliContext } from "../../cli-context/CliContext"; import { API_CLI_OPTION } from "../../constants"; import { validateAPIWorkspaceAndLogIssues } from "../validate/validateAPIWorkspaceAndLogIssues"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; export async function testOutput({ cliContext, diff --git a/packages/cli/cli/src/commands/token/token.ts b/packages/cli/cli/src/commands/token/token.ts index 69d98f0ce0b..6e1e1d29eae 100644 --- a/packages/cli/cli/src/commands/token/token.ts +++ b/packages/cli/cli/src/commands/token/token.ts @@ -1,8 +1,9 @@ +import chalk from "chalk"; + import { createVenusService } from "@fern-api/core"; import { askToLogin } from "@fern-api/login"; import { TaskContext } from "@fern-api/task-context"; import { FernVenusApi } from "@fern-api/venus-api-sdk"; -import chalk from "chalk"; export async function generateToken({ orgId, diff --git a/packages/cli/cli/src/commands/upgrade/updateApiSpec.ts b/packages/cli/cli/src/commands/upgrade/updateApiSpec.ts index d54ba582ca2..b32b2eef828 100644 --- a/packages/cli/cli/src/commands/upgrade/updateApiSpec.ts +++ b/packages/cli/cli/src/commands/upgrade/updateApiSpec.ts @@ -1,14 +1,16 @@ -import { generatorsYml, getFernDirectory, loadGeneratorsConfiguration } from "@fern-api/configuration-loader"; -import { assertNever, isPlainObject } from "@fern-api/core-utils"; -import { join, RelativeFilePath, AbsoluteFilePath } from "@fern-api/fs-utils"; -import { Logger } from "@fern-api/logger"; -import { Project } from "@fern-api/project-loader"; import * as fs from "fs"; import { readFile, writeFile } from "fs/promises"; import yaml from "js-yaml"; import { Readable } from "stream"; import { finished } from "stream/promises"; import { ReadableStream } from "stream/web"; + +import { generatorsYml, getFernDirectory, loadGeneratorsConfiguration } from "@fern-api/configuration-loader"; +import { assertNever, isPlainObject } from "@fern-api/core-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { Logger } from "@fern-api/logger"; +import { Project } from "@fern-api/project-loader"; + import { CliContext } from "../../cli-context/CliContext"; async function fetchAndWriteFile(url: string, path: string, logger: Logger): Promise { diff --git a/packages/cli/cli/src/commands/upgrade/upgrade.ts b/packages/cli/cli/src/commands/upgrade/upgrade.ts index 62f95d661ef..c43329d5d36 100644 --- a/packages/cli/cli/src/commands/upgrade/upgrade.ts +++ b/packages/cli/cli/src/commands/upgrade/upgrade.ts @@ -1,10 +1,12 @@ -import { fernConfigJson, FERN_DIRECTORY, getFernDirectory, loadProjectConfig } from "@fern-api/configuration-loader"; -import { loggingExeca } from "@fern-api/logging-execa"; -import { isVersionAhead } from "@fern-api/semver-utils"; -import { runMigrations } from "@fern-api/cli-migrations"; import chalk from "chalk"; import { writeFile } from "fs/promises"; import { produce } from "immer"; + +import { runMigrations } from "@fern-api/cli-migrations"; +import { FERN_DIRECTORY, fernConfigJson, getFernDirectory, loadProjectConfig } from "@fern-api/configuration-loader"; +import { loggingExeca } from "@fern-api/logging-execa"; +import { isVersionAhead } from "@fern-api/semver-utils"; + import { CliContext } from "../../cli-context/CliContext"; import { doesVersionOfCliExist } from "../../cli-context/upgrade-utils/doesVersionOfCliExist"; import { rerunFernCliAtVersion } from "../../rerunFernCliAtVersion"; diff --git a/packages/cli/cli/src/commands/upgrade/upgradeGenerator.ts b/packages/cli/cli/src/commands/upgrade/upgradeGenerator.ts index 2b0291f042a..83a10452e4a 100644 --- a/packages/cli/cli/src/commands/upgrade/upgradeGenerator.ts +++ b/packages/cli/cli/src/commands/upgrade/upgradeGenerator.ts @@ -1,3 +1,8 @@ +import chalk from "chalk"; +import { readFile, writeFile } from "fs/promises"; +import path from "path"; +import YAML from "yaml"; + import { getGeneratorNameOrThrow, getLatestGeneratorVersion, @@ -7,11 +12,9 @@ import { import { AbsoluteFilePath, doesPathExist } from "@fern-api/fs-utils"; import { Project } from "@fern-api/project-loader"; import { TaskContext } from "@fern-api/task-context"; + import { FernRegistry } from "@fern-fern/generators-sdk"; -import chalk from "chalk"; -import { readFile, writeFile } from "fs/promises"; -import path from "path"; -import YAML from "yaml"; + import { CliContext } from "../../cli-context/CliContext"; export async function loadAndUpdateGenerators({ diff --git a/packages/cli/cli/src/commands/validate/logViolations.ts b/packages/cli/cli/src/commands/validate/logViolations.ts index 4b56567c8f9..90268fa471a 100644 --- a/packages/cli/cli/src/commands/validate/logViolations.ts +++ b/packages/cli/cli/src/commands/validate/logViolations.ts @@ -1,9 +1,10 @@ +import chalk from "chalk"; + +import { formatLog } from "@fern-api/cli-logger"; import { assertNever } from "@fern-api/core-utils"; +import { ValidationViolation } from "@fern-api/fern-definition-validator"; import { LogLevel } from "@fern-api/logger"; -import { formatLog } from "@fern-api/cli-logger"; import { TaskContext } from "@fern-api/task-context"; -import { ValidationViolation } from "@fern-api/fern-definition-validator"; -import chalk from "chalk"; export interface LogViolationsResponse { hasErrors: boolean; diff --git a/packages/cli/cli/src/commands/validate/validateAPIWorkspaceAndLogIssues.ts b/packages/cli/cli/src/commands/validate/validateAPIWorkspaceAndLogIssues.ts index 52c1b45785c..62cf51b1bf9 100644 --- a/packages/cli/cli/src/commands/validate/validateAPIWorkspaceAndLogIssues.ts +++ b/packages/cli/cli/src/commands/validate/validateAPIWorkspaceAndLogIssues.ts @@ -1,9 +1,11 @@ -import { TaskContext } from "@fern-api/task-context"; -import { validateFernWorkspace } from "@fern-api/fern-definition-validator"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; import validatePackageName from "validate-npm-package-name"; -import { logViolations } from "./logViolations"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; +import { validateFernWorkspace } from "@fern-api/fern-definition-validator"; import { validateGeneratorsWorkspace } from "@fern-api/generators-validator"; +import { TaskContext } from "@fern-api/task-context"; + +import { logViolations } from "./logViolations"; export async function validateAPIWorkspaceWithoutExiting({ workspace, diff --git a/packages/cli/cli/src/commands/validate/validateDocsWorkspaceAndLogIssues.ts b/packages/cli/cli/src/commands/validate/validateDocsWorkspaceAndLogIssues.ts index 1585c6eec66..608b6a896a3 100644 --- a/packages/cli/cli/src/commands/validate/validateDocsWorkspaceAndLogIssues.ts +++ b/packages/cli/cli/src/commands/validate/validateDocsWorkspaceAndLogIssues.ts @@ -1,6 +1,7 @@ import { APIWorkspaceLoader, validateDocsWorkspace } from "@fern-api/docs-validator"; import { TaskContext } from "@fern-api/task-context"; import { DocsWorkspace } from "@fern-api/workspace-loader"; + import { logViolations } from "./logViolations"; export async function validateDocsWorkspaceWithoutExiting({ diff --git a/packages/cli/cli/src/commands/validate/validateWorkspaces.ts b/packages/cli/cli/src/commands/validate/validateWorkspaces.ts index f61f35717e0..59ff1987884 100644 --- a/packages/cli/cli/src/commands/validate/validateWorkspaces.ts +++ b/packages/cli/cli/src/commands/validate/validateWorkspaces.ts @@ -1,4 +1,5 @@ import { Project } from "@fern-api/project-loader"; + import { CliContext } from "../../cli-context/CliContext"; import { validateAPIWorkspaceAndLogIssues } from "./validateAPIWorkspaceAndLogIssues"; import { validateDocsWorkspaceAndLogIssues } from "./validateDocsWorkspaceAndLogIssues"; diff --git a/packages/cli/cli/src/commands/write-definition/writeDefinitionForWorkspaces.ts b/packages/cli/cli/src/commands/write-definition/writeDefinitionForWorkspaces.ts index f7fc2528982..1c0b09cbb85 100644 --- a/packages/cli/cli/src/commands/write-definition/writeDefinitionForWorkspaces.ts +++ b/packages/cli/cli/src/commands/write-definition/writeDefinitionForWorkspaces.ts @@ -1,13 +1,15 @@ -import { DEFINITION_DIRECTORY, generatorsYml, ROOT_API_FILENAME } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, dirname, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { Project } from "@fern-api/project-loader"; -import { TaskContext } from "@fern-api/task-context"; -import { FernDefinition, FernWorkspace } from "@fern-api/workspace-loader"; -import { OSSWorkspace } from "@fern-api/lazy-fern-workspace"; import chalk from "chalk"; import { mkdir, rmdir, writeFile } from "fs/promises"; import yaml from "js-yaml"; import path from "path"; + +import { DEFINITION_DIRECTORY, ROOT_API_FILENAME, generatorsYml } from "@fern-api/configuration-loader"; +import { AbsoluteFilePath, RelativeFilePath, dirname, doesPathExist, join } from "@fern-api/fs-utils"; +import { OSSWorkspace } from "@fern-api/lazy-fern-workspace"; +import { Project } from "@fern-api/project-loader"; +import { TaskContext } from "@fern-api/task-context"; +import { FernDefinition, FernWorkspace } from "@fern-api/workspace-loader"; + import { CliContext } from "../../cli-context/CliContext"; export async function writeDefinitionForWorkspaces({ diff --git a/packages/cli/cli/src/commands/write-docs-definition/writeDocsDefinitionForProject.ts b/packages/cli/cli/src/commands/write-docs-definition/writeDocsDefinitionForProject.ts index 3381c3d9722..2730acf882c 100644 --- a/packages/cli/cli/src/commands/write-docs-definition/writeDocsDefinitionForProject.ts +++ b/packages/cli/cli/src/commands/write-docs-definition/writeDocsDefinitionForProject.ts @@ -1,9 +1,11 @@ -import { Project } from "@fern-api/project-loader"; -import { CliContext } from "../../cli-context/CliContext"; -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { writeFile } from "fs/promises"; import chalk from "chalk"; +import { writeFile } from "fs/promises"; + import { DocsDefinitionResolver } from "@fern-api/docs-resolver"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { Project } from "@fern-api/project-loader"; + +import { CliContext } from "../../cli-context/CliContext"; export async function writeDocsDefinitionForProject({ project, diff --git a/packages/cli/cli/src/persistence/output-directories/getOutputDirectories.ts b/packages/cli/cli/src/persistence/output-directories/getOutputDirectories.ts index edae42ea711..1d0ea4dc78b 100644 --- a/packages/cli/cli/src/persistence/output-directories/getOutputDirectories.ts +++ b/packages/cli/cli/src/persistence/output-directories/getOutputDirectories.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, doesPathExist } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; + +import { AbsoluteFilePath, doesPathExist } from "@fern-api/fs-utils"; + import { getPathToOutputDirectoriesFile } from "./getPathToOutputDirectoriesFile"; export async function getOutputDirectories(): Promise { diff --git a/packages/cli/cli/src/persistence/output-directories/getPathToOutputDirectoriesFile.ts b/packages/cli/cli/src/persistence/output-directories/getPathToOutputDirectoriesFile.ts index e5836b6766a..c4014d698fa 100644 --- a/packages/cli/cli/src/persistence/output-directories/getPathToOutputDirectoriesFile.ts +++ b/packages/cli/cli/src/persistence/output-directories/getPathToOutputDirectoriesFile.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { homedir } from "os"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { APPROVED_DIRECTORIES_FILENAME, LOCAL_STORAGE_FOLDER } from "../../constants"; export function getPathToOutputDirectoriesFile(): AbsoluteFilePath { diff --git a/packages/cli/cli/src/persistence/output-directories/storeOutputDirectories.ts b/packages/cli/cli/src/persistence/output-directories/storeOutputDirectories.ts index 1d3402a9f01..08d1aa70b07 100644 --- a/packages/cli/cli/src/persistence/output-directories/storeOutputDirectories.ts +++ b/packages/cli/cli/src/persistence/output-directories/storeOutputDirectories.ts @@ -1,6 +1,8 @@ import { mkdir, writeFile } from "fs/promises"; -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import path from "path"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { getPathToOutputDirectoriesFile } from "./getPathToOutputDirectoriesFile"; export async function storeOutputDirectories(outputDirectories: AbsoluteFilePath[]): Promise { diff --git a/packages/cli/cli/src/rerunFernCliAtVersion.ts b/packages/cli/cli/src/rerunFernCliAtVersion.ts index 80f77fdb4e0..3878b601ad1 100644 --- a/packages/cli/cli/src/rerunFernCliAtVersion.ts +++ b/packages/cli/cli/src/rerunFernCliAtVersion.ts @@ -1,5 +1,7 @@ -import { loggingExeca } from "@fern-api/logging-execa"; import chalk from "chalk"; + +import { loggingExeca } from "@fern-api/logging-execa"; + import { CliContext } from "./cli-context/CliContext"; import { FERN_CWD_ENV_VAR } from "./cwd"; diff --git a/packages/cli/configuration-loader/package.json b/packages/cli/configuration-loader/package.json index abf76b29ddd..2c886a96d3c 100644 --- a/packages/cli/configuration-loader/package.json +++ b/packages/cli/configuration-loader/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": { @@ -53,8 +52,8 @@ "@types/tinycolor2": "^1.4.6", "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" } diff --git a/packages/cli/configuration-loader/src/commons/validateSchema.ts b/packages/cli/configuration-loader/src/commons/validateSchema.ts index 0812ee9cc80..145ab80a956 100644 --- a/packages/cli/configuration-loader/src/commons/validateSchema.ts +++ b/packages/cli/configuration-loader/src/commons/validateSchema.ts @@ -1,8 +1,9 @@ -import { addPrefixToString } from "@fern-api/core-utils"; -import { TaskContext } from "@fern-api/task-context"; import path from "path"; import { z } from "zod"; +import { addPrefixToString } from "@fern-api/core-utils"; +import { TaskContext } from "@fern-api/task-context"; + export async function validateSchema({ schema, value, diff --git a/packages/cli/configuration-loader/src/dependencies-yml/convertDependenciesConfiguration.ts b/packages/cli/configuration-loader/src/dependencies-yml/convertDependenciesConfiguration.ts index e4bf5ad9330..f766c17b297 100644 --- a/packages/cli/configuration-loader/src/dependencies-yml/convertDependenciesConfiguration.ts +++ b/packages/cli/configuration-loader/src/dependencies-yml/convertDependenciesConfiguration.ts @@ -1,7 +1,8 @@ -import { AbsoluteFilePath, doesPathExist } from "@fern-api/fs-utils"; -import { TaskContext, TaskResult } from "@fern-api/task-context"; import path from "path"; + import { dependenciesYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, doesPathExist } from "@fern-api/fs-utils"; +import { TaskContext, TaskResult } from "@fern-api/task-context"; const EMPTY_DEPENDENCIES_CONFIGURATION: dependenciesYml.DependenciesConfiguration = { dependencies: {} diff --git a/packages/cli/configuration-loader/src/dependencies-yml/loadDependenciesConfiguration.ts b/packages/cli/configuration-loader/src/dependencies-yml/loadDependenciesConfiguration.ts index 6902d5ee597..8599493df69 100644 --- a/packages/cli/configuration-loader/src/dependencies-yml/loadDependenciesConfiguration.ts +++ b/packages/cli/configuration-loader/src/dependencies-yml/loadDependenciesConfiguration.ts @@ -1,8 +1,9 @@ +import { dependenciesYml } from "@fern-api/configuration"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; + import { convertDependenciesConfiguration } from "./convertDependenciesConfiguration"; import { loadRawDependenciesConfiguration } from "./loadRawDependenciesConfiguration"; -import { dependenciesYml } from "@fern-api/configuration"; export async function loadDependenciesConfiguration({ absolutePathToWorkspace, diff --git a/packages/cli/configuration-loader/src/dependencies-yml/loadRawDependenciesConfiguration.ts b/packages/cli/configuration-loader/src/dependencies-yml/loadRawDependenciesConfiguration.ts index 87f7a03560b..aa9daaa5368 100644 --- a/packages/cli/configuration-loader/src/dependencies-yml/loadRawDependenciesConfiguration.ts +++ b/packages/cli/configuration-loader/src/dependencies-yml/loadRawDependenciesConfiguration.ts @@ -1,9 +1,11 @@ -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile } from "fs/promises"; import yaml from "js-yaml"; -import { validateSchema } from "../commons/validateSchema"; + import { DEPENDENCIES_CONFIGURATION_FILENAME } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + +import { validateSchema } from "../commons/validateSchema"; import { DependenciesConfigurationSchema } from "./schemas/DependenciesConfigurationSchema"; export async function loadRawDependenciesConfiguration({ diff --git a/packages/cli/configuration-loader/src/docs-yml/__test__/convertColorsConfiguration.test.ts b/packages/cli/configuration-loader/src/docs-yml/__test__/convertColorsConfiguration.test.ts index 4a8002bc6e3..23f3a4ba45e 100644 --- a/packages/cli/configuration-loader/src/docs-yml/__test__/convertColorsConfiguration.test.ts +++ b/packages/cli/configuration-loader/src/docs-yml/__test__/convertColorsConfiguration.test.ts @@ -1,4 +1,5 @@ import { createMockTaskContext } from "@fern-api/task-context"; + import { convertColorsConfiguration, getColorType } from "../convertColorsConfiguration"; describe("getColorType", () => { diff --git a/packages/cli/configuration-loader/src/docs-yml/convertColorsConfiguration.ts b/packages/cli/configuration-loader/src/docs-yml/convertColorsConfiguration.ts index 1f5f6840775..f7184e1cfb1 100644 --- a/packages/cli/configuration-loader/src/docs-yml/convertColorsConfiguration.ts +++ b/packages/cli/configuration-loader/src/docs-yml/convertColorsConfiguration.ts @@ -1,8 +1,10 @@ +import tinycolor from "tinycolor2"; + +import { docsYml } from "@fern-api/configuration"; import { assertNever } from "@fern-api/core-utils"; import { TaskContext } from "@fern-api/task-context"; + import { FernRegistry as CjsFdrSdk } from "@fern-fern/fdr-cjs-sdk"; -import tinycolor from "tinycolor2"; -import { docsYml } from "@fern-api/configuration"; export function convertColorsConfiguration( rawConfig: docsYml.RawSchemas.ColorsConfiguration = { accentPrimary: undefined, background: undefined }, diff --git a/packages/cli/configuration-loader/src/docs-yml/getAllPages.ts b/packages/cli/configuration-loader/src/docs-yml/getAllPages.ts index e7c65e4918f..de61271ec9c 100644 --- a/packages/cli/configuration-loader/src/docs-yml/getAllPages.ts +++ b/packages/cli/configuration-loader/src/docs-yml/getAllPages.ts @@ -1,8 +1,9 @@ -import { assertNever } from "@fern-api/core-utils"; -import { AbsoluteFilePath, RelativeFilePath, relativize } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; import { compact } from "lodash-es"; + import { docsYml } from "@fern-api/configuration"; +import { assertNever } from "@fern-api/core-utils"; +import { AbsoluteFilePath, RelativeFilePath, relativize } from "@fern-api/fs-utils"; const BATCH_SIZE = 100; // Define a reasonable batch size diff --git a/packages/cli/configuration-loader/src/docs-yml/getReferencedApiSections.ts b/packages/cli/configuration-loader/src/docs-yml/getReferencedApiSections.ts index d756be0c340..517958858ee 100644 --- a/packages/cli/configuration-loader/src/docs-yml/getReferencedApiSections.ts +++ b/packages/cli/configuration-loader/src/docs-yml/getReferencedApiSections.ts @@ -1,5 +1,5 @@ -import { assertNever } from "@fern-api/core-utils"; import { docsYml } from "@fern-api/configuration"; +import { assertNever } from "@fern-api/core-utils"; export type ReferencedApisResponse = DefaultAPIReferenced | NamedAPIReferenced; diff --git a/packages/cli/configuration-loader/src/docs-yml/parseDocsConfiguration.ts b/packages/cli/configuration-loader/src/docs-yml/parseDocsConfiguration.ts index 827b96bfbba..9b65f1a783c 100644 --- a/packages/cli/configuration-loader/src/docs-yml/parseDocsConfiguration.ts +++ b/packages/cli/configuration-loader/src/docs-yml/parseDocsConfiguration.ts @@ -1,13 +1,16 @@ +import { readFile } from "fs/promises"; +import yaml from "js-yaml"; + +import { docsYml } from "@fern-api/configuration"; import { assertNever, isPlainObject } from "@fern-api/core-utils"; import { AbsoluteFilePath, dirname, doesPathExist, listFiles, resolve } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; + import { FernRegistry as CjsFdrSdk } from "@fern-fern/fdr-cjs-sdk"; -import { readFile } from "fs/promises"; -import yaml from "js-yaml"; + import { WithoutQuestionMarks } from "../commons/WithoutQuestionMarks"; import { convertColorsConfiguration } from "./convertColorsConfiguration"; import { getAllPages, loadAllPages } from "./getAllPages"; -import { docsYml } from "@fern-api/configuration"; export async function parseDocsConfiguration({ rawDocsConfiguration, @@ -290,8 +293,8 @@ function convertLayoutConfig( layout.searchbarPlacement === "header" ? CjsFdrSdk.docs.v1.commons.SearchbarPlacement.Header : layout.searchbarPlacement === "header-tabs" - ? CjsFdrSdk.docs.v1.commons.SearchbarPlacement.HeaderTabs - : CjsFdrSdk.docs.v1.commons.SearchbarPlacement.Sidebar, + ? CjsFdrSdk.docs.v1.commons.SearchbarPlacement.HeaderTabs + : CjsFdrSdk.docs.v1.commons.SearchbarPlacement.Sidebar, tabsPlacement: layout.tabsPlacement === "header" ? CjsFdrSdk.docs.v1.commons.TabsPlacement.Header diff --git a/packages/cli/configuration-loader/src/fern-config-json/loadProjectConfig.ts b/packages/cli/configuration-loader/src/fern-config-json/loadProjectConfig.ts index baab4703eae..c0b8f6f6e58 100644 --- a/packages/cli/configuration-loader/src/fern-config-json/loadProjectConfig.ts +++ b/packages/cli/configuration-loader/src/fern-config-json/loadProjectConfig.ts @@ -1,9 +1,11 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile } from "fs/promises"; -import { validateSchema } from "../commons/validateSchema"; + import { PROJECT_CONFIG_FILENAME } from "@fern-api/configuration"; import { fernConfigJson } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + +import { validateSchema } from "../commons/validateSchema"; import { ProjectConfigSchema } from "./schema/ProjectConfigSchema"; export async function loadProjectConfig({ diff --git a/packages/cli/configuration-loader/src/generators-yml/GeneratorName.ts b/packages/cli/configuration-loader/src/generators-yml/GeneratorName.ts index c6a025f41a4..1075b427b1b 100644 --- a/packages/cli/configuration-loader/src/generators-yml/GeneratorName.ts +++ b/packages/cli/configuration-loader/src/generators-yml/GeneratorName.ts @@ -28,4 +28,4 @@ export const GeneratorName = { OPENAPI_PYTHON_CLIENT: "fernapi/openapi-python-client" } as const; -export type GeneratorName = typeof GeneratorName[keyof typeof GeneratorName]; +export type GeneratorName = (typeof GeneratorName)[keyof typeof GeneratorName]; diff --git a/packages/cli/configuration-loader/src/generators-yml/__test__/convertGeneratorsConfiguration.test.ts b/packages/cli/configuration-loader/src/generators-yml/__test__/convertGeneratorsConfiguration.test.ts index 8dc35b5eb1b..ca469cc4050 100644 --- a/packages/cli/configuration-loader/src/generators-yml/__test__/convertGeneratorsConfiguration.test.ts +++ b/packages/cli/configuration-loader/src/generators-yml/__test__/convertGeneratorsConfiguration.test.ts @@ -1,5 +1,6 @@ /* eslint-disable jest/no-conditional-expect */ import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { convertGeneratorsConfiguration } from "../convertGeneratorsConfiguration"; describe("convertGeneratorsConfiguration", () => { diff --git a/packages/cli/configuration-loader/src/generators-yml/__test__/loadRawGeneratorsConfiguration.test.ts b/packages/cli/configuration-loader/src/generators-yml/__test__/loadRawGeneratorsConfiguration.test.ts index e02c63cf9ab..a4c36cb8439 100644 --- a/packages/cli/configuration-loader/src/generators-yml/__test__/loadRawGeneratorsConfiguration.test.ts +++ b/packages/cli/configuration-loader/src/generators-yml/__test__/loadRawGeneratorsConfiguration.test.ts @@ -1,10 +1,12 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { promises as fs } from "fs"; import yaml from "js-yaml"; import path from "path"; import tmp from "tmp-promise"; import { beforeEach, describe, expect, it } from "vitest"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { loadRawGeneratorsConfiguration } from "../loadGeneratorsConfiguration"; describe("loadRawGeneratorsConfiguration", () => { diff --git a/packages/cli/configuration-loader/src/generators-yml/addGenerator.ts b/packages/cli/configuration-loader/src/generators-yml/addGenerator.ts index 9baa9bfbc77..1a3e26d20dd 100644 --- a/packages/cli/configuration-loader/src/generators-yml/addGenerator.ts +++ b/packages/cli/configuration-loader/src/generators-yml/addGenerator.ts @@ -1,9 +1,10 @@ -import { TaskContext } from "@fern-api/task-context"; import { DEFAULT_GROUP_GENERATORS_CONFIG_KEY, generatorsYml } from "@fern-api/configuration"; -import { updateGeneratorGroup } from "./updateGeneratorGroup"; +import { TaskContext } from "@fern-api/task-context"; + import { GENERATOR_INVOCATIONS } from "./generatorInvocations"; import { getGeneratorNameOrThrow } from "./getGeneratorName"; import { getLatestGeneratorVersion } from "./getGeneratorVersions"; +import { updateGeneratorGroup } from "./updateGeneratorGroup"; export async function addGenerator({ generatorName, diff --git a/packages/cli/configuration-loader/src/generators-yml/convertGeneratorsConfiguration.ts b/packages/cli/configuration-loader/src/generators-yml/convertGeneratorsConfiguration.ts index a6a5a36142f..968bd1432a8 100644 --- a/packages/cli/configuration-loader/src/generators-yml/convertGeneratorsConfiguration.ts +++ b/packages/cli/configuration-loader/src/generators-yml/convertGeneratorsConfiguration.ts @@ -1,11 +1,13 @@ +import { readFile } from "fs/promises"; +import path from "path"; + import { generatorsYml } from "@fern-api/configuration"; import { assertNever } from "@fern-api/core-utils"; import { visitRawApiAuth } from "@fern-api/fern-definition-schema"; -import { AbsoluteFilePath, dirname, join, RelativeFilePath, resolve } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, dirname, join, resolve } from "@fern-api/fs-utils"; + import { FernFiddle } from "@fern-fern/fiddle-sdk"; import { GithubPullRequestReviewer, OutputMetadata, PublishingMetadata, PypiMetadata } from "@fern-fern/fiddle-sdk/api"; -import { readFile } from "fs/promises"; -import path from "path"; export async function convertGeneratorsConfiguration({ absolutePathToGeneratorsConfiguration, @@ -697,7 +699,7 @@ async function convertOutputMode({ return FernFiddle.OutputMode.publishV2( FernFiddle.remoteGen.PublishOutputModeV2.pypiOverride({ registryUrl: generator.output.url ?? "https://upload.pypi.org/legacy/", - username: generator.output.token != null ? "__token__" : generator.output.password ?? "", + username: generator.output.token != null ? "__token__" : (generator.output.password ?? ""), password: generator.output.token ?? generator.output.password ?? "", coordinate: generator.output["package-name"], downloadSnippets, diff --git a/packages/cli/configuration-loader/src/generators-yml/generatorInvocations.ts b/packages/cli/configuration-loader/src/generators-yml/generatorInvocations.ts index 68de74472a9..51cdac8c40c 100644 --- a/packages/cli/configuration-loader/src/generators-yml/generatorInvocations.ts +++ b/packages/cli/configuration-loader/src/generators-yml/generatorInvocations.ts @@ -1,6 +1,7 @@ -import { GeneratorName } from "./GeneratorName"; import { generatorsYml } from "@fern-api/configuration"; +import { GeneratorName } from "./GeneratorName"; + export const GENERATOR_INVOCATIONS: Record> = { [GeneratorName.JAVA]: { version: "1.0.5" diff --git a/packages/cli/configuration-loader/src/generators-yml/getGeneratorName.ts b/packages/cli/configuration-loader/src/generators-yml/getGeneratorName.ts index aa1532796a9..43327e8c977 100644 --- a/packages/cli/configuration-loader/src/generators-yml/getGeneratorName.ts +++ b/packages/cli/configuration-loader/src/generators-yml/getGeneratorName.ts @@ -1,4 +1,5 @@ import { TaskContext } from "@fern-api/task-context"; + import { GeneratorName } from "./GeneratorName"; export function getGeneratorNameOrThrow(generatorName: string, context: TaskContext): GeneratorName { diff --git a/packages/cli/configuration-loader/src/generators-yml/getGeneratorVersions.ts b/packages/cli/configuration-loader/src/generators-yml/getGeneratorVersions.ts index 54bbf37ab7c..7118f71c103 100644 --- a/packages/cli/configuration-loader/src/generators-yml/getGeneratorVersions.ts +++ b/packages/cli/configuration-loader/src/generators-yml/getGeneratorVersions.ts @@ -1,6 +1,8 @@ +import semver from "semver"; + import { TaskContext } from "@fern-api/task-context"; + import { FernRegistry, FernRegistryClient as GeneratorsClient } from "@fern-fern/generators-sdk"; -import semver from "semver"; export async function getLatestGeneratorVersion({ generatorName, diff --git a/packages/cli/configuration-loader/src/generators-yml/loadGeneratorsConfiguration.ts b/packages/cli/configuration-loader/src/generators-yml/loadGeneratorsConfiguration.ts index 07643d450e7..de20553459b 100644 --- a/packages/cli/configuration-loader/src/generators-yml/loadGeneratorsConfiguration.ts +++ b/packages/cli/configuration-loader/src/generators-yml/loadGeneratorsConfiguration.ts @@ -1,9 +1,11 @@ -import { generatorsYml } from "@fern-api/configuration"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile } from "fs/promises"; import yaml from "js-yaml"; import path from "path"; + +import { generatorsYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { convertGeneratorsConfiguration } from "./convertGeneratorsConfiguration"; export async function loadRawGeneratorsConfiguration({ diff --git a/packages/cli/configuration-loader/src/generators-yml/updateGeneratorGroup.ts b/packages/cli/configuration-loader/src/generators-yml/updateGeneratorGroup.ts index 9bc82f82ef3..159d47cd56b 100644 --- a/packages/cli/configuration-loader/src/generators-yml/updateGeneratorGroup.ts +++ b/packages/cli/configuration-loader/src/generators-yml/updateGeneratorGroup.ts @@ -1,5 +1,5 @@ -import { TaskContext } from "@fern-api/task-context"; import { generatorsYml } from "@fern-api/configuration"; +import { TaskContext } from "@fern-api/task-context"; export async function updateGeneratorGroup({ generatorsConfiguration, diff --git a/packages/cli/configuration-loader/src/getFernDirectory.ts b/packages/cli/configuration-loader/src/getFernDirectory.ts index 14ba8be98af..deb2c12a75e 100644 --- a/packages/cli/configuration-loader/src/getFernDirectory.ts +++ b/packages/cli/configuration-loader/src/getFernDirectory.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; import { findUp } from "find-up"; + import { FERN_DIRECTORY, PROJECT_CONFIG_FILENAME } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; export async function getFernDirectory(nameOverride?: string): Promise { const fernDirectoryStr = await findUp(nameOverride ?? FERN_DIRECTORY, { type: "directory" }); diff --git a/packages/cli/configuration/package.json b/packages/cli/configuration/package.json index 337d5c0fcf0..2d655eb5547 100644 --- a/packages/cli/configuration/package.json +++ b/packages/cli/configuration/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": { @@ -39,8 +38,8 @@ "@types/jest": "^29.5.14", "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" } diff --git a/packages/cli/configuration/src/docs-yml/ParsedDocsConfiguration.ts b/packages/cli/configuration/src/docs-yml/ParsedDocsConfiguration.ts index b35ba41de58..c7de2a637bc 100644 --- a/packages/cli/configuration/src/docs-yml/ParsedDocsConfiguration.ts +++ b/packages/cli/configuration/src/docs-yml/ParsedDocsConfiguration.ts @@ -1,8 +1,9 @@ import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/path-utils"; + import { FernRegistry as CjsFdrSdk } from "@fern-fern/fdr-cjs-sdk"; + import { Audiences } from "../commons"; import { DocsInstance, ExperimentalConfig, PlaygroundSettings, VersionAvailability } from "./schemas"; - // TODO: Update this import import { AnnouncementConfig } from "./schemas/sdk/api/resources/docs/types/AnnouncementConfig"; diff --git a/packages/cli/configuration/src/fern-config-json/ProjectConfig.ts b/packages/cli/configuration/src/fern-config-json/ProjectConfig.ts index 060363180d0..0217a0b3fbd 100644 --- a/packages/cli/configuration/src/fern-config-json/ProjectConfig.ts +++ b/packages/cli/configuration/src/fern-config-json/ProjectConfig.ts @@ -1,4 +1,5 @@ import { AbsoluteFilePath } from "@fern-api/path-utils"; + import { ProjectConfigSchema } from "./schema/ProjectConfigSchema"; export interface ProjectConfig { diff --git a/packages/cli/configuration/src/generators-yml/GeneratorsConfiguration.ts b/packages/cli/configuration/src/generators-yml/GeneratorsConfiguration.ts index fbbd1112b93..39f4da0c4a0 100644 --- a/packages/cli/configuration/src/generators-yml/GeneratorsConfiguration.ts +++ b/packages/cli/configuration/src/generators-yml/GeneratorsConfiguration.ts @@ -1,7 +1,9 @@ import { Values } from "@fern-api/core-utils"; import { RawSchemas } from "@fern-api/fern-definition-schema"; import { AbsoluteFilePath } from "@fern-api/path-utils"; + import { FernFiddle } from "@fern-fern/fiddle-sdk"; + import { generatorsYml } from ".."; import { Audiences } from "../commons"; import { diff --git a/packages/cli/configuration/src/generators-yml/utils/isAsyncAPISpecSchema.ts b/packages/cli/configuration/src/generators-yml/utils/isAsyncAPISpecSchema.ts index a7ab536c415..4b2343b2ea9 100644 --- a/packages/cli/configuration/src/generators-yml/utils/isAsyncAPISpecSchema.ts +++ b/packages/cli/configuration/src/generators-yml/utils/isAsyncAPISpecSchema.ts @@ -1,4 +1,4 @@ -import { AsyncApiSchema, AsyncApiOrOpenApiSpecSchema } from "../schemas"; +import { AsyncApiOrOpenApiSpecSchema, AsyncApiSchema } from "../schemas"; export function isAsyncAPISchema(spec: AsyncApiOrOpenApiSpecSchema): spec is AsyncApiSchema { return (spec as AsyncApiSchema)?.asyncapi != null; diff --git a/packages/cli/configuration/src/generators-yml/utils/isOpenAPISpecSchema.ts b/packages/cli/configuration/src/generators-yml/utils/isOpenAPISpecSchema.ts index 3ce3766f10b..963136ccb82 100644 --- a/packages/cli/configuration/src/generators-yml/utils/isOpenAPISpecSchema.ts +++ b/packages/cli/configuration/src/generators-yml/utils/isOpenAPISpecSchema.ts @@ -1,4 +1,4 @@ -import { OpenApiSpecSchema, AsyncApiOrOpenApiSpecSchema } from "../schemas"; +import { AsyncApiOrOpenApiSpecSchema, OpenApiSpecSchema } from "../schemas"; export function isOpenAPISchema(spec: AsyncApiOrOpenApiSpecSchema): spec is OpenApiSpecSchema { return (spec as OpenApiSpecSchema)?.openapi != null; diff --git a/packages/cli/docs-importers/commons/package.json b/packages/cli/docs-importers/commons/package.json index 9ff5fd591b8..49c8418e6b1 100644 --- a/packages/cli/docs-importers/commons/package.json +++ b/packages/cli/docs-importers/commons/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": { @@ -39,8 +38,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" } diff --git a/packages/cli/docs-importers/commons/src/DocsImporter.ts b/packages/cli/docs-importers/commons/src/DocsImporter.ts index 60a60d71812..0ee5348f138 100644 --- a/packages/cli/docs-importers/commons/src/DocsImporter.ts +++ b/packages/cli/docs-importers/commons/src/DocsImporter.ts @@ -1,6 +1,7 @@ -import { FernDocsBuilder } from "./FernDocsBuilder"; import { TaskContext } from "@fern-api/task-context"; +import { FernDocsBuilder } from "./FernDocsBuilder"; + export declare namespace DocsImporter { interface BaseArgs { context: TaskContext; diff --git a/packages/cli/docs-importers/commons/src/FernDocsBuilder.ts b/packages/cli/docs-importers/commons/src/FernDocsBuilder.ts index 9b9ca27f12a..165c0f9be28 100644 --- a/packages/cli/docs-importers/commons/src/FernDocsBuilder.ts +++ b/packages/cli/docs-importers/commons/src/FernDocsBuilder.ts @@ -1,5 +1,6 @@ -import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { docsYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; + import { FernRegistry as CjsFdrSdk } from "@fern-fern/fdr-cjs-sdk"; /** diff --git a/packages/cli/docs-importers/commons/src/FernDocsBuilderImpl.ts b/packages/cli/docs-importers/commons/src/FernDocsBuilderImpl.ts index eb6ecfadc2d..352c3d809d8 100644 --- a/packages/cli/docs-importers/commons/src/FernDocsBuilderImpl.ts +++ b/packages/cli/docs-importers/commons/src/FernDocsBuilderImpl.ts @@ -1,10 +1,13 @@ -import { docsYml, DOCS_CONFIGURATION_FILENAME, FERN_DIRECTORY } from "@fern-api/configuration"; -import { AbsoluteFilePath, dirname, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { FernDocsBuilder, FernDocsNavigationBuilder } from "./FernDocsBuilder"; -import { mkdir, writeFile, cp } from "fs/promises"; +import { cp, mkdir, writeFile } from "fs/promises"; import yaml from "js-yaml"; + +import { DOCS_CONFIGURATION_FILENAME, FERN_DIRECTORY, docsYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, dirname, join } from "@fern-api/fs-utils"; + import { FernRegistry as CjsFdrSdk } from "@fern-fern/fdr-cjs-sdk"; +import { FernDocsBuilder, FernDocsNavigationBuilder } from "./FernDocsBuilder"; + interface MarkdownPage { frontmatter: CjsFdrSdk.docs.latest.Frontmatter; markdown: string; diff --git a/packages/cli/docs-importers/mintlify/package.json b/packages/cli/docs-importers/mintlify/package.json index edba4cfc026..9a82cbe0b0c 100644 --- a/packages/cli/docs-importers/mintlify/package.json +++ b/packages/cli/docs-importers/mintlify/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": { @@ -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" } diff --git a/packages/cli/docs-importers/mintlify/src/MintlifyImporter.ts b/packages/cli/docs-importers/mintlify/src/MintlifyImporter.ts index 7db05d39088..11b89fa38ed 100644 --- a/packages/cli/docs-importers/mintlify/src/MintlifyImporter.ts +++ b/packages/cli/docs-importers/mintlify/src/MintlifyImporter.ts @@ -1,13 +1,15 @@ -import { AbsoluteFilePath, dirname, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { readFile } from "fs/promises"; + +import { stripLeadingSlash } from "@fern-api/core-utils"; import { DocsImporter, FernDocsNavigationBuilder } from "@fern-api/docs-importer-commons"; import { FernDocsBuilder } from "@fern-api/docs-importer-commons"; -import { readFile } from "fs/promises"; -import { MintJsonSchema, MintNavigationItem } from "./mintlify"; -import { convertLogo } from "./convertLogo"; +import { AbsoluteFilePath, RelativeFilePath, dirname, join } from "@fern-api/fs-utils"; + import { convertColors } from "./convertColors"; +import { convertLogo } from "./convertLogo"; import { convertNavigationItem } from "./convertNavigationItem"; +import { MintJsonSchema, MintNavigationItem } from "./mintlify"; import { getTabForMintItem } from "./utils/getTabForMintItem"; -import { stripLeadingSlash } from "@fern-api/core-utils"; export declare namespace MintlifyImporter { interface Args { diff --git a/packages/cli/docs-importers/mintlify/src/__test__/migrateFromMintlify.test.ts b/packages/cli/docs-importers/mintlify/src/__test__/migrateFromMintlify.test.ts index 9146288cae1..1df517c18a4 100644 --- a/packages/cli/docs-importers/mintlify/src/__test__/migrateFromMintlify.test.ts +++ b/packages/cli/docs-importers/mintlify/src/__test__/migrateFromMintlify.test.ts @@ -1,8 +1,10 @@ -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { CONSOLE_LOGGER } from "@fern-api/logger"; -import { createMockTaskContext } from "@fern-api/task-context"; import { mkdir, rmdir } from "fs/promises"; import path from "path"; + +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { CONSOLE_LOGGER } from "@fern-api/logger"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { runMintlifyMigration } from "../runMintlifyMigration"; const FIXTURES_PATH = AbsoluteFilePath.of(path.join(__dirname, "fixtures")); diff --git a/packages/cli/docs-importers/mintlify/src/convertColors.ts b/packages/cli/docs-importers/mintlify/src/convertColors.ts index 154731a1cdd..f9fd61767c7 100644 --- a/packages/cli/docs-importers/mintlify/src/convertColors.ts +++ b/packages/cli/docs-importers/mintlify/src/convertColors.ts @@ -1,4 +1,5 @@ import { docsYml } from "@fern-api/configuration"; + import { MintJsonSchema } from "./mintlify"; export function convertColors(colors: MintJsonSchema["colors"]): docsYml.RawSchemas.ColorsConfiguration { diff --git a/packages/cli/docs-importers/mintlify/src/convertLogo.ts b/packages/cli/docs-importers/mintlify/src/convertLogo.ts index b88e1d5499e..e0554a86811 100644 --- a/packages/cli/docs-importers/mintlify/src/convertLogo.ts +++ b/packages/cli/docs-importers/mintlify/src/convertLogo.ts @@ -1,8 +1,9 @@ -import { MintJsonSchema } from "./mintlify"; import { docsYml } from "@fern-api/configuration"; import { stripLeadingSlash } from "@fern-api/core-utils"; import { FernDocsBuilder } from "@fern-api/docs-importer-commons"; -import { AbsoluteFilePath, dirname, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, dirname, join } from "@fern-api/fs-utils"; + +import { MintJsonSchema } from "./mintlify"; const LOGO_DEFAULT_HEIGHT = 28; // mintlify's default height (1.75rem); diff --git a/packages/cli/docs-importers/mintlify/src/convertMarkdown.ts b/packages/cli/docs-importers/mintlify/src/convertMarkdown.ts index 8c2afe29529..b6c5ec18610 100644 --- a/packages/cli/docs-importers/mintlify/src/convertMarkdown.ts +++ b/packages/cli/docs-importers/mintlify/src/convertMarkdown.ts @@ -1,9 +1,12 @@ -import grayMatter from "gray-matter"; -import { MintlifyFrontmatter } from "./mintlify"; import { readFile } from "fs/promises"; -import { FernRegistry as CjsFdrSdk, FernRegistry } from "@fern-fern/fdr-cjs-sdk"; -import { AbsoluteFilePath, dirname, join, RelativeFilePath, relativize } from "@fern-api/fs-utils"; +import grayMatter from "gray-matter"; + import { FernDocsBuilder } from "@fern-api/docs-importer-commons"; +import { AbsoluteFilePath, RelativeFilePath, dirname, join, relativize } from "@fern-api/fs-utils"; + +import { FernRegistry as CjsFdrSdk, FernRegistry } from "@fern-fern/fdr-cjs-sdk"; + +import { MintlifyFrontmatter } from "./mintlify"; export declare namespace convertMarkdown { interface Args { diff --git a/packages/cli/docs-importers/mintlify/src/convertNavigationItem.ts b/packages/cli/docs-importers/mintlify/src/convertNavigationItem.ts index c99ac97c0be..04ddd7f52a6 100644 --- a/packages/cli/docs-importers/mintlify/src/convertNavigationItem.ts +++ b/packages/cli/docs-importers/mintlify/src/convertNavigationItem.ts @@ -1,8 +1,9 @@ import { docsYml } from "@fern-api/configuration"; import { isNonNullish } from "@fern-api/core-utils"; import { FernDocsBuilder } from "@fern-api/docs-importer-commons"; -import { AbsoluteFilePath, dirname, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, dirname, doesPathExist, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; + import { convertMarkdown } from "./convertMarkdown"; import { MintNavigationItem } from "./mintlify"; diff --git a/packages/cli/docs-importers/mintlify/src/runMintlifyMigration.ts b/packages/cli/docs-importers/mintlify/src/runMintlifyMigration.ts index f220328cf0c..8dc208fcf72 100644 --- a/packages/cli/docs-importers/mintlify/src/runMintlifyMigration.ts +++ b/packages/cli/docs-importers/mintlify/src/runMintlifyMigration.ts @@ -1,8 +1,10 @@ +import { writeFile } from "fs/promises"; + import { FERN_DIRECTORY, PROJECT_CONFIG_FILENAME } from "@fern-api/configuration"; import { FernDocsBuilderImpl } from "@fern-api/docs-importer-commons"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; -import { writeFile } from "fs/promises"; + import { MintlifyImporter } from "./MintlifyImporter"; interface RunMintlifyMigrationParams { diff --git a/packages/cli/docs-markdown-utils/package.json b/packages/cli/docs-markdown-utils/package.json index 5b294bc5726..02a6b44caee 100644 --- a/packages/cli/docs-markdown-utils/package.json +++ b/packages/cli/docs-markdown-utils/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": { @@ -43,8 +42,8 @@ "depcheck": "^1.4.7", "diff": "^5.2.0", "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", "zod": "^3.22.3" diff --git a/packages/cli/docs-markdown-utils/src/__test__/parseImagePaths.test.ts b/packages/cli/docs-markdown-utils/src/__test__/parseImagePaths.test.ts index 50e49488c24..b2286855794 100644 --- a/packages/cli/docs-markdown-utils/src/__test__/parseImagePaths.test.ts +++ b/packages/cli/docs-markdown-utils/src/__test__/parseImagePaths.test.ts @@ -1,9 +1,11 @@ /* eslint-disable jest/expect-expect */ -import { AbsoluteFilePath, relative } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; import { diffLines } from "diff"; import fs from "fs"; import { resolve } from "path"; + +import { AbsoluteFilePath, relative } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { parseImagePaths, replaceImagePathsAndUrls } from "../parseImagePaths"; const CONTEXT = createMockTaskContext(); diff --git a/packages/cli/docs-markdown-utils/src/__test__/replaceReferencedCode.test.ts b/packages/cli/docs-markdown-utils/src/__test__/replaceReferencedCode.test.ts index 56ed7a0896a..d5cc7c26275 100644 --- a/packages/cli/docs-markdown-utils/src/__test__/replaceReferencedCode.test.ts +++ b/packages/cli/docs-markdown-utils/src/__test__/replaceReferencedCode.test.ts @@ -1,5 +1,6 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { createMockTaskContext } from "@fern-api/task-context"; + import { replaceReferencedCode } from "../replaceReferencedCode"; const absolutePathToFernFolder = AbsoluteFilePath.of("/path/to/fern"); diff --git a/packages/cli/docs-markdown-utils/src/__test__/replaceReferencedMarkdown.test.ts b/packages/cli/docs-markdown-utils/src/__test__/replaceReferencedMarkdown.test.ts index e5b4dfa4f70..191fa8ff88b 100644 --- a/packages/cli/docs-markdown-utils/src/__test__/replaceReferencedMarkdown.test.ts +++ b/packages/cli/docs-markdown-utils/src/__test__/replaceReferencedMarkdown.test.ts @@ -1,6 +1,8 @@ +import { vi } from "vitest"; + import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { createMockTaskContext } from "@fern-api/task-context"; -import { vi } from "vitest"; + import { replaceReferencedMarkdown } from "../replaceReferencedMarkdown"; const absolutePathToFernFolder = AbsoluteFilePath.of("/path/to/fern"); diff --git a/packages/cli/docs-markdown-utils/src/parseImagePaths.ts b/packages/cli/docs-markdown-utils/src/parseImagePaths.ts index 51662205db0..7aa26bf47bf 100644 --- a/packages/cli/docs-markdown-utils/src/parseImagePaths.ts +++ b/packages/cli/docs-markdown-utils/src/parseImagePaths.ts @@ -1,14 +1,17 @@ -import { AbsoluteFilePath, dirname, relative, RelativeFilePath, resolve } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; -import { FernRegistry as CjsFdrSdk } from "@fern-fern/fdr-cjs-sdk"; import grayMatter from "gray-matter"; import { fromMarkdown } from "mdast-util-from-markdown"; import { mdxFromMarkdown } from "mdast-util-mdx"; import { mdx } from "micromark-extension-mdx"; import { visit } from "unist-util-visit"; -import { parseMarkdownToTree } from "./parseMarkdownToTree"; import { z } from "zod"; +import { AbsoluteFilePath, RelativeFilePath, dirname, relative, resolve } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + +import { FernRegistry as CjsFdrSdk } from "@fern-fern/fdr-cjs-sdk"; + +import { parseMarkdownToTree } from "./parseMarkdownToTree"; + interface AbsolutePathMetadata { absolutePathToMdx: AbsoluteFilePath; absolutePathToFernFolder: AbsoluteFilePath; diff --git a/packages/cli/docs-markdown-utils/src/replaceReferencedCode.ts b/packages/cli/docs-markdown-utils/src/replaceReferencedCode.ts index f0ac7573fcf..3fd3de32967 100644 --- a/packages/cli/docs-markdown-utils/src/replaceReferencedCode.ts +++ b/packages/cli/docs-markdown-utils/src/replaceReferencedCode.ts @@ -1,7 +1,8 @@ -import { AbsoluteFilePath, dirname, RelativeFilePath, resolve } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile } from "fs/promises"; +import { AbsoluteFilePath, RelativeFilePath, dirname, resolve } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + async function defaultFileLoader(filepath: AbsoluteFilePath): Promise { // strip frontmatter from the referenced markdown const file = await readFile(filepath); diff --git a/packages/cli/docs-markdown-utils/src/replaceReferencedMarkdown.ts b/packages/cli/docs-markdown-utils/src/replaceReferencedMarkdown.ts index a5a55469062..170de4a9d2e 100644 --- a/packages/cli/docs-markdown-utils/src/replaceReferencedMarkdown.ts +++ b/packages/cli/docs-markdown-utils/src/replaceReferencedMarkdown.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath, dirname, RelativeFilePath, resolve } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile } from "fs/promises"; import grayMatter from "gray-matter"; +import { AbsoluteFilePath, RelativeFilePath, dirname, resolve } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + async function defaultMarkdownLoader(filepath: AbsoluteFilePath) { // strip frontmatter from the referenced markdown const { content } = grayMatter(await readFile(filepath)); diff --git a/packages/cli/docs-preview/package.json b/packages/cli/docs-preview/package.json index ba37ee843e1..fa895155250 100644 --- a/packages/cli/docs-preview/package.json +++ b/packages/cli/docs-preview/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": { @@ -59,8 +58,8 @@ "@types/xml2js": "^0.4.14", "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" } diff --git a/packages/cli/docs-preview/src/__test__/downloadLocalDocsBundle.test.ts b/packages/cli/docs-preview/src/__test__/downloadLocalDocsBundle.test.ts index ea2f398f6ba..4546e2bd0ea 100644 --- a/packages/cli/docs-preview/src/__test__/downloadLocalDocsBundle.test.ts +++ b/packages/cli/docs-preview/src/__test__/downloadLocalDocsBundle.test.ts @@ -1,4 +1,5 @@ import { CONSOLE_LOGGER } from "@fern-api/logger"; + import { downloadBundle } from "../downloadLocalDocsBundle"; describe("preview", () => { diff --git a/packages/cli/docs-preview/src/downloadLocalDocsBundle.ts b/packages/cli/docs-preview/src/downloadLocalDocsBundle.ts index ccdad488f06..ccdd87e72e9 100644 --- a/packages/cli/docs-preview/src/downloadLocalDocsBundle.ts +++ b/packages/cli/docs-preview/src/downloadLocalDocsBundle.ts @@ -1,14 +1,15 @@ -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { Logger } from "@fern-api/logger"; +import { fetcher } from "@fern-typescript/fetcher"; import decompress from "decompress"; -import { Readable } from "readable-stream"; +import fs from "fs"; import { mkdir, readFile, rm, writeFile } from "fs/promises"; import { homedir } from "os"; import path from "path"; +import { Readable } from "readable-stream"; import tmp from "tmp-promise"; import xml2js from "xml2js"; -import { fetcher } from "@fern-typescript/fetcher"; -import fs from "fs"; + +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { Logger } from "@fern-api/logger"; const ETAG_FILENAME = "etag"; const PREVIEW_FOLDER_NAME = "preview"; diff --git a/packages/cli/docs-preview/src/previewDocs.ts b/packages/cli/docs-preview/src/previewDocs.ts index 26fb2132da9..c81038597ef 100644 --- a/packages/cli/docs-preview/src/previewDocs.ts +++ b/packages/cli/docs-preview/src/previewDocs.ts @@ -1,23 +1,23 @@ -import { DocsDefinitionResolver } from "@fern-api/docs-resolver"; +import { v4 as uuidv4 } from "uuid"; +import { DocsDefinitionResolver } from "@fern-api/docs-resolver"; import { APIV1Read, APIV1Write, - convertAPIDefinitionToDb, - convertDbAPIDefinitionToRead, - convertDbDocsConfigToRead, - convertDocsDefinitionToDb, DocsV1Read, FdrAPI, FernNavigation, - SDKSnippetHolder + SDKSnippetHolder, + convertAPIDefinitionToDb, + convertDbAPIDefinitionToRead, + convertDbDocsConfigToRead, + convertDocsDefinitionToDb } from "@fern-api/fdr-sdk"; import { convertToFernHostAbsoluteFilePath } from "@fern-api/fs-utils"; import { IntermediateRepresentation } from "@fern-api/ir-sdk"; import { Project } from "@fern-api/project-loader"; import { convertIrToFdrApi } from "@fern-api/register"; import { TaskContext } from "@fern-api/task-context"; -import { v4 as uuidv4 } from "uuid"; export async function getPreviewDocsDefinition({ domain, diff --git a/packages/cli/docs-preview/src/runPreviewServer.ts b/packages/cli/docs-preview/src/runPreviewServer.ts index 3c9433fcafb..cea13e243f7 100644 --- a/packages/cli/docs-preview/src/runPreviewServer.ts +++ b/packages/cli/docs-preview/src/runPreviewServer.ts @@ -1,15 +1,17 @@ -import { wrapWithHttps } from "@fern-api/docs-resolver"; -import { FernNavigation, DocsV1Read, DocsV2Read } from "@fern-api/fdr-sdk"; -import { dirname, doesPathExist, AbsoluteFilePath } from "@fern-api/fs-utils"; -import { Project } from "@fern-api/project-loader"; -import { TaskContext } from "@fern-api/task-context"; import chalk from "chalk"; import cors from "cors"; import express from "express"; import http from "http"; import path from "path"; import Watcher from "watcher"; -import { WebSocketServer, type WebSocket } from "ws"; +import { type WebSocket, WebSocketServer } from "ws"; + +import { wrapWithHttps } from "@fern-api/docs-resolver"; +import { DocsV1Read, DocsV2Read, FernNavigation } from "@fern-api/fdr-sdk"; +import { AbsoluteFilePath, dirname, doesPathExist } from "@fern-api/fs-utils"; +import { Project } from "@fern-api/project-loader"; +import { TaskContext } from "@fern-api/task-context"; + import { downloadBundle, getPathToBundleFolder } from "./downloadLocalDocsBundle"; import { getPreviewDocsDefinition } from "./previewDocs"; diff --git a/packages/cli/docs-resolver/package.json b/packages/cli/docs-resolver/package.json index b96ffe7b48e..f69bb9f4317 100644 --- a/packages/cli/docs-resolver/package.json +++ b/packages/cli/docs-resolver/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": { @@ -49,8 +48,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" } diff --git a/packages/cli/docs-resolver/src/ApiDefinitionHolder.ts b/packages/cli/docs-resolver/src/ApiDefinitionHolder.ts index febfde5ed8b..5001d80e642 100644 --- a/packages/cli/docs-resolver/src/ApiDefinitionHolder.ts +++ b/packages/cli/docs-resolver/src/ApiDefinitionHolder.ts @@ -1,6 +1,8 @@ +import urlJoin from "url-join"; + import { APIV1Read, FernNavigation } from "@fern-api/fdr-sdk"; import { TaskContext } from "@fern-api/task-context"; -import urlJoin from "url-join"; + import { isSubpackage } from "./utils/isSubpackage"; import { stringifyEndpointPathParts, stringifyEndpointPathParts2 } from "./utils/stringifyEndpointPathParts"; @@ -69,7 +71,10 @@ export class ApiDefinitionHolder { return pkg; } - private constructor(public readonly api: APIV1Read.ApiDefinition, private readonly context?: TaskContext) { + private constructor( + public readonly api: APIV1Read.ApiDefinition, + private readonly context?: TaskContext + ) { [api.rootPackage, ...Object.values(api.subpackages)].forEach((pkg) => { const subpackageId = APIV1Read.SubpackageId(ApiDefinitionHolder.getSubpackageId(pkg)); const subpackageHolder = { diff --git a/packages/cli/docs-resolver/src/ApiReferenceNodeConverter.ts b/packages/cli/docs-resolver/src/ApiReferenceNodeConverter.ts index aa2d13f6aaa..c1d2092462b 100644 --- a/packages/cli/docs-resolver/src/ApiReferenceNodeConverter.ts +++ b/packages/cli/docs-resolver/src/ApiReferenceNodeConverter.ts @@ -1,17 +1,19 @@ +import { kebabCase } from "lodash-es"; +import urlJoin from "url-join"; + import { docsYml } from "@fern-api/configuration-loader"; import { isNonNullish } from "@fern-api/core-utils"; import { APIV1Read, FernNavigation } from "@fern-api/fdr-sdk"; -import { AbsoluteFilePath, relative, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, relative } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; +import { titleCase, visitDiscriminatedUnion } from "@fern-api/ui-core-utils"; import { DocsWorkspace, FernWorkspace } from "@fern-api/workspace-loader"; -import { kebabCase } from "lodash-es"; -import urlJoin from "url-join"; + import { ApiDefinitionHolder } from "./ApiDefinitionHolder"; import { ChangelogNodeConverter } from "./ChangelogNodeConverter"; import { NodeIdGenerator } from "./NodeIdGenerator"; import { isSubpackage } from "./utils/isSubpackage"; import { stringifyEndpointPathParts } from "./utils/stringifyEndpointPathParts"; -import { titleCase, visitDiscriminatedUnion } from "@fern-api/ui-core-utils"; export class ApiReferenceNodeConverter { apiDefinitionId: FernNavigation.V1.ApiDefinitionId; @@ -196,7 +198,7 @@ export class ApiReferenceNodeConverter { pkg.slug ?? (isSubpackage(subpackage) ? subpackage.urlSlug - : this.apiSection.slug ?? kebabCase(this.apiSection.title)); + : (this.apiSection.slug ?? kebabCase(this.apiSection.title))); const slug = parentSlug.apply({ fullSlug: maybeFullSlug?.split("/"), skipUrlSlug: pkg.skipUrlSlug, @@ -210,7 +212,7 @@ export class ApiReferenceNodeConverter { title: pkg.title ?? (isSubpackage(subpackage) - ? subpackage.displayName ?? titleCase(subpackage.name) + ? (subpackage.displayName ?? titleCase(subpackage.name)) : this.apiSection.title), slug: slug.get(), icon: pkg.icon, @@ -351,7 +353,7 @@ export class ApiReferenceNodeConverter { type: "apiPackage", children: [], title: isSubpackage(subpackage) - ? subpackage.displayName ?? titleCase(subpackage.name) + ? (subpackage.displayName ?? titleCase(subpackage.name)) : this.apiSection.title, slug: slug.get(), icon: undefined, @@ -644,7 +646,7 @@ export class ApiReferenceNodeConverter { type: "apiPackage", children: subpackageChildren, title: isSubpackage(subpackage) - ? subpackage.displayName ?? titleCase(subpackage.name) + ? (subpackage.displayName ?? titleCase(subpackage.name)) : this.apiSection.title, slug: slug.get(), icon: undefined, diff --git a/packages/cli/docs-resolver/src/ChangelogNodeConverter.ts b/packages/cli/docs-resolver/src/ChangelogNodeConverter.ts index 3813bf727db..3089a7e39a2 100644 --- a/packages/cli/docs-resolver/src/ChangelogNodeConverter.ts +++ b/packages/cli/docs-resolver/src/ChangelogNodeConverter.ts @@ -1,9 +1,11 @@ -import { APIV1Write, FernNavigation } from "@fern-api/fdr-sdk"; -import { AbsoluteFilePath, relative, RelativeFilePath } from "@fern-api/fs-utils"; -import { DocsWorkspace } from "@fern-api/workspace-loader"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { kebabCase, last } from "lodash-es"; + +import { APIV1Write, FernNavigation } from "@fern-api/fdr-sdk"; +import { AbsoluteFilePath, RelativeFilePath, relative } from "@fern-api/fs-utils"; +import { DocsWorkspace } from "@fern-api/workspace-loader"; + import { NodeIdGenerator } from "./NodeIdGenerator"; import { extractDatetimeFromChangelogTitle } from "./utils/extractDatetimeFromChangelogTitle"; diff --git a/packages/cli/docs-resolver/src/DocsDefinitionResolver.ts b/packages/cli/docs-resolver/src/DocsDefinitionResolver.ts index 011c62af493..d3eff78fc2c 100644 --- a/packages/cli/docs-resolver/src/DocsDefinitionResolver.ts +++ b/packages/cli/docs-resolver/src/DocsDefinitionResolver.ts @@ -1,4 +1,12 @@ -import { docsYml, parseDocsConfiguration, WithoutQuestionMarks } from "@fern-api/configuration-loader"; +import dayjs from "dayjs"; +import utc from "dayjs/plugin/utc"; +import { readFile, stat } from "fs/promises"; +import matter from "gray-matter"; +import { kebabCase } from "lodash-es"; +import urlJoin from "url-join"; + +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; +import { WithoutQuestionMarks, docsYml, parseDocsConfiguration } from "@fern-api/configuration-loader"; import { assertNever, isNonNullish, visitDiscriminatedUnion } from "@fern-api/core-utils"; import { parseImagePaths, @@ -7,17 +15,12 @@ import { replaceReferencedMarkdown } from "@fern-api/docs-markdown-utils"; import { APIV1Write, DocsV1Write, FernNavigation } from "@fern-api/fdr-sdk"; -import { AbsoluteFilePath, listFiles, relative, RelativeFilePath, relativize, resolve } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, listFiles, relative, relativize, resolve } from "@fern-api/fs-utils"; import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { IntermediateRepresentation } from "@fern-api/ir-sdk"; import { TaskContext } from "@fern-api/task-context"; import { DocsWorkspace, FernWorkspace } from "@fern-api/workspace-loader"; -import dayjs from "dayjs"; -import utc from "dayjs/plugin/utc"; -import { readFile, stat } from "fs/promises"; -import matter from "gray-matter"; -import { kebabCase } from "lodash-es"; -import urlJoin from "url-join"; + import { ApiReferenceNodeConverter } from "./ApiReferenceNodeConverter"; import { ChangelogNodeConverter } from "./ChangelogNodeConverter"; import { NodeIdGenerator } from "./NodeIdGenerator"; @@ -25,7 +28,6 @@ import { convertDocsSnippetsConfigToFdr } from "./utils/convertDocsSnippetsConfi import { convertIrToApiDefinition } from "./utils/convertIrToApiDefinition"; import { collectFilesFromDocsConfig } from "./utils/getImageFilepathsToUpload"; import { wrapWithHttps } from "./wrapWithHttps"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; dayjs.extend(utc); diff --git a/packages/cli/docs-resolver/src/NodeIdGenerator.ts b/packages/cli/docs-resolver/src/NodeIdGenerator.ts index 27c5867a907..b52d2417dbb 100644 --- a/packages/cli/docs-resolver/src/NodeIdGenerator.ts +++ b/packages/cli/docs-resolver/src/NodeIdGenerator.ts @@ -1,6 +1,7 @@ -import { FernNavigation } from "@fern-api/fdr-sdk"; import crypto from "crypto"; +import { FernNavigation } from "@fern-api/fdr-sdk"; + function hash(id: string): string { return crypto.createHash("sha256").update(id).digest("hex"); } diff --git a/packages/cli/docs-resolver/src/__test__/api-resolver.test.ts b/packages/cli/docs-resolver/src/__test__/api-resolver.test.ts index cd851d9b576..c8c73eecd3d 100644 --- a/packages/cli/docs-resolver/src/__test__/api-resolver.test.ts +++ b/packages/cli/docs-resolver/src/__test__/api-resolver.test.ts @@ -1,14 +1,15 @@ +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { docsYml, parseDocsConfiguration } from "@fern-api/configuration-loader"; import { FernNavigation } from "@fern-api/fdr-sdk"; import { AbsoluteFilePath, resolve } from "@fern-api/fs-utils"; import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { createMockTaskContext } from "@fern-api/task-context"; import { loadAPIWorkspace, loadDocsWorkspace } from "@fern-api/workspace-loader"; + import { ApiDefinitionHolder } from "../ApiDefinitionHolder"; import { ApiReferenceNodeConverter } from "../ApiReferenceNodeConverter"; import { NodeIdGenerator } from "../NodeIdGenerator"; import { convertIrToApiDefinition } from "../utils/convertIrToApiDefinition"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; const context = createMockTaskContext(); diff --git a/packages/cli/docs-resolver/src/__test__/dry.test.ts b/packages/cli/docs-resolver/src/__test__/dry.test.ts index afa718448b1..fa11fd86b8b 100644 --- a/packages/cli/docs-resolver/src/__test__/dry.test.ts +++ b/packages/cli/docs-resolver/src/__test__/dry.test.ts @@ -3,6 +3,7 @@ import { FernNavigation } from "@fern-api/fdr-sdk"; import { AbsoluteFilePath, resolve } from "@fern-api/fs-utils"; import { createMockTaskContext } from "@fern-api/task-context"; import { loadDocsWorkspace } from "@fern-api/workspace-loader"; + import { DocsDefinitionResolver } from "../DocsDefinitionResolver"; const context = createMockTaskContext(); diff --git a/packages/cli/docs-resolver/src/__test__/stream.test.ts b/packages/cli/docs-resolver/src/__test__/stream.test.ts index 4fec3d6e36b..7baf80e02c4 100644 --- a/packages/cli/docs-resolver/src/__test__/stream.test.ts +++ b/packages/cli/docs-resolver/src/__test__/stream.test.ts @@ -1,14 +1,15 @@ +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { docsYml, parseDocsConfiguration } from "@fern-api/configuration-loader"; import { FernNavigation } from "@fern-api/fdr-sdk"; import { AbsoluteFilePath, resolve } from "@fern-api/fs-utils"; -import { generateIntermediateRepresentation, IdGenerator } from "@fern-api/ir-generator"; +import { IdGenerator, generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { createMockTaskContext } from "@fern-api/task-context"; import { loadAPIWorkspace, loadDocsWorkspace } from "@fern-api/workspace-loader"; + import { ApiDefinitionHolder } from "../ApiDefinitionHolder"; import { ApiReferenceNodeConverter } from "../ApiReferenceNodeConverter"; import { NodeIdGenerator } from "../NodeIdGenerator"; import { convertIrToApiDefinition } from "../utils/convertIrToApiDefinition"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; const context = createMockTaskContext(); diff --git a/packages/cli/docs-resolver/src/utils/convertIrToApiDefinition.ts b/packages/cli/docs-resolver/src/utils/convertIrToApiDefinition.ts index 5dcf1a9f062..a0e02a633eb 100644 --- a/packages/cli/docs-resolver/src/utils/convertIrToApiDefinition.ts +++ b/packages/cli/docs-resolver/src/utils/convertIrToApiDefinition.ts @@ -1,12 +1,13 @@ import { APIV1Read, DocsV1Read, + SDKSnippetHolder, convertAPIDefinitionToDb, - convertDbAPIDefinitionToRead, - SDKSnippetHolder + convertDbAPIDefinitionToRead } from "@fern-api/fdr-sdk"; import { IntermediateRepresentation } from "@fern-api/ir-sdk"; import { convertIrToFdrApi } from "@fern-api/register"; + import { PlaygroundConfig } from "../DocsDefinitionResolver"; const EMPTY_SNIPPET_HOLDER = new SDKSnippetHolder({ diff --git a/packages/cli/ete-tests/package.json b/packages/cli/ete-tests/package.json index ab5fc371dce..cd0eb9b1256 100644 --- a/packages/cli/ete-tests/package.json +++ b/packages/cli/ete-tests/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": { @@ -52,8 +51,8 @@ "form-data": "4.0.0", "vitest": "^2.1.8", "jest-environment-jsdom": "^29.7.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" } } \ No newline at end of file diff --git a/packages/cli/ete-tests/src/tests/add/add.test.ts b/packages/cli/ete-tests/src/tests/add/add.test.ts index 25ae045cb52..6a643e7f5dc 100644 --- a/packages/cli/ete-tests/src/tests/add/add.test.ts +++ b/packages/cli/ete-tests/src/tests/add/add.test.ts @@ -1,4 +1,5 @@ import { getDirectoryContents, getDirectoryContentsForSnapshot } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; import { init } from "../init/init"; diff --git a/packages/cli/ete-tests/src/tests/api-option/api-option.test.ts b/packages/cli/ete-tests/src/tests/api-option/api-option.test.ts index 94fd0918d67..6e6c19ee5c9 100644 --- a/packages/cli/ete-tests/src/tests/api-option/api-option.test.ts +++ b/packages/cli/ete-tests/src/tests/api-option/api-option.test.ts @@ -1,5 +1,6 @@ import path from "path"; import tmp from "tmp-promise"; + import { runFernCli } from "../../utils/runFernCli"; const FIXTURES_DIR = path.join(__dirname, "fixtures"); diff --git a/packages/cli/ete-tests/src/tests/dependencies/dependencies.test.ts b/packages/cli/ete-tests/src/tests/dependencies/dependencies.test.ts index 345cc31f873..04a4c88a6f8 100644 --- a/packages/cli/ete-tests/src/tests/dependencies/dependencies.test.ts +++ b/packages/cli/ete-tests/src/tests/dependencies/dependencies.test.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import stripAnsi from "strip-ansi"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; import { generateIrAsString } from "../ir/generateIrAsString"; diff --git a/packages/cli/ete-tests/src/tests/docs-dev/docsDev.test.ts b/packages/cli/ete-tests/src/tests/docs-dev/docsDev.test.ts index de40c935d75..fdabd701b4e 100644 --- a/packages/cli/ete-tests/src/tests/docs-dev/docsDev.test.ts +++ b/packages/cli/ete-tests/src/tests/docs-dev/docsDev.test.ts @@ -1,6 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { FernRegistry as FdrCjsSdk } from "@fern-fern/fdr-cjs-sdk"; import fetch from "node-fetch"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + +import { FernRegistry as FdrCjsSdk } from "@fern-fern/fdr-cjs-sdk"; + import { runFernCli } from "../../utils/runFernCli"; const fixturesDir = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/ete-tests/src/tests/dynamic/dyanmic.test.ts b/packages/cli/ete-tests/src/tests/dynamic/dyanmic.test.ts index a243f5e3a5c..5d206dbddc5 100644 --- a/packages/cli/ete-tests/src/tests/dynamic/dyanmic.test.ts +++ b/packages/cli/ete-tests/src/tests/dynamic/dyanmic.test.ts @@ -1,5 +1,6 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { generatorsYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { generateDynamicIrAsString } from "./generateDynamicIrAsString"; const FIXTURES_DIR = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/ete-tests/src/tests/dynamic/generateDynamicIrAsString.ts b/packages/cli/ete-tests/src/tests/dynamic/generateDynamicIrAsString.ts index f5a098cf194..7539100b142 100644 --- a/packages/cli/ete-tests/src/tests/dynamic/generateDynamicIrAsString.ts +++ b/packages/cli/ete-tests/src/tests/dynamic/generateDynamicIrAsString.ts @@ -1,6 +1,8 @@ -import { generatorsYml } from "@fern-api/configuration"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile, rm } from "fs/promises"; + +import { generatorsYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; export async function generateDynamicIrAsString({ diff --git a/packages/cli/ete-tests/src/tests/fdr/fdr.test.ts b/packages/cli/ete-tests/src/tests/fdr/fdr.test.ts index e5262c44e20..b7718b184ea 100644 --- a/packages/cli/ete-tests/src/tests/fdr/fdr.test.ts +++ b/packages/cli/ete-tests/src/tests/fdr/fdr.test.ts @@ -1,5 +1,6 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { generatorsYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { generateFdrApiDefinitionAsString } from "./generateFdrApiDefinitionAsString"; const FIXTURES_DIR = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/ete-tests/src/tests/fdr/generateFdrApiDefinitionAsString.ts b/packages/cli/ete-tests/src/tests/fdr/generateFdrApiDefinitionAsString.ts index 4ffcd7222e6..5cc0e3709eb 100644 --- a/packages/cli/ete-tests/src/tests/fdr/generateFdrApiDefinitionAsString.ts +++ b/packages/cli/ete-tests/src/tests/fdr/generateFdrApiDefinitionAsString.ts @@ -1,6 +1,8 @@ -import { generatorsYml } from "@fern-api/configuration"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile, rm } from "fs/promises"; + +import { generatorsYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; export async function generateFdrApiDefinitionAsString({ diff --git a/packages/cli/ete-tests/src/tests/fetcher/fetcher.test.ts b/packages/cli/ete-tests/src/tests/fetcher/fetcher.test.ts index a0662059bba..d49dcafc7ac 100644 --- a/packages/cli/ete-tests/src/tests/fetcher/fetcher.test.ts +++ b/packages/cli/ete-tests/src/tests/fetcher/fetcher.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable jest/no-disabled-tests */ -import { fetcher, newFormData, Stream } from "@fern-typescript/fetcher"; +import { Stream, fetcher, newFormData } from "@fern-typescript/fetcher"; import * as fs from "fs"; import path from "path"; import * as stream from "stream"; diff --git a/packages/cli/ete-tests/src/tests/generate/fernignore.test.ts b/packages/cli/ete-tests/src/tests/generate/fernignore.test.ts index b1fcb44855b..54c7974b49d 100644 --- a/packages/cli/ete-tests/src/tests/generate/fernignore.test.ts +++ b/packages/cli/ete-tests/src/tests/generate/fernignore.test.ts @@ -1,6 +1,8 @@ -import { FERNIGNORE_FILENAME } from "@fern-api/configuration"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; import { writeFile } from "fs/promises"; + +import { FERNIGNORE_FILENAME } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; import { init } from "../init/init"; diff --git a/packages/cli/ete-tests/src/tests/generate/generate-with-settings.test.ts b/packages/cli/ete-tests/src/tests/generate/generate-with-settings.test.ts index 23f8e32d045..55ed7a705a9 100644 --- a/packages/cli/ete-tests/src/tests/generate/generate-with-settings.test.ts +++ b/packages/cli/ete-tests/src/tests/generate/generate-with-settings.test.ts @@ -1,12 +1,14 @@ +import { cp } from "fs/promises"; +import tmp from "tmp-promise"; + import { AbsoluteFilePath, + RelativeFilePath, getDirectoryContents, getDirectoryContentsForSnapshot, - join, - RelativeFilePath + join } from "@fern-api/fs-utils"; -import { cp } from "fs/promises"; -import tmp from "tmp-promise"; + import { runFernCli } from "../../utils/runFernCli"; describe("fern generate with settings", () => { diff --git a/packages/cli/ete-tests/src/tests/generate/generate.test.ts b/packages/cli/ete-tests/src/tests/generate/generate.test.ts index 1ec0985eae4..ecc307cc32e 100644 --- a/packages/cli/ete-tests/src/tests/generate/generate.test.ts +++ b/packages/cli/ete-tests/src/tests/generate/generate.test.ts @@ -1,8 +1,10 @@ -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { exec } from "child_process"; import stripAnsi from "strip-ansi"; + +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; import { init } from "../init/init"; -import { exec } from "child_process"; const fixturesDir = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/ete-tests/src/tests/generate/output-directory-prompts.test.ts b/packages/cli/ete-tests/src/tests/generate/output-directory-prompts.test.ts index 75e4f142b5b..18e20a0cd00 100644 --- a/packages/cli/ete-tests/src/tests/generate/output-directory-prompts.test.ts +++ b/packages/cli/ete-tests/src/tests/generate/output-directory-prompts.test.ts @@ -1,10 +1,12 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { Options } from "execa"; import { cp, mkdir } from "fs/promises"; +import stripAnsi from "strip-ansi"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; -import stripAnsi from "strip-ansi"; import { init } from "../init/init"; -import { Options } from "execa"; const envWithCI = { CI: "true" diff --git a/packages/cli/ete-tests/src/tests/generators-get/generators-get.test.ts b/packages/cli/ete-tests/src/tests/generators-get/generators-get.test.ts index a9b125a77a5..fb54df836e8 100644 --- a/packages/cli/ete-tests/src/tests/generators-get/generators-get.test.ts +++ b/packages/cli/ete-tests/src/tests/generators-get/generators-get.test.ts @@ -1,7 +1,8 @@ +import { readFile } from "fs/promises"; +import tmp from "tmp-promise"; + import { runFernCli } from "../../utils/runFernCli"; import { init } from "../init/init"; -import tmp from "tmp-promise"; -import { readFile } from "fs/promises"; // Ensure that the generators list command works and the format doesn't change, since fern-bot consumes this describe("fern generator get", () => { diff --git a/packages/cli/ete-tests/src/tests/help/help.test.ts b/packages/cli/ete-tests/src/tests/help/help.test.ts index 781476c12a7..685a9b8e0ad 100644 --- a/packages/cli/ete-tests/src/tests/help/help.test.ts +++ b/packages/cli/ete-tests/src/tests/help/help.test.ts @@ -1,4 +1,5 @@ import tmp from "tmp-promise"; + import { runFernCli } from "../../utils/runFernCli"; describe("help", () => { diff --git a/packages/cli/ete-tests/src/tests/init/init.test.ts b/packages/cli/ete-tests/src/tests/init/init.test.ts index 48e65a2d66f..dc1201410a6 100644 --- a/packages/cli/ete-tests/src/tests/init/init.test.ts +++ b/packages/cli/ete-tests/src/tests/init/init.test.ts @@ -1,12 +1,13 @@ import { APIS_DIRECTORY, FERN_DIRECTORY } from "@fern-api/configuration"; import { AbsoluteFilePath, + RelativeFilePath, doesPathExist, getDirectoryContents, getDirectoryContentsForSnapshot, - join, - RelativeFilePath + join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; import { init } from "./init"; diff --git a/packages/cli/ete-tests/src/tests/init/init.ts b/packages/cli/ete-tests/src/tests/init/init.ts index 261c46e69fd..9fe54ac1e28 100644 --- a/packages/cli/ete-tests/src/tests/init/init.ts +++ b/packages/cli/ete-tests/src/tests/init/init.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; interface InitOptions { diff --git a/packages/cli/ete-tests/src/tests/ir/generateIrAsString.ts b/packages/cli/ete-tests/src/tests/ir/generateIrAsString.ts index 05edde5113a..19cd20dd68c 100644 --- a/packages/cli/ete-tests/src/tests/ir/generateIrAsString.ts +++ b/packages/cli/ete-tests/src/tests/ir/generateIrAsString.ts @@ -1,6 +1,8 @@ -import { generatorsYml } from "@fern-api/configuration"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile, rm } from "fs/promises"; + +import { generatorsYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; export async function generateIrAsString({ diff --git a/packages/cli/ete-tests/src/tests/ir/ir.test.ts b/packages/cli/ete-tests/src/tests/ir/ir.test.ts index ac110350e54..c2444b46cf0 100644 --- a/packages/cli/ete-tests/src/tests/ir/ir.test.ts +++ b/packages/cli/ete-tests/src/tests/ir/ir.test.ts @@ -1,7 +1,8 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { generatorsYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; import { generateIrAsString } from "./generateIrAsString"; -import { generatorsYml } from "@fern-api/configuration"; const FIXTURES_DIR = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/ete-tests/src/tests/jsonschema/jsonschema.test.ts b/packages/cli/ete-tests/src/tests/jsonschema/jsonschema.test.ts index 9c5a30b5a7e..564a4dc9aff 100644 --- a/packages/cli/ete-tests/src/tests/jsonschema/jsonschema.test.ts +++ b/packages/cli/ete-tests/src/tests/jsonschema/jsonschema.test.ts @@ -1,7 +1,9 @@ -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { readFile } from "fs/promises"; + +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; import { init } from "../init/init"; -import { readFile } from "fs/promises"; describe("jsonschema", () => { it("works with latest version", async () => { diff --git a/packages/cli/ete-tests/src/tests/mock/mock.test.ts b/packages/cli/ete-tests/src/tests/mock/mock.test.ts index a3d187cccb6..e46ec2868be 100644 --- a/packages/cli/ete-tests/src/tests/mock/mock.test.ts +++ b/packages/cli/ete-tests/src/tests/mock/mock.test.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import fetch from "node-fetch"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; const fixturesDir = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("fixtures")); diff --git a/packages/cli/ete-tests/src/tests/organization/organization.test.ts b/packages/cli/ete-tests/src/tests/organization/organization.test.ts index 413a5855279..b86761bd86a 100644 --- a/packages/cli/ete-tests/src/tests/organization/organization.test.ts +++ b/packages/cli/ete-tests/src/tests/organization/organization.test.ts @@ -1,7 +1,9 @@ import { readFile } from "fs/promises"; import tmp from "tmp-promise"; + import { runFernCli } from "../../utils/runFernCli"; import { init } from "../init/init"; + // Pretty trivial command, but adding tests in case this breaks down the line describe("fern organization", () => { it("fern organization", async () => { diff --git a/packages/cli/ete-tests/src/tests/update-api/update-api.test.ts b/packages/cli/ete-tests/src/tests/update-api/update-api.test.ts index 3ad7098cbfe..73758d23a54 100644 --- a/packages/cli/ete-tests/src/tests/update-api/update-api.test.ts +++ b/packages/cli/ete-tests/src/tests/update-api/update-api.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, getDirectoryContentsForSnapshot } from "@fern-api/fs-utils"; import { cp } from "fs/promises"; import path from "path"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, getDirectoryContentsForSnapshot } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; import { setupOpenAPIServer } from "../../utils/setupOpenAPIServer"; diff --git a/packages/cli/ete-tests/src/tests/upgrade-generator/upgrade-generator.test.ts b/packages/cli/ete-tests/src/tests/upgrade-generator/upgrade-generator.test.ts index a8a03fed292..1e5c2127b57 100644 --- a/packages/cli/ete-tests/src/tests/upgrade-generator/upgrade-generator.test.ts +++ b/packages/cli/ete-tests/src/tests/upgrade-generator/upgrade-generator.test.ts @@ -1,8 +1,10 @@ /* eslint-disable jest/no-disabled-tests */ -import { AbsoluteFilePath, getDirectoryContents, join, RelativeFilePath } from "@fern-api/fs-utils"; import { cp, readFile } from "fs/promises"; import path from "path"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, getDirectoryContents, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; const FIXTURES_DIR = path.join(__dirname, "fixtures"); diff --git a/packages/cli/ete-tests/src/tests/upgrade/upgrade.test.ts b/packages/cli/ete-tests/src/tests/upgrade/upgrade.test.ts index 274cbe39a48..1b2863e5806 100644 --- a/packages/cli/ete-tests/src/tests/upgrade/upgrade.test.ts +++ b/packages/cli/ete-tests/src/tests/upgrade/upgrade.test.ts @@ -1,7 +1,9 @@ -import { FERN_DIRECTORY, GENERATORS_CONFIGURATION_FILENAME, generatorsYml } from "@fern-api/configuration"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile, writeFile } from "fs/promises"; import yaml from "js-yaml"; + +import { FERN_DIRECTORY, GENERATORS_CONFIGURATION_FILENAME, generatorsYml } from "@fern-api/configuration"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; import { init } from "../init/init"; diff --git a/packages/cli/ete-tests/src/tests/validate/validate.test.ts b/packages/cli/ete-tests/src/tests/validate/validate.test.ts index de2b6f5a2df..18a789288a2 100644 --- a/packages/cli/ete-tests/src/tests/validate/validate.test.ts +++ b/packages/cli/ete-tests/src/tests/validate/validate.test.ts @@ -1,6 +1,7 @@ import { rm } from "fs/promises"; import path from "path"; import stripAnsi from "strip-ansi"; + import { runFernCli } from "../../utils/runFernCli"; const FIXTURES_DIR = path.join(__dirname, "fixtures"); diff --git a/packages/cli/ete-tests/src/tests/version/version.test.ts b/packages/cli/ete-tests/src/tests/version/version.test.ts index 69cb8bf42aa..633e73018df 100644 --- a/packages/cli/ete-tests/src/tests/version/version.test.ts +++ b/packages/cli/ete-tests/src/tests/version/version.test.ts @@ -1,4 +1,5 @@ import tmp from "tmp-promise"; + import { runFernCli } from "../../utils/runFernCli"; const DEFAULT_VERSION = "0.0.0"; diff --git a/packages/cli/ete-tests/src/tests/write-definition/writeDefinition.test.ts b/packages/cli/ete-tests/src/tests/write-definition/writeDefinition.test.ts index 61218ca3cb9..da932c058b4 100644 --- a/packages/cli/ete-tests/src/tests/write-definition/writeDefinition.test.ts +++ b/packages/cli/ete-tests/src/tests/write-definition/writeDefinition.test.ts @@ -1,11 +1,13 @@ +import { rm } from "fs/promises"; +import path from "path"; + import { AbsoluteFilePath, doesPathExist, getDirectoryContents, getDirectoryContentsForSnapshot } from "@fern-api/fs-utils"; -import { rm } from "fs/promises"; -import path from "path"; + import { runFernCli } from "../../utils/runFernCli"; const FIXTURES_DIR = path.join(__dirname, "fixtures"); diff --git a/packages/cli/ete-tests/src/tests/write-docs-definition/writeDocsDefinition.test.ts b/packages/cli/ete-tests/src/tests/write-docs-definition/writeDocsDefinition.test.ts index 3b0f514cc2c..17e5073a76c 100644 --- a/packages/cli/ete-tests/src/tests/write-docs-definition/writeDocsDefinition.test.ts +++ b/packages/cli/ete-tests/src/tests/write-docs-definition/writeDocsDefinition.test.ts @@ -1,6 +1,8 @@ -import { AbsoluteFilePath, doesPathExist } from "@fern-api/fs-utils"; -import { rm, readFile } from "fs/promises"; +import { readFile, rm } from "fs/promises"; import path from "path"; + +import { AbsoluteFilePath, doesPathExist } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; const FIXTURES_DIR = path.join(__dirname, "fixtures"); diff --git a/packages/cli/ete-tests/src/tests/write-overrides/writeOverrides.test.ts b/packages/cli/ete-tests/src/tests/write-overrides/writeOverrides.test.ts index 4bfdf140fa8..b5057918ed1 100644 --- a/packages/cli/ete-tests/src/tests/write-overrides/writeOverrides.test.ts +++ b/packages/cli/ete-tests/src/tests/write-overrides/writeOverrides.test.ts @@ -1,6 +1,8 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; import path from "path"; + +import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { runFernCli } from "../../utils/runFernCli"; const FIXTURES_DIR = path.join(__dirname, "fixtures"); diff --git a/packages/cli/ete-tests/src/utils/runFernCli.ts b/packages/cli/ete-tests/src/utils/runFernCli.ts index e4a83599a12..94751a0d980 100644 --- a/packages/cli/ete-tests/src/utils/runFernCli.ts +++ b/packages/cli/ete-tests/src/utils/runFernCli.ts @@ -1,7 +1,8 @@ -import { loggingExeca } from "@fern-api/logging-execa"; import { ExecaChildProcess, Options } from "execa"; import path from "path"; +import { loggingExeca } from "@fern-api/logging-execa"; + export async function runFernCli(args: string[], options?: Options): Promise { return loggingExeca(undefined, "node", [path.join(__dirname, "../../../cli/dist/dev/cli.cjs"), ...args], { ...options, diff --git a/packages/cli/ete-tests/src/utils/runSeedCli.ts b/packages/cli/ete-tests/src/utils/runSeedCli.ts index 67bb0ffab64..6bf1ee50b89 100644 --- a/packages/cli/ete-tests/src/utils/runSeedCli.ts +++ b/packages/cli/ete-tests/src/utils/runSeedCli.ts @@ -1,7 +1,8 @@ -import { loggingExeca } from "@fern-api/logging-execa"; import { ExecaChildProcess, Options } from "execa"; import path from "path"; +import { loggingExeca } from "@fern-api/logging-execa"; + export async function runSeedCli(args: string[], options?: Options): Promise { return loggingExeca(undefined, "node", [path.join(__dirname, "../../../../seed/dist/cli.cjs"), ...args], { ...options, diff --git a/packages/cli/ete-tests/src/utils/setupOpenAPIServer.ts b/packages/cli/ete-tests/src/utils/setupOpenAPIServer.ts index d917a38e1fe..3909a5e895b 100644 --- a/packages/cli/ete-tests/src/utils/setupOpenAPIServer.ts +++ b/packages/cli/ete-tests/src/utils/setupOpenAPIServer.ts @@ -1,6 +1,6 @@ -import { OpenAPI } from "openapi-types"; import express from "express"; import * as http from "http"; +import { OpenAPI } from "openapi-types"; const TEST_OPENAPI_DOCUMENT: OpenAPI.Document = { openapi: "3.0.0", diff --git a/packages/cli/fern-definition/formatter/package.json b/packages/cli/fern-definition/formatter/package.json index 530e3dc7b73..4a0be0103e1 100644 --- a/packages/cli/fern-definition/formatter/package.json +++ b/packages/cli/fern-definition/formatter/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": { @@ -33,16 +32,17 @@ "@fern-api/task-context": "workspace:*", "@fern-api/api-workspace-commons": "workspace:*", "@fern-api/fern-definition-schema": "workspace:*", + "prettier2": "npm:prettier@^2.7.1", "chalk": "^5.3.0" }, "devDependencies": { "@types/jest": "^29.5.14", "@types/node": "18.15.3", - "@types/prettier": "^2.7.1", + "@types/prettier2": "npm:@types/prettier@^2.7.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" } diff --git a/packages/cli/fern-definition/formatter/src/FernDefinitionFileFormatter.ts b/packages/cli/fern-definition/formatter/src/FernDefinitionFileFormatter.ts index 104c665fcc7..6b46860a7a2 100644 --- a/packages/cli/fern-definition/formatter/src/FernDefinitionFileFormatter.ts +++ b/packages/cli/fern-definition/formatter/src/FernDefinitionFileFormatter.ts @@ -1,6 +1,7 @@ +import * as prettier from "prettier2"; + import { assertNever, assertNeverNoThrow } from "@fern-api/core-utils"; import { RawSchemas } from "@fern-api/fern-definition-schema"; -import * as prettier from "prettier"; const LANG_SERVER_BANNER = "# yaml-language-server: $schema=https://raw.githubusercontent.com/fern-api/fern/main/fern.schema.json"; diff --git a/packages/cli/fern-definition/formatter/src/__test__/formatDefinitionFile.test.ts b/packages/cli/fern-definition/formatter/src/__test__/formatDefinitionFile.test.ts index e648305652f..5c78d80b983 100644 --- a/packages/cli/fern-definition/formatter/src/__test__/formatDefinitionFile.test.ts +++ b/packages/cli/fern-definition/formatter/src/__test__/formatDefinitionFile.test.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { formatDefinitionFile } from "../formatDefinitionFile"; const FIXTURES = [ diff --git a/packages/cli/fern-definition/formatter/src/formatWorkspace.ts b/packages/cli/fern-definition/formatter/src/formatWorkspace.ts index 0650c1da7b1..72bf9a656ee 100644 --- a/packages/cli/fern-definition/formatter/src/formatWorkspace.ts +++ b/packages/cli/fern-definition/formatter/src/formatWorkspace.ts @@ -1,8 +1,10 @@ -import { entries } from "@fern-api/core-utils"; -import { TaskContext } from "@fern-api/task-context"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; import chalk from "chalk"; import { writeFile } from "fs/promises"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; +import { entries } from "@fern-api/core-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { formatDefinitionFile } from "./formatDefinitionFile"; export async function formatFernWorkspace({ diff --git a/packages/cli/fern-definition/ir-to-jsonschema/package.json b/packages/cli/fern-definition/ir-to-jsonschema/package.json index 3c70fea8f64..9823e91485f 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/package.json +++ b/packages/cli/fern-definition/ir-to-jsonschema/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 @@ "@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" } diff --git a/packages/cli/fern-definition/ir-to-jsonschema/src/JsonSchemaConverterContext.ts b/packages/cli/fern-definition/ir-to-jsonschema/src/JsonSchemaConverterContext.ts index fffea62a098..7813aab913c 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/src/JsonSchemaConverterContext.ts +++ b/packages/cli/fern-definition/ir-to-jsonschema/src/JsonSchemaConverterContext.ts @@ -1,12 +1,16 @@ +import { JSONSchema4 } from "json-schema"; + import { IntermediateRepresentation, TypeDeclaration, TypeId, TypeReference } from "@fern-api/ir-sdk"; import { TaskContext } from "@fern-api/task-context"; -import { JSONSchema4 } from "json-schema"; export class JsonSchemaConverterContext { private readonly buildingTypeIds: Set = new Set(); private readonly definitions: Record = {}; - constructor(private readonly context: TaskContext, private readonly ir: IntermediateRepresentation) {} + constructor( + private readonly context: TaskContext, + private readonly ir: IntermediateRepresentation + ) {} public getTypeDeclarationForId({ typeName, typeId }: { typeId: TypeId; typeName?: string }): TypeDeclaration { const typeDeclaration = this.ir.types[typeId]; diff --git a/packages/cli/fern-definition/ir-to-jsonschema/src/__test__/convertIRtoJsonSchema.test.ts b/packages/cli/fern-definition/ir-to-jsonschema/src/__test__/convertIRtoJsonSchema.test.ts index 2abed94bdd2..82f5914898f 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/src/__test__/convertIRtoJsonSchema.test.ts +++ b/packages/cli/fern-definition/ir-to-jsonschema/src/__test__/convertIRtoJsonSchema.test.ts @@ -1,12 +1,14 @@ -import { describe, it, expect } from "vitest"; -import { convertIRtoJsonSchema } from "../convertIRtoJsonSchema"; -import { createMockTaskContext } from "@fern-api/task-context"; -import { loadApis } from "@fern-api/project-loader"; -import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; -import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import Ajv from "ajv"; import addFormats from "ajv-formats"; +import { describe, expect, it } from "vitest"; + import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; +import { loadApis } from "@fern-api/project-loader"; +import { createMockTaskContext } from "@fern-api/task-context"; + +import { convertIRtoJsonSchema } from "../convertIRtoJsonSchema"; describe("convertIRtoJsonSchema", async () => { const TEST_DEFINITIONS_DIR = join( diff --git a/packages/cli/fern-definition/ir-to-jsonschema/src/convertIRtoJsonSchema.ts b/packages/cli/fern-definition/ir-to-jsonschema/src/convertIRtoJsonSchema.ts index a15617db1a4..6f3e6efb70b 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/src/convertIRtoJsonSchema.ts +++ b/packages/cli/fern-definition/ir-to-jsonschema/src/convertIRtoJsonSchema.ts @@ -1,6 +1,8 @@ -import { IntermediateRepresentation, TypeDeclaration, TypeId } from "@fern-api/ir-sdk/"; import { JSONSchema4 } from "json-schema"; + +import { IntermediateRepresentation, TypeDeclaration, TypeId } from "@fern-api/ir-sdk/"; import { TaskContext } from "@fern-api/task-context"; + import { JsonSchemaConverterContext } from "./JsonSchemaConverterContext"; import { convertTypeDeclarationToJsonSchema } from "./converters/convertTypeDeclarationToJsonSchema"; diff --git a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/containerToJsonSchema.ts b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/containerToJsonSchema.ts index 4b125d669ee..1c7dfba3d75 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/containerToJsonSchema.ts +++ b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/containerToJsonSchema.ts @@ -1,6 +1,8 @@ +import { JSONSchema4 } from "json-schema"; + import { assertNever } from "@fern-api/core-utils"; import { ContainerType } from "@fern-api/ir-sdk"; -import { JSONSchema4 } from "json-schema"; + import { JsonSchemaConverterContext } from "../JsonSchemaConverterContext"; import { convertTypeReferenceToJsonSchema } from "./typeReferenceToJsonSchema"; diff --git a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/convertTypeDeclarationToJsonSchema.ts b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/convertTypeDeclarationToJsonSchema.ts index 293307a342c..6aab2c753e0 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/convertTypeDeclarationToJsonSchema.ts +++ b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/convertTypeDeclarationToJsonSchema.ts @@ -1,12 +1,14 @@ -import { TypeDeclaration } from "@fern-api/ir-sdk"; import { JSONSchema4 } from "json-schema"; + +import { assertNever } from "@fern-api/core-utils"; +import { TypeDeclaration } from "@fern-api/ir-sdk"; + import { JsonSchemaConverterContext } from "../JsonSchemaConverterContext"; -import { convertObjectToJsonSchema } from "./objectToJsonSchema"; import { convertEnumToJsonSchema } from "./enumToJsonSchema"; -import { convertUnionToJsonSchema } from "./unionToJsonSchema"; -import { convertUndiscriminatedUnionToJsonSchema } from "./undiscriminatedUnionToJsonSchema"; +import { convertObjectToJsonSchema } from "./objectToJsonSchema"; import { convertTypeReferenceToJsonSchema } from "./typeReferenceToJsonSchema"; -import { assertNever } from "@fern-api/core-utils"; +import { convertUndiscriminatedUnionToJsonSchema } from "./undiscriminatedUnionToJsonSchema"; +import { convertUnionToJsonSchema } from "./unionToJsonSchema"; export declare namespace convertTypeDeclarationToJsonSchema { interface Args { diff --git a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/enumToJsonSchema.ts b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/enumToJsonSchema.ts index 4bbb4adc46d..7f6c8d40ed4 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/enumToJsonSchema.ts +++ b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/enumToJsonSchema.ts @@ -1,5 +1,7 @@ -import { EnumTypeDeclaration } from "@fern-api/ir-sdk"; import { JSONSchema4 } from "json-schema"; + +import { EnumTypeDeclaration } from "@fern-api/ir-sdk"; + import { JsonSchemaConverterContext } from "../JsonSchemaConverterContext"; export declare namespace convertEnumToJsonSchema { diff --git a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/objectToJsonSchema.ts b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/objectToJsonSchema.ts index 7c9bfd4e672..58802fbabf1 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/objectToJsonSchema.ts +++ b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/objectToJsonSchema.ts @@ -1,5 +1,7 @@ -import { ObjectTypeDeclaration } from "@fern-api/ir-sdk"; import { JSONSchema4 } from "json-schema"; + +import { ObjectTypeDeclaration } from "@fern-api/ir-sdk"; + import { JsonSchemaConverterContext } from "../JsonSchemaConverterContext"; import { convertTypeReferenceToJsonSchema } from "./typeReferenceToJsonSchema"; diff --git a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/typeReferenceToJsonSchema.ts b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/typeReferenceToJsonSchema.ts index 9f01d1570e0..109269589ab 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/typeReferenceToJsonSchema.ts +++ b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/typeReferenceToJsonSchema.ts @@ -1,7 +1,9 @@ -import { PrimitiveTypeV1, TypeReference } from "@fern-api/ir-sdk"; import { JSONSchema4 } from "json-schema"; -import { JsonSchemaConverterContext } from "../JsonSchemaConverterContext"; + import { assertNever } from "@fern-api/core-utils"; +import { PrimitiveTypeV1, TypeReference } from "@fern-api/ir-sdk"; + +import { JsonSchemaConverterContext } from "../JsonSchemaConverterContext"; import { convertContainerToJsonSchema } from "./containerToJsonSchema"; import { convertTypeDeclarationToJsonSchema } from "./convertTypeDeclarationToJsonSchema"; diff --git a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/undiscriminatedUnionToJsonSchema.ts b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/undiscriminatedUnionToJsonSchema.ts index 325f2bcf886..0a4951620d5 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/undiscriminatedUnionToJsonSchema.ts +++ b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/undiscriminatedUnionToJsonSchema.ts @@ -1,5 +1,7 @@ -import { UndiscriminatedUnionTypeDeclaration } from "@fern-api/ir-sdk"; import { JSONSchema4 } from "json-schema"; + +import { UndiscriminatedUnionTypeDeclaration } from "@fern-api/ir-sdk"; + import { JsonSchemaConverterContext } from "../JsonSchemaConverterContext"; import { convertTypeReferenceToJsonSchema } from "./typeReferenceToJsonSchema"; diff --git a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/unionToJsonSchema.ts b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/unionToJsonSchema.ts index c682f6cc448..4cf176cca7a 100644 --- a/packages/cli/fern-definition/ir-to-jsonschema/src/converters/unionToJsonSchema.ts +++ b/packages/cli/fern-definition/ir-to-jsonschema/src/converters/unionToJsonSchema.ts @@ -1,6 +1,8 @@ +import { JSONSchema4 } from "json-schema"; + import { assertNever } from "@fern-api/core-utils"; import { UnionTypeDeclaration } from "@fern-api/ir-sdk"; -import { JSONSchema4 } from "json-schema"; + import { JsonSchemaConverterContext } from "../JsonSchemaConverterContext"; import { convertTypeDeclarationToJsonSchema } from "./convertTypeDeclarationToJsonSchema"; import { convertTypeReferenceToJsonSchema } from "./typeReferenceToJsonSchema"; diff --git a/packages/cli/fern-definition/schema/package.json b/packages/cli/fern-definition/schema/package.json index 0c17aee4adf..dabbc27c135 100644 --- a/packages/cli/fern-definition/schema/package.json +++ b/packages/cli/fern-definition/schema/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": { @@ -37,8 +36,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" } } \ No newline at end of file diff --git a/packages/cli/fern-definition/schema/src/utils/parseFileUploadRequest.ts b/packages/cli/fern-definition/schema/src/utils/parseFileUploadRequest.ts index b4a296835b7..9fb199f75c5 100644 --- a/packages/cli/fern-definition/schema/src/utils/parseFileUploadRequest.ts +++ b/packages/cli/fern-definition/schema/src/utils/parseFileUploadRequest.ts @@ -1,4 +1,5 @@ import { MediaType } from "@fern-api/core-utils"; + import { AvailabilityUnionSchema, HttpInlineRequestBodySchema, diff --git a/packages/cli/fern-definition/schema/src/utils/recursivelyVisitRawTypeReference.ts b/packages/cli/fern-definition/schema/src/utils/recursivelyVisitRawTypeReference.ts index 3dadad80de1..16368902943 100644 --- a/packages/cli/fern-definition/schema/src/utils/recursivelyVisitRawTypeReference.ts +++ b/packages/cli/fern-definition/schema/src/utils/recursivelyVisitRawTypeReference.ts @@ -1,4 +1,5 @@ import { Literal, PrimitiveType } from "@fern-api/ir-sdk"; + import { ValidationSchema } from "../schemas"; import { visitRawTypeReference } from "./visitRawTypeReference"; diff --git a/packages/cli/fern-definition/schema/src/utils/visitExampleCodeSampleSchema.ts b/packages/cli/fern-definition/schema/src/utils/visitExampleCodeSampleSchema.ts index af05b235f6d..2d5002c87fe 100644 --- a/packages/cli/fern-definition/schema/src/utils/visitExampleCodeSampleSchema.ts +++ b/packages/cli/fern-definition/schema/src/utils/visitExampleCodeSampleSchema.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { ExampleCodeSampleSchema, ExampleCodeSampleSchemaLanguage, ExampleCodeSampleSchemaSdk } from "../schemas"; export interface ExampleCodeSampleVisitor { diff --git a/packages/cli/fern-definition/schema/src/utils/visitRawApiAuth.ts b/packages/cli/fern-definition/schema/src/utils/visitRawApiAuth.ts index f6295fd1f59..2c7452dbea5 100644 --- a/packages/cli/fern-definition/schema/src/utils/visitRawApiAuth.ts +++ b/packages/cli/fern-definition/schema/src/utils/visitRawApiAuth.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { AnyAuthSchemesSchema, ApiAuthSchema } from "../schemas"; import { AuthSchemeReferenceSchema } from "../schemas"; diff --git a/packages/cli/fern-definition/schema/src/utils/visitRawAuthSchemeDeclaration.ts b/packages/cli/fern-definition/schema/src/utils/visitRawAuthSchemeDeclaration.ts index 44d978e0e99..8a2173e8ef6 100644 --- a/packages/cli/fern-definition/schema/src/utils/visitRawAuthSchemeDeclaration.ts +++ b/packages/cli/fern-definition/schema/src/utils/visitRawAuthSchemeDeclaration.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { AuthSchemeDeclarationSchema, BasicAuthSchemeSchema, diff --git a/packages/cli/fern-definition/schema/src/utils/visitRawEnvironmentDeclaration.ts b/packages/cli/fern-definition/schema/src/utils/visitRawEnvironmentDeclaration.ts index 75165383998..65e07362aa8 100644 --- a/packages/cli/fern-definition/schema/src/utils/visitRawEnvironmentDeclaration.ts +++ b/packages/cli/fern-definition/schema/src/utils/visitRawEnvironmentDeclaration.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { EnvironmentSchema, MultipleBaseUrlsEnvironmentSchema, SingleBaseUrlEnvironmentSchema } from "../schemas"; export interface EnvironmentDeclarationVisitor { diff --git a/packages/cli/fern-definition/schema/src/utils/visitRawTypeDeclaration.ts b/packages/cli/fern-definition/schema/src/utils/visitRawTypeDeclaration.ts index eaf221cb8b4..cbbe976d55e 100644 --- a/packages/cli/fern-definition/schema/src/utils/visitRawTypeDeclaration.ts +++ b/packages/cli/fern-definition/schema/src/utils/visitRawTypeDeclaration.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { AliasSchema, DiscriminatedUnionSchema, EnumSchema, ObjectSchema, TypeDeclarationSchema } from "../schemas"; import { UndiscriminatedUnionSchema } from "../schemas"; diff --git a/packages/cli/fern-definition/schema/src/utils/visitRawTypeReference.ts b/packages/cli/fern-definition/schema/src/utils/visitRawTypeReference.ts index 09e1944baab..088940a0d97 100644 --- a/packages/cli/fern-definition/schema/src/utils/visitRawTypeReference.ts +++ b/packages/cli/fern-definition/schema/src/utils/visitRawTypeReference.ts @@ -1,4 +1,5 @@ import { Literal, PrimitiveType, PrimitiveTypeV1, PrimitiveTypeV2 } from "@fern-api/ir-sdk"; + import { NumberValidationSchema } from "../schemas"; import { StringValidationSchema } from "../schemas"; import { ValidationSchema } from "../schemas"; diff --git a/packages/cli/fern-definition/validator/package.json b/packages/cli/fern-definition/validator/package.json index 54d11a7b76f..c0db42e93d4 100644 --- a/packages/cli/fern-definition/validator/package.json +++ b/packages/cli/fern-definition/validator/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": { @@ -51,8 +50,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" } } \ No newline at end of file diff --git a/packages/cli/fern-definition/validator/src/ComplexQueryParamTypeDetector.ts b/packages/cli/fern-definition/validator/src/ComplexQueryParamTypeDetector.ts index 61b5b611db8..c4e2e2e7a1e 100644 --- a/packages/cli/fern-definition/validator/src/ComplexQueryParamTypeDetector.ts +++ b/packages/cli/fern-definition/validator/src/ComplexQueryParamTypeDetector.ts @@ -1,22 +1,23 @@ -import { assertNever } from "@fern-api/core-utils"; -import { - constructFernFileContext, - FernFileContext, - getAllPropertiesForObject, - ResolvedContainerType, - ResolvedType, - TypeResolver, - TypeResolverImpl -} from "@fern-api/ir-generator"; import { FernWorkspace } from "@fern-api/api-workspace-commons"; +import { assertNever } from "@fern-api/core-utils"; import { DefinitionFileSchema, + RawSchemas, isRawDiscriminatedUnionDefinition, isRawEnumDefinition, isRawObjectDefinition, - isRawUndiscriminatedUnionDefinition, - RawSchemas + isRawUndiscriminatedUnionDefinition } from "@fern-api/fern-definition-schema"; +import { + FernFileContext, + ResolvedContainerType, + ResolvedType, + TypeResolver, + TypeResolverImpl, + constructFernFileContext, + getAllPropertiesForObject +} from "@fern-api/ir-generator"; + import { RuleRunnerArgs } from "./Rule"; import { CASINGS_GENERATOR } from "./utils/casingsGenerator"; diff --git a/packages/cli/fern-definition/validator/src/Rule.ts b/packages/cli/fern-definition/validator/src/Rule.ts index 9ad9ed6b35b..c5470219f99 100644 --- a/packages/cli/fern-definition/validator/src/Rule.ts +++ b/packages/cli/fern-definition/validator/src/Rule.ts @@ -1,8 +1,9 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; -import { Logger } from "@fern-api/logger"; import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { PackageMarkerAstNodeTypes, RootApiFileAstNodeTypes, DefinitionFileAstNodeTypes } from "./ast"; import { DefinitionFileSchema, PackageMarkerFileSchema, RootApiFileSchema } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/fs-utils"; +import { Logger } from "@fern-api/logger"; + +import { DefinitionFileAstNodeTypes, PackageMarkerAstNodeTypes, RootApiFileAstNodeTypes } from "./ast"; export interface Rule { name: string; diff --git a/packages/cli/fern-definition/validator/src/ValidationViolation.ts b/packages/cli/fern-definition/validator/src/ValidationViolation.ts index 69237149476..b59cb4b95ce 100644 --- a/packages/cli/fern-definition/validator/src/ValidationViolation.ts +++ b/packages/cli/fern-definition/validator/src/ValidationViolation.ts @@ -1,5 +1,5 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { NodePath } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/fs-utils"; export interface ValidationViolation { severity: "error" | "warning"; diff --git a/packages/cli/fern-definition/validator/src/__test__/getAllRules.test.ts b/packages/cli/fern-definition/validator/src/__test__/getAllRules.test.ts index 404997808ad..a7802e4d5ab 100644 --- a/packages/cli/fern-definition/validator/src/__test__/getAllRules.test.ts +++ b/packages/cli/fern-definition/validator/src/__test__/getAllRules.test.ts @@ -1,8 +1,10 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { readdir } from "fs/promises"; import { camelCase, upperFirst } from "lodash-es"; -import { getAllRules } from "../getAllRules"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { Rule } from "../Rule"; +import { getAllRules } from "../getAllRules"; const RULES_DIRECTORY = join(AbsoluteFilePath.of(__dirname), RelativeFilePath.of("../rules")); diff --git a/packages/cli/fern-definition/validator/src/__test__/validator/validateFernWorkspace.test.ts b/packages/cli/fern-definition/validator/src/__test__/validator/validateFernWorkspace.test.ts index bdfa4e699e5..78436b885f8 100644 --- a/packages/cli/fern-definition/validator/src/__test__/validator/validateFernWorkspace.test.ts +++ b/packages/cli/fern-definition/validator/src/__test__/validator/validateFernWorkspace.test.ts @@ -1,9 +1,10 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { LazyFernWorkspace } from "@fern-api/lazy-fern-workspace"; import { CONSOLE_LOGGER } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; -import { LazyFernWorkspace } from "@fern-api/lazy-fern-workspace"; -import { validateFernWorkspace } from "../../validateFernWorkspace"; + import { ValidationViolation } from "../../ValidationViolation"; +import { validateFernWorkspace } from "../../validateFernWorkspace"; interface Fixture { name: string; diff --git a/packages/cli/fern-definition/validator/src/ast/RootApiFileAstVisitor.ts b/packages/cli/fern-definition/validator/src/ast/RootApiFileAstVisitor.ts index adac04f1031..91258867fb5 100644 --- a/packages/cli/fern-definition/validator/src/ast/RootApiFileAstVisitor.ts +++ b/packages/cli/fern-definition/validator/src/ast/RootApiFileAstVisitor.ts @@ -1,4 +1,4 @@ -import { RawSchemas, NodePath, RootApiFileSchema } from "@fern-api/fern-definition-schema"; +import { NodePath, RawSchemas, RootApiFileSchema } from "@fern-api/fern-definition-schema"; export type RootApiFileAstVisitor = { [K in keyof RootApiFileAstNodeTypes]: RootApiFileAstNodeVisitor; diff --git a/packages/cli/fern-definition/validator/src/ast/visitDefinitionFileYamlAst.ts b/packages/cli/fern-definition/validator/src/ast/visitDefinitionFileYamlAst.ts index b79a7a64c75..6dcdb840da2 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitDefinitionFileYamlAst.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitDefinitionFileYamlAst.ts @@ -1,5 +1,6 @@ import { noop, visitObject } from "@fern-api/core-utils"; import { DefinitionFileSchema } from "@fern-api/fern-definition-schema"; + import { DefinitionFileAstVisitor } from "./DefinitionFileAstVisitor"; import { visitHttpService } from "./visitors/services/visitHttpService"; import { createDocsVisitor } from "./visitors/utils/createDocsVisitor"; diff --git a/packages/cli/fern-definition/validator/src/ast/visitPackageMarkerYamlAst.ts b/packages/cli/fern-definition/validator/src/ast/visitPackageMarkerYamlAst.ts index 3d28246868c..1412dffe4c3 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitPackageMarkerYamlAst.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitPackageMarkerYamlAst.ts @@ -1,5 +1,6 @@ import { noop, visitObject } from "@fern-api/core-utils"; import { PackageMarkerFileSchema } from "@fern-api/fern-definition-schema"; + import { PackageMarkerAstVisitor } from "./PackageMarkerAstVisitor"; export function visitPackageMarkerYamlAst( diff --git a/packages/cli/fern-definition/validator/src/ast/visitRootApiFileYamlAst.ts b/packages/cli/fern-definition/validator/src/ast/visitRootApiFileYamlAst.ts index 5c6c27e3c23..b8719b91b2e 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitRootApiFileYamlAst.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitRootApiFileYamlAst.ts @@ -1,5 +1,6 @@ import { noop, visitObject } from "@fern-api/core-utils"; -import { isOAuthScheme, RootApiFileSchema } from "@fern-api/fern-definition-schema"; +import { RootApiFileSchema, isOAuthScheme } from "@fern-api/fern-definition-schema"; + import { RootApiFileAstVisitor } from "./RootApiFileAstVisitor"; import { visitPathParameters } from "./visitors/services/visitHttpService"; diff --git a/packages/cli/fern-definition/validator/src/ast/visitors/services/visitHttpService.ts b/packages/cli/fern-definition/validator/src/ast/visitors/services/visitHttpService.ts index 89bbd7efbd3..64b04642bed 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitors/services/visitHttpService.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitors/services/visitHttpService.ts @@ -1,11 +1,12 @@ import { noop, visitObject } from "@fern-api/core-utils"; import { - RawSchemas, NodePath, + RawSchemas, isInlineRequestBody, isVariablePathParameter, visitExampleResponseSchema } from "@fern-api/fern-definition-schema"; + import { DefinitionFileAstVisitor, TypeReferenceLocation } from "../../DefinitionFileAstVisitor"; import { RootApiFileAstVisitor } from "../../RootApiFileAstVisitor"; import { createDocsVisitor } from "../utils/createDocsVisitor"; diff --git a/packages/cli/fern-definition/validator/src/ast/visitors/utils/createDocsVisitor.ts b/packages/cli/fern-definition/validator/src/ast/visitors/utils/createDocsVisitor.ts index 50f5134c203..321bb9fa743 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitors/utils/createDocsVisitor.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitors/utils/createDocsVisitor.ts @@ -1,4 +1,5 @@ import { NodePath } from "@fern-api/fern-definition-schema"; + import { DefinitionFileAstVisitor } from "../../DefinitionFileAstVisitor"; export function createDocsVisitor( diff --git a/packages/cli/fern-definition/validator/src/ast/visitors/utils/visitAllReferencesInExample.ts b/packages/cli/fern-definition/validator/src/ast/visitors/utils/visitAllReferencesInExample.ts index 04dddcca251..5ba98cf1f62 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitors/utils/visitAllReferencesInExample.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitors/utils/visitAllReferencesInExample.ts @@ -1,5 +1,6 @@ import { isPlainObject } from "@fern-api/core-utils"; -import { NodePath, EXAMPLE_REFERENCE_PREFIX } from "@fern-api/fern-definition-schema"; +import { EXAMPLE_REFERENCE_PREFIX, NodePath } from "@fern-api/fern-definition-schema"; + import { DefinitionFileAstVisitor } from "../../DefinitionFileAstVisitor"; export function visitAllReferencesInExample({ diff --git a/packages/cli/fern-definition/validator/src/ast/visitors/utils/visitTypeReference.ts b/packages/cli/fern-definition/validator/src/ast/visitors/utils/visitTypeReference.ts index 8fc936c08b1..01888d105de 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitors/utils/visitTypeReference.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitors/utils/visitTypeReference.ts @@ -1,4 +1,5 @@ import { NodePath, RawSchemas } from "@fern-api/fern-definition-schema"; + import { DefinitionFileAstVisitor, TypeReferenceLocation } from "../../DefinitionFileAstVisitor"; export function createTypeReferenceVisitor( diff --git a/packages/cli/fern-definition/validator/src/ast/visitors/visitErrorDeclarations.ts b/packages/cli/fern-definition/validator/src/ast/visitors/visitErrorDeclarations.ts index d9463fce93a..8e85ec54562 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitors/visitErrorDeclarations.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitors/visitErrorDeclarations.ts @@ -1,5 +1,6 @@ import { noop, visitObject } from "@fern-api/core-utils"; import { NodePath, RawSchemas } from "@fern-api/fern-definition-schema"; + import { DefinitionFileAstVisitor } from "../DefinitionFileAstVisitor"; import { createDocsVisitor } from "./utils/createDocsVisitor"; import { createTypeReferenceVisitor } from "./utils/visitTypeReference"; diff --git a/packages/cli/fern-definition/validator/src/ast/visitors/visitImports.ts b/packages/cli/fern-definition/validator/src/ast/visitors/visitImports.ts index 44e846d546b..a055d6c18fd 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitors/visitImports.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitors/visitImports.ts @@ -1,4 +1,5 @@ import { NodePath } from "@fern-api/fern-definition-schema"; + import { DefinitionFileAstVisitor } from "../DefinitionFileAstVisitor"; export function visitImports({ diff --git a/packages/cli/fern-definition/validator/src/ast/visitors/visitTypeDeclarations.ts b/packages/cli/fern-definition/validator/src/ast/visitors/visitTypeDeclarations.ts index 5e9cc830bf6..249edada28e 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitors/visitTypeDeclarations.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitors/visitTypeDeclarations.ts @@ -1,5 +1,6 @@ import { noop, visitObject } from "@fern-api/core-utils"; import { NodePath, RawSchemas, visitRawTypeDeclaration } from "@fern-api/fern-definition-schema"; + import { DefinitionFileAstVisitor } from "../DefinitionFileAstVisitor"; import { createDocsVisitor } from "./utils/createDocsVisitor"; import { visitAllReferencesInExample } from "./utils/visitAllReferencesInExample"; @@ -205,7 +206,7 @@ export function visitTypeDeclaration({ for (const enumType of enumTypes) { const nodePathForEnumType = [ ...nodePathForType, - typeof enumType === "string" ? enumType : enumType.name ?? enumType.value + typeof enumType === "string" ? enumType : (enumType.name ?? enumType.value) ]; if (typeof enumType !== "string") { diff --git a/packages/cli/fern-definition/validator/src/ast/visitors/visitWebhooks.ts b/packages/cli/fern-definition/validator/src/ast/visitors/visitWebhooks.ts index b2bab0235b4..6d922334240 100644 --- a/packages/cli/fern-definition/validator/src/ast/visitors/visitWebhooks.ts +++ b/packages/cli/fern-definition/validator/src/ast/visitors/visitWebhooks.ts @@ -1,5 +1,6 @@ import { noop, visitObject } from "@fern-api/core-utils"; import { NodePath, RawSchemas } from "@fern-api/fern-definition-schema"; + import { DefinitionFileAstVisitor, TypeReferenceLocation } from "../DefinitionFileAstVisitor"; import { createDocsVisitor } from "./utils/createDocsVisitor"; import { createTypeReferenceVisitor } from "./utils/visitTypeReference"; diff --git a/packages/cli/fern-definition/validator/src/createDefinitionFileAstVisitorForRules.ts b/packages/cli/fern-definition/validator/src/createDefinitionFileAstVisitorForRules.ts index d9f05d41dde..b069a4dfae4 100644 --- a/packages/cli/fern-definition/validator/src/createDefinitionFileAstVisitorForRules.ts +++ b/packages/cli/fern-definition/validator/src/createDefinitionFileAstVisitorForRules.ts @@ -1,8 +1,9 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { DefinitionFileSchema, NodePath } from "@fern-api/fern-definition-schema"; -import { DefinitionFileAstNodeTypes, DefinitionFileAstNodeVisitor, DefinitionFileAstVisitor } from "./ast"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { RuleVisitors } from "./Rule"; import { ValidationViolation } from "./ValidationViolation"; +import { DefinitionFileAstNodeTypes, DefinitionFileAstNodeVisitor, DefinitionFileAstVisitor } from "./ast"; export function createDefinitionFileAstVisitorForRules({ relativeFilepath, diff --git a/packages/cli/fern-definition/validator/src/createPackageMarkerAstVisitorForRules.ts b/packages/cli/fern-definition/validator/src/createPackageMarkerAstVisitorForRules.ts index 34eea395bce..d315be385ab 100644 --- a/packages/cli/fern-definition/validator/src/createPackageMarkerAstVisitorForRules.ts +++ b/packages/cli/fern-definition/validator/src/createPackageMarkerAstVisitorForRules.ts @@ -1,8 +1,9 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { NodePath, PackageMarkerFileSchema } from "@fern-api/fern-definition-schema"; -import { PackageMarkerAstNodeTypes, PackageMarkerAstNodeVisitor, PackageMarkerAstVisitor } from "./ast"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { RuleVisitors } from "./Rule"; import { ValidationViolation } from "./ValidationViolation"; +import { PackageMarkerAstNodeTypes, PackageMarkerAstNodeVisitor, PackageMarkerAstVisitor } from "./ast"; export function createPackageMarkerAstVisitorForRules({ relativeFilepath, diff --git a/packages/cli/fern-definition/validator/src/createRootApiFileAstVisitorForRules.ts b/packages/cli/fern-definition/validator/src/createRootApiFileAstVisitorForRules.ts index 50a0ca8fc11..720e4cca7d9 100644 --- a/packages/cli/fern-definition/validator/src/createRootApiFileAstVisitorForRules.ts +++ b/packages/cli/fern-definition/validator/src/createRootApiFileAstVisitorForRules.ts @@ -1,8 +1,9 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { NodePath, RootApiFileSchema } from "@fern-api/fern-definition-schema"; -import { RootApiFileAstNodeTypes, RootApiFileAstNodeVisitor, RootApiFileAstVisitor } from "./ast"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { RuleVisitors } from "./Rule"; import { ValidationViolation } from "./ValidationViolation"; +import { RootApiFileAstNodeTypes, RootApiFileAstNodeVisitor, RootApiFileAstVisitor } from "./ast"; export function createRootApiFileAstVisitorForRules({ relativeFilepath, diff --git a/packages/cli/fern-definition/validator/src/getAllRules.ts b/packages/cli/fern-definition/validator/src/getAllRules.ts index d15880c0fc5..3d3563bf39f 100644 --- a/packages/cli/fern-definition/validator/src/getAllRules.ts +++ b/packages/cli/fern-definition/validator/src/getAllRules.ts @@ -1,4 +1,5 @@ import { Rule } from "./Rule"; +import { ContentTypeOnlyForMultipartRule } from "./rules/content-type-only-for-multipart"; import { ImportFileExistsRule } from "./rules/import-file-exists"; import { MatchingEnvironmentUrlsRule } from "./rules/matching-environment-urls"; import { NoCircularImportsRule } from "./rules/no-circular-imports"; @@ -42,7 +43,6 @@ import { ValidStreamConditionRule } from "./rules/valid-stream-condition"; import { ValidTypeNameRule } from "./rules/valid-type-name"; import { ValidTypeReferenceWithDefaultAndValidationRule } from "./rules/valid-type-reference-with-default-and-validation"; import { ValidVersionRule } from "./rules/valid-version"; -import { ContentTypeOnlyForMultipartRule } from "./rules/content-type-only-for-multipart"; export function getAllRules(): Rule[] { return [ diff --git a/packages/cli/fern-definition/validator/src/rules/content-type-only-for-multipart/__test__/content-type-only-for-multipart.test.ts b/packages/cli/fern-definition/validator/src/rules/content-type-only-for-multipart/__test__/content-type-only-for-multipart.test.ts index f4418b61121..38d619e4ba0 100644 --- a/packages/cli/fern-definition/validator/src/rules/content-type-only-for-multipart/__test__/content-type-only-for-multipart.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/content-type-only-for-multipart/__test__/content-type-only-for-multipart.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ContentTypeOnlyForMultipartRule } from "../content-type-only-for-multipart"; diff --git a/packages/cli/fern-definition/validator/src/rules/content-type-only-for-multipart/content-type-only-for-multipart.ts b/packages/cli/fern-definition/validator/src/rules/content-type-only-for-multipart/content-type-only-for-multipart.ts index 16ddcc32c37..ef0832ce3b8 100644 --- a/packages/cli/fern-definition/validator/src/rules/content-type-only-for-multipart/content-type-only-for-multipart.ts +++ b/packages/cli/fern-definition/validator/src/rules/content-type-only-for-multipart/content-type-only-for-multipart.ts @@ -1,4 +1,5 @@ -import { parseFileUploadRequest, isInlineRequestBody } from "@fern-api/fern-definition-schema"; +import { isInlineRequestBody, parseFileUploadRequest } from "@fern-api/fern-definition-schema"; + import { Rule, RuleViolation } from "../../Rule"; export const ContentTypeOnlyForMultipartRule: Rule = { diff --git a/packages/cli/fern-definition/validator/src/rules/import-file-exists/__test__/import-file-exists.test.ts b/packages/cli/fern-definition/validator/src/rules/import-file-exists/__test__/import-file-exists.test.ts index f7edc75d615..34ae344b083 100644 --- a/packages/cli/fern-definition/validator/src/rules/import-file-exists/__test__/import-file-exists.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/import-file-exists/__test__/import-file-exists.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ImportFileExistsRule } from "../import-file-exists"; diff --git a/packages/cli/fern-definition/validator/src/rules/import-file-exists/import-file-exists.ts b/packages/cli/fern-definition/validator/src/rules/import-file-exists/import-file-exists.ts index 610d6848aac..45737125bde 100644 --- a/packages/cli/fern-definition/validator/src/rules/import-file-exists/import-file-exists.ts +++ b/packages/cli/fern-definition/validator/src/rules/import-file-exists/import-file-exists.ts @@ -1,6 +1,8 @@ -import { dirname, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getAllDefinitionFiles } from "@fern-api/api-workspace-commons"; import chalk from "chalk"; + +import { getAllDefinitionFiles } from "@fern-api/api-workspace-commons"; +import { RelativeFilePath, dirname, join } from "@fern-api/fs-utils"; + import { Rule, RuleViolation } from "../../Rule"; export const ImportFileExistsRule: Rule = { diff --git a/packages/cli/fern-definition/validator/src/rules/matching-environment-urls/__test__/matching-environment-urls.test.ts b/packages/cli/fern-definition/validator/src/rules/matching-environment-urls/__test__/matching-environment-urls.test.ts index f1e3ab01160..440fba91093 100644 --- a/packages/cli/fern-definition/validator/src/rules/matching-environment-urls/__test__/matching-environment-urls.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/matching-environment-urls/__test__/matching-environment-urls.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { MatchingEnvironmentUrlsRule } from "../matching-environment-urls"; describe("matching-environment-urls", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/matching-environment-urls/matching-environment-urls.ts b/packages/cli/fern-definition/validator/src/rules/matching-environment-urls/matching-environment-urls.ts index 177a04e1b11..f1a3b64c933 100644 --- a/packages/cli/fern-definition/validator/src/rules/matching-environment-urls/matching-environment-urls.ts +++ b/packages/cli/fern-definition/validator/src/rules/matching-environment-urls/matching-environment-urls.ts @@ -1,5 +1,7 @@ -import { visitRawEnvironmentDeclaration } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; + +import { visitRawEnvironmentDeclaration } from "@fern-api/fern-definition-schema"; + import { Rule, RuleViolation } from "../../Rule"; import { getAllEnvironmentUrlIds } from "../../utils/getAllEnvironmentUriIds"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-circular-imports/__test__/no-circular-imports.test.ts b/packages/cli/fern-definition/validator/src/rules/no-circular-imports/__test__/no-circular-imports.test.ts index b9d465b338c..da14a4c083a 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-circular-imports/__test__/no-circular-imports.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-circular-imports/__test__/no-circular-imports.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoCircularImportsRule } from "../no-circular-imports"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-circular-imports/no-circular-imports.ts b/packages/cli/fern-definition/validator/src/rules/no-circular-imports/no-circular-imports.ts index 348624c77e3..f189dda21d4 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-circular-imports/no-circular-imports.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-circular-imports/no-circular-imports.ts @@ -1,7 +1,8 @@ +import { FernDefinition } from "@fern-api/api-workspace-commons"; import { keys } from "@fern-api/core-utils"; import { RelativeFilePath } from "@fern-api/fs-utils"; import { getResolvedPathOfImportedFile } from "@fern-api/ir-generator"; -import { FernDefinition } from "@fern-api/api-workspace-commons"; + import { Rule } from "../../Rule"; type CircularImports = Record; diff --git a/packages/cli/fern-definition/validator/src/rules/no-complex-query-params/__test__/no-complex-query-params.test.ts b/packages/cli/fern-definition/validator/src/rules/no-complex-query-params/__test__/no-complex-query-params.test.ts index 7df0be6b328..1800d074c8c 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-complex-query-params/__test__/no-complex-query-params.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-complex-query-params/__test__/no-complex-query-params.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoComplexQueryParamsRule } from "../no-complex-query-params"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-parameters/__test__/no-conflicting-endpoint-parameters.test.ts b/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-parameters/__test__/no-conflicting-endpoint-parameters.test.ts index d67a0c3a208..3804b91a702 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-parameters/__test__/no-conflicting-endpoint-parameters.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-parameters/__test__/no-conflicting-endpoint-parameters.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoConflictingEndpointParametersRule } from "../no-conflicting-endpoint-parameters"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-parameters/no-conflicting-endpoint-parameters.ts b/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-parameters/no-conflicting-endpoint-parameters.ts index 7ad1cc7e36c..e9e20e1298d 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-parameters/no-conflicting-endpoint-parameters.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-parameters/no-conflicting-endpoint-parameters.ts @@ -1,5 +1,7 @@ -import { DEFAULT_REQUEST_PARAMETER_NAME } from "@fern-api/ir-generator"; import chalk from "chalk"; + +import { DEFAULT_REQUEST_PARAMETER_NAME } from "@fern-api/ir-generator"; + import { Rule } from "../../Rule"; export const NoConflictingEndpointParametersRule: Rule = { diff --git a/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/EndpointPathRegistry.ts b/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/EndpointPathRegistry.ts index 97c5e059bb9..646cc81690b 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/EndpointPathRegistry.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/EndpointPathRegistry.ts @@ -1,5 +1,6 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { getFullEndpointPath } from "./getFullEndpointPath"; export interface EndpointReference { diff --git a/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/__test__/no-conflicting-endpoint-paths.test.ts b/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/__test__/no-conflicting-endpoint-paths.test.ts index 405a92548b6..674ab799034 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/__test__/no-conflicting-endpoint-paths.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/__test__/no-conflicting-endpoint-paths.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoConflictingEndpointPathsRule } from "../no-conflicting-endpoint-paths"; describe("no-conflicting-endpoint-paths", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/no-conflicting-endpoint-paths.ts b/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/no-conflicting-endpoint-paths.ts index cef24addcb3..8884f66f901 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/no-conflicting-endpoint-paths.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-conflicting-endpoint-paths/no-conflicting-endpoint-paths.ts @@ -1,7 +1,9 @@ -import { visitAllDefinitionFiles } from "@fern-api/api-workspace-commons"; -import { visitDefinitionFileYamlAst } from "../../ast"; import chalk from "chalk"; + +import { visitAllDefinitionFiles } from "@fern-api/api-workspace-commons"; + import { Rule } from "../../Rule"; +import { visitDefinitionFileYamlAst } from "../../ast"; import { EndpointPathRegistry } from "./EndpointPathRegistry"; import { getFullEndpointPath } from "./getFullEndpointPath"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-conflicting-request-wrapper-properties/__test__/no-conflicting-request-wrapper-properties.test.ts b/packages/cli/fern-definition/validator/src/rules/no-conflicting-request-wrapper-properties/__test__/no-conflicting-request-wrapper-properties.test.ts index 7ad170b45d4..a0daf6433c1 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-conflicting-request-wrapper-properties/__test__/no-conflicting-request-wrapper-properties.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-conflicting-request-wrapper-properties/__test__/no-conflicting-request-wrapper-properties.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoConflictingRequestWrapperPropertiesRule } from "../no-conflicting-request-wrapper-properties"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-conflicting-request-wrapper-properties/no-conflicting-request-wrapper-properties.ts b/packages/cli/fern-definition/validator/src/rules/no-conflicting-request-wrapper-properties/no-conflicting-request-wrapper-properties.ts index 4c113e7412e..bbef2e581f2 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-conflicting-request-wrapper-properties/no-conflicting-request-wrapper-properties.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-conflicting-request-wrapper-properties/no-conflicting-request-wrapper-properties.ts @@ -1,19 +1,21 @@ +import chalk from "chalk"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { assertNever } from "@fern-api/core-utils"; +import { DefinitionFileSchema, RawSchemas, isInlineRequestBody } from "@fern-api/fern-definition-schema"; import { RelativeFilePath } from "@fern-api/fs-utils"; import { + DEFAULT_BODY_PROPERTY_KEY_IN_WRAPPER, + ObjectPropertyWithPath, + TypeResolverImpl, constructFernFileContext, convertObjectPropertyWithPathToString, - DEFAULT_BODY_PROPERTY_KEY_IN_WRAPPER, doesRequestHaveNonBodyProperties, getAllPropertiesForObject, getHeaderName, - getQueryParameterName, - ObjectPropertyWithPath, - TypeResolverImpl + getQueryParameterName } from "@fern-api/ir-generator"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { DefinitionFileSchema, isInlineRequestBody, RawSchemas } from "@fern-api/fern-definition-schema"; -import chalk from "chalk"; + import { Rule, RuleViolation } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-duplicate-declarations/__test__/no-duplicate-declarations.test.ts b/packages/cli/fern-definition/validator/src/rules/no-duplicate-declarations/__test__/no-duplicate-declarations.test.ts index ccfaf2c248b..c2e7421e417 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-duplicate-declarations/__test__/no-duplicate-declarations.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-duplicate-declarations/__test__/no-duplicate-declarations.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoDuplicateDeclarationsRule } from "../no-duplicate-declarations"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-duplicate-declarations/no-duplicate-declarations.ts b/packages/cli/fern-definition/validator/src/rules/no-duplicate-declarations/no-duplicate-declarations.ts index dc98a77980d..5bf205a8136 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-duplicate-declarations/no-duplicate-declarations.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-duplicate-declarations/no-duplicate-declarations.ts @@ -1,8 +1,10 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; -import { FernWorkspace, visitAllDefinitionFiles } from "@fern-api/api-workspace-commons"; -import { visitDefinitionFileYamlAst } from "../../ast"; import path from "path"; + +import { FernWorkspace, visitAllDefinitionFiles } from "@fern-api/api-workspace-commons"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { Rule, RuleViolation } from "../../Rule"; +import { visitDefinitionFileYamlAst } from "../../ast"; type RelativeDirectoryPath = string; type DeclaredName = string; diff --git a/packages/cli/fern-definition/validator/src/rules/no-duplicate-enum-values/__test__/no-duplicate-enum-values.test.ts b/packages/cli/fern-definition/validator/src/rules/no-duplicate-enum-values/__test__/no-duplicate-enum-values.test.ts index 7a7d6b96662..5352dad8e7c 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-duplicate-enum-values/__test__/no-duplicate-enum-values.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-duplicate-enum-values/__test__/no-duplicate-enum-values.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoDuplicateEnumValuesRule } from "../no-duplicate-enum-values"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-duplicate-enum-values/no-duplicate-enum-values.ts b/packages/cli/fern-definition/validator/src/rules/no-duplicate-enum-values/no-duplicate-enum-values.ts index b7dacc2eb4f..7c96cbbbcbd 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-duplicate-enum-values/no-duplicate-enum-values.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-duplicate-enum-values/no-duplicate-enum-values.ts @@ -1,5 +1,7 @@ -import { isRawEnumDefinition } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; + +import { isRawEnumDefinition } from "@fern-api/fern-definition-schema"; + import { Rule } from "../../Rule"; import { getDuplicates } from "../../utils/getDuplicates"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-duplicate-example-names/__test__/no-duplicate-example-names.test.ts b/packages/cli/fern-definition/validator/src/rules/no-duplicate-example-names/__test__/no-duplicate-example-names.test.ts index 60d97c2b775..8f00b26f142 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-duplicate-example-names/__test__/no-duplicate-example-names.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-duplicate-example-names/__test__/no-duplicate-example-names.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoDuplicateExampleNamesRule } from "../no-duplicate-example-names"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-duplicate-example-names/no-duplicate-example-names.ts b/packages/cli/fern-definition/validator/src/rules/no-duplicate-example-names/no-duplicate-example-names.ts index 79ae0eb9b82..d6e36806030 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-duplicate-example-names/no-duplicate-example-names.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-duplicate-example-names/no-duplicate-example-names.ts @@ -1,4 +1,5 @@ import { isNonNullish } from "@fern-api/core-utils"; + import { Rule } from "../../Rule"; import { getDuplicates } from "../../utils/getDuplicates"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-duplicate-field-names/__test__/no-duplicate-field-names.test.ts b/packages/cli/fern-definition/validator/src/rules/no-duplicate-field-names/__test__/no-duplicate-field-names.test.ts index b5c67e32556..8429c36b0d0 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-duplicate-field-names/__test__/no-duplicate-field-names.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-duplicate-field-names/__test__/no-duplicate-field-names.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoDuplicateFieldNamesRule } from "../no-duplicate-field-names"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-duplicate-field-names/no-duplicate-field-names.ts b/packages/cli/fern-definition/validator/src/rules/no-duplicate-field-names/no-duplicate-field-names.ts index af8cac9786b..6151304a5c0 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-duplicate-field-names/no-duplicate-field-names.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-duplicate-field-names/no-duplicate-field-names.ts @@ -1,15 +1,17 @@ +import { groupBy, noop } from "lodash-es"; + +import { getDefinitionFile } from "@fern-api/api-workspace-commons"; +import { isRawObjectDefinition, visitRawTypeDeclaration } from "@fern-api/fern-definition-schema"; import { + TypeResolverImpl, constructFernFileContext, convertObjectPropertyWithPathToString, getAllPropertiesForObject, getEnumName, getSingleUnionTypeName, - getUnionDiscriminantName, - TypeResolverImpl + getUnionDiscriminantName } from "@fern-api/ir-generator"; -import { getDefinitionFile } from "@fern-api/api-workspace-commons"; -import { isRawObjectDefinition, visitRawTypeDeclaration } from "@fern-api/fern-definition-schema"; -import { groupBy, noop } from "lodash-es"; + import { Rule, RuleViolation } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; import { getTypeDeclarationNameAsString } from "../../utils/getTypeDeclarationNameAsString"; @@ -92,8 +94,8 @@ export const NoDuplicateFieldNamesRule: Rule = { typeof singleUnionType === "string" ? singleUnionType : typeof singleUnionType.type === "string" - ? singleUnionType.type - : undefined; + ? singleUnionType.type + : undefined; // if the union type has a key, we don't need to check for conflicts // because the variant is nested under the key diff --git a/packages/cli/fern-definition/validator/src/rules/no-error-status-code-conflict/__test__/no-error-status-code-conflict.test.ts b/packages/cli/fern-definition/validator/src/rules/no-error-status-code-conflict/__test__/no-error-status-code-conflict.test.ts index cffd6096c75..c9779a5ac31 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-error-status-code-conflict/__test__/no-error-status-code-conflict.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-error-status-code-conflict/__test__/no-error-status-code-conflict.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoErrorStatusCodeConflictRule } from "../no-error-status-code-conflict"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-error-status-code-conflict/no-error-status-code-conflict.ts b/packages/cli/fern-definition/validator/src/rules/no-error-status-code-conflict/no-error-status-code-conflict.ts index a49b9f7a3c9..e466e6d5f94 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-error-status-code-conflict/no-error-status-code-conflict.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-error-status-code-conflict/no-error-status-code-conflict.ts @@ -1,8 +1,10 @@ +import { noop } from "lodash-es"; + import { FernWorkspace, visitAllDefinitionFiles } from "@fern-api/api-workspace-commons"; import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { visitDefinitionFileYamlAst } from "../../ast"; -import { noop } from "lodash-es"; + import { Rule, RuleViolation } from "../../Rule"; +import { visitDefinitionFileYamlAst } from "../../ast"; export const NoErrorStatusCodeConflictRule: Rule = { name: "no-error-status-code-conflict", diff --git a/packages/cli/fern-definition/validator/src/rules/no-extensions-with-file-upload/__test__/no-extensions-with-file-upload.test.ts b/packages/cli/fern-definition/validator/src/rules/no-extensions-with-file-upload/__test__/no-extensions-with-file-upload.test.ts index 37d242eccbd..8d1c6d1bb8c 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-extensions-with-file-upload/__test__/no-extensions-with-file-upload.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-extensions-with-file-upload/__test__/no-extensions-with-file-upload.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoExtensionsWithFileUploadRule } from "../no-extensions-with-file-upload"; describe("no-extensions-with-file-upload", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/no-extensions-with-file-upload/no-extensions-with-file-upload.ts b/packages/cli/fern-definition/validator/src/rules/no-extensions-with-file-upload/no-extensions-with-file-upload.ts index abf90a40913..6ace870bfc5 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-extensions-with-file-upload/no-extensions-with-file-upload.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-extensions-with-file-upload/no-extensions-with-file-upload.ts @@ -1,4 +1,5 @@ import { parseFileUploadRequest } from "@fern-api/fern-definition-schema"; + import { Rule } from "../../Rule"; export const NoExtensionsWithFileUploadRule: Rule = { diff --git a/packages/cli/fern-definition/validator/src/rules/no-get-request-body/__test__/no-get-request-body.test.ts b/packages/cli/fern-definition/validator/src/rules/no-get-request-body/__test__/no-get-request-body.test.ts index 2024eab8336..5eba8698f43 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-get-request-body/__test__/no-get-request-body.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-get-request-body/__test__/no-get-request-body.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoGetRequestBodyRule } from "../no-get-request-body"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-get-request-body/no-get-request-body.ts b/packages/cli/fern-definition/validator/src/rules/no-get-request-body/no-get-request-body.ts index 4fba8a2563a..647dc53575a 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-get-request-body/no-get-request-body.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-get-request-body/no-get-request-body.ts @@ -1,4 +1,5 @@ import { getRequestBody } from "@fern-api/fern-definition-schema"; + import { Rule } from "../../Rule"; export const NoGetRequestBodyRule: Rule = { diff --git a/packages/cli/fern-definition/validator/src/rules/no-missing-auth/__test__/no-missing-auth.test.ts b/packages/cli/fern-definition/validator/src/rules/no-missing-auth/__test__/no-missing-auth.test.ts index 1584152a46d..ee6384cb9e7 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-missing-auth/__test__/no-missing-auth.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-missing-auth/__test__/no-missing-auth.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoMissingAuthRule } from "../no-missing-auth"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-missing-error-discriminant/__test__/no-missing-error-discriminant.test.ts b/packages/cli/fern-definition/validator/src/rules/no-missing-error-discriminant/__test__/no-missing-error-discriminant.test.ts index 7a0266c4246..df5a000f3da 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-missing-error-discriminant/__test__/no-missing-error-discriminant.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-missing-error-discriminant/__test__/no-missing-error-discriminant.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoMissingErrorDiscriminantRule } from "../no-missing-error-discriminant"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-missing-error-discriminant/no-missing-error-discriminant.ts b/packages/cli/fern-definition/validator/src/rules/no-missing-error-discriminant/no-missing-error-discriminant.ts index fe564327d56..f4305c153c1 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-missing-error-discriminant/no-missing-error-discriminant.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-missing-error-discriminant/no-missing-error-discriminant.ts @@ -1,5 +1,7 @@ -import { FernWorkspace, getAllNamedDefinitionFiles } from "@fern-api/api-workspace-commons"; import { isEmpty } from "lodash-es"; + +import { FernWorkspace, getAllNamedDefinitionFiles } from "@fern-api/api-workspace-commons"; + import { Rule } from "../../Rule"; export const NoMissingErrorDiscriminantRule: Rule = { diff --git a/packages/cli/fern-definition/validator/src/rules/no-missing-request-name/__test__/no-missing-request-name.test.ts b/packages/cli/fern-definition/validator/src/rules/no-missing-request-name/__test__/no-missing-request-name.test.ts index e900aeef258..e4e2657bfd9 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-missing-request-name/__test__/no-missing-request-name.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-missing-request-name/__test__/no-missing-request-name.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoMissingRequestNameRule } from "../no-missing-request-name"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-missing-request-name/no-missing-request-name.ts b/packages/cli/fern-definition/validator/src/rules/no-missing-request-name/no-missing-request-name.ts index 7808ca84493..bb0e02d2929 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-missing-request-name/no-missing-request-name.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-missing-request-name/no-missing-request-name.ts @@ -1,5 +1,7 @@ -import { isInlineRequestBody } from "@fern-api/fern-definition-schema"; import { size } from "lodash-es"; + +import { isInlineRequestBody } from "@fern-api/fern-definition-schema"; + import { Rule } from "../../Rule"; export const NoMissingRequestNameRule: Rule = { diff --git a/packages/cli/fern-definition/validator/src/rules/no-object-single-property-key/__test__/no-object-single-property-key.test.ts b/packages/cli/fern-definition/validator/src/rules/no-object-single-property-key/__test__/no-object-single-property-key.test.ts index 229939f0f64..e3f310e41c5 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-object-single-property-key/__test__/no-object-single-property-key.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-object-single-property-key/__test__/no-object-single-property-key.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoObjectSinglePropertyKeyRule } from "../no-missing-union-variant-key"; describe("valid-field-names", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/no-object-single-property-key/no-missing-union-variant-key.ts b/packages/cli/fern-definition/validator/src/rules/no-object-single-property-key/no-missing-union-variant-key.ts index 61efe99afae..50bf1eb599f 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-object-single-property-key/no-missing-union-variant-key.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-object-single-property-key/no-missing-union-variant-key.ts @@ -1,5 +1,6 @@ -import { constructFernFileContext, TypeResolverImpl } from "@fern-api/ir-generator"; -import { isRawDiscriminatedUnionDefinition, RawSchemas } from "@fern-api/fern-definition-schema"; +import { RawSchemas, isRawDiscriminatedUnionDefinition } from "@fern-api/fern-definition-schema"; +import { TypeResolverImpl, constructFernFileContext } from "@fern-api/ir-generator"; + import { Rule, RuleViolation } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-response-property/__test__/no-response-property.test.ts b/packages/cli/fern-definition/validator/src/rules/no-response-property/__test__/no-response-property.test.ts index 47c6818a815..25fb95628f5 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-response-property/__test__/no-response-property.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-response-property/__test__/no-response-property.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoResponsePropertyRule } from "../no-response-property"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-response-property/no-response-property.ts b/packages/cli/fern-definition/validator/src/rules/no-response-property/no-response-property.ts index 67b41dc3b25..ba6191fee4e 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-response-property/no-response-property.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-response-property/no-response-property.ts @@ -1,12 +1,13 @@ import { assertNever } from "@fern-api/core-utils"; +import { RawSchemas, parseRawFileType, parseRawTextType } from "@fern-api/fern-definition-schema"; import { - constructFernFileContext, FernFileContext, ResolvedType, TypeResolver, - TypeResolverImpl + TypeResolverImpl, + constructFernFileContext } from "@fern-api/ir-generator"; -import { parseRawFileType, parseRawTextType, RawSchemas } from "@fern-api/fern-definition-schema"; + import { Rule, RuleViolation } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-undefined-error-reference/__test__/no-undefined-error-reference.test.ts b/packages/cli/fern-definition/validator/src/rules/no-undefined-error-reference/__test__/no-undefined-error-reference.test.ts index 550c69d298e..292bb16f417 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-undefined-error-reference/__test__/no-undefined-error-reference.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-undefined-error-reference/__test__/no-undefined-error-reference.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoUndefinedErrorReferenceRule } from "../no-undefined-error-reference"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-undefined-error-reference/no-undefined-error-reference.ts b/packages/cli/fern-definition/validator/src/rules/no-undefined-error-reference/no-undefined-error-reference.ts index d153477679e..d810e6b805a 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-undefined-error-reference/no-undefined-error-reference.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-undefined-error-reference/no-undefined-error-reference.ts @@ -1,10 +1,12 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; -import { parseReferenceToTypeName } from "@fern-api/ir-generator"; +import { mapValues } from "lodash-es"; + import { FernWorkspace, visitAllDefinitionFiles } from "@fern-api/api-workspace-commons"; import { DefinitionFileSchema, RootApiFileSchema } from "@fern-api/fern-definition-schema"; -import { visitDefinitionFileYamlAst } from "../../ast"; -import { mapValues } from "lodash-es"; +import { RelativeFilePath } from "@fern-api/fs-utils"; +import { parseReferenceToTypeName } from "@fern-api/ir-generator"; + import { Rule, RuleViolation } from "../../Rule"; +import { visitDefinitionFileYamlAst } from "../../ast"; type ErrorName = string; diff --git a/packages/cli/fern-definition/validator/src/rules/no-undefined-example-reference/__test__/no-undefined-example-reference.test.ts b/packages/cli/fern-definition/validator/src/rules/no-undefined-example-reference/__test__/no-undefined-example-reference.test.ts index 2863afdf62d..0b418cea123 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-undefined-example-reference/__test__/no-undefined-example-reference.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-undefined-example-reference/__test__/no-undefined-example-reference.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoUndefinedExampleReferenceRule } from "../no-undefined-example-reference"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-undefined-example-reference/no-undefined-example-reference.ts b/packages/cli/fern-definition/validator/src/rules/no-undefined-example-reference/no-undefined-example-reference.ts index 601c8c88b33..68d3226be01 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-undefined-example-reference/no-undefined-example-reference.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-undefined-example-reference/no-undefined-example-reference.ts @@ -1,5 +1,7 @@ -import { constructFernFileContext, ExampleResolverImpl, TypeResolverImpl } from "@fern-api/ir-generator"; import chalk from "chalk"; + +import { ExampleResolverImpl, TypeResolverImpl, constructFernFileContext } from "@fern-api/ir-generator"; + import { Rule } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-undefined-path-parameters/__test__/no-undefined-path-parameters.test.ts b/packages/cli/fern-definition/validator/src/rules/no-undefined-path-parameters/__test__/no-undefined-path-parameters.test.ts index 58ddd249aa2..709376cda81 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-undefined-path-parameters/__test__/no-undefined-path-parameters.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-undefined-path-parameters/__test__/no-undefined-path-parameters.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoUndefinedPathParametersRule } from "../no-undefined-path-parameters"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-undefined-path-parameters/no-undefined-path-parameters.ts b/packages/cli/fern-definition/validator/src/rules/no-undefined-path-parameters/no-undefined-path-parameters.ts index 3d63ea4c289..ae030a090d8 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-undefined-path-parameters/no-undefined-path-parameters.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-undefined-path-parameters/no-undefined-path-parameters.ts @@ -1,10 +1,12 @@ -import { constructHttpPath, getEndpointPathParameters } from "@fern-api/ir-generator"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; import capitalize from "lodash-es/capitalize"; -import { Rule, RuleViolation } from "../../Rule"; import urlJoin from "url-join"; +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { constructHttpPath, getEndpointPathParameters } from "@fern-api/ir-generator"; + +import { Rule, RuleViolation } from "../../Rule"; + export const NoUndefinedPathParametersRule: Rule = { name: "no-undefined-path-parameters", create: () => { diff --git a/packages/cli/fern-definition/validator/src/rules/no-undefined-type-reference/__test__/no-undefined-type-reference.test.ts b/packages/cli/fern-definition/validator/src/rules/no-undefined-type-reference/__test__/no-undefined-type-reference.test.ts index 5a62dceb818..d2da5678387 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-undefined-type-reference/__test__/no-undefined-type-reference.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-undefined-type-reference/__test__/no-undefined-type-reference.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoUndefinedTypeReferenceRule } from "../no-undefined-type-reference"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-undefined-type-reference/no-undefined-type-reference.ts b/packages/cli/fern-definition/validator/src/rules/no-undefined-type-reference/no-undefined-type-reference.ts index 7a3287af76d..76d407405ac 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-undefined-type-reference/no-undefined-type-reference.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-undefined-type-reference/no-undefined-type-reference.ts @@ -1,18 +1,20 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; -import { parseReferenceToTypeName } from "@fern-api/ir-generator"; +import chalk from "chalk"; +import { mapValues } from "lodash-es"; + import { FernWorkspace, visitAllDefinitionFiles } from "@fern-api/api-workspace-commons"; import { - isRawTextType, NodePath, + isRawTextType, + parseGeneric, parseRawBytesType, parseRawFileType, - recursivelyVisitRawTypeReference, - parseGeneric + recursivelyVisitRawTypeReference } from "@fern-api/fern-definition-schema"; -import { visitDefinitionFileYamlAst, TypeReferenceLocation } from "../../ast"; -import chalk from "chalk"; -import { mapValues } from "lodash-es"; +import { RelativeFilePath } from "@fern-api/fs-utils"; +import { parseReferenceToTypeName } from "@fern-api/ir-generator"; + import { Rule, RuleViolation } from "../../Rule"; +import { TypeReferenceLocation, visitDefinitionFileYamlAst } from "../../ast"; type TypeName = string; diff --git a/packages/cli/fern-definition/validator/src/rules/no-undefined-variable-reference/__test__/no-undefined-variable-reference.test.ts b/packages/cli/fern-definition/validator/src/rules/no-undefined-variable-reference/__test__/no-undefined-variable-reference.test.ts index 1417351119f..6e78cb7fbaa 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-undefined-variable-reference/__test__/no-undefined-variable-reference.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-undefined-variable-reference/__test__/no-undefined-variable-reference.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoUndefinedVariableReferenceRule } from "../no-undefined-variable-reference"; describe("no-undefined-variable-reference", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/no-undefined-variable-reference/no-undefined-variable-reference.ts b/packages/cli/fern-definition/validator/src/rules/no-undefined-variable-reference/no-undefined-variable-reference.ts index b2a329cd06f..0524f859f35 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-undefined-variable-reference/no-undefined-variable-reference.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-undefined-variable-reference/no-undefined-variable-reference.ts @@ -1,9 +1,10 @@ import { - constructFernFileContext, - constructRootApiFileContext, FernFileContext, - VariableResolverImpl + VariableResolverImpl, + constructFernFileContext, + constructRootApiFileContext } from "@fern-api/ir-generator"; + import { Rule, RuleViolation } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-unused-generic/__test__/no-unused-generic.test.ts b/packages/cli/fern-definition/validator/src/rules/no-unused-generic/__test__/no-unused-generic.test.ts index 3d7f93cdad1..30b95cdce02 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-unused-generic/__test__/no-unused-generic.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-unused-generic/__test__/no-unused-generic.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { NoUnusedGenericRule } from "../no-unused-generic"; diff --git a/packages/cli/fern-definition/validator/src/rules/no-unused-generic/no-unused-generic.ts b/packages/cli/fern-definition/validator/src/rules/no-unused-generic/no-unused-generic.ts index e29500b4607..df398cacf87 100644 --- a/packages/cli/fern-definition/validator/src/rules/no-unused-generic/no-unused-generic.ts +++ b/packages/cli/fern-definition/validator/src/rules/no-unused-generic/no-unused-generic.ts @@ -1,8 +1,9 @@ /* eslint-disable @typescript-eslint/no-empty-function */ import { visitAllDefinitionFiles } from "@fern-api/api-workspace-commons"; -import { visitDefinitionFileYamlAst } from "../../ast"; +import { parseGeneric, visitRawTypeDeclaration } from "@fern-api/fern-definition-schema"; + import { Rule, RuleViolation } from "../../Rule"; -import { visitRawTypeDeclaration, parseGeneric } from "@fern-api/fern-definition-schema"; +import { visitDefinitionFileYamlAst } from "../../ast"; export const NoUnusedGenericRule: Rule = { name: "no-unused-generic", diff --git a/packages/cli/fern-definition/validator/src/rules/only-object-extensions/__test__/only-object-extensions.test.ts b/packages/cli/fern-definition/validator/src/rules/only-object-extensions/__test__/only-object-extensions.test.ts index 3e52e63ff72..b4a2a13bded 100644 --- a/packages/cli/fern-definition/validator/src/rules/only-object-extensions/__test__/only-object-extensions.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/only-object-extensions/__test__/only-object-extensions.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { OnlyObjectExtensionsRule } from "../only-object-extensions"; describe("only-object-extensions", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/only-object-extensions/only-object-extensions.ts b/packages/cli/fern-definition/validator/src/rules/only-object-extensions/only-object-extensions.ts index 4e0f25fda91..1ddf2bd327a 100644 --- a/packages/cli/fern-definition/validator/src/rules/only-object-extensions/only-object-extensions.ts +++ b/packages/cli/fern-definition/validator/src/rules/only-object-extensions/only-object-extensions.ts @@ -1,5 +1,6 @@ -import { constructFernFileContext, TypeResolverImpl } from "@fern-api/ir-generator"; import { isRawObjectDefinition } from "@fern-api/fern-definition-schema"; +import { TypeResolverImpl, constructFernFileContext } from "@fern-api/ir-generator"; + import { Rule } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-base-path/__test__/valid-base-path.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-base-path/__test__/valid-base-path.test.ts index 033a3242df5..ed8157f986d 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-base-path/__test__/valid-base-path.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-base-path/__test__/valid-base-path.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidBasePathRule } from "../valid-base-path"; describe("valid-base-path", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-default-environment/__test__/valid-default-environment.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-default-environment/__test__/valid-default-environment.test.ts index efe5e6a8e06..2dd367d1ce3 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-default-environment/__test__/valid-default-environment.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-default-environment/__test__/valid-default-environment.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidDefaultEnvironmentRule } from "../valid-default-environment"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-endpoint-path/__test__/valid-base-path.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-endpoint-path/__test__/valid-base-path.test.ts index 225e4db6806..ba974e5a6df 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-endpoint-path/__test__/valid-base-path.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-endpoint-path/__test__/valid-base-path.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidEndpointPathRule } from "../valid-endpoint-path"; describe("valid-endpoint-path", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/__test__/valid-example-endpoint-call.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/__test__/valid-example-endpoint-call.test.ts index 4582424376c..eb1d805c452 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/__test__/valid-example-endpoint-call.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/__test__/valid-example-endpoint-call.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidExampleEndpointCallRule } from "../valid-example-endpoint-call"; describe("valid-example-endpoint-call", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/valid-example-endpoint-call.ts b/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/valid-example-endpoint-call.ts index fe9c378c6c0..75bcebe27d6 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/valid-example-endpoint-call.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/valid-example-endpoint-call.ts @@ -1,19 +1,20 @@ import { FernWorkspace } from "@fern-api/api-workspace-commons"; +import { RawSchemas } from "@fern-api/fern-definition-schema"; import { - constructFernFileContext, ErrorResolverImpl, ExampleResolverImpl, - getEndpointPathParameters, - resolvePathParameter, TypeResolverImpl, - VariableResolverImpl + VariableResolverImpl, + constructFernFileContext, + getEndpointPathParameters, + resolvePathParameter } from "@fern-api/ir-generator"; + import { Rule } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; import { validateExampleEndpointCallParameters } from "./validateExampleEndpointCallParameters"; import { validateRequest } from "./validateRequest"; import { validateResponse } from "./validateResponse"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; export const ValidExampleEndpointCallRule: Rule = { name: "valid-example-endpoint-call", diff --git a/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateExampleEndpointCallParameters.ts b/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateExampleEndpointCallParameters.ts index 56f1329e74f..35c179c8740 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateExampleEndpointCallParameters.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateExampleEndpointCallParameters.ts @@ -1,6 +1,7 @@ -import { ExampleResolver, ExampleValidators, FernFileContext, TypeResolver } from "@fern-api/ir-generator"; import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { ExampleResolver, ExampleValidators, FernFileContext, TypeResolver } from "@fern-api/ir-generator"; + import { RuleViolation } from "../../Rule"; export function validateExampleEndpointCallParameters({ diff --git a/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateRequest.ts b/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateRequest.ts index 0d90543f065..1c730f426c2 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateRequest.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateRequest.ts @@ -1,6 +1,7 @@ import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { isInlineRequestBody, RawSchemas } from "@fern-api/fern-definition-schema"; +import { RawSchemas, isInlineRequestBody } from "@fern-api/fern-definition-schema"; import { ExampleResolver, ExampleValidators, FernFileContext, TypeResolver } from "@fern-api/ir-generator"; + import { RuleViolation } from "../../Rule"; export function validateRequest({ diff --git a/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateResponse.ts b/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateResponse.ts index 0b83891455d..24b6ffe673b 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateResponse.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-example-endpoint-call/validateResponse.ts @@ -1,3 +1,7 @@ +import chalk from "chalk"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; +import { RawSchemas, visitExampleResponseSchema } from "@fern-api/fern-definition-schema"; import { ErrorResolver, ExampleResolver, @@ -5,9 +9,7 @@ import { FernFileContext, TypeResolver } from "@fern-api/ir-generator"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { RawSchemas, visitExampleResponseSchema } from "@fern-api/fern-definition-schema"; -import chalk from "chalk"; + import { RuleViolation } from "../../Rule"; export function validateResponse({ diff --git a/packages/cli/fern-definition/validator/src/rules/valid-example-error/__test__/valid-example-error.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-example-error/__test__/valid-example-error.test.ts index dbdc36bfb12..ae417167cf2 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-example-error/__test__/valid-example-error.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-example-error/__test__/valid-example-error.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidExampleErrorRule } from "../valid-example-error"; describe("valid-example-error", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-example-error/valid-example-error.ts b/packages/cli/fern-definition/validator/src/rules/valid-example-error/valid-example-error.ts index 75b10960b8c..84baf9d5c1b 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-example-error/valid-example-error.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-example-error/valid-example-error.ts @@ -1,9 +1,10 @@ import { - constructFernFileContext, ExampleResolverImpl, ExampleValidators, - TypeResolverImpl + TypeResolverImpl, + constructFernFileContext } from "@fern-api/ir-generator"; + import { Rule } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-example-type/__test__/valid-example-type.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-example-type/__test__/valid-example-type.test.ts index 875a0e18875..d5d14f01ee6 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-example-type/__test__/valid-example-type.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-example-type/__test__/valid-example-type.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidExampleTypeRule } from "../valid-example-type"; describe("valid-example-type", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-example-type/valid-example-type.ts b/packages/cli/fern-definition/validator/src/rules/valid-example-type/valid-example-type.ts index 8c18d22ca4b..f411b0524ec 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-example-type/valid-example-type.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-example-type/valid-example-type.ts @@ -1,9 +1,10 @@ import { - constructFernFileContext, ExampleResolverImpl, ExampleValidators, - TypeResolverImpl + TypeResolverImpl, + constructFernFileContext } from "@fern-api/ir-generator"; + import { Rule } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-field-names/__test__/valid-field-names.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-field-names/__test__/valid-field-names.test.ts index 71c353f256a..c92c77c3ef6 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-field-names/__test__/valid-field-names.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-field-names/__test__/valid-field-names.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidFieldNamesRule } from "../valid-field-names"; describe("valid-field-names", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-field-names/valid-field-names.ts b/packages/cli/fern-definition/validator/src/rules/valid-field-names/valid-field-names.ts index 09c5b5d0299..ec130d1c116 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-field-names/valid-field-names.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-field-names/valid-field-names.ts @@ -1,4 +1,5 @@ import { visitRawTypeDeclaration } from "@fern-api/fern-definition-schema"; + import { Rule, RuleViolation } from "../../Rule"; import { validateEnumNames } from "./validateEnumNames"; import { validateUnionNames } from "./validateUnionNames"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-field-names/validateEnumNames.ts b/packages/cli/fern-definition/validator/src/rules/valid-field-names/validateEnumNames.ts index de8dcfc069b..989b17b5124 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-field-names/validateEnumNames.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-field-names/validateEnumNames.ts @@ -1,6 +1,8 @@ -import { getEnumName } from "@fern-api/ir-generator"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { getEnumName } from "@fern-api/ir-generator"; + import { RuleViolation } from "../../Rule"; import { VALID_NAME_REGEX } from "./regex"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-field-names/validateUnionNames.ts b/packages/cli/fern-definition/validator/src/rules/valid-field-names/validateUnionNames.ts index 7b8e6d8c940..70cceaf2f2d 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-field-names/validateUnionNames.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-field-names/validateUnionNames.ts @@ -1,6 +1,8 @@ -import { getUnionDiscriminantName } from "@fern-api/ir-generator"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { getUnionDiscriminantName } from "@fern-api/ir-generator"; + import { RuleViolation } from "../../Rule"; import { VALID_NAME_REGEX } from "./regex"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-generic/__test__/valid-generic.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-generic/__test__/valid-generic.test.ts index 3c6445241de..8f04983e21a 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-generic/__test__/valid-generic.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-generic/__test__/valid-generic.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidGenericRule } from "../valid-generic"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-generic/valid-generic.ts b/packages/cli/fern-definition/validator/src/rules/valid-generic/valid-generic.ts index ce6720dacbd..a20fd39dfb3 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-generic/valid-generic.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-generic/valid-generic.ts @@ -1,7 +1,8 @@ /* eslint-disable @typescript-eslint/no-empty-function */ -import { Rule, RuleViolation } from "../../Rule"; -import { NodePath, visitRawTypeDeclaration, isGeneric, parseGeneric } from "@fern-api/fern-definition-schema"; import { FernWorkspace, visitAllDefinitionFiles } from "@fern-api/api-workspace-commons"; +import { NodePath, isGeneric, parseGeneric, visitRawTypeDeclaration } from "@fern-api/fern-definition-schema"; + +import { Rule, RuleViolation } from "../../Rule"; import { visitDefinitionFileYamlAst } from "../../ast"; type GenericDeclaration = string; @@ -123,8 +124,8 @@ export const ValidGenericRule: Rule = { typeof value === "string" ? value : typeof value.type === "string" - ? value.type - : undefined; + ? value.type + : undefined; if (discriminatedUnionValue && isGeneric(discriminatedUnionValue)) { if (nodePath) { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-navigation/__test__/valid-navigation.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-navigation/__test__/valid-navigation.test.ts index 4f6eedf3944..376ca7f00be 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-navigation/__test__/valid-navigation.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-navigation/__test__/valid-navigation.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidNavigationRule } from "../valid-navigation"; describe("valid-navigation", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-navigation/valid-navigation.ts b/packages/cli/fern-definition/validator/src/rules/valid-navigation/valid-navigation.ts index aa971478029..291b9a49581 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-navigation/valid-navigation.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-navigation/valid-navigation.ts @@ -1,8 +1,10 @@ +import path from "path"; + +import { getAllDefinitionFiles, getAllNamedDefinitionFiles } from "@fern-api/api-workspace-commons"; import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration-loader"; import { keys } from "@fern-api/core-utils"; -import { dirname, join, relative, RelativeFilePath } from "@fern-api/fs-utils"; -import { getAllDefinitionFiles, getAllNamedDefinitionFiles } from "@fern-api/api-workspace-commons"; -import path from "path"; +import { RelativeFilePath, dirname, join, relative } from "@fern-api/fs-utils"; + import { Rule, RuleViolation } from "../../Rule"; export const ValidNavigationRule: Rule = { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-oauth/__test__/valid-oauth.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-oauth/__test__/valid-oauth.test.ts index b0d42d32102..dce86178283 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-oauth/__test__/valid-oauth.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-oauth/__test__/valid-oauth.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidOauthRule } from "../valid-oauth"; describe("valid-oauth", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-oauth/valid-oauth.ts b/packages/cli/fern-definition/validator/src/rules/valid-oauth/valid-oauth.ts index 850df4f026a..97881417377 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-oauth/valid-oauth.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-oauth/valid-oauth.ts @@ -1,6 +1,8 @@ -import { DocsLinks } from "@fern-api/configuration-loader"; -import { constructRootApiFileContext, EndpointResolverImpl, TypeResolverImpl } from "@fern-api/ir-generator"; import terminalLink from "terminal-link"; + +import { DocsLinks } from "@fern-api/configuration-loader"; +import { EndpointResolverImpl, TypeResolverImpl, constructRootApiFileContext } from "@fern-api/ir-generator"; + import { Rule, RuleViolation } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; import { validateRefreshTokenEndpoint } from "./validateRefreshTokenEndpoint"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateRefreshTokenEndpoint.ts b/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateRefreshTokenEndpoint.ts index 80b1a8fbc0e..30923212407 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateRefreshTokenEndpoint.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateRefreshTokenEndpoint.ts @@ -1,6 +1,8 @@ -import { FernFileContext, TypeResolver } from "@fern-api/ir-generator"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { FernFileContext, TypeResolver } from "@fern-api/ir-generator"; + import { RuleViolation } from "../../Rule"; import { maybeFileFromResolvedType, resolveResponseType } from "../../utils/propertyValidatorUtils"; import { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateTokenEndpoint.ts b/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateTokenEndpoint.ts index 6d4eee3b7a5..c1893d457f1 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateTokenEndpoint.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateTokenEndpoint.ts @@ -1,6 +1,8 @@ -import { FernFileContext, TypeResolver } from "@fern-api/ir-generator"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { FernFileContext, TypeResolver } from "@fern-api/ir-generator"; + import { RuleViolation } from "../../Rule"; import { maybeFileFromResolvedType, resolveResponseType } from "../../utils/propertyValidatorUtils"; import { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateUtils.ts b/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateUtils.ts index 08ae75643a2..47a4e7b8bff 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateUtils.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-oauth/validateUtils.ts @@ -1,17 +1,19 @@ -import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; + import { RuleViolation } from "../../Rule"; import { + REQUEST_PREFIX, + RESPONSE_PREFIX, + RequestPropertyValidator, + ResponsePropertyValidator, getRequestPropertyComponents, getResponsePropertyComponents, maybePrimitiveType, - RequestPropertyValidator, requestTypeHasProperty, - REQUEST_PREFIX, - resolvedTypeHasProperty, - ResponsePropertyValidator, - RESPONSE_PREFIX + resolvedTypeHasProperty } from "../../utils/propertyValidatorUtils"; export const DEFAULT_CLIENT_ID = `${REQUEST_PREFIX}client_id`; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-pagination/__test__/valid-pagination.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-pagination/__test__/valid-pagination.test.ts index df7e16466d9..b94905eb372 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-pagination/__test__/valid-pagination.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-pagination/__test__/valid-pagination.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidPaginationRule } from "../valid-pagination"; describe("valid-pagination", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-pagination/resolveResponseType.ts b/packages/cli/fern-definition/validator/src/rules/valid-pagination/resolveResponseType.ts index 42604b55bb0..c2f19920bb1 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-pagination/resolveResponseType.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-pagination/resolveResponseType.ts @@ -1,5 +1,5 @@ -import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; export function resolveResponseType({ endpoint, diff --git a/packages/cli/fern-definition/validator/src/rules/valid-pagination/valid-pagination.ts b/packages/cli/fern-definition/validator/src/rules/valid-pagination/valid-pagination.ts index 2f7572e48ef..d5066190e4c 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-pagination/valid-pagination.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-pagination/valid-pagination.ts @@ -1,5 +1,6 @@ -import { constructFernFileContext, TypeResolverImpl } from "@fern-api/ir-generator"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { TypeResolverImpl, constructFernFileContext } from "@fern-api/ir-generator"; + import { Rule } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; import { validateCursorPagination } from "./validateCursorPagination"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateCursorPagination.ts b/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateCursorPagination.ts index 47366721703..00e91b34d61 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateCursorPagination.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateCursorPagination.ts @@ -1,12 +1,14 @@ -import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; + import { RuleViolation } from "../../Rule"; import { maybeFileFromResolvedType, maybePrimitiveType, - resolvedTypeHasProperty, - resolveResponseType + resolveResponseType, + resolvedTypeHasProperty } from "../../utils/propertyValidatorUtils"; import { validateRequestProperty, validateResponseProperty, validateResultsProperty } from "./validateUtils"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateOffsetPagination.ts b/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateOffsetPagination.ts index 506ca3cb35f..6f2a790a280 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateOffsetPagination.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateOffsetPagination.ts @@ -1,6 +1,8 @@ -import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; + import { RuleViolation } from "../../Rule"; import { getPathFromSelector } from "../../utils/property-validator/getPathFromSelector"; import { validatePropertyInType } from "../../utils/property-validator/validatePropertyInType"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateUtils.ts b/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateUtils.ts index f5f2370ecca..8e1fe2bbb06 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateUtils.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-pagination/validateUtils.ts @@ -1,14 +1,16 @@ -import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import chalk from "chalk"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; + import { RuleViolation } from "../../Rule"; import { + RequestPropertyValidator, + ResponsePropertyValidator, getRequestPropertyComponents, getResponsePropertyComponents, - RequestPropertyValidator, requestTypeHasProperty, - resolvedTypeHasProperty, - ResponsePropertyValidator + resolvedTypeHasProperty } from "../../utils/propertyValidatorUtils"; export function validateResultsProperty({ diff --git a/packages/cli/fern-definition/validator/src/rules/valid-path-parameters-configuration/__test__/valid-path-parameters-configuration.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-path-parameters-configuration/__test__/valid-path-parameters-configuration.test.ts index 09105e51ddc..380d684cc8f 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-path-parameters-configuration/__test__/valid-path-parameters-configuration.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-path-parameters-configuration/__test__/valid-path-parameters-configuration.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidPathParametersConfigurationRule } from "../valid-path-parameters-configuration"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-service-urls/__test__/valid-service-urls.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-service-urls/__test__/valid-service-urls.test.ts index c0003c9bd82..fd8ef208e25 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-service-urls/__test__/valid-service-urls.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-service-urls/__test__/valid-service-urls.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidServiceUrlsRule } from "../valid-service-url"; describe("valid-service-urls", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-service-urls/valid-service-url.ts b/packages/cli/fern-definition/validator/src/rules/valid-service-urls/valid-service-url.ts index e35124131d4..118b684a8a6 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-service-urls/valid-service-url.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-service-urls/valid-service-url.ts @@ -1,5 +1,7 @@ -import { ROOT_API_FILENAME } from "@fern-api/configuration-loader"; import chalk from "chalk"; + +import { ROOT_API_FILENAME } from "@fern-api/configuration-loader"; + import { Rule, RuleViolation } from "../../Rule"; import { getAllEnvironmentUrlIds } from "../../utils/getAllEnvironmentUriIds"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-stream-condition/__test__/valid-stream-condition.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-stream-condition/__test__/valid-stream-condition.test.ts index 6e63c1ec04d..6a63aab0cbd 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-stream-condition/__test__/valid-stream-condition.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-stream-condition/__test__/valid-stream-condition.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidStreamConditionRule } from "../valid-stream-condition"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-stream-condition/valid-stream-condition.ts b/packages/cli/fern-definition/validator/src/rules/valid-stream-condition/valid-stream-condition.ts index c4462aacd60..2a260a4e4a1 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-stream-condition/valid-stream-condition.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-stream-condition/valid-stream-condition.ts @@ -1,17 +1,18 @@ +import { RawSchemas } from "@fern-api/fern-definition-schema"; import { - constructFernFileContext, FernFileContext, ResolvedType, TypeResolver, - TypeResolverImpl + TypeResolverImpl, + constructFernFileContext } from "@fern-api/ir-generator"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { Rule, RuleViolation } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; import { + RequestPropertyValidator, getRequestPropertyComponents, maybePrimitiveType, - RequestPropertyValidator, requestTypeHasProperty } from "../../utils/propertyValidatorUtils"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-type-name/__test__/valid-type-name.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-type-name/__test__/valid-type-name.test.ts index 3ea443b11dc..65af9fc7527 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-type-name/__test__/valid-type-name.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-type-name/__test__/valid-type-name.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidTypeNameRule } from "../valid-type-name"; describe("valid-type-name", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-type-reference-with-default-and-validation/__test__/valid-type-reference-with-default-and-validation.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-type-reference-with-default-and-validation/__test__/valid-type-reference-with-default-and-validation.test.ts index dbacf199465..1788434d630 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-type-reference-with-default-and-validation/__test__/valid-type-reference-with-default-and-validation.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-type-reference-with-default-and-validation/__test__/valid-type-reference-with-default-and-validation.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidTypeReferenceWithDefaultAndValidationRule } from "../valid-type-reference-with-default-and-validation"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-type-reference-with-default-and-validation/valid-type-reference-with-default-and-validation.ts b/packages/cli/fern-definition/validator/src/rules/valid-type-reference-with-default-and-validation/valid-type-reference-with-default-and-validation.ts index 67e5eb82544..2b6bb6bdb85 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-type-reference-with-default-and-validation/valid-type-reference-with-default-and-validation.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-type-reference-with-default-and-validation/valid-type-reference-with-default-and-validation.ts @@ -1,5 +1,6 @@ -import { constructFernFileContext, ResolvedType, TypeResolverImpl } from "@fern-api/ir-generator"; -import { isRawEnumDefinition, RawSchemas } from "@fern-api/fern-definition-schema"; +import { RawSchemas, isRawEnumDefinition } from "@fern-api/fern-definition-schema"; +import { ResolvedType, TypeResolverImpl, constructFernFileContext } from "@fern-api/ir-generator"; + import { Rule, RuleViolation } from "../../Rule"; import { CASINGS_GENERATOR } from "../../utils/casingsGenerator"; diff --git a/packages/cli/fern-definition/validator/src/rules/valid-version/__test__/valid-version.test.ts b/packages/cli/fern-definition/validator/src/rules/valid-version/__test__/valid-version.test.ts index 2f39c2eb608..a03c039992c 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-version/__test__/valid-version.test.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-version/__test__/valid-version.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { ValidVersionRule } from "../valid-version"; describe("valid-version", () => { diff --git a/packages/cli/fern-definition/validator/src/rules/valid-version/valid-version.ts b/packages/cli/fern-definition/validator/src/rules/valid-version/valid-version.ts index 5000ded97cc..70b156dcc25 100644 --- a/packages/cli/fern-definition/validator/src/rules/valid-version/valid-version.ts +++ b/packages/cli/fern-definition/validator/src/rules/valid-version/valid-version.ts @@ -1,5 +1,6 @@ -import { TypeResolver, TypeResolverImpl } from "@fern-api/ir-generator"; import { RootApiFileSchema } from "@fern-api/fern-definition-schema"; +import { TypeResolver, TypeResolverImpl } from "@fern-api/ir-generator"; + import { Rule, RuleViolation } from "../../Rule"; export const ValidVersionRule: Rule = { diff --git a/packages/cli/fern-definition/validator/src/testing-utils/getViolationsForRule.ts b/packages/cli/fern-definition/validator/src/testing-utils/getViolationsForRule.ts index d3b9ac8d508..64643da3a1e 100644 --- a/packages/cli/fern-definition/validator/src/testing-utils/getViolationsForRule.ts +++ b/packages/cli/fern-definition/validator/src/testing-utils/getViolationsForRule.ts @@ -1,12 +1,14 @@ +import stripAnsi from "strip-ansi"; + import { generatorsYml, loadGeneratorsConfiguration } from "@fern-api/configuration-loader"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { LazyFernWorkspace } from "@fern-api/lazy-fern-workspace"; import { CONSOLE_LOGGER } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; -import stripAnsi from "strip-ansi"; + import { Rule } from "../Rule"; -import { runRulesOnWorkspace } from "../validateFernWorkspace"; import { ValidationViolation } from "../ValidationViolation"; +import { runRulesOnWorkspace } from "../validateFernWorkspace"; export declare namespace getViolationsForRule { export interface Args { diff --git a/packages/cli/fern-definition/validator/src/utils/getAllPropertiesForRequest.ts b/packages/cli/fern-definition/validator/src/utils/getAllPropertiesForRequest.ts index a875f5919d7..c0ce3fcdd5b 100644 --- a/packages/cli/fern-definition/validator/src/utils/getAllPropertiesForRequest.ts +++ b/packages/cli/fern-definition/validator/src/utils/getAllPropertiesForRequest.ts @@ -1,12 +1,12 @@ +import { FernWorkspace } from "@fern-api/api-workspace-commons"; +import { RawSchemas, isInlineRequestBody } from "@fern-api/fern-definition-schema"; import { RelativeFilePath } from "@fern-api/fs-utils"; import { - getAllPropertiesForObject, - getAllPropertiesForType, ObjectPropertyWithPath, - TypeResolverImpl + TypeResolverImpl, + getAllPropertiesForObject, + getAllPropertiesForType } from "@fern-api/ir-generator"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { isInlineRequestBody, RawSchemas } from "@fern-api/fern-definition-schema"; export function getAllPropertiesForRequest({ endpoint, diff --git a/packages/cli/fern-definition/validator/src/utils/getTypeDeclarationNameAsString.ts b/packages/cli/fern-definition/validator/src/utils/getTypeDeclarationNameAsString.ts index 978a17ef211..48f96f40aa0 100644 --- a/packages/cli/fern-definition/validator/src/utils/getTypeDeclarationNameAsString.ts +++ b/packages/cli/fern-definition/validator/src/utils/getTypeDeclarationNameAsString.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { TypeDeclarationName } from "../ast"; export function getTypeDeclarationNameAsString(typeName: TypeDeclarationName): string { diff --git a/packages/cli/fern-definition/validator/src/utils/property-validator/validatePropertyInRequest.ts b/packages/cli/fern-definition/validator/src/utils/property-validator/validatePropertyInRequest.ts index f091488775e..e9c1bb939ea 100644 --- a/packages/cli/fern-definition/validator/src/utils/property-validator/validatePropertyInRequest.ts +++ b/packages/cli/fern-definition/validator/src/utils/property-validator/validatePropertyInRequest.ts @@ -1,5 +1,6 @@ +import { RawSchemas, isInlineRequestBody } from "@fern-api/fern-definition-schema"; import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; -import { isInlineRequestBody, RawSchemas } from "@fern-api/fern-definition-schema"; + import { RuleViolation } from "../../Rule"; import { getAllPropertiesForRawObjectSchema, validatePropertyInType } from "./validatePropertyInType"; diff --git a/packages/cli/fern-definition/validator/src/utils/property-validator/validatePropertyInType.ts b/packages/cli/fern-definition/validator/src/utils/property-validator/validatePropertyInType.ts index c17a3923a3d..1e2abbef576 100644 --- a/packages/cli/fern-definition/validator/src/utils/property-validator/validatePropertyInType.ts +++ b/packages/cli/fern-definition/validator/src/utils/property-validator/validatePropertyInType.ts @@ -1,5 +1,6 @@ +import { RawSchemas, isRawObjectDefinition } from "@fern-api/fern-definition-schema"; import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; -import { isRawObjectDefinition, RawSchemas } from "@fern-api/fern-definition-schema"; + import { RuleViolation } from "../../Rule"; export declare namespace ValidatePropertyInType { diff --git a/packages/cli/fern-definition/validator/src/utils/propertyValidatorUtils.ts b/packages/cli/fern-definition/validator/src/utils/propertyValidatorUtils.ts index 64f3a0df18f..54704289d41 100644 --- a/packages/cli/fern-definition/validator/src/utils/propertyValidatorUtils.ts +++ b/packages/cli/fern-definition/validator/src/utils/propertyValidatorUtils.ts @@ -1,6 +1,6 @@ +import { RawSchemas, isInlineRequestBody, isRawObjectDefinition } from "@fern-api/fern-definition-schema"; import { FernFileContext, ResolvedType, TypeResolver } from "@fern-api/ir-generator"; import { PrimitiveTypeV1 } from "@fern-api/ir-sdk"; -import { isInlineRequestBody, isRawObjectDefinition, RawSchemas } from "@fern-api/fern-definition-schema"; export const REQUEST_PREFIX = "$request."; export const RESPONSE_PREFIX = "$response."; diff --git a/packages/cli/fern-definition/validator/src/validateFernWorkspace.ts b/packages/cli/fern-definition/validator/src/validateFernWorkspace.ts index 52b2d4d8175..67ca7ff16d4 100644 --- a/packages/cli/fern-definition/validator/src/validateFernWorkspace.ts +++ b/packages/cli/fern-definition/validator/src/validateFernWorkspace.ts @@ -1,15 +1,16 @@ -import { generatorsYml, ROOT_API_FILENAME, GENERATORS_CONFIGURATION_FILENAME } from "@fern-api/configuration-loader"; -import { RelativeFilePath } from "@fern-api/fs-utils"; -import { Logger } from "@fern-api/logger"; import { FernWorkspace, visitAllDefinitionFiles, visitAllPackageMarkers } from "@fern-api/api-workspace-commons"; +import { GENERATORS_CONFIGURATION_FILENAME, ROOT_API_FILENAME, generatorsYml } from "@fern-api/configuration-loader"; import { DefinitionFileSchema, PackageMarkerFileSchema, RootApiFileSchema } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/fs-utils"; +import { Logger } from "@fern-api/logger"; + +import { Rule, RuleVisitors } from "./Rule"; +import { ValidationViolation } from "./ValidationViolation"; +import { visitDefinitionFileYamlAst, visitPackageMarkerYamlAst, visitRootApiFileYamlAst } from "./ast"; import { createDefinitionFileAstVisitorForRules } from "./createDefinitionFileAstVisitorForRules"; import { createPackageMarkerAstVisitorForRules } from "./createPackageMarkerAstVisitorForRules"; import { createRootApiFileAstVisitorForRules } from "./createRootApiFileAstVisitorForRules"; import { getAllEnabledRules } from "./getAllRules"; -import { Rule, RuleVisitors } from "./Rule"; -import { ValidationViolation } from "./ValidationViolation"; -import { visitRootApiFileYamlAst, visitPackageMarkerYamlAst, visitDefinitionFileYamlAst } from "./ast"; export function validateFernWorkspace(workspace: FernWorkspace, logger: Logger): ValidationViolation[] { return runRulesOnWorkspace({ workspace, rules: getAllEnabledRules(), logger }); diff --git a/packages/cli/generation/ir-generator-tests/package.json b/packages/cli/generation/ir-generator-tests/package.json index 36db00cde55..ee1758d5e1d 100644 --- a/packages/cli/generation/ir-generator-tests/package.json +++ b/packages/cli/generation/ir-generator-tests/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": { @@ -36,13 +35,13 @@ "@fern-api/project-loader": "workspace:*", "@fern-api/task-context": "workspace:*", "@fern-api/workspace-loader": "workspace:*", - "prettier": "^2.7.1" + "prettier": "^3.4.2" }, "devDependencies": { "@types/node": "18.15.3", "depcheck": "^1.4.7", "eslint": "^9.16.0", - "organize-imports-cli": "^0.10.0", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", "typescript": "5.7.2", "vitest": "^2.0.5" } diff --git a/packages/cli/generation/ir-generator-tests/src/dynamic-snippets/__test__/DynamicSnippetsConverter.test.ts b/packages/cli/generation/ir-generator-tests/src/dynamic-snippets/__test__/DynamicSnippetsConverter.test.ts index 7b98e1e01e6..a4fa39e6985 100644 --- a/packages/cli/generation/ir-generator-tests/src/dynamic-snippets/__test__/DynamicSnippetsConverter.test.ts +++ b/packages/cli/generation/ir-generator-tests/src/dynamic-snippets/__test__/DynamicSnippetsConverter.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import path from "path"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { loadApis } from "@fern-api/project-loader"; import { createMockTaskContext } from "@fern-api/task-context"; -import path from "path"; + import { generateAndSnapshotDynamicIR } from "./generateAndSnapshotDynamicIR"; // eslint-disable-next-line @typescript-eslint/no-misused-promises diff --git a/packages/cli/generation/ir-generator-tests/src/dynamic-snippets/__test__/generateAndSnapshotDynamicIR.ts b/packages/cli/generation/ir-generator-tests/src/dynamic-snippets/__test__/generateAndSnapshotDynamicIR.ts index 24ddad5f958..d10127cebde 100644 --- a/packages/cli/generation/ir-generator-tests/src/dynamic-snippets/__test__/generateAndSnapshotDynamicIR.ts +++ b/packages/cli/generation/ir-generator-tests/src/dynamic-snippets/__test__/generateAndSnapshotDynamicIR.ts @@ -1,11 +1,12 @@ +import { writeFile } from "fs/promises"; + +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { Audiences } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, join, RelativeFilePath, stringifyLargeObject } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join, stringifyLargeObject } from "@fern-api/fs-utils"; +import { convertIrToDynamicSnippetsIr, generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { serialization as IrSerialization } from "@fern-api/ir-sdk"; import { createMockTaskContext } from "@fern-api/task-context"; import { AbstractAPIWorkspace } from "@fern-api/workspace-loader"; -import { writeFile } from "fs/promises"; -import { convertIrToDynamicSnippetsIr, generateIntermediateRepresentation } from "@fern-api/ir-generator"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; export async function generateAndSnapshotDynamicIR({ workspace, diff --git a/packages/cli/generation/ir-generator-tests/src/ir/__test__/casingsGenerator.test.ts b/packages/cli/generation/ir-generator-tests/src/ir/__test__/casingsGenerator.test.ts index 27187ec13d6..897c89c1153 100644 --- a/packages/cli/generation/ir-generator-tests/src/ir/__test__/casingsGenerator.test.ts +++ b/packages/cli/generation/ir-generator-tests/src/ir/__test__/casingsGenerator.test.ts @@ -1,5 +1,5 @@ -import { Name } from "@fern-api/ir-sdk"; import { constructCasingsGenerator } from "@fern-api/ir-generator"; +import { Name } from "@fern-api/ir-sdk"; describe("casingsGenerator", () => { const casingsGenerator = constructCasingsGenerator({ diff --git a/packages/cli/generation/ir-generator-tests/src/ir/__test__/constructHttpPath.test.ts b/packages/cli/generation/ir-generator-tests/src/ir/__test__/constructHttpPath.test.ts index a7f512c9ff2..79665bbcda3 100644 --- a/packages/cli/generation/ir-generator-tests/src/ir/__test__/constructHttpPath.test.ts +++ b/packages/cli/generation/ir-generator-tests/src/ir/__test__/constructHttpPath.test.ts @@ -1,5 +1,5 @@ -import { HttpPath } from "@fern-api/ir-sdk"; import { constructHttpPath } from "@fern-api/ir-generator"; +import { HttpPath } from "@fern-api/ir-sdk"; describe("constructHttpPath", () => { it("/hello/{world}", () => { diff --git a/packages/cli/generation/ir-generator-tests/src/ir/__test__/convertResponseErrors.test.ts b/packages/cli/generation/ir-generator-tests/src/ir/__test__/convertResponseErrors.test.ts index ceffd8a7dd4..10ea32da704 100644 --- a/packages/cli/generation/ir-generator-tests/src/ir/__test__/convertResponseErrors.test.ts +++ b/packages/cli/generation/ir-generator-tests/src/ir/__test__/convertResponseErrors.test.ts @@ -1,11 +1,11 @@ import { RelativeFilePath } from "@fern-api/fs-utils"; -import { ResponseErrors } from "@fern-api/ir-sdk"; import { constructCasingsGenerator, constructFernFileContext, convertResponseErrors, convertToFernFilepath } from "@fern-api/ir-generator"; +import { ResponseErrors } from "@fern-api/ir-sdk"; describe("convertResponseErrors", () => { it("reference to an error in another file", () => { diff --git a/packages/cli/generation/ir-generator-tests/src/ir/__test__/generateAndSnapshotIR.ts b/packages/cli/generation/ir-generator-tests/src/ir/__test__/generateAndSnapshotIR.ts index 8ab28c0cbe8..a663dcd4f71 100644 --- a/packages/cli/generation/ir-generator-tests/src/ir/__test__/generateAndSnapshotIR.ts +++ b/packages/cli/generation/ir-generator-tests/src/ir/__test__/generateAndSnapshotIR.ts @@ -1,11 +1,12 @@ +import { writeFile } from "fs/promises"; + +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { Audiences } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, join, RelativeFilePath, stringifyLargeObject } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join, stringifyLargeObject } from "@fern-api/fs-utils"; +import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { serialization as IrSerialization } from "@fern-api/ir-sdk"; import { createMockTaskContext } from "@fern-api/task-context"; import { AbstractAPIWorkspace, loadAPIWorkspace } from "@fern-api/workspace-loader"; -import { writeFile } from "fs/promises"; -import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; export async function generateAndSnapshotIRFromPath({ absolutePathToWorkspace, diff --git a/packages/cli/generation/ir-generator-tests/src/ir/__test__/generateIntermediateRepresentation.test.ts b/packages/cli/generation/ir-generator-tests/src/ir/__test__/generateIntermediateRepresentation.test.ts index 6f2ebd14d6f..16a658472a8 100644 --- a/packages/cli/generation/ir-generator-tests/src/ir/__test__/generateIntermediateRepresentation.test.ts +++ b/packages/cli/generation/ir-generator-tests/src/ir/__test__/generateIntermediateRepresentation.test.ts @@ -2,11 +2,12 @@ /* eslint-disable jest/no-disabled-tests */ /* eslint-disable jest/valid-describe-callback */ /* eslint-disable @typescript-eslint/no-misused-promises */ +import path from "path"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { loadApis } from "@fern-api/project-loader"; import { createMockTaskContext } from "@fern-api/task-context"; -import path from "path"; + import { generateAndSnapshotIR, generateAndSnapshotIRFromPath } from "./generateAndSnapshotIR"; const IR_DIR = path.join(__dirname, "irs"); diff --git a/packages/cli/generation/ir-generator-tests/src/ir/__test__/parseInlineType.test.ts b/packages/cli/generation/ir-generator-tests/src/ir/__test__/parseInlineType.test.ts index 9c9ace1d3f9..4f96d2eda30 100644 --- a/packages/cli/generation/ir-generator-tests/src/ir/__test__/parseInlineType.test.ts +++ b/packages/cli/generation/ir-generator-tests/src/ir/__test__/parseInlineType.test.ts @@ -1,11 +1,11 @@ import { RelativeFilePath } from "@fern-api/fs-utils"; -import { ContainerType, serialization as IrSerialization, TypeReference } from "@fern-api/ir-sdk"; import { constructCasingsGenerator, constructFernFileContext, convertToFernFilepath, parseInlineType } from "@fern-api/ir-generator"; +import { ContainerType, serialization as IrSerialization, TypeReference } from "@fern-api/ir-sdk"; describe("parse inline types", () => { it("nested containers", async () => { diff --git a/packages/cli/generation/ir-generator-tests/src/resolvers/__test__/source-resolver/SourceResolver.test.ts b/packages/cli/generation/ir-generator-tests/src/resolvers/__test__/source-resolver/SourceResolver.test.ts index 48360d6a67b..628bf7568cc 100644 --- a/packages/cli/generation/ir-generator-tests/src/resolvers/__test__/source-resolver/SourceResolver.test.ts +++ b/packages/cli/generation/ir-generator-tests/src/resolvers/__test__/source-resolver/SourceResolver.test.ts @@ -1,8 +1,8 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { constructCasingsGenerator, constructFernFileContext } from "@fern-api/ir-generator"; import { createMockTaskContext } from "@fern-api/task-context"; import { loadAPIWorkspace } from "@fern-api/workspace-loader"; -import { constructCasingsGenerator, constructFernFileContext } from "@fern-api/ir-generator"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; describe("SourceResolver", () => { it("non-existant proto source throws", async () => { diff --git a/packages/cli/generation/ir-generator-tests/src/resolvers/__test__/type-resolver/TypeResolver.test.ts b/packages/cli/generation/ir-generator-tests/src/resolvers/__test__/type-resolver/TypeResolver.test.ts index 35fb175bed4..7236c43c2aa 100644 --- a/packages/cli/generation/ir-generator-tests/src/resolvers/__test__/type-resolver/TypeResolver.test.ts +++ b/packages/cli/generation/ir-generator-tests/src/resolvers/__test__/type-resolver/TypeResolver.test.ts @@ -1,7 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { TypeResolverImpl, constructCasingsGenerator, constructFernFileContext } from "@fern-api/ir-generator"; import { createMockTaskContext } from "@fern-api/task-context"; import { loadAPIWorkspace } from "@fern-api/workspace-loader"; -import { constructCasingsGenerator, constructFernFileContext, TypeResolverImpl } from "@fern-api/ir-generator"; describe("TypeResolver", () => { it("illogical self-referencing types", async () => { diff --git a/packages/cli/generation/ir-generator/package.json b/packages/cli/generation/ir-generator/package.json index 9fadc604aff..d48a6129bca 100644 --- a/packages/cli/generation/ir-generator/package.json +++ b/packages/cli/generation/ir-generator/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", "dist": "pnpm compile && node build.cjs" }, @@ -42,8 +41,8 @@ "depcheck": "^1.4.7", "eslint": "^9.16.0", "lodash-es": "^4.17.21", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "string.prototype.replaceall": "^1.0.10", "tsup": "^8.3.5", "typescript": "5.7.2", diff --git a/packages/cli/generation/ir-generator/src/FernFileContext.ts b/packages/cli/generation/ir-generator/src/FernFileContext.ts index 6fe482165f9..fccbfd34b8e 100644 --- a/packages/cli/generation/ir-generator/src/FernFileContext.ts +++ b/packages/cli/generation/ir-generator/src/FernFileContext.ts @@ -1,7 +1,9 @@ -import { RelativeFilePath } from "@fern-api/path-utils"; -import { FernFilepath, TypeReference } from "@fern-api/ir-sdk"; -import { DefinitionFileSchema, RawSchemas, RootApiFileSchema } from "@fern-api/fern-definition-schema"; import { mapValues } from "lodash-es"; + +import { DefinitionFileSchema, RawSchemas, RootApiFileSchema } from "@fern-api/fern-definition-schema"; +import { FernFilepath, TypeReference } from "@fern-api/ir-sdk"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { CasingsGenerator } from "./casings/CasingsGenerator"; import { convertToFernFilepath } from "./utils/convertToFernFilepath"; import { parseInlineType } from "./utils/parseInlineType"; diff --git a/packages/cli/generation/ir-generator/src/IdGenerator.ts b/packages/cli/generation/ir-generator/src/IdGenerator.ts index c7e7350d782..6e7a29b3895 100644 --- a/packages/cli/generation/ir-generator/src/IdGenerator.ts +++ b/packages/cli/generation/ir-generator/src/IdGenerator.ts @@ -1,4 +1,5 @@ import { DeclaredErrorName, DeclaredServiceName, DeclaredTypeName, FernFilepath, FernIr } from "@fern-api/ir-sdk"; + import { ResolvedEndpoint } from "./resolvers/ResolvedEndpoint"; export const IdGenerator = { diff --git a/packages/cli/generation/ir-generator/src/PackageTreeGenerator.tsx b/packages/cli/generation/ir-generator/src/PackageTreeGenerator.tsx index 66a9bed25ae..23591ce58b5 100644 --- a/packages/cli/generation/ir-generator/src/PackageTreeGenerator.tsx +++ b/packages/cli/generation/ir-generator/src/PackageTreeGenerator.tsx @@ -1,3 +1,5 @@ +import { mapValues } from "lodash-es"; + import { ErrorDeclaration, ErrorId, @@ -10,12 +12,12 @@ import { SubpackageId, TypeDeclaration, TypeId, - WebhookGroupId, - WebSocketChannelId + WebSocketChannelId, + WebhookGroupId } from "@fern-api/ir-sdk"; -import { mapValues } from "lodash-es"; -import { FilteredIr } from "./filtered-ir/FilteredIr"; + import { IdGenerator } from "./IdGenerator"; +import { FilteredIr } from "./filtered-ir/FilteredIr"; type UnprocessedPackage = Omit; type UnprocessedSubpackage = Omit; diff --git a/packages/cli/generation/ir-generator/src/casings/CasingsGenerator.ts b/packages/cli/generation/ir-generator/src/casings/CasingsGenerator.ts index ba6a18c1e02..ecf2973a57d 100644 --- a/packages/cli/generation/ir-generator/src/casings/CasingsGenerator.ts +++ b/packages/cli/generation/ir-generator/src/casings/CasingsGenerator.ts @@ -1,7 +1,9 @@ +import { camelCase, snakeCase, upperFirst, words } from "lodash-es"; + import { generatorsYml } from "@fern-api/configuration"; -import { Name, NameAndWireValue, SafeAndUnsafeString } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { camelCase, snakeCase, upperFirst, words } from "lodash-es"; +import { Name, NameAndWireValue, SafeAndUnsafeString } from "@fern-api/ir-sdk"; + import { RESERVED_KEYWORDS } from "./reserved"; export interface CasingsGenerator { diff --git a/packages/cli/generation/ir-generator/src/casings/reserved.ts b/packages/cli/generation/ir-generator/src/casings/reserved.ts index 81771ebe36e..7878ab7f758 100644 --- a/packages/cli/generation/ir-generator/src/casings/reserved.ts +++ b/packages/cli/generation/ir-generator/src/casings/reserved.ts @@ -1,6 +1,7 @@ -import { generatorsYml } from "@fern-api/configuration"; import { upperFirst } from "lodash-es"; +import { generatorsYml } from "@fern-api/configuration"; + export const RESERVED_KEYWORDS: Record> = { [generatorsYml.GenerationLanguage.PHP]: new Set( [ diff --git a/packages/cli/generation/ir-generator/src/converters/constants.ts b/packages/cli/generation/ir-generator/src/converters/constants.ts index ad93eb8cf61..3a8ec5dd812 100644 --- a/packages/cli/generation/ir-generator/src/converters/constants.ts +++ b/packages/cli/generation/ir-generator/src/converters/constants.ts @@ -1,4 +1,5 @@ import { Constants } from "@fern-api/ir-sdk"; + import { CasingsGenerator } from "../casings/CasingsGenerator"; export function generateFernConstants(casingsGenerator: CasingsGenerator): Constants { diff --git a/packages/cli/generation/ir-generator/src/converters/convertApiAuth.ts b/packages/cli/generation/ir-generator/src/converters/convertApiAuth.ts index d5dc62195c6..af9b084158e 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertApiAuth.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertApiAuth.ts @@ -1,5 +1,6 @@ -import { ApiAuth, AuthScheme, AuthSchemesRequirement, OAuthConfiguration } from "@fern-api/ir-sdk"; import { RawSchemas, visitRawApiAuth, visitRawAuthSchemeDeclaration } from "@fern-api/fern-definition-schema"; +import { ApiAuth, AuthScheme, AuthSchemesRequirement, OAuthConfiguration } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../FernFileContext"; import { EndpointResolver } from "../resolvers/EndpointResolver"; import { PropertyResolver } from "../resolvers/PropertyResolver"; diff --git a/packages/cli/generation/ir-generator/src/converters/convertApiVersionScheme.ts b/packages/cli/generation/ir-generator/src/converters/convertApiVersionScheme.ts index 7ca86d2b9ec..6e0f8154d8d 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertApiVersionScheme.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertApiVersionScheme.ts @@ -1,5 +1,6 @@ -import { ApiVersionScheme, EnumTypeDeclaration, HttpHeader } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { ApiVersionScheme, EnumTypeDeclaration, HttpHeader } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../FernFileContext"; import { convertHttpHeader } from "./services/convertHttpService"; import { convertEnumTypeDeclaration } from "./type-declarations/convertEnumTypeDeclaration"; diff --git a/packages/cli/generation/ir-generator/src/converters/convertChannel.ts b/packages/cli/generation/ir-generator/src/converters/convertChannel.ts index b4fcaf88d05..be17a900dc2 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertChannel.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertChannel.ts @@ -1,4 +1,6 @@ +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { isPlainObject } from "@fern-api/core-utils"; +import { RawSchemas } from "@fern-api/fern-definition-schema"; import { ExampleHeader, ExampleInlinedRequestBodyProperty, @@ -13,13 +15,13 @@ import { WebSocketMessage, WebSocketMessageBody } from "@fern-api/ir-sdk"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { getHeaderName } from ".."; import { FernFileContext } from "../FernFileContext"; import { ExampleResolver } from "../resolvers/ExampleResolver"; import { TypeResolver } from "../resolvers/TypeResolver"; import { VariableResolver } from "../resolvers/VariableResolver"; +import { getEndpointPathParameters } from "../utils/getEndpointPathParameters"; import { parseTypeName } from "../utils/parseTypeName"; import { convertAvailability, convertDeclaration } from "./convertDeclaration"; import { constructHttpPath } from "./services/constructHttpPath"; @@ -30,7 +32,6 @@ import { getOriginalTypeDeclarationForPropertyFromExtensions } from "./type-declarations/convertExampleType"; import { getExtensionsAsList, getPropertyName } from "./type-declarations/convertObjectTypeDeclaration"; -import { getEndpointPathParameters } from "../utils/getEndpointPathParameters"; export function convertChannel({ channel, diff --git a/packages/cli/generation/ir-generator/src/converters/convertDeclaration.ts b/packages/cli/generation/ir-generator/src/converters/convertDeclaration.ts index 5eb4704e135..91c91874910 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertDeclaration.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertDeclaration.ts @@ -1,6 +1,7 @@ import { assertNever } from "@fern-api/core-utils"; -import { Availability, AvailabilityStatus, Declaration } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Availability, AvailabilityStatus, Declaration } from "@fern-api/ir-sdk"; + import { formatDocs } from "../formatDocs"; const DEFAULT_DECLARATION = { diff --git a/packages/cli/generation/ir-generator/src/converters/convertEnvironments.ts b/packages/cli/generation/ir-generator/src/converters/convertEnvironments.ts index 197023fd9dd..f565451330f 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertEnvironments.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertEnvironments.ts @@ -1,3 +1,6 @@ +import { mapValues } from "lodash-es"; + +import { RawSchemas, visitRawEnvironmentDeclaration } from "@fern-api/fern-definition-schema"; import { Environments, EnvironmentsConfig, @@ -6,8 +9,7 @@ import { SingleBaseUrlEnvironment, SingleBaseUrlEnvironments } from "@fern-api/ir-sdk"; -import { RawSchemas, visitRawEnvironmentDeclaration } from "@fern-api/fern-definition-schema"; -import { mapValues } from "lodash-es"; + import { CasingsGenerator } from "../casings/CasingsGenerator"; export function convertEnvironments({ diff --git a/packages/cli/generation/ir-generator/src/converters/convertErrorDeclaration.ts b/packages/cli/generation/ir-generator/src/converters/convertErrorDeclaration.ts index 07e262ee1bc..aa82991b49c 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertErrorDeclaration.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertErrorDeclaration.ts @@ -1,6 +1,7 @@ -import { ErrorDeclaration, FernIr } from "@fern-api/ir-sdk"; import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { ErrorDeclaration, FernIr } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../FernFileContext"; import { ExampleResolver } from "../resolvers/ExampleResolver"; import { TypeResolver } from "../resolvers/TypeResolver"; diff --git a/packages/cli/generation/ir-generator/src/converters/convertErrorDiscriminationStrategy.ts b/packages/cli/generation/ir-generator/src/converters/convertErrorDiscriminationStrategy.ts index a453aa08329..bb159541bff 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertErrorDiscriminationStrategy.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertErrorDiscriminationStrategy.ts @@ -1,6 +1,7 @@ import { assertNever } from "@fern-api/core-utils"; -import { ErrorDiscriminationStrategy } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { ErrorDiscriminationStrategy } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../FernFileContext"; const ERROR_CONTENT_PROPERTY_NAME = "content"; diff --git a/packages/cli/generation/ir-generator/src/converters/convertOAuthClientCredentials.ts b/packages/cli/generation/ir-generator/src/converters/convertOAuthClientCredentials.ts index 6c40bbf3f6f..4e909227d8e 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertOAuthClientCredentials.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertOAuthClientCredentials.ts @@ -1,5 +1,6 @@ -import { OAuthClientCredentials } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { OAuthClientCredentials } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../FernFileContext"; import { EndpointResolver } from "../resolvers/EndpointResolver"; import { PropertyResolver } from "../resolvers/PropertyResolver"; diff --git a/packages/cli/generation/ir-generator/src/converters/convertOAuthRefreshEndpoint.ts b/packages/cli/generation/ir-generator/src/converters/convertOAuthRefreshEndpoint.ts index c8fc7c39830..eae643b791c 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertOAuthRefreshEndpoint.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertOAuthRefreshEndpoint.ts @@ -1,4 +1,5 @@ import { OAuthRefreshEndpoint } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../FernFileContext"; import { IdGenerator } from "../IdGenerator"; import { EndpointResolver } from "../resolvers/EndpointResolver"; diff --git a/packages/cli/generation/ir-generator/src/converters/convertOAuthTokenEndpoint.ts b/packages/cli/generation/ir-generator/src/converters/convertOAuthTokenEndpoint.ts index 64a16e1c727..5c0dff1c40b 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertOAuthTokenEndpoint.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertOAuthTokenEndpoint.ts @@ -1,4 +1,5 @@ import { OAuthTokenEndpoint } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../FernFileContext"; import { IdGenerator } from "../IdGenerator"; import { EndpointResolver } from "../resolvers/EndpointResolver"; diff --git a/packages/cli/generation/ir-generator/src/converters/convertOAuthUtils.ts b/packages/cli/generation/ir-generator/src/converters/convertOAuthUtils.ts index ed628491a40..295379db767 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertOAuthUtils.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertOAuthUtils.ts @@ -1,4 +1,5 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { getRequestPropertyComponents, getResponsePropertyComponents } from "./services/convertProperty"; const DEFAULT_TOKEN_ENDPOINT: Omit = { diff --git a/packages/cli/generation/ir-generator/src/converters/convertProtobufType.ts b/packages/cli/generation/ir-generator/src/converters/convertProtobufType.ts index 2c1f7b1fdad..3d859a1ef69 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertProtobufType.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertProtobufType.ts @@ -1,6 +1,7 @@ -import { ProtobufType, WellKnownProtobufType } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { ProtobufType, WellKnownProtobufType } from "@fern-api/ir-sdk"; import { ResolvedSource } from "@fern-api/source-resolver"; + import { CASINGS_GENERATOR } from "../utils/getAllPropertiesForObject"; import { convertProtobufFile } from "./convertProtobufFile"; diff --git a/packages/cli/generation/ir-generator/src/converters/convertReadmeConfig.ts b/packages/cli/generation/ir-generator/src/converters/convertReadmeConfig.ts index db705e072b1..e6998ee55e9 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertReadmeConfig.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertReadmeConfig.ts @@ -1,6 +1,7 @@ +import urlJoin from "url-join"; + import { generatorsYml } from "@fern-api/configuration"; import { HttpEndpoint, HttpService, ReadmeConfig, ServiceId } from "@fern-api/ir-sdk"; -import urlJoin from "url-join"; export function convertReadmeConfig({ readme, diff --git a/packages/cli/generation/ir-generator/src/converters/convertWebhookGroup.ts b/packages/cli/generation/ir-generator/src/converters/convertWebhookGroup.ts index ee5bd20f0aa..722ad110c56 100644 --- a/packages/cli/generation/ir-generator/src/converters/convertWebhookGroup.ts +++ b/packages/cli/generation/ir-generator/src/converters/convertWebhookGroup.ts @@ -1,4 +1,6 @@ +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { isPlainObject } from "@fern-api/core-utils"; +import { RawSchemas } from "@fern-api/fern-definition-schema"; import { Availability, ExampleWebhookCall, @@ -7,8 +9,7 @@ import { WebhookGroup, WebhookPayload } from "@fern-api/ir-sdk"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../FernFileContext"; import { IdGenerator } from "../IdGenerator"; import { ExampleResolver } from "../resolvers/ExampleResolver"; @@ -149,8 +150,8 @@ function convertWebhookExamples({ typeof webhook.payload === "string" ? webhook.payload : isReferencedWebhookPayloadSchema(webhook.payload) - ? webhook.payload.type - : undefined; + ? webhook.payload.type + : undefined; if (typeName != null) { return examples.map((example) => ({ docs: webhook.docs, diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertCodeSamples.ts b/packages/cli/generation/ir-generator/src/converters/services/convertCodeSamples.ts index 0b16ede68cd..45fe3654f4b 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertCodeSamples.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertCodeSamples.ts @@ -1,5 +1,6 @@ -import { ExampleCodeSample, SupportedSdkLanguage } from "@fern-api/ir-sdk"; import { RawSchemas, visitExampleCodeSampleSchema } from "@fern-api/fern-definition-schema"; +import { ExampleCodeSample, SupportedSdkLanguage } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; export function convertCodeSample({ diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertCursorPagination.ts b/packages/cli/generation/ir-generator/src/converters/services/convertCursorPagination.ts index 3a565dd5eb9..0b7a31971d6 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertCursorPagination.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertCursorPagination.ts @@ -1,5 +1,6 @@ -import { Pagination } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Pagination } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; import { PropertyResolver } from "../../resolvers/PropertyResolver"; import { CursorPaginationPropertyComponents } from "./convertPaginationUtils"; diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertExampleEndpointCall.ts b/packages/cli/generation/ir-generator/src/converters/services/convertExampleEndpointCall.ts index 84cb08ff300..df8dd7b1434 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertExampleEndpointCall.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertExampleEndpointCall.ts @@ -1,4 +1,14 @@ +import urlJoin from "url-join"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { isNonNullish, isPlainObject } from "@fern-api/core-utils"; +import { + RawSchemas, + isInlineRequestBody, + parseBytesRequest, + parseRawFileType, + visitExampleResponseSchema +} from "@fern-api/fern-definition-schema"; import { ExampleEndpointCall, ExampleEndpointSuccessResponse, @@ -10,19 +20,14 @@ import { ExampleResponse, Name } from "@fern-api/ir-sdk"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { - isInlineRequestBody, - parseBytesRequest, - parseRawFileType, - RawSchemas, - visitExampleResponseSchema -} from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../../FernFileContext"; import { ErrorResolver } from "../../resolvers/ErrorResolver"; import { ExampleResolver } from "../../resolvers/ExampleResolver"; import { TypeResolver } from "../../resolvers/TypeResolver"; import { VariableResolver } from "../../resolvers/VariableResolver"; +import { getEndpointPathParameters } from "../../utils/getEndpointPathParameters"; +import { hashJSON } from "../../utils/hashJSON"; import { parseErrorName } from "../../utils/parseErrorName"; import { convertTypeReferenceExample, @@ -31,9 +36,6 @@ import { import { getPropertyName } from "../type-declarations/convertObjectTypeDeclaration"; import { getHeaderName, resolvePathParameterOrThrow } from "./convertHttpService"; import { getQueryParameterName } from "./convertQueryParameter"; -import urlJoin from "url-join"; -import { getEndpointPathParameters } from "../../utils/getEndpointPathParameters"; -import { hashJSON } from "../../utils/hashJSON"; export function convertExampleEndpointCall({ service, diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertHttpRequestBody.ts b/packages/cli/generation/ir-generator/src/converters/services/convertHttpRequestBody.ts index 9b6364162a3..96fcd3ad7a4 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertHttpRequestBody.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertHttpRequestBody.ts @@ -1,21 +1,22 @@ import { + RawSchemas, + isInlineRequestBody, + parseBytesRequest, + parseFileUploadRequest +} from "@fern-api/fern-definition-schema"; +import { + Availability, FileProperty, FileUploadRequestProperty, HttpRequestBody, HttpRequestBodyReference, - InlinedRequestBodyProperty, - Availability + InlinedRequestBodyProperty } from "@fern-api/ir-sdk"; -import { - isInlineRequestBody, - parseBytesRequest, - parseFileUploadRequest, - RawSchemas -} from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../../FernFileContext"; import { parseTypeName } from "../../utils/parseTypeName"; -import { getExtensionsAsList, getPropertyName } from "../type-declarations/convertObjectTypeDeclaration"; import { convertAvailability } from "../convertDeclaration"; +import { getExtensionsAsList, getPropertyName } from "../type-declarations/convertObjectTypeDeclaration"; export function convertHttpRequestBody({ request, diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertHttpResponse.ts b/packages/cli/generation/ir-generator/src/converters/services/convertHttpResponse.ts index da228af6915..3830938f170 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertHttpResponse.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertHttpResponse.ts @@ -1,4 +1,11 @@ import { assertNever } from "@fern-api/core-utils"; +import { + RawSchemas, + isRawTextType, + parseRawBytesType, + parseRawFileType, + parseRawTextType +} from "@fern-api/fern-definition-schema"; import { HttpResponse, HttpResponseBody, @@ -6,13 +13,7 @@ import { NonStreamHttpResponseBody, StreamingResponse } from "@fern-api/ir-sdk"; -import { - isRawTextType, - parseRawFileType, - parseRawTextType, - parseRawBytesType, - RawSchemas -} from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../../FernFileContext"; import { TypeResolver } from "../../resolvers/TypeResolver"; import { getObjectPropertyFromResolvedType } from "./getObjectPropertyFromResolvedType"; @@ -144,7 +145,7 @@ export function convertStreamHttpResponseBody({ if (responseStream != null) { const docs = typeof responseStream !== "string" ? responseStream.docs : undefined; const typeReference = typeof responseStream === "string" ? responseStream : responseStream.type; - const streamFormat = typeof responseStream === "string" ? "json" : responseStream.format ?? "json"; + const streamFormat = typeof responseStream === "string" ? "json" : (responseStream.format ?? "json"); if (isRawTextType(typeReference)) { return StreamingResponse.text({ docs diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertHttpSdkRequest.ts b/packages/cli/generation/ir-generator/src/converters/services/convertHttpSdkRequest.ts index a4afd21911c..122a27741ca 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertHttpSdkRequest.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertHttpSdkRequest.ts @@ -1,6 +1,8 @@ -import { SdkRequest, SdkRequestBodyType, SdkRequestShape } from "@fern-api/ir-sdk"; -import { isInlineRequestBody, parseRawBytesType, RawSchemas } from "@fern-api/fern-definition-schema"; import { size } from "lodash-es"; + +import { RawSchemas, isInlineRequestBody, parseRawBytesType } from "@fern-api/fern-definition-schema"; +import { SdkRequest, SdkRequestBodyType, SdkRequestShape } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; import { PropertyResolver } from "../../resolvers/PropertyResolver"; import { TypeResolver } from "../../resolvers/TypeResolver"; diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertHttpService.ts b/packages/cli/generation/ir-generator/src/converters/services/convertHttpService.ts index dec19928470..8937351d293 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertHttpService.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertHttpService.ts @@ -1,4 +1,8 @@ +import urlJoin from "url-join"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { assertNever } from "@fern-api/core-utils"; +import { RawSchemas, isVariablePathParameter } from "@fern-api/fern-definition-schema"; import { Encoding, HttpEndpoint, @@ -11,17 +15,16 @@ import { Transport, TypeReference } from "@fern-api/ir-sdk"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { isVariablePathParameter, RawSchemas } from "@fern-api/fern-definition-schema"; -import urlJoin from "url-join"; +import { SourceResolver } from "@fern-api/source-resolver"; + import { FernFileContext } from "../../FernFileContext"; import { IdGenerator } from "../../IdGenerator"; import { ErrorResolver } from "../../resolvers/ErrorResolver"; import { ExampleResolver } from "../../resolvers/ExampleResolver"; import { PropertyResolver } from "../../resolvers/PropertyResolver"; -import { SourceResolver } from "@fern-api/source-resolver"; import { TypeResolver } from "../../resolvers/TypeResolver"; import { VariableResolver } from "../../resolvers/VariableResolver"; +import { getEndpointPathParameters } from "../../utils/getEndpointPathParameters"; import { convertAvailability, convertDeclaration } from "../convertDeclaration"; import { constructHttpPath } from "./constructHttpPath"; import { convertCodeSample } from "./convertCodeSamples"; @@ -32,8 +35,7 @@ import { convertHttpSdkRequest } from "./convertHttpSdkRequest"; import { convertPagination } from "./convertPagination"; import { convertQueryParameter } from "./convertQueryParameter"; import { convertResponseErrors } from "./convertResponseErrors"; -import { getTransportForService, getTransportForEndpoint } from "./convertTransport"; -import { getEndpointPathParameters } from "../../utils/getEndpointPathParameters"; +import { getTransportForEndpoint, getTransportForService } from "./convertTransport"; export function convertHttpService({ rootDefaultUrl, @@ -112,8 +114,8 @@ export function convertHttpService({ endpoint["base-path"] != null ? urlJoin(endpoint["base-path"], endpoint.path) : file.rootApiFile["base-path"] != null - ? urlJoin(file.rootApiFile["base-path"], serviceDefinition["base-path"], endpoint.path) - : urlJoin(serviceDefinition["base-path"], endpoint.path) + ? urlJoin(file.rootApiFile["base-path"], serviceDefinition["base-path"], endpoint.path) + : urlJoin(serviceDefinition["base-path"], endpoint.path) ), pathParameters: endpointPathParameters, allPathParameters: diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertOffsetPagination.ts b/packages/cli/generation/ir-generator/src/converters/services/convertOffsetPagination.ts index e3801260f09..aab69f67789 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertOffsetPagination.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertOffsetPagination.ts @@ -1,5 +1,6 @@ -import { Pagination } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Pagination } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; import { PropertyResolver } from "../../resolvers/PropertyResolver"; import { OffsetPaginationPropertyComponents } from "./convertPaginationUtils"; diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertPagination.ts b/packages/cli/generation/ir-generator/src/converters/services/convertPagination.ts index 1f2f7d0fc3e..3607d2e74ab 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertPagination.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertPagination.ts @@ -1,6 +1,7 @@ import { assertNever } from "@fern-api/core-utils"; -import { Pagination } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Pagination } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; import { PropertyResolver } from "../../resolvers/PropertyResolver"; import { convertCursorPagination } from "./convertCursorPagination"; diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertPaginationUtils.ts b/packages/cli/generation/ir-generator/src/converters/services/convertPaginationUtils.ts index f4f054c574b..84ceaa22722 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertPaginationUtils.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertPaginationUtils.ts @@ -1,4 +1,5 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../../FernFileContext"; import { ResolvedType } from "../../resolvers/ResolvedType"; import { TypeResolver } from "../../resolvers/TypeResolver"; diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertProperty.ts b/packages/cli/generation/ir-generator/src/converters/services/convertProperty.ts index 34e16fde2e1..bf9ccf27078 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertProperty.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertProperty.ts @@ -1,5 +1,6 @@ +import { RawSchemas, isRawObjectDefinition } from "@fern-api/fern-definition-schema"; import { ObjectProperty } from "@fern-api/ir-sdk"; -import { isRawObjectDefinition, RawSchemas } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../../FernFileContext"; import { ResolvedType } from "../../resolvers/ResolvedType"; import { TypeResolver } from "../../resolvers/TypeResolver"; diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertProtobufService.ts b/packages/cli/generation/ir-generator/src/converters/services/convertProtobufService.ts index 58f37b26411..2e8dd8add00 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertProtobufService.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertProtobufService.ts @@ -1,5 +1,6 @@ import { ProtobufService } from "@fern-api/ir-sdk"; import { ResolvedSource } from "@fern-api/source-resolver"; + import { CASINGS_GENERATOR } from "../../utils/getAllPropertiesForObject"; import { convertProtobufFile } from "../convertProtobufFile"; diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertQueryParameter.ts b/packages/cli/generation/ir-generator/src/converters/services/convertQueryParameter.ts index ac2ad393df4..2b9c5905ec2 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertQueryParameter.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertQueryParameter.ts @@ -1,5 +1,6 @@ -import { QueryParameter } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { QueryParameter } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; import { convertDeclaration } from "../convertDeclaration"; diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertResponseErrors.ts b/packages/cli/generation/ir-generator/src/converters/services/convertResponseErrors.ts index 518206e587f..b0ac8a32095 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertResponseErrors.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertResponseErrors.ts @@ -1,5 +1,6 @@ -import { ResponseErrors } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { ResponseErrors } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; import { parseErrorName } from "../../utils/parseErrorName"; diff --git a/packages/cli/generation/ir-generator/src/converters/services/convertTransport.ts b/packages/cli/generation/ir-generator/src/converters/services/convertTransport.ts index 276609a7c6b..07e27efe5a1 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/convertTransport.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/convertTransport.ts @@ -1,7 +1,8 @@ +import { RawSchemas, isRawProtobufSourceSchema } from "@fern-api/fern-definition-schema"; import { Transport } from "@fern-api/ir-sdk"; -import { isRawProtobufSourceSchema, RawSchemas } from "@fern-api/fern-definition-schema"; -import { FernFileContext } from "../../FernFileContext"; import { SourceResolver } from "@fern-api/source-resolver"; + +import { FernFileContext } from "../../FernFileContext"; import { convertProtobufService } from "./convertProtobufService"; export function getTransportForService({ diff --git a/packages/cli/generation/ir-generator/src/converters/services/getObjectPropertyFromResolvedType.ts b/packages/cli/generation/ir-generator/src/converters/services/getObjectPropertyFromResolvedType.ts index 14fd0d06eeb..80323f85b73 100644 --- a/packages/cli/generation/ir-generator/src/converters/services/getObjectPropertyFromResolvedType.ts +++ b/packages/cli/generation/ir-generator/src/converters/services/getObjectPropertyFromResolvedType.ts @@ -1,6 +1,7 @@ import { assertNever } from "@fern-api/core-utils"; +import { RawSchemas, isRawObjectDefinition } from "@fern-api/fern-definition-schema"; import { ObjectProperty } from "@fern-api/ir-sdk"; -import { isRawObjectDefinition, RawSchemas } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../../FernFileContext"; import { ResolvedType } from "../../resolvers/ResolvedType"; import { TypeResolver } from "../../resolvers/TypeResolver"; diff --git a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertAliasTypeDeclaration.ts b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertAliasTypeDeclaration.ts index 7c07759759c..8ffa05ebc80 100644 --- a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertAliasTypeDeclaration.ts +++ b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertAliasTypeDeclaration.ts @@ -1,14 +1,15 @@ import { assertNever } from "@fern-api/core-utils"; -import { ResolvedTypeReference, ShapeType, Type } from "@fern-api/ir-sdk"; import { + RawSchemas, + isGeneric, isRawDiscriminatedUnionDefinition, isRawEnumDefinition, isRawObjectDefinition, isRawUndiscriminatedUnionDefinition, - RawSchemas, - parseGeneric, - isGeneric + parseGeneric } from "@fern-api/fern-definition-schema"; +import { ResolvedTypeReference, ShapeType, Type } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; import { TypeResolver } from "../../resolvers/TypeResolver"; import { convertGenericTypeDeclaration } from "./convertGenericTypeDeclaration"; @@ -53,12 +54,12 @@ function constructResolvedTypeReference({ const shapeType = isRawObjectDefinition(resolvedType.declaration) ? ShapeType.Object : isRawDiscriminatedUnionDefinition(resolvedType.declaration) - ? ShapeType.Union - : isRawEnumDefinition(resolvedType.declaration) - ? ShapeType.Enum - : isRawUndiscriminatedUnionDefinition(resolvedType.declaration) - ? ShapeType.UndiscriminatedUnion - : assertNever(resolvedType.declaration); + ? ShapeType.Union + : isRawEnumDefinition(resolvedType.declaration) + ? ShapeType.Enum + : isRawUndiscriminatedUnionDefinition(resolvedType.declaration) + ? ShapeType.UndiscriminatedUnion + : assertNever(resolvedType.declaration); return ResolvedTypeReference.named({ name: resolvedType.name, shape: shapeType diff --git a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertDiscriminatedUnionTypeDeclaration.ts b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertDiscriminatedUnionTypeDeclaration.ts index 5a7d2b4bb91..7a48eda3c29 100644 --- a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertDiscriminatedUnionTypeDeclaration.ts +++ b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertDiscriminatedUnionTypeDeclaration.ts @@ -1,10 +1,11 @@ +import { RawSchemas, isRawObjectDefinition } from "@fern-api/fern-definition-schema"; import { SingleUnionType, SingleUnionTypeProperties, Type, TypeReference } from "@fern-api/ir-sdk"; -import { isRawObjectDefinition, RawSchemas } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../../FernFileContext"; import { TypeResolver } from "../../resolvers/TypeResolver"; import { getAvailability } from "../../utils/getAvailability"; -import { getDocs } from "../../utils/getDocs"; import { getDisplayName } from "../../utils/getDisplayName"; +import { getDocs } from "../../utils/getDocs"; import { parseTypeName } from "../../utils/parseTypeName"; import { convertDeclaration } from "../convertDeclaration"; import { getExtensionsAsList, getPropertyName } from "./convertObjectTypeDeclaration"; @@ -43,8 +44,8 @@ export function convertDiscriminatedUnionTypeDeclaration({ typeof rawSingleUnionType === "string" ? rawSingleUnionType : typeof rawSingleUnionType.type === "string" - ? rawSingleUnionType.type - : undefined; + ? rawSingleUnionType.type + : undefined; const discriminantValue = file.casingsGenerator.generateNameAndWireValue({ wireValue: unionKey, diff --git a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertEnumTypeDeclaration.ts b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertEnumTypeDeclaration.ts index 04dfc900f0c..9e694153a3e 100644 --- a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertEnumTypeDeclaration.ts +++ b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertEnumTypeDeclaration.ts @@ -1,5 +1,6 @@ -import { EnumTypeDeclaration, EnumValue } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { EnumTypeDeclaration, EnumValue } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; import { convertDeclaration } from "../convertDeclaration"; @@ -47,7 +48,7 @@ export function getEnumNameFromEnumValue( ); return { - name: typeof maybeEnumDefinition === "string" ? enumValue : maybeEnumDefinition?.name ?? enumValue, + name: typeof maybeEnumDefinition === "string" ? enumValue : (maybeEnumDefinition?.name ?? enumValue), wasExplicitlySet: false }; } diff --git a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertExampleType.ts b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertExampleType.ts index dbe65785b26..5fa6c3f8547 100644 --- a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertExampleType.ts +++ b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertExampleType.ts @@ -1,4 +1,12 @@ +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { assertNever, isPlainObject } from "@fern-api/core-utils"; +import { + RawSchemas, + isRawAliasDefinition, + isRawObjectDefinition, + visitRawTypeDeclaration, + visitRawTypeReference +} from "@fern-api/fern-definition-schema"; import { DeclaredTypeName, ExampleContainer, @@ -11,17 +19,10 @@ import { ExampleTypeShape, PrimitiveTypeV1 } from "@fern-api/ir-sdk"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { - isRawAliasDefinition, - isRawObjectDefinition, - RawSchemas, - visitRawTypeDeclaration, - visitRawTypeReference -} from "@fern-api/fern-definition-schema"; -import { validateTypeReferenceExample } from "../../examples/validateTypeReferenceExample"; + import { FernFileContext } from "../../FernFileContext"; import { IdGenerator } from "../../IdGenerator"; +import { validateTypeReferenceExample } from "../../examples/validateTypeReferenceExample"; import { ExampleResolver } from "../../resolvers/ExampleResolver"; import { TypeResolver } from "../../resolvers/TypeResolver"; import { @@ -100,8 +101,8 @@ export function convertTypeExample({ typeof rawSingleUnionType === "string" ? rawSingleUnionType : typeof rawSingleUnionType.type === "string" - ? rawSingleUnionType.type - : undefined; + ? rawSingleUnionType.type + : undefined; return ExampleTypeShape.union({ discriminant: fileContainingExample.casingsGenerator.generateNameAndWireValue({ diff --git a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertGenericTypeDeclaration.ts b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertGenericTypeDeclaration.ts index 40b92476785..aff030c6eed 100644 --- a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertGenericTypeDeclaration.ts +++ b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertGenericTypeDeclaration.ts @@ -1,6 +1,7 @@ +import { RawSchemas, isRawObjectDefinition, parseGeneric } from "@fern-api/fern-definition-schema"; import { Type } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; -import { RawSchemas, isRawObjectDefinition, parseGeneric } from "@fern-api/fern-definition-schema"; import { TypeResolver } from "../../resolvers/TypeResolver"; import { parseTypeName } from "../../utils/parseTypeName"; import { getExtensionsAsList, getObjectPropertiesFromRawObjectSchema } from "./convertObjectTypeDeclaration"; diff --git a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertObjectTypeDeclaration.ts b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertObjectTypeDeclaration.ts index 1636b83f242..4dcf2d47b81 100644 --- a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertObjectTypeDeclaration.ts +++ b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertObjectTypeDeclaration.ts @@ -1,5 +1,6 @@ -import { ObjectProperty, Type } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { ObjectProperty, Type } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; import { parseTypeName } from "../../utils/parseTypeName"; import { convertDeclaration } from "../convertDeclaration"; diff --git a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertTypeDeclaration.ts b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertTypeDeclaration.ts index e5b217ffdb9..23e56e96ae5 100644 --- a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertTypeDeclaration.ts +++ b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertTypeDeclaration.ts @@ -1,10 +1,11 @@ -import { Encoding, ExampleType, FernFilepath, Source, Type, TypeDeclaration } from "@fern-api/ir-sdk"; import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { isRawObjectDefinition, RawSchemas, visitRawTypeDeclaration } from "@fern-api/fern-definition-schema"; +import { RawSchemas, isRawObjectDefinition, visitRawTypeDeclaration } from "@fern-api/fern-definition-schema"; +import { Encoding, ExampleType, FernFilepath, Source, Type, TypeDeclaration } from "@fern-api/ir-sdk"; +import { SourceResolver } from "@fern-api/source-resolver"; + import { FernFileContext } from "../../FernFileContext"; import { AudienceId } from "../../filtered-ir/ids"; import { ExampleResolver } from "../../resolvers/ExampleResolver"; -import { SourceResolver } from "@fern-api/source-resolver"; import { TypeResolver } from "../../resolvers/TypeResolver"; import { getPropertiesByAudience } from "../../utils/getPropertiesByAudience"; import { parseTypeName } from "../../utils/parseTypeName"; diff --git a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertUndiscriminatedUnionTypeDeclaration.ts b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertUndiscriminatedUnionTypeDeclaration.ts index 46f38095797..c37b26df2cc 100644 --- a/packages/cli/generation/ir-generator/src/converters/type-declarations/convertUndiscriminatedUnionTypeDeclaration.ts +++ b/packages/cli/generation/ir-generator/src/converters/type-declarations/convertUndiscriminatedUnionTypeDeclaration.ts @@ -1,5 +1,6 @@ -import { Type } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { Type } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; export function convertUndiscriminatedUnionTypeDeclaration({ diff --git a/packages/cli/generation/ir-generator/src/converters/type-declarations/getReferencedTypesFromRawDeclaration.ts b/packages/cli/generation/ir-generator/src/converters/type-declarations/getReferencedTypesFromRawDeclaration.ts index a71ea195113..5961131a90d 100644 --- a/packages/cli/generation/ir-generator/src/converters/type-declarations/getReferencedTypesFromRawDeclaration.ts +++ b/packages/cli/generation/ir-generator/src/converters/type-declarations/getReferencedTypesFromRawDeclaration.ts @@ -1,12 +1,13 @@ -import { DeclaredTypeName } from "@fern-api/ir-sdk"; import { RawSchemas, - recursivelyVisitRawTypeReference, - visitRawTypeDeclaration, + isGeneric, isRawObjectDefinition, parseGeneric, - isGeneric + recursivelyVisitRawTypeReference, + visitRawTypeDeclaration } from "@fern-api/fern-definition-schema"; +import { DeclaredTypeName } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../../FernFileContext"; import { TypeResolver } from "../../resolvers/TypeResolver"; import { parseTypeName } from "../../utils/parseTypeName"; diff --git a/packages/cli/generation/ir-generator/src/dynamic-snippets/DynamicSnippetsConverter.ts b/packages/cli/generation/ir-generator/src/dynamic-snippets/DynamicSnippetsConverter.ts index 68a80703db0..692efb2c52f 100644 --- a/packages/cli/generation/ir-generator/src/dynamic-snippets/DynamicSnippetsConverter.ts +++ b/packages/cli/generation/ir-generator/src/dynamic-snippets/DynamicSnippetsConverter.ts @@ -1,3 +1,5 @@ +import urlJoin from "url-join"; + import { assertNever } from "@fern-api/core-utils"; import { AliasTypeDeclaration, @@ -33,7 +35,7 @@ import { UndiscriminatedUnionTypeDeclaration, UnionTypeDeclaration } from "@fern-api/ir-sdk"; -import urlJoin from "url-join"; + import { Version } from "./version"; interface EndpointWithFilepath extends HttpEndpoint { diff --git a/packages/cli/generation/ir-generator/src/dynamic-snippets/convertIrToDynamicSnippetsIr.ts b/packages/cli/generation/ir-generator/src/dynamic-snippets/convertIrToDynamicSnippetsIr.ts index 4c1ddb2252a..8cc86d83f92 100644 --- a/packages/cli/generation/ir-generator/src/dynamic-snippets/convertIrToDynamicSnippetsIr.ts +++ b/packages/cli/generation/ir-generator/src/dynamic-snippets/convertIrToDynamicSnippetsIr.ts @@ -1,4 +1,5 @@ import { dynamic as DynamicSnippets, IntermediateRepresentation } from "@fern-api/ir-sdk"; + import { DynamicSnippetsConverter } from "./DynamicSnippetsConverter"; export function convertIrToDynamicSnippetsIr( diff --git a/packages/cli/generation/ir-generator/src/examples/generator/generateContainerExample.ts b/packages/cli/generation/ir-generator/src/examples/generator/generateContainerExample.ts index b4c641eba4d..0fe1b5e15b6 100644 --- a/packages/cli/generation/ir-generator/src/examples/generator/generateContainerExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/generator/generateContainerExample.ts @@ -1,5 +1,6 @@ import { assertNever } from "@fern-api/core-utils"; import { ContainerType, ExampleContainer, ExamplePrimitive, TypeDeclaration, TypeId } from "@fern-api/ir-sdk"; + import { ExampleGenerationResult, ExampleGenerationSuccess } from "./ExampleGenerationResult"; import { generateTypeReferenceExample } from "./generateTypeReferenceExample"; diff --git a/packages/cli/generation/ir-generator/src/examples/generator/generatePrimitiveExample.ts b/packages/cli/generation/ir-generator/src/examples/generator/generatePrimitiveExample.ts index 898041c7e63..2469d447538 100644 --- a/packages/cli/generation/ir-generator/src/examples/generator/generatePrimitiveExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/generator/generatePrimitiveExample.ts @@ -1,12 +1,13 @@ +import { Examples, assertNever } from "@fern-api/core-utils"; import { + DoubleValidationRules, ExamplePrimitive, + IntegerValidationRules, PrimitiveType, PrimitiveTypeV2, - StringValidationRules, - DoubleValidationRules, - IntegerValidationRules + StringValidationRules } from "@fern-api/ir-sdk"; -import { assertNever, Examples } from "@fern-api/core-utils"; + import { ExampleGenerationSuccess } from "./ExampleGenerationResult"; export declare namespace generatePrimitiveExample { diff --git a/packages/cli/generation/ir-generator/src/examples/generator/generateSuccessEndpointExample.ts b/packages/cli/generation/ir-generator/src/examples/generator/generateSuccessEndpointExample.ts index d0658f0f0b8..95b1555a4a0 100644 --- a/packages/cli/generation/ir-generator/src/examples/generator/generateSuccessEndpointExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/generator/generateSuccessEndpointExample.ts @@ -21,6 +21,7 @@ import { TypeId, TypeReference } from "@fern-api/ir-sdk"; + import { hashJSON } from "../../utils/hashJSON"; import { ExampleGenerationResult } from "./ExampleGenerationResult"; import { generateTypeReferenceExample } from "./generateTypeReferenceExample"; diff --git a/packages/cli/generation/ir-generator/src/examples/generator/generateTypeDeclarationExample.ts b/packages/cli/generation/ir-generator/src/examples/generator/generateTypeDeclarationExample.ts index 1a3f757d483..e47133028b5 100644 --- a/packages/cli/generation/ir-generator/src/examples/generator/generateTypeDeclarationExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/generator/generateTypeDeclarationExample.ts @@ -1,13 +1,14 @@ import { - ExampleTypeShape, - TypeDeclaration, - TypeId, - ExampleObjectProperty, ExampleAliasType, - ExampleSingleUnionTypeProperties, + ExampleObjectProperty, ExampleObjectType, - ObjectTypeDeclaration + ExampleSingleUnionTypeProperties, + ExampleTypeShape, + ObjectTypeDeclaration, + TypeDeclaration, + TypeId } from "@fern-api/ir-sdk"; + import { ExampleGenerationResult } from "./ExampleGenerationResult"; import { generateTypeReferenceExample } from "./generateTypeReferenceExample"; import { isOptional } from "./isTypeReferenceOptional"; diff --git a/packages/cli/generation/ir-generator/src/examples/generator/generateTypeReferenceExample.ts b/packages/cli/generation/ir-generator/src/examples/generator/generateTypeReferenceExample.ts index df64841f71d..308d5f4b240 100644 --- a/packages/cli/generation/ir-generator/src/examples/generator/generateTypeReferenceExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/generator/generateTypeReferenceExample.ts @@ -5,9 +5,10 @@ import { TypeId, TypeReference } from "@fern-api/ir-sdk"; -import { generatePrimitiveExample } from "./generatePrimitiveExample"; -import { generateContainerExample, generateEmptyContainerExample } from "./generateContainerExample"; + import { ExampleGenerationResult } from "./ExampleGenerationResult"; +import { generateContainerExample, generateEmptyContainerExample } from "./generateContainerExample"; +import { generatePrimitiveExample } from "./generatePrimitiveExample"; import { generateTypeDeclarationExample } from "./generateTypeDeclarationExample"; export declare namespace generateTypeReferenceExample { diff --git a/packages/cli/generation/ir-generator/src/examples/getViolationsForMisshapenExample.ts b/packages/cli/generation/ir-generator/src/examples/getViolationsForMisshapenExample.ts index 7caed16ab01..8679e3c6972 100644 --- a/packages/cli/generation/ir-generator/src/examples/getViolationsForMisshapenExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/getViolationsForMisshapenExample.ts @@ -1,4 +1,5 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { ExampleViolation } from "./exampleViolation"; export function getViolationsForMisshapenExample( diff --git a/packages/cli/generation/ir-generator/src/examples/validateAliasExample.ts b/packages/cli/generation/ir-generator/src/examples/validateAliasExample.ts index 6598b29ae34..585b5f38d7b 100644 --- a/packages/cli/generation/ir-generator/src/examples/validateAliasExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/validateAliasExample.ts @@ -1,5 +1,6 @@ import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../FernFileContext"; import { ExampleResolver } from "../resolvers/ExampleResolver"; import { TypeResolver } from "../resolvers/TypeResolver"; diff --git a/packages/cli/generation/ir-generator/src/examples/validateEnumExample.ts b/packages/cli/generation/ir-generator/src/examples/validateEnumExample.ts index a3772c03c37..e412f35d31a 100644 --- a/packages/cli/generation/ir-generator/src/examples/validateEnumExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/validateEnumExample.ts @@ -1,4 +1,5 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { ExampleViolation } from "./exampleViolation"; import { getViolationsForMisshapenExample } from "./getViolationsForMisshapenExample"; diff --git a/packages/cli/generation/ir-generator/src/examples/validateObjectExample.ts b/packages/cli/generation/ir-generator/src/examples/validateObjectExample.ts index 28ffb4da981..c2ea8a6d80e 100644 --- a/packages/cli/generation/ir-generator/src/examples/validateObjectExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/validateObjectExample.ts @@ -1,8 +1,10 @@ +import { keyBy } from "lodash-es"; + import { FernWorkspace, getDefinitionFile } from "@fern-api/api-workspace-commons"; import { isPlainObject } from "@fern-api/core-utils"; import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { keyBy } from "lodash-es"; -import { constructFernFileContext, FernFileContext } from "../FernFileContext"; + +import { FernFileContext, constructFernFileContext } from "../FernFileContext"; import { ExampleResolver } from "../resolvers/ExampleResolver"; import { TypeResolver } from "../resolvers/TypeResolver"; import { getAllPropertiesForObject } from "../utils/getAllPropertiesForObject"; diff --git a/packages/cli/generation/ir-generator/src/examples/validateTypeExample.ts b/packages/cli/generation/ir-generator/src/examples/validateTypeExample.ts index 7dd78398db4..8a27f669007 100644 --- a/packages/cli/generation/ir-generator/src/examples/validateTypeExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/validateTypeExample.ts @@ -1,5 +1,6 @@ import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { RawSchemas, visitRawTypeDeclaration } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../FernFileContext"; import { ExampleResolver } from "../resolvers/ExampleResolver"; import { TypeResolver } from "../resolvers/TypeResolver"; diff --git a/packages/cli/generation/ir-generator/src/examples/validateTypeReferenceExample.ts b/packages/cli/generation/ir-generator/src/examples/validateTypeReferenceExample.ts index b2579b705e2..fd259338ce4 100644 --- a/packages/cli/generation/ir-generator/src/examples/validateTypeReferenceExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/validateTypeReferenceExample.ts @@ -1,4 +1,6 @@ +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { assertNever, getDuplicates, isPlainObject } from "@fern-api/core-utils"; +import { EXAMPLE_REFERENCE_PREFIX, RawSchemas, visitRawTypeReference } from "@fern-api/fern-definition-schema"; import { DoubleValidationRules, IntegerValidationRules, @@ -8,8 +10,7 @@ import { PrimitiveTypeV2, StringValidationRules } from "@fern-api/ir-sdk"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { EXAMPLE_REFERENCE_PREFIX, RawSchemas, visitRawTypeReference } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../FernFileContext"; import { ExampleResolver } from "../resolvers/ExampleResolver"; import { ResolvedType } from "../resolvers/ResolvedType"; diff --git a/packages/cli/generation/ir-generator/src/examples/validateUndiscriminatedUnionExample.ts b/packages/cli/generation/ir-generator/src/examples/validateUndiscriminatedUnionExample.ts index 0fd37dce739..82500d83212 100644 --- a/packages/cli/generation/ir-generator/src/examples/validateUndiscriminatedUnionExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/validateUndiscriminatedUnionExample.ts @@ -1,5 +1,6 @@ import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../FernFileContext"; import { ExampleResolver } from "../resolvers/ExampleResolver"; import { TypeResolver } from "../resolvers/TypeResolver"; diff --git a/packages/cli/generation/ir-generator/src/examples/validateUnionExample.ts b/packages/cli/generation/ir-generator/src/examples/validateUnionExample.ts index 279fbbae2e7..ec6c496fca6 100644 --- a/packages/cli/generation/ir-generator/src/examples/validateUnionExample.ts +++ b/packages/cli/generation/ir-generator/src/examples/validateUnionExample.ts @@ -1,8 +1,9 @@ -import { isPlainObject } from "@fern-api/core-utils"; import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { isRawObjectDefinition, RawSchemas } from "@fern-api/fern-definition-schema"; -import { getUnionDiscriminant } from "../converters/type-declarations/convertDiscriminatedUnionTypeDeclaration"; +import { isPlainObject } from "@fern-api/core-utils"; +import { RawSchemas, isRawObjectDefinition } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../FernFileContext"; +import { getUnionDiscriminant } from "../converters/type-declarations/convertDiscriminatedUnionTypeDeclaration"; import { ExampleResolver } from "../resolvers/ExampleResolver"; import { TypeResolver } from "../resolvers/TypeResolver"; import { ExampleViolation } from "./exampleViolation"; diff --git a/packages/cli/generation/ir-generator/src/extended-properties/addExtendedPropertiesToIr.ts b/packages/cli/generation/ir-generator/src/extended-properties/addExtendedPropertiesToIr.ts index f9becc3ab78..b30b4638bb1 100644 --- a/packages/cli/generation/ir-generator/src/extended-properties/addExtendedPropertiesToIr.ts +++ b/packages/cli/generation/ir-generator/src/extended-properties/addExtendedPropertiesToIr.ts @@ -7,6 +7,7 @@ import { TypeDeclaration } from "@fern-api/ir-sdk"; import { LoggableFernCliError } from "@fern-api/task-context"; + import { getTypeDeclaration } from "../utils/getTypeDeclaration"; type TypesAndServices = Pick; diff --git a/packages/cli/generation/ir-generator/src/filterExamples.ts b/packages/cli/generation/ir-generator/src/filterExamples.ts index d5d6b9ede3c..57cc3417c38 100644 --- a/packages/cli/generation/ir-generator/src/filterExamples.ts +++ b/packages/cli/generation/ir-generator/src/filterExamples.ts @@ -18,6 +18,7 @@ import { ExampleTypeReferenceShape, ExampleTypeShape } from "@fern-api/ir-sdk"; + import { FilteredIr } from "./filtered-ir/FilteredIr"; function filterExampleSingleUnionTypeProperties({ diff --git a/packages/cli/generation/ir-generator/src/filtered-ir/FilteredIr.ts b/packages/cli/generation/ir-generator/src/filtered-ir/FilteredIr.ts index 3393373cfe6..50525883b1b 100644 --- a/packages/cli/generation/ir-generator/src/filtered-ir/FilteredIr.ts +++ b/packages/cli/generation/ir-generator/src/filtered-ir/FilteredIr.ts @@ -3,10 +3,11 @@ import { HttpEndpoint, HttpService, TypeDeclaration, - Webhook, WebSocketChannel, - WebSocketChannelId + WebSocketChannelId, + Webhook } from "@fern-api/ir-sdk"; + import { IdGenerator } from "../IdGenerator"; import { EndpointId, EnvironmentId, ErrorId, ServiceId, SubpackageId, TypeId, WebhookId } from "./ids"; diff --git a/packages/cli/generation/ir-generator/src/filtered-ir/IrGraph.ts b/packages/cli/generation/ir-generator/src/filtered-ir/IrGraph.ts index 4396e0ca0cb..c40e45819f7 100644 --- a/packages/cli/generation/ir-generator/src/filtered-ir/IrGraph.ts +++ b/packages/cli/generation/ir-generator/src/filtered-ir/IrGraph.ts @@ -1,6 +1,6 @@ import { Audiences as ConfigAudiences } from "@fern-api/configuration"; import { assertNever, noop } from "@fern-api/core-utils"; -import { isInlineRequestBody, RawSchemas } from "@fern-api/fern-definition-schema"; +import { RawSchemas, isInlineRequestBody } from "@fern-api/fern-definition-schema"; import { ContainerType, DeclaredServiceName, @@ -15,15 +15,16 @@ import { MultipleBaseUrlsEnvironment, SingleBaseUrlEnvironment, TypeReference, - Webhook, - WebhookPayload, WebSocketChannel, WebSocketChannelId, - WebSocketMessageBody + WebSocketMessageBody, + Webhook, + WebhookPayload } from "@fern-api/ir-sdk"; -import { isReferencedWebhookPayloadSchema } from "../converters/convertWebhookGroup"; + import { FernFileContext } from "../FernFileContext"; import { IdGenerator } from "../IdGenerator"; +import { isReferencedWebhookPayloadSchema } from "../converters/convertWebhookGroup"; import { getPropertiesByAudience } from "../utils/getPropertiesByAudience"; import { FilteredIr, FilteredIrImpl } from "./FilteredIr"; import { diff --git a/packages/cli/generation/ir-generator/src/generateIntermediateRepresentation.ts b/packages/cli/generation/ir-generator/src/generateIntermediateRepresentation.ts index f54c5799d60..651be22132c 100644 --- a/packages/cli/generation/ir-generator/src/generateIntermediateRepresentation.ts +++ b/packages/cli/generation/ir-generator/src/generateIntermediateRepresentation.ts @@ -1,3 +1,5 @@ +import { mapValues, pickBy } from "lodash-es"; + import { FernWorkspace, visitAllDefinitionFiles, visitAllPackageMarkers } from "@fern-api/api-workspace-commons"; import { Audiences, FERN_PACKAGE_MARKER_FILENAME, generatorsYml } from "@fern-api/configuration"; import { noop, visitObject } from "@fern-api/core-utils"; @@ -15,10 +17,13 @@ import { TypeId, Webhook } from "@fern-api/ir-sdk"; -import { dirname, join, RelativeFilePath } from "@fern-api/path-utils"; +import { RelativeFilePath, dirname, join } from "@fern-api/path-utils"; import { SourceResolver } from "@fern-api/source-resolver"; import { TaskContext } from "@fern-api/task-context"; -import { mapValues, pickBy } from "lodash-es"; + +import { FernFileContext, constructFernFileContext, constructRootApiFileContext } from "./FernFileContext"; +import { IdGenerator } from "./IdGenerator"; +import { PackageTreeGenerator } from "./PackageTreeGenerator"; import { constructCasingsGenerator } from "./casings/CasingsGenerator"; import { generateFernConstants } from "./converters/constants"; import { convertApiAuth } from "./converters/convertApiAuth"; @@ -36,13 +41,10 @@ import { convertTypeDeclaration } from "./converters/type-declarations/convertTy import { convertIrToDynamicSnippetsIr } from "./dynamic-snippets/convertIrToDynamicSnippetsIr"; import { generateEndpointExample } from "./examples/generator/generateSuccessEndpointExample"; import { addExtendedPropertiesToIr } from "./extended-properties/addExtendedPropertiesToIr"; -import { constructFernFileContext, constructRootApiFileContext, FernFileContext } from "./FernFileContext"; +import { filterEndpointExample, filterExampleType } from "./filterExamples"; import { FilteredIr } from "./filtered-ir/FilteredIr"; import { IrGraph } from "./filtered-ir/IrGraph"; -import { filterEndpointExample, filterExampleType } from "./filterExamples"; import { formatDocs } from "./formatDocs"; -import { IdGenerator } from "./IdGenerator"; -import { PackageTreeGenerator } from "./PackageTreeGenerator"; import { EndpointResolverImpl } from "./resolvers/EndpointResolver"; import { ErrorResolverImpl } from "./resolvers/ErrorResolver"; import { ExampleResolverImpl } from "./resolvers/ExampleResolver"; diff --git a/packages/cli/generation/ir-generator/src/resolvers/EndpointResolver.ts b/packages/cli/generation/ir-generator/src/resolvers/EndpointResolver.ts index 039fb211071..1313fd2d50d 100644 --- a/packages/cli/generation/ir-generator/src/resolvers/EndpointResolver.ts +++ b/packages/cli/generation/ir-generator/src/resolvers/EndpointResolver.ts @@ -1,12 +1,13 @@ -import { HttpEndpointReferenceParser } from "@fern-api/fern-definition-schema"; -import { HttpMethod } from "@fern-api/ir-sdk"; import { FernWorkspace, getDefinitionFile, visitAllDefinitionFiles, visitAllPackageMarkers } from "@fern-api/api-workspace-commons"; -import { constructFernFileContext, FernFileContext } from "../FernFileContext"; +import { HttpEndpointReferenceParser } from "@fern-api/fern-definition-schema"; +import { HttpMethod } from "@fern-api/ir-sdk"; + +import { FernFileContext, constructFernFileContext } from "../FernFileContext"; import { CASINGS_GENERATOR } from "../utils/getAllPropertiesForObject"; import { parseReferenceToEndpointName } from "../utils/parseReferenceToEndpointName"; import { ResolvedEndpoint } from "./ResolvedEndpoint"; diff --git a/packages/cli/generation/ir-generator/src/resolvers/ErrorResolver.ts b/packages/cli/generation/ir-generator/src/resolvers/ErrorResolver.ts index 630c956f1c8..32b0bb1b9e9 100644 --- a/packages/cli/generation/ir-generator/src/resolvers/ErrorResolver.ts +++ b/packages/cli/generation/ir-generator/src/resolvers/ErrorResolver.ts @@ -1,6 +1,7 @@ import { FernWorkspace, getDefinitionFile } from "@fern-api/api-workspace-commons"; import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { constructFernFileContext, FernFileContext } from "../FernFileContext"; + +import { FernFileContext, constructFernFileContext } from "../FernFileContext"; import { parseReferenceToTypeName } from "../utils/parseReferenceToTypeName"; export interface ErrorResolver { diff --git a/packages/cli/generation/ir-generator/src/resolvers/ExampleResolver.ts b/packages/cli/generation/ir-generator/src/resolvers/ExampleResolver.ts index c7edffb2ec6..6a9d1f85f67 100644 --- a/packages/cli/generation/ir-generator/src/resolvers/ExampleResolver.ts +++ b/packages/cli/generation/ir-generator/src/resolvers/ExampleResolver.ts @@ -1,5 +1,6 @@ import { isPlainObject } from "@fern-api/core-utils"; import { EXAMPLE_REFERENCE_PREFIX } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../FernFileContext"; import { TypeResolver } from "./TypeResolver"; diff --git a/packages/cli/generation/ir-generator/src/resolvers/PropertyResolver.ts b/packages/cli/generation/ir-generator/src/resolvers/PropertyResolver.ts index 8f823832fc7..5095803bb73 100644 --- a/packages/cli/generation/ir-generator/src/resolvers/PropertyResolver.ts +++ b/packages/cli/generation/ir-generator/src/resolvers/PropertyResolver.ts @@ -1,12 +1,13 @@ +import { RawSchemas, isInlineRequestBody } from "@fern-api/fern-definition-schema"; import { Name, ObjectProperty, RequestProperty, RequestPropertyValue, ResponseProperty } from "@fern-api/ir-sdk"; -import { isInlineRequestBody, RawSchemas } from "@fern-api/fern-definition-schema"; + +import { FernFileContext } from "../FernFileContext"; import { getNestedObjectPropertyFromObjectSchema, getNestedObjectPropertyFromResolvedType, maybeFileFromResolvedType } from "../converters/services/convertProperty"; import { convertQueryParameter } from "../converters/services/convertQueryParameter"; -import { FernFileContext } from "../FernFileContext"; import { EndpointResolver } from "./EndpointResolver"; import { TypeResolver } from "./TypeResolver"; @@ -34,7 +35,10 @@ export interface PropertyResolver { } export class PropertyResolverImpl implements PropertyResolver { - constructor(private readonly typeResolver: TypeResolver, private readonly endpointResolver: EndpointResolver) { + constructor( + private readonly typeResolver: TypeResolver, + private readonly endpointResolver: EndpointResolver + ) { this.typeResolver = typeResolver; this.endpointResolver = endpointResolver; } diff --git a/packages/cli/generation/ir-generator/src/resolvers/ResolvedEndpoint.ts b/packages/cli/generation/ir-generator/src/resolvers/ResolvedEndpoint.ts index 8cd345a31af..003ca00cc63 100644 --- a/packages/cli/generation/ir-generator/src/resolvers/ResolvedEndpoint.ts +++ b/packages/cli/generation/ir-generator/src/resolvers/ResolvedEndpoint.ts @@ -1,4 +1,5 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { FernFileContext } from "../FernFileContext"; export interface ResolvedEndpoint { diff --git a/packages/cli/generation/ir-generator/src/resolvers/ResolvedType.ts b/packages/cli/generation/ir-generator/src/resolvers/ResolvedType.ts index 6a17be9ed40..d32f6e669e0 100644 --- a/packages/cli/generation/ir-generator/src/resolvers/ResolvedType.ts +++ b/packages/cli/generation/ir-generator/src/resolvers/ResolvedType.ts @@ -1,6 +1,7 @@ -import { RelativeFilePath } from "@fern-api/path-utils"; -import { DeclaredTypeName, Literal as IrLiteral, PrimitiveType, TypeReference } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { DeclaredTypeName, Literal as IrLiteral, PrimitiveType, TypeReference } from "@fern-api/ir-sdk"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { FernFileContext } from "../FernFileContext"; export declare type ResolvedType = diff --git a/packages/cli/generation/ir-generator/src/resolvers/TypeResolver.ts b/packages/cli/generation/ir-generator/src/resolvers/TypeResolver.ts index 4a98c682068..2919d382214 100644 --- a/packages/cli/generation/ir-generator/src/resolvers/TypeResolver.ts +++ b/packages/cli/generation/ir-generator/src/resolvers/TypeResolver.ts @@ -1,12 +1,13 @@ -import { ContainerType, TypeReference } from "@fern-api/ir-sdk"; import { FernWorkspace, getDefinitionFile } from "@fern-api/api-workspace-commons"; import { - isRawAliasDefinition, RawSchemas, - recursivelyVisitRawTypeReference, - parseGeneric + isRawAliasDefinition, + parseGeneric, + recursivelyVisitRawTypeReference } from "@fern-api/fern-definition-schema"; -import { constructFernFileContext, FernFileContext } from "../FernFileContext"; +import { ContainerType, TypeReference } from "@fern-api/ir-sdk"; + +import { FernFileContext, constructFernFileContext } from "../FernFileContext"; import { parseInlineType } from "../utils/parseInlineType"; import { parseReferenceToTypeName } from "../utils/parseReferenceToTypeName"; import { ObjectPathItem, ResolvedType } from "./ResolvedType"; diff --git a/packages/cli/generation/ir-generator/src/resolvers/VariableResolver.ts b/packages/cli/generation/ir-generator/src/resolvers/VariableResolver.ts index cc4f71ada02..0438d7076ea 100644 --- a/packages/cli/generation/ir-generator/src/resolvers/VariableResolver.ts +++ b/packages/cli/generation/ir-generator/src/resolvers/VariableResolver.ts @@ -1,6 +1,7 @@ -import { VariableId } from "@fern-api/ir-sdk"; import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { constructRootApiFileContext, FernFileContext } from "../FernFileContext"; +import { VariableId } from "@fern-api/ir-sdk"; + +import { FernFileContext, constructRootApiFileContext } from "../FernFileContext"; export interface VariableResolver { getDeclarationOrThrow( diff --git a/packages/cli/generation/ir-generator/src/utils/convertToFernFilepath.ts b/packages/cli/generation/ir-generator/src/utils/convertToFernFilepath.ts index 02c4b87500c..70e08382856 100644 --- a/packages/cli/generation/ir-generator/src/utils/convertToFernFilepath.ts +++ b/packages/cli/generation/ir-generator/src/utils/convertToFernFilepath.ts @@ -1,6 +1,7 @@ import { FERN_PACKAGE_MARKER_FILENAME_NO_EXTENSION } from "@fern-api/configuration"; -import { basename, dirname, RelativeFilePath, sep } from "@fern-api/path-utils"; import { FernFilepath } from "@fern-api/ir-sdk"; +import { RelativeFilePath, basename, dirname, sep } from "@fern-api/path-utils"; + import { CasingsGenerator } from "../casings/CasingsGenerator"; export function convertToFernFilepath({ diff --git a/packages/cli/generation/ir-generator/src/utils/endpointOnlyHasPathParameters.ts b/packages/cli/generation/ir-generator/src/utils/endpointOnlyHasPathParameters.ts index 19d427e34aa..89372df74f8 100644 --- a/packages/cli/generation/ir-generator/src/utils/endpointOnlyHasPathParameters.ts +++ b/packages/cli/generation/ir-generator/src/utils/endpointOnlyHasPathParameters.ts @@ -1,4 +1,5 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { getEndpointPathParameters } from "./getEndpointPathParameters"; export function endpointOnlyHasPathParameters( diff --git a/packages/cli/generation/ir-generator/src/utils/getAllPropertiesForObject.ts b/packages/cli/generation/ir-generator/src/utils/getAllPropertiesForObject.ts index 7ab3f24a42a..1bcfe036d7f 100644 --- a/packages/cli/generation/ir-generator/src/utils/getAllPropertiesForObject.ts +++ b/packages/cli/generation/ir-generator/src/utils/getAllPropertiesForObject.ts @@ -1,9 +1,10 @@ -import { RelativeFilePath } from "@fern-api/path-utils"; import { FernWorkspace, getDefinitionFile } from "@fern-api/api-workspace-commons"; -import { isRawObjectDefinition, RawSchemas } from "@fern-api/fern-definition-schema"; +import { RawSchemas, isRawObjectDefinition } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/path-utils"; + +import { constructFernFileContext } from "../FernFileContext"; import { constructCasingsGenerator } from "../casings/CasingsGenerator"; import { getPropertyName } from "../converters/type-declarations/convertObjectTypeDeclaration"; -import { constructFernFileContext } from "../FernFileContext"; import { ResolvedType } from "../resolvers/ResolvedType"; import { TypeResolver } from "../resolvers/TypeResolver"; diff --git a/packages/cli/generation/ir-generator/src/utils/getAvailability.ts b/packages/cli/generation/ir-generator/src/utils/getAvailability.ts index f1a3a40ab17..692b6f2b8ea 100644 --- a/packages/cli/generation/ir-generator/src/utils/getAvailability.ts +++ b/packages/cli/generation/ir-generator/src/utils/getAvailability.ts @@ -1,4 +1,5 @@ import { Availability, AvailabilityStatus } from "@fern-api/ir-sdk"; + import { convertAvailability } from "../converters/convertDeclaration"; type RawAvailabilityStatus = "in-development" | "pre-release" | "generally-available" | "deprecated"; diff --git a/packages/cli/generation/ir-generator/src/utils/getEndpointPathParameters.ts b/packages/cli/generation/ir-generator/src/utils/getEndpointPathParameters.ts index 07e51afcafe..011952cf446 100644 --- a/packages/cli/generation/ir-generator/src/utils/getEndpointPathParameters.ts +++ b/packages/cli/generation/ir-generator/src/utils/getEndpointPathParameters.ts @@ -6,6 +6,6 @@ export function getEndpointPathParameters( return typeof endpoint.request !== "string" && endpoint.request?.["path-parameters"] ? endpoint.request?.["path-parameters"] : endpoint["path-parameters"] != null - ? endpoint["path-parameters"] - : {}; + ? endpoint["path-parameters"] + : {}; } diff --git a/packages/cli/generation/ir-generator/src/utils/getEnvironmentsByAudience.ts b/packages/cli/generation/ir-generator/src/utils/getEnvironmentsByAudience.ts index 903eb84f66a..adbc4ec2b4b 100644 --- a/packages/cli/generation/ir-generator/src/utils/getEnvironmentsByAudience.ts +++ b/packages/cli/generation/ir-generator/src/utils/getEnvironmentsByAudience.ts @@ -1,4 +1,5 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { AudienceId } from "../filtered-ir/ids"; export function getAudienceForEnvironment( diff --git a/packages/cli/generation/ir-generator/src/utils/getPropertiesByAudience.ts b/packages/cli/generation/ir-generator/src/utils/getPropertiesByAudience.ts index e7b13f876cd..c11b4509ffe 100644 --- a/packages/cli/generation/ir-generator/src/utils/getPropertiesByAudience.ts +++ b/packages/cli/generation/ir-generator/src/utils/getPropertiesByAudience.ts @@ -1,4 +1,5 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { AudienceId } from "../filtered-ir/ids"; export function getPropertiesByAudience( diff --git a/packages/cli/generation/ir-generator/src/utils/getResolvedPathOfImportedFile.ts b/packages/cli/generation/ir-generator/src/utils/getResolvedPathOfImportedFile.ts index 12c4da86fbd..fbda2f09369 100644 --- a/packages/cli/generation/ir-generator/src/utils/getResolvedPathOfImportedFile.ts +++ b/packages/cli/generation/ir-generator/src/utils/getResolvedPathOfImportedFile.ts @@ -1,4 +1,4 @@ -import { dirname, join, RelativeFilePath } from "@fern-api/path-utils"; +import { RelativeFilePath, dirname, join } from "@fern-api/path-utils"; export function getResolvedPathOfImportedFile({ referencedIn, diff --git a/packages/cli/generation/ir-generator/src/utils/parseErrorName.ts b/packages/cli/generation/ir-generator/src/utils/parseErrorName.ts index 5dfe2f3c827..083cbe7703c 100644 --- a/packages/cli/generation/ir-generator/src/utils/parseErrorName.ts +++ b/packages/cli/generation/ir-generator/src/utils/parseErrorName.ts @@ -1,4 +1,5 @@ import { DeclaredErrorName } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../FernFileContext"; import { IdGenerator } from "../IdGenerator"; import { convertToFernFilepath } from "./convertToFernFilepath"; diff --git a/packages/cli/generation/ir-generator/src/utils/parseInlineType.ts b/packages/cli/generation/ir-generator/src/utils/parseInlineType.ts index e49c830fa3f..ae87a88b41c 100644 --- a/packages/cli/generation/ir-generator/src/utils/parseInlineType.ts +++ b/packages/cli/generation/ir-generator/src/utils/parseInlineType.ts @@ -1,5 +1,6 @@ -import { ContainerType, TypeReference } from "@fern-api/ir-sdk"; import { RawSchemas, recursivelyVisitRawTypeReference } from "@fern-api/fern-definition-schema"; +import { ContainerType, TypeReference } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../FernFileContext"; import { parseTypeName } from "./parseTypeName"; diff --git a/packages/cli/generation/ir-generator/src/utils/parseReferenceToEndpointName.ts b/packages/cli/generation/ir-generator/src/utils/parseReferenceToEndpointName.ts index 859b5e3fd62..acf6c470a4b 100644 --- a/packages/cli/generation/ir-generator/src/utils/parseReferenceToEndpointName.ts +++ b/packages/cli/generation/ir-generator/src/utils/parseReferenceToEndpointName.ts @@ -1,4 +1,5 @@ import { RelativeFilePath } from "@fern-api/path-utils"; + import { getResolvedPathOfImportedFile } from "./getResolvedPathOfImportedFile"; export interface ReferenceToEndpointName { diff --git a/packages/cli/generation/ir-generator/src/utils/parseReferenceToTypeName.ts b/packages/cli/generation/ir-generator/src/utils/parseReferenceToTypeName.ts index 54ecad71bbe..6610e2d3277 100644 --- a/packages/cli/generation/ir-generator/src/utils/parseReferenceToTypeName.ts +++ b/packages/cli/generation/ir-generator/src/utils/parseReferenceToTypeName.ts @@ -1,4 +1,5 @@ import { RelativeFilePath } from "@fern-api/path-utils"; + import { getResolvedPathOfImportedFile } from "./getResolvedPathOfImportedFile"; export interface ReferenceToTypeName { diff --git a/packages/cli/generation/ir-generator/src/utils/parseTypeName.ts b/packages/cli/generation/ir-generator/src/utils/parseTypeName.ts index fcfd40fec55..712b2d46e22 100644 --- a/packages/cli/generation/ir-generator/src/utils/parseTypeName.ts +++ b/packages/cli/generation/ir-generator/src/utils/parseTypeName.ts @@ -1,4 +1,5 @@ import { DeclaredTypeName } from "@fern-api/ir-sdk"; + import { FernFileContext } from "../FernFileContext"; import { IdGenerator } from "../IdGenerator"; import { convertToFernFilepath } from "./convertToFernFilepath"; diff --git a/packages/cli/generation/ir-migrations/package.json b/packages/cli/generation/ir-migrations/package.json index 5076af92e03..e686be7c904 100644 --- a/packages/cli/generation/ir-migrations/package.json +++ b/packages/cli/generation/ir-migrations/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": { @@ -99,8 +98,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" } diff --git a/packages/cli/generation/ir-migrations/src/IntermediateRepresentationMigrator.ts b/packages/cli/generation/ir-migrations/src/IntermediateRepresentationMigrator.ts index 0b6b3344c57..f576e89f6fc 100644 --- a/packages/cli/generation/ir-migrations/src/IntermediateRepresentationMigrator.ts +++ b/packages/cli/generation/ir-migrations/src/IntermediateRepresentationMigrator.ts @@ -2,7 +2,16 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { IntermediateRepresentation, serialization as IrSerialization } from "@fern-api/ir-sdk"; import { isVersionAhead } from "@fern-api/semver-utils"; import { TaskContext } from "@fern-api/task-context"; + import { GeneratorNameAndVersion } from "./IrMigrationContext"; +import { V2_TO_V1_MIGRATION } from "./migrations/v2-to-v1/migrateFromV2ToV1"; +import { V3_TO_V2_MIGRATION } from "./migrations/v3-to-v2/migrateFromV3ToV2"; +import { V4_TO_V3_MIGRATION } from "./migrations/v4-to-v3/migrateFromV4ToV3"; +import { V5_TO_V4_MIGRATION } from "./migrations/v5-to-v4/migrateFromV5ToV4"; +import { V6_TO_V5_MIGRATION } from "./migrations/v6-to-v5/migrateFromV6ToV5"; +import { V7_TO_V6_MIGRATION } from "./migrations/v7-to-v6/migrateFromV7ToV6"; +import { V8_TO_V7_MIGRATION } from "./migrations/v8-to-v7/migrateFromV8ToV7"; +import { V9_TO_V8_MIGRATION } from "./migrations/v9-to-v8/migrateFromV9ToV8"; import { V10_TO_V9_MIGRATION } from "./migrations/v10-to-v9/migrateFromV10ToV9"; import { V11_TO_V10_MIGRATION } from "./migrations/v11-to-v10/migrateFromV11ToV10"; import { V12_TO_V11_MIGRATION } from "./migrations/v12-to-v11/migrateFromV12ToV11"; @@ -13,7 +22,6 @@ import { V16_TO_V15_MIGRATION } from "./migrations/v16-to-v15/migrateFromV16ToV1 import { V17_TO_V16_MIGRATION } from "./migrations/v17-to-v16/migrateFromV17ToV16"; import { V18_TO_V17_MIGRATION } from "./migrations/v18-to-v17/migrateFromV18ToV17"; import { V19_TO_V18_MIGRATION } from "./migrations/v19-to-v18/migrateFromV19ToV18"; -import { V2_TO_V1_MIGRATION } from "./migrations/v2-to-v1/migrateFromV2ToV1"; import { V20_TO_V19_MIGRATION } from "./migrations/v20-to-v19/migrateFromV20ToV19"; import { V21_TO_V20_MIGRATION } from "./migrations/v21-to-v20/migrateFromV21ToV20"; import { V22_TO_V21_MIGRATION } from "./migrations/v22-to-v21/migrateFromV22ToV21"; @@ -24,7 +32,6 @@ import { V26_TO_V25_MIGRATION } from "./migrations/v26-to-v25/migrateFromV26ToV2 import { V27_TO_V26_MIGRATION } from "./migrations/v27-to-v26/migrateFromV27-to-v26"; import { V28_TO_V27_MIGRATION } from "./migrations/v28-to-v27/migrateFromV28ToV27"; import { V29_TO_V28_MIGRATION } from "./migrations/v29-to-v28/migrateFromV29ToV28"; -import { V3_TO_V2_MIGRATION } from "./migrations/v3-to-v2/migrateFromV3ToV2"; import { V30_TO_V29_MIGRATION } from "./migrations/v30-to-v29/migrateFromV30ToV29"; import { V31_TO_V30_MIGRATION } from "./migrations/v31-to-v30/migrateFromV31ToV30"; import { V32_TO_V31_MIGRATION } from "./migrations/v32-to-v31/migrateFromV32ToV31"; @@ -35,7 +42,6 @@ import { V36_TO_V35_MIGRATION } from "./migrations/v36-to-v35/migrateFromV36ToV3 import { V37_TO_V36_MIGRATION } from "./migrations/v37-to-v36/migrateFromV37ToV36"; import { V38_TO_V37_MIGRATION } from "./migrations/v38-to-v37/migrateFromV38ToV37"; import { V39_TO_V38_MIGRATION } from "./migrations/v39-to-v38/migrateFromV39ToV38"; -import { V4_TO_V3_MIGRATION } from "./migrations/v4-to-v3/migrateFromV4ToV3"; import { V40_TO_V39_MIGRATION } from "./migrations/v40-to-v39/migrateFromV40ToV39"; import { V41_TO_V40_MIGRATION } from "./migrations/v41-to-v40/migrateFromV41ToV40"; import { V42_TO_V41_MIGRATION } from "./migrations/v42-to-v41/migrateFromV42ToV41"; @@ -46,16 +52,11 @@ import { V46_TO_V45_MIGRATION } from "./migrations/v46-to-v45/migrateFromV46ToV4 import { V47_TO_V46_MIGRATION } from "./migrations/v47-to-v46/migrateFromV47ToV46"; import { V48_TO_V47_MIGRATION } from "./migrations/v48-to-v47/migrateFromV48ToV47"; import { V49_TO_V48_MIGRATION } from "./migrations/v49-to-v48/migrateFromV49ToV48"; -import { V5_TO_V4_MIGRATION } from "./migrations/v5-to-v4/migrateFromV5ToV4"; import { V50_TO_V49_MIGRATION } from "./migrations/v50-to-v49/migrateFromV50ToV49"; import { V51_TO_V50_MIGRATION } from "./migrations/v51-to-v50/migrateFromV51ToV50"; import { V52_TO_V51_MIGRATION } from "./migrations/v52-to-v51/migrateFromV52ToV51"; import { V53_TO_V52_MIGRATION } from "./migrations/v53-to-v52/migrateFromV53ToV52"; import { V54_TO_V53_MIGRATION } from "./migrations/v54-to-v53/migrateFromV54ToV53"; -import { V6_TO_V5_MIGRATION } from "./migrations/v6-to-v5/migrateFromV6ToV5"; -import { V7_TO_V6_MIGRATION } from "./migrations/v7-to-v6/migrateFromV7ToV6"; -import { V8_TO_V7_MIGRATION } from "./migrations/v8-to-v7/migrateFromV8ToV7"; -import { V9_TO_V8_MIGRATION } from "./migrations/v9-to-v8/migrateFromV9ToV8"; import { GeneratorWasNeverUpdatedToConsumeNewIR, GeneratorWasNotCreatedYet, IrMigration } from "./types/IrMigration"; export function getIntermediateRepresentationMigrator(): IntermediateRepresentationMigrator { diff --git a/packages/cli/generation/ir-migrations/src/__test__/migrateIntermediateRepresentation.test.ts b/packages/cli/generation/ir-migrations/src/__test__/migrateIntermediateRepresentation.test.ts index fd35569246e..2aafd19a6ce 100644 --- a/packages/cli/generation/ir-migrations/src/__test__/migrateIntermediateRepresentation.test.ts +++ b/packages/cli/generation/ir-migrations/src/__test__/migrateIntermediateRepresentation.test.ts @@ -1,8 +1,9 @@ import { GeneratorName } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { IntermediateRepresentation } from "@fern-api/ir-sdk"; import { isVersionAhead } from "@fern-api/semver-utils"; import { createMockTaskContext } from "@fern-api/task-context"; + import { getIntermediateRepresentationMigrator } from "../IntermediateRepresentationMigrator"; import { IrVersions } from "../ir-versions"; import { migrateIntermediateRepresentationForGenerator } from "../migrateIntermediateRepresentationForGenerator"; diff --git a/packages/cli/generation/ir-migrations/src/__test__/utils/createMigrationTester.ts b/packages/cli/generation/ir-migrations/src/__test__/utils/createMigrationTester.ts index e927c3aac7a..80a972563c7 100644 --- a/packages/cli/generation/ir-migrations/src/__test__/utils/createMigrationTester.ts +++ b/packages/cli/generation/ir-migrations/src/__test__/utils/createMigrationTester.ts @@ -1,8 +1,9 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { createMockTaskContext } from "@fern-api/task-context"; + import { - getIntermediateRepresentationMigrator, - MigratedIntermediateMigration + MigratedIntermediateMigration, + getIntermediateRepresentationMigrator } from "../../IntermediateRepresentationMigrator"; import { IrMigrationContext } from "../../IrMigrationContext"; import { IrMigration } from "../../types/IrMigration"; diff --git a/packages/cli/generation/ir-migrations/src/__test__/utils/getIrForApi.ts b/packages/cli/generation/ir-migrations/src/__test__/utils/getIrForApi.ts index 7a2d935bdc3..4c46ffc6fac 100644 --- a/packages/cli/generation/ir-migrations/src/__test__/utils/getIrForApi.ts +++ b/packages/cli/generation/ir-migrations/src/__test__/utils/getIrForApi.ts @@ -1,9 +1,9 @@ +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { IntermediateRepresentation } from "@fern-api/ir-sdk"; import { createMockTaskContext } from "@fern-api/task-context"; import { loadAPIWorkspace } from "@fern-api/workspace-loader"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; export async function getIrForApi(absolutePathToWorkspace: AbsoluteFilePath): Promise { const context = createMockTaskContext(); diff --git a/packages/cli/generation/ir-migrations/src/getMinimumVersionForGenerator.ts b/packages/cli/generation/ir-migrations/src/getMinimumVersionForGenerator.ts index d872d1ddd44..e78a2829e59 100644 --- a/packages/cli/generation/ir-migrations/src/getMinimumVersionForGenerator.ts +++ b/packages/cli/generation/ir-migrations/src/getMinimumVersionForGenerator.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { getIntermediateRepresentationMigrator } from "./IntermediateRepresentationMigrator"; export function getMinimumVersionForGenerator({ generatorName }: { generatorName: string }): string | undefined { diff --git a/packages/cli/generation/ir-migrations/src/migrateIntermediateRepresentationForGenerator.ts b/packages/cli/generation/ir-migrations/src/migrateIntermediateRepresentationForGenerator.ts index 6c436bf5fb0..22c39ba006c 100644 --- a/packages/cli/generation/ir-migrations/src/migrateIntermediateRepresentationForGenerator.ts +++ b/packages/cli/generation/ir-migrations/src/migrateIntermediateRepresentationForGenerator.ts @@ -1,5 +1,6 @@ import { IntermediateRepresentation } from "@fern-api/ir-sdk"; import { TaskContext } from "@fern-api/task-context"; + import { getIntermediateRepresentationMigrator } from "./IntermediateRepresentationMigrator"; import { GeneratorNameAndVersion } from "./IrMigrationContext"; diff --git a/packages/cli/generation/ir-migrations/src/migrateIntermediateRepresentationThroughVersion.ts b/packages/cli/generation/ir-migrations/src/migrateIntermediateRepresentationThroughVersion.ts index 931b5f9e1f6..58ffd4eb0db 100644 --- a/packages/cli/generation/ir-migrations/src/migrateIntermediateRepresentationThroughVersion.ts +++ b/packages/cli/generation/ir-migrations/src/migrateIntermediateRepresentationThroughVersion.ts @@ -1,5 +1,6 @@ import { IntermediateRepresentation } from "@fern-api/ir-sdk"; import { TaskContext } from "@fern-api/task-context"; + import { getIntermediateRepresentationMigrator } from "./IntermediateRepresentationMigrator"; export function migrateIntermediateRepresentationThroughVersion({ diff --git a/packages/cli/generation/ir-migrations/src/migrations/v10-to-v9/__test__/migrateFromV10ToV9.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v10-to-v9/__test__/migrateFromV10ToV9.test.ts index 675e3095fb8..c35d3f4a41f 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v10-to-v9/__test__/migrateFromV10ToV9.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v10-to-v9/__test__/migrateFromV10ToV9.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V10_TO_V9_MIGRATION } from "../migrateFromV10ToV9"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v10-to-v9/migrateFromV10ToV9.ts b/packages/cli/generation/ir-migrations/src/migrations/v10-to-v9/migrateFromV10ToV9.ts index 5a845d4a26f..8769f76ae2b 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v10-to-v9/migrateFromV10ToV9.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v10-to-v9/migrateFromV10ToV9.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v11-to-v10/__test__/migrateFromV11ToV10.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v11-to-v10/__test__/migrateFromV11ToV10.test.ts index 03f08521518..7a80176d6fd 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v11-to-v10/__test__/migrateFromV11ToV10.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v11-to-v10/__test__/migrateFromV11ToV10.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createLogger } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V11_TO_V10_MIGRATION } from "../migrateFromV11ToV10"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v11-to-v10/migrateFromV11ToV10.ts b/packages/cli/generation/ir-migrations/src/migrations/v11-to-v10/migrateFromV11ToV10.ts index adcdd01c197..ce77b962e60 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v11-to-v10/migrateFromV11ToV10.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v11-to-v10/migrateFromV11ToV10.ts @@ -1,6 +1,7 @@ import { GeneratorName } from "@fern-api/configuration-loader"; -import { IrVersions } from "../../ir-versions"; + import { IrMigrationContext } from "../../IrMigrationContext"; +import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, GeneratorWasNotCreatedYet, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v12-to-v11/__test__/migrateFromV12ToV11.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v12-to-v11/__test__/migrateFromV12ToV11.test.ts index 843d2ec706f..09852358741 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v12-to-v11/__test__/migrateFromV12ToV11.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v12-to-v11/__test__/migrateFromV12ToV11.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createLogger } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V12_TO_V11_MIGRATION } from "../migrateFromV12ToV11"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v12-to-v11/migrateFromV12ToV11.ts b/packages/cli/generation/ir-migrations/src/migrations/v12-to-v11/migrateFromV12ToV11.ts index ce22f8f850d..ecc1b3a729c 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v12-to-v11/migrateFromV12ToV11.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v12-to-v11/migrateFromV12ToV11.ts @@ -1,7 +1,9 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; -import { IrVersions } from "../../ir-versions"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrMigrationContext } from "../../IrMigrationContext"; +import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, GeneratorWasNotCreatedYet, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v13-to-v12/__test__/migrateFromV13ToV12.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v13-to-v12/__test__/migrateFromV13ToV12.test.ts index bebca8f86be..99e3561ae64 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v13-to-v12/__test__/migrateFromV13ToV12.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v13-to-v12/__test__/migrateFromV13ToV12.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V13_TO_V12_MIGRATION } from "../migrateFromV13ToV12"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v13-to-v12/migrateFromV13ToV12.ts b/packages/cli/generation/ir-migrations/src/migrations/v13-to-v12/migrateFromV13ToV12.ts index 43eec518f0f..a7f393fb91c 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v13-to-v12/migrateFromV13ToV12.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v13-to-v12/migrateFromV13ToV12.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v14-to-v13/__test__/migrateFromV14ToV13.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v14-to-v13/__test__/migrateFromV14ToV13.test.ts index 11cef6e1aaa..3d2615d5e59 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v14-to-v13/__test__/migrateFromV14ToV13.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v14-to-v13/__test__/migrateFromV14ToV13.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V14_TO_V13_MIGRATION } from "../migrateFromV14ToV13"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v14-to-v13/migrateFromV14ToV13.ts b/packages/cli/generation/ir-migrations/src/migrations/v14-to-v13/migrateFromV14ToV13.ts index be992751494..aa13e083e13 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v14-to-v13/migrateFromV14ToV13.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v14-to-v13/migrateFromV14ToV13.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v15-to-v14/__test__/migrateFromV15ToV14.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v15-to-v14/__test__/migrateFromV15ToV14.test.ts index 274e8ed47ad..3ab44743d67 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v15-to-v14/__test__/migrateFromV15ToV14.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v15-to-v14/__test__/migrateFromV15ToV14.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V15_TO_V14_MIGRATION } from "../migrateFromV15ToV14"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v15-to-v14/migrateFromV15ToV14.ts b/packages/cli/generation/ir-migrations/src/migrations/v15-to-v14/migrateFromV15ToV14.ts index 82203aaa408..7a2fd5e63aa 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v15-to-v14/migrateFromV15ToV14.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v15-to-v14/migrateFromV15ToV14.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v16-to-v15/__test__/migrateFromV16ToV15.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v16-to-v15/__test__/migrateFromV16ToV15.test.ts index ae6c2b96059..a81d55feed4 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v16-to-v15/__test__/migrateFromV16ToV15.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v16-to-v15/__test__/migrateFromV16ToV15.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createLogger } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V16_TO_V15_MIGRATION } from "../migrateFromV16ToV15"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v16-to-v15/migrateFromV16ToV15.ts b/packages/cli/generation/ir-migrations/src/migrations/v16-to-v15/migrateFromV16ToV15.ts index 0af70746881..9a2866437b9 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v16-to-v15/migrateFromV16ToV15.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v16-to-v15/migrateFromV16ToV15.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v17-to-v16/__test__/migrateFromV17ToV16.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v17-to-v16/__test__/migrateFromV17ToV16.test.ts index 54b9152cce4..f3d4d86b8cf 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v17-to-v16/__test__/migrateFromV17ToV16.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v17-to-v16/__test__/migrateFromV17ToV16.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createLogger } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V17_TO_V16_MIGRATION } from "../migrateFromV17ToV16"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v17-to-v16/migrateFromV17ToV16.ts b/packages/cli/generation/ir-migrations/src/migrations/v17-to-v16/migrateFromV17ToV16.ts index a7728d75b7a..a93c31c3b9a 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v17-to-v16/migrateFromV17ToV16.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v17-to-v16/migrateFromV17ToV16.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v18-to-v17/__test__/migrateFromV18ToV17.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v18-to-v17/__test__/migrateFromV18ToV17.test.ts index 74234a3f131..6b7c51ba899 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v18-to-v17/__test__/migrateFromV18ToV17.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v18-to-v17/__test__/migrateFromV18ToV17.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createLogger } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V18_TO_V17_MIGRATION } from "../migrateFromV18ToV17"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v18-to-v17/migrateFromV18ToV17.ts b/packages/cli/generation/ir-migrations/src/migrations/v18-to-v17/migrateFromV18ToV17.ts index 9c64a87d02f..aebced81cc9 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v18-to-v17/migrateFromV18ToV17.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v18-to-v17/migrateFromV18ToV17.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v19-to-v18/__test__/migrateFromV19ToV18.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v19-to-v18/__test__/migrateFromV19ToV18.test.ts index aeaa4916d0b..b0985738610 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v19-to-v18/__test__/migrateFromV19ToV18.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v19-to-v18/__test__/migrateFromV19ToV18.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createLogger } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V19_TO_V18_MIGRATION } from "../migrateFromV19ToV18"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v19-to-v18/migrateFromV19ToV18.ts b/packages/cli/generation/ir-migrations/src/migrations/v19-to-v18/migrateFromV19ToV18.ts index f67d669084d..66a499ca4eb 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v19-to-v18/migrateFromV19ToV18.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v19-to-v18/migrateFromV19ToV18.ts @@ -1,7 +1,9 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; -import { IrVersions } from "../../ir-versions"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrMigrationContext } from "../../IrMigrationContext"; +import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, GeneratorWasNotCreatedYet, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v2-to-v1/__test__/migrateFromV2ToV1.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v2-to-v1/__test__/migrateFromV2ToV1.test.ts index 7eb3d31601e..461e377a732 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v2-to-v1/__test__/migrateFromV2ToV1.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v2-to-v1/__test__/migrateFromV2ToV1.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V2_TO_V1_MIGRATION } from "../migrateFromV2ToV1"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v2-to-v1/migrateFromV2ToV1.ts b/packages/cli/generation/ir-migrations/src/migrations/v2-to-v1/migrateFromV2ToV1.ts index b266d33f17a..49717dff2fd 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v2-to-v1/migrateFromV2ToV1.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v2-to-v1/migrateFromV2ToV1.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v20-to-v19/__test__/migrateFromV20ToV19.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v20-to-v19/__test__/migrateFromV20ToV19.test.ts index 8405146cbfc..faaff441320 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v20-to-v19/__test__/migrateFromV20ToV19.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v20-to-v19/__test__/migrateFromV20ToV19.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createLogger } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V20_TO_V19_MIGRATION } from "../migrateFromV20ToV19"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v20-to-v19/migrateFromV20ToV19.ts b/packages/cli/generation/ir-migrations/src/migrations/v20-to-v19/migrateFromV20ToV19.ts index 069ff77ee35..1ff1945462a 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v20-to-v19/migrateFromV20ToV19.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v20-to-v19/migrateFromV20ToV19.ts @@ -1,7 +1,9 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; -import { IrVersions } from "../../ir-versions"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrMigrationContext } from "../../IrMigrationContext"; +import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, GeneratorWasNotCreatedYet, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v21-to-v20/__test__/migrateFromV21ToV20.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v21-to-v20/__test__/migrateFromV21ToV20.test.ts index e750bae2f8c..a2d5cb42d4d 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v21-to-v20/__test__/migrateFromV21ToV20.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v21-to-v20/__test__/migrateFromV21ToV20.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createLogger } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V21_TO_V20_MIGRATION } from "../migrateFromV21ToV20"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v21-to-v20/migrateFromV21ToV20.ts b/packages/cli/generation/ir-migrations/src/migrations/v21-to-v20/migrateFromV21ToV20.ts index 000ec9e67fe..c6349ab35d0 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v21-to-v20/migrateFromV21ToV20.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v21-to-v20/migrateFromV21ToV20.ts @@ -1,7 +1,9 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; -import { IrVersions } from "../../ir-versions"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrMigrationContext } from "../../IrMigrationContext"; +import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, GeneratorWasNotCreatedYet, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v22-to-v21/migrateFromV22ToV21.ts b/packages/cli/generation/ir-migrations/src/migrations/v22-to-v21/migrateFromV22ToV21.ts index 3d88a523bce..2cbd2a28864 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v22-to-v21/migrateFromV22ToV21.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v22-to-v21/migrateFromV22ToV21.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v23-to-v22/__test__/migrateFromV23ToV22.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v23-to-v22/__test__/migrateFromV23ToV22.test.ts index ee3d97ba617..5591c0d8d0c 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v23-to-v22/__test__/migrateFromV23ToV22.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v23-to-v22/__test__/migrateFromV23ToV22.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createLogger } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V23_TO_V22_MIGRATION } from "../migrateFromV23ToV22"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v23-to-v22/migrateFromV23ToV22.ts b/packages/cli/generation/ir-migrations/src/migrations/v23-to-v22/migrateFromV23ToV22.ts index f38d1d9254a..3d43474bda9 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v23-to-v22/migrateFromV23ToV22.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v23-to-v22/migrateFromV23ToV22.ts @@ -1,6 +1,8 @@ +import { mapValues } from "lodash-es"; + import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever } from "@fern-api/core-utils"; -import { mapValues } from "lodash-es"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v24-to-v23/migrateFromV24ToV23.ts b/packages/cli/generation/ir-migrations/src/migrations/v24-to-v23/migrateFromV24ToV23.ts index b3f99bc7f8f..4a83ebedbc5 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v24-to-v23/migrateFromV24ToV23.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v24-to-v23/migrateFromV24ToV23.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v25-to-v24/migrateFromV25ToV24.ts b/packages/cli/generation/ir-migrations/src/migrations/v25-to-v24/migrateFromV25ToV24.ts index 3052c679980..b867ae6a322 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v25-to-v24/migrateFromV25ToV24.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v25-to-v24/migrateFromV25ToV24.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v26-to-v25/migrateFromV26ToV25.ts b/packages/cli/generation/ir-migrations/src/migrations/v26-to-v25/migrateFromV26ToV25.ts index 449bf190d76..d388a75b10b 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v26-to-v25/migrateFromV26ToV25.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v26-to-v25/migrateFromV26ToV25.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v27-to-v26/migrateFromV27-to-v26.ts b/packages/cli/generation/ir-migrations/src/migrations/v27-to-v26/migrateFromV27-to-v26.ts index 547236d5b47..9abf69f1185 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v27-to-v26/migrateFromV27-to-v26.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v27-to-v26/migrateFromV27-to-v26.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v28-to-v27/__test__/migrateFromV28ToV27.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v28-to-v27/__test__/migrateFromV28ToV27.test.ts index 099e07d7bfc..c36c39523ec 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v28-to-v27/__test__/migrateFromV28ToV27.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v28-to-v27/__test__/migrateFromV28ToV27.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V28_TO_V27_MIGRATION } from "../migrateFromV28ToV27"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v28-to-v27/migrateFromV28ToV27.ts b/packages/cli/generation/ir-migrations/src/migrations/v28-to-v27/migrateFromV28ToV27.ts index 786b8eadf52..931ddbcb0cb 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v28-to-v27/migrateFromV28ToV27.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v28-to-v27/migrateFromV28ToV27.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever } from "@fern-api/core-utils"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v29-to-v28/__test__/migrateFromV29ToV28.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v29-to-v28/__test__/migrateFromV29ToV28.test.ts index 4ca50835cc6..6949a9f06d4 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v29-to-v28/__test__/migrateFromV29ToV28.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v29-to-v28/__test__/migrateFromV29ToV28.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V29_TO_V28_MIGRATION } from "../migrateFromV29ToV28"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v29-to-v28/migrateFromV29ToV28.ts b/packages/cli/generation/ir-migrations/src/migrations/v29-to-v28/migrateFromV29ToV28.ts index 7e1c97cd449..501e660d836 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v29-to-v28/migrateFromV29ToV28.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v29-to-v28/migrateFromV29ToV28.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { commons } from "@fern-api/ir-sdk"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/__test__/migrateFromV3ToV2.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/__test__/migrateFromV3ToV2.test.ts index 996f209c874..ac814cfebaa 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/__test__/migrateFromV3ToV2.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/__test__/migrateFromV3ToV2.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V3_TO_V2_MIGRATION } from "../migrateFromV3ToV2"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/getReferencedTypesForInlinedRequest.ts b/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/getReferencedTypesForInlinedRequest.ts index cd4b25f58bf..c6bb2790aaf 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/getReferencedTypesForInlinedRequest.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/getReferencedTypesForInlinedRequest.ts @@ -1,4 +1,5 @@ import { noop } from "@fern-api/core-utils"; + import { IrVersions } from "../../ir-versions"; type StringifiedTypeId = string; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/migrateFromV3ToV2.ts b/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/migrateFromV3ToV2.ts index 5d7748e66cb..d8849a31342 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/migrateFromV3ToV2.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v3-to-v2/migrateFromV3ToV2.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v30-to-v29/__test__/migrateFromV30ToV29.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v30-to-v29/__test__/migrateFromV30ToV29.test.ts index 1ff2996f1f5..d291e0d1029 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v30-to-v29/__test__/migrateFromV30ToV29.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v30-to-v29/__test__/migrateFromV30ToV29.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V30_TO_V29_MIGRATION } from "../migrateFromV30ToV29"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v30-to-v29/migrateFromV30ToV29.ts b/packages/cli/generation/ir-migrations/src/migrations/v30-to-v29/migrateFromV30ToV29.ts index b441a76af6f..ce9599ce30c 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v30-to-v29/migrateFromV30ToV29.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v30-to-v29/migrateFromV30ToV29.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever } from "@fern-api/core-utils"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v31-to-v30/migrateFromV31ToV30.ts b/packages/cli/generation/ir-migrations/src/migrations/v31-to-v30/migrateFromV31ToV30.ts index a5549027ba9..08ff35efc06 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v31-to-v30/migrateFromV31ToV30.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v31-to-v30/migrateFromV31ToV30.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v32-to-v31/migrateFromV32ToV31.ts b/packages/cli/generation/ir-migrations/src/migrations/v32-to-v31/migrateFromV32ToV31.ts index 60712bbb2e9..279f1e6b707 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v32-to-v31/migrateFromV32ToV31.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v32-to-v31/migrateFromV32ToV31.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever } from "@fern-api/core-utils"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v33-to-v32/__test__/migrateFromV33ToV32.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v33-to-v32/__test__/migrateFromV33ToV32.test.ts index 4f5ee60999e..52f06c88125 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v33-to-v32/__test__/migrateFromV33ToV32.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v33-to-v32/__test__/migrateFromV33ToV32.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V33_TO_V32_MIGRATION } from "../migrateFromV33ToV32"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v33-to-v32/migrateFromV33ToV32.ts b/packages/cli/generation/ir-migrations/src/migrations/v33-to-v32/migrateFromV33ToV32.ts index b7616a0e555..77ae6efda21 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v33-to-v32/migrateFromV33ToV32.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v33-to-v32/migrateFromV33ToV32.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever } from "@fern-api/core-utils"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v34-to-v33/__test__/migrateFromV34ToV33.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v34-to-v33/__test__/migrateFromV34ToV33.test.ts index 19f23f3a498..3619c35bdec 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v34-to-v33/__test__/migrateFromV34ToV33.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v34-to-v33/__test__/migrateFromV34ToV33.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V34_TO_V33_MIGRATION } from "../migrateFromV34ToV33"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v34-to-v33/migrateFromV34ToV33.ts b/packages/cli/generation/ir-migrations/src/migrations/v34-to-v33/migrateFromV34ToV33.ts index f8774197eff..c2b8736c4f9 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v34-to-v33/migrateFromV34ToV33.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v34-to-v33/migrateFromV34ToV33.ts @@ -1,5 +1,7 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { FernIrV33 } from "@fern-fern/ir-v33-sdk"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v35-to-v34/__test__/migrateFromV35ToV34.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v35-to-v34/__test__/migrateFromV35ToV34.test.ts index 8834b7ac82d..17896956123 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v35-to-v34/__test__/migrateFromV35ToV34.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v35-to-v34/__test__/migrateFromV35ToV34.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V35_TO_V34_MIGRATION } from "../migrateFromV35ToV34"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v35-to-v34/migrateFromV35ToV34.ts b/packages/cli/generation/ir-migrations/src/migrations/v35-to-v34/migrateFromV35ToV34.ts index 0546bcd7a64..5b74f07a8c6 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v35-to-v34/migrateFromV35ToV34.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v35-to-v34/migrateFromV35ToV34.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v36-to-v35/__test__/migrateFromV36ToV35.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v36-to-v35/__test__/migrateFromV36ToV35.test.ts index 01973128af8..1107a644268 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v36-to-v35/__test__/migrateFromV36ToV35.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v36-to-v35/__test__/migrateFromV36ToV35.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V36_TO_V35_MIGRATION } from "../migrateFromV36ToV35"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v36-to-v35/migrateFromV36ToV35.ts b/packages/cli/generation/ir-migrations/src/migrations/v36-to-v35/migrateFromV36ToV35.ts index d4a033690d2..e2f6e35aae8 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v36-to-v35/migrateFromV36ToV35.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v36-to-v35/migrateFromV36ToV35.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v37-to-v36/__test__/migrateFromV37ToV36.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v37-to-v36/__test__/migrateFromV37ToV36.test.ts index d27f424662d..81b1777bfbc 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v37-to-v36/__test__/migrateFromV37ToV36.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v37-to-v36/__test__/migrateFromV37ToV36.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V37_TO_V36_MIGRATION } from "../migrateFromV37ToV36"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v37-to-v36/migrateFromV37ToV36.ts b/packages/cli/generation/ir-migrations/src/migrations/v37-to-v36/migrateFromV37ToV36.ts index a699784b5c6..30faf007065 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v37-to-v36/migrateFromV37ToV36.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v37-to-v36/migrateFromV37ToV36.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v38-to-v37/__test__/migrateFromV38ToV37.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v38-to-v37/__test__/migrateFromV38ToV37.test.ts index 83261ac370a..f1fac7c3c14 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v38-to-v37/__test__/migrateFromV38ToV37.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v38-to-v37/__test__/migrateFromV38ToV37.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V38_TO_V37_MIGRATION } from "../migrateFromV38ToV37"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v38-to-v37/migrateFromV38ToV37.ts b/packages/cli/generation/ir-migrations/src/migrations/v38-to-v37/migrateFromV38ToV37.ts index 88a8f47b2e9..85e1d89d0cf 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v38-to-v37/migrateFromV38ToV37.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v38-to-v37/migrateFromV38ToV37.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v39-to-v38/__test__/migrateFromV39ToV38.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v39-to-v38/__test__/migrateFromV39ToV38.test.ts index 6f3262021d3..b7abb9af456 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v39-to-v38/__test__/migrateFromV39ToV38.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v39-to-v38/__test__/migrateFromV39ToV38.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V39_TO_V38_MIGRATION } from "../migrateFromV39ToV38"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v39-to-v38/migrateFromV39ToV38.ts b/packages/cli/generation/ir-migrations/src/migrations/v39-to-v38/migrateFromV39ToV38.ts index 52ba22dc934..1092fecbad6 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v39-to-v38/migrateFromV39ToV38.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v39-to-v38/migrateFromV39ToV38.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever } from "@fern-api/core-utils"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v4-to-v3/__test__/migrateFromV4ToV3.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v4-to-v3/__test__/migrateFromV4ToV3.test.ts index c75e0c28687..3ccbc504e0d 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v4-to-v3/__test__/migrateFromV4ToV3.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v4-to-v3/__test__/migrateFromV4ToV3.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { IrVersions } from "../../../ir-versions"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; +import { IrVersions } from "../../../ir-versions"; import { V4_TO_V3_MIGRATION } from "../migrateFromV4ToV3"; const runMigration = createMigrationTester(V4_TO_V3_MIGRATION); diff --git a/packages/cli/generation/ir-migrations/src/migrations/v4-to-v3/migrateFromV4ToV3.ts b/packages/cli/generation/ir-migrations/src/migrations/v4-to-v3/migrateFromV4ToV3.ts index 851f283b54f..da5b3ff947c 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v4-to-v3/migrateFromV4ToV3.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v4-to-v3/migrateFromV4ToV3.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v40-to-v39/__test__/migrateFromV40ToV39.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v40-to-v39/__test__/migrateFromV40ToV39.test.ts index 577dd5e5526..a4f4de9e2d2 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v40-to-v39/__test__/migrateFromV40ToV39.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v40-to-v39/__test__/migrateFromV40ToV39.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V40_TO_V39_MIGRATION } from "../migrateFromV40ToV39"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v40-to-v39/migrateFromV40ToV39.ts b/packages/cli/generation/ir-migrations/src/migrations/v40-to-v39/migrateFromV40ToV39.ts index 0b6ff91e278..0d311a1248e 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v40-to-v39/migrateFromV40ToV39.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v40-to-v39/migrateFromV40ToV39.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v41-to-v40/migrateFromV41ToV40.ts b/packages/cli/generation/ir-migrations/src/migrations/v41-to-v40/migrateFromV41ToV40.ts index e9ab51ab35b..5b837e4dc77 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v41-to-v40/migrateFromV41ToV40.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v41-to-v40/migrateFromV41ToV40.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v42-to-v41/__test__/migrateFromV42ToV41.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v42-to-v41/__test__/migrateFromV42ToV41.test.ts index c81373e4408..9dcf823ff34 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v42-to-v41/__test__/migrateFromV42ToV41.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v42-to-v41/__test__/migrateFromV42ToV41.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V42_TO_V41_MIGRATION } from "../migrateFromV42ToV41"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v42-to-v41/migrateFromV42ToV41.ts b/packages/cli/generation/ir-migrations/src/migrations/v42-to-v41/migrateFromV42ToV41.ts index 019ea957420..c7405a71543 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v42-to-v41/migrateFromV42ToV41.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v42-to-v41/migrateFromV42ToV41.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever } from "@fern-api/core-utils"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v43-to-v42/__test__/migrateFromV43ToV42.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v43-to-v42/__test__/migrateFromV43ToV42.test.ts index 136737239d5..52fe0d7f4be 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v43-to-v42/__test__/migrateFromV43ToV42.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v43-to-v42/__test__/migrateFromV43ToV42.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V43_TO_V42_MIGRATION } from "../migrateFromV43ToV42"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v43-to-v42/migrateFromV43ToV42.ts b/packages/cli/generation/ir-migrations/src/migrations/v43-to-v42/migrateFromV43ToV42.ts index 78d49a31f8a..fe17f8a0ea8 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v43-to-v42/migrateFromV43ToV42.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v43-to-v42/migrateFromV43ToV42.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v44-to-v43/__test__/migrateFromV44ToV43.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v44-to-v43/__test__/migrateFromV44ToV43.test.ts index 731b216f159..2f59306f73f 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v44-to-v43/__test__/migrateFromV44ToV43.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v44-to-v43/__test__/migrateFromV44ToV43.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V44_TO_V43_MIGRATION } from "../migrateFromV44ToV43"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v44-to-v43/migrateFromV44ToV43.ts b/packages/cli/generation/ir-migrations/src/migrations/v44-to-v43/migrateFromV44ToV43.ts index 0bddfd16ed8..16ac633e9de 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v44-to-v43/migrateFromV44ToV43.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v44-to-v43/migrateFromV44ToV43.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever, isNonNullish } from "@fern-api/core-utils"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v45-to-v44/__test__/migrateFromV45ToV44.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v45-to-v44/__test__/migrateFromV45ToV44.test.ts index b295278d809..12e93da67a7 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v45-to-v44/__test__/migrateFromV45ToV44.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v45-to-v44/__test__/migrateFromV45ToV44.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V45_TO_V44_MIGRATION } from "../migrateFromV45ToV44"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v45-to-v44/migrateFromV45ToV44.ts b/packages/cli/generation/ir-migrations/src/migrations/v45-to-v44/migrateFromV45ToV44.ts index 587924ac6ac..644b94369b6 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v45-to-v44/migrateFromV45ToV44.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v45-to-v44/migrateFromV45ToV44.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v46-to-v45/__test__/migrateFromV46ToV45.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v46-to-v45/__test__/migrateFromV46ToV45.test.ts index 2fccdaf3d15..a91d351d57b 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v46-to-v45/__test__/migrateFromV46ToV45.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v46-to-v45/__test__/migrateFromV46ToV45.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V46_TO_V45_MIGRATION } from "../migrateFromV46ToV45"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v46-to-v45/migrateFromV46ToV45.ts b/packages/cli/generation/ir-migrations/src/migrations/v46-to-v45/migrateFromV46ToV45.ts index 772d9d40384..9c9abd61f76 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v46-to-v45/migrateFromV46ToV45.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v46-to-v45/migrateFromV46ToV45.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v47-to-v46/__test__/migrateFromV47ToV46.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v47-to-v46/__test__/migrateFromV47ToV46.test.ts index 2819bccd0d5..dfe652635e7 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v47-to-v46/__test__/migrateFromV47ToV46.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v47-to-v46/__test__/migrateFromV47ToV46.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V47_TO_V46_MIGRATION } from "../migrateFromV47ToV46"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v47-to-v46/migrateFromV47ToV46.ts b/packages/cli/generation/ir-migrations/src/migrations/v47-to-v46/migrateFromV47ToV46.ts index d09899f67a3..d0a9d6d08f5 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v47-to-v46/migrateFromV47ToV46.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v47-to-v46/migrateFromV47ToV46.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { isNonNullish } from "@fern-api/core-utils"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v48-to-v47/__test__/migrateFromV48ToV47.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v48-to-v47/__test__/migrateFromV48ToV47.test.ts index 0bcc639114c..96ef6e7772c 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v48-to-v47/__test__/migrateFromV48ToV47.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v48-to-v47/__test__/migrateFromV48ToV47.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V48_TO_V47_MIGRATION } from "../migrateFromV48ToV47"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v48-to-v47/migrateFromV48ToV47.ts b/packages/cli/generation/ir-migrations/src/migrations/v48-to-v47/migrateFromV48ToV47.ts index ba004ece318..fb49c13cbb7 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v48-to-v47/migrateFromV48ToV47.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v48-to-v47/migrateFromV48ToV47.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever } from "@fern-api/core-utils"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v49-to-v48/__test__/migrateFromV49ToV48.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v49-to-v48/__test__/migrateFromV49ToV48.test.ts index da7bfcf05c3..d4c9951d987 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v49-to-v48/__test__/migrateFromV49ToV48.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v49-to-v48/__test__/migrateFromV49ToV48.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V49_TO_V48_MIGRATION } from "../migrateFromV49ToV48"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v49-to-v48/migrateFromV49ToV48.ts b/packages/cli/generation/ir-migrations/src/migrations/v49-to-v48/migrateFromV49ToV48.ts index cb9178d3679..86b82a73412 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v49-to-v48/migrateFromV49ToV48.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v49-to-v48/migrateFromV49ToV48.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/TypeReferenceResolver.ts b/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/TypeReferenceResolver.ts index ac2cfea8c02..d678bedd805 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/TypeReferenceResolver.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/TypeReferenceResolver.ts @@ -1,4 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; + import { IrVersions } from "../../ir-versions"; import { convertContainerType } from "./convertContainerType"; import { convertDeclaredTypeName } from "./convertDeclaredTypeName"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/__test__/migrateFromV5ToV4.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/__test__/migrateFromV5ToV4.test.ts index 098a4507062..c644a39ddc8 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/__test__/migrateFromV5ToV4.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/__test__/migrateFromV5ToV4.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V5_TO_V4_MIGRATION } from "../migrateFromV5ToV4"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/convertErrorDeclaration.ts b/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/convertErrorDeclaration.ts index e2b1e91624d..ea854469439 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/convertErrorDeclaration.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/convertErrorDeclaration.ts @@ -1,8 +1,8 @@ import { IrVersions } from "../../ir-versions"; +import { TypeReferenceResolver } from "./TypeReferenceResolver"; import { convertFernFilepathV1, convertFernFilepathV2 } from "./convertFernFilepath"; import { convertNameAndWireValueToV2, convertNameToV1, convertNameToV2 } from "./convertName"; import { convertTypeReference } from "./convertTypeReference"; -import { TypeReferenceResolver } from "./TypeReferenceResolver"; export function convertErrorDeclaration({ errorDeclaration, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/convertService.ts b/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/convertService.ts index 77a866a4b9a..33e82237f19 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/convertService.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/convertService.ts @@ -1,4 +1,5 @@ import { IrVersions } from "../../ir-versions"; +import { ErrorResolver } from "./ErrorResolver"; import { convertDeclaredTypeName } from "./convertDeclaredTypeName"; import { convertExampleTypeReference } from "./convertExampleTypeReference"; import { convertFernFilepathV1, convertFernFilepathV2 } from "./convertFernFilepath"; @@ -10,7 +11,6 @@ import { convertNameToV2 } from "./convertName"; import { convertTypeReference } from "./convertTypeReference"; -import { ErrorResolver } from "./ErrorResolver"; export function convertService({ service, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/migrateFromV5ToV4.ts b/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/migrateFromV5ToV4.ts index 3c5d63c04fc..eae0d31f8f6 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/migrateFromV5ToV4.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v5-to-v4/migrateFromV5ToV4.ts @@ -1,10 +1,13 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, GeneratorWasNotCreatedYet, IrMigration } from "../../types/IrMigration"; +import { ErrorResolverImpl } from "./ErrorResolver"; +import { TypeReferenceResolverImpl } from "./TypeReferenceResolver"; import { convertAuth } from "./convertAuth"; import { convertEnvironment } from "./convertEnvironment"; import { convertErrorDeclaration } from "./convertErrorDeclaration"; @@ -12,8 +15,6 @@ import { convertHeader } from "./convertHeader"; import { convertNameAndWireValueToV1, convertNameAndWireValueToV2, convertNameToV2 } from "./convertName"; import { convertService } from "./convertService"; import { convertTypeDeclaration } from "./convertTypeDeclaration"; -import { ErrorResolverImpl } from "./ErrorResolver"; -import { TypeReferenceResolverImpl } from "./TypeReferenceResolver"; export const V5_TO_V4_MIGRATION: IrMigration< IrVersions.V5.ir.IntermediateRepresentation, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v50-to-v49/__test__/migrateFromV50ToV49.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v50-to-v49/__test__/migrateFromV50ToV49.test.ts index 29c91dc2b3a..4a7ad3c76f3 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v50-to-v49/__test__/migrateFromV50ToV49.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v50-to-v49/__test__/migrateFromV50ToV49.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V50_TO_V49_MIGRATION } from "../migrateFromV50ToV49"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v50-to-v49/migrateFromV50ToV49.ts b/packages/cli/generation/ir-migrations/src/migrations/v50-to-v49/migrateFromV50ToV49.ts index c86a9e8681d..02a48bf6ac3 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v50-to-v49/migrateFromV50ToV49.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v50-to-v49/migrateFromV50ToV49.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v51-to-v50/__test__/migrateFromV51ToV50.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v51-to-v50/__test__/migrateFromV51ToV50.test.ts index 30dc190e62c..0581af7f485 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v51-to-v50/__test__/migrateFromV51ToV50.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v51-to-v50/__test__/migrateFromV51ToV50.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V51_TO_V50_MIGRATION } from "../migrateFromV51ToV50"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v51-to-v50/migrateFromV51ToV50.ts b/packages/cli/generation/ir-migrations/src/migrations/v51-to-v50/migrateFromV51ToV50.ts index f1909f2684b..738a3d537da 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v51-to-v50/migrateFromV51ToV50.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v51-to-v50/migrateFromV51ToV50.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v52-to-v51/__test__/migrateFromV52ToV51.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v52-to-v51/__test__/migrateFromV52ToV51.test.ts index ee66744f598..3c24e7e0369 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v52-to-v51/__test__/migrateFromV52ToV51.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v52-to-v51/__test__/migrateFromV52ToV51.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V52_TO_V51_MIGRATION } from "../migrateFromV52ToV51"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v52-to-v51/migrateFromV52ToV51.ts b/packages/cli/generation/ir-migrations/src/migrations/v52-to-v51/migrateFromV52ToV51.ts index b247fe78a45..47b61bf66d7 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v52-to-v51/migrateFromV52ToV51.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v52-to-v51/migrateFromV52ToV51.ts @@ -1,6 +1,8 @@ +import { mapValues } from "lodash-es"; + import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever } from "@fern-api/core-utils"; -import { mapValues } from "lodash-es"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v53-to-v52/__test__/migrateFromV53ToV52.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v53-to-v52/__test__/migrateFromV53ToV52.test.ts index 590ff6aec7a..585184db974 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v53-to-v52/__test__/migrateFromV53ToV52.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v53-to-v52/__test__/migrateFromV53ToV52.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V53_TO_V52_MIGRATION } from "../migrateFromV53ToV52"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v53-to-v52/migrateFromV53ToV52.ts b/packages/cli/generation/ir-migrations/src/migrations/v53-to-v52/migrateFromV53ToV52.ts index 8c31f8eff9a..c41a0bc9570 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v53-to-v52/migrateFromV53ToV52.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v53-to-v52/migrateFromV53ToV52.ts @@ -1,6 +1,8 @@ +import { mapValues } from "lodash-es"; + import { GeneratorName } from "@fern-api/configuration-loader"; import { assertNever } from "@fern-api/core-utils"; -import { mapValues } from "lodash-es"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v54-to-v53/__test__/migrateFromV53ToV52.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v54-to-v53/__test__/migrateFromV53ToV52.test.ts index 0dcd1e0ce0d..16bea6d5d5e 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v54-to-v53/__test__/migrateFromV53ToV52.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v54-to-v53/__test__/migrateFromV53ToV52.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V54_TO_V53_MIGRATION } from "../migrateFromV54ToV53"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v54-to-v53/migrateFromV54ToV53.ts b/packages/cli/generation/ir-migrations/src/migrations/v54-to-v53/migrateFromV54ToV53.ts index 75a644233f3..80ee4217fee 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v54-to-v53/migrateFromV54ToV53.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v54-to-v53/migrateFromV54ToV53.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { mapValues } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrSerialization } from "../../ir-serialization"; import { IrVersions } from "../../ir-versions"; import { diff --git a/packages/cli/generation/ir-migrations/src/migrations/v6-to-v5/__test__/migrateFromV6ToV5.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v6-to-v5/__test__/migrateFromV6ToV5.test.ts index 0e18c5ab04d..bfa32315122 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v6-to-v5/__test__/migrateFromV6ToV5.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v6-to-v5/__test__/migrateFromV6ToV5.test.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { createLogger } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; -import { IrVersions } from "../../../ir-versions"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; +import { IrVersions } from "../../../ir-versions"; import { V6_TO_V5_MIGRATION } from "../migrateFromV6ToV5"; const runMigration = createMigrationTester(V6_TO_V5_MIGRATION); diff --git a/packages/cli/generation/ir-migrations/src/migrations/v6-to-v5/migrateFromV6ToV5.ts b/packages/cli/generation/ir-migrations/src/migrations/v6-to-v5/migrateFromV6ToV5.ts index 2ea7b1eb3ae..03e9fbbb0ac 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v6-to-v5/migrateFromV6ToV5.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v6-to-v5/migrateFromV6ToV5.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v7-to-v6/__test__/migrateFromV7ToV6.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v7-to-v6/__test__/migrateFromV7ToV6.test.ts index a8a1b575f50..21d73134662 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v7-to-v6/__test__/migrateFromV7ToV6.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v7-to-v6/__test__/migrateFromV7ToV6.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V7_TO_V6_MIGRATION } from "../migrateFromV7ToV6"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v7-to-v6/migrateFromV7ToV6.ts b/packages/cli/generation/ir-migrations/src/migrations/v7-to-v6/migrateFromV7ToV6.ts index 4eb30e8079d..562d58c6a20 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v7-to-v6/migrateFromV7ToV6.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v7-to-v6/migrateFromV7ToV6.ts @@ -1,5 +1,7 @@ -import { GeneratorName } from "@fern-api/configuration-loader"; import { upperFirst } from "lodash-es"; + +import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v8-to-v7/__test__/migrateFromV8ToV7.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v8-to-v7/__test__/migrateFromV8ToV7.test.ts index cdfbcb20935..c0c6b4ce2fe 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v8-to-v7/__test__/migrateFromV8ToV7.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v8-to-v7/__test__/migrateFromV8ToV7.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V8_TO_V7_MIGRATION } from "../migrateFromV8ToV7"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v8-to-v7/migrateFromV8ToV7.ts b/packages/cli/generation/ir-migrations/src/migrations/v8-to-v7/migrateFromV8ToV7.ts index 1a978210ad7..7017bbff44c 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v8-to-v7/migrateFromV8ToV7.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v8-to-v7/migrateFromV8ToV7.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/migrations/v9-to-v8/__test__/migrateFromV9ToV8.test.ts b/packages/cli/generation/ir-migrations/src/migrations/v9-to-v8/__test__/migrateFromV9ToV8.test.ts index d7502a39f81..1bea655a353 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v9-to-v8/__test__/migrateFromV9ToV8.test.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v9-to-v8/__test__/migrateFromV9ToV8.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { createMigrationTester } from "../../../__test__/utils/createMigrationTester"; import { V9_TO_V8_MIGRATION } from "../migrateFromV9ToV8"; diff --git a/packages/cli/generation/ir-migrations/src/migrations/v9-to-v8/migrateFromV9ToV8.ts b/packages/cli/generation/ir-migrations/src/migrations/v9-to-v8/migrateFromV9ToV8.ts index 095fa6bd446..558755c8fd0 100644 --- a/packages/cli/generation/ir-migrations/src/migrations/v9-to-v8/migrateFromV9ToV8.ts +++ b/packages/cli/generation/ir-migrations/src/migrations/v9-to-v8/migrateFromV9ToV8.ts @@ -1,5 +1,6 @@ import { GeneratorName } from "@fern-api/configuration-loader"; import { TaskResult } from "@fern-api/task-context"; + import { IrVersions } from "../../ir-versions"; import { GeneratorWasNeverUpdatedToConsumeNewIR, diff --git a/packages/cli/generation/ir-migrations/src/types/IrMigration.ts b/packages/cli/generation/ir-migrations/src/types/IrMigration.ts index 8fba6523438..a0348081b24 100644 --- a/packages/cli/generation/ir-migrations/src/types/IrMigration.ts +++ b/packages/cli/generation/ir-migrations/src/types/IrMigration.ts @@ -1,4 +1,5 @@ import { GeneratorName } from "@fern-api/configuration-loader"; + import { IrMigrationContext } from "../IrMigrationContext"; export type GeneratorVersion = string | GeneratorWasNeverUpdatedToConsumeNewIR | GeneratorWasNotCreatedYet; diff --git a/packages/cli/generation/local-generation/docker-utils/package.json b/packages/cli/generation/local-generation/docker-utils/package.json index 1622f8b12a0..c0d38f72160 100644 --- a/packages/cli/generation/local-generation/docker-utils/package.json +++ b/packages/cli/generation/local-generation/docker-utils/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": { @@ -37,8 +36,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" } diff --git a/packages/cli/generation/local-generation/docker-utils/src/__test__/runDocker.test.ts b/packages/cli/generation/local-generation/docker-utils/src/__test__/runDocker.test.ts index 78efcf633ab..783917e9924 100644 --- a/packages/cli/generation/local-generation/docker-utils/src/__test__/runDocker.test.ts +++ b/packages/cli/generation/local-generation/docker-utils/src/__test__/runDocker.test.ts @@ -1,9 +1,11 @@ -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { CONSOLE_LOGGER } from "@fern-api/logger"; import { exec } from "child_process"; import { mkdir, rm } from "fs/promises"; import path from "path"; import { promisify } from "util"; + +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { CONSOLE_LOGGER } from "@fern-api/logger"; + import { runDocker } from "../runDocker"; const promisifiedExec = promisify(exec); diff --git a/packages/cli/generation/local-generation/docker-utils/src/runDocker.ts b/packages/cli/generation/local-generation/docker-utils/src/runDocker.ts index 11a6c41051c..2b544f153fe 100644 --- a/packages/cli/generation/local-generation/docker-utils/src/runDocker.ts +++ b/packages/cli/generation/local-generation/docker-utils/src/runDocker.ts @@ -1,6 +1,7 @@ -import { Logger } from "@fern-api/logger"; import { writeFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { Logger } from "@fern-api/logger"; import { loggingExeca } from "@fern-api/logging-execa"; export declare namespace runDocker { diff --git a/packages/cli/generation/local-generation/local-workspace-runner/package.json b/packages/cli/generation/local-generation/local-workspace-runner/package.json index 6282aa32cb2..bf3187b8123 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/package.json +++ b/packages/cli/generation/local-generation/local-workspace-runner/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": { @@ -47,7 +46,8 @@ "chalk": "^5.3.0", "decompress": "^4.2.1", "tmp-promise": "^3.0.3", - "url-join": "^5.0.0" + "url-join": "^5.0.0", + "prettier2": "npm:prettier@^2.7.1" }, "devDependencies": { "@types/decompress": "^4.2.7", @@ -55,11 +55,12 @@ "@types/node": "18.15.3", "@types/tmp": "^0.2.4", "@types/url-join": "4.0.1", + "@types/prettier2": "npm:@types/prettier@^2.7.3", "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" } } \ No newline at end of file diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/LocalTaskHandler.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/LocalTaskHandler.ts index ecd495b4386..39190b07446 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/LocalTaskHandler.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/LocalTaskHandler.ts @@ -1,10 +1,11 @@ +import decompress from "decompress"; +import { cp, readFile, readdir, rm, rmdir } from "fs/promises"; +import tmp from "tmp-promise"; + import { FERNIGNORE_FILENAME } from "@fern-api/configuration"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; import { loggingExeca } from "@fern-api/logging-execa"; import { TaskContext } from "@fern-api/task-context"; -import decompress from "decompress"; -import { cp, readdir, readFile, rm, rmdir } from "fs/promises"; -import tmp from "tmp-promise"; export declare namespace LocalTaskHandler { export interface Init { diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/DynamicSnippetsTestGenerator.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/DynamicSnippetsTestGenerator.ts index d44dd51001a..547945374e7 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/DynamicSnippetsTestGenerator.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/DynamicSnippetsTestGenerator.ts @@ -1,11 +1,15 @@ import { generatorsYml } from "@fern-api/configuration"; -import { DynamicSnippetsTestSuite } from "./DynamicSnippetsTestSuite"; -import { DynamicSnippetsGoTestGenerator } from "./go/DynamicSnippetsGoTestGenerator"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; +import { DynamicSnippetsTestSuite } from "./DynamicSnippetsTestSuite"; +import { DynamicSnippetsGoTestGenerator } from "./go/DynamicSnippetsGoTestGenerator"; + export class DynamicSnippetsTestGenerator { - constructor(private readonly context: TaskContext, private readonly testSuite: DynamicSnippetsTestSuite) {} + constructor( + private readonly context: TaskContext, + private readonly testSuite: DynamicSnippetsTestSuite + ) {} public async generateTests({ outputDir, diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/DynamicSnippetsTestSuite.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/DynamicSnippetsTestSuite.ts index 04346dce333..0f2f11bf0a5 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/DynamicSnippetsTestSuite.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/DynamicSnippetsTestSuite.ts @@ -1,4 +1,5 @@ import { dynamic as DynamicSnippets } from "@fern-api/ir-sdk"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; export interface DynamicSnippetsTestSuite { diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/generateDynamicSnippetTests.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/generateDynamicSnippetTests.ts index f71d57255be..bec543dbb8e 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/generateDynamicSnippetTests.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/generateDynamicSnippetTests.ts @@ -1,10 +1,12 @@ -import { generateDynamicSnippetsTestSuite } from "./generateDynamicSnippetsTestSuite"; -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { DynamicSnippetsTestGenerator } from "./DynamicSnippetsTestGenerator"; import { generatorsYml } from "@fern-api/configuration"; -import { TaskContext } from "@fern-api/task-context"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { IntermediateRepresentation } from "@fern-api/ir-sdk"; +import { TaskContext } from "@fern-api/task-context"; + +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; + +import { DynamicSnippetsTestGenerator } from "./DynamicSnippetsTestGenerator"; +import { generateDynamicSnippetsTestSuite } from "./generateDynamicSnippetsTestSuite"; export async function generateDynamicSnippetTests({ context, diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/generateDynamicSnippetsTestSuite.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/generateDynamicSnippetsTestSuite.ts index 95496759207..258021f73d9 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/generateDynamicSnippetsTestSuite.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/generateDynamicSnippetsTestSuite.ts @@ -1,7 +1,10 @@ -import { ApiAuth, HttpEndpoint, dynamic as DynamicSnippets, IntermediateRepresentation } from "@fern-api/ir-sdk"; +import urlJoin from "url-join"; + import { assertNever } from "@fern-api/core-utils"; +import { ApiAuth, dynamic as DynamicSnippets, HttpEndpoint, IntermediateRepresentation } from "@fern-api/ir-sdk"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import urlJoin from "url-join"; + import { DynamicSnippetsTestSuite } from "./DynamicSnippetsTestSuite"; export async function generateDynamicSnippetsTestSuite({ diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/go/DynamicSnippetsGoTestGenerator.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/go/DynamicSnippetsGoTestGenerator.ts index 08dd6c3ef89..4df017c2151 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/go/DynamicSnippetsGoTestGenerator.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/dynamic-snippets/go/DynamicSnippetsGoTestGenerator.ts @@ -1,11 +1,13 @@ -import { dynamic as DynamicSnippets, HttpEndpoint, IntermediateRepresentation } from "@fern-api/ir-sdk"; -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import { DynamicSnippetsGenerator } from "@fern-api/go-dynamic-snippets"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { mkdir, writeFile } from "fs/promises"; -import { TaskContext } from "@fern-api/task-context"; import path from "path"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { DynamicSnippetsGenerator } from "@fern-api/go-dynamic-snippets"; +import { dynamic as DynamicSnippets, HttpEndpoint, IntermediateRepresentation } from "@fern-api/ir-sdk"; +import { TaskContext } from "@fern-api/task-context"; + +import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; + export class DynamicSnippetsGoTestGenerator { private dynamicSnippetsGenerator: DynamicSnippetsGenerator; diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/getGeneratorConfig.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/getGeneratorConfig.ts index 8aec3a4a0ea..131e97af9af 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/getGeneratorConfig.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/getGeneratorConfig.ts @@ -1,5 +1,6 @@ import { generatorsYml } from "@fern-api/configuration"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { GithubPublishInfo as FiddleGithubPublishInfo, MavenOutput, @@ -13,6 +14,7 @@ import { } from "@fern-fern/fiddle-sdk/api"; import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { EnvironmentVariable } from "@fern-fern/generator-exec-sdk/api"; + import { DOCKER_CODEGEN_OUTPUT_DIRECTORY, DOCKER_PATH_TO_IR, diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/getIntermediateRepresentation.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/getIntermediateRepresentation.ts index 1dc6e2f0198..5f53116f84d 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/getIntermediateRepresentation.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/getIntermediateRepresentation.ts @@ -1,3 +1,5 @@ +import { FernWorkspace } from "@fern-api/api-workspace-commons"; +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { Audiences, generatorsYml } from "@fern-api/configuration"; import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { @@ -6,8 +8,6 @@ import { } from "@fern-api/ir-migrations"; import { IntermediateRepresentation, SourceConfig } from "@fern-api/ir-sdk"; import { TaskContext } from "@fern-api/task-context"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; export declare namespace getIntermediateRepresentation { interface Return { diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/runGenerator.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/runGenerator.ts index 393e7a2f684..b410e66cc56 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/runGenerator.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/runGenerator.ts @@ -1,13 +1,17 @@ +import { writeFile } from "fs/promises"; +import tmp, { DirectoryResult } from "tmp-promise"; + import { Audiences, generatorsYml } from "@fern-api/configuration"; import { runDocker } from "@fern-api/docker-utils"; import { AbsoluteFilePath, streamObjectToFile, waitUntilPathExists } from "@fern-api/fs-utils"; import { ApiDefinitionSource, IntermediateRepresentation, SourceConfig } from "@fern-api/ir-sdk"; import { TaskContext } from "@fern-api/task-context"; import { FernWorkspace, IdentifiableSource } from "@fern-api/workspace-loader"; + import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import * as FernGeneratorExecParsing from "@fern-fern/generator-exec-sdk/serialization"; -import { writeFile } from "fs/promises"; -import tmp, { DirectoryResult } from "tmp-promise"; + +import { LocalTaskHandler } from "./LocalTaskHandler"; import { DOCKER_CODEGEN_OUTPUT_DIRECTORY, DOCKER_GENERATOR_CONFIG_PATH, @@ -16,7 +20,6 @@ import { } from "./constants"; import { getGeneratorConfig } from "./getGeneratorConfig"; import { getIntermediateRepresentation } from "./getIntermediateRepresentation"; -import { LocalTaskHandler } from "./LocalTaskHandler"; export interface GeneratorRunResponse { ir: IntermediateRepresentation; diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/runLocalGenerationForSeed.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/runLocalGenerationForSeed.ts index 63e72f29223..6976c847c24 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/runLocalGenerationForSeed.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/runLocalGenerationForSeed.ts @@ -1,22 +1,24 @@ +import chalk from "chalk"; +import { readFile } from "fs/promises"; +import { writeFile } from "fs/promises"; +import * as prettier from "prettier2"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { - generatorsYml, RESOLVED_SNIPPET_TEMPLATES_MD, SNIPPET_JSON_FILENAME, - SNIPPET_TEMPLATES_JSON_FILENAME + SNIPPET_TEMPLATES_JSON_FILENAME, + generatorsYml } from "@fern-api/configuration"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import chalk from "chalk"; -import { writeFilesToDiskAndRunGenerator } from "./runGenerator"; -import { getWorkspaceTempDir } from "./runLocalGenerationForWorkspace"; -import { readFile } from "fs/promises"; -import { Fern, Template } from "@fern-api/sdk"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { HttpEndpoint } from "@fern-api/ir-sdk"; -import { writeFile } from "fs/promises"; import { IntermediateRepresentation } from "@fern-api/ir-sdk"; -import * as prettier from "prettier"; +import { Fern, Template } from "@fern-api/sdk"; +import { TaskContext } from "@fern-api/task-context"; + import { generateDynamicSnippetTests } from "./dynamic-snippets/generateDynamicSnippetTests"; +import { writeFilesToDiskAndRunGenerator } from "./runGenerator"; +import { getWorkspaceTempDir } from "./runLocalGenerationForWorkspace"; export async function runLocalGenerationForSeed({ organization, @@ -221,8 +223,8 @@ export async function writeResolvedSnippetsJson({ let resovledMd = ""; for (const snippet of snippets) { resovledMd += `\`\`\`${generatorInvocation.language} -${snippet} -\`\`\` +${snippet} +\`\`\` \n\n`; } if (resovledMd.length > 0) { diff --git a/packages/cli/generation/local-generation/local-workspace-runner/src/runLocalGenerationForWorkspace.ts b/packages/cli/generation/local-generation/local-workspace-runner/src/runLocalGenerationForWorkspace.ts index 13d0f5f37b4..e0bc06ded7d 100644 --- a/packages/cli/generation/local-generation/local-workspace-runner/src/runLocalGenerationForWorkspace.ts +++ b/packages/cli/generation/local-generation/local-workspace-runner/src/runLocalGenerationForWorkspace.ts @@ -1,13 +1,15 @@ +import chalk from "chalk"; +import os from "os"; +import path from "path"; +import tmp from "tmp-promise"; + import { fernConfigJson, generatorsYml } from "@fern-api/configuration"; import { TaskContext } from "@fern-api/task-context"; import { AbstractAPIWorkspace, getBaseOpenAPIWorkspaceSettingsFromGeneratorInvocation } from "@fern-api/workspace-loader"; -import chalk from "chalk"; -import os from "os"; -import path from "path"; -import tmp from "tmp-promise"; + import { writeFilesToDiskAndRunGenerator } from "./runGenerator"; export async function runLocalGenerationForWorkspace({ diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/package.json b/packages/cli/generation/remote-generation/remote-workspace-runner/package.json index 6887e9c6ce8..9f4a9dc31f6 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/package.json +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/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": { @@ -69,8 +68,8 @@ "depcheck": "^1.4.7", "eslint": "^9.16.0", "lodash-es": "^4.17.21", - "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" } diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/RemoteTaskHandler.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/RemoteTaskHandler.ts index 367b89e8a9a..1b9978c53b5 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/RemoteTaskHandler.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/RemoteTaskHandler.ts @@ -1,9 +1,3 @@ -import { generatorsYml } from "@fern-api/configuration"; -import { noop } from "@fern-api/core-utils"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { LogLevel } from "@fern-api/logger"; -import { InteractiveTaskContext } from "@fern-api/task-context"; -import { FernFiddle } from "@fern-fern/fiddle-sdk"; import axios from "axios"; import chalk from "chalk"; import decompress from "decompress"; @@ -14,6 +8,14 @@ import { pipeline } from "stream/promises"; import terminalLink from "terminal-link"; import tmp from "tmp-promise"; +import { generatorsYml } from "@fern-api/configuration"; +import { noop } from "@fern-api/core-utils"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { LogLevel } from "@fern-api/logger"; +import { InteractiveTaskContext } from "@fern-api/task-context"; + +import { FernFiddle } from "@fern-fern/fiddle-sdk"; + export declare namespace RemoteTaskHandler { export interface Init { job: FernFiddle.remoteGen.CreateJobResponse; diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/SourceUploader.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/SourceUploader.ts index f5bf9c1f3d5..c895e2ecf69 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/SourceUploader.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/SourceUploader.ts @@ -1,11 +1,13 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { readFile, unlink } from "fs/promises"; +import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { ApiDefinitionSource, SourceConfig } from "@fern-api/ir-sdk"; import { loggingExeca } from "@fern-api/logging-execa"; import { InteractiveTaskContext } from "@fern-api/task-context"; import { IdentifiableSource } from "@fern-api/workspace-loader"; + import { FernRegistry as FdrAPI } from "@fern-fern/fdr-cjs-sdk"; -import { readFile, unlink } from "fs/promises"; -import tmp from "tmp-promise"; const PROTOBUF_ZIP_FILENAME = "proto.zip"; diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/__test__/substituteEnvVariables.test.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/__test__/substituteEnvVariables.test.ts index 2fe73ff78db..0e5fb330c28 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/__test__/substituteEnvVariables.test.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/__test__/substituteEnvVariables.test.ts @@ -1,6 +1,6 @@ import { replaceEnvVariables } from "@fern-api/core-utils"; import { NOOP_LOGGER } from "@fern-api/logger"; -import { createMockTaskContext, FernCliError } from "@fern-api/task-context"; +import { FernCliError, createMockTaskContext } from "@fern-api/task-context"; describe("substituteEnvVariables", () => { it("basic", () => { diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/createAndStartJob.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/createAndStartJob.ts index 54ddff501bf..188552737bb 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/createAndStartJob.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/createAndStartJob.ts @@ -1,14 +1,23 @@ +import axios, { AxiosError } from "axios"; +import FormData from "form-data"; +import { mkdir, readFile, writeFile } from "fs/promises"; +import yaml from "js-yaml"; +import { relative } from "path"; +import { create as createTar } from "tar"; +import tmp from "tmp-promise"; +import urlJoin from "url-join"; + import { FernToken } from "@fern-api/auth"; import { DEFINITION_DIRECTORY, - fernConfigJson, FERN_DIRECTORY, - generatorsYml, PROJECT_CONFIG_FILENAME, - ROOT_API_FILENAME + ROOT_API_FILENAME, + fernConfigJson, + generatorsYml } from "@fern-api/configuration"; import { createFiddleService, getFiddleOrigin } from "@fern-api/core"; -import { AbsoluteFilePath, dirname, join, RelativeFilePath, stringifyLargeObject } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, dirname, join, stringifyLargeObject } from "@fern-api/fs-utils"; import { migrateIntermediateRepresentationForGenerator, migrateIntermediateRepresentationToVersionForGenerator @@ -16,16 +25,9 @@ import { import { IntermediateRepresentation } from "@fern-api/ir-sdk"; import { TaskContext } from "@fern-api/task-context"; import { FernDefinition, FernWorkspace } from "@fern-api/workspace-loader"; + import { FernFiddle } from "@fern-fern/fiddle-sdk"; import { Fetcher } from "@fern-fern/fiddle-sdk/core"; -import axios, { AxiosError } from "axios"; -import FormData from "form-data"; -import { mkdir, readFile, writeFile } from "fs/promises"; -import yaml from "js-yaml"; -import { relative } from "path"; -import { create as createTar } from "tar"; -import tmp from "tmp-promise"; -import urlJoin from "url-join"; export async function createAndStartJob({ projectConfig, diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/downloadSnippetsForTask.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/downloadSnippetsForTask.ts index b03fea0c675..a0da16fd3dd 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/downloadSnippetsForTask.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/downloadSnippetsForTask.ts @@ -1,11 +1,12 @@ -import { AbsoluteFilePath, dirname, doesPathExist } from "@fern-api/fs-utils"; -import { InteractiveTaskContext } from "@fern-api/task-context"; import axios from "axios"; import chalk from "chalk"; import { createWriteStream } from "fs"; import { mkdir, rm } from "fs/promises"; import { pipeline } from "stream/promises"; +import { AbsoluteFilePath, dirname, doesPathExist } from "@fern-api/fs-utils"; +import { InteractiveTaskContext } from "@fern-api/task-context"; + export async function downloadSnippetsForTask({ snippetsS3PreSignedReadUrl, absolutePathToLocalSnippetJSON, diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/measureImageSizes.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/measureImageSizes.ts index 1ad3fb5c6a1..c9ff0c3f22b 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/measureImageSizes.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/measureImageSizes.ts @@ -1,10 +1,11 @@ -import { isNonNullish } from "@fern-api/core-utils"; -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import imageSize from "image-size"; import { chunk } from "lodash-es"; import { promisify } from "util"; +import { isNonNullish } from "@fern-api/core-utils"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + interface AbsoluteImageFilePath { filePath: AbsoluteFilePath; width: number; diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/pollJobAndReportStatus.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/pollJobAndReportStatus.ts index 54632ece025..01c110161dd 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/pollJobAndReportStatus.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/pollJobAndReportStatus.ts @@ -1,5 +1,7 @@ import { TaskContext } from "@fern-api/task-context"; + import { FernFiddle } from "@fern-fern/fiddle-sdk"; + import { RemoteTaskHandler } from "./RemoteTaskHandler"; import { REMOTE_GENERATION_SERVICE } from "./service"; diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/publishDocs.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/publishDocs.ts index 5f1684edaa3..7fa027ea06f 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/publishDocs.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/publishDocs.ts @@ -1,3 +1,10 @@ +import axios from "axios"; +import chalk from "chalk"; +import { readFile } from "fs/promises"; +import { chunk } from "lodash-es"; +import * as mime from "mime-types"; +import terminalLink from "terminal-link"; + import { FernToken } from "@fern-api/auth"; import { docsYml } from "@fern-api/configuration"; import { createFdrService } from "@fern-api/core"; @@ -8,13 +15,9 @@ import { convertToFernHostRelativeFilePath } from "@fern-api/fs-utils"; import { convertIrToFdrApi } from "@fern-api/register"; import { TaskContext } from "@fern-api/task-context"; import { DocsWorkspace, FernWorkspace } from "@fern-api/workspace-loader"; + import { FernRegistry as CjsFdrSdk } from "@fern-fern/fdr-cjs-sdk"; -import axios from "axios"; -import chalk from "chalk"; -import { readFile } from "fs/promises"; -import { chunk } from "lodash-es"; -import * as mime from "mime-types"; -import terminalLink from "terminal-link"; + import { measureImageSizes } from "./measureImageSizes"; const MEASURE_IMAGE_BATCH_SIZE = 10; diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForAPIWorkspace.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForAPIWorkspace.ts index 94ac0c44f4a..efb9453c59b 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForAPIWorkspace.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForAPIWorkspace.ts @@ -6,7 +6,9 @@ import { AbstractAPIWorkspace, getBaseOpenAPIWorkspaceSettingsFromGeneratorInvocation } from "@fern-api/workspace-loader"; + import { FernFiddle } from "@fern-fern/fiddle-sdk"; + import { downloadSnippetsForTask } from "./downloadSnippetsForTask"; import { runRemoteGenerationForGenerator } from "./runRemoteGenerationForGenerator"; diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForDocsWorkspace.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForDocsWorkspace.ts index d21227958df..373640c4777 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForDocsWorkspace.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForDocsWorkspace.ts @@ -2,6 +2,7 @@ import { FernToken } from "@fern-api/auth"; import { replaceEnvVariables } from "@fern-api/core-utils"; import { TaskContext } from "@fern-api/task-context"; import { DocsWorkspace, FernWorkspace } from "@fern-api/workspace-loader"; + import { publishDocs } from "./publishDocs"; export async function runRemoteGenerationForDocsWorkspace({ diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForGenerator.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForGenerator.ts index e90e07a30f4..fa856c5d2fd 100644 --- a/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForGenerator.ts +++ b/packages/cli/generation/remote-generation/remote-workspace-runner/src/runRemoteGenerationForGenerator.ts @@ -1,20 +1,22 @@ import { FernToken } from "@fern-api/auth"; +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { Audiences, fernConfigJson, generatorsYml } from "@fern-api/configuration"; import { createFdrService } from "@fern-api/core"; +import { replaceEnvVariables } from "@fern-api/core-utils"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { FernIr } from "@fern-api/ir-sdk"; import { convertIrToFdrApi } from "@fern-api/register"; import { InteractiveTaskContext } from "@fern-api/task-context"; import { FernWorkspace, IdentifiableSource } from "@fern-api/workspace-loader"; + import { FernRegistry as FdrAPI, FernRegistryClient as FdrClient } from "@fern-fern/fdr-cjs-sdk"; import { FernFiddle } from "@fern-fern/fiddle-sdk"; -import { createAndStartJob } from "./createAndStartJob"; -import { pollJobAndReportStatus } from "./pollJobAndReportStatus"; + import { RemoteTaskHandler } from "./RemoteTaskHandler"; import { SourceUploader } from "./SourceUploader"; -import { replaceEnvVariables } from "@fern-api/core-utils"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; +import { createAndStartJob } from "./createAndStartJob"; +import { pollJobAndReportStatus } from "./pollJobAndReportStatus"; export async function runRemoteGenerationForGenerator({ projectConfig, diff --git a/packages/cli/generation/source-resolver/package.json b/packages/cli/generation/source-resolver/package.json index 463e9f65a05..7c6191f324f 100644 --- a/packages/cli/generation/source-resolver/package.json +++ b/packages/cli/generation/source-resolver/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": { @@ -36,8 +35,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" } } \ No newline at end of file diff --git a/packages/cli/generation/source-resolver/src/NopSourceResolver.ts b/packages/cli/generation/source-resolver/src/NopSourceResolver.ts index e23151da88d..8bf309b4761 100644 --- a/packages/cli/generation/source-resolver/src/NopSourceResolver.ts +++ b/packages/cli/generation/source-resolver/src/NopSourceResolver.ts @@ -1,4 +1,5 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; + import { ResolvedSource } from "./ResolvedSource"; import { SourceResolver } from "./SourceResolver"; diff --git a/packages/cli/generation/source-resolver/src/SourceResolver.ts b/packages/cli/generation/source-resolver/src/SourceResolver.ts index 77028b6ca0c..6279246fe2c 100644 --- a/packages/cli/generation/source-resolver/src/SourceResolver.ts +++ b/packages/cli/generation/source-resolver/src/SourceResolver.ts @@ -1,7 +1,8 @@ import { RawSchemas } from "@fern-api/fern-definition-schema"; -import { ResolvedSource } from "./ResolvedSource"; import { RelativeFilePath } from "@fern-api/path-utils"; +import { ResolvedSource } from "./ResolvedSource"; + export interface SourceResolver { resolveSource: (args: { source: RawSchemas.SourceSchema }) => ResolvedSource | undefined; resolveSourceOrThrow: (args: { diff --git a/packages/cli/init/package.json b/packages/cli/init/package.json index b0e06df448b..e8c83bd2e05 100644 --- a/packages/cli/init/package.json +++ b/packages/cli/init/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": { @@ -52,8 +51,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" } } \ No newline at end of file diff --git a/packages/cli/init/src/__test__/initializeWithMintlify.test.ts b/packages/cli/init/src/__test__/initializeWithMintlify.test.ts index 0181b5dad31..4c343560153 100644 --- a/packages/cli/init/src/__test__/initializeWithMintlify.test.ts +++ b/packages/cli/init/src/__test__/initializeWithMintlify.test.ts @@ -3,6 +3,7 @@ import { vi } from "vitest"; /* eslint-disable @typescript-eslint/no-explicit-any */ import { AbsoluteFilePath, cwd, resolve } from "@fern-api/fs-utils"; import { runMintlifyMigration } from "@fern-api/mintlify-importer"; + import { initializeWithMintlify } from "../initializeWithMintlify"; // We'll mock calling runMintlifyMigration instead of actually calling it diff --git a/packages/cli/init/src/createFernDirectoryAndOrganization.ts b/packages/cli/init/src/createFernDirectoryAndOrganization.ts index 96d41ffa556..ba3f280a61b 100644 --- a/packages/cli/init/src/createFernDirectoryAndOrganization.ts +++ b/packages/cli/init/src/createFernDirectoryAndOrganization.ts @@ -1,3 +1,7 @@ +import chalk from "chalk"; +import { mkdir, writeFile } from "fs/promises"; +import { kebabCase } from "lodash-es"; + import { createOrganizationIfDoesNotExist, getCurrentUser } from "@fern-api/auth"; import { FERN_DIRECTORY, @@ -6,12 +10,9 @@ import { loadProjectConfig } from "@fern-api/configuration-loader"; import { createVenusService } from "@fern-api/core"; -import { AbsoluteFilePath, cwd, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, cwd, doesPathExist, join } from "@fern-api/fs-utils"; import { askToLogin } from "@fern-api/login"; import { TaskContext } from "@fern-api/task-context"; -import chalk from "chalk"; -import { mkdir, writeFile } from "fs/promises"; -import { kebabCase } from "lodash-es"; export async function createFernDirectoryAndWorkspace({ organization, diff --git a/packages/cli/init/src/createWorkspace.ts b/packages/cli/init/src/createWorkspace.ts index 1af822427d5..6d2264853a9 100644 --- a/packages/cli/init/src/createWorkspace.ts +++ b/packages/cli/init/src/createWorkspace.ts @@ -1,22 +1,24 @@ +import { createReadStream } from "fs"; +import { mkdir, readFile, writeFile } from "fs/promises"; +import yaml from "js-yaml"; +import path from "path"; + import { DEFAULT_GROUP_NAME, DEFINITION_DIRECTORY, - generatorsYml, GENERATORS_CONFIGURATION_FILENAME, GENERATOR_INVOCATIONS, - getLatestGeneratorVersion, OPENAPI_DIRECTORY, - ROOT_API_FILENAME + ROOT_API_FILENAME, + generatorsYml, + getLatestGeneratorVersion } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { formatDefinitionFile } from "@fern-api/fern-definition-formatter"; import { RootApiFileSchema } from "@fern-api/fern-definition-schema"; -import { mkdir, readFile, writeFile } from "fs/promises"; -import yaml from "js-yaml"; -import path from "path"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { SAMPLE_IMDB_API } from "./sampleImdbApi"; -import { createReadStream } from "fs"; export async function createFernWorkspace({ directoryOfWorkspace, diff --git a/packages/cli/init/src/initializeAPI.ts b/packages/cli/init/src/initializeAPI.ts index e7c994ee933..2261a483119 100644 --- a/packages/cli/init/src/initializeAPI.ts +++ b/packages/cli/init/src/initializeAPI.ts @@ -1,15 +1,17 @@ +import chalk from "chalk"; +import fs from "fs-extra"; +import { mkdir } from "fs/promises"; +import path from "path"; + import { APIS_DIRECTORY, DEFAULT_API_WORSPACE_FOLDER_NAME, DEFINITION_DIRECTORY, GENERATORS_CONFIGURATION_FILENAME } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; -import chalk from "chalk"; -import fs from "fs-extra"; -import { mkdir } from "fs/promises"; -import path from "path"; + import { createFernDirectoryAndWorkspace } from "./createFernDirectoryAndOrganization"; import { createFernWorkspace, createOpenAPIWorkspace } from "./createWorkspace"; diff --git a/packages/cli/init/src/initializeDocs.ts b/packages/cli/init/src/initializeDocs.ts index 75a97e2b121..ac380459912 100644 --- a/packages/cli/init/src/initializeDocs.ts +++ b/packages/cli/init/src/initializeDocs.ts @@ -1,9 +1,11 @@ +import { writeFile } from "fs/promises"; +import yaml from "js-yaml"; + import { DOCS_CONFIGURATION_FILENAME } from "@fern-api/configuration-loader"; import { docsYml } from "@fern-api/configuration-loader"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; -import { writeFile } from "fs/promises"; -import yaml from "js-yaml"; + import { createFernDirectoryAndWorkspace } from "./createFernDirectoryAndOrganization"; export async function initializeDocs({ diff --git a/packages/cli/init/src/utils/loadOpenApiFromUrl.ts b/packages/cli/init/src/utils/loadOpenApiFromUrl.ts index 5793ffecfc4..d06974f81ff 100644 --- a/packages/cli/init/src/utils/loadOpenApiFromUrl.ts +++ b/packages/cli/init/src/utils/loadOpenApiFromUrl.ts @@ -3,6 +3,7 @@ import { writeFile } from "fs/promises"; import { dump } from "js-yaml"; import { join } from "path"; import tmp from "tmp-promise"; + import { Logger } from "../../../logger/src/Logger"; export type LoadOpenAPIResult = SuccessLoadOpenAPI | FailedLoadOpenAPI; diff --git a/packages/cli/logger/package.json b/packages/cli/logger/package.json index 9fc5c041e83..84472a0b4e6 100644 --- a/packages/cli/logger/package.json +++ b/packages/cli/logger/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": { @@ -35,8 +34,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" } } \ No newline at end of file diff --git a/packages/cli/logger/src/console.ts b/packages/cli/logger/src/console.ts index eea4ba5ea51..068fb0dcbf3 100644 --- a/packages/cli/logger/src/console.ts +++ b/packages/cli/logger/src/console.ts @@ -1,6 +1,6 @@ -import { createLogger } from "./createLogger"; -import { Logger } from "./Logger"; import { LogLevel } from "./LogLevel"; +import { Logger } from "./Logger"; +import { createLogger } from "./createLogger"; export const CONSOLE_LOGGER: Logger = Object.freeze(createLogger(log)); diff --git a/packages/cli/logger/src/createLogger.ts b/packages/cli/logger/src/createLogger.ts index 20754acdc96..e7ba62e0456 100644 --- a/packages/cli/logger/src/createLogger.ts +++ b/packages/cli/logger/src/createLogger.ts @@ -1,8 +1,11 @@ -import { Logger } from "./Logger"; import { LogLevel } from "./LogLevel"; +import { Logger } from "./Logger"; class LoggerImpl implements Logger { - constructor(public readonly log: (level: LogLevel, ...args: string[]) => void, private enabled: boolean = true) {} + constructor( + public readonly log: (level: LogLevel, ...args: string[]) => void, + private enabled: boolean = true + ) {} public disable(): void { this.enabled = false; diff --git a/packages/cli/logger/src/noop.ts b/packages/cli/logger/src/noop.ts index e358250d747..2bfc54fbc90 100644 --- a/packages/cli/logger/src/noop.ts +++ b/packages/cli/logger/src/noop.ts @@ -1,4 +1,5 @@ import { noop } from "@fern-api/core-utils"; + import { createLogger } from "./createLogger"; export const NOOP_LOGGER = createLogger(noop); diff --git a/packages/cli/login/package.json b/packages/cli/login/package.json index 4319705355f..0e4b7c4d3d6 100644 --- a/packages/cli/login/package.json +++ b/packages/cli/login/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": { @@ -48,8 +47,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" } } \ No newline at end of file diff --git a/packages/cli/login/src/askToLogin.ts b/packages/cli/login/src/askToLogin.ts index 3d5f24907ba..0148c9690a7 100644 --- a/packages/cli/login/src/askToLogin.ts +++ b/packages/cli/login/src/askToLogin.ts @@ -1,6 +1,8 @@ +import inquirer, { ConfirmQuestion } from "inquirer"; + import { FernToken, getToken, isLoggedIn } from "@fern-api/auth"; import { TaskContext } from "@fern-api/task-context"; -import inquirer, { ConfirmQuestion } from "inquirer"; + import { login } from "./login"; export async function askToLogin(context: TaskContext): Promise { diff --git a/packages/cli/login/src/auth0-login/doAuth0DeviceAuthorizationFlow.ts b/packages/cli/login/src/auth0-login/doAuth0DeviceAuthorizationFlow.ts index 47bee09fbed..da0e008dd52 100644 --- a/packages/cli/login/src/auth0-login/doAuth0DeviceAuthorizationFlow.ts +++ b/packages/cli/login/src/auth0-login/doAuth0DeviceAuthorizationFlow.ts @@ -1,10 +1,11 @@ -import { delay } from "@fern-api/core-utils"; -import { TaskContext } from "@fern-api/task-context"; import axios from "axios"; import boxen from "boxen"; import open from "open"; import qs from "qs"; +import { delay } from "@fern-api/core-utils"; +import { TaskContext } from "@fern-api/task-context"; + interface DeviceCodeResponse { device_code: string; user_code: string; diff --git a/packages/cli/login/src/auth0-login/doAuth0LoginFlow.ts b/packages/cli/login/src/auth0-login/doAuth0LoginFlow.ts index ffe0e8478d8..370ed695979 100644 --- a/packages/cli/login/src/auth0-login/doAuth0LoginFlow.ts +++ b/packages/cli/login/src/auth0-login/doAuth0LoginFlow.ts @@ -1,6 +1,7 @@ import axios from "axios"; import { IncomingMessage, Server } from "http"; import open from "open"; + import { createServer } from "./createServer"; const SUCCESS_PAGE = ` diff --git a/packages/cli/login/src/login.ts b/packages/cli/login/src/login.ts index 9216acc4a6c..3ab451cf9dd 100644 --- a/packages/cli/login/src/login.ts +++ b/packages/cli/login/src/login.ts @@ -1,7 +1,9 @@ +import chalk from "chalk"; + import { FernUserToken, storeToken } from "@fern-api/auth"; import { getPosthogManager } from "@fern-api/posthog-manager"; import { TaskContext } from "@fern-api/task-context"; -import chalk from "chalk"; + import { doAuth0DeviceAuthorizationFlow } from "./auth0-login/doAuth0DeviceAuthorizationFlow"; import { doAuth0LoginFlow } from "./auth0-login/doAuth0LoginFlow"; diff --git a/packages/cli/mock/package.json b/packages/cli/mock/package.json index 19ca2e3e96e..cea73081e80 100644 --- a/packages/cli/mock/package.json +++ b/packages/cli/mock/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": { @@ -43,8 +42,8 @@ "@types/url-join": "4.0.1", "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" } diff --git a/packages/cli/mock/src/equal/bodyEqual.ts b/packages/cli/mock/src/equal/bodyEqual.ts index 487a0d9958a..e2ace3b64ea 100644 --- a/packages/cli/mock/src/equal/bodyEqual.ts +++ b/packages/cli/mock/src/equal/bodyEqual.ts @@ -1,7 +1,9 @@ +import { Request } from "express"; +import { isEqual, isEqualWith } from "lodash-es"; + import { ExampleEndpointCall } from "@fern-api/ir-sdk"; -import { isEqualWith, isEqual } from "lodash-es"; + import { EqualResponse } from "./EqualRequestResponse"; -import { Request } from "express"; export declare namespace bodyEqual { interface Args { diff --git a/packages/cli/mock/src/equal/headersEqual.ts b/packages/cli/mock/src/equal/headersEqual.ts index f75a1e59a1b..87ab45006f9 100644 --- a/packages/cli/mock/src/equal/headersEqual.ts +++ b/packages/cli/mock/src/equal/headersEqual.ts @@ -1,7 +1,9 @@ -import { ExampleEndpointCall } from "@fern-api/ir-sdk"; +import { Request } from "express"; import { isEqualWith } from "lodash-es"; + +import { ExampleEndpointCall } from "@fern-api/ir-sdk"; + import { EqualResponse } from "./EqualRequestResponse"; -import { Request } from "express"; export declare namespace headersEqual { interface Args { diff --git a/packages/cli/mock/src/equal/pathParametersEqual.ts b/packages/cli/mock/src/equal/pathParametersEqual.ts index 72226850332..3ffc921518c 100644 --- a/packages/cli/mock/src/equal/pathParametersEqual.ts +++ b/packages/cli/mock/src/equal/pathParametersEqual.ts @@ -1,7 +1,9 @@ -import { ExampleEndpointCall } from "@fern-api/ir-sdk"; +import { Request } from "express"; import { isEqualWith } from "lodash-es"; + +import { ExampleEndpointCall } from "@fern-api/ir-sdk"; + import { EqualResponse } from "./EqualRequestResponse"; -import { Request } from "express"; export declare namespace pathParametersEqual { interface Args { diff --git a/packages/cli/mock/src/equal/queryParametersEqual.ts b/packages/cli/mock/src/equal/queryParametersEqual.ts index 949c208ce5d..d9410778d66 100644 --- a/packages/cli/mock/src/equal/queryParametersEqual.ts +++ b/packages/cli/mock/src/equal/queryParametersEqual.ts @@ -1,7 +1,9 @@ -import { ExampleEndpointCall } from "@fern-api/ir-sdk"; +import { Request } from "express"; import { isEqualWith } from "lodash-es"; + +import { ExampleEndpointCall } from "@fern-api/ir-sdk"; + import { EqualResponse } from "./EqualRequestResponse"; -import { Request } from "express"; export declare namespace queryParametersEqual { interface Args { diff --git a/packages/cli/mock/src/equal/requestEqual.ts b/packages/cli/mock/src/equal/requestEqual.ts index 1dec5505917..5290d3c365e 100644 --- a/packages/cli/mock/src/equal/requestEqual.ts +++ b/packages/cli/mock/src/equal/requestEqual.ts @@ -1,10 +1,12 @@ +import { Request } from "express"; + import { ExampleEndpointCall } from "@fern-api/ir-sdk"; + +import { EqualResponse } from "./EqualRequestResponse"; +import { bodyEqual } from "./bodyEqual"; +import { headersEqual } from "./headersEqual"; import { pathParametersEqual } from "./pathParametersEqual"; import { queryParametersEqual } from "./queryParametersEqual"; -import { Request } from "express"; -import { headersEqual } from "./headersEqual"; -import { bodyEqual } from "./bodyEqual"; -import { EqualResponse } from "./EqualRequestResponse"; export declare namespace requestEqual { interface Args { diff --git a/packages/cli/mock/src/runMockServer.ts b/packages/cli/mock/src/runMockServer.ts index 1771f8b7da4..3178dbd5b05 100644 --- a/packages/cli/mock/src/runMockServer.ts +++ b/packages/cli/mock/src/runMockServer.ts @@ -1,11 +1,13 @@ -import { isPlainObject } from "@fern-api/core-utils"; -import { HttpEndpoint, IntermediateRepresentation } from "@fern-api/ir-sdk"; -import { TaskContext } from "@fern-api/task-context"; import express, { Request, Response } from "express"; import getPort from "get-port"; import { Server } from "http"; import { noop } from "lodash-es"; import urlJoin from "url-join"; + +import { isPlainObject } from "@fern-api/core-utils"; +import { HttpEndpoint, IntermediateRepresentation } from "@fern-api/ir-sdk"; +import { TaskContext } from "@fern-api/task-context"; + import { NotEqual } from "./equal/EqualRequestResponse"; import { requestEqual } from "./equal/requestEqual"; diff --git a/packages/cli/posthog-manager/package.json b/packages/cli/posthog-manager/package.json index 44f9bf8268a..459555fa044 100644 --- a/packages/cli/posthog-manager/package.json +++ b/packages/cli/posthog-manager/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": { @@ -41,8 +40,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" } } \ No newline at end of file diff --git a/packages/cli/posthog-manager/src/AccessTokenPosthogManager.ts b/packages/cli/posthog-manager/src/AccessTokenPosthogManager.ts index fa2e5a0f8d9..db97f8c5fcb 100644 --- a/packages/cli/posthog-manager/src/AccessTokenPosthogManager.ts +++ b/packages/cli/posthog-manager/src/AccessTokenPosthogManager.ts @@ -1,5 +1,7 @@ -import { PosthogEvent } from "@fern-api/task-context"; import { PostHog } from "posthog-node"; + +import { PosthogEvent } from "@fern-api/task-context"; + import { PosthogManager } from "./PosthogManager"; export class AccessTokenPosthogManager implements PosthogManager { diff --git a/packages/cli/posthog-manager/src/UserPosthogManager.ts b/packages/cli/posthog-manager/src/UserPosthogManager.ts index eb5976f44ce..9a4043db32e 100644 --- a/packages/cli/posthog-manager/src/UserPosthogManager.ts +++ b/packages/cli/posthog-manager/src/UserPosthogManager.ts @@ -1,11 +1,13 @@ -import { FernUserToken, getUserIdFromToken } from "@fern-api/auth"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { PosthogEvent } from "@fern-api/task-context"; import { mkdir, readFile, writeFile } from "fs/promises"; import { homedir } from "os"; import { dirname } from "path"; import { PostHog } from "posthog-node"; import { v4 as uuidv4 } from "uuid"; + +import { FernUserToken, getUserIdFromToken } from "@fern-api/auth"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { PosthogEvent } from "@fern-api/task-context"; + import { PosthogManager } from "./PosthogManager"; const DISTINCT_ID_FILENAME = "id"; diff --git a/packages/cli/posthog-manager/src/getPosthogManager.ts b/packages/cli/posthog-manager/src/getPosthogManager.ts index 34382095175..a10b5439a25 100644 --- a/packages/cli/posthog-manager/src/getPosthogManager.ts +++ b/packages/cli/posthog-manager/src/getPosthogManager.ts @@ -1,4 +1,5 @@ import { getAccessToken, getUserToken } from "@fern-api/auth"; + import { AccessTokenPosthogManager } from "./AccessTokenPosthogManager"; import { NoopPosthogManager } from "./NoopPosthogManager"; import { PosthogManager } from "./PosthogManager"; diff --git a/packages/cli/project-loader/package.json b/packages/cli/project-loader/package.json index 8b3ba46a79c..c667f32e39c 100644 --- a/packages/cli/project-loader/package.json +++ b/packages/cli/project-loader/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": { @@ -41,8 +40,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" } } \ No newline at end of file diff --git a/packages/cli/project-loader/src/Project.ts b/packages/cli/project-loader/src/Project.ts index 4a9ff92ebd1..f8fae47a289 100644 --- a/packages/cli/project-loader/src/Project.ts +++ b/packages/cli/project-loader/src/Project.ts @@ -1,6 +1,7 @@ +import { AbstractAPIWorkspace } from "@fern-api/api-workspace-commons"; import { fernConfigJson } from "@fern-api/configuration-loader"; import { DocsWorkspace } from "@fern-api/workspace-loader"; -import { AbstractAPIWorkspace } from "@fern-api/api-workspace-commons"; + export interface Project { config: fernConfigJson.ProjectConfig; apiWorkspaces: AbstractAPIWorkspace[]; diff --git a/packages/cli/project-loader/src/loadProject.ts b/packages/cli/project-loader/src/loadProject.ts index 1fb7e02ca49..72cbdc42f83 100644 --- a/packages/cli/project-loader/src/loadProject.ts +++ b/packages/cli/project-loader/src/loadProject.ts @@ -1,21 +1,23 @@ +import chalk from "chalk"; +import { readdir } from "fs/promises"; + +import { AbstractAPIWorkspace } from "@fern-api/api-workspace-commons"; import { APIS_DIRECTORY, ASYNCAPI_DIRECTORY, DEFINITION_DIRECTORY, FERN_DIRECTORY, - fernConfigJson, GENERATORS_CONFIGURATION_FILENAME, + OPENAPI_DIRECTORY, + fernConfigJson, generatorsYml, getFernDirectory, - OPENAPI_DIRECTORY, loadProjectConfig } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; import { handleFailedWorkspaceParserResult, loadAPIWorkspace, loadDocsWorkspace } from "@fern-api/workspace-loader"; -import { AbstractAPIWorkspace } from "@fern-api/api-workspace-commons"; -import chalk from "chalk"; -import { readdir } from "fs/promises"; + import { Project } from "./Project"; export declare namespace loadProject { diff --git a/packages/cli/register/package.json b/packages/cli/register/package.json index 34df0a7cb81..c9d55e8ed25 100644 --- a/packages/cli/register/package.json +++ b/packages/cli/register/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": { @@ -47,8 +46,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" } diff --git a/packages/cli/register/src/ir-to-fdr-converter/__test__/convertIrToFdrApi.test.ts b/packages/cli/register/src/ir-to-fdr-converter/__test__/convertIrToFdrApi.test.ts index 63c4e82db61..470ba709a74 100644 --- a/packages/cli/register/src/ir-to-fdr-converter/__test__/convertIrToFdrApi.test.ts +++ b/packages/cli/register/src/ir-to-fdr-converter/__test__/convertIrToFdrApi.test.ts @@ -1,15 +1,16 @@ /* eslint-disable jest/valid-describe-callback */ /* eslint-disable jest/valid-title */ /* eslint-disable @typescript-eslint/no-misused-promises */ +import { readdir } from "fs/promises"; +import path from "path"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { loadApis } from "@fern-api/project-loader"; import { createMockTaskContext } from "@fern-api/task-context"; -import path from "path"; + import { convertIrToFdrApi } from "../convertIrToFdrApi"; -import { readdir } from "fs/promises"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; describe("fdr", async () => { const TEST_DEFINITIONS_DIR = path.join(__dirname, "../../../../../../test-definitions"); @@ -25,9 +26,7 @@ describe("fdr", async () => { })), ...( await Promise.all( - ( - await readdir(FIXTURES_DIR, { withFileTypes: true }) - ) + (await readdir(FIXTURES_DIR, { withFileTypes: true })) .filter((fixture) => fixture.isDirectory()) .flatMap(async (fixture) => { return await loadApis({ diff --git a/packages/cli/register/src/ir-to-fdr-converter/convertAuth.ts b/packages/cli/register/src/ir-to-fdr-converter/convertAuth.ts index 42ba7b69ce2..e90e7f0828b 100644 --- a/packages/cli/register/src/ir-to-fdr-converter/convertAuth.ts +++ b/packages/cli/register/src/ir-to-fdr-converter/convertAuth.ts @@ -1,5 +1,6 @@ import { assertNever } from "@fern-api/core-utils"; import { FernIr as Ir } from "@fern-api/ir-sdk"; + import { FernRegistry as FdrCjsSdk } from "@fern-fern/fdr-cjs-sdk"; export interface PlaygroundConfig { diff --git a/packages/cli/register/src/ir-to-fdr-converter/convertIrToFdrApi.ts b/packages/cli/register/src/ir-to-fdr-converter/convertIrToFdrApi.ts index c84ed22cb56..f90f1adc498 100644 --- a/packages/cli/register/src/ir-to-fdr-converter/convertIrToFdrApi.ts +++ b/packages/cli/register/src/ir-to-fdr-converter/convertIrToFdrApi.ts @@ -1,8 +1,10 @@ import { IntermediateRepresentation } from "@fern-api/ir-sdk"; + import { FernRegistry as FdrCjsSdk } from "@fern-fern/fdr-cjs-sdk"; + +import { PlaygroundConfig, convertAuth } from "./convertAuth"; import { convertIrAvailability, convertPackage } from "./convertPackage"; import { convertTypeReference, convertTypeShape } from "./convertTypeShape"; -import { convertAuth, PlaygroundConfig } from "./convertAuth"; export function convertIrToFdrApi({ ir, diff --git a/packages/cli/register/src/ir-to-fdr-converter/convertPackage.ts b/packages/cli/register/src/ir-to-fdr-converter/convertPackage.ts index 5487136884a..5be373415db 100644 --- a/packages/cli/register/src/ir-to-fdr-converter/convertPackage.ts +++ b/packages/cli/register/src/ir-to-fdr-converter/convertPackage.ts @@ -1,4 +1,6 @@ -import { assertNever, isNonNullish, isPlainObject, MediaType } from "@fern-api/core-utils"; +import { noop, startCase } from "lodash-es"; + +import { MediaType, assertNever, isNonNullish, isPlainObject } from "@fern-api/core-utils"; import { generateEndpointExample } from "@fern-api/ir-generator"; import { AutogeneratedEndpointExample, @@ -6,8 +8,9 @@ import { FernIr as Ir, UserSpecifiedEndpointExample } from "@fern-api/ir-sdk"; + import { FernRegistry as FdrCjsSdk } from "@fern-fern/fdr-cjs-sdk"; -import { noop, startCase } from "lodash-es"; + import { convertTypeReference } from "./convertTypeShape"; export function convertPackage( diff --git a/packages/cli/register/src/ir-to-fdr-converter/convertTypeShape.ts b/packages/cli/register/src/ir-to-fdr-converter/convertTypeShape.ts index 085cbcb5f34..d767567e21b 100644 --- a/packages/cli/register/src/ir-to-fdr-converter/convertTypeShape.ts +++ b/packages/cli/register/src/ir-to-fdr-converter/convertTypeShape.ts @@ -1,5 +1,7 @@ -import { FernRegistry as FdrCjsSdk } from "@fern-fern/fdr-cjs-sdk"; import { FernIr as Ir, TypeReference } from "@fern-api/ir-sdk"; + +import { FernRegistry as FdrCjsSdk } from "@fern-fern/fdr-cjs-sdk"; + import { convertIrAvailability } from "./convertPackage"; export function convertTypeShape(irType: Ir.types.Type): FdrCjsSdk.api.v1.register.TypeShape { diff --git a/packages/cli/register/src/registerApi.ts b/packages/cli/register/src/registerApi.ts index 333957c4e1c..56ac879667b 100644 --- a/packages/cli/register/src/registerApi.ts +++ b/packages/cli/register/src/registerApi.ts @@ -1,14 +1,16 @@ +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { FernToken } from "@fern-api/auth"; +import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; import { Audiences } from "@fern-api/configuration"; import { createFdrService } from "@fern-api/core"; import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { IntermediateRepresentation } from "@fern-api/ir-sdk"; import { TaskContext } from "@fern-api/task-context"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; + import { FernRegistry as FdrCjsSdk } from "@fern-fern/fdr-cjs-sdk"; -import { convertIrToFdrApi } from "./ir-to-fdr-converter/convertIrToFdrApi"; + import { PlaygroundConfig } from "./ir-to-fdr-converter/convertAuth"; -import { SourceResolverImpl } from "@fern-api/cli-source-resolver"; +import { convertIrToFdrApi } from "./ir-to-fdr-converter/convertIrToFdrApi"; export async function registerApi({ organization, diff --git a/packages/cli/semver-utils/package.json b/packages/cli/semver-utils/package.json index 144b686431f..9ff2ffeb419 100644 --- a/packages/cli/semver-utils/package.json +++ b/packages/cli/semver-utils/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": { @@ -36,8 +35,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" } } \ No newline at end of file diff --git a/packages/cli/semver-utils/src/isVersionAhead.ts b/packages/cli/semver-utils/src/isVersionAhead.ts index 7eb53e3fb31..fec2314c0a7 100644 --- a/packages/cli/semver-utils/src/isVersionAhead.ts +++ b/packages/cli/semver-utils/src/isVersionAhead.ts @@ -1,4 +1,5 @@ import semverDiff from "semver-diff"; + import { ParsedVersion, parseVersion } from "./parseVersion"; /** diff --git a/packages/cli/task-context/package.json b/packages/cli/task-context/package.json index 8b239a6a685..4b8e4b1cedd 100644 --- a/packages/cli/task-context/package.json +++ b/packages/cli/task-context/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": { @@ -36,8 +35,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" } } \ No newline at end of file diff --git a/packages/cli/task-context/src/MockTaskContext.ts b/packages/cli/task-context/src/MockTaskContext.ts index e0f26cdf7d0..32234dda487 100644 --- a/packages/cli/task-context/src/MockTaskContext.ts +++ b/packages/cli/task-context/src/MockTaskContext.ts @@ -1,4 +1,5 @@ import { CONSOLE_LOGGER, Logger } from "@fern-api/logger"; + import { FernCliError } from "./FernCliError"; import { TaskContext, TaskResult } from "./TaskContext"; diff --git a/packages/cli/workspace/browser-compatible-fern-workspace/package.json b/packages/cli/workspace/browser-compatible-fern-workspace/package.json index 8460ddfa53d..fd43bf853a1 100644 --- a/packages/cli/workspace/browser-compatible-fern-workspace/package.json +++ b/packages/cli/workspace/browser-compatible-fern-workspace/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": { @@ -43,8 +42,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" } } \ No newline at end of file diff --git a/packages/cli/workspace/browser-compatible-fern-workspace/src/InMemoryOpenAPILoader.ts b/packages/cli/workspace/browser-compatible-fern-workspace/src/InMemoryOpenAPILoader.ts index 23c293ef52e..0dd16754443 100644 --- a/packages/cli/workspace/browser-compatible-fern-workspace/src/InMemoryOpenAPILoader.ts +++ b/packages/cli/workspace/browser-compatible-fern-workspace/src/InMemoryOpenAPILoader.ts @@ -1,8 +1,10 @@ -import { getParseOptions, OpenAPIDocument } from "@fern-api/openapi-ir-parser"; -import { OpenAPIWorkspace } from "./OpenAPIWorkspace"; import { OpenAPI, OpenAPIV3 } from "openapi-types"; + import { isOpenAPIV2, isOpenAPIV3_1 } from "@fern-api/api-workspace-commons"; import { mergeWithOverrides as coreMergeWithOverrides } from "@fern-api/core-utils"; +import { OpenAPIDocument, getParseOptions } from "@fern-api/openapi-ir-parser"; + +import { OpenAPIWorkspace } from "./OpenAPIWorkspace"; export class InMemoryOpenAPILoader { public loadDocument(spec: OpenAPIWorkspace.Spec): OpenAPIDocument { diff --git a/packages/cli/workspace/browser-compatible-fern-workspace/src/OpenAPIWorkspace.ts b/packages/cli/workspace/browser-compatible-fern-workspace/src/OpenAPIWorkspace.ts index f4f45ffa734..64357424bee 100644 --- a/packages/cli/workspace/browser-compatible-fern-workspace/src/OpenAPIWorkspace.ts +++ b/packages/cli/workspace/browser-compatible-fern-workspace/src/OpenAPIWorkspace.ts @@ -1,10 +1,12 @@ +import { OpenAPI } from "openapi-types"; + import { BaseOpenAPIWorkspace, BaseOpenAPIWorkspaceSync } from "@fern-api/api-workspace-commons"; import { generatorsYml } from "@fern-api/configuration"; import { OpenApiIntermediateRepresentation } from "@fern-api/openapi-ir"; import { parse } from "@fern-api/openapi-ir-parser"; import { AbsoluteFilePath } from "@fern-api/path-utils"; import { TaskContext } from "@fern-api/task-context"; -import { OpenAPI } from "openapi-types"; + import { InMemoryOpenAPILoader } from "./InMemoryOpenAPILoader"; const IN_MEMORY_ABSOLUTE_FILEPATH = AbsoluteFilePath.of("/"); diff --git a/packages/cli/workspace/commons/package.json b/packages/cli/workspace/commons/package.json index 9ae35997a97..46f6939bf1e 100644 --- a/packages/cli/workspace/commons/package.json +++ b/packages/cli/workspace/commons/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": { @@ -48,8 +47,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" } } \ No newline at end of file diff --git a/packages/cli/workspace/commons/src/AbstractAPIWorkspace.ts b/packages/cli/workspace/commons/src/AbstractAPIWorkspace.ts index b4b6fe65c44..355ccce9b8a 100644 --- a/packages/cli/workspace/commons/src/AbstractAPIWorkspace.ts +++ b/packages/cli/workspace/commons/src/AbstractAPIWorkspace.ts @@ -1,10 +1,11 @@ -import { TaskContext } from "@fern-api/task-context"; import { generatorsYml } from "@fern-api/configuration"; +import { DefinitionFileSchema, PackageMarkerFileSchema, RootApiFileSchema } from "@fern-api/fern-definition-schema"; import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/path-utils"; +import { TaskContext } from "@fern-api/task-context"; + +import { APIChangelog } from "./APIChangelog"; import { ParsedFernFile } from "./FernFile"; -import { DefinitionFileSchema, PackageMarkerFileSchema, RootApiFileSchema } from "@fern-api/fern-definition-schema"; import { FernWorkspace } from "./FernWorkspace"; -import { APIChangelog } from "./APIChangelog"; export interface FernDefinition { absoluteFilePath: AbsoluteFilePath; diff --git a/packages/cli/workspace/commons/src/FernWorkspace.ts b/packages/cli/workspace/commons/src/FernWorkspace.ts index 4f7058862d1..e687ef34767 100644 --- a/packages/cli/workspace/commons/src/FernWorkspace.ts +++ b/packages/cli/workspace/commons/src/FernWorkspace.ts @@ -1,5 +1,6 @@ import { dependenciesYml } from "@fern-api/configuration"; import { AbsoluteFilePath } from "@fern-api/path-utils"; + import { AbstractAPIWorkspace, FernDefinition } from "./AbstractAPIWorkspace"; import { IdentifiableSource } from "./Source"; diff --git a/packages/cli/workspace/commons/src/Spec.ts b/packages/cli/workspace/commons/src/Spec.ts index cec86c94a72..4db57480139 100644 --- a/packages/cli/workspace/commons/src/Spec.ts +++ b/packages/cli/workspace/commons/src/Spec.ts @@ -1,5 +1,6 @@ import { ParseOpenAPIOptions } from "@fern-api/openapi-ir-parser"; import { AbsoluteFilePath } from "@fern-api/path-utils"; + import { Source } from "./Source"; export type Spec = OpenAPISpec | ProtobufSpec; diff --git a/packages/cli/workspace/commons/src/openapi/BaseOpenAPIWorkspace.ts b/packages/cli/workspace/commons/src/openapi/BaseOpenAPIWorkspace.ts index 0ae1c651aea..f3721fd480b 100644 --- a/packages/cli/workspace/commons/src/openapi/BaseOpenAPIWorkspace.ts +++ b/packages/cli/workspace/commons/src/openapi/BaseOpenAPIWorkspace.ts @@ -1,10 +1,11 @@ -import { AbstractAPIWorkspace, AbstractAPIWorkspaceSync, FernDefinition, FernWorkspace } from ".."; +import { generatorsYml } from "@fern-api/configuration"; +import { OpenApiIntermediateRepresentation } from "@fern-api/openapi-ir"; import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/path-utils"; import { TaskContext } from "@fern-api/task-context"; -import { OpenApiIntermediateRepresentation } from "@fern-api/openapi-ir"; -import { OpenAPISettings } from "./OpenAPISettings"; + +import { AbstractAPIWorkspace, AbstractAPIWorkspaceSync, FernDefinition, FernWorkspace } from ".."; import { FernDefinitionConverter } from "./FernDefinitionConverter"; -import { generatorsYml } from "@fern-api/configuration"; +import { OpenAPISettings } from "./OpenAPISettings"; export declare namespace BaseOpenAPIWorkspace { export interface Args extends AbstractAPIWorkspace.Args { diff --git a/packages/cli/workspace/commons/src/openapi/FernDefinitionConverter.ts b/packages/cli/workspace/commons/src/openapi/FernDefinitionConverter.ts index 1a783f249cb..e2bb43b4563 100644 --- a/packages/cli/workspace/commons/src/openapi/FernDefinitionConverter.ts +++ b/packages/cli/workspace/commons/src/openapi/FernDefinitionConverter.ts @@ -1,12 +1,14 @@ -import { BaseOpenAPIWorkspace } from "./BaseOpenAPIWorkspace"; +import yaml from "js-yaml"; +import { mapValues } from "lodash-es"; + +import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration"; +import { OpenApiIntermediateRepresentation } from "@fern-api/openapi-ir"; import { convert, getConvertOptions } from "@fern-api/openapi-ir-to-fern"; -import { FernDefinition } from ".."; import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/path-utils"; import { TaskContext } from "@fern-api/task-context"; -import { OpenApiIntermediateRepresentation } from "@fern-api/openapi-ir"; -import { mapValues } from "lodash-es"; -import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration"; -import yaml from "js-yaml"; + +import { FernDefinition } from ".."; +import { BaseOpenAPIWorkspace } from "./BaseOpenAPIWorkspace"; export class FernDefinitionConverter { constructor(private readonly args: BaseOpenAPIWorkspace.Args) {} diff --git a/packages/cli/workspace/commons/src/openapi/constants.ts b/packages/cli/workspace/commons/src/openapi/constants.ts index 9506326a10e..90575b03ace 100644 --- a/packages/cli/workspace/commons/src/openapi/constants.ts +++ b/packages/cli/workspace/commons/src/openapi/constants.ts @@ -1,6 +1,7 @@ -import { FERN_TYPE_EXTENSIONS } from "@fern-api/openapi-ir-parser"; -import { BundleOptions } from "@redocly/openapi-core/lib/bundle"; import { Config } from "@redocly/openapi-core"; +import { BundleOptions } from "@redocly/openapi-core/lib/bundle"; + +import { FERN_TYPE_EXTENSIONS } from "@fern-api/openapi-ir-parser"; export const DEFAULT_OPENAPI_BUNDLE_OPTIONS: BundleOptions = { config: new Config( diff --git a/packages/cli/workspace/commons/src/openapi/getBaseOpenAPIWorkspaceSettingsFromGeneratorInvocation.ts b/packages/cli/workspace/commons/src/openapi/getBaseOpenAPIWorkspaceSettingsFromGeneratorInvocation.ts index 4213d11d857..eb8b5b3925c 100644 --- a/packages/cli/workspace/commons/src/openapi/getBaseOpenAPIWorkspaceSettingsFromGeneratorInvocation.ts +++ b/packages/cli/workspace/commons/src/openapi/getBaseOpenAPIWorkspaceSettingsFromGeneratorInvocation.ts @@ -1,4 +1,5 @@ import { generatorsYml } from "@fern-api/configuration"; + import { type BaseOpenAPIWorkspace } from "./BaseOpenAPIWorkspace"; export function getBaseOpenAPIWorkspaceSettingsFromGeneratorInvocation( diff --git a/packages/cli/workspace/commons/src/utils/getAllDefinitionFiles.ts b/packages/cli/workspace/commons/src/utils/getAllDefinitionFiles.ts index cb57c128a8b..929d39e241f 100644 --- a/packages/cli/workspace/commons/src/utils/getAllDefinitionFiles.ts +++ b/packages/cli/workspace/commons/src/utils/getAllDefinitionFiles.ts @@ -1,7 +1,8 @@ -import { RelativeFilePath } from "@fern-api/path-utils"; import { DefinitionFileSchema } from "@fern-api/fern-definition-schema"; -import { ParsedFernFile } from "../FernFile"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { FernDefinition } from "../AbstractAPIWorkspace"; +import { ParsedFernFile } from "../FernFile"; import { getAllNamedDefinitionFiles } from "./getAllNamedDefinitionFiles"; import { getAllPackageMarkers } from "./getAllPackageMarkers"; diff --git a/packages/cli/workspace/commons/src/utils/getAllNamedDefinitionFiles.ts b/packages/cli/workspace/commons/src/utils/getAllNamedDefinitionFiles.ts index 13e1aa58d65..c32c2ed5a90 100644 --- a/packages/cli/workspace/commons/src/utils/getAllNamedDefinitionFiles.ts +++ b/packages/cli/workspace/commons/src/utils/getAllNamedDefinitionFiles.ts @@ -1,9 +1,11 @@ +import { mapKeys } from "lodash-es"; + import { entries } from "@fern-api/core-utils"; -import { join, RelativeFilePath } from "@fern-api/path-utils"; import { DefinitionFileSchema } from "@fern-api/fern-definition-schema"; -import { mapKeys } from "lodash-es"; -import { ParsedFernFile } from "../FernFile"; +import { RelativeFilePath, join } from "@fern-api/path-utils"; + import { FernDefinition } from "../AbstractAPIWorkspace"; +import { ParsedFernFile } from "../FernFile"; export declare namespace getAllNamedDefinitionFiles { interface Opts { diff --git a/packages/cli/workspace/commons/src/utils/getAllPackageMarkers.ts b/packages/cli/workspace/commons/src/utils/getAllPackageMarkers.ts index e91a2c57f8f..a110d22286a 100644 --- a/packages/cli/workspace/commons/src/utils/getAllPackageMarkers.ts +++ b/packages/cli/workspace/commons/src/utils/getAllPackageMarkers.ts @@ -1,9 +1,11 @@ +import { mapKeys } from "lodash-es"; + import { entries } from "@fern-api/core-utils"; -import { join, RelativeFilePath } from "@fern-api/path-utils"; import { PackageMarkerFileSchema } from "@fern-api/fern-definition-schema"; -import { mapKeys } from "lodash-es"; -import { ParsedFernFile } from "../FernFile"; +import { RelativeFilePath, join } from "@fern-api/path-utils"; + import { FernDefinition } from "../AbstractAPIWorkspace"; +import { ParsedFernFile } from "../FernFile"; export declare namespace getAllPackageMarkers { interface Opts { diff --git a/packages/cli/workspace/commons/src/utils/getDefinitionFile.ts b/packages/cli/workspace/commons/src/utils/getDefinitionFile.ts index 742bace3fb2..60cb5668dfc 100644 --- a/packages/cli/workspace/commons/src/utils/getDefinitionFile.ts +++ b/packages/cli/workspace/commons/src/utils/getDefinitionFile.ts @@ -1,5 +1,6 @@ -import { RelativeFilePath } from "@fern-api/path-utils"; import { DefinitionFileSchema } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { FernWorkspace } from "../FernWorkspace"; import { getAllDefinitionFiles } from "./getAllDefinitionFiles"; diff --git a/packages/cli/workspace/commons/src/utils/visitAllDefinitionFiles.ts b/packages/cli/workspace/commons/src/utils/visitAllDefinitionFiles.ts index b8fc89ba1a7..f73492d72fe 100644 --- a/packages/cli/workspace/commons/src/utils/visitAllDefinitionFiles.ts +++ b/packages/cli/workspace/commons/src/utils/visitAllDefinitionFiles.ts @@ -1,8 +1,9 @@ import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration"; import { entries } from "@fern-api/core-utils"; -import { RelativeFilePath } from "@fern-api/path-utils"; import { DefinitionFileSchema } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/path-utils"; import { basename } from "@fern-api/path-utils"; + import { FernWorkspace } from "../FernWorkspace"; import { getAllDefinitionFiles } from "./getAllDefinitionFiles"; diff --git a/packages/cli/workspace/commons/src/utils/visitAllPackageMarkers.ts b/packages/cli/workspace/commons/src/utils/visitAllPackageMarkers.ts index fcd8a9352ef..347cfbbf5a7 100644 --- a/packages/cli/workspace/commons/src/utils/visitAllPackageMarkers.ts +++ b/packages/cli/workspace/commons/src/utils/visitAllPackageMarkers.ts @@ -1,6 +1,7 @@ import { entries } from "@fern-api/core-utils"; -import { RelativeFilePath } from "@fern-api/path-utils"; import { PackageMarkerFileSchema } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/path-utils"; + import { FernWorkspace } from "../FernWorkspace"; import { getAllPackageMarkers } from "./getAllPackageMarkers"; diff --git a/packages/cli/workspace/lazy-fern-workspace/package.json b/packages/cli/workspace/lazy-fern-workspace/package.json index 68eb69f6e5c..c87f0e86b37 100644 --- a/packages/cli/workspace/lazy-fern-workspace/package.json +++ b/packages/cli/workspace/lazy-fern-workspace/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": { @@ -68,8 +67,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" } } \ No newline at end of file diff --git a/packages/cli/workspace/lazy-fern-workspace/src/ConjureWorkspace.ts b/packages/cli/workspace/lazy-fern-workspace/src/ConjureWorkspace.ts index 43846e734ca..dc1592b00f3 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/ConjureWorkspace.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/ConjureWorkspace.ts @@ -1,9 +1,11 @@ +import yaml from "js-yaml"; + import { AbstractAPIWorkspace, FernDefinition, FernWorkspace } from "@fern-api/api-workspace-commons"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; -import { ConjureImporter } from "@fern-api/conjure-to-fern"; import { FERN_PACKAGE_MARKER_FILENAME } from "@fern-api/configuration-loader"; -import yaml from "js-yaml"; +import { ConjureImporter } from "@fern-api/conjure-to-fern"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { mapValues } from "./utils/mapValues"; export declare namespace ConjureWorkspace { diff --git a/packages/cli/workspace/lazy-fern-workspace/src/LazyFernWorkspace.ts b/packages/cli/workspace/lazy-fern-workspace/src/LazyFernWorkspace.ts index d4b25480621..1bfadde1655 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/LazyFernWorkspace.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/LazyFernWorkspace.ts @@ -1,20 +1,22 @@ +import hash from "object-hash"; + +import { AbstractAPIWorkspace, FernDefinition, FernWorkspace } from "@fern-api/api-workspace-commons"; import { DEFINITION_DIRECTORY, - loadDependenciesConfiguration, dependenciesYml, - generatorsYml + generatorsYml, + loadDependenciesConfiguration } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; -import hash from "object-hash"; + +import { OSSWorkspace } from "./OSSWorkspace"; import { handleFailedWorkspaceParserResultRaw } from "./utils/handleFailedWorkspaceParserResult"; import { listFernFiles } from "./utils/listFernFiles"; +import { LoadAPIWorkspace } from "./utils/loadAPIWorkspace"; import { parseYamlFiles } from "./utils/parseYamlFiles"; import { processPackageMarkers } from "./utils/processPackageMarkers"; import { validateStructureOfYamlFiles } from "./utils/validateStructureOfYamlFiles"; -import { OSSWorkspace } from "./OSSWorkspace"; -import { FernWorkspace, AbstractAPIWorkspace, FernDefinition } from "@fern-api/api-workspace-commons"; -import { LoadAPIWorkspace } from "./utils/loadAPIWorkspace"; export declare namespace LazyFernWorkspace { export interface Args extends AbstractAPIWorkspace.Args { diff --git a/packages/cli/workspace/lazy-fern-workspace/src/OSSWorkspace.ts b/packages/cli/workspace/lazy-fern-workspace/src/OSSWorkspace.ts index 068264554bb..7c680049812 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/OSSWorkspace.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/OSSWorkspace.ts @@ -1,3 +1,5 @@ +import { v4 as uuidv4 } from "uuid"; + import { AbstractAPIWorkspace, BaseOpenAPIWorkspace, @@ -10,7 +12,7 @@ import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { OpenApiIntermediateRepresentation } from "@fern-api/openapi-ir"; import { parse } from "@fern-api/openapi-ir-parser"; import { TaskContext } from "@fern-api/task-context"; -import { v4 as uuidv4 } from "uuid"; + import { OpenAPILoader } from "./loaders/OpenAPILoader"; import { getAllOpenAPISpecs } from "./utils/getAllOpenAPISpecs"; diff --git a/packages/cli/workspace/lazy-fern-workspace/src/__test__/parseYamlFiles.test.ts b/packages/cli/workspace/lazy-fern-workspace/src/__test__/parseYamlFiles.test.ts index 381fdabc21c..d3f7aae73d0 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/__test__/parseYamlFiles.test.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/__test__/parseYamlFiles.test.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, RelativeFilePath, resolve } from "@fern-api/fs-utils"; import { YAMLException } from "js-yaml"; + +import { AbsoluteFilePath, RelativeFilePath, resolve } from "@fern-api/fs-utils"; + import { parseYamlFiles } from "../utils/parseYamlFiles"; const FILEPATH = RelativeFilePath.of("duplicate-key.yml"); diff --git a/packages/cli/workspace/lazy-fern-workspace/src/loaders/OpenAPILoader.ts b/packages/cli/workspace/lazy-fern-workspace/src/loaders/OpenAPILoader.ts index 50f49b1a629..5051cdc69b3 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/loaders/OpenAPILoader.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/loaders/OpenAPILoader.ts @@ -1,15 +1,17 @@ -import { TaskContext } from "@fern-api/task-context"; -import { mergeWithOverrides } from "./mergeWithOverrides"; -import { AbsoluteFilePath, dirname, join, relative, RelativeFilePath } from "@fern-api/fs-utils"; -import { AsyncAPIV2, Document, FernOpenAPIExtension } from "@fern-api/openapi-ir-parser"; -import { Source as OpenApiIrSource } from "@fern-api/openapi-ir"; +import { Source, bundle } from "@redocly/openapi-core"; import { readFile } from "fs/promises"; -import { OpenAPI, OpenAPIV2, OpenAPIV3 } from "openapi-types"; -import { bundle, Source } from "@redocly/openapi-core"; import yaml from "js-yaml"; -import { DEFAULT_OPENAPI_BUNDLE_OPTIONS, OpenAPISpec, isOpenAPIV3, isOpenAPIV2 } from "@fern-api/api-workspace-commons"; +import { OpenAPI, OpenAPIV2, OpenAPIV3 } from "openapi-types"; import { convertObj } from "swagger2openapi"; +import { DEFAULT_OPENAPI_BUNDLE_OPTIONS, OpenAPISpec, isOpenAPIV2, isOpenAPIV3 } from "@fern-api/api-workspace-commons"; +import { AbsoluteFilePath, RelativeFilePath, dirname, join, relative } from "@fern-api/fs-utils"; +import { Source as OpenApiIrSource } from "@fern-api/openapi-ir"; +import { AsyncAPIV2, Document, FernOpenAPIExtension } from "@fern-api/openapi-ir-parser"; +import { TaskContext } from "@fern-api/task-context"; + +import { mergeWithOverrides } from "./mergeWithOverrides"; + export class OpenAPILoader { constructor(private readonly absoluteFilePath: AbsoluteFilePath) {} diff --git a/packages/cli/workspace/lazy-fern-workspace/src/loaders/mergeWithOverrides.ts b/packages/cli/workspace/lazy-fern-workspace/src/loaders/mergeWithOverrides.ts index 8264c6df6a4..d0bfc8b611f 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/loaders/mergeWithOverrides.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/loaders/mergeWithOverrides.ts @@ -1,8 +1,9 @@ -import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile } from "fs/promises"; import yaml from "js-yaml"; + import { mergeWithOverrides as coreMergeWithOverrides } from "@fern-api/core-utils"; +import { AbsoluteFilePath } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; export async function mergeWithOverrides({ absoluteFilePathToOverrides, diff --git a/packages/cli/workspace/lazy-fern-workspace/src/protobuf/ProtobufOpenAPIGenerator.ts b/packages/cli/workspace/lazy-fern-workspace/src/protobuf/ProtobufOpenAPIGenerator.ts index cdb0dc1a07e..4925719fe24 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/protobuf/ProtobufOpenAPIGenerator.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/protobuf/ProtobufOpenAPIGenerator.ts @@ -1,9 +1,10 @@ -import { AbsoluteFilePath, join, relative, RelativeFilePath } from "@fern-api/fs-utils"; -import { createLoggingExecutable } from "@fern-api/logging-execa"; -import { TaskContext } from "@fern-api/task-context"; import { cp, writeFile } from "fs/promises"; import tmp from "tmp-promise"; +import { AbsoluteFilePath, RelativeFilePath, join, relative } from "@fern-api/fs-utils"; +import { createLoggingExecutable } from "@fern-api/logging-execa"; +import { TaskContext } from "@fern-api/task-context"; + const PROTOBUF_GENERATOR_CONFIG_FILENAME = "buf.gen.yaml"; const PROTOBUF_GENERATOR_OUTPUT_PATH = "output"; const PROTOBUF_GENERATOR_OUTPUT_FILEPATH = `${PROTOBUF_GENERATOR_OUTPUT_PATH}/openapi.yaml`; diff --git a/packages/cli/workspace/lazy-fern-workspace/src/utils/Result.ts b/packages/cli/workspace/lazy-fern-workspace/src/utils/Result.ts index e1cb230076b..8c9792b7183 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/utils/Result.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/utils/Result.ts @@ -1,9 +1,11 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { ZodError } from "zod"; -import { OSSWorkspace } from "../OSSWorkspace"; -import { LazyFernWorkspace } from "../LazyFernWorkspace"; -import { ConjureWorkspace } from "../ConjureWorkspace"; + import { validateAgainstJsonSchema } from "@fern-api/core-utils"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + +import { ConjureWorkspace } from "../ConjureWorkspace"; +import { LazyFernWorkspace } from "../LazyFernWorkspace"; +import { OSSWorkspace } from "../OSSWorkspace"; export declare namespace WorkspaceLoader { export type Result = SuccessfulResult | FailedResult; diff --git a/packages/cli/workspace/lazy-fern-workspace/src/utils/getAllOpenAPISpecs.ts b/packages/cli/workspace/lazy-fern-workspace/src/utils/getAllOpenAPISpecs.ts index c55cedf521b..46e575c8e14 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/utils/getAllOpenAPISpecs.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/utils/getAllOpenAPISpecs.ts @@ -1,7 +1,8 @@ +import { OpenAPISpec, ProtobufSpec, Spec } from "@fern-api/api-workspace-commons"; import { RelativeFilePath, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; + import { ProtobufOpenAPIGenerator } from "../protobuf/ProtobufOpenAPIGenerator"; -import { OpenAPISpec, ProtobufSpec, Spec } from "@fern-api/api-workspace-commons"; export async function getAllOpenAPISpecs({ context, diff --git a/packages/cli/workspace/lazy-fern-workspace/src/utils/handleFailedWorkspaceParserResult.ts b/packages/cli/workspace/lazy-fern-workspace/src/utils/handleFailedWorkspaceParserResult.ts index 26e225ad111..339a0aa28cf 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/utils/handleFailedWorkspaceParserResult.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/utils/handleFailedWorkspaceParserResult.ts @@ -1,11 +1,13 @@ +import chalk from "chalk"; +import { YAMLException } from "js-yaml"; +import { ZodIssue, ZodIssueCode } from "zod"; + import { formatLog } from "@fern-api/cli-logger"; import { DEPENDENCIES_FILENAME } from "@fern-api/configuration-loader"; import { assertNever, entries } from "@fern-api/core-utils"; import { RelativeFilePath } from "@fern-api/fs-utils"; import { Logger } from "@fern-api/logger"; -import chalk from "chalk"; -import { YAMLException } from "js-yaml"; -import { ZodIssue, ZodIssueCode } from "zod"; + import { WorkspaceLoader, WorkspaceLoaderFailureType } from "./Result"; export function handleFailedWorkspaceParserResult(result: WorkspaceLoader.FailedResult, logger: Logger): void { diff --git a/packages/cli/workspace/lazy-fern-workspace/src/utils/listFernFiles.ts b/packages/cli/workspace/lazy-fern-workspace/src/utils/listFernFiles.ts index 828cd3bffb8..f4b37568c50 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/utils/listFernFiles.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/utils/listFernFiles.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, listFiles, relative, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; + import { FernFile } from "@fern-api/api-workspace-commons"; +import { AbsoluteFilePath, RelativeFilePath, listFiles, relative } from "@fern-api/fs-utils"; export async function listFernFiles(root: AbsoluteFilePath, extensionGlob: string): Promise { const files: FernFile[] = []; diff --git a/packages/cli/workspace/lazy-fern-workspace/src/utils/loadAPIWorkspace.ts b/packages/cli/workspace/lazy-fern-workspace/src/utils/loadAPIWorkspace.ts index 2368aea5061..528d53d2fe0 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/utils/loadAPIWorkspace.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/utils/loadAPIWorkspace.ts @@ -1,5 +1,6 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; + import { WorkspaceLoader } from "./Result"; export type LoadAPIWorkspace = ({ diff --git a/packages/cli/workspace/lazy-fern-workspace/src/utils/loadDependency.ts b/packages/cli/workspace/lazy-fern-workspace/src/utils/loadDependency.ts index d18aac7fa81..1c92113cf17 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/utils/loadDependency.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/utils/loadDependency.ts @@ -1,11 +1,3 @@ -import { dependenciesYml } from "@fern-api/configuration-loader"; -import { createFiddleService } from "@fern-api/core"; -import { assertNever, noop, visitObject } from "@fern-api/core-utils"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { parseVersion } from "@fern-api/semver-utils"; -import { TaskContext } from "@fern-api/task-context"; -import { RootApiFileSchema, YAML_SCHEMA_VERSION } from "@fern-api/fern-definition-schema"; -import { FernFiddle } from "@fern-fern/fiddle-sdk"; import axios from "axios"; import { createWriteStream } from "fs"; import { mkdir, readFile, writeFile } from "fs/promises"; @@ -15,9 +7,20 @@ import path from "path"; import { pipeline } from "stream/promises"; import { extract as extractTar } from "tar"; import tmp from "tmp-promise"; -import { WorkspaceLoader, WorkspaceLoaderFailureType } from "./Result"; -import { OSSWorkspace } from "../OSSWorkspace"; + import { FernDefinition, FernWorkspace } from "@fern-api/api-workspace-commons"; +import { dependenciesYml } from "@fern-api/configuration-loader"; +import { createFiddleService } from "@fern-api/core"; +import { assertNever, noop, visitObject } from "@fern-api/core-utils"; +import { RootApiFileSchema, YAML_SCHEMA_VERSION } from "@fern-api/fern-definition-schema"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { parseVersion } from "@fern-api/semver-utils"; +import { TaskContext } from "@fern-api/task-context"; + +import { FernFiddle } from "@fern-fern/fiddle-sdk"; + +import { OSSWorkspace } from "../OSSWorkspace"; +import { WorkspaceLoader, WorkspaceLoaderFailureType } from "./Result"; import { LoadAPIWorkspace } from "./loadAPIWorkspace"; const FIDDLE = createFiddleService(); diff --git a/packages/cli/workspace/lazy-fern-workspace/src/utils/parseYamlFiles.ts b/packages/cli/workspace/lazy-fern-workspace/src/utils/parseYamlFiles.ts index 55d1f0f38cc..5e5d6a77772 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/utils/parseYamlFiles.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/utils/parseYamlFiles.ts @@ -1,6 +1,8 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import yaml from "js-yaml"; + import { FernFile, ParsedFernFile } from "@fern-api/api-workspace-commons"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { WorkspaceLoader, WorkspaceLoaderFailureType } from "./Result"; export declare namespace Parser { diff --git a/packages/cli/workspace/lazy-fern-workspace/src/utils/processPackageMarkers.ts b/packages/cli/workspace/lazy-fern-workspace/src/utils/processPackageMarkers.ts index f95e7ffd1df..f5a8dfe8df4 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/utils/processPackageMarkers.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/utils/processPackageMarkers.ts @@ -1,15 +1,17 @@ +import { size } from "lodash-es"; + +import { FernDefinition, ParsedFernFile } from "@fern-api/api-workspace-commons"; import { dependenciesYml } from "@fern-api/configuration-loader"; import { entries, keys } from "@fern-api/core-utils"; -import { dirname, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { PackageMarkerFileSchema } from "@fern-api/fern-definition-schema"; -import { size } from "lodash-es"; -import { loadDependency } from "./loadDependency"; -import { WorkspaceLoader, WorkspaceLoaderFailureType } from "./Result"; -import { validateStructureOfYamlFiles } from "./validateStructureOfYamlFiles"; +import { RelativeFilePath, dirname } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { OSSWorkspace } from "../OSSWorkspace"; -import { FernDefinition, ParsedFernFile } from "@fern-api/api-workspace-commons"; +import { WorkspaceLoader, WorkspaceLoaderFailureType } from "./Result"; import { LoadAPIWorkspace } from "./loadAPIWorkspace"; +import { loadDependency } from "./loadDependency"; +import { validateStructureOfYamlFiles } from "./validateStructureOfYamlFiles"; export declare namespace processPackageMarkers { export type Return = SuccessfulResult | FailedResult; diff --git a/packages/cli/workspace/lazy-fern-workspace/src/utils/validateStructureOfYamlFiles.ts b/packages/cli/workspace/lazy-fern-workspace/src/utils/validateStructureOfYamlFiles.ts index 7d975004aa2..61eccc69ddb 100644 --- a/packages/cli/workspace/lazy-fern-workspace/src/utils/validateStructureOfYamlFiles.ts +++ b/packages/cli/workspace/lazy-fern-workspace/src/utils/validateStructureOfYamlFiles.ts @@ -1,13 +1,15 @@ -import { FERN_PACKAGE_MARKER_FILENAME, ROOT_API_FILENAME } from "@fern-api/configuration-loader"; -import { entries, validateAgainstJsonSchema } from "@fern-api/core-utils"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { PackageMarkerFileSchema, RootApiFileSchema, RawSchemas } from "@fern-api/fern-definition-schema"; import path from "path"; -import { WorkspaceLoader, WorkspaceLoaderFailureType } from "./Result"; + import { OnDiskNamedDefinitionFile, ParsedFernFile } from "@fern-api/api-workspace-commons"; -import * as DefinitionFileJsonSchema from "../fern.schema.json"; +import { FERN_PACKAGE_MARKER_FILENAME, ROOT_API_FILENAME } from "@fern-api/configuration-loader"; +import { entries, validateAgainstJsonSchema } from "@fern-api/core-utils"; +import { PackageMarkerFileSchema, RawSchemas, RootApiFileSchema } from "@fern-api/fern-definition-schema"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import * as RootApiFileJsonSchema from "../api-yml.schema.json"; +import * as DefinitionFileJsonSchema from "../fern.schema.json"; import * as PackageMarkerFileJsonSchema from "../package-yml.schema.json"; +import { WorkspaceLoader, WorkspaceLoaderFailureType } from "./Result"; export declare namespace validateStructureOfYamlFiles { export type Return = SuccessfulResult | FailedResult; diff --git a/packages/cli/workspace/loader/package.json b/packages/cli/workspace/loader/package.json index 6792b65d254..0d3456c55c9 100644 --- a/packages/cli/workspace/loader/package.json +++ b/packages/cli/workspace/loader/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": { @@ -50,8 +49,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" } } \ No newline at end of file diff --git a/packages/cli/workspace/loader/src/__test__/loadWorkspace.test.ts b/packages/cli/workspace/loader/src/__test__/loadWorkspace.test.ts index 5d8f75d3597..a0e1bd4ccb5 100644 --- a/packages/cli/workspace/loader/src/__test__/loadWorkspace.test.ts +++ b/packages/cli/workspace/loader/src/__test__/loadWorkspace.test.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { createMockTaskContext } from "@fern-api/task-context"; -import { RawSchemas } from "@fern-api/fern-definition-schema"; import assert from "assert"; + +import { RawSchemas } from "@fern-api/fern-definition-schema"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { createMockTaskContext } from "@fern-api/task-context"; + import { loadAPIWorkspace } from "../loadAPIWorkspace"; describe("loadWorkspace", () => { diff --git a/packages/cli/workspace/loader/src/handleFailedWorkspaceParserResult.ts b/packages/cli/workspace/loader/src/handleFailedWorkspaceParserResult.ts index 57827522293..80e98ce4f5d 100644 --- a/packages/cli/workspace/loader/src/handleFailedWorkspaceParserResult.ts +++ b/packages/cli/workspace/loader/src/handleFailedWorkspaceParserResult.ts @@ -1,12 +1,13 @@ -import { DEPENDENCIES_FILENAME } from "@fern-api/configuration-loader"; -import { assertNever, entries } from "@fern-api/core-utils"; -import { RelativeFilePath } from "@fern-api/fs-utils"; -import { Logger } from "@fern-api/logger"; -import { formatLog } from "@fern-api/cli-logger"; import chalk from "chalk"; import { YAMLException } from "js-yaml"; import { ZodIssue, ZodIssueCode } from "zod"; + +import { formatLog } from "@fern-api/cli-logger"; +import { DEPENDENCIES_FILENAME } from "@fern-api/configuration-loader"; +import { assertNever, entries } from "@fern-api/core-utils"; +import { RelativeFilePath } from "@fern-api/fs-utils"; import { WorkspaceLoader, WorkspaceLoaderFailureType } from "@fern-api/lazy-fern-workspace"; +import { Logger } from "@fern-api/logger"; export function handleFailedWorkspaceParserResult(result: WorkspaceLoader.FailedResult, logger: Logger): void { for (const [relativeFilepath, failure] of entries(result.failures)) { diff --git a/packages/cli/workspace/loader/src/listFernFiles.ts b/packages/cli/workspace/loader/src/listFernFiles.ts index 8bda256a51e..d57815c272d 100644 --- a/packages/cli/workspace/loader/src/listFernFiles.ts +++ b/packages/cli/workspace/loader/src/listFernFiles.ts @@ -1,5 +1,7 @@ -import { AbsoluteFilePath, listFiles, relative, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; + +import { AbsoluteFilePath, RelativeFilePath, listFiles, relative } from "@fern-api/fs-utils"; + import { FernFile } from "./types/FernFile"; export async function listFernFiles(root: AbsoluteFilePath, extensionGlob: string): Promise { diff --git a/packages/cli/workspace/loader/src/loadAPIChangelog.ts b/packages/cli/workspace/loader/src/loadAPIChangelog.ts index 0f5290ad519..0491f6022e6 100644 --- a/packages/cli/workspace/loader/src/loadAPIChangelog.ts +++ b/packages/cli/workspace/loader/src/loadAPIChangelog.ts @@ -1,7 +1,8 @@ +import { APIChangelog } from "@fern-api/api-workspace-commons"; import { CHANGELOG_DIRECTORY } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; + import { listFernFiles } from "./listFernFiles"; -import { APIChangelog } from "@fern-api/api-workspace-commons"; export async function loadAPIChangelog({ absolutePathToWorkspace diff --git a/packages/cli/workspace/loader/src/loadAPIWorkspace.ts b/packages/cli/workspace/loader/src/loadAPIWorkspace.ts index 0be1de8415f..7877232c375 100644 --- a/packages/cli/workspace/loader/src/loadAPIWorkspace.ts +++ b/packages/cli/workspace/loader/src/loadAPIWorkspace.ts @@ -1,11 +1,11 @@ import { Spec } from "@fern-api/api-workspace-commons"; import { DEFINITION_DIRECTORY, + OPENAPI_DIRECTORY, generatorsYml, - loadGeneratorsConfiguration, - OPENAPI_DIRECTORY + loadGeneratorsConfiguration } from "@fern-api/configuration-loader"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; import { ConjureWorkspace, LazyFernWorkspace, @@ -14,6 +14,7 @@ import { WorkspaceLoaderFailureType } from "@fern-api/lazy-fern-workspace"; import { TaskContext } from "@fern-api/task-context"; + import { loadAPIChangelog } from "./loadAPIChangelog"; export async function loadSingleNamespaceAPIWorkspace({ diff --git a/packages/cli/workspace/loader/src/loadAsyncAPIFile.ts b/packages/cli/workspace/loader/src/loadAsyncAPIFile.ts index d69772270f9..e17396265fc 100644 --- a/packages/cli/workspace/loader/src/loadAsyncAPIFile.ts +++ b/packages/cli/workspace/loader/src/loadAsyncAPIFile.ts @@ -1,7 +1,8 @@ -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readdir } from "fs/promises"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + export async function getValidAbsolutePathToAsyncAPIFromFolder( context: TaskContext, absolutePathToAsyncAPIFolder: AbsoluteFilePath diff --git a/packages/cli/workspace/loader/src/loadDocsWorkspace.ts b/packages/cli/workspace/loader/src/loadDocsWorkspace.ts index 0f208223b2d..916a5df0ca9 100644 --- a/packages/cli/workspace/loader/src/loadDocsWorkspace.ts +++ b/packages/cli/workspace/loader/src/loadDocsWorkspace.ts @@ -1,10 +1,12 @@ -import { docsYml, DOCS_CONFIGURATION_FILENAME } from "@fern-api/configuration-loader"; -import { addPrefixToString } from "@fern-api/core-utils"; -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readFile } from "fs/promises"; import yaml from "js-yaml"; import path from "path"; + +import { DOCS_CONFIGURATION_FILENAME, docsYml } from "@fern-api/configuration-loader"; +import { addPrefixToString } from "@fern-api/core-utils"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { DocsWorkspace } from "./types/Workspace"; export async function loadDocsWorkspace({ diff --git a/packages/cli/workspace/loader/src/loadOpenAPIFile.ts b/packages/cli/workspace/loader/src/loadOpenAPIFile.ts index 68eedfac1e0..d50f8665252 100644 --- a/packages/cli/workspace/loader/src/loadOpenAPIFile.ts +++ b/packages/cli/workspace/loader/src/loadOpenAPIFile.ts @@ -1,7 +1,8 @@ -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import { readdir } from "fs/promises"; +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + export async function getValidAbsolutePathToOpenAPIFromFolder( context: TaskContext, absolutePathToOpenAPIFolder: AbsoluteFilePath diff --git a/packages/cli/workspace/loader/src/protobuf/ProtobufOpenAPIGenerator.ts b/packages/cli/workspace/loader/src/protobuf/ProtobufOpenAPIGenerator.ts index cdb0dc1a07e..4925719fe24 100644 --- a/packages/cli/workspace/loader/src/protobuf/ProtobufOpenAPIGenerator.ts +++ b/packages/cli/workspace/loader/src/protobuf/ProtobufOpenAPIGenerator.ts @@ -1,9 +1,10 @@ -import { AbsoluteFilePath, join, relative, RelativeFilePath } from "@fern-api/fs-utils"; -import { createLoggingExecutable } from "@fern-api/logging-execa"; -import { TaskContext } from "@fern-api/task-context"; import { cp, writeFile } from "fs/promises"; import tmp from "tmp-promise"; +import { AbsoluteFilePath, RelativeFilePath, join, relative } from "@fern-api/fs-utils"; +import { createLoggingExecutable } from "@fern-api/logging-execa"; +import { TaskContext } from "@fern-api/task-context"; + const PROTOBUF_GENERATOR_CONFIG_FILENAME = "buf.gen.yaml"; const PROTOBUF_GENERATOR_OUTPUT_PATH = "output"; const PROTOBUF_GENERATOR_OUTPUT_FILEPATH = `${PROTOBUF_GENERATOR_OUTPUT_PATH}/openapi.yaml`; diff --git a/packages/cli/workspace/loader/src/types/Workspace.ts b/packages/cli/workspace/loader/src/types/Workspace.ts index 997d3b9ab76..dd7e958e45c 100644 --- a/packages/cli/workspace/loader/src/types/Workspace.ts +++ b/packages/cli/workspace/loader/src/types/Workspace.ts @@ -1,6 +1,6 @@ +import { AbstractAPIWorkspace } from "@fern-api/api-workspace-commons"; import { docsYml } from "@fern-api/configuration-loader"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { AbstractAPIWorkspace } from "@fern-api/api-workspace-commons"; export type Workspace = DocsWorkspace | AbstractAPIWorkspace; diff --git a/packages/cli/yaml/docs-validator/package.json b/packages/cli/yaml/docs-validator/package.json index cc30538b4fb..95c29782177 100644 --- a/packages/cli/yaml/docs-validator/package.json +++ b/packages/cli/yaml/docs-validator/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": { @@ -55,8 +54,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" } diff --git a/packages/cli/yaml/docs-validator/src/Rule.ts b/packages/cli/yaml/docs-validator/src/Rule.ts index e67724f66fa..72ebe2b0772 100644 --- a/packages/cli/yaml/docs-validator/src/Rule.ts +++ b/packages/cli/yaml/docs-validator/src/Rule.ts @@ -1,5 +1,6 @@ import { Logger } from "@fern-api/logger"; import { DocsWorkspace } from "@fern-api/workspace-loader"; + import { DocsConfigFileAstNodeTypes } from "./docsAst/DocsConfigFileAstVisitor"; export interface Rule { diff --git a/packages/cli/yaml/docs-validator/src/ValidationViolation.ts b/packages/cli/yaml/docs-validator/src/ValidationViolation.ts index 69237149476..b59cb4b95ce 100644 --- a/packages/cli/yaml/docs-validator/src/ValidationViolation.ts +++ b/packages/cli/yaml/docs-validator/src/ValidationViolation.ts @@ -1,5 +1,5 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { NodePath } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/fs-utils"; export interface ValidationViolation { severity: "error" | "warning"; diff --git a/packages/cli/yaml/docs-validator/src/__test__/valid-file-types/valid-file-types.test.ts b/packages/cli/yaml/docs-validator/src/__test__/valid-file-types/valid-file-types.test.ts index 76679e09e7c..d20af9945ae 100644 --- a/packages/cli/yaml/docs-validator/src/__test__/valid-file-types/valid-file-types.test.ts +++ b/packages/cli/yaml/docs-validator/src/__test__/valid-file-types/valid-file-types.test.ts @@ -1,4 +1,5 @@ import path from "path"; + import { getViolationsForFile } from "../../rules/valid-file-types/valid-file-types"; describe("isValidFileType", () => { diff --git a/packages/cli/yaml/docs-validator/src/__test__/valid-markdown-link.test.ts b/packages/cli/yaml/docs-validator/src/__test__/valid-markdown-link.test.ts index 77f157b3a12..1374401e87a 100644 --- a/packages/cli/yaml/docs-validator/src/__test__/valid-markdown-link.test.ts +++ b/packages/cli/yaml/docs-validator/src/__test__/valid-markdown-link.test.ts @@ -1,4 +1,5 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { getReferencedMarkdownFiles } from "../rules/valid-markdown-link/valid-markdown-link"; describe("getReferencedMarkdownFiles", () => { diff --git a/packages/cli/yaml/docs-validator/src/createDocsConfigFileAstVisitorForRules.ts b/packages/cli/yaml/docs-validator/src/createDocsConfigFileAstVisitorForRules.ts index 7d5a349a4a6..9793bb27abf 100644 --- a/packages/cli/yaml/docs-validator/src/createDocsConfigFileAstVisitorForRules.ts +++ b/packages/cli/yaml/docs-validator/src/createDocsConfigFileAstVisitorForRules.ts @@ -1,12 +1,13 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { NodePath } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + +import { RuleVisitor } from "./Rule"; +import { ValidationViolation } from "./ValidationViolation"; import { DocsConfigFileAstNodeTypes, DocsConfigFileAstNodeVisitor, DocsConfigFileAstVisitor } from "./docsAst/DocsConfigFileAstVisitor"; -import { RuleVisitor } from "./Rule"; -import { ValidationViolation } from "./ValidationViolation"; export function createDocsConfigFileAstVisitorForRules({ relativeFilepath, diff --git a/packages/cli/yaml/docs-validator/src/docsAst/DocsConfigFileAstVisitor.ts b/packages/cli/yaml/docs-validator/src/docsAst/DocsConfigFileAstVisitor.ts index c1d9b1b0833..57851be7c49 100644 --- a/packages/cli/yaml/docs-validator/src/docsAst/DocsConfigFileAstVisitor.ts +++ b/packages/cli/yaml/docs-validator/src/docsAst/DocsConfigFileAstVisitor.ts @@ -1,8 +1,8 @@ import { docsYml } from "@fern-api/configuration-loader"; +import { NodePath } from "@fern-api/fern-definition-schema"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; import { AbstractAPIWorkspace } from "@fern-api/workspace-loader"; -import { NodePath } from "@fern-api/fern-definition-schema"; export type DocsConfigFileAstVisitor> = { [K in keyof DocsConfigFileAstNodeTypes]: DocsConfigFileAstNodeVisitor; diff --git a/packages/cli/yaml/docs-validator/src/docsAst/validateVersionConfig.ts b/packages/cli/yaml/docs-validator/src/docsAst/validateVersionConfig.ts index 75b0f654ae6..ccb06f2e976 100644 --- a/packages/cli/yaml/docs-validator/src/docsAst/validateVersionConfig.ts +++ b/packages/cli/yaml/docs-validator/src/docsAst/validateVersionConfig.ts @@ -1,5 +1,5 @@ -import { addPrefixToString } from "@fern-api/core-utils"; import { docsYml } from "@fern-api/configuration-loader"; +import { addPrefixToString } from "@fern-api/core-utils"; export type VersionParseResult = VersionFileSuccessParseResult | VersionFileFailureParseResult; diff --git a/packages/cli/yaml/docs-validator/src/docsAst/visitDocsConfigFileYamlAst.ts b/packages/cli/yaml/docs-validator/src/docsAst/visitDocsConfigFileYamlAst.ts index d86666be1b3..7624d17397e 100644 --- a/packages/cli/yaml/docs-validator/src/docsAst/visitDocsConfigFileYamlAst.ts +++ b/packages/cli/yaml/docs-validator/src/docsAst/visitDocsConfigFileYamlAst.ts @@ -1,15 +1,17 @@ +import { readFile } from "fs/promises"; +import yaml from "js-yaml"; + import { docsYml } from "@fern-api/configuration-loader"; +import { noop, visitObjectAsync } from "@fern-api/core-utils"; +import { NodePath } from "@fern-api/fern-definition-schema"; import { AbsoluteFilePath, dirname, doesPathExist, resolve } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; -import yaml from "js-yaml"; -import { DocsConfigFileAstVisitor } from "./DocsConfigFileAstVisitor"; + import { APIWorkspaceLoader } from "./APIWorkspaceLoader"; -import { noop, visitObjectAsync } from "@fern-api/core-utils"; -import { NodePath } from "@fern-api/fern-definition-schema"; +import { DocsConfigFileAstVisitor } from "./DocsConfigFileAstVisitor"; +import { validateVersionConfigFileSchema } from "./validateVersionConfig"; import { visitFilepath } from "./visitFilepath"; import { visitNavigationAst } from "./visitNavigationAst"; -import { validateVersionConfigFileSchema } from "./validateVersionConfig"; -import { readFile } from "fs/promises"; export declare namespace visitDocsConfigFileYamlAst { interface Args { diff --git a/packages/cli/yaml/docs-validator/src/docsAst/visitFilepath.ts b/packages/cli/yaml/docs-validator/src/docsAst/visitFilepath.ts index 42717c2a4cf..2dc4ddb78af 100644 --- a/packages/cli/yaml/docs-validator/src/docsAst/visitFilepath.ts +++ b/packages/cli/yaml/docs-validator/src/docsAst/visitFilepath.ts @@ -1,5 +1,6 @@ import { NodePath } from "@fern-api/fern-definition-schema"; import { AbsoluteFilePath, dirname, resolve } from "@fern-api/fs-utils"; + import { DocsConfigFileAstVisitor } from "./DocsConfigFileAstVisitor"; export async function visitFilepath({ diff --git a/packages/cli/yaml/docs-validator/src/docsAst/visitNavigationAst.ts b/packages/cli/yaml/docs-validator/src/docsAst/visitNavigationAst.ts index 614b0952046..a0e30a80413 100644 --- a/packages/cli/yaml/docs-validator/src/docsAst/visitNavigationAst.ts +++ b/packages/cli/yaml/docs-validator/src/docsAst/visitNavigationAst.ts @@ -1,13 +1,15 @@ +import { readFile } from "fs/promises"; + import { docsYml } from "@fern-api/configuration-loader"; +import { noop, visitObjectAsync } from "@fern-api/core-utils"; +import { parseImagePaths } from "@fern-api/docs-markdown-utils"; import { NodePath } from "@fern-api/fern-definition-schema"; import { AbsoluteFilePath, dirname, doesPathExist, relative, resolve } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { APIWorkspaceLoader } from "./APIWorkspaceLoader"; import { DocsConfigFileAstVisitor } from "./DocsConfigFileAstVisitor"; import { visitFilepath } from "./visitFilepath"; -import { readFile } from "fs/promises"; -import { noop, visitObjectAsync } from "@fern-api/core-utils"; -import { TaskContext } from "@fern-api/task-context"; -import { parseImagePaths } from "@fern-api/docs-markdown-utils"; export declare namespace visitNavigationAst { interface Args { diff --git a/packages/cli/yaml/docs-validator/src/rules/accent-color-contrast/index.ts b/packages/cli/yaml/docs-validator/src/rules/accent-color-contrast/index.ts index 8e9a1f304dc..17285c9314b 100644 --- a/packages/cli/yaml/docs-validator/src/rules/accent-color-contrast/index.ts +++ b/packages/cli/yaml/docs-validator/src/rules/accent-color-contrast/index.ts @@ -1,5 +1,7 @@ -import { docsYml, getColorFromRawConfig, getColorType } from "@fern-api/configuration-loader"; import tinycolor from "tinycolor2"; + +import { docsYml, getColorFromRawConfig, getColorType } from "@fern-api/configuration-loader"; + import { Rule, RuleViolation } from "../../Rule"; export const AccentColorContrastRule: Rule = { diff --git a/packages/cli/yaml/docs-validator/src/rules/filepaths-exist/filepaths-exist.ts b/packages/cli/yaml/docs-validator/src/rules/filepaths-exist/filepaths-exist.ts index 1a2cd07271c..682a6a21adb 100644 --- a/packages/cli/yaml/docs-validator/src/rules/filepaths-exist/filepaths-exist.ts +++ b/packages/cli/yaml/docs-validator/src/rules/filepaths-exist/filepaths-exist.ts @@ -1,4 +1,5 @@ import { doesPathExist } from "@fern-api/fs-utils"; + import { Rule } from "../../Rule"; export const FilepathsExistRule: Rule = { diff --git a/packages/cli/yaml/docs-validator/src/rules/playground-environments-exist/__test__/playground-environments-exist.test.ts b/packages/cli/yaml/docs-validator/src/rules/playground-environments-exist/__test__/playground-environments-exist.test.ts index 9cc0efe4dac..4f78532b9f4 100644 --- a/packages/cli/yaml/docs-validator/src/rules/playground-environments-exist/__test__/playground-environments-exist.test.ts +++ b/packages/cli/yaml/docs-validator/src/rules/playground-environments-exist/__test__/playground-environments-exist.test.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { PlaygroundEnvironmentsExistRule } from "../playground-environments-exist"; diff --git a/packages/cli/yaml/docs-validator/src/rules/tab-with-href/index.ts b/packages/cli/yaml/docs-validator/src/rules/tab-with-href/index.ts index efe57a52e68..b2c02271be7 100644 --- a/packages/cli/yaml/docs-validator/src/rules/tab-with-href/index.ts +++ b/packages/cli/yaml/docs-validator/src/rules/tab-with-href/index.ts @@ -1,4 +1,5 @@ import { docsYml } from "@fern-api/configuration-loader"; + import { Rule, RuleViolation } from "../../Rule"; export const TabWithHrefRule: Rule = { diff --git a/packages/cli/yaml/docs-validator/src/rules/valid-file-types/valid-file-types.ts b/packages/cli/yaml/docs-validator/src/rules/valid-file-types/valid-file-types.ts index 7175c7947a5..6c623fbe2a8 100644 --- a/packages/cli/yaml/docs-validator/src/rules/valid-file-types/valid-file-types.ts +++ b/packages/cli/yaml/docs-validator/src/rules/valid-file-types/valid-file-types.ts @@ -1,8 +1,10 @@ -import { doesPathExist } from "@fern-api/fs-utils"; import chardet from "chardet"; -import { fileTypeFromBuffer, type MimeType } from "file-type"; +import { type MimeType, fileTypeFromBuffer } from "file-type"; import { readFile } from "fs/promises"; import path from "path"; + +import { doesPathExist } from "@fern-api/fs-utils"; + import { Rule, RuleViolation } from "../../Rule"; const ALLOWED_FILE_TYPES = new Set([ diff --git a/packages/cli/yaml/docs-validator/src/rules/valid-markdown-link/valid-markdown-link.ts b/packages/cli/yaml/docs-validator/src/rules/valid-markdown-link/valid-markdown-link.ts index 13064258448..574b803ea20 100644 --- a/packages/cli/yaml/docs-validator/src/rules/valid-markdown-link/valid-markdown-link.ts +++ b/packages/cli/yaml/docs-validator/src/rules/valid-markdown-link/valid-markdown-link.ts @@ -1,4 +1,5 @@ -import { AbsoluteFilePath, dirname, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, dirname, doesPathExist, join } from "@fern-api/fs-utils"; + import { Rule, RuleViolation } from "../../Rule"; const LINK_PATTERN = /\[([^\]]+)\]\(((?!http:\/\/|https:\/\/).*?)\)/gi; diff --git a/packages/cli/yaml/docs-validator/src/rules/valid-markdown/valid-markdown.ts b/packages/cli/yaml/docs-validator/src/rules/valid-markdown/valid-markdown.ts index 356da9c68b6..9323999bd9d 100644 --- a/packages/cli/yaml/docs-validator/src/rules/valid-markdown/valid-markdown.ts +++ b/packages/cli/yaml/docs-validator/src/rules/valid-markdown/valid-markdown.ts @@ -1,11 +1,13 @@ import { serialize } from "next-mdx-remote/serialize"; +import rehypeKatex from "rehype-katex"; import remarkGfm from "remark-gfm"; import remarkMath from "remark-math"; -import rehypeKatex from "rehype-katex"; import { z } from "zod"; -import { Rule } from "../../Rule"; + import { parseMarkdownToTree } from "@fern-api/docs-markdown-utils"; +import { Rule } from "../../Rule"; + export const ValidMarkdownRule: Rule = { name: "valid-markdown", create: () => { diff --git a/packages/cli/yaml/docs-validator/src/rules/validate-version-file/validate-version-file.ts b/packages/cli/yaml/docs-validator/src/rules/validate-version-file/validate-version-file.ts index fd16344be3a..254be0564be 100644 --- a/packages/cli/yaml/docs-validator/src/rules/validate-version-file/validate-version-file.ts +++ b/packages/cli/yaml/docs-validator/src/rules/validate-version-file/validate-version-file.ts @@ -1,5 +1,5 @@ -import { validateVersionConfigFileSchema } from "../../docsAst/validateVersionConfig"; import { Rule } from "../../Rule"; +import { validateVersionConfigFileSchema } from "../../docsAst/validateVersionConfig"; export const ValidateVersionFileRule: Rule = { name: "validate-version-file", diff --git a/packages/cli/yaml/docs-validator/src/testing-utils/getViolationsForRule.ts b/packages/cli/yaml/docs-validator/src/testing-utils/getViolationsForRule.ts index 7522c3e0eb8..ffb3024962b 100644 --- a/packages/cli/yaml/docs-validator/src/testing-utils/getViolationsForRule.ts +++ b/packages/cli/yaml/docs-validator/src/testing-utils/getViolationsForRule.ts @@ -1,10 +1,12 @@ +import stripAnsi from "strip-ansi"; + import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { loadProjectFromDirectory } from "@fern-api/project-loader"; import { createMockTaskContext } from "@fern-api/task-context"; -import stripAnsi from "strip-ansi"; + import { Rule } from "../Rule"; -import { runRulesOnDocsWorkspace } from "../validateDocsWorkspace"; import { ValidationViolation } from "../ValidationViolation"; +import { runRulesOnDocsWorkspace } from "../validateDocsWorkspace"; export declare namespace getViolationsForRule { export interface Args { diff --git a/packages/cli/yaml/docs-validator/src/validateDocsWorkspace.ts b/packages/cli/yaml/docs-validator/src/validateDocsWorkspace.ts index ca103f8d3fb..7d55009f08d 100644 --- a/packages/cli/yaml/docs-validator/src/validateDocsWorkspace.ts +++ b/packages/cli/yaml/docs-validator/src/validateDocsWorkspace.ts @@ -1,13 +1,14 @@ import { DOCS_CONFIGURATION_FILENAME } from "@fern-api/configuration-loader"; -import { join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; import { DocsWorkspace } from "@fern-api/workspace-loader"; + +import { Rule } from "./Rule"; +import { ValidationViolation } from "./ValidationViolation"; import { createDocsConfigFileAstVisitorForRules } from "./createDocsConfigFileAstVisitorForRules"; import { APIWorkspaceLoader } from "./docsAst/APIWorkspaceLoader"; import { visitDocsConfigFileYamlAst } from "./docsAst/visitDocsConfigFileYamlAst"; import { getAllRules } from "./getAllRules"; -import { Rule } from "./Rule"; -import { ValidationViolation } from "./ValidationViolation"; export async function validateDocsWorkspace( workspace: DocsWorkspace, diff --git a/packages/cli/yaml/generators-validator/package.json b/packages/cli/yaml/generators-validator/package.json index 23311d5a233..a4d39031ce7 100644 --- a/packages/cli/yaml/generators-validator/package.json +++ b/packages/cli/yaml/generators-validator/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": { @@ -46,8 +45,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" } diff --git a/packages/cli/yaml/generators-validator/src/Rule.ts b/packages/cli/yaml/generators-validator/src/Rule.ts index c40e342acad..12a3742746c 100644 --- a/packages/cli/yaml/generators-validator/src/Rule.ts +++ b/packages/cli/yaml/generators-validator/src/Rule.ts @@ -1,7 +1,8 @@ +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { generatorsYml } from "@fern-api/configuration-loader"; import { RelativeFilePath } from "@fern-api/fs-utils"; import { Logger } from "@fern-api/logger"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; + import { GeneratorsYmlFileAstNodeTypes } from "./ast/GeneratorsYmlAstVisitor"; export interface Rule { diff --git a/packages/cli/yaml/generators-validator/src/ValidationViolation.ts b/packages/cli/yaml/generators-validator/src/ValidationViolation.ts index 69237149476..b59cb4b95ce 100644 --- a/packages/cli/yaml/generators-validator/src/ValidationViolation.ts +++ b/packages/cli/yaml/generators-validator/src/ValidationViolation.ts @@ -1,5 +1,5 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; import { NodePath } from "@fern-api/fern-definition-schema"; +import { RelativeFilePath } from "@fern-api/fs-utils"; export interface ValidationViolation { severity: "error" | "warning"; diff --git a/packages/cli/yaml/generators-validator/src/ast/visitGeneratorsYamlAst.ts b/packages/cli/yaml/generators-validator/src/ast/visitGeneratorsYamlAst.ts index 5787265b701..7458f7d2321 100644 --- a/packages/cli/yaml/generators-validator/src/ast/visitGeneratorsYamlAst.ts +++ b/packages/cli/yaml/generators-validator/src/ast/visitGeneratorsYamlAst.ts @@ -1,6 +1,7 @@ import { generatorsYml } from "@fern-api/configuration-loader"; -import { GeneratorsYmlFileAstVisitor } from "./GeneratorsYmlAstVisitor"; import { noop, visitObject, visitObjectAsync } from "@fern-api/core-utils"; + +import { GeneratorsYmlFileAstVisitor } from "./GeneratorsYmlAstVisitor"; import { visitGeneratorGroups } from "./visitors/visitGeneratorGroups"; export async function visitGeneratorsYamlAst( diff --git a/packages/cli/yaml/generators-validator/src/ast/visitors/visitGeneratorGroups.ts b/packages/cli/yaml/generators-validator/src/ast/visitors/visitGeneratorGroups.ts index 57ecec69ace..e17c3983f4f 100644 --- a/packages/cli/yaml/generators-validator/src/ast/visitors/visitGeneratorGroups.ts +++ b/packages/cli/yaml/generators-validator/src/ast/visitors/visitGeneratorGroups.ts @@ -1,5 +1,6 @@ import { generatorsYml } from "@fern-api/configuration-loader"; import { NodePath } from "@fern-api/fern-definition-schema"; + import { GeneratorsYmlFileAstVisitor } from "../GeneratorsYmlAstVisitor"; export async function visitGeneratorGroups({ diff --git a/packages/cli/yaml/generators-validator/src/createGeneratorsYmlAstVisitorForRules.ts b/packages/cli/yaml/generators-validator/src/createGeneratorsYmlAstVisitorForRules.ts index 59cb3c24f6e..099a2b9ec44 100644 --- a/packages/cli/yaml/generators-validator/src/createGeneratorsYmlAstVisitorForRules.ts +++ b/packages/cli/yaml/generators-validator/src/createGeneratorsYmlAstVisitorForRules.ts @@ -1,9 +1,10 @@ -import { RelativeFilePath } from "@fern-api/fs-utils"; +import { generatorsYml } from "@fern-api/configuration-loader"; import { NodePath } from "@fern-api/fern-definition-schema"; -import { GeneratorsYmlFileAstNodeTypes, GeneratorsYmlFileAstNodeVisitor } from "./ast/GeneratorsYmlAstVisitor"; +import { RelativeFilePath } from "@fern-api/fs-utils"; + import { RuleVisitors } from "./Rule"; import { ValidationViolation } from "./ValidationViolation"; -import { generatorsYml } from "@fern-api/configuration-loader"; +import { GeneratorsYmlFileAstNodeTypes, GeneratorsYmlFileAstNodeVisitor } from "./ast/GeneratorsYmlAstVisitor"; import { GeneratorsYmlFileAstVisitor } from "./ast/GeneratorsYmlAstVisitor"; export function createGeneratorsYmlAstVisitorForRules({ diff --git a/packages/cli/yaml/generators-validator/src/rules/compatible-ir-versions/__test__/compatible-ir-versions.test.ts b/packages/cli/yaml/generators-validator/src/rules/compatible-ir-versions/__test__/compatible-ir-versions.test.ts index 0e7b51b4644..97fad1fbc93 100644 --- a/packages/cli/yaml/generators-validator/src/rules/compatible-ir-versions/__test__/compatible-ir-versions.test.ts +++ b/packages/cli/yaml/generators-validator/src/rules/compatible-ir-versions/__test__/compatible-ir-versions.test.ts @@ -1,6 +1,7 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { ValidationViolation } from "../../../ValidationViolation"; +import { getViolationsForRule } from "../../../testing-utils/getViolationsForRule"; import { CompatibleIrVersionsRule } from "../compatible-ir-versions"; describe("compatible-ir-versions", () => { diff --git a/packages/cli/yaml/generators-validator/src/rules/compatible-ir-versions/compatible-ir-versions.ts b/packages/cli/yaml/generators-validator/src/rules/compatible-ir-versions/compatible-ir-versions.ts index 9888c362f67..6bfb19f8cec 100644 --- a/packages/cli/yaml/generators-validator/src/rules/compatible-ir-versions/compatible-ir-versions.ts +++ b/packages/cli/yaml/generators-validator/src/rules/compatible-ir-versions/compatible-ir-versions.ts @@ -1,6 +1,7 @@ import { generatorsYml } from "@fern-api/configuration-loader"; import { createFdrGeneratorsSdkService } from "@fern-api/core"; import { isVersionAhead } from "@fern-api/semver-utils"; + import { Rule, RuleViolation } from "../../Rule"; function getMaybeBadVersionMessage( diff --git a/packages/cli/yaml/generators-validator/src/testing-utils/getViolationsForRule.ts b/packages/cli/yaml/generators-validator/src/testing-utils/getViolationsForRule.ts index ffad98afc36..e783510eb1d 100644 --- a/packages/cli/yaml/generators-validator/src/testing-utils/getViolationsForRule.ts +++ b/packages/cli/yaml/generators-validator/src/testing-utils/getViolationsForRule.ts @@ -1,12 +1,14 @@ +import stripAnsi from "strip-ansi"; + import { loadGeneratorsConfiguration } from "@fern-api/configuration-loader"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { LazyFernWorkspace } from "@fern-api/lazy-fern-workspace"; import { CONSOLE_LOGGER } from "@fern-api/logger"; import { createMockTaskContext } from "@fern-api/task-context"; -import stripAnsi from "strip-ansi"; + import { Rule } from "../Rule"; -import { runRulesOnWorkspace } from "../validateGeneratorsWorkspace"; import { ValidationViolation } from "../ValidationViolation"; +import { runRulesOnWorkspace } from "../validateGeneratorsWorkspace"; export declare namespace getViolationsForRule { export interface Args { diff --git a/packages/cli/yaml/generators-validator/src/validateGeneratorsWorkspace.ts b/packages/cli/yaml/generators-validator/src/validateGeneratorsWorkspace.ts index fe2950a3725..f07e05485d9 100644 --- a/packages/cli/yaml/generators-validator/src/validateGeneratorsWorkspace.ts +++ b/packages/cli/yaml/generators-validator/src/validateGeneratorsWorkspace.ts @@ -1,12 +1,13 @@ -import { generatorsYml, GENERATORS_CONFIGURATION_FILENAME } from "@fern-api/configuration-loader"; +import { GENERATORS_CONFIGURATION_FILENAME, generatorsYml } from "@fern-api/configuration-loader"; import { RelativeFilePath } from "@fern-api/fs-utils"; +import { Logger } from "@fern-api/logger"; import { FernWorkspace } from "@fern-api/workspace-loader"; -import { getAllRules } from "./getAllRules"; + import { Rule, RuleVisitors } from "./Rule"; import { ValidationViolation } from "./ValidationViolation"; -import { Logger } from "@fern-api/logger"; -import { createGeneratorsYmlAstVisitorForRules } from "./createGeneratorsYmlAstVisitorForRules"; import { visitGeneratorsYamlAst } from "./ast/visitGeneratorsYamlAst"; +import { createGeneratorsYmlAstVisitorForRules } from "./createGeneratorsYmlAstVisitorForRules"; +import { getAllRules } from "./getAllRules"; export async function validateGeneratorsWorkspace( workspace: FernWorkspace, diff --git a/packages/commons/core-utils/package.json b/packages/commons/core-utils/package.json index a96b2dd85f0..13e816c60aa 100644 --- a/packages/commons/core-utils/package.json +++ b/packages/commons/core-utils/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": { @@ -46,8 +45,8 @@ "@types/whatwg-mimetype": "^3.0.2", "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" } diff --git a/packages/commons/core-utils/src/__tests__/replaceEnvVars.test.ts b/packages/commons/core-utils/src/__tests__/replaceEnvVars.test.ts index b90910a65e8..be94e0c68ed 100644 --- a/packages/commons/core-utils/src/__tests__/replaceEnvVars.test.ts +++ b/packages/commons/core-utils/src/__tests__/replaceEnvVars.test.ts @@ -1,4 +1,5 @@ import { vi } from "vitest"; + import { replaceEnvVariables } from "../replaceEnvVars"; describe("replaceEnvVariables", () => { diff --git a/packages/commons/core-utils/src/__tests__/validateAgainstJsonSchema.test.ts b/packages/commons/core-utils/src/__tests__/validateAgainstJsonSchema.test.ts index c8bf6b353ea..f7741dcf3c0 100644 --- a/packages/commons/core-utils/src/__tests__/validateAgainstJsonSchema.test.ts +++ b/packages/commons/core-utils/src/__tests__/validateAgainstJsonSchema.test.ts @@ -1,6 +1,7 @@ -import { validateAgainstJsonSchema } from "../validateAgainstJsonSchema"; import { JSONSchema4 } from "json-schema"; +import { validateAgainstJsonSchema } from "../validateAgainstJsonSchema"; + describe("validateAgainstJsonSchema", () => { const schema: JSONSchema4 = { type: "object", diff --git a/packages/commons/core-utils/src/mergeWithOverrides.ts b/packages/commons/core-utils/src/mergeWithOverrides.ts index 80643e8fd43..0578055b643 100644 --- a/packages/commons/core-utils/src/mergeWithOverrides.ts +++ b/packages/commons/core-utils/src/mergeWithOverrides.ts @@ -1,5 +1,5 @@ -import { isNull, isPlainObject, mergeWith, omitBy } from "lodash-es"; import type { Dictionary, NumericDictionary, PartialObject, PropertyName, ValueKeyIteratee } from "lodash"; +import { isNull, isPlainObject, mergeWith, omitBy } from "lodash-es"; export function mergeWithOverrides({ data, overrides }: { data: T; overrides: object }): T { const merged = mergeWith(data, mergeWith, overrides, (obj, src) => diff --git a/packages/commons/fs-utils/package.json b/packages/commons/fs-utils/package.json index eb0184426cf..7efc0f5331e 100644 --- a/packages/commons/fs-utils/package.json +++ b/packages/commons/fs-utils/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": { @@ -42,8 +41,8 @@ "@types/stream-json": "^1.7.7", "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" } diff --git a/packages/commons/fs-utils/src/AbsoluteFilePath.ts b/packages/commons/fs-utils/src/AbsoluteFilePath.ts index 0206ff1ef42..452938ad9b9 100644 --- a/packages/commons/fs-utils/src/AbsoluteFilePath.ts +++ b/packages/commons/fs-utils/src/AbsoluteFilePath.ts @@ -1,4 +1,5 @@ import path from "path"; + import { convertToOsPath } from "./osPathConverter"; export type AbsoluteFilePath = string & { diff --git a/packages/commons/fs-utils/src/RelativeFilePath.ts b/packages/commons/fs-utils/src/RelativeFilePath.ts index 8875f564258..e35af584538 100644 --- a/packages/commons/fs-utils/src/RelativeFilePath.ts +++ b/packages/commons/fs-utils/src/RelativeFilePath.ts @@ -1,4 +1,5 @@ import path from "path"; + import { convertToOsPath } from "./osPathConverter"; export type RelativeFilePath = string & { diff --git a/packages/commons/fs-utils/src/__test__/join.test.ts b/packages/commons/fs-utils/src/__test__/join.test.ts index 7aac2d2ab2b..778d1a3c68d 100644 --- a/packages/commons/fs-utils/src/__test__/join.test.ts +++ b/packages/commons/fs-utils/src/__test__/join.test.ts @@ -1,6 +1,5 @@ /* eslint-disable jest/expect-expect */ /* eslint-disable @typescript-eslint/ban-ts-comment */ - import { AbsoluteFilePath } from "../AbsoluteFilePath"; import { join } from "../join"; diff --git a/packages/commons/fs-utils/src/dirname.ts b/packages/commons/fs-utils/src/dirname.ts index 5fdef740ac2..cc3a9ebb52b 100644 --- a/packages/commons/fs-utils/src/dirname.ts +++ b/packages/commons/fs-utils/src/dirname.ts @@ -1,4 +1,5 @@ import path from "path"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; import { RelativeFilePath } from "./RelativeFilePath"; diff --git a/packages/commons/fs-utils/src/doesPathExist.ts b/packages/commons/fs-utils/src/doesPathExist.ts index 74340844f9c..8e128219150 100644 --- a/packages/commons/fs-utils/src/doesPathExist.ts +++ b/packages/commons/fs-utils/src/doesPathExist.ts @@ -1,5 +1,6 @@ import { lstatSync } from "fs"; import { lstat } from "fs/promises"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; export async function doesPathExist(filepath: AbsoluteFilePath): Promise { diff --git a/packages/commons/fs-utils/src/getDirectoryContents.ts b/packages/commons/fs-utils/src/getDirectoryContents.ts index 7c04f01c6bd..9aabd14b8c1 100644 --- a/packages/commons/fs-utils/src/getDirectoryContents.ts +++ b/packages/commons/fs-utils/src/getDirectoryContents.ts @@ -1,8 +1,9 @@ -import { readdir, readFile } from "fs/promises"; +import { readFile, readdir } from "fs/promises"; import path from "path"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; -import { join } from "./join"; import { RelativeFilePath } from "./RelativeFilePath"; +import { join } from "./join"; export type FileOrDirectory = File | Directory; diff --git a/packages/commons/fs-utils/src/join.ts b/packages/commons/fs-utils/src/join.ts index df5ea854c81..ae4811e4278 100644 --- a/packages/commons/fs-utils/src/join.ts +++ b/packages/commons/fs-utils/src/join.ts @@ -1,4 +1,5 @@ import path from "path"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; import { RelativeFilePath } from "./RelativeFilePath"; diff --git a/packages/commons/fs-utils/src/listFiles.ts b/packages/commons/fs-utils/src/listFiles.ts index e3218a85554..bbfa9d3a48d 100644 --- a/packages/commons/fs-utils/src/listFiles.ts +++ b/packages/commons/fs-utils/src/listFiles.ts @@ -1,4 +1,5 @@ import { glob } from "glob"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; export async function listFiles(root: AbsoluteFilePath, extensionGlob: string): Promise { diff --git a/packages/commons/fs-utils/src/moveFile.ts b/packages/commons/fs-utils/src/moveFile.ts index a6d453442f1..91f7a318089 100644 --- a/packages/commons/fs-utils/src/moveFile.ts +++ b/packages/commons/fs-utils/src/moveFile.ts @@ -1,4 +1,5 @@ import { rename } from "fs/promises"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; export async function moveFile({ src, dest }: { src: AbsoluteFilePath; dest: AbsoluteFilePath }): Promise { diff --git a/packages/commons/fs-utils/src/moveFolder.ts b/packages/commons/fs-utils/src/moveFolder.ts index 9504d89328d..db163fd0795 100644 --- a/packages/commons/fs-utils/src/moveFolder.ts +++ b/packages/commons/fs-utils/src/moveFolder.ts @@ -1,10 +1,11 @@ import { mkdir, rename } from "fs/promises"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; +import { RelativeFilePath } from "./RelativeFilePath"; import { dirname } from "./dirname"; import { doesPathExist } from "./doesPathExist"; import { FileOrDirectory, getDirectoryContents } from "./getDirectoryContents"; import { join } from "./join"; -import { RelativeFilePath } from "./RelativeFilePath"; export async function moveFolder({ src, dest }: { src: AbsoluteFilePath; dest: AbsoluteFilePath }): Promise { const contents = await getDirectoryContents(src); diff --git a/packages/commons/fs-utils/src/relative.ts b/packages/commons/fs-utils/src/relative.ts index fcc78517115..4c791f6d22d 100644 --- a/packages/commons/fs-utils/src/relative.ts +++ b/packages/commons/fs-utils/src/relative.ts @@ -1,4 +1,5 @@ import path from "path"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; import { RelativeFilePath } from "./RelativeFilePath"; diff --git a/packages/commons/fs-utils/src/relativize.ts b/packages/commons/fs-utils/src/relativize.ts index 711ad4017a1..549e89ea15a 100644 --- a/packages/commons/fs-utils/src/relativize.ts +++ b/packages/commons/fs-utils/src/relativize.ts @@ -1,4 +1,5 @@ import path from "path"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; import { RelativeFilePath } from "./RelativeFilePath"; diff --git a/packages/commons/fs-utils/src/resolve.ts b/packages/commons/fs-utils/src/resolve.ts index af604107157..06c44dd7626 100644 --- a/packages/commons/fs-utils/src/resolve.ts +++ b/packages/commons/fs-utils/src/resolve.ts @@ -1,4 +1,5 @@ import path from "path"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; import { convertToOsPath } from "./osPathConverter"; diff --git a/packages/commons/fs-utils/src/streamObjectFromFile.ts b/packages/commons/fs-utils/src/streamObjectFromFile.ts index 5febd6eeeb3..5008f92a031 100644 --- a/packages/commons/fs-utils/src/streamObjectFromFile.ts +++ b/packages/commons/fs-utils/src/streamObjectFromFile.ts @@ -1,8 +1,9 @@ import { createReadStream } from "fs"; -import { AbsoluteFilePath } from "./AbsoluteFilePath"; import StreamJSON from "stream-json"; import Assembler from "stream-json/Assembler.js"; +import { AbsoluteFilePath } from "./AbsoluteFilePath"; + export async function streamObjectFromFile(filePath: AbsoluteFilePath): Promise { return new Promise((resolve, reject) => { const jsonStream = StreamJSON.parser({ diff --git a/packages/commons/fs-utils/src/streamObjectToFile.ts b/packages/commons/fs-utils/src/streamObjectToFile.ts index 9ddbdf0c358..46a03db4a94 100644 --- a/packages/commons/fs-utils/src/streamObjectToFile.ts +++ b/packages/commons/fs-utils/src/streamObjectToFile.ts @@ -1,5 +1,6 @@ import { createWriteStream } from "fs"; import { JsonStreamStringify } from "json-stream-stringify"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; export async function streamObjectToFile( diff --git a/packages/commons/fs-utils/src/stringifyLargeObject.ts b/packages/commons/fs-utils/src/stringifyLargeObject.ts index 1f084dd70b6..8b0e95f6c8e 100644 --- a/packages/commons/fs-utils/src/stringifyLargeObject.ts +++ b/packages/commons/fs-utils/src/stringifyLargeObject.ts @@ -1,5 +1,6 @@ import { readFile } from "fs/promises"; import tmp from "tmp-promise"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; import { streamObjectToFile } from "./streamObjectToFile"; diff --git a/packages/commons/fs-utils/src/waitUntilPathExists.ts b/packages/commons/fs-utils/src/waitUntilPathExists.ts index ec964376287..261ed210cbb 100644 --- a/packages/commons/fs-utils/src/waitUntilPathExists.ts +++ b/packages/commons/fs-utils/src/waitUntilPathExists.ts @@ -1,4 +1,5 @@ import { delay } from "@fern-api/core-utils"; + import { AbsoluteFilePath } from "./AbsoluteFilePath"; import { doesPathExist } from "./doesPathExist"; diff --git a/packages/commons/loadable/package.json b/packages/commons/loadable/package.json index ea6f606b8a5..d24bb81e037 100644 --- a/packages/commons/loadable/package.json +++ b/packages/commons/loadable/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": { @@ -35,8 +34,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" } } \ No newline at end of file diff --git a/packages/commons/loadable/src/utils.ts b/packages/commons/loadable/src/utils.ts index 0bbc0a46d59..ff2a5842d3c 100644 --- a/packages/commons/loadable/src/utils.ts +++ b/packages/commons/loadable/src/utils.ts @@ -1,5 +1,6 @@ import { keys } from "@fern-api/core-utils"; -import { failed, isFailed, isLoaded, Loadable, loaded, Loading, loading, NotFailed } from "./Loadable"; + +import { Loadable, Loading, NotFailed, failed, isFailed, isLoaded, loaded, loading } from "./Loadable"; import { visitLoadable } from "./visitor"; export function getLoadableValue(loadable: Loadable | undefined): V | undefined { diff --git a/packages/commons/loadable/src/visitor.ts b/packages/commons/loadable/src/visitor.ts index 5a6eb87528b..99c2238cad1 100644 --- a/packages/commons/loadable/src/visitor.ts +++ b/packages/commons/loadable/src/visitor.ts @@ -1,5 +1,6 @@ import { assertNever } from "@fern-api/core-utils"; -import { isFailed, isLoaded, isLoading, isNotStartedLoading, Loadable } from "./Loadable"; + +import { Loadable, isFailed, isLoaded, isLoading, isNotStartedLoading } from "./Loadable"; export function visitLoadable( loadable: Loadable | undefined, diff --git a/packages/commons/logging-execa/package.json b/packages/commons/logging-execa/package.json index 09113e483dc..9ac079b02ea 100644 --- a/packages/commons/logging-execa/package.json +++ b/packages/commons/logging-execa/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": { @@ -35,8 +34,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" } diff --git a/packages/commons/logging-execa/src/__test__/loggingExeca.test.ts b/packages/commons/logging-execa/src/__test__/loggingExeca.test.ts index c0e5bf9eeeb..1132514aa37 100644 --- a/packages/commons/logging-execa/src/__test__/loggingExeca.test.ts +++ b/packages/commons/logging-execa/src/__test__/loggingExeca.test.ts @@ -1,7 +1,9 @@ -import { createLogger } from "@fern-api/logger"; import { readdir } from "fs/promises"; import path from "path"; import tmp from "tmp-promise"; + +import { createLogger } from "@fern-api/logger"; + import { loggingExeca } from "../loggingExeca"; describe("loggingExeca", () => { diff --git a/packages/commons/logging-execa/src/createLoggingExecutable.ts b/packages/commons/logging-execa/src/createLoggingExecutable.ts index 1022910001e..275f1158c0d 100644 --- a/packages/commons/logging-execa/src/createLoggingExecutable.ts +++ b/packages/commons/logging-execa/src/createLoggingExecutable.ts @@ -1,5 +1,7 @@ -import { Logger } from "@fern-api/logger"; import { ExecaReturnValue } from "execa"; + +import { Logger } from "@fern-api/logger"; + import { loggingExeca } from "./loggingExeca"; export type LoggingExecutable = (args?: string[], options?: loggingExeca.Options) => Promise; diff --git a/packages/commons/logging-execa/src/loggingExeca.ts b/packages/commons/logging-execa/src/loggingExeca.ts index 12a5c1cc659..1ad13d1bdd9 100644 --- a/packages/commons/logging-execa/src/loggingExeca.ts +++ b/packages/commons/logging-execa/src/loggingExeca.ts @@ -1,6 +1,7 @@ -import { Logger } from "@fern-api/logger"; import execa, { ExecaReturnValue } from "execa"; +import { Logger } from "@fern-api/logger"; + export declare namespace loggingExeca { export interface Options extends execa.Options { doNotPipeOutput?: boolean; diff --git a/packages/commons/path-utils/package.json b/packages/commons/path-utils/package.json index d40107ce95f..a92bd4cdb16 100644 --- a/packages/commons/path-utils/package.json +++ b/packages/commons/path-utils/package.json @@ -23,15 +23,14 @@ "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" }, "devDependencies": { "@types/jest": "^29.5.14", "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" } diff --git a/packages/core/package.json b/packages/core/package.json index 3107c266114..31fcb7a6963 100644 --- a/packages/core/package.json +++ b/packages/core/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": { @@ -40,8 +39,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" } } \ No newline at end of file diff --git a/packages/ir-sdk/package.json b/packages/ir-sdk/package.json index c63e94c802f..99f3824488d 100644 --- a/packages/ir-sdk/package.json +++ b/packages/ir-sdk/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", "generate": "fern generate --api ir-types-latest --local" }, @@ -34,8 +33,8 @@ "depcheck": "^1.4.6", "eslint": "^8.56.0", "vitest": "^2.1.4", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "typescript": "4.6.4" } } \ No newline at end of file diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 174ee00a517..d84d9351b8b 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -27,7 +27,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", "generate": "fern generate --api ir-types-latest --local", "dist:cli": "tsup src/cli.ts --format cjs --platform node --clean" @@ -41,8 +40,8 @@ "depcheck": "^1.4.6", "eslint": "^8.56.0", "vitest": "^2.1.4", - "organize-imports-cli": "^0.10.0", - "prettier": "^2.7.1", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier": "^3.4.2", "typescript": "4.6.4", "tsup": "^8.0.2", "@types/yargs": "^17.0.32", diff --git a/packages/scripts/src/cli.ts b/packages/scripts/src/cli.ts index 20061417f79..1819443cf3d 100644 --- a/packages/scripts/src/cli.ts +++ b/packages/scripts/src/cli.ts @@ -1,10 +1,10 @@ #!/usr/bin/env node - import { mkdir, writeFile } from "fs/promises"; import path from "path"; import yaml from "yaml"; import yargs from "yargs"; import { hideBin } from "yargs/helpers"; + import { convertChangelogToVersions } from "./convertChangelogToVersionsYml"; async function main() { diff --git a/packages/scripts/src/convertChangelogToVersionsYml.ts b/packages/scripts/src/convertChangelogToVersionsYml.ts index e512dc30af1..cb3c43fa364 100644 --- a/packages/scripts/src/convertChangelogToVersionsYml.ts +++ b/packages/scripts/src/convertChangelogToVersionsYml.ts @@ -1,6 +1,7 @@ +import { readFile } from "fs/promises"; + import { resolve } from "@fern-api/fs-utils"; import { INTERMEDIATE_REPRESENTATION_MIGRATOR } from "@fern-api/ir-migrations"; -import { readFile } from "fs/promises"; interface ChangelogEntry { version: string; diff --git a/packages/seed/package.json b/packages/seed/package.json index 0d6c5899dfe..312e6716e5c 100644 --- a/packages/seed/package.json +++ b/packages/seed/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", "env:prod": "env-cmd -r .env-cmdrc.cjs -e prod", "dist:cli": "pnpm compile && node build.cjs && cp -R ../../test-definitions/fern dist", @@ -67,8 +66,8 @@ "depcheck": "^1.4.7", "esbuild": "^0.24.0", "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", "tsup": "^8.3.5", "typescript": "5.7.2", "vitest": "^2.0.5" diff --git a/packages/seed/src/Log.ts b/packages/seed/src/Log.ts index d700c1911d0..6ae062a0d25 100644 --- a/packages/seed/src/Log.ts +++ b/packages/seed/src/Log.ts @@ -1,5 +1,4 @@ // HACKHACK: copied from cli folder - import { LogLevel } from "@fern-api/logger"; export interface Log { diff --git a/packages/seed/src/TaskContextImpl.ts b/packages/seed/src/TaskContextImpl.ts index 1d8696a7147..c442057937f 100644 --- a/packages/seed/src/TaskContextImpl.ts +++ b/packages/seed/src/TaskContextImpl.ts @@ -1,7 +1,8 @@ // HACKHACK: copied from cli folder +import chalk from "chalk"; import { addPrefixToString } from "@fern-api/core-utils"; -import { createLogger, LogLevel } from "@fern-api/logger"; +import { LogLevel, createLogger } from "@fern-api/logger"; import { CreateInteractiveTaskParams, FernCliError, @@ -12,7 +13,7 @@ import { TaskContext, TaskResult } from "@fern-api/task-context"; -import chalk from "chalk"; + import { Log } from "./Log"; import { logErrorMessage } from "./logErrorMessage"; diff --git a/packages/seed/src/__test__/getNewVersion.test.ts b/packages/seed/src/__test__/getNewVersion.test.ts index c5b1f6db0b0..7fb7b190b64 100644 --- a/packages/seed/src/__test__/getNewVersion.test.ts +++ b/packages/seed/src/__test__/getNewVersion.test.ts @@ -1,5 +1,7 @@ -import { createMockTaskContext } from "@fern-api/task-context"; import { join } from "path"; + +import { createMockTaskContext } from "@fern-api/task-context"; + import { getNewVersion } from "../commands/publish/publishGenerator"; import { getNewCliVersion } from "../utils/versionUtilities"; diff --git a/packages/seed/src/cli.ts b/packages/seed/src/cli.ts index 3f69d52a9ca..71e727abbdc 100644 --- a/packages/seed/src/cli.ts +++ b/packages/seed/src/cli.ts @@ -1,10 +1,16 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { CONSOLE_LOGGER, LogLevel, LOG_LEVELS } from "@fern-api/logger"; -import { askToLogin } from "@fern-api/login"; -import { FernRegistryClient as FdrClient } from "@fern-fern/generators-sdk"; import { writeFile } from "fs/promises"; import yargs, { Argv } from "yargs"; import { hideBin } from "yargs/helpers"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { CONSOLE_LOGGER, LOG_LEVELS, LogLevel } from "@fern-api/logger"; +import { askToLogin } from "@fern-api/login"; + +import { FernRegistryClient as FdrClient } from "@fern-fern/generators-sdk"; + +import { Semaphore } from "./Semaphore"; +import { generateCliChangelog } from "./commands/generate/generateCliChangelog"; +import { generateGeneratorChangelog } from "./commands/generate/generateGeneratorChangelog"; import { getLatestCli } from "./commands/latest/getLatestCli"; import { getLatestGenerator } from "./commands/latest/getLatestGenerator"; import { publishCli } from "./commands/publish/publishCli"; @@ -19,9 +25,6 @@ import { FIXTURES, testGenerator } from "./commands/test/testWorkspaceFixtures"; import { validateCliRelease } from "./commands/validate/validateCliChangelog"; import { validateGenerator } from "./commands/validate/validateGeneratorChangelog"; import { GeneratorWorkspace, loadGeneratorWorkspaces } from "./loadGeneratorWorkspaces"; -import { Semaphore } from "./Semaphore"; -import { generateCliChangelog } from "./commands/generate/generateCliChangelog"; -import { generateGeneratorChangelog } from "./commands/generate/generateGeneratorChangelog"; void tryRunCli(); diff --git a/packages/seed/src/commands/generate/generateCliChangelog.ts b/packages/seed/src/commands/generate/generateCliChangelog.ts index e7a21a64e5b..f050cfe972e 100644 --- a/packages/seed/src/commands/generate/generateCliChangelog.ts +++ b/packages/seed/src/commands/generate/generateCliChangelog.ts @@ -1,11 +1,14 @@ -import { doesPathExist, join, RelativeFilePath, AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; -import { writeChangelogEntries, writeChangelogsToFile } from "./writeChangelogEntries"; -import { parseCliReleasesFile } from "../../utils/convertVersionsFileToReleases"; -import { loadCliWorkspace } from "../../loadGeneratorWorkspaces"; import { mkdir, readdir, rm } from "fs/promises"; + +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { FernRegistryClient } from "@fern-fern/generators-sdk"; +import { loadCliWorkspace } from "../../loadGeneratorWorkspaces"; +import { parseCliReleasesFile } from "../../utils/convertVersionsFileToReleases"; +import { writeChangelogEntries, writeChangelogsToFile } from "./writeChangelogEntries"; + export async function generateCliChangelog({ context, outputPath, @@ -21,8 +24,8 @@ export async function generateCliChangelog({ outputPath == null ? AbsoluteFilePath.of(process.cwd()) : outputPath.startsWith("/") - ? AbsoluteFilePath.of(outputPath) - : join(AbsoluteFilePath.of(process.cwd()), RelativeFilePath.of(outputPath)); + ? AbsoluteFilePath.of(outputPath) + : join(AbsoluteFilePath.of(process.cwd()), RelativeFilePath.of(outputPath)); await mkdir(resolvedOutputPath, { recursive: true }); diff --git a/packages/seed/src/commands/generate/generateGeneratorChangelog.ts b/packages/seed/src/commands/generate/generateGeneratorChangelog.ts index 80d1cfc8178..10cadcbb8fe 100644 --- a/packages/seed/src/commands/generate/generateGeneratorChangelog.ts +++ b/packages/seed/src/commands/generate/generateGeneratorChangelog.ts @@ -1,11 +1,14 @@ -import { doesPathExist, join, RelativeFilePath, AbsoluteFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; -import { writeChangelogEntries, writeChangelogsToFile } from "./writeChangelogEntries"; -import { parseGeneratorReleasesFile } from "../../utils/convertVersionsFileToReleases"; -import { GeneratorWorkspace } from "../../loadGeneratorWorkspaces"; import { mkdir, readdir, rm } from "fs/promises"; + +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { FernRegistryClient } from "@fern-fern/generators-sdk"; +import { GeneratorWorkspace } from "../../loadGeneratorWorkspaces"; +import { parseGeneratorReleasesFile } from "../../utils/convertVersionsFileToReleases"; +import { writeChangelogEntries, writeChangelogsToFile } from "./writeChangelogEntries"; + export async function generateGeneratorChangelog({ context, generator, @@ -23,8 +26,8 @@ export async function generateGeneratorChangelog({ outputPath == null ? AbsoluteFilePath.of(process.cwd()) : outputPath.startsWith("/") - ? AbsoluteFilePath.of(outputPath) - : join(AbsoluteFilePath.of(process.cwd()), RelativeFilePath.of(outputPath)); + ? AbsoluteFilePath.of(outputPath) + : join(AbsoluteFilePath.of(process.cwd()), RelativeFilePath.of(outputPath)); await mkdir(resolvedOutputPath, { recursive: true }); diff --git a/packages/seed/src/commands/generate/writeChangelogEntries.ts b/packages/seed/src/commands/generate/writeChangelogEntries.ts index c4da1658f37..7c0cab5efbb 100644 --- a/packages/seed/src/commands/generate/writeChangelogEntries.ts +++ b/packages/seed/src/commands/generate/writeChangelogEntries.ts @@ -1,7 +1,9 @@ -import { ChangelogEntry } from "@fern-fern/generators-sdk/api/resources/generators"; -import { join, RelativeFilePath, AbsoluteFilePath } from "@fern-api/fs-utils"; -import moment from "moment"; import { writeFile } from "fs/promises"; +import moment from "moment"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + +import { ChangelogEntry } from "@fern-fern/generators-sdk/api/resources/generators"; export function writeChangelogEntries(version: string, entries: ChangelogEntry[] | undefined): string { // ## 0.0.1 diff --git a/packages/seed/src/commands/latest/getLatestCli.ts b/packages/seed/src/commands/latest/getLatestCli.ts index 83c7f884b1d..0ef9c8aafcc 100644 --- a/packages/seed/src/commands/latest/getLatestCli.ts +++ b/packages/seed/src/commands/latest/getLatestCli.ts @@ -1,9 +1,11 @@ -import { doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import semver from "semver"; + +import { RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { loadCliWorkspace } from "../../loadGeneratorWorkspaces"; import { parseCliReleasesFile } from "../../utils/convertVersionsFileToReleases"; -import { getNewCliVersion, VersionFilePair } from "../../utils/versionUtilities"; +import { VersionFilePair, getNewCliVersion } from "../../utils/versionUtilities"; export async function getLatestCli({ context, diff --git a/packages/seed/src/commands/latest/getLatestGenerator.ts b/packages/seed/src/commands/latest/getLatestGenerator.ts index 38d003caa68..a6b0ed9c26a 100644 --- a/packages/seed/src/commands/latest/getLatestGenerator.ts +++ b/packages/seed/src/commands/latest/getLatestGenerator.ts @@ -1,6 +1,8 @@ -import { doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; import semver from "semver"; + +import { RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { GeneratorWorkspace, loadCliWorkspace } from "../../loadGeneratorWorkspaces"; import { parseGeneratorReleasesFile } from "../../utils/convertVersionsFileToReleases"; diff --git a/packages/seed/src/commands/publish/publishCli.ts b/packages/seed/src/commands/publish/publishCli.ts index ffd85068a1b..11f5c55709c 100644 --- a/packages/seed/src/commands/publish/publishCli.ts +++ b/packages/seed/src/commands/publish/publishCli.ts @@ -1,10 +1,12 @@ +import path from "path"; + import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; -import path from "path"; + import { PublishCommand } from "../../config/api"; import { loadCliWorkspace } from "../../loadGeneratorWorkspaces"; import { runCommands, subVersion } from "../../utils/publishUtilities"; -import { getNewCliVersion, VersionFilePair } from "../../utils/versionUtilities"; +import { VersionFilePair, getNewCliVersion } from "../../utils/versionUtilities"; export async function publishCli({ version, diff --git a/packages/seed/src/commands/publish/publishGenerator.ts b/packages/seed/src/commands/publish/publishGenerator.ts index c789a781f01..089726f12d1 100644 --- a/packages/seed/src/commands/publish/publishGenerator.ts +++ b/packages/seed/src/commands/publish/publishGenerator.ts @@ -1,9 +1,12 @@ +import path from "path"; +import semver from "semver"; + import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { loggingExeca } from "@fern-api/logging-execa"; import { TaskContext } from "@fern-api/task-context"; + import { GeneratorReleaseRequest } from "@fern-fern/generators-sdk/api/resources/generators"; -import path from "path"; -import semver from "semver"; + import { PublishDockerConfiguration } from "../../config/api"; import { GeneratorWorkspace } from "../../loadGeneratorWorkspaces"; import { parseGeneratorReleasesFile } from "../../utils/convertVersionsFileToReleases"; @@ -60,8 +63,8 @@ export async function publishGenerator({ const preBuildCommands = Array.isArray(unparsedCommands) ? unparsedCommands : unparsedCommands - ? [unparsedCommands] - : []; + ? [unparsedCommands] + : []; await runCommands(preBuildCommands, context, workingDirectory); await buildAndPushDockerImage(publishConfig.docker, publishVersion, context); diff --git a/packages/seed/src/commands/register/registerCliRelease.ts b/packages/seed/src/commands/register/registerCliRelease.ts index a23d5f5fc04..be271f4daab 100644 --- a/packages/seed/src/commands/register/registerCliRelease.ts +++ b/packages/seed/src/commands/register/registerCliRelease.ts @@ -1,9 +1,12 @@ -import { doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { readFile } from "fs/promises"; +import yaml from "js-yaml"; + +import { RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; + import { FernRegistryClient as FdrClient } from "@fern-fern/generators-sdk"; import * as serializers from "@fern-fern/generators-sdk/serialization"; -import { readFile } from "fs/promises"; -import yaml from "js-yaml"; + import { loadCliWorkspace } from "../../loadGeneratorWorkspaces"; export async function registerCliRelease({ diff --git a/packages/seed/src/commands/register/registerGenerator.ts b/packages/seed/src/commands/register/registerGenerator.ts index 2b72c9a32ac..fa16c689b27 100644 --- a/packages/seed/src/commands/register/registerGenerator.ts +++ b/packages/seed/src/commands/register/registerGenerator.ts @@ -1,6 +1,8 @@ -import { doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; -import { FernRegistry, FernRegistryClient as FdrClient } from "@fern-fern/generators-sdk"; + +import { FernRegistryClient as FdrClient, FernRegistry } from "@fern-fern/generators-sdk"; + import { GeneratorType } from "../../config/api"; import { GeneratorWorkspace } from "../../loadGeneratorWorkspaces"; import { parseGeneratorReleasesFile } from "../../utils/convertVersionsFileToReleases"; diff --git a/packages/seed/src/commands/run/runWithCustomFixture.ts b/packages/seed/src/commands/run/runWithCustomFixture.ts index 9d16e27f5e0..709196df496 100644 --- a/packages/seed/src/commands/run/runWithCustomFixture.ts +++ b/packages/seed/src/commands/run/runWithCustomFixture.ts @@ -1,14 +1,16 @@ +import tmp from "tmp-promise"; + import { DEFINITION_DIRECTORY, GeneratorGroup, GeneratorInvocation } from "@fern-api/configuration"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { LogLevel } from "@fern-api/logger"; import { AbstractAPIWorkspace, FernWorkspace, getBaseOpenAPIWorkspaceSettingsFromGeneratorInvocation } from "@fern-api/workspace-loader"; -import tmp from "tmp-promise"; -import { GeneratorWorkspace } from "../../loadGeneratorWorkspaces"; + import { Semaphore } from "../../Semaphore"; +import { GeneratorWorkspace } from "../../loadGeneratorWorkspaces"; import { convertGeneratorWorkspaceToFernWorkspace } from "../../utils/convertSeedWorkspaceToFernWorkspace"; import { workspaceShouldGenerateDynamicSnippetTests } from "../../workspaceShouldGenerateDynamicSnippetTests"; import { ScriptRunner } from "../test/ScriptRunner"; diff --git a/packages/seed/src/commands/test/ScriptRunner.ts b/packages/seed/src/commands/test/ScriptRunner.ts index 471633cf845..5fbe629cc27 100644 --- a/packages/seed/src/commands/test/ScriptRunner.ts +++ b/packages/seed/src/commands/test/ScriptRunner.ts @@ -1,11 +1,13 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { loggingExeca } from "@fern-api/logging-execa"; -import { TaskContext } from "@fern-api/task-context"; import { writeFile } from "fs/promises"; import tmp from "tmp-promise"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { loggingExeca } from "@fern-api/logging-execa"; +import { TaskContext } from "@fern-api/task-context"; + +import { Semaphore } from "../../Semaphore"; import { DockerScriptConfig } from "../../config/api"; import { GeneratorWorkspace } from "../../loadGeneratorWorkspaces"; -import { Semaphore } from "../../Semaphore"; export declare namespace ScriptRunner { interface RunArgs { diff --git a/packages/seed/src/commands/test/TaskContextFactory.ts b/packages/seed/src/commands/test/TaskContextFactory.ts index 4a316f57bea..d2b7bd6df4c 100644 --- a/packages/seed/src/commands/test/TaskContextFactory.ts +++ b/packages/seed/src/commands/test/TaskContextFactory.ts @@ -1,7 +1,9 @@ +import chalk from "chalk"; + import { assertNever } from "@fern-api/core-utils"; -import { CONSOLE_LOGGER, LogLevel, LOG_LEVELS } from "@fern-api/logger"; +import { CONSOLE_LOGGER, LOG_LEVELS, LogLevel } from "@fern-api/logger"; import { TaskContext } from "@fern-api/task-context"; -import chalk from "chalk"; + import { TaskContextImpl } from "../../TaskContextImpl"; const TASK_COLORS = ["#2E86AB", "#A23B72", "#F18F01", "#C73E1D", "#CCE2A3"]; diff --git a/packages/seed/src/commands/test/printTestCases.ts b/packages/seed/src/commands/test/printTestCases.ts index 67997cea375..c5eae9b69e2 100644 --- a/packages/seed/src/commands/test/printTestCases.ts +++ b/packages/seed/src/commands/test/printTestCases.ts @@ -1,4 +1,5 @@ import { printTable } from "console-table-printer"; + import { TestRunner } from "./test-runner"; export function printTestCases(result: TestRunner.TestResult[]): void { diff --git a/packages/seed/src/commands/test/test-runner/DockerTestRunner.ts b/packages/seed/src/commands/test/test-runner/DockerTestRunner.ts index aedc713ba49..335b6f99637 100644 --- a/packages/seed/src/commands/test/test-runner/DockerTestRunner.ts +++ b/packages/seed/src/commands/test/test-runner/DockerTestRunner.ts @@ -1,10 +1,12 @@ +import path from "path"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { generatorsYml } from "@fern-api/configuration"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { runLocalGenerationForSeed } from "@fern-api/local-workspace-runner"; import { CONSOLE_LOGGER } from "@fern-api/logger"; import { TaskContext } from "@fern-api/task-context"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; -import path from "path"; + import { runScript } from "../../../runScript"; import { ALL_AUDIENCES, DUMMY_ORGANIZATION } from "../../../utils/constants"; import { getGeneratorInvocation } from "../../../utils/getGeneratorInvocation"; diff --git a/packages/seed/src/commands/test/test-runner/LocalTestRunner.ts b/packages/seed/src/commands/test/test-runner/LocalTestRunner.ts index d8eb8ff9c4d..8f1c5ceca60 100644 --- a/packages/seed/src/commands/test/test-runner/LocalTestRunner.ts +++ b/packages/seed/src/commands/test/test-runner/LocalTestRunner.ts @@ -1,18 +1,21 @@ +import { writeFile } from "fs/promises"; +import path from "path"; +import tmp from "tmp-promise"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { SNIPPET_JSON_FILENAME, SNIPPET_TEMPLATES_JSON_FILENAME } from "@fern-api/configuration"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; import { ApiDefinitionSource, SourceConfig } from "@fern-api/ir-sdk"; import { + LocalTaskHandler, generateDynamicSnippetTests, getGeneratorConfig, - getIntermediateRepresentation, - LocalTaskHandler + getIntermediateRepresentation } from "@fern-api/local-workspace-runner"; import { CONSOLE_LOGGER } from "@fern-api/logger"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; + import * as GeneratorExecSerialization from "@fern-fern/generator-exec-sdk/serialization"; -import { writeFile } from "fs/promises"; -import path from "path"; -import tmp from "tmp-promise"; + import { LocalBuildInfo } from "../../../config/api"; import { runScript } from "../../../runScript"; import { DUMMY_ORGANIZATION } from "../../../utils/constants"; diff --git a/packages/seed/src/commands/test/test-runner/TestRunner.ts b/packages/seed/src/commands/test/test-runner/TestRunner.ts index a960c0fb23b..71d1061a78a 100644 --- a/packages/seed/src/commands/test/test-runner/TestRunner.ts +++ b/packages/seed/src/commands/test/test-runner/TestRunner.ts @@ -1,18 +1,20 @@ -import { APIS_DIRECTORY, FERN_DIRECTORY, generatorsYml } from "@fern-api/configuration"; -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { TaskContext } from "@fern-api/task-context"; -import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { cp, mkdir, writeFile } from "fs/promises"; import path from "path"; -import { FixtureConfigurations, OutputMode } from "../../../config/api"; -import { GeneratorWorkspace } from "../../../loadGeneratorWorkspaces"; + +import { FernWorkspace } from "@fern-api/api-workspace-commons"; +import { APIS_DIRECTORY, FERN_DIRECTORY, generatorsYml } from "@fern-api/configuration"; +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; +import { TaskContext } from "@fern-api/task-context"; + import { Semaphore } from "../../../Semaphore"; import { Stopwatch } from "../../../Stopwatch"; +import { FixtureConfigurations, OutputMode } from "../../../config/api"; +import { GeneratorWorkspace } from "../../../loadGeneratorWorkspaces"; import { convertGeneratorWorkspaceToFernWorkspace } from "../../../utils/convertSeedWorkspaceToFernWorkspace"; import { ParsedDockerName, parseDockerOrThrow } from "../../../utils/parseDockerOrThrow"; +import { workspaceShouldGenerateDynamicSnippetTests } from "../../../workspaceShouldGenerateDynamicSnippetTests"; import { ScriptRunner } from "../ScriptRunner"; import { TaskContextFactory } from "../TaskContextFactory"; -import { workspaceShouldGenerateDynamicSnippetTests } from "../../../workspaceShouldGenerateDynamicSnippetTests"; export declare namespace TestRunner { interface Args { diff --git a/packages/seed/src/commands/test/testWorkspaceFixtures.ts b/packages/seed/src/commands/test/testWorkspaceFixtures.ts index dc544d1eeb6..a8b4035290d 100644 --- a/packages/seed/src/commands/test/testWorkspaceFixtures.ts +++ b/packages/seed/src/commands/test/testWorkspaceFixtures.ts @@ -1,8 +1,10 @@ -import { APIS_DIRECTORY, FERN_DIRECTORY } from "@fern-api/configuration"; -import { CONSOLE_LOGGER } from "@fern-api/logger"; import fs from "fs"; import { difference } from "lodash-es"; import path from "path"; + +import { APIS_DIRECTORY, FERN_DIRECTORY } from "@fern-api/configuration"; +import { CONSOLE_LOGGER } from "@fern-api/logger"; + import { GeneratorWorkspace } from "../../loadGeneratorWorkspaces"; import { printTestCases } from "./printTestCases"; import { TestRunner } from "./test-runner"; diff --git a/packages/seed/src/commands/validate/validateCliChangelog.ts b/packages/seed/src/commands/validate/validateCliChangelog.ts index a17bf1a84c0..5756090a1d5 100644 --- a/packages/seed/src/commands/validate/validateCliChangelog.ts +++ b/packages/seed/src/commands/validate/validateCliChangelog.ts @@ -1,11 +1,14 @@ -import { doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { loadCliWorkspace } from "../../loadGeneratorWorkspaces"; -import yaml from "js-yaml"; +import chalk from "chalk"; import { readFile } from "fs/promises"; +import yaml from "js-yaml"; + +import { RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import * as serializers from "@fern-fern/generators-sdk/serialization"; import { TaskContext } from "@fern-api/task-context"; -import chalk from "chalk"; + +import * as serializers from "@fern-fern/generators-sdk/serialization"; + +import { loadCliWorkspace } from "../../loadGeneratorWorkspaces"; export async function validateCliRelease({ context }: { context: TaskContext }): Promise { const cliWorkspace = await loadCliWorkspace(); diff --git a/packages/seed/src/commands/validate/validateGeneratorChangelog.ts b/packages/seed/src/commands/validate/validateGeneratorChangelog.ts index 5220f503c54..35b2402d7ba 100644 --- a/packages/seed/src/commands/validate/validateGeneratorChangelog.ts +++ b/packages/seed/src/commands/validate/validateGeneratorChangelog.ts @@ -1,9 +1,12 @@ -import { AbsoluteFilePath, doesPathExist, join, RelativeFilePath } from "@fern-api/fs-utils"; -import yaml from "js-yaml"; +import chalk from "chalk"; import { readFile } from "fs/promises"; -import * as serializers from "@fern-fern/generators-sdk/serialization"; +import yaml from "js-yaml"; + +import { AbsoluteFilePath, RelativeFilePath, doesPathExist, join } from "@fern-api/fs-utils"; import { TaskContext } from "@fern-api/task-context"; -import chalk from "chalk"; + +import * as serializers from "@fern-fern/generators-sdk/serialization"; + import { GeneratorWorkspace } from "../../loadGeneratorWorkspaces"; // TODO: we should share the language and generator type with the FDR definition diff --git a/packages/seed/src/loadGeneratorWorkspaces.ts b/packages/seed/src/loadGeneratorWorkspaces.ts index 55f913e8fc9..988c2d6305b 100644 --- a/packages/seed/src/loadGeneratorWorkspaces.ts +++ b/packages/seed/src/loadGeneratorWorkspaces.ts @@ -1,7 +1,9 @@ -import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; import { findUp } from "find-up"; -import { readdir, readFile } from "fs/promises"; +import { readFile, readdir } from "fs/promises"; import yaml from "js-yaml"; + +import { AbsoluteFilePath, RelativeFilePath, join } from "@fern-api/fs-utils"; + import { FernSeedConfig } from "./config"; export interface GeneratorWorkspace { diff --git a/packages/seed/src/logErrorMessage.ts b/packages/seed/src/logErrorMessage.ts index ea471778f5f..870dd372b59 100644 --- a/packages/seed/src/logErrorMessage.ts +++ b/packages/seed/src/logErrorMessage.ts @@ -1,8 +1,8 @@ // HACKHACK: copied from cli folder +import chalk from "chalk"; -import { Logger, LogLevel } from "@fern-api/logger"; +import { LogLevel, Logger } from "@fern-api/logger"; import { FernCliError } from "@fern-api/task-context"; -import chalk from "chalk"; export function logErrorMessage({ message, diff --git a/packages/seed/src/runScript.ts b/packages/seed/src/runScript.ts index aadc321b2f4..bf866534332 100644 --- a/packages/seed/src/runScript.ts +++ b/packages/seed/src/runScript.ts @@ -1,8 +1,9 @@ -import { Logger } from "@fern-api/logger"; -import { loggingExeca } from "@fern-api/logging-execa"; import { writeFile } from "fs/promises"; import tmp from "tmp-promise"; +import { Logger } from "@fern-api/logger"; +import { loggingExeca } from "@fern-api/logging-execa"; + export async function runScript({ commands, workingDir, diff --git a/packages/seed/src/utils/convertVersionsFileToReleases.ts b/packages/seed/src/utils/convertVersionsFileToReleases.ts index d849872ed17..f1ce9a36ef8 100644 --- a/packages/seed/src/utils/convertVersionsFileToReleases.ts +++ b/packages/seed/src/utils/convertVersionsFileToReleases.ts @@ -1,8 +1,10 @@ +import { readFile } from "fs/promises"; +import yaml from "js-yaml"; + import { TaskContext } from "@fern-api/task-context"; + import { CliReleaseRequest, GeneratorReleaseRequest } from "@fern-fern/generators-sdk/api/resources/generators"; import * as serializers from "@fern-fern/generators-sdk/serialization"; -import { readFile } from "fs/promises"; -import yaml from "js-yaml"; export async function parseGeneratorReleasesFile({ generatorId, diff --git a/packages/seed/src/utils/getGeneratorInvocation.ts b/packages/seed/src/utils/getGeneratorInvocation.ts index c22d8ac7596..66b261ad40f 100644 --- a/packages/seed/src/utils/getGeneratorInvocation.ts +++ b/packages/seed/src/utils/getGeneratorInvocation.ts @@ -1,9 +1,11 @@ import { generatorsYml } from "@fern-api/configuration"; import { assertNever } from "@fern-api/core-utils"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; + import { FernFiddle } from "@fern-fern/fiddle-sdk"; -import * as FernFiddleSerialization from "@fern-fern/fiddle-sdk/serialization"; import { GithubPublishInfo, PublishOutputModeV2 } from "@fern-fern/fiddle-sdk/api"; +import * as FernFiddleSerialization from "@fern-fern/fiddle-sdk/serialization"; + import { OutputMode } from "../config/api"; import { ParsedDockerName } from "../utils/parseDockerOrThrow"; diff --git a/packages/seed/src/utils/publishUtilities.ts b/packages/seed/src/utils/publishUtilities.ts index 655f683305e..c12de4b045c 100644 --- a/packages/seed/src/utils/publishUtilities.ts +++ b/packages/seed/src/utils/publishUtilities.ts @@ -1,5 +1,6 @@ import { loggingExeca } from "@fern-api/logging-execa"; import { TaskContext } from "@fern-api/task-context"; + import { runScript } from "../runScript"; // Replace the version string within the command, if one is specified diff --git a/packages/seed/src/utils/versionUtilities.ts b/packages/seed/src/utils/versionUtilities.ts index 3a13c4b65fe..c0299095437 100644 --- a/packages/seed/src/utils/versionUtilities.ts +++ b/packages/seed/src/utils/versionUtilities.ts @@ -1,6 +1,9 @@ import semver from "semver"; + import { TaskContext } from "@fern-api/task-context"; + import { CliReleaseRequest } from "@fern-fern/generators-sdk/api/resources/generators"; + import { parseCliReleasesFile } from "./convertVersionsFileToReleases"; export interface VersionFilePair { diff --git a/packages/snippets/core/package.json b/packages/snippets/core/package.json index 76b906bd75d..512da4af9b9 100644 --- a/packages/snippets/core/package.json +++ b/packages/snippets/core/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", "dist": "pnpm compile && node build.cjs" }, @@ -43,8 +42,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", "string.prototype.replaceall": "^1.0.10", "tsup": "^8.3.5", "typescript": "5.7.2" diff --git a/packages/snippets/core/src/Spec.ts b/packages/snippets/core/src/Spec.ts index 071eedd190d..c066c6a46ff 100644 --- a/packages/snippets/core/src/Spec.ts +++ b/packages/snippets/core/src/Spec.ts @@ -1,4 +1,5 @@ import { OpenAPI as OpenAPITypes } from "openapi-types"; + import { OpenAPIWorkspace } from "@fern-api/browser-compatible-fern-workspace"; export type Spec = OpenAPISpec; diff --git a/packages/snippets/core/src/__test__/generateDynamicIR.test.ts b/packages/snippets/core/src/__test__/generateDynamicIR.test.ts index 9164f23b60a..490cd771367 100644 --- a/packages/snippets/core/src/__test__/generateDynamicIR.test.ts +++ b/packages/snippets/core/src/__test__/generateDynamicIR.test.ts @@ -1,4 +1,5 @@ import { OpenAPI } from "openapi-types"; + import { generateDynamicIR } from "../generateDynamicIR"; describe("generateDynamicIR", () => { diff --git a/packages/snippets/core/src/generateDynamicIR.ts b/packages/snippets/core/src/generateDynamicIR.ts index fa8b0dc65a9..89ee4f1b103 100644 --- a/packages/snippets/core/src/generateDynamicIR.ts +++ b/packages/snippets/core/src/generateDynamicIR.ts @@ -1,10 +1,11 @@ -import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; -import { NopSourceResolver } from "@fern-api/source-resolver"; -import { createTaskContext } from "./utils/createTaskContext"; import { Audiences, generatorsYml } from "@fern-api/configuration"; +import { generateIntermediateRepresentation } from "@fern-api/ir-generator"; import { dynamic } from "@fern-api/ir-sdk"; +import { NopSourceResolver } from "@fern-api/source-resolver"; + import { Spec } from "./Spec"; import { convertSpecToWorkspace } from "./utils/convertSpecToWorkspace"; +import { createTaskContext } from "./utils/createTaskContext"; export function generateDynamicIR({ spec, diff --git a/packages/snippets/core/src/utils/convertSpecToWorkspace.ts b/packages/snippets/core/src/utils/convertSpecToWorkspace.ts index 99fc12363ea..5ae07ceeee4 100644 --- a/packages/snippets/core/src/utils/convertSpecToWorkspace.ts +++ b/packages/snippets/core/src/utils/convertSpecToWorkspace.ts @@ -1,9 +1,10 @@ import { FernWorkspace } from "@fern-api/api-workspace-commons"; import { OpenAPIWorkspace } from "@fern-api/browser-compatible-fern-workspace"; -import { Spec } from "../Spec"; import { generatorsYml } from "@fern-api/configuration"; import { TaskContext } from "@fern-api/task-context"; +import { Spec } from "../Spec"; + export function convertSpecToWorkspace({ context, spec, diff --git a/packages/snippets/core/src/utils/createTaskContext.ts b/packages/snippets/core/src/utils/createTaskContext.ts index 94aaf6d9f61..e3af604dea9 100644 --- a/packages/snippets/core/src/utils/createTaskContext.ts +++ b/packages/snippets/core/src/utils/createTaskContext.ts @@ -1,5 +1,6 @@ +import { PosthogEvent, TaskContext } from "@fern-api/task-context"; + import { NopLogger } from "./NopLogger"; -import { TaskContext, PosthogEvent } from "@fern-api/task-context"; export enum TaskResult { Success, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bb6480ce976..fdf1c7db60c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,6 +47,9 @@ importers: '@blueprintjs/stylelint-plugin': specifier: ^4.1.14 version: 4.1.14(stylelint@14.14.0) + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -113,12 +116,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 react: specifier: ^18.2.0 version: 18.2.0 @@ -177,6 +177,9 @@ importers: specifier: ^3.0.3 version: 3.0.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/js-yaml': specifier: ^4.0.8 version: 4.0.8 @@ -192,12 +195,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -223,18 +223,18 @@ importers: specifier: ^0.0.898 version: 0.0.898 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) depcheck: specifier: ^1.4.7 version: 1.4.7 eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -266,6 +266,9 @@ importers: specifier: ^3.22.3 version: 3.22.4 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -281,12 +284,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -308,6 +308,9 @@ importers: '@fern-fern/ir-sdk': specifier: ^53.18.0 version: 53.18.0 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -326,12 +329,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.3.5 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -374,6 +374,9 @@ importers: '@fern-fern/ir-sdk': specifier: ^53.18.0 version: 53.18.0 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -398,12 +401,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.3.5 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -438,6 +438,9 @@ importers: specifier: ^3.22.3 version: 3.23.8 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -447,12 +450,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -471,6 +471,9 @@ importers: '@fern-api/go-ast': specifier: workspace:* version: link:../ast + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -486,12 +489,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.0.2 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -528,6 +528,9 @@ importers: '@fern-api/path-utils': specifier: workspace:* version: link:../../../packages/commons/path-utils + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -537,12 +540,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 string.prototype.replaceall: specifier: ^1.0.10 version: 1.0.10 @@ -565,6 +565,9 @@ importers: specifier: ^0.4.9 version: 0.4.9 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -577,12 +580,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -592,6 +592,9 @@ importers: generators/go-v2/model: devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -607,12 +610,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.0.2 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -625,6 +625,9 @@ importers: generators/go-v2/sdk: devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -640,12 +643,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.0.2 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -670,6 +670,9 @@ importers: '@fern-fern/ir-sdk': specifier: 53.9.0 version: 53.9.0 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -703,12 +706,9 @@ importers: openapi-types: specifier: ^12.1.3 version: 12.1.3 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.3.5 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -746,6 +746,9 @@ importers: specifier: ^3.22.3 version: 3.22.4 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -761,12 +764,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -788,6 +788,9 @@ importers: '@fern-fern/ir-sdk': specifier: ^53.15.0 version: 53.15.0 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -806,12 +809,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.3.5 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -848,6 +848,9 @@ importers: '@fern-fern/ir-sdk': specifier: ^53.15.0 version: 53.15.0 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -872,12 +875,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.3.5 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -908,6 +908,9 @@ importers: '@fern-fern/postman-sdk': specifier: 0.1.1 version: 0.1.1 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -935,12 +938,9 @@ importers: lodash: specifier: ^4.17.21 version: 4.17.21 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.3.5 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -966,6 +966,9 @@ importers: specifier: ^0.6.1 version: 0.6.1 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -975,12 +978,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1015,6 +1015,9 @@ importers: specifier: ^3.22.4 version: 3.23.8 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -1027,12 +1030,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1042,6 +1042,9 @@ importers: generators/python-v2/fastapi: devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -1057,12 +1060,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.3.5 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -1096,6 +1096,9 @@ importers: '@fern-fern/ir-sdk': specifier: 53.7.0 version: 53.7.0 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -1111,12 +1114,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.3.5 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -1151,6 +1151,9 @@ importers: specifier: ^3.0.3 version: 3.0.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1163,12 +1166,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1197,6 +1197,9 @@ importers: specifier: ^3.22.3 version: 3.22.4 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1212,12 +1215,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1248,6 +1248,9 @@ importers: '@fern-fern/ir-sdk': specifier: ^39 version: 39.0.0 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1266,12 +1269,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 ts-loader: specifier: ^9.3.1 version: 9.5.1(typescript@5.7.2)(webpack@5.94.0(esbuild@0.24.0)) @@ -1314,6 +1314,9 @@ importers: '@fern-fern/ir-sdk': specifier: ^39 version: 39.0.0 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1332,12 +1335,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.3.5 version: 8.3.5(postcss@8.4.49)(typescript@5.7.2)(yaml@2.3.3) @@ -1363,6 +1363,9 @@ importers: specifier: workspace:* version: link:../../../packages/commons/fs-utils devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1381,12 +1384,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1395,6 +1395,10 @@ importers: version: 2.0.5(@types/node@18.15.3)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) generators/typescript-v2/ast: + dependencies: + prettier2: + specifier: npm:prettier@^2.7.1 + version: prettier@2.8.8 devDependencies: '@fern-api/browser-compatible-base-generator': specifier: workspace:* @@ -1405,24 +1409,27 @@ importers: '@fern-fern/ir-sdk': specifier: 53.23.0 version: 53.23.0 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 '@types/node': specifier: 18.15.3 version: 18.15.3 + '@types/prettier2': + specifier: npm:@types/prettier@^2.7.3 + version: '@types/prettier@2.7.3' depcheck: specifier: ^1.4.7 version: 1.4.7 eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1447,6 +1454,9 @@ importers: '@fern-api/typescript-ast': specifier: workspace:* version: link:../ast + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.12 version: 29.5.14 @@ -1456,12 +1466,9 @@ importers: eslint: specifier: ^8.56.0 version: 8.56.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 string.prototype.replaceall: specifier: ^1.0.10 version: 1.0.10 @@ -1495,6 +1502,9 @@ importers: '@fern-typescript/express-generator': specifier: workspace:* version: link:../generator + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@ts-morph/common': specifier: ^0.25.0 version: 0.25.0 @@ -1519,12 +1529,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 ts-loader: specifier: ^9.3.1 version: 9.5.1(typescript@5.7.2)(webpack@5.94.0) @@ -1562,6 +1569,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1574,12 +1584,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1605,6 +1612,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1617,12 +1627,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1651,6 +1658,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1663,12 +1673,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1688,6 +1695,9 @@ importers: specifier: workspace:* version: link:../../utils/contexts devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1700,12 +1710,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1731,6 +1738,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1743,12 +1753,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1777,6 +1784,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1792,12 +1802,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1823,6 +1830,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1835,12 +1845,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1911,6 +1918,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1923,12 +1933,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1951,6 +1958,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1963,12 +1973,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -1994,6 +2001,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2006,12 +2016,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2037,6 +2044,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2049,12 +2059,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2080,6 +2087,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2092,12 +2102,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2126,6 +2133,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2138,12 +2148,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2169,6 +2176,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2181,12 +2191,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2212,6 +2219,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2224,12 +2234,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2261,6 +2268,9 @@ importers: specifier: ^5.0.0 version: 5.0.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -2288,12 +2298,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 sass: specifier: ^1.72.0 version: 1.72.0 @@ -2336,6 +2343,9 @@ importers: '@fern-typescript/sdk-generator': specifier: workspace:* version: link:../generator + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@ts-morph/common': specifier: ^0.25.0 version: 0.25.0 @@ -2360,12 +2370,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 ts-loader: specifier: ^9.3.1 version: 9.5.1(typescript@5.7.2)(webpack@5.94.0) @@ -2406,6 +2413,9 @@ importers: specifier: ^6.7.0 version: 6.7.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2418,12 +2428,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2452,6 +2459,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2464,12 +2474,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2492,6 +2499,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2504,12 +2514,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2610,6 +2617,9 @@ importers: specifier: ^9.0.1 version: 9.0.1 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2631,12 +2641,9 @@ importers: jest-specific-snapshot: specifier: ^8.0.0 version: 8.0.0(jest@29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2))) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2659,6 +2666,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2671,12 +2681,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2702,6 +2709,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2714,12 +2724,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2754,6 +2761,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2766,12 +2776,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2797,6 +2804,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2809,12 +2819,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2843,6 +2850,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2855,12 +2865,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2886,6 +2893,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2898,12 +2908,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2923,6 +2930,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2935,12 +2945,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -2972,6 +2979,9 @@ importers: specifier: workspace:* version: link:../contexts devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -2984,12 +2994,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3009,6 +3016,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -3021,12 +3031,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3088,6 +3095,9 @@ importers: specifier: ^5.0.0 version: 5.0.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/decompress': specifier: ^4.2.7 version: 4.2.7 @@ -3118,15 +3128,12 @@ importers: memfs: specifier: ^3.4.1 version: 3.5.3 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 package-json-type: specifier: ^1.0.3 version: 1.0.3 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 vitest: specifier: ^2.1.8 version: 2.1.8(@types/node@18.15.3)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) @@ -3152,6 +3159,9 @@ importers: specifier: ^15.1.0 version: 15.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -3164,12 +3174,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3186,6 +3193,9 @@ importers: specifier: ^3.7.6 version: 3.7.7 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -3201,12 +3211,9 @@ importers: jest: specifier: ^29.7.0 version: 29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2)) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 ts-jest: specifier: ^29.2.4 version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2)))(typescript@5.7.2) @@ -3216,6 +3223,9 @@ importers: generators/typescript/utils/core-utilities/base: devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -3231,12 +3241,9 @@ importers: jest: specifier: ^29.7.0 version: 29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2)) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 ts-jest: specifier: ^29.2.4 version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2)))(typescript@5.7.2) @@ -3246,6 +3253,9 @@ importers: generators/typescript/utils/core-utilities/callback-queue: devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -3261,12 +3271,9 @@ importers: jest: specifier: ^29.7.0 version: 29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2)) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3289,6 +3296,9 @@ importers: specifier: ^4.5.2 version: 4.5.2 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/express': specifier: ^4.17.21 version: 4.17.21 @@ -3331,12 +3341,9 @@ importers: multer: specifier: ^1.4.5-lts.1 version: 1.4.5-lts.1 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 ts-jest: specifier: ^29.2.4 version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2)))(typescript@5.7.2) @@ -3352,6 +3359,9 @@ importers: generators/typescript/utils/core-utilities/utils: devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -3367,12 +3377,9 @@ importers: jest: specifier: ^29.7.0 version: 29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2)) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 ts-jest: specifier: ^29.2.4 version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2)))(typescript@5.7.2) @@ -3388,6 +3395,9 @@ importers: '@babel/preset-typescript': specifier: ^7.26.0 version: 7.26.0(@babel/core@7.26.0) + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -3403,12 +3413,9 @@ importers: jest: specifier: ^29.7.0 version: 29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2)) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 ts-jest: specifier: ^29.2.4 version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@18.15.3)(ts-node@10.9.2(@types/node@18.15.3)(typescript@5.7.2)))(typescript@5.7.2) @@ -3425,6 +3432,9 @@ importers: specifier: workspace:* version: link:../commons devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -3437,12 +3447,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3468,18 +3475,18 @@ importers: specifier: ^4.17.21 version: 4.17.21 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 depcheck: specifier: ^1.4.7 version: 1.4.7 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3489,6 +3496,9 @@ importers: packages/cli/api-importers/conjure/conjure-sdk: devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -3501,12 +3511,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3532,6 +3539,9 @@ importers: specifier: ^4.1.0 version: 4.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/js-yaml': specifier: ^4.0.8 version: 4.0.8 @@ -3541,12 +3551,9 @@ importers: depcheck: specifier: ^1.4.7 version: 1.4.7 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3566,6 +3573,9 @@ importers: specifier: workspace:* version: link:../../../workspace/loader devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -3575,12 +3585,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3594,6 +3601,9 @@ importers: specifier: ^4.17.21 version: 4.17.21 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.12 version: 29.5.14 @@ -3606,12 +3616,9 @@ importers: eslint: specifier: ^8.56.0 version: 8.56.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 4.6.4 version: 4.6.4 @@ -3652,6 +3659,9 @@ importers: specifier: ^3.22.3 version: 3.23.8 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -3661,12 +3671,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3704,6 +3711,9 @@ importers: specifier: ^4.17.21 version: 4.17.21 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -3713,12 +3723,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3750,6 +3757,9 @@ importers: specifier: ^12.1.3 version: 12.1.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/js-yaml': specifier: ^4.0.8 version: 4.0.8 @@ -3762,12 +3772,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3799,6 +3806,9 @@ importers: specifier: ^3.1.0 version: 3.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -3814,12 +3824,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -3958,6 +3965,9 @@ importers: '@inquirer/prompts': specifier: ^7.1.0 version: 7.1.0(@types/node@18.15.3) + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/axios': specifier: ^0.14.0 version: 0.14.0 @@ -4039,12 +4049,9 @@ importers: ora: specifier: ^7.0.1 version: 7.0.1 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tar: specifier: ^6.2.1 version: 6.2.1 @@ -4079,6 +4086,9 @@ importers: specifier: ^5.3.0 version: 5.3.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -4091,12 +4101,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4149,6 +4156,9 @@ importers: specifier: ^3.22.3 version: 3.22.4 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/inquirer': specifier: ^9.0.7 version: 9.0.7 @@ -4167,12 +4177,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tmp-promise: specifier: ^3.0.3 version: 3.0.3 @@ -4201,6 +4208,9 @@ importers: specifier: workspace:* version: link:../task-context devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -4210,12 +4220,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4223,6 +4230,8 @@ importers: specifier: ^2.1.8 version: 2.1.8(@types/node@18.15.3)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) + packages/cli/cli/dist/local: {} + packages/cli/configuration: dependencies: '@fern-api/core-utils': @@ -4244,6 +4253,9 @@ importers: specifier: ^3.22.3 version: 3.22.4 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -4253,12 +4265,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4314,6 +4323,9 @@ importers: specifier: ^3.22.3 version: 3.23.8 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -4338,12 +4350,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4369,6 +4378,9 @@ importers: specifier: ^4.1.0 version: 4.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/js-yaml': specifier: ^4.0.8 version: 4.0.8 @@ -4381,12 +4393,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4421,6 +4430,9 @@ importers: specifier: ^4.0.3 version: 4.0.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -4430,12 +4442,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4470,6 +4479,9 @@ importers: specifier: ^5.0.0 version: 5.0.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/diff': specifier: ^5.2.1 version: 5.2.1 @@ -4485,12 +4497,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4561,6 +4570,9 @@ importers: specifier: ^0.6.2 version: 0.6.2 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/cors': specifier: ^2.8.13 version: 2.8.17 @@ -4591,12 +4603,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4655,6 +4664,9 @@ importers: '@fern-api/workspace-loader': specifier: workspace:* version: link:../workspace/loader + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -4667,12 +4679,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4719,6 +4728,9 @@ importers: specifier: ^3.0.3 version: 3.0.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/express': specifier: ^4.17.21 version: 4.17.21 @@ -4746,12 +4758,9 @@ importers: jest-environment-jsdom: specifier: ^29.7.0 version: 29.7.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4779,28 +4788,31 @@ importers: chalk: specifier: ^5.3.0 version: 5.3.0 + prettier2: + specifier: npm:prettier@^2.7.1 + version: prettier@2.8.8 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 '@types/node': specifier: 18.15.3 version: 18.15.3 - '@types/prettier': - specifier: ^2.7.1 - version: 2.7.3 + '@types/prettier2': + specifier: npm:@types/prettier@^2.7.3 + version: '@types/prettier@2.7.3' depcheck: specifier: ^1.4.7 version: 1.4.7 eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4844,6 +4856,9 @@ importers: specifier: ^0.4.0 version: 0.4.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/json-schema': specifier: ^7.0.15 version: 7.0.15 @@ -4856,12 +4871,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4878,6 +4890,9 @@ importers: specifier: workspace:* version: link:../../../ir-sdk devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -4890,12 +4905,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -4951,6 +4963,9 @@ importers: specifier: ^5.0.0 version: 5.0.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -4966,12 +4981,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5005,6 +5017,9 @@ importers: '@fern-api/task-context': specifier: workspace:* version: link:../../task-context + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -5020,12 +5035,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 string.prototype.replaceall: specifier: ^1.0.10 version: 1.0.10 @@ -5069,9 +5081,12 @@ importers: specifier: workspace:* version: link:../../workspace/loader prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -5081,9 +5096,6 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5286,6 +5298,9 @@ importers: specifier: ^4.17.21 version: 4.17.21 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -5301,12 +5316,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5329,6 +5341,9 @@ importers: specifier: ^3.0.3 version: 3.0.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -5338,12 +5353,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5407,6 +5419,9 @@ importers: decompress: specifier: ^4.2.1 version: 4.2.1 + prettier2: + specifier: npm:prettier@^2.7.1 + version: prettier@2.8.8 tmp-promise: specifier: ^3.0.3 version: 3.0.3 @@ -5414,6 +5429,9 @@ importers: specifier: ^5.0.0 version: 5.0.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/decompress': specifier: ^4.2.7 version: 4.2.7 @@ -5423,6 +5441,9 @@ importers: '@types/node': specifier: 18.15.3 version: 18.15.3 + '@types/prettier2': + specifier: npm:@types/prettier@^2.7.3 + version: '@types/prettier@2.7.3' '@types/tmp': specifier: ^0.2.4 version: 0.2.4 @@ -5435,12 +5456,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5538,6 +5556,9 @@ importers: specifier: ^5.0.0 version: 5.0.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/decompress': specifier: ^4.2.7 version: 4.2.7 @@ -5565,12 +5586,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5587,6 +5605,9 @@ importers: specifier: workspace:* version: link:../../../commons/path-utils devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -5596,12 +5617,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5657,6 +5675,9 @@ importers: specifier: ^3.0.3 version: 3.0.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/fs-extra': specifier: ^11.0.1 version: 11.0.1 @@ -5675,12 +5696,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5694,6 +5712,9 @@ importers: specifier: workspace:* version: link:../../commons/core-utils devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -5703,12 +5724,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5749,6 +5767,9 @@ importers: specifier: 6.12.1 version: 6.12.1 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/boxen': specifier: ^3.0.1 version: 3.0.1 @@ -5770,12 +5791,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5810,6 +5828,9 @@ importers: specifier: ^5.0.0 version: 5.0.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/express': specifier: ^4.17.21 version: 4.17.21 @@ -5825,12 +5846,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5856,6 +5874,9 @@ importers: specifier: ^9.0.1 version: 9.0.1 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -5871,12 +5892,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5905,6 +5923,9 @@ importers: specifier: ^5.3.0 version: 5.3.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -5917,12 +5938,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -5972,6 +5990,9 @@ importers: specifier: ^4.17.21 version: 4.17.21 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -5984,12 +6005,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6003,6 +6021,9 @@ importers: specifier: ^4.0.0 version: 4.0.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6015,12 +6036,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6034,6 +6052,9 @@ importers: specifier: workspace:* version: link:../logger devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6046,12 +6067,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6086,6 +6104,9 @@ importers: specifier: ^12.1.3 version: 12.1.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6098,12 +6119,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6150,6 +6168,9 @@ importers: specifier: ^12.1.3 version: 12.1.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6165,12 +6186,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6265,6 +6283,9 @@ importers: specifier: ^3.22.3 version: 3.23.8 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6292,12 +6313,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6350,6 +6368,9 @@ importers: specifier: ^3.22.3 version: 3.23.8 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6365,12 +6386,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6441,6 +6459,9 @@ importers: specifier: ^3.22.3 version: 3.22.4 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6456,12 +6477,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6508,6 +6526,9 @@ importers: specifier: ^7.1.0 version: 7.1.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6520,12 +6541,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6557,6 +6575,9 @@ importers: specifier: ^4.0.0 version: 4.0.0 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/ajv': specifier: ^1.0.0 version: 1.0.4 @@ -6587,12 +6608,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6621,6 +6639,9 @@ importers: specifier: ^3.0.3 version: 3.0.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6636,12 +6657,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6655,6 +6673,9 @@ importers: specifier: workspace:* version: link:../core-utils devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6667,12 +6688,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6692,6 +6710,9 @@ importers: specifier: ^3.0.3 version: 3.0.3 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/node': specifier: 18.15.3 version: 18.15.3 @@ -6701,12 +6722,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6716,6 +6734,9 @@ importers: packages/commons/path-utils: devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6725,12 +6746,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6756,6 +6774,9 @@ importers: specifier: 0.114.0-5745f9e74 version: 0.114.0-5745f9e74 devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -6768,12 +6789,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.16.0(jiti@1.18.2) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6783,6 +6801,9 @@ importers: packages/ir-sdk: devDependencies: + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.12 version: 29.5.14 @@ -6795,12 +6816,9 @@ importers: eslint: specifier: ^8.56.0 version: 8.56.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 typescript: specifier: 4.6.4 version: 4.6.4 @@ -6816,6 +6834,9 @@ importers: '@fern-api/ir-migrations': specifier: workspace:* version: link:../cli/generation/ir-migrations + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.12 version: 29.5.14 @@ -6831,12 +6852,9 @@ importers: eslint: specifier: ^8.56.0 version: 8.56.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 tsup: specifier: ^8.0.2 version: 8.3.5(postcss@8.4.49)(typescript@4.6.4)(yaml@2.3.3) @@ -6897,6 +6915,9 @@ importers: '@fern-fern/generators-sdk': specifier: 0.114.0-5745f9e74 version: 0.114.0-5745f9e74 + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/find-up': specifier: ^4.0.0 version: 4.0.0 @@ -6948,12 +6969,9 @@ importers: moment: specifier: ^2.30.1 version: 2.30.1 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 pretty-ms: specifier: ^9.0.0 version: 9.0.0 @@ -7005,6 +7023,9 @@ importers: '@fern-api/task-context': specifier: workspace:* version: link:../../cli/task-context + '@trivago/prettier-plugin-sort-imports': + specifier: ^5.2.1 + version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -7017,12 +7038,9 @@ importers: openapi-types: specifier: ^12.1.3 version: 12.1.3 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: - specifier: ^2.7.1 - version: 2.7.1 + specifier: ^3.4.2 + version: 3.4.2 string.prototype.replaceall: specifier: ^1.0.10 version: 1.0.10 @@ -8776,6 +8794,22 @@ packages: resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==} engines: {node: '>= 10'} + '@trivago/prettier-plugin-sort-imports@5.2.1': + resolution: {integrity: sha512-NDZndt0fmVThIx/8cExuJHLZagUVzfGCoVrwH9x6aZvwfBdkrDFTYujecek6X2WpG4uUFsVaPg5+aNQPSyjcmw==} + engines: {node: '>18.12'} + peerDependencies: + '@vue/compiler-sfc': 3.x + prettier: 2.x - 3.x + prettier-plugin-svelte: 3.x + svelte: 4.x || 5.x + peerDependenciesMeta: + '@vue/compiler-sfc': + optional: true + prettier-plugin-svelte: + optional: true + svelte: + optional: true + '@ts-morph/common@0.16.0': resolution: {integrity: sha512-SgJpzkTgZKLKqQniCjLaE3c2L2sdL7UShvmTmPBejAKd2OKV/yfMpQ2IWpAuA+VY5wy7PkSUaEObIqEK6afFuw==} @@ -9020,12 +9054,6 @@ packages: '@types/stream-json@1.7.7': resolution: {integrity: sha512-hHG7cLQ09H/m9i0jzL6UJAeLLxIWej90ECn0svO4T8J0nGcl89xZDQ2ujT4WKlvg0GWkcxJbjIDzW/v7BYUM6Q==} - '@types/strip-bom@3.0.0': - resolution: {integrity: sha512-xevGOReSYGM7g/kUBZzPqCrR/KYAo+F0yiPc85WFTJa0MSLtyFTVTU6cJu/aV4mid7IffDIWqo69THF2o4JiEQ==} - - '@types/strip-json-comments@0.0.30': - resolution: {integrity: sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==} - '@types/swagger2openapi@7.0.4': resolution: {integrity: sha512-ffMqzciTDihOKH4Q//9Ond1yb5JP1P5FC/aFPsLK4blea1Fwk2aYctiNCkAh5etDYFswFXS+5LV/vuGkf+PU6A==} @@ -10261,10 +10289,6 @@ packages: ecdsa-sig-formatter@1.0.11: resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==} - editorconfig@0.15.3: - resolution: {integrity: sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==} - hasBin: true - ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} @@ -11396,6 +11420,9 @@ packages: engines: {node: '>=10'} hasBin: true + javascript-natural-sort@0.7.1: + resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==} + jest-changed-files@29.7.0: resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -11811,9 +11838,6 @@ packages: resolution: {integrity: sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==} engines: {node: 20 || >=22} - lru-cache@4.1.5: - resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} - lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} @@ -12340,10 +12364,6 @@ packages: resolution: {integrity: sha512-0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw==} engines: {node: '>=16'} - organize-imports-cli@0.10.0: - resolution: {integrity: sha512-cVyNEeiDxX/zA6gdK1QS2rr3TK1VymIkT0LagnAk4f6eE0IC0bo3BeUkMzm3q3GnCJzYC+6lfuMpBE0Cequ7Vg==} - hasBin: true - os-tmpdir@1.0.2: resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} @@ -12635,13 +12655,13 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - prettier@2.7.1: - resolution: {integrity: sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==} + prettier@2.8.8: + resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true - prettier@3.3.3: - resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + prettier@3.4.2: + resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==} engines: {node: '>=14'} hasBin: true @@ -12683,9 +12703,6 @@ packages: proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} - pseudomap@1.0.2: - resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} - psl@1.9.0: resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} @@ -13092,9 +13109,6 @@ packages: siginfo@2.0.0: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} - sigmund@1.0.1: - resolution: {integrity: sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==} - signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -13650,9 +13664,6 @@ packages: tsconfig-paths@3.15.0: resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==} - tsconfig@7.0.0: - resolution: {integrity: sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==} - tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} @@ -14260,9 +14271,6 @@ packages: resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} engines: {node: '>=10'} - yallist@2.1.2: - resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==} - yallist@3.1.1: resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} @@ -14413,7 +14421,7 @@ snapshots: '@babel/helper-annotate-as-pure@7.25.7': dependencies: - '@babel/types': 7.25.8 + '@babel/types': 7.26.3 '@babel/helper-annotate-as-pure@7.25.9': dependencies: @@ -15219,8 +15227,8 @@ snapshots: '@babel/template@7.25.7': dependencies: '@babel/code-frame': 7.25.7 - '@babel/parser': 7.25.8 - '@babel/types': 7.25.8 + '@babel/parser': 7.26.3 + '@babel/types': 7.26.3 '@babel/template@7.25.9': dependencies: @@ -15603,7 +15611,7 @@ snapshots: '@fern-api/template-resolver@0.7.5': dependencies: - prettier: 3.3.3 + prettier: 3.4.2 '@fern-api/ui-core-utils@0.0.0': dependencies: @@ -16326,6 +16334,20 @@ snapshots: '@tootallnate/once@2.0.0': {} + '@trivago/prettier-plugin-sort-imports@5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2)': + dependencies: + '@babel/generator': 7.26.3 + '@babel/parser': 7.26.3 + '@babel/traverse': 7.23.2 + '@babel/types': 7.26.3 + javascript-natural-sort: 0.7.1 + lodash: 4.17.21 + prettier: 3.4.2 + optionalDependencies: + '@vue/compiler-sfc': 3.5.13 + transitivePeerDependencies: + - supports-color + '@ts-morph/common@0.16.0': dependencies: fast-glob: 3.3.2 @@ -16605,10 +16627,6 @@ snapshots: '@types/node': 18.15.3 '@types/stream-chain': 2.1.0 - '@types/strip-bom@3.0.0': {} - - '@types/strip-json-comments@0.0.30': {} - '@types/swagger2openapi@7.0.4': dependencies: '@types/node': 18.15.3 @@ -17323,7 +17341,7 @@ snapshots: babel-plugin-jest-hoist@29.6.3: dependencies: '@babel/template': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.26.3 '@types/babel__core': 7.20.5 '@types/babel__traverse': 7.17.1 @@ -18021,13 +18039,6 @@ snapshots: dependencies: safe-buffer: 5.2.1 - editorconfig@0.15.3: - dependencies: - commander: 2.20.3 - lru-cache: 4.1.5 - semver: 5.7.2 - sigmund: 1.0.1 - ee-first@1.1.1: {} ejs@3.1.10: @@ -19458,7 +19469,7 @@ snapshots: istanbul-lib-instrument@5.2.0: dependencies: '@babel/core': 7.26.0 - '@babel/parser': 7.25.8 + '@babel/parser': 7.26.3 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 6.3.1 @@ -19468,7 +19479,7 @@ snapshots: istanbul-lib-instrument@6.0.1: dependencies: '@babel/core': 7.26.0 - '@babel/parser': 7.25.8 + '@babel/parser': 7.26.3 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 7.6.3 @@ -19519,6 +19530,8 @@ snapshots: filelist: 1.0.4 minimatch: 3.1.2 + javascript-natural-sort@0.7.1: {} + jest-changed-files@29.7.0: dependencies: execa: 5.1.1 @@ -20124,11 +20137,6 @@ snapshots: lru-cache@11.0.1: {} - lru-cache@4.1.5: - dependencies: - pseudomap: 1.0.2 - yallist: 2.1.2 - lru-cache@5.1.1: dependencies: yallist: 3.1.1 @@ -20977,13 +20985,6 @@ snapshots: string-width: 6.1.0 strip-ansi: 7.1.0 - organize-imports-cli@0.10.0: - dependencies: - chalk: 4.1.2 - editorconfig: 0.15.3 - ts-morph: 15.1.0 - tsconfig: 7.0.0 - os-tmpdir@1.0.2: {} p-finally@1.0.0: {} @@ -21222,9 +21223,9 @@ snapshots: prelude-ls@1.2.1: {} - prettier@2.7.1: {} + prettier@2.8.8: {} - prettier@3.3.3: {} + prettier@3.4.2: {} pretty-format@29.7.0: dependencies: @@ -21264,8 +21265,6 @@ snapshots: proxy-from-env@1.1.0: {} - pseudomap@1.0.2: {} - psl@1.9.0: {} punycode@2.3.1: {} @@ -21783,8 +21782,6 @@ snapshots: siginfo@2.0.0: {} - sigmund@1.0.1: {} - signal-exit@3.0.7: {} signal-exit@4.1.0: {} @@ -22484,13 +22481,6 @@ snapshots: minimist: 1.2.6 strip-bom: 3.0.0 - tsconfig@7.0.0: - dependencies: - '@types/strip-bom': 3.0.0 - '@types/strip-json-comments': 0.0.30 - strip-bom: 3.0.0 - strip-json-comments: 2.0.1 - tslib@1.14.1: {} tslib@2.6.2: {} @@ -23364,8 +23354,6 @@ snapshots: y18n@5.0.8: {} - yallist@2.1.2: {} - yallist@3.1.1: {} yallist@4.0.0: {} diff --git a/turbo.json b/turbo.json index 7e413f0a9c4..6eaff489229 100644 --- a/turbo.json +++ b/turbo.json @@ -17,9 +17,6 @@ "lint:eslint:fix": { "outputs": [] }, - "organize-imports": { - "outputs": [] - }, "test": { "dependsOn": ["^compile"], "outputs": []