@autorest/typescript 6.0.14 → 6.0.15

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 (23) hide show
  1. package/dist/src/generators/modelsGenerator.js +1 -1
  2. package/dist/src/generators/modelsGenerator.js.map +1 -1
  3. package/dist/src/generators/static/packageFileGenerator.js +4 -4
  4. package/dist/src/models/parameterDetails.d.ts +1 -0
  5. package/dist/src/models/parameterDetails.d.ts.map +1 -1
  6. package/dist/src/transforms/objectTransforms.d.ts.map +1 -1
  7. package/dist/src/transforms/objectTransforms.js +13 -14
  8. package/dist/src/transforms/objectTransforms.js.map +1 -1
  9. package/dist/src/transforms/parameterTransforms.d.ts.map +1 -1
  10. package/dist/src/transforms/parameterTransforms.js +21 -14
  11. package/dist/src/transforms/parameterTransforms.js.map +1 -1
  12. package/dist/src/transforms/transforms.js +10 -10
  13. package/dist/src/transforms/transforms.js.map +1 -1
  14. package/dist/src/utils/languageHelpers.d.ts.map +1 -1
  15. package/dist/src/utils/languageHelpers.js.map +1 -1
  16. package/package.json +7 -6
  17. package/src/generators/modelsGenerator.ts +1 -1
  18. package/src/generators/static/packageFileGenerator.ts +4 -4
  19. package/src/models/parameterDetails.ts +1 -0
  20. package/src/transforms/objectTransforms.ts +24 -22
  21. package/src/transforms/parameterTransforms.ts +39 -18
  22. package/src/transforms/transforms.ts +10 -10
  23. package/src/utils/languageHelpers.ts +3 -1
