@autorest/typescript 6.0.17 → 6.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/autorestSession.d.ts +2 -1
- package/dist/src/autorestSession.d.ts.map +1 -1
- package/dist/src/autorestSession.js.map +1 -1
- package/dist/src/restLevelClient/transforms/transform.js +2 -2
- package/dist/src/restLevelClient/transforms/transform.js.map +1 -1
- package/dist/src/restLevelClient/transforms/transformOptions.js +2 -2
- package/dist/src/restLevelClient/transforms/transformOptions.js.map +1 -1
- package/dist/src/utils/autorestOptions.d.ts.map +1 -1
- package/dist/src/utils/autorestOptions.js +24 -5
- package/dist/src/utils/autorestOptions.js.map +1 -1
- package/package.json +2 -2
- package/src/autorestSession.ts +2 -1
- package/src/restLevelClient/transforms/transform.ts +2 -2
- package/src/restLevelClient/transforms/transformOptions.ts +2 -2
- package/src/utils/autorestOptions.ts +29 -4
|
@@ -2,6 +2,7 @@ import { AutorestExtensionHost, Session } from "@autorest/extension-base";
|
|
|
2
2
|
import { CodeModel } from "@autorest/codemodel";
|
|
3
3
|
import { PackageDetails } from "./models/packageDetails";
|
|
4
4
|
import { DependencyInfo, TracingInfo } from "./models/clientDetails";
|
|
5
|
+
import { PackageFlavor } from "@azure-tools/rlc-common";
|
|
5
6
|
export interface AutorestOptions {
|
|
6
7
|
restLevelClient?: boolean;
|
|
7
8
|
rlcShortcut?: boolean;
|
|
@@ -36,7 +37,7 @@ export interface AutorestOptions {
|
|
|
36
37
|
dependencyInfo?: DependencyInfo;
|
|
37
38
|
lenientModelDeduplication?: boolean;
|
|
38
39
|
useLegacyLro?: boolean;
|
|
39
|
-
|
|
40
|
+
flavor?: PackageFlavor;
|
|
40
41
|
}
|
|
41
42
|
export declare function initializeSession(autorestHost: AutorestExtensionHost): Promise<void>;
|
|
42
43
|
export declare function getSession(): Session<CodeModel>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autorestSession.d.ts","sourceRoot":"","sources":["../../src/autorestSession.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,OAAO,EAER,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAmB,MAAM,qBAAqB,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"autorestSession.d.ts","sourceRoot":"","sources":["../../src/autorestSession.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,OAAO,EAER,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAmB,MAAM,qBAAqB,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,MAAM,WAAW,eAAe;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAMD,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,qBAAqB,iBAI1E;AAED,wBAAgB,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,CAQ/C;AAED,wBAAgB,OAAO,IAAI,qBAAqB,CAQ/C;AAED,wBAAgB,kBAAkB,IAAI,eAAe,CAQpD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autorestSession.js","sourceRoot":"","sources":["../../src/autorestSession.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAIkC;AAClC,mDAAiE;AACjE,6DAAiE;
|
|
1
|
+
{"version":3,"file":"autorestSession.js","sourceRoot":"","sources":["../../src/autorestSession.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAIkC;AAClC,mDAAiE;AACjE,6DAAiE;AA0CjE,IAAI,IAA2B,CAAC;AAChC,IAAI,OAA2B,CAAC;AAChC,IAAI,OAAwB,CAAC;AAE7B,SAAsB,iBAAiB,CAAC,YAAmC;;QACzE,IAAI,GAAG,YAAY,CAAC;QACpB,OAAO,GAAG,MAAM,IAAA,6BAAY,EAAY,IAAI,EAAE,2BAAe,CAAC,CAAC;QAC/D,OAAO,GAAG,MAAM,IAAA,wCAAsB,GAAE,CAAC;IAC3C,CAAC;CAAA;AAJD,8CAIC;AAED,SAAgB,UAAU;IACxB,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CACb,mGAAmG,CACpG,CAAC;KACH;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AARD,gCAQC;AAED,SAAgB,OAAO;IACrB,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CACb,gGAAgG,CACjG,CAAC;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AARD,0BAQC;AAED,SAAgB,kBAAkB;IAChC,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CACb,oGAAoG,CACrG,CAAC;KACH;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AARD,gDAQC"}
|
|
@@ -20,7 +20,7 @@ const transformSchemas_1 = require("./transformSchemas");
|
|
|
20
20
|
const rlcSampleGenerator_1 = require("../../generators/samples/rlcSampleGenerator");
|
|
21
21
|
function transform(model) {
|
|
22
22
|
var _a;
|
|
23
|
-
const { srcPath } = (0, autorestSession_1.getAutorestOptions)();
|
|
23
|
+
const { srcPath, flavor } = (0, autorestSession_1.getAutorestOptions)();
|
|
24
24
|
const importDetails = (0, rlc_common_1.initInternalImports)();
|
|
25
25
|
const urlInfo = transformUrlInfo(model);
|
|
26
26
|
const rlcModel = {
|
|
@@ -36,7 +36,7 @@ function transform(model) {
|
|
|
36
36
|
apiVersionInfo: transformApiVersion(model, urlInfo),
|
|
37
37
|
importInfo: {
|
|
38
38
|
internalImports: importDetails,
|
|
39
|
-
runtimeImports: (0, rlc_common_1.buildRuntimeImports)()
|
|
39
|
+
runtimeImports: (0, rlc_common_1.buildRuntimeImports)(flavor)
|
|
40
40
|
}
|
|
41
41
|
};
|
|
42
42
|
rlcModel.sampleGroups = (0, rlcSampleGenerator_1.transformRLCSampleData)(model, rlcModel);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transform.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,mDAI6B;AAC7B,wDASiC;AACjC,2DAA2D;AAC3D,kEAAkE;AAClE,mFAG8C;AAC9C,iEAAkE;AAClE,qDAAgE;AAChE,0EAAuE;AACvE,oDAAoD;AACpD,yDAAsD;AACtD,uEAGmC;AACnC,qDAAkD;AAClD,qEAAkE;AAClE,yDAAsD;AACtD,oFAAqF;AAErF,SAAgB,SAAS,CAAC,KAAgB;;IACxC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transform.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const autorestSession_1 = require("../../autorestSession");
|
|
|
5
5
|
const schemaHelpers_1 = require("../../utils/schemaHelpers");
|
|
6
6
|
function transformOptions(model) {
|
|
7
7
|
var _a;
|
|
8
|
-
const { rlcShortcut, multiClient, batch, packageDetails, generateMetadata, generateSample, generateTest, azureOutputDirectory, azureSdkForJs, dependencyInfo, productDocLink, azureArm,
|
|
8
|
+
const { rlcShortcut, multiClient, batch, packageDetails, generateMetadata, generateSample, generateTest, azureOutputDirectory, azureSdkForJs, dependencyInfo, productDocLink, azureArm, flavor, } = (0, autorestSession_1.getAutorestOptions)();
|
|
9
9
|
const options = {};
|
|
10
10
|
options.includeShortcuts = rlcShortcut;
|
|
11
11
|
options.multiClient = multiClient;
|
|
@@ -19,7 +19,7 @@ function transformOptions(model) {
|
|
|
19
19
|
options.dependencyInfo = dependencyInfo;
|
|
20
20
|
options.productDocLink = productDocLink;
|
|
21
21
|
options.azureArm = azureArm;
|
|
22
|
-
options.
|
|
22
|
+
options.flavor = flavor;
|
|
23
23
|
options.serviceInfo = {
|
|
24
24
|
title: (_a = model.info.title) !== null && _a !== void 0 ? _a : model.language.default.name,
|
|
25
25
|
description: model.info.description
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformOptions.js","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transformOptions.ts"],"names":[],"mappings":";;;AAEA,2DAA2D;AAC3D,6DAAqE;AAErE,SAAgB,gBAAgB,CAAC,KAAgB;;IAC/C,MAAM,EACJ,WAAW,EACX,WAAW,EACX,KAAK,EACL,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,cAAc,EACd,cAAc,EACd,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"transformOptions.js","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transformOptions.ts"],"names":[],"mappings":";;;AAEA,2DAA2D;AAC3D,6DAAqE;AAErE,SAAgB,gBAAgB,CAAC,KAAgB;;IAC/C,MAAM,EACJ,WAAW,EACX,WAAW,EACX,KAAK,EACL,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,cAAc,EACd,cAAc,EACd,QAAQ,EACR,MAAM,GACP,GAAG,IAAA,oCAAkB,GAAE,CAAC;IACzB,MAAM,OAAO,GAAe,EAAE,CAAC;IAC/B,OAAO,CAAC,gBAAgB,GAAG,WAAW,CAAC;IACvC,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;IAClC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;IACtB,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;IACxC,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC5C,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;IACxC,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC;IACpC,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACpD,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;IACtC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;IACxC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;IACxC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC5B,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IACxB,OAAO,CAAC,WAAW,GAAG;QACpB,KAAK,EAAE,MAAA,KAAK,CAAC,IAAI,CAAC,KAAK,mCAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI;QACtD,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW;KACpC,CAAC;IACF,MAAM,EACJ,cAAc,EACd,gBAAgB,EAChB,uBAAuB,EACxB,GAAG,IAAA,wCAAwB,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC7C,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;IACxC,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC5C,OAAO,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;IAC1D,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAC/B,mDAAmD;IACnD,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IACpC,OAAO,OAAO,CAAC;AACjB,CAAC;AA9CD,4CA8CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autorestOptions.d.ts","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAuB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"autorestOptions.d.ts","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAuB,MAAM,oBAAoB,CAAC;AAM1E;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAwEvE;AAiND,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAO/B"}
|
|
@@ -50,7 +50,7 @@ function extractAutorestOptions() {
|
|
|
50
50
|
const coreHttpCompatMode = yield getCoreHttpCompatMode(host);
|
|
51
51
|
const azureSdkForJs = yield getAzureSdkForJs(host);
|
|
52
52
|
const dependencyInfo = yield getDependencyInfo(host);
|
|
53
|
-
const
|
|
53
|
+
const flavor = yield getFlavor(host);
|
|
54
54
|
return {
|
|
55
55
|
azureArm,
|
|
56
56
|
addCredentials,
|
|
@@ -84,7 +84,7 @@ function extractAutorestOptions() {
|
|
|
84
84
|
coreHttpCompatMode,
|
|
85
85
|
dependencyInfo,
|
|
86
86
|
useLegacyLro,
|
|
87
|
-
|
|
87
|
+
flavor
|
|
88
88
|
};
|
|
89
89
|
});
|
|
90
90
|
}
|
|
@@ -318,10 +318,29 @@ function getCoreHttpCompatMode(host) {
|
|
|
318
318
|
return (yield host.getValue("core-http-compat-mode")) || false;
|
|
319
319
|
});
|
|
320
320
|
}
|
|
321
|
-
function
|
|
322
|
-
var _a;
|
|
321
|
+
function getFlavor(host) {
|
|
323
322
|
return __awaiter(this, void 0, void 0, function* () {
|
|
324
|
-
|
|
323
|
+
const flavor = yield host.getValue("flavor");
|
|
324
|
+
if (flavor) {
|
|
325
|
+
if (flavor.toLowerCase() === "azure") {
|
|
326
|
+
return "azure";
|
|
327
|
+
}
|
|
328
|
+
else {
|
|
329
|
+
return undefined;
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
const branded = yield host.getValue("branded");
|
|
333
|
+
if (branded !== undefined) {
|
|
334
|
+
return branded ? "azure" : undefined;
|
|
335
|
+
}
|
|
336
|
+
const scopeName = (yield getPackageDetails(host)).scopeName;
|
|
337
|
+
if (scopeName &&
|
|
338
|
+
(scopeName.startsWith("azure") || scopeName.startsWith("msinternal"))) {
|
|
339
|
+
return "azure";
|
|
340
|
+
}
|
|
341
|
+
else {
|
|
342
|
+
return undefined;
|
|
343
|
+
}
|
|
325
344
|
});
|
|
326
345
|
}
|
|
327
346
|
function getDependencyInfo(host) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autorestOptions.js","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wDAA0E;AAG1E,2CAAsD;
|
|
1
|
+
{"version":3,"file":"autorestOptions.js","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wDAA0E;AAG1E,2CAAsD;AAGtD;;GAEG;AACH,SAAsB,sBAAsB;;QAC1C,MAAM,IAAI,GAAG,IAAA,yBAAO,GAAE,CAAC;QACvB,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,kBAAkB,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,2BAA2B,GAAG,MAAM,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,wBAAwB,GAAG,MAAM,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,uBAAuB,GAAG,MAAM,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,kBAAkB,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC7D,MAAM,oBAAoB,GAAG,MAAM,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACrE,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,kBAAkB,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC7D,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;QAErC,OAAO;YACL,QAAQ;YACR,cAAc;YACd,QAAQ;YACR,kBAAkB;YAClB,cAAc;YACd,eAAe;YACf,WAAW;YACX,OAAO;YACP,UAAU;YACV,cAAc;YACd,aAAa;YACb,WAAW;YACX,gBAAgB;YAChB,SAAS;YACT,WAAW;YACX,wBAAwB;YACxB,uBAAuB;YACvB,2BAA2B;YAC3B,kBAAkB;YAClB,KAAK;YACL,oBAAoB;YACpB,aAAa;YACb,aAAa;YACb,YAAY;YACZ,KAAK;YACL,WAAW;YACX,cAAc;YACd,aAAa;YACb,cAAc;YACd,kBAAkB;YAClB,cAAc;YACd,YAAY;YACZ,MAAM;SACP,CAAC;IACJ,CAAC;CAAA;AAxED,wDAwEC;AAED,SAAe,eAAe,CAAC,IAA2B;;QACxD,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QACjE,OAAO,kBAAkB,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC3E,CAAC;CAAA;AAED,SAAe,qBAAqB,CAClC,IAA2B;;QAE3B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAE1D,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC;IAChC,CAAC;CAAA;AAED,SAAe,gBAAgB,CAAC,IAA2B;;QACzD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAE7D,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC;IAChC,CAAC;CAAA;AAED,SAAe,gBAAgB,CAAC,IAA2B;;QACzD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAC7D,OAAO,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACjE,CAAC;CAAA;AAED,SAAe,iBAAiB,CAC9B,IAA2B;;QAE3B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAC9D,OAAO,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,IAAI;YAC5D,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC9B,CAAC;CAAA;AAED,SAAe,eAAe,CAAC,IAA2B;;QACxD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC1D,OAAO,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS;YACxD,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5B,CAAC;CAAA;AAED,SAAe,gBAAgB,CAAC,IAA2B;;QACzD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QAC9D,OAAO,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,IAAI;YAC1D,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC7B,CAAC;CAAA;AAED,SAAe,qBAAqB,CAClC,IAA2B;;QAE3B,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;QAEvE,OAAO,kBAAkB,KAAK,IAAI,CAAC;IACrC,CAAC;CAAA;AAED,SAAe,0BAA0B,CACvC,IAA2B;;QAE3B,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,IAAI,KAAK,CAAC;IACrE,CAAC;CAAA;AAED,SAAe,2BAA2B,CACxC,IAA2B;;QAE3B,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;YACzD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,UAAU,CAAC;IACjB,CAAC;CAAA;AAED,SAAe,wBAAwB,CACrC,IAA2B;;QAE3B,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,KAAK,IAAI,CAAC;IACnE,CAAC;CAAA;AAED,SAAe,cAAc,CAAC,IAA2B;;QACvD,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,KAAK,CAAC;IACxD,CAAC;CAAA;AACD,SAAe,mBAAmB,CAAC,IAA2B;;QAC5D,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,KAAK,KAAK,CAAC;IAC9D,CAAC;CAAA;AAED,SAAe,gBAAgB,CAAC,IAA2B;;QACzD,MAAM,OAAO,GAAwB,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAC3E,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,OAAO,IAAI,CAAC;SACb;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAED,SAAe,QAAQ,CACrB,IAA2B;;QAE3B,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,SAAS,CAAC;IACrD,CAAC;CAAA;AAED,SAAe,UAAU,CAAC,IAA2B;;QACnD,OAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAY,IAAI,KAAK,CAAC;IAC/E,CAAC;CAAA;AAED,SAAe,aAAa,CAC1B,IAA2B;;QAE3B,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,IAAI,SAAS,CAAC;IAC7D,CAAC;CAAA;AAED,SAAe,qBAAqB,CAClC,IAA2B;;QAE3B,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,IAAI,SAAS,CAAC;IACpE,CAAC;CAAA;AAED,SAAe,iBAAiB,CAC9B,IAA2B;;QAE3B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAE9D,8DAA8D;QAC9D,4BAA4B;QAC5B,IAAI,cAAc,KAAK,KAAK,EAAE;YAC5B,OAAO,KAAK,CAAC;SACd;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;CAAA;AAED,SAAe,WAAW,CACxB,IAA2B;;QAE3B,MAAM,QAAQ,GAAuB,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACrE,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAED,SAAe,aAAa,CAAC,IAA2B;;QACtD,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,IAAI,CAAC;QACzD,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,KAAK,KAAK,CAAC;QAEhE,OAAO,IAAI,IAAI,OAAO,CAAC;IACzB,CAAC;CAAA;AAED,SAAe,kBAAkB,CAC/B,IAA2B;;QAE3B,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,KAAK,IAAI,CAAC;IAC7D,CAAC;CAAA;AAED,SAAe,YAAY,CAAC,IAA2B;;QACrD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC3D,OAAO,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACpE,CAAC;CAAA;AAED,SAAe,cAAc,CAC3B,IAA2B;;QAE3B,MAAM,OAAO,GACX,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,SAAS,CAAC;QAErD,IAAI,OAAO,IAAI,OAAO,CAAC,SAAS,EAAE;YAChC,OAAO,OAAO,CAAC;SAChB;QAED,MAAM,SAAS,GACb,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAS,wBAAwB,CAAC,CAAC,IAAI,SAAS,CAAC;QACvE,MAAM,aAAa,GACjB,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,IAAI,SAAS,CAAC;QAEnE,IAAI,aAAa,IAAI,SAAS,EAAE;YAC9B,OAAO;gBACL,SAAS;gBACT,aAAa;aACd,CAAC;SACH;QAED,IAAI,CAAC,OAAO,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,EAAE;YAC5C,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,IAAI,KAAK,CACb,8EAA8E,CAC/E,CAAC;IACJ,CAAC;CAAA;AAED,SAAe,iBAAiB,CAC9B,IAA2B;;QAE3B,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4BAAU,GAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,IAAA,yBAAa,EAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,oBAAQ,CAAC,IAAI,CAAC,CAAC;QACvE,8CAA8C;QAC9C,MAAM,WAAW,GAAW,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,IAAI,CAAC;QAC1E,MAAM,gBAAgB,GACpB,WAAW,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACvC,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACjD;QACD,MAAM,OAAO,GACX,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,IAAI,cAAc,CAAC;QAE7D,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;YAC9B,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC;YACrC,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW;YAC/C,OAAO;SACR,CAAC;IACJ,CAAC;CAAA;AAED,SAAsB,iBAAiB,CACrC,IAA2B;;QAE3B,MAAM,cAAc,GAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QACzC,IAAI,cAAc,KAAK,SAAS,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YACtE,OAAO,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAClC;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AATD,8CASC;AAED,SAAe,2BAA2B,CACxC,IAA2B;;QAE3B,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAS,iBAAiB,CAAC,CAAC;QAC3E,MAAM,2BAA2B,GAAuB,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CACvE,OAAO,CAAC,KAAK,EAAE,EAAE,EAClB,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,CAAC,CAAC,EACR,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,OAAO,CAAA,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,MAAK,KAAK;YACxD,CAAC,CAAC,2BAA2B;YAC7B,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;CAAA;AAED,SAAe,QAAQ,CACrB,IAA2B;;QAE3B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAkB,OAAO,CAAC,CAAC;QAC5D,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAED,SAAe,iBAAiB,CAC9B,IAA2B;;QAE3B,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,IAAI,SAAS,CAAC;IAChE,CAAC;CAAA;AAED,SAAe,cAAc,CAAC,IAA2B;;QACvD,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,SAAS,CAAC;QACvE,OAAO,CAAC,CAAC,WAAW,CAAC;IACvB,CAAC;CAAA;AAED,SAAe,qBAAqB,CAClC,IAA2B;;QAE3B,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,IAAI,KAAK,CAAC;IACjE,CAAC;CAAA;AAED,SAAe,SAAS,CAAC,IAA2B;;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAS,QAAQ,CAAC,CAAC;QAErD,IAAI,MAAM,EAAE;YACV,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE;gBACpC,OAAO,OAAO,CAAC;aAChB;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;SACtC;QAED,MAAM,SAAS,GAAG,CAAC,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAE5D,IACE,SAAS;YACT,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,EACrE;YACA,OAAO,OAAO,CAAC;SAChB;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CAAA;AAED,SAAe,iBAAiB,CAC9B,IAA2B;;QAE3B,MAAM,UAAU,GACd,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,IAAI,SAAS,CAAC;QAExD,IAAI,UAAU,IAAI,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,IAAI,EAAE;YAC3D,OAAO,UAAU,CAAC;SACnB;QAED,MAAM,IAAI,GACR,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAS,sBAAsB,CAAC,CAAC,IAAI,SAAS,CAAC;QACrE,MAAM,WAAW,GACf,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC,IAAI,SAAS,CAAC;QAEpE,IAAI,WAAW,IAAI,IAAI,EAAE;YACvB,OAAO;gBACL,IAAI;gBACJ,WAAW;aACZ,CAAC;SACH;QAED,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,EAAE;YACxC,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,IAAI,KAAK,CACb,0EAA0E,CAC3E,CAAC;IACJ,CAAC;CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@autorest/typescript",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.18",
|
|
4
4
|
"browser": {
|
|
5
5
|
"./test-browser/utils/stream-helpers.js": "./test-browser/utils/stream-helpers.browser.js",
|
|
6
6
|
"./test-browser/utils/fileSystem.js": "./test-browser/utils/fileSystem.browser.js",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"source-map-support": "^0.5.16",
|
|
36
36
|
"ts-morph": "^15.1.0",
|
|
37
37
|
"@azure/core-auth": "^1.6.0",
|
|
38
|
-
"@azure-tools/rlc-common": "^0.
|
|
38
|
+
"@azure-tools/rlc-common": "^0.24.0"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@azure-tools/test-recorder": "^3.0.0",
|
package/src/autorestSession.ts
CHANGED
|
@@ -7,6 +7,7 @@ import { CodeModel, codeModelSchema } from "@autorest/codemodel";
|
|
|
7
7
|
import { extractAutorestOptions } from "./utils/autorestOptions";
|
|
8
8
|
import { PackageDetails } from "./models/packageDetails";
|
|
9
9
|
import { DependencyInfo, TracingInfo } from "./models/clientDetails";
|
|
10
|
+
import { PackageFlavor } from "@azure-tools/rlc-common";
|
|
10
11
|
|
|
11
12
|
export interface AutorestOptions {
|
|
12
13
|
restLevelClient?: boolean;
|
|
@@ -42,7 +43,7 @@ export interface AutorestOptions {
|
|
|
42
43
|
dependencyInfo?: DependencyInfo;
|
|
43
44
|
lenientModelDeduplication?: boolean;
|
|
44
45
|
useLegacyLro?: boolean;
|
|
45
|
-
|
|
46
|
+
flavor?: PackageFlavor;
|
|
46
47
|
}
|
|
47
48
|
|
|
48
49
|
let host: AutorestExtensionHost;
|
|
@@ -37,7 +37,7 @@ import { transformSchemas } from "./transformSchemas";
|
|
|
37
37
|
import { transformRLCSampleData } from "../../generators/samples/rlcSampleGenerator";
|
|
38
38
|
|
|
39
39
|
export function transform(model: CodeModel): RLCModel {
|
|
40
|
-
const { srcPath } = getAutorestOptions();
|
|
40
|
+
const { srcPath, flavor } = getAutorestOptions();
|
|
41
41
|
const importDetails = initInternalImports();
|
|
42
42
|
const urlInfo = transformUrlInfo(model);
|
|
43
43
|
const rlcModel: RLCModel = {
|
|
@@ -56,7 +56,7 @@ export function transform(model: CodeModel): RLCModel {
|
|
|
56
56
|
apiVersionInfo: transformApiVersion(model, urlInfo),
|
|
57
57
|
importInfo: {
|
|
58
58
|
internalImports: importDetails,
|
|
59
|
-
runtimeImports: buildRuntimeImports()
|
|
59
|
+
runtimeImports: buildRuntimeImports(flavor)
|
|
60
60
|
}
|
|
61
61
|
};
|
|
62
62
|
rlcModel.sampleGroups = transformRLCSampleData(model, rlcModel);
|
|
@@ -17,7 +17,7 @@ export function transformOptions(model: CodeModel): RLCOptions {
|
|
|
17
17
|
dependencyInfo,
|
|
18
18
|
productDocLink,
|
|
19
19
|
azureArm,
|
|
20
|
-
|
|
20
|
+
flavor,
|
|
21
21
|
} = getAutorestOptions();
|
|
22
22
|
const options: RLCOptions = {};
|
|
23
23
|
options.includeShortcuts = rlcShortcut;
|
|
@@ -32,7 +32,7 @@ export function transformOptions(model: CodeModel): RLCOptions {
|
|
|
32
32
|
options.dependencyInfo = dependencyInfo;
|
|
33
33
|
options.productDocLink = productDocLink;
|
|
34
34
|
options.azureArm = azureArm;
|
|
35
|
-
options.
|
|
35
|
+
options.flavor = flavor;
|
|
36
36
|
options.serviceInfo = {
|
|
37
37
|
title: model.info.title ?? model.language.default.name,
|
|
38
38
|
description: model.info.description
|
|
@@ -3,6 +3,7 @@ import { AutorestOptions, getHost, getSession } from "../autorestSession";
|
|
|
3
3
|
import { DependencyInfo, TracingInfo } from "../models/clientDetails";
|
|
4
4
|
import { PackageDetails } from "../models/packageDetails";
|
|
5
5
|
import { NameType, normalizeName } from "./nameUtils";
|
|
6
|
+
import { PackageFlavor } from "@azure-tools/rlc-common";
|
|
6
7
|
|
|
7
8
|
/**
|
|
8
9
|
* Extracts common autorest options
|
|
@@ -42,7 +43,7 @@ export async function extractAutorestOptions(): Promise<AutorestOptions> {
|
|
|
42
43
|
const coreHttpCompatMode = await getCoreHttpCompatMode(host);
|
|
43
44
|
const azureSdkForJs = await getAzureSdkForJs(host);
|
|
44
45
|
const dependencyInfo = await getDependencyInfo(host);
|
|
45
|
-
const
|
|
46
|
+
const flavor = await getFlavor(host);
|
|
46
47
|
|
|
47
48
|
return {
|
|
48
49
|
azureArm,
|
|
@@ -77,7 +78,7 @@ export async function extractAutorestOptions(): Promise<AutorestOptions> {
|
|
|
77
78
|
coreHttpCompatMode,
|
|
78
79
|
dependencyInfo,
|
|
79
80
|
useLegacyLro,
|
|
80
|
-
|
|
81
|
+
flavor
|
|
81
82
|
};
|
|
82
83
|
}
|
|
83
84
|
|
|
@@ -337,8 +338,32 @@ async function getCoreHttpCompatMode(
|
|
|
337
338
|
return (await host.getValue("core-http-compat-mode")) || false;
|
|
338
339
|
}
|
|
339
340
|
|
|
340
|
-
async function
|
|
341
|
-
|
|
341
|
+
async function getFlavor(host: AutorestExtensionHost): Promise<PackageFlavor> {
|
|
342
|
+
const flavor = await host.getValue<string>("flavor");
|
|
343
|
+
|
|
344
|
+
if (flavor) {
|
|
345
|
+
if (flavor.toLowerCase() === "azure") {
|
|
346
|
+
return "azure";
|
|
347
|
+
} else {
|
|
348
|
+
return undefined;
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
|
|
352
|
+
const branded = await host.getValue("branded");
|
|
353
|
+
if (branded !== undefined) {
|
|
354
|
+
return branded ? "azure" : undefined;
|
|
355
|
+
}
|
|
356
|
+
|
|
357
|
+
const scopeName = (await getPackageDetails(host)).scopeName;
|
|
358
|
+
|
|
359
|
+
if (
|
|
360
|
+
scopeName &&
|
|
361
|
+
(scopeName.startsWith("azure") || scopeName.startsWith("msinternal"))
|
|
362
|
+
) {
|
|
363
|
+
return "azure";
|
|
364
|
+
} else {
|
|
365
|
+
return undefined;
|
|
366
|
+
}
|
|
342
367
|
}
|
|
343
368
|
|
|
344
369
|
async function getDependencyInfo(
|