Skip to content

Commit 773418d

Browse files
MaryGaov-jiaodi
MaryGao
and
v-jiaodi
authored
Remove client Context in restorePoller (#2614)
* Remove the dep for client Context * fix ci * Fix the restorePoller issue * fix ci --------- Co-authored-by: Jiao Di (MSFT) <80496810+v-jiaodi@users.noreply.github.com>
1 parent fb91d96 commit 773418d

9 files changed

Lines changed: 17 additions & 54 deletions

File tree

‎packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/review/arm-networkanalytics.api.md‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,12 @@
55
```ts
66

77
import { AbortSignalLike } from '@azure/abort-controller';
8-
import { Client } from '@azure-rest/core-client';
98
import { ClientOptions } from '@azure-rest/core-client';
10-
import { HttpResponse } from '@azure-rest/core-client';
119
import { OperationOptions } from '@azure-rest/core-client';
1210
import { OperationState } from '@azure/core-lro';
13-
import { Paged } from '@azure/core-paging';
1411
import { PathUncheckedResponse } from '@azure-rest/core-client';
1512
import { Pipeline } from '@azure/core-rest-pipeline';
1613
import { PollerLike } from '@azure/core-lro';
17-
import { RawHttpHeaders } from '@azure/core-rest-pipeline';
18-
import { RequestParameters } from '@azure-rest/core-client';
19-
import { StreamableMethod } from '@azure-rest/core-client';
2014
import { TokenCredential } from '@azure/core-auth';
2115

2216
// @public
@@ -605,10 +599,8 @@ export interface Resource {
605599
// @public
606600
export type ResourceProvisioningState = string;
607601

608-
// Warning: (ae-forgotten-export) The symbol "NetworkAnalyticsContext" needs to be exported by the entry point index.d.ts
609-
//
610602
// @public
611-
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(client: NetworkAnalyticsContext | NetworkAnalyticsClient, serializedState: string, sourceOperation: (...args: any[]) => PollerLike<OperationState<TResult>, TResult>, options?: RestorePollerOptions<TResult>): PollerLike<OperationState<TResult>, TResult>;
603+
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(client: NetworkAnalyticsClient, serializedState: string, sourceOperation: (...args: any[]) => PollerLike<OperationState<TResult>, TResult>, options?: RestorePollerOptions<TResult>): PollerLike<OperationState<TResult>, TResult>;
612604

613605
// @public (undocumented)
614606
export interface RestorePollerOptions<TResult, TResponse extends PathUncheckedResponse = PathUncheckedResponse> extends OperationOptions {

‎packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/src/restorePollerHelpers.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
deserializeState,
88
ResourceLocationConfig,
99
} from "@azure/core-lro";
10-
import { NetworkAnalyticsContext } from "./api/networkAnalyticsContext.js";
1110
import { NetworkAnalyticsClient } from "./networkAnalyticsClient.js";
1211
import { getLongRunningPoller } from "./api/pollingHelpers.js";
1312
import {
@@ -47,7 +46,7 @@ export interface RestorePollerOptions<
4746
* needs to be constructed after the original one is not in scope.
4847
*/
4948
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(
50-
client: NetworkAnalyticsContext | NetworkAnalyticsClient,
49+
client: NetworkAnalyticsClient,
5150
serializedState: string,
5251
sourceOperation: (
5352
...args: any[]

‎packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/review/load-testing.api.md‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,13 @@
44
55
```ts
66

7-
/// <reference types="node" />
8-
97
import { AbortSignalLike } from '@azure/abort-controller';
10-
import { Client } from '@azure-rest/core-client';
118
import { ClientOptions } from '@azure-rest/core-client';
12-
import { ErrorResponse } from '@azure-rest/core-client';
13-
import { HttpResponse } from '@azure-rest/core-client';
149
import { OperationOptions } from '@azure-rest/core-client';
1510
import { OperationState } from '@azure/core-lro';
16-
import { Paged } from '@azure/core-paging';
1711
import { PathUncheckedResponse } from '@azure-rest/core-client';
1812
import { Pipeline } from '@azure/core-rest-pipeline';
1913
import { PollerLike } from '@azure/core-lro';
20-
import { RawHttpHeaders } from '@azure/core-rest-pipeline';
21-
import { RequestParameters } from '@azure-rest/core-client';
22-
import { StreamableMethod } from '@azure-rest/core-client';
2314
import { TokenCredential } from '@azure/core-auth';
2415

2516
// @public (undocumented)
@@ -377,10 +368,8 @@ export interface ResourceMetric {
377368
unit?: string;
378369
}
379370

380-
// Warning: (ae-forgotten-export) The symbol "AzureLoadTestingContext" needs to be exported by the entry point index.d.ts
381-
//
382371
// @public
383-
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(client: AzureLoadTestingContext | TestRunOperationsClient, serializedState: string, sourceOperation: (...args: any[]) => PollerLike<OperationState<TResult>, TResult>, options?: RestorePollerOptions<TResult>): PollerLike<OperationState<TResult>, TResult>;
372+
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(client: TestRunOperationsClient, serializedState: string, sourceOperation: (...args: any[]) => PollerLike<OperationState<TResult>, TResult>, options?: RestorePollerOptions<TResult>): PollerLike<OperationState<TResult>, TResult>;
384373

385374
// @public (undocumented)
386375
export interface RestorePollerOptions<TResult, TResponse extends PathUncheckedResponse = PathUncheckedResponse> extends OperationOptions {

‎packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/testRunOperations/restorePollerHelpers.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
deserializeState,
88
ResourceLocationConfig,
99
} from "@azure/core-lro";
10-
import { AzureLoadTestingContext } from "./api/testRunOperationsContext.js";
1110
import { TestRunOperationsClient } from "./testRunOperationsClient.js";
1211
import { getLongRunningPoller } from "./api/pollingHelpers.js";
1312
import { _testRunDeserialize } from "./api/operations.js";
@@ -37,7 +36,7 @@ export interface RestorePollerOptions<
3736
* needs to be constructed after the original one is not in scope.
3837
*/
3938
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(
40-
client: AzureLoadTestingContext | TestRunOperationsClient,
39+
client: TestRunOperationsClient,
4140
serializedState: string,
4241
sourceOperation: (
4342
...args: any[]

‎packages/typespec-test/test/widget_dpg/generated/typespec-ts/review/widget_dpg.api.md‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,12 @@
55
```ts
66

77
import { AbortSignalLike } from '@azure/abort-controller';
8-
import { Client } from '@azure-rest/core-client';
98
import { ClientOptions } from '@azure-rest/core-client';
10-
import { ErrorResponse } from '@azure-rest/core-client';
11-
import { HttpResponse } from '@azure-rest/core-client';
129
import { OperationOptions } from '@azure-rest/core-client';
1310
import { OperationState } from '@azure/core-lro';
1411
import { PathUncheckedResponse } from '@azure-rest/core-client';
1512
import { Pipeline } from '@azure/core-rest-pipeline';
1613
import { PollerLike } from '@azure/core-lro';
17-
import { RawHttpHeaders } from '@azure/core-rest-pipeline';
18-
import { RawHttpHeadersInput } from '@azure/core-rest-pipeline';
19-
import { RequestParameters } from '@azure-rest/core-client';
20-
import { StreamableMethod } from '@azure-rest/core-client';
2114

2215
// @public (undocumented)
2316
export interface AnalyzeResult {
@@ -81,10 +74,8 @@ export interface PageSettings {
8174
continuationToken?: string;
8275
}
8376

84-
// Warning: (ae-forgotten-export) The symbol "WidgetServiceContext" needs to be exported by the entry point index.d.ts
85-
//
8677
// @public
87-
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(client: WidgetServiceContext | WidgetServiceClient, serializedState: string, sourceOperation: (...args: any[]) => PollerLike<OperationState<TResult>, TResult>, options?: RestorePollerOptions<TResult>): PollerLike<OperationState<TResult>, TResult>;
78+
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(client: WidgetServiceClient, serializedState: string, sourceOperation: (...args: any[]) => PollerLike<OperationState<TResult>, TResult>, options?: RestorePollerOptions<TResult>): PollerLike<OperationState<TResult>, TResult>;
8879

8980
// @public (undocumented)
9081
export interface RestorePollerOptions<TResult, TResponse extends PathUncheckedResponse = PathUncheckedResponse> extends OperationOptions {

‎packages/typespec-test/test/widget_dpg/generated/typespec-ts/src/restorePollerHelpers.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
deserializeState,
88
ResourceLocationConfig,
99
} from "@azure/core-lro";
10-
import { WidgetServiceContext } from "./api/widgetServiceContext.js";
1110
import { WidgetServiceClient } from "./widgetServiceClient.js";
1211
import { getLongRunningPoller } from "./api/pollingHelpers.js";
1312
import { _createOrReplaceDeserialize } from "./api/widgets/index.js";
@@ -41,7 +40,7 @@ export interface RestorePollerOptions<
4140
* needs to be constructed after the original one is not in scope.
4241
*/
4342
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(
44-
client: WidgetServiceContext | WidgetServiceClient,
43+
client: WidgetServiceClient,
4544
serializedState: string,
4645
sourceOperation: (
4746
...args: any[]

‎packages/typespec-ts/src/modular/buildLroFiles.ts‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export function buildRestorePollerHelper(
5757
);
5858

5959
importLroCoreDependencies(restorePollerFile);
60-
const clientNames = importClientContext(client, restorePollerFile);
60+
const clientNames = importClassicalClient(client, restorePollerFile);
6161
importGetPollerHelper(restorePollerFile);
6262
const deserializeMap = importDeserializeHelpers(client, restorePollerFile);
6363
const restorePollerHelperContent = `import {
@@ -210,20 +210,16 @@ export function buildRestorePollerHelper(
210210
restorePollerFile.fixUnusedIdentifiers();
211211
}
212212

213-
function importClientContext(client: Client, sourceFile: SourceFile): string[] {
214-
const name = getClientName(client);
215-
const classicalClientname = `${getClientName(client)}Client`;
216-
const clientContextName = client.rlcClientName;
217-
sourceFile.addImportDeclaration({
218-
namedImports: [`${clientContextName}`],
219-
moduleSpecifier: `./api/${normalizeName(name, NameType.File)}Context.js`
220-
});
221-
213+
function importClassicalClient(
214+
client: Client,
215+
sourceFile: SourceFile
216+
): string[] {
217+
const classicalClientName = `${getClientName(client)}Client`;
222218
sourceFile.addImportDeclaration({
223-
namedImports: [`${classicalClientname}`],
224-
moduleSpecifier: `./${normalizeName(classicalClientname, NameType.File)}.js`
219+
namedImports: [`${classicalClientName}`],
220+
moduleSpecifier: `./${normalizeName(classicalClientName, NameType.File)}.js`
225221
});
226-
return [clientContextName, classicalClientname];
222+
return [classicalClientName];
227223
}
228224

229225
function importGetPollerHelper(sourceFile: SourceFile) {

‎packages/typespec-ts/test/modularIntegration/generated/azure/core/lro/rpc/generated/src/restorePollerHelpers.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
deserializeState,
88
ResourceLocationConfig,
99
} from "@azure/core-lro";
10-
import { RpcContext } from "./api/rpcContext.js";
1110
import { RpcClient } from "./rpcClient.js";
1211
import { getLongRunningPoller } from "./api/pollingHelpers.js";
1312
import { _longRunningRpcDeserialize } from "./api/operations.js";
@@ -37,7 +36,7 @@ export interface RestorePollerOptions<
3736
* needs to be constructed after the original one is not in scope.
3837
*/
3938
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(
40-
client: RpcContext | RpcClient,
39+
client: RpcClient,
4140
serializedState: string,
4241
sourceOperation: (
4342
...args: any[]

‎packages/typespec-ts/test/modularIntegration/generated/azure/core/lro/standard/generated/src/restorePollerHelpers.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
deserializeState,
88
ResourceLocationConfig,
99
} from "@azure/core-lro";
10-
import { StandardContext } from "./api/standardContext.js";
1110
import { StandardClient } from "./standardClient.js";
1211
import { getLongRunningPoller } from "./api/pollingHelpers.js";
1312
import {
@@ -41,7 +40,7 @@ export interface RestorePollerOptions<
4140
* needs to be constructed after the original one is not in scope.
4241
*/
4342
export function restorePoller<TResponse extends PathUncheckedResponse, TResult>(
44-
client: StandardContext | StandardClient,
43+
client: StandardClient,
4544
serializedState: string,
4645
sourceOperation: (
4746
...args: any[]

0 commit comments

Comments
 (0)
⚡