@autorest/typescript 6.0.8 → 6.0.9

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 (12) hide show
  1. package/dist/src/generators/clientFileGenerator.d.ts.map +1 -1
  2. package/dist/src/generators/clientFileGenerator.js +4 -3
  3. package/dist/src/generators/clientFileGenerator.js.map +1 -1
  4. package/dist/src/generators/static/packageFileGenerator.js +2 -2
  5. package/dist/src/generators/static/packageFileGenerator.js.map +1 -1
  6. package/dist/src/utils/schemaHelpers.d.ts.map +1 -1
  7. package/dist/src/utils/schemaHelpers.js +12 -6
  8. package/dist/src/utils/schemaHelpers.js.map +1 -1
  9. package/package.json +4 -4
  10. package/src/generators/clientFileGenerator.ts +20 -12
  11. package/src/generators/static/packageFileGenerator.ts +2 -2
  12. package/src/utils/schemaHelpers.ts +17 -9
package/dist/src/generators/clientFileGenerator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clientFileGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/clientFileGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAOR,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAQxD,OAAO,EAEL,qBAAqB,EACtB,MAAM,4BAA4B,CAAC;AAepC,wBAAgB,cAAc,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,QA6M5E;AA8BD,wBAAgB,sBAAsB,CACpC,kBAAkB,EAAE,qBAAqB,EAAE,EAC3C,gBAAgB,EAAE,qBAAqB,EAAE,QAoB1C"}
1
+ {"version":3,"file":"clientFileGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/clientFileGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAOR,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAQxD,OAAO,EAEL,qBAAqB,EACtB,MAAM,4BAA4B,CAAC;AAepC,wBAAgB,cAAc,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,QAkN5E;AA8BD,wBAAgB,sBAAsB,CACpC,kBAAkB,EAAE,qBAAqB,EAAE,EAC3C,gBAAgB,EAAE,qBAAqB,EAAE,QAoB1C"}
package/dist/src/generators/clientFileGenerator.js CHANGED
@@ -427,7 +427,8 @@ function getTrack1DefaultContent(addScopes, hasCredentials) {
427
427
  `;
428
428
  }
429
429
  function getTrack2DefaultContent(addScopes, defaults, packageDetails, clientDetails) {
430
- const { azureArm, allowInsecureConnection, addCredentials } = (0, autorestSession_1.getAutorestOptions)();
430
+ const { azureArm, allowInsecureConnection } = (0, autorestSession_1.getAutorestOptions)();
431
+ const { addCredentials } = (0, schemaHelpers_1.getSecurityInfoFromModel)(clientDetails.security);
431
432
  const overloadDefaults = `
432
433
  let subscriptionId: string | undefined;
433
434
 
@@ -494,8 +495,8 @@ function getTrack2DefaultContent(addScopes, defaults, packageDetails, clientDeta
494
495
  }
495
496
  function writeDefaultOptions(hasCredentials, hasLro, clientDetails) {
496
497
  var _a;
497
- const { useCoreV2, packageDetails, addCredentials } = (0, autorestSession_1.getAutorestOptions)();
498
- const { credentialScopes } = (0, schemaHelpers_1.getSecurityInfoFromModel)(clientDetails.security);
498
+ const { useCoreV2, packageDetails } = (0, autorestSession_1.getAutorestOptions)();
499
+ const { credentialScopes, addCredentials } = (0, schemaHelpers_1.getSecurityInfoFromModel)(clientDetails.security);
499
500
  const credentialScopesValues = getCredentialScopesValue(credentialScopes, (_a = clientDetails === null || clientDetails === void 0 ? void 0 : clientDetails.endpoint) === null || _a === void 0 ? void 0 : _a.endpoint);
500
501
  const addScopes = isAddScopes(addCredentials, credentialScopes, credentialScopesValues)
501
502
  ? `if(!options.credentialScopes) {
package/dist/src/generators/clientFileGenerator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clientFileGenerator.js","sourceRoot":"","sources":["../../../src/generators/clientFileGenerator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clientFileGenerator.js","sourceRoot":"","sources":["../../../src/generators/clientFileGenerator.ts"],"names":[],"mappings":"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"}
package/dist/src/generators/static/packageFileGenerator.js CHANGED
@@ -72,7 +72,7 @@ function regularAutorestPackage(clientDetails, packageDetails) {
72
72
  "rollup-plugin-sourcemaps": "^0.6.3",
73
73
  typescript: "~5.0.0",
74
74
  "uglify-js": "^3.4.9",
75
- rimraf: "^3.0.0",
75
+ rimraf: "^5.0.0",
76
76
  dotenv: "^16.0.0"
77
77
  },
78
78
  repository: {
@@ -108,7 +108,7 @@ function regularAutorestPackage(clientDetails, packageDetails) {
108
108
  "extract-api": "api-extractor run --local",
109
109
  lint: "echo skipped",
110
110
  audit: "echo skipped",
111
- clean: "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
111
+ clean: "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log",
112
112
  "build:node": "echo skipped",
113
113
  "build:browser": "echo skipped",
114
114
  "build:test": "echo skipped",
package/dist/src/generators/static/packageFileGenerator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"packageFileGenerator.js","sourceRoot":"","sources":["../../../../src/generators/static/packageFileGenerator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"packageFileGenerator.js","sourceRoot":"","sources":["../../../../src/generators/static/packageFileGenerator.ts"],"names":[],"mappings":"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"}
package/dist/src/utils/schemaHelpers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schemaHelpers.d.ts","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAgB,MAAM,wBAAwB,CAAC;AAEnE,OAAO,EACL,MAAM,EAGN,YAAY,EAGZ,cAAc,EACd,aAAa,EAIb,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAO7B;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,OAAO,EAAE,EAAE,YAAY,EACzB,aAAa,UAAQ,mBAWtB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,OAAO,EAAE,EAAE,YAAY,EACzB,aAAa,UAAQ,GACpB,aAAa,GAAG,SAAS,CAU3B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,UAAU,GAAE,OAAe,EAC3B,SAAS,GAAE,OAAe,GACzB,WAAW,CAoIb;AAMD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,GAAG,GAAG,QAAQ,IAAI,cAAc,CAG1E;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,0MASxD;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,QAAQ;;;;EAuC1D"}
1
+ {"version":3,"file":"schemaHelpers.d.ts","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAgB,MAAM,wBAAwB,CAAC;AAEnE,OAAO,EACL,MAAM,EAGN,YAAY,EAGZ,cAAc,EACd,aAAa,EAIb,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAO7B;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,OAAO,EAAE,EAAE,YAAY,EACzB,aAAa,UAAQ,mBAWtB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,OAAO,EAAE,EAAE,YAAY,EACzB,aAAa,UAAQ,GACpB,aAAa,GAAG,SAAS,CAU3B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,UAAU,GAAE,OAAe,EAC3B,SAAS,GAAE,OAAe,GACzB,WAAW,CAoIb;AAMD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,GAAG,GAAG,QAAQ,IAAI,cAAc,CAG1E;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,0MASxD;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,QAAQ;;;;EA+C1D"}
package/dist/src/utils/schemaHelpers.js CHANGED
@@ -188,7 +188,7 @@ function getSecurityInfoFromModel(security) {
188
188
  for (const securitySchema of security.schemes) {
189
189
  if (securitySchema.type === "OAuth2") {
190
190
  securitySchema.scopes.forEach(scope => {
191
- const scopes = scope.split(',');
191
+ const scopes = scope.split(",");
192
192
  for (const scope of scopes) {
193
193
  credentialScopes.add(scope);
194
194
  }
@@ -206,12 +206,18 @@ function getSecurityInfoFromModel(security) {
206
206
  logger_1.logger.warning(`Set multiple headers for key credential has not been supported yet`);
207
207
  }
208
208
  }
209
- const scopes = [];
210
- credentialScopes.forEach(item => {
211
- scopes.push(item);
212
- });
209
+ const scopes = [...credentialScopes];
210
+ let refinedAddCredentials = addCredentials === false ? false : security.authenticationRequired;
211
+ // Add default info if explictly set the addCredentials as true
212
+ if (addCredentials === true &&
213
+ !security.authenticationRequired &&
214
+ scopes.length === 0 &&
215
+ credentialKeyHeaderName === "") {
216
+ refinedAddCredentials = true;
217
+ scopes.push("https://management.azure.com/.default");
218
+ }
213
219
  return {
214
- addCredentials: addCredentials === false ? false : security.authenticationRequired,
220
+ addCredentials: refinedAddCredentials,
215
221
  credentialScopes: scopes,
216
222
  credentialKeyHeaderName: credentialKeyHeaderName
217
223
  };
package/dist/src/utils/schemaHelpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schemaHelpers.js","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schemaHelpers.js","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autorest/typescript",
3
- "version": "6.0.8",
3
+ "version": "6.0.9",
4
4
  "browser": {
5
5
  "./test-browser/utils/stream-helpers.js": "./test-browser/utils/stream-helpers.browser.js",
6
6
  "./test-browser/utils/fileSystem.js": "./test-browser/utils/fileSystem.browser.js",
@@ -35,7 +35,7 @@
35
35
  "source-map-support": "^0.5.16",
36
36
  "ts-morph": "^15.1.0",
37
37
  "@azure/core-auth": "^1.3.2",
38
- "@azure-tools/rlc-common": "^0.15.0"
38
+ "@azure-tools/rlc-common": "^0.16.0"
39
39
  },
40
40
  "devDependencies": {
41
41
  "@azure-tools/test-recorder": "^3.0.0",
@@ -71,7 +71,7 @@
71
71
  "npm-run-all": "^4.1.5",
72
72
  "path-browserify": "^1.0.1",
73
73
  "puppeteer": "^3.3.0",
74
- "rimraf": "^3.0.2",
74
+ "rimraf": "^5.0.0",
75
75
  "sinon": "^10.0.0",
76
76
  "source-map-loader": "^1.0.0",
77
77
  "ts-node": "^8.5.2",
@@ -93,7 +93,7 @@
93
93
  "build:test:browser": "tsc -p tsconfig.browser-test.json && webpack --config webpack.config.test.js",
94
94
  "check:tree": "ts-node ./test/commands/check-clean-tree.ts",
95
95
  "pack": "npm pack 2>&1",
96
- "clean": "rimraf test-browser test/**/node_modules",
96
+ "clean": "rimraf --glob test-browser test/**/node_modules",
97
97
  "start": "node ./dist/src/main.js",
98
98
  "test": "npm-run-all unit-test integration-test rlc-integration-test validate-version-tolerance",
99
99
  "test:node": "npm run unit-test && npm run start-test-server:v2 & npm run integration-test:alone & npm run rlc-integration-test:alone & npm run test-version-tolerance & npm run stop-test-server",
package/src/generators/clientFileGenerator.ts CHANGED
@@ -220,7 +220,12 @@ export function generateClient(clientDetails: ClientDetails, project: Project) {
220
220
  apiVersionParams && apiVersionParams.length === 1
221
221
  ? apiVersionParams[0]
222
222
  : undefined;
223
- writeClassProperties(clientClass, clientParams, importedModels, clientDetails.hasTenantLevelOperation);
223
+ writeClassProperties(
224
+ clientClass,
225
+ clientParams,
226
+ importedModels,
227
+ clientDetails.hasTenantLevelOperation
228
+ );
224
229
  writeConstructor(clientDetails, clientClass, importedModels, apiVersionParam);
225
230
  if (useCoreV2 && apiVersionParam) {
226
231
  writeCustomApiVersion(clientClass);
@@ -349,7 +354,7 @@ function writeConstructor(
349
354
  type: optionsParameterType
350
355
  }
351
356
  ]
352
- }
357
+ };
353
358
 
354
359
  let clientConstructor;
355
360
  if (clientDetails.hasTenantLevelOperation) {
@@ -376,7 +381,7 @@ function writeConstructor(
376
381
  }
377
382
  ]
378
383
  });
379
- clientConstructor.addOverload(clientConstructorInitial)
384
+ clientConstructor.addOverload(clientConstructorInitial);
380
385
  clientConstructor.addOverload({
381
386
  parameters: [
382
387
  ...requiredParams
@@ -396,7 +401,9 @@ function writeConstructor(
396
401
  ]
397
402
  });
398
403
  } else {
399
- clientConstructor = classDeclaration.addConstructor(clientConstructorInitial);
404
+ clientConstructor = classDeclaration.addConstructor(
405
+ clientConstructorInitial
406
+ );
400
407
  }
401
408
 
402
409
  const { useCoreV2 } = getAutorestOptions();
@@ -647,11 +654,8 @@ function getTrack2DefaultContent(
647
654
  packageDetails: PackageDetails,
648
655
  clientDetails: ClientDetails
649
656
  ) {
650
- const {
651
- azureArm,
652
- allowInsecureConnection,
653
- addCredentials
654
- } = getAutorestOptions();
657
+ const { azureArm, allowInsecureConnection } = getAutorestOptions();
658
+ const { addCredentials } = getSecurityInfoFromModel(clientDetails.security);
655
659
 
656
660
  const overloadDefaults = `
657
661
  let subscriptionId: string | undefined;
@@ -663,7 +667,9 @@ function getTrack2DefaultContent(
663
667
  }
664
668
  `;
665
669
 
666
- const defaultContent = `${clientDetails.hasTenantLevelOperation ? overloadDefaults: ""}
670
+ const defaultContent = `${
671
+ clientDetails.hasTenantLevelOperation ? overloadDefaults : ""
672
+ }
667
673
  // Initializing default values for options
668
674
  if (!options) {
669
675
  options = {};
@@ -731,8 +737,10 @@ function writeDefaultOptions(
731
737
  hasLro: boolean,
732
738
  clientDetails: ClientDetails
733
739
  ) {
734
- const { useCoreV2, packageDetails, addCredentials } = getAutorestOptions();
735
- const { credentialScopes } = getSecurityInfoFromModel(clientDetails.security);
740
+ const { useCoreV2, packageDetails } = getAutorestOptions();
741
+ const { credentialScopes, addCredentials } = getSecurityInfoFromModel(
742
+ clientDetails.security
743
+ );
736
744
 
737
745
  const credentialScopesValues = getCredentialScopesValue(
738
746
  credentialScopes,
package/src/generators/static/packageFileGenerator.ts CHANGED
@@ -118,7 +118,7 @@ function regularAutorestPackage(
118
118
  "rollup-plugin-sourcemaps": "^0.6.3",
119
119
  typescript: "~5.0.0",
120
120
  "uglify-js": "^3.4.9",
121
- rimraf: "^3.0.0",
121
+ rimraf: "^5.0.0",
122
122
  dotenv: "^16.0.0"
123
123
  },
124
124
  repository: {
@@ -156,7 +156,7 @@ function regularAutorestPackage(
156
156
  lint: "echo skipped",
157
157
  audit: "echo skipped",
158
158
  clean:
159
- "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
159
+ "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log",
160
160
  "build:node": "echo skipped",
161
161
  "build:browser": "echo skipped",
162
162
  "build:test": "echo skipped",
package/src/utils/schemaHelpers.ts CHANGED
@@ -154,7 +154,7 @@ export function getTypeForSchema(
154
154
  }
155
155
  break;
156
156
  case SchemaType.AnyObject:
157
- kind = PropertyKind.Dictionary
157
+ kind = PropertyKind.Dictionary;
158
158
  typeName = `Record<string, unknown>`;
159
159
  break;
160
160
  case SchemaType.Number:
@@ -236,8 +236,8 @@ export function getSecurityInfoFromModel(security: Security) {
236
236
  for (const securitySchema of security.schemes) {
237
237
  if (securitySchema.type === "OAuth2") {
238
238
  (securitySchema as OAuth2SecurityScheme).scopes.forEach(scope => {
239
- const scopes = scope.split(',');
240
- for(const scope of scopes) {
239
+ const scopes = scope.split(",");
240
+ for (const scope of scopes) {
241
241
  credentialScopes.add(scope);
242
242
  }
243
243
  });
@@ -258,13 +258,21 @@ export function getSecurityInfoFromModel(security: Security) {
258
258
  );
259
259
  }
260
260
  }
261
- const scopes: string[] = [];
262
- credentialScopes.forEach(item => {
263
- scopes.push(item);
264
- });
261
+ const scopes: string[] = [...credentialScopes];
262
+ let refinedAddCredentials =
263
+ addCredentials === false ? false : security.authenticationRequired;
264
+ // Add default info if explictly set the addCredentials as true
265
+ if (
266
+ addCredentials === true &&
267
+ !security.authenticationRequired &&
268
+ scopes.length === 0 &&
269
+ credentialKeyHeaderName === ""
270
+ ) {
271
+ refinedAddCredentials = true;
272
+ scopes.push("https://management.azure.com/.default");
273
+ }
265
274
  return {
266
- addCredentials:
267
- addCredentials === false ? false : security.authenticationRequired,
275
+ addCredentials: refinedAddCredentials,
268
276
  credentialScopes: scopes,
269
277
  credentialKeyHeaderName: credentialKeyHeaderName
270
278
  };