From fa4aa6e82064ff4b4075203ec9e5b5f0df156ab1 Mon Sep 17 00:00:00 2001 From: Alex McKinney Date: Tue, 26 Nov 2024 16:58:02 -0700 Subject: [PATCH] chore(cli): Add browser compatible base generator (#5288) --- generators/{commons => base}/.depcheckrc.json | 0 generators/{commons => base}/.prettierrc.cjs | 0 generators/{commons => base}/package.json | 6 +- .../src/AbstractGeneratorAgent.ts | 3 +- .../src/AbstractGeneratorCli.ts | 9 +- .../src/GeneratorAgentClient.ts | 0 .../{commons => base}/src/SourceFetcher.ts | 2 +- .../src/__test__/SourceFetcher.test.ts | 2 +- .../__snapshots__/SourceFetcher.test.ts.snap | 0 .../fixtures/google/api/annotations.proto | 0 .../fixtures/google/api/field_behavior.proto | 0 .../__test__/fixtures/google/api/http.proto | 0 .../src/__test__/fixtures/user/v1/user.proto | 0 .../base/src/browserCompatibleExports.ts | 6 + generators/{commons => base}/src/index.ts | 5 +- .../src/project/AbstractProject.ts | 2 +- .../{commons => base}/src/project/File.ts | 0 .../{commons => base}/src/project/index.ts | 0 .../readme/AbstractReadmeSnippetBuilder.ts | 2 +- .../{commons => base}/src/readme/index.ts | 0 .../src/reference/ReferenceConfigBuilder.ts | 0 .../{commons => base}/src/reference/index.ts | 0 generators/base/src/utils/index.ts | 2 + .../src/utils/parseGeneratorConfig.ts | 3 +- .../{commons => base}/src/utils/parseIR.ts | 0 generators/base/tsconfig.json | 28 +++ generators/{commons => base}/vitest.config.ts | 0 .../browser-compatible-base/.depcheckrc.json | 10 ++ .../browser-compatible-base/.prettierrc.cjs | 1 + .../browser-compatible-base/package.json | 42 +++++ .../src/AbstractGeneratorContext.ts | 0 .../src/GeneratorNotificationService.ts | 0 .../src/ast/AbstractAstNode.ts | 0 .../src/ast/AbstractFormatter.ts | 0 .../src/ast/AbstractWriter.ts | 0 .../src/ast/Argument.ts | 0 .../src/ast/CodeBlock.ts | 0 .../src/ast/Ternary.ts | 0 .../src/ast/index.ts | 0 .../AbstractDynamicSnippetsGenerator.ts | 0 ...AbstractDynamicSnippetsGeneratorContext.ts | 0 .../src/dynamic-snippets/index.ts | 0 .../browser-compatible-base/src/index.ts | 5 + .../src/utils/getBasename.ts | 0 .../src/utils/getPackageName.ts | 0 .../src/utils/getSdkVersion.ts | 0 .../src/utils/index.ts | 2 - .../browser-compatible-base/tsconfig.json | 19 ++ .../browser-compatible-base/vitest.config.ts | 1 + generators/commons/tsconfig.json | 11 -- generators/csharp/codegen/package.json | 2 +- .../csharp/codegen/src/FileGenerator.ts | 2 +- .../codegen/src/ast/ClassInstantiation.ts | 2 +- .../csharp/codegen/src/ast/CodeBlock.ts | 2 +- .../csharp/codegen/src/ast/Dictionary.ts | 2 +- generators/csharp/codegen/src/ast/Ternary.ts | 2 +- .../csharp/codegen/src/ast/core/AstNode.ts | 2 +- .../csharp/codegen/src/ast/core/Writer.ts | 2 +- .../src/cli/AbstractCsharpGeneratorCli.ts | 2 +- .../context/AbstractCsharpGeneratorContext.ts | 2 +- .../csharp/codegen/src/project/CSharpFile.ts | 2 +- .../codegen/src/project/CsharpProject.ts | 2 +- .../codegen/src/project/PrebuiltUtilities.ts | 2 +- generators/csharp/codegen/tsconfig.json | 2 +- generators/csharp/model/package.json | 2 +- .../csharp/model/src/ModelGeneratorCli.ts | 2 +- generators/csharp/model/tsconfig.json | 2 +- generators/csharp/sdk/package.json | 2 +- .../csharp/sdk/src/CsharpGeneratorAgent.ts | 2 +- generators/csharp/sdk/src/SdkGeneratorCli.ts | 2 +- .../csharp/sdk/src/SdkGeneratorContext.ts | 2 +- .../csharp/sdk/src/endpoint/http/RawClient.ts | 2 +- .../sdk/src/readme/ReadmeSnippetBuilder.ts | 2 +- .../sdk/src/reference/buildReference.ts | 2 +- generators/csharp/sdk/tsconfig.json | 2 +- generators/go-v2/ast/package.json | 4 +- generators/go-v2/ast/src/FileGenerator.ts | 2 +- generators/go-v2/ast/src/ast/CodeBlock.ts | 2 +- generators/go-v2/ast/src/ast/core/AstNode.ts | 2 +- generators/go-v2/ast/src/ast/core/Writer.ts | 2 +- .../go-v2/ast/src/ast/utils/writeArguments.ts | 2 +- .../src/context/AbstractGoGeneratorContext.ts | 2 +- .../custom-config/resolveRootImportPath.ts | 2 +- generators/go-v2/ast/tsconfig.json | 2 +- generators/go-v2/base/tsconfig.json | 2 +- .../go-v2/dynamic-snippets/package.json | 2 +- .../src/DynamicSnippetsGenerator.ts | 2 +- .../utils/buildDynamicSnippetsGenerator.ts | 2 +- .../__test__/utils/buildGeneratorConfig.ts | 2 +- .../DynamicSnippetsGeneratorContext.ts | 4 +- .../go-v2/dynamic-snippets/tsconfig.json | 2 +- generators/go-v2/formatter/package.json | 4 +- generators/go-v2/formatter/src/GoFormatter.ts | 2 +- generators/go-v2/formatter/tsconfig.json | 2 +- generators/go-v2/model/tsconfig.json | 2 +- generators/go-v2/sdk/tsconfig.json | 2 +- generators/openapi/package.json | 2 +- .../src/converters/servicesConverter.ts | 2 +- generators/openapi/src/customConfig.ts | 2 +- generators/openapi/src/writeOpenApi.ts | 2 +- generators/openapi/tsconfig.json | 2 +- generators/php/codegen/package.json | 4 +- generators/php/codegen/src/FileGenerator.ts | 2 +- .../php/codegen/src/ast/ClassInstantiation.ts | 2 +- generators/php/codegen/src/ast/CodeBlock.ts | 2 +- .../php/codegen/src/ast/MethodInvocation.ts | 2 +- .../php/codegen/src/ast/core/AstNode.ts | 2 +- generators/php/codegen/src/ast/core/Writer.ts | 2 +- .../codegen/src/ast/utils/writeArguments.ts | 2 +- .../src/cli/AbstractPhpGeneratorCli.ts | 2 +- .../context/AbstractPhpGeneratorContext.ts | 2 +- .../codegen/src/context/PhpAttributeMapper.ts | 2 +- generators/php/codegen/src/php.ts | 2 +- generators/php/codegen/src/project/PhpFile.ts | 2 +- .../php/codegen/src/project/PhpProject.ts | 2 +- generators/php/codegen/tsconfig.json | 2 +- generators/php/model/package.json | 2 +- generators/php/model/src/ModelGeneratorCli.ts | 2 +- generators/php/model/tsconfig.json | 2 +- generators/php/sdk/package.json | 2 +- generators/php/sdk/src/SdkGeneratorCli.ts | 2 +- generators/php/sdk/src/SdkGeneratorContext.ts | 2 +- generators/php/sdk/src/core/RawClient.ts | 2 +- .../endpoint/http/HttpEndpointGenerator.ts | 2 +- .../src/endpoint/request/EndpointRequest.ts | 2 +- .../request/WrappedEndpointRequest.ts | 2 +- generators/php/sdk/tsconfig.json | 2 +- generators/postman/package.json | 2 +- .../postman/src/writePostmanCollection.ts | 2 +- .../src/writePostmanGithubWorkflows.ts | 2 +- generators/postman/tsconfig.json | 2 +- generators/python-v2/ast/package.json | 2 +- generators/python-v2/ast/src/CodeBlock.ts | 2 +- generators/python-v2/ast/src/core/AstNode.ts | 2 +- generators/python-v2/ast/src/core/Writer.ts | 2 +- generators/python-v2/ast/tsconfig.json | 2 +- generators/python-v2/base/package.json | 2 +- .../src/cli/AbstractPythonGeneratorCli.ts | 2 +- .../context/AbstractPythonGeneratorContext.ts | 2 +- .../base/src/project/PythonProject.ts | 2 +- .../base/src/project/WriteablePythonFile.ts | 2 +- generators/python-v2/base/tsconfig.json | 2 +- generators/python-v2/fastapi/tsconfig.json | 2 +- .../python-v2/pydantic-model/package.json | 2 +- .../pydantic-model/src/ModelGeneratorCli.ts | 2 +- .../python-v2/pydantic-model/tsconfig.json | 2 +- generators/ruby/cli/package.json | 2 +- .../ruby/cli/src/AbstractGeneratorCli.ts | 2 +- .../cli/src/loadIntermediateRepresentation.ts | 2 +- generators/ruby/cli/tsconfig.json | 2 +- generators/ruby/codegen/tsconfig.json | 2 +- generators/ruby/model/package.json | 2 +- generators/ruby/model/src/GeneratorCli.ts | 2 +- generators/ruby/model/src/TypesGenerator.ts | 2 +- generators/ruby/model/tsconfig.json | 2 +- generators/ruby/sdk/package.json | 2 +- generators/ruby/sdk/src/ClientsGenerator.ts | 2 +- generators/ruby/sdk/src/GeneratorCli.ts | 2 +- generators/ruby/sdk/tsconfig.json | 2 +- generators/swift/codegen/package.json | 2 +- .../swift/codegen/src/ast/core/AstNode.ts | 2 +- .../swift/codegen/src/ast/core/Writer.ts | 2 +- .../swift/codegen/src/project/SwiftFile.ts | 2 +- generators/swift/codegen/tsconfig.json | 2 +- generators/typescript/codegen/package.json | 2 +- .../typescript/codegen/src/ast/CodeBlock.ts | 2 +- .../codegen/src/ast/core/AstNode.ts | 2 +- .../typescript/codegen/src/ast/core/Writer.ts | 2 +- generators/typescript/codegen/tsconfig.json | 2 +- .../sdk-error-schema-generator/tsconfig.json | 2 +- generators/typescript/sdk/cli/package.json | 2 +- .../typescript/sdk/cli/src/SdkGeneratorCli.ts | 2 +- generators/typescript/sdk/cli/tsconfig.json | 2 +- .../typescript/sdk/generator/package.json | 2 +- .../sdk/generator/src/SdkGenerator.ts | 2 +- .../generator/src/TypeScriptGeneratorAgent.ts | 2 +- .../generator/src/contexts/SdkContextImpl.ts | 2 +- .../src/readme/ReadmeSnippetBuilder.ts | 2 +- .../utils/abstract-generator-cli/package.json | 2 +- .../src/AbstractGeneratorCli.ts | 2 +- .../src/publishPackage.ts | 2 +- .../abstract-generator-cli/tsconfig.json | 2 +- .../typescript/utils/contexts/package.json | 2 +- .../contexts/src/sdk-context/SdkContext.ts | 2 +- pnpm-lock.yaml | 170 ++++++++++-------- 185 files changed, 367 insertions(+), 240 deletions(-) rename generators/{commons => base}/.depcheckrc.json (100%) rename generators/{commons => base}/.prettierrc.cjs (100%) rename generators/{commons => base}/package.json (91%) rename generators/{commons => base}/src/AbstractGeneratorAgent.ts (96%) rename generators/{commons => base}/src/AbstractGeneratorCli.ts (94%) rename generators/{commons => base}/src/GeneratorAgentClient.ts (100%) rename generators/{commons => base}/src/SourceFetcher.ts (98%) rename generators/{commons => base}/src/__test__/SourceFetcher.test.ts (93%) rename generators/{commons => base}/src/__test__/__snapshots__/SourceFetcher.test.ts.snap (100%) rename generators/{commons => base}/src/__test__/fixtures/google/api/annotations.proto (100%) rename generators/{commons => base}/src/__test__/fixtures/google/api/field_behavior.proto (100%) rename generators/{commons => base}/src/__test__/fixtures/google/api/http.proto (100%) rename generators/{commons => base}/src/__test__/fixtures/user/v1/user.proto (100%) create mode 100644 generators/base/src/browserCompatibleExports.ts rename generators/{commons => base}/src/index.ts (59%) rename generators/{commons => base}/src/project/AbstractProject.ts (90%) rename generators/{commons => base}/src/project/File.ts (100%) rename generators/{commons => base}/src/project/index.ts (100%) rename generators/{commons => base}/src/readme/AbstractReadmeSnippetBuilder.ts (94%) rename generators/{commons => base}/src/readme/index.ts (100%) rename generators/{commons => base}/src/reference/ReferenceConfigBuilder.ts (100%) rename generators/{commons => base}/src/reference/index.ts (100%) create mode 100644 generators/base/src/utils/index.ts rename generators/{commons => base}/src/utils/parseGeneratorConfig.ts (82%) rename generators/{commons => base}/src/utils/parseIR.ts (100%) create mode 100644 generators/base/tsconfig.json rename generators/{commons => base}/vitest.config.ts (100%) create mode 100644 generators/browser-compatible-base/.depcheckrc.json create mode 100644 generators/browser-compatible-base/.prettierrc.cjs create mode 100644 generators/browser-compatible-base/package.json rename generators/{commons => browser-compatible-base}/src/AbstractGeneratorContext.ts (100%) rename generators/{commons => browser-compatible-base}/src/GeneratorNotificationService.ts (100%) rename generators/{commons => browser-compatible-base}/src/ast/AbstractAstNode.ts (100%) rename generators/{commons => browser-compatible-base}/src/ast/AbstractFormatter.ts (100%) rename generators/{commons => browser-compatible-base}/src/ast/AbstractWriter.ts (100%) rename generators/{commons => browser-compatible-base}/src/ast/Argument.ts (100%) rename generators/{commons => browser-compatible-base}/src/ast/CodeBlock.ts (100%) rename generators/{commons => browser-compatible-base}/src/ast/Ternary.ts (100%) rename generators/{commons => browser-compatible-base}/src/ast/index.ts (100%) rename generators/{commons => browser-compatible-base}/src/dynamic-snippets/AbstractDynamicSnippetsGenerator.ts (100%) rename generators/{commons => browser-compatible-base}/src/dynamic-snippets/AbstractDynamicSnippetsGeneratorContext.ts (100%) rename generators/{commons => browser-compatible-base}/src/dynamic-snippets/index.ts (100%) create mode 100644 generators/browser-compatible-base/src/index.ts rename generators/{commons => browser-compatible-base}/src/utils/getBasename.ts (100%) rename generators/{commons => browser-compatible-base}/src/utils/getPackageName.ts (100%) rename generators/{commons => browser-compatible-base}/src/utils/getSdkVersion.ts (100%) rename generators/{commons => browser-compatible-base}/src/utils/index.ts (59%) create mode 100644 generators/browser-compatible-base/tsconfig.json create mode 100644 generators/browser-compatible-base/vitest.config.ts delete mode 100644 generators/commons/tsconfig.json diff --git a/generators/commons/.depcheckrc.json b/generators/base/.depcheckrc.json similarity index 100% rename from generators/commons/.depcheckrc.json rename to generators/base/.depcheckrc.json diff --git a/generators/commons/.prettierrc.cjs b/generators/base/.prettierrc.cjs similarity index 100% rename from generators/commons/.prettierrc.cjs rename to generators/base/.prettierrc.cjs diff --git a/generators/commons/package.json b/generators/base/package.json similarity index 91% rename from generators/commons/package.json rename to generators/base/package.json index 0627584dec3..9b525724517 100644 --- a/generators/commons/package.json +++ b/generators/base/package.json @@ -1,10 +1,10 @@ { - "name": "@fern-api/generator-commons", + "name": "@fern-api/base-generator", "version": "0.0.0", "repository": { "type": "git", "url": "https://github.com/fern-api/fern.git", - "directory": "generators/commons" + "directory": "generators/base" }, "private": true, "files": [ @@ -28,12 +28,12 @@ "depcheck": "depcheck" }, "dependencies": { + "@fern-api/browser-compatible-base-generator": "workspace:*", "@fern-api/core-utils": "workspace:*", "@fern-api/fs-utils": "workspace:*", "@fern-api/logger": "workspace:*", "@fern-api/logging-execa": "workspace:*", "@fern-fern/generator-cli-sdk": "0.0.17", - "@fern-fern/generator-exec-sdk": "^0.0.898", "js-yaml": "^4.1.0", "lodash-es": "^4.17.21", "tmp-promise": "^3.0.3" diff --git a/generators/commons/src/AbstractGeneratorAgent.ts b/generators/base/src/AbstractGeneratorAgent.ts similarity index 96% rename from generators/commons/src/AbstractGeneratorAgent.ts rename to generators/base/src/AbstractGeneratorAgent.ts index 52b20fcfd74..4cc95838ec8 100644 --- a/generators/commons/src/AbstractGeneratorAgent.ts +++ b/generators/base/src/AbstractGeneratorAgent.ts @@ -1,12 +1,11 @@ import { Logger } from "@fern-api/logger"; -import { AbstractGeneratorContext } from "./AbstractGeneratorContext"; +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 { ReferenceConfigBuilder } from "./reference"; -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; const DOCKER_FEATURES_CONFIG_PATH = "/assets/features.yml"; diff --git a/generators/commons/src/AbstractGeneratorCli.ts b/generators/base/src/AbstractGeneratorCli.ts similarity index 94% rename from generators/commons/src/AbstractGeneratorCli.ts rename to generators/base/src/AbstractGeneratorCli.ts index 634746f8d7e..2bb77eda4e3 100644 --- a/generators/commons/src/AbstractGeneratorCli.ts +++ b/generators/base/src/AbstractGeneratorCli.ts @@ -1,9 +1,12 @@ /* eslint-disable no-console */ import { assertNever } from "@fern-api/core-utils"; -import * as GeneratorExecParsing from "@fern-fern/generator-exec-sdk/serialization"; import { readFile } from "fs/promises"; -import { AbstractGeneratorContext } from "./AbstractGeneratorContext"; -import { FernGeneratorExec, GeneratorNotificationService } from "./GeneratorNotificationService"; +import { + AbstractGeneratorContext, + FernGeneratorExec, + GeneratorExecParsing, + GeneratorNotificationService +} from "@fern-api/browser-compatible-base-generator"; export abstract class AbstractGeneratorCli< CustomConfig, diff --git a/generators/commons/src/GeneratorAgentClient.ts b/generators/base/src/GeneratorAgentClient.ts similarity index 100% rename from generators/commons/src/GeneratorAgentClient.ts rename to generators/base/src/GeneratorAgentClient.ts diff --git a/generators/commons/src/SourceFetcher.ts b/generators/base/src/SourceFetcher.ts similarity index 98% rename from generators/commons/src/SourceFetcher.ts rename to generators/base/src/SourceFetcher.ts index 1523f24b730..f1e78ee8795 100644 --- a/generators/commons/src/SourceFetcher.ts +++ b/generators/base/src/SourceFetcher.ts @@ -4,7 +4,7 @@ import { createWriteStream } from "fs"; import { mkdir, readdir } from "fs/promises"; import { pipeline } from "stream"; import { promisify } from "util"; -import { AbstractGeneratorContext } from "./AbstractGeneratorContext"; +import { AbstractGeneratorContext } from "@fern-api/browser-compatible-base-generator"; const LOCAL_FILE_SCHEME = "file:///"; const PROTOBUF_ZIP_FILENAME = "proto.zip"; diff --git a/generators/commons/src/__test__/SourceFetcher.test.ts b/generators/base/src/__test__/SourceFetcher.test.ts similarity index 93% rename from generators/commons/src/__test__/SourceFetcher.test.ts rename to generators/base/src/__test__/SourceFetcher.test.ts index 0c709418ef2..be36a4591eb 100644 --- a/generators/commons/src/__test__/SourceFetcher.test.ts +++ b/generators/base/src/__test__/SourceFetcher.test.ts @@ -1,6 +1,6 @@ import { AbsoluteFilePath, getDirectoryContents, getDirectoryContentsForSnapshot } from "@fern-api/fs-utils"; import path from "path"; -import { AbstractGeneratorContext } from "../AbstractGeneratorContext"; +import { AbstractGeneratorContext } from "@fern-api/browser-compatible-base-generator"; import { SourceFetcher } from "../SourceFetcher"; const AWS_BUCKET_NAME = "fdr-api-definition-source-test"; diff --git a/generators/commons/src/__test__/__snapshots__/SourceFetcher.test.ts.snap b/generators/base/src/__test__/__snapshots__/SourceFetcher.test.ts.snap similarity index 100% rename from generators/commons/src/__test__/__snapshots__/SourceFetcher.test.ts.snap rename to generators/base/src/__test__/__snapshots__/SourceFetcher.test.ts.snap diff --git a/generators/commons/src/__test__/fixtures/google/api/annotations.proto b/generators/base/src/__test__/fixtures/google/api/annotations.proto similarity index 100% rename from generators/commons/src/__test__/fixtures/google/api/annotations.proto rename to generators/base/src/__test__/fixtures/google/api/annotations.proto diff --git a/generators/commons/src/__test__/fixtures/google/api/field_behavior.proto b/generators/base/src/__test__/fixtures/google/api/field_behavior.proto similarity index 100% rename from generators/commons/src/__test__/fixtures/google/api/field_behavior.proto rename to generators/base/src/__test__/fixtures/google/api/field_behavior.proto diff --git a/generators/commons/src/__test__/fixtures/google/api/http.proto b/generators/base/src/__test__/fixtures/google/api/http.proto similarity index 100% rename from generators/commons/src/__test__/fixtures/google/api/http.proto rename to generators/base/src/__test__/fixtures/google/api/http.proto diff --git a/generators/commons/src/__test__/fixtures/user/v1/user.proto b/generators/base/src/__test__/fixtures/user/v1/user.proto similarity index 100% rename from generators/commons/src/__test__/fixtures/user/v1/user.proto rename to generators/base/src/__test__/fixtures/user/v1/user.proto diff --git a/generators/base/src/browserCompatibleExports.ts b/generators/base/src/browserCompatibleExports.ts new file mode 100644 index 00000000000..cba46d22b9f --- /dev/null +++ b/generators/base/src/browserCompatibleExports.ts @@ -0,0 +1,6 @@ +// Export everything from @fern-api/browser-compatible-base-generator +// so that generators can simply consume @fern-api/base-generator. +// +// Packages that require browser compatibility should import directly +// from @fern-api/browser-compatible-base-generator. +export * from "@fern-api/browser-compatible-base-generator"; diff --git a/generators/commons/src/index.ts b/generators/base/src/index.ts similarity index 59% rename from generators/commons/src/index.ts rename to generators/base/src/index.ts index 71448ee2aa5..42bca0c6921 100644 --- a/generators/commons/src/index.ts +++ b/generators/base/src/index.ts @@ -1,11 +1,8 @@ export * from "./AbstractGeneratorAgent"; export * from "./AbstractGeneratorCli"; -export * from "./AbstractGeneratorContext"; -export * from "./GeneratorNotificationService"; +export * from "./browserCompatibleExports"; export * from "./SourceFetcher"; -export * from "./ast"; export * from "./project"; export * from "./readme"; export * from "./reference"; export * from "./utils"; -export * from "./dynamic-snippets"; diff --git a/generators/commons/src/project/AbstractProject.ts b/generators/base/src/project/AbstractProject.ts similarity index 90% rename from generators/commons/src/project/AbstractProject.ts rename to generators/base/src/project/AbstractProject.ts index 1744ee9fdf9..7d2b4a615e3 100644 --- a/generators/commons/src/project/AbstractProject.ts +++ b/generators/base/src/project/AbstractProject.ts @@ -1,4 +1,4 @@ -import { AbstractGeneratorContext } from "../AbstractGeneratorContext"; +import { AbstractGeneratorContext } from "@fern-api/browser-compatible-base-generator"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { File } from "./File"; diff --git a/generators/commons/src/project/File.ts b/generators/base/src/project/File.ts similarity index 100% rename from generators/commons/src/project/File.ts rename to generators/base/src/project/File.ts diff --git a/generators/commons/src/project/index.ts b/generators/base/src/project/index.ts similarity index 100% rename from generators/commons/src/project/index.ts rename to generators/base/src/project/index.ts diff --git a/generators/commons/src/readme/AbstractReadmeSnippetBuilder.ts b/generators/base/src/readme/AbstractReadmeSnippetBuilder.ts similarity index 94% rename from generators/commons/src/readme/AbstractReadmeSnippetBuilder.ts rename to generators/base/src/readme/AbstractReadmeSnippetBuilder.ts index 4dd5ea484ee..bcfa9260246 100644 --- a/generators/commons/src/readme/AbstractReadmeSnippetBuilder.ts +++ b/generators/base/src/readme/AbstractReadmeSnippetBuilder.ts @@ -1,4 +1,4 @@ -import { FernGeneratorExec } from "../GeneratorNotificationService"; +import { FernGeneratorExec } from "@fern-api/browser-compatible-base-generator"; import { camelCase } from "lodash-es"; export abstract class AbstractReadmeSnippetBuilder { diff --git a/generators/commons/src/readme/index.ts b/generators/base/src/readme/index.ts similarity index 100% rename from generators/commons/src/readme/index.ts rename to generators/base/src/readme/index.ts diff --git a/generators/commons/src/reference/ReferenceConfigBuilder.ts b/generators/base/src/reference/ReferenceConfigBuilder.ts similarity index 100% rename from generators/commons/src/reference/ReferenceConfigBuilder.ts rename to generators/base/src/reference/ReferenceConfigBuilder.ts diff --git a/generators/commons/src/reference/index.ts b/generators/base/src/reference/index.ts similarity index 100% rename from generators/commons/src/reference/index.ts rename to generators/base/src/reference/index.ts diff --git a/generators/base/src/utils/index.ts b/generators/base/src/utils/index.ts new file mode 100644 index 00000000000..6dc87c18e48 --- /dev/null +++ b/generators/base/src/utils/index.ts @@ -0,0 +1,2 @@ +export { parseGeneratorConfig } from "./parseGeneratorConfig"; +export { parseIR } from "./parseIR"; diff --git a/generators/commons/src/utils/parseGeneratorConfig.ts b/generators/base/src/utils/parseGeneratorConfig.ts similarity index 82% rename from generators/commons/src/utils/parseGeneratorConfig.ts rename to generators/base/src/utils/parseGeneratorConfig.ts index a12edbc242f..588dc33b94c 100644 --- a/generators/commons/src/utils/parseGeneratorConfig.ts +++ b/generators/base/src/utils/parseGeneratorConfig.ts @@ -1,5 +1,4 @@ -import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; -import * as GeneratorExecParsing from "@fern-fern/generator-exec-sdk/serialization"; +import { FernGeneratorExec, GeneratorExecParsing } from "@fern-api/browser-compatible-base-generator"; import { readFile } from "fs/promises"; export async function parseGeneratorConfig(pathToConfig: string): Promise { diff --git a/generators/commons/src/utils/parseIR.ts b/generators/base/src/utils/parseIR.ts similarity index 100% rename from generators/commons/src/utils/parseIR.ts rename to generators/base/src/utils/parseIR.ts diff --git a/generators/base/tsconfig.json b/generators/base/tsconfig.json new file mode 100644 index 00000000000..57aa1525fc2 --- /dev/null +++ b/generators/base/tsconfig.json @@ -0,0 +1,28 @@ +{ + "extends": "../../shared/tsconfig.shared.json", + "compilerOptions": { + "composite": true, + "outDir": "lib", + "rootDir": "src" + }, + "include": [ + "./src/**/*" + ], + "references": [ + { + "path": "../browser-compatible-base" + }, + { + "path": "../../packages/cli/logger" + }, + { + "path": "../../packages/commons/core-utils" + }, + { + "path": "../../packages/commons/fs-utils" + }, + { + "path": "../../packages/commons/logging-execa" + } + ] +} \ No newline at end of file diff --git a/generators/commons/vitest.config.ts b/generators/base/vitest.config.ts similarity index 100% rename from generators/commons/vitest.config.ts rename to generators/base/vitest.config.ts diff --git a/generators/browser-compatible-base/.depcheckrc.json b/generators/browser-compatible-base/.depcheckrc.json new file mode 100644 index 00000000000..a3a4f43188c --- /dev/null +++ b/generators/browser-compatible-base/.depcheckrc.json @@ -0,0 +1,10 @@ +{ + "ignores": [ + "@types/jest", + "globals", + "@types/node" + ], + "ignore-patterns": [ + "lib" + ] +} \ No newline at end of file diff --git a/generators/browser-compatible-base/.prettierrc.cjs b/generators/browser-compatible-base/.prettierrc.cjs new file mode 100644 index 00000000000..2b5cf5b0c04 --- /dev/null +++ b/generators/browser-compatible-base/.prettierrc.cjs @@ -0,0 +1 @@ +module.exports = require("../../.prettierrc.json"); diff --git a/generators/browser-compatible-base/package.json b/generators/browser-compatible-base/package.json new file mode 100644 index 00000000000..bc88e2f5f3d --- /dev/null +++ b/generators/browser-compatible-base/package.json @@ -0,0 +1,42 @@ +{ + "name": "@fern-api/browser-compatible-base-generator", + "version": "0.0.0", + "repository": { + "type": "git", + "url": "https://github.com/fern-api/fern.git", + "directory": "generators/browser-compatible-base" + }, + "private": true, + "files": [ + "lib" + ], + "type": "module", + "source": "src/index.ts", + "main": "lib/index.js", + "types": "lib/index.d.ts", + "sideEffects": false, + "scripts": { + "clean": "rm -rf ./lib && tsc --build --clean", + "compile": "tsc --build", + "test": "vitest --passWithNoTests --run", + "test:update": "vitest --passWithNoTests --run -u", + "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore", + "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": { + "@fern-api/logger": "workspace:*", + "@fern-fern/generator-exec-sdk": "^0.0.898" + }, + "devDependencies": { + "depcheck": "^1.4.6", + "eslint": "^8.56.0", + "vitest": "^2.1.4", + "organize-imports-cli": "^0.10.0", + "prettier": "^2.7.1", + "typescript": "4.6.4" + } +} \ No newline at end of file diff --git a/generators/commons/src/AbstractGeneratorContext.ts b/generators/browser-compatible-base/src/AbstractGeneratorContext.ts similarity index 100% rename from generators/commons/src/AbstractGeneratorContext.ts rename to generators/browser-compatible-base/src/AbstractGeneratorContext.ts diff --git a/generators/commons/src/GeneratorNotificationService.ts b/generators/browser-compatible-base/src/GeneratorNotificationService.ts similarity index 100% rename from generators/commons/src/GeneratorNotificationService.ts rename to generators/browser-compatible-base/src/GeneratorNotificationService.ts diff --git a/generators/commons/src/ast/AbstractAstNode.ts b/generators/browser-compatible-base/src/ast/AbstractAstNode.ts similarity index 100% rename from generators/commons/src/ast/AbstractAstNode.ts rename to generators/browser-compatible-base/src/ast/AbstractAstNode.ts diff --git a/generators/commons/src/ast/AbstractFormatter.ts b/generators/browser-compatible-base/src/ast/AbstractFormatter.ts similarity index 100% rename from generators/commons/src/ast/AbstractFormatter.ts rename to generators/browser-compatible-base/src/ast/AbstractFormatter.ts diff --git a/generators/commons/src/ast/AbstractWriter.ts b/generators/browser-compatible-base/src/ast/AbstractWriter.ts similarity index 100% rename from generators/commons/src/ast/AbstractWriter.ts rename to generators/browser-compatible-base/src/ast/AbstractWriter.ts diff --git a/generators/commons/src/ast/Argument.ts b/generators/browser-compatible-base/src/ast/Argument.ts similarity index 100% rename from generators/commons/src/ast/Argument.ts rename to generators/browser-compatible-base/src/ast/Argument.ts diff --git a/generators/commons/src/ast/CodeBlock.ts b/generators/browser-compatible-base/src/ast/CodeBlock.ts similarity index 100% rename from generators/commons/src/ast/CodeBlock.ts rename to generators/browser-compatible-base/src/ast/CodeBlock.ts diff --git a/generators/commons/src/ast/Ternary.ts b/generators/browser-compatible-base/src/ast/Ternary.ts similarity index 100% rename from generators/commons/src/ast/Ternary.ts rename to generators/browser-compatible-base/src/ast/Ternary.ts diff --git a/generators/commons/src/ast/index.ts b/generators/browser-compatible-base/src/ast/index.ts similarity index 100% rename from generators/commons/src/ast/index.ts rename to generators/browser-compatible-base/src/ast/index.ts diff --git a/generators/commons/src/dynamic-snippets/AbstractDynamicSnippetsGenerator.ts b/generators/browser-compatible-base/src/dynamic-snippets/AbstractDynamicSnippetsGenerator.ts similarity index 100% rename from generators/commons/src/dynamic-snippets/AbstractDynamicSnippetsGenerator.ts rename to generators/browser-compatible-base/src/dynamic-snippets/AbstractDynamicSnippetsGenerator.ts diff --git a/generators/commons/src/dynamic-snippets/AbstractDynamicSnippetsGeneratorContext.ts b/generators/browser-compatible-base/src/dynamic-snippets/AbstractDynamicSnippetsGeneratorContext.ts similarity index 100% rename from generators/commons/src/dynamic-snippets/AbstractDynamicSnippetsGeneratorContext.ts rename to generators/browser-compatible-base/src/dynamic-snippets/AbstractDynamicSnippetsGeneratorContext.ts diff --git a/generators/commons/src/dynamic-snippets/index.ts b/generators/browser-compatible-base/src/dynamic-snippets/index.ts similarity index 100% rename from generators/commons/src/dynamic-snippets/index.ts rename to generators/browser-compatible-base/src/dynamic-snippets/index.ts diff --git a/generators/browser-compatible-base/src/index.ts b/generators/browser-compatible-base/src/index.ts new file mode 100644 index 00000000000..b978780b839 --- /dev/null +++ b/generators/browser-compatible-base/src/index.ts @@ -0,0 +1,5 @@ +export * from "./AbstractGeneratorContext"; +export * from "./GeneratorNotificationService"; +export * from "./ast"; +export * from "./utils"; +export * from "./dynamic-snippets"; diff --git a/generators/commons/src/utils/getBasename.ts b/generators/browser-compatible-base/src/utils/getBasename.ts similarity index 100% rename from generators/commons/src/utils/getBasename.ts rename to generators/browser-compatible-base/src/utils/getBasename.ts diff --git a/generators/commons/src/utils/getPackageName.ts b/generators/browser-compatible-base/src/utils/getPackageName.ts similarity index 100% rename from generators/commons/src/utils/getPackageName.ts rename to generators/browser-compatible-base/src/utils/getPackageName.ts diff --git a/generators/commons/src/utils/getSdkVersion.ts b/generators/browser-compatible-base/src/utils/getSdkVersion.ts similarity index 100% rename from generators/commons/src/utils/getSdkVersion.ts rename to generators/browser-compatible-base/src/utils/getSdkVersion.ts diff --git a/generators/commons/src/utils/index.ts b/generators/browser-compatible-base/src/utils/index.ts similarity index 59% rename from generators/commons/src/utils/index.ts rename to generators/browser-compatible-base/src/utils/index.ts index 2c849bf3db9..b54496f8d83 100644 --- a/generators/commons/src/utils/index.ts +++ b/generators/browser-compatible-base/src/utils/index.ts @@ -1,5 +1,3 @@ export { getBasename } from "./getBasename"; export { getPackageName } from "./getPackageName"; export { getSdkVersion } from "./getSdkVersion"; -export { parseGeneratorConfig } from "./parseGeneratorConfig"; -export { parseIR } from "./parseIR"; diff --git a/generators/browser-compatible-base/tsconfig.json b/generators/browser-compatible-base/tsconfig.json new file mode 100644 index 00000000000..343cda0c5d1 --- /dev/null +++ b/generators/browser-compatible-base/tsconfig.json @@ -0,0 +1,19 @@ +{ + "extends": "../../shared/tsconfig.shared.json", + "compilerOptions": { + "composite": true, + "outDir": "lib", + "rootDir": "src" + }, + "include": [ + "./src/**/*" + ], + "references": [ + { + "path": "../../packages/cli/logger" + }, + { + "path": "../../packages/commons/core-utils" + }, + ] +} \ No newline at end of file diff --git a/generators/browser-compatible-base/vitest.config.ts b/generators/browser-compatible-base/vitest.config.ts new file mode 100644 index 00000000000..0652c358cb4 --- /dev/null +++ b/generators/browser-compatible-base/vitest.config.ts @@ -0,0 +1 @@ +export { default } from "../../shared/vitest.config"; diff --git a/generators/commons/tsconfig.json b/generators/commons/tsconfig.json deleted file mode 100644 index 5d331c2fe89..00000000000 --- a/generators/commons/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib", "rootDir": "src" }, - "include": ["./src/**/*"], - "references": [ - { "path": "../../packages/cli/logger" }, - { "path": "../../packages/commons/core-utils" }, - { "path": "../../packages/commons/fs-utils" }, - { "path": "../../packages/commons/logging-execa" } - ] -} diff --git a/generators/csharp/codegen/package.json b/generators/csharp/codegen/package.json index 6556d292a4a..d59aa71a078 100644 --- a/generators/csharp/codegen/package.json +++ b/generators/csharp/codegen/package.json @@ -29,7 +29,7 @@ "dependencies": { "@fern-api/core-utils": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/logging-execa": "workspace:*", "@fern-fern/ir-sdk": "^53.18.0", "lodash-es": "^4.17.21", diff --git a/generators/csharp/codegen/src/FileGenerator.ts b/generators/csharp/codegen/src/FileGenerator.ts index 25b86fb4ead..7f5e8c45571 100644 --- a/generators/csharp/codegen/src/FileGenerator.ts +++ b/generators/csharp/codegen/src/FileGenerator.ts @@ -1,7 +1,7 @@ import { RelativeFilePath } from "@fern-api/fs-utils"; import { AbstractCsharpGeneratorContext } from "./cli"; import { BaseCsharpCustomConfigSchema } from "./custom-config"; -import { File } from "@fern-api/generator-commons"; +import { File } from "@fern-api/base-generator"; export abstract class FileGenerator< GeneratedFile extends File, diff --git a/generators/csharp/codegen/src/ast/ClassInstantiation.ts b/generators/csharp/codegen/src/ast/ClassInstantiation.ts index 1d2652c7951..af2484b43a7 100644 --- a/generators/csharp/codegen/src/ast/ClassInstantiation.ts +++ b/generators/csharp/codegen/src/ast/ClassInstantiation.ts @@ -1,4 +1,4 @@ -import { Arguments, hasNamedArgument, isNamedArgument } from "@fern-api/generator-commons"; +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 5e2421b0cc2..951ae1090ab 100644 --- a/generators/csharp/codegen/src/ast/CodeBlock.ts +++ b/generators/csharp/codegen/src/ast/CodeBlock.ts @@ -1,4 +1,4 @@ -import { CodeBlock as CommonCodeBlock } from "@fern-api/generator-commons"; +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 81801bf7cac..596273d4540 100644 --- a/generators/csharp/codegen/src/ast/Dictionary.ts +++ b/generators/csharp/codegen/src/ast/Dictionary.ts @@ -1,5 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; -import { UnnamedArgument } from "@fern-api/generator-commons"; +import { UnnamedArgument } from "@fern-api/base-generator"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; import { Type } from "./Type"; diff --git a/generators/csharp/codegen/src/ast/Ternary.ts b/generators/csharp/codegen/src/ast/Ternary.ts index 2aee50d10b9..b5efa4ca54b 100644 --- a/generators/csharp/codegen/src/ast/Ternary.ts +++ b/generators/csharp/codegen/src/ast/Ternary.ts @@ -1,4 +1,4 @@ -import { Ternary as CommonTernary } from "@fern-api/generator-commons"; +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/core/AstNode.ts b/generators/csharp/codegen/src/ast/core/AstNode.ts index 4425661af89..051012f02f8 100644 --- a/generators/csharp/codegen/src/ast/core/AstNode.ts +++ b/generators/csharp/codegen/src/ast/core/AstNode.ts @@ -1,4 +1,4 @@ -import { AbstractAstNode } from "@fern-api/generator-commons"; +import { AbstractAstNode } from "@fern-api/base-generator"; import { execSync } from "child_process"; 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 67bfdaf61b8..f52568c94af 100644 --- a/generators/csharp/codegen/src/ast/core/Writer.ts +++ b/generators/csharp/codegen/src/ast/core/Writer.ts @@ -1,4 +1,4 @@ -import { AbstractWriter } from "@fern-api/generator-commons"; +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 eec7bcf107d..d9e5bb32f3b 100644 --- a/generators/csharp/codegen/src/cli/AbstractCsharpGeneratorCli.ts +++ b/generators/csharp/codegen/src/cli/AbstractCsharpGeneratorCli.ts @@ -1,5 +1,5 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { AbstractGeneratorCli, parseIR } from "@fern-api/generator-commons"; +import { AbstractGeneratorCli, parseIR } from "@fern-api/base-generator"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; import { readFile } from "fs/promises"; diff --git a/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts b/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts index 81d1abf8e0d..916d3572d8e 100644 --- a/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts +++ b/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts @@ -1,5 +1,5 @@ import { join, RelativeFilePath } from "@fern-api/fs-utils"; -import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService } from "@fern-api/generator-commons"; +import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService } from "@fern-api/base-generator"; import { FernFilepath, HttpHeader, diff --git a/generators/csharp/codegen/src/project/CSharpFile.ts b/generators/csharp/codegen/src/project/CSharpFile.ts index 1086b56ad13..cbb86962b8b 100644 --- a/generators/csharp/codegen/src/project/CSharpFile.ts +++ b/generators/csharp/codegen/src/project/CSharpFile.ts @@ -3,7 +3,7 @@ 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/generator-commons"; +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 ffbad660489..1d57d40e4e9 100644 --- a/generators/csharp/codegen/src/project/CsharpProject.ts +++ b/generators/csharp/codegen/src/project/CsharpProject.ts @@ -1,5 +1,5 @@ import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { SourceFetcher, File, AbstractProject, FernGeneratorExec } from "@fern-api/generator-commons"; +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"; diff --git a/generators/csharp/codegen/src/project/PrebuiltUtilities.ts b/generators/csharp/codegen/src/project/PrebuiltUtilities.ts index 2bcd6dbca0c..765f9120c86 100644 --- a/generators/csharp/codegen/src/project/PrebuiltUtilities.ts +++ b/generators/csharp/codegen/src/project/PrebuiltUtilities.ts @@ -1,7 +1,7 @@ import { AbsoluteFilePath, RelativeFilePath } from "@fern-api/fs-utils"; import { readFile } from "fs/promises"; import { Annotation, ClassReference } from "../ast"; -import { File } from "@fern-api/generator-commons"; +import { File } from "@fern-api/base-generator"; export class PrebuiltUtilities { private utilitiesDirectory = RelativeFilePath.of("Utilities"); diff --git a/generators/csharp/codegen/tsconfig.json b/generators/csharp/codegen/tsconfig.json index 816c55164d8..d88e84c5ae9 100644 --- a/generators/csharp/codegen/tsconfig.json +++ b/generators/csharp/codegen/tsconfig.json @@ -6,6 +6,6 @@ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/commons/logging-execa" }, - { "path": "../../commons" } + { "path": "../../base" } ] } diff --git a/generators/csharp/model/package.json b/generators/csharp/model/package.json index 5be5e323a5a..b6de5a813c8 100644 --- a/generators/csharp/model/package.json +++ b/generators/csharp/model/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@fern-api/csharp-codegen": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-fern/ir-sdk": "^53.18.0", "zod": "^3.22.3", "@types/jest": "^29.5.12", diff --git a/generators/csharp/model/src/ModelGeneratorCli.ts b/generators/csharp/model/src/ModelGeneratorCli.ts index 87e94655259..e8384e04f48 100644 --- a/generators/csharp/model/src/ModelGeneratorCli.ts +++ b/generators/csharp/model/src/ModelGeneratorCli.ts @@ -1,5 +1,5 @@ import { AbstractCsharpGeneratorCli, validateReadOnlyMemoryTypes } from "@fern-api/csharp-codegen"; -import { FernGeneratorExec, GeneratorNotificationService } from "@fern-api/generator-commons"; +import { FernGeneratorExec, GeneratorNotificationService } from "@fern-api/base-generator"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { generateModels } from "./generateModels"; import { generateWellKnownProtobufFiles } from "./generateWellKnownProtobufFiles"; diff --git a/generators/csharp/model/tsconfig.json b/generators/csharp/model/tsconfig.json index 6d607d88e95..eb309edcc38 100644 --- a/generators/csharp/model/tsconfig.json +++ b/generators/csharp/model/tsconfig.json @@ -4,7 +4,7 @@ "include": ["./src/**/*"], "references": [ { "path": "../../../packages/commons/fs-utils" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../codegen" } ] } diff --git a/generators/csharp/sdk/package.json b/generators/csharp/sdk/package.json index b8e08fe09d8..2f594af6f8e 100644 --- a/generators/csharp/sdk/package.json +++ b/generators/csharp/sdk/package.json @@ -34,7 +34,7 @@ "@fern-api/csharp-codegen": "workspace:*", "@fern-api/fern-csharp-model": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/logger": "workspace:*", "@fern-fern/generator-cli-sdk": "0.0.17", "@fern-fern/generator-exec-sdk": "^0.0.898", diff --git a/generators/csharp/sdk/src/CsharpGeneratorAgent.ts b/generators/csharp/sdk/src/CsharpGeneratorAgent.ts index 7023ffae92b..708d4eb9f95 100644 --- a/generators/csharp/sdk/src/CsharpGeneratorAgent.ts +++ b/generators/csharp/sdk/src/CsharpGeneratorAgent.ts @@ -1,4 +1,4 @@ -import { AbstractGeneratorAgent } from "@fern-api/generator-commons"; +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"; diff --git a/generators/csharp/sdk/src/SdkGeneratorCli.ts b/generators/csharp/sdk/src/SdkGeneratorCli.ts index 034a65974d5..e2f7dba7761 100644 --- a/generators/csharp/sdk/src/SdkGeneratorCli.ts +++ b/generators/csharp/sdk/src/SdkGeneratorCli.ts @@ -5,7 +5,7 @@ import { generateWellKnownProtobufFiles, generateVersion } from "@fern-api/fern-csharp-model"; -import { File, GeneratorNotificationService } from "@fern-api/generator-commons"; +import { File, GeneratorNotificationService } from "@fern-api/base-generator"; import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { HttpService, IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { writeFile } from "fs/promises"; diff --git a/generators/csharp/sdk/src/SdkGeneratorContext.ts b/generators/csharp/sdk/src/SdkGeneratorContext.ts index f5cf228c328..23b9cffd14d 100644 --- a/generators/csharp/sdk/src/SdkGeneratorContext.ts +++ b/generators/csharp/sdk/src/SdkGeneratorContext.ts @@ -1,6 +1,6 @@ import { AbstractCsharpGeneratorContext, AsIsFiles, csharp } from "@fern-api/csharp-codegen"; import { RelativeFilePath } from "@fern-api/fs-utils"; -import { GeneratorNotificationService } from "@fern-api/generator-commons"; +import { GeneratorNotificationService } from "@fern-api/base-generator"; import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { DeclaredErrorName, diff --git a/generators/csharp/sdk/src/endpoint/http/RawClient.ts b/generators/csharp/sdk/src/endpoint/http/RawClient.ts index 02a1e37d826..ddb3080ec3e 100644 --- a/generators/csharp/sdk/src/endpoint/http/RawClient.ts +++ b/generators/csharp/sdk/src/endpoint/http/RawClient.ts @@ -1,4 +1,4 @@ -import { Arguments } from "@fern-api/generator-commons"; +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"; diff --git a/generators/csharp/sdk/src/readme/ReadmeSnippetBuilder.ts b/generators/csharp/sdk/src/readme/ReadmeSnippetBuilder.ts index b79851d69c3..9b043910720 100644 --- a/generators/csharp/sdk/src/readme/ReadmeSnippetBuilder.ts +++ b/generators/csharp/sdk/src/readme/ReadmeSnippetBuilder.ts @@ -2,7 +2,7 @@ import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk"; import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { EndpointId, FeatureId, FernFilepath, HttpEndpoint } from "@fern-fern/ir-sdk/api"; import { SdkGeneratorContext } from "../SdkGeneratorContext"; -import { AbstractReadmeSnippetBuilder } from "@fern-api/generator-commons"; +import { AbstractReadmeSnippetBuilder } from "@fern-api/base-generator"; import { EndpointSnippetsGenerator } from "../endpoint/snippets/EndpointSnippetsGenerator"; interface EndpointWithFilepath { diff --git a/generators/csharp/sdk/src/reference/buildReference.ts b/generators/csharp/sdk/src/reference/buildReference.ts index 3ab6b5c5621..c411f68ca18 100644 --- a/generators/csharp/sdk/src/reference/buildReference.ts +++ b/generators/csharp/sdk/src/reference/buildReference.ts @@ -1,4 +1,4 @@ -import { ReferenceConfigBuilder } from "@fern-api/generator-commons"; +import { ReferenceConfigBuilder } from "@fern-api/base-generator"; import { FernGeneratorCli } from "@fern-fern/generator-cli-sdk"; import { HttpEndpoint, HttpService, ServiceId } from "@fern-fern/ir-sdk/api"; import { EndpointSignatureInfo } from "../endpoint/EndpointSignatureInfo"; diff --git a/generators/csharp/sdk/tsconfig.json b/generators/csharp/sdk/tsconfig.json index 8d71586d0de..3144b142812 100644 --- a/generators/csharp/sdk/tsconfig.json +++ b/generators/csharp/sdk/tsconfig.json @@ -5,7 +5,7 @@ "references": [ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../codegen" }, { "path": "../model" } ] diff --git a/generators/go-v2/ast/package.json b/generators/go-v2/ast/package.json index cc1a056df10..2656d09f16a 100644 --- a/generators/go-v2/ast/package.json +++ b/generators/go-v2/ast/package.json @@ -29,14 +29,14 @@ "dependencies": { "@fern-api/core-utils": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-fern/ir-sdk": "^53.21.0", "zod": "^3.22.3" }, "devDependencies": { "@fern-api/core-utils": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-fern/ir-sdk": "^53.21.0", "@types/jest": "^29.5.12", "@types/node": "^18.7.18", diff --git a/generators/go-v2/ast/src/FileGenerator.ts b/generators/go-v2/ast/src/FileGenerator.ts index 11a52c825fa..9de6cb9885e 100644 --- a/generators/go-v2/ast/src/FileGenerator.ts +++ b/generators/go-v2/ast/src/FileGenerator.ts @@ -1,7 +1,7 @@ import { RelativeFilePath } from "@fern-api/fs-utils"; import { AbstractGoGeneratorContext } from "./context/AbstractGoGeneratorContext"; import { BaseGoCustomConfigSchema } from "./custom-config/BaseGoCustomConfigSchema"; -import { File } from "@fern-api/generator-commons"; +import { File } from "@fern-api/base-generator"; export abstract class FileGenerator< GeneratedFile extends File, diff --git a/generators/go-v2/ast/src/ast/CodeBlock.ts b/generators/go-v2/ast/src/ast/CodeBlock.ts index cbd4d7fbb7d..17ffd153f0c 100644 --- a/generators/go-v2/ast/src/ast/CodeBlock.ts +++ b/generators/go-v2/ast/src/ast/CodeBlock.ts @@ -1,4 +1,4 @@ -import { CodeBlock as CommonCodeBlock } from "@fern-api/generator-commons"; +import { CodeBlock as CommonCodeBlock } from "@fern-api/base-generator"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; diff --git a/generators/go-v2/ast/src/ast/core/AstNode.ts b/generators/go-v2/ast/src/ast/core/AstNode.ts index 335bc0ff3ad..32e6a289c07 100644 --- a/generators/go-v2/ast/src/ast/core/AstNode.ts +++ b/generators/go-v2/ast/src/ast/core/AstNode.ts @@ -1,4 +1,4 @@ -import { AbstractAstNode, AbstractFormatter } from "@fern-api/generator-commons"; +import { AbstractAstNode, AbstractFormatter } from "@fern-api/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 caa81b2a1d6..4302ce1586a 100644 --- a/generators/go-v2/ast/src/ast/core/Writer.ts +++ b/generators/go-v2/ast/src/ast/core/Writer.ts @@ -1,4 +1,4 @@ -import { AbstractFormatter, AbstractWriter, getBasename, NopFormatter } from "@fern-api/generator-commons"; +import { AbstractFormatter, AbstractWriter, getBasename, NopFormatter } from "@fern-api/base-generator"; import { BaseGoCustomConfigSchema } from "../../custom-config/BaseGoCustomConfigSchema"; type Alias = string; diff --git a/generators/go-v2/ast/src/ast/utils/writeArguments.ts b/generators/go-v2/ast/src/ast/utils/writeArguments.ts index bc2cf498202..a62684abadd 100644 --- a/generators/go-v2/ast/src/ast/utils/writeArguments.ts +++ b/generators/go-v2/ast/src/ast/utils/writeArguments.ts @@ -1,4 +1,4 @@ -import { Argument, Arguments, isNamedArgument } from "@fern-api/generator-commons"; +import { Argument, Arguments, isNamedArgument } from "@fern-api/base-generator"; import { Writer } from "../core/Writer"; import { TypeInstantiation } from "../TypeInstantiation"; diff --git a/generators/go-v2/ast/src/context/AbstractGoGeneratorContext.ts b/generators/go-v2/ast/src/context/AbstractGoGeneratorContext.ts index c05aaef7275..74698e486e0 100644 --- a/generators/go-v2/ast/src/context/AbstractGoGeneratorContext.ts +++ b/generators/go-v2/ast/src/context/AbstractGoGeneratorContext.ts @@ -1,4 +1,4 @@ -import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService } from "@fern-api/generator-commons"; +import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService } from "@fern-api/base-generator"; import { IntermediateRepresentation, Literal, diff --git a/generators/go-v2/ast/src/custom-config/resolveRootImportPath.ts b/generators/go-v2/ast/src/custom-config/resolveRootImportPath.ts index af6d13b478b..eca64b8189b 100644 --- a/generators/go-v2/ast/src/custom-config/resolveRootImportPath.ts +++ b/generators/go-v2/ast/src/custom-config/resolveRootImportPath.ts @@ -1,4 +1,4 @@ -import { FernGeneratorExec, getBasename } from "@fern-api/generator-commons"; +import { FernGeneratorExec, getBasename } from "@fern-api/base-generator"; import { BaseGoCustomConfigSchema } from "./BaseGoCustomConfigSchema"; const DEFAULT_MODULE_PATH = "sdk"; diff --git a/generators/go-v2/ast/tsconfig.json b/generators/go-v2/ast/tsconfig.json index 816c55164d8..d88e84c5ae9 100644 --- a/generators/go-v2/ast/tsconfig.json +++ b/generators/go-v2/ast/tsconfig.json @@ -6,6 +6,6 @@ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/commons/logging-execa" }, - { "path": "../../commons" } + { "path": "../../base" } ] } diff --git a/generators/go-v2/base/tsconfig.json b/generators/go-v2/base/tsconfig.json index ae5d385f7a1..bf5606fd22c 100644 --- a/generators/go-v2/base/tsconfig.json +++ b/generators/go-v2/base/tsconfig.json @@ -5,7 +5,7 @@ "references": [ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../ast" } ] } diff --git a/generators/go-v2/dynamic-snippets/package.json b/generators/go-v2/dynamic-snippets/package.json index 5fe2d15f167..5052b28230b 100644 --- a/generators/go-v2/dynamic-snippets/package.json +++ b/generators/go-v2/dynamic-snippets/package.json @@ -31,7 +31,7 @@ "@fern-api/core-utils": "workspace:*", "@fern-api/fern-definition-schema": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/go-ast": "workspace:*", "@fern-api/go-formatter": "workspace:*", "@fern-fern/ir-sdk": "^53.21.0", diff --git a/generators/go-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts b/generators/go-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts index ea296f9c4aa..b3ad31b2ac2 100644 --- a/generators/go-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts +++ b/generators/go-v2/dynamic-snippets/src/DynamicSnippetsGenerator.ts @@ -1,4 +1,4 @@ -import { AbstractDynamicSnippetsGenerator, AbstractFormatter, FernGeneratorExec } from "@fern-api/generator-commons"; +import { AbstractDynamicSnippetsGenerator, AbstractFormatter, FernGeneratorExec } from "@fern-api/base-generator"; import { go } from "@fern-api/go-ast"; import { DynamicSnippetsGeneratorContext } from "./context/DynamicSnippetsGeneratorContext"; import { dynamic as DynamicSnippets } from "@fern-fern/ir-sdk/api"; 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 d82d2dbf3a4..d6a42c30e54 100644 --- a/generators/go-v2/dynamic-snippets/src/__test__/utils/buildDynamicSnippetsGenerator.ts +++ b/generators/go-v2/dynamic-snippets/src/__test__/utils/buildDynamicSnippetsGenerator.ts @@ -1,6 +1,6 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { DynamicSnippetsGenerator } from "../../DynamicSnippetsGenerator"; -import { FernGeneratorExec } from "@fern-api/generator-commons"; +import { FernGeneratorExec } from "@fern-api/base-generator"; import { readFileSync } from "fs"; import { dynamic as DynamicSnippets } from "@fern-fern/ir-sdk/serialization"; import { GoFormatter } from "@fern-api/go-formatter"; diff --git a/generators/go-v2/dynamic-snippets/src/__test__/utils/buildGeneratorConfig.ts b/generators/go-v2/dynamic-snippets/src/__test__/utils/buildGeneratorConfig.ts index 4e45d7df40e..0879e0d839d 100644 --- a/generators/go-v2/dynamic-snippets/src/__test__/utils/buildGeneratorConfig.ts +++ b/generators/go-v2/dynamic-snippets/src/__test__/utils/buildGeneratorConfig.ts @@ -1,4 +1,4 @@ -import { FernGeneratorExec } from "@fern-api/generator-commons"; +import { FernGeneratorExec } from "@fern-api/base-generator"; import { BaseGoCustomConfigSchema } from "@fern-api/go-ast"; const DEFAULT_CONFIG: FernGeneratorExec.GeneratorConfig = { diff --git a/generators/go-v2/dynamic-snippets/src/context/DynamicSnippetsGeneratorContext.ts b/generators/go-v2/dynamic-snippets/src/context/DynamicSnippetsGeneratorContext.ts index 3580d6fe053..e80e6efc2b4 100644 --- a/generators/go-v2/dynamic-snippets/src/context/DynamicSnippetsGeneratorContext.ts +++ b/generators/go-v2/dynamic-snippets/src/context/DynamicSnippetsGeneratorContext.ts @@ -1,5 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; -import { FernGeneratorExec } from "@fern-api/generator-commons"; +import { FernGeneratorExec } from "@fern-api/base-generator"; import { BaseGoCustomConfigSchema, resolveRootImportPath } from "@fern-api/go-ast"; import { FernFilepath, dynamic as DynamicSnippets, TypeId, Name } from "@fern-fern/ir-sdk/api"; import { HttpEndpointReferenceParser } from "@fern-api/fern-definition-schema"; @@ -10,7 +10,7 @@ import { DynamicTypeInstantiationMapper } from "./DynamicTypeInstantiationMapper import { go } from "@fern-api/go-ast"; import { ErrorReporter, Severity } from "./ErrorReporter"; import { FilePropertyMapper } from "./FilePropertyMapper"; -import { AbstractDynamicSnippetsGeneratorContext } from "@fern-api/generator-commons"; +import { AbstractDynamicSnippetsGeneratorContext } from "@fern-api/base-generator"; export class DynamicSnippetsGeneratorContext extends AbstractDynamicSnippetsGeneratorContext { public customConfig: BaseGoCustomConfigSchema | undefined; diff --git a/generators/go-v2/dynamic-snippets/tsconfig.json b/generators/go-v2/dynamic-snippets/tsconfig.json index b4b10688fee..ef46be29564 100644 --- a/generators/go-v2/dynamic-snippets/tsconfig.json +++ b/generators/go-v2/dynamic-snippets/tsconfig.json @@ -7,7 +7,7 @@ { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/cli/fern-definition/schema" }, { "path": "../../../packages/ir-sdk" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../ast" }, { "path": "../formatter" } ] diff --git a/generators/go-v2/formatter/package.json b/generators/go-v2/formatter/package.json index 3867bbb0f28..ac765ffb553 100644 --- a/generators/go-v2/formatter/package.json +++ b/generators/go-v2/formatter/package.json @@ -27,11 +27,11 @@ "depcheck": "depcheck" }, "dependencies": { - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@wasm-fmt/gofmt": "^0.4.9" }, "devDependencies": { - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@types/jest": "^29.5.12", "@types/node": "^18.7.18", "depcheck": "^1.4.6", diff --git a/generators/go-v2/formatter/src/GoFormatter.ts b/generators/go-v2/formatter/src/GoFormatter.ts index 9a40a9d66db..926609524de 100644 --- a/generators/go-v2/formatter/src/GoFormatter.ts +++ b/generators/go-v2/formatter/src/GoFormatter.ts @@ -1,4 +1,4 @@ -import { AbstractFormatter } from "@fern-api/generator-commons"; +import { AbstractFormatter } from "@fern-api/base-generator"; import init, { format } from "@wasm-fmt/gofmt"; export class GoFormatter extends AbstractFormatter { diff --git a/generators/go-v2/formatter/tsconfig.json b/generators/go-v2/formatter/tsconfig.json index 7a4b9b26b02..f8722af6a14 100644 --- a/generators/go-v2/formatter/tsconfig.json +++ b/generators/go-v2/formatter/tsconfig.json @@ -6,7 +6,7 @@ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/cli/fern-definition/schema" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../ast" } ] } diff --git a/generators/go-v2/model/tsconfig.json b/generators/go-v2/model/tsconfig.json index ae5d385f7a1..bf5606fd22c 100644 --- a/generators/go-v2/model/tsconfig.json +++ b/generators/go-v2/model/tsconfig.json @@ -5,7 +5,7 @@ "references": [ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../ast" } ] } diff --git a/generators/go-v2/sdk/tsconfig.json b/generators/go-v2/sdk/tsconfig.json index ae5d385f7a1..bf5606fd22c 100644 --- a/generators/go-v2/sdk/tsconfig.json +++ b/generators/go-v2/sdk/tsconfig.json @@ -5,7 +5,7 @@ "references": [ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../ast" } ] } diff --git a/generators/openapi/package.json b/generators/openapi/package.json index 42c18403007..dd3ef6d8f82 100644 --- a/generators/openapi/package.json +++ b/generators/openapi/package.json @@ -34,7 +34,7 @@ "devDependencies": { "@fern-api/core-utils": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-fern/ir-sdk": "53.9.0", "js-yaml": "^4.1.0", "lodash-es": "^4.17.21", diff --git a/generators/openapi/src/converters/servicesConverter.ts b/generators/openapi/src/converters/servicesConverter.ts index 1ea7294ad89..9fd5ad44c50 100644 --- a/generators/openapi/src/converters/servicesConverter.ts +++ b/generators/openapi/src/converters/servicesConverter.ts @@ -26,7 +26,7 @@ import { import { isEqual, size } from "lodash-es"; import { OpenAPIV3 } from "openapi-types"; import urlJoin from "url-join"; -import { isNonNullish } from "../../../commons/node_modules/@fern-api/core-utils/src"; +import { isNonNullish } from "@fern-api/core-utils"; import { getDeclaredTypeNameKey, getErrorTypeNameKey } from "../convertToOpenApi"; import { Mode } from "../writeOpenApi"; import { convertObject } from "./convertObject"; diff --git a/generators/openapi/src/customConfig.ts b/generators/openapi/src/customConfig.ts index 83aa77177d8..240148e1d79 100644 --- a/generators/openapi/src/customConfig.ts +++ b/generators/openapi/src/customConfig.ts @@ -1,4 +1,4 @@ -import { GeneratorConfig } from "@fern-api/generator-commons"; +import { GeneratorConfig } from "@fern-api/base-generator"; export interface FernOpenapiCustomConfig { format: "yaml" | "json"; diff --git a/generators/openapi/src/writeOpenApi.ts b/generators/openapi/src/writeOpenApi.ts index ab4b9076079..a83941912ae 100644 --- a/generators/openapi/src/writeOpenApi.ts +++ b/generators/openapi/src/writeOpenApi.ts @@ -11,7 +11,7 @@ import { ExitStatusUpdate, parseGeneratorConfig, parseIR -} from "@fern-api/generator-commons"; +} from "@fern-api/base-generator"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; import { mergeWithOverrides } from "@fern-api/core-utils"; diff --git a/generators/openapi/tsconfig.json b/generators/openapi/tsconfig.json index 8f8475dcc90..2a2709cdde1 100644 --- a/generators/openapi/tsconfig.json +++ b/generators/openapi/tsconfig.json @@ -2,5 +2,5 @@ "extends": "../../shared/tsconfig.shared.json", "compilerOptions": { "composite": true, "outDir": "lib", "rootDir": "src" }, "include": ["./src/**/*"], - "references": [{ "path": "../commons" }, { "path": "../../packages/commons/fs-utils" }, { "path": "../../packages/commons/core-utils" }] + "references": [{ "path": "../base" }, { "path": "../../packages/commons/fs-utils" }, { "path": "../../packages/commons/core-utils" }] } diff --git a/generators/php/codegen/package.json b/generators/php/codegen/package.json index 059c68d47aa..bbdef5c641c 100644 --- a/generators/php/codegen/package.json +++ b/generators/php/codegen/package.json @@ -29,7 +29,7 @@ "dependencies": { "@fern-api/core-utils": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/logging-execa": "workspace:*", "@fern-fern/ir-sdk": "^53.15.0", "lodash-es": "^4.17.21", @@ -37,7 +37,7 @@ }, "devDependencies": { "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/logging-execa": "workspace:*", "@types/lodash-es": "^4.17.12", "@fern-fern/ir-sdk": "^53.15.0", diff --git a/generators/php/codegen/src/FileGenerator.ts b/generators/php/codegen/src/FileGenerator.ts index 50c5446ce7f..476e86c8239 100644 --- a/generators/php/codegen/src/FileGenerator.ts +++ b/generators/php/codegen/src/FileGenerator.ts @@ -1,7 +1,7 @@ import { RelativeFilePath } from "@fern-api/fs-utils"; import { AbstractPhpGeneratorContext } from "./context/AbstractPhpGeneratorContext"; import { BasePhpCustomConfigSchema } from "./custom-config/BasePhpCustomConfigSchema"; -import { File } from "@fern-api/generator-commons"; +import { File } from "@fern-api/base-generator"; export abstract class FileGenerator< GeneratedFile extends File, diff --git a/generators/php/codegen/src/ast/ClassInstantiation.ts b/generators/php/codegen/src/ast/ClassInstantiation.ts index 695d30bb8c9..22126ee9af3 100644 --- a/generators/php/codegen/src/ast/ClassInstantiation.ts +++ b/generators/php/codegen/src/ast/ClassInstantiation.ts @@ -1,4 +1,4 @@ -import { Arguments } from "@fern-api/generator-commons"; +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 cbd4d7fbb7d..17ffd153f0c 100644 --- a/generators/php/codegen/src/ast/CodeBlock.ts +++ b/generators/php/codegen/src/ast/CodeBlock.ts @@ -1,4 +1,4 @@ -import { CodeBlock as CommonCodeBlock } from "@fern-api/generator-commons"; +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/MethodInvocation.ts b/generators/php/codegen/src/ast/MethodInvocation.ts index 6ad94cbf78c..3e922b786ad 100644 --- a/generators/php/codegen/src/ast/MethodInvocation.ts +++ b/generators/php/codegen/src/ast/MethodInvocation.ts @@ -1,5 +1,5 @@ import { AstNode } from "./core/AstNode"; -import { Arguments } from "@fern-api/generator-commons"; +import { Arguments } from "@fern-api/base-generator"; import { Writer } from "./core/Writer"; import { writeArguments } from "./utils/writeArguments"; diff --git a/generators/php/codegen/src/ast/core/AstNode.ts b/generators/php/codegen/src/ast/core/AstNode.ts index b5b207b2998..6db5e4b343a 100644 --- a/generators/php/codegen/src/ast/core/AstNode.ts +++ b/generators/php/codegen/src/ast/core/AstNode.ts @@ -1,4 +1,4 @@ -import { AbstractAstNode } from "@fern-api/generator-commons"; +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 72e3c092815..d81c548bc94 100644 --- a/generators/php/codegen/src/ast/core/Writer.ts +++ b/generators/php/codegen/src/ast/core/Writer.ts @@ -1,4 +1,4 @@ -import { AbstractWriter } from "@fern-api/generator-commons"; +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 e4e9424ba8d..d404a41cec4 100644 --- a/generators/php/codegen/src/ast/utils/writeArguments.ts +++ b/generators/php/codegen/src/ast/utils/writeArguments.ts @@ -1,4 +1,4 @@ -import { Argument, Arguments, isNamedArgument } from "@fern-api/generator-commons"; +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 ab87bb1ecc6..a3fbe15eeb6 100644 --- a/generators/php/codegen/src/cli/AbstractPhpGeneratorCli.ts +++ b/generators/php/codegen/src/cli/AbstractPhpGeneratorCli.ts @@ -1,5 +1,5 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { AbstractGeneratorCli, parseIR } from "@fern-api/generator-commons"; +import { AbstractGeneratorCli, parseIR } from "@fern-api/base-generator"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; import { readFile } from "fs/promises"; diff --git a/generators/php/codegen/src/context/AbstractPhpGeneratorContext.ts b/generators/php/codegen/src/context/AbstractPhpGeneratorContext.ts index 8b802e59bc1..37484cb6975 100644 --- a/generators/php/codegen/src/context/AbstractPhpGeneratorContext.ts +++ b/generators/php/codegen/src/context/AbstractPhpGeneratorContext.ts @@ -1,4 +1,4 @@ -import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService } from "@fern-api/generator-commons"; +import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService } from "@fern-api/base-generator"; import { IntermediateRepresentation, Literal, diff --git a/generators/php/codegen/src/context/PhpAttributeMapper.ts b/generators/php/codegen/src/context/PhpAttributeMapper.ts index 8f005ce02c7..e2ff7d2b83a 100644 --- a/generators/php/codegen/src/context/PhpAttributeMapper.ts +++ b/generators/php/codegen/src/context/PhpAttributeMapper.ts @@ -1,5 +1,5 @@ import { assertNever } from "@fern-api/core-utils"; -import { Arguments, UnnamedArgument } from "@fern-api/generator-commons"; +import { Arguments, UnnamedArgument } from "@fern-api/base-generator"; import { ObjectProperty } from "@fern-fern/ir-sdk/api"; import { isEqual, uniq, uniqWith } from "lodash-es"; import { php } from ".."; diff --git a/generators/php/codegen/src/php.ts b/generators/php/codegen/src/php.ts index 3536da4f6f8..2ae639450e2 100644 --- a/generators/php/codegen/src/php.ts +++ b/generators/php/codegen/src/php.ts @@ -1,4 +1,4 @@ -import { Ternary } from "@fern-api/generator-commons"; +import { Ternary } from "@fern-api/base-generator"; import { Array as Array_, Attribute, diff --git a/generators/php/codegen/src/project/PhpFile.ts b/generators/php/codegen/src/project/PhpFile.ts index bd584e4d1f2..cf5b8ff57bb 100644 --- a/generators/php/codegen/src/project/PhpFile.ts +++ b/generators/php/codegen/src/project/PhpFile.ts @@ -2,7 +2,7 @@ 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/generator-commons"; +import { File } from "@fern-api/base-generator"; import { Class } from "../ast/Class"; import { Enum, Trait } from "../ast"; import { DataClass } from "../ast/DataClass"; diff --git a/generators/php/codegen/src/project/PhpProject.ts b/generators/php/codegen/src/project/PhpProject.ts index b8d2d218538..6bf632bca3f 100644 --- a/generators/php/codegen/src/project/PhpProject.ts +++ b/generators/php/codegen/src/project/PhpProject.ts @@ -1,5 +1,5 @@ import { AbsoluteFilePath, join, RelativeFilePath } from "@fern-api/fs-utils"; -import { AbstractProject, File } from "@fern-api/generator-commons"; +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"; diff --git a/generators/php/codegen/tsconfig.json b/generators/php/codegen/tsconfig.json index 816c55164d8..d88e84c5ae9 100644 --- a/generators/php/codegen/tsconfig.json +++ b/generators/php/codegen/tsconfig.json @@ -6,6 +6,6 @@ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/commons/logging-execa" }, - { "path": "../../commons" } + { "path": "../../base" } ] } diff --git a/generators/php/model/package.json b/generators/php/model/package.json index 16197a49ea7..db9e06c8158 100644 --- a/generators/php/model/package.json +++ b/generators/php/model/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/php-codegen": "workspace:*", "@fern-fern/ir-sdk": "^53.15.0", "@types/jest": "^29.5.12", diff --git a/generators/php/model/src/ModelGeneratorCli.ts b/generators/php/model/src/ModelGeneratorCli.ts index 1307d0bca5b..58f87a49e9d 100644 --- a/generators/php/model/src/ModelGeneratorCli.ts +++ b/generators/php/model/src/ModelGeneratorCli.ts @@ -1,4 +1,4 @@ -import { GeneratorConfig, GeneratorNotificationService } from "@fern-api/generator-commons"; +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"; diff --git a/generators/php/model/tsconfig.json b/generators/php/model/tsconfig.json index 6d607d88e95..eb309edcc38 100644 --- a/generators/php/model/tsconfig.json +++ b/generators/php/model/tsconfig.json @@ -4,7 +4,7 @@ "include": ["./src/**/*"], "references": [ { "path": "../../../packages/commons/fs-utils" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../codegen" } ] } diff --git a/generators/php/sdk/package.json b/generators/php/sdk/package.json index c00ac0b157b..45b1d1194b5 100644 --- a/generators/php/sdk/package.json +++ b/generators/php/sdk/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@fern-api/core-utils": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "lodash-es": "^4.17.21", "@fern-api/php-codegen": "workspace:*", "@fern-api/php-model": "workspace:*", diff --git a/generators/php/sdk/src/SdkGeneratorCli.ts b/generators/php/sdk/src/SdkGeneratorCli.ts index 5c77b1f7dfe..da1fa3ea184 100644 --- a/generators/php/sdk/src/SdkGeneratorCli.ts +++ b/generators/php/sdk/src/SdkGeneratorCli.ts @@ -1,5 +1,5 @@ import { AbstractPhpGeneratorCli } from "@fern-api/php-codegen"; -import { GeneratorNotificationService } from "@fern-api/generator-commons"; +import { GeneratorNotificationService } from "@fern-api/base-generator"; import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { HttpService, IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { SdkCustomConfigSchema } from "./SdkCustomConfig"; diff --git a/generators/php/sdk/src/SdkGeneratorContext.ts b/generators/php/sdk/src/SdkGeneratorContext.ts index 2ba9198580f..5cfe26fa8c0 100644 --- a/generators/php/sdk/src/SdkGeneratorContext.ts +++ b/generators/php/sdk/src/SdkGeneratorContext.ts @@ -9,7 +9,7 @@ import { HttpMethod } from "@fern-fern/ir-sdk/api"; import { AbstractPhpGeneratorContext, FileLocation } from "@fern-api/php-codegen"; -import { GeneratorNotificationService } from "@fern-api/generator-commons"; +import { GeneratorNotificationService } from "@fern-api/base-generator"; import { FernGeneratorExec } from "@fern-fern/generator-exec-sdk"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { SdkCustomConfigSchema } from "./SdkCustomConfig"; diff --git a/generators/php/sdk/src/core/RawClient.ts b/generators/php/sdk/src/core/RawClient.ts index f818a1e1e40..c5943b62724 100644 --- a/generators/php/sdk/src/core/RawClient.ts +++ b/generators/php/sdk/src/core/RawClient.ts @@ -1,6 +1,6 @@ import { SdkGeneratorContext } from "../SdkGeneratorContext"; import { php } from "@fern-api/php-codegen"; -import { Arguments, NamedArgument } from "@fern-api/generator-commons"; +import { Arguments, NamedArgument } from "@fern-api/base-generator"; import { HttpEndpoint } from "@fern-fern/ir-sdk/api"; export declare namespace RawClient { diff --git a/generators/php/sdk/src/endpoint/http/HttpEndpointGenerator.ts b/generators/php/sdk/src/endpoint/http/HttpEndpointGenerator.ts index f8a31f7e407..265677be684 100644 --- a/generators/php/sdk/src/endpoint/http/HttpEndpointGenerator.ts +++ b/generators/php/sdk/src/endpoint/http/HttpEndpointGenerator.ts @@ -11,7 +11,7 @@ import { import { SdkGeneratorContext } from "../../SdkGeneratorContext"; import { getEndpointReturnType } from "../utils/getEndpointReturnType"; import { AbstractEndpointGenerator } from "../AbstractEndpointGenerator"; -import { Arguments, UnnamedArgument } from "@fern-api/generator-commons"; +import { Arguments, UnnamedArgument } from "@fern-api/base-generator"; import { upperFirst } from "lodash-es"; export declare namespace EndpointGenerator { diff --git a/generators/php/sdk/src/endpoint/request/EndpointRequest.ts b/generators/php/sdk/src/endpoint/request/EndpointRequest.ts index 4176b0936a7..3bd9d09d521 100644 --- a/generators/php/sdk/src/endpoint/request/EndpointRequest.ts +++ b/generators/php/sdk/src/endpoint/request/EndpointRequest.ts @@ -1,4 +1,4 @@ -import { UnnamedArgument } from "@fern-api/generator-commons"; +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"; diff --git a/generators/php/sdk/src/endpoint/request/WrappedEndpointRequest.ts b/generators/php/sdk/src/endpoint/request/WrappedEndpointRequest.ts index 79be0d8a794..4fb5027bb29 100644 --- a/generators/php/sdk/src/endpoint/request/WrappedEndpointRequest.ts +++ b/generators/php/sdk/src/endpoint/request/WrappedEndpointRequest.ts @@ -31,7 +31,7 @@ import { QueryParameterCodeBlock, RequestBodyCodeBlock } from "./EndpointRequest"; -import { CodeBlock } from "@fern-api/generator-commons"; +import { CodeBlock } from "@fern-api/base-generator"; import { assertNever } from "@fern-api/core-utils"; import { FileUploadBodyProperty } from "@fern-fern/ir-sdk/serialization"; diff --git a/generators/php/sdk/tsconfig.json b/generators/php/sdk/tsconfig.json index 8d71586d0de..3144b142812 100644 --- a/generators/php/sdk/tsconfig.json +++ b/generators/php/sdk/tsconfig.json @@ -5,7 +5,7 @@ "references": [ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../codegen" }, { "path": "../model" } ] diff --git a/generators/postman/package.json b/generators/postman/package.json index 59cacf4072e..adb1a755457 100644 --- a/generators/postman/package.json +++ b/generators/postman/package.json @@ -34,7 +34,7 @@ "devDependencies": { "@fern-api/core-utils": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-fern/ir-sdk": "53.9.0", "@fern-fern/postman-sdk": "0.1.1", "@types/jest": "^29.5.12", diff --git a/generators/postman/src/writePostmanCollection.ts b/generators/postman/src/writePostmanCollection.ts index a2e9570796e..cc760b806ec 100644 --- a/generators/postman/src/writePostmanCollection.ts +++ b/generators/postman/src/writePostmanCollection.ts @@ -14,7 +14,7 @@ import { LogLevel, parseGeneratorConfig, parseIR -} from "@fern-api/generator-commons"; +} from "@fern-api/base-generator"; import { writePostmanGithubWorkflows } from "./writePostmanGithubWorkflows"; import { startCase } from "lodash"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; diff --git a/generators/postman/src/writePostmanGithubWorkflows.ts b/generators/postman/src/writePostmanGithubWorkflows.ts index 64671d2a14c..1d3c5b73566 100644 --- a/generators/postman/src/writePostmanGithubWorkflows.ts +++ b/generators/postman/src/writePostmanGithubWorkflows.ts @@ -1,4 +1,4 @@ -import { GeneratorConfig, GithubOutputMode } from "@fern-api/generator-commons"; +import { GeneratorConfig, GithubOutputMode } from "@fern-api/base-generator"; import endent from "endent"; import { mkdir, writeFile } from "fs/promises"; import path from "path"; diff --git a/generators/postman/tsconfig.json b/generators/postman/tsconfig.json index af08ccba7db..d0dca4bdb6a 100644 --- a/generators/postman/tsconfig.json +++ b/generators/postman/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "composite": true, "outDir": "lib", "rootDir": "src" }, "include": ["./src/**/*"], "references": [ - { "path": "../commons" }, + { "path": "../base" }, { "path": "../../packages/core" }, { "path": "../../packages/commons/fs-utils" } ] diff --git a/generators/python-v2/ast/package.json b/generators/python-v2/ast/package.json index 3b134f3b192..eafdbbd106b 100644 --- a/generators/python-v2/ast/package.json +++ b/generators/python-v2/ast/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "@fern-api/core-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@wasm-fmt/ruff_fmt": "^0.6.1" }, "devDependencies": { diff --git a/generators/python-v2/ast/src/CodeBlock.ts b/generators/python-v2/ast/src/CodeBlock.ts index cbd4d7fbb7d..17ffd153f0c 100644 --- a/generators/python-v2/ast/src/CodeBlock.ts +++ b/generators/python-v2/ast/src/CodeBlock.ts @@ -1,4 +1,4 @@ -import { CodeBlock as CommonCodeBlock } from "@fern-api/generator-commons"; +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/core/AstNode.ts b/generators/python-v2/ast/src/core/AstNode.ts index 07fb2b6bc7a..a0578c4205c 100644 --- a/generators/python-v2/ast/src/core/AstNode.ts +++ b/generators/python-v2/ast/src/core/AstNode.ts @@ -1,4 +1,4 @@ -import { AbstractAstNode } from "@fern-api/generator-commons"; +import { AbstractAstNode } from "@fern-api/base-generator"; import { Writer } from "./Writer"; import { Reference } from "../Reference"; import { Config } from "@wasm-fmt/ruff_fmt"; diff --git a/generators/python-v2/ast/src/core/Writer.ts b/generators/python-v2/ast/src/core/Writer.ts index 59ffcfc4d81..3a937e958b5 100644 --- a/generators/python-v2/ast/src/core/Writer.ts +++ b/generators/python-v2/ast/src/core/Writer.ts @@ -1,4 +1,4 @@ -import { AbstractWriter } from "@fern-api/generator-commons"; +import { AbstractWriter } from "@fern-api/base-generator"; import { Config } from "@wasm-fmt/ruff_fmt"; export declare namespace Writer {} diff --git a/generators/python-v2/ast/tsconfig.json b/generators/python-v2/ast/tsconfig.json index 816c55164d8..d88e84c5ae9 100644 --- a/generators/python-v2/ast/tsconfig.json +++ b/generators/python-v2/ast/tsconfig.json @@ -6,6 +6,6 @@ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/commons/logging-execa" }, - { "path": "../../commons" } + { "path": "../../base" } ] } diff --git a/generators/python-v2/base/package.json b/generators/python-v2/base/package.json index 748e935dd8b..4558345b8a1 100644 --- a/generators/python-v2/base/package.json +++ b/generators/python-v2/base/package.json @@ -29,7 +29,7 @@ "dependencies": { "@fern-api/fs-utils": "workspace:*", "@fern-api/core-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/python-ast": "workspace:*", "@fern-api/logging-execa": "workspace:*", "@fern-fern/ir-sdk": "53.7.0", diff --git a/generators/python-v2/base/src/cli/AbstractPythonGeneratorCli.ts b/generators/python-v2/base/src/cli/AbstractPythonGeneratorCli.ts index 00f5fffb0e3..219ff05642f 100644 --- a/generators/python-v2/base/src/cli/AbstractPythonGeneratorCli.ts +++ b/generators/python-v2/base/src/cli/AbstractPythonGeneratorCli.ts @@ -1,5 +1,5 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { AbstractGeneratorCli, parseIR } from "@fern-api/generator-commons"; +import { AbstractGeneratorCli, parseIR } from "@fern-api/base-generator"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; import { AbstractPythonGeneratorContext } from "../context/AbstractPythonGeneratorContext"; diff --git a/generators/python-v2/base/src/context/AbstractPythonGeneratorContext.ts b/generators/python-v2/base/src/context/AbstractPythonGeneratorContext.ts index e8550567007..cc521da2d91 100644 --- a/generators/python-v2/base/src/context/AbstractPythonGeneratorContext.ts +++ b/generators/python-v2/base/src/context/AbstractPythonGeneratorContext.ts @@ -1,4 +1,4 @@ -import { AbstractGeneratorContext, FernGeneratorExec, GeneratorNotificationService } from "@fern-api/generator-commons"; +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"; diff --git a/generators/python-v2/base/src/project/PythonProject.ts b/generators/python-v2/base/src/project/PythonProject.ts index 86f2fde9c36..1cbcca7001c 100644 --- a/generators/python-v2/base/src/project/PythonProject.ts +++ b/generators/python-v2/base/src/project/PythonProject.ts @@ -1,4 +1,4 @@ -import { AbstractProject } from "@fern-api/generator-commons"; +import { AbstractProject } from "@fern-api/base-generator"; import { AbstractPythonGeneratorContext } from "../cli"; import { BasePythonCustomConfigSchema } from "../custom-config"; import { WriteablePythonFile } from "./WriteablePythonFile"; diff --git a/generators/python-v2/base/src/project/WriteablePythonFile.ts b/generators/python-v2/base/src/project/WriteablePythonFile.ts index 2bd99a70c2b..61663cad1eb 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/generator-commons"; +import { File } from "@fern-api/base-generator"; import { python } from "@fern-api/python-ast"; export declare namespace WriteablePythonFile { diff --git a/generators/python-v2/base/tsconfig.json b/generators/python-v2/base/tsconfig.json index 71c717c3d69..633941bff53 100644 --- a/generators/python-v2/base/tsconfig.json +++ b/generators/python-v2/base/tsconfig.json @@ -6,7 +6,7 @@ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/commons/logging-execa" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../ast" }, { "path": "../../../packages/commons/logging-execa" } ] diff --git a/generators/python-v2/fastapi/tsconfig.json b/generators/python-v2/fastapi/tsconfig.json index 5c1e319cac3..5a906d420b5 100644 --- a/generators/python-v2/fastapi/tsconfig.json +++ b/generators/python-v2/fastapi/tsconfig.json @@ -5,7 +5,7 @@ "references": [ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../ast" }, { "path": "../base" } ] diff --git a/generators/python-v2/pydantic-model/package.json b/generators/python-v2/pydantic-model/package.json index a35562fa59d..db99dda8694 100644 --- a/generators/python-v2/pydantic-model/package.json +++ b/generators/python-v2/pydantic-model/package.json @@ -37,7 +37,7 @@ "zod": "^3.22.4", "@fern-fern/ir-sdk": "53.7.0", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@types/node": "18.7.18", "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.14", "depcheck": "^1.4.6", diff --git a/generators/python-v2/pydantic-model/src/ModelGeneratorCli.ts b/generators/python-v2/pydantic-model/src/ModelGeneratorCli.ts index 1abb5f9b548..3b190ef9f50 100644 --- a/generators/python-v2/pydantic-model/src/ModelGeneratorCli.ts +++ b/generators/python-v2/pydantic-model/src/ModelGeneratorCli.ts @@ -4,7 +4,7 @@ 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/generator-commons"; +import { GeneratorNotificationService } from "@fern-api/base-generator"; export class ModelGeneratorCLI extends AbstractPythonGeneratorCli< PydanticModelCustomConfigSchema, diff --git a/generators/python-v2/pydantic-model/tsconfig.json b/generators/python-v2/pydantic-model/tsconfig.json index 5c1e319cac3..5a906d420b5 100644 --- a/generators/python-v2/pydantic-model/tsconfig.json +++ b/generators/python-v2/pydantic-model/tsconfig.json @@ -5,7 +5,7 @@ "references": [ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../ast" }, { "path": "../base" } ] diff --git a/generators/ruby/cli/package.json b/generators/ruby/cli/package.json index 35f35e7b930..c7b69cca74b 100644 --- a/generators/ruby/cli/package.json +++ b/generators/ruby/cli/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/logger": "workspace:*", "@fern-api/logging-execa": "workspace:*", "@fern-fern/ir-sdk": "^39", diff --git a/generators/ruby/cli/src/AbstractGeneratorCli.ts b/generators/ruby/cli/src/AbstractGeneratorCli.ts index 55c238d6138..1ba49b1b70f 100644 --- a/generators/ruby/cli/src/AbstractGeneratorCli.ts +++ b/generators/ruby/cli/src/AbstractGeneratorCli.ts @@ -4,7 +4,7 @@ import { FernGeneratorExec, GeneratorNotificationService, parseGeneratorConfig -} from "@fern-api/generator-commons"; +} from "@fern-api/base-generator"; import { Logger } from "@fern-api/logger"; import { createLoggingExecutable } from "@fern-api/logging-execa"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; diff --git a/generators/ruby/cli/src/loadIntermediateRepresentation.ts b/generators/ruby/cli/src/loadIntermediateRepresentation.ts index a04b67afdaf..cbca0512add 100644 --- a/generators/ruby/cli/src/loadIntermediateRepresentation.ts +++ b/generators/ruby/cli/src/loadIntermediateRepresentation.ts @@ -1,5 +1,5 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { parseIR } from "@fern-api/generator-commons"; +import { parseIR } from "@fern-api/base-generator"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import * as IrSerialization from "@fern-fern/ir-sdk/serialization"; diff --git a/generators/ruby/cli/tsconfig.json b/generators/ruby/cli/tsconfig.json index 69dfc038d62..58a4ddad1b8 100644 --- a/generators/ruby/cli/tsconfig.json +++ b/generators/ruby/cli/tsconfig.json @@ -6,6 +6,6 @@ { "path": "../../../packages/cli/logger" }, { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/commons/logging-execa" }, - { "path": "../../commons" } + { "path": "../../base" } ] } diff --git a/generators/ruby/codegen/tsconfig.json b/generators/ruby/codegen/tsconfig.json index 7251ae3d3cf..cf51d7b6c98 100644 --- a/generators/ruby/codegen/tsconfig.json +++ b/generators/ruby/codegen/tsconfig.json @@ -2,5 +2,5 @@ "extends": "../../../shared/tsconfig.shared.json", "compilerOptions": { "composite": true, "outDir": "lib", "rootDir": "src" }, "include": ["./src/**/*"], - "references": [{ "path": "../../../packages/commons/fs-utils" }, { "path": "../../commons" }] + "references": [{ "path": "../../../packages/commons/fs-utils" }, { "path": "../../base" }] } diff --git a/generators/ruby/model/package.json b/generators/ruby/model/package.json index 7f1fb3bf993..6f5bd5f9d78 100644 --- a/generators/ruby/model/package.json +++ b/generators/ruby/model/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/logging-execa": "workspace:*", "@fern-api/ruby-codegen": "workspace:*", "@fern-api/ruby-generator-cli": "workspace:*", diff --git a/generators/ruby/model/src/GeneratorCli.ts b/generators/ruby/model/src/GeneratorCli.ts index eb856eb4bac..9e9660f0dce 100644 --- a/generators/ruby/model/src/GeneratorCli.ts +++ b/generators/ruby/model/src/GeneratorCli.ts @@ -1,5 +1,5 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { AbstractGeneratorContext, getPackageName, getSdkVersion } from "@fern-api/generator-commons"; +import { AbstractGeneratorContext, getPackageName, getSdkVersion } from "@fern-api/base-generator"; import { loggingExeca } from "@fern-api/logging-execa"; import { generateBasicRakefile, diff --git a/generators/ruby/model/src/TypesGenerator.ts b/generators/ruby/model/src/TypesGenerator.ts index efdf2bc8add..0baf6f7ddd6 100644 --- a/generators/ruby/model/src/TypesGenerator.ts +++ b/generators/ruby/model/src/TypesGenerator.ts @@ -1,4 +1,4 @@ -import { AbstractGeneratorContext } from "@fern-api/generator-commons"; +import { AbstractGeneratorContext } from "@fern-api/base-generator"; import { ClassReferenceFactory, Class_, GeneratedRubyFile, LocationGenerator, Module_ } from "@fern-api/ruby-codegen"; import { AliasTypeDeclaration, diff --git a/generators/ruby/model/tsconfig.json b/generators/ruby/model/tsconfig.json index 9ffe4867405..5f417d76805 100644 --- a/generators/ruby/model/tsconfig.json +++ b/generators/ruby/model/tsconfig.json @@ -5,7 +5,7 @@ "references": [ { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/commons/logging-execa" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../cli" }, { "path": "../codegen" } ] diff --git a/generators/ruby/sdk/package.json b/generators/ruby/sdk/package.json index 1d5f6f5a4e3..6b756b3f9c0 100644 --- a/generators/ruby/sdk/package.json +++ b/generators/ruby/sdk/package.json @@ -34,7 +34,7 @@ "devDependencies": { "@fern-api/fern-ruby-model": "workspace:*", "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/logging-execa": "workspace:*", "@fern-api/ruby-codegen": "workspace:*", "@fern-api/ruby-generator-cli": "workspace:*", diff --git a/generators/ruby/sdk/src/ClientsGenerator.ts b/generators/ruby/sdk/src/ClientsGenerator.ts index 087571cd330..4e248eb1bf5 100644 --- a/generators/ruby/sdk/src/ClientsGenerator.ts +++ b/generators/ruby/sdk/src/ClientsGenerator.ts @@ -1,4 +1,4 @@ -import { AbstractGeneratorContext } from "@fern-api/generator-commons"; +import { AbstractGeneratorContext } from "@fern-api/base-generator"; import { ClassReferenceFactory, Class_, diff --git a/generators/ruby/sdk/src/GeneratorCli.ts b/generators/ruby/sdk/src/GeneratorCli.ts index d18dbd40e99..586fcdaa9e2 100644 --- a/generators/ruby/sdk/src/GeneratorCli.ts +++ b/generators/ruby/sdk/src/GeneratorCli.ts @@ -1,6 +1,6 @@ import { TypesGenerator } from "@fern-api/fern-ruby-model"; import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { AbstractGeneratorContext, getPackageName, getSdkVersion } from "@fern-api/generator-commons"; +import { AbstractGeneratorContext, getPackageName, getSdkVersion } from "@fern-api/base-generator"; import { loggingExeca } from "@fern-api/logging-execa"; import { ClassReferenceFactory, diff --git a/generators/ruby/sdk/tsconfig.json b/generators/ruby/sdk/tsconfig.json index 69f77909b39..3151c489830 100644 --- a/generators/ruby/sdk/tsconfig.json +++ b/generators/ruby/sdk/tsconfig.json @@ -5,7 +5,7 @@ "references": [ { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/commons/logging-execa" }, - { "path": "../../commons" }, + { "path": "../../base" }, { "path": "../cli" }, { "path": "../codegen" }, { "path": "../model" } diff --git a/generators/swift/codegen/package.json b/generators/swift/codegen/package.json index 48ebd66e77f..5232231e5a7 100644 --- a/generators/swift/codegen/package.json +++ b/generators/swift/codegen/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "@fern-api/core-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/fs-utils": "workspace:*" }, "devDependencies": { diff --git a/generators/swift/codegen/src/ast/core/AstNode.ts b/generators/swift/codegen/src/ast/core/AstNode.ts index a52d667b510..c7cb2ff69ef 100644 --- a/generators/swift/codegen/src/ast/core/AstNode.ts +++ b/generators/swift/codegen/src/ast/core/AstNode.ts @@ -1,4 +1,4 @@ -import { AbstractAstNode } from "@fern-api/generator-commons"; +import { AbstractAstNode } from "@fern-api/base-generator"; import { Writer } from "./Writer"; export abstract class AstNode extends AbstractAstNode { diff --git a/generators/swift/codegen/src/ast/core/Writer.ts b/generators/swift/codegen/src/ast/core/Writer.ts index cf02fa714fc..45de07c0810 100644 --- a/generators/swift/codegen/src/ast/core/Writer.ts +++ b/generators/swift/codegen/src/ast/core/Writer.ts @@ -1,4 +1,4 @@ -import { AbstractWriter } from "@fern-api/generator-commons"; +import { AbstractWriter } from "@fern-api/base-generator"; export class Writer extends AbstractWriter { public toString(): string { diff --git a/generators/swift/codegen/src/project/SwiftFile.ts b/generators/swift/codegen/src/project/SwiftFile.ts index 39f8e598cec..198f11014d4 100644 --- a/generators/swift/codegen/src/project/SwiftFile.ts +++ b/generators/swift/codegen/src/project/SwiftFile.ts @@ -1,4 +1,4 @@ -import { File } from "@fern-api/generator-commons"; +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/swift/codegen/tsconfig.json b/generators/swift/codegen/tsconfig.json index 94501b36058..adad9e6f162 100644 --- a/generators/swift/codegen/tsconfig.json +++ b/generators/swift/codegen/tsconfig.json @@ -2,5 +2,5 @@ "extends": "../../../shared/tsconfig.shared.json", "compilerOptions": { "composite": true, "outDir": "lib", "rootDir": "src" }, "include": ["./src/**/*"], - "references": [{ "path": "../../../packages/commons/core-utils" }, { "path": "../../commons" }, { "path": "../../../packages/commons/fs-utils" }] + "references": [{ "path": "../../../packages/commons/core-utils" }, { "path": "../../base" }, { "path": "../../../packages/commons/fs-utils" }] } diff --git a/generators/typescript/codegen/package.json b/generators/typescript/codegen/package.json index f45fe2b133b..15b70ad5af8 100644 --- a/generators/typescript/codegen/package.json +++ b/generators/typescript/codegen/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@fern-api/core-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-fern/ir-sdk": "53.8.0", "@types/jest": "^29.5.12", "@types/node": "18.7.18", diff --git a/generators/typescript/codegen/src/ast/CodeBlock.ts b/generators/typescript/codegen/src/ast/CodeBlock.ts index 5188dacb210..b49e1bad82e 100644 --- a/generators/typescript/codegen/src/ast/CodeBlock.ts +++ b/generators/typescript/codegen/src/ast/CodeBlock.ts @@ -1,4 +1,4 @@ -import { CodeBlock as CommonCodeBlock } from "@fern-api/generator-commons"; +import { CodeBlock as CommonCodeBlock } from "@fern-api/base-generator"; import { AstNode } from "./core/AstNode"; import { Writer } from "./core/Writer"; diff --git a/generators/typescript/codegen/src/ast/core/AstNode.ts b/generators/typescript/codegen/src/ast/core/AstNode.ts index f1bf5a3886f..149f8d7bbbf 100644 --- a/generators/typescript/codegen/src/ast/core/AstNode.ts +++ b/generators/typescript/codegen/src/ast/core/AstNode.ts @@ -1,4 +1,4 @@ -import { AbstractAstNode } from "@fern-api/generator-commons"; +import { AbstractAstNode } from "@fern-api/base-generator"; import { Writer } from "./Writer"; import * as prettier from "prettier"; diff --git a/generators/typescript/codegen/src/ast/core/Writer.ts b/generators/typescript/codegen/src/ast/core/Writer.ts index 46e2b64fdab..b1baf759cf9 100644 --- a/generators/typescript/codegen/src/ast/core/Writer.ts +++ b/generators/typescript/codegen/src/ast/core/Writer.ts @@ -1,4 +1,4 @@ -import { AbstractWriter } from "@fern-api/generator-commons"; +import { AbstractWriter } from "@fern-api/base-generator"; import { Reference } from "../Reference"; type ModuleName = string; diff --git a/generators/typescript/codegen/tsconfig.json b/generators/typescript/codegen/tsconfig.json index 816c55164d8..d88e84c5ae9 100644 --- a/generators/typescript/codegen/tsconfig.json +++ b/generators/typescript/codegen/tsconfig.json @@ -6,6 +6,6 @@ { "path": "../../../packages/commons/core-utils" }, { "path": "../../../packages/commons/fs-utils" }, { "path": "../../../packages/commons/logging-execa" }, - { "path": "../../commons" } + { "path": "../../base" } ] } diff --git a/generators/typescript/express/sdk-error-schema-generator/tsconfig.json b/generators/typescript/express/sdk-error-schema-generator/tsconfig.json index 996a1884da8..68a8a70c332 100644 --- a/generators/typescript/express/sdk-error-schema-generator/tsconfig.json +++ b/generators/typescript/express/sdk-error-schema-generator/tsconfig.json @@ -8,7 +8,7 @@ "include": ["../express-error-schema-generator/src"], "references": [ { "path": "../../../abstract-schema-generator" }, - { "path": "../../../commons" }, + { "path": "../../../base" }, { "path": "../../../contexts" } ] } diff --git a/generators/typescript/sdk/cli/package.json b/generators/typescript/sdk/cli/package.json index e2957b9d5ee..22ae8a4290b 100644 --- a/generators/typescript/sdk/cli/package.json +++ b/generators/typescript/sdk/cli/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-fern/ir-sdk": "53.8.0", "@fern-typescript/abstract-generator-cli": "workspace:*", "@fern-typescript/commons": "workspace:*", diff --git a/generators/typescript/sdk/cli/src/SdkGeneratorCli.ts b/generators/typescript/sdk/cli/src/SdkGeneratorCli.ts index 9c8018a3a84..6d9c4510e45 100644 --- a/generators/typescript/sdk/cli/src/SdkGeneratorCli.ts +++ b/generators/typescript/sdk/cli/src/SdkGeneratorCli.ts @@ -1,5 +1,5 @@ import { AbsoluteFilePath } from "@fern-api/fs-utils"; -import { FernGeneratorExec } from "@fern-api/generator-commons"; +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"; diff --git a/generators/typescript/sdk/cli/tsconfig.json b/generators/typescript/sdk/cli/tsconfig.json index 71a1135c39c..c07c6a03fba 100644 --- a/generators/typescript/sdk/cli/tsconfig.json +++ b/generators/typescript/sdk/cli/tsconfig.json @@ -5,7 +5,7 @@ "exclude": ["./src/**/__test__/**/generated"], "references": [ { "path": "../../../../packages/commons/fs-utils" }, - { "path": "../../../commons" }, + { "path": "../../../base" }, { "path": "../../utils/abstract-generator-cli" }, { "path": "../../utils/commons" }, { "path": "../../utils/contexts" }, diff --git a/generators/typescript/sdk/generator/package.json b/generators/typescript/sdk/generator/package.json index e48f24c9942..9fa358cc545 100644 --- a/generators/typescript/sdk/generator/package.json +++ b/generators/typescript/sdk/generator/package.json @@ -30,7 +30,7 @@ "@fern-api/core-utils": "workspace:*", "@fern-api/fs-utils": "workspace:*", "@fern-api/typescript-codegen": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/logger": "workspace:*", "@fern-fern/generator-cli-sdk": "0.0.17", "@fern-fern/generator-exec-sdk": "^0.0.898", diff --git a/generators/typescript/sdk/generator/src/SdkGenerator.ts b/generators/typescript/sdk/generator/src/SdkGenerator.ts index fa3bbe06286..bed1ab1ff30 100644 --- a/generators/typescript/sdk/generator/src/SdkGenerator.ts +++ b/generators/typescript/sdk/generator/src/SdkGenerator.ts @@ -57,7 +57,7 @@ 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/generator-commons"; +import { ReferenceConfigBuilder } from "@fern-api/base-generator"; import { TypeScriptGeneratorAgent } from "./TypeScriptGeneratorAgent"; import { TemplateGenerator } from "./TemplateGenerator"; import { JestTestGenerator } from "./test-generator/JestTestGenerator"; diff --git a/generators/typescript/sdk/generator/src/TypeScriptGeneratorAgent.ts b/generators/typescript/sdk/generator/src/TypeScriptGeneratorAgent.ts index 97e0236ccb5..075d2c3d9c1 100644 --- a/generators/typescript/sdk/generator/src/TypeScriptGeneratorAgent.ts +++ b/generators/typescript/sdk/generator/src/TypeScriptGeneratorAgent.ts @@ -1,4 +1,4 @@ -import { AbstractGeneratorAgent } from "@fern-api/generator-commons"; +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"; diff --git a/generators/typescript/sdk/generator/src/contexts/SdkContextImpl.ts b/generators/typescript/sdk/generator/src/contexts/SdkContextImpl.ts index cc9bdb03014..023d2072cc1 100644 --- a/generators/typescript/sdk/generator/src/contexts/SdkContextImpl.ts +++ b/generators/typescript/sdk/generator/src/contexts/SdkContextImpl.ts @@ -1,4 +1,4 @@ -import { GeneratorNotificationService } from "@fern-api/generator-commons"; +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"; diff --git a/generators/typescript/sdk/generator/src/readme/ReadmeSnippetBuilder.ts b/generators/typescript/sdk/generator/src/readme/ReadmeSnippetBuilder.ts index d45aa25532d..87dffb4715f 100644 --- a/generators/typescript/sdk/generator/src/readme/ReadmeSnippetBuilder.ts +++ b/generators/typescript/sdk/generator/src/readme/ReadmeSnippetBuilder.ts @@ -4,7 +4,7 @@ import { EndpointId, FeatureId, FernFilepath, HttpEndpoint, SdkRequestWrapper } import { getTextOfTsNode } from "@fern-typescript/commons"; import { SdkContext } from "@fern-typescript/contexts"; import { code, Code } from "ts-poet"; -import { AbstractReadmeSnippetBuilder } from "@fern-api/generator-commons"; +import { AbstractReadmeSnippetBuilder } from "@fern-api/base-generator"; import { isNonNullish } from "@fern-api/core-utils"; interface EndpointWithFilepath { diff --git a/generators/typescript/utils/abstract-generator-cli/package.json b/generators/typescript/utils/abstract-generator-cli/package.json index 6afa1c5631c..7fbec6d57f6 100644 --- a/generators/typescript/utils/abstract-generator-cli/package.json +++ b/generators/typescript/utils/abstract-generator-cli/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "@fern-api/fs-utils": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-api/logger": "workspace:*", "@fern-fern/generator-exec-sdk": "^0.0.898", "@fern-fern/ir-sdk": "53.8.0", diff --git a/generators/typescript/utils/abstract-generator-cli/src/AbstractGeneratorCli.ts b/generators/typescript/utils/abstract-generator-cli/src/AbstractGeneratorCli.ts index d5e5377cdba..848f3932340 100644 --- a/generators/typescript/utils/abstract-generator-cli/src/AbstractGeneratorCli.ts +++ b/generators/typescript/utils/abstract-generator-cli/src/AbstractGeneratorCli.ts @@ -4,7 +4,7 @@ import { GeneratorNotificationService, parseGeneratorConfig, parseIR -} from "@fern-api/generator-commons"; +} from "@fern-api/base-generator"; import { CONSOLE_LOGGER, createLogger, Logger, LogLevel } from "@fern-api/logger"; import { IntermediateRepresentation } from "@fern-fern/ir-sdk/api"; import { NpmPackage, PersistedTypescriptProject } from "@fern-typescript/commons"; diff --git a/generators/typescript/utils/abstract-generator-cli/src/publishPackage.ts b/generators/typescript/utils/abstract-generator-cli/src/publishPackage.ts index 77c2ca8a8e1..2b42ebe382e 100644 --- a/generators/typescript/utils/abstract-generator-cli/src/publishPackage.ts +++ b/generators/typescript/utils/abstract-generator-cli/src/publishPackage.ts @@ -1,4 +1,4 @@ -import { GeneratorNotificationService } from "@fern-api/generator-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"; diff --git a/generators/typescript/utils/abstract-generator-cli/tsconfig.json b/generators/typescript/utils/abstract-generator-cli/tsconfig.json index 60c7cab93a0..2a39ae96076 100644 --- a/generators/typescript/utils/abstract-generator-cli/tsconfig.json +++ b/generators/typescript/utils/abstract-generator-cli/tsconfig.json @@ -5,7 +5,7 @@ "references": [ { "path": "../../../../packages/cli/logger" }, { "path": "../../../../packages/commons/fs-utils" }, - { "path": "../../../commons" }, + { "path": "../../../base" }, { "path": "../commons" }, { "path": "../contexts" } ] diff --git a/generators/typescript/utils/contexts/package.json b/generators/typescript/utils/contexts/package.json index ffd4b6a75ed..34f95fc84f8 100644 --- a/generators/typescript/utils/contexts/package.json +++ b/generators/typescript/utils/contexts/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "@fern-api/logger": "workspace:*", - "@fern-api/generator-commons": "workspace:*", + "@fern-api/base-generator": "workspace:*", "@fern-fern/generator-exec-sdk": "^0.0.898", "@fern-fern/ir-sdk": "53.8.0", "@fern-typescript/commons": "workspace:*", diff --git a/generators/typescript/utils/contexts/src/sdk-context/SdkContext.ts b/generators/typescript/utils/contexts/src/sdk-context/SdkContext.ts index 5aa51d40217..c05084ab1ef 100644 --- a/generators/typescript/utils/contexts/src/sdk-context/SdkContext.ts +++ b/generators/typescript/utils/contexts/src/sdk-context/SdkContext.ts @@ -14,7 +14,7 @@ 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/generator-commons"; +import { GeneratorNotificationService } from "@fern-api/base-generator"; import { Logger } from "@fern-api/logger"; export interface SdkContext extends ModelContext { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9694671f02e..6dfe69beae1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -149,8 +149,11 @@ importers: jsonc-parser@2.2.1: unplugged: true - generators/commons: + generators/base: dependencies: + '@fern-api/browser-compatible-base-generator': + specifier: workspace:* + version: link:../browser-compatible-base '@fern-api/core-utils': specifier: workspace:* version: link:../../packages/commons/core-utils @@ -166,9 +169,6 @@ importers: '@fern-fern/generator-cli-sdk': specifier: 0.0.17 version: 0.0.17 - '@fern-fern/generator-exec-sdk': - specifier: ^0.0.898 - version: 0.0.898 js-yaml: specifier: ^4.1.0 version: 4.1.0 @@ -207,17 +207,45 @@ importers: specifier: ^2.1.4 version: 2.1.4(@types/node@18.7.18)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) + generators/browser-compatible-base: + dependencies: + '@fern-api/logger': + specifier: workspace:* + version: link:../../packages/cli/logger + '@fern-fern/generator-exec-sdk': + specifier: ^0.0.898 + version: 0.0.898 + devDependencies: + depcheck: + specifier: ^1.4.6 + version: 1.4.6 + 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 + typescript: + specifier: 4.6.4 + version: 4.6.4 + vitest: + specifier: ^2.1.4 + version: 2.1.4(@types/node@18.7.18)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) + generators/csharp/codegen: dependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../packages/commons/core-utils '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/logging-execa': specifier: workspace:* version: link:../../../packages/commons/logging-execa @@ -261,15 +289,15 @@ importers: generators/csharp/model: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/csharp-codegen': specifier: workspace:* version: link:../codegen '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-fern/ir-sdk': specifier: ^53.18.0 version: 53.18.0 @@ -312,6 +340,9 @@ importers: generators/csharp/sdk: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../packages/commons/core-utils @@ -324,9 +355,6 @@ importers: '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/logger': specifier: workspace:* version: link:../../../packages/cli/logger @@ -387,15 +415,15 @@ importers: generators/go-v2/ast: dependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../packages/commons/core-utils '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-fern/ir-sdk': specifier: ^53.21.0 version: 53.21.0 @@ -463,6 +491,9 @@ importers: generators/go-v2/dynamic-snippets: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../packages/commons/core-utils @@ -472,9 +503,6 @@ importers: '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/go-ast': specifier: workspace:* version: link:../ast @@ -511,9 +539,9 @@ importers: generators/go-v2/formatter: dependencies: - '@fern-api/generator-commons': + '@fern-api/base-generator': specifier: workspace:* - version: link:../../commons + version: link:../../base '@wasm-fmt/gofmt': specifier: ^0.4.9 version: 0.4.9 @@ -611,15 +639,15 @@ importers: generators/openapi: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../base '@fern-api/core-utils': specifier: workspace:* version: link:../../packages/commons/core-utils '@fern-api/fs-utils': specifier: workspace:* version: link:../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../commons '@fern-fern/ir-sdk': specifier: 53.9.0 version: 53.9.0 @@ -677,15 +705,15 @@ importers: generators/php/codegen: dependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../packages/commons/core-utils '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/logging-execa': specifier: workspace:* version: link:../../../packages/commons/logging-execa @@ -729,12 +757,12 @@ importers: generators/php/model: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/php-codegen': specifier: workspace:* version: link:../codegen @@ -780,15 +808,15 @@ importers: generators/php/sdk: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../packages/commons/core-utils '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/php-codegen': specifier: workspace:* version: link:../codegen @@ -846,15 +874,15 @@ importers: generators/postman: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../base '@fern-api/core-utils': specifier: workspace:* version: link:../../packages/commons/core-utils '@fern-api/fs-utils': specifier: workspace:* version: link:../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../commons '@fern-fern/ir-sdk': specifier: 53.9.0 version: 53.9.0 @@ -909,12 +937,12 @@ importers: generators/python-v2/ast: dependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../packages/commons/core-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@wasm-fmt/ruff_fmt': specifier: ^0.6.1 version: 0.6.1 @@ -943,15 +971,15 @@ importers: generators/python-v2/base: dependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../packages/commons/core-utils '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/logging-execa': specifier: workspace:* version: link:../../../packages/commons/logging-execa @@ -1028,6 +1056,9 @@ importers: generators/python-v2/pydantic-model: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/base-python-generator': specifier: workspace:* version: link:../base @@ -1037,9 +1068,6 @@ importers: '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/python-ast': specifier: workspace:* version: link:../ast @@ -1085,12 +1113,12 @@ importers: generators/ruby/cli: dependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/logger': specifier: workspace:* version: link:../../../packages/cli/logger @@ -1180,12 +1208,12 @@ importers: generators/ruby/model: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/logging-execa': specifier: workspace:* version: link:../../../packages/commons/logging-execa @@ -1243,15 +1271,15 @@ importers: generators/ruby/sdk: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/fern-ruby-model': specifier: workspace:* version: link:../model '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-api/logging-execa': specifier: workspace:* version: link:../../../packages/commons/logging-execa @@ -1306,15 +1334,15 @@ importers: generators/swift/codegen: dependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../packages/commons/core-utils '@fern-api/fs-utils': specifier: workspace:* version: link:../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons devDependencies: '@types/jest': specifier: ^29.5.12 @@ -1349,12 +1377,12 @@ importers: generators/typescript/codegen: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../packages/commons/core-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../commons '@fern-fern/ir-sdk': specifier: 53.8.0 version: 53.8.0 @@ -2217,12 +2245,12 @@ importers: generators/typescript/sdk/cli: devDependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../../base '@fern-api/fs-utils': specifier: workspace:* version: link:../../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../../commons '@fern-fern/ir-sdk': specifier: 53.8.0 version: 53.8.0 @@ -2421,15 +2449,15 @@ importers: generators/typescript/sdk/generator: dependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../../base '@fern-api/core-utils': specifier: workspace:* version: link:../../../../packages/commons/core-utils '@fern-api/fs-utils': specifier: workspace:* version: link:../../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../../commons '@fern-api/logger': specifier: workspace:* version: link:../../../../packages/cli/logger @@ -2852,12 +2880,12 @@ importers: generators/typescript/utils/abstract-generator-cli: dependencies: + '@fern-api/base-generator': + specifier: workspace:* + version: link:../../../base '@fern-api/fs-utils': specifier: workspace:* version: link:../../../../packages/commons/fs-utils - '@fern-api/generator-commons': - specifier: workspace:* - version: link:../../../commons '@fern-api/logger': specifier: workspace:* version: link:../../../../packages/cli/logger @@ -3035,9 +3063,9 @@ importers: generators/typescript/utils/contexts: dependencies: - '@fern-api/generator-commons': + '@fern-api/base-generator': specifier: workspace:* - version: link:../../../commons + version: link:../../../base '@fern-api/logger': specifier: workspace:* version: link:../../../../packages/cli/logger