@azure-tools/typespec-ts 0.14.0 → 0.15.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 (138) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/dist/src/index.d.ts +1 -5
  3. package/dist/src/index.d.ts.map +1 -1
  4. package/dist/src/index.js +148 -78
  5. package/dist/src/index.js.map +1 -1
  6. package/dist/src/lib.d.ts.map +1 -1
  7. package/dist/src/lib.js +4 -2
  8. package/dist/src/lib.js.map +1 -1
  9. package/dist/src/modular/buildClassicalClient.d.ts +1 -1
  10. package/dist/src/modular/buildClassicalClient.d.ts.map +1 -1
  11. package/dist/src/modular/buildClassicalClient.js +7 -6
  12. package/dist/src/modular/buildClassicalClient.js.map +1 -1
  13. package/dist/src/modular/buildClientContext.d.ts +1 -1
  14. package/dist/src/modular/buildClientContext.d.ts.map +1 -1
  15. package/dist/src/modular/buildClientContext.js +16 -7
  16. package/dist/src/modular/buildClientContext.js.map +1 -1
  17. package/dist/src/modular/buildCodeModel.d.ts.map +1 -1
  18. package/dist/src/modular/buildCodeModel.js +6 -6
  19. package/dist/src/modular/buildCodeModel.js.map +1 -1
  20. package/dist/src/modular/buildOperations.d.ts +2 -1
  21. package/dist/src/modular/buildOperations.d.ts.map +1 -1
  22. package/dist/src/modular/buildOperations.js +19 -25
  23. package/dist/src/modular/buildOperations.js.map +1 -1
  24. package/dist/src/modular/buildProjectFiles.d.ts +2 -2
  25. package/dist/src/modular/buildProjectFiles.d.ts.map +1 -1
  26. package/dist/src/modular/buildProjectFiles.js +284 -145
  27. package/dist/src/modular/buildProjectFiles.js.map +1 -1
  28. package/dist/src/modular/buildRootIndex.d.ts.map +1 -1
  29. package/dist/src/modular/buildRootIndex.js +5 -5
  30. package/dist/src/modular/buildRootIndex.js.map +1 -1
  31. package/dist/src/modular/buildSubpathIndex.d.ts.map +1 -1
  32. package/dist/src/modular/buildSubpathIndex.js +9 -2
  33. package/dist/src/modular/buildSubpathIndex.js.map +1 -1
  34. package/dist/src/modular/emitModels.d.ts +2 -1
  35. package/dist/src/modular/emitModels.d.ts.map +1 -1
  36. package/dist/src/modular/emitModels.js +36 -7
  37. package/dist/src/modular/emitModels.js.map +1 -1
  38. package/dist/src/modular/helpers/clientHelpers.d.ts.map +1 -1
  39. package/dist/src/modular/helpers/clientHelpers.js +5 -3
  40. package/dist/src/modular/helpers/clientHelpers.js.map +1 -1
  41. package/dist/src/modular/helpers/docsHelpers.d.ts +3 -0
  42. package/dist/src/modular/helpers/docsHelpers.d.ts.map +1 -0
  43. package/dist/src/modular/helpers/docsHelpers.js +10 -0
  44. package/dist/src/modular/helpers/docsHelpers.js.map +1 -0
  45. package/dist/src/modular/helpers/operationHelpers.d.ts +10 -3
  46. package/dist/src/modular/helpers/operationHelpers.d.ts.map +1 -1
  47. package/dist/src/modular/helpers/operationHelpers.js +162 -35
  48. package/dist/src/modular/helpers/operationHelpers.js.map +1 -1
  49. package/dist/src/modular/helpers/typeHelpers.d.ts.map +1 -1
  50. package/dist/src/modular/helpers/typeHelpers.js +6 -0
  51. package/dist/src/modular/helpers/typeHelpers.js.map +1 -1
  52. package/dist/src/transform/transform.d.ts +5 -8
  53. package/dist/src/transform/transform.d.ts.map +1 -1
  54. package/dist/src/transform/transform.js +23 -13
  55. package/dist/src/transform/transform.js.map +1 -1
  56. package/dist/src/transform/transformApiVersionInfo.d.ts +2 -1
  57. package/dist/src/transform/transformApiVersionInfo.d.ts.map +1 -1
  58. package/dist/src/transform/transformApiVersionInfo.js.map +1 -1
  59. package/dist/src/transform/transformHelperFunctionDetails.d.ts +2 -1
  60. package/dist/src/transform/transformHelperFunctionDetails.d.ts.map +1 -1
  61. package/dist/src/transform/transformHelperFunctionDetails.js +1 -6
  62. package/dist/src/transform/transformHelperFunctionDetails.js.map +1 -1
  63. package/dist/src/transform/transformParameters.d.ts +2 -2
  64. package/dist/src/transform/transformParameters.d.ts.map +1 -1
  65. package/dist/src/transform/transformParameters.js +4 -1
  66. package/dist/src/transform/transformParameters.js.map +1 -1
  67. package/dist/src/transform/transformPaths.d.ts +2 -2
  68. package/dist/src/transform/transformPaths.d.ts.map +1 -1
  69. package/dist/src/transform/transformPaths.js.map +1 -1
  70. package/dist/src/transform/transformResponses.d.ts +2 -2
  71. package/dist/src/transform/transformResponses.d.ts.map +1 -1
  72. package/dist/src/transform/transformResponses.js +5 -1
  73. package/dist/src/transform/transformResponses.js.map +1 -1
  74. package/dist/src/transform/transformSchemas.d.ts +2 -2
  75. package/dist/src/transform/transformSchemas.d.ts.map +1 -1
  76. package/dist/src/transform/transformSchemas.js.map +1 -1
  77. package/dist/src/transform/transformTelemetryInfo.d.ts +4 -0
  78. package/dist/src/transform/transformTelemetryInfo.d.ts.map +1 -0
  79. package/dist/src/transform/transformTelemetryInfo.js +42 -0
  80. package/dist/src/transform/transformTelemetryInfo.js.map +1 -0
  81. package/dist/src/transform/transfromRLCOptions.d.ts +4 -2
  82. package/dist/src/transform/transfromRLCOptions.d.ts.map +1 -1
  83. package/dist/src/transform/transfromRLCOptions.js +27 -13
  84. package/dist/src/transform/transfromRLCOptions.js.map +1 -1
  85. package/dist/src/utils/clientUtils.d.ts +2 -1
  86. package/dist/src/utils/clientUtils.d.ts.map +1 -1
  87. package/dist/src/utils/clientUtils.js.map +1 -1
  88. package/dist/src/utils/interfaces.d.ts +13 -0
  89. package/dist/src/utils/interfaces.d.ts.map +1 -0
  90. package/dist/src/utils/interfaces.js +2 -0
  91. package/dist/src/utils/interfaces.js.map +1 -0
  92. package/dist/src/utils/modelUtils.d.ts +1 -1
  93. package/dist/src/utils/modelUtils.d.ts.map +1 -1
  94. package/dist/src/utils/modelUtils.js +14 -9
  95. package/dist/src/utils/modelUtils.js.map +1 -1
  96. package/dist/src/utils/operationUtil.d.ts +4 -4
  97. package/dist/src/utils/operationUtil.d.ts.map +1 -1
  98. package/dist/src/utils/operationUtil.js +1 -1
  99. package/dist/src/utils/operationUtil.js.map +1 -1
  100. package/dist/tsconfig.tsbuildinfo +1 -1
  101. package/package.json +28 -18
  102. package/src/index.ts +231 -129
  103. package/src/lib.ts +4 -2
  104. package/src/modular/buildClassicalClient.ts +10 -7
  105. package/src/modular/buildClientContext.ts +18 -8
  106. package/src/modular/buildCodeModel.ts +7 -9
  107. package/src/modular/buildOperations.ts +25 -32
  108. package/src/modular/buildProjectFiles.ts +329 -162
  109. package/src/modular/buildRootIndex.ts +5 -7
  110. package/src/modular/buildSubpathIndex.ts +9 -2
  111. package/src/modular/emitModels.ts +47 -5
  112. package/src/modular/helpers/clientHelpers.ts +5 -3
  113. package/src/modular/helpers/docsHelpers.ts +10 -0
  114. package/src/modular/helpers/operationHelpers.ts +277 -36
  115. package/src/modular/helpers/typeHelpers.ts +6 -0
  116. package/src/transform/transform.ts +24 -31
  117. package/src/transform/transformApiVersionInfo.ts +1 -1
  118. package/src/transform/transformHelperFunctionDetails.ts +2 -7
  119. package/src/transform/transformParameters.ts +15 -12
  120. package/src/transform/transformPaths.ts +5 -5
  121. package/src/transform/transformResponses.ts +10 -6
  122. package/src/transform/transformSchemas.ts +2 -2
  123. package/src/transform/transformTelemetryInfo.ts +72 -0
  124. package/src/transform/transfromRLCOptions.ts +34 -15
  125. package/src/utils/clientUtils.ts +2 -4
  126. package/src/utils/interfaces.ts +14 -0
  127. package/src/utils/modelUtils.ts +17 -8
  128. package/src/utils/operationUtil.ts +5 -6
  129. package/dist/src/modular/helpers/fixmeHelpers.d.ts +0 -2
  130. package/dist/src/modular/helpers/fixmeHelpers.d.ts.map +0 -1
  131. package/dist/src/modular/helpers/fixmeHelpers.js +0 -4
  132. package/dist/src/modular/helpers/fixmeHelpers.js.map +0 -1
  133. package/dist/src/modular/helpers/parameterHelpers.d.ts +0 -3
  134. package/dist/src/modular/helpers/parameterHelpers.d.ts.map +0 -1
  135. package/dist/src/modular/helpers/parameterHelpers.js +0 -16
  136. package/dist/src/modular/helpers/parameterHelpers.js.map +0 -1
  137. package/src/modular/helpers/fixmeHelpers.ts +0 -3
  138. package/src/modular/helpers/parameterHelpers.ts +0 -17
