@azure-tools/rlc-common 1.0.0-beta.1 → 1.0.0-beta.10
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/.eslintrc.json +23 -0
- package/.prettierignore +1 -0
- package/.prettierrc +7 -0
- package/.rush/temp/package-deps_build.json +33 -25
- package/.rush/temp/shrinkwrap-deps.json +84 -9
- package/CHANGELOG.md +52 -1
- package/CONTRIBUTING.md +29 -0
- package/README.md +3 -0
- package/dist/buildClient.js +89 -19
- package/dist/buildClient.js.map +1 -1
- package/dist/buildClientDefinitions.js.map +1 -1
- package/dist/buildIndexFile.js +18 -0
- package/dist/buildIndexFile.js.map +1 -1
- package/dist/buildIsUnexpectedHelper.js +52 -51
- package/dist/buildIsUnexpectedHelper.js.map +1 -1
- package/dist/buildMethodShortcuts.js +1 -1
- package/dist/buildMethodShortcuts.js.map +1 -1
- package/dist/buildObjectTypes.js +47 -11
- package/dist/buildObjectTypes.js.map +1 -1
- package/dist/buildParameterTypes.js +31 -3
- package/dist/buildParameterTypes.js.map +1 -1
- package/dist/buildResponseTypes.js +19 -6
- package/dist/buildResponseTypes.js.map +1 -1
- package/dist/buildSchemaType.js +22 -1
- package/dist/buildSchemaType.js.map +1 -1
- package/dist/buildSerializeHelper.js +35 -0
- package/dist/buildSerializeHelper.js.map +1 -0
- package/dist/buildTopLevelIndexFile.js +6 -3
- package/dist/buildTopLevelIndexFile.js.map +1 -1
- package/dist/helpers/nameConstructors.js +2 -2
- package/dist/helpers/nameConstructors.js.map +1 -1
- package/dist/helpers/nameUtils.js +1 -1
- package/dist/helpers/nameUtils.js.map +1 -1
- package/dist/helpers/operationHelpers.js +23 -3
- package/dist/helpers/operationHelpers.js.map +1 -1
- package/dist/helpers/pathUtils.js +13 -0
- package/dist/helpers/pathUtils.js.map +1 -0
- package/dist/helpers/shortcutMethods.js +1 -1
- package/dist/helpers/shortcutMethods.js.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/interfaces.js.map +1 -1
- package/dist/metadata/buildPackageFile.js +70 -28
- package/dist/metadata/buildPackageFile.js.map +1 -1
- package/dist/metadata/buildReadmeFile.js +3 -3
- package/dist/package.json +1 -1
- package/dist/static/paginateContent.js +1 -1
- package/dist/static/pollingContent.js +26 -6
- package/dist/static/pollingContent.js.map +1 -1
- package/dist/static/serializeHelper.js +30 -0
- package/dist/static/serializeHelper.js.map +1 -0
- package/dist/test/template.js +1 -2
- package/dist/test/template.js.map +1 -1
- package/dist-esm/buildClient.js +88 -18
- package/dist-esm/buildClient.js.map +1 -1
- package/dist-esm/buildClientDefinitions.js +1 -1
- package/dist-esm/buildClientDefinitions.js.map +1 -1
- package/dist-esm/buildIndexFile.js +19 -1
- package/dist-esm/buildIndexFile.js.map +1 -1
- package/dist-esm/buildIsUnexpectedHelper.js +52 -51
- package/dist-esm/buildIsUnexpectedHelper.js.map +1 -1
- package/dist-esm/buildMethodShortcuts.js +1 -1
- package/dist-esm/buildMethodShortcuts.js.map +1 -1
- package/dist-esm/buildObjectTypes.js +47 -8
- package/dist-esm/buildObjectTypes.js.map +1 -1
- package/dist-esm/buildParameterTypes.js +35 -2
- package/dist-esm/buildParameterTypes.js.map +1 -1
- package/dist-esm/buildResponseTypes.js +19 -6
- package/dist-esm/buildResponseTypes.js.map +1 -1
- package/dist-esm/buildSchemaType.js +23 -2
- package/dist-esm/buildSchemaType.js.map +1 -1
- package/dist-esm/buildSerializeHelper.js +31 -0
- package/dist-esm/buildSerializeHelper.js.map +1 -0
- package/dist-esm/buildTopLevelIndexFile.js +6 -3
- package/dist-esm/buildTopLevelIndexFile.js.map +1 -1
- package/dist-esm/helpers/nameConstructors.js +2 -2
- package/dist-esm/helpers/nameConstructors.js.map +1 -1
- package/dist-esm/helpers/nameUtils.js +1 -1
- package/dist-esm/helpers/nameUtils.js.map +1 -1
- package/dist-esm/helpers/operationHelpers.js +15 -3
- package/dist-esm/helpers/operationHelpers.js.map +1 -1
- package/dist-esm/helpers/pathUtils.js +9 -0
- package/dist-esm/helpers/pathUtils.js.map +1 -0
- package/dist-esm/helpers/shortcutMethods.js +1 -1
- package/dist-esm/helpers/shortcutMethods.js.map +1 -1
- package/dist-esm/index.js +1 -0
- package/dist-esm/index.js.map +1 -1
- package/dist-esm/interfaces.js.map +1 -1
- package/dist-esm/metadata/buildPackageFile.js +70 -28
- package/dist-esm/metadata/buildPackageFile.js.map +1 -1
- package/dist-esm/metadata/buildReadmeFile.js +3 -3
- package/dist-esm/package.json +1 -1
- package/dist-esm/static/paginateContent.js +1 -1
- package/dist-esm/static/pollingContent.js +26 -6
- package/dist-esm/static/pollingContent.js.map +1 -1
- package/dist-esm/static/serializeHelper.js +27 -0
- package/dist-esm/static/serializeHelper.js.map +1 -0
- package/dist-esm/test/template.js +1 -2
- package/dist-esm/test/template.js.map +1 -1
- package/package.json +10 -4
- package/src/buildClient.ts +121 -19
- package/src/buildClientDefinitions.ts +6 -2
- package/src/buildIndexFile.ts +28 -0
- package/src/buildIsUnexpectedHelper.ts +52 -52
- package/src/buildMethodShortcuts.ts +1 -1
- package/src/buildObjectTypes.ts +66 -10
- package/src/buildParameterTypes.ts +45 -3
- package/src/buildResponseTypes.ts +23 -6
- package/src/buildSchemaType.ts +24 -1
- package/src/buildSerializeHelper.ts +42 -0
- package/src/buildTopLevelIndexFile.ts +9 -3
- package/src/helpers/nameConstructors.ts +2 -2
- package/src/helpers/nameUtils.ts +1 -1
- package/src/helpers/operationHelpers.ts +19 -3
- package/src/helpers/pathUtils.ts +9 -0
- package/src/helpers/schemaHelpers.ts +1 -1
- package/src/helpers/shortcutMethods.ts +1 -1
- package/src/index.ts +1 -0
- package/src/interfaces.ts +16 -1
- package/src/metadata/buildPackageFile.ts +94 -31
- package/src/metadata/buildReadmeFile.ts +3 -3
- package/src/static/paginateContent.ts +1 -1
- package/src/static/pollingContent.ts +26 -6
- package/src/static/serializeHelper.ts +29 -0
- package/src/test/template.ts +1 -2
- package/types/buildObjectTypes.d.ts +2 -1
- package/types/buildParameterTypes.d.ts +9 -1
- package/types/buildSerializeHelper.d.ts +5 -0
- package/types/helpers/operationHelpers.d.ts +4 -0
- package/types/helpers/pathUtils.d.ts +1 -0
- package/types/index.d.ts +1 -0
- package/types/interfaces.d.ts +15 -1
- package/types/static/pollingContent.d.ts +1 -1
- package/types/static/serializeHelper.d.ts +4 -0
- package/types/test/template.d.ts +1 -1
package/dist/buildIndexFile.js
CHANGED
|
@@ -75,6 +75,16 @@ function generateRLCIndexForMultiClient(file, model) {
|
|
|
75
75
|
});
|
|
76
76
|
exports.push("PollingHelper");
|
|
77
77
|
}
|
|
78
|
+
if ((0, operationHelpers_js_1.hasMultiCollection)(model) ||
|
|
79
|
+
(0, operationHelpers_js_1.hasSsvCollection)(model) ||
|
|
80
|
+
(0, operationHelpers_js_1.hasPipeCollection)(model) ||
|
|
81
|
+
(0, operationHelpers_js_1.hasTsvCollection)(model)) {
|
|
82
|
+
file.addImportDeclaration({
|
|
83
|
+
namespaceImport: "SerializeHelper",
|
|
84
|
+
moduleSpecifier: "./serializeHelper"
|
|
85
|
+
});
|
|
86
|
+
exports.push("SerializeHelper");
|
|
87
|
+
}
|
|
78
88
|
file.addExportDeclarations([
|
|
79
89
|
{
|
|
80
90
|
moduleSpecifier: `./${moduleName}`,
|
|
@@ -142,6 +152,14 @@ function generateRLCIndex(file, model) {
|
|
|
142
152
|
}
|
|
143
153
|
]);
|
|
144
154
|
}
|
|
155
|
+
if ((0, operationHelpers_js_1.hasMultiCollection)(model) ||
|
|
156
|
+
(0, operationHelpers_js_1.hasSsvCollection)(model) ||
|
|
157
|
+
(0, operationHelpers_js_1.hasPipeCollection)(model) ||
|
|
158
|
+
(0, operationHelpers_js_1.hasTsvCollection)(model)) {
|
|
159
|
+
file.addExportDeclarations([{
|
|
160
|
+
moduleSpecifier: "./serializeHelper"
|
|
161
|
+
}]);
|
|
162
|
+
}
|
|
145
163
|
file.addExportAssignment({
|
|
146
164
|
expression: createClientFuncName,
|
|
147
165
|
isExportEquals: false
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildIndexFile.js","sourceRoot":"","sources":["../src/buildIndexFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uCAA+C;AAC/C,yDAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"buildIndexFile.js","sourceRoot":"","sources":["../src/buildIndexFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uCAA+C;AAC/C,yDAAiE;AACjE,uEAUuC;AAEvC,6BAA6B;AAE7B,SAAgB,cAAc,CAAC,KAAe;;IAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,MAAA,KAAK,CAAC,OAAO,0CAAE,WAAW,CAAC,EACrD,KAAK,GAAG,MAAA,KAAK,CAAC,OAAO,0CAAE,KAAK,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE;QAC9D,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,MAAK,CAAC,EAAE;QACjD,mDAAmD;QACnD,gBAAgB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KACpC;SAAM;QACL,8BAA8B,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KAClD;IACD,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,SAAS,CAAC,WAAW,EAAE;KACjC,CAAC;AACJ,CAAC;AApBD,wCAoBC;AAED,oFAAoF;AACpF,SAAS,8BAA8B,CAAC,IAAgB,EAAE,KAAe;IACvE,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;IACrC,MAAM,oBAAoB,GAAG,cAAc,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,UAAU,EAAE,uBAAQ,CAAC,IAAI,CAAC,CAAC;IAE5D,IAAI,CAAC,oBAAoB,CAAC;QACxB,eAAe,EAAE,YAAY;QAC7B,eAAe,EAAE,cAAc;KAChC,CAAC,CAAC;IAEH,IAAI,CAAC,oBAAoB,CAAC;QACxB,eAAe,EAAE,WAAW;QAC5B,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAC;IAEH,IAAI,CAAC,oBAAoB,CAAC;QACxB,eAAe,EAAE,QAAQ;QACzB,eAAe,EAAE,qBAAqB;KACvC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,CAAC,YAAY,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IACtD,IAAI,IAAA,oCAAc,EAAC,KAAK,CAAC,EAAE;QACzB,IAAI,CAAC,oBAAoB,CAAC;YACxB,eAAe,EAAE,QAAQ;YACzB,eAAe,EAAE,UAAU;SAC5B,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KACxB;IAED,IAAI,IAAA,qCAAe,EAAC,KAAK,CAAC,EAAE;QAC1B,IAAI,CAAC,oBAAoB,CAAC;YACxB,eAAe,EAAE,cAAc;YAC/B,eAAe,EAAE,gBAAgB;SAClC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;KAC9B;IAED,IAAI,IAAA,yCAAmB,EAAC,KAAK,CAAC,EAAE;QAC9B,IAAI,CAAC,oBAAoB,CAAC;YACxB,eAAe,EAAE,gBAAgB;YACjC,eAAe,EAAE,kBAAkB;SACpC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;KAChC;IAED,IAAI,IAAA,0CAAoB,EAAC,KAAK,CAAC,EAAE;QAC/B,IAAI,CAAC,oBAAoB,CAAC;YACxB,eAAe,EAAE,eAAe;YAChC,eAAe,EAAE,iBAAiB;SACnC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;KAC/B;IAED,IACE,IAAA,wCAAkB,EAAC,KAAK,CAAC;QACzB,IAAA,sCAAgB,EAAC,KAAK,CAAC;QACvB,IAAA,uCAAiB,EAAC,KAAK,CAAC;QACxB,IAAA,sCAAgB,EAAC,KAAK,CAAC,EACvB;QACA,IAAI,CAAC,oBAAoB,CAAC;YACxB,eAAe,EAAE,iBAAiB;YAClC,eAAe,EAAE,mBAAmB;SACrC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KACjC;IAED,IAAI,CAAC,qBAAqB,CAAC;QACzB;YACE,eAAe,EAAE,KAAK,UAAU,EAAE;YAClC,YAAY,EAAE,CAAC,GAAG,oBAAoB,EAAE,CAAC;SAC1C;QACD;YACE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC;SAC3B;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAgB,EAAE,KAAe;IACzD,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;IACrC,MAAM,oBAAoB,GAAG,GAAG,UAAU,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,UAAU,EAAE,uBAAQ,CAAC,IAAI,CAAC,CAAC;IAE5D,IAAI,CAAC,oBAAoB,CAAC;QACxB,eAAe,EAAE,KAAK,UAAU,EAAE;QAClC,aAAa,EAAE,oBAAoB;KACpC,CAAC,CAAC;IAEH,IAAI,CAAC,qBAAqB,CAAC;QACzB;YACE,eAAe,EAAE,KAAK,UAAU,EAAE;SACnC;QACD;YACE,eAAe,EAAE,cAAc;SAChC;QACD;YACE,eAAe,EAAE,aAAa;SAC/B;QACD;YACE,eAAe,EAAE,qBAAqB;SACvC;KACF,CAAC,CAAC;IAEH,IAAI,IAAA,yCAAmB,EAAC,KAAK,CAAC,EAAE;QAC9B,IAAI,CAAC,qBAAqB,CAAC;YACzB;gBACE,eAAe,EAAE,gBAAgB;aAClC;SACF,CAAC,CAAC;KACJ;IAED,IAAI,IAAA,oCAAc,EAAC,KAAK,CAAC,EAAE;QACzB,IAAI,CAAC,qBAAqB,CAAC;YACzB;gBACE,eAAe,EAAE,UAAU;aAC5B;SACF,CAAC,CAAC;KACJ;IAED,IAAI,IAAA,qCAAe,EAAC,KAAK,CAAC,EAAE;QAC1B,IAAI,CAAC,qBAAqB,CAAC;YACzB;gBACE,eAAe,EAAE,gBAAgB;aAClC;SACF,CAAC,CAAC;KACJ;IAED,IAAI,IAAA,yCAAmB,EAAC,KAAK,CAAC,EAAE;QAC9B,IAAI,CAAC,qBAAqB,CAAC;YACzB;gBACE,eAAe,EAAE,kBAAkB;aACpC;SACF,CAAC,CAAC;KACJ;IAED,IAAI,IAAA,0CAAoB,EAAC,KAAK,CAAC,EAAE;QAC/B,IAAI,CAAC,qBAAqB,CAAC;YACzB;gBACE,eAAe,EAAE,iBAAiB;aACnC;SACF,CAAC,CAAC;KACJ;IAED,IACE,IAAA,wCAAkB,EAAC,KAAK,CAAC;QACzB,IAAA,sCAAgB,EAAC,KAAK,CAAC;QACvB,IAAA,uCAAiB,EAAC,KAAK,CAAC;QACxB,IAAA,sCAAgB,EAAC,KAAK,CAAC,EACvB;QACA,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBAC1B,eAAe,EAAE,mBAAmB;aACrC,CAAC,CAAC,CAAC;KACL;IAED,IAAI,CAAC,mBAAmB,CAAC;QACvB,UAAU,EAAE,oBAAoB;QAChC,cAAc,EAAE,KAAK;KACtB,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -18,9 +18,9 @@ function buildIsUnexpectedHelper(model) {
|
|
|
18
18
|
overwrite: true
|
|
19
19
|
});
|
|
20
20
|
let map = {};
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
const allResponseTypes = new Set();
|
|
22
|
+
const allErrorTypes = new Set();
|
|
23
|
+
const overloads = [];
|
|
24
24
|
const pathDictionary = model.paths;
|
|
25
25
|
for (const [path, details] of Object.entries(pathDictionary)) {
|
|
26
26
|
for (const [methodName, methodDetails] of Object.entries(details.methods)) {
|
|
@@ -94,7 +94,7 @@ function buildIsUnexpectedHelper(model) {
|
|
|
94
94
|
${hasTemplate ? "let" : "const"} pathDetails = responseMap[\`\${method} \${url.pathname}\`];
|
|
95
95
|
if (!pathDetails) {`,
|
|
96
96
|
hasTemplate
|
|
97
|
-
? "pathDetails =
|
|
97
|
+
? "pathDetails = getParametrizedPathSuccess(method, url.pathname);"
|
|
98
98
|
: `return true;`,
|
|
99
99
|
` }
|
|
100
100
|
return !pathDetails.includes(response.status);
|
|
@@ -104,7 +104,7 @@ function buildIsUnexpectedHelper(model) {
|
|
|
104
104
|
if (hasTemplate) {
|
|
105
105
|
isErrorHelper.addFunction({
|
|
106
106
|
isExported: false,
|
|
107
|
-
name: "
|
|
107
|
+
name: "getParametrizedPathSuccess",
|
|
108
108
|
parameters: [
|
|
109
109
|
{
|
|
110
110
|
name: "method",
|
|
@@ -118,73 +118,74 @@ function buildIsUnexpectedHelper(model) {
|
|
|
118
118
|
returnType: `string[]`,
|
|
119
119
|
statements: [
|
|
120
120
|
`
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
//
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
const
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
121
|
+
const pathParts = path.split("/");
|
|
122
|
+
|
|
123
|
+
// Traverse list to match the longest candidate
|
|
124
|
+
// matchedLen: the length of candidate path
|
|
125
|
+
// matchedValue: the matched status code array
|
|
126
|
+
let matchedLen = -1,
|
|
127
|
+
matchedValue: string[] = [];
|
|
128
|
+
|
|
129
|
+
// Iterate the responseMap to find a match
|
|
130
|
+
for (const [key, value] of Object.entries(responseMap)) {
|
|
131
|
+
// Extracting the path from the map key which is in format
|
|
132
|
+
// GET /path/foo
|
|
133
|
+
if (!key.startsWith(method)) {
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
136
|
+
const candidatePath = getPathFromMapKey(key);
|
|
137
|
+
// Get each part of the url path
|
|
138
|
+
const candidateParts = candidatePath.split("/");
|
|
139
|
+
|
|
140
140
|
// track if we have found a match to return the values found.
|
|
141
141
|
let found = true;
|
|
142
|
-
for (
|
|
142
|
+
for (
|
|
143
|
+
let i = candidateParts.length - 1, j = pathParts.length - 1;
|
|
144
|
+
i >= 1 && j >= 1;
|
|
145
|
+
i--, j--
|
|
146
|
+
) {
|
|
143
147
|
if (
|
|
144
148
|
candidateParts[i]?.startsWith("{") &&
|
|
145
|
-
candidateParts[i]?.
|
|
149
|
+
candidateParts[i]?.indexOf("}") !== -1
|
|
146
150
|
) {
|
|
151
|
+
const start = candidateParts[i]!.indexOf("}") + 1,
|
|
152
|
+
end = candidateParts[i]?.length;
|
|
147
153
|
// If the current part of the candidate is a "template" part
|
|
148
|
-
//
|
|
149
|
-
//
|
|
154
|
+
// Try to use the suffix of pattern to match the path
|
|
155
|
+
// {guid} ==> $
|
|
156
|
+
// {guid}:export ==> :export$
|
|
157
|
+
const isMatched = new RegExp(
|
|
158
|
+
\`\${candidateParts[i]?.slice(start, end)}\`
|
|
159
|
+
).test(pathParts[j] || '');
|
|
160
|
+
|
|
161
|
+
if (!isMatched) {
|
|
162
|
+
found = false;
|
|
163
|
+
break;
|
|
164
|
+
}
|
|
150
165
|
continue;
|
|
151
166
|
}
|
|
152
|
-
|
|
167
|
+
|
|
153
168
|
// If the candidate part is not a template and
|
|
154
169
|
// the parts don't match mark the candidate as not found
|
|
155
170
|
// to move on with the next candidate path.
|
|
156
|
-
if (candidateParts[i] !== pathParts[
|
|
171
|
+
if (candidateParts[i] !== pathParts[j]) {
|
|
157
172
|
found = false;
|
|
158
173
|
break;
|
|
159
174
|
}
|
|
160
175
|
}
|
|
161
|
-
|
|
176
|
+
|
|
162
177
|
// We finished evaluating the current candidate parts
|
|
163
|
-
// if
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
178
|
+
// Update the matched value if and only if we found the longer pattern
|
|
179
|
+
if (found && candidatePath.length > matchedLen) {
|
|
180
|
+
matchedLen = candidatePath.length;
|
|
181
|
+
matchedValue = value;
|
|
167
182
|
}
|
|
168
183
|
}
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
// No match was found, return an empty array.
|
|
172
|
-
return [];
|
|
184
|
+
|
|
185
|
+
return matchedValue;
|
|
173
186
|
`
|
|
174
187
|
]
|
|
175
188
|
});
|
|
176
|
-
isErrorHelper.addFunction({
|
|
177
|
-
isExported: false,
|
|
178
|
-
name: "hasParametrizedPath",
|
|
179
|
-
parameters: [
|
|
180
|
-
{
|
|
181
|
-
name: "path",
|
|
182
|
-
type: "string"
|
|
183
|
-
}
|
|
184
|
-
],
|
|
185
|
-
returnType: `boolean`,
|
|
186
|
-
statements: [`return path.includes("/{");`]
|
|
187
|
-
});
|
|
188
189
|
isErrorHelper.addFunction({
|
|
189
190
|
isExported: false,
|
|
190
191
|
name: "getPathFromMapKey",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildIsUnexpectedHelper.js","sourceRoot":"","sources":["../src/buildIsUnexpectedHelper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,6BAA6B;AAC7B,uCAKkB;AAClB,uEAAoE;AACpE,SAAgB,uBAAuB,CAAC,KAAe;;IACrD,IAAI,CAAC,IAAA,yCAAmB,EAAC,KAAK,CAAC,EAAE;QAC/B,OAAO;KACR;IACD,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE;QAClE,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,IAAI,GAAG,GAA6B,EAAE,CAAC;IACvC,
|
|
1
|
+
{"version":3,"file":"buildIsUnexpectedHelper.js","sourceRoot":"","sources":["../src/buildIsUnexpectedHelper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,6BAA6B;AAC7B,uCAKkB;AAClB,uEAAoE;AACpE,SAAgB,uBAAuB,CAAC,KAAe;;IACrD,IAAI,CAAC,IAAA,yCAAmB,EAAC,KAAK,CAAC,EAAE;QAC/B,OAAO;KACR;IACD,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE;QAClE,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,IAAI,GAAG,GAA6B,EAAE,CAAC;IACvC,MAAM,gBAAgB,GAAgB,IAAI,GAAG,EAAE,CAAC;IAChD,MAAM,aAAa,GAAgB,IAAI,GAAG,EAAE,CAAC;IAC7C,MAAM,SAAS,GAAyD,EAAE,CAAC;IAC3E,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC;IAEnC,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QAC5D,KAAK,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACzE,MAAM,cAAc,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;YAChD,MAAM,SAAS,GAAG,GAAG,cAAc,IAAI,IAAI,EAAE,CAAC;YAC9C,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YAC/C,GAAG,mCAAQ,GAAG,GAAK,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAE,CAAC;YAE9C,2CAA2C;YAC3C,+BAA+B;YAC/B,IACE,CAAA,MAAA,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,0CAAE,aAAa;gBAC3C,cAAc,KAAK,KAAK,EACxB;gBACA,MAAM,SAAS,GAAG,OAAO,IAAI,EAAE,CAAC;gBAChC,MAAM,OAAO,GACX,MAAA,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;qBAClC,MAAA,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,0CAAE,aAAa,CAAA,CAAC,mCACxD,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBACjC,GAAG,mCAAQ,GAAG,GAAK,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAE,CAAC;aAC/C;YAED,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC;YAC5D,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC;YAExD,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;gBAChE,SAAS;aACV;YAED,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACrD,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACvB,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACxB,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;YAEH,SAAS,CAAC,IAAI,CAAC;gBACb,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,CAAC,GAAG,YAAY,EAAE,GAAG,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;qBACnD;iBACF;gBACD,UAAU,EAAE,eAAe,UAAU,CAAC,CAAC,CAAC,EAAE;aAC3C,CAAC,CAAC;SACJ;KACF;IACD,aAAa,CAAC,oBAAoB,CAAC;QACjC,YAAY,EAAE,CAAC,GAAG,gBAAgB,CAAC;QACnC,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAC;IAEH,aAAa,CAAC,oBAAoB,CAAC;QACjC,YAAY,EAAE;YACZ;gBACE,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;gBAChC,IAAI,EAAE,0BAA0B;aACjC;SACF;QACD,eAAe,EAAE,kCAAuB,CAAC,KAAK;KAC/C,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,IAAI,EAAE;QACtB,MAAM,WAAW,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;QACxD,aAAa,CAAC,WAAW,CAAC;YACxB,SAAS;YACT,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,cAAc;YACpB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;iBACxC;aACF;YACD,UAAU,EAAE,eAAe,CAAC,GAAG,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC3D,UAAU,EAAE;gBACV;;;;YAKI,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OACxB;8BACoB;gBACtB,WAAW;oBACT,CAAC,CAAC,iEAAiE;oBACnE,CAAC,CAAC,cAAc;gBAClB;;SAEC;aACF;SACF,CAAC,CAAC;QACH,IAAI,WAAW,EAAE;YACf,aAAa,CAAC,WAAW,CAAC;gBACxB,UAAU,EAAE,KAAK;gBACjB,IAAI,EAAE,4BAA4B;gBAClC,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,QAAQ;qBACf;iBACF;gBACD,UAAU,EAAE,UAAU;gBACtB,UAAU,EAAE;oBACV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAkED;iBACA;aACF,CAAC,CAAC;YAEH,aAAa,CAAC,WAAW,CAAC;gBACxB,UAAU,EAAE,KAAK;gBACjB,IAAI,EAAE,mBAAmB;gBACzB,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,QAAQ;qBACf;iBACF;gBACD,UAAU,EAAE,QAAQ;gBACpB,UAAU,EAAE;oBACV;yCAC+B;iBAChC;aACF,CAAC,CAAC;SACJ;KACF;IAED,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,aAAa,CAAC,WAAW,EAAE;KACrC,CAAC;AACJ,CAAC;AAzND,0DAyNC;AAED,SAAS,mBAAmB,CAAC,cAAqB;IAChD,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QACnD,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC7C,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -16,7 +16,7 @@ exports.REST_CLIENT_RESERVED = [
|
|
|
16
16
|
}
|
|
17
17
|
];
|
|
18
18
|
function buildMethodShortcutImplementation(paths) {
|
|
19
|
-
|
|
19
|
+
const keys = {};
|
|
20
20
|
for (const path of Object.keys(paths)) {
|
|
21
21
|
const groupName = (0, nameUtils_js_1.normalizeName)(paths[path].operationGroupName, nameUtils_js_1.NameType.OperationGroup, true, exports.REST_CLIENT_RESERVED, nameUtils_js_1.CasingConvention.Camel);
|
|
22
22
|
if (keys[groupName]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildMethodShortcuts.js","sourceRoot":"","sources":["../src/buildMethodShortcuts.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,yDAKgC;AAGnB,QAAA,oBAAoB,GAAmB;IAClD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,uBAAQ,CAAC,QAAQ,EAAE,uBAAQ,CAAC,cAAc,CAAC,EAAE;IAC3E;QACE,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,CAAC,uBAAQ,CAAC,QAAQ,EAAE,uBAAQ,CAAC,cAAc,CAAC;KAC1D;IACD;QACE,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,CAAC,uBAAQ,CAAC,QAAQ,EAAE,uBAAQ,CAAC,cAAc,CAAC;KAC1D;CACF,CAAC;AAEF,SAAgB,iCAAiC,CAAC,KAAY;IAC5D,
|
|
1
|
+
{"version":3,"file":"buildMethodShortcuts.js","sourceRoot":"","sources":["../src/buildMethodShortcuts.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,yDAKgC;AAGnB,QAAA,oBAAoB,GAAmB;IAClD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,uBAAQ,CAAC,QAAQ,EAAE,uBAAQ,CAAC,cAAc,CAAC,EAAE;IAC3E;QACE,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,CAAC,uBAAQ,CAAC,QAAQ,EAAE,uBAAQ,CAAC,cAAc,CAAC;KAC1D;IACD;QACE,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,CAAC,uBAAQ,CAAC,QAAQ,EAAE,uBAAQ,CAAC,cAAc,CAAC;KAC1D;CACF,CAAC;AAEF,SAAgB,iCAAiC,CAAC,KAAY;IAC5D,MAAM,IAAI,GAA6B,EAAE,CAAC;IAC1C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACrC,MAAM,SAAS,GAAG,IAAA,4BAAa,EAC7B,KAAK,CAAC,IAAI,CAAC,CAAC,kBAAkB,EAC9B,uBAAQ,CAAC,cAAc,EACvB,IAAI,EACJ,4BAAoB,EACpB,+BAAgB,CAAC,KAAK,CACvB,CAAC;QAEF,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACxE;aAAM;YACL,IAAI,CAAC,SAAS,CAAC,GAAG,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SACjE;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAlBD,8EAkBC;AAED,SAAS,0BAA0B,CAAC,IAAY,EAAE,YAA0B;IAC1E,IAAI,GAAG,GAAa,EAAE,CAAC;IACvB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;QACtD,KAAK,MAAM,EAAE,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC7C,MAAM,UAAU,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAc,CAAC;YAChD,MAAM,IAAI,GAAG,IAAA,4BAAa,EAAC,EAAE,CAAC,aAAa,EAAE,uBAAQ,CAAC,QAAQ,CAAC,CAAC;YAChE,MAAM,iBAAiB,GAAG,4BAA4B,CACpD,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,UAAU,CACX,CAAC;YACF,GAAG,GAAG,CAAC,GAAG,GAAG,EAAE,iBAAiB,CAAC,CAAC;SACnC;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,4BAA4B,CACnC,IAAY,EACZ,aAAqB,EACrB,MAAc,EACd,aAA8B,EAAE;IAEhC,MAAM,cAAc,GAAG,GACrB,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAChE,EAAE,CAAC;IACH,OAAO,IAAI,aAAa,OAAO,cAAc;4BACnB,IAAI,MAAM,cAAc,KAAK,MAAM;MACzD,CAAC;AACP,CAAC"}
|
package/dist/buildObjectTypes.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT License.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.getPropertySignature = exports.buildPolymorphicAliases = exports.buildObjectInterfaces = void 0;
|
|
5
|
+
exports.getPropertySignature = exports.buildPolymorphicAliases = exports.buildObjectAliases = exports.buildObjectInterfaces = void 0;
|
|
6
6
|
const ts_morph_1 = require("ts-morph");
|
|
7
7
|
const nameUtils_js_1 = require("./helpers/nameUtils.js");
|
|
8
8
|
const schemaHelpers_js_1 = require("./helpers/schemaHelpers.js");
|
|
@@ -19,6 +19,9 @@ function buildObjectInterfaces(model, importedModels, schemaUsage) {
|
|
|
19
19
|
});
|
|
20
20
|
const objectInterfaces = [];
|
|
21
21
|
for (const objectSchema of objectSchemas) {
|
|
22
|
+
if (objectSchema.alias || objectSchema.outputAlias) {
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
22
25
|
const baseName = getObjectBaseName(objectSchema, schemaUsage);
|
|
23
26
|
const interfaceDeclaration = getObjectInterfaceDeclaration(baseName, objectSchema, schemaUsage, importedModels);
|
|
24
27
|
objectInterfaces.push(interfaceDeclaration);
|
|
@@ -26,6 +29,30 @@ function buildObjectInterfaces(model, importedModels, schemaUsage) {
|
|
|
26
29
|
return objectInterfaces;
|
|
27
30
|
}
|
|
28
31
|
exports.buildObjectInterfaces = buildObjectInterfaces;
|
|
32
|
+
function buildObjectAliases(model, importedModels, schemaUsage) {
|
|
33
|
+
var _a, _b;
|
|
34
|
+
const objectSchemas = ((_a = model.schemas) !== null && _a !== void 0 ? _a : []).filter((o) => {
|
|
35
|
+
var _a;
|
|
36
|
+
return (0, schemaHelpers_js_1.isObjectSchema)(o) &&
|
|
37
|
+
((_a = o.usage) === null || _a === void 0 ? void 0 : _a.some((u) => schemaUsage.includes(u)));
|
|
38
|
+
});
|
|
39
|
+
const objectAliases = [];
|
|
40
|
+
for (const objectSchema of objectSchemas) {
|
|
41
|
+
if (objectSchema.alias || objectSchema.outputAlias) {
|
|
42
|
+
const description = objectSchema.description;
|
|
43
|
+
objectAliases.push(Object.assign(Object.assign({ kind: ts_morph_1.StructureKind.TypeAlias }, (description && { docs: [{ description }] })), { name: schemaUsage.includes(interfaces_js_1.SchemaContext.Input)
|
|
44
|
+
? `${objectSchema.typeName}`
|
|
45
|
+
: `${objectSchema.outputTypeName}`, type: schemaUsage.includes(interfaces_js_1.SchemaContext.Input)
|
|
46
|
+
? `${objectSchema.alias}`
|
|
47
|
+
: `${objectSchema.outputAlias}`, isExported: true }));
|
|
48
|
+
if ((_b = objectSchema.alias) === null || _b === void 0 ? void 0 : _b.startsWith("Paged<")) {
|
|
49
|
+
importedModels.add("Paged");
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return objectAliases;
|
|
54
|
+
}
|
|
55
|
+
exports.buildObjectAliases = buildObjectAliases;
|
|
29
56
|
function buildPolymorphicAliases(model, schemaUsage) {
|
|
30
57
|
var _a;
|
|
31
58
|
// We'll add aliases for polymorphic objects
|
|
@@ -202,7 +229,7 @@ function getImmediateParentsNames(objectSchema, schemaUsage) {
|
|
|
202
229
|
if (!((_a = objectSchema.parents) === null || _a === void 0 ? void 0 : _a.immediate)) {
|
|
203
230
|
return [];
|
|
204
231
|
}
|
|
205
|
-
|
|
232
|
+
const extendFrom = [];
|
|
206
233
|
// If an immediate parent is a DictionarySchema, that means that the object has been marked
|
|
207
234
|
// with additional properties. We need to add Record<string, unknown> to the extend list and
|
|
208
235
|
if (objectSchema.parents.immediate.find(schemaHelpers_js_1.isDictionarySchema)) {
|
|
@@ -223,7 +250,11 @@ function getImmediateParentsNames(objectSchema, schemaUsage) {
|
|
|
223
250
|
return [...parents, ...extendFrom];
|
|
224
251
|
}
|
|
225
252
|
function getPropertySignatures(properties, schemaUsage, importedModels) {
|
|
226
|
-
|
|
253
|
+
let validProperties = Object.keys(properties);
|
|
254
|
+
const readOnlyFilter = (name) => !(schemaUsage.includes(interfaces_js_1.SchemaContext.Input) && properties[name].readOnly);
|
|
255
|
+
const neverFilter = (name) => properties[name].type !== "never";
|
|
256
|
+
validProperties = validProperties.filter(readOnlyFilter).filter(neverFilter);
|
|
257
|
+
return validProperties.map((p) => getPropertySignature(Object.assign(Object.assign({}, properties[p]), { name: p }), schemaUsage, importedModels));
|
|
227
258
|
}
|
|
228
259
|
/**
|
|
229
260
|
* Builds a Typescript property or parameter signature
|
|
@@ -231,20 +262,25 @@ function getPropertySignatures(properties, schemaUsage, importedModels) {
|
|
|
231
262
|
* @param importedModels - Set to track the models that need to be imported
|
|
232
263
|
* @returns a PropertySignatureStructure for the property.
|
|
233
264
|
*/
|
|
234
|
-
function getPropertySignature(property, schemaUsage, importedModels
|
|
235
|
-
var _a, _b;
|
|
265
|
+
function getPropertySignature(property, schemaUsage, importedModels) {
|
|
236
266
|
const propertyName = property.name;
|
|
237
267
|
const description = property.description;
|
|
238
|
-
|
|
239
|
-
((_a = property.usage) === null || _a === void 0 ? void 0 : _a.includes(interfaces_js_1.SchemaContext.Output))) ||
|
|
240
|
-
(schemaUsage.includes(interfaces_js_1.SchemaContext.Exception) &&
|
|
241
|
-
((_b = property.usage) === null || _b === void 0 ? void 0 : _b.includes(interfaces_js_1.SchemaContext.Exception)))) &&
|
|
242
|
-
property.outputTypeName
|
|
268
|
+
let type = generateForOutput(schemaUsage, property.usage) && property.outputTypeName
|
|
243
269
|
? property.outputTypeName
|
|
244
270
|
: property.typeName
|
|
245
271
|
? property.typeName
|
|
246
272
|
: property.type;
|
|
247
|
-
|
|
273
|
+
if (property.typeName && property.fromCore) {
|
|
274
|
+
importedModels.add(property.typeName);
|
|
275
|
+
type = property.typeName;
|
|
276
|
+
}
|
|
277
|
+
return Object.assign(Object.assign({ name: propertyName }, (description && { docs: [{ description }] })), { hasQuestionToken: !property.required, isReadonly: generateForOutput(schemaUsage, property.usage) && property.readOnly, type, kind: ts_morph_1.StructureKind.PropertySignature });
|
|
248
278
|
}
|
|
249
279
|
exports.getPropertySignature = getPropertySignature;
|
|
280
|
+
function generateForOutput(schemaUsage, propertyUsage) {
|
|
281
|
+
return ((schemaUsage.includes(interfaces_js_1.SchemaContext.Output) &&
|
|
282
|
+
(propertyUsage === null || propertyUsage === void 0 ? void 0 : propertyUsage.includes(interfaces_js_1.SchemaContext.Output))) ||
|
|
283
|
+
(schemaUsage.includes(interfaces_js_1.SchemaContext.Exception) &&
|
|
284
|
+
(propertyUsage === null || propertyUsage === void 0 ? void 0 : propertyUsage.includes(interfaces_js_1.SchemaContext.Exception))));
|
|
285
|
+
}
|
|
250
286
|
//# sourceMappingURL=buildObjectTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildObjectTypes.js","sourceRoot":"","sources":["../src/buildObjectTypes.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uCAKkB;AAClB,yDAAiE;AACjE,iEAAgF;AAChF,mDAMyB;AAEzB;;GAEG;AACH,SAAgB,qBAAqB,CACnC,KAAe,EACf,cAA2B,EAC3B,WAA4B;;IAE5B,MAAM,aAAa,GAAmB,CAAC,MAAA,KAAK,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,MAAM,CAChE,CAAC,CAAC,EAAE,EAAE;;QACJ,OAAA,IAAA,iCAAc,EAAC,CAAC,CAAC;aACjB,MAAC,CAAkB,CAAC,KAAK,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA,CAAA;KAAA,CAClE,CAAC;IACF,MAAM,gBAAgB,GAAoC,EAAE,CAAC;IAE7D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC9D,MAAM,oBAAoB,GAAG,6BAA6B,CACxD,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,cAAc,CACf,CAAC;QAEF,gBAAgB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;KAC7C;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;
|
|
1
|
+
{"version":3,"file":"buildObjectTypes.js","sourceRoot":"","sources":["../src/buildObjectTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT License.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.buildParameterTypes = void 0;
|
|
5
|
+
exports.buildBodyTypeAlias = exports.buildParameterTypes = void 0;
|
|
6
6
|
const ts_morph_1 = require("ts-morph");
|
|
7
7
|
const path = require("path");
|
|
8
8
|
const interfaces_js_1 = require("./interfaces.js");
|
|
@@ -40,6 +40,10 @@ function buildParameterTypes(model) {
|
|
|
40
40
|
const headerParameterDefinitions = buildHeaderParameterDefinitions(parameter, baseParameterName, parametersFile, internalReferences, i);
|
|
41
41
|
const contentTypeParameterDefinition = buildContentTypeParametersDefinition(parameter, baseParameterName, internalReferences, i);
|
|
42
42
|
const bodyParameterDefinition = buildBodyParametersDefinition(parameter, baseParameterName, internalReferences, i);
|
|
43
|
+
const bodyTypeAlias = buildBodyTypeAlias(parameter);
|
|
44
|
+
if (bodyTypeAlias) {
|
|
45
|
+
parametersFile.addTypeAlias(bodyTypeAlias);
|
|
46
|
+
}
|
|
43
47
|
// Add interfaces for body and query parameters
|
|
44
48
|
parametersFile.addInterfaces([
|
|
45
49
|
...(bodyParameterDefinition !== null && bodyParameterDefinition !== void 0 ? bodyParameterDefinition : []),
|
|
@@ -135,7 +139,7 @@ function buildQueryParameterDefinition(parameters, baseName, internalReferences,
|
|
|
135
139
|
}
|
|
136
140
|
function getPropertyFromSchema(schema) {
|
|
137
141
|
const description = schema.description;
|
|
138
|
-
return Object.assign(Object.assign({ name: schema.name }, (description && { docs: [{ description }] })), { type: schema.type, hasQuestionToken: !
|
|
142
|
+
return Object.assign(Object.assign({ name: schema.name }, (description && { docs: [{ description }] })), { type: schema.type, hasQuestionToken: !schema.required, kind: ts_morph_1.StructureKind.PropertySignature });
|
|
139
143
|
}
|
|
140
144
|
function buildPathParameterDefinitions(parameters, baseName, parametersFile, internalReferences, requestIndex) {
|
|
141
145
|
const pathParameters = (parameters.parameters || []).filter((p) => p.type === "path");
|
|
@@ -179,8 +183,10 @@ function buildHeaderParameterDefinitions(parameters, baseName, parametersFile, i
|
|
|
179
183
|
const nameSuffix = requestIndex > 0 ? `${requestIndex}` : "";
|
|
180
184
|
const headerParameterInterfaceName = `${baseName}HeaderParam${nameSuffix}`;
|
|
181
185
|
const headersInterface = getRequestHeaderInterfaceDefinition(headerParameters, baseName);
|
|
186
|
+
let isOptional = true;
|
|
182
187
|
if (headersInterface) {
|
|
183
188
|
parametersFile.addInterface(headersInterface);
|
|
189
|
+
isOptional = !(headersInterface.properties || []).some((prop) => prop.hasQuestionToken === false);
|
|
184
190
|
}
|
|
185
191
|
internalReferences.add(headerParameterInterfaceName);
|
|
186
192
|
return {
|
|
@@ -191,7 +197,8 @@ function buildHeaderParameterDefinitions(parameters, baseName, parametersFile, i
|
|
|
191
197
|
{
|
|
192
198
|
name: "headers",
|
|
193
199
|
type: `RawHttpHeadersInput & ${baseName}Headers`,
|
|
194
|
-
kind: ts_morph_1.StructureKind.PropertySignature
|
|
200
|
+
kind: ts_morph_1.StructureKind.PropertySignature,
|
|
201
|
+
hasQuestionToken: isOptional
|
|
195
202
|
}
|
|
196
203
|
]
|
|
197
204
|
};
|
|
@@ -284,4 +291,25 @@ function buildBodyParametersDefinition(parameters, baseName, internalReferences,
|
|
|
284
291
|
];
|
|
285
292
|
}
|
|
286
293
|
}
|
|
294
|
+
function buildBodyTypeAlias(parameters) {
|
|
295
|
+
const bodyParameters = parameters.body;
|
|
296
|
+
if (!bodyParameters ||
|
|
297
|
+
!(bodyParameters === null || bodyParameters === void 0 ? void 0 : bodyParameters.body) ||
|
|
298
|
+
!(bodyParameters === null || bodyParameters === void 0 ? void 0 : bodyParameters.body.length)) {
|
|
299
|
+
return undefined;
|
|
300
|
+
}
|
|
301
|
+
const schema = bodyParameters.body[0];
|
|
302
|
+
const headerParameters = (parameters.parameters || []).filter((p) => p.type === "header" && p.name === "contentType");
|
|
303
|
+
if (!headerParameters.length || headerParameters.length > 1) {
|
|
304
|
+
return undefined;
|
|
305
|
+
}
|
|
306
|
+
const contentType = headerParameters[0].param.type;
|
|
307
|
+
const description = `${schema.description}`;
|
|
308
|
+
const typeName = `${schema.typeName}ResourceMergeAndPatch`;
|
|
309
|
+
if (contentType.includes("application/merge-patch+json")) {
|
|
310
|
+
const type = `Partial<${schema.typeName}>`;
|
|
311
|
+
return Object.assign(Object.assign({}, (description && { docs: [{ description }] })), { name: `${typeName}`, type, isExported: true });
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
exports.buildBodyTypeAlias = buildBodyTypeAlias;
|
|
287
315
|
//# sourceMappingURL=buildParameterTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildParameterTypes.js","sourceRoot":"","sources":["../src/buildParameterTypes.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uCAMkB;AAClB,6BAA6B;AAC7B,mDAMyB;AAEzB,uEAGuC;AAEvC,SAAgB,mBAAmB,CAAC,KAAe;;IACjD,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE;QACnE,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IACH,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;QACrB,OAAO;KACR;IACD,KAAK,MAAM,gBAAgB,IAAI,KAAK,CAAC,UAAU,EAAE;QAC/C,MAAM,iBAAiB,GAAG,IAAA,0CAAoB,EAC5C,gBAAgB,CAAC,cAAc,EAC/B,gBAAgB,CAAC,aAAa,CAC/B,CAAC;QACF,MAAM,YAAY,GAAG,MAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,UAAU,0CAAE,MAAM,mCAAI,CAAC,CAAC;QAC/D,MAAM,YAAY,GAAG,IAAA,0CAAoB,EAAC,iBAAiB,CAAC,CAAC;QAC7D,MAAM,aAAa,GAAa,EAAE,CAAC;QAEnC,+EAA+E;QAC/E,6EAA6E;QAC7E,0CAA0C;QAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC7C,0FAA0F;YAC1F,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,MAAM,sBAAsB,GAC1B,YAAY,GAAG,CAAC;gBACd,CAAC,CAAC,GAAG,iBAAiB,oBAAoB,UAAU,EAAE;gBACtD,CAAC,CAAC,YAAY,CAAC;YACnB,MAAM,yBAAyB,GAAG,6BAA6B,CAC7D,SAAS,EACT,iBAAiB,EACjB,kBAAkB,EAClB,CAAC,CACF,CAAC;YACF,MAAM,wBAAwB,GAAG,6BAA6B,CAC5D,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,CAAC,CACF,CAAC;YAEF,MAAM,0BAA0B,GAAG,+BAA+B,CAChE,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,CAAC,CACF,CAAC;YAEF,MAAM,8BAA8B,GAClC,oCAAoC,CAClC,SAAS,EACT,iBAAiB,EACjB,kBAAkB,EAClB,CAAC,CACF,CAAC;YAEJ,MAAM,uBAAuB,GAAG,6BAA6B,CAC3D,SAAS,EACT,iBAAiB,EACjB,kBAAkB,EAClB,CAAC,CACF,CAAC;YAEF,+CAA+C;YAC/C,cAAc,CAAC,aAAa,CAAC;gBAC3B,GAAG,CAAC,uBAAuB,aAAvB,uBAAuB,cAAvB,uBAAuB,GAAI,EAAE,CAAC;gBAClC,GAAG,CAAC,yBAAyB,aAAzB,yBAAyB,cAAzB,yBAAyB,GAAI,EAAE,CAAC;gBACpC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/D,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnE,GAAG,CAAC,8BAA8B;oBAChC,CAAC,CAAC,CAAC,8BAA8B,CAAC;oBAClC,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,CAAC;YAEH,wFAAwF;YACxF,yCAAyC;YACzC,cAAc,CAAC,YAAY,CAAC;gBAC1B,IAAI,EAAE,sBAAsB;gBAC5B,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE,CAAC,GAAG,kBAAkB,EAAE,mBAAmB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;aAC/D,CAAC,CAAC;YAEH,aAAa,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YAE3C,IAAI,0BAA0B,KAAK,SAAS,EAAE;gBAC5C,UAAU,GAAG,IAAI,CAAC;aACnB;SACF;QACD,wFAAwF;QACxF,yCAAyC;QACzC,IAAI,YAAY,GAAG,CAAC,EAAE;YACpB,cAAc,CAAC,YAAY,CAAC;gBAC1B,IAAI,EAAE,YAAY;gBAClB,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;aACrC,CAAC,CAAC;SACJ;KACF;IAED,IAAI,UAAU,EAAE;QACd,cAAc,CAAC,qBAAqB,CAAC;YACnC;gBACE,YAAY,EAAE,CAAC,qBAAqB,CAAC;gBACrC,eAAe,EAAE,2BAA2B;aAC7C;SACF,CAAC,CAAC;KACJ;IACD,cAAc,CAAC,qBAAqB,CAAC;QACnC;YACE,YAAY,EAAE,CAAC,mBAAmB,CAAC;YACnC,eAAe,EAAE,yBAAyB;SAC3C;KACF,CAAC,CAAC;IACH,IAAI,MAAA,KAAK,CAAC,SAAS,0CAAE,GAAG,CAAC,0BAAU,CAAC,cAAc,CAAC,EAAE;QACnD,cAAc,CAAC,qBAAqB,CAAC;YACnC;gBACE,YAAY,EAAE;oBACZ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAA,MAAA,KAAK,CAAC,SAAS,0CAAE,GAAG,CAAC,0BAAU,CAAC,cAAc,CAAC,KAAI,EAAE,CAAC;iBACrE;gBACD,eAAe,EAAE,UAAU;aAC5B;SACF,CAAC,CAAC;KACJ;IACD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC;AACnE,CAAC;AAnID,kDAmIC;AAED,SAAS,6BAA6B,CACpC,UAA8B,EAC9B,QAAgB,EAChB,kBAA+B,EAC/B,YAAoB;IAEpB,MAAM,eAAe,GAAG,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,KAAI,EAAE,CAAC,CAAC,MAAM,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAC1B,CAAC;IAEF,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;QAC3B,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,UAAU,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,MAAM,2BAA2B,GAAG,GAAG,QAAQ,aAAa,UAAU,EAAE,CAAC;IACzE,MAAM,4BAA4B,GAAG,GAAG,QAAQ,sBAAsB,CAAC;IAEvE,sDAAsD;IACtD,MAAM,oBAAoB,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CACtD,qBAAqB,CAAC,EAAE,CAAC,KAAK,CAAC,CAChC,CAAC;IAEF,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,IAAI,CACrD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAC3B,CAAC;IAEF,MAAM,mBAAmB,GAAkC;QACzD,IAAI,EAAE,wBAAa,CAAC,SAAS;QAC7B,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,4BAA4B;QAClC,UAAU,EAAE,oBAAoB;KACjC,CAAC;IAEF,MAAM,kBAAkB,GAAkC;QACxD,IAAI,EAAE,wBAAa,CAAC,SAAS;QAC7B,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,2BAA2B;QACjC,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,4BAA4B;gBAClC,uDAAuD;gBACvD,gBAAgB,EAAE,CAAC,qBAAqB;aACzC;SACF;KACF,CAAC;IAEF,kDAAkD;IAClD,kBAAkB,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAEpD,OAAO,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAc;IAC3C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IACvC,qCACE,IAAI,EAAE,MAAM,CAAC,IAAI,IACd,CAAC,WAAW,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,KAC/C,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,gBAAgB,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAC3C,IAAI,EAAE,wBAAa,CAAC,iBAAiB,IACrC;AACJ,CAAC;AAED,SAAS,6BAA6B,CACpC,UAA8B,EAC9B,QAAgB,EAChB,cAA0B,EAC1B,kBAA+B,EAC/B,YAAoB;IAEpB,MAAM,cAAc,GAAG,CAAC,UAAU,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CACzD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CACzB,CAAC;IACF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;QAC1B,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,UAAU,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,MAAM,0BAA0B,GAAG,GAAG,QAAQ,YAAY,UAAU,EAAE,CAAC;IAEvE,MAAM,aAAa,GAAG,0BAA0B,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAE3E,IAAI,aAAa,EAAE;QACjB,cAAc,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;KAC5C;IAED,kBAAkB,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAEnD,OAAO;QACL,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,wBAAa,CAAC,SAAS;QAC7B,IAAI,EAAE,0BAA0B;QAChC,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,GAAG,QAAQ,gBAAgB;gBACjC,IAAI,EAAE,wBAAa,CAAC,iBAAiB;aACtC;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CACjC,cAAmC,EACnC,QAAgB;IAEhB,MAAM,iBAAiB,GAAG,GAAG,QAAQ,gBAAgB,CAAC;IACtD,OAAO;QACL,IAAI,EAAE,wBAAa,CAAC,SAAS;QAC7B,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,iBAAiB;QACvB,UAAU,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAoB,EAAE,EAAE,CACtD,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,CAC/B;KACF,CAAC;AACJ,CAAC;AAED,SAAS,+BAA+B,CACtC,UAA8B,EAC9B,QAAgB,EAChB,cAA0B,EAC1B,kBAA+B,EAC/B,YAAoB;IAEpB,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,CACvD,CAAC;IACF,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;QAC5B,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,UAAU,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,MAAM,4BAA4B,GAAG,GAAG,QAAQ,cAAc,UAAU,EAAE,CAAC;IAE3E,MAAM,gBAAgB,GAAG,mCAAmC,CAC1D,gBAAgB,EAChB,QAAQ,CACT,CAAC;IAEF,IAAI,gBAAgB,EAAE;QACpB,cAAc,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;KAC/C;IAED,kBAAkB,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAErD,OAAO;QACL,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,wBAAa,CAAC,SAAS;QAC7B,IAAI,EAAE,4BAA4B;QAClC,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,yBAAyB,QAAQ,SAAS;gBAChD,IAAI,EAAE,wBAAa,CAAC,iBAAiB;aACtC;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,mCAAmC,CAC1C,gBAAqC,EACrC,QAAgB;IAEhB,MAAM,oBAAoB,GAAG,GAAG,QAAQ,SAAS,CAAC;IAClD,OAAO;QACL,IAAI,EAAE,wBAAa,CAAC,SAAS;QAC7B,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,oBAAoB;QAC1B,UAAU,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAoB,EAAE,EAAE,CACxD,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,CAC/B;KACF,CAAC;AACJ,CAAC;AAED,SAAS,oCAAoC,CAC3C,UAA8B,EAC9B,QAAgB,EAChB,kBAA+B,EAC/B,YAAoB;IAEpB,MAAM,mBAAmB,GAAG,CAAC,UAAU,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,CACvD,CAAC;IACF,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE;QAC/B,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,UAAU,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,MAAM,gCAAgC,GAAG,GAAG,QAAQ,kBAAkB,UAAU,EAAE,CAAC;IAEnF,kDAAkD;IAClD,kBAAkB,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAEhD,OAAO;QACL,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,wBAAa,CAAC,SAAS;QAC7B,IAAI,EAAE,gCAAgC;QACtC,UAAU,EAAE,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;KAChD,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CACpC,UAA8B,EAC9B,QAAgB,EAChB,kBAA+B,EAC/B,YAAoB;IAEpB,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;IACvC,IACE,CAAC,cAAc;QACf,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAA;QACrB,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAC,MAAM,CAAA,EAC5B;QACA,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,MAAM,0BAA0B,GAAG,GAAG,QAAQ,YAAY,UAAU,EAAE,CAAC;IACvE,kBAAkB,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAEnD,iFAAiF;IACjF,IAAI,cAAc,CAAC,aAAa,EAAE;QAChC,IAAI,gBAAgB,GAAG,IAAI,CAAC;QAC5B,MAAM,qBAAqB,GAAiC,EAAE,CAAC;QAC/D,KAAK,MAAM,KAAK,IAAI,cAAc,CAAC,IAAI,EAAE;YACvC,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,gBAAgB,GAAG,KAAK,CAAC;aAC1B;YAED,qBAAqB,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;SAC1D;QAED,MAAM,YAAY,GAAG,GAAG,QAAQ,UAAU,CAAC;QAC3C,MAAM,iBAAiB,GAAkC;YACvD,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,wBAAa,CAAC,SAAS;YAC7B,IAAI,EAAE,YAAY;YAClB,UAAU,EAAE,qBAAqB;SAClC,CAAC;QAEF,OAAO;YACL;gBACE,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE,wBAAa,CAAC,SAAS;gBAC7B,IAAI,EAAE,0BAA0B;gBAChC,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,YAAY;wBAClB,gBAAgB,EAAE,gBAAgB;qBACnC;iBACF;aACF;YACD,iBAAiB;SAClB,CAAC;KACH;SAAM;QACL,MAAM,aAAa,GAAG,qBAAqB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpE,OAAO;YACL;gBACE,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE,wBAAa,CAAC,SAAS;gBAC7B,IAAI,EAAE,0BAA0B;gBAChC,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,aAAa,CAAC,IAAI;wBACxB,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,aAAa,CAAC,IAAI;wBACxB,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;qBACjD;iBACF;aACF;SACF,CAAC;KACH;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"buildParameterTypes.js","sourceRoot":"","sources":["../src/buildParameterTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,13 @@ const ts_morph_1 = require("ts-morph");
|
|
|
7
7
|
const interfaces_js_1 = require("./interfaces.js");
|
|
8
8
|
const path = require("path");
|
|
9
9
|
const nameConstructors_js_1 = require("./helpers/nameConstructors.js");
|
|
10
|
+
let hasErrorResponse = false;
|
|
10
11
|
function buildResponseTypes(model) {
|
|
11
12
|
var _a;
|
|
12
13
|
const project = new ts_morph_1.Project();
|
|
13
14
|
const srcPath = model.srcPath;
|
|
14
15
|
const filePath = path.join(srcPath, `responses.ts`);
|
|
16
|
+
hasErrorResponse = false;
|
|
15
17
|
const responsesFile = project.createSourceFile(filePath, undefined, {
|
|
16
18
|
overwrite: true
|
|
17
19
|
});
|
|
@@ -59,18 +61,23 @@ function buildResponseTypes(model) {
|
|
|
59
61
|
}
|
|
60
62
|
]);
|
|
61
63
|
}
|
|
64
|
+
const namedImports = ["HttpResponse"];
|
|
65
|
+
if (hasErrorResponse) {
|
|
66
|
+
namedImports.push("ErrorResponse");
|
|
67
|
+
}
|
|
62
68
|
responsesFile.addImportDeclarations([
|
|
63
69
|
{
|
|
64
|
-
namedImports
|
|
70
|
+
namedImports,
|
|
65
71
|
moduleSpecifier: "@azure-rest/core-client"
|
|
66
72
|
}
|
|
67
73
|
]);
|
|
68
74
|
if ((_a = model.importSet) === null || _a === void 0 ? void 0 : _a.has(interfaces_js_1.ImportKind.ResponseOutput)) {
|
|
75
|
+
const modelNamedImports = Array.from(model.importSet.get(interfaces_js_1.ImportKind.ResponseOutput) || []).filter((modelName) => {
|
|
76
|
+
return !(modelName === "ErrorResponseOutput" && hasErrorResponse);
|
|
77
|
+
});
|
|
69
78
|
responsesFile.addImportDeclarations([
|
|
70
79
|
{
|
|
71
|
-
namedImports:
|
|
72
|
-
...Array.from(model.importSet.get(interfaces_js_1.ImportKind.ResponseOutput) || [])
|
|
73
|
-
],
|
|
80
|
+
namedImports: modelNamedImports,
|
|
74
81
|
moduleSpecifier: "./outputModels"
|
|
75
82
|
}
|
|
76
83
|
]);
|
|
@@ -90,7 +97,7 @@ function getResponseHeaderInterfaceDefinition(response, baseName) {
|
|
|
90
97
|
name: headersInterfaceName,
|
|
91
98
|
properties: response === null || response === void 0 ? void 0 : response.headers.map((h) => {
|
|
92
99
|
const description = h.description;
|
|
93
|
-
return Object.assign(Object.assign({ name: h.name }, (description && { docs: [{ description }] })), { type: h.type, hasQuestionToken: !
|
|
100
|
+
return Object.assign(Object.assign({ name: h.name }, (description && { docs: [{ description }] })), { type: h.type, hasQuestionToken: !h.required });
|
|
94
101
|
})
|
|
95
102
|
};
|
|
96
103
|
}
|
|
@@ -108,7 +115,13 @@ function getResponseInterfaceProperties(response, headersInterfaceName) {
|
|
|
108
115
|
];
|
|
109
116
|
if (response.body) {
|
|
110
117
|
const description = response.body.description;
|
|
111
|
-
|
|
118
|
+
let type = response.body.type;
|
|
119
|
+
if (response.body.type === "ErrorResponseOutput" &&
|
|
120
|
+
response.body.fromCore) {
|
|
121
|
+
type = "ErrorResponse";
|
|
122
|
+
hasErrorResponse = true;
|
|
123
|
+
}
|
|
124
|
+
responseProperties.push(Object.assign({ name: "body", type, kind: ts_morph_1.StructureKind.PropertySignature }, (description && { docs: [{ description }] })));
|
|
112
125
|
}
|
|
113
126
|
if (headersInterfaceName) {
|
|
114
127
|
responseProperties.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildResponseTypes.js","sourceRoot":"","sources":["../src/buildResponseTypes.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uCAMkB;AAClB,mDAKyB;AACzB,6BAA6B;AAC7B,uEAGuC;AAEvC,SAAgB,kBAAkB,CAAC,KAAe;;IAChD,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE;QAClE,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IACH,0DAA0D;IAC1D,4CAA4C;IAC5C,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;QACpB,OAAO;KACR;IACD,KAAK,MAAM,iBAAiB,IAAI,KAAK,CAAC,SAAS,EAAE;QAC/C,KAAK,MAAM,QAAQ,IAAI,iBAAiB,CAAC,SAAS,EAAE;YAClD,uCAAuC;YACvC,MAAM,gBAAgB,GAAG,IAAA,yCAAmB,EAC1C,iBAAiB,CAAC,cAAc,EAChC,iBAAiB,CAAC,aAAa,EAC/B,QAAQ,CAAC,UAAU,CACpB,CAAC;YAEF,4BAA4B;YAC5B,MAAM,gBAAgB,GACpB,oCAAoC,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;YACnE,IAAI,gBAAgB,EAAE;gBACpB,UAAU,GAAG,IAAI,CAAC;gBAClB,aAAa,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;aAC9C;YAED,sDAAsD;YACtD,MAAM,gBAAgB,GAAG,IAAA,yCAAmB,EAAC,gBAAgB,CAAC,CAAC;YAC/D,MAAM,kBAAkB,GAAG,8BAA8B,CACvD,QAAQ,EACR,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,CACvB,CAAC;YAEF,MAAM,2BAA2B,GAC/B;gBACE,IAAI,EAAE,gBAAgB;gBACtB,UAAU,EAAE,kBAAkB;gBAC9B,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE,CAAC,cAAc,CAAC;aAC1B,CAAC;YAEJ,4DAA4D;YAC5D,mDAAmD;YACnD,IAAI,QAAQ,CAAC,WAAW,EAAE;gBACxB,2BAA2B,CAAC,IAAI,GAAG;oBACjC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE;iBACtC,CAAC;aACH;YAED,mDAAmD;YACnD,aAAa,CAAC,YAAY,CAAC,2BAA2B,CAAC,CAAC;SACzD;KACF;IAED,IAAI,UAAU,EAAE;QACd,aAAa,CAAC,qBAAqB,CAAC;YAClC;gBACE,YAAY,EAAE,CAAC,gBAAgB,CAAC;gBAChC,eAAe,EAAE,2BAA2B;aAC7C;SACF,CAAC,CAAC;KACJ;IACD,
|
|
1
|
+
{"version":3,"file":"buildResponseTypes.js","sourceRoot":"","sources":["../src/buildResponseTypes.ts"],"names":[],"mappings":"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"}
|