Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
532 changes: 269 additions & 263 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions packages/typespec-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"type": "module",
"dependencies": {
"@azure-tools/typespec-ts": "workspace:^0.42.0",
"@typespec/openapi": "^1.1.0",
"@azure-tools/typespec-autorest": "^0.57.1",
"@typespec/openapi3": "^1.1.0",
"@azure-tools/typespec-azure-core": "^0.57.0",
"@azure-tools/typespec-client-generator-core": "^0.57.3",
"@azure-tools/typespec-azure-resource-manager": "^0.57.2",
"@azure-tools/typespec-azure-rulesets": "^0.57.1",
"@typespec/compiler": "^1.1.0",
"@typespec/http": "^1.1.0",
"@typespec/rest": "^0.71.0",
"@typespec/versioning": "^0.71.0",
"@typespec/json-schema": "^1.1.0",
"@typespec/openapi": "^1.2.1",
"@azure-tools/typespec-autorest": "^0.58.0",
"@typespec/openapi3": "^1.2.1",
"@azure-tools/typespec-azure-core": "^0.58.0",
"@azure-tools/typespec-client-generator-core": "^0.58.0",
"@azure-tools/typespec-azure-resource-manager": "^0.58.0",
"@azure-tools/typespec-azure-rulesets": "^0.58.0",
"@typespec/compiler": "^1.2.1",
"@typespec/http": "^1.2.1",
"@typespec/rest": "^0.72.1",
"@typespec/versioning": "^0.72.1",
"@typespec/json-schema": "^1.2.1",
"prettier": "^3.1.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@
},
"Azure.Core.Foundations.InnerError": {
"type": "object",
"description": "An object containing more specific information about the error. As per Microsoft One API guidelines - https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md#handling-errors.",
"description": "An object containing more specific information about the error. As per Azure REST API guidelines - https://aka.ms/AzureRestApiGuidelines#handling-errors.",
"properties": {
"code": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@
},
"Azure.Core.Foundations.InnerError": {
"type": "object",
"description": "An object containing more specific information about the error. As per Microsoft One API guidelines - https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md#handling-errors.",
"description": "An object containing more specific information about the error. As per Azure REST API guidelines - https://aka.ms/AzureRestApiGuidelines#handling-errors.",
"properties": {
"code": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
},
"Azure.Core.Foundations.InnerError": {
"type": "object",
"description": "An object containing more specific information about the error. As per Microsoft One API guidelines - https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md#handling-errors.",
"description": "An object containing more specific information about the error. As per Azure REST API guidelines - https://aka.ms/AzureRestApiGuidelines#handling-errors.",
"properties": {
"code": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
},
"Azure.Core.Foundations.InnerError": {
"type": "object",
"description": "An object containing more specific information about the error. As per Microsoft One API guidelines - https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md#handling-errors.",
"description": "An object containing more specific information about the error. As per Azure REST API guidelines - https://aka.ms/AzureRestApiGuidelines#handling-errors.",
"properties": {
"code": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
},
"Azure.Core.Foundations.InnerError": {
"type": "object",
"description": "An object containing more specific information about the error. As per Microsoft One API guidelines - https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md#handling-errors.",
"description": "An object containing more specific information about the error. As per Azure REST API guidelines - https://aka.ms/AzureRestApiGuidelines#handling-errors.",
"properties": {
"code": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
},
"Azure.Core.Foundations.InnerError": {
"type": "object",
"description": "An object containing more specific information about the error. As per Microsoft One API guidelines - https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md#handling-errors.",
"description": "An object containing more specific information about the error. As per Azure REST API guidelines - https://aka.ms/AzureRestApiGuidelines#handling-errors.",
"properties": {
"code": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
},
"Azure.Core.Foundations.InnerError": {
"type": "object",
"description": "An object containing more specific information about the error. As per Microsoft One API guidelines - https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md#handling-errors.",
"description": "An object containing more specific information about the error. As per Azure REST API guidelines - https://aka.ms/AzureRestApiGuidelines#handling-errors.",
"properties": {
"code": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
},
"Azure.Core.Foundations.InnerError": {
"type": "object",
"description": "An object containing more specific information about the error. As per Microsoft One API guidelines - https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md#handling-errors.",
"description": "An object containing more specific information about the error. As per Azure REST API guidelines - https://aka.ms/AzureRestApiGuidelines#handling-errors.",
"properties": {
"code": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
},
"Azure.Core.Foundations.InnerError": {
"type": "object",
"description": "An object containing more specific information about the error. As per Microsoft One API guidelines - https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md#handling-errors.",
"description": "An object containing more specific information about the error. As per Azure REST API guidelines - https://aka.ms/AzureRestApiGuidelines#handling-errors.",
"properties": {
"code": {
"type": "string",
Expand Down Expand Up @@ -180,6 +180,7 @@
"properties": {
"type": {
"type": "string",
"description": "implicit flow",
"enum": [
"implicit"
]
Expand Down
38 changes: 19 additions & 19 deletions packages/typespec-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@
"license": "MIT",
"devDependencies": {
"@azure-rest/core-client": "^2.3.1",
"@typespec/http-specs": "0.1.0-alpha.24-dev.2",
"@typespec/http-specs": "0.1.0-alpha.25-dev.0",
"@typespec/spector": "0.1.0-alpha.16-dev.2",
"@typespec/spec-api": "0.1.0-alpha.7-dev.1",
"@azure-tools/azure-http-specs": "0.1.0-alpha.22",
"@azure-tools/typespec-autorest": "^0.57.1",
"@azure-tools/typespec-azure-core": "^0.57.0",
"@azure-tools/typespec-azure-resource-manager": "^0.57.2",
"@azure-tools/typespec-client-generator-core": "^0.57.3",
"@typespec/spec-api": "0.1.0-alpha.8-dev.0",
"@azure-tools/azure-http-specs": "0.1.0-alpha.24-dev.0",
"@azure-tools/typespec-autorest": "^0.58.0",
"@azure-tools/typespec-azure-core": "^0.58.0",
"@azure-tools/typespec-azure-resource-manager": "^0.58.0",
"@azure-tools/typespec-client-generator-core": "^0.58.0",
"@azure/abort-controller": "^2.1.2",
"@azure/core-auth": "^1.6.0",
"@azure/core-lro": "^3.1.0",
Expand All @@ -86,12 +86,12 @@
"@types/node": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^8.28.0",
"@typescript-eslint/parser": "^8.28.0",
"@typespec/compiler": "^1.1.0",
"@typespec/http": "^1.1.0",
"@typespec/openapi": "^1.1.0",
"@typespec/rest": "^0.71.0",
"@typespec/compiler": "^1.2.1",
"@typespec/http": "^1.2.1",
"@typespec/openapi": "^1.2.1",
"@typespec/rest": "^0.72.1",
"@typespec/ts-http-runtime": "^0.1.0",
"@typespec/versioning": "^0.71.0",
"@typespec/versioning": "^0.72.1",
"chai": "^4.3.6",
"chalk": "^4.0.0",
"cross-env": "^7.0.3",
Expand All @@ -113,13 +113,13 @@
"js-yaml": "^4.1.0"
},
"peerDependencies": {
"@azure-tools/typespec-azure-core": "^0.57.0",
"@azure-tools/typespec-client-generator-core": "^0.57.3",
"@typespec/compiler": "^1.1.0",
"@typespec/http": "^1.1.0",
"@typespec/rest": "^0.71.0",
"@typespec/versioning": "^0.71.0",
"@typespec/xml": "^0.71.0"
"@azure-tools/typespec-azure-core": "^0.58.0",
"@azure-tools/typespec-client-generator-core": "^0.58.0",
"@typespec/compiler": "^1.2.1",
"@typespec/http": "^1.2.1",
"@typespec/rest": "^0.72.1",
"@typespec/versioning": "^0.72.1",
"@typespec/xml": "^0.72.1"
},
"dependencies": {
"@azure-tools/rlc-common": "workspace:^0.42.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,48 @@ export declare interface PetOutput {

export declare interface Routes {
(path: "/payload/pageable/server-driven-pagination/link"): ServerDrivenPaginationLink;
(path: "/payload/pageable/server-driven-pagination/nested-link"): ServerDrivenPaginationNestedLink;
(path: "/payload/pageable/server-driven-pagination/continuationtoken/request-query-response-body"): ServerDrivenPaginationContinuationTokenRequestQueryResponseBody;
(path: "/payload/pageable/server-driven-pagination/continuationtoken/request-header-response-body"): ServerDrivenPaginationContinuationTokenRequestHeaderResponseBody;
(path: "/payload/pageable/server-driven-pagination/continuationtoken/request-query-response-header"): ServerDrivenPaginationContinuationTokenRequestQueryResponseHeader;
(path: "/payload/pageable/server-driven-pagination/continuationtoken/request-header-response-header"): ServerDrivenPaginationContinuationTokenRequestHeaderResponseHeader;
(path: "/payload/pageable/server-driven-pagination/continuationtoken/request-query-nested-response-body"): ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBody;
(path: "/payload/pageable/server-driven-pagination/continuationtoken/request-header-nested-response-body"): ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBody;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBody {
get(options?: ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyParameters): StreamableMethod<ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBody200Response>;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBody200Response extends HttpResponse {
status: "200";
body: {
nestedItems: {
pets: Array<PetOutput>;
};
nestedNext?: {
nextToken?: string;
};
};
}

export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyHeaderParam {
headers?: RawHttpHeadersInput & ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyHeaders;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyHeaders {
token?: string;
foo?: string;
}

export declare type ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyParameters = ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyQueryParam & ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyHeaderParam & RequestParameters;

export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyQueryParam {
queryParameters?: ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyQueryParamProperties;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyQueryParamProperties {
bar?: string;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderResponseBody {
Expand Down Expand Up @@ -95,6 +133,41 @@ export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderRes
bar?: string;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBody {
get(options?: ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyParameters): StreamableMethod<ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBody200Response>;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBody200Response extends HttpResponse {
status: "200";
body: {
nestedItems: {
pets: Array<PetOutput>;
};
nestedNext?: {
nextToken?: string;
};
};
}

export declare interface ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyHeaderParam {
headers?: RawHttpHeadersInput & ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyHeaders;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyHeaders {
foo?: string;
}

export declare type ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyParameters = ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyQueryParam & ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyHeaderParam & RequestParameters;

export declare interface ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyQueryParam {
queryParameters?: ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyQueryParamProperties;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyQueryParamProperties {
token?: string;
bar?: string;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestQueryResponseBody {
get(options?: ServerDrivenPaginationContinuationTokenRequestQueryResponseBodyParameters): StreamableMethod<ServerDrivenPaginationContinuationTokenRequestQueryResponseBody200Response>;
}
Expand Down Expand Up @@ -175,4 +248,22 @@ export declare interface ServerDrivenPaginationLink200Response extends HttpRespo

export declare type ServerDrivenPaginationLinkParameters = RequestParameters;

export declare interface ServerDrivenPaginationNestedLink {
get(options?: ServerDrivenPaginationNestedLinkParameters): StreamableMethod<ServerDrivenPaginationNestedLink200Response>;
}

export declare interface ServerDrivenPaginationNestedLink200Response extends HttpResponse {
status: "200";
body: {
nestedItems: {
pets: Array<PetOutput>;
};
nestedNext: {
next?: string;
};
};
}

export declare type ServerDrivenPaginationNestedLinkParameters = RequestParameters;

export { }
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,20 @@ export declare interface Pet {
}

export declare interface ServerDrivenPaginationContinuationTokenOperations {
requestHeaderNestedResponseBody: (options?: ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyOptionalParams) => PagedAsyncIterableIterator<Pet>;
requestQueryNestedResponseBody: (options?: ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyOptionalParams) => PagedAsyncIterableIterator<Pet>;
requestHeaderResponseHeader: (options?: ServerDrivenPaginationContinuationTokenRequestHeaderResponseHeaderOptionalParams) => PagedAsyncIterableIterator<Pet>;
requestQueryResponseHeader: (options?: ServerDrivenPaginationContinuationTokenRequestQueryResponseHeaderOptionalParams) => PagedAsyncIterableIterator<Pet>;
requestHeaderResponseBody: (options?: ServerDrivenPaginationContinuationTokenRequestHeaderResponseBodyOptionalParams) => PagedAsyncIterableIterator<Pet>;
requestQueryResponseBody: (options?: ServerDrivenPaginationContinuationTokenRequestQueryResponseBodyOptionalParams) => PagedAsyncIterableIterator<Pet>;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderNestedResponseBodyOptionalParams extends OperationOptions {
token?: string;
foo?: string;
bar?: string;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderResponseBodyOptionalParams extends OperationOptions {
token?: string;
foo?: string;
Expand All @@ -50,6 +58,12 @@ export declare interface ServerDrivenPaginationContinuationTokenRequestHeaderRes
bar?: string;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestQueryNestedResponseBodyOptionalParams extends OperationOptions {
token?: string;
foo?: string;
bar?: string;
}

export declare interface ServerDrivenPaginationContinuationTokenRequestQueryResponseBodyOptionalParams extends OperationOptions {
token?: string;
foo?: string;
Expand All @@ -65,7 +79,11 @@ export declare interface ServerDrivenPaginationContinuationTokenRequestQueryResp
export declare interface ServerDrivenPaginationLinkOptionalParams extends OperationOptions {
}

export declare interface ServerDrivenPaginationNestedLinkOptionalParams extends OperationOptions {
}

export declare interface ServerDrivenPaginationOperations {
nestedLink: (options?: ServerDrivenPaginationNestedLinkOptionalParams) => PagedAsyncIterableIterator<Pet>;
link: (options?: ServerDrivenPaginationLinkOptionalParams) => PagedAsyncIterableIterator<Pet>;
continuationToken: ServerDrivenPaginationContinuationTokenOperations;
}
Expand Down
Loading
Loading