@autorest/typescript 6.0.0-beta.19 → 6.0.0-beta.20
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/README.md +3 -3
- package/dist/hlcREADME.md.hbs +144 -0
- package/dist/karma.conf.js.hbs +126 -0
- package/dist/paginateHelper.ts.hbs +208 -0
- package/dist/pollingHelper.ts.hbs +69 -0
- package/dist/rlcEnv.ts.hbs +3 -0
- package/dist/rlcREADME.md.hbs +71 -0
- package/dist/rlcRecordedClient.ts.hbs +26 -0
- package/dist/rlcSampleTest.spec.ts.hbs +20 -0
- package/dist/sampleEnv.hbs +4 -0
- package/dist/sampleTest.ts.hbs +32 -0
- package/dist/samples.ts.hbs +49 -0
- package/dist/src/autorestSession.js +2 -2
- package/dist/src/autorestSession.js.map +1 -1
- package/dist/src/generators/LROGenerator.js +4 -4
- package/dist/src/generators/LROGenerator.js.map +1 -1
- package/dist/src/generators/clientFileGenerator.d.ts.map +1 -1
- package/dist/src/generators/clientFileGenerator.js +78 -19
- package/dist/src/generators/clientFileGenerator.js.map +1 -1
- package/dist/src/generators/indexGenerator.js +14 -14
- package/dist/src/generators/indexGenerator.js.map +1 -1
- package/dist/src/generators/mappersGenerator.js +14 -14
- package/dist/src/generators/mappersGenerator.js.map +1 -1
- package/dist/src/generators/modelsGenerator.js +22 -22
- package/dist/src/generators/modelsGenerator.js.map +1 -1
- package/dist/src/generators/operationGenerator.d.ts.map +1 -1
- package/dist/src/generators/operationGenerator.js +58 -89
- package/dist/src/generators/operationGenerator.js.map +1 -1
- package/dist/src/generators/operationInterfaceGenerator.js +20 -20
- package/dist/src/generators/operationInterfaceGenerator.js.map +1 -1
- package/dist/src/generators/parametersGenerator.d.ts.map +1 -1
- package/dist/src/generators/parametersGenerator.js +7 -8
- package/dist/src/generators/parametersGenerator.js.map +1 -1
- package/dist/src/generators/samples/sampleGenerator.js +1 -1
- package/dist/src/generators/samples/sampleGenerator.js.map +1 -1
- package/dist/src/generators/static/apiExtractorConfig.js +1 -1
- package/dist/src/generators/static/apiExtractorConfig.js.map +1 -1
- package/dist/src/generators/static/esLintConfigGenerator.js +1 -1
- package/dist/src/generators/static/esLintConfigGenerator.js.map +1 -1
- package/dist/src/generators/static/karma.conf.js.hbs +4 -19
- package/dist/src/generators/static/karmaConfigFileGenerator.js +1 -1
- package/dist/src/generators/static/karmaConfigFileGenerator.js.map +1 -1
- package/dist/src/generators/static/licenseFileGenerator.js +1 -1
- package/dist/src/generators/static/licenseFileGenerator.js.map +1 -1
- package/dist/src/generators/static/packageFileGenerator.js +46 -40
- package/dist/src/generators/static/packageFileGenerator.js.map +1 -1
- package/dist/src/generators/static/readmeFileGenerator.js +4 -4
- package/dist/src/generators/static/readmeFileGenerator.js.map +1 -1
- package/dist/src/generators/static/rollupConfigFileGenerator.js +1 -1
- package/dist/src/generators/static/rollupConfigFileGenerator.js.map +1 -1
- package/dist/src/generators/static/tsConfigFileGenerator.js +1 -1
- package/dist/src/generators/static/tsConfigFileGenerator.js.map +1 -1
- package/dist/src/generators/test/envBrowserFileGenerator.js +1 -1
- package/dist/src/generators/test/envBrowserFileGenerator.js.map +1 -1
- package/dist/src/generators/test/envFileGenerator.js +1 -1
- package/dist/src/generators/test/envFileGenerator.js.map +1 -1
- package/dist/src/generators/test/recordedClientFileGenerator.js +1 -1
- package/dist/src/generators/test/recordedClientFileGenerator.js.map +1 -1
- package/dist/src/generators/test/rlcRecordedClient.ts.hbs +15 -24
- package/dist/src/generators/test/rlcSampleTest.spec.ts.hbs +4 -3
- package/dist/src/generators/test/sampleTest.ts.hbs +18 -18
- package/dist/src/generators/test/sampleTestGenerator.js +1 -1
- package/dist/src/generators/test/sampleTestGenerator.js.map +1 -1
- package/dist/src/generators/tracingFileGenerator.d.ts.map +1 -1
- package/dist/src/generators/tracingFileGenerator.js +7 -21
- package/dist/src/generators/tracingFileGenerator.js.map +1 -1
- package/dist/src/generators/utils/docsUtils.js +2 -2
- package/dist/src/generators/utils/docsUtils.js.map +1 -1
- package/dist/src/generators/utils/operationsUtils.js +1 -1
- package/dist/src/generators/utils/operationsUtils.js.map +1 -1
- package/dist/src/generators/utils/pagingOperations.js +13 -13
- package/dist/src/generators/utils/pagingOperations.js.map +1 -1
- package/dist/src/generators/utils/parameterUtils.js +9 -9
- package/dist/src/generators/utils/parameterUtils.js.map +1 -1
- package/dist/src/generators/utils/responseTypeUtils.js +2 -2
- package/dist/src/generators/utils/responseTypeUtils.js.map +1 -1
- package/dist/src/generators/utils/tracingUtils.d.ts.map +1 -1
- package/dist/src/generators/utils/tracingUtils.js +2 -6
- package/dist/src/generators/utils/tracingUtils.js.map +1 -1
- package/dist/src/main.js +5 -5
- package/dist/src/main.js.map +1 -1
- package/dist/src/models/clientDetails.d.ts +1 -1
- package/dist/src/models/clientDetails.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateClient.js +14 -14
- package/dist/src/restLevelClient/generateClient.js.map +1 -1
- package/dist/src/restLevelClient/generateClientDefinition.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateClientDefinition.js +23 -25
- package/dist/src/restLevelClient/generateClientDefinition.js.map +1 -1
- package/dist/src/restLevelClient/generateMethodShortcuts.js +5 -5
- package/dist/src/restLevelClient/generateMethodShortcuts.js.map +1 -1
- package/dist/src/restLevelClient/generateObjectTypes.js +10 -10
- package/dist/src/restLevelClient/generateObjectTypes.js.map +1 -1
- package/dist/src/restLevelClient/generatePagingHelper.js +4 -4
- package/dist/src/restLevelClient/generatePagingHelper.js.map +1 -1
- package/dist/src/restLevelClient/generateParameterTypes.js +11 -11
- package/dist/src/restLevelClient/generateParameterTypes.js.map +1 -1
- package/dist/src/restLevelClient/generatePollingHelper.js +2 -2
- package/dist/src/restLevelClient/generatePollingHelper.js.map +1 -1
- package/dist/src/restLevelClient/generateResponseTypes.js +12 -12
- package/dist/src/restLevelClient/generateResponseTypes.js.map +1 -1
- package/dist/src/restLevelClient/generateRestLevel.d.ts.map +1 -1
- package/dist/src/restLevelClient/generateRestLevel.js +32 -28
- package/dist/src/restLevelClient/generateRestLevel.js.map +1 -1
- package/dist/src/restLevelClient/generateSchemaTypes.js +5 -5
- package/dist/src/restLevelClient/generateSchemaTypes.js.map +1 -1
- package/dist/src/restLevelClient/generateTopLevelIndexFile.js +3 -3
- package/dist/src/restLevelClient/generateTopLevelIndexFile.js.map +1 -1
- package/dist/src/restLevelClient/getPropertySignature.js +4 -4
- package/dist/src/restLevelClient/getPropertySignature.js.map +1 -1
- package/dist/src/restLevelClient/helpers/operationHelpers.js +1 -1
- package/dist/src/restLevelClient/helpers/operationHelpers.js.map +1 -1
- package/dist/src/restLevelClient/mutateCodeModel.js +2 -2
- package/dist/src/restLevelClient/mutateCodeModel.js.map +1 -1
- package/dist/src/restLevelClient/operationHelpers.js +2 -2
- package/dist/src/restLevelClient/operationHelpers.js.map +1 -1
- package/dist/src/restLevelClient/schemaHelpers.js +4 -4
- package/dist/src/restLevelClient/schemaHelpers.js.map +1 -1
- package/dist/src/transforms/extensions.js +10 -10
- package/dist/src/transforms/extensions.js.map +1 -1
- package/dist/src/transforms/groupTransforms.js +2 -2
- package/dist/src/transforms/groupTransforms.js.map +1 -1
- package/dist/src/transforms/mapperTransforms.js +25 -25
- package/dist/src/transforms/mapperTransforms.js.map +1 -1
- package/dist/src/transforms/objectTransforms.js +22 -22
- package/dist/src/transforms/objectTransforms.js.map +1 -1
- package/dist/src/transforms/operationTransforms.js +25 -25
- package/dist/src/transforms/operationTransforms.js.map +1 -1
- package/dist/src/transforms/optionsTransforms.js +1 -1
- package/dist/src/transforms/optionsTransforms.js.map +1 -1
- package/dist/src/transforms/parameterTransforms.js +23 -23
- package/dist/src/transforms/parameterTransforms.js.map +1 -1
- package/dist/src/transforms/samplesTransforms.d.ts +1 -1
- package/dist/src/transforms/samplesTransforms.d.ts.map +1 -1
- package/dist/src/transforms/samplesTransforms.js +30 -20
- package/dist/src/transforms/samplesTransforms.js.map +1 -1
- package/dist/src/transforms/transforms.d.ts.map +1 -1
- package/dist/src/transforms/transforms.js +21 -21
- package/dist/src/transforms/transforms.js.map +1 -1
- package/dist/src/transforms/urlTransforms.js +3 -3
- package/dist/src/transforms/urlTransforms.js.map +1 -1
- package/dist/src/typescriptGenerator.d.ts.map +1 -1
- package/dist/src/typescriptGenerator.js +25 -23
- package/dist/src/typescriptGenerator.js.map +1 -1
- package/dist/src/utils/autorestOptions.d.ts.map +1 -1
- package/dist/src/utils/autorestOptions.js +19 -13
- package/dist/src/utils/autorestOptions.js.map +1 -1
- package/dist/src/utils/cloneOperation.js +2 -2
- package/dist/src/utils/cloneOperation.js.map +1 -1
- package/dist/src/utils/extractHeaders.js +4 -4
- package/dist/src/utils/extractHeaders.js.map +1 -1
- package/dist/src/utils/extractPaginationDetails.js +9 -9
- package/dist/src/utils/extractPaginationDetails.js.map +1 -1
- package/dist/src/utils/headersToSchema.js +1 -1
- package/dist/src/utils/headersToSchema.js.map +1 -1
- package/dist/src/utils/logger.js +1 -1
- package/dist/src/utils/logger.js.map +1 -1
- package/dist/src/utils/nameUtils.js +2 -2
- package/dist/src/utils/nameUtils.js.map +1 -1
- package/dist/src/utils/schemaHelpers.js +3 -3
- package/dist/src/utils/schemaHelpers.js.map +1 -1
- package/dist/src/utils/sortObjectSchemasHierarchically.js +1 -1
- package/dist/src/utils/sortObjectSchemasHierarchically.js.map +1 -1
- package/dist/src/utils/valueHelpers.js +1 -1
- package/dist/src/utils/valueHelpers.js.map +1 -1
- package/package.json +29 -30
- package/src/generators/clientFileGenerator.ts +74 -5
- package/src/generators/modelsGenerator.ts +2 -2
- package/src/generators/operationGenerator.ts +39 -85
- package/src/generators/parametersGenerator.ts +2 -3
- package/src/generators/static/karma.conf.js.hbs +4 -19
- package/src/generators/static/packageFileGenerator.ts +39 -33
- package/src/generators/test/rlcRecordedClient.ts.hbs +15 -24
- package/src/generators/test/rlcSampleTest.spec.ts.hbs +4 -3
- package/src/generators/test/sampleTest.ts.hbs +18 -18
- package/src/generators/tracingFileGenerator.ts +6 -24
- package/src/generators/utils/tracingUtils.ts +1 -5
- package/src/models/clientDetails.ts +1 -1
- package/src/restLevelClient/generateClientDefinition.ts +10 -8
- package/src/restLevelClient/generateRestLevel.ts +5 -2
- package/src/transforms/samplesTransforms.ts +325 -276
- package/src/transforms/transforms.ts +2 -3
- package/src/typescriptGenerator.ts +7 -3
- package/src/utils/autorestOptions.ts +16 -10
- package/CHANGELOG.md +0 -106
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientDetails.d.ts","sourceRoot":"","sources":["../../../src/models/clientDetails.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"clientDetails.d.ts","sourceRoot":"","sources":["../../../src/models/clientDetails.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,IAAI,CAAC;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,eAAe,EAAE,qBAAqB,EAAE,CAAC;IACzC,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB"}
|
|
@@ -12,15 +12,15 @@ const languageHelpers_1 = require("../utils/languageHelpers");
|
|
|
12
12
|
const generateMethodShortcuts_1 = require("./generateMethodShortcuts");
|
|
13
13
|
const generateClientDefinition_1 = require("./generateClientDefinition");
|
|
14
14
|
function generateClient(model, project) {
|
|
15
|
-
const name = nameUtils_1.normalizeName(languageHelpers_1.getLanguageMetadata(model.language).name, nameUtils_1.NameType.File);
|
|
16
|
-
const { srcPath } = autorestSession_1.getAutorestOptions();
|
|
15
|
+
const name = (0, nameUtils_1.normalizeName)((0, languageHelpers_1.getLanguageMetadata)(model.language).name, nameUtils_1.NameType.File);
|
|
16
|
+
const { srcPath } = (0, autorestSession_1.getAutorestOptions)();
|
|
17
17
|
const clientFile = project.createSourceFile(path.join(srcPath, `${name}.ts`), undefined, {
|
|
18
18
|
overwrite: true
|
|
19
19
|
});
|
|
20
20
|
// Get all paths
|
|
21
|
-
const clientName = languageHelpers_1.getLanguageMetadata(model.language).name;
|
|
21
|
+
const clientName = (0, languageHelpers_1.getLanguageMetadata)(model.language).name;
|
|
22
22
|
const uriParameter = getClientUriParameter();
|
|
23
|
-
const { addCredentials, credentialKeyHeaderName, multiClient, batch, credentialScopes } = autorestSession_1.getAutorestOptions();
|
|
23
|
+
const { addCredentials, credentialKeyHeaderName, multiClient, batch, credentialScopes } = (0, autorestSession_1.getAutorestOptions)();
|
|
24
24
|
const credentialTypes = addCredentials ? ["TokenCredential"] : [];
|
|
25
25
|
if (credentialKeyHeaderName) {
|
|
26
26
|
credentialTypes.push("KeyCredential");
|
|
@@ -70,11 +70,11 @@ function generateClient(model, project) {
|
|
|
70
70
|
}
|
|
71
71
|
exports.generateClient = generateClient;
|
|
72
72
|
function getClientFactoryBody(clientTypeName, paths) {
|
|
73
|
-
const { rlcShortcut, packageDetails } = autorestSession_1.getAutorestOptions();
|
|
73
|
+
const { rlcShortcut, packageDetails } = (0, autorestSession_1.getAutorestOptions)();
|
|
74
74
|
let clientPackageName = packageDetails.nameWithoutScope;
|
|
75
75
|
const packageVersion = packageDetails.version;
|
|
76
|
-
const { model } = autorestSession_1.getSession();
|
|
77
|
-
const { endpoint, parameterName } = urlTransforms_1.transformBaseUrl(model);
|
|
76
|
+
const { model } = (0, autorestSession_1.getSession)();
|
|
77
|
+
const { endpoint, parameterName } = (0, urlTransforms_1.transformBaseUrl)(model);
|
|
78
78
|
let baseUrl;
|
|
79
79
|
if (parameterName) {
|
|
80
80
|
const parsedEndpoint = endpoint === null || endpoint === void 0 ? void 0 : endpoint.replace(`{${parameterName}}`, `\${${parameterName}}`);
|
|
@@ -113,7 +113,7 @@ function getClientFactoryBody(clientTypeName, paths) {
|
|
|
113
113
|
declarationKind: ts_morph_1.VariableDeclarationKind.Const,
|
|
114
114
|
declarations: [{ name: "baseUrl", initializer: baseUrl }]
|
|
115
115
|
};
|
|
116
|
-
const { credentialScopes, credentialKeyHeaderName } = autorestSession_1.getAutorestOptions();
|
|
116
|
+
const { credentialScopes, credentialKeyHeaderName } = (0, autorestSession_1.getAutorestOptions)();
|
|
117
117
|
const scopesString = credentialScopes && credentialScopes.length
|
|
118
118
|
? credentialScopes.map(cs => `"${cs}"`).join(", ")
|
|
119
119
|
: "";
|
|
@@ -136,7 +136,7 @@ function getClientFactoryBody(clientTypeName, paths) {
|
|
|
136
136
|
`;
|
|
137
137
|
let returnStatement = `return client;`;
|
|
138
138
|
if (rlcShortcut) {
|
|
139
|
-
const shortcutImplementations = generateMethodShortcuts_1.generateMethodShortcutImplementation(model, paths);
|
|
139
|
+
const shortcutImplementations = (0, generateMethodShortcuts_1.generateMethodShortcutImplementation)(model, paths);
|
|
140
140
|
const shortcutBody = Object.keys(shortcutImplementations).map(key => {
|
|
141
141
|
// If the operation group has an empty name, it means its operations are client
|
|
142
142
|
// level operations so we need to spread the definitions. Otherwise they are
|
|
@@ -157,7 +157,7 @@ function getClientFactoryBody(clientTypeName, paths) {
|
|
|
157
157
|
];
|
|
158
158
|
}
|
|
159
159
|
function getApiVersion() {
|
|
160
|
-
const { model } = autorestSession_1.getSession();
|
|
160
|
+
const { model } = (0, autorestSession_1.getSession)();
|
|
161
161
|
if (!model.globalParameters || !model.globalParameters.length) {
|
|
162
162
|
return undefined;
|
|
163
163
|
}
|
|
@@ -167,15 +167,15 @@ function getApiVersion() {
|
|
|
167
167
|
return gp.implementation === codemodel_1.ImplementationLocation.Client &&
|
|
168
168
|
((_a = gp.protocol.http) === null || _a === void 0 ? void 0 : _a.in) === codemodel_1.ParameterLocation.Query;
|
|
169
169
|
})
|
|
170
|
-
.find(param => languageHelpers_1.getLanguageMetadata(param.language).serializedName === "api-version");
|
|
171
|
-
if (apiVersionParam && schemaHelpers_1.isConstantSchema(apiVersionParam.schema)) {
|
|
170
|
+
.find(param => (0, languageHelpers_1.getLanguageMetadata)(param.language).serializedName === "api-version");
|
|
171
|
+
if (apiVersionParam && (0, schemaHelpers_1.isConstantSchema)(apiVersionParam.schema)) {
|
|
172
172
|
return apiVersionParam.schema.value.value.toString();
|
|
173
173
|
}
|
|
174
174
|
return undefined;
|
|
175
175
|
}
|
|
176
176
|
function getClientUriParameter() {
|
|
177
|
-
const { model } = autorestSession_1.getSession();
|
|
178
|
-
const { parameterName } = urlTransforms_1.transformBaseUrl(model);
|
|
177
|
+
const { model } = (0, autorestSession_1.getSession)();
|
|
178
|
+
const { parameterName } = (0, urlTransforms_1.transformBaseUrl)(model);
|
|
179
179
|
return parameterName;
|
|
180
180
|
}
|
|
181
181
|
//# sourceMappingURL=generateClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateClient.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateClient.ts"],"names":[],"mappings":";;;AAAA,mDAK6B;AAE7B,uCAOkB;AAClB,6BAA6B;AAE7B,wDAAoE;AACpE,+DAA+D;AAC/D,kDAA6D;AAC7D,mDAAmD;AACnD,8DAA+D;AAC/D,uEAAiF;AAEjF,yEAA4D;AAE5D,SAAgB,cAAc,CAAC,KAAgB,EAAE,OAAgB;IAC/D,MAAM,IAAI,GAAG,yBAAa,
|
|
1
|
+
{"version":3,"file":"generateClient.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateClientDefinition.d.ts","sourceRoot":"","sources":["../../../src/restLevelClient/generateClientDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIV,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"generateClientDefinition.d.ts","sourceRoot":"","sources":["../../../src/restLevelClient/generateClientDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIV,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAEL,OAAO,EAIR,MAAM,UAAU,CAAC;AAgBlB,OAAO,EAA0B,KAAK,EAAE,MAAM,cAAc,CAAC;AAC7D,eAAO,IAAI,cAAc,EAAE,KAAU,CAAC;AAEtC,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,QAoKzE"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generatePathFirstClient = exports.pathDictionary = void 0;
|
|
4
4
|
const codemodel_1 = require("@autorest/codemodel");
|
|
5
|
+
const lodash_1 = require("lodash");
|
|
5
6
|
const operationHelpers_1 = require("./operationHelpers");
|
|
6
7
|
const ts_morph_1 = require("ts-morph");
|
|
7
8
|
const path = require("path");
|
|
8
9
|
const autorestSession_1 = require("../autorestSession");
|
|
9
|
-
const urlTransforms_1 = require("../transforms/urlTransforms");
|
|
10
10
|
const nameUtils_1 = require("../utils/nameUtils");
|
|
11
11
|
const languageHelpers_1 = require("../utils/languageHelpers");
|
|
12
12
|
const operationHelpers_2 = require("./helpers/operationHelpers");
|
|
@@ -14,8 +14,8 @@ const generateMethodShortcuts_1 = require("./generateMethodShortcuts");
|
|
|
14
14
|
exports.pathDictionary = {};
|
|
15
15
|
function generatePathFirstClient(model, project) {
|
|
16
16
|
var _a, _b, _c, _d, _e;
|
|
17
|
-
const name = nameUtils_1.normalizeName(languageHelpers_1.getLanguageMetadata(model.language).name, nameUtils_1.NameType.File);
|
|
18
|
-
const { srcPath } = autorestSession_1.getAutorestOptions();
|
|
17
|
+
const name = (0, nameUtils_1.normalizeName)((0, languageHelpers_1.getLanguageMetadata)(model.language).name, nameUtils_1.NameType.File);
|
|
18
|
+
const { srcPath } = (0, autorestSession_1.getAutorestOptions)();
|
|
19
19
|
const clientFile = project.createSourceFile(path.join(srcPath, `clientDefinitions.ts`), undefined, {
|
|
20
20
|
overwrite: true
|
|
21
21
|
});
|
|
@@ -26,11 +26,11 @@ function generatePathFirstClient(model, project) {
|
|
|
26
26
|
exports.pathDictionary = {};
|
|
27
27
|
for (const operationGroup of model.operationGroups) {
|
|
28
28
|
for (const operation of operationGroup.operations) {
|
|
29
|
-
const operationName = languageHelpers_1.getLanguageMetadata(operation.language).name;
|
|
30
|
-
const operationDescription = languageHelpers_1.getLanguageMetadata(operation.language)
|
|
29
|
+
const operationName = (0, languageHelpers_1.getLanguageMetadata)(operation.language).name;
|
|
30
|
+
const operationDescription = (0, languageHelpers_1.getLanguageMetadata)(operation.language)
|
|
31
31
|
.description;
|
|
32
32
|
const pathParameters = ((_a = operation.parameters) === null || _a === void 0 ? void 0 : _a.filter(p => { var _a; return ((_a = p.protocol.http) === null || _a === void 0 ? void 0 : _a.in) === codemodel_1.ParameterLocation.Path; }).map(p => {
|
|
33
|
-
const languageMetadata = languageHelpers_1.getLanguageMetadata(p.language);
|
|
33
|
+
const languageMetadata = (0, languageHelpers_1.getLanguageMetadata)(p.language);
|
|
34
34
|
return {
|
|
35
35
|
name: languageMetadata.serializedName || languageMetadata.name,
|
|
36
36
|
schema: p.schema,
|
|
@@ -59,7 +59,8 @@ function generatePathFirstClient(model, project) {
|
|
|
59
59
|
hasOptionalOptions,
|
|
60
60
|
returnType: `Promise<${getOperationReturnType(operation, importedResponses, clientImports)}>`
|
|
61
61
|
};
|
|
62
|
-
if (exports.pathDictionary[path].methods[`${method}`]
|
|
62
|
+
if (exports.pathDictionary[path].methods[`${method}`] &&
|
|
63
|
+
!exports.pathDictionary[path].methods[`${method}`].some(m => (0, lodash_1.isEqual)(m, newMethod))) {
|
|
63
64
|
exports.pathDictionary[path].methods[`${method}`].push(newMethod);
|
|
64
65
|
}
|
|
65
66
|
else {
|
|
@@ -75,15 +76,17 @@ function generatePathFirstClient(model, project) {
|
|
|
75
76
|
isExported: true,
|
|
76
77
|
callSignatures: getPathFirstRoutesInterfaceDefinition(exports.pathDictionary, clientFile)
|
|
77
78
|
});
|
|
78
|
-
const clientName = languageHelpers_1.getLanguageMetadata(model.language).name;
|
|
79
|
-
const clientInterfaceName = clientName.endsWith("Client")
|
|
80
|
-
|
|
79
|
+
const clientName = (0, languageHelpers_1.getLanguageMetadata)(model.language).name;
|
|
80
|
+
const clientInterfaceName = clientName.endsWith("Client")
|
|
81
|
+
? `${clientName}`
|
|
82
|
+
: `${clientName}Client`;
|
|
83
|
+
const { rlcShortcut } = (0, autorestSession_1.getAutorestOptions)();
|
|
81
84
|
let shortcutElements = !rlcShortcut
|
|
82
85
|
? []
|
|
83
86
|
: model.operationGroups.map(og => {
|
|
84
87
|
const groupName = og.language.default.name;
|
|
85
|
-
const name = nameUtils_1.normalizeName(groupName, nameUtils_1.NameType.OperationGroup, true, generateMethodShortcuts_1.REST_CLIENT_RESERVED, nameUtils_1.CasingConvention.Camel);
|
|
86
|
-
const interfaceName = nameUtils_1.normalizeName(`${name}Operations`, nameUtils_1.NameType.Interface, true, generateMethodShortcuts_1.REST_CLIENT_RESERVED);
|
|
88
|
+
const name = (0, nameUtils_1.normalizeName)(groupName, nameUtils_1.NameType.OperationGroup, true, generateMethodShortcuts_1.REST_CLIENT_RESERVED, nameUtils_1.CasingConvention.Camel);
|
|
89
|
+
const interfaceName = (0, nameUtils_1.normalizeName)(`${name}Operations`, nameUtils_1.NameType.Interface, true, generateMethodShortcuts_1.REST_CLIENT_RESERVED);
|
|
87
90
|
return { name, type: interfaceName };
|
|
88
91
|
});
|
|
89
92
|
// There may be operations without an operation group, those shortcut
|
|
@@ -128,7 +131,7 @@ function generatePathFirstClient(model, project) {
|
|
|
128
131
|
}
|
|
129
132
|
exports.generatePathFirstClient = generatePathFirstClient;
|
|
130
133
|
function writeShortcutInterface(model, pathDictionary, clientFile) {
|
|
131
|
-
const { rlcShortcut } = autorestSession_1.getAutorestOptions();
|
|
134
|
+
const { rlcShortcut } = (0, autorestSession_1.getAutorestOptions)();
|
|
132
135
|
if (!rlcShortcut) {
|
|
133
136
|
return;
|
|
134
137
|
}
|
|
@@ -138,9 +141,9 @@ function writeShortcutInterface(model, pathDictionary, clientFile) {
|
|
|
138
141
|
map.set(name, description);
|
|
139
142
|
return map;
|
|
140
143
|
}, new Map());
|
|
141
|
-
const shortcuts = generateMethodShortcuts_1.generateMethodShortcuts(model, pathDictionary);
|
|
144
|
+
const shortcuts = (0, generateMethodShortcuts_1.generateMethodShortcuts)(model, pathDictionary);
|
|
142
145
|
for (const group of Object.keys(shortcuts)) {
|
|
143
|
-
const groupName = nameUtils_1.normalizeName(group, nameUtils_1.NameType.Interface, true, generateMethodShortcuts_1.REST_CLIENT_RESERVED) ||
|
|
146
|
+
const groupName = (0, nameUtils_1.normalizeName)(group, nameUtils_1.NameType.Interface, true, generateMethodShortcuts_1.REST_CLIENT_RESERVED) ||
|
|
144
147
|
"Client";
|
|
145
148
|
const groupOperations = shortcuts[group];
|
|
146
149
|
clientFile.addInterface({
|
|
@@ -155,13 +158,13 @@ function writeShortcutInterface(model, pathDictionary, clientFile) {
|
|
|
155
158
|
}
|
|
156
159
|
}
|
|
157
160
|
function hasRequiredOptions(operation) {
|
|
158
|
-
return operationHelpers_2.getOperationParameters(operation)
|
|
161
|
+
return (0, operationHelpers_2.getOperationParameters)(operation)
|
|
159
162
|
.filter(p => p.implementation === codemodel_1.ImplementationLocation.Method)
|
|
160
163
|
.filter(p => { var _a; return ["query", "body", "headers"].includes((_a = p.protocol.http) === null || _a === void 0 ? void 0 : _a.in); })
|
|
161
164
|
.some(p => p.required);
|
|
162
165
|
}
|
|
163
166
|
function getOperationOptionsType(operation, importedParameters = new Set()) {
|
|
164
|
-
const paramsName = `${languageHelpers_1.getLanguageMetadata(operation.language).name}Parameters`;
|
|
167
|
+
const paramsName = `${(0, languageHelpers_1.getLanguageMetadata)(operation.language).name}Parameters`;
|
|
165
168
|
importedParameters.add(paramsName);
|
|
166
169
|
return paramsName;
|
|
167
170
|
}
|
|
@@ -177,7 +180,7 @@ function getOperationReturnType(operation, importedResponses = new Set(), coreCl
|
|
|
177
180
|
const responseTypes = responses
|
|
178
181
|
.filter(r => { var _a, _b; return ((_a = r.protocol.http) === null || _a === void 0 ? void 0 : _a.statusCodes) && ((_b = r.protocol.http) === null || _b === void 0 ? void 0 : _b.statusCodes.length); })
|
|
179
182
|
.map(r => {
|
|
180
|
-
const responseName = operationHelpers_1.getResponseTypeName(operation, r);
|
|
183
|
+
const responseName = (0, operationHelpers_1.getResponseTypeName)(operation, r);
|
|
181
184
|
importedResponses.add(responseName);
|
|
182
185
|
return responseName;
|
|
183
186
|
});
|
|
@@ -207,7 +210,7 @@ function getPathFirstRoutesInterfaceDefinition(paths, sourcefile) {
|
|
|
207
210
|
],
|
|
208
211
|
parameters: [
|
|
209
212
|
{ name: "path", type: `"${key}"` },
|
|
210
|
-
...operationHelpers_2.getPathParamDefinitions(pathParams)
|
|
213
|
+
...(0, operationHelpers_2.getPathParamDefinitions)(pathParams)
|
|
211
214
|
],
|
|
212
215
|
returnType: paths[key].name,
|
|
213
216
|
kind: ts_morph_1.StructureKind.CallSignature
|
|
@@ -215,13 +218,8 @@ function getPathFirstRoutesInterfaceDefinition(paths, sourcefile) {
|
|
|
215
218
|
}
|
|
216
219
|
return signatures;
|
|
217
220
|
}
|
|
218
|
-
function getClientUriParameter() {
|
|
219
|
-
const { model } = autorestSession_1.getSession();
|
|
220
|
-
const { parameterName } = urlTransforms_1.transformBaseUrl(model);
|
|
221
|
-
return parameterName;
|
|
222
|
-
}
|
|
223
221
|
function generatePathFirstRouteMethodsDefinition(operationName, methods, file) {
|
|
224
|
-
const methodDefinitions = operationHelpers_2.buildMethodDefinitions(methods);
|
|
222
|
+
const methodDefinitions = (0, operationHelpers_2.buildMethodDefinitions)(methods);
|
|
225
223
|
file.addInterface({
|
|
226
224
|
methods: methodDefinitions,
|
|
227
225
|
name: operationName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateClientDefinition.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateClientDefinition.ts"],"names":[],"mappings":";;;AAAA,mDAK6B;
|
|
1
|
+
{"version":3,"file":"generateClientDefinition.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateClientDefinition.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ function generateMethodShortcuts(model, paths) {
|
|
|
18
18
|
const operationGroups = model.operationGroups;
|
|
19
19
|
let keys = {};
|
|
20
20
|
for (const group of operationGroups) {
|
|
21
|
-
const groupName = nameUtils_1.normalizeName(group.language.default.name, nameUtils_1.NameType.OperationGroup, true, exports.REST_CLIENT_RESERVED, nameUtils_1.CasingConvention.Camel);
|
|
21
|
+
const groupName = (0, nameUtils_1.normalizeName)(group.language.default.name, nameUtils_1.NameType.OperationGroup, true, exports.REST_CLIENT_RESERVED, nameUtils_1.CasingConvention.Camel);
|
|
22
22
|
keys[groupName] = buildOperationDefinitions(group.operations, paths);
|
|
23
23
|
}
|
|
24
24
|
return keys;
|
|
@@ -28,7 +28,7 @@ function generateMethodShortcutImplementation(model, paths) {
|
|
|
28
28
|
const operationGroups = model.operationGroups;
|
|
29
29
|
let keys = {};
|
|
30
30
|
for (const group of operationGroups) {
|
|
31
|
-
const groupName = nameUtils_1.normalizeName(group.language.default.name, nameUtils_1.NameType.OperationGroup, true, exports.REST_CLIENT_RESERVED, nameUtils_1.CasingConvention.Camel);
|
|
31
|
+
const groupName = (0, nameUtils_1.normalizeName)(group.language.default.name, nameUtils_1.NameType.OperationGroup, true, exports.REST_CLIENT_RESERVED, nameUtils_1.CasingConvention.Camel);
|
|
32
32
|
keys[groupName] = buildOperationDeclarations(group.operations, paths);
|
|
33
33
|
}
|
|
34
34
|
return keys;
|
|
@@ -38,7 +38,7 @@ function buildOperationDeclarations(operations, paths) {
|
|
|
38
38
|
var _a, _b, _c;
|
|
39
39
|
let ops = [];
|
|
40
40
|
for (const operation of operations) {
|
|
41
|
-
const name = nameUtils_1.normalizeName(operation.language.default.name, nameUtils_1.NameType.Property, true);
|
|
41
|
+
const name = (0, nameUtils_1.normalizeName)(operation.language.default.name, nameUtils_1.NameType.Property, true);
|
|
42
42
|
const path = (_a = operation.requests[0].protocol.http) === null || _a === void 0 ? void 0 : _a.path;
|
|
43
43
|
const method = (_b = operation.requests[0].protocol.http) === null || _b === void 0 ? void 0 : _b.method;
|
|
44
44
|
const pathParams = (_c = paths[path]) === null || _c === void 0 ? void 0 : _c.pathParameters;
|
|
@@ -57,12 +57,12 @@ function buildOperationDefinitions(operations, paths) {
|
|
|
57
57
|
var _a, _b, _c, _d;
|
|
58
58
|
let ops = [];
|
|
59
59
|
for (const operation of operations) {
|
|
60
|
-
const name = nameUtils_1.normalizeName(operation.language.default.name, nameUtils_1.NameType.Property, true);
|
|
60
|
+
const name = (0, nameUtils_1.normalizeName)(operation.language.default.name, nameUtils_1.NameType.Property, true);
|
|
61
61
|
const path = (_a = operation.requests[0].protocol.http) === null || _a === void 0 ? void 0 : _a.path;
|
|
62
62
|
const method = (_b = operation.requests[0].protocol.http) === null || _b === void 0 ? void 0 : _b.method;
|
|
63
63
|
const methods = (_c = paths[path]) === null || _c === void 0 ? void 0 : _c.methods[method];
|
|
64
64
|
const pathParams = (_d = paths[path]) === null || _d === void 0 ? void 0 : _d.pathParameters;
|
|
65
|
-
const methodDefinitions = operationHelpers_1.buildMethodDefinitions({ [name]: methods }, pathParams);
|
|
65
|
+
const methodDefinitions = (0, operationHelpers_1.buildMethodDefinitions)({ [name]: methods }, pathParams);
|
|
66
66
|
ops = [...ops, ...methodDefinitions];
|
|
67
67
|
}
|
|
68
68
|
return ops;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateMethodShortcuts.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateMethodShortcuts.ts"],"names":[],"mappings":";;;AAEA,kDAK4B;AAC5B,iEAAoE;AAGvD,QAAA,oBAAoB,GAAmB;IAClD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,oBAAQ,CAAC,QAAQ,EAAE,oBAAQ,CAAC,cAAc,CAAC,EAAE;IAC3E;QACE,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,CAAC,oBAAQ,CAAC,QAAQ,EAAE,oBAAQ,CAAC,cAAc,CAAC;KAC1D;IACD;QACE,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,CAAC,oBAAQ,CAAC,QAAQ,EAAE,oBAAQ,CAAC,cAAc,CAAC;KAC1D;CACF,CAAC;AACF,SAAgB,uBAAuB,CAAC,KAAgB,EAAE,KAAY;IACpE,MAAM,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;IAC9C,IAAI,IAAI,GAA6D,EAAE,CAAC;IACxE,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE;QACnC,MAAM,SAAS,GAAG,yBAAa,
|
|
1
|
+
{"version":3,"file":"generateMethodShortcuts.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateMethodShortcuts.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ exports.buildPolymorphicAliases = buildPolymorphicAliases;
|
|
|
44
44
|
*/
|
|
45
45
|
function getObjectBaseName(objectSchema, schemaUsage) {
|
|
46
46
|
const nameSuffix = schemaUsage.includes(codemodel_1.SchemaContext.Output) ? "Output" : "";
|
|
47
|
-
const name = nameUtils_1.normalizeName(languageHelpers_1.getLanguageMetadata(objectSchema.language).name, nameUtils_1.NameType.Interface, true /** guard name */);
|
|
47
|
+
const name = (0, nameUtils_1.normalizeName)((0, languageHelpers_1.getLanguageMetadata)(objectSchema.language).name, nameUtils_1.NameType.Interface, true /** guard name */);
|
|
48
48
|
return `${name}${nameSuffix}`;
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
@@ -65,7 +65,7 @@ function getPolymorphicTypeAlias(baseName, objectSchema, schemaUsage) {
|
|
|
65
65
|
const nameSuffix = schemaUsage.includes(codemodel_1.SchemaContext.Output)
|
|
66
66
|
? "Output"
|
|
67
67
|
: "";
|
|
68
|
-
const name = nameUtils_1.normalizeName(languageHelpers_1.getLanguageMetadata(child.language).name, nameUtils_1.NameType.Interface, true /** shouldGuard */);
|
|
68
|
+
const name = (0, nameUtils_1.normalizeName)((0, languageHelpers_1.getLanguageMetadata)(child.language).name, nameUtils_1.NameType.Interface, true /** shouldGuard */);
|
|
69
69
|
unionTypes.push(`${name}${nameSuffix}`);
|
|
70
70
|
}
|
|
71
71
|
return {
|
|
@@ -112,7 +112,7 @@ function addDiscriminatorProperty(objectSchema, properties) {
|
|
|
112
112
|
* Finds the name of the property used as discriminator and the discriminator value.
|
|
113
113
|
*/
|
|
114
114
|
function getDiscriminatorProperty(objectSchema) {
|
|
115
|
-
const { message } = autorestSession_1.getSession();
|
|
115
|
+
const { message } = (0, autorestSession_1.getSession)();
|
|
116
116
|
const discriminatorValue = objectSchema.discriminatorValue;
|
|
117
117
|
if (!discriminatorValue && !objectSchema.discriminator) {
|
|
118
118
|
return undefined;
|
|
@@ -122,7 +122,7 @@ function getDiscriminatorProperty(objectSchema) {
|
|
|
122
122
|
if (discriminators) {
|
|
123
123
|
if (discriminatorPropertyName === undefined) {
|
|
124
124
|
message({
|
|
125
|
-
Text: `getDiscriminatorProperty: Expected object ${languageHelpers_1.getLanguageMetadata(objectSchema.language).name} to have a discriminator in its hierarchy but found none`,
|
|
125
|
+
Text: `getDiscriminatorProperty: Expected object ${(0, languageHelpers_1.getLanguageMetadata)(objectSchema.language).name} to have a discriminator in its hierarchy but found none`,
|
|
126
126
|
Channel: extension_base_1.Channel.Warning
|
|
127
127
|
});
|
|
128
128
|
return;
|
|
@@ -145,7 +145,7 @@ function getDiscriminatorPropertyName(objectSchema) {
|
|
|
145
145
|
}
|
|
146
146
|
const allParents = (_b = (_a = objectSchema.parents) === null || _a === void 0 ? void 0 : _a.all) !== null && _b !== void 0 ? _b : [];
|
|
147
147
|
for (const parent of allParents) {
|
|
148
|
-
if (codemodel_1.isObjectSchema(parent) && parent.discriminator) {
|
|
148
|
+
if ((0, codemodel_1.isObjectSchema)(parent) && parent.discriminator) {
|
|
149
149
|
return parent.discriminator.property.serializedName;
|
|
150
150
|
}
|
|
151
151
|
}
|
|
@@ -187,7 +187,7 @@ function getDiscriminatorValue(objectSchema) {
|
|
|
187
187
|
function getChildDiscriminatorValues(children) {
|
|
188
188
|
const discriminatorValues = new Set();
|
|
189
189
|
for (const child of children) {
|
|
190
|
-
if (codemodel_1.isObjectSchema(child) && child.discriminatorValue) {
|
|
190
|
+
if ((0, codemodel_1.isObjectSchema)(child) && child.discriminatorValue) {
|
|
191
191
|
discriminatorValues.add(child.discriminatorValue);
|
|
192
192
|
}
|
|
193
193
|
}
|
|
@@ -209,19 +209,19 @@ function getImmediateParentsNames(objectSchema, shcemaUsage) {
|
|
|
209
209
|
}
|
|
210
210
|
// Get the rest of the parents excluding any DictionarySchemas
|
|
211
211
|
const parents = objectSchema.parents.immediate
|
|
212
|
-
.filter(p => !schemaHelpers_1.isDictionarySchema(p))
|
|
212
|
+
.filter(p => !(0, schemaHelpers_1.isDictionarySchema)(p))
|
|
213
213
|
.map(parent => {
|
|
214
214
|
const nameSuffix = shcemaUsage.includes(codemodel_1.SchemaContext.Output)
|
|
215
215
|
? "Output"
|
|
216
216
|
: "";
|
|
217
|
-
const name = `${nameUtils_1.normalizeName(languageHelpers_1.getLanguageMetadata(parent.language).name, nameUtils_1.NameType.Interface, true /** shouldGuard */)}${nameSuffix}`;
|
|
218
|
-
return codemodel_1.isObjectSchema(parent) && isPolymorphicParent(parent)
|
|
217
|
+
const name = `${(0, nameUtils_1.normalizeName)((0, languageHelpers_1.getLanguageMetadata)(parent.language).name, nameUtils_1.NameType.Interface, true /** shouldGuard */)}${nameSuffix}`;
|
|
218
|
+
return (0, codemodel_1.isObjectSchema)(parent) && isPolymorphicParent(parent)
|
|
219
219
|
? `${name}Base`
|
|
220
220
|
: name;
|
|
221
221
|
});
|
|
222
222
|
return [...parents, ...extendFrom];
|
|
223
223
|
}
|
|
224
224
|
function getPropertySignatures(properties, schemaUsage, importedModels) {
|
|
225
|
-
return properties.map(p => getPropertySignature_1.getPropertySignature(p, schemaUsage, importedModels));
|
|
225
|
+
return properties.map(p => (0, getPropertySignature_1.getPropertySignature)(p, schemaUsage, importedModels));
|
|
226
226
|
}
|
|
227
227
|
//# sourceMappingURL=generateObjectTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateObjectTypes.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateObjectTypes.ts"],"names":[],"mappings":";;;AAAA,mDAO6B;AAC7B,6DAAmD;AACnD,uCAKkB;AAClB,wDAAgD;AAChD,kDAA6D;AAC7D,mDAAqD;AACrD,iEAA8D;AAC9D,8DAA+D;AAE/D;;GAEG;AACH,SAAgB,qBAAqB,CACnC,KAAgB,EAChB,cAA2B,EAC3B,WAA4B;;IAE5B,MAAM,aAAa,GAAG,CAAC,MAAA,KAAK,CAAC,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,WAC7D,OAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA,EAAA,CAC5C,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;AAtBD,sDAsBC;AAED,SAAgB,uBAAuB,CACrC,KAAgB,EAChB,WAA4B;;IAE5B,4CAA4C;IAC5C,MAAM,aAAa,GAAoC,EAAE,CAAC;IAC1D,MAAM,aAAa,GAAG,CAAC,MAAA,KAAK,CAAC,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,WAC7D,OAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA,EAAA,CAC5C,CAAC;IACF,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,uBAAuB,CACvC,QAAQ,EACR,YAAY,EACZ,WAAW,CACZ,CAAC;QACF,IAAI,SAAS,EAAE;YACb,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC/B;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAtBD,0DAsBC;AAED;;GAEG;AACH,SAAS,iBAAiB,CACxB,YAA0B,EAC1B,WAA4B;IAE5B,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,yBAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,MAAM,IAAI,GAAG,yBAAa,
|
|
1
|
+
{"version":3,"file":"generateObjectTypes.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateObjectTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const hbs = require("handlebars");
|
|
|
9
9
|
function generatePagingHelper(project) {
|
|
10
10
|
const pagingInfo = getPagingInfo();
|
|
11
11
|
let file = "";
|
|
12
|
-
file = fs_1.readFileSync(path.join(__dirname, "paginateHelper.ts.hbs"), {
|
|
12
|
+
file = (0, fs_1.readFileSync)(path.join(__dirname, "paginateHelper.ts.hbs"), {
|
|
13
13
|
encoding: "utf-8"
|
|
14
14
|
});
|
|
15
15
|
hbs.registerHelper("quoteWrap", function (value) {
|
|
@@ -18,7 +18,7 @@ function generatePagingHelper(project) {
|
|
|
18
18
|
}
|
|
19
19
|
return `"${value}"`;
|
|
20
20
|
});
|
|
21
|
-
const { srcPath } = autorestSession_1.getAutorestOptions();
|
|
21
|
+
const { srcPath } = (0, autorestSession_1.getAutorestOptions)();
|
|
22
22
|
const readmeFileContents = hbs.compile(file, { noEscape: true });
|
|
23
23
|
project.createSourceFile(path.join(srcPath, "paginateHelper.ts"), readmeFileContents(pagingInfo), {
|
|
24
24
|
overwrite: true
|
|
@@ -26,7 +26,7 @@ function generatePagingHelper(project) {
|
|
|
26
26
|
}
|
|
27
27
|
exports.generatePagingHelper = generatePagingHelper;
|
|
28
28
|
function getPagingInfo() {
|
|
29
|
-
const { model } = autorestSession_1.getSession();
|
|
29
|
+
const { model } = (0, autorestSession_1.getSession)();
|
|
30
30
|
const nextLinks = new Set();
|
|
31
31
|
const itemNames = new Set();
|
|
32
32
|
// Add default values
|
|
@@ -34,7 +34,7 @@ function getPagingInfo() {
|
|
|
34
34
|
itemNames.add("value");
|
|
35
35
|
for (let operationGroup of model.operationGroups) {
|
|
36
36
|
for (let operation of operationGroup.operations) {
|
|
37
|
-
const paginationDetails = extractPaginationDetails_1.extractPaginationDetails(operation);
|
|
37
|
+
const paginationDetails = (0, extractPaginationDetails_1.extractPaginationDetails)(operation);
|
|
38
38
|
if (paginationDetails) {
|
|
39
39
|
const { nextLinkName, itemName } = paginationDetails;
|
|
40
40
|
nextLinkName && nextLinks.add(`${nextLinkName}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatePagingHelper.js","sourceRoot":"","sources":["../../../src/restLevelClient/generatePagingHelper.ts"],"names":[],"mappings":";;;AAAA,2BAAkC;AAClC,wDAAoE;AACpE,gFAA6E;AAC7E,6BAA6B;AAC7B,kCAAkC;AASlC,SAAgB,oBAAoB,CAAC,OAAgB;IACnD,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,IAAI,IAAI,GAAW,EAAE,CAAC;IAEtB,IAAI,GAAG,iBAAY,
|
|
1
|
+
{"version":3,"file":"generatePagingHelper.js","sourceRoot":"","sources":["../../../src/restLevelClient/generatePagingHelper.ts"],"names":[],"mappings":";;;AAAA,2BAAkC;AAClC,wDAAoE;AACpE,gFAA6E;AAC7E,6BAA6B;AAC7B,kCAAkC;AASlC,SAAgB,oBAAoB,CAAC,OAAgB;IACnD,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,IAAI,IAAI,GAAW,EAAE,CAAC;IAEtB,IAAI,GAAG,IAAA,iBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,EAAE;QACjE,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IAEH,GAAG,CAAC,cAAc,CAAC,WAAW,EAAE,UAC9B,KAA2C;QAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;SACpD;QAED,OAAO,IAAI,KAAK,GAAG,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IACzC,MAAM,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACjE,OAAO,CAAC,gBAAgB,CACtB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,EACvC,kBAAkB,CAAC,UAAU,CAAC,EAC9B;QACE,SAAS,EAAE,IAAI;KAChB,CACF,CAAC;AACJ,CAAC;AA3BD,oDA2BC;AAED,SAAS,aAAa;IACpB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4BAAU,GAAE,CAAC;IAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,qBAAqB;IACrB,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1B,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,KAAK,IAAI,cAAc,IAAI,KAAK,CAAC,eAAe,EAAE;QAChD,KAAK,IAAI,SAAS,IAAI,cAAc,CAAC,UAAU,EAAE;YAC/C,MAAM,iBAAiB,GAAG,IAAA,mDAAwB,EAAC,SAAS,CAAC,CAAC;YAC9D,IAAI,iBAAiB,EAAE;gBACrB,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC;gBACrD,YAAY,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,YAAY,EAAE,CAAC,CAAC;gBACjD,QAAQ,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,QAAQ,EAAE,CAAC,CAAC;aAC1C;SACF;KACF;IAED,uFAAuF;IACvF,kCAAkC;IAClC,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,GAAG,CAAC,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC;IACjE,OAAO;QACL,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;QACzB,aAAa,EAAE,CAAC,GAAG,SAAS,CAAC;QAC7B,eAAe;KAChB,CAAC;AACJ,CAAC"}
|