@azure-tools/rlc-common 1.0.0-beta.1 → 1.0.0-beta.10

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 (135) hide show
  1. package/.eslintrc.json +23 -0
  2. package/.prettierignore +1 -0
  3. package/.prettierrc +7 -0
  4. package/.rush/temp/package-deps_build.json +33 -25
  5. package/.rush/temp/shrinkwrap-deps.json +84 -9
  6. package/CHANGELOG.md +52 -1
  7. package/CONTRIBUTING.md +29 -0
  8. package/README.md +3 -0
  9. package/dist/buildClient.js +89 -19
  10. package/dist/buildClient.js.map +1 -1
  11. package/dist/buildClientDefinitions.js.map +1 -1
  12. package/dist/buildIndexFile.js +18 -0
  13. package/dist/buildIndexFile.js.map +1 -1
  14. package/dist/buildIsUnexpectedHelper.js +52 -51
  15. package/dist/buildIsUnexpectedHelper.js.map +1 -1
  16. package/dist/buildMethodShortcuts.js +1 -1
  17. package/dist/buildMethodShortcuts.js.map +1 -1
  18. package/dist/buildObjectTypes.js +47 -11
  19. package/dist/buildObjectTypes.js.map +1 -1
  20. package/dist/buildParameterTypes.js +31 -3
  21. package/dist/buildParameterTypes.js.map +1 -1
  22. package/dist/buildResponseTypes.js +19 -6
  23. package/dist/buildResponseTypes.js.map +1 -1
  24. package/dist/buildSchemaType.js +22 -1
  25. package/dist/buildSchemaType.js.map +1 -1
  26. package/dist/buildSerializeHelper.js +35 -0
  27. package/dist/buildSerializeHelper.js.map +1 -0
  28. package/dist/buildTopLevelIndexFile.js +6 -3
  29. package/dist/buildTopLevelIndexFile.js.map +1 -1
  30. package/dist/helpers/nameConstructors.js +2 -2
  31. package/dist/helpers/nameConstructors.js.map +1 -1
  32. package/dist/helpers/nameUtils.js +1 -1
  33. package/dist/helpers/nameUtils.js.map +1 -1
  34. package/dist/helpers/operationHelpers.js +23 -3
  35. package/dist/helpers/operationHelpers.js.map +1 -1
  36. package/dist/helpers/pathUtils.js +13 -0
  37. package/dist/helpers/pathUtils.js.map +1 -0
  38. package/dist/helpers/shortcutMethods.js +1 -1
  39. package/dist/helpers/shortcutMethods.js.map +1 -1
  40. package/dist/index.js +1 -0
  41. package/dist/index.js.map +1 -1
  42. package/dist/interfaces.js.map +1 -1
  43. package/dist/metadata/buildPackageFile.js +70 -28
  44. package/dist/metadata/buildPackageFile.js.map +1 -1
  45. package/dist/metadata/buildReadmeFile.js +3 -3
  46. package/dist/package.json +1 -1
  47. package/dist/static/paginateContent.js +1 -1
  48. package/dist/static/pollingContent.js +26 -6
  49. package/dist/static/pollingContent.js.map +1 -1
  50. package/dist/static/serializeHelper.js +30 -0
  51. package/dist/static/serializeHelper.js.map +1 -0
  52. package/dist/test/template.js +1 -2
  53. package/dist/test/template.js.map +1 -1
  54. package/dist-esm/buildClient.js +88 -18
  55. package/dist-esm/buildClient.js.map +1 -1
  56. package/dist-esm/buildClientDefinitions.js +1 -1
  57. package/dist-esm/buildClientDefinitions.js.map +1 -1
  58. package/dist-esm/buildIndexFile.js +19 -1
  59. package/dist-esm/buildIndexFile.js.map +1 -1
  60. package/dist-esm/buildIsUnexpectedHelper.js +52 -51
  61. package/dist-esm/buildIsUnexpectedHelper.js.map +1 -1
  62. package/dist-esm/buildMethodShortcuts.js +1 -1
  63. package/dist-esm/buildMethodShortcuts.js.map +1 -1
  64. package/dist-esm/buildObjectTypes.js +47 -8
  65. package/dist-esm/buildObjectTypes.js.map +1 -1
  66. package/dist-esm/buildParameterTypes.js +35 -2
  67. package/dist-esm/buildParameterTypes.js.map +1 -1
  68. package/dist-esm/buildResponseTypes.js +19 -6
  69. package/dist-esm/buildResponseTypes.js.map +1 -1
  70. package/dist-esm/buildSchemaType.js +23 -2
  71. package/dist-esm/buildSchemaType.js.map +1 -1
  72. package/dist-esm/buildSerializeHelper.js +31 -0
  73. package/dist-esm/buildSerializeHelper.js.map +1 -0
  74. package/dist-esm/buildTopLevelIndexFile.js +6 -3
  75. package/dist-esm/buildTopLevelIndexFile.js.map +1 -1
  76. package/dist-esm/helpers/nameConstructors.js +2 -2
  77. package/dist-esm/helpers/nameConstructors.js.map +1 -1
  78. package/dist-esm/helpers/nameUtils.js +1 -1
  79. package/dist-esm/helpers/nameUtils.js.map +1 -1
  80. package/dist-esm/helpers/operationHelpers.js +15 -3
  81. package/dist-esm/helpers/operationHelpers.js.map +1 -1
  82. package/dist-esm/helpers/pathUtils.js +9 -0
  83. package/dist-esm/helpers/pathUtils.js.map +1 -0
  84. package/dist-esm/helpers/shortcutMethods.js +1 -1
  85. package/dist-esm/helpers/shortcutMethods.js.map +1 -1
  86. package/dist-esm/index.js +1 -0
  87. package/dist-esm/index.js.map +1 -1
  88. package/dist-esm/interfaces.js.map +1 -1
  89. package/dist-esm/metadata/buildPackageFile.js +70 -28
  90. package/dist-esm/metadata/buildPackageFile.js.map +1 -1
  91. package/dist-esm/metadata/buildReadmeFile.js +3 -3
  92. package/dist-esm/package.json +1 -1
  93. package/dist-esm/static/paginateContent.js +1 -1
  94. package/dist-esm/static/pollingContent.js +26 -6
  95. package/dist-esm/static/pollingContent.js.map +1 -1
  96. package/dist-esm/static/serializeHelper.js +27 -0
  97. package/dist-esm/static/serializeHelper.js.map +1 -0
  98. package/dist-esm/test/template.js +1 -2
  99. package/dist-esm/test/template.js.map +1 -1
  100. package/package.json +10 -4
  101. package/src/buildClient.ts +121 -19
  102. package/src/buildClientDefinitions.ts +6 -2
  103. package/src/buildIndexFile.ts +28 -0
  104. package/src/buildIsUnexpectedHelper.ts +52 -52
  105. package/src/buildMethodShortcuts.ts +1 -1
  106. package/src/buildObjectTypes.ts +66 -10
  107. package/src/buildParameterTypes.ts +45 -3
  108. package/src/buildResponseTypes.ts +23 -6
  109. package/src/buildSchemaType.ts +24 -1
  110. package/src/buildSerializeHelper.ts +42 -0
  111. package/src/buildTopLevelIndexFile.ts +9 -3
  112. package/src/helpers/nameConstructors.ts +2 -2
  113. package/src/helpers/nameUtils.ts +1 -1
  114. package/src/helpers/operationHelpers.ts +19 -3
  115. package/src/helpers/pathUtils.ts +9 -0
  116. package/src/helpers/schemaHelpers.ts +1 -1
  117. package/src/helpers/shortcutMethods.ts +1 -1
  118. package/src/index.ts +1 -0
  119. package/src/interfaces.ts +16 -1
  120. package/src/metadata/buildPackageFile.ts +94 -31
  121. package/src/metadata/buildReadmeFile.ts +3 -3
  122. package/src/static/paginateContent.ts +1 -1
  123. package/src/static/pollingContent.ts +26 -6
  124. package/src/static/serializeHelper.ts +29 -0
  125. package/src/test/template.ts +1 -2
  126. package/types/buildObjectTypes.d.ts +2 -1
  127. package/types/buildParameterTypes.d.ts +9 -1
  128. package/types/buildSerializeHelper.d.ts +5 -0
  129. package/types/helpers/operationHelpers.d.ts +4 -0
  130. package/types/helpers/pathUtils.d.ts +1 -0
  131. package/types/index.d.ts +1 -0
  132. package/types/interfaces.d.ts +15 -1
  133. package/types/static/pollingContent.d.ts +1 -1
  134. package/types/static/serializeHelper.d.ts +4 -0
  135. package/types/test/template.d.ts +1 -1
