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.

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

Support server versions in modular and add cadl-ranch test cases #2261

Merged
merged 39 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
528f86e
add modular server versions
v-jiaodi Jan 30, 2024
118f022
fix version param global calculation
qiaozha Feb 2, 2024
87dcd59
fix api version in operation logic
qiaozha Feb 2, 2024
fb32dea
fix versioned test
qiaozha Feb 4, 2024
8353c86
reserve work
qiaozha Feb 5, 2024
9df4d5e
fix ci
qiaozha Feb 5, 2024
4727977
fix ci
qiaozha Feb 5, 2024
d880632
Merge branch 'main' of https://github.com/v-jiaodi/autorest.typescrip…
v-jiaodi Mar 6, 2024
708999d
add rlc server versions in this pr
v-jiaodi Mar 6, 2024
a530616
merge main
qiaozha Mar 11, 2024
3883d55
revert smoke test
qiaozha Mar 11, 2024
14bf481
should only have client side api version if api version exists in all…
qiaozha Mar 11, 2024
6dd9110
fix batch
qiaozha Mar 11, 2024
a9fda08
fix ut
qiaozha Mar 11, 2024
689d5fd
unify api version when it exists in all operations
qiaozha Mar 11, 2024
eecafb6
fix smoke test
qiaozha Mar 11, 2024
be535fe
fix ci
qiaozha Mar 11, 2024
e697042
fix parameters
qiaozha Mar 11, 2024
34862a6
fix ci
qiaozha Mar 11, 2024
e055947
add ut for api version in modular
qiaozha Mar 13, 2024
1153098
Update packages/typespec-ts/test/modularUnit/apiOperations.spec.ts
qiaozha Mar 13, 2024
d0c5bdc
fix ut
qiaozha Mar 13, 2024
bd2f586
reserve work
qiaozha Mar 14, 2024
0ac1e34
generate client level required apiVersion
qiaozha Mar 14, 2024
fee93a1
merge main
qiaozha Mar 14, 2024
6478b24
handle api-version in both url and query
qiaozha Mar 15, 2024
36963a6
merge main
qiaozha Mar 15, 2024
d2e477e
fix ci
qiaozha Mar 15, 2024
474674e
should not export apiVersion in operation level signature when it has…
qiaozha Mar 18, 2024
af3841d
fix ci
qiaozha Mar 18, 2024
35a0dc8
Update packages/typespec-ts/src/modular/helpers/operationHelpers.ts
qiaozha Mar 18, 2024
cba8781
fix integration test
qiaozha Mar 19, 2024
e09c342
merge main
qiaozha Mar 19, 2024
834c7bd
fix smoke-test
qiaozha Mar 19, 2024
0cb8fa5
merge main and resolve conflicts
qiaozha Mar 21, 2024
0335d33
regen smoke-test
v-jiaodi Mar 22, 2024
703213d
regen cadl test case
v-jiaodi Mar 22, 2024
4a1cf7e
add ut and fix smoke test
qiaozha Mar 25, 2024
c2512bf
resolve comments
qiaozha Mar 25, 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
3 changes: 2 additions & 1 deletion packages/rlc-common/src/buildClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,9 @@ export function getClientFactoryBody(
!!model.apiVersionInfo?.defaultValue
) {
apiVersionStatement = `options.apiVersion = options.apiVersion ?? "${model.apiVersionInfo?.defaultValue}"`;
} else if (model.apiVersionInfo?.definedPosition === "query") {
apiVersionStatement = `options.apiVersion = options.apiVersion ?? apiVersion`;
}

if (!clientPackageName.endsWith("-rest")) {
clientPackageName = clientPackageName + "-rest";
}
Expand Down
1 change: 1 addition & 0 deletions packages/rlc-common/src/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export interface PathTemplateApiVersion {
export interface UrlInfo {
endpoint?: string;
urlParameters?: PathParameter[];
apiVersionInfo?: ApiVersionInfo;
}

export interface ApiVersionInfo {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,15 @@
"./api": "./src/api/index.ts",
"./models": "./src/models/index.ts"
},
"dialects": [
"esm",
"commonjs"
],
"esmDialects": [
"browser",
"react-native"
],
"dialects": ["esm", "commonjs"],
"esmDialects": ["browser", "react-native"],
"selfLink": false
},
"type": "module",
"keywords": [
"node",
"azure",
"cloud",
"typescript",
"browser",
"isomorphic"
],
"keywords": ["node", "azure", "cloud", "typescript", "browser", "isomorphic"],
"author": "Microsoft Corporation",
"license": "MIT",
"files": [
"dist",
"README.md",
"LICENSE",
"review/*"
],
"files": ["dist", "README.md", "LICENSE", "review/*"],
"dependencies": {
"@azure-rest/core-client": "^1.2.0",
"@azure/core-auth": "^1.6.0",
Expand Down Expand Up @@ -86,64 +68,5 @@
"test:node": "npm run clean && tshy && npm run unit-test:node && npm run integration-test:node",
"test": "npm run clean && tshy && npm run unit-test:node && npm run unit-test:browser && npm run integration-test",
"build": "npm run clean && tshy && npm run extract-api"
},
"exports": {
"./package.json": "./package.json",
".": {
"browser": {
"types": "./dist/browser/index.d.ts",
"default": "./dist/browser/index.js"
},
"react-native": {
"types": "./dist/react-native/index.d.ts",
"default": "./dist/react-native/index.js"
},
"import": {
"types": "./dist/esm/index.d.ts",
"default": "./dist/esm/index.js"
},
"require": {
"types": "./dist/commonjs/index.d.ts",
"default": "./dist/commonjs/index.js"
}
},
"./api": {
"browser": {
"types": "./dist/browser/api/index.d.ts",
"default": "./dist/browser/api/index.js"
},
"react-native": {
"types": "./dist/react-native/api/index.d.ts",
"default": "./dist/react-native/api/index.js"
},
"import": {
"types": "./dist/esm/api/index.d.ts",
"default": "./dist/esm/api/index.js"
},
"require": {
"types": "./dist/commonjs/api/index.d.ts",
"default": "./dist/commonjs/api/index.js"
}
},
"./models": {
"browser": {
"types": "./dist/browser/models/index.d.ts",
"default": "./dist/browser/models/index.js"
},
"react-native": {
"types": "./dist/react-native/models/index.d.ts",
"default": "./dist/react-native/models/index.js"
},
"import": {
"types": "./dist/esm/models/index.d.ts",
"default": "./dist/esm/models/index.js"
},
"require": {
"types": "./dist/commonjs/models/index.d.ts",
"default": "./dist/commonjs/models/index.js"
}
}
},
"main": "./dist/commonjs/index.js",
"types": "./dist/commonjs/index.d.ts"
}
}
Loading
Loading