Skip to content

Commit

Permalink
chore(cli): bump OpenApi Parser v2, FDR packages and keep nulls in Op…
Browse files Browse the repository at this point in the history
…enApi specs (#5924)

* bump package and keep nulls

* switch back to isNull

* update versions yml

* chore: update changelog

---------

Co-authored-by: fern-support <[email protected]>
  • Loading branch information
RohinBhargava and fern-support authored Feb 7, 2025
1 parent cf2db62 commit e41cf5c
Show file tree
Hide file tree
Showing 18 changed files with 108 additions and 93 deletions.
5 changes: 5 additions & 0 deletions fern/pages/changelogs/cli/2025-02-07.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## 0.51.33
**`(fix):`** The OpenAPI parser v2 now handles `null` values in examples, parses request and response bodies as unions if multiple, handles required
properties for global headers and improves upon example generation for APIs.


8 changes: 8 additions & 0 deletions packages/cli/cli/versions.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
- changelogEntry:
- summary: |
The OpenAPI parser v2 now handles `null` values in examples, parses request and response bodies as unions if multiple, handles required
properties for global headers and improves upon example generation for APIs.
type: fix
irVersion: 55
version: 0.51.33

- changelogEntry:
- summary: |
The Conjure Importer now handles replacing 'rid' types more safely by checking if an import alias starts with 'rid'.
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/configuration-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@fern-api/fs-utils": "workspace:*",
"@fern-api/task-context": "workspace:*",
"@fern-api/fern-definition-schema": "workspace:*",
"@fern-fern/fdr-cjs-sdk": "0.129.3-c425af4ef",
"@fern-fern/fdr-cjs-sdk": "0.129.4-b6c699ad2",
"@fern-fern/fiddle-sdk": "0.0.584",
"@fern-fern/generators-sdk": "0.114.0-5745f9e74",
"find-up": "^6.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/configuration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@fern-api/core-utils": "workspace:*",
"@fern-api/path-utils": "workspace:*",
"@fern-api/fern-definition-schema": "workspace:*",
"@fern-fern/fdr-cjs-sdk": "0.129.3-c425af4ef",
"@fern-fern/fdr-cjs-sdk": "0.129.4-b6c699ad2",
"@fern-fern/fiddle-sdk": "0.0.584",
"zod": "^3.22.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/docs-importers/commons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@fern-api/configuration": "workspace:*",
"@fern-api/fs-utils": "workspace:*",
"@fern-api/task-context": "workspace:*",
"@fern-fern/fdr-cjs-sdk": "0.129.3-c425af4ef",
"@fern-fern/fdr-cjs-sdk": "0.129.4-b6c699ad2",
"js-yaml": "^4.1.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/docs-importers/mintlify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@fern-api/fs-utils": "workspace:*",
"@fern-api/logger": "workspace:*",
"@fern-api/task-context": "workspace:*",
"@fern-fern/fdr-cjs-sdk": "0.129.3-c425af4ef",
"@fern-fern/fdr-cjs-sdk": "0.129.4-b6c699ad2",
"gray-matter": "^4.0.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/docs-importers/readme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@fern-api/docs-importer-commons": "workspace:*",
"@fern-api/fs-utils": "workspace:*",
"@fern-api/task-context": "workspace:*",
"@fern-fern/fdr-cjs-sdk": "0.129.3-c425af4ef",
"@fern-fern/fdr-cjs-sdk": "0.129.4-b6c699ad2",
"gray-matter": "^4.0.3",
"hast-util-to-mdast": "^10.1.0",
"mdast-util-mdx-jsx": "^3.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/docs-markdown-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"@fern-api/fs-utils": "workspace:*",
"@fern-api/task-context": "workspace:*",
"@fern-fern/fdr-cjs-sdk": "0.129.3-c425af4ef",
"@fern-fern/fdr-cjs-sdk": "0.129.4-b6c699ad2",
"gray-matter": "^4.0.3",
"mdast-util-from-markdown": "^2.0.2",
"mdast-util-gfm": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/docs-preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"dependencies": {
"@fern-api/docs-resolver": "workspace:*",
"@fern-api/fdr-sdk": "0.129.3-c425af4ef",
"@fern-api/fdr-sdk": "0.129.4-b6c699ad2",
"@fern-api/fs-utils": "workspace:*",
"@fern-api/ir-sdk": "workspace:*",
"@fern-api/logger": "workspace:*",
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/docs-resolver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"@fern-api/configuration-loader": "workspace:*",
"@fern-api/core-utils": "workspace:*",
"@fern-api/docs-markdown-utils": "workspace:*",
"@fern-api/docs-parsers": "^0.0.51",
"@fern-api/fdr-sdk": "0.129.3-c425af4ef",
"@fern-api/docs-parsers": "0.0.53",
"@fern-api/fdr-sdk": "0.129.4-b6c699ad2",
"@fern-api/lazy-fern-workspace": "workspace:*",
"@fern-api/ui-core-utils": "0.129.3-c425af4ef",
"@fern-api/ui-core-utils": "0.129.4-b6c699ad2",
"@fern-api/fs-utils": "workspace:*",
"@fern-api/ir-generator": "workspace:*",
"@fern-api/ir-sdk": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ it.skip("finds endpoint by id and by path/method", () => {
requests: [],
responses: [],
errors: [],
snippetTemplates: undefined
snippetTemplates: undefined,
protocol: undefined
}
};
expect(findEndpointByLocator("getUser", mockEndpoints)).toBeDefined();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { AbstractAPIWorkspace } from "@fern-api/api-workspace-commons";
import {
BaseOpenApiV3_1ConverterNodeContext,
ErrorCollector,
FernRegistry,
OpenApiDocumentConverterNode
} from "@fern-api/docs-parsers";
import { LazyFernWorkspace, OSSWorkspace, OpenAPILoader, getAllOpenAPISpecs } from "@fern-api/lazy-fern-workspace";
Expand All @@ -26,8 +27,7 @@ export async function generateFdrFromOpenApiWorkspace(

const openApiDocuments = await openApiLoader.loadDocuments({ context, specs: openApiSpecs });

// // eslint-disable-next-line @typescript-eslint/no-explicit-any
let fdrApiDefinition: ReturnType<OpenApiDocumentConverterNode["convert"]>;
let fdrApiDefinition: FernRegistry.api.latest.ApiDefinition | undefined;
for (const openApi of openApiDocuments) {
if (openApi.type !== "openapi") {
continue;
Expand All @@ -36,7 +36,8 @@ export async function generateFdrFromOpenApiWorkspace(
const oasContext: BaseOpenApiV3_1ConverterNodeContext = {
document: openApi.value as OpenAPIV3_1.Document,
logger: context.logger,
errors: new ErrorCollector()
errors: new ErrorCollector(),
generatedTypes: {}
};

const openApiFdrJson = new OpenApiDocumentConverterNode({
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/ete-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"dependencies": {
"@fern-api/configuration": "workspace:*",
"@fern-fern/fdr-cjs-sdk": "0.129.3-c425af4ef",
"@fern-fern/fdr-cjs-sdk": "0.129.4-b6c699ad2",
"@fern-api/fs-utils": "workspace:*",
"@fern-api/logging-execa": "workspace:*",
"@fern-typescript/fetcher": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@fern-api/core-utils": "workspace:*",
"@fern-api/docs-resolver": "workspace:*",
"@fern-api/logging-execa": "workspace:*",
"@fern-fern/fdr-cjs-sdk": "0.129.3-c425af4ef",
"@fern-fern/fdr-cjs-sdk": "0.129.4-b6c699ad2",
"@fern-api/fs-utils": "workspace:*",
"@fern-api/ir-generator": "workspace:*",
"@fern-api/ir-migrations": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/register/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@fern-api/configuration": "workspace:*",
"@fern-api/core": "workspace:*",
"@fern-api/core-utils": "workspace:*",
"@fern-fern/fdr-cjs-sdk": "0.129.3-c425af4ef",
"@fern-fern/fdr-cjs-sdk": "0.129.4-b6c699ad2",
"@fern-api/fs-utils": "workspace:*",
"@fern-api/ir-generator": "workspace:*",
"@fern-api/ir-sdk": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/yaml/docs-validator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@fern-api/core-utils": "workspace:*",
"@fern-api/docs-markdown-utils": "workspace:*",
"@fern-api/docs-resolver": "workspace:*",
"@fern-api/fdr-sdk": "0.129.3-c425af4ef",
"@fern-api/fdr-sdk": "0.129.4-b6c699ad2",
"@fern-api/fern-definition-schema": "workspace:*",
"@fern-api/fs-utils": "workspace:*",
"@fern-api/ir-generator": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"depcheck": "depcheck"
},
"dependencies": {
"@fern-fern/fdr-cjs-sdk": "0.129.3-c425af4ef",
"@fern-fern/fdr-cjs-sdk": "0.129.4-b6c699ad2",
"@fern-fern/generators-sdk": "0.114.0-5745f9e74",
"@fern-api/venus-api-sdk": "0.10.2",
"@fern-fern/fdr-test-sdk": "^0.0.5297",
Expand Down
Loading

0 comments on commit e41cf5c

Please sign in to comment.