@azure-tools/rlc-common 0.13.2 → 0.13.3

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 (11) hide show
  1. package/.rush/temp/operation/build/state.json +1 -1
  2. package/.rush/temp/package-deps_build.json +3 -3
  3. package/CHANGELOG.md +4 -0
  4. package/dist/buildIsUnexpectedHelper.js +36 -49
  5. package/dist/buildIsUnexpectedHelper.js.map +1 -1
  6. package/dist/package.json +1 -1
  7. package/dist-esm/buildIsUnexpectedHelper.js +36 -49
  8. package/dist-esm/buildIsUnexpectedHelper.js.map +1 -1
  9. package/dist-esm/package.json +1 -1
  10. package/package.json +1 -1
  11. package/src/buildIsUnexpectedHelper.ts +36 -53
package/.rush/temp/operation/build/state.json CHANGED
@@ -1,3 +1,3 @@
1
1
  {
2
- "nonCachedDurationMs": 6434.369672000059
2
+ "nonCachedDurationMs": 6613.154929000011
3
3
  }
package/.rush/temp/package-deps_build.json CHANGED
@@ -3,15 +3,15 @@
3
3
  "packages/rlc-common/.eslintrc.json": "9fa7b6e2fbe4e63955031b8f8556b51c0a16a46b",
4
4
  "packages/rlc-common/.prettierignore": "0f7a61c11bf3ac442a984b1136525710e0ebf6d3",
5
5
  "packages/rlc-common/.prettierrc": "83e03202b2f3ad5b8df166a965fea698eccb0f90",
6
- "packages/rlc-common/CHANGELOG.md": "821a55116320a9be240229d749939f4a18da8d08",
6
+ "packages/rlc-common/CHANGELOG.md": "b5d06202d3818273d8cb145047cd82354daa67dd",
7
7
  "packages/rlc-common/CONTRIBUTING.md": "1e6cd52a747c7461956721c6d6b64466608a33ab",
8
8
  "packages/rlc-common/README.md": "4089f33033d3351a176a9d9c6dcaff93cbe9514d",
9
- "packages/rlc-common/package.json": "3caf48720e04e6038c844ff1ae751810c84e763a",
9
+ "packages/rlc-common/package.json": "1e416a9e98ea89df01b3367267a4c980fdea699a",
10
10
  "packages/rlc-common/publishPackage.js": "3512e26d1199937b1962f3b4189aa9c506d9da1a",
11
11
  "packages/rlc-common/src/buildClient.ts": "576075adc1df556d2e9cebbf383c0948a288c0d9",
12
12
  "packages/rlc-common/src/buildClientDefinitions.ts": "9d57b0bb46ce84fd442bf4cc0e3631de48778bf2",
13
13
  "packages/rlc-common/src/buildIndexFile.ts": "8aca048bd46b2376b71f6544b5220be59a28b537",
14
- "packages/rlc-common/src/buildIsUnexpectedHelper.ts": "4f5ad8bfb674242067c40f1d1924d111b359b015",
14
+ "packages/rlc-common/src/buildIsUnexpectedHelper.ts": "e2b617ad98544a7646157e5027e761e07b63d048",
15
15
  "packages/rlc-common/src/buildLogger.ts": "ee2ceec802a6cf786ea9167b9a789d20657de800",
16
16
  "packages/rlc-common/src/buildMethodShortcuts.ts": "833a2b2965d7b71d5a696b358498a9f9e68d83d1",
17
17
  "packages/rlc-common/src/buildObjectTypes.ts": "bfb85f686fe53b4d1c925cfd196b75cfc13af82b",