@@ -159,7 +159,7 @@ function checkPagingRequest(response: PathUncheckedResponse): void {
159
159
  ];
160
160
  if (!Http2xxStatusCodes.includes(response.status)) {
161
161
  throw createRestError(
162
- \`Pagination failed with unexpected statusCode \${response.status\}\`,
162
+ \`Pagination failed with unexpected statusCode \${response.status}\`,
163
163
  response
164
164
  );
165
165
  }
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.pollingContent = void 0;
4
4
  exports.pollingContent = `
5
5
  import { Client, HttpResponse } from "@azure-rest/core-client";
6
+ {{#if useLegacyLro}}
6
7
  import {
7
8
  LongRunningOperation,
8
9
  LroEngine,
@@ -11,7 +12,16 @@ import {
11
12
  PollerLike,
12
13
  PollOperationState
13
14
  } from "@azure/core-lro";
14
-
15
+ {{else}}
16
+ import {
17
+ CreateHttpPollerOptions,
18
+ LongRunningOperation,
19
+ LroResponse,
20
+ OperationState,
21
+ SimplePollerLike,
22
+ createHttpPoller
23
+ } from "@azure/core-lro";
24
+ {{/if}}
15
25
  /**
16
26
  * Helper function that builds a Poller object to help polling a long running operation.
17
27
  * @param client - Client to use for sending the request to get additional pages.
@@ -19,12 +29,17 @@ import {
19
29
  * @param options - Options to set a resume state or custom polling interval.
20
30
  * @returns - A poller object to poll for operation state updates and eventually get the final response.
21
31
  */
22
- export function getLongRunningPoller<TResult extends HttpResponse>(
32
+ export {{#unless useLegacyLro}}async {{/unless}}function getLongRunningPoller<TResult extends HttpResponse>(
23
33
  client: Client,
24
34
  initialResponse: TResult,
35
+ {{#if useLegacyLro}}
25
36
  options: LroEngineOptions<TResult, PollOperationState<TResult>> = {}
26
- ): PollerLike<PollOperationState<TResult>, TResult> {
27
- const poller: LongRunningOperation<TResult> = {
37
+ ): PollerLike<PollOperationState<TResult>, TResult> {
38
+ {{else}}
39
+ options: CreateHttpPollerOptions<TResult, OperationState<TResult>> = {}
40
+ ): Promise<SimplePollerLike<OperationState<TResult>, TResult>> {
41
+ {{/if}}
42
+ const poller: LongRunningOperation<TResult> = {
28
43
  requestMethod: initialResponse.request.method,
29
44
  requestPath: initialResponse.request.url,
30
45
  sendInitialRequest: async () => {
@@ -48,13 +63,18 @@ export function getLongRunningPoller<TResult extends HttpResponse>(
48
63
  }
49
64
  };
50
65
 
66
+ {{#if useLegacyLro}}
51
67
  return new LroEngine(poller, options);
68
+ {{else}}
69
+ options.resolveOnUnsuccessful = options.resolveOnUnsuccessful ?? true;
70
+ return await createHttpPoller(poller, options);
71
+ {{/if}}
52
72
  }
53
73
 
54
74
  /**
55
- * Converts a Rest Client response to a response that the LRO engine knows about
75
+ * Converts a Rest Client response to a response that the LRO implementation understands
56
76
  * @param response - a rest client http response
57
- * @returns - An LRO response that the LRO engine can work with
77
+ * @returns - An LRO response that the LRO implementation understands
58
78
  */
59
79
  function getLroResponse<TResult extends HttpResponse>(
60
80
  response: TResult
@@ -1 +1 @@
1
- {"version":3,"file":"pollingContent.js","sourceRoot":"","sources":["../../src/static/pollingContent.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyE7B,CAAC"}
1
+ {"version":3,"file":"pollingContent.js","sourceRoot":"","sources":["../../src/static/pollingContent.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6F7B,CAAC"}
@@ -0,0 +1,30 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.buildTsvCollectionContent = exports.buildSsvCollectionContent = exports.buildPipeCollectionContent = exports.buildMultiCollectionContent = void 0;
4
+ exports.buildMultiCollectionContent = `
5
+ export function buildMultiCollection(
6
+ queryParameters: string[],
7
+ parameterName: string
8
+ ) {
9
+ return queryParameters
10
+ .map((item, index) => {
11
+ if (index === 0) {
12
+ return item;
13
+ }
14
+ return \`\${parameterName}=\${item}\`;
15
+ })
16
+ .join("&");
17
+ }`;
18
+ exports.buildPipeCollectionContent = `
19
+ export function buildPipeCollection(queryParameters: string[]): string {
20
+ return queryParameters.join("|");
21
+ }`;
22
+ exports.buildSsvCollectionContent = `
23
+ export function buildSsvCollection(queryParameters: string[]): string {
24
+ return queryParameters.join(" ");
25
+ }`;
26
+ exports.buildTsvCollectionContent = `
27
+ export function buildTsvCollection(queryParameters: string[]) {
28
+ return queryParameters.join("\\t");
29
+ }`;
30
+ //# sourceMappingURL=serializeHelper.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"serializeHelper.js","sourceRoot":"","sources":["../../src/static/serializeHelper.ts"],"names":[],"mappings":";;;AAAa,QAAA,2BAA2B,GAAG;;;;;;;;;;;;;EAazC,CAAC;AAEU,QAAA,0BAA0B,GAAG;;;EAGxC,CAAC;AAEU,QAAA,yBAAyB,GAAG;;;EAGvC,CAAC;AAEU,QAAA,yBAAyB,GAAG;;;EAGvC,CAAC"}
@@ -31,9 +31,7 @@ module.exports = function (config) {
31
31
  "karma-mocha",
32
32
  "karma-mocha-reporter",
33
33
  "karma-chrome-launcher",
34
- "karma-edge-launcher",
35
34
  "karma-firefox-launcher",
36
- "karma-ie-launcher",
37
35
  "karma-env-preprocessor",
38
36
  "karma-coverage",
39
37
  "karma-sourcemap-loader",
@@ -66,6 +64,7 @@ module.exports = function (config) {
66
64
  "AZURE_CLIENT_ID",
67
65
  "AZURE_TENANT_ID",
68
66
  "SUBSCRIPTION_ID",
67
+ "RECORDINGS_RELATIVE_PATH",
69
68
  ],
70
69
 
71
70
  // test results reporter to use
@@ -1 +1 @@
1
- {"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/test/template.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG;;;;CAIzB,CAAC;AAEW,QAAA,iBAAiB,GAAG;;;;CAIhC,CAAC;AAEW,QAAA,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+H1B,CAAC;AAEW,QAAA,qBAAqB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BpC,CAAC;AAEW,QAAA,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;CAqBhC,CAAC"}
1
+ {"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/test/template.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG;;;;CAIzB,CAAC;AAEW,QAAA,iBAAiB,GAAG;;;;CAIhC,CAAC;AAEW,QAAA,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8H1B,CAAC;AAEW,QAAA,qBAAqB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BpC,CAAC;AAEW,QAAA,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;CAqBhC,CAAC"}
@@ -5,6 +5,24 @@ import * as path from "path";
5
5
  import { NameType, normalizeName } from "./helpers/nameUtils.js";
6
6
  import { isConstantSchema } from "./helpers/schemaHelpers.js";
7
7
  import { buildMethodShortcutImplementation } from "./buildMethodShortcuts.js";
8
+ function getClientOptionsInterface(clientName, optionalUrlParameters) {
9
+ if (!optionalUrlParameters || optionalUrlParameters.length === 0) {
10
+ return undefined;
11
+ }
12
+ const properties = optionalUrlParameters.map((param) => {
13
+ return {
14
+ name: param.name,
15
+ type: param.type,
16
+ hasQuestionToken: true
17
+ };
18
+ });
19
+ return {
20
+ name: `${clientName}Options`,
21
+ extends: ["ClientOptions"],
22
+ isExported: true,
23
+ properties
24
+ };
25
+ }
8
26
  export function buildClient(model) {
9
27
  const name = normalizeName(model.libraryName, NameType.File);
10
28
  const { srcPath } = model;
@@ -15,7 +33,20 @@ export function buildClient(model) {
15
33
  });
16
34
  // Get all paths
17
35
  const clientName = model.libraryName;
18
- const urlParameters = model?.urlInfo?.urlParameters;
36
+ const clientInterfaceName = clientName.endsWith("Client")
37
+ ? `${clientName}`
38
+ : `${clientName}Client`;
39
+ normalizeUrlInfo(model);
40
+ const urlParameters = model?.urlInfo?.urlParameters?.filter(
41
+ // Do not include parameters with constant values in the signature, these should go in the options bag
42
+ (p) => p.value === undefined);
43
+ const optionalUrlParameters = model?.urlInfo?.urlParameters?.filter(
44
+ // Do not include parameters with constant values in the signature, these should go in the options bag
45
+ (p) => Boolean(p.value));
46
+ const clientOptionsInterface = getClientOptionsInterface(clientInterfaceName, optionalUrlParameters);
47
+ if (clientOptionsInterface) {
48
+ clientFile.addInterface(clientOptionsInterface);
49
+ }
19
50
  if (!model.options) {
20
51
  return undefined;
21
52
  }
@@ -30,24 +61,35 @@ export function buildClient(model) {
30
61
  ...(addCredentials === false ||
31
62
  !isSecurityInfoDefined(credentialScopes, credentialKeyHeaderName)
32
63
  ? []
33
- : [{ name: "credentials", type: credentialTypes.join(" | ") }])
64
+ : [
65
+ {
66
+ name: "credentials",
67
+ type: credentialTypes.join(" | "),
68
+ description: `uniquely identify client credential`
69
+ }
70
+ ])
71
+ ];
72
+ const allClientParams = [
73
+ ...commonClientParams,
74
+ {
75
+ name: "options",
76
+ type: `${clientOptionsInterface?.name ?? "ClientOptions"} = {}`,
77
+ description: "the parameter for all optional parameters"
78
+ }
34
79
  ];
35
- const clientInterfaceName = clientName.endsWith("Client")
36
- ? `${clientName}`
37
- : `${clientName}Client`;
38
80
  const functionStatement = {
39
81
  isExported: true,
40
82
  name: `createClient`,
41
- parameters: [
42
- ...commonClientParams,
43
- { name: "options", type: "ClientOptions = {}" }
44
- ],
83
+ parameters: allClientParams,
45
84
  docs: [
46
85
  {
47
- description: `Initialize a new instance of the class ${clientInterfaceName} class. \n` +
48
- commonClientParams
86
+ description: `Initialize a new instance of \`${clientInterfaceName}\` \n` +
87
+ allClientParams
49
88
  .map((param) => {
50
- return `@param ${param.name} type: ${param.type} ${param.description ?? ""}`;
89
+ return `@param ${param.name} type: ${param.type
90
+ .split("=")[0]
91
+ .split(" ")
92
+ .join("")}, ${param.description ?? "The parameter " + param.name}`;
51
93
  })
52
94
  .join("\n")
53
95
  }
@@ -94,6 +136,13 @@ function getClientFactoryBody(model, clientTypeName) {
94
136
  let clientPackageName = packageDetails.nameWithoutScope ?? "";
95
137
  const packageVersion = packageDetails.version;
96
138
  const { endpoint, urlParameters } = model.urlInfo;
139
+ const optionalUrlParameters = [];
140
+ for (const param of urlParameters ?? []) {
141
+ if (param.value) {
142
+ const value = typeof param.value === "string" ? `"${param.value}"` : param.value;
143
+ optionalUrlParameters.push(`const ${param.name} = options.${param.name} ?? ${value}`);
144
+ }
145
+ }
97
146
  let baseUrl;
98
147
  if (urlParameters && endpoint) {
99
148
  let parsedEndpoint = endpoint;
@@ -105,7 +154,7 @@ function getClientFactoryBody(model, clientTypeName) {
105
154
  else {
106
155
  baseUrl = `options.baseUrl ?? "${endpoint}"`;
107
156
  }
108
- const apiVersion = getApiVersion(model);
157
+ const apiVersion = getApiVersionInQueryParam(model);
109
158
  let apiVersionStatement = "";
110
159
  if (apiVersion) {
111
160
  apiVersionStatement = `options.apiVersion = options.apiVersion ?? "${apiVersion}"`;
@@ -168,6 +217,7 @@ function getClientFactoryBody(model, clientTypeName) {
168
217
  returnStatement = `return { ...client, ${shortcutBody.join()} };`;
169
218
  }
170
219
  return [
220
+ ...optionalUrlParameters,
171
221
  baseUrlStatement,
172
222
  apiVersionStatement,
173
223
  credentials,
@@ -178,14 +228,34 @@ function getClientFactoryBody(model, clientTypeName) {
178
228
  returnStatement
179
229
  ];
180
230
  }
181
- function getApiVersion(model) {
182
- if (!model.apiVersionParam) {
231
+ function getApiVersionInQueryParam(model) {
232
+ if (!model.apiVersionInQueryParam) {
183
233
  return undefined;
184
234
  }
185
- if (model.apiVersionParam &&
186
- isConstantSchema(model.apiVersionParam)) {
187
- return model.apiVersionParam.default;
235
+ if (model.apiVersionInQueryParam &&
236
+ isConstantSchema(model.apiVersionInQueryParam)) {
237
+ return model.apiVersionInQueryParam.default;
188
238
  }
189
239
  return undefined;
190
240
  }
241
+ function normalizeUrlInfo(model) {
242
+ if (!model ||
243
+ !model.urlInfo ||
244
+ !model.urlInfo.endpoint ||
245
+ !model.urlInfo.urlParameters ||
246
+ model.urlInfo.urlParameters.length === 0) {
247
+ return;
248
+ }
249
+ let parsedEndpoint = model.urlInfo.endpoint;
250
+ const urlParameters = model.urlInfo.urlParameters;
251
+ urlParameters.forEach((urlParameter) => {
252
+ const name = urlParameter.name;
253
+ const normalizedName = normalizeName(name, NameType.Parameter);
254
+ if (name !== normalizedName) {
255
+ urlParameter.name = normalizedName;
256
+ parsedEndpoint = parsedEndpoint.replace(`{${name}}`, `{${normalizedName}}`);
257
+ }
258
+ });
259
+ model.urlInfo.endpoint = parsedEndpoint;
260
+ }
191
261
  //# sourceMappingURL=buildClient.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"buildClient.js","sourceRoot":"","sources":["../src/buildClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildClient.js","sourceRoot":"","sources":["../src/buildClient.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ import { Project, StructureKind, Writers } from "ts-morph";
4
4
  import * as path from "path";
5
5
  import { buildMethodDefinitions, getPathParamDefinitions } from "./helpers/operationHelpers.js";
6
6
  import { generateMethodShortcuts } from "./helpers/shortcutMethods.js";
7
- import { REST_CLIENT_RESERVED } from './buildMethodShortcuts.js';
7
+ import { REST_CLIENT_RESERVED } from "./buildMethodShortcuts.js";
8
8
  import { CasingConvention, NameType, normalizeName } from "./helpers/nameUtils.js";
9
9
  import { pascalCase } from "./helpers/nameUtils.js";
10
10
  export function buildClientDefinitions(model) {
@@ -1 +1 @@
1
- {"version":3,"file":"buildClientDefinitions.js","sourceRoot":"","sources":["../src/buildClientDefinitions.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAIL,OAAO,EAEP,aAAa,EACb,OAAO,EACR,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,MAAM,UAAU,sBAAsB,CAAC,KAAe;IACpD,MAAM,OAAO,GAAG;QACd,kBAAkB,EAAE,IAAI,GAAG,EAAU;QACrC,iBAAiB,EAAE,IAAI,GAAG,EAAU;QACpC,aAAa,EAAE,IAAI,GAAG,EAAU;KACjC,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAC5D,MAAM,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE;QAC1E,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,gBAAgB;IAChB,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC;IACnC,IAAI,SAAS,GAAkD,EAAE,CAAC;IAClE,qEAAqE;IACrE,0CAA0C;IAC1C,IAAI,yBAAyB,GAAqC,EAAE,CAAC;IAErE,IAAI,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE;QACnC,SAAS,GAAG,uBAAuB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjD,qBAAqB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC/C,yBAAyB,GAAG,SAAS;aAClC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC;aAC5C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;KACxC;IAED,qBAAqB,CAAC,YAAY,CAAC;QACjC,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,IAAI;QAChB,cAAc,EAAE,qCAAqC,CACnD,cAAc,EACd,qBAAqB,EACrB,OAAO,CACR;KACF,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;IAErC,MAAM,mBAAmB,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACvD,CAAC,CAAC,GAAG,UAAU,EAAE;QACjB,CAAC,CAAC,GAAG,UAAU,QAAQ,CAAC;IAE1B,qBAAqB,CAAC,YAAY,CAAC;QACjC,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAC5B,QAAQ,EACR,OAAO,CAAC,UAAU,CAAC;YACjB,UAAU,EAAE;gBACV,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAChC,GAAG,yBAAyB;aAC7B;SACF,CAAC;QACF,kFAAkF;QAClF,qEAAqE;QACrE,wEAAwE;QACxE,kDAAkD;QAClD,GAAG,CAAC,yBAAyB,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;YACvD,CAAC,CAAC,CAAC,kBAAkB,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC,CACR;KACF,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE;QACnC,qBAAqB,CAAC,oBAAoB,CAAC;YACzC,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAC7C,eAAe,EAAE,cAAc;SAChC,CAAC,CAAC;KACJ;IAED,IAAI,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE;QAClC,qBAAqB,CAAC,oBAAoB,CAAC;YACzC,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;YAC5C,eAAe,EAAE,aAAa;SAC/B,CAAC,CAAC;KACJ;IAED,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACpC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC9C,qBAAqB,CAAC,qBAAqB,CAAC;QAC1C;YACE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;YACxC,eAAe,EAAE,yBAAyB;SAC3C;KACF,CAAC,CAAC;IAEH,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qBAAqB,CAAC,WAAW,EAAE,EAAE,CAAC;AAC1E,CAAC;AAED,SAAS,qCAAqC,CAC5C,KAAY,EACZ,UAAsB,EACtB,OAIC;IAED,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,UAAU,GAAwC,EAAE,CAAC;IAC3D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACpC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE;YAClD,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC7C,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBACnD,MAAM,CAAC,UAAU;qBACd,KAAK,CAAC,KAAK,CAAC;qBACZ,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;aAC3D;SACF;QACD,uCAAuC,CACrC,KAAK,CAAC,GAAG,CAAC,EACV,mBAAmB,EACnB,UAAU,CACX,CAAC;QACF,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC;QAC7C,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE;gBACJ,iBAAiB,GAAG;qBACjB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;qBACpB,OAAO,CACN,IAAI,EACJ,KAAK,CACN,0CAA0C,MAAM,CAAC,IAAI,CACtD,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CACnB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;aACf;YACD,UAAU,EAAE;gBACV,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,GAAG,EAAE;gBAClC,GAAG,uBAAuB,CAAC,UAAU,CAAC;aACvC;YACD,UAAU,EAAE,0BAA0B,CACpC,KAAK,CAAC,GAAG,CAAC,EACV,sBAAsB,CAAC,KAAK,CAAC,CAC9B;YACD,IAAI,EAAE,aAAa,CAAC,aAAa;SAClC,CAAC,CAAC;KACJ;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAY;IAC1C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;SACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC;SACvC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC;IAE7C,OAAO,WAAW,CAAC,IAAI,CAAC;AAC1B,CAAC;AAED,SAAS,0BAA0B,CACjC,EAAE,kBAAkB,EAAE,IAAI,EAAgB,EAC1C,mBAA2B;IAE3B,IACE,mBAAmB,GAAG,CAAC;QACvB,kBAAkB;QAClB,kBAAkB,KAAK,QAAQ,EAC/B;QACA,OAAO,GAAG,UAAU,CAAC,kBAAkB,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;KAC/D;IAED,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,uCAAuC,CAC9C,IAAkB,EAClB,mBAA2B,EAC3B,IAAgB;IAEhB,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE,iBAAiB;QAC1B,IAAI,EAAE,0BAA0B,CAAC,IAAI,EAAE,mBAAmB,CAAC;QAC3D,UAAU,EAAE,IAAI;KACjB,CAAC;IACF,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,eAAe,CAAC,aAAqB;IAC5C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,aAAa,CAAC;QAC9C,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,aAAa,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;IAC/C,MAAM,cAAc,GAAG,aAAa,CAClC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,EACpC,QAAQ,CAAC,cAAc,EACvB,IAAI,EACJ,oBAAoB,EACpB,gBAAgB,CAAC,KAAK,CACvB,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,aAAa;KACpB,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,aAAa,GAAG;QACpB,oBAAoB;QACpB,gBAAgB;QAChB,yBAAyB;KAC1B,CAAC;IACF,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;AAC3E,CAAC"}
1
+ {"version":3,"file":"buildClientDefinitions.js","sourceRoot":"","sources":["../src/buildClientDefinitions.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAIL,OAAO,EAEP,aAAa,EACb,OAAO,EACR,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,MAAM,UAAU,sBAAsB,CAAC,KAAe;IACpD,MAAM,OAAO,GAAG;QACd,kBAAkB,EAAE,IAAI,GAAG,EAAU;QACrC,iBAAiB,EAAE,IAAI,GAAG,EAAU;QACpC,aAAa,EAAE,IAAI,GAAG,EAAU;KACjC,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAC5D,MAAM,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE;QAC1E,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,gBAAgB;IAChB,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC;IACnC,IAAI,SAAS,GAAkD,EAAE,CAAC;IAClE,qEAAqE;IACrE,0CAA0C;IAC1C,IAAI,yBAAyB,GAAqC,EAAE,CAAC;IAErE,IAAI,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE;QACnC,SAAS,GAAG,uBAAuB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjD,qBAAqB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC/C,yBAAyB,GAAG,SAAS;aAClC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC;aAC5C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;KACxC;IAED,qBAAqB,CAAC,YAAY,CAAC;QACjC,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,IAAI;QAChB,cAAc,EAAE,qCAAqC,CACnD,cAAc,EACd,qBAAqB,EACrB,OAAO,CACR;KACF,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;IAErC,MAAM,mBAAmB,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACvD,CAAC,CAAC,GAAG,UAAU,EAAE;QACjB,CAAC,CAAC,GAAG,UAAU,QAAQ,CAAC;IAE1B,qBAAqB,CAAC,YAAY,CAAC;QACjC,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAC5B,QAAQ,EACR,OAAO,CAAC,UAAU,CAAC;YACjB,UAAU,EAAE;gBACV,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAChC,GAAG,yBAAyB;aAC7B;SACF,CAAC;QACF,kFAAkF;QAClF,qEAAqE;QACrE,wEAAwE;QACxE,kDAAkD;QAClD,GAAG,CAAC,yBAAyB,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;YACvD,CAAC,CAAC,CAAC,kBAAkB,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC,CACR;KACF,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE;QACnC,qBAAqB,CAAC,oBAAoB,CAAC;YACzC,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAC7C,eAAe,EAAE,cAAc;SAChC,CAAC,CAAC;KACJ;IAED,IAAI,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE;QAClC,qBAAqB,CAAC,oBAAoB,CAAC;YACzC,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;YAC5C,eAAe,EAAE,aAAa;SAC/B,CAAC,CAAC;KACJ;IAED,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACpC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC9C,qBAAqB,CAAC,qBAAqB,CAAC;QAC1C;YACE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;YACxC,eAAe,EAAE,yBAAyB;SAC3C;KACF,CAAC,CAAC;IAEH,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qBAAqB,CAAC,WAAW,EAAE,EAAE,CAAC;AAC1E,CAAC;AAED,SAAS,qCAAqC,CAC5C,KAAY,EACZ,UAAsB,EACtB,OAIC;IAED,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,UAAU,GAAwC,EAAE,CAAC;IAC3D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACpC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE;YAClD,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC7C,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBACnD,MAAM,CAAC,UAAU;qBACd,KAAK,CAAC,KAAK,CAAC;qBACZ,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;aAC3D;SACF;QACD,uCAAuC,CACrC,KAAK,CAAC,GAAG,CAAC,EACV,mBAAmB,EACnB,UAAU,CACX,CAAC;QACF,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC;QAC7C,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE;gBACJ,iBAAiB,GAAG;qBACjB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;qBACpB,OAAO,CACN,IAAI,EACJ,KAAK,CACN,0CAA0C,MAAM,CAAC,IAAI,CACtD,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CACnB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;aACf;YACD,UAAU,EAAE;gBACV,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,GAAG,EAAE;gBAClC,GAAG,uBAAuB,CAAC,UAAU,CAAC;aACvC;YACD,UAAU,EAAE,0BAA0B,CACpC,KAAK,CAAC,GAAG,CAAC,EACV,sBAAsB,CAAC,KAAK,CAAC,CAC9B;YACD,IAAI,EAAE,aAAa,CAAC,aAAa;SAClC,CAAC,CAAC;KACJ;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAY;IAC1C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;SACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC;SACvC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC;IAE7C,OAAO,WAAW,CAAC,IAAI,CAAC;AAC1B,CAAC;AAED,SAAS,0BAA0B,CACjC,EAAE,kBAAkB,EAAE,IAAI,EAAgB,EAC1C,mBAA2B;IAE3B,IACE,mBAAmB,GAAG,CAAC;QACvB,kBAAkB;QAClB,kBAAkB,KAAK,QAAQ,EAC/B;QACA,OAAO,GAAG,UAAU,CAAC,kBAAkB,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;KAC/D;IAED,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,uCAAuC,CAC9C,IAAkB,EAClB,mBAA2B,EAC3B,IAAgB;IAEhB,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE,iBAAiB;QAC1B,IAAI,EAAE,0BAA0B,CAAC,IAAI,EAAE,mBAAmB,CAAC;QAC3D,UAAU,EAAE,IAAI;KACjB,CAAC;IACF,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,eAAe,CAAC,aAAqB;IAC5C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,aAAa,CAAC;QAC9C,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,aAAa,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;IAC/C,MAAM,cAAc,GAAG,aAAa,CAClC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,EACpC,QAAQ,CAAC,cAAc,EACvB,IAAI,EACJ,oBAAoB,EACpB,gBAAgB,CAAC,KAAK,CACvB,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,aAAa;KACpB,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,aAAa,GAAG;QACpB,oBAAoB;QACpB,gBAAgB;QAChB,yBAAyB;KAC1B,CAAC;IACF,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;AAC3E,CAAC"}
@@ -2,7 +2,7 @@
2
2
  // Licensed under the MIT License.
3
3
  import { Project } from "ts-morph";
4
4
  import { NameType, normalizeName } from "./helpers/nameUtils.js";
5
- import { hasInputModels, hasOutputModels, hasPagingOperations, hasPollingOperations, hasUnexpectedHelper } from "./helpers/operationHelpers.js";
5
+ import { hasInputModels, hasMultiCollection, hasOutputModels, hasPagingOperations, hasPipeCollection, hasPollingOperations, hasSsvCollection, hasTsvCollection, hasUnexpectedHelper } from "./helpers/operationHelpers.js";
6
6
  import * as path from "path";
7
7
  export function buildIndexFile(model) {
8
8
  const multiClient = Boolean(model.options?.multiClient), batch = model.options?.batch;
@@ -70,6 +70,16 @@ function generateRLCIndexForMultiClient(file, model) {
70
70
  });
71
71
  exports.push("PollingHelper");
72
72
  }
73
+ if (hasMultiCollection(model) ||
74
+ hasSsvCollection(model) ||
75
+ hasPipeCollection(model) ||
76
+ hasTsvCollection(model)) {
77
+ file.addImportDeclaration({
78
+ namespaceImport: "SerializeHelper",
79
+ moduleSpecifier: "./serializeHelper"
80
+ });
81
+ exports.push("SerializeHelper");
82
+ }
73
83
  file.addExportDeclarations([
74
84
  {
75
85
  moduleSpecifier: `./${moduleName}`,
@@ -137,6 +147,14 @@ function generateRLCIndex(file, model) {
137
147
  }
138
148
  ]);
139
149
  }
150
+ if (hasMultiCollection(model) ||
151
+ hasSsvCollection(model) ||
152
+ hasPipeCollection(model) ||
153
+ hasTsvCollection(model)) {
154
+ file.addExportDeclarations([{
155
+ moduleSpecifier: "./serializeHelper"
156
+ }]);
157
+ }
140
158
  file.addExportAssignment({
141
159
  expression: createClientFuncName,
142
160
  isExportEquals: false
@@ -1 +1 @@
1
- {"version":3,"file":"buildIndexFile.js","sourceRoot":"","sources":["../src/buildIndexFile.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildIndexFile.js","sourceRoot":"","sources":["../src/buildIndexFile.ts"],"names":[],"mappings":"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"}
@@ -14,9 +14,9 @@ export function buildIsUnexpectedHelper(model) {
14
14
  overwrite: true
15
15
  });
16
16
  let map = {};
17
- let allResponseTypes = new Set();
18
- let allErrorTypes = new Set();
19
- let overloads = [];
17
+ const allResponseTypes = new Set();
18
+ const allErrorTypes = new Set();
19
+ const overloads = [];
20
20
  const pathDictionary = model.paths;
21
21
  for (const [path, details] of Object.entries(pathDictionary)) {
22
22
  for (const [methodName, methodDetails] of Object.entries(details.methods)) {
@@ -91,7 +91,7 @@ export function buildIsUnexpectedHelper(model) {
91
91
  ${hasTemplate ? "let" : "const"} pathDetails = responseMap[\`\${method} \${url.pathname}\`];
92
92
  if (!pathDetails) {`,
93
93
  hasTemplate
94
- ? "pathDetails = geParametrizedPathSuccess(method, url.pathname);"
94
+ ? "pathDetails = getParametrizedPathSuccess(method, url.pathname);"
95
95
  : `return true;`,
96
96
  ` }
97
97
  return !pathDetails.includes(response.status);
@@ -101,7 +101,7 @@ export function buildIsUnexpectedHelper(model) {
101
101
  if (hasTemplate) {
102
102
  isErrorHelper.addFunction({
103
103
  isExported: false,
104
- name: "geParametrizedPathSuccess",
104
+ name: "getParametrizedPathSuccess",
105
105
  parameters: [
106
106
  {
107
107
  name: "method",
@@ -115,73 +115,74 @@ export function buildIsUnexpectedHelper(model) {
115
115
  returnType: `string[]`,
116
116
  statements: [
117
117
  `
118
- const pathParts = path.split("/");
119
-
120
- // Iterate the responseMap to find a match
121
- for (const [key, value] of Object.entries(responseMap)) {
122
- // Extracting the path from the map key which is in format
123
- // GET /path/foo
124
- if (!key.startsWith(method)) {
125
- continue;
126
- }
127
- const candidatePath = getPathFromMapKey(key);
128
- // Get each part of the url path
129
- const candidateParts = candidatePath.split("/");
130
-
131
- // If the candidate and actual paths don't match in size
132
- // we move on to the next candidate path
133
- if (
134
- candidateParts.length === pathParts.length &&
135
- hasParametrizedPath(key)
136
- ) {
118
+ const pathParts = path.split("/");
119
+
120
+ // Traverse list to match the longest candidate
121
+ // matchedLen: the length of candidate path
122
+ // matchedValue: the matched status code array
123
+ let matchedLen = -1,
124
+ matchedValue: string[] = [];
125
+
126
+ // Iterate the responseMap to find a match
127
+ for (const [key, value] of Object.entries(responseMap)) {
128
+ // Extracting the path from the map key which is in format
129
+ // GET /path/foo
130
+ if (!key.startsWith(method)) {
131
+ continue;
132
+ }
133
+ const candidatePath = getPathFromMapKey(key);
134
+ // Get each part of the url path
135
+ const candidateParts = candidatePath.split("/");
136
+
137
137
  // track if we have found a match to return the values found.
138
138
  let found = true;
139
- for (let i = 0; i < candidateParts.length; i++) {
139
+ for (
140
+ let i = candidateParts.length - 1, j = pathParts.length - 1;
141
+ i >= 1 && j >= 1;
142
+ i--, j--
143
+ ) {
140
144
  if (
141
145
  candidateParts[i]?.startsWith("{") &&
142
- candidateParts[i]?.endsWith("}")
146
+ candidateParts[i]?.indexOf("}") !== -1
143
147
  ) {
148
+ const start = candidateParts[i]!.indexOf("}") + 1,
149
+ end = candidateParts[i]?.length;
144
150
  // If the current part of the candidate is a "template" part
145
- // it is a match with the actual path part on hand
146
- // skip as the parameterized part can match anything
151
+ // Try to use the suffix of pattern to match the path
152
+ // {guid} ==> $
153
+ // {guid}:export ==> :export$
154
+ const isMatched = new RegExp(
155
+ \`\${candidateParts[i]?.slice(start, end)}\`
156
+ ).test(pathParts[j] || '');
157
+
158
+ if (!isMatched) {
159
+ found = false;
160
+ break;
161
+ }
147
162
  continue;
148
163
  }
149
-
164
+
150
165
  // If the candidate part is not a template and
151
166
  // the parts don't match mark the candidate as not found
152
167
  // to move on with the next candidate path.
153
- if (candidateParts[i] !== pathParts[i]) {
168
+ if (candidateParts[i] !== pathParts[j]) {
154
169
  found = false;
155
170
  break;
156
171
  }
157
172
  }
158
-
173
+
159
174
  // We finished evaluating the current candidate parts
160
- // if all parts matched we return the success values form
161
- // the path mapping.
162
- if (found) {
163
- return value;
175
+ // Update the matched value if and only if we found the longer pattern
176
+ if (found && candidatePath.length > matchedLen) {
177
+ matchedLen = candidatePath.length;
178
+ matchedValue = value;
164
179
  }
165
180
  }
166
- }
167
-
168
- // No match was found, return an empty array.
169
- return [];
181
+
182
+ return matchedValue;
170
183
  `
171
184
  ]
172
185
  });
173
- isErrorHelper.addFunction({
174
- isExported: false,
175
- name: "hasParametrizedPath",
176
- parameters: [
177
- {
178
- name: "path",
179
- type: "string"
180
- }
181
- ],
182
- returnType: `boolean`,
183
- statements: [`return path.includes("/{");`]
184
- });
185
186
  isErrorHelper.addFunction({
186
187
  isExported: false,
187
188
  name: "getPathFromMapKey",
@@ -1 +1 @@
1
- {"version":3,"file":"buildIsUnexpectedHelper.js","sourceRoot":"","sources":["../src/buildIsUnexpectedHelper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildIsUnexpectedHelper.js","sourceRoot":"","sources":["../src/buildIsUnexpectedHelper.ts"],"names":[],"mappings":"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"}
@@ -13,7 +13,7 @@ export const REST_CLIENT_RESERVED = [
13
13
  }
14
14
  ];
15
15
  export function buildMethodShortcutImplementation(paths) {
16
- let keys = {};
16
+ const keys = {};
17
17
  for (const path of Object.keys(paths)) {
18
18
  const groupName = normalizeName(paths[path].operationGroupName, NameType.OperationGroup, true, REST_CLIENT_RESERVED, CasingConvention.Camel);
19
19
  if (keys[groupName]) {
@@ -1 +1 @@
1
- {"version":3,"file":"buildMethodShortcuts.js","sourceRoot":"","sources":["../src/buildMethodShortcuts.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,aAAa,EAEd,MAAM,wBAAwB,CAAC;AAGhC,MAAM,CAAC,MAAM,oBAAoB,GAAmB;IAClD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,EAAE;IAC3E;QACE,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC;KAC1D;IACD;QACE,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC;KAC1D;CACF,CAAC;AAEF,MAAM,UAAU,iCAAiC,CAAC,KAAY;IAC5D,IAAI,IAAI,GAA6B,EAAE,CAAC;IACxC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACrC,MAAM,SAAS,GAAG,aAAa,CAC7B,KAAK,CAAC,IAAI,CAAC,CAAC,kBAAkB,EAC9B,QAAQ,CAAC,cAAc,EACvB,IAAI,EACJ,oBAAoB,EACpB,gBAAgB,CAAC,KAAK,CACvB,CAAC;QAEF,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACxE;aAAM;YACL,IAAI,CAAC,SAAS,CAAC,GAAG,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SACjE;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,0BAA0B,CAAC,IAAY,EAAE,YAA0B;IAC1E,IAAI,GAAG,GAAa,EAAE,CAAC;IACvB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;QACtD,KAAK,MAAM,EAAE,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC7C,MAAM,UAAU,GAAG,YAAY,EAAE,cAAc,CAAC;YAChD,MAAM,IAAI,GAAG,aAAa,CAAC,EAAE,CAAC,aAAa,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChE,MAAM,iBAAiB,GAAG,4BAA4B,CACpD,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,UAAU,CACX,CAAC;YACF,GAAG,GAAG,CAAC,GAAG,GAAG,EAAE,iBAAiB,CAAC,CAAC;SACnC;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,4BAA4B,CACnC,IAAY,EACZ,aAAqB,EACrB,MAAc,EACd,aAA8B,EAAE;IAEhC,MAAM,cAAc,GAAG,GACrB,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAChE,EAAE,CAAC;IACH,OAAO,IAAI,aAAa,OAAO,cAAc;4BACnB,IAAI,MAAM,cAAc,KAAK,MAAM;MACzD,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"buildMethodShortcuts.js","sourceRoot":"","sources":["../src/buildMethodShortcuts.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,aAAa,EAEd,MAAM,wBAAwB,CAAC;AAGhC,MAAM,CAAC,MAAM,oBAAoB,GAAmB;IAClD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,EAAE;IAC3E;QACE,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC;KAC1D;IACD;QACE,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC;KAC1D;CACF,CAAC;AAEF,MAAM,UAAU,iCAAiC,CAAC,KAAY;IAC5D,MAAM,IAAI,GAA6B,EAAE,CAAC;IAC1C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACrC,MAAM,SAAS,GAAG,aAAa,CAC7B,KAAK,CAAC,IAAI,CAAC,CAAC,kBAAkB,EAC9B,QAAQ,CAAC,cAAc,EACvB,IAAI,EACJ,oBAAoB,EACpB,gBAAgB,CAAC,KAAK,CACvB,CAAC;QAEF,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACxE;aAAM;YACL,IAAI,CAAC,SAAS,CAAC,GAAG,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SACjE;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,0BAA0B,CAAC,IAAY,EAAE,YAA0B;IAC1E,IAAI,GAAG,GAAa,EAAE,CAAC;IACvB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;QACtD,KAAK,MAAM,EAAE,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC7C,MAAM,UAAU,GAAG,YAAY,EAAE,cAAc,CAAC;YAChD,MAAM,IAAI,GAAG,aAAa,CAAC,EAAE,CAAC,aAAa,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChE,MAAM,iBAAiB,GAAG,4BAA4B,CACpD,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,UAAU,CACX,CAAC;YACF,GAAG,GAAG,CAAC,GAAG,GAAG,EAAE,iBAAiB,CAAC,CAAC;SACnC;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,4BAA4B,CACnC,IAAY,EACZ,aAAqB,EACrB,MAAc,EACd,aAA8B,EAAE;IAEhC,MAAM,cAAc,GAAG,GACrB,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAChE,EAAE,CAAC;IACH,OAAO,IAAI,aAAa,OAAO,cAAc;4BACnB,IAAI,MAAM,cAAc,KAAK,MAAM;MACzD,CAAC;AACP,CAAC"}