Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update oazapfts to 6.0.2 #4198

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Update oazapfts to 6.0.2 #4198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a41608
Update oazapfts to 6.0.2
SimonEggert Feb 14, 2024
7939056
Use bundler moduleResolution to be able to import new oazapfts types
SimonEggert Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/rtk-query-codegen-openapi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"dependencies": {
"@apidevtools/swagger-parser": "^10.0.2",
"commander": "^6.2.0",
"oazapfts": "^4.8.0",
"oazapfts": "^6.0.2",
"prettier": "^3.2.5",
"semver": "^7.3.5",
"swagger2openapi": "^7.0.4",
Expand Down
4 changes: 1 addition & 3 deletions packages/rtk-query-codegen-openapi/src/generate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ import ApiGenerator, {
getReferenceName,
isReference,
supportDeepObjects,
} from 'oazapfts/lib/codegen/generate';
import {
createPropertyAssignment,
createQuestionToken,
isValidIdentifier,
keywordType,
} from 'oazapfts/lib/codegen/tscodegen';
} from 'oazapfts/generate';
import type { OpenAPIV3 } from 'openapi-types';
import ts from 'typescript';
import type { ObjectPropertyDefinitions } from './codegen';
Expand Down
2 changes: 1 addition & 1 deletion packages/rtk-query-codegen-openapi/src/generators/react-hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ts from 'typescript';
import { getOperationName } from 'oazapfts/lib/codegen/generate';
import { getOperationName } from 'oazapfts/generate';
import { capitalize, isQuery } from '../utils';
import type { OperationDefinition, EndpointOverrides, ConfigFile } from '../types';
import { getOverrides } from '../generate';
Expand Down
6 changes: 6 additions & 0 deletions packages/rtk-query-codegen-openapi/test/__snapshots__/cli.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ export type Pet = {
category?: Category;
photoUrls: string[];
tags?: Tag[];
/** pet status in the store */
status?: 'available' | 'pending' | 'sold';
};
export type ApiResponse = {
Expand All @@ -204,6 +205,7 @@ export type Order = {
petId?: number;
quantity?: number;
shipDate?: string;
/** Order Status */
status?: 'placed' | 'approved' | 'delivered';
complete?: boolean;
};
Expand All @@ -215,6 +217,7 @@ export type User = {
email?: string;
password?: string;
phone?: string;
/** User Status */
userStatus?: number;
};
"
Expand Down Expand Up @@ -412,6 +415,7 @@ export type Pet = {
category?: Category;
photoUrls: string[];
tags?: Tag[];
/** pet status in the store */
status?: 'available' | 'pending' | 'sold';
};
export type ApiResponse = {
Expand All @@ -424,6 +428,7 @@ export type Order = {
petId?: number;
quantity?: number;
shipDate?: string;
/** Order Status */
status?: 'placed' | 'approved' | 'delivered';
complete?: boolean;
};
Expand All @@ -435,6 +440,7 @@ export type User = {
email?: string;
password?: string;
phone?: string;
/** User Status */
userStatus?: number;
};
"
Expand Down
15 changes: 15 additions & 0 deletions packages/rtk-query-codegen-openapi/test/__snapshots__/generateEndpoints.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ export type Pet = {
category?: Category | undefined;
photoUrls: string[];
tags?: Tag[] | undefined;
/** pet status in the store */
status?: ("available" | "pending" | "sold") | undefined;
};
export type ApiResponse = {
Expand All @@ -270,6 +271,7 @@ export type Order = {
petId?: number | undefined;
quantity?: number | undefined;
shipDate?: string | undefined;
/** Order Status */
status?: ("placed" | "approved" | "delivered") | undefined;
complete?: boolean | undefined;
};
Expand All @@ -281,6 +283,7 @@ export type User = {
email?: string | undefined;
password?: string | undefined;
phone?: string | undefined;
/** User Status */
userStatus?: number | undefined;
};
"
Expand Down Expand Up @@ -386,6 +389,7 @@ export type Order = {
petId?: number | undefined;
quantity?: number | undefined;
shipDate?: string | undefined;
/** Order Status */
status?: ("placed" | "approved" | "delivered") | undefined;
complete?: boolean | undefined;
};
Expand Down Expand Up @@ -494,6 +498,7 @@ export type Pet = {
category?: Category | undefined;
photoUrls: string[];
tags?: Tag[] | undefined;
/** pet status in the store */
status?: ("available" | "pending" | "sold") | undefined;
};
export const { useAddPetMutation, useGetPetByIdQuery } = injectedRtkApi;
Expand Down Expand Up @@ -680,6 +685,7 @@ export type Pet = {
category?: Category;
photoUrls: string[];
tags?: Tag[];
/** pet status in the store */
status?: "available" | "pending" | "sold";
};
export const { useAddPetMutation, useGetPetByIdQuery, useLazyGetPetByIdQuery } =
Expand Down Expand Up @@ -729,6 +735,7 @@ export type Pet = {
category?: Category;
photoUrls: string[];
tags?: Tag[];
/** pet status in the store */
status?: "available" | "pending" | "sold";
};
export const { useLazyGetPetByIdQuery } = injectedRtkApi;
Expand Down Expand Up @@ -777,6 +784,7 @@ export type Pet = {
category?: Category;
photoUrls: string[];
tags?: Tag[];
/** pet status in the store */
status?: "available" | "pending" | "sold";
};
export const { useAddPetMutation } = injectedRtkApi;
Expand Down Expand Up @@ -825,6 +833,7 @@ export type Pet = {
category?: Category;
photoUrls: string[];
tags?: Tag[];
/** pet status in the store */
status?: "available" | "pending" | "sold";
};
export const { useGetPetByIdQuery } = injectedRtkApi;
Expand Down Expand Up @@ -1153,6 +1162,7 @@ export type Pet = {
category?: Category | undefined;
photoUrls: string[];
tags?: Tag[] | undefined;
/** pet status in the store */
status?: ("available" | "pending" | "sold") | undefined;
};
export type ApiResponse = {
Expand All @@ -1165,6 +1175,7 @@ export type Order = {
petId?: number | undefined;
quantity?: number | undefined;
shipDate?: string | undefined;
/** Order Status */
status?: ("placed" | "approved" | "delivered") | undefined;
complete?: boolean | undefined;
};
Expand All @@ -1176,6 +1187,7 @@ export type User = {
email?: string | undefined;
password?: string | undefined;
phone?: string | undefined;
/** User Status */
userStatus?: number | undefined;
};
export const {
Expand Down Expand Up @@ -1537,6 +1549,7 @@ export type Pet = {
category?: Category | undefined;
photoUrls: string[];
tags?: Tag[] | undefined;
/** pet status in the store */
status?: ("available" | "pending" | "sold") | undefined;
};
export type ApiResponse = {
Expand All @@ -1549,6 +1562,7 @@ export type Order = {
petId?: number | undefined;
quantity?: number | undefined;
shipDate?: string | undefined;
/** Order Status */
status?: ("placed" | "approved" | "delivered") | undefined;
complete?: boolean | undefined;
};
Expand All @@ -1560,6 +1574,7 @@ export type User = {
email?: string | undefined;
password?: string | undefined;
phone?: string | undefined;
/** User Status */
userStatus?: number | undefined;
};
export const {
Expand Down
4 changes: 2 additions & 2 deletions packages/rtk-query-codegen-openapi/tsconfig.json
View file
Open in desktop
Copy link
Contributor Author

@SimonEggert SimonEggert Feb 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes were necessary to fix errors regarding the new import structure that does not seem to work (for TypeScript at least), s. this workflow run. I am not fully aware of the implications this might have for building and packaging, so please take a closer look.

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"compilerOptions": {
"target": "ESNext",
"module": "CommonJS",
"module": "ESNext",
"declaration": true,
"sourceMap": true,
"outDir": "lib",
"rootDir": "src",
"strict": true,
"noUnusedLocals": false,
"resolveJsonModule": true,
"moduleResolution": "Node",
"moduleResolution": "bundler",
"types": ["vitest/globals", "vitest/importMeta"],
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
16 changes: 9 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7617,7 +7617,7 @@ __metadata:
husky: "npm:^4.3.6"
msw: "npm:^2.1.5"
node-fetch: "npm:^3.3.2"
oazapfts: "npm:^4.8.0"
oazapfts: "npm:^6.0.2"
openapi-types: "npm:^9.1.0"
prettier: "npm:^3.2.5"
pretty-quick: "npm:^3.1.0"
Expand Down Expand Up @@ -21400,18 +21400,20 @@ __metadata:
languageName: node
linkType: hard

"oazapfts@npm:^4.8.0":
version: 4.10.0
resolution: "oazapfts@npm:4.10.0"
"oazapfts@npm:^6.0.2":
version: 6.0.2
resolution: "oazapfts@npm:6.0.2"
dependencies:
"@apidevtools/swagger-parser": "npm:^10.1.0"
lodash: "npm:^4.17.21"
minimist: "npm:^1.2.8"
swagger2openapi: "npm:^7.0.8"
typescript: "npm:^5.2.2"
typescript: "npm:^5.3.3"
peerDependencies:
"@oazapfts/runtime": "*"
bin:
oazapfts: lib/codegen/cli.js
checksum: 10/361915b5bafea470b63e54274a54ec19a1d5de09f017f11a4dc380f6e00bd7fb043ae7e0b6a166a46276c41e19a9206cc13b9213d7e7a4e0e08f783ef7b4ec07
oazapfts: dist/cli.js
checksum: 10/9132e4bbc589cefba2b93a2421309c89e7685cf75108ac8611d93f78c4e985a0d95829feb2f2b109fa22cb6feb12a6a1e03a679bba9892633c22fe9fb21bd91c
languageName: node
linkType: hard

Expand Down