package/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 0.13.3 (2023-06-14)
2
+
3
+ - [Bugfix] Fix isUnexpected helper function in health insights case. Please refer to pr [#1889](https://github.com/Azure/autorest.typescript/pull/1889).
4
+
1
5
  ## 0.13.2 (2023-06-13)
2
6
 
3
7
  - [Feature] Support typespec compiler 0.45.0, Please refer to pr [#1881](https://github.com/Azure/autorest.typescript/pull/1881).
package/dist/buildIsUnexpectedHelper.js CHANGED
@@ -86,7 +86,6 @@ function buildIsUnexpectedHelper(model) {
86
86
  declarationKind: ts_morph_1.VariableDeclarationKind.Const
87
87
  });
88
88
  if (allErrorTypes.size) {
89
- const hasTemplate = hasParametrizedPath(pathDictionary);
90
89
  isErrorHelper.addFunction({
91
90
  overloads,
92
91
  isExported: true,
@@ -103,33 +102,30 @@ function buildIsUnexpectedHelper(model) {
103
102
  const lroOriginal = response.headers["x-ms-original-url"];
104
103
  const url = new URL(lroOriginal ?? response.request.url);
105
104
  const method = response.request.method;
106
- ${hasTemplate ? "let" : "const"} pathDetails = responseMap[\`\${method} \${url.pathname}\`];
107
- if (!pathDetails) {`,
108
- hasTemplate
109
- ? "pathDetails = getParametrizedPathSuccess(method, url.pathname);"
110
- : `return true;`,
111
- ` }
105
+ let pathDetails = responseMap[\`\${method} \${url.pathname}\`];
106
+ if (!pathDetails) {
107
+ pathDetails = getParametrizedPathSuccess(method, url.pathname);
108
+ }
112
109
  return !pathDetails.includes(response.status);
113
110
  `
114
111
  ]
115
112
  });
116
- if (hasTemplate) {
117
- isErrorHelper.addFunction({
118
- isExported: false,
119
- name: "getParametrizedPathSuccess",
120
- parameters: [
121
- {
122
- name: "method",
123
- type: "string"
124
- },
125
- {
126
- name: "path",
127
- type: "string"
128
- }
129
- ],
130
- returnType: `string[]`,
131
- statements: [
132
- `
113
+ isErrorHelper.addFunction({
114
+ isExported: false,
115
+ name: "getParametrizedPathSuccess",
116
+ parameters: [
117
+ {
118
+ name: "method",
119
+ type: "string"
120
+ },
121
+ {
122
+ name: "path",
123
+ type: "string"
124
+ }
125
+ ],
126
+ returnType: `string[]`,
127
+ statements: [
128
+ `
133
129
  const pathParts = path.split("/");
134
130
 
135
131
  // Traverse list to match the longest candidate
@@ -196,24 +192,23 @@ function buildIsUnexpectedHelper(model) {
196
192
 
197
193
  return matchedValue;
198
194
  `
199
- ]
200
- });
201
- isErrorHelper.addFunction({
202
- isExported: false,
203
- name: "getPathFromMapKey",
204
- parameters: [
205
- {
206
- name: "mapKey",
207
- type: "string"
208
- }
209
- ],
210
- returnType: `string`,
211
- statements: [
212
- `const pathStart = mapKey.indexOf("/");
195
+ ]
196
+ });
197
+ isErrorHelper.addFunction({
198
+ isExported: false,
199
+ name: "getPathFromMapKey",
200
+ parameters: [
201
+ {
202
+ name: "mapKey",
203
+ type: "string"
204
+ }
205
+ ],
206
+ returnType: `string`,
207
+ statements: [
208
+ `const pathStart = mapKey.indexOf("/");
213
209
  return mapKey.slice(pathStart);`
214
- ]
215
- });
216
- }
210
+ ]
211
+ });
217
212
  }
218
213
  return {
219
214
  path: filePath,
@@ -221,12 +216,4 @@ function buildIsUnexpectedHelper(model) {
221
216
  };
222
217
  }
223
218
  exports.buildIsUnexpectedHelper = buildIsUnexpectedHelper;
224
- function hasParametrizedPath(pathDictionary) {
225
- for (const [path] of Object.entries(pathDictionary)) {
226
- if (path.includes("/{") && path.includes("}")) {
227
- return true;
228
- }
229
- }
230
- return false;
231
- }
232
219
  //# sourceMappingURL=buildIsUnexpectedHelper.js.map
package/dist/buildIsUnexpectedHelper.js.map CHANGED
@@ -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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"}
package/dist/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@azure-tools/rlc-common","version":"0.13.2","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":"~5.0.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"},"bugs":{"url":"https://github.com/Azure/autorest.typescript/issues"},"homepage":"https://github.com/Azure/autorest.typescript/tree/main/packages/rlc-common/"}
1
+ {"name":"@azure-tools/rlc-common","version":"0.13.3","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":"~5.0.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"},"bugs":{"url":"https://github.com/Azure/autorest.typescript/issues"},"homepage":"https://github.com/Azure/autorest.typescript/tree/main/packages/rlc-common/"}
package/dist-esm/buildIsUnexpectedHelper.js CHANGED
@@ -86,7 +86,6 @@ export function buildIsUnexpectedHelper(model) {
86
86
  declarationKind: VariableDeclarationKind.Const
87
87
  });