package/dist/src/generators/modelsGenerator.js CHANGED
@@ -469,7 +469,7 @@ function writeOptionalParameters(typeName, optionalParams, modelsIndexFile, { ba
469
469
  function buildParamDetails(p) {
470
470
  const description = (0, getParameterDescription_1.getParameterDescription)(p, operationFullName);
471
471
  return {
472
- name: (0, nameUtils_1.normalizeName)(p.name, nameUtils_1.NameType.Parameter),
472
+ name: (0, nameUtils_1.normalizeName)(p.propertyName, nameUtils_1.NameType.Parameter),
473
473
  hasQuestionToken: true,
474
474
  type: p.typeDetails.typeName,
475
475
  docs: description ? [description] : undefined,
package/dist/src/generators/modelsGenerator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"modelsGenerator.js","sourceRoot":"","sources":["../../../src/generators/modelsGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAGlC,uCAWkB;AAClB,mCAA6C;AAC7C,yDAMgC;AAChC,kDAA6D;AAC7D,2DAAmE;AAMnE,mDAK6B;AAC7B,kDAAsD;AACtD,wDAA0D;AAC1D,8DAA+D;AAC/D,iEAGmC;AACnC,8EAA2E;AAE3E,wDAAwD;AAExD,SAAgB,cAAc,CAAC,aAA4B,EAAE,OAAgB;IAC3E,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IACpD,MAAM,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAC9C,GAAG,OAAO,kBAAkB,EAC5B,SAAS,EACT,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,eAAe,CAAC,oBAAoB,CAAC;YACnC,eAAe,EAAE,UAAU;YAC3B,eAAe,EAAE,kBAAkB;SACpC,CAAC,CAAC;KACJ;SAAM;QACL,eAAe,CAAC,oBAAoB,CAAC;YACnC,eAAe,EAAE,YAAY;YAC7B,eAAe,EAAE,oBAAoB;SACtC,CAAC,CAAC;QACH,eAAe,CAAC,oBAAoB,CAAC;YACnC,eAAe,EAAE,kBAAkB;YACnC,eAAe,EAAE,2BAA2B;SAC7C,CAAC,CAAC;QACH,eAAe,CAAC,oBAAoB,CAAC;YACnC,eAAe,EAAE,gBAAgB;YACjC,eAAe,EAAE,yBAAyB;SAC3C,CAAC,CAAC;KACJ;IAED,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAChD,YAAY,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAC7C,YAAY,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAC7C,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IACrD,iBAAiB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAClD,eAAe,CAAC,oBAAoB,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC;IAClD,aAAa,CAAC,QAAQ,GAAG,QAAQ;SAC9B,MAAM,CAAC,IAAI,CAAC,EAAE;QACb,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC,CAAC;SACD,GAAG,CAAC,IAAI,CAAC,EAAE;QACV,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;AACP,CAAC;AA1CD,wCA0CC;AAED,MAAM,iBAAiB,GAAG,CACxB,aAA4B,EAC5B,eAA2B,EAC3B,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,kBAAkB,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IAC/D,IAAI,oBAAoB,GAAG,aAAa,CAAC,UAAU,CAAC,MAAM,CACxD,CAAC,CAAC,EAAE,CACF,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,YAAY,CAAC;QAC/B,CAAC,CAAC,sBAAsB,KAAK,kCAAsB,CAAC,MAAM,CAC7D,CAAC;IAEF,uBAAuB,CACrB,aAAa,CAAC,IAAI,EAClB,oBAAoB,EACpB,eAAe,EACf;QACE,SAAS,EAAE,CAAC,SAAS;YACnB,CAAC,CAAC,+BAA+B;YACjC,CAAC,CAAC,kBAAkB;gBACpB,CAAC,CAAC,6CAA6C;gBAC/C,CAAC,CAAC,iCAAiC;KACtC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAC3B,aAA4B,EAC5B,eAA2B,EAC3B,EAAE;IACF,MAAM,WAAW,GAAG,IAAA,qCAAiB,EAAC,aAAa,CAAC,CAAC;IACrD,OAAO,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QAC5D,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC5C,qBAAqB,CAAC,aAAa,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;YACjE,kBAAkB,CAAC,SAAS,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;GAEG;AACH,SAAS,qBAAqB,CAC5B,aAA4B,EAC5B,SAA2B,EAC3B,UAAsB;IAEtB,MAAM,mBAAmB,GAAG,IAAA,0CAAyB,EACnD,aAAa,CAAC,UAAU,EACxB,SAAS,EACT,EAAE,eAAe,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,CAC1D,CAAC;IAEF,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAC/C,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,IAAI,CAAC,WAAW,CACzD,CAAC;IAEF,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC7D,SAAS,CAAC,QAAQ,CAAC,OAAO,CACxB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,0BAA0B,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAChE,CAAC;IACF,uBAAuB,CACrB,SAAS,CAAC,WAAW,CAAC,QAAQ,EAC9B,cAAc,EACd,UAAU,EACV;QACE,UAAU,EAAE,0BAA0B;QACtC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;QACrC,cAAc,EAAE,SAAS,CAAC,KAAK;KAChC,CACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,kBAAkB,CACzB,EACE,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,WAAW,EAAE,aAAa,EAC1B,KAAK,EACY,EACnB,eAA2B,EAC3B,cAA2B;IAE3B,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IAE1D,MAAM,YAAY,GAAG,IAAA,uCAAmB,EACtC,aAAa,CAAC,QAAQ,EACtB,cAAc,CACf,CAAC;IAEF,MAAM,cAAc,GAGd,EAAE,CAAC;IAET,SAAS;QACP,sFAAsF;SACrF,MAAM,CACL,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CACvB,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC,CAC5D;SACA,OAAO,CAAC,SAAS,CAAC,EAAE;QACnB,MAAM,EAAE,WAAW,KAAsB,SAAS,EAA1B,YAAY,UAAK,SAAS,EAA5C,eAAgC,CAAY,CAAC;QACnD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,sCAAsC;YACtC,eAAe,CAAC,YAAY,CAAC;gBAC3B,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,CAAC,kCAAkC,IAAI,aAAa,CAAC;gBAC3D,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC;gBACzC,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;gBAC3C,IAAI,EAAE,wBAAa,CAAC,SAAS;aAC9B,CAAC,CAAC;YACH,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;SACrE;QAED,MAAM,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACnE,IACE,gBAAgB;YAChB,IAAA,gBAAO,EAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,EAChD;YACA,MAAM,IAAI,KAAK,CACb,yDAAyD,CAC1D,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEL,IACE,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,sBAAU,CAAC,IAAI;QACtC,cAAc,CAAC,MAAM,KAAK,CAAC;QAC3B,aAAa,EACb;QACA,eAAe,CAAC,YAAY,CAAC;YAC3B,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,CAAC,kCAAkC,IAAI,aAAa,CAAC;YAC3D,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,SAAS;gBACb,CAAC,CAAC;;QAEF;gBACA,CAAC,CAAC;;;;;;;;;;QAUF;YACF,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;YAC3C,IAAI,EAAE,wBAAa,CAAC,SAAS;SAC9B,CAAC,CAAC;KACJ;AACH,CAAC;AAYD;;GAEG;AACH,SAAS,iBAAiB,CAAC,EACzB,KAAK,EAAE,EAAE,QAAQ,EAAE,EACnB,SAAS,EACgB;IACzB,IAAI,CAAC,QAAQ,IAAI,SAAS,KAAK,wBAAc,CAAC,MAAM,EAAE;QACpD,OAAO;KACR;IAED,MAAM,eAAe,GACnB,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,MAAK,2BAAY,CAAC,SAAS;QACzC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,MAAK,2BAAY,CAAC,UAAU,CAAC;IAC7C,iGAAiG;IACjG,MAAM,cAAc,GAA+C,EAAE,CAAC;IACtE,uGAAuG;IACvG,MAAM,0BAA0B,GAE1B,EAAE,CAAC;IAET,IAAI,QAAQ,EAAE;QACZ,IAAI,eAAe,EAAE;YACnB,cAAc,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,QAAQ,CAAC,QAAQ;gBACvB,IAAI,EAAE,CAAC,2BAA2B,CAAC;aACpC,CAAC,CAAC;SACJ;QACD,0BAA0B,CAAC,IAAI,CAC7B;YACE,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,QAAQ;YACd,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;YAC3C,IAAI,EAAE,CAAC,2CAA2C,CAAC;SACpD,EACD;YACE,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,CAAC,yCAAyC,CAAC;YACjD,IAAI,EAAE,QAAQ,CAAC,QAAQ;YACvB,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;SAC5C,CACF,CAAC;KACH;SAAM,IAAI,SAAS,KAAK,wBAAc,CAAC,MAAM,EAAE;QAC9C,cAAc,CAAC,IAAI,CACjB;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE;gBACJ,sFAAsF;aACvF;YACD,gBAAgB,EAAE,IAAI;SACvB,EACD;YACE,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,uBAAuB;YAC7B,IAAI,EAAE;gBACJ,oGAAoG;aACrG;YACD,gBAAgB,EAAE,IAAI;SACvB,CACF,CAAC;KACH;IAED,qCACE,cAAc,IAGX,CAAC,CAAC,eAAe,IAAI,EAAE,gBAAgB,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,EAAE,CAAC,KACjE,0BAA0B,IAC1B;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB,CAAC,EAC5B,KAAK,EAAE,EAAE,WAAW,EAAE,EACG;IACzB,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO;KACR;IACD,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;IAEjC,OAAO;QACL,uGAAuG;QACvG,0BAA0B,EAAE;YAC1B;gBACE,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,CAAC,mCAAmC,CAAC;gBAC3C,IAAI,EAAE,QAAQ;aACf;SACF;QACD,qHAAqH;QACrH,cAAc,EAAE,EAAE;QAClB,yHAAyH;QACzH,gBAAgB,EAAE,QAAQ;KAC3B,CAAC;AACJ,CAAC;AAQD;;;GAGG;AACH,SAAS,iBAAiB,CACxB,iBAA2C,EAC3C,QAAiB,KAAK;;IAEtB,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IAC3C,qDAAqD;IACrD,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;IAClE,MAAM,cAAc,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAE5D,MAAM,uBAAuB,GAAG;QAC9B,GAAG,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,0BAA0B,KAAI,EAAE,CAAC;QACrD,GAAG,CAAC,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,0BAA0B,KAAI,EAAE,CAAC;KACzD,CAAC;IAEF,IAAI,iBAAiB,GAA4B,EAAE,CAAC;IACpD,IAAI,eAAe,GAA0B,kBAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAEpE,IAAI,SAAS,EAAE;QACb,IAAI,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc,0CAAE,MAAM,EAAE;YAC1C,eAAe,GAAG,kBAAO,CAAC,UAAU,CAAC;gBACnC,UAAU,EAAE,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc;aAC3C,CAAC,CAAC;YACH,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACzC;KACF;SAAM;QACL,eAAe,GAAG,kBAAO,CAAC,UAAU,CAAC;YACnC,UAAU,EAAE;gBACV,GAAG,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc,KAAI,EAAE,CAAC;gBACzC;oBACE,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,CAAC,+BAA+B,CAAC;oBACvC,IAAI,EAAE,uBAAuB,CAAC,MAAM;wBAClC,CAAC,CAAC,kBAAO,CAAC,gBAAgB,CACtB,uBAAuB,EACvB,kBAAO,CAAC,UAAU,CAAC;4BACjB,UAAU,EAAE,uBAAuB;yBACpC,CAAC,CACH;wBACH,CAAC,CAAC,uBAAuB;oBAC3B,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;iBAC5C;aACF;SACF,CAAC,CAAC;QAEH,iBAAiB,GAAG,CAAC,eAAe,CAAC,CAAC;KACvC;IAED,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,gBAAgB;QAC9B,iBAAiB,CAAC,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;IAC7D,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,gBAAgB;QACjC,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IAEhE;;;;;;;;;;;;;;;;;;;;OAoBG;IAEH,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,iBAAiB,CAAC,MAAM,GAAG,CAAC;YACjC,CAAC,CAAC,sFAAsF;gBACtF,8FAA8F;gBAC9F,gHAAgH;gBAChH,2BAA2B;gBAC3B,kBAAO,CAAC,gBAAgB,CAAC,KAAK,CAC5B,kBAAO,EACP,iBAA+C,CAChD;YACH,CAAC,CAAE,eAAkC,CAAC;KACzC;SAAM;QACL,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,OAAO,kBAAO,CAAC,gBAAgB,CAAC,KAAK,CACnC,kBAAO,EACP,iBAA+C,CAChD,CAAC;SACH;aAAM,IAAI,iBAAiB,CAAC,MAAM,IAAI,CAAC,EAAE;YACxC,OAAO,iBAAiB,CAAC,CAAC,CAA4B,CAAC;SACxD;aAAM;YACL,OAAO,mBAAmB,CAAC;SAC5B;KACF;AACH,CAAC;AAED,MAAM,YAAY,GAAG,CACnB,aAA4B,EAC5B,eAA2B,EAC3B,EAAE;IACF,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACpC,IAAI,MAAM,CAAC,UAAU,KAAK,sBAAU,CAAC,MAAM,EAAE;YAC3C,qBAAqB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;SAChD;aAAM;YACL,iBAAiB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;SAC5C;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC5B,MAAoB,EACpB,eAA2B,EAC3B,EAAE;IACF,oDAAoD;IACpD,sGAAsG;IACtG,IACE,MAAM,CAAC,QAAQ,KAAK,sBAAU,CAAC,MAAM;QACrC,MAAM,CAAC,QAAQ,IAAI,sBAAU,CAAC,MAAM,EACpC;QACA,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAC/C,eAAe,CAAC,OAAO,CAAC;YACtB,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE;gBACJ,0BAA0B,MAAM,CAAC,IAAI,6BAA6B;aACnE;YACD,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACnC,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,IAAI,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;aAC/C,CAAC,CAAC;SACJ,CAAC,CAAC;KACJ;IAED,eAAe,CAAC,YAAY,CAAC;QAC3B,IAAI,EAAE,yBAAyB,CAAC,MAAM,CAAC;QACvC,IAAI,EAAE,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC;QAC9C,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,MAAM,CAAC,QAAQ,IAAI,sBAAU,CAAC,MAAM;QAC1C,cAAc,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE;KAC3C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,SAAS,yBAAyB,CAAC,MAAoB;;IACrD,IAAI,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,cAAc,0CAAE,UAAU,CAAC,oBAAoB,CAAC,EAAE;QAC5D,OAAO,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;KAChE;IAED,OAAO,MAAA,MAAM,CAAC,cAAc,mCAAI,MAAM,CAAC,IAAI,CAAC;AAC9C,CAAC;AACD,SAAS,qBAAqB,CAAC,MAAoB;IACjD,OAAO,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;AAC/B,CAAC;AAED,sFAAsF;AACtF,sDAAsD;AACtD,SAAS,8BAA8B,CAAC,MAAoB;IAC1D,MAAM,OAAO,GAAG,CAAC,sBAAU,CAAC,MAAM,EAAE,sBAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,CAC7D,MAAM,CAAC,QAAQ,IAAI,sBAAU,CAAC,OAAO,CACtC,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU;SACxC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;SACtE,IAAI,CAAC,OAAO,CAAC;QACd,4FAA4F;SAC3F,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC;SACtB,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,UAAU,QAAQ,sCAAsC,MAAM,CAAC,IAAI,oEAAoE,CAAC;IAEzJ,OAAO;QACL,GAAG,MAAM,CAAC,WAAW,KAAK;QAC1B,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9B,2CAA2C;QAC3C,iBAAiB;KAClB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAChB,CAAC;AAED,MAAM,iBAAiB,GAAG,CACxB,MAAoB,EACpB,eAA2B,EAC3B,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU;SAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,CACP,MAAM,CAAC,QAAQ,KAAK,sBAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CACjE;SACA,IAAI,CAAC,KAAK,CAAC,CAAC;IAEf,eAAe,CAAC,YAAY,CAAC;QAC3B,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC;QAC1B,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,MAAM;QACZ,cAAc,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE;KAC3C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CACnB,aAA4B,EAC5B,eAA2B,EAC3B,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC;AAE1E,MAAM,oBAAoB,GAAG,CAAC,eAA2B,EAAE,EAAE,CAAC,CAC5D,KAAoB,EACpB,EAAE;IACF,eAAe,CAAC,YAAY,CAAC;QAC3B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE;QAClD,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACvC,UAAU,EAAE,uBAAuB,CAAC,KAAK,CAAC;QAC1C,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;KAC5C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;GAEG;AACH,SAAS,eAAe,CAAC,EAAE,OAAO,EAAiB,EAAE,UAAsB;IACzE,OAAO;SACJ,MAAM,CACL,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,yBAAU,CAAC,WAAW,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CACtE;SACA,OAAO,CAAC,GAAG,CAAC,EAAE;QACb,MAAM,iBAAiB,GAAG,GAA+B,CAAC;QAC1D,MAAM,aAAa,GAAG;YACpB,CAAC,iBAAiB,CAAC,IAAI,CAAC;YACxB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACpC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM;oBAC5D,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,OAAO;oBAClB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACb,CAAC,CAAC;SACH,CAAC;QACF,UAAU,CAAC,YAAY,CAAC;YACtB,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,OAAO;YACxB,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;YAC/B,cAAc,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE;SAC3C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAaD,SAAS,iBAAiB,CACxB,cAAkC;IAElC,IAAI,cAAc,GAAgB,EAAE,CAAC;IAErC,cAAc;SACX,MAAM,CACL,CAAC,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,CAC1C,SAAS,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,CAAC,SAAS,CACjD;SACA,OAAO,CAAC,CAAC,CAAC,EAAE;QACX,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QACxB,MAAM,SAAS,GAAG,IAAA,qCAAmB,EAAC,SAAS,CAAC,SAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;QAC1E,MAAM,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC/C,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qCAAmB,EAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACjD,OAAO,IAAI,KAAK,SAAS,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,IAAI,SAAS,CAAC,SAAS,IAAI,CAAC,gBAAgB,EAAE;YAC5C,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;SAC1C;QACD,IAAA,aAAI,EAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEL,OAAO,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAChC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAA,qCAAmB,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClE,OAAO;YACL,IAAI,EAAE,IAAA,yBAAa,EAAC,IAAI,EAAE,oBAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;YACnD,gBAAgB,EAAE,CAAC,KAAK,CAAC,QAAQ;YACjC,IAAI,EAAE,IAAA,yBAAa,EAAC,IAAI,EAAE,oBAAQ,CAAC,SAAS,CAAC;YAC7C,IAAI,EAAE,CAAC,WAAW,CAAC;YACnB,IAAI,EAAE,wBAAa,CAAC,iBAAiB;SACtC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAC9B,QAAgB,EAChB,cAAkC,EAClC,eAA2B,EAC3B,EACE,SAAS,EACT,UAAU,EACV,iBAAiB,EACjB,cAAc,EACiB;;IAEjC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IAC3C,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;IACpE,SAAS,iBAAiB,CAAC,CAAmB;QAC5C,MAAM,WAAW,GAAG,IAAA,iDAAuB,EAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;QAClE,OAAO;YACL,IAAI,EAAE,IAAA,yBAAa,EAAC,CAAC,CAAC,IAAI,EAAE,oBAAQ,CAAC,SAAS,CAAC;YAC/C,gBAAgB,EAAE,IAAI;YACtB,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ;YAC5B,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;YAC7C,IAAI,EAAE,wBAAa,CAAC,iBAAiB;SACtC,CAAC;IACJ,CAAC;IAED,SAAS,qBAAqB,CAC5B,IAAY,EACZ,UAAsD;QAEtD,OAAO;YACL,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,CAAC,sBAAsB,CAAC;YAC9B,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE;gBACP,SAAS;oBACP,CAAC,CAAC,SAAS;wBACT,CAAC,CAAC,2BAA2B;wBAC7B,CAAC,CAAC,6BAA6B,CAAC;aACrC;YACD,UAAU,EAAE,UAAU;SACvB,CAAC;IACJ,CAAC;IAED,MAAM,eAAe,GAAG,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,mCAAI,CAAC,CAAC;IAC9C,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,IAAI,eAAe,GAAG,CAAC,EAAE;QACvB,iDAAiD;QACjD,KAAK,MAAM,SAAS,IAAI,UAAW,CAAC,MAAM,EAAE,EAAE;YAC5C,UAAU,CAAC,IAAI,CACb,eAAe,CAAC,YAAY,CAC1B,qBAAqB,CAAC,GAAG,QAAQ,IAAI,SAAS,gBAAgB,EAAE;gBAC9D,GAAG,yBAAyB;gBAC5B,GAAG,cAAc;qBACd,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,CAAC,eAAe,KAAK,SAAS,CAC3D;qBACA,GAAG,CAA6B,iBAAiB,CAAC;aACtD,CAAC,CACH,CACF,CAAC;SACH;KACF;SAAM;QACL,UAAU,CAAC,IAAI,CACb,eAAe,CAAC,YAAY,CAC1B,qBAAqB,CAAC,GAAG,QAAQ,gBAAgB,EAAE;YACjD,GAAG,yBAAyB;YAC5B,GAAG,cAAc,CAAC,GAAG,CAA6B,iBAAiB,CAAC;SACrE,CAAC,CACH,CACF,CAAC;KACH;IACD,IAAI,cAAc;QAChB,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACzB,KAAK,CAAC,aAAa,CAAC;gBAClB;oBACE,IAAI,EAAE,oBAAoB;oBAC1B,IAAI,EAAE,QAAQ;oBACd,gBAAgB,EAAE,IAAI;oBACtB,IAAI,EAAE,CAAC,iDAAiD,CAAC;iBAC1D;gBACD;oBACE,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,QAAQ;oBACd,gBAAgB,EAAE,IAAI;oBACtB,IAAI,EAAE;wBACJ,4FAA4F;qBAC7F;iBACF;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,iDAAiD;AACjD,SAAS,mBAAmB,CAC1B,QAAyB,EACzB,aAA4B,EAC5B,wBAAiC;IAEjC,IAAI,QAAQ,CAAC,UAAU,EAAE;QACvB,IACE,QAAQ,CAAC,IAAI,KAAK,sBAAU,CAAC,MAAM;YACnC,QAAQ,CAAC,IAAI,KAAK,sBAAU,CAAC,OAAO,EACpC;YACA,OAAO,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;SACnC;QACD,OAAO,IAAI,IAAA,gCAAiB,EAC1B,QAAQ,CAAC,YAAY,EACrB,QAAQ,CAAC,IAAI,EACb,KAAK,CAAC,QAAQ;SACf,GAAG,CAAC;KACN;IAED,MAAM,QAAQ,GACZ,QAAQ,CAAC,IAAI,KAAK,UAAU;QAC1B,CAAC,CAAC,GAAI,aAA0C,CAAC,SAAS,IAAI;QAC9D,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAEpB,IAAI,wBAAwB,EAAE;QAC5B,OAAO,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ;YAC3C,CAAC,CAAC,GAAG,QAAQ,SAAS;YACtB,CAAC,CAAC,QAAQ,CAAC;KACd;SAAM;QACL,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;KAC5D;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,6BAA6B,CACpC,aAA4B;IAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAErC,OAAO,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,sBAAsB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAmB;IACxE,IAAI,QAAQ,EAAE;QACZ,MAAM,YAAY,GAChB,qFAAqF,CAAC;QACxF,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW,KAAK,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;KAC3E;SAAM;QACL,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;KAChD;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CACxB,KAAoB,EACpB,UAAwC;IAExC,MAAM,mBAAmB,GAAI,KAAkC;SAC5D,mBAAmB,CAAC;IACvB,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,UAAU,CAAC;KACnB;IAED,MAAM,SAAS,GAAG,IAAA,aAAI,EAAC,mBAAmB,CAAC,CAAC,GAAG,CAC7C,GAAG,CAAC,EAAE;QACJ,qEAAqE;QACrE,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,IAAA,yBAAa,EAAC,YAAY,EAAE,oBAAQ,CAAC,QAAQ,CAAC,CAAC;QAC5D,OAAO;YACL,IAAI,EAAE;gBACJ,mFAAmF;aACpF;YACD,IAAI,EAAE,IAAI,IAAI,GAAG;YACjB,IAAI,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YACnE,IAAI,EAAE,wBAAa,CAAC,iBAAiB;SACtC,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,8BAA8B,GAAG,UAAU,CAAC,MAAM,CACtD,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAC/C,CAAC;IAEF,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,8BAA8B,CAAC,CAAC;AAC3D,CAAC;AAED;;;;GAIG;AACH,SAAS,wBAAwB,CAC/B,KAAoB,EACpB,UAAwC;IAExC,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE;QAClC,OAAO,UAAU,CAAC;KACnB;IAED,OAAO;QACL;YACE,IAAI,EAAE;gBACJ,sFAAsF;aACvF;YACD,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,wBAAa,CAAC,iBAAiB;SACtC;QACD,GAAG,UAAU;KACd,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,uBAAuB,GAAG,CAAC,aAA4B,EAAE,EAAE;IAC/D,MAAM,EAAE,wBAAwB,GAAG,KAAK,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IAClE,MAAM,UAAU,GAAG,6BAA6B,CAAC,aAAa,CAAC,CAAC,GAAG,CAEjE,QAAQ,CAAC,EAAE,CAAC,CAAC;QACb,IAAI,EAAE,IAAI,QAAQ,CAAC,IAAI,GAAG;QAC1B,gBAAgB,EAAE,CAAC,QAAQ,CAAC,QAAQ;QACpC,UAAU,EAAE,QAAQ,CAAC,QAAQ;QAC7B,IAAI,EAAE,mBAAmB,CACvB,QAAQ,EACR,aAAa,EACb,wBAAwB,CACzB;QACD,IAAI,EAAE,sBAAsB,CAAC,QAAQ,CAAC;QACtC,IAAI,EAAE,wBAAa,CAAC,iBAAiB;KACtC,CAAC,CAAC,CAAC;IACJ,OAAO,iBAAiB,CACtB,aAAa,EACb,wBAAwB,CAAC,aAAa,EAAE,UAAU,CAAC,CACpD,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"modelsGenerator.js","sourceRoot":"","sources":["../../../src/generators/modelsGenerator.ts"],"names":[],"mappings":"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"}
package/dist/src/generators/static/packageFileGenerator.js CHANGED
@@ -50,9 +50,9 @@ function regularAutorestPackage(clientDetails, packageDetails) {
50
50
  engines: {
51
51
  node: ">=18.0.0"
52
52
  },
53
- dependencies: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (hasLro && { "@azure/core-lro": "^2.5.4" })), (hasLro && { "@azure/abort-controller": "^1.0.0" })), (hasAsyncIterators && { "@azure/core-paging": "^1.2.0" })), (!useCoreV2 && { "@azure/core-http": "^3.0.0" })), (useCoreV2 && { "@azure/core-client": "^1.7.0" })), (useCoreV2 && addCredentials && { "@azure/core-auth": "^1.3.0" })), (useCoreV2 &&
53
+ dependencies: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (hasLro && { "@azure/core-lro": "^2.5.4" })), (hasLro && { "@azure/abort-controller": "^1.0.0" })), (hasAsyncIterators && { "@azure/core-paging": "^1.2.0" })), (!useCoreV2 && { "@azure/core-http": "^3.0.0" })), (useCoreV2 && { "@azure/core-client": "^1.7.0" })), (useCoreV2 && addCredentials && { "@azure/core-auth": "^1.6.0" })), (useCoreV2 &&
54
54
  coreHttpCompatMode && { "@azure/core-http-compat": "^1.2.0" })), (useCoreV2 && {
55
- "@azure/core-rest-pipeline": "^1.12.0"
55
+ "@azure/core-rest-pipeline": "^1.14.0"
56
56
  })), (tracingInfo && {
57
57
  "@azure/core-tracing": "^1.0.0"
58
58
  })), { tslib: "^2.2.0" }),