package/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## 0.15.0 (2023-08-15)
2
+
3
+ - [Feature] Support custom http authentication in RLC, Please refer to pr [#1959](https://github.com/Azure/autorest.typescript/pull/1959).
4
+ - [Feature] Add ts-node to dev dependencies, Please refer to pr [#1953](https://github.com/Azure/autorest.typescript/pull/1953).
5
+ - [Feature] Allow to generate code under sources folder for typespec input, Please refer to pr [#1960](https://github.com/Azure/autorest.typescript/pull/1960).
6
+ - [Feature] Generate metadata and testing files if relevant files are absent for typespec input, Please refer to pr [#1967](https://github.com/Azure/autorest.typescript/pull/1967).
7
+ - [Feature] Add converter for uint8array map to string in modular, Please refer to pr [#1934](https://github.com/Azure/autorest.typescript/pull/1934).
8
+ - [Bugfix] Fix some issues found in latest OpenAI typespec, Please refer to issue [#1941](https://github.com/Azure/autorest.typescript/issues/1941).
9
+
1
10
  ## 0.14.0 (2023-07-26)
2
11
 
3
12
  - [Feature] Support multi-client in Modular, Please refer to pr [#1830](https://github.com/Azure/autorest.typescript/pull/1830).
@@ -1,10 +1,6 @@
1
1
  import { EmitContext } from "@typespec/compiler";
2
- import { RLCOptions } from "@azure-tools/rlc-common";
3
- import { SdkContext } from "@azure-tools/typespec-client-generator-core";
4
2
  import { Project } from "ts-morph";
5
- export interface RLCSdkContext extends SdkContext {
6
- options: RLCOptions;
7
- }
3
+ export * from "./lib.js";
8
4
  export declare function $onEmit(context: EmitContext): Promise<void>;
9
5
  /**
10
6
  * Removing this for now, as it has some problem when we have two models with the same name and only one of them is unused, this function will end up removing the other used models.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAuBL,UAAU,EAKX,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EACL,UAAU,EAEX,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAAE,OAAO,EAAc,MAAM,UAAU,CAAC;AAc/C,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C,OAAO,EAAE,UAAU,CAAC;CACrB;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,iBA+HjD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,QA6EtD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAmC1D,OAAO,EAAE,OAAO,EAAc,MAAM,UAAU,CAAC;AAkB/C,cAAc,UAAU,CAAC;AAEzB,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,iBAmPjD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,QA+EtD"}
package/dist/src/index.js CHANGED
@@ -1,99 +1,174 @@
1
1
  // Copyright (c) Microsoft Corporation.
2
2
  // Licensed under the MIT License.
3
3
  import * as fsextra from "fs-extra";
4
+ import { existsSync } from "fs";
4
5
  import { buildClientDefinitions, buildResponseTypes, buildParameterTypes, buildIsUnexpectedHelper, buildClient, buildIndexFile, buildTopLevelIndex, buildRollupConfig, buildTsConfig, buildApiExtractorConfig, buildPackageFile, buildPollingHelper, buildPaginateHelper, buildEsLintConfig, buildKarmaConfigFile, buildEnvFile, buildEnvBrowserFile, buildRecordedClientFile, buildSampleTest, buildReadmeFile, buildSerializeHelper, buildLogger, normalizeName, NameType, hasUnexpectedHelper } from "@azure-tools/rlc-common";
5
6
  import { transformRLCModel } from "./transform/transform.js";
6
7
  import { emitContentByBuilder, emitModels } from "./utils/emitUtil.js";
7
8
  import { createSdkContext } from "@azure-tools/typespec-client-generator-core";
8
- import * as path from "path";
9
9
  import { Project, SyntaxKind } from "ts-morph";
10
10
  import { buildClientContext } from "./modular/buildClientContext.js";
11
11
  import { emitCodeModel } from "./modular/buildCodeModel.js";
12
12
  import { buildRootIndex, buildSubClientIndexFile } from "./modular/buildRootIndex.js";
13
- import { buildModels } from "./modular/emitModels.js";
13
+ import { buildModels, buildModelsOptions } from "./modular/emitModels.js";
14
14
  import { buildOperationFiles } from "./modular/buildOperations.js";
15
15
  import { buildSubpathIndexFile } from "./modular/buildSubpathIndex.js";
16
16
  import { buildClassicalClient } from "./modular/buildClassicalClient.js";
17
17
  import { emitPackage, emitTsConfig } from "./modular/buildProjectFiles.js";
18
18
  import { getRLCClients } from "./utils/clientUtils.js";
19
+ import { join } from "path";
20
+ import { transformRLCOptions } from "./transform/transfromRLCOptions.js";
21
+ export * from "./lib.js";
19
22
  export async function $onEmit(context) {
23
+ /** Shared status */
20
24
  const program = context.program;
21
- const options = context.options;
25
+ const emitterOptions = context.options;
22
26
  const dpgContext = createSdkContext(context);
23
- const clients = getRLCClients(dpgContext);
24
- const srcPath = context.emitterOutputDir;
25
- let count = -1;
26
27
  const needUnexpectedHelper = new Map();
27
28
  const serviceNameToRlcModelsMap = new Map();
28
- for (const client of clients) {
29
- count++;
30
- const rlcModels = await transformRLCModel(program, options, client, context.emitterOutputDir, dpgContext);
31
- serviceNameToRlcModelsMap.set(client.service.name, rlcModels);
32
- const pathToClear = rlcModels.srcPath;
33
- needUnexpectedHelper.set(client.name, hasUnexpectedHelper(rlcModels));
34
- clearSrcFolder(pathToClear, count, options.multiClient, options.isModularLibrary);
35
- await emitModels(rlcModels, program);
36
- await emitContentByBuilder(program, buildClientDefinitions, rlcModels);
37
- await emitContentByBuilder(program, buildResponseTypes, rlcModels);
38
- await emitContentByBuilder(program, buildClient, rlcModels);
39
- await emitContentByBuilder(program, buildParameterTypes, rlcModels);
40
- await emitContentByBuilder(program, buildIsUnexpectedHelper, rlcModels);
41
- await emitContentByBuilder(program, buildIndexFile, rlcModels);
42
- await emitContentByBuilder(program, buildLogger, rlcModels);
43
- await emitContentByBuilder(program, buildTopLevelIndex, rlcModels);
44
- await emitContentByBuilder(program, buildPaginateHelper, rlcModels);
45
- await emitContentByBuilder(program, buildPollingHelper, rlcModels);
46
- // buildSerializeHelper
47
- await emitContentByBuilder(program, buildSerializeHelper, rlcModels);
48
- // build metadata relevant files
49
- await emitContentByBuilder(program, [
29
+ const rlcCodeModels = [];
30
+ let modularCodeModel;
31
+ // 1. Enrich the dpg context with path detail and common options
32
+ await enrichDpgContext();
33
+ // 2. Clear sources folder
34
+ await clearSrcFolder();
35
+ // 3. Generate RLC sources
36
+ await generateRLCSources();
37
+ // 4. Generate Modular sources
38
+ await generateModularSources();
39
+ // 5. Generate metadata and test files
40
+ await generateMetadataAndTest();
41
+ async function enrichDpgContext() {
42
+ const generationPathDetail = await calculateGenerationDir();
43
+ dpgContext.generationPathDetail = generationPathDetail;
44
+ const options = transformRLCOptions(emitterOptions, dpgContext);
45
+ dpgContext.rlcOptions = options;
46
+ }
47
+ async function calculateGenerationDir() {
48
+ var _a;
49
+ const projectRoot = (_a = context.emitterOutputDir) !== null && _a !== void 0 ? _a : "";
50
+ let sourcesRoot = join(projectRoot, "src");
51
+ const customizationFolder = join(projectRoot, "sources");
52
+ if (await fsextra.pathExists(customizationFolder)) {
53
+ sourcesRoot = join(customizationFolder, "generated", "src");
54
+ }
55
+ return {
56
+ rootDir: projectRoot,
57
+ metadataDir: projectRoot,
58
+ rlcSourcesDir: join(sourcesRoot, emitterOptions.isModularLibrary ? "rest" : "" // When generating modular library, RLC has to go under rest folder
59
+ ),
60
+ modularSourcesDir: emitterOptions.isModularLibrary
61
+ ? sourcesRoot
62
+ : undefined
63
+ };
64
+ }
65
+ async function clearSrcFolder() {
66
+ var _a, _b, _c, _d;
67
+ await fsextra.emptyDir((_d = (_b = (_a = dpgContext.generationPathDetail) === null || _a === void 0 ? void 0 : _a.modularSourcesDir) !== null && _b !== void 0 ? _b : (_c = dpgContext.generationPathDetail) === null || _c === void 0 ? void 0 : _c.rlcSourcesDir) !== null && _d !== void 0 ? _d : "");
68
+ }
69
+ async function generateRLCSources() {
70
+ const clients = getRLCClients(dpgContext);
71
+ for (const client of clients) {
72
+ const rlcModels = await transformRLCModel(client, dpgContext);
73
+ rlcCodeModels.push(rlcModels);
74
+ serviceNameToRlcModelsMap.set(client.service.name, rlcModels);
75
+ needUnexpectedHelper.set(client.name, hasUnexpectedHelper(rlcModels));
76
+ await emitModels(rlcModels, program);
77
+ await emitContentByBuilder(program, buildClientDefinitions, rlcModels);
78
+ await emitContentByBuilder(program, buildResponseTypes, rlcModels);
79
+ await emitContentByBuilder(program, buildClient, rlcModels);
80
+ await emitContentByBuilder(program, buildParameterTypes, rlcModels);
81
+ await emitContentByBuilder(program, buildIsUnexpectedHelper, rlcModels);
82
+ await emitContentByBuilder(program, buildIndexFile, rlcModels);
83
+ await emitContentByBuilder(program, buildLogger, rlcModels);
84
+ await emitContentByBuilder(program, buildTopLevelIndex, rlcModels);
85
+ await emitContentByBuilder(program, buildPaginateHelper, rlcModels);
86
+ await emitContentByBuilder(program, buildPollingHelper, rlcModels);
87
+ await emitContentByBuilder(program, buildSerializeHelper, rlcModels);
88
+ }
89
+ }
90
+ async function generateModularSources() {
91
+ var _a, _b, _c;
92
+ if (emitterOptions.isModularLibrary) {
93
+ // TODO: Emit modular parts of the library
94
+ const modularSourcesRoot = (_b = (_a = dpgContext.generationPathDetail) === null || _a === void 0 ? void 0 : _a.modularSourcesDir) !== null && _b !== void 0 ? _b : "src";
95
+ const project = new Project();
96
+ modularCodeModel = emitCodeModel(context, serviceNameToRlcModelsMap, {
97
+ casing: "camel"
98
+ });
99
+ const rootIndexFile = project.createSourceFile(`${modularSourcesRoot}/index.ts`, "", {
100
+ overwrite: true
101
+ });
102
+ for (const subClient of modularCodeModel.clients) {
103
+ let subfolder = "";
104
+ if (modularCodeModel.clients.length > 1) {
105
+ subfolder = normalizeName(subClient.name.replace("Client", ""), NameType.File);
106
+ }
107
+ buildModels(modularCodeModel, project, modularSourcesRoot, subfolder);
108
+ buildModelsOptions(subClient, project, modularSourcesRoot, subfolder);
109
+ const hasClientUnexpectedHelper = (_c = needUnexpectedHelper.get(subClient.rlcClientName.replace("Context", "Client"))) !== null && _c !== void 0 ? _c : false;
110
+ buildOperationFiles(dpgContext, subClient, project, modularSourcesRoot, subfolder, hasClientUnexpectedHelper);
111
+ buildClientContext(dpgContext, subClient, project, modularSourcesRoot, subfolder);
112
+ buildSubpathIndexFile(project, modularSourcesRoot, "models", subfolder);
113
+ buildSubpathIndexFile(project, modularSourcesRoot, "api", subfolder);
114
+ buildClassicalClient(dpgContext, subClient, project, modularSourcesRoot, subfolder);
115
+ if (modularCodeModel.clients.length > 1) {
116
+ buildSubClientIndexFile(subClient, project, modularSourcesRoot, subfolder);
117
+ }
118
+ buildRootIndex(subClient, project, rootIndexFile, modularSourcesRoot, subfolder);
119
+ }
120
+ removeUnusedInterfaces(project);
121
+ for (const file of project.getSourceFiles()) {
122
+ await emitContentByBuilder(program, () => ({ content: file.getFullText(), path: file.getFilePath() }), modularCodeModel);
123
+ // emitFile(program, { content: hrlcClient.content, path: hrlcClient.path });
124
+ }
125
+ }
126
+ }
127
+ async function generateMetadataAndTest() {
128
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
129
+ if (rlcCodeModels.length === 0 || !rlcCodeModels[0]) {
130
+ return;
131
+ }
132
+ const rlcClient = rlcCodeModels[0];
133
+ const option = dpgContext.rlcOptions;
134
+ // Generate metadata
135
+ const hasPackageFile = await existsSync(join((_b = (_a = dpgContext.generationPathDetail) === null || _a === void 0 ? void 0 : _a.metadataDir) !== null && _b !== void 0 ? _b : "", "package.json"));
136
+ const shouldGenerateMetadata = option.generateMetadata === true ||
137
+ (option.generateMetadata === undefined && !hasPackageFile);
138
+ const commonBuilders = [
50
139
  buildEsLintConfig,
51
140
  buildRollupConfig,
52
141
  buildApiExtractorConfig,
53
- buildReadmeFile,
54
- buildPackageFile,
55
- buildTsConfig
56
- ], rlcModels, context.emitterOutputDir);
57
- // build test relevant files
58
- await emitContentByBuilder(program, [
59
- buildKarmaConfigFile,
60
- buildEnvFile,
61
- buildEnvBrowserFile,
62
- buildRecordedClientFile,
63
- buildSampleTest
64
- ], rlcModels, context.emitterOutputDir);
65
- }
66
- if (options.isModularLibrary) {
67
- // TODO: Emit modular parts of the library
68
- const project = new Project();
69
- const modularCodeModel = emitCodeModel(context, serviceNameToRlcModelsMap, {
70
- casing: "camel"
71
- });
72
- const rootIndexFile = project.createSourceFile(`${srcPath}/src/index.ts`, "", {
73
- overwrite: true
74
- });
75
- for (const subClient of modularCodeModel.clients) {
76
- let subfolder = "";
77
- if (modularCodeModel.clients.length > 1) {
78
- subfolder = normalizeName(subClient.name.replace("Client", ""), NameType.File);
79
- }
80
- buildClientContext(dpgContext, subClient, project, srcPath, subfolder);
81
- buildModels(modularCodeModel, project, srcPath, subfolder);
82
- buildOperationFiles(dpgContext, subClient, project, srcPath, subfolder, needUnexpectedHelper.get(subClient.name + "Client"));
83
- buildSubpathIndexFile(project, srcPath, "models", subfolder);
84
- buildSubpathIndexFile(project, srcPath, "api", subfolder);
85
- buildClassicalClient(dpgContext, subClient, project, srcPath, subfolder);
86
- if (modularCodeModel.clients.length > 1) {
87
- buildSubClientIndexFile(subClient, project, srcPath, subfolder);
142
+ buildReadmeFile
143
+ ];
144
+ if (!option.isModularLibrary) {
145
+ commonBuilders.push(buildPackageFile);
146
+ commonBuilders.push(buildTsConfig);
147
+ }
148
+ if (shouldGenerateMetadata) {
149
+ // build metadata relevant files
150
+ await emitContentByBuilder(program, commonBuilders, rlcClient, (_c = dpgContext.generationPathDetail) === null || _c === void 0 ? void 0 : _c.metadataDir);
151
+ if (option.isModularLibrary) {
152
+ const project = new Project();
153
+ emitPackage(project, (_e = (_d = dpgContext.generationPathDetail) === null || _d === void 0 ? void 0 : _d.metadataDir) !== null && _e !== void 0 ? _e : "", modularCodeModel);
154
+ emitTsConfig(project, (_g = (_f = dpgContext.generationPathDetail) === null || _f === void 0 ? void 0 : _f.metadataDir) !== null && _g !== void 0 ? _g : "", modularCodeModel);
155
+ for (const file of project.getSourceFiles()) {
156
+ await emitContentByBuilder(program, () => ({ content: file.getFullText(), path: file.getFilePath() }), modularCodeModel);
157
+ }
88
158
  }
89
- buildRootIndex(subClient, project, rootIndexFile, srcPath, subfolder);
90
159
  }
91
- emitPackage(project, srcPath, modularCodeModel);
92
- emitTsConfig(project, srcPath, modularCodeModel);
93
- removeUnusedInterfaces(project);
94
- for (const file of project.getSourceFiles()) {
95
- await emitContentByBuilder(program, () => ({ content: file.getFullText(), path: file.getFilePath() }), modularCodeModel);
96
- // emitFile(program, { content: hrlcClient.content, path: hrlcClient.path });
160
+ // Generate test relevant files
161
+ const hasTestFolder = await fsextra.pathExists(join((_j = (_h = dpgContext.generationPathDetail) === null || _h === void 0 ? void 0 : _h.metadataDir) !== null && _j !== void 0 ? _j : "", "test"));
162
+ const shouldGenerateTest = option.generateTest === true ||
163
+ (option.generateTest === undefined && !hasTestFolder);
164
+ if (shouldGenerateTest) {
165
+ await emitContentByBuilder(program, [
166
+ buildKarmaConfigFile,
167
+ buildEnvFile,
168
+ buildEnvBrowserFile,
169
+ buildRecordedClientFile,
170
+ buildSampleTest
171
+ ], rlcClient, (_k = dpgContext.generationPathDetail) === null || _k === void 0 ? void 0 : _k.metadataDir);
97
172
  }
98
173
  }
99
174
  }
@@ -129,7 +204,9 @@ export function removeUnusedInterfaces(project) {
129
204
  map.set(exportPath, node.getText());
130
205
  });
131
206
  // Get the index.ts file
132
- const indexFiles = project.getSourceFiles("**/index.ts"); // Adjust the path to your index.ts file
207
+ const indexFiles = project.getSourceFiles().filter((file) => {
208
+ return file.getFilePath().endsWith("index.ts");
209
+ }); // Adjust the path to your index.ts file
133
210
  // to make sure the top level index file is in the last
134
211
  const sortedIndexFiles = indexFiles.sort((idx1, idx2) => {
135
212
  return (idx2.getFilePath().split("/").length -
@@ -166,11 +243,4 @@ export function removeUnusedInterfaces(project) {
166
243
  interfaceDeclaration.interfaceDeclaration.remove();
167
244
  });
168
245
  }
169
- function clearSrcFolder(srcPath, count, isMultiClient = false, isModularLibrary = false) {
170
- fsextra.emptyDirSync(srcPath);
171
- if ((isMultiClient || isModularLibrary) && count === 0) {
172
- const folderPath = path.join(srcPath.substring(0, srcPath.lastIndexOf(path.sep + "src") + 4));
173
- fsextra.emptyDirSync(folderPath);
174
- }
175
- }
176
246
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,UAAU,CAkEvD,CAAC;AAgHF,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAA4B,CAAC;AAC9C,eAAO,MAAQ,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAS,CAAC;AAEzC,eAAO,MAAM,yBAAyB,EAAE,OASvC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,OAKjC,CAAC"}
1
+ {"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,UAAU,CAoEvD,CAAC;AAgHF,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAA4B,CAAC;AAC9C,eAAO,MAAQ,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAS,CAAC;AAEzC,eAAO,MAAM,yBAAyB,EAAE,OASvC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,OAKjC,CAAC"}
package/dist/src/lib.js CHANGED
@@ -22,9 +22,9 @@ export const RLCOptionsSchema = {
22
22
  scopeName: { type: "string", nullable: true },
23
23
  nameWithoutScope: { type: "string", nullable: true },
24
24
  description: { type: "string", nullable: true },
25
- version: { type: "string", nullable: false }
25
+ version: { type: "string", nullable: true }
26
26
  },
27
- required: ["name", "version"],
27
+ required: ["name"],
28
28
  nullable: true
29
29
  },
30
30
  addCredentials: { type: "boolean", nullable: true },
@@ -34,6 +34,8 @@ export const RLCOptionsSchema = {
34
34
  items: { type: "string" }
35
35
  },
36
36
  credentialKeyHeaderName: { type: "string", nullable: true },
37
+ customHttpAuthHeaderName: { type: "string", nullable: true },
38
+ customHttpAuthSharedKeyPrefix: { type: "string", nullable: true },
37
39
  generateMetadata: { type: "boolean", nullable: true },
38
40
  generateTest: { type: "boolean", nullable: true },
39
41
  generateSample: { type: "boolean", nullable: true },
@@ -1 +1 @@
1
- {"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { Project } from "ts-morph";
2
2
  import { Client } from "./modularCodeModel.js";
3
- import { SdkContext } from "@azure-tools/typespec-client-generator-core";
3
+ import { SdkContext } from "../utils/interfaces.js";
4
4
  export declare function buildClassicalClient(dpgContext: SdkContext, client: Client, project: Project, srcPath: string, subfolder: string): void;
5
5
  //# sourceMappingURL=buildClassicalClient.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"buildClassicalClient.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,OAAO,EAIR,MAAM,UAAU,CAAC;AAKlB,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAEzE,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAsDlB"}
1
+ {"version":3,"file":"buildClassicalClient.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,OAAO,EAIR,MAAM,UAAU,CAAC;AAKlB,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG/C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAsDlB"}
@@ -4,12 +4,13 @@ import { getClientParameters } from "./helpers/clientHelpers.js";
4
4
  import { getClientName } from "./helpers/namingHelpers.js";
5
5
  import { getOperationFunction } from "./helpers/operationHelpers.js";
6
6
  import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
7
+ import { getDocsFromDescription } from "./helpers/docsHelpers.js";
7
8
  export function buildClassicalClient(dpgContext, client, project, srcPath, subfolder) {
8
9
  const { description } = client;
9
10
  const modularClientName = getClientName(client);
10
11
  const classicalClientname = `${getClientName(client)}Client`;
11
12
  const params = getClientParameters(client);
12
- const clientFile = project.createSourceFile(`${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}${classicalClientname}.ts`);
13
+ const clientFile = project.createSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}${classicalClientname}.ts`);
13
14
  clientFile.addExportDeclaration({
14
15
  namedExports: [`${classicalClientname}Options`],
15
16
  moduleSpecifier: `./api/${modularClientName}Context.js`
@@ -35,7 +36,7 @@ export function buildClassicalClient(dpgContext, client, project, srcPath, subfo
35
36
  }
36
37
  // TODO: We may need to generate constructor overloads at some point. Here we'd do that.
37
38
  const constructor = clientClass.addConstructor({
38
- docs: [description],
39
+ docs: getDocsFromDescription(description),
39
40
  parameters: params
40
41
  });
41
42
  constructor.addStatements([
@@ -52,7 +53,7 @@ export function buildClassicalClient(dpgContext, client, project, srcPath, subfo
52
53
  }
53
54
  function importAllApis(clientFile, srcPath, subfolder) {
54
55
  const project = clientFile.getProject();
55
- const apiModels = project.getSourceFile(`${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}api/index.ts`);
56
+ const apiModels = project.getSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}api/index.ts`);
56
57
  if (!apiModels) {
57
58
  return;
58
59
  }
@@ -64,7 +65,7 @@ function importAllApis(clientFile, srcPath, subfolder) {
64
65
  }
65
66
  function importAllModels(clientFile, srcPath, subfolder) {
66
67
  const project = clientFile.getProject();
67
- const apiModels = project.getSourceFile(`${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}models/models.ts`);
68
+ const apiModels = project.getSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}models/models.ts`);
68
69
  if (!apiModels) {
69
70
  return;
70
71
  }
@@ -73,7 +74,7 @@ function importAllModels(clientFile, srcPath, subfolder) {
73
74
  moduleSpecifier: `./models/models.js`,
74
75
  namedImports: exported
75
76
  });
76
- const apiModelsOptions = project.getSourceFile(`${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}models/options.ts`);
77
+ const apiModelsOptions = project.getSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}models/options.ts`);
77
78
  if (!apiModelsOptions) {
78
79
  return;
79
80
  }
@@ -106,7 +107,7 @@ function buildClientOperationGroups(client, clientClass, subfolder) {
106
107
  {
107
108
  ${operationDeclarations.map((d) => {
108
109
  var _a, _b;
109
- return `${d.name}: (${(_a = d.parameters) === null || _a === void 0 ? void 0 : _a.filter((p) => p.name !== "context").map((p) => p.name + ": " + p.type).join(",")}): ${d.returnType} => {return ${d.name}(${[
110
+ return `${d.name}: (${(_a = d.parameters) === null || _a === void 0 ? void 0 : _a.filter((p) => p.name !== "context").map((p) => p.name + (p.name === "options" ? "?" : "") + ": " + p.type).join(",")}): ${d.returnType} => {return ${d.name}(${[
110
111
  "this._client",
111
112
  ...[(_b = d.parameters) === null || _b === void 0 ? void 0 : _b.map((p) => p.name).filter((p) => p !== "context")]
112
113
  ].join(",")})}`;
@@ -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,6 +1,6 @@
1
1
  import { Project, SourceFile } from "ts-morph";
2
2
  import { Client } from "./modularCodeModel.js";
3
- import { SdkContext } from "@azure-tools/typespec-client-generator-core";
3
+ import { SdkContext } from "../utils/interfaces.js";
4
4
  /**
5
5
  * This function creates the file containing the modular client context
6
6
  */
@@ -1 +1 @@
1
- {"version":3,"file":"buildClientContext.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAIpE,OAAO,EAAE,MAAM,EAAa,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAEzE;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,MAAc,EACvB,SAAS,GAAE,MAAW,GACrB,UAAU,CAmHZ"}
1
+ {"version":3,"file":"buildClientContext.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAIpE,OAAO,EAAE,MAAM,EAAa,MAAM,uBAAuB,CAAC;AAI1D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,MAAc,EACvB,SAAS,GAAE,MAAW,GACrB,UAAU,CA2HZ"}
@@ -2,14 +2,17 @@ import { getClientParameters } from "./helpers/clientHelpers.js";
2
2
  import { importCredential } from "./helpers/credentialHelpers.js";
3
3
  import { getClientName } from "./helpers/namingHelpers.js";
4
4
  import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
5
+ import { getDocsFromDescription } from "./helpers/docsHelpers.js";
6
+ import { importModels } from "./buildOperations.js";
5
7
  /**
6
8
  * This function creates the file containing the modular client context
7
9
  */
8
10
  export function buildClientContext(dpgContext, client, project, srcPath = "src", subfolder = "") {
9
11
  const { description, parameters } = client;
10
12
  const name = getClientName(client);
11
- const clientContextFile = project.createSourceFile(`${srcPath}/src/${subfolder && subfolder !== "" ? subfolder + "/" : ""}/api/${name}Context.ts`);
13
+ const clientContextFile = project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}/api/${name}Context.ts`);
12
14
  let factoryFunction;
15
+ importModels(srcPath, clientContextFile, project, subfolder);
13
16
  clientContextFile.addImportDeclaration({
14
17
  moduleSpecifier: "@azure-rest/core-client",
15
18
  namedImports: ["ClientOptions"]
@@ -29,7 +32,7 @@ export function buildClientContext(dpgContext, client, project, srcPath = "src",
29
32
  namedExports: [`Client`]
30
33
  });
31
34
  factoryFunction = clientContextFile.addFunction({
32
- docs: [description],
35
+ docs: getDocsFromDescription(description),
33
36
  name: `create${name}`,
34
37
  returnType: `Client.${client.name}`,
35
38
  parameters: getClientParameters(client),
@@ -47,7 +50,7 @@ export function buildClientContext(dpgContext, client, project, srcPath = "src",
47
50
  namedExports: [`${rlcClientName}`]
48
51
  });
49
52
  factoryFunction = clientContextFile.addFunction({
50
- docs: [description],
53
+ docs: getDocsFromDescription(description),
51
54
  name: `create${name}`,
52
55
  returnType: `${rlcClientName}`,
53
56
  parameters: getClientParameters(client),
@@ -56,20 +59,25 @@ export function buildClientContext(dpgContext, client, project, srcPath = "src",
56
59
  }
57
60
  const credentialsParam = parameters.find((p) => p.clientName === "credential");
58
61
  const baseUrlParam = parameters.find((p) => p.location === "endpointPath");
59
- let baseUrl = "endpoint";
60
62
  if (baseUrlParam) {
63
+ let baseUrl = "endpoint";
61
64
  baseUrl =
62
65
  baseUrlParam.type.type === "constant"
63
66
  ? baseUrlParam.type.value
64
67
  : baseUrlParam.clientName;
68
+ factoryFunction.addStatements([`const baseUrl = ${baseUrl}`]);
69
+ }
70
+ let getClientStatement = `const clientContext = getClient(options)`;
71
+ if (baseUrlParam) {
72
+ getClientStatement = `const clientContext = getClient(baseUrl, options)`;
65
73
  }
66
- factoryFunction.addStatements([`const baseUrl = ${baseUrl}`]);
67
- let getClientStatement = `const clientContext = getClient(baseUrl, options)`;
68
74
  // If the client needs credentials we need to pass those to getClient
69
75
  if (credentialsParam) {
70
76
  importCredential(credentialsParam.type, clientContextFile);
71
77
  addCredentialOptionsStatement(credentialsParam, factoryFunction);
72
- getClientStatement = `const clientContext = getClient(baseUrl, credential, options)`;
78
+ getClientStatement = baseUrlParam
79
+ ? `const clientContext = getClient(baseUrl, credential, options)`
80
+ : `const clientContext = getClient(credential, options)`;
73
81
  }
74
82
  factoryFunction.addStatements([getClientStatement, "return clientContext;"]);
75
83
  if (isRLCMultiEndpoint(dpgContext)) {
@@ -89,6 +97,7 @@ export function buildClientContext(dpgContext, client, project, srcPath = "src",
89
97
  ]);
90
98
  }
91
99
  clientContextFile.fixMissingImports({}, { importModuleSpecifierEnding: "js" });
100
+ clientContextFile.fixUnusedIdentifiers();
92
101
  return clientContextFile;
93
102
  }
94
103
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"buildClientContext.js","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildClientContext.js","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"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"}