88
88
  if (allErrorTypes.size) {
89
- const hasTemplate = hasParametrizedPath(pathDictionary);
90
89
  isErrorHelper.addFunction({
91
90
  overloads,
92
91
  isExported: true,
@@ -103,33 +102,30 @@ export function buildIsUnexpectedHelper(model) {
103
102
  const lroOriginal = response.headers["x-ms-original-url"];
104
103
  const url = new URL(lroOriginal ?? response.request.url);
105
104
  const method = response.request.method;
106
- ${hasTemplate ? "let" : "const"} pathDetails = responseMap[\`\${method} \${url.pathname}\`];
107
- if (!pathDetails) {`,
108
- hasTemplate
109
- ? "pathDetails = getParametrizedPathSuccess(method, url.pathname);"
110
- : `return true;`,
111
- ` }
105
+ let pathDetails = responseMap[\`\${method} \${url.pathname}\`];
106
+ if (!pathDetails) {
107
+ pathDetails = getParametrizedPathSuccess(method, url.pathname);
108
+ }
112
109
  return !pathDetails.includes(response.status);
113
110
  `
114
111
  ]
115
112
  });
116
- if (hasTemplate) {
117
- isErrorHelper.addFunction({
118
- isExported: false,
119
- name: "getParametrizedPathSuccess",
120
- parameters: [
121
- {
122
- name: "method",
123
- type: "string"
124
- },
125
- {
126
- name: "path",
127
- type: "string"
128
- }
129
- ],
130
- returnType: `string[]`,
131
- statements: [
132
- `
113
+ isErrorHelper.addFunction({
114
+ isExported: false,
115
+ name: "getParametrizedPathSuccess",
116
+ parameters: [
117
+ {
118
+ name: "method",
119
+ type: "string"
120
+ },
121
+ {
122
+ name: "path",
123
+ type: "string"
124
+ }
125
+ ],
126
+ returnType: `string[]`,
127
+ statements: [
128
+ `
133
129
  const pathParts = path.split("/");
134
130
 
135
131
  // Traverse list to match the longest candidate
@@ -196,36 +192,27 @@ export function buildIsUnexpectedHelper(model) {
196
192
 
197
193
  return matchedValue;
198
194
  `
199
- ]
200
- });
201
- isErrorHelper.addFunction({
202
- isExported: false,
203
- name: "getPathFromMapKey",
204
- parameters: [
205
- {
206
- name: "mapKey",
207
- type: "string"
208
- }
209
- ],
210
- returnType: `string`,
211
- statements: [
212
- `const pathStart = mapKey.indexOf("/");
195
+ ]
196
+ });
197
+ isErrorHelper.addFunction({
198
+ isExported: false,
199
+ name: "getPathFromMapKey",
200
+ parameters: [
201
+ {
202
+ name: "mapKey",
203
+ type: "string"
204
+ }
205
+ ],
206
+ returnType: `string`,
207
+ statements: [
208
+ `const pathStart = mapKey.indexOf("/");
213
209
  return mapKey.slice(pathStart);`
214
- ]
215
- });
216
- }
210
+ ]
211
+ });
217
212
  }
218
213
  return {
219
214
  path: filePath,
220
215
  content: isErrorHelper.getFullText()
221
216
  };
222
217
  }
223
- function hasParametrizedPath(pathDictionary) {
224
- for (const [path] of Object.entries(pathDictionary)) {
225
- if (path.includes("/{") && path.includes("}")) {
226
- return true;
227
- }
228
- }
229
- return false;
230
- }
231
218
  //# sourceMappingURL=buildIsUnexpectedHelper.js.map
package/dist-esm/buildIsUnexpectedHelper.js.map CHANGED
@@ -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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"}
package/dist-esm/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@azure-tools/rlc-common","version":"0.13.2","description":"","type":"module","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":"~5.0.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"},"bugs":{"url":"https://github.com/Azure/autorest.typescript/issues"},"homepage":"https://github.com/Azure/autorest.typescript/tree/main/packages/rlc-common/"}
1
+ {"name":"@azure-tools/rlc-common","version":"0.13.3","description":"","type":"module","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":"~5.0.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"},"bugs":{"url":"https://github.com/Azure/autorest.typescript/issues"},"homepage":"https://github.com/Azure/autorest.typescript/tree/main/packages/rlc-common/"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azure-tools/rlc-common",
3
- "version": "0.13.2",
3
+ "version": "0.13.3",
4
4
  "description": "",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
