@autorest/typescript 6.0.22 → 6.0.23
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.
- package/dist/src/generators/static/packageFileGenerator.js +1 -1
- package/dist/src/restLevelClient/transforms/transformPaths.js +1 -1
- package/dist/src/restLevelClient/transforms/transformPaths.js.map +1 -1
- package/dist/src/transforms/mapperTransforms.d.ts.map +1 -1
- package/dist/src/transforms/mapperTransforms.js +15 -13
- package/dist/src/transforms/mapperTransforms.js.map +1 -1
- package/dist/src/transforms/objectTransforms.d.ts.map +1 -1
- package/dist/src/transforms/objectTransforms.js +10 -4
- package/dist/src/transforms/objectTransforms.js.map +1 -1
- package/package.json +7 -6
- package/src/generators/static/packageFileGenerator.ts +1 -1
- package/src/restLevelClient/transforms/transformPaths.ts +1 -1
- package/src/transforms/mapperTransforms.ts +30 -17
- package/src/transforms/objectTransforms.ts +26 -13
|
@@ -150,7 +150,7 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
150
150
|
packageInfo.module = `./dist-esm/src/index.js`;
|
|
151
151
|
packageInfo.devDependencies["@azure/identity"] = "^4.0.1";
|
|
152
152
|
packageInfo.devDependencies["@azure-tools/test-recorder"] = "^3.0.0";
|
|
153
|
-
packageInfo.devDependencies["@azure-tools/test-credential"] = "^1.
|
|
153
|
+
packageInfo.devDependencies["@azure-tools/test-credential"] = "^1.1.0";
|
|
154
154
|
packageInfo.devDependencies["mocha"] = "^10.0.0";
|
|
155
155
|
packageInfo.devDependencies["@types/mocha"] = "^10.0.0";
|
|
156
156
|
packageInfo.devDependencies["tsx"] = "^4.7.1";
|
|
@@ -63,7 +63,7 @@ function transformPaths(model) {
|
|
|
63
63
|
lroDetails: {
|
|
64
64
|
isLongRunning: (0, hasPollingOperations_1.isLongRunningOperation)(operation)
|
|
65
65
|
},
|
|
66
|
-
|
|
66
|
+
isPaging: (0, extractPaginationDetails_1.isPagingOperation)(operation)
|
|
67
67
|
}
|
|
68
68
|
};
|
|
69
69
|
if (pathDictionary[path].methods[`${method}`] &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformPaths.js","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transformPaths.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,mDAO6B;AAO7B,mCAAiC;AACjC,mFAAyE;AACzE,iEAAkE;AAClE,qDAAgE;AAChE,0EAAyE;AACzE,kEAAqE;AACrE,0DAG6B;AAC7B,oDAAkD;AAElD,SAAgB,cAAc,CAAC,KAAgB;;IAC7C,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,EAC1C,aAAa,GAAG,IAAI,GAAG,EAAU,EACjC,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,MAAM,cAAc,GAAU,EAAE,CAAC;IAEjC,KAAK,MAAM,cAAc,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QACnD,MAAM,kBAAkB,GAAG,IAAA,yBAAa,EACtC,IAAA,qCAAmB,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,IAAI,EACjD,oBAAQ,CAAC,SAAS,EAClB,KAAK,CACN,CAAC;QACF,KAAK,MAAM,SAAS,IAAI,cAAc,CAAC,UAAU,EAAE,CAAC;YAClD,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;YACtD,MAAM,oBAAoB,GAAG,IAAA,qCAAmB,EAAC,SAAS,CAAC,QAAQ,CAAC;iBACjE,WAAW,CAAC;YACf,MAAM,cAAc,GAClB,CAAA,MAAA,SAAS,CAAC,UAAU,0CAChB,MAAM,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,0CAAE,EAAE,MAAK,6BAAiB,CAAC,IAAI,CAAA,EAAA,EAC3D,GAAG,CAAC,CAAC,CAAC,EAAE;gBACP,MAAM,gBAAgB,GAAG,IAAA,qCAAmB,EAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACzD,OAAO;oBACL,IAAI,EAAE,gBAAgB,CAAC,cAAc,IAAI,gBAAgB,CAAC,IAAI;oBAC9D,IAAI,EAAE,IAAA,8BAAc,EAAC,CAAC,CAAC,MAAM,EAAE;wBAC7B,yBAAa,CAAC,KAAK;wBACnB,yBAAa,CAAC,SAAS;qBACxB,CAAC;oBACF,WAAW,EAAE,gBAAgB,CAAC,WAAW;iBAC1C,CAAC;YACJ,CAAC,CAAC,KAAI,EAAE,CAAC;YACb,MAAM,IAAI,GAAW,MAAA,MAAA,SAAS,CAAC,QAAQ,0CAAG,CAAC,EAAE,QAAQ,CAAC,IAAI,0CAAE,IAAI,CAAC;YACjE,cAAc,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,CAAgB,EAAE,CAAgB;gBACrE,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;YAEH,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;gBAC/C,MAAM,IAAI,GAAW,MAAA,OAAO,CAAC,QAAQ,CAAC,IAAI,0CAAE,IAAc,CAAC;gBAC3D,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,QAAQ,CAAC,IAAI,0CAAE,MAAM,CAAC;gBAE7C,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;oBACnB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC1B,cAAc,CAAC,IAAI,CAAC,GAAG;4BACrB,kBAAkB,EAAE,kBAAkB,IAAI,QAAQ;4BAClD,WAAW,EAAE,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW;4BACxD,cAAc;4BACd,OAAO,EAAE,EAAE;4BACX,IAAI,EAAE,aAAa;yBACpB,CAAC;oBACJ,CAAC;oBACD,MAAM,kBAAkB,GAAG,CAAC,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;oBAEjE,MAAM,SAAS,GAAoB;wBACjC,WAAW,EAAE,oBAAoB;wBACjC,WAAW,EAAE,uBAAuB,CAAC,SAAS,EAAE,kBAAkB,CAAC;wBACnE,kBAAkB;wBAClB,UAAU,EAAE,sBAAsB,CAChC,SAAS,EACT,iBAAiB,EACjB,aAAa,CACd;wBACD,aAAa,EAAE,gBAAgB,CAAC,SAAS,CAAC;wBAC1C,aAAa,EAAE,IAAA,4CAAyB,EAAC,SAAS,CAAC;wBACnD,aAAa;wBACb,qBAAqB,EAAE;4BACrB,UAAU,EAAE;gCACV,aAAa,EAAE,IAAA,6CAAsB,EAAC,SAAS,CAAC;6BACjD;4BACD,
|
|
1
|
+
{"version":3,"file":"transformPaths.js","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transformPaths.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,mDAO6B;AAO7B,mCAAiC;AACjC,mFAAyE;AACzE,iEAAkE;AAClE,qDAAgE;AAChE,0EAAyE;AACzE,kEAAqE;AACrE,0DAG6B;AAC7B,oDAAkD;AAElD,SAAgB,cAAc,CAAC,KAAgB;;IAC7C,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,EAC1C,aAAa,GAAG,IAAI,GAAG,EAAU,EACjC,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,MAAM,cAAc,GAAU,EAAE,CAAC;IAEjC,KAAK,MAAM,cAAc,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QACnD,MAAM,kBAAkB,GAAG,IAAA,yBAAa,EACtC,IAAA,qCAAmB,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,IAAI,EACjD,oBAAQ,CAAC,SAAS,EAClB,KAAK,CACN,CAAC;QACF,KAAK,MAAM,SAAS,IAAI,cAAc,CAAC,UAAU,EAAE,CAAC;YAClD,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;YACtD,MAAM,oBAAoB,GAAG,IAAA,qCAAmB,EAAC,SAAS,CAAC,QAAQ,CAAC;iBACjE,WAAW,CAAC;YACf,MAAM,cAAc,GAClB,CAAA,MAAA,SAAS,CAAC,UAAU,0CAChB,MAAM,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,0CAAE,EAAE,MAAK,6BAAiB,CAAC,IAAI,CAAA,EAAA,EAC3D,GAAG,CAAC,CAAC,CAAC,EAAE;gBACP,MAAM,gBAAgB,GAAG,IAAA,qCAAmB,EAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACzD,OAAO;oBACL,IAAI,EAAE,gBAAgB,CAAC,cAAc,IAAI,gBAAgB,CAAC,IAAI;oBAC9D,IAAI,EAAE,IAAA,8BAAc,EAAC,CAAC,CAAC,MAAM,EAAE;wBAC7B,yBAAa,CAAC,KAAK;wBACnB,yBAAa,CAAC,SAAS;qBACxB,CAAC;oBACF,WAAW,EAAE,gBAAgB,CAAC,WAAW;iBAC1C,CAAC;YACJ,CAAC,CAAC,KAAI,EAAE,CAAC;YACb,MAAM,IAAI,GAAW,MAAA,MAAA,SAAS,CAAC,QAAQ,0CAAG,CAAC,EAAE,QAAQ,CAAC,IAAI,0CAAE,IAAI,CAAC;YACjE,cAAc,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,CAAgB,EAAE,CAAgB;gBACrE,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;YAEH,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;gBAC/C,MAAM,IAAI,GAAW,MAAA,OAAO,CAAC,QAAQ,CAAC,IAAI,0CAAE,IAAc,CAAC;gBAC3D,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,QAAQ,CAAC,IAAI,0CAAE,MAAM,CAAC;gBAE7C,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;oBACnB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC1B,cAAc,CAAC,IAAI,CAAC,GAAG;4BACrB,kBAAkB,EAAE,kBAAkB,IAAI,QAAQ;4BAClD,WAAW,EAAE,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW;4BACxD,cAAc;4BACd,OAAO,EAAE,EAAE;4BACX,IAAI,EAAE,aAAa;yBACpB,CAAC;oBACJ,CAAC;oBACD,MAAM,kBAAkB,GAAG,CAAC,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;oBAEjE,MAAM,SAAS,GAAoB;wBACjC,WAAW,EAAE,oBAAoB;wBACjC,WAAW,EAAE,uBAAuB,CAAC,SAAS,EAAE,kBAAkB,CAAC;wBACnE,kBAAkB;wBAClB,UAAU,EAAE,sBAAsB,CAChC,SAAS,EACT,iBAAiB,EACjB,aAAa,CACd;wBACD,aAAa,EAAE,gBAAgB,CAAC,SAAS,CAAC;wBAC1C,aAAa,EAAE,IAAA,4CAAyB,EAAC,SAAS,CAAC;wBACnD,aAAa;wBACb,qBAAqB,EAAE;4BACrB,UAAU,EAAE;gCACV,aAAa,EAAE,IAAA,6CAAsB,EAAC,SAAS,CAAC;6BACjD;4BACD,QAAQ,EAAE,IAAA,4CAAiB,EAAC,SAAS,CAAC;yBACvC;qBACF,CAAC;oBAEF,IACE,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE,CAAC;wBACzC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAClD,IAAA,gBAAO,EAAC,CAAC,EAAE,SAAS,CAAC,CACtB,EACD,CAAC;wBACD,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC5D,CAAC;yBAAM,CAAC;wBACN,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC1D,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAxFD,wCAwFC;AAED,SAAS,uBAAuB,CAC9B,SAAoB,EACpB,qBAAqB,IAAI,GAAG,EAAU;IAEtC,MAAM,UAAU,GAAG,GAAG,IAAA,qCAAmB,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI;QAChE,IAAA,qCAAmB,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,cAAc,YAAY,CAAC;IACrE,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEnC,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,kBAAkB,CAAC,SAAoB,EAAE,KAAgB;;IAChE,MAAM,iBAAiB,GAAG,CAAC,MAAA,SAAS,CAAC,UAAU,mCAAI,EAAE,CAAC;SACnD,MAAM,CACL,CAAC,CAAC,EAAE;;QACF,OAAA,CAAA,MAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,0CAAE,EAAE,MAAK,6BAAiB,CAAC,GAAG;YAC7C,CAAA,MAAA,KAAK,CAAC,gBAAgB,0CAAE,OAAO,CAAC,CAAC,CAAC,MAAK,CAAC,CAAC,CAAA;KAAA,CAC5C;SACA,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACzB,MAAM,oBAAoB,GAAG,IAAA,yCAAsB,EAAC,SAAS,CAAC;SAC3D,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,kCAAsB,CAAC,MAAM,CAAC;SAC/D,MAAM,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,0CAAE,EAAE,CAAC,CAAA,EAAA,CAAC;SACvE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAEzB,OAAO,iBAAiB,IAAI,oBAAoB,CAAC;AACnD,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,SAAoB;;IAC5C,IAAI,WAAW,GAAkB;QAC/B,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,IACE,CAAC,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;QACnD,CAAC,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EACrD,CAAC;QACD,SAAS,eAAe,CAAC,SAAqB;YAC5C,OAAO,SAAS;iBACb,MAAM,CACL,CAAC,CAAC,EAAE,eACF,OAAA,CAAA,MAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,0CAAE,WAAW,MAAI,MAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,0CAAE,WAAW,CAAC,MAAM,CAAA,CAAA,EAAA,CACtE;iBACA,GAAG,CAAC,CAAC,CAAC,EAAE;gBACP,MAAM,YAAY,GAAG,IAAA,sCAAmB,EAAC,SAAS,EAAE,CAAC,CAAC,CAAC;gBACvD,OAAO,YAAY,CAAC;YACtB,CAAC,CAAC,CAAC;QACP,CAAC;QAED,WAAW,CAAC,KAAK,GAAG,eAAe,CAAC,MAAA,SAAS,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC;QAChE,WAAW,CAAC,OAAO,GAAG,eAAe,CAAC,MAAA,SAAS,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,mDAAmD;AACnD,6BAA6B;AAC7B,IAAI;AAEJ,SAAS,sBAAsB,CAC7B,SAAoB,EACpB,oBAAoB,IAAI,GAAG,EAAU,EACrC,oBAAoB,IAAI,GAAG,EAAU;;IAErC,IAAI,UAAU,GAAW,cAAc,CAAC;IACxC,IACE,CAAC,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;QACnD,CAAC,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EACrD,CAAC;QACD,MAAM,SAAS,GAAG;YAChB,GAAG,CAAC,MAAA,SAAS,CAAC,SAAS,mCAAI,EAAE,CAAC;YAC9B,GAAG,CAAC,MAAA,SAAS,CAAC,UAAU,mCAAI,EAAE,CAAC;SAChC,CAAC;QACF,MAAM,aAAa,GAAG,SAAS;aAC5B,MAAM,CACL,CAAC,CAAC,EAAE,eAAC,OAAA,CAAA,MAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,0CAAE,WAAW,MAAI,MAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,0CAAE,WAAW,CAAC,MAAM,CAAA,CAAA,EAAA,CACzE;aACA,GAAG,CAAC,CAAC,CAAC,EAAE;YACP,MAAM,YAAY,GAAG,IAAA,sCAAmB,EAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACvD,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACpC,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC,CAAC;QAEL,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACzB,IACE,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;gBAC1C,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,EAClC,CAAC;gBACD,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACxC,CAAC;YACD,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IACD,IAAI,UAAU,KAAK,cAAc,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QACxE,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapperTransforms.d.ts","sourceRoot":"","sources":["../../../src/transforms/mapperTransforms.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,UAAU,EAUV,SAAS,EAGV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,MAAM,EAIP,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAKxD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"mapperTransforms.d.ts","sourceRoot":"","sources":["../../../src/transforms/mapperTransforms.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,UAAU,EAUV,SAAS,EAGV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,MAAM,EAIP,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAKxD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AA0BpD,MAAM,MAAM,eAAe,GAAG;IAAE,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC;AAE5E,MAAM,WAAW,aAAa;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,aAAa,EAAE,EAC5B,EAAE,UAAU,EAAE,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC,CAuBnB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,WAAW,UAwB/D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAMzD;AA2mBD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,MAAM,EACvB,OAAO,GAAE,aAAkB,GAC1B,MAAM,CAmBR;AAED,wBAAgB,YAAY,CAAC,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,WAExE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,qNA8CxE"}
|
|
@@ -40,12 +40,12 @@ function transformMappers(codeModel_1, uberParents_1, _a) {
|
|
|
40
40
|
if (!codeModel.schemas.objects) {
|
|
41
41
|
return [];
|
|
42
42
|
}
|
|
43
|
-
const uberParentsNames = uberParents.map(up => up.name);
|
|
43
|
+
const uberParentsNames = uberParents.map((up) => up.name);
|
|
44
44
|
const hasXmlMetadata = mediaTypes === null || mediaTypes === void 0 ? void 0 : mediaTypes.has(codegen_1.KnownMediaType.Xml);
|
|
45
45
|
return [
|
|
46
46
|
...codeModel.schemas.objects,
|
|
47
47
|
...(0, extractHeaders_1.extractHeaders)(codeModel.operationGroups, clientName)
|
|
48
|
-
].map(objectSchema => transformMapper({
|
|
48
|
+
].map((objectSchema) => transformMapper({
|
|
49
49
|
schema: objectSchema,
|
|
50
50
|
options: {
|
|
51
51
|
hasXmlMetadata,
|
|
@@ -153,8 +153,7 @@ function getXmlMetadata(schema, { hasXmlMetadata, serializedName }) {
|
|
|
153
153
|
const defaultName = serializedName || (0, languageHelpers_1.getLanguageMetadata)(schema.language).serializedName;
|
|
154
154
|
const { name, attribute: xmlIsAttribute, wrapped: xmlIsWrapped } = ((_j = schema.serialization) === null || _j === void 0 ? void 0 : _j.xml) || {};
|
|
155
155
|
const xmlName = name || defaultName;
|
|
156
|
-
const headerCollectionPrefix = (0, languageHelpers_1.getLanguageMetadata)(schema.language)
|
|
157
|
-
.headerCollectionPrefix;
|
|
156
|
+
const headerCollectionPrefix = (0, languageHelpers_1.getLanguageMetadata)(schema.language).headerCollectionPrefix;
|
|
158
157
|
return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (headerCollectionPrefix && { headerCollectionPrefix })), (xmlName && { xmlName })), (xmlIsAttribute && { xmlIsAttribute })), (xmlIsWrapped && { xmlIsWrapped })), (xmlElementName && { xmlElementName })), (xmlNamespace && { xmlNamespace })), (xmlNamespacePrefix && { xmlNamespacePrefix })), (isXmlText && { xmlIsMsText: true }));
|
|
159
158
|
}
|
|
160
159
|
function buildAdditionalProperties(objectSchema) {
|
|
@@ -172,7 +171,7 @@ function isUberParent(objectSchema) {
|
|
|
172
171
|
return !parents && children && children.all && children.all.length;
|
|
173
172
|
}
|
|
174
173
|
function transformObjectMapper(pipelineValue) {
|
|
175
|
-
var _a, _b;
|
|
174
|
+
var _a, _b, _c;
|
|
176
175
|
const { schema, options } = pipelineValue;
|
|
177
176
|
if (!isSchemaType([codemodel_1.SchemaType.Object], schema)) {
|
|
178
177
|
return pipelineValue;
|
|
@@ -184,8 +183,8 @@ function transformObjectMapper(pipelineValue) {
|
|
|
184
183
|
const parents = (0, schemaHelpers_1.getSchemaParents)(objectSchema);
|
|
185
184
|
const immediateParents = (0, schemaHelpers_1.getSchemaParents)(objectSchema, true /** immediateOnly */);
|
|
186
185
|
const parentsRefs = immediateParents
|
|
187
|
-
.map(p => getMapperClassName(p))
|
|
188
|
-
.filter(p => p !== className);
|
|
186
|
+
.map((p) => getMapperClassName(p))
|
|
187
|
+
.filter((p) => p !== className);
|
|
189
188
|
const additionalProperties = buildAdditionalProperties(objectSchema);
|
|
190
189
|
modelProperties = Object.assign(Object.assign({}, modelProperties), (parentsRefs && parentsRefs.length && { parentsRefs }));
|
|
191
190
|
const uberParents = (options === null || options === void 0 ? void 0 : options.uberParents) || [];
|
|
@@ -195,9 +194,12 @@ function transformObjectMapper(pipelineValue) {
|
|
|
195
194
|
}
|
|
196
195
|
// If any of the parents is present in uberParents we know it
|
|
197
196
|
// is its uber parent
|
|
198
|
-
let uberParent = getMapperClassName(parents.find(p =>
|
|
197
|
+
let uberParent = getMapperClassName(parents.find((p) => p.discriminator &&
|
|
198
|
+
uberParents.includes(getMapperClassName(p))) ||
|
|
199
|
+
parents.find((p) => uberParents.includes(getMapperClassName(p))) ||
|
|
200
|
+
schema);
|
|
199
201
|
if ((_a = objectSchema.parents) === null || _a === void 0 ? void 0 : _a.immediate[0]) {
|
|
200
|
-
uberParent = getMapperClassName((_b = objectSchema.parents) === null || _b === void 0 ? void 0 : _b.immediate[0]);
|
|
202
|
+
uberParent = getMapperClassName(((_b = objectSchema.parents) === null || _b === void 0 ? void 0 : _b.immediate.find((im) => im.discriminator)) || ((_c = objectSchema.parents) === null || _c === void 0 ? void 0 : _c.immediate[0]));
|
|
201
203
|
}
|
|
202
204
|
const mapper = buildMapper(schema, Object.assign(Object.assign(Object.assign({ name: core_http_1.MapperType.Composite, className,
|
|
203
205
|
modelProperties }, (discriminatorValue && {
|
|
@@ -316,7 +318,7 @@ function transformChoiceMapper(pipelineValue) {
|
|
|
316
318
|
else {
|
|
317
319
|
type = {
|
|
318
320
|
name: core_http_1.MapperType.Enum,
|
|
319
|
-
allowedValues: choiceSchema.choices.map(choice => choice.value)
|
|
321
|
+
allowedValues: choiceSchema.choices.map((choice) => choice.value)
|
|
320
322
|
};
|
|
321
323
|
}
|
|
322
324
|
}
|
|
@@ -429,7 +431,7 @@ function transformUuidMapper(pipelineValue) {
|
|
|
429
431
|
}
|
|
430
432
|
function processProperties(properties = [], options = {}) {
|
|
431
433
|
let modelProperties = {};
|
|
432
|
-
properties.forEach(prop => {
|
|
434
|
+
properties.forEach((prop) => {
|
|
433
435
|
const serializedName = getPropertySerializedName(prop);
|
|
434
436
|
const propName = (0, languageHelpers_1.getLanguageMetadata)(prop.language).name;
|
|
435
437
|
const name = (0, nameUtils_1.normalizeName)(propName, prop.language.default.isTopLevelParameter
|
|
@@ -444,9 +446,9 @@ function getPropertySerializedName({ flattenedNames, serializedName }) {
|
|
|
444
446
|
return serializedName;
|
|
445
447
|
}
|
|
446
448
|
return flattenedNames
|
|
447
|
-
.map(name => {
|
|
449
|
+
.map((name) => {
|
|
448
450
|
// Escaping names
|
|
449
|
-
["."].forEach(character => {
|
|
451
|
+
["."].forEach((character) => {
|
|
450
452
|
name = name.replace(character, `\\${character}`);
|
|
451
453
|
});
|
|
452
454
|
return name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapperTransforms.js","sourceRoot":"","sources":["../../../src/transforms/mapperTransforms.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mapperTransforms.js","sourceRoot":"","sources":["../../../src/transforms/mapperTransforms.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
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"}
|
|
@@ -131,7 +131,7 @@ function transformComposedObject(objectDetails) {
|
|
|
131
131
|
return Object.assign(Object.assign({}, objectDetails), { parentNames });
|
|
132
132
|
}
|
|
133
133
|
function transformPolymorphicObject(objectDetails, uberParents) {
|
|
134
|
-
var _a, _b;
|
|
134
|
+
var _a, _b, _c;
|
|
135
135
|
const schema = objectDetails.schema;
|
|
136
136
|
let uberParent = objectDetails.schema;
|
|
137
137
|
const allParents = (0, schemaHelpers_1.getSchemaParents)(schema);
|
|
@@ -139,8 +139,14 @@ function transformPolymorphicObject(objectDetails, uberParents) {
|
|
|
139
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
|
|
143
|
-
|
|
142
|
+
return (p.discriminator &&
|
|
143
|
+
uberParents.some((up) => up.name === name));
|
|
144
|
+
}) ||
|
|
145
|
+
allParents.find((p) => {
|
|
146
|
+
// TODO: Reconsider names to reduce issues with normalization, can we switch to serialized?
|
|
147
|
+
const name = (0, nameUtils_1.normalizeName)((0, languageHelpers_1.getLanguageMetadata)(p.language).name, nameUtils_1.NameType.Interface, true /** shouldGuard */);
|
|
148
|
+
return uberParents.some((up) => up.name === name);
|
|
149
|
+
});
|
|
144
150
|
if (!uberParentSchema) {
|
|
145
151
|
const upn = uberParents.map((u) => u.name);
|
|
146
152
|
throw new Error(`Could not determine uberParent for Object ${objectDetails.name}. Make sure that swagger defines polymorphism correctly; UberParents: ${JSON.stringify(upn)}`);
|
|
@@ -148,7 +154,7 @@ function transformPolymorphicObject(objectDetails, uberParents) {
|
|
|
148
154
|
uberParent = uberParentSchema;
|
|
149
155
|
}
|
|
150
156
|
if (schema !== uberParent && ((_a = objectDetails.schema.parents) === null || _a === void 0 ? void 0 : _a.immediate[0])) {
|
|
151
|
-
uberParent = (_b = objectDetails.schema.parents) === null || _b === void 0 ? void 0 : _b.immediate[0];
|
|
157
|
+
uberParent = (((_b = objectDetails.schema.parents) === null || _b === void 0 ? void 0 : _b.immediate.find((im) => im.discriminator)) || ((_c = objectDetails.schema.parents) === null || _c === void 0 ? void 0 : _c.immediate[0]));
|
|
152
158
|
}
|
|
153
159
|
const uberParentName = (0, languageHelpers_1.getLanguageMetadata)(uberParent.language).name;
|
|
154
160
|
const unionName = `${(0, nameUtils_1.normalizeName)(uberParentName, nameUtils_1.NameType.Interface)}Union`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectTransforms.js","sourceRoot":"","sources":["../../../src/transforms/objectTransforms.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAUlC,yDAKgC;AAChC,8DAA+D;AAC/D,kDAA6D;AAE7D,0DAKgC;AAChC,4DAAyD;AACzD,wDAAwD;AAExD,SAAgB,gBAAgB,CAC9B,SAAoB,EACpB,WAA4B;IAE5B,MAAM,UAAU,GAAG,IAAA,qCAAmB,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;IAChE,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;IACtD,MAAM,cAAc,GAAG,IAAA,+BAAc,EAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAC7E,MAAM,aAAa,GAAG,CAAC,GAAG,aAAa,EAAE,GAAG,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACzE,eAAe,CAAC,MAAM,EAAE,WAAW,CAAC,CACrC,CAAC;IAEF,OAAO,6BAA6B,CAAC,aAAa,CAAC,CAAC;AACtD,CAAC;AAZD,4CAYC;AAED,SAAgB,eAAe,CAC7B,MAAoB,EACpB,WAA4B;IAE5B,MAAM,QAAQ,GAAG,IAAA,qCAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtD,IAAI,IAAI,GAAG,IAAA,yBAAa,EACtB,QAAQ,CAAC,IAAI,EACb,oBAAQ,CAAC,KAAK,EACd,IAAI,CAAC,kBAAkB,CACxB,CAAC;IACF,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAEnC,IAAI,aAAa,GAAkB;QACjC,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;QACX,uBAAuB,EAAE,KAAK;QAC9B,IAAI;QACJ,IAAI;QACJ,cAAc,EAAE,uBAAuB,CAAC,QAAQ,EAAE,IAAI,CAAC;QACvD,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,SAAS;QAC9C,MAAM;QACN,UAAU,EAAE,MAAM,CAAC,UAAU;YAC3B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"objectTransforms.js","sourceRoot":"","sources":["../../../src/transforms/objectTransforms.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.
|
|
3
|
+
"version": "6.0.23",
|
|
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.6.0",
|
|
38
|
-
"@azure-tools/rlc-common": "^0.
|
|
38
|
+
"@azure-tools/rlc-common": "^0.29.0"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@azure-tools/test-recorder": "^3.0.0",
|
|
@@ -89,7 +89,8 @@
|
|
|
89
89
|
"homepage": "https://github.com/Azure/autorest.typescript/tree/main/packages/autorest.typescript/",
|
|
90
90
|
"scripts": {
|
|
91
91
|
"build": "tsc -p . && npm run copyFiles",
|
|
92
|
-
"build:test:browser": "tsc -p tsconfig.browser-test.json && webpack --config webpack.config.test.js",
|
|
92
|
+
"build:test:browser:rlc": "tsc -p tsconfig.browser-test.json && ts-node test/commands/prepare-deps.ts --browser && webpack --config webpack.config.test.js --env mode=rlc",
|
|
93
|
+
"build:test:browser": "tsc -p tsconfig.browser-test.json && ts-node test/commands/prepare-deps.ts --removal && webpack --config webpack.config.test.js --env mode=hlc",
|
|
93
94
|
"check:tree": "ts-node ./test/commands/check-clean-tree.ts",
|
|
94
95
|
"pack": "npm pack 2>&1",
|
|
95
96
|
"clean": "rimraf --glob test-browser test/**/node_modules",
|
|
@@ -98,7 +99,7 @@
|
|
|
98
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",
|
|
99
100
|
"test:node:alone": "npm run unit-test && npm run integration-test:alone && npm run rlc-integration-test:alone && npm run test-version-tolerance",
|
|
100
101
|
"test:browser": "npm run start-test-server:v2 & npm run integration-test:browser & npm run rlc-integration-test:browser & npm run test-version-tolerance & npm run stop-test-server",
|
|
101
|
-
"test:browser:alone": "npm run integration-test:browser && npm run rlc-integration-test:browser &&
|
|
102
|
+
"test:browser:alone": "npm run integration-test:browser && npm run rlc-integration-test:browser && npm run test-version-tolerance",
|
|
102
103
|
"rlc-test:node": "npm run unit-test && npm run start-test-server:v2 & npm run rlc-integration-test:alone && npm run stop-test-server",
|
|
103
104
|
"rlc-test:browser": "npm run start-test-server:v2 & npm run rlc-integration-test:browser && npm run stop-test-server",
|
|
104
105
|
"unit-test": "mocha -r ts-node/register \"./test/unit/**/*spec.ts\"",
|
|
@@ -109,9 +110,9 @@
|
|
|
109
110
|
"integration-test:alone": "mocha -r ts-node/register --timeout 2000 \"./test/integration/**/!(sampleTest).spec.ts\"",
|
|
110
111
|
"rlc-integration-test": "npm run start-test-server:v2 & npm run rlc-generate-and-test && npm run stop-test-server",
|
|
111
112
|
"rlc-integration-test:new": "npm-run-all start-test-server rlc-generate-and-test rlc-integration-test:alone stop-test-server",
|
|
112
|
-
"rlc-integration-test:browser": "npm run build:test:browser && karma start karma.conf.js",
|
|
113
|
+
"rlc-integration-test:browser": "npm run build:test:browser:rlc && karma start karma.conf.js",
|
|
113
114
|
"rlc-generate-and-test": "npm-run-all -s build rlc-generate-swaggers rlc-integration-test:alone rlc-integration-test:browser",
|
|
114
|
-
"rlc-integration-test:alone": "mocha -r ts-node/register --timeout 2000 \"./test/rlcIntegration
|
|
115
|
+
"rlc-integration-test:alone": "ts-node test/commands/prepare-deps.ts && mocha -r ts-node/register --timeout 2000 \"./test/rlcIntegration/!(sampleTest).spec.ts\"",
|
|
115
116
|
"start-test-server": "ts-node test/commands/start-server.ts",
|
|
116
117
|
"start-test-server:v2": "autorest-testserver run --appendCoverage",
|
|
117
118
|
"stop-test-server": "autorest-testserver stop",
|
|
@@ -199,7 +199,7 @@ function regularAutorestPackage(
|
|
|
199
199
|
packageInfo.module = `./dist-esm/src/index.js`;
|
|
200
200
|
packageInfo.devDependencies["@azure/identity"] = "^4.0.1";
|
|
201
201
|
packageInfo.devDependencies["@azure-tools/test-recorder"] = "^3.0.0";
|
|
202
|
-
packageInfo.devDependencies["@azure-tools/test-credential"] = "^1.
|
|
202
|
+
packageInfo.devDependencies["@azure-tools/test-credential"] = "^1.1.0";
|
|
203
203
|
packageInfo.devDependencies["mocha"] = "^10.0.0";
|
|
204
204
|
packageInfo.devDependencies["@types/mocha"] = "^10.0.0";
|
|
205
205
|
packageInfo.devDependencies["tsx"] = "^4.7.1";
|
|
@@ -58,9 +58,10 @@ const primitiveSchemaTypes = [
|
|
|
58
58
|
* if any function processed the input, remaining ones will skip
|
|
59
59
|
* @param fns functions in the pipeline
|
|
60
60
|
*/
|
|
61
|
-
const pipe =
|
|
62
|
-
...fns: Array<(pipelineValue: PipelineValue) => PipelineValue>
|
|
63
|
-
|
|
61
|
+
const pipe =
|
|
62
|
+
(...fns: Array<(pipelineValue: PipelineValue) => PipelineValue>) =>
|
|
63
|
+
(x: PipelineValue) =>
|
|
64
|
+
fns.reduce((v, f) => (!v.isHandled ? f(v) : v), x);
|
|
64
65
|
|
|
65
66
|
export type ModelProperties = { [propertyName: string]: Mapper | string[] };
|
|
66
67
|
|
|
@@ -91,12 +92,12 @@ export async function transformMappers(
|
|
|
91
92
|
return [];
|
|
92
93
|
}
|
|
93
94
|
|
|
94
|
-
const uberParentsNames = uberParents.map(up => up.name);
|
|
95
|
+
const uberParentsNames = uberParents.map((up) => up.name);
|
|
95
96
|
const hasXmlMetadata = mediaTypes?.has(KnownMediaType.Xml);
|
|
96
97
|
return [
|
|
97
98
|
...codeModel.schemas.objects,
|
|
98
99
|
...extractHeaders(codeModel.operationGroups, clientName)
|
|
99
|
-
].map(objectSchema =>
|
|
100
|
+
].map((objectSchema) =>
|
|
100
101
|
transformMapper({
|
|
101
102
|
schema: objectSchema,
|
|
102
103
|
options: {
|
|
@@ -275,13 +276,17 @@ function getXmlMetadata(
|
|
|
275
276
|
|
|
276
277
|
const defaultName =
|
|
277
278
|
serializedName || getLanguageMetadata(schema.language).serializedName;
|
|
278
|
-
const {
|
|
279
|
-
|
|
279
|
+
const {
|
|
280
|
+
name,
|
|
281
|
+
attribute: xmlIsAttribute,
|
|
282
|
+
wrapped: xmlIsWrapped
|
|
283
|
+
} = schema.serialization?.xml || {};
|
|
280
284
|
|
|
281
285
|
const xmlName = name || defaultName;
|
|
282
286
|
|
|
283
|
-
const headerCollectionPrefix = getLanguageMetadata(
|
|
284
|
-
.
|
|
287
|
+
const headerCollectionPrefix = getLanguageMetadata(
|
|
288
|
+
schema.language
|
|
289
|
+
).headerCollectionPrefix;
|
|
285
290
|
|
|
286
291
|
return {
|
|
287
292
|
...(headerCollectionPrefix && { headerCollectionPrefix }),
|
|
@@ -330,8 +335,8 @@ function transformObjectMapper(pipelineValue: PipelineValue) {
|
|
|
330
335
|
true /** immediateOnly */
|
|
331
336
|
);
|
|
332
337
|
const parentsRefs = immediateParents
|
|
333
|
-
.map(p => getMapperClassName(p))
|
|
334
|
-
.filter(p => p !== className);
|
|
338
|
+
.map((p) => getMapperClassName(p))
|
|
339
|
+
.filter((p) => p !== className);
|
|
335
340
|
|
|
336
341
|
const additionalProperties = buildAdditionalProperties(objectSchema);
|
|
337
342
|
|
|
@@ -350,12 +355,20 @@ function transformObjectMapper(pipelineValue: PipelineValue) {
|
|
|
350
355
|
// If any of the parents is present in uberParents we know it
|
|
351
356
|
// is its uber parent
|
|
352
357
|
let uberParent = getMapperClassName(
|
|
353
|
-
parents.find(
|
|
358
|
+
parents.find(
|
|
359
|
+
(p) =>
|
|
360
|
+
(p as ObjectSchema).discriminator &&
|
|
361
|
+
uberParents.includes(getMapperClassName(p))
|
|
362
|
+
) ||
|
|
363
|
+
parents.find((p) => uberParents.includes(getMapperClassName(p))) ||
|
|
364
|
+
schema
|
|
354
365
|
);
|
|
355
366
|
|
|
356
367
|
if (objectSchema.parents?.immediate[0]) {
|
|
357
368
|
uberParent = getMapperClassName(
|
|
358
|
-
objectSchema.parents?.immediate
|
|
369
|
+
objectSchema.parents?.immediate.find(
|
|
370
|
+
(im) => (im as ObjectSchema).discriminator
|
|
371
|
+
) || (objectSchema.parents?.immediate[0] as ObjectSchema)
|
|
359
372
|
);
|
|
360
373
|
}
|
|
361
374
|
const mapper = buildMapper(
|
|
@@ -527,7 +540,7 @@ function transformChoiceMapper(pipelineValue: PipelineValue) {
|
|
|
527
540
|
} else {
|
|
528
541
|
type = {
|
|
529
542
|
name: MapperType.Enum,
|
|
530
|
-
allowedValues: choiceSchema.choices.map(choice => choice.value)
|
|
543
|
+
allowedValues: choiceSchema.choices.map((choice) => choice.value)
|
|
531
544
|
};
|
|
532
545
|
}
|
|
533
546
|
}
|
|
@@ -703,7 +716,7 @@ function processProperties(
|
|
|
703
716
|
options: EntityOptions = {}
|
|
704
717
|
) {
|
|
705
718
|
let modelProperties: ModelProperties = {};
|
|
706
|
-
properties.forEach(prop => {
|
|
719
|
+
properties.forEach((prop) => {
|
|
707
720
|
const serializedName = getPropertySerializedName(prop);
|
|
708
721
|
const propName = getLanguageMetadata(prop.language).name;
|
|
709
722
|
const name = normalizeName(
|
|
@@ -734,9 +747,9 @@ function getPropertySerializedName({
|
|
|
734
747
|
}
|
|
735
748
|
|
|
736
749
|
return flattenedNames
|
|
737
|
-
.map(name => {
|
|
750
|
+
.map((name) => {
|
|
738
751
|
// Escaping names
|
|
739
|
-
["."].forEach(character => {
|
|
752
|
+
["."].forEach((character) => {
|
|
740
753
|
name = name.replace(character, `\\${character}`);
|
|
741
754
|
});
|
|
742
755
|
return name;
|
|
@@ -63,9 +63,7 @@ export function transformObject(
|
|
|
63
63
|
description: metadata.description || undefined,
|
|
64
64
|
schema,
|
|
65
65
|
properties: schema.properties
|
|
66
|
-
? schema.properties.map((prop) =>
|
|
67
|
-
transformProperty(prop)
|
|
68
|
-
)
|
|
66
|
+
? schema.properties.map((prop) => transformProperty(prop))
|
|
69
67
|
: []
|
|
70
68
|
};
|
|
71
69
|
|
|
@@ -246,15 +244,28 @@ function transformPolymorphicObject(
|
|
|
246
244
|
let uberParent: ObjectSchema | undefined = objectDetails.schema;
|
|
247
245
|
const allParents = getSchemaParents(schema);
|
|
248
246
|
if (allParents && allParents.length) {
|
|
249
|
-
const uberParentSchema =
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
247
|
+
const uberParentSchema =
|
|
248
|
+
allParents.find((p) => {
|
|
249
|
+
// TODO: Reconsider names to reduce issues with normalization, can we switch to serialized?
|
|
250
|
+
const name = normalizeName(
|
|
251
|
+
getLanguageMetadata(p.language).name,
|
|
252
|
+
NameType.Interface,
|
|
253
|
+
true /** shouldGuard */
|
|
254
|
+
);
|
|
255
|
+
return (
|
|
256
|
+
(p as ObjectSchema).discriminator &&
|
|
257
|
+
uberParents.some((up) => up.name === name)
|
|
258
|
+
);
|
|
259
|
+
}) ||
|
|
260
|
+
allParents.find((p) => {
|
|
261
|
+
// TODO: Reconsider names to reduce issues with normalization, can we switch to serialized?
|
|
262
|
+
const name = normalizeName(
|
|
263
|
+
getLanguageMetadata(p.language).name,
|
|
264
|
+
NameType.Interface,
|
|
265
|
+
true /** shouldGuard */
|
|
266
|
+
);
|
|
267
|
+
return uberParents.some((up) => up.name === name);
|
|
268
|
+
});
|
|
258
269
|
|
|
259
270
|
if (!uberParentSchema) {
|
|
260
271
|
const upn = uberParents.map((u) => u.name);
|
|
@@ -271,7 +282,9 @@ function transformPolymorphicObject(
|
|
|
271
282
|
}
|
|
272
283
|
|
|
273
284
|
if (schema !== uberParent && objectDetails.schema.parents?.immediate[0]) {
|
|
274
|
-
uberParent = objectDetails.schema.parents?.immediate
|
|
285
|
+
uberParent = (objectDetails.schema.parents?.immediate.find(
|
|
286
|
+
(im) => (im as ObjectSchema).discriminator
|
|
287
|
+
) || objectDetails.schema.parents?.immediate[0]) as ObjectSchema;
|
|
275
288
|
}
|
|
276
289
|
const uberParentName = getLanguageMetadata(uberParent.language).name;
|
|
277
290
|
const unionName = `${normalizeName(uberParentName, NameType.Interface)}Union`;
|