@azure-tools/typespec-ts 0.40.0 → 0.40.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +54 -16
- package/dist/src/index.js.map +1 -1
- package/dist/src/lib.d.ts +4 -12
- package/dist/src/lib.d.ts.map +1 -1
- package/dist/src/lib.js +2 -101
- package/dist/src/lib.js.map +1 -1
- package/dist/src/modular/buildClassicalClient.d.ts +1 -1
- package/dist/src/modular/buildClassicalClient.d.ts.map +1 -1
- package/dist/src/modular/buildClassicalClient.js +75 -5
- package/dist/src/modular/buildClassicalClient.js.map +1 -1
- package/dist/src/modular/buildClassicalOperationGroups.d.ts +1 -1
- package/dist/src/modular/buildClassicalOperationGroups.d.ts.map +1 -1
- package/dist/src/modular/buildClassicalOperationGroups.js +5 -4
- package/dist/src/modular/buildClassicalOperationGroups.js.map +1 -1
- package/dist/src/modular/buildClientContext.d.ts +2 -2
- package/dist/src/modular/buildClientContext.d.ts.map +1 -1
- package/dist/src/modular/buildClientContext.js +8 -8
- package/dist/src/modular/buildClientContext.js.map +1 -1
- package/dist/src/modular/buildOperations.d.ts +1 -1
- package/dist/src/modular/buildOperations.d.ts.map +1 -1
- package/dist/src/modular/buildOperations.js +3 -2
- package/dist/src/modular/buildOperations.js.map +1 -1
- package/dist/src/modular/buildProjectFiles.d.ts.map +1 -1
- package/dist/src/modular/buildProjectFiles.js +16 -7
- package/dist/src/modular/buildProjectFiles.js.map +1 -1
- package/dist/src/modular/buildRestorePoller.d.ts +1 -1
- package/dist/src/modular/buildRestorePoller.d.ts.map +1 -1
- package/dist/src/modular/buildRestorePoller.js +3 -2
- package/dist/src/modular/buildRestorePoller.js.map +1 -1
- package/dist/src/modular/buildRootIndex.d.ts +2 -2
- package/dist/src/modular/buildRootIndex.d.ts.map +1 -1
- package/dist/src/modular/buildRootIndex.js +6 -4
- package/dist/src/modular/buildRootIndex.js.map +1 -1
- package/dist/src/modular/buildSubpathIndex.d.ts +1 -2
- package/dist/src/modular/buildSubpathIndex.d.ts.map +1 -1
- package/dist/src/modular/buildSubpathIndex.js +3 -3
- package/dist/src/modular/buildSubpathIndex.js.map +1 -1
- package/dist/src/modular/emitModelsOptions.d.ts +1 -1
- package/dist/src/modular/emitModelsOptions.d.ts.map +1 -1
- package/dist/src/modular/emitModelsOptions.js +3 -2
- package/dist/src/modular/emitModelsOptions.js.map +1 -1
- package/dist/src/modular/emitSamples.d.ts.map +1 -1
- package/dist/src/modular/emitSamples.js +3 -2
- package/dist/src/modular/emitSamples.js.map +1 -1
- package/dist/src/modular/helpers/classicalOperationHelpers.d.ts +1 -1
- package/dist/src/modular/helpers/classicalOperationHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/classicalOperationHelpers.js +2 -2
- package/dist/src/modular/helpers/classicalOperationHelpers.js.map +1 -1
- package/dist/src/modular/helpers/namingHelpers.js +4 -3
- package/dist/src/modular/helpers/namingHelpers.js.map +1 -1
- package/dist/src/transform/transfromRLCOptions.d.ts +1 -4
- package/dist/src/transform/transfromRLCOptions.d.ts.map +1 -1
- package/dist/src/transform/transfromRLCOptions.js +58 -262
- package/dist/src/transform/transfromRLCOptions.js.map +1 -1
- package/dist/src/utils/clientUtils.d.ts +2 -1
- package/dist/src/utils/clientUtils.d.ts.map +1 -1
- package/dist/src/utils/clientUtils.js +38 -5
- package/dist/src/utils/clientUtils.js.map +1 -1
- package/dist/src/utils/operationUtil.d.ts.map +1 -1
- package/dist/src/utils/operationUtil.js +21 -17
- package/dist/src/utils/operationUtil.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +20 -20
- package/src/index.ts +75 -47
- package/src/lib.ts +6 -105
- package/src/modular/buildClassicalClient.ts +98 -8
- package/src/modular/buildClassicalOperationGroups.ts +5 -4
- package/src/modular/buildClientContext.ts +8 -10
- package/src/modular/buildOperations.ts +3 -5
- package/src/modular/buildProjectFiles.ts +19 -8
- package/src/modular/buildRestorePoller.ts +3 -2
- package/src/modular/buildRootIndex.ts +6 -5
- package/src/modular/buildSubpathIndex.ts +3 -5
- package/src/modular/emitModelsOptions.ts +3 -2
- package/src/modular/emitSamples.ts +3 -2
- package/src/modular/helpers/classicalOperationHelpers.ts +2 -2
- package/src/modular/helpers/namingHelpers.ts +4 -4
- package/src/transform/transfromRLCOptions.ts +60 -305
- package/src/utils/clientUtils.ts +44 -8
- package/src/utils/operationUtil.ts +23 -9
|
@@ -7,11 +7,13 @@ import { getOperationFunction } from "./helpers/operationHelpers.js";
|
|
|
7
7
|
import { getModularClientOptions, isRLCMultiEndpoint } from "../utils/clientUtils.js";
|
|
8
8
|
import { resolveReference } from "../framework/reference.js";
|
|
9
9
|
import { useDependencies } from "../framework/hooks/useDependencies.js";
|
|
10
|
+
import { InitializedByFlags } from "@azure-tools/typespec-client-generator-core";
|
|
10
11
|
import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
|
|
11
12
|
import { useContext } from "../contextManager.js";
|
|
12
13
|
import { refkey } from "../framework/refkey.js";
|
|
13
|
-
export function buildClassicalClient(dpgContext,
|
|
14
|
+
export function buildClassicalClient(dpgContext, clientMap, emitterOptions) {
|
|
14
15
|
const project = useContext("outputProject");
|
|
16
|
+
const [_hierarchy, client] = clientMap;
|
|
15
17
|
const dependencies = useDependencies();
|
|
16
18
|
const modularClientName = getClientName(client);
|
|
17
19
|
const classicalClientName = `${getClassicalClientName(client)}`;
|
|
@@ -23,7 +25,7 @@ export function buildClassicalClient(dpgContext, client, emitterOptions) {
|
|
|
23
25
|
requiredOnly: true
|
|
24
26
|
});
|
|
25
27
|
const srcPath = emitterOptions.modularOptions.sourceRoot;
|
|
26
|
-
const { subfolder, rlcClientName } = getModularClientOptions(
|
|
28
|
+
const { subfolder, rlcClientName } = getModularClientOptions(clientMap);
|
|
27
29
|
const clientFile = project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}${normalizeName(classicalClientName, NameType.File)}.ts`);
|
|
28
30
|
clientFile.addExportDeclaration({
|
|
29
31
|
namedExports: [`${classicalClientName}OptionalParams`],
|
|
@@ -56,6 +58,21 @@ export function buildClassicalClient(dpgContext, client, emitterOptions) {
|
|
|
56
58
|
isReadonly: true,
|
|
57
59
|
docs: ["The pipeline used by this client to make requests"]
|
|
58
60
|
});
|
|
61
|
+
const hasChildClient = client.children &&
|
|
62
|
+
client.children.some((childClient) => {
|
|
63
|
+
return (childClient.clientInitialization.initializedBy &
|
|
64
|
+
InitializedByFlags.Parent);
|
|
65
|
+
});
|
|
66
|
+
if (hasChildClient) {
|
|
67
|
+
clientClass.addProperty({
|
|
68
|
+
name: "_clientParams",
|
|
69
|
+
type: `{${classicalParams.map((p) => {
|
|
70
|
+
return `${p.name}: ${p.type}`;
|
|
71
|
+
})}}`,
|
|
72
|
+
scope: Scope.Private,
|
|
73
|
+
docs: ["The parent client parameters that are used in the constructors."]
|
|
74
|
+
});
|
|
75
|
+
}
|
|
59
76
|
// TODO: We may need to generate constructor overloads at some point. Here we'd do that.
|
|
60
77
|
const constructor = clientClass.addConstructor({
|
|
61
78
|
docs: getDocsFromDescription(client.doc),
|
|
@@ -75,7 +92,30 @@ export function buildClassicalClient(dpgContext, client, emitterOptions) {
|
|
|
75
92
|
`this._client = create${modularClientName}(${paramNames.join(",")});`
|
|
76
93
|
]);
|
|
77
94
|
constructor.addStatements(`this.pipeline = this._client.pipeline;`);
|
|
78
|
-
|
|
95
|
+
if (hasChildClient && client.children) {
|
|
96
|
+
constructor.addStatements(`this._clientParams = {${classicalParams.map((p) => p.name).join(",")}};`);
|
|
97
|
+
for (const childClient of client.children) {
|
|
98
|
+
const subfolder = normalizeName(childClient.name.replace("Client", ""), NameType.File);
|
|
99
|
+
clientFile.addImportDeclaration({
|
|
100
|
+
moduleSpecifier: `./${subfolder}/${normalizeName(childClient.name, NameType.File)}.js`,
|
|
101
|
+
namedImports: [
|
|
102
|
+
`${getClassicalClientName(childClient)}`,
|
|
103
|
+
`${getClassicalClientName(childClient)}OptionalParams`
|
|
104
|
+
]
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
buildClientOperationGroups(clientMap, dpgContext, clientClass);
|
|
109
|
+
if (client.children) {
|
|
110
|
+
client.children
|
|
111
|
+
.filter((childClient) => {
|
|
112
|
+
return (childClient.clientInitialization.initializedBy &
|
|
113
|
+
InitializedByFlags.Parent);
|
|
114
|
+
})
|
|
115
|
+
.forEach((childClient) => {
|
|
116
|
+
addChildClient(dpgContext, clientClass, client, childClient);
|
|
117
|
+
});
|
|
118
|
+
}
|
|
79
119
|
importAllApis(clientFile, srcPath, subfolder !== null && subfolder !== void 0 ? subfolder : "");
|
|
80
120
|
clientFile.fixUnusedIdentifiers();
|
|
81
121
|
return clientFile;
|
|
@@ -110,10 +150,11 @@ function generateMethod(context, clientType, method) {
|
|
|
110
150
|
};
|
|
111
151
|
return result;
|
|
112
152
|
}
|
|
113
|
-
function buildClientOperationGroups(
|
|
153
|
+
function buildClientOperationGroups(clientMap, dpgContext, clientClass) {
|
|
114
154
|
var _a, _b;
|
|
115
155
|
let clientType = "Client";
|
|
116
|
-
const
|
|
156
|
+
const [_hierarchy, client] = clientMap;
|
|
157
|
+
const { subfolder } = getModularClientOptions(clientMap);
|
|
117
158
|
if (subfolder && subfolder !== "") {
|
|
118
159
|
clientType = `Client.${clientClass.getName()}`;
|
|
119
160
|
}
|
|
@@ -151,4 +192,33 @@ function buildClientOperationGroups(client, dpgContext, clientClass) {
|
|
|
151
192
|
}
|
|
152
193
|
}
|
|
153
194
|
}
|
|
195
|
+
function addChildClient(context, clientClass, parentClient, client) {
|
|
196
|
+
const parentParams = getClientParametersDeclaration(parentClient, context, {
|
|
197
|
+
requiredOnly: true
|
|
198
|
+
});
|
|
199
|
+
const clientParams = getClientParametersDeclaration(client, context, {
|
|
200
|
+
requiredOnly: true
|
|
201
|
+
});
|
|
202
|
+
const diffParams = clientParams.filter((p) => {
|
|
203
|
+
return !parentParams.some((pp) => pp.name === p.name && pp.name !== "options");
|
|
204
|
+
});
|
|
205
|
+
const name = getClassicalClientName(client);
|
|
206
|
+
const getChildClientFunction = clientClass.addMethod({
|
|
207
|
+
docs: getDocsFromDescription(client.doc),
|
|
208
|
+
name: `get${name}`,
|
|
209
|
+
returnType: `${getClassicalClientName(client)}`,
|
|
210
|
+
parameters: diffParams
|
|
211
|
+
});
|
|
212
|
+
getChildClientFunction.addStatements(`return new ${getClassicalClientName(client)}(
|
|
213
|
+
${parentParams
|
|
214
|
+
.filter((p) => !p.name.includes("options"))
|
|
215
|
+
.map((p) => `this._clientParams.${p.name}`)
|
|
216
|
+
.join(",")},
|
|
217
|
+
${diffParams
|
|
218
|
+
.filter((p) => p.name !== "options")
|
|
219
|
+
.map((p) => `${p.name}`)
|
|
220
|
+
.join(",")}${diffParams.filter((p) => p.name !== "options").length > 0 ? "," : ""}
|
|
221
|
+
{ ...this._clientParams.options, ...options }
|
|
222
|
+
)`);
|
|
223
|
+
}
|
|
154
224
|
//# sourceMappingURL=buildClassicalClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClassicalClient.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,EAEL,aAAa,EACd,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAC/B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,sBAAsB,EACtB,aAAa,EACd,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"buildClassicalClient.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,5 @@ import { SourceFile } from "ts-morph";
|
|
|
2
2
|
import { ModularEmitterOptions } from "./interfaces.js";
|
|
3
3
|
import { SdkContext } from "../utils/interfaces.js";
|
|
4
4
|
import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
|
|
5
|
-
export declare function buildClassicOperationFiles(dpgContext: SdkContext,
|
|
5
|
+
export declare function buildClassicOperationFiles(dpgContext: SdkContext, clientMap: [string[], SdkClientType<SdkServiceOperation>], emitterOptions: ModularEmitterOptions): Map<string, SourceFile>;
|
|
6
6
|
//# sourceMappingURL=buildClassicalOperationGroups.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClassicalOperationGroups.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EACL,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAIrD,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"buildClassicalOperationGroups.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EACL,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAIrD,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,EACzD,cAAc,EAAE,qBAAqB,2BA4EtC"}
|
|
@@ -4,11 +4,12 @@ import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";
|
|
|
4
4
|
import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
|
|
5
5
|
import { getModularClientOptions } from "../utils/clientUtils.js";
|
|
6
6
|
import { useContext } from "../contextManager.js";
|
|
7
|
-
export function buildClassicOperationFiles(dpgContext,
|
|
7
|
+
export function buildClassicOperationFiles(dpgContext, clientMap, emitterOptions) {
|
|
8
8
|
var _a, _b;
|
|
9
9
|
// const sdkPackage = dpgContext.sdkPackage;
|
|
10
10
|
const project = useContext("outputProject");
|
|
11
|
-
const
|
|
11
|
+
const [_hierarchy, client] = clientMap;
|
|
12
|
+
const { subfolder } = getModularClientOptions(clientMap);
|
|
12
13
|
const classicOperationFiles = new Map();
|
|
13
14
|
const methodMap = getMethodHierarchiesMap(dpgContext, client);
|
|
14
15
|
for (const [prefixKey, operations] of methodMap) {
|
|
@@ -21,7 +22,7 @@ export function buildClassicOperationFiles(dpgContext, client, emitterOptions) {
|
|
|
21
22
|
"index";
|
|
22
23
|
const srcPath = emitterOptions.modularOptions.sourceRoot;
|
|
23
24
|
const classicFile = (_a = classicOperationFiles.get(classicOperationFileName)) !== null && _a !== void 0 ? _a : project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}classic/${classicOperationFileName}.ts`);
|
|
24
|
-
getClassicalOperation(dpgContext,
|
|
25
|
+
getClassicalOperation(dpgContext, clientMap, classicFile, [
|
|
25
26
|
prefixes,
|
|
26
27
|
operations
|
|
27
28
|
]);
|
|
@@ -39,7 +40,7 @@ export function buildClassicOperationFiles(dpgContext, client, emitterOptions) {
|
|
|
39
40
|
"index";
|
|
40
41
|
const srcPath = emitterOptions.modularOptions.sourceRoot;
|
|
41
42
|
const classicFile = (_b = classicOperationFiles.get(classicOperationFileName)) !== null && _b !== void 0 ? _b : project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}classic/${classicOperationFileName}.ts`);
|
|
42
|
-
getClassicalOperation(dpgContext,
|
|
43
|
+
getClassicalOperation(dpgContext, clientMap, classicFile, [prefixes, operations], layer);
|
|
43
44
|
classicOperationFiles.set(classicOperationFileName, classicFile);
|
|
44
45
|
}
|
|
45
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClassicalOperationGroups.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAGrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAKpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,UAAU,0BAA0B,CACxC,UAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"buildClassicalOperationGroups.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@ import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client
|
|
|
5
5
|
/**
|
|
6
6
|
* This function gets the path of the file containing the modular client context
|
|
7
7
|
*/
|
|
8
|
-
export declare function getClientContextPath(
|
|
8
|
+
export declare function getClientContextPath(clientMap: [string[], SdkClientType<SdkServiceOperation>], emitterOptions: ModularEmitterOptions): string;
|
|
9
9
|
/**
|
|
10
10
|
* This function creates the file containing the modular client context
|
|
11
11
|
*/
|
|
12
|
-
export declare function buildClientContext(dpgContext: SdkContext,
|
|
12
|
+
export declare function buildClientContext(dpgContext: SdkContext, clientMap: [string[], SdkClientType<SdkServiceOperation>], emitterOptions: ModularEmitterOptions): SourceFile;
|
|
13
13
|
//# sourceMappingURL=buildClientContext.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClientContext.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAexD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAUtC,OAAO,EACL,aAAa,EAGb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAKrD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,
|
|
1
|
+
{"version":3,"file":"buildClientContext.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAexD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAUtC,OAAO,EACL,aAAa,EAGb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAKrD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,EACzD,cAAc,EAAE,qBAAqB,GACpC,MAAM,CASR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,EACzD,cAAc,EAAE,qBAAqB,GACpC,UAAU,CAqMZ"}
|
|
@@ -12,8 +12,9 @@ import { refkey } from "../framework/refkey.js";
|
|
|
12
12
|
/**
|
|
13
13
|
* This function gets the path of the file containing the modular client context
|
|
14
14
|
*/
|
|
15
|
-
export function getClientContextPath(
|
|
16
|
-
const
|
|
15
|
+
export function getClientContextPath(clientMap, emitterOptions) {
|
|
16
|
+
const [_, client] = clientMap;
|
|
17
|
+
const { subfolder } = getModularClientOptions(clientMap);
|
|
17
18
|
const name = getClientName(client);
|
|
18
19
|
const srcPath = emitterOptions.modularOptions.sourceRoot;
|
|
19
20
|
const contentPath = `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/${normalizeName(name, NameType.File)}Context.ts`;
|
|
@@ -22,18 +23,19 @@ export function getClientContextPath(context, client, emitterOptions) {
|
|
|
22
23
|
/**
|
|
23
24
|
* This function creates the file containing the modular client context
|
|
24
25
|
*/
|
|
25
|
-
export function buildClientContext(dpgContext,
|
|
26
|
+
export function buildClientContext(dpgContext, clientMap, emitterOptions) {
|
|
26
27
|
var _a;
|
|
27
28
|
const project = useContext("outputProject");
|
|
28
29
|
const dependencies = useDependencies();
|
|
30
|
+
const [hierarchy, client] = clientMap;
|
|
29
31
|
const name = getClientName(client);
|
|
30
|
-
const { rlcClientName } = getModularClientOptions(
|
|
32
|
+
const { rlcClientName } = getModularClientOptions(clientMap);
|
|
31
33
|
const requiredParams = getClientParametersDeclaration(client, dpgContext, {
|
|
32
34
|
onClientOnly: false,
|
|
33
35
|
requiredOnly: true,
|
|
34
36
|
apiVersionAsRequired: true
|
|
35
37
|
});
|
|
36
|
-
const clientContextFile = project.createSourceFile(getClientContextPath(
|
|
38
|
+
const clientContextFile = project.createSourceFile(getClientContextPath(clientMap, emitterOptions));
|
|
37
39
|
clientContextFile.addInterface({
|
|
38
40
|
isExported: true,
|
|
39
41
|
name: `${rlcClientName}`,
|
|
@@ -82,9 +84,7 @@ export function buildClientContext(dpgContext, client, emitterOptions) {
|
|
|
82
84
|
// (for now) now logger for unbranded pkgs
|
|
83
85
|
if (isAzurePackage(emitterOptions)) {
|
|
84
86
|
clientContextFile.addImportDeclaration({
|
|
85
|
-
moduleSpecifier:
|
|
86
|
-
? "../../logger.js"
|
|
87
|
-
: "../logger.js",
|
|
87
|
+
moduleSpecifier: "../".repeat(hierarchy.length + 1) + "logger.js",
|
|
88
88
|
namedImports: ["logger"]
|
|
89
89
|
});
|
|
90
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClientContext.js","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,6BAA6B,EAC7B,2BAA2B,EAC3B,0BAA0B,EAC1B,sBAAsB,EACtB,mBAAmB,EACnB,8BAA8B,EAC/B,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EACL,sBAAsB,EACtB,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAOpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,
|
|
1
|
+
{"version":3,"file":"buildClientContext.js","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ import { ServiceOperation } from "../utils/operationUtil.js";
|
|
|
9
9
|
* If there is no operation group in the TypeSpec program, we create a single
|
|
10
10
|
* file called operations.ts where all operations are generated.
|
|
11
11
|
*/
|
|
12
|
-
export declare function buildOperationFiles(dpgContext: SdkContext,
|
|
12
|
+
export declare function buildOperationFiles(dpgContext: SdkContext, clientMap: [string[], SdkClientType<SdkServiceOperation>], emitterOptions: ModularEmitterOptions): SourceFile[];
|
|
13
13
|
/**
|
|
14
14
|
* This function generates the interfaces for each operation options
|
|
15
15
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildOperations.d.ts","sourceRoot":"","sources":["../../../src/modular/buildOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EACL,UAAU,EAGX,MAAM,UAAU,CAAC;AAUlB,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAQpD,OAAO,EACL,aAAa,EAEb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAEL,gBAAgB,EACjB,MAAM,2BAA2B,CAAC;AAOnC;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"buildOperations.d.ts","sourceRoot":"","sources":["../../../src/modular/buildOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EACL,UAAU,EAGX,MAAM,UAAU,CAAC;AAUlB,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAQpD,OAAO,EACL,aAAa,EAEb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAEL,gBAAgB,EACjB,MAAM,2BAA2B,CAAC;AAOnC;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,EACzD,cAAc,EAAE,qBAAqB,gBAkEtC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,EACpC,UAAU,EAAE,UAAU,QAsDvB;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,+CA+C3C"}
|
|
@@ -16,10 +16,11 @@ import { useContext } from "../contextManager.js";
|
|
|
16
16
|
* If there is no operation group in the TypeSpec program, we create a single
|
|
17
17
|
* file called operations.ts where all operations are generated.
|
|
18
18
|
*/
|
|
19
|
-
export function buildOperationFiles(dpgContext,
|
|
19
|
+
export function buildOperationFiles(dpgContext, clientMap, emitterOptions) {
|
|
20
20
|
const project = useContext("outputProject");
|
|
21
|
+
const [_, client] = clientMap;
|
|
21
22
|
const operationFiles = new Set();
|
|
22
|
-
const { subfolder, rlcClientName } = getModularClientOptions(
|
|
23
|
+
const { subfolder, rlcClientName } = getModularClientOptions(clientMap);
|
|
23
24
|
const isMultiEndpoint = isRLCMultiEndpoint(dpgContext);
|
|
24
25
|
const clientType = isMultiEndpoint ? `Client.${rlcClientName}` : "Client";
|
|
25
26
|
const methodMap = getMethodHierarchiesMap(dpgContext, client);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildOperations.js","sourceRoot":"","sources":["../../../src/modular/buildOperations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAGL,aAAa,EACd,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,6BAA6B,EAC7B,mBAAmB,EACnB,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAIvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAM9E,OAAO,EACL,uBAAuB,EAExB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,UAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"buildOperations.js","sourceRoot":"","sources":["../../../src/modular/buildOperations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildProjectFiles.d.ts","sourceRoot":"","sources":["../../../src/modular/buildProjectFiles.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"buildProjectFiles.d.ts","sourceRoot":"","sources":["../../../src/modular/buildProjectFiles.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AA+DzE,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,UAAU,EACnB,cAAc,EAAE,qBAAqB,OAWtC"}
|
|
@@ -1,22 +1,31 @@
|
|
|
1
1
|
import { NameType } from "@azure-tools/rlc-common";
|
|
2
2
|
import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";
|
|
3
|
-
import { getModularClientOptions } from "../utils/clientUtils.js";
|
|
3
|
+
import { getClientHierarchyMap, getModularClientOptions } from "../utils/clientUtils.js";
|
|
4
4
|
import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
|
|
5
5
|
import { useContext } from "../contextManager.js";
|
|
6
6
|
import path from "path/posix";
|
|
7
7
|
function buildExportsForMultiClient(context, emitterOptions, packageInfo) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
const clientMap = getClientHierarchyMap(context);
|
|
9
|
+
let hasTopLevelClient = false;
|
|
10
|
+
for (const [hierarchy, client] of clientMap) {
|
|
11
|
+
const methodMap = getMethodHierarchiesMap(context, client);
|
|
12
|
+
if (hierarchy.length === 0) {
|
|
13
|
+
hasTopLevelClient = true;
|
|
14
|
+
}
|
|
15
|
+
const { subfolder } = getModularClientOptions([hierarchy, client]);
|
|
16
|
+
if (subfolder !== "" && methodMap.size > 0) {
|
|
12
17
|
packageInfo.exports[`./${subfolder}`] = `./src/${subfolder}/index.ts`;
|
|
13
18
|
packageInfo.exports[`./${subfolder}/api`] =
|
|
14
19
|
`./src/${subfolder}/api/index.ts`;
|
|
15
20
|
}
|
|
16
21
|
}
|
|
22
|
+
if (!hasTopLevelClient) {
|
|
23
|
+
delete packageInfo.exports["./api"];
|
|
24
|
+
}
|
|
17
25
|
if (emitterOptions.options.hierarchyClient) {
|
|
18
|
-
for (const
|
|
19
|
-
const { subfolder } = getModularClientOptions(
|
|
26
|
+
for (const flattenedClient of clientMap) {
|
|
27
|
+
const { subfolder } = getModularClientOptions(flattenedClient);
|
|
28
|
+
const client = flattenedClient[1];
|
|
20
29
|
const methodMap = getMethodHierarchiesMap(context, client);
|
|
21
30
|
for (const [prefixKey, _] of methodMap) {
|
|
22
31
|
const prefixes = prefixKey.split("/");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildProjectFiles.js","sourceRoot":"","sources":["../../../src/modular/buildProjectFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,
|
|
1
|
+
{"version":3,"file":"buildProjectFiles.js","sourceRoot":"","sources":["../../../src/modular/buildProjectFiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ModularEmitterOptions } from "./interfaces.js";
|
|
2
2
|
import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
|
|
3
3
|
import { SdkContext } from "../utils/interfaces.js";
|
|
4
|
-
export declare function buildRestorePoller(context: SdkContext,
|
|
4
|
+
export declare function buildRestorePoller(context: SdkContext, clientMap: [string[], SdkClientType<SdkServiceOperation>], emitterOptions: ModularEmitterOptions): void;
|
|
5
5
|
//# sourceMappingURL=buildRestorePoller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildRestorePoller.d.ts","sourceRoot":"","sources":["../../../src/modular/buildRestorePoller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAQxD,OAAO,EACL,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"buildRestorePoller.d.ts","sourceRoot":"","sources":["../../../src/modular/buildRestorePoller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAQxD,OAAO,EACL,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,EACzD,cAAc,EAAE,qBAAqB,QA+LtC"}
|
|
@@ -10,10 +10,11 @@ import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
|
|
|
10
10
|
import { getModularClientOptions } from "../utils/clientUtils.js";
|
|
11
11
|
import { useDependencies } from "../framework/hooks/useDependencies.js";
|
|
12
12
|
import { useContext } from "../contextManager.js";
|
|
13
|
-
export function buildRestorePoller(context,
|
|
13
|
+
export function buildRestorePoller(context, clientMap, emitterOptions) {
|
|
14
14
|
const project = useContext("outputProject");
|
|
15
|
+
const [_, client] = clientMap;
|
|
15
16
|
const dependencies = useDependencies();
|
|
16
|
-
const { subfolder } = getModularClientOptions(
|
|
17
|
+
const { subfolder } = getModularClientOptions(clientMap);
|
|
17
18
|
const methodMap = getMethodHierarchiesMap(context, client);
|
|
18
19
|
const hasLro = Array.from(methodMap.values()).some((operations) => {
|
|
19
20
|
return operations.some(isLroOnlyOperation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildRestorePoller.js","sourceRoot":"","sources":["../../../src/modular/buildRestorePoller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAK9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,UAAU,kBAAkB,CAChC,OAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"buildRestorePoller.js","sourceRoot":"","sources":["../../../src/modular/buildRestorePoller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { SourceFile } from "ts-morph";
|
|
2
2
|
import { ModularEmitterOptions } from "./interfaces.js";
|
|
3
3
|
import { SdkClientType, SdkContext, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
|
|
4
|
-
export declare function buildRootIndex(context: SdkContext,
|
|
4
|
+
export declare function buildRootIndex(context: SdkContext, clientMap: [string[], SdkClientType<SdkServiceOperation>], emitterOptions: ModularEmitterOptions, rootIndexFile: SourceFile): void;
|
|
5
5
|
export interface ExportModulesOptions {
|
|
6
6
|
interfaceOnly?: boolean;
|
|
7
7
|
isTopLevel?: boolean;
|
|
8
8
|
subfolder?: string;
|
|
9
9
|
recursive?: boolean;
|
|
10
10
|
}
|
|
11
|
-
export declare function buildSubClientIndexFile(
|
|
11
|
+
export declare function buildSubClientIndexFile(clientMap: [string[], SdkClientType<SdkServiceOperation>], emitterOptions: ModularEmitterOptions): void;
|
|
12
12
|
//# sourceMappingURL=buildRootIndex.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildRootIndex.d.ts","sourceRoot":"","sources":["../../../src/modular/buildRootIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,UAAU,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,OAAO,EACL,aAAa,EACb,UAAU,EACV,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAMrD,wBAAgB,cAAc,CAC5B,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"buildRootIndex.d.ts","sourceRoot":"","sources":["../../../src/modular/buildRootIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,UAAU,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,OAAO,EACL,aAAa,EACb,UAAU,EACV,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAMrD,wBAAgB,cAAc,CAC5B,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,EACzD,cAAc,EAAE,qBAAqB,EACrC,aAAa,EAAE,UAAU,QAuD1B;AA0ID,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AA4GD,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,EACzD,cAAc,EAAE,qBAAqB,QAqCtC"}
|
|
@@ -6,11 +6,12 @@ import { getModularClientOptions } from "../utils/clientUtils.js";
|
|
|
6
6
|
import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
|
|
7
7
|
import { join } from "path/posix";
|
|
8
8
|
import { useContext } from "../contextManager.js";
|
|
9
|
-
export function buildRootIndex(context,
|
|
9
|
+
export function buildRootIndex(context, clientMap, emitterOptions, rootIndexFile) {
|
|
10
10
|
var _a;
|
|
11
11
|
const project = useContext("outputProject");
|
|
12
|
+
const [_, client] = clientMap;
|
|
12
13
|
const srcPath = emitterOptions.modularOptions.sourceRoot;
|
|
13
|
-
const { subfolder } = getModularClientOptions(
|
|
14
|
+
const { subfolder } = getModularClientOptions(clientMap);
|
|
14
15
|
const clientName = `${getClassicalClientName(client)}`;
|
|
15
16
|
const clientFile = project.getSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}${normalizeName(clientName, NameType.File)}.ts`);
|
|
16
17
|
if (!clientFile) {
|
|
@@ -206,9 +207,10 @@ function exportModules(indexFile, project, srcPath, clientName, moduleName, opti
|
|
|
206
207
|
}
|
|
207
208
|
}
|
|
208
209
|
}
|
|
209
|
-
export function buildSubClientIndexFile(
|
|
210
|
+
export function buildSubClientIndexFile(clientMap, emitterOptions) {
|
|
210
211
|
const project = useContext("outputProject");
|
|
211
|
-
const
|
|
212
|
+
const [_, client] = clientMap;
|
|
213
|
+
const { subfolder } = getModularClientOptions(clientMap);
|
|
212
214
|
const srcPath = emitterOptions.modularOptions.sourceRoot;
|
|
213
215
|
const subClientIndexFile = project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}index.ts`, undefined, { overwrite: true });
|
|
214
216
|
const clientName = `${getClassicalClientName(client)}`;
|