package/src/buildIsUnexpectedHelper.ts CHANGED
@@ -116,7 +116,6 @@ export function buildIsUnexpectedHelper(model: RLCModel) {
116
116
  });
117
117
 
118
118
  if (allErrorTypes.size) {
119
- const hasTemplate = hasParametrizedPath(pathDictionary);
120
119
  isErrorHelper.addFunction({
121
120
  overloads,
122
121
  isExported: true,
@@ -133,35 +132,30 @@ export function buildIsUnexpectedHelper(model: RLCModel) {
133
132
  const lroOriginal = response.headers["x-ms-original-url"];
134
133
  const url = new URL(lroOriginal ?? response.request.url);
135
134
  const method = response.request.method;
136
- ${
137
- hasTemplate ? "let" : "const"
138
- } pathDetails = responseMap[\`\${method} \${url.pathname}\`];
139
- if (!pathDetails) {`,
140
- hasTemplate
141
- ? "pathDetails = getParametrizedPathSuccess(method, url.pathname);"
142
- : `return true;`,
143
- ` }
135
+ let pathDetails = responseMap[\`\${method} \${url.pathname}\`];
136
+ if (!pathDetails) {
137
+ pathDetails = getParametrizedPathSuccess(method, url.pathname);
138
+ }
144
139
  return !pathDetails.includes(response.status);
145
140
  `
146
141
  ]
147
142
  });
148
- if (hasTemplate) {
149
- isErrorHelper.addFunction({
150
- isExported: false,
151
- name: "getParametrizedPathSuccess",
152
- parameters: [
153
- {
154
- name: "method",
155
- type: "string"
156
- },
157
- {
158
- name: "path",
159
- type: "string"
160
- }
161
- ],
162
- returnType: `string[]`,
163
- statements: [
164
- `
143
+ isErrorHelper.addFunction({
144
+ isExported: false,
145
+ name: "getParametrizedPathSuccess",
146
+ parameters: [
147
+ {
148
+ name: "method",
149
+ type: "string"
150
+ },
151
+ {
152
+ name: "path",
153
+ type: "string"
154
+ }
155
+ ],
156
+ returnType: `string[]`,
157
+ statements: [
158
+ `
165
159
  const pathParts = path.split("/");
166
160
 
167
161
  // Traverse list to match the longest candidate
@@ -228,25 +222,24 @@ export function buildIsUnexpectedHelper(model: RLCModel) {
228
222
 
229
223
  return matchedValue;
230
224
  `
231
- ]
232
- });
225
+ ]
226
+ });
233
227
 
234
- isErrorHelper.addFunction({
235
- isExported: false,
236
- name: "getPathFromMapKey",
237
- parameters: [
238
- {
239
- name: "mapKey",
240
- type: "string"
241
- }
242
- ],
243
- returnType: `string`,
244
- statements: [
245
- `const pathStart = mapKey.indexOf("/");
228
+ isErrorHelper.addFunction({
229
+ isExported: false,
230
+ name: "getPathFromMapKey",
231
+ parameters: [
232
+ {
233
+ name: "mapKey",
234
+ type: "string"
235
+ }
236
+ ],
237
+ returnType: `string`,
238
+ statements: [
239
+ `const pathStart = mapKey.indexOf("/");
246
240
  return mapKey.slice(pathStart);`
247
- ]
248
- });
249
- }
241
+ ]
242
+ });
250
243
  }
251
244
 
252
245
  return {
@@ -254,13 +247,3 @@ export function buildIsUnexpectedHelper(model: RLCModel) {
254
247
  content: isErrorHelper.getFullText()
255
248
  };
256
249
  }
257
-
258
- function hasParametrizedPath(pathDictionary: Paths): boolean {
259
- for (const [path] of Object.entries(pathDictionary)) {
260
- if (path.includes("/{") && path.includes("}")) {
261
- return true;
262
- }
263
- }
264
-
265
- return false;
266
- }