@azure-tools/rlc-common 1.0.0-beta.6 → 1.0.0-beta.8
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/.rush/temp/package-deps_build.json +7 -7
- package/.rush/temp/shrinkwrap-deps.json +10 -10
- package/CHANGELOG.md +10 -0
- package/dist/buildClient.js +23 -2
- package/dist/buildClient.js.map +1 -1
- package/dist/helpers/operationHelpers.js +1 -1
- package/dist/helpers/operationHelpers.js.map +1 -1
- package/dist/interfaces.js.map +1 -1
- package/dist/metadata/buildPackageFile.js +18 -5
- package/dist/metadata/buildPackageFile.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist-esm/buildClient.js +23 -2
- package/dist-esm/buildClient.js.map +1 -1
- package/dist-esm/helpers/operationHelpers.js +2 -2
- package/dist-esm/helpers/operationHelpers.js.map +1 -1
- package/dist-esm/interfaces.js.map +1 -1
- package/dist-esm/metadata/buildPackageFile.js +18 -5
- package/dist-esm/metadata/buildPackageFile.js.map +1 -1
- package/dist-esm/package.json +1 -1
- package/package.json +1 -1
- package/src/buildClient.ts +30 -2
- package/src/helpers/operationHelpers.ts +2 -2
- package/src/interfaces.ts +0 -1
- package/src/metadata/buildPackageFile.ts +33 -8
- package/types/interfaces.d.ts +0 -1
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"files": {
|
|
3
|
-
"packages/rlc-common/.rush/temp/shrinkwrap-deps.json": "
|
|
3
|
+
"packages/rlc-common/.rush/temp/shrinkwrap-deps.json": "f8044a27e31ff9f722c8633924c63f230f593880",
|
|
4
4
|
"packages/rlc-common/.eslintrc.json": "9fa7b6e2fbe4e63955031b8f8556b51c0a16a46b",
|
|
5
5
|
"packages/rlc-common/.prettierignore": "0f7a61c11bf3ac442a984b1136525710e0ebf6d3",
|
|
6
6
|
"packages/rlc-common/.prettierrc": "83e03202b2f3ad5b8df166a965fea698eccb0f90",
|
|
7
|
-
"packages/rlc-common/CHANGELOG.md": "
|
|
7
|
+
"packages/rlc-common/CHANGELOG.md": "e8baef79074dec770e997c63b63cb723482ba776",
|
|
8
8
|
"packages/rlc-common/CONTRIBUTING.md": "e49bf8e171df33db3fbd8fde003be18e1b85c412",
|
|
9
9
|
"packages/rlc-common/README.md": "4089f33033d3351a176a9d9c6dcaff93cbe9514d",
|
|
10
|
-
"packages/rlc-common/package.json": "
|
|
10
|
+
"packages/rlc-common/package.json": "e06f3b9b1ffade94a0d4d4e5955c25552751276c",
|
|
11
11
|
"packages/rlc-common/publishPackage.js": "3512e26d1199937b1962f3b4189aa9c506d9da1a",
|
|
12
|
-
"packages/rlc-common/src/buildClient.ts": "
|
|
12
|
+
"packages/rlc-common/src/buildClient.ts": "0c3122bc6173af28da228d42b663f8cf7e3365af",
|
|
13
13
|
"packages/rlc-common/src/buildClientDefinitions.ts": "9b497bd2683f45fb342f3d92ad885c8eed1576d8",
|
|
14
14
|
"packages/rlc-common/src/buildIndexFile.ts": "51d58678165108fc34e3e3a9fa23e6ec1f7be7a1",
|
|
15
15
|
"packages/rlc-common/src/buildIsUnexpectedHelper.ts": "aca8646a8bbc32fa926904fa43ded0e6b098ac3d",
|
|
@@ -23,15 +23,15 @@
|
|
|
23
23
|
"packages/rlc-common/src/buildTopLevelIndexFile.ts": "7b52fdcafbff1559427c5545694fab02859c6098",
|
|
24
24
|
"packages/rlc-common/src/helpers/nameConstructors.ts": "12ac7b5f39f469b4943b2e12513a2c909650090c",
|
|
25
25
|
"packages/rlc-common/src/helpers/nameUtils.ts": "bf86e9989a525846deee1389602a42f33bf525f6",
|
|
26
|
-
"packages/rlc-common/src/helpers/operationHelpers.ts": "
|
|
26
|
+
"packages/rlc-common/src/helpers/operationHelpers.ts": "549c33986fbc227b66953aacdd59d3e7ec32b3d5",
|
|
27
27
|
"packages/rlc-common/src/helpers/schemaHelpers.ts": "722c52837218b8cfafdc36fe29e675e0df4acb09",
|
|
28
28
|
"packages/rlc-common/src/helpers/shortcutMethods.ts": "cd52b21e05192c7b3fce3ff26eae2ac03ab62679",
|
|
29
29
|
"packages/rlc-common/src/index.ts": "72222a5889cd28a0bfb52cdd417f607513201817",
|
|
30
|
-
"packages/rlc-common/src/interfaces.ts": "
|
|
30
|
+
"packages/rlc-common/src/interfaces.ts": "2de573801ae30505c11bf367f733b6c5b6aafad7",
|
|
31
31
|
"packages/rlc-common/src/metadata/buildApiExtractorConfig.ts": "4bcc63b3551d923d2881adb015b23978a2539e14",
|
|
32
32
|
"packages/rlc-common/src/metadata/buildESLintConfig.ts": "b0530cba08bf5e29cc1d307b93363f66c1e6b81d",
|
|
33
33
|
"packages/rlc-common/src/metadata/buildLicenseFile.ts": "ce4083770e48d3b0dd670f7efc324a7fed10dac4",
|
|
34
|
-
"packages/rlc-common/src/metadata/buildPackageFile.ts": "
|
|
34
|
+
"packages/rlc-common/src/metadata/buildPackageFile.ts": "11963f7add3bfedce9cfd0233c2bcb469a9f9caf",
|
|
35
35
|
"packages/rlc-common/src/metadata/buildReadmeFile.ts": "649510f75d04ba8438202b92b83a56d3d3206efe",
|
|
36
36
|
"packages/rlc-common/src/metadata/buildRollupConfig.ts": "56a0ac2b69266d8a3192981abc4c09fcde444634",
|
|
37
37
|
"packages/rlc-common/src/metadata/buildTsConfig.ts": "861d8af19f1e8658b7fef02b51c63d4f006c76f3",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"@cspotcode/source-map-support@0.8.1": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
|
|
3
3
|
"@eslint/eslintrc@1.3.3": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
|
|
4
|
-
"@humanwhocodes/config-array@0.11.
|
|
4
|
+
"@humanwhocodes/config-array@0.11.8": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
|
|
5
5
|
"@humanwhocodes/module-importer@1.0.1": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
|
|
6
6
|
"@humanwhocodes/object-schema@1.2.1": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
|
|
7
7
|
"@jridgewell/resolve-uri@3.1.0": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"@tsconfig/node14@1.0.3": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
|
|
17
17
|
"@tsconfig/node16@1.0.3": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
|
|
18
18
|
"@types/fs-extra@8.1.2": "sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==",
|
|
19
|
-
"@types/lodash@4.14.
|
|
20
|
-
"@types/node@18.11.
|
|
19
|
+
"@types/lodash@4.14.191": "sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==",
|
|
20
|
+
"@types/node@18.11.15": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw==",
|
|
21
21
|
"acorn-jsx@5.3.2_acorn@8.8.1": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
|
|
22
22
|
"acorn-walk@8.2.0": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
|
|
23
23
|
"acorn@8.8.1": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
|
|
@@ -44,10 +44,10 @@
|
|
|
44
44
|
"doctrine@3.0.0": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
|
|
45
45
|
"escape-string-regexp@4.0.0": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
|
|
46
46
|
"eslint-scope@7.1.1": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
|
|
47
|
-
"eslint-utils@3.0.0_eslint@8.
|
|
47
|
+
"eslint-utils@3.0.0_eslint@8.29.0": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
|
|
48
48
|
"eslint-visitor-keys@2.1.0": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
|
|
49
49
|
"eslint-visitor-keys@3.3.0": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
|
|
50
|
-
"eslint@8.
|
|
50
|
+
"eslint@8.29.0": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==",
|
|
51
51
|
"espree@9.4.1": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
|
|
52
52
|
"esquery@1.4.0": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
|
|
53
53
|
"esrecurse@4.3.0": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"fast-glob@3.2.12": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
|
|
58
58
|
"fast-json-stable-stringify@2.1.0": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
|
|
59
59
|
"fast-levenshtein@2.0.6": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
|
|
60
|
-
"fastq@1.
|
|
60
|
+
"fastq@1.14.0": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
|
|
61
61
|
"file-entry-cache@6.0.1": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
|
|
62
62
|
"fill-range@7.0.1": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
|
|
63
63
|
"find-up@5.0.0": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
|
|
@@ -68,12 +68,12 @@
|
|
|
68
68
|
"glob-parent@5.1.2": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
|
|
69
69
|
"glob-parent@6.0.2": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
|
|
70
70
|
"glob@7.2.3": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
|
|
71
|
-
"globals@13.
|
|
71
|
+
"globals@13.19.0": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
|
|
72
72
|
"graceful-fs@4.2.10": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
|
|
73
73
|
"grapheme-splitter@1.0.4": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
|
|
74
74
|
"handlebars@4.7.7": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
|
|
75
75
|
"has-flag@4.0.0": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
|
|
76
|
-
"ignore@5.2.
|
|
76
|
+
"ignore@5.2.1": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",
|
|
77
77
|
"import-fresh@3.3.0": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
|
|
78
78
|
"imurmurhash@0.1.4": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
|
|
79
79
|
"inflight@1.0.6": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
|
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
"merge2@1.4.1": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
|
|
97
97
|
"micromatch@4.0.5": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
|
|
98
98
|
"minimatch@3.1.2": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
|
|
99
|
-
"minimatch@5.1.
|
|
99
|
+
"minimatch@5.1.1": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==",
|
|
100
100
|
"minimist@1.2.7": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
|
|
101
101
|
"mkdirp@1.0.4": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
|
|
102
102
|
"ms@2.1.2": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
|
|
@@ -130,7 +130,7 @@
|
|
|
130
130
|
"text-table@0.2.0": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
|
|
131
131
|
"to-regex-range@5.0.1": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
|
|
132
132
|
"ts-morph@15.1.0": "sha512-RBsGE2sDzUXFTnv8Ba22QfeuKbgvAGJFuTN7HfmIRUkgT/NaVLfDM/8OFm2NlFkGlWEXdpW5OaFIp1jvqdDuOg==",
|
|
133
|
-
"ts-node@10.9.
|
|
133
|
+
"ts-node@10.9.1_a62200f3a6296e4395945d00029dfe72": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
|
|
134
134
|
"type-check@0.4.0": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
|
|
135
135
|
"type-fest@0.20.2": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
|
|
136
136
|
"typescript@4.8.4": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
## 1.0.0-beta.8 (2023-01-09)
|
|
2
|
+
|
|
3
|
+
- [Feature] Normalize parameter in host template and path uri, Please refer to pr [#1714](https://github.com/Azure/autorest.typescript/pull/1714).
|
|
4
|
+
- [BugFix] Fix a few minor issues. Please refer to pr [#1715](https://github.com/Azure/autorest.typescript/pull/1715) for more details.
|
|
5
|
+
|
|
6
|
+
## 1.0.0-beta.7 (2022-12-21)
|
|
7
|
+
|
|
8
|
+
- [Feature] Support cadl compiler 0.38.0, Please refer to issue [#1704](https://github.com/Azure/autorest.typescript/pull/1704).
|
|
9
|
+
- [BugFix] Fix a few minor issues. Please refer to issue [#1700](https://github.com/Azure/autorest.typescript/pull/1700) for more details.
|
|
10
|
+
|
|
1
11
|
## 1.0.0-beta.6 (2022-12-14)
|
|
2
12
|
|
|
3
13
|
- [Feature] Support ArmId schema. Please refer to issue [#1697](https://github.com/Azure/autorest.typescript/pull/1697) and issue [#1695](https://github.com/Azure/autorest.typescript/pull/1695).
|
package/dist/buildClient.js
CHANGED
|
@@ -40,6 +40,7 @@ function buildClient(model) {
|
|
|
40
40
|
const clientInterfaceName = clientName.endsWith("Client")
|
|
41
41
|
? `${clientName}`
|
|
42
42
|
: `${clientName}Client`;
|
|
43
|
+
normalizeUrlInfo(model);
|
|
43
44
|
const urlParameters = (_b = (_a = model === null || model === void 0 ? void 0 : model.urlInfo) === null || _a === void 0 ? void 0 : _a.urlParameters) === null || _b === void 0 ? void 0 : _b.filter(
|
|
44
45
|
// Do not include parameters with constant values in the signature, these should go in the options bag
|
|
45
46
|
(p) => p.value === undefined);
|
|
@@ -149,7 +150,7 @@ function getClientFactoryBody(model, clientTypeName) {
|
|
|
149
150
|
else {
|
|
150
151
|
baseUrl = `options.baseUrl ?? "${endpoint}"`;
|
|
151
152
|
}
|
|
152
|
-
const apiVersion =
|
|
153
|
+
const apiVersion = getApiVersionInQueryParam(model);
|
|
153
154
|
let apiVersionStatement = "";
|
|
154
155
|
if (apiVersion) {
|
|
155
156
|
apiVersionStatement = `options.apiVersion = options.apiVersion ?? "${apiVersion}"`;
|
|
@@ -223,7 +224,7 @@ function getClientFactoryBody(model, clientTypeName) {
|
|
|
223
224
|
returnStatement
|
|
224
225
|
];
|
|
225
226
|
}
|
|
226
|
-
function
|
|
227
|
+
function getApiVersionInQueryParam(model) {
|
|
227
228
|
if (!model.apiVersionInQueryParam) {
|
|
228
229
|
return undefined;
|
|
229
230
|
}
|
|
@@ -233,4 +234,24 @@ function getApiVersion(model) {
|
|
|
233
234
|
}
|
|
234
235
|
return undefined;
|
|
235
236
|
}
|
|
237
|
+
function normalizeUrlInfo(model) {
|
|
238
|
+
if (!model ||
|
|
239
|
+
!model.urlInfo ||
|
|
240
|
+
!model.urlInfo.endpoint ||
|
|
241
|
+
!model.urlInfo.urlParameters ||
|
|
242
|
+
model.urlInfo.urlParameters.length === 0) {
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
245
|
+
let parsedEndpoint = model.urlInfo.endpoint;
|
|
246
|
+
const urlParameters = model.urlInfo.urlParameters;
|
|
247
|
+
urlParameters.forEach((urlParameter) => {
|
|
248
|
+
const name = urlParameter.name;
|
|
249
|
+
const normalizedName = (0, nameUtils_js_1.normalizeName)(name, nameUtils_js_1.NameType.Parameter);
|
|
250
|
+
if (name !== normalizedName) {
|
|
251
|
+
urlParameter.name = normalizedName;
|
|
252
|
+
parsedEndpoint = parsedEndpoint.replace(`{${name}}`, `{${normalizedName}}`);
|
|
253
|
+
}
|
|
254
|
+
});
|
|
255
|
+
model.urlInfo.endpoint = parsedEndpoint;
|
|
256
|
+
}
|
|
236
257
|
//# sourceMappingURL=buildClient.js.map
|
package/dist/buildClient.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClient.js","sourceRoot":"","sources":["../src/buildClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"buildClient.js","sourceRoot":"","sources":["../src/buildClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ exports.buildMethodDefinitions = buildMethodDefinitions;
|
|
|
29
29
|
function getPathParamDefinitions(pathParams) {
|
|
30
30
|
return pathParams.map(({ name, type, description }) => {
|
|
31
31
|
return {
|
|
32
|
-
name,
|
|
32
|
+
name: (0, nameUtils_js_1.normalizeName)(name, nameUtils_js_1.NameType.Parameter),
|
|
33
33
|
type,
|
|
34
34
|
description
|
|
35
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operationHelpers.js","sourceRoot":"","sources":["../../src/helpers/operationHelpers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAOlC,oDAM0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"operationHelpers.js","sourceRoot":"","sources":["../../src/helpers/operationHelpers.ts"],"names":[],"mappings":"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"}
|
package/dist/interfaces.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AA8GA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+DAAc,CAAA;IACd,+DAAc,CAAA;AAChB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB;AAMD,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,kDAAkD;IAClD,gCAAe,CAAA;IACf,qDAAqD;IACrD,kCAAiB,CAAA;IACjB,wDAAwD;IACxD,wCAAuB,CAAA;AACzB,CAAC,EAPW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAOxB"}
|
|
@@ -80,17 +80,17 @@ function restLevelPackage(model, hasSamplesGenerated) {
|
|
|
80
80
|
"build:samples": "echo skipped.",
|
|
81
81
|
"build:test": "echo skipped.",
|
|
82
82
|
"build:debug": "echo skipped.",
|
|
83
|
-
"check-format":
|
|
83
|
+
"check-format": `prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.ts" "*.{js,json}" ${appendPathWhenFormat(generateTest, generateSample)}`,
|
|
84
84
|
clean: "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
|
|
85
85
|
"execute:samples": "echo skipped",
|
|
86
86
|
"extract-api": "rimraf review && mkdirp ./review && api-extractor run --local",
|
|
87
|
-
format:
|
|
87
|
+
format: `prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.ts" "*.{js,json}" ${appendPathWhenFormat(generateTest, generateSample)}`,
|
|
88
88
|
"generate:client": "autorest --typescript swagger/README.md && npm run format",
|
|
89
89
|
"integration-test:browser": "echo skipped",
|
|
90
90
|
"integration-test:node": "echo skipped",
|
|
91
91
|
"integration-test": "echo skipped",
|
|
92
|
-
"lint:fix":
|
|
93
|
-
lint:
|
|
92
|
+
"lint:fix": `eslint package.json api-extractor.json src ${appednPathWhenLint(generateTest)} --ext .ts --fix --fix-type [problem,suggestion]`,
|
|
93
|
+
lint: `eslint package.json api-extractor.json src ${appednPathWhenLint(generateTest)} --ext .ts`,
|
|
94
94
|
pack: "npm pack 2>&1",
|
|
95
95
|
"test:browser": "echo skipped",
|
|
96
96
|
"test:node": "echo skipped",
|
|
@@ -179,7 +179,7 @@ function restLevelPackage(model, hasSamplesGenerated) {
|
|
|
179
179
|
packageInfo.devDependencies["karma-source-map-support"] = "~1.4.0";
|
|
180
180
|
packageInfo.devDependencies["karma-sourcemap-loader"] = "^0.3.8";
|
|
181
181
|
packageInfo.devDependencies["karma"] = "^6.2.0";
|
|
182
|
-
packageInfo.devDependencies["nyc"] = "^
|
|
182
|
+
packageInfo.devDependencies["nyc"] = "^15.0.0";
|
|
183
183
|
packageInfo.devDependencies["source-map-support"] = "^0.5.9";
|
|
184
184
|
packageInfo.scripts["test"] =
|
|
185
185
|
"npm run clean && npm run build:test && npm run unit-test";
|
|
@@ -231,4 +231,17 @@ function restLevelPackage(model, hasSamplesGenerated) {
|
|
|
231
231
|
}
|
|
232
232
|
return packageInfo;
|
|
233
233
|
}
|
|
234
|
+
function appendPathWhenFormat(generateTest, generateSample) {
|
|
235
|
+
let path = "";
|
|
236
|
+
if (generateTest) {
|
|
237
|
+
path = path + ` "test/**/*.ts"`;
|
|
238
|
+
}
|
|
239
|
+
if (generateSample) {
|
|
240
|
+
path = path + ` "samples-dev/**/*.ts"`;
|
|
241
|
+
}
|
|
242
|
+
return path;
|
|
243
|
+
}
|
|
244
|
+
function appednPathWhenLint(generateTest) {
|
|
245
|
+
return generateTest ? "test" : "";
|
|
246
|
+
}
|
|
234
247
|
//# sourceMappingURL=buildPackageFile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uCAAmC;AACnC,wEAGwC;AAGxC,IAAI,SAAS,GAAG,KAAK,CAAC;AACtB,IAAI,MAAM,GAAG,KAAK,CAAC;AACnB,SAAgB,gBAAgB,CAAC,KAAe,EAAE,mBAAmB,GAAG,KAAK;;IAC3E,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAA,KAAK,CAAC,OAAO,0CAAE,gBAAgB,CAAC,CAAC;IAClE,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO;KACR;IACD,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,cAAc,CAAC;IAChC,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;IACzE,0CAA0C;IAC1C,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO;KACR;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAC1C,QAAQ,EACR,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,EACnC;QACE,SAAS,EAAE,IAAI;KAChB,CACF,CAAC;IACF,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,WAAW,CAAC,WAAW,EAAE;KACnC,CAAC;AACJ,CAAC;AAxBD,4CAwBC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,KAAe,EAAE,mBAA4B;;IACrE,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE;QACnD,OAAO;KACR;IAED,MAAM,EACJ,cAAc,EACd,YAAY,EACZ,cAAc,EACd,oBAAoB,EACpB,aAAa,EACb,UAAU,EACX,GAAG,KAAK,CAAC,OAAO,CAAC;IAElB,MAAM,iBAAiB,GAAG,cAAc,CAAC,IAAI,CAAC;IAC9C,IAAI,uBAAuB,GAAW,EAAE,CAAC;IACzC,IAAI,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC3C,uBAAuB,GAAG,0BAA0B,CAAC;KACtD;IACD,SAAS,GAAG,SAAS,IAAI,IAAA,yCAAmB,EAAC,KAAK,CAAC,CAAC;IACpD,MAAM,GAAG,MAAM,IAAI,IAAA,0CAAoB,EAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAwB;QACvC,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,EAAE;QAC9B,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,uBAAuB;QAC/B,OAAO,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE;QACpC,WAAW,EACT,GAAG,cAAc,CAAC,WAAW,EAAE;YAC/B,uBAAuB,KAAK,CAAC,WAAW,GAAG;QAC7C,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,CAAC;QAC3E,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,qBAAqB;QACxE,KAAK,EAAE,WAAW,cAAc,CAAC,gBAAgB,OAAO;QACxD,UAAU,EAAE,+BAA+B;QAC3C,IAAI,EAAE;YACJ,GAAG,EAAE,kDAAkD;SACxD;QACD,KAAK,EAAE;YACL,OAAO;YACP,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW;YAC5C,SAAS,cAAc,CAAC,gBAAgB,OAAO;YAC/C,WAAW;YACX,SAAS;YACT,UAAU;SACX;QACD,OAAO,EAAE;YACP,IAAI,EAAE,UAAU;SACjB;QACD,OAAO,EAAE;YACP,KAAK,EACH,oIAAoI;YACtI,eAAe,EAAE,eAAe;YAChC,YAAY,EAAE,eAAe;YAC7B,eAAe,EAAE,eAAe;YAChC,YAAY,EAAE,eAAe;YAC7B,aAAa,EAAE,eAAe;YAC9B,cAAc,EACZ,
|
|
1
|
+
{"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@azure-tools/rlc-common","version":"1.0.0-beta.
|
|
1
|
+
{"name":"@azure-tools/rlc-common","version":"1.0.0-beta.8","description":"","type":"commonjs","main":"dist/index.js","module":"dist-esm/index.js","exports":{".":{"types":"./types/index.d.ts","require":"./dist/index.js","import":"./dist-esm/index.js"}},"types":"./types/index.d.ts","scripts":{"lint":"eslint src --ext .ts --max-warnings=0","lint:fix":"eslint src --fix --ext .ts","format":"npm run -s prettier -- --write","check-format":"npm run prettier -- --check","prettier":"prettier --config ./.prettierrc src/**/*.ts","build":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js","build:cjs":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig-cjs.json && node publishPackage.js","build:esm":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && node publishPackage.js","test":"echo \"Error: no test specified\" && exit 1"},"keywords":[],"author":"","license":"ISC","dependencies":{"ts-morph":"^15.1.0","lodash":"^4.17.21","handlebars":"^4.7.7"},"devDependencies":{"@types/node":"^18.0.0","eslint":"^8.9.0","prettier":"~2.7.1","typescript":"~4.8.0","rimraf":"^3.0.2","@types/lodash":"^4.14.182","fs-extra":"^10.0.0","@types/fs-extra":"^8.1.0","ts-node":"^10.7.0"}}
|
package/dist-esm/buildClient.js
CHANGED
|
@@ -36,6 +36,7 @@ export function buildClient(model) {
|
|
|
36
36
|
const clientInterfaceName = clientName.endsWith("Client")
|
|
37
37
|
? `${clientName}`
|
|
38
38
|
: `${clientName}Client`;
|
|
39
|
+
normalizeUrlInfo(model);
|
|
39
40
|
const urlParameters = model?.urlInfo?.urlParameters?.filter(
|
|
40
41
|
// Do not include parameters with constant values in the signature, these should go in the options bag
|
|
41
42
|
(p) => p.value === undefined);
|
|
@@ -142,7 +143,7 @@ function getClientFactoryBody(model, clientTypeName) {
|
|
|
142
143
|
else {
|
|
143
144
|
baseUrl = `options.baseUrl ?? "${endpoint}"`;
|
|
144
145
|
}
|
|
145
|
-
const apiVersion =
|
|
146
|
+
const apiVersion = getApiVersionInQueryParam(model);
|
|
146
147
|
let apiVersionStatement = "";
|
|
147
148
|
if (apiVersion) {
|
|
148
149
|
apiVersionStatement = `options.apiVersion = options.apiVersion ?? "${apiVersion}"`;
|
|
@@ -216,7 +217,7 @@ function getClientFactoryBody(model, clientTypeName) {
|
|
|
216
217
|
returnStatement
|
|
217
218
|
];
|
|
218
219
|
}
|
|
219
|
-
function
|
|
220
|
+
function getApiVersionInQueryParam(model) {
|
|
220
221
|
if (!model.apiVersionInQueryParam) {
|
|
221
222
|
return undefined;
|
|
222
223
|
}
|
|
@@ -226,4 +227,24 @@ function getApiVersion(model) {
|
|
|
226
227
|
}
|
|
227
228
|
return undefined;
|
|
228
229
|
}
|
|
230
|
+
function normalizeUrlInfo(model) {
|
|
231
|
+
if (!model ||
|
|
232
|
+
!model.urlInfo ||
|
|
233
|
+
!model.urlInfo.endpoint ||
|
|
234
|
+
!model.urlInfo.urlParameters ||
|
|
235
|
+
model.urlInfo.urlParameters.length === 0) {
|
|
236
|
+
return;
|
|
237
|
+
}
|
|
238
|
+
let parsedEndpoint = model.urlInfo.endpoint;
|
|
239
|
+
const urlParameters = model.urlInfo.urlParameters;
|
|
240
|
+
urlParameters.forEach((urlParameter) => {
|
|
241
|
+
const name = urlParameter.name;
|
|
242
|
+
const normalizedName = normalizeName(name, NameType.Parameter);
|
|
243
|
+
if (name !== normalizedName) {
|
|
244
|
+
urlParameter.name = normalizedName;
|
|
245
|
+
parsedEndpoint = parsedEndpoint.replace(`{${name}}`, `{${normalizedName}}`);
|
|
246
|
+
}
|
|
247
|
+
});
|
|
248
|
+
model.urlInfo.endpoint = parsedEndpoint;
|
|
249
|
+
}
|
|
229
250
|
//# sourceMappingURL=buildClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClient.js","sourceRoot":"","sources":["../src/buildClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"buildClient.js","sourceRoot":"","sources":["../src/buildClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Copyright (c) Microsoft Corporation.
|
|
2
2
|
// Licensed under the MIT License.
|
|
3
3
|
import { SchemaContext } from "../interfaces.js";
|
|
4
|
-
import { pascalCase } from "./nameUtils.js";
|
|
4
|
+
import { NameType, normalizeName, pascalCase } from "./nameUtils.js";
|
|
5
5
|
import { isObjectSchema } from "./schemaHelpers.js";
|
|
6
6
|
export function buildMethodDefinitions(methods, pathParams = []) {
|
|
7
7
|
const methodDefinitions = [];
|
|
@@ -30,7 +30,7 @@ export function buildMethodDefinitions(methods, pathParams = []) {
|
|
|
30
30
|
export function getPathParamDefinitions(pathParams) {
|
|
31
31
|
return pathParams.map(({ name, type, description }) => {
|
|
32
32
|
return {
|
|
33
|
-
name,
|
|
33
|
+
name: normalizeName(name, NameType.Parameter),
|
|
34
34
|
type,
|
|
35
35
|
description
|
|
36
36
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operationHelpers.js","sourceRoot":"","sources":["../../src/helpers/operationHelpers.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAOlC,OAAO,EAKL,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"operationHelpers.js","sourceRoot":"","sources":["../../src/helpers/operationHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"AA8GA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+DAAc,CAAA;IACd,+DAAc,CAAA;AAChB,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB;AAMD,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,kDAAkD;IAClD,gCAAe,CAAA;IACf,qDAAqD;IACrD,kCAAiB,CAAA;IACjB,wDAAwD;IACxD,wCAAuB,CAAA;AACzB,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB"}
|
|
@@ -74,17 +74,17 @@ function restLevelPackage(model, hasSamplesGenerated) {
|
|
|
74
74
|
"build:samples": "echo skipped.",
|
|
75
75
|
"build:test": "echo skipped.",
|
|
76
76
|
"build:debug": "echo skipped.",
|
|
77
|
-
"check-format":
|
|
77
|
+
"check-format": `prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.ts" "*.{js,json}" ${appendPathWhenFormat(generateTest, generateSample)}`,
|
|
78
78
|
clean: "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
|
|
79
79
|
"execute:samples": "echo skipped",
|
|
80
80
|
"extract-api": "rimraf review && mkdirp ./review && api-extractor run --local",
|
|
81
|
-
format:
|
|
81
|
+
format: `prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.ts" "*.{js,json}" ${appendPathWhenFormat(generateTest, generateSample)}`,
|
|
82
82
|
"generate:client": "autorest --typescript swagger/README.md && npm run format",
|
|
83
83
|
"integration-test:browser": "echo skipped",
|
|
84
84
|
"integration-test:node": "echo skipped",
|
|
85
85
|
"integration-test": "echo skipped",
|
|
86
|
-
"lint:fix":
|
|
87
|
-
lint:
|
|
86
|
+
"lint:fix": `eslint package.json api-extractor.json src ${appednPathWhenLint(generateTest)} --ext .ts --fix --fix-type [problem,suggestion]`,
|
|
87
|
+
lint: `eslint package.json api-extractor.json src ${appednPathWhenLint(generateTest)} --ext .ts`,
|
|
88
88
|
pack: "npm pack 2>&1",
|
|
89
89
|
"test:browser": "echo skipped",
|
|
90
90
|
"test:node": "echo skipped",
|
|
@@ -181,7 +181,7 @@ function restLevelPackage(model, hasSamplesGenerated) {
|
|
|
181
181
|
packageInfo.devDependencies["karma-source-map-support"] = "~1.4.0";
|
|
182
182
|
packageInfo.devDependencies["karma-sourcemap-loader"] = "^0.3.8";
|
|
183
183
|
packageInfo.devDependencies["karma"] = "^6.2.0";
|
|
184
|
-
packageInfo.devDependencies["nyc"] = "^
|
|
184
|
+
packageInfo.devDependencies["nyc"] = "^15.0.0";
|
|
185
185
|
packageInfo.devDependencies["source-map-support"] = "^0.5.9";
|
|
186
186
|
packageInfo.scripts["test"] =
|
|
187
187
|
"npm run clean && npm run build:test && npm run unit-test";
|
|
@@ -233,4 +233,17 @@ function restLevelPackage(model, hasSamplesGenerated) {
|
|
|
233
233
|
}
|
|
234
234
|
return packageInfo;
|
|
235
235
|
}
|
|
236
|
+
function appendPathWhenFormat(generateTest, generateSample) {
|
|
237
|
+
let path = "";
|
|
238
|
+
if (generateTest) {
|
|
239
|
+
path = path + ` "test/**/*.ts"`;
|
|
240
|
+
}
|
|
241
|
+
if (generateSample) {
|
|
242
|
+
path = path + ` "samples-dev/**/*.ts"`;
|
|
243
|
+
}
|
|
244
|
+
return path;
|
|
245
|
+
}
|
|
246
|
+
function appednPathWhenLint(generateTest) {
|
|
247
|
+
return generateTest ? "test" : "";
|
|
248
|
+
}
|
|
236
249
|
//# sourceMappingURL=buildPackageFile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"buildPackageFile.js","sourceRoot":"","sources":["../../src/metadata/buildPackageFile.ts"],"names":[],"mappings":"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"}
|
package/dist-esm/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@azure-tools/rlc-common","version":"1.0.0-beta.
|
|
1
|
+
{"name":"@azure-tools/rlc-common","version":"1.0.0-beta.8","description":"","type":"module","main":"dist/index.js","module":"dist-esm/index.js","exports":{".":{"types":"./types/index.d.ts","require":"./dist/index.js","import":"./dist-esm/index.js"}},"types":"./types/index.d.ts","scripts":{"lint":"eslint src --ext .ts --max-warnings=0","lint:fix":"eslint src --fix --ext .ts","format":"npm run -s prettier -- --write","check-format":"npm run prettier -- --check","prettier":"prettier --config ./.prettierrc src/**/*.ts","build":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node publishPackage.js","build:cjs":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig-cjs.json && node publishPackage.js","build:esm":"rimraf dist/* dist-esm/* types/* && tsc -p tsconfig.json && node publishPackage.js","test":"echo \"Error: no test specified\" && exit 1"},"keywords":[],"author":"","license":"ISC","dependencies":{"ts-morph":"^15.1.0","lodash":"^4.17.21","handlebars":"^4.7.7"},"devDependencies":{"@types/node":"^18.0.0","eslint":"^8.9.0","prettier":"~2.7.1","typescript":"~4.8.0","rimraf":"^3.0.2","@types/lodash":"^4.14.182","fs-extra":"^10.0.0","@types/fs-extra":"^8.1.0","ts-node":"^10.7.0"}}
|
package/package.json
CHANGED
package/src/buildClient.ts
CHANGED
|
@@ -56,6 +56,7 @@ export function buildClient(model: RLCModel): File | undefined {
|
|
|
56
56
|
? `${clientName}`
|
|
57
57
|
: `${clientName}Client`;
|
|
58
58
|
|
|
59
|
+
normalizeUrlInfo(model);
|
|
59
60
|
const urlParameters = model?.urlInfo?.urlParameters?.filter(
|
|
60
61
|
// Do not include parameters with constant values in the signature, these should go in the options bag
|
|
61
62
|
(p) => p.value === undefined
|
|
@@ -204,7 +205,7 @@ function getClientFactoryBody(
|
|
|
204
205
|
baseUrl = `options.baseUrl ?? "${endpoint}"`;
|
|
205
206
|
}
|
|
206
207
|
|
|
207
|
-
const apiVersion =
|
|
208
|
+
const apiVersion = getApiVersionInQueryParam(model);
|
|
208
209
|
let apiVersionStatement: string = "";
|
|
209
210
|
if (apiVersion) {
|
|
210
211
|
apiVersionStatement = `options.apiVersion = options.apiVersion ?? "${apiVersion}"`;
|
|
@@ -298,7 +299,7 @@ function getClientFactoryBody(
|
|
|
298
299
|
];
|
|
299
300
|
}
|
|
300
301
|
|
|
301
|
-
function
|
|
302
|
+
function getApiVersionInQueryParam(model: RLCModel): string | undefined {
|
|
302
303
|
if (!model.apiVersionInQueryParam) {
|
|
303
304
|
return undefined;
|
|
304
305
|
}
|
|
@@ -312,3 +313,30 @@ function getApiVersion(model: RLCModel): string | undefined {
|
|
|
312
313
|
|
|
313
314
|
return undefined;
|
|
314
315
|
}
|
|
316
|
+
|
|
317
|
+
function normalizeUrlInfo(model: RLCModel) {
|
|
318
|
+
if (
|
|
319
|
+
!model ||
|
|
320
|
+
!model.urlInfo ||
|
|
321
|
+
!model.urlInfo.endpoint ||
|
|
322
|
+
!model.urlInfo.urlParameters ||
|
|
323
|
+
model.urlInfo.urlParameters.length === 0
|
|
324
|
+
) {
|
|
325
|
+
return;
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
let parsedEndpoint = model.urlInfo.endpoint;
|
|
329
|
+
const urlParameters = model.urlInfo.urlParameters;
|
|
330
|
+
urlParameters.forEach((urlParameter) => {
|
|
331
|
+
const name = urlParameter.name;
|
|
332
|
+
const normalizedName = normalizeName(name, NameType.Parameter);
|
|
333
|
+
if (name !== normalizedName) {
|
|
334
|
+
urlParameter.name = normalizedName;
|
|
335
|
+
parsedEndpoint = parsedEndpoint.replace(
|
|
336
|
+
`{${name}}`,
|
|
337
|
+
`{${normalizedName}}`
|
|
338
|
+
);
|
|
339
|
+
}
|
|
340
|
+
});
|
|
341
|
+
model.urlInfo.endpoint = parsedEndpoint;
|
|
342
|
+
}
|
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
RLCModel,
|
|
14
14
|
SchemaContext
|
|
15
15
|
} from "../interfaces.js";
|
|
16
|
-
import { pascalCase } from "./nameUtils.js";
|
|
16
|
+
import { NameType, normalizeName, pascalCase } from "./nameUtils.js";
|
|
17
17
|
import { isObjectSchema } from "./schemaHelpers.js";
|
|
18
18
|
|
|
19
19
|
export function buildMethodDefinitions(
|
|
@@ -52,7 +52,7 @@ export function getPathParamDefinitions(
|
|
|
52
52
|
): OptionalKind<ParameterDeclarationStructure>[] {
|
|
53
53
|
return pathParams.map(({ name, type, description }) => {
|
|
54
54
|
return {
|
|
55
|
-
name,
|
|
55
|
+
name: normalizeName(name, NameType.Parameter),
|
|
56
56
|
type,
|
|
57
57
|
description
|
|
58
58
|
};
|
package/src/interfaces.ts
CHANGED
|
@@ -97,23 +97,30 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
|
|
|
97
97
|
"build:samples": "echo skipped.",
|
|
98
98
|
"build:test": "echo skipped.",
|
|
99
99
|
"build:debug": "echo skipped.",
|
|
100
|
-
"check-format":
|
|
101
|
-
|
|
100
|
+
"check-format": `prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.ts" "*.{js,json}" ${appendPathWhenFormat(
|
|
101
|
+
generateTest,
|
|
102
|
+
generateSample
|
|
103
|
+
)}`,
|
|
102
104
|
clean:
|
|
103
105
|
"rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
|
|
104
106
|
"execute:samples": "echo skipped",
|
|
105
107
|
"extract-api":
|
|
106
108
|
"rimraf review && mkdirp ./review && api-extractor run --local",
|
|
107
|
-
format:
|
|
108
|
-
|
|
109
|
+
format: `prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.ts" "*.{js,json}" ${appendPathWhenFormat(
|
|
110
|
+
generateTest,
|
|
111
|
+
generateSample
|
|
112
|
+
)}`,
|
|
109
113
|
"generate:client":
|
|
110
114
|
"autorest --typescript swagger/README.md && npm run format",
|
|
111
115
|
"integration-test:browser": "echo skipped",
|
|
112
116
|
"integration-test:node": "echo skipped",
|
|
113
117
|
"integration-test": "echo skipped",
|
|
114
|
-
"lint:fix":
|
|
115
|
-
|
|
116
|
-
|
|
118
|
+
"lint:fix": `eslint package.json api-extractor.json src ${appednPathWhenLint(
|
|
119
|
+
generateTest
|
|
120
|
+
)} --ext .ts --fix --fix-type [problem,suggestion]`,
|
|
121
|
+
lint: `eslint package.json api-extractor.json src ${appednPathWhenLint(
|
|
122
|
+
generateTest
|
|
123
|
+
)} --ext .ts`,
|
|
117
124
|
pack: "npm pack 2>&1",
|
|
118
125
|
"test:browser": "echo skipped",
|
|
119
126
|
"test:node": "echo skipped",
|
|
@@ -215,7 +222,7 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
|
|
|
215
222
|
packageInfo.devDependencies["karma-source-map-support"] = "~1.4.0";
|
|
216
223
|
packageInfo.devDependencies["karma-sourcemap-loader"] = "^0.3.8";
|
|
217
224
|
packageInfo.devDependencies["karma"] = "^6.2.0";
|
|
218
|
-
packageInfo.devDependencies["nyc"] = "^
|
|
225
|
+
packageInfo.devDependencies["nyc"] = "^15.0.0";
|
|
219
226
|
packageInfo.devDependencies["source-map-support"] = "^0.5.9";
|
|
220
227
|
packageInfo.scripts["test"] =
|
|
221
228
|
"npm run clean && npm run build:test && npm run unit-test";
|
|
@@ -271,3 +278,21 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
|
|
|
271
278
|
|
|
272
279
|
return packageInfo;
|
|
273
280
|
}
|
|
281
|
+
|
|
282
|
+
function appendPathWhenFormat(
|
|
283
|
+
generateTest?: boolean,
|
|
284
|
+
generateSample?: boolean
|
|
285
|
+
) {
|
|
286
|
+
let path = "";
|
|
287
|
+
if (generateTest) {
|
|
288
|
+
path = path + ` "test/**/*.ts"`;
|
|
289
|
+
}
|
|
290
|
+
if (generateSample) {
|
|
291
|
+
path = path + ` "samples-dev/**/*.ts"`;
|
|
292
|
+
}
|
|
293
|
+
return path;
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
function appednPathWhenLint(generateTest?: boolean) {
|
|
297
|
+
return generateTest ? "test" : "";
|
|
298
|
+
}
|