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

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 (88) 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 +25 -20
  5. package/.rush/temp/shrinkwrap-deps.json +81 -6
  6. package/CHANGELOG.md +15 -1
  7. package/CONTRIBUTING.md +29 -0
  8. package/README.md +3 -0
  9. package/dist/buildClient.js +44 -6
  10. package/dist/buildClient.js.map +1 -1
  11. package/dist/buildClientDefinitions.js.map +1 -1
  12. package/dist/buildIsUnexpectedHelper.js +52 -51
  13. package/dist/buildIsUnexpectedHelper.js.map +1 -1
  14. package/dist/buildMethodShortcuts.js +1 -1
  15. package/dist/buildMethodShortcuts.js.map +1 -1
  16. package/dist/buildObjectTypes.js +16 -9
  17. package/dist/buildObjectTypes.js.map +1 -1
  18. package/dist/buildParameterTypes.js +45 -3
  19. package/dist/buildParameterTypes.js.map +1 -1
  20. package/dist/buildResponseTypes.js +1 -1
  21. package/dist/buildResponseTypes.js.map +1 -1
  22. package/dist/helpers/nameConstructors.js +2 -2
  23. package/dist/helpers/nameConstructors.js.map +1 -1
  24. package/dist/helpers/nameUtils.js +1 -1
  25. package/dist/helpers/nameUtils.js.map +1 -1
  26. package/dist/helpers/operationHelpers.js +1 -1
  27. package/dist/helpers/operationHelpers.js.map +1 -1
  28. package/dist/helpers/shortcutMethods.js +1 -1
  29. package/dist/helpers/shortcutMethods.js.map +1 -1
  30. package/dist/interfaces.js.map +1 -1
  31. package/dist/metadata/buildPackageFile.js +2 -2
  32. package/dist/metadata/buildPackageFile.js.map +1 -1
  33. package/dist/metadata/buildReadmeFile.js +3 -3
  34. package/dist/package.json +1 -1
  35. package/dist/static/paginateContent.js +1 -1
  36. package/dist/test/template.js +1 -0
  37. package/dist/test/template.js.map +1 -1
  38. package/dist-esm/buildClient.js +43 -5
  39. package/dist-esm/buildClient.js.map +1 -1
  40. package/dist-esm/buildClientDefinitions.js +1 -1
  41. package/dist-esm/buildClientDefinitions.js.map +1 -1
  42. package/dist-esm/buildIsUnexpectedHelper.js +52 -51
  43. package/dist-esm/buildIsUnexpectedHelper.js.map +1 -1
  44. package/dist-esm/buildMethodShortcuts.js +1 -1
  45. package/dist-esm/buildMethodShortcuts.js.map +1 -1
  46. package/dist-esm/buildObjectTypes.js +16 -7
  47. package/dist-esm/buildObjectTypes.js.map +1 -1
  48. package/dist-esm/buildParameterTypes.js +49 -2
  49. package/dist-esm/buildParameterTypes.js.map +1 -1
  50. package/dist-esm/buildResponseTypes.js +1 -1
  51. package/dist-esm/buildResponseTypes.js.map +1 -1
  52. package/dist-esm/helpers/nameConstructors.js +2 -2
  53. package/dist-esm/helpers/nameConstructors.js.map +1 -1
  54. package/dist-esm/helpers/nameUtils.js +1 -1
  55. package/dist-esm/helpers/nameUtils.js.map +1 -1
  56. package/dist-esm/helpers/operationHelpers.js +1 -1
  57. package/dist-esm/helpers/operationHelpers.js.map +1 -1
  58. package/dist-esm/helpers/shortcutMethods.js +1 -1
  59. package/dist-esm/helpers/shortcutMethods.js.map +1 -1
  60. package/dist-esm/interfaces.js.map +1 -1
  61. package/dist-esm/metadata/buildPackageFile.js +2 -2
  62. package/dist-esm/metadata/buildPackageFile.js.map +1 -1
  63. package/dist-esm/metadata/buildReadmeFile.js +3 -3
  64. package/dist-esm/package.json +1 -1
  65. package/dist-esm/static/paginateContent.js +1 -1
  66. package/dist-esm/test/template.js +1 -0
  67. package/dist-esm/test/template.js.map +1 -1
  68. package/package.json +10 -4
  69. package/src/buildClient.ts +70 -7
  70. package/src/buildClientDefinitions.ts +6 -2
  71. package/src/buildIsUnexpectedHelper.ts +52 -52
  72. package/src/buildMethodShortcuts.ts +1 -1
  73. package/src/buildObjectTypes.ts +24 -8
  74. package/src/buildParameterTypes.ts +59 -3
  75. package/src/buildResponseTypes.ts +1 -1
  76. package/src/helpers/nameConstructors.ts +2 -2
  77. package/src/helpers/nameUtils.ts +1 -1
  78. package/src/helpers/operationHelpers.ts +1 -1
  79. package/src/helpers/schemaHelpers.ts +1 -1
  80. package/src/helpers/shortcutMethods.ts +1 -1
  81. package/src/interfaces.ts +8 -0
  82. package/src/metadata/buildPackageFile.ts +2 -2
  83. package/src/metadata/buildReadmeFile.ts +3 -3
  84. package/src/static/paginateContent.ts +1 -1
  85. package/src/test/template.ts +1 -0
  86. package/types/buildParameterTypes.d.ts +9 -1
  87. package/types/interfaces.d.ts +7 -0
  88. package/types/test/template.d.ts +1 -1
