@azure-tools/typespec-ts 0.36.0 → 0.37.0

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.
Files changed (143) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/src/contextManager.d.ts +1 -2
  3. package/dist/src/contextManager.d.ts.map +1 -1
  4. package/dist/src/contextManager.js.map +1 -1
  5. package/dist/src/framework/load-static-helpers.d.ts +2 -1
  6. package/dist/src/framework/load-static-helpers.d.ts.map +1 -1
  7. package/dist/src/framework/load-static-helpers.js +17 -0
  8. package/dist/src/framework/load-static-helpers.js.map +1 -1
  9. package/dist/src/index.d.ts.map +1 -1
  10. package/dist/src/index.js +31 -29
  11. package/dist/src/index.js.map +1 -1
  12. package/dist/src/metaTree.d.ts +0 -5
  13. package/dist/src/metaTree.d.ts.map +1 -1
  14. package/dist/src/modular/buildClassicalClient.d.ts +3 -2
  15. package/dist/src/modular/buildClassicalClient.d.ts.map +1 -1
  16. package/dist/src/modular/buildClassicalClient.js +64 -62
  17. package/dist/src/modular/buildClassicalClient.js.map +1 -1
  18. package/dist/src/modular/buildClassicalOperationGroups.d.ts +3 -2
  19. package/dist/src/modular/buildClassicalOperationGroups.d.ts.map +1 -1
  20. package/dist/src/modular/buildClassicalOperationGroups.js +35 -27
  21. package/dist/src/modular/buildClassicalOperationGroups.js.map +1 -1
  22. package/dist/src/modular/buildClientContext.d.ts +4 -3
  23. package/dist/src/modular/buildClientContext.d.ts.map +1 -1
  24. package/dist/src/modular/buildClientContext.js +84 -35
  25. package/dist/src/modular/buildClientContext.js.map +1 -1
  26. package/dist/src/modular/buildModularOptions.d.ts +7 -0
  27. package/dist/src/modular/buildModularOptions.d.ts.map +1 -0
  28. package/dist/src/modular/buildModularOptions.js +16 -0
  29. package/dist/src/modular/buildModularOptions.js.map +1 -0
  30. package/dist/src/modular/buildOperations.d.ts +6 -4
  31. package/dist/src/modular/buildOperations.d.ts.map +1 -1
  32. package/dist/src/modular/buildOperations.js +56 -55
  33. package/dist/src/modular/buildOperations.js.map +1 -1
  34. package/dist/src/modular/buildProjectFiles.d.ts +3 -2
  35. package/dist/src/modular/buildProjectFiles.d.ts.map +1 -1
  36. package/dist/src/modular/buildProjectFiles.js +18 -16
  37. package/dist/src/modular/buildProjectFiles.js.map +1 -1
  38. package/dist/src/modular/buildRestorePoller.d.ts +4 -2
  39. package/dist/src/modular/buildRestorePoller.d.ts.map +1 -1
  40. package/dist/src/modular/buildRestorePoller.js +22 -18
  41. package/dist/src/modular/buildRestorePoller.js.map +1 -1
  42. package/dist/src/modular/buildRootIndex.d.ts +4 -3
  43. package/dist/src/modular/buildRootIndex.d.ts.map +1 -1
  44. package/dist/src/modular/buildRootIndex.js +40 -31
  45. package/dist/src/modular/buildRootIndex.js.map +1 -1
  46. package/dist/src/modular/buildSubpathIndex.d.ts +4 -2
  47. package/dist/src/modular/buildSubpathIndex.d.ts.map +1 -1
  48. package/dist/src/modular/buildSubpathIndex.js +8 -5
  49. package/dist/src/modular/buildSubpathIndex.js.map +1 -1
  50. package/dist/src/modular/emitLoggerFile.d.ts +2 -3
  51. package/dist/src/modular/emitLoggerFile.d.ts.map +1 -1
  52. package/dist/src/modular/emitLoggerFile.js +4 -4
  53. package/dist/src/modular/emitLoggerFile.js.map +1 -1
  54. package/dist/src/modular/emitModels.d.ts +1 -2
  55. package/dist/src/modular/emitModels.d.ts.map +1 -1
  56. package/dist/src/modular/emitModels.js +10 -3
  57. package/dist/src/modular/emitModels.js.map +1 -1
  58. package/dist/src/modular/emitModelsOptions.d.ts +3 -24
  59. package/dist/src/modular/emitModelsOptions.d.ts.map +1 -1
  60. package/dist/src/modular/emitModelsOptions.js +10 -86
  61. package/dist/src/modular/emitModelsOptions.js.map +1 -1
  62. package/dist/src/modular/emitSamples.js +2 -1
  63. package/dist/src/modular/emitSamples.js.map +1 -1
  64. package/dist/src/modular/helpers/classicalOperationHelpers.d.ts +3 -3
  65. package/dist/src/modular/helpers/classicalOperationHelpers.d.ts.map +1 -1
  66. package/dist/src/modular/helpers/classicalOperationHelpers.js +40 -50
  67. package/dist/src/modular/helpers/classicalOperationHelpers.js.map +1 -1
  68. package/dist/src/modular/helpers/clientHelpers.d.ts +11 -8
  69. package/dist/src/modular/helpers/clientHelpers.d.ts.map +1 -1
  70. package/dist/src/modular/helpers/clientHelpers.js +87 -60
  71. package/dist/src/modular/helpers/clientHelpers.js.map +1 -1
  72. package/dist/src/modular/helpers/namingHelpers.d.ts +4 -7
  73. package/dist/src/modular/helpers/namingHelpers.d.ts.map +1 -1
  74. package/dist/src/modular/helpers/namingHelpers.js +3 -26
  75. package/dist/src/modular/helpers/namingHelpers.js.map +1 -1
  76. package/dist/src/modular/helpers/operationHelpers.d.ts +21 -20
  77. package/dist/src/modular/helpers/operationHelpers.d.ts.map +1 -1
  78. package/dist/src/modular/helpers/operationHelpers.js +336 -291
  79. package/dist/src/modular/helpers/operationHelpers.js.map +1 -1
  80. package/dist/src/modular/helpers/typeHelpers.d.ts +4 -25
  81. package/dist/src/modular/helpers/typeHelpers.d.ts.map +1 -1
  82. package/dist/src/modular/helpers/typeHelpers.js +6 -218
  83. package/dist/src/modular/helpers/typeHelpers.js.map +1 -1
  84. package/dist/src/modular/interfaces.d.ts +15 -8
  85. package/dist/src/modular/interfaces.d.ts.map +1 -1
  86. package/dist/src/modular/serialization/buildDeserializerFunction.d.ts.map +1 -1
  87. package/dist/src/modular/serialization/buildDeserializerFunction.js +1 -2
  88. package/dist/src/modular/serialization/buildDeserializerFunction.js.map +1 -1
  89. package/dist/src/modular/serialization/buildSerializerFunction.d.ts.map +1 -1
  90. package/dist/src/modular/serialization/buildSerializerFunction.js +1 -2
  91. package/dist/src/modular/serialization/buildSerializerFunction.js.map +1 -1
  92. package/dist/src/modular/serialization/serializeUtils.d.ts +8 -5
  93. package/dist/src/modular/serialization/serializeUtils.d.ts.map +1 -1
  94. package/dist/src/modular/serialization/serializeUtils.js +22 -22
  95. package/dist/src/modular/serialization/serializeUtils.js.map +1 -1
  96. package/dist/src/utils/clientUtils.d.ts +3 -1
  97. package/dist/src/utils/clientUtils.d.ts.map +1 -1
  98. package/dist/src/utils/clientUtils.js +10 -0
  99. package/dist/src/utils/clientUtils.js.map +1 -1
  100. package/dist/src/utils/operationUtil.d.ts +6 -2
  101. package/dist/src/utils/operationUtil.d.ts.map +1 -1
  102. package/dist/src/utils/operationUtil.js +66 -7
  103. package/dist/src/utils/operationUtil.js.map +1 -1
  104. package/dist/tsconfig.tsbuildinfo +1 -1
  105. package/package.json +3 -3
  106. package/src/contextManager.ts +1 -2
  107. package/src/framework/load-static-helpers.ts +24 -1
  108. package/src/index.ts +65 -37
  109. package/src/metaTree.ts +0 -6
  110. package/src/modular/buildClassicalClient.ts +97 -99
  111. package/src/modular/buildClassicalOperationGroups.ts +53 -47
  112. package/src/modular/buildClientContext.ts +101 -44
  113. package/src/modular/buildModularOptions.ts +27 -0
  114. package/src/modular/buildOperations.ts +91 -78
  115. package/src/modular/buildProjectFiles.ts +24 -21
  116. package/src/modular/buildRestorePoller.ts +39 -23
  117. package/src/modular/buildRootIndex.ts +51 -42
  118. package/src/modular/buildSubpathIndex.ts +16 -7
  119. package/src/modular/emitLoggerFile.ts +12 -10
  120. package/src/modular/emitModels.ts +15 -7
  121. package/src/modular/emitModelsOptions.ts +18 -125
  122. package/src/modular/emitSamples.ts +2 -3
  123. package/src/modular/helpers/classicalOperationHelpers.ts +50 -75
  124. package/src/modular/helpers/clientHelpers.ts +107 -73
  125. package/src/modular/helpers/namingHelpers.ts +6 -65
  126. package/src/modular/helpers/operationHelpers.ts +506 -384
  127. package/src/modular/helpers/typeHelpers.ts +11 -267
  128. package/src/modular/interfaces.ts +16 -8
  129. package/src/modular/serialization/buildDeserializerFunction.ts +1 -6
  130. package/src/modular/serialization/buildSerializerFunction.ts +1 -2
  131. package/src/modular/serialization/serializeUtils.ts +31 -30
  132. package/src/utils/clientUtils.ts +23 -1
  133. package/src/utils/operationUtil.ts +106 -14
  134. package/dist/src/modular/buildCodeModel.d.ts +0 -34
  135. package/dist/src/modular/buildCodeModel.d.ts.map +0 -1
  136. package/dist/src/modular/buildCodeModel.js +0 -1489
  137. package/dist/src/modular/buildCodeModel.js.map +0 -1
  138. package/dist/src/modular/modularCodeModel.d.ts +0 -166
  139. package/dist/src/modular/modularCodeModel.d.ts.map +0 -1
  140. package/dist/src/modular/modularCodeModel.js +0 -2
  141. package/dist/src/modular/modularCodeModel.js.map +0 -1
  142. package/src/modular/buildCodeModel.ts +0 -1965
  143. package/src/modular/modularCodeModel.ts +0 -211
