diff --git a/.changepacks/changepack_log_C4OZkxASMEli1IvI1Adsf.json b/.changepacks/changepack_log_C4OZkxASMEli1IvI1Adsf.json new file mode 100644 index 0000000..2e9151f --- /dev/null +++ b/.changepacks/changepack_log_C4OZkxASMEli1IvI1Adsf.json @@ -0,0 +1 @@ +{"changes":{"packages/generator/package.json":"Patch"},"note":"Fix gen interface issue","date":"2025-12-22T12:46:09.147884Z"} \ No newline at end of file diff --git a/bun.lock b/bun.lock index b0aeef9..deb955d 100644 --- a/bun.lock +++ b/bun.lock @@ -22,7 +22,7 @@ "@devup-api/next-plugin": "workspace:*", "@devup-api/react-query": "workspace:*", "@devup-ui/react": "^1", - "next": "^16.0.10", + "next": "^16.1.0", "react": "^19.2.3", "react-dom": "^19.2.3", }, @@ -41,7 +41,7 @@ "@devup-api/fetch": "workspace:*", "@devup-api/next-plugin": "workspace:*", "@devup-ui/react": "^1", - "next": "^16.0.10", + "next": "^16.1.0", "react": "^19.2.3", "react-dom": "^19.2.3", }, @@ -89,7 +89,7 @@ }, "packages/core": { "name": "@devup-api/core", - "version": "0.1.9", + "version": "0.1.10", "devDependencies": { "@types/node": "^25.0", "typescript": "^5.9", @@ -97,7 +97,7 @@ }, "packages/fetch": { "name": "@devup-api/fetch", - "version": "0.1.10", + "version": "0.1.11", "dependencies": { "@devup-api/core": "workspace:*", }, @@ -108,7 +108,7 @@ }, "packages/generator": { "name": "@devup-api/generator", - "version": "0.1.8", + "version": "0.1.9", "dependencies": { "@devup-api/core": "workspace:*", "@devup-api/utils": "workspace:*", @@ -121,7 +121,7 @@ }, "packages/next-plugin": { "name": "@devup-api/next-plugin", - "version": "0.1.5", + "version": "0.1.6", "dependencies": { "@devup-api/core": "workspace:*", "@devup-api/generator": "workspace:*", @@ -140,7 +140,7 @@ }, "packages/react-query": { "name": "@devup-api/react-query", - "version": "0.1.2", + "version": "0.1.3", "dependencies": { "@devup-api/fetch": "workspace:*", "@tanstack/react-query": ">=5.90", @@ -159,7 +159,7 @@ }, "packages/rsbuild-plugin": { "name": "@devup-api/rsbuild-plugin", - "version": "0.1.5", + "version": "0.1.6", "dependencies": { "@devup-api/core": "workspace:*", "@devup-api/generator": "workspace:*", @@ -176,7 +176,7 @@ }, "packages/utils": { "name": "@devup-api/utils", - "version": "0.1.5", + "version": "0.1.6", "devDependencies": { "@types/node": "^25.0", "openapi-types": "^12.1", @@ -185,7 +185,7 @@ }, "packages/vite-plugin": { "name": "@devup-api/vite-plugin", - "version": "0.1.5", + "version": "0.1.6", "dependencies": { "@devup-api/core": "workspace:*", "@devup-api/generator": "workspace:*", @@ -202,7 +202,7 @@ }, "packages/webpack-plugin": { "name": "@devup-api/webpack-plugin", - "version": "0.1.5", + "version": "0.1.6", "dependencies": { "@devup-api/core": "workspace:*", "@devup-api/generator": "workspace:*", @@ -441,23 +441,23 @@ "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.0.7", "", { "dependencies": { "@emnapi/core": "^1.5.0", "@emnapi/runtime": "^1.5.0", "@tybys/wasm-util": "^0.10.1" } }, "sha512-SeDnOO0Tk7Okiq6DbXmmBODgOAb9dp9gjlphokTUxmt8U3liIP1ZsozBahH69j/RJv+Rfs6IwUKHTgQYJ/HBAw=="], - "@next/env": ["@next/env@16.0.10", "", {}, "sha512-8tuaQkyDVgeONQ1MeT9Mkk8pQmZapMKFh5B+OrFUlG3rVmYTXcXlBetBgTurKXGaIZvkoqRT9JL5K3phXcgang=="], + "@next/env": ["@next/env@16.1.0", "", {}, "sha512-Dd23XQeFHmhf3KBW76leYVkejHlCdB7erakC2At2apL1N08Bm+dLYNP+nNHh0tzUXfPQcNcXiQyacw0PG4Fcpw=="], - "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@16.0.10", "", { "os": "darwin", "cpu": "arm64" }, "sha512-4XgdKtdVsaflErz+B5XeG0T5PeXKDdruDf3CRpnhN+8UebNa5N2H58+3GDgpn/9GBurrQ1uWW768FfscwYkJRg=="], + "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@16.1.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-onHq8dl8KjDb8taANQdzs3XmIqQWV3fYdslkGENuvVInFQzZnuBYYOG2HGHqqtvgmEU7xWzhgndXXxnhk4Z3fQ=="], - "@next/swc-darwin-x64": ["@next/swc-darwin-x64@16.0.10", "", { "os": "darwin", "cpu": "x64" }, "sha512-spbEObMvRKkQ3CkYVOME+ocPDFo5UqHb8EMTS78/0mQ+O1nqE8toHJVioZo4TvebATxgA8XMTHHrScPrn68OGw=="], + "@next/swc-darwin-x64": ["@next/swc-darwin-x64@16.1.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-Am6VJTp8KhLuAH13tPrAoVIXzuComlZlMwGr++o2KDjWiKPe3VwpxYhgV6I4gKls2EnsIMggL4y7GdXyDdJcFA=="], - "@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@16.0.10", "", { "os": "linux", "cpu": "arm64" }, "sha512-uQtWE3X0iGB8apTIskOMi2w/MKONrPOUCi5yLO+v3O8Mb5c7K4Q5KD1jvTpTF5gJKa3VH/ijKjKUq9O9UhwOYw=="], + "@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@16.1.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-fVicfaJT6QfghNyg8JErZ+EMNQ812IS0lmKfbmC01LF1nFBcKfcs4Q75Yy8IqnsCqH/hZwGhqzj3IGVfWV6vpA=="], - "@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@16.0.10", "", { "os": "linux", "cpu": "arm64" }, "sha512-llA+hiDTrYvyWI21Z0L1GiXwjQaanPVQQwru5peOgtooeJ8qx3tlqRV2P7uH2pKQaUfHxI/WVarvI5oYgGxaTw=="], + "@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@16.1.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-TojQnDRoX7wJWXEEwdfuJtakMDW64Q7NrxQPviUnfYJvAx5/5wcGE+1vZzQ9F17m+SdpFeeXuOr6v3jbyusYMQ=="], - "@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@16.0.10", "", { "os": "linux", "cpu": "x64" }, "sha512-AK2q5H0+a9nsXbeZ3FZdMtbtu9jxW4R/NgzZ6+lrTm3d6Zb7jYrWcgjcpM1k8uuqlSy4xIyPR2YiuUr+wXsavA=="], + "@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@16.1.0", "", { "os": "linux", "cpu": "x64" }, "sha512-quhNFVySW4QwXiZkZ34SbfzNBm27vLrxZ2HwTfFFO1BBP0OY1+pI0nbyewKeq1FriqU+LZrob/cm26lwsiAi8Q=="], - "@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@16.0.10", "", { "os": "linux", "cpu": "x64" }, "sha512-1TDG9PDKivNw5550S111gsO4RGennLVl9cipPhtkXIFVwo31YZ73nEbLjNC8qG3SgTz/QZyYyaFYMeY4BKZR/g=="], + "@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@16.1.0", "", { "os": "linux", "cpu": "x64" }, "sha512-6JW0z2FZUK5iOVhUIWqE4RblAhUj1EwhZ/MwteGb//SpFTOHydnhbp3868gxalwea+mbOLWO6xgxj9wA9wNvNw=="], - "@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@16.0.10", "", { "os": "win32", "cpu": "arm64" }, "sha512-aEZIS4Hh32xdJQbHz121pyuVZniSNoqDVx1yIr2hy+ZwJGipeqnMZBJHyMxv2tiuAXGx6/xpTcQJ6btIiBjgmg=="], + "@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@16.1.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-+DK/akkAvvXn5RdYN84IOmLkSy87SCmpofJPdB8vbLmf01BzntPBSYXnMvnEEv/Vcf3HYJwt24QZ/s6sWAwOMQ=="], - "@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@16.0.10", "", { "os": "win32", "cpu": "x64" }, "sha512-E+njfCoFLb01RAFEnGZn6ERoOqhK1Gl3Lfz1Kjnj0Ulfu7oJbuMyvBKNj/bw8XZnenHDASlygTjZICQW+rYW1Q=="], + "@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@16.1.0", "", { "os": "win32", "cpu": "x64" }, "sha512-Tr0j94MphimCCks+1rtYPzQFK+faJuhHWCegU9S9gDlgyOk8Y3kPmO64UcjyzZAlligeBtYZ/2bEyrKq0d2wqQ=="], "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.0-beta.53", "", {}, "sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ=="], @@ -745,7 +745,7 @@ "neo-async": ["neo-async@2.6.2", "", {}, "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="], - "next": ["next@16.0.10", "", { "dependencies": { "@next/env": "16.0.10", "@swc/helpers": "0.5.15", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "16.0.10", "@next/swc-darwin-x64": "16.0.10", "@next/swc-linux-arm64-gnu": "16.0.10", "@next/swc-linux-arm64-musl": "16.0.10", "@next/swc-linux-x64-gnu": "16.0.10", "@next/swc-linux-x64-musl": "16.0.10", "@next/swc-win32-arm64-msvc": "16.0.10", "@next/swc-win32-x64-msvc": "16.0.10", "sharp": "^0.34.4" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.51.1", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-RtWh5PUgI+vxlV3HdR+IfWA1UUHu0+Ram/JBO4vWB54cVPentCD0e+lxyAYEsDTqGGMg7qpjhKh6dc6aW7W/sA=="], + "next": ["next@16.1.0", "", { "dependencies": { "@next/env": "16.1.0", "@swc/helpers": "0.5.15", "baseline-browser-mapping": "^2.8.3", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "16.1.0", "@next/swc-darwin-x64": "16.1.0", "@next/swc-linux-arm64-gnu": "16.1.0", "@next/swc-linux-arm64-musl": "16.1.0", "@next/swc-linux-x64-gnu": "16.1.0", "@next/swc-linux-x64-musl": "16.1.0", "@next/swc-win32-arm64-msvc": "16.1.0", "@next/swc-win32-x64-msvc": "16.1.0", "sharp": "^0.34.4" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.51.1", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-Y+KbmDbefYtHDDQKLNrmzE/YYzG2msqo2VXhzh5yrJ54tx/6TmGdkR5+kP9ma7i7LwZpZMfoY3m/AoPPPKxtVw=="], "next-example": ["next-example@workspace:examples/next"], @@ -843,6 +843,8 @@ "@babel/helper-compilation-targets/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], + "@devup-ui/next-plugin/next": ["next@16.0.10", "", { "dependencies": { "@next/env": "16.0.10", "@swc/helpers": "0.5.15", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "16.0.10", "@next/swc-darwin-x64": "16.0.10", "@next/swc-linux-arm64-gnu": "16.0.10", "@next/swc-linux-arm64-musl": "16.0.10", "@next/swc-linux-x64-gnu": "16.0.10", "@next/swc-linux-x64-musl": "16.0.10", "@next/swc-win32-arm64-msvc": "16.0.10", "@next/swc-win32-x64-msvc": "16.0.10", "sharp": "^0.34.4" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.51.1", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-RtWh5PUgI+vxlV3HdR+IfWA1UUHu0+Ram/JBO4vWB54cVPentCD0e+lxyAYEsDTqGGMg7qpjhKh6dc6aW7W/sA=="], + "@devup-ui/webpack-plugin/@devup-ui/wasm": ["@devup-ui/wasm@1.0.47", "", {}, "sha512-RPktfdg53bK5BqAyhfs9hA5vzAiH0D63w60S+ACaoIPXpqQaQp2Lh9pl3Mi6E+8KA0Div/hoQCLfYxuAefodrg=="], "@rsbuild/core/@swc/helpers": ["@swc/helpers@0.5.17", "", { "dependencies": { "tslib": "^2.8.0" } }, "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A=="], @@ -853,6 +855,24 @@ "vite/postcss": ["postcss@8.5.6", "", { "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg=="], + "@devup-ui/next-plugin/next/@next/env": ["@next/env@16.0.10", "", {}, "sha512-8tuaQkyDVgeONQ1MeT9Mkk8pQmZapMKFh5B+OrFUlG3rVmYTXcXlBetBgTurKXGaIZvkoqRT9JL5K3phXcgang=="], + + "@devup-ui/next-plugin/next/@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@16.0.10", "", { "os": "darwin", "cpu": "arm64" }, "sha512-4XgdKtdVsaflErz+B5XeG0T5PeXKDdruDf3CRpnhN+8UebNa5N2H58+3GDgpn/9GBurrQ1uWW768FfscwYkJRg=="], + + "@devup-ui/next-plugin/next/@next/swc-darwin-x64": ["@next/swc-darwin-x64@16.0.10", "", { "os": "darwin", "cpu": "x64" }, "sha512-spbEObMvRKkQ3CkYVOME+ocPDFo5UqHb8EMTS78/0mQ+O1nqE8toHJVioZo4TvebATxgA8XMTHHrScPrn68OGw=="], + + "@devup-ui/next-plugin/next/@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@16.0.10", "", { "os": "linux", "cpu": "arm64" }, "sha512-uQtWE3X0iGB8apTIskOMi2w/MKONrPOUCi5yLO+v3O8Mb5c7K4Q5KD1jvTpTF5gJKa3VH/ijKjKUq9O9UhwOYw=="], + + "@devup-ui/next-plugin/next/@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@16.0.10", "", { "os": "linux", "cpu": "arm64" }, "sha512-llA+hiDTrYvyWI21Z0L1GiXwjQaanPVQQwru5peOgtooeJ8qx3tlqRV2P7uH2pKQaUfHxI/WVarvI5oYgGxaTw=="], + + "@devup-ui/next-plugin/next/@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@16.0.10", "", { "os": "linux", "cpu": "x64" }, "sha512-AK2q5H0+a9nsXbeZ3FZdMtbtu9jxW4R/NgzZ6+lrTm3d6Zb7jYrWcgjcpM1k8uuqlSy4xIyPR2YiuUr+wXsavA=="], + + "@devup-ui/next-plugin/next/@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@16.0.10", "", { "os": "linux", "cpu": "x64" }, "sha512-1TDG9PDKivNw5550S111gsO4RGennLVl9cipPhtkXIFVwo31YZ73nEbLjNC8qG3SgTz/QZyYyaFYMeY4BKZR/g=="], + + "@devup-ui/next-plugin/next/@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@16.0.10", "", { "os": "win32", "cpu": "arm64" }, "sha512-aEZIS4Hh32xdJQbHz121pyuVZniSNoqDVx1yIr2hy+ZwJGipeqnMZBJHyMxv2tiuAXGx6/xpTcQJ6btIiBjgmg=="], + + "@devup-ui/next-plugin/next/@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@16.0.10", "", { "os": "win32", "cpu": "x64" }, "sha512-E+njfCoFLb01RAFEnGZn6ERoOqhK1Gl3Lfz1Kjnj0Ulfu7oJbuMyvBKNj/bw8XZnenHDASlygTjZICQW+rYW1Q=="], + "happy-dom/@types/node/undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="], } } diff --git a/examples/next-webpack/package.json b/examples/next-webpack/package.json index 3b7b646..7a6896c 100644 --- a/examples/next-webpack/package.json +++ b/examples/next-webpack/package.json @@ -9,7 +9,7 @@ "lint": "next lint" }, "dependencies": { - "next": "^16.0.10", + "next": "^16.1.0", "react": "^19.2.3", "react-dom": "^19.2.3", "@devup-api/next-plugin": "workspace:*", diff --git a/examples/next/package.json b/examples/next/package.json index 14e420a..8204d4a 100644 --- a/examples/next/package.json +++ b/examples/next/package.json @@ -9,7 +9,7 @@ "lint": "next lint" }, "dependencies": { - "next": "^16.0.10", + "next": "^16.1.0", "react": "^19.2.3", "react-dom": "^19.2.3", "@devup-api/next-plugin": "workspace:*", diff --git a/packages/generator/src/__tests__/__snapshots__/generate-interface.test.ts.snap b/packages/generator/src/__tests__/__snapshots__/generate-interface.test.ts.snap index 003eacb..d2210c7 100644 --- a/packages/generator/src/__tests__/__snapshots__/generate-interface.test.ts.snap +++ b/packages/generator/src/__tests__/__snapshots__/generate-interface.test.ts.snap @@ -132,10 +132,10 @@ declare module "@devup-api/fetch" { interface DevupGetApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: Array['User']>; + response: Array['User']>; }; getUsers: { - response: Array['User']>; + response: Array['User']>; }; } } @@ -143,10 +143,10 @@ declare module "@devup-api/fetch" { interface DevupPostApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; createUser: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; } } @@ -178,10 +178,10 @@ declare module "@devup-api/fetch" { interface DevupGetApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: Array['User']>; + response: Array['User']>; }; GetUsers: { - response: Array['User']>; + response: Array['User']>; }; } } @@ -189,10 +189,10 @@ declare module "@devup-api/fetch" { interface DevupPostApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; CreateUser: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; } } @@ -224,10 +224,10 @@ declare module "@devup-api/fetch" { interface DevupGetApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: Array['User']>; + response: Array['User']>; }; get_users: { - response: Array['User']>; + response: Array['User']>; }; } } @@ -235,10 +235,10 @@ declare module "@devup-api/fetch" { interface DevupPostApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; create_user: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; } } @@ -270,10 +270,10 @@ declare module "@devup-api/fetch" { interface DevupGetApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: Array['User']>; + response: Array['User']>; }; getUsers: { - response: Array['User']>; + response: Array['User']>; }; } } @@ -281,10 +281,10 @@ declare module "@devup-api/fetch" { interface DevupPostApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; createUser: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; } } @@ -316,10 +316,10 @@ declare module "@devup-api/fetch" { interface DevupGetApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: Array['User']>; + response: Array['User']>; }; getUsers: { - response: Array['User']>; + response: Array['User']>; }; } } @@ -327,10 +327,10 @@ declare module "@devup-api/fetch" { interface DevupPostApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; createUser: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; } } @@ -576,11 +576,11 @@ declare module "@devup-api/fetch" { interface DevupPostApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - body: DevupObject<'openapi.json', 'request'>['User']; + body: DevupObject<'request', 'openapi.json'>['User']; response?: {}; }; createUser: { - body: DevupObject<'openapi.json', 'request'>['User']; + body: DevupObject<'request', 'openapi.json'>['User']; response?: {}; }; } @@ -613,10 +613,10 @@ declare module "@devup-api/fetch" { interface DevupGetApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: Array['User']>; + response: Array['User']>; }; getUsers: { - response: Array['User']>; + response: Array['User']>; }; } } @@ -648,10 +648,10 @@ declare module "@devup-api/fetch" { interface DevupPostApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; createUser: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; } } @@ -790,11 +790,11 @@ declare module "@devup-api/fetch" { interface DevupPostApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - body: DevupObject<'openapi.json', 'request'>['CreateUserRequest']; + body: DevupObject<'request', 'openapi.json'>['CreateUserRequest']; response?: {}; }; createUser: { - body: DevupObject<'openapi.json', 'request'>['CreateUserRequest']; + body: DevupObject<'request', 'openapi.json'>['CreateUserRequest']; response?: {}; }; } @@ -827,10 +827,10 @@ declare module "@devup-api/fetch" { interface DevupGetApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; getUsers: { - response: DevupObject<'openapi.json', 'response'>['User']; + response: DevupObject<'response', 'openapi.json'>['User']; }; } } @@ -863,11 +863,11 @@ declare module "@devup-api/fetch" { [\`openapi.json\`]: { [\`/users\`]: { response?: {}; - error: DevupObject<'openapi.json', 'error'>['Error']; + error: DevupObject<'error', 'openapi.json'>['Error']; }; getUsers: { response?: {}; - error: DevupObject<'openapi.json', 'error'>['Error']; + error: DevupObject<'error', 'openapi.json'>['Error']; }; } } @@ -899,10 +899,10 @@ declare module "@devup-api/fetch" { interface DevupGetApiStruct { [\`openapi.json\`]: { [\`/users\`]: { - response: Array['User']>; + response: Array['User']>; }; getUsers: { - response: Array['User']>; + response: Array['User']>; }; } } @@ -1291,8 +1291,8 @@ declare module "@devup-api/fetch" { query?: { include?: string; }; - response: DevupObject<'openapi.json', 'response'>['Post']; - error: DevupObject<'openapi.json', 'error'>['Error']; + response: DevupObject<'response', 'openapi.json'>['Post']; + error: DevupObject<'error', 'openapi.json'>['Error']; }; getUserPost: { params: { @@ -1302,8 +1302,8 @@ declare module "@devup-api/fetch" { query?: { include?: string; }; - response: DevupObject<'openapi.json', 'response'>['Post']; - error: DevupObject<'openapi.json', 'error'>['Error']; + response: DevupObject<'response', 'openapi.json'>['Post']; + error: DevupObject<'error', 'openapi.json'>['Error']; }; } } @@ -1314,15 +1314,15 @@ declare module "@devup-api/fetch" { params: { userId: string; }; - body: DevupObject<'openapi.json', 'request'>['UpdatePostRequest']; - response: DevupObject<'openapi.json', 'response'>['Post']; + body: DevupObject<'request', 'openapi.json'>['UpdatePostRequest']; + response: DevupObject<'response', 'openapi.json'>['Post']; }; updateUserPost: { params: { userId: string; }; - body: DevupObject<'openapi.json', 'request'>['UpdatePostRequest']; - response: DevupObject<'openapi.json', 'response'>['Post']; + body: DevupObject<'request', 'openapi.json'>['UpdatePostRequest']; + response: DevupObject<'response', 'openapi.json'>['Post']; }; } } @@ -1675,11 +1675,11 @@ declare module "@devup-api/fetch" { [\`openapi.json\`]: { [\`/users\`]: { response?: {}; - error: Array['Error']>; + error: Array['Error']>; }; getUsers: { response?: {}; - error: Array['Error']>; + error: Array['Error']>; }; } } diff --git a/packages/generator/src/generate-interface.ts b/packages/generator/src/generate-interface.ts index d083803..67d29a4 100644 --- a/packages/generator/src/generate-interface.ts +++ b/packages/generator/src/generate-interface.ts @@ -256,7 +256,7 @@ function generateSchemaInterface( requestSchemaNames.has(schemaName) ) { // Use component reference - requestBodyType = `DevupObject<'${serverName}', 'request'>['${schemaName}']` + requestBodyType = `DevupObject<'request', '${serverName}'>['${schemaName}']` } else { const requestBody = extractRequestBody( operation.requestBody, @@ -316,7 +316,7 @@ function generateSchemaInterface( responseSchemaNames.has(schemaName) ) { // Use component reference - responseType = `DevupObject<'${serverName}', 'response'>['${schemaName}']` + responseType = `DevupObject<'response', '${serverName}'>['${schemaName}']` } else { // Extract schema type with response options const responseDefaultNonNullable = @@ -347,7 +347,7 @@ function generateSchemaInterface( responseSchemaNames.has(schemaName) ) { // Use component reference for array items - responseType = `Array['${schemaName}']>` + responseType = `Array['${schemaName}']>` } else { // Extract schema type with response options const responseDefaultNonNullable = @@ -420,7 +420,7 @@ function generateSchemaInterface( errorSchemaNames.has(schemaName) ) { // Use component reference - errorType = `DevupObject<'${serverName}', 'error'>['${schemaName}']` + errorType = `DevupObject<'error', '${serverName}'>['${schemaName}']` } else { // Extract schema type with response options const responseDefaultNonNullable = @@ -451,7 +451,7 @@ function generateSchemaInterface( errorSchemaNames.has(schemaName) ) { // Use component reference for array items - errorType = `Array['${schemaName}']>` + errorType = `Array['${schemaName}']>` } else { // Extract schema type with response options const responseDefaultNonNullable =