@@ -64,7 +64,7 @@ function regularAutorestPackage(clientDetails, packageDetails) {
64
64
  devDependencies: {
65
65
  "@microsoft/api-extractor": "^7.31.1",
66
66
  mkdirp: "^2.1.2",
67
- typescript: "~5.2.0",
67
+ typescript: "~5.3.3",
68
68
  "uglify-js": "^3.4.9",
69
69
  rimraf: "^5.0.0",
70
70
  dotenv: "^16.0.0"
@@ -147,7 +147,7 @@ function regularAutorestPackage(clientDetails, packageDetails) {
147
147
  }
148
148
  if (generateTest) {
149
149
  packageInfo.module = `./dist-esm/src/index.js`;
150
- packageInfo.devDependencies["@azure/identity"] = "^3.3.0";
150
+ packageInfo.devDependencies["@azure/identity"] = "^4.0.1";
151
151
  packageInfo.devDependencies["@azure-tools/test-recorder"] = "^3.0.0";
152
152
  packageInfo.devDependencies["@azure-tools/test-credential"] = "^1.0.0";
153
153
  packageInfo.devDependencies["mocha"] = "^10.0.0";
package/dist/src/models/parameterDetails.d.ts CHANGED
@@ -7,6 +7,7 @@ export interface ParameterDetails {
7
7
  defaultValue?: any;
8
8
  description?: string;
9
9
  name: string;
10
+ propertyName: string;
10
11
  serializedName: string;
11
12
  location: ParameterLocation;
12
13
  required?: boolean;
package/dist/src/models/parameterDetails.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"parameterDetails.d.ts","sourceRoot":"","sources":["../../../src/models/parameterDetails.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACjC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACxC,YAAY,CAAC,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG;YAAE,WAAW,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IACpE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,cAAc,CAAC;IAC3B,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAChD,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,eAAe,CAAC,EAAE,cAAc,CAAC;CAClC"}
1
+ {"version":3,"file":"parameterDetails.d.ts","sourceRoot":"","sources":["../../../src/models/parameterDetails.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACjC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACxC,YAAY,CAAC,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG;YAAE,WAAW,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IACpE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,cAAc,CAAC;IAC3B,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAChD,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,eAAe,CAAC,EAAE,cAAc,CAAC;CAClC"}
package/dist/src/transforms/objectTransforms.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"objectTransforms.d.ts","sourceRoot":"","sources":["../../../src/transforms/objectTransforms.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,YAAY,EAEZ,QAAQ,EACR,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,aAAa,EAId,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAUzD,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,aAAa,EAAE,GAC3B,aAAa,EAAE,CASjB;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,aAAa,EAAE,GAC3B,aAAa,CAwBf;AAUD,wBAAgB,iBAAiB,CAAC,EAChC,QAAQ,EACR,MAAM,EACN,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,QAAQ,EACT,EAAE,QAAQ,GAAG,aAAa,GAAG,eAAe,CAgC5C"}
1
+ {"version":3,"file":"objectTransforms.d.ts","sourceRoot":"","sources":["../../../src/transforms/objectTransforms.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,YAAY,EAEZ,QAAQ,EACR,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,aAAa,EAId,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAUzD,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,aAAa,EAAE,GAC3B,aAAa,EAAE,CASjB;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,aAAa,EAAE,GAC3B,aAAa,CA0Bf;AAUD,wBAAgB,iBAAiB,CAAC,EAChC,QAAQ,EACR,MAAM,EACN,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,QAAQ,EACT,EAAE,QAAQ,GAAG,aAAa,GAAG,eAAe,CAgC5C"}
package/dist/src/transforms/objectTransforms.js CHANGED
@@ -13,7 +13,7 @@ function transformObjects(codeModel, uberParents) {
13
13
  const clientName = (0, languageHelpers_1.getLanguageMetadata)(codeModel.language).name;
14
14
  const objectSchemas = codeModel.schemas.objects || [];
15
15
  const headersSchemas = (0, extractHeaders_1.extractHeaders)(codeModel.operationGroups, clientName);
16
- const objectDetails = [...objectSchemas, ...headersSchemas].map(object => transformObject(object, uberParents));
16
+ const objectDetails = [...objectSchemas, ...headersSchemas].map((object) => transformObject(object, uberParents));
17
17
  return getObjectDetailsWithHierarchy(objectDetails);
18
18
  }
19
19
  exports.transformObjects = transformObjects;
@@ -31,7 +31,7 @@ function transformObject(schema, uberParents) {
31
31
  description: metadata.description || undefined,
32
32
  schema,
33
33
  properties: schema.properties
34
- ? schema.properties.map(prop => transformProperty(prop))
34
+ ? schema.properties.map((prop) => transformProperty(prop))
35
35
  : []
36
36
  };
37
37
  return getAdditionalObjectDetails(objectDetails, uberParents);
@@ -83,7 +83,7 @@ function getObjectKind(schema) {
83
83
  return modelDetails_1.ObjectKind.Basic;
84
84
  }
85
85
  function getObjectDetailsWithHierarchy(objectsDetails) {
86
- return objectsDetails.map(current => {
86
+ return objectsDetails.map((current) => {
87
87
  const parentsSchema = (0, schemaHelpers_1.getSchemaParents)(current.schema, true /** immediateOnly */);
88
88
  const childrenSchema = current.schema.children && current.schema.children.immediate;
89
89
  let parents = extractHierarchy(parentsSchema, objectsDetails, current);
@@ -98,9 +98,9 @@ function extractHierarchy(schemas, objectsDetails, current) {
98
98
  if (!schemas || !schemas.length) {
99
99
  return [];
100
100
  }
101
- return schemas.map(r => {
101
+ return schemas.map((r) => {
102
102
  const relativeName = (0, nameUtils_1.normalizeName)((0, languageHelpers_1.getLanguageMetadata)(r.language).name, nameUtils_1.NameType.Interface, true /** shouldGuard */);
103
- const relative = objectsDetails.find(o => o.name === relativeName);
103
+ const relative = objectsDetails.find((o) => o.name === relativeName);
104
104
  if (!relative) {
105
105
  throw new Error(`Expected relative ${relativeName} of ${current.name} but couldn't find it in transformed objects`);
106
106
  }
@@ -124,7 +124,7 @@ function transformComposedObject(objectDetails) {
124
124
  if (immediateParents.length < 1) {
125
125
  throw new Error(`Expected object ${objectDetails.name} to have parents`);
126
126
  }
127
- const parentNames = immediateParents.map(parent => {
127
+ const parentNames = immediateParents.map((parent) => {
128
128
  const name = (0, languageHelpers_1.getLanguageMetadata)(parent.language).name;
129
129
  return `${(0, nameUtils_1.normalizeName)(name, nameUtils_1.NameType.Interface, true /** shouldGuard */)}`;
130
130
  });
@@ -136,13 +136,13 @@ function transformPolymorphicObject(objectDetails, uberParents) {
136
136
  let uberParent = objectDetails.schema;
137
137
  const allParents = (0, schemaHelpers_1.getSchemaParents)(schema);
138
138
  if (allParents && allParents.length) {
139
- const uberParentSchema = allParents.find(p => {
139
+ const uberParentSchema = allParents.find((p) => {
140
140
  // TODO: Reconsider names to reduce issues with normalization, can we switch to serialized?
141
141
  const name = (0, nameUtils_1.normalizeName)((0, languageHelpers_1.getLanguageMetadata)(p.language).name, nameUtils_1.NameType.Interface, true /** shouldGuard */);
142
- return uberParents.some(up => up.name === name);
142
+ return uberParents.some((up) => up.name === name);
143
143
  });
144
144
  if (!uberParentSchema) {
145
- const upn = uberParents.map(u => u.name);
145
+ const upn = uberParents.map((u) => u.name);
146
146
  throw new Error(`Could not determine uberParent for Object ${objectDetails.name}. Make sure that swagger defines polymorphism correctly; UberParents: ${JSON.stringify(upn)}`);
147
147
  }
148
148
  uberParent = uberParentSchema;
@@ -162,7 +162,7 @@ function transformPolymorphicObject(objectDetails, uberParents) {
162
162
  discriminatorPath = `${uberParentName}`;
163
163
  const discriminatorProperty = (0, languageHelpers_1.getLanguageMetadata)(uberParent.discriminator.property.language).name;
164
164
  const childDiscriminators = getChildrenDiscriminators(schema);
165
- const propertyToMark = objectDetails.properties.find(p => p.name === discriminatorProperty);
165
+ const propertyToMark = objectDetails.properties.find((p) => p.name === discriminatorProperty);
166
166
  if (propertyToMark) {
167
167
  propertyToMark.isDiscriminator = true;
168
168
  }
@@ -177,8 +177,7 @@ function transformPolymorphicObject(objectDetails, uberParents) {
177
177
  if (uberParent.discriminator) {
178
178
  const childDiscriminators = getChildrenDiscriminators(schema);
179
179
  discriminatorValues = {
180
- [(0, languageHelpers_1.getLanguageMetadata)(uberParent.discriminator.property.language)
181
- .name]: [
180
+ [(0, languageHelpers_1.getLanguageMetadata)(uberParent.discriminator.property.language).name]: [
182
181
  schema.discriminatorValue
183
182
  ? schema.discriminatorValue
184
183
  : schema.language.default.name,
@@ -195,7 +194,7 @@ function getChildrenDiscriminators(objectSchema) {
195
194
  var _a, _b;
196
195
  const children = (_b = (_a = objectSchema.children) === null || _a === void 0 ? void 0 : _a.all) !== null && _b !== void 0 ? _b : [];
197
196
  return children
198
- .map(c => c.discriminatorValue)
199
- .filter(c => !!c);
197
+ .map((c) => c.discriminatorValue)
198
+ .filter((c) => !!c);
200
199
  }
201
200
  //# sourceMappingURL=objectTransforms.js.map
package/dist/src/transforms/objectTransforms.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"objectTransforms.js","sourceRoot":"","sources":["../../../src/transforms/objectTransforms.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"objectTransforms.js","sourceRoot":"","sources":["../../../src/transforms/objectTransforms.ts"],"names":[],"mappings":"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"}
package/dist/src/transforms/parameterTransforms.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"parameterTransforms.d.ts","sourceRoot":"","sources":["../../../src/transforms/parameterTransforms.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,SAAS,EAQV,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAa9D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAkEtD,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,aAAa,GACrB,gBAAgB,EAAE,CAyBpB;AAsFD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,gBAAgB,EAAE,EACvC,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,OAAO,EACvB,eAAe,CAAC,EAAE,cAAc,GAC/B,IAAI,CAqGN;AA6KD;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,gBAAgB,EAC3B,mBAAmB,EAAE,gBAAgB,EAAE,EACvC,cAAc,EAAE,gBAAgB,EAAE,EAClC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,QA8BpB"}
1
+ {"version":3,"file":"parameterTransforms.d.ts","sourceRoot":"","sources":["../../../src/transforms/parameterTransforms.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,SAAS,EAQV,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAa9D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAqEtD,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,aAAa,GACrB,gBAAgB,EAAE,CAyBpB;AA6FD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,gBAAgB,EAAE,EACvC,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,OAAO,EACvB,eAAe,CAAC,EAAE,cAAc,GAC/B,IAAI,CA0GN;AAmLD;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,gBAAgB,EAC3B,mBAAmB,EAAE,gBAAgB,EAAE,EACvC,cAAc,EAAE,gBAAgB,EAAE,EAClC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,QA8BpB"}
package/dist/src/transforms/parameterTransforms.js CHANGED
@@ -20,6 +20,7 @@ const buildCredentialsParameter = () => {
20
20
  nameRef: "credentials",
21
21
  description: "Subscription credentials which uniquely identify client subscription.",
22
22
  name: "credentials",
23
+ propertyName: "credentials",
23
24
  serializedName: "credentials",
24
25
  location: codemodel_1.ParameterLocation.None,
25
26
  required: true,
@@ -45,6 +46,7 @@ const buildEndpointParameter = () => ({
45
46
  nameRef: "endpoint",
46
47
  description: "Overrides client endpoint.",
47
48
  name: "endpoint",
49
+ propertyName: "endpoint",
48
50
  serializedName: "endpoint",
49
51
  location: codemodel_1.ParameterLocation.None,
50
52
  required: false,
@@ -68,7 +70,7 @@ function transformParameters(codeModel, options) {
68
70
  let parameters = [];
69
71
  const { addCredentials } = (0, schemaHelpers_1.getSecurityInfoFromModel)(codeModel.security);
70
72
  const hasXmlMetadata = !!((_a = options.mediaTypes) === null || _a === void 0 ? void 0 : _a.has(codegen_1.KnownMediaType.Xml));
71
- extractOperationParameters(codeModel).forEach(p => populateOperationParameters(p.parameter, parameters, p.operationName, hasXmlMetadata, p.targetMediaType));
73
+ extractOperationParameters(codeModel).forEach((p) => populateOperationParameters(p.parameter, parameters, p.operationName, hasXmlMetadata, p.targetMediaType));
72
74
  // Adding credentials parameter as a Synthetic parameter, this is to treat this as any another parameter
73
75
  // during generation and remove the need of special handling it.
74
76
  if (addCredentials) {
@@ -90,9 +92,10 @@ const extractOperationParameters = (codeModel) => codeModel.operationGroups.redu
90
92
  if (requests === undefined) {
91
93
  throw new Error(`No request object was found for operation: ${operationName}`);
92
94
  }
93
- const operationParams = (operation.parameters || []).map(p => {
95
+ const operationParams = (operation.parameters || []).map((p) => {
94
96
  if (p.required) {
95
97
  p.language.default.isTopLevelParameter = true;
98
+ p.schema.language.default.isTopLevelParameter = true;
96
99
  }
97
100
  return {
98
101
  parameter: p,
@@ -103,9 +106,9 @@ const extractOperationParameters = (codeModel) => codeModel.operationGroups.redu
103
106
  // This is known to be the case when an operation can consume multiple media types.
104
107
  // We need to ensure that the parameters from each request (method overload) is accounted for.
105
108
  const requestParams = [];
106
- requests.map(request => {
109
+ requests.map((request) => {
107
110
  var _a;
108
- (_a = request.parameters) === null || _a === void 0 ? void 0 : _a.map(parameter => {
111
+ (_a = request.parameters) === null || _a === void 0 ? void 0 : _a.map((parameter) => {
109
112
  var _a;
110
113
  requestParams.push({
111
114
  operationName,
@@ -113,10 +116,12 @@ const extractOperationParameters = (codeModel) => codeModel.operationGroups.redu
113
116
  targetMediaType: (_a = request.protocol.http) === null || _a === void 0 ? void 0 : _a.knownMediaType
114
117
  });
115
118
  if (parameter.required) {
116
- if (parameter['targetProperty'] !== undefined) {
117
- parameter['targetProperty'].language.default.isTopLevelParameter = true;
119
+ if (parameter["targetProperty"] !== undefined) {
120
+ parameter["targetProperty"].language.default.isTopLevelParameter = true;
121
+ parameter["targetProperty"].schema.language.default.isTopLevelParameter = true;
118
122
  }
119
123
  parameter.language.default.isTopLevelParameter = true;
124
+ parameter.schema.language.default.isTopLevelParameter = true;
120
125
  }
121
126
  return parameter;
122
127
  });
@@ -159,8 +164,9 @@ function populateOperationParameters(parameter, operationParameters, operationNa
159
164
  if (parameter.schema.type === codemodel_1.SchemaType.Group) {
160
165
  return;
161
166
  }
162
- const name = (0, nameUtils_1.normalizeName)(parameterName, nameUtils_1.NameType.Parameter, parameter.language.default.isTopLevelParameter /** shouldGuard */);
163
- const sameNameParams = operationParameters.filter(p => p.name === name || p.nameRef === name);
167
+ const name = (0, nameUtils_1.normalizeName)(parameterName, nameUtils_1.NameType.Parameter, true /** shouldGuard */);
168
+ const propertyName = (0, nameUtils_1.normalizeName)(parameterName, nameUtils_1.NameType.Property, true /** shouldGuard */);
169
+ const sameNameParams = operationParameters.filter((p) => p.name === name || p.nameRef === name);
164
170
  description += (0, schemaHelpers_1.getSchemaTypeDocumentation)(parameter.schema);
165
171
  const isRequired = getParameterRequired(parameter);
166
172
  const isNullable = !!parameter.nullable;
@@ -172,6 +178,7 @@ function populateOperationParameters(parameter, operationParameters, operationNa
172
178
  ? undefined
173
179
  : description,
174
180
  name,
181
+ propertyName,
175
182
  serializedName,
176
183
  operationsIn: {
177
184
  [operationName]: {
@@ -229,20 +236,20 @@ function getParameterPath(parameter) {
229
236
  const metadata = (0, languageHelpers_1.getLanguageMetadata)(parameter.language);
230
237
  // ParameterPath has to include the name we used for the parameter, not the serializedName
231
238
  const name = (0, nameUtils_1.normalizeName)(metadata.name, nameUtils_1.NameType.Parameter, parameter.language.default.isTopLevelParameter ? true : false /** shouldGuard */);
239
+ const propertyName = (0, nameUtils_1.normalizeName)(metadata.name, nameUtils_1.NameType.Property, true);
232
240
  if (parameter.groupedBy) {
233
- const groupedByName = (0, languageHelpers_1.getLanguageMetadata)(parameter.groupedBy.language)
234
- .name;
241
+ const groupedByName = (0, languageHelpers_1.getLanguageMetadata)(parameter.groupedBy.language).name;
235
242
  return [
236
243
  ...(!parameter.required && !parameter.groupedBy.required
237
244
  ? ["options"]
238
245
  : []),
239
246
  (0, nameUtils_1.normalizeName)(groupedByName, nameUtils_1.NameType.Parameter, true /** shouldGuard */),
240
- name
247
+ propertyName
241
248
  ];
242
249
  }
243
250
  return isClientImplementation(parameter) || parameter.required
244
251
  ? name
245
- : ["options", name];
252
+ : ["options", propertyName];
246
253
  }
247
254
  const isClientImplementation = (parameter) => parameter.implementation === codemodel_1.ImplementationLocation.Client;
248
255
  function getParameterLocation(parameter) {
@@ -273,7 +280,7 @@ function getCollectionFormat(parameter) {
273
280
  if (httpInfo.in !== codemodel_1.ParameterLocation.Query || !style) {
274
281
  return undefined;
275
282
  }
276
- const getStyle = (value) => Object.keys(core_http_1.QueryCollectionFormat).find(key => core_http_1.QueryCollectionFormat[key] === value);
283
+ const getStyle = (value) => Object.keys(core_http_1.QueryCollectionFormat).find((key) => core_http_1.QueryCollectionFormat[key] === value);
277
284
  let queryCollectionFormat;
278
285
  switch (style) {
279
286
  case AllSerializationStyles.SpaceDelimited:
@@ -339,7 +346,7 @@ function getComparableParameter({ name, serializedName, location, required, para
339
346
  */
340
347
  function disambiguateParameter(parameter, operationParameters, sameNameParams, operationName, description) {
341
348
  const param = getComparableParameter(parameter);
342
- const existingParam = sameNameParams.find(p => (0, lodash_1.isEqual)(getComparableParameter(p), param));
349
+ const existingParam = sameNameParams.find((p) => (0, lodash_1.isEqual)(getComparableParameter(p), param));
343
350
  if (existingParam) {
344
351
  if (existingParam.operationsIn) {
345
352
  existingParam.operationsIn[operationName] = { description };
package/dist/src/transforms/parameterTransforms.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"parameterTransforms.js","sourceRoot":"","sources":["../../../src/transforms/parameterTransforms.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parameterTransforms.js","sourceRoot":"","sources":["../../../src/transforms/parameterTransforms.ts"],"names":[],"mappings":"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"}
package/dist/src/transforms/transforms.js CHANGED
@@ -37,7 +37,7 @@ function transformChoices(codeModel) {
37
37
  }
38
38
  exports.transformChoices = transformChoices;
39
39
  function extractProperties(choice) {
40
- return choice.choices.map(c => {
40
+ return choice.choices.map((c) => {
41
41
  var _a, _b;
42
42
  const metadata = (0, languageHelpers_1.getLanguageMetadata)(c.language);
43
43
  return {
@@ -82,10 +82,10 @@ function transformCodeModel(codeModel) {
82
82
  (0, operationTransforms_1.transformOperationGroups)(codeModel)
83
83
  ]);
84
84
  const options = yield (0, optionsTransforms_1.transformOptions)(operationGroups);
85
- const [objects, groups, parameters, mappers, unions] = yield Promise.all([
85
+ const [objects, parameters, groups, mappers, unions] = yield Promise.all([
86
86
  (0, objectTransforms_1.transformObjects)(codeModel, uberParents),
87
- (0, groupTransforms_1.transformGroups)(codeModel),
88
87
  (0, parameterTransforms_1.transformParameters)(codeModel, options),
88
+ (0, groupTransforms_1.transformGroups)(codeModel),
89
89
  (0, mapperTransforms_1.transformMappers)(codeModel, uberParents, options),
90
90
  transformChoices(codeModel)
91
91
  ]);
@@ -120,9 +120,9 @@ function getUberParents(codeModel) {
120
120
  return [];
121
121
  }
122
122
  let uberParents = [];
123
- codeModel.schemas.objects.forEach(object => {
123
+ codeModel.schemas.objects.forEach((object) => {
124
124
  const name = (0, languageHelpers_1.getLanguageMetadata)(object.language).name;
125
- const isPresent = uberParents.some(up => up.name === name);
125
+ const isPresent = uberParents.some((up) => up.name === name);
126
126
  const hasChildren = object.children && object.children.all.length;
127
127
  const hasParents = (0, schemaHelpers_1.getSchemaParents)(object).length > 0;
128
128
  if (hasChildren && !hasParents && !isPresent) {
@@ -134,9 +134,9 @@ function getUberParents(codeModel) {
134
134
  });
135
135
  }
136
136
  function transformHasTenantLevel(operationGroups) {
137
- const hasClientLevelSubscription = operationGroups.some(opGroup => {
138
- return opGroup.operations.some(op => {
139
- return op.parameters.some(p => {
137
+ const hasClientLevelSubscription = operationGroups.some((opGroup) => {
138
+ return opGroup.operations.some((op) => {
139
+ return op.parameters.some((p) => {
140
140
  var _a;
141
141
  return (p.language.default.name.toLowerCase() === "subscriptionid" &&
142
142
  ((_a = p.protocol.http) === null || _a === void 0 ? void 0 : _a.in) === codemodel_1.ParameterLocation.Path &&
@@ -144,8 +144,8 @@ function transformHasTenantLevel(operationGroups) {
144
144
  });
145
145
  });
146
146
  });
147
- const hasTenantLevelOperation = operationGroups.some(opGroup => {
148
- return opGroup.operations.some(op => {
147
+ const hasTenantLevelOperation = operationGroups.some((opGroup) => {
148
+ return opGroup.operations.some((op) => {
149
149
  return op.isTenantLevel;
150
150
  });
151
151
  });
package/dist/src/transforms/transforms.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../../src/transforms/transforms.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../../src/transforms/transforms.ts"],"names":[],"mappings":"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"}
package/dist/src/utils/languageHelpers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"languageHelpers.d.ts","sourceRoot":"","sources":["../../../src/utils/languageHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,QAAQ,IAAI,eAAe,EAC3B,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC;IAE3B;;OAEG;IACH,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,MAAM,QAAQ,GAAG,eAAe,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAE1E,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAElE"}
1
+ {"version":3,"file":"languageHelpers.d.ts","sourceRoot":"","sources":["../../../src/utils/languageHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,QAAQ,IAAI,eAAe,EAC3B,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC;IAE3B;;OAEG;IACH,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,MAAM,QAAQ,GAAG,eAAe,GAAG;IACvC,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAElE"}
package/dist/src/utils/languageHelpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"languageHelpers.js","sourceRoot":"","sources":["../../../src/utils/languageHelpers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAwClC,SAAgB,mBAAmB,CAAC,SAAoB;IACtD,OAAO,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,OAAO,CAAC;AAC3E,CAAC;AAFD,kDAEC"}
1
+ {"version":3,"file":"languageHelpers.js","sourceRoot":"","sources":["../../../src/utils/languageHelpers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AA0ClC,SAAgB,mBAAmB,CAAC,SAAoB;IACtD,OAAO,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,OAAO,CAAC;AAC3E,CAAC;AAFD,kDAEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autorest/typescript",
3
- "version": "6.0.14",
3
+ "version": "6.0.15",
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",
@@ -16,14 +16,14 @@
16
16
  "@autorest/codemodel": "~4.19.2",
17
17
  "@autorest/extension-base": "^3.5.0",
18
18
  "@autorest/testmodeler": "^2.4.0",
19
- "@azure-rest/core-client": "^1.1.6",
19
+ "@azure-rest/core-client": "^1.2.0",
20
20
  "@azure-tools/codegen": "^2.9.1",
21
21
  "@azure/core-client": "^1.6.1",
22
22
  "@azure/core-http": "^3.0.0",
23
23
  "@azure/core-http-compat": "^1.2.0",
24
24
  "@azure/core-lro": "^2.5.4",
25
25
  "@azure/core-paging": "^1.5.0",
26
- "@azure/core-rest-pipeline": "^1.12.0",
26
+ "@azure/core-rest-pipeline": "^1.14.0",
27
27
  "@azure/core-tracing": "^1.0.0",
28
28
  "@azure/logger": "^1.0.0",
29
29
  "@types/lodash": "^4.14.149",
@@ -34,8 +34,8 @@
34
34
  "prettier": "^3.1.0",
35
35
  "source-map-support": "^0.5.16",
36
36
  "ts-morph": "^15.1.0",
37
- "@azure/core-auth": "^1.3.2",
38
- "@azure-tools/rlc-common": "^0.20.0"
37
+ "@azure/core-auth": "^1.6.0",
38
+ "@azure-tools/rlc-common": "^0.22.0"
39
39
  },
40
40
  "devDependencies": {
41
41
  "@azure-tools/test-recorder": "^3.0.0",
@@ -69,7 +69,7 @@
69
69
  "node-cmd": "^3.0.0",
70
70
  "npm-run-all": "^4.1.5",
71
71
  "path-browserify": "^1.0.1",
72
- "puppeteer": "^3.3.0",
72
+ "puppeteer": "^21.0.0",
73
73
  "rimraf": "^5.0.0",
74
74
  "sinon": "^10.0.0",
75
75
  "source-map-loader": "^1.0.0",
@@ -121,6 +121,7 @@
121
121
  "validate-version-tolerance": "npm run start-test-server:v2 & npm run generate-version-tolerance && npm run generate-version-tolerance:tests && npm run test-version-tolerance && npm run stop-test-server",
122
122
  "generate-version-tolerance": "ts-node ./test/commands/version-tolerance.ts",
123
123
  "generate-version-tolerance:tests": "ts-node ./test/commands/version-tolerance.ts --test-gen",
124
+ "regen-test-baselines": "npm run generate-swaggers && npm run rlc-generate-swaggers && npm run smoke-test",
124
125
  "test-version-tolerance": "mocha -r ts-node/register --timeout 2000 \"./test/version-tolerance/**/!(sampleTest).spec.ts\"",
125
126
  "clone:specs": "git clone -c core.longpaths=true https://github.com/Azure/azure-rest-api-specs.git ./.tmp/specs",
126
127
  "smoke-test": "ts-node ./test/commands/smoke-test.ts",
package/src/generators/modelsGenerator.ts CHANGED
@@ -680,7 +680,7 @@ function writeOptionalParameters(
680
680
  function buildParamDetails(p: ParameterDetails): PropertySignatureStructure {
681
681
  const description = getParameterDescription(p, operationFullName);
682
682
  return {
683
- name: normalizeName(p.name, NameType.Parameter),
683
+ name: normalizeName(p.propertyName, NameType.Parameter),
684
684
  hasQuestionToken: true,
685
685
  type: p.typeDetails.typeName,
686
686
  docs: description ? [description] : undefined,
package/src/generators/static/packageFileGenerator.ts CHANGED
@@ -91,11 +91,11 @@ function regularAutorestPackage(
91
91
  ...(hasAsyncIterators && { "@azure/core-paging": "^1.2.0" }),
92
92
  ...(!useCoreV2 && { "@azure/core-http": "^3.0.0" }),
93
93
  ...(useCoreV2 && { "@azure/core-client": "^1.7.0" }),
94
- ...(useCoreV2 && addCredentials && { "@azure/core-auth": "^1.3.0" }),
94
+ ...(useCoreV2 && addCredentials && { "@azure/core-auth": "^1.6.0" }),
95
95
  ...(useCoreV2 &&
96
96
  coreHttpCompatMode && { "@azure/core-http-compat": "^1.2.0" }),
97
97
  ...(useCoreV2 && {
98
- "@azure/core-rest-pipeline": "^1.12.0"
98
+ "@azure/core-rest-pipeline": "^1.14.0"
99
99
  }),
100
100
  ...(tracingInfo && {
101
101
  "@azure/core-tracing": "^1.0.0"
@@ -110,7 +110,7 @@ function regularAutorestPackage(
110
110
  devDependencies: {
111
111
  "@microsoft/api-extractor": "^7.31.1",
112
112
  mkdirp: "^2.1.2",
113
- typescript: "~5.2.0",
113
+ typescript: "~5.3.3",
114
114
  "uglify-js": "^3.4.9",
115
115
  rimraf: "^5.0.0",
116
116
  dotenv: "^16.0.0"
@@ -196,7 +196,7 @@ function regularAutorestPackage(
196
196
 
197
197
  if (generateTest) {
198
198
  packageInfo.module = `./dist-esm/src/index.js`;
199
- packageInfo.devDependencies["@azure/identity"] = "^3.3.0";
199
+ packageInfo.devDependencies["@azure/identity"] = "^4.0.1";
200
200
  packageInfo.devDependencies["@azure-tools/test-recorder"] = "^3.0.0";
201
201
  packageInfo.devDependencies["@azure-tools/test-credential"] = "^1.0.0";
202
202
  packageInfo.devDependencies["mocha"] = "^10.0.0";
package/src/models/parameterDetails.ts CHANGED
@@ -17,6 +17,7 @@ export interface ParameterDetails {
17
17
  defaultValue?: any;
18
18
  description?: string;
19
19
  name: string;
20
+ propertyName: string;
20
21
  serializedName: string;
21
22
  location: ParameterLocation;
22
23
  required?: boolean;
package/src/transforms/objectTransforms.ts CHANGED
@@ -34,7 +34,7 @@ export function transformObjects(
34
34
  const clientName = getLanguageMetadata(codeModel.language).name;
35
35
  const objectSchemas = codeModel.schemas.objects || [];
36
36
  const headersSchemas = extractHeaders(codeModel.operationGroups, clientName);
37
- const objectDetails = [...objectSchemas, ...headersSchemas].map(object =>
37
+ const objectDetails = [...objectSchemas, ...headersSchemas].map((object) =>
38
38
  transformObject(object, uberParents)
39
39
  );
40
40
 
@@ -63,7 +63,9 @@ export function transformObject(
63
63
  description: metadata.description || undefined,
64
64
  schema,
65
65
  properties: schema.properties
66
- ? schema.properties.map(prop => transformProperty(prop))
66
+ ? schema.properties.map((prop) =>
67
+ transformProperty(prop)
68
+ )
67
69
  : []
68
70
  };
69
71
 
@@ -74,8 +76,8 @@ function getObjectSerializedName(metadata: Language, kind: ObjectKind) {
74
76
  return metadata.serializedName
75
77
  ? metadata.serializedName
76
78
  : kind === ObjectKind.Polymorphic
77
- ? metadata.name
78
- : undefined;
79
+ ? metadata.name
80
+ : undefined;
79
81
  }
80
82
 
81
83
  export function transformProperty({
@@ -135,7 +137,7 @@ function getObjectKind(schema: ObjectSchema): ObjectKind {
135
137
  function getObjectDetailsWithHierarchy(
136
138
  objectsDetails: ObjectDetails[]
137
139
  ): ObjectDetails[] {
138
- return objectsDetails.map(current => {
140
+ return objectsDetails.map((current) => {
139
141
  const parentsSchema = getSchemaParents(
140
142
  current.schema,
141
143
  true /** immediateOnly */
@@ -174,13 +176,13 @@ function extractHierarchy(
174
176
  return [];
175
177
  }
176
178
 
177
- return schemas.map(r => {
179
+ return schemas.map((r) => {
178
180
  const relativeName = normalizeName(
179
181
  getLanguageMetadata(r.language).name,
180
182
  NameType.Interface,
181
183
  true /** shouldGuard */
182
184
  );
183
- const relative = objectsDetails.find(o => o.name === relativeName);
185
+ const relative = objectsDetails.find((o) => o.name === relativeName);
184
186
 
185
187
  if (!relative) {
186
188
  throw new Error(
@@ -221,7 +223,7 @@ function transformComposedObject(
221
223
  throw new Error(`Expected object ${objectDetails.name} to have parents`);
222
224
  }
223
225
 
224
- const parentNames = immediateParents.map(parent => {
226
+ const parentNames = immediateParents.map((parent) => {
225
227
  const name = getLanguageMetadata(parent.language).name;
226
228
  return `${normalizeName(
227
229
  name,
@@ -244,18 +246,18 @@ function transformPolymorphicObject(
244
246
  let uberParent: ObjectSchema | undefined = objectDetails.schema;
245
247
  const allParents = getSchemaParents(schema);
246
248
  if (allParents && allParents.length) {
247
- const uberParentSchema = allParents.find(p => {
249
+ const uberParentSchema = allParents.find((p) => {
248
250
  // TODO: Reconsider names to reduce issues with normalization, can we switch to serialized?
249
251
  const name = normalizeName(
250
252
  getLanguageMetadata(p.language).name,
251
253
  NameType.Interface,
252
254
  true /** shouldGuard */
253
255
  );
254
- return uberParents.some(up => up.name === name);
256
+ return uberParents.some((up) => up.name === name);
255
257
  });
256
258
 
257
259
  if (!uberParentSchema) {
258
- const upn = uberParents.map(u => u.name);
260
+ const upn = uberParents.map((u) => u.name);
259
261
  throw new Error(
260
262
  `Could not determine uberParent for Object ${
261
263
  objectDetails.name
@@ -269,7 +271,7 @@ function transformPolymorphicObject(
269
271
  }
270
272
 
271
273
  if (schema !== uberParent && objectDetails.schema.parents?.immediate[0]) {
272
- uberParent = objectDetails.schema.parents?.immediate[0] as ObjectSchema;
274
+ uberParent = objectDetails.schema.parents?.immediate[0] as ObjectSchema;
273
275
  }
274
276
  const uberParentName = getLanguageMetadata(uberParent.language).name;
275
277
  const unionName = `${normalizeName(uberParentName, NameType.Interface)}Union`;
@@ -290,7 +292,7 @@ function transformPolymorphicObject(
290
292
  const childDiscriminators = getChildrenDiscriminators(schema);
291
293
 
292
294
  const propertyToMark = objectDetails.properties.find(
293
- p => p.name === discriminatorProperty
295
+ (p) => p.name === discriminatorProperty
294
296
  );
295
297
 
296
298
  if (propertyToMark) {
@@ -309,13 +311,13 @@ function transformPolymorphicObject(
309
311
  if (uberParent.discriminator) {
310
312
  const childDiscriminators = getChildrenDiscriminators(schema);
311
313
  discriminatorValues = {
312
- [getLanguageMetadata(uberParent.discriminator.property.language)
313
- .name]: [
314
- schema.discriminatorValue
315
- ? schema.discriminatorValue
316
- : schema.language.default.name,
317
- ...childDiscriminators
318
- ]
314
+ [getLanguageMetadata(uberParent.discriminator.property.language).name]:
315
+ [
316
+ schema.discriminatorValue
317
+ ? schema.discriminatorValue
318
+ : schema.language.default.name,
319
+ ...childDiscriminators
320
+ ]
319
321
  };
320
322
  }
321
323
  }
@@ -331,6 +333,6 @@ function transformPolymorphicObject(
331
333
  function getChildrenDiscriminators(objectSchema: ObjectSchema) {
332
334
  const children = objectSchema.children?.all ?? [];
333
335
  return children
334
- .map(c => (c as ObjectSchema).discriminatorValue)
335
- .filter(c => !!c) as string[];
336
+ .map((c) => (c as ObjectSchema).discriminatorValue)
337
+ .filter((c) => !!c) as string[];
336
338
  }
package/src/transforms/parameterTransforms.ts CHANGED
@@ -37,6 +37,7 @@ import { PropertyKind } from "../models/modelDetails";
37
37
  import { KnownMediaType } from "@azure-tools/codegen";
38
38
  import { getAutorestOptions } from "../autorestSession";
39
39
  import { DictionaryMapper } from "@azure/core-client";
40
+ import { ReservedModelNames } from "@azure-tools/rlc-common";
40
41
 
41
42
  interface OperationParameterDetails {
42
43
  parameter: Parameter;
@@ -55,6 +56,7 @@ const buildCredentialsParameter = (): ParameterDetails => {
55
56
  description:
56
57
  "Subscription credentials which uniquely identify client subscription.",
57
58
  name: "credentials",
59
+ propertyName: "credentials",
58
60
  serializedName: "credentials",
59
61
  location: ParameterLocation.None,
60
62
  required: true,
@@ -81,6 +83,7 @@ const buildEndpointParameter = (): ParameterDetails => ({
81
83
  nameRef: "endpoint",
82
84
  description: "Overrides client endpoint.",
83
85
  name: "endpoint",
86
+ propertyName: "endpoint",
84
87
  serializedName: "endpoint",
85
88
  location: ParameterLocation.None,
86
89
  required: false,
@@ -108,7 +111,7 @@ export function transformParameters(
108
111
  const { addCredentials } = getSecurityInfoFromModel(codeModel.security);
109
112
 
110
113
  const hasXmlMetadata = !!options.mediaTypes?.has(KnownMediaType.Xml);
111
- extractOperationParameters(codeModel).forEach(p =>
114
+ extractOperationParameters(codeModel).forEach((p) =>
112
115
  populateOperationParameters(
113
116
  p.parameter,
114
117
  parameters,
@@ -148,32 +151,39 @@ const extractOperationParameters = (codeModel: CodeModel) =>
148
151
  }
149
152
  const operationParams: OperationParameterDetails[] = (
150
153
  operation.parameters || []
151
- ).map(p => {
154
+ ).map((p) => {
152
155
  if (p.required) {
153
156
  p.language.default.isTopLevelParameter = true;
157
+ p.schema.language.default.isTopLevelParameter = true;
154
158
  }
155
159
  return {
156
- parameter: p,
157
- operationName
158
- }
160
+ parameter: p,
161
+ operationName
162
+ };
159
163
  });
160
164
 
161
165
  // Operations may have multiple requests, each with their own set of parameters.
162
166
  // This is known to be the case when an operation can consume multiple media types.
163
167
  // We need to ensure that the parameters from each request (method overload) is accounted for.
164
168
  const requestParams: OperationParameterDetails[] = [];
165
- requests.map(request => {
166
- request.parameters?.map(parameter => {
169
+ requests.map((request) => {
170
+ request.parameters?.map((parameter) => {
167
171
  requestParams.push({
168
172
  operationName,
169
173
  parameter,
170
174
  targetMediaType: request.protocol.http?.knownMediaType
171
175
  });
172
176
  if (parameter.required) {
173
- if ((parameter as any)['targetProperty'] !== undefined) {
174
- (parameter as any)['targetProperty'].language.default.isTopLevelParameter = true;
177
+ if ((parameter as any)["targetProperty"] !== undefined) {
178
+ (parameter as any)[
179
+ "targetProperty"
180
+ ].language.default.isTopLevelParameter = true;
181
+ (parameter as any)[
182
+ "targetProperty"
183
+ ].schema.language.default.isTopLevelParameter = true;
175
184
  }
176
185
  parameter.language.default.isTopLevelParameter = true;
186
+ parameter.schema.language.default.isTopLevelParameter = true;
177
187
  }
178
188
  return parameter;
179
189
  });
@@ -250,11 +260,15 @@ export function populateOperationParameters(
250
260
  const name = normalizeName(
251
261
  parameterName,
252
262
  NameType.Parameter,
253
- parameter.language.default.isTopLevelParameter /** shouldGuard */
263
+ true /** shouldGuard */
254
264
  );
255
-
265
+ const propertyName = normalizeName(
266
+ parameterName,
267
+ NameType.Property,
268
+ true /** shouldGuard */
269
+ )
256
270
  const sameNameParams = operationParameters.filter(
257
- p => p.name === name || p.nameRef === name
271
+ (p) => p.name === name || p.nameRef === name
258
272
  );
259
273
  description += getSchemaTypeDocumentation(parameter.schema);
260
274
  const isRequired = getParameterRequired(parameter);
@@ -269,6 +283,7 @@ export function populateOperationParameters(
269
283
  ? undefined
270
284
  : description,
271
285
  name,
286
+ propertyName,
272
287
  serializedName,
273
288
  operationsIn: {
274
289
  [operationName]: {
@@ -351,21 +366,27 @@ function getParameterPath(parameter: Parameter) {
351
366
  parameter.language.default.isTopLevelParameter ? true: false /** shouldGuard */
352
367
  );
353
368
 
369
+ const propertyName = normalizeName(
370
+ metadata.name,
371
+ NameType.Property,
372
+ true
373
+ );
354
374
  if (parameter.groupedBy) {
355
- const groupedByName = getLanguageMetadata(parameter.groupedBy.language)
356
- .name;
375
+ const groupedByName = getLanguageMetadata(
376
+ parameter.groupedBy.language
377
+ ).name;
357
378
  return [
358
379
  ...(!parameter.required && !parameter.groupedBy.required
359
380
  ? ["options"]
360
381
  : []),
361
382
  normalizeName(groupedByName, NameType.Parameter, true /** shouldGuard */),
362
- name
383
+ propertyName
363
384
  ];
364
385
  }
365
386
 
366
387
  return isClientImplementation(parameter) || parameter.required
367
388
  ? name
368
- : ["options", name];
389
+ : ["options", propertyName];
369
390
  }
370
391
 
371
392
  const isClientImplementation = (parameter: Parameter) =>
@@ -409,7 +430,7 @@ function getCollectionFormat(parameter: Parameter): string | undefined {
409
430
 
410
431
  const getStyle = (value: QueryCollectionFormat) =>
411
432
  Object.keys(QueryCollectionFormat).find(
412
- key => (QueryCollectionFormat as any)[key] === value
433
+ (key) => (QueryCollectionFormat as any)[key] === value
413
434
  );
414
435
 
415
436
  let queryCollectionFormat: QueryCollectionFormat;
@@ -512,7 +533,7 @@ export function disambiguateParameter(
512
533
  description: string
513
534
  ) {
514
535
  const param = getComparableParameter(parameter);
515
- const existingParam = sameNameParams.find(p =>
536
+ const existingParam = sameNameParams.find((p) =>
516
537
  isEqual(getComparableParameter(p), param)
517
538
  );
518
539
 
package/src/transforms/transforms.ts CHANGED
@@ -41,7 +41,7 @@ export async function transformChoices(codeModel: CodeModel) {
41
41
  function extractProperties(
42
42
  choice: ChoiceSchema | SealedChoiceSchema
43
43
  ): UnionElement[] {
44
- return choice.choices.map(c => {
44
+ return choice.choices.map((c) => {
45
45
  const metadata = getLanguageMetadata(c.language);
46
46
  return {
47
47
  name: metadata.name,
@@ -106,10 +106,10 @@ export async function transformCodeModel(
106
106
 
107
107
  const options = await transformOptions(operationGroups);
108
108
 
109
- const [objects, groups, parameters, mappers, unions] = await Promise.all([
109
+ const [objects, parameters, groups, mappers, unions] = await Promise.all([
110
110
  transformObjects(codeModel, uberParents),
111
- transformGroups(codeModel),
112
111
  transformParameters(codeModel, options),
112
+ transformGroups(codeModel),
113
113
  transformMappers(codeModel, uberParents, options),
114
114
  transformChoices(codeModel)
115
115
  ]);
@@ -146,9 +146,9 @@ async function getUberParents(codeModel: CodeModel): Promise<ObjectDetails[]> {
146
146
 
147
147
  let uberParents: ObjectDetails[] = [];
148
148
 
149
- codeModel.schemas.objects.forEach(object => {
149
+ codeModel.schemas.objects.forEach((object) => {
150
150
  const name = getLanguageMetadata(object.language).name;
151
- const isPresent = uberParents.some(up => up.name === name);
151
+ const isPresent = uberParents.some((up) => up.name === name);
152
152
  const hasChildren = object.children && object.children.all.length;
153
153
  const hasParents = getSchemaParents(object).length > 0;
154
154
 
@@ -164,9 +164,9 @@ async function getUberParents(codeModel: CodeModel): Promise<ObjectDetails[]> {
164
164
  function transformHasTenantLevel(
165
165
  operationGroups: OperationGroupDetails[]
166
166
  ): boolean {
167
- const hasClientLevelSubscription = operationGroups.some(opGroup => {
168
- return opGroup.operations.some(op => {
169
- return op.parameters.some(p => {
167
+ const hasClientLevelSubscription = operationGroups.some((opGroup) => {
168
+ return opGroup.operations.some((op) => {
169
+ return op.parameters.some((p) => {
170
170
  return (
171
171
  p.language.default.name.toLowerCase() === "subscriptionid" &&
172
172
  p.protocol.http?.in === ParameterLocation.Path &&
@@ -175,8 +175,8 @@ function transformHasTenantLevel(
175
175
  });
176
176
  });
177
177
  });
178
- const hasTenantLevelOperation = operationGroups.some(opGroup => {
179
- return opGroup.operations.some(op => {
178
+ const hasTenantLevelOperation = operationGroups.some((opGroup) => {
179
+ return opGroup.operations.some((op) => {
180
180
  return op.isTenantLevel;
181
181
  });
182
182
  });
package/src/utils/languageHelpers.ts CHANGED
@@ -37,7 +37,9 @@ export interface PaginationExtension {
37
37
  isNextLinkMethod?: boolean;
38
38
  }
39
39
 
40
- export type Language = ModelerLanguage & { paging?: PaginationExtension };
40
+ export type Language = ModelerLanguage & {
41
+ paging?: PaginationExtension;
42
+ };
41
43
 
42
44
  export function getLanguageMetadata(languages: Languages): Language {
43
45
  return languages.typescript || languages.javascript || languages.default;