@@ -1 +1 @@
1
- {"version":3,"file":"buildClassicalClient.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildClassicalClient.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { SourceFile } from "ts-morph";
2
- import { Client, ModularCodeModel } from "./modularCodeModel.js";
2
+ import { ModularEmitterOptions } from "./interfaces.js";
3
3
  import { SdkContext } from "../utils/interfaces.js";
4
- export declare function buildClassicOperationFiles(dpgContext: SdkContext, codeModel: ModularCodeModel, client: Client): Map<string, SourceFile>;
4
+ import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
5
+ export declare function buildClassicOperationFiles(dpgContext: SdkContext, client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions): Map<string, SourceFile>;
5
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,EACL,MAAM,EACN,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,2BA6Ef"}
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;AAGrD,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,2BAqFtC"}
@@ -1,53 +1,61 @@
1
1
  import { NameType } from "@azure-tools/rlc-common";
2
2
  import { getClassicalOperation } from "./helpers/classicalOperationHelpers.js";
3
3
  import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";
4
- export function buildClassicOperationFiles(dpgContext, codeModel, client) {
4
+ import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
5
+ import { getModularClientOptions } from "../utils/clientUtils.js";
6
+ export function buildClassicOperationFiles(dpgContext, client, emitterOptions) {
5
7
  var _a, _b;
8
+ // const sdkPackage = dpgContext.sdkPackage;
9
+ const { subfolder } = getModularClientOptions(dpgContext, client);
6
10
  const classicOperationFiles = new Map();
7
- for (const operationGroup of client.operationGroups) {
8
- if (operationGroup.namespaceHierarchies.length > 0) {
9
- const classicOperationFileName = operationGroup.namespaceHierarchies.length > 0
10
- ? `${getClassicalLayerPrefix(operationGroup, NameType.File, "/", operationGroup.namespaceHierarchies.length - 1)}/index`
11
+ const methodMap = getMethodHierarchiesMap(dpgContext, client);
12
+ for (const [prefixKey, operations] of methodMap) {
13
+ const prefixes = prefixKey.split("/");
14
+ if (prefixes.length > 0 && prefixKey !== "") {
15
+ const classicOperationFileName = prefixes.length > 0
16
+ ? `${getClassicalLayerPrefix(prefixes, NameType.File, "/", prefixes.length - 1)}/index`
11
17
  : // When the program has no operation groups defined all operations are put
12
18
  // into a nameless operation group. We'll call this operations.
13
19
  "index";
14
- const subfolder = client.subfolder;
15
- const srcPath = codeModel.modularOptions.sourceRoot;
16
- const classicFile = (_a = classicOperationFiles.get(classicOperationFileName)) !== null && _a !== void 0 ? _a : codeModel.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}classic/${classicOperationFileName}.ts`);
17
- getClassicalOperation(dpgContext, client, classicFile, operationGroup);
18
- importApis(classicFile, client, codeModel, operationGroup);
20
+ const srcPath = emitterOptions.modularOptions.sourceRoot;
21
+ const classicFile = (_a = classicOperationFiles.get(classicOperationFileName)) !== null && _a !== void 0 ? _a : emitterOptions.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}classic/${classicOperationFileName}.ts`);
22
+ getClassicalOperation(dpgContext, client, classicFile, [
23
+ prefixes,
24
+ operations
25
+ ]);
26
+ importApis(dpgContext, classicFile, client, emitterOptions, prefixes);
19
27
  // We need to import the paging helpers and types explicitly because ts-morph may not be able to find them.
20
28
  classicOperationFiles.set(classicOperationFileName, classicFile);
21
29
  }
22
30
  }
23
- for (const operationGroup of client.operationGroups) {
24
- if (operationGroup.namespaceHierarchies.length > 0) {
25
- for (let layer = 0; layer < operationGroup.namespaceHierarchies.length - 1; layer++) {
26
- const classicOperationFileName = operationGroup.namespaceHierarchies.length > 0
27
- ? `${getClassicalLayerPrefix(operationGroup, NameType.File, "/", layer)}/index`
31
+ for (const [prefixKey, operations] of methodMap) {
32
+ const prefixes = prefixKey.split("/");
33
+ if (prefixes.length > 0 && prefixKey !== "") {
34
+ for (let layer = 0; layer < prefixes.length - 1; layer++) {
35
+ const classicOperationFileName = prefixes.length > 0
36
+ ? `${getClassicalLayerPrefix(prefixes, NameType.File, "/", layer)}/index`
28
37
  : // When the program has no operation groups defined all operations are put
29
38
  // into a nameless operation group. We'll call this operations.
30
39
  "index";
31
- const subfolder = client.subfolder;
32
- const srcPath = codeModel.modularOptions.sourceRoot;
33
- const classicFile = (_b = classicOperationFiles.get(classicOperationFileName)) !== null && _b !== void 0 ? _b : codeModel.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}classic/${classicOperationFileName}.ts`);
34
- getClassicalOperation(dpgContext, client, classicFile, operationGroup, layer);
35
- importApis(classicFile, client, codeModel, operationGroup, layer);
40
+ const srcPath = emitterOptions.modularOptions.sourceRoot;
41
+ const classicFile = (_b = classicOperationFiles.get(classicOperationFileName)) !== null && _b !== void 0 ? _b : emitterOptions.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}classic/${classicOperationFileName}.ts`);
42
+ getClassicalOperation(dpgContext, client, classicFile, [prefixes, operations], layer);
43
+ importApis(dpgContext, classicFile, client, emitterOptions, prefixes, layer);
36
44
  classicOperationFiles.set(classicOperationFileName, classicFile);
37
45
  }
38
46
  }
39
47
  }
40
48
  return classicOperationFiles;
41
49
  }
42
- function importApis(classicFile, client, modularCodeModel, operationGroup, layer = operationGroup.namespaceHierarchies.length - 1) {
43
- const classicOperationFileName = operationGroup.namespaceHierarchies.length > 0
44
- ? `${getClassicalLayerPrefix(operationGroup, NameType.File, "/", layer)}/index`
50
+ function importApis(context, classicFile, client, emitterOptions, prefixes, layer = prefixes.length - 1) {
51
+ const { subfolder } = getModularClientOptions(context, client);
52
+ const classicOperationFileName = prefixes.length > 0 && prefixes[0] !== ""
53
+ ? `${getClassicalLayerPrefix(prefixes, NameType.File, "/", layer)}/index`
45
54
  : // When the program has no operation groups defined all operations are put
46
55
  // into a nameless operation group. We'll call this operations.
47
56
  "index";
48
- const subfolder = client.subfolder;
49
- const srcPath = modularCodeModel.modularOptions.sourceRoot;
50
- const apiFile = modularCodeModel.project.getSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/${classicOperationFileName}.ts`);
57
+ const srcPath = emitterOptions.modularOptions.sourceRoot;
58
+ const apiFile = emitterOptions.project.getSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/${classicOperationFileName}.ts`);
51
59
  if (!apiFile) {
52
60
  return;
53
61
  }
@@ -61,7 +69,7 @@ function importApis(classicFile, client, modularCodeModel, operationGroup, layer
61
69
  })[0];
62
70
  if (exported.length > 0 && !existApiImport) {
63
71
  classicFile.addImportDeclaration({
64
- moduleSpecifier: `${"../".repeat(operationGroup.namespaceHierarchies.length + 1)}api/${classicOperationFileName}.js`,
72
+ moduleSpecifier: `${"../".repeat(prefixes.length + 1)}api/${classicOperationFileName}.js`,
65
73
  namedImports: exported
66
74
  });
67
75
  }
@@ -1 +1 @@
1
- {"version":3,"file":"buildClassicalOperationGroups.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildClassicalOperationGroups.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,13 @@
1
- import { Client, ModularCodeModel } from "./modularCodeModel.js";
1
+ import { ModularEmitterOptions } from "./interfaces.js";
2
2
  import { SdkContext } from "../utils/interfaces.js";
3
3
  import { SourceFile } from "ts-morph";
4
+ import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
4
5
  /**
5
6
  * This function gets the path of the file containing the modular client context
6
7
  */
7
- export declare function getClientContextPath(_client: Client, codeModel: ModularCodeModel): string;
8
+ export declare function getClientContextPath(context: SdkContext, client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions): string;
8
9
  /**
9
10
  * This function creates the file containing the modular client context
10
11
  */
11
- export declare function buildClientContext(_client: Client, dpgContext: SdkContext, codeModel: ModularCodeModel): SourceFile;
12
+ export declare function buildClientContext(dpgContext: SdkContext, client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions): SourceFile;
12
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,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAejE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAYtC;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,gBAAgB,GAC1B,MAAM,CAQR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,GAC1B,UAAU,CAiJZ"}
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;AAOtC,OAAO,EACL,aAAa,EAGb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAGrD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,GACpC,MAAM,CAQR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,GACpC,UAAU,CAsMZ"}
@@ -6,45 +6,66 @@ import { getTypeExpression } from "./type-expressions/get-type-expression.js";
6
6
  import { resolveReference } from "../framework/reference.js";
7
7
  import { useDependencies } from "../framework/hooks/useDependencies.js";
8
8
  import { buildEnumTypes, getApiVersionEnum } from "./emitModels.js";
9
+ import { getModularClientOptions } from "../utils/clientUtils.js";
9
10
  /**
10
11
  * This function gets the path of the file containing the modular client context
11
12
  */
12
- export function getClientContextPath(_client, codeModel) {
13
- const { subfolder, tcgcClient: client } = _client;
13
+ export function getClientContextPath(context, client, emitterOptions) {
14
+ const { subfolder } = getModularClientOptions(context, client);
14
15
  const name = getClientName(client);
15
- const srcPath = codeModel.modularOptions.sourceRoot;
16
+ const srcPath = emitterOptions.modularOptions.sourceRoot;
16
17
  const contentPath = `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/${normalizeName(name, NameType.File)}Context.ts`;
17
18
  return contentPath;
18
19
  }
19
20
  /**
20
21
  * This function creates the file containing the modular client context
21
22
  */
22
- export function buildClientContext(_client, dpgContext, codeModel) {
23
- const { description, tcgcClient: client } = _client;
23
+ export function buildClientContext(dpgContext, client, emitterOptions) {
24
+ var _a;
24
25
  const dependencies = useDependencies();
25
26
  const name = getClientName(client);
26
- const requiredParams = getClientParametersDeclaration(_client, dpgContext, {
27
+ const { rlcClientName } = getModularClientOptions(dpgContext, client);
28
+ const requiredParams = getClientParametersDeclaration(client, dpgContext, {
27
29
  onClientOnly: false,
28
- requiredOnly: true
30
+ requiredOnly: true,
31
+ apiVersionAsRequired: true
29
32
  });
30
- const clientContextFile = codeModel.project.createSourceFile(getClientContextPath(_client, codeModel));
33
+ const clientContextFile = emitterOptions.project.createSourceFile(getClientContextPath(dpgContext, client, emitterOptions));
31
34
  clientContextFile.addInterface({
32
35
  isExported: true,
33
- name: `${_client.rlcClientName}`,
36
+ name: `${rlcClientName}`,
34
37
  extends: [resolveReference(dependencies.Client)],
35
- docs: getDocsFromDescription(description)
38
+ docs: getDocsFromDescription(client.doc),
39
+ properties: getClientParameters(client, dpgContext, {
40
+ onClientOnly: false,
41
+ requiredOnly: true,
42
+ apiVersionAsRequired: true
43
+ })
44
+ .filter((p) => {
45
+ const clientParamName = getClientParameterName(p);
46
+ return (clientParamName !== "endpointParam" &&
47
+ clientParamName !== "credential");
48
+ })
49
+ .map((p) => {
50
+ return {
51
+ name: getClientParameterName(p),
52
+ type: getTypeExpression(dpgContext, p.type),
53
+ hasQuestionToken: false,
54
+ docs: getDocsWithKnownVersion(dpgContext, p)
55
+ };
56
+ })
36
57
  });
37
58
  clientContextFile.addInterface({
38
59
  name: `${name}ClientOptionalParams`,
39
60
  isExported: true,
40
61
  extends: [resolveReference(dependencies.ClientOptions)],
41
- properties: getClientParameters(_client, dpgContext, {
62
+ properties: getClientParameters(client, dpgContext, {
42
63
  optionalOnly: true
43
64
  })
44
65
  .filter((p) => p.name !== "endpoint")
45
66
  .map((p) => {
46
67
  return {
47
- name: normalizeName(p.name, NameType.Parameter),
68
+ name: getClientParameterName(p),
48
69
  type: p.name.toLowerCase() === "apiversion"
49
70
  ? "string"
50
71
  : getTypeExpression(dpgContext, p.type),
@@ -56,24 +77,29 @@ export function buildClientContext(_client, dpgContext, codeModel) {
56
77
  });
57
78
  // TODO use binder here
58
79
  // (for now) now logger for unbranded pkgs
59
- if (isAzurePackage(codeModel)) {
80
+ if (isAzurePackage(emitterOptions)) {
60
81
  clientContextFile.addImportDeclaration({
61
- moduleSpecifier: codeModel.clients.length > 1 ? "../../logger.js" : "../logger.js",
82
+ moduleSpecifier: dpgContext.sdkPackage.clients.length > 1
83
+ ? "../../logger.js"
84
+ : "../logger.js",
62
85
  namedImports: ["logger"]
63
86
  });
64
87
  }
65
88
  const factoryFunction = clientContextFile.addFunction({
66
- docs: getDocsFromDescription(description),
89
+ docs: getDocsFromDescription(client.doc),
67
90
  name: `create${name}`,
68
- returnType: `${_client.rlcClientName}`,
69
- parameters: requiredParams,
91
+ returnType: `${rlcClientName}`,
92
+ parameters: getClientParametersDeclaration(client, dpgContext, {
93
+ onClientOnly: false,
94
+ requiredOnly: true
95
+ }),
70
96
  isExported: true
71
97
  });
72
- const endpointParam = buildGetClientEndpointParam(factoryFunction, dpgContext, _client);
73
- const credentialParam = buildGetClientCredentialParam(_client, codeModel);
74
- const optionsParam = buildGetClientOptionsParam(factoryFunction, codeModel, endpointParam);
98
+ const endpointParam = buildGetClientEndpointParam(factoryFunction, dpgContext, client);
99
+ const credentialParam = buildGetClientCredentialParam(client, emitterOptions);
100
+ const optionsParam = buildGetClientOptionsParam(factoryFunction, emitterOptions, endpointParam);
75
101
  factoryFunction.addStatements(`const clientContext = ${resolveReference(dependencies.getClient)}(${endpointParam}, ${credentialParam}, ${optionsParam});`);
76
- const { customHttpAuthHeaderName, customHttpAuthSharedKeyPrefix } = codeModel.options;
102
+ const { customHttpAuthHeaderName, customHttpAuthSharedKeyPrefix } = emitterOptions.options;
77
103
  if (customHttpAuthHeaderName && customHttpAuthSharedKeyPrefix) {
78
104
  factoryFunction.addStatements(`
79
105
  if(${resolveReference(dependencies.isKeyCredential)}(credential)) {
@@ -88,12 +114,23 @@ export function buildClientContext(_client, dpgContext, codeModel) {
88
114
  `);
89
115
  }
90
116
  let apiVersionPolicyStatement = `clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });`;
91
- if (dpgContext.hasApiVersionInClient) {
92
- const apiVersionParam = getClientParameters(_client, dpgContext).find((x) => x.isApiVersionParam && x.kind === "method");
93
- if (apiVersionParam) {
94
- if (apiVersionParam.clientDefaultValue) {
95
- apiVersionPolicyStatement += `const apiVersion = options.apiVersion ?? "${apiVersionParam.clientDefaultValue}";`;
96
- }
117
+ const apiVersionParam = getClientParameters(client, dpgContext).find((x) => x.isApiVersionParam);
118
+ const endpointParameter = getClientParameters(client, dpgContext, {
119
+ onClientOnly: false,
120
+ requiredOnly: true,
121
+ skipEndpointTemplate: true
122
+ }).find((x) => x.kind === "endpoint");
123
+ if (apiVersionParam) {
124
+ const templateArguments = endpointParameter && endpointParameter.type.kind === "endpoint"
125
+ ? endpointParameter.type.templateArguments
126
+ : endpointParameter && endpointParameter.type.kind === "union"
127
+ ? (_a = endpointParameter.type.variantTypes[0]) === null || _a === void 0 ? void 0 : _a.templateArguments
128
+ : [];
129
+ const apiVersionInEndpoint = templateArguments && templateArguments.find((p) => p.isApiVersionParam);
130
+ if (!apiVersionInEndpoint && apiVersionParam.clientDefaultValue) {
131
+ apiVersionPolicyStatement += `const apiVersion = options.apiVersion ?? "${apiVersionParam.clientDefaultValue}";`;
132
+ }
133
+ if (apiVersionParam.kind === "method") {
97
134
  apiVersionPolicyStatement += `
98
135
  clientContext.pipeline.addPolicy({
99
136
  name: 'ClientApiVersionPolicy',
@@ -112,20 +149,32 @@ export function buildClientContext(_client, dpgContext, codeModel) {
112
149
  });`;
113
150
  }
114
151
  }
115
- else if (isAzurePackage(codeModel)) {
152
+ else if (isAzurePackage(emitterOptions)) {
116
153
  apiVersionPolicyStatement += `
117
- if (options.apiVersion) {
118
- logger.warning("This client does not support client api-version, please change it at the operation level");
119
- }`;
154
+ if (options.apiVersion) {
155
+ logger.warning("This client does not support client api-version, please change it at the operation level");
156
+ }`;
120
157
  }
121
158
  else {
122
159
  apiVersionPolicyStatement += `
123
- if (options.apiVersion) {
124
- console.warn("This client does not support client api-version, please change it at the operation level");
125
- }`;
160
+ if (options.apiVersion) {
161
+ console.warn("This client does not support client api-version, please change it at the operation level");
162
+ }`;
126
163
  }
127
164
  factoryFunction.addStatements(apiVersionPolicyStatement);
128
- factoryFunction.addStatements("return clientContext;");
165
+ const contextRequiredParam = requiredParams.filter((p) => p.name !== "endpointParam" &&
166
+ p.name !== "credential" &&
167
+ p.name !== "options");
168
+ if (contextRequiredParam.length) {
169
+ factoryFunction.addStatements(`return { ...clientContext, ${contextRequiredParam
170
+ .map((p) => {
171
+ return p.name;
172
+ })
173
+ .join(", ")}} as ${rlcClientName};`);
174
+ }
175
+ else {
176
+ factoryFunction.addStatements(`return clientContext;`);
177
+ }
129
178
  clientContextFile.fixMissingImports({}, { importModuleSpecifierEnding: "js" });
130
179
  clientContextFile.fixUnusedIdentifiers();
131
180
  return clientContextFile;
@@ -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,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,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;AAMpE;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAe,EACf,SAA2B;IAE3B,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAClD,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;IACpD,MAAM,WAAW,GAAG,GAAG,OAAO,IAC5B,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EACpD,OAAO,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;IACtD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAe,EACf,UAAsB,EACtB,SAA2B;IAE3B,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpD,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,cAAc,GAAG,8BAA8B,CAAC,OAAO,EAAE,UAAU,EAAE;QACzE,YAAY,EAAE,KAAK;QACnB,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAC1D,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC,CACzC,CAAC;IAEF,iBAAiB,CAAC,YAAY,CAAC;QAC7B,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE;QAChC,OAAO,EAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,EAAE,sBAAsB,CAAC,WAAW,CAAC;KAC1C,CAAC,CAAC;IAEH,iBAAiB,CAAC,YAAY,CAAC;QAC7B,IAAI,EAAE,GAAG,IAAI,sBAAsB;QACnC,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QACvD,UAAU,EAAE,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE;YACnD,YAAY,EAAE,IAAI;SACnB,CAAC;aACC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;aACpC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,OAAO;gBACL,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC;gBAC/C,IAAI,EACF,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY;oBACnC,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC3C,gBAAgB,EAAE,IAAI;gBACtB,IAAI,EAAE,uBAAuB,CAAC,UAAU,EAAE,CAAC,CAAC;aAC7C,CAAC;QACJ,CAAC,CAAC;QACJ,IAAI,EAAE,CAAC,qCAAqC,CAAC;KAC9C,CAAC,CAAC;IAEH,uBAAuB;IACvB,0CAA0C;IAC1C,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,iBAAiB,CAAC,oBAAoB,CAAC;YACrC,eAAe,EACb,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,cAAc;YACnE,YAAY,EAAE,CAAC,QAAQ,CAAC;SACzB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,eAAe,GAAG,iBAAiB,CAAC,WAAW,CAAC;QACpD,IAAI,EAAE,sBAAsB,CAAC,WAAW,CAAC;QACzC,IAAI,EAAE,SAAS,IAAI,EAAE;QACrB,UAAU,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE;QACtC,UAAU,EAAE,cAAc;QAC1B,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,2BAA2B,CAC/C,eAAe,EACf,UAAU,EACV,OAAO,CACR,CAAC;IACF,MAAM,eAAe,GAAG,6BAA6B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,0BAA0B,CAC7C,eAAe,EACf,SAAS,EACT,aAAa,CACd,CAAC;IAEF,eAAe,CAAC,aAAa,CAC3B,yBAAyB,gBAAgB,CACvC,YAAY,CAAC,SAAS,CACvB,IAAI,aAAa,KAAK,eAAe,KAAK,YAAY,IAAI,CAC5D,CAAC;IAEF,MAAM,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,GAC/D,SAAS,CAAC,OAAO,CAAC;IAEpB,IAAI,wBAAwB,IAAI,6BAA6B,EAAE,CAAC;QAC9D,eAAe,CAAC,aAAa,CAAC;WACvB,gBAAgB,CAAC,YAAY,CAAC,eAAe,CAAC;;;;mCAItB,wBAAwB,OAAO,6BAA6B;;;;;OAKxF,CAAC,CAAC;IACP,CAAC;IAED,IAAI,yBAAyB,GAAG,oEAAoE,CAAC;IAErG,IAAI,UAAU,CAAC,qBAAqB,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,IAAI,CACnE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAClD,CAAC;QAEF,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,eAAe,CAAC,kBAAkB,EAAE,CAAC;gBACvC,yBAAyB,IAAI,6CAA6C,eAAe,CAAC,kBAAkB,IAAI,CAAC;YACnH,CAAC;YAED,yBAAyB,IAAI;;;;;;;;;;8BAUL,sBAAsB,CAAC,eAAe,CAAC;;;;;UAK3D,CAAC;QACP,CAAC;IACH,CAAC;SAAM,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACrC,yBAAyB,IAAI;;;QAGzB,CAAC;IACP,CAAC;SAAM,CAAC;QACN,yBAAyB,IAAI;;;QAGzB,CAAC;IACP,CAAC;IACD,eAAe,CAAC,aAAa,CAAC,yBAAyB,CAAC,CAAC;IAEzD,eAAe,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC;IAEvD,iBAAiB,CAAC,iBAAiB,CACjC,EAAE,EACF,EAAE,2BAA2B,EAAE,IAAI,EAAE,CACtC,CAAC;IAEF,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;IACzC,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAAS,uBAAuB,CAC9B,UAAsB,EACtB,KAAsC;IAEtC,MAAM,IAAI,GAAG,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACrD,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACxE,IAAI,CAAC,IAAI,CACP,0BAA0B,eAAe,CAAC,IAAI,6BAA6B,CAC5E,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"buildClientContext.js","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ import { ModularEmitterOptions } from "./interfaces.js";
2
+ import { Project } from "ts-morph";
3
+ import { SdkContext } from "../utils/interfaces.js";
4
+ export declare function transformModularEmitterOptions(dpgContext: SdkContext, modularSourcesRoot: string, project: Project, options?: {
5
+ casing: "snake" | "camel";
6
+ }): ModularEmitterOptions;
7
+ //# sourceMappingURL=buildModularOptions.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"buildModularOptions.d.ts","sourceRoot":"","sources":["../../../src/modular/buildModularOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAA;CAAwB,GAC3D,qBAAqB,CAcvB"}
@@ -0,0 +1,16 @@
1
+ let CASING = "snake";
2
+ export function transformModularEmitterOptions(dpgContext, modularSourcesRoot, project, options = { casing: "snake" }) {
3
+ var _a, _b, _c, _d;
4
+ CASING = (_a = options.casing) !== null && _a !== void 0 ? _a : CASING;
5
+ const emitterOptions = {
6
+ options: (_b = dpgContext.rlcOptions) !== null && _b !== void 0 ? _b : {},
7
+ modularOptions: {
8
+ sourceRoot: modularSourcesRoot,
9
+ compatibilityMode: !!((_c = dpgContext.rlcOptions) === null || _c === void 0 ? void 0 : _c.compatibilityMode),
10
+ experimentalExtensibleEnums: !!((_d = dpgContext.rlcOptions) === null || _d === void 0 ? void 0 : _d.experimentalExtensibleEnums)
11
+ },
12
+ project
13
+ };
14
+ return emitterOptions;
15
+ }
16
+ //# sourceMappingURL=buildModularOptions.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"buildModularOptions.js","sourceRoot":"","sources":["../../../src/modular/buildModularOptions.ts"],"names":[],"mappings":"AAKA,IAAI,MAAM,GAAsB,OAAO,CAAC;AAExC,MAAM,UAAU,8BAA8B,CAC5C,UAAsB,EACtB,kBAA0B,EAC1B,OAAgB,EAChB,UAAyC,EAAE,MAAM,EAAE,OAAO,EAAE;;IAE5D,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,MAAM,CAAC;IAClC,MAAM,cAAc,GAA0B;QAC5C,OAAO,EAAE,MAAA,UAAU,CAAC,UAAU,mCAAI,EAAE;QACpC,cAAc,EAAE;YACd,UAAU,EAAE,kBAAkB;YAC9B,iBAAiB,EAAE,CAAC,CAAC,CAAA,MAAA,UAAU,CAAC,UAAU,0CAAE,iBAAiB,CAAA;YAC7D,2BAA2B,EACzB,CAAC,CAAC,CAAA,MAAA,UAAU,CAAC,UAAU,0CAAE,2BAA2B,CAAA;SACvD;QACD,OAAO;KACR,CAAC;IAEF,OAAO,cAAc,CAAC;AACxB,CAAC"}
@@ -1,20 +1,22 @@
1
- import { Client, ModularCodeModel, Operation } from "./modularCodeModel.js";
1
+ import { ModularEmitterOptions } from "./interfaces.js";
2
2
  import { Project, SourceFile } from "ts-morph";
3
3
  import { OperationPathAndDeserDetails } from "./interfaces.js";
4
4
  import { SdkContext } from "../utils/interfaces.js";
5
+ import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
6
+ import { ServiceOperation } from "../utils/operationUtil.js";
5
7
  /**
6
8
  * This function creates a file under /api for each operation group.
7
9
  * If there is no operation group in the TypeSpec program, we create a single
8
10
  * file called operations.ts where all operations are generated.
9
11
  */
10
- export declare function buildOperationFiles(client: Client, dpgContext: SdkContext, codeModel: ModularCodeModel): SourceFile[];
12
+ export declare function buildOperationFiles(dpgContext: SdkContext, client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions): SourceFile[];
11
13
  export declare function importDeserializeUtils(srcPath: string, sourceFile: SourceFile, project: Project, serializeType: string, subfolder?: string, importLayer?: number): void;
12
14
  /**
13
15
  * This function generates the interfaces for each operation options
14
16
  */
15
- export declare function buildOperationOptions(context: SdkContext, operation: Operation, sourceFile: SourceFile): void;
17
+ export declare function buildOperationOptions(context: SdkContext, method: [string[], ServiceOperation], sourceFile: SourceFile): void;
16
18
  /**
17
19
  * This function creates a map of operation file path to operation names.
18
20
  */
19
- export declare function buildLroDeserDetailMap(client: Client): Map<string, OperationPathAndDeserDetails[]>;
21
+ export declare function buildLroDeserDetailMap(context: SdkContext, client: SdkClientType<SdkServiceOperation>): Map<string, OperationPathAndDeserDetails[]>;
20
22
  //# sourceMappingURL=buildOperations.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"buildOperations.d.ts","sourceRoot":"","sources":["../../../src/modular/buildOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,gBAAgB,EAChB,SAAS,EAEV,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAU/C,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAQpD;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,gBAoF5B;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,MAAM,EACrB,SAAS,GAAE,MAAW,EACtB,WAAW,GAAE,MAAU,QAwBxB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,QA0CvB;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,+CA8CpD"}
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,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAU/C,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AASpD,OAAO,EACL,aAAa,EAEb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAEL,gBAAgB,EACjB,MAAM,2BAA2B,CAAC;AAInC;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,gBAqFtC;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,MAAM,EACrB,SAAS,GAAE,MAAW,EACtB,WAAW,GAAE,MAAU,QAwBxB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,EACpC,UAAU,EAAE,UAAU,QAgDvB;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,+CA+C3C"}