@@ -42,7 +42,6 @@ function restLevelPackage(model, hasSamplesGenerated) {
42
42
  if (packageDetails.version.includes("beta")) {
43
43
  apiRefUrlQueryParameter = "?view=azure-node-preview";
44
44
  }
45
- const description = packageDetails.description;
46
45
  const hasPaging = (0, operationHelpers_js_1.hasPagingOperations)(model);
47
46
  const hasLRO = (0, operationHelpers_js_1.hasPollingOperations)(model);
48
47
  const packageInfo = {
@@ -115,7 +114,7 @@ function restLevelPackage(model, hasSamplesGenerated) {
115
114
  prettier: "2.2.1",
116
115
  rimraf: "^3.0.0",
117
116
  "source-map-support": "^0.5.9",
118
- typescript: "~4.6.0"
117
+ typescript: "~4.8.0"
119
118
  }
120
119
  };
121
120
  if (azureOutputDirectory) {
@@ -160,6 +159,7 @@ function restLevelPackage(model, hasSamplesGenerated) {
160
159
  packageInfo.devDependencies["@azure/identity"] = "^2.0.1";
161
160
  packageInfo.devDependencies["@azure-tools/test-recorder"] = "^2.0.0";
162
161
  packageInfo.devDependencies["mocha"] = "^7.1.1";
162
+ packageInfo.devDependencies["@types/mocha"] = "^7.0.2";
163
163
  packageInfo.devDependencies["mocha-junit-reporter"] = "^1.18.0";
164
164
  packageInfo.devDependencies["cross-env"] = "^7.0.2";
165
165
  packageInfo.devDependencies["@types/chai"] = "^4.2.8";
@@ -1 +1 @@
1
- {"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":"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"}
@@ -36,7 +36,7 @@ Key links:
36
36
 
37
37
  ### Currently supported environments
38
38
 
39
- - Node.js version 14.x.x or higher
39
+ - LTS versions of Node.js
40
40
 
41
41
  ### Prerequisites
42
42
 
@@ -73,7 +73,7 @@ AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_CLIENT_SECRET
73
73
  Enabling logging may help uncover useful information about failures. In order to see a log of HTTP requests and responses, set the \`AZURE_LOG_LEVEL\` environment variable to \`info\`. Alternatively, logging can be enabled at runtime by calling \`setLogLevel\` in the \`@azure/logger\`:
74
74
 
75
75
  \`\`\`javascript
76
- import { setLogLevel } from "@azure/logger";
76
+ const { setLogLevel } = require("@azure/logger");
77
77
 
78
78
  setLogLevel("info");
79
79
  \`\`\`
@@ -116,7 +116,7 @@ function createMetadata(model) {
116
116
  const clientPackageName = packageDetails === null || packageDetails === void 0 ? void 0 : packageDetails.name;
117
117
  const clientClassName = getClientName(model);
118
118
  const serviceName = getServiceName(model);
119
- var apiRefUrlQueryParameter = "";
119
+ let apiRefUrlQueryParameter = "";
120
120
  if (packageDetails === null || packageDetails === void 0 ? void 0 : packageDetails.version.includes("beta")) {
121
121
  apiRefUrlQueryParameter = "?view=azure-node-preview";
122
122
  }
package/dist/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@azure-tools/rlc-common","version":"1.0.0-beta.1","description":"","type":"commonjs","main":"dist/index.js","module":"dist-esm/index.js","exports":{".":{"types":"./types/index.d.ts","require":"./dist/index.js","import":"./dist-esm/index.js"}},"types":"./types/index.d.ts","scripts":{"build":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js","build:cjs":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig-cjs.json && node publishPackage.js","build:esm":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && node publishPackage.js","test":"echo \"Error: no test specified\" && exit 1"},"keywords":[],"author":"","license":"ISC","dependencies":{"ts-morph":"^15.1.0","lodash":"^4.17.21","handlebars":"^4.7.7"},"devDependencies":{"@types/node":"^18.0.0","prettier":"~2.7.1","typescript":"^4.6.3","rimraf":"^3.0.2","@types/lodash":"^4.14.182","fs-extra":"^10.0.0","@types/fs-extra":"^8.1.0","ts-node":"^10.7.0"}}
1
+ {"name":"@azure-tools/rlc-common","version":"1.0.0-beta.4","description":"","type":"commonjs","main":"dist/index.js","module":"dist-esm/index.js","exports":{".":{"types":"./types/index.d.ts","require":"./dist/index.js","import":"./dist-esm/index.js"}},"types":"./types/index.d.ts","scripts":{"lint":"eslint src --ext .ts --max-warnings=0","lint:fix":"eslint src --fix --ext .ts","format":"npm run -s prettier -- --write","check-format":"npm run prettier -- --check","prettier":"prettier --config ./.prettierrc src/**/*.ts","build":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js","build:cjs":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig-cjs.json && node publishPackage.js","build:esm":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && node publishPackage.js","test":"echo \"Error: no test specified\" && exit 1"},"keywords":[],"author":"","license":"ISC","dependencies":{"ts-morph":"^15.1.0","lodash":"^4.17.21","handlebars":"^4.7.7"},"devDependencies":{"@types/node":"^18.0.0","eslint":"^8.9.0","prettier":"~2.7.1","typescript":"~4.8.0","rimraf":"^3.0.2","@types/lodash":"^4.14.182","fs-extra":"^10.0.0","@types/fs-extra":"^8.1.0","ts-node":"^10.7.0"}}
@@ -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
  }
@@ -66,6 +66,7 @@ module.exports = function (config) {
66
66
  "AZURE_CLIENT_ID",
67
67
  "AZURE_TENANT_ID",
68
68
  "SUBSCRIPTION_ID",
69
+ "RECORDINGS_RELATIVE_PATH",
69
70
  ],
70
71
 
71
72
  // 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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgI1B,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,19 @@ 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
+ const urlParameters = model?.urlInfo?.urlParameters?.filter(
40
+ // Do not include parameters with constant values in the signature, these should go in the options bag
41
+ (p) => p.value === undefined);
42
+ const optionalUrlParameters = model?.urlInfo?.urlParameters?.filter(
43
+ // Do not include parameters with constant values in the signature, these should go in the options bag
44
+ (p) => Boolean(p.value));
45
+ const clientOptionsInterface = getClientOptionsInterface(clientInterfaceName, optionalUrlParameters);
46
+ if (clientOptionsInterface) {
47
+ clientFile.addInterface(clientOptionsInterface);
48
+ }
19
49
  if (!model.options) {
20
50
  return undefined;
21
51
  }
@@ -32,15 +62,15 @@ export function buildClient(model) {
32
62
  ? []
33
63
  : [{ name: "credentials", type: credentialTypes.join(" | ") }])
34
64
  ];
35
- const clientInterfaceName = clientName.endsWith("Client")
36
- ? `${clientName}`
37
- : `${clientName}Client`;
38
65
  const functionStatement = {
39
66
  isExported: true,
40
67
  name: `createClient`,
41
68
  parameters: [
42
69
  ...commonClientParams,
43
- { name: "options", type: "ClientOptions = {}" }
70
+ {
71
+ name: "options",
72
+ type: `${clientOptionsInterface?.name ?? "ClientOptions"} = {}`
73
+ }
44
74
  ],
45
75
  docs: [
46
76
  {
@@ -94,6 +124,13 @@ function getClientFactoryBody(model, clientTypeName) {
94
124
  let clientPackageName = packageDetails.nameWithoutScope ?? "";
95
125
  const packageVersion = packageDetails.version;
96
126
  const { endpoint, urlParameters } = model.urlInfo;
127
+ const optionalUrlParameters = [];
128
+ for (const param of urlParameters ?? []) {
129
+ if (param.value) {
130
+ const value = typeof param.value === "string" ? `"${param.value}"` : param.value;
131
+ optionalUrlParameters.push(`const ${param.name} = options.${param.name} ?? ${value}`);
132
+ }
133
+ }
97
134
  let baseUrl;
98
135
  if (urlParameters && endpoint) {
99
136
  let parsedEndpoint = endpoint;
@@ -168,6 +205,7 @@ function getClientFactoryBody(model, clientTypeName) {
168
205
  returnStatement = `return { ...client, ${shortcutBody.join()} };`;
169
206
  }
170
207
  return [
208
+ ...optionalUrlParameters,
171
209
  baseUrlStatement,
172
210
  apiVersionStatement,
173
211
  credentials,
@@ -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":"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"}
1
+ {"version":3,"file":"buildClientDefinitions.js","sourceRoot":"","sources":["../src/buildClientDefinitions.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":"AAAA,uCAAuC;AACvC,kCAAkC;AAGlC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAGL,OAAO,EACP,uBAAuB,EACxB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,MAAM,UAAU,uBAAuB,CAAC,KAAe;IACrD,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE;QAC/B,OAAO;KACR;IACD,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,iBAAiB,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE;QAClE,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,IAAI,GAAG,GAA6B,EAAE,CAAC;IACvC,IAAI,gBAAgB,GAAgB,IAAI,GAAG,EAAE,CAAC;IAC9C,IAAI,aAAa,GAAgB,IAAI,GAAG,EAAE,CAAC;IAC3C,IAAI,SAAS,GAAyD,EAAE,CAAC;IACzE,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC;IAEnC,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QAC5D,KAAK,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACzE,MAAM,cAAc,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;YAChD,MAAM,SAAS,GAAG,GAAG,cAAc,IAAI,IAAI,EAAE,CAAC;YAC9C,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YAC/C,GAAG,GAAG,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;YAE9C,2CAA2C;YAC3C,+BAA+B;YAC/B,IACE,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,aAAa;gBAC3C,cAAc,KAAK,KAAK,EACxB;gBACA,MAAM,SAAS,GAAG,OAAO,IAAI,EAAE,CAAC;gBAChC,MAAM,OAAO,GACX,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;oBAClC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC;oBACxD,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBACjC,GAAG,GAAG,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;aAC/C;YAED,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC;YAC5D,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC;YAExD,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;gBAChE,SAAS;aACV;YAED,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACrD,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACvB,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACxB,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;YAEH,SAAS,CAAC,IAAI,CAAC;gBACb,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,CAAC,GAAG,YAAY,EAAE,GAAG,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;qBACnD;iBACF;gBACD,UAAU,EAAE,eAAe,UAAU,CAAC,CAAC,CAAC,EAAE;aAC3C,CAAC,CAAC;SACJ;KACF;IACD,aAAa,CAAC,oBAAoB,CAAC;QACjC,YAAY,EAAE,CAAC,GAAG,gBAAgB,CAAC;QACnC,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAC;IAEH,aAAa,CAAC,oBAAoB,CAAC;QACjC,YAAY,EAAE;YACZ;gBACE,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;gBAChC,IAAI,EAAE,0BAA0B;aACjC;SACF;QACD,eAAe,EAAE,uBAAuB,CAAC,KAAK;KAC/C,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,IAAI,EAAE;QACtB,MAAM,WAAW,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;QACxD,aAAa,CAAC,WAAW,CAAC;YACxB,SAAS;YACT,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,cAAc;YACpB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;iBACxC;aACF;YACD,UAAU,EAAE,eAAe,CAAC,GAAG,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC3D,UAAU,EAAE;gBACV;;;;YAKI,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OACxB;8BACoB;gBACtB,WAAW;oBACT,CAAC,CAAC,gEAAgE;oBAClE,CAAC,CAAC,cAAc;gBAClB;;SAEC;aACF;SACF,CAAC,CAAC;QACH,IAAI,WAAW,EAAE;YACf,aAAa,CAAC,WAAW,CAAC;gBACxB,UAAU,EAAE,KAAK;gBACjB,IAAI,EAAE,2BAA2B;gBACjC,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,QAAQ;qBACf;iBACF;gBACD,UAAU,EAAE,UAAU;gBACtB,UAAU,EAAE;oBACV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAqDD;iBACA;aACF,CAAC,CAAC;YAEH,aAAa,CAAC,WAAW,CAAC;gBACxB,UAAU,EAAE,KAAK;gBACjB,IAAI,EAAE,qBAAqB;gBAC3B,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,QAAQ;qBACf;iBACF;gBACD,UAAU,EAAE,SAAS;gBACrB,UAAU,EAAE,CAAC,6BAA6B,CAAC;aAC5C,CAAC,CAAC;YAEH,aAAa,CAAC,WAAW,CAAC;gBACxB,UAAU,EAAE,KAAK;gBACjB,IAAI,EAAE,mBAAmB;gBACzB,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,QAAQ;qBACf;iBACF;gBACD,UAAU,EAAE,QAAQ;gBACpB,UAAU,EAAE;oBACV;yCAC+B;iBAChC;aACF,CAAC,CAAC;SACJ;KACF;IAED,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,aAAa,CAAC,WAAW,EAAE;KACrC,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,cAAqB;IAChD,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QACnD,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC7C,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
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"}
@@ -197,7 +197,7 @@ function getImmediateParentsNames(objectSchema, schemaUsage) {
197
197
  if (!objectSchema.parents?.immediate) {
198
198
  return [];
199
199
  }
200
- let extendFrom = [];
200
+ const extendFrom = [];
201
201
  // If an immediate parent is a DictionarySchema, that means that the object has been marked
202
202
  // with additional properties. We need to add Record<string, unknown> to the extend list and
203
203
  if (objectSchema.parents.immediate.find(isDictionarySchema)) {
@@ -218,7 +218,13 @@ function getImmediateParentsNames(objectSchema, schemaUsage) {
218
218
  return [...parents, ...extendFrom];
219
219
  }
220
220
  function getPropertySignatures(properties, schemaUsage, importedModels) {
221
- return Object.keys(properties).map((p) => getPropertySignature({ ...properties[p], name: p }, schemaUsage, importedModels));
221
+ let validProperties = Object.keys(properties);
222
+ if (schemaUsage.includes(SchemaContext.Input)) {
223
+ validProperties = validProperties.filter((p) => {
224
+ return !properties[p].readOnly;
225
+ });
226
+ }
227
+ return validProperties.map((p) => getPropertySignature({ ...properties[p], name: p }, schemaUsage, importedModels));
222
228
  }
223
229
  /**
224
230
  * Builds a Typescript property or parameter signature
@@ -229,11 +235,7 @@ function getPropertySignatures(properties, schemaUsage, importedModels) {
229
235
  export function getPropertySignature(property, schemaUsage, importedModels = new Set()) {
230
236
  const propertyName = property.name;
231
237
  const description = property.description;
232
- const type = ((schemaUsage.includes(SchemaContext.Output) &&
233
- property.usage?.includes(SchemaContext.Output)) ||
234
- (schemaUsage.includes(SchemaContext.Exception) &&
235
- property.usage?.includes(SchemaContext.Exception))) &&
236
- property.outputTypeName
238
+ const type = generateForOutput(schemaUsage, property.usage) && property.outputTypeName
237
239
  ? property.outputTypeName
238
240
  : property.typeName
239
241
  ? property.typeName
@@ -242,8 +244,15 @@ export function getPropertySignature(property, schemaUsage, importedModels = new
242
244
  name: propertyName,
243
245
  ...(description && { docs: [{ description }] }),
244
246
  hasQuestionToken: !property.required,
247
+ isReadonly: generateForOutput(schemaUsage, property.usage) && property.readOnly,
245
248
  type,
246
249
  kind: StructureKind.PropertySignature
247
250
  };
248
251
  }
252
+ function generateForOutput(schemaUsage, propertyUsage) {
253
+ return ((schemaUsage.includes(SchemaContext.Output) &&
254
+ propertyUsage?.includes(SchemaContext.Output)) ||
255
+ (schemaUsage.includes(SchemaContext.Exception) &&
256
+ propertyUsage?.includes(SchemaContext.Exception)));
257
+ }
249
258
  //# sourceMappingURL=buildObjectTypes.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"buildObjectTypes.js","sourceRoot":"","sources":["../src/buildObjectTypes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildObjectTypes.js","sourceRoot":"","sources":["../src/buildObjectTypes.ts"],"names":[],"mappings":"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"}