npm - @autorest/typescript - Versions diffs - 6.0.0-beta.15 → 6.0.0-beta.16 - Mend

@autorest/typescript 6.0.0-beta.15 → 6.0.0-beta.16

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.

Files changed (219) hide show

package/dist/src/utils/autorestOptions.js CHANGED Viewed

@@ -21,6 +21,7 @@ function extractAutorestOptions() {
         const host = autorestSession_1.getHost();
         const useCoreV2 = yield getUseCoreV2(host);
         const restLevelClient = yield getRestLevelClient(host);
+        const rlcShortcut = yield getHasShortcutMethods(host);
         const azureArm = yield getIsAzureArm(host);
         const addCredentials = yield getAddCredentials(host);
         const credentialKeyHeaderName = yield getKeyCredentialHeaderName(host);
@@ -41,12 +42,17 @@ function extractAutorestOptions() {
         const headAsBoolean = yield getHeadAsBoolean(host);
         const isTestPackage = yield getIsTestPackage(host);
         const generateTest = yield getGenerateTest(host);
+        const batch = yield getBatch(host);
+        const multiClient = yield getMultiClient(host);
+        const generateSample = yield getGenerateSample(host);
+        const coreHttpCompatMode = yield getCoreHttpCompatMode(host);
         return {
             azureArm,
             addCredentials,
             credentialKeyHeaderName,
             credentialScopes,
             restLevelClient,
+            rlcShortcut,
             srcPath,
             outputPath,
             packageDetails,
@@ -64,90 +70,106 @@ function extractAutorestOptions() {
             headAsBoolean,
             isTestPackage,
             generateTest,
+            batch,
+            multiClient,
+            generateSample,
+            coreHttpCompatMode
         };
     });
 }
 exports.extractAutorestOptions = extractAutorestOptions;
+function getHasShortcutMethods(host) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const headAsBoolean = yield host.getValue("rlc-shortcut");
+        return Boolean(headAsBoolean);
+    });
+}
 function getHeadAsBoolean(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        const headAsBoolean = yield host.GetValue("head-as-boolean");
+        const headAsBoolean = yield host.getValue("head-as-boolean");
         return Boolean(headAsBoolean);
     });
 }
 function getIsTestPackage(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        const isTestPackage = yield host.GetValue("is-test-package");
+        const isTestPackage = yield host.getValue("is-test-package");
         return isTestPackage === null ? false : Boolean(isTestPackage);
     });
 }
 function getGenerateTest(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        const generateTest = yield host.GetValue("generate-test");
+        const generateTest = yield host.getValue("generate-test");
         return generateTest === null ? false : Boolean(generateTest);
     });
 }
+function getGenerateSample(host) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const generateSample = yield host.getValue("generate-sample");
+        return generateSample === null ? false : Boolean(generateSample);
+    });
+}
 function getSkipEnumValidation(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        const skipEnumValidation = yield host.GetValue("skip-enum-validation");
+        const skipEnumValidation = yield host.getValue("skip-enum-validation");
         return skipEnumValidation === true;
     });
 }
 function getAllowInsecureConnection(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield host.GetValue("allow-insecure-connection")) || false;
+        return (yield host.getValue("allow-insecure-connection")) || false;
     });
 }
 function getIgnoreNullableOnOptional(host) {
     return __awaiter(this, void 0, void 0, function* () {
         const isAzureArm = yield getIsAzureArm(host);
-        return (yield host.GetValue("ignore-nullable-on-optional"))
+        return (yield host.getValue("ignore-nullable-on-optional"))
             ? true
             : isAzureArm;
     });
 }
 function getDisableAsyncOperators(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield host.GetValue("disable-async-iterators")) === true;
+        return (yield host.getValue("disable-async-iterators")) === true;
     });
 }
 function getHideClients(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield host.GetValue("hide-clients")) || false;
+        return (yield host.getValue("hide-clients")) || false;
     });
 }
 function getGenerateMetadata(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield host.GetValue("generate-metadata")) !== false;
+        return (yield host.getValue("generate-metadata")) !== false;
     });
 }
 function getLicenseHeader(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield host.GetValue("license-header")) || false;
+        return (yield host.getValue("license-header")) || false;
     });
 }
 function getTitle(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield host.GetValue("title")) || undefined;
+        return (yield host.getValue("title")) || undefined;
     });
 }
 function getSrcPath(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield host.GetValue("source-code-folder-path")) || "src";
+        return (yield host.getValue("source-code-folder-path")) || "src";
     });
 }
 function getOutputPath(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield host.GetValue("output-folder")) || undefined;
+        return (yield host.getValue("output-folder")) || undefined;
     });
 }
 function getKeyCredentialHeaderName(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield host.GetValue("credential-key-header-name")) || undefined;
+        return (yield host.getValue("credential-key-header-name")) || undefined;
     });
 }
 function getAddCredentials(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        const addCredentials = yield host.GetValue("add-credentials");
+        const addCredentials = yield host.getValue("add-credentials");
         // Only set addCredentials to false if explicitly set to false
         // otherwise default to true
         if (addCredentials === false) {
@@ -160,30 +182,30 @@ function getAddCredentials(host) {
 }
 function getIsAzureArm(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        const flag = (yield host.GetValue("azure-arm")) === true;
-        const openapi = (yield host.GetValue("openapi-type")) === "arm";
+        const flag = (yield host.getValue("azure-arm")) === true;
+        const openapi = (yield host.getValue("openapi-type")) === "arm";
         return flag || openapi;
     });
 }
 function getRestLevelClient(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield host.GetValue("rest-level-client")) === true;
+        return (yield host.getValue("rest-level-client")) === true;
     });
 }
 function getUseCoreV2(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        const useCoreV2Option = yield host.GetValue("use-core-v2");
+        const useCoreV2Option = yield host.getValue("use-core-v2");
         return useCoreV2Option === null ? true : Boolean(useCoreV2Option);
     });
 }
 function getTracingInfo(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        const tracing = (yield host.GetValue("tracing-info")) || undefined;
+        const tracing = (yield host.getValue("tracing-info")) || undefined;
         if (tracing && tracing.namespace && tracing.packagePrefix) {
             return tracing;
         }
-        const namespace = (yield host.GetValue("tracing-info.namespace")) || undefined;
-        const packagePrefix = (yield host.GetValue("tracing-info.packagePrefix")) || undefined;
+        const namespace = (yield host.getValue("tracing-info.namespace")) || undefined;
+        const packagePrefix = (yield host.getValue("tracing-info.packagePrefix")) || undefined;
         if (packagePrefix && namespace) {
             return {
                 namespace,
@@ -197,13 +219,14 @@ function getTracingInfo(host) {
     });
 }
 function getPackageDetails(host) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const { model } = autorestSession_1.getSession();
         const name = nameUtils_1.normalizeName(model.language.default.name, nameUtils_1.NameType.File);
         // TODO: Look for an existing package.json and
-        const packageName = (yield host.GetValue("package-name")) || name;
-        const packageNameParts = packageName.match(/(^@(.*)\/)?(.*)/);
-        const version = (yield host.GetValue("package-version")) || "1.0.0-beta.1";
+        const packageName = (yield host.getValue("package-name")) || name;
+        const packageNameParts = (_a = packageName.match(/(^@(.*)\/)?(.*)/)) !== null && _a !== void 0 ? _a : [];
+        const version = (yield host.getValue("package-version")) || "1.0.0-beta.1";
         return {
             name: packageName,
             scopeName: packageNameParts[2],
@@ -215,9 +238,9 @@ function getPackageDetails(host) {
 }
 function getCredentialScopes(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        const addCredentials = yield host.GetValue("add-credentials");
-        const credentialScopes = yield host.GetValue("credential-scopes");
-        const azureArm = yield host.GetValue("azure-arm");
+        const addCredentials = yield host.getValue("add-credentials");
+        const credentialScopes = yield host.getValue("credential-scopes");
+        const azureArm = yield host.getValue("azure-arm");
         if (credentialScopes && !addCredentials) {
             throw new Error("--credential-scopes must be used with the --add-credentials flag");
         }
@@ -226,7 +249,7 @@ function getCredentialScopes(host) {
                 return ["https://management.azure.com/.default"];
             }
             else if (addCredentials) {
-                host.Message({
+                host.message({
                     Channel: extension_base_1.Channel.Warning,
                     Text: `You have default credential policy BearerTokenCredentialPolicy
         but not the --credential-scopes flag set while generating non-management plane code.
@@ -244,11 +267,28 @@ function getCredentialScopes(host) {
 exports.getCredentialScopes = getCredentialScopes;
 function getAzureOutputDirectoryPath(host) {
     return __awaiter(this, void 0, void 0, function* () {
-        const outputDirectoryPath = yield host.GetValue("outputFolderUri");
+        const outputDirectoryPath = yield host.getValue("outputFolderUri");
         const outputDirectoryRelativePath = outputDirectoryPath === null || outputDirectoryPath === void 0 ? void 0 : outputDirectoryPath.replace(/\/$/, "").split("/").slice(-3).join("/");
         return (outputDirectoryRelativePath === null || outputDirectoryRelativePath === void 0 ? void 0 : outputDirectoryRelativePath.substr(0, 3)) === "sdk"
             ? outputDirectoryRelativePath
             : undefined;
     });
 }
+function getBatch(host) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const batch = yield host.getValue("batch");
+        return batch;
+    });
+}
+function getMultiClient(host) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const multiClient = (yield host.getValue("multi-client")) || undefined;
+        return !!multiClient;
+    });
+}
+function getCoreHttpCompatMode(host) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield host.getValue("core-http-compat-mode")) || false;
+    });
+}
 //# sourceMappingURL=autorestOptions.js.map

package/dist/src/utils/autorestOptions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"autorestOptions.js","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,~~6DAAyD~~;~~AACzD~~,wDAA0E;AAG1E,2CAAsD;AAEtD;;GAEG;AACH,SAAsB,sBAAsB;;QAC1C,MAAM,IAAI,GAAG,yBAAO,EAAE,CAAC;QACvB,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,uBAAuB,GAAG,MAAM,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACzD,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,YAAY,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,~~CAAA~~;~~QAEhD~~,OAAO;YACL,QAAQ;YACR,cAAc;YACd,uBAAuB;YACvB,gBAAgB;YAChB,eAAe;YACf,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;~~SACb~~,CAAC;IACJ,CAAC;CAAA;~~AAlDD~~,~~wDAkDC~~;AAED,SAAe,gBAAgB,CAAC,~~IAAU~~;;~~QACxC~~,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,~~IAAU~~;;~~QACxC~~,MAAM,aAAa,~~GAAY~~,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;~~QACtE~~,OAAO,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACjE,CAAC;CAAA;AAED,SAAe,eAAe,CAAC,~~IAAU~~;;~~QACvC~~,MAAM,YAAY,~~GAAY~~,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;~~QACnE~~,OAAO,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC/D,CAAC;CAAA;AAED,SAAe,~~qBAAqB~~,CAAC,~~IAAU~~;;~~QAC7C~~,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;QAEvE,OAAO,kBAAkB,KAAK,IAAI,CAAC;IACrC,CAAC;CAAA;AAED,SAAe,0BAA0B,~~CAAC~~,~~IAAU~~;;~~QAClD~~,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,IAAI,KAAK,CAAC;IACrE,CAAC;CAAA;AAED,SAAe,2BAA2B,~~CAAC~~,~~IAAU~~;;~~QACnD~~,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,~~CAAC~~,~~IAAU~~;;~~QAChD~~,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,KAAK,IAAI,CAAC;IACnE,CAAC;CAAA;AAED,SAAe,cAAc,CAAC,~~IAAU~~;;~~QACtC~~,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,KAAK,CAAC;IACxD,CAAC;CAAA;AACD,SAAe,mBAAmB,CAAC,~~IAAU~~;;~~QAC3C~~,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,KAAK,KAAK,CAAC;IAC9D,CAAC;CAAA;AAED,SAAe,gBAAgB,CAAC,~~IAAU~~;;~~QACxC~~,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,IAAI,KAAK,CAAC;IAC1D,CAAC;CAAA;AAED,SAAe,QAAQ,~~CAAC~~,~~IAAU~~;;~~QAChC~~,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,SAAS,CAAC;IACrD,CAAC;CAAA;AAED,SAAe,UAAU,CAAC,~~IAAU~~;;~~QAClC~~,OAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAY,IAAI,KAAK,CAAC;IAC/E,CAAC;CAAA;AAED,SAAe,aAAa,~~CAAC~~,~~IAAU~~;;~~QACrC~~,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,IAAI,SAAS,CAAC;IAC7D,CAAC;CAAA;AAED,SAAe,0BAA0B,CACvC,~~IAAU~~;;~~QAEV~~,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,IAAI,SAAS,CAAC;IAC1E,CAAC;CAAA;AAED,SAAe,iBAAiB,~~CAAC~~,~~IAAU~~;;~~QACzC~~,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;AACD,SAAe,aAAa,CAAC,~~IAAU~~;;~~QACrC~~,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,~~CAAC~~,~~IAAU~~;;~~QAC1C~~,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,KAAK,IAAI,CAAC;IAC7D,CAAC;CAAA;AAED,SAAe,YAAY,CAAC,~~IAAU~~;;~~QACpC~~,MAAM,eAAe,~~GAAY~~,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;~~QACpE~~,OAAO,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACpE,CAAC;CAAA;AAED,SAAe,cAAc,~~CAAC~~,~~IAAU~~;;~~QACtC~~,MAAM,OAAO,GACX,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,SAAS,CAAC;QAErD,IAAI,OAAO,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,aAAa,EAAE;YACzD,OAAO,OAAO,CAAC;SAChB;QAED,MAAM,SAAS,GACb,CAAC,MAAM,IAAI,CAAC,QAAQ,~~CAAC~~,wBAAwB,CAAC,CAAC,IAAI,SAAS,CAAC;~~QAC/D~~,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,~~CAAC~~,~~IAAU;;QACzC~~,MAAM,EAAE,KAAK,EAAE,GAAG,4BAAU,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,yBAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,oBAAQ,CAAC,IAAI,CAAC,CAAC;QACvE,8CAA8C;QAC9C,MAAM,WAAW,~~GAAG~~,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,IAAI,CAAC;~~QAClE~~,MAAM,gBAAgB,~~GAAG~~,WAAW,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;~~QAC9D~~,MAAM,OAAO,~~GAAG~~,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,IAAI,cAAc,CAAC;~~QAE3E~~,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,mBAAmB,CACvC,~~IAAU~~;;~~QAEV~~,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAC9D,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAElD,IAAI,gBAAgB,IAAI,CAAC,cAAc,EAAE;YACvC,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;SACH;QAED,IAAI,CAAC,gBAAgB,EAAE;YACrB,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,uCAAuC,CAAC,CAAC;aAClD;iBAAM,IAAI,cAAc,EAAE;gBACzB,IAAI,CAAC,OAAO,CAAC;oBACX,OAAO,EAAE,wBAAO,CAAC,OAAO;oBACxB,IAAI,EAAE;;;qDAGuC;iBAC9C,CAAC,CAAC;aACJ;SACF;QAED,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;YACxC,OAAO,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CAAA;AAhCD,kDAgCC;AAED,SAAe,2BAA2B,CACxC,~~IAAU~~;;~~QAEV~~,MAAM,mBAAmB,~~GAAkB~~,MAAM,IAAI,CAAC,QAAQ,~~CAC5D~~,iBAAiB,~~CAClB~~,CAAC;~~QACF~~,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"}
1	+ {"version":3,"file":"autorestOptions.js","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/nameUtils.d.ts CHANGED Viewed

@@ -1,5 +1,9 @@
 import { Operation, OperationGroup } from "@autorest/codemodel";
 import { TypeDetails } from "../models/modelDetails";
+export interface ReservedName {
+    name: string;
+    reservedFor: NameType[];
+}
 export declare enum NameType {
     Class = 0,
     File = 1,
@@ -13,13 +17,13 @@ export declare enum CasingConvention {
     Pascal = 0,
     Camel = 1
 }
-export declare function guardReservedNames(name: string, nameType: NameType): string;
+export declare function guardReservedNames(name: string, nameType: NameType, customReservedNames?: ReservedName[]): string;
 /**
  * Returns a normalized Type name, this is, the type name capitalized when needed.
  * Otherwise, return the original typename, for example primitives "string", etc. don't need capitalization.
  */
 export declare function normalizeTypeName({ kind, typeName }: TypeDetails): string;
-export declare function normalizeName(name: string, nameType: NameType, shouldGuard?: boolean): string;
+export declare function normalizeName(name: string, nameType: NameType, shouldGuard?: boolean, customReservedNames?: ReservedName[], casingOverride?: CasingConvention): string;
 export declare function getModelsName(title: string): string;
 export declare function getMappersName(title: string): string;
 export declare function getOperationFullName(operationGroup: OperationGroup, operation: Operation, clientName: string): string;

package/dist/src/utils/nameUtils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"nameUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/nameUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAgB,MAAM,wBAAwB,CAAC;~~AAOnE~~,oBAAY,QAAQ;IAClB,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,SAAS,IAAA;IACT,QAAQ,IAAA;IACR,SAAS,IAAA;IACT,SAAS,IAAA;IACT,cAAc,IAAA;CACf;AAuED,oBAAY,gBAAgB;IAC1B,MAAM,IAAA;IACN,KAAK,IAAA;CACN;AAED,wBAAgB,kBAAkB,~~CAAC~~,IAAI,EAAE,MAAM,~~EAAE~~,QAAQ,EAAE,QAAQ,~~GAAG~~,MAAM,~~CAO3E~~;AAmBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,WAAW,UAQhE;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,EAClB,WAAW,CAAC,EAAE,OAAO,~~GACpB~~,MAAM,~~CAiBR~~;AAcD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGnD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGpD;AAwCD,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,UAYnB"}
1	+ {"version":3,"file":"nameUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/nameUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAgB,MAAM,wBAAwB,CAAC;AAEnE,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,QAAQ,EAAE,CAAC;CACzB;AAED,oBAAY,QAAQ;IAClB,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,SAAS,IAAA;IACT,QAAQ,IAAA;IACR,SAAS,IAAA;IACT,SAAS,IAAA;IACT,cAAc,IAAA;CACf;AAuED,oBAAY,gBAAgB;IAC1B,MAAM,IAAA;IACN,KAAK,IAAA;CACN;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,GAAE,YAAY,EAAO,GACvC,MAAM,CAOR;AAmBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,WAAW,UAQhE;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,EAClB,WAAW,CAAC,EAAE,OAAO,EACrB,mBAAmB,GAAE,YAAY,EAAO,EACxC,cAAc,CAAC,EAAE,gBAAgB,GAChC,MAAM,CAmBR;AAcD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGnD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGpD;AAwCD,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,UAYnB"}

package/dist/src/utils/nameUtils.js CHANGED Viewed

@@ -85,9 +85,11 @@ var CasingConvention;
     CasingConvention[CasingConvention["Pascal"] = 0] = "Pascal";
     CasingConvention[CasingConvention["Camel"] = 1] = "Camel";
 })(CasingConvention = exports.CasingConvention || (exports.CasingConvention = {}));
-function guardReservedNames(name, nameType) {
+function guardReservedNames(name, nameType, customReservedNames = []) {
     const suffix = getSuffix(nameType);
-    return ReservedModelNames.filter(r => r.reservedFor.includes(nameType)).find(r => r.name === name.toLowerCase())
+    return [...ReservedModelNames, ...customReservedNames]
+        .filter(r => r.reservedFor.includes(nameType))
+        .find(r => r.name === name.toLowerCase())
         ? `${name}${suffix}`
         : name;
 }
@@ -121,11 +123,11 @@ function normalizeTypeName({ kind, typeName }) {
     return typeName;
 }
 exports.normalizeTypeName = normalizeTypeName;
-function normalizeName(name, nameType, shouldGuard) {
+function normalizeName(name, nameType, shouldGuard, customReservedNames = [], casingOverride) {
     if (name.startsWith("$DO_NOT_NORMALIZE$")) {
         return name.replace("$DO_NOT_NORMALIZE$", "");
     }
-    const casingConvention = getCasingConvention(nameType);
+    const casingConvention = casingOverride !== null && casingOverride !== void 0 ? casingOverride : getCasingConvention(nameType);
     const sanitizedName = sanitizeName(name);
     const parts = getNameParts(sanitizedName);
     const [firstPart, ...otherParts] = parts;
@@ -134,7 +136,9 @@ function normalizeName(name, nameType, shouldGuard) {
         .map(part => part === "null" ? part : toCasing(part, CasingConvention.Pascal))
         .join("");
     const normalized = checkBeginning(`${normalizedFirstPart}${normalizedParts}`);
-    return shouldGuard ? guardReservedNames(normalized, nameType) : normalized;
+    return shouldGuard
+        ? guardReservedNames(normalized, nameType, customReservedNames)
+        : normalized;
 }
 exports.normalizeName = normalizeName;
 function checkBeginning(name) {

package/dist/src/utils/nameUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"nameUtils.js","sourceRoot":"","sources":["../../../src/utils/nameUtils.ts"],"names":[],"mappings":";;;AAGA,uDAAwD;AACxD,yDAAmE;AAOnE,IAAY,QAQX;AARD,WAAY,QAAQ;IAClB,yCAAK,CAAA;IACL,uCAAI,CAAA;IACJ,iDAAS,CAAA;IACT,+CAAQ,CAAA;IACR,iDAAS,CAAA;IACT,iDAAS,CAAA;IACT,2DAAc,CAAA;AAChB,CAAC,EARW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAQnB;AAED,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;AAE9E,MAAM,kBAAkB,GAAmB;IACzC,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IAClD,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACjD,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,EAAE;IAClE,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACnD,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IAC1D,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACvD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,EAAE;IAC/D,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACvD,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACtD,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACtD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACrD,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACjD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACnD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACnD,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,EAAE;IAChE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACrD,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACtD,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACtD,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IAClD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACnD,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,EAAE;IACnE,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IAClD,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACjD,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACzD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACrD,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACjD,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACzD,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACxD,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IAClD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACrD,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IAClD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACnD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,EAAE;IACjE,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACjD,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACtD,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACtD,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACxD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACrD,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IAC7D,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACtD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACrD,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,EAAE;IAC9D,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACrD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,EAAE;IACjE,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACrD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,EAAE;IACjE,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACnD,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACnD,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IAClD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACnD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACrD,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IAClD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACnD,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACnD,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;CACzD,CAAC;AAEF,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,2DAAM,CAAA;IACN,yDAAK,CAAA;AACP,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B;AAED,SAAgB,kBAAkB,~~CAAC~~,IAAY,~~EAAE~~,QAAkB;~~IACjE~~,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,~~CAAC,~~IAAI,~~CAC1E~~,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,~~CACnC~~;~~QACC~~,CAAC,CAAC,GAAG,IAAI,GAAG,MAAM,EAAE;QACpB,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;~~AAPD~~,~~gDAOC~~;AAED,SAAS,SAAS,CAAC,QAAmB;IACpC,QAAQ,QAAQ,EAAE;QAChB,KAAK,QAAQ,CAAC,IAAI,CAAC;QACnB,KAAK,QAAQ,CAAC,SAAS,CAAC;QACxB,KAAK,QAAQ,CAAC,QAAQ;YACpB,OAAO,EAAE,CAAC;QACZ,KAAK,QAAQ,CAAC,cAAc;YAC1B,OAAO,YAAY,CAAC;QACtB,KAAK,QAAQ,CAAC,SAAS;YACrB,OAAO,OAAO,CAAC;QACjB,KAAK,QAAQ,CAAC,KAAK,CAAC;QACpB,KAAK,QAAQ,CAAC,SAAS,CAAC;QACxB;YACE,OAAO,OAAO,CAAC;KAClB;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAe;IAC/D,mDAAmD;IACnD,IAAI,CAAC,2BAAY,CAAC,IAAI,EAAE,2BAAY,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC9D,OAAO,GAAG,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;KACzD;IAED,sDAAsD;IACtD,OAAO,QAAQ,CAAC;AAClB,CAAC;AARD,8CAQC;AAED,SAAgB,aAAa,CAC3B,IAAY,EACZ,QAAkB,EAClB,WAAqB;~~IAErB~~,IAAI,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;QACzC,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;KAC/C;IACD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;~~IACvD~~,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;IAC1C,MAAM,CAAC,SAAS,EAAE,GAAG,UAAU,CAAC,GAAG,KAAK,CAAC;IACzC,MAAM,mBAAmB,GAAG,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IAClE,MAAM,eAAe,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;SACvC,GAAG,CAAC,IAAI,CAAC,EAAE,CACV,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,CACjE;SACA,IAAI,CAAC,EAAE,CAAC,CAAC;IAEZ,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,mBAAmB,GAAG,eAAe,EAAE,CAAC,CAAC;IAC9E,OAAO,WAAW,CAAC,CAAC,~~CAAC,~~kBAAkB,CAAC,UAAU,EAAE,QAAQ,~~CAAC~~,CAAC,CAAC,CAAC,UAAU,CAAC;~~AAC7E~~,CAAC;~~AArBD~~,~~sCAqBC~~;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KAC1B;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,IAAY;IAChC,qCAAqC;IACrC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AACtC,CAAC;AAED,SAAgB,aAAa,CAAC,KAAa;IACzC,MAAM,iBAAiB,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAClD,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC;AAC5D,CAAC;AAHD,sCAGC;AAED,SAAgB,cAAc,CAAC,KAAa;IAC1C,MAAM,iBAAiB,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAClD,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC;AAC7D,CAAC;AAHD,wCAGC;AAED,SAAS,mBAAmB,CAAC,QAAkB;IAC7C,QAAQ,QAAQ,EAAE;QAChB,KAAK,QAAQ,CAAC,KAAK,CAAC;QACpB,KAAK,QAAQ,CAAC,SAAS,CAAC;QACxB,KAAK,QAAQ,CAAC,cAAc;YAC1B,OAAO,gBAAgB,CAAC,MAAM,CAAC;QACjC,KAAK,QAAQ,CAAC,IAAI,CAAC;QACnB,KAAK,QAAQ,CAAC,QAAQ,CAAC;QACvB,KAAK,QAAQ,CAAC,SAAS,CAAC;QACxB,KAAK,QAAQ,CAAC,SAAS;YACrB,OAAO,gBAAgB,CAAC,KAAK,CAAC;KACjC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,QAAQ,CAAC,GAAW,EAAE,MAAwB;IACrD,IAAI,KAAK,GAAG,GAAG,CAAC;IAChB,IAAI,KAAK,KAAK,KAAK,CAAC,WAAW,EAAE,EAAE;QACjC,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;KAC3B;IAED,MAAM,SAAS,GACb,MAAM,KAAK,gBAAgB,CAAC,MAAM;QAChC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;QAC/B,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC1C,OAAO,GAAG,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7C,CAAC;AAED,SAAS,YAAY,CAAC,IAAY;IAChC,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAElC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,oBAAoB,CAClC,cAA8B,EAC9B,SAAoB,EACpB,UAAkB;IAElB,MAAM,SAAS,GAAG,aAAa,CAC7B,qCAAmB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,UAAU,EAC/D,QAAQ,CAAC,cAAc,CACxB,CAAC;IACF,MAAM,aAAa,GAAG,aAAa,CACjC,qCAAmB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,EAC5C,QAAQ,CAAC,SAAS,CACnB,CAAC;IAEF,OAAO,GAAG,SAAS,IAAI,aAAa,EAAE,CAAC;AACzC,CAAC;AAfD,oDAeC"}
1	+ {"version":3,"file":"nameUtils.js","sourceRoot":"","sources":["../../../src/utils/nameUtils.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/schemaHelpers.js CHANGED Viewed

@@ -45,7 +45,7 @@ exports.getAdditionalProperties = getAdditionalProperties;
 function getTypeForSchema(schema, isNullable = false, useCoreV2 = false) {
     let typeName = "";
     let usedModels = [];
-    let defaultValue = "";
+    let defaultValue = undefined;
     let kind = modelDetails_1.PropertyKind.Primitive;
     switch (schema.type) {
         case codemodel_1.SchemaType.Any:
@@ -145,9 +145,14 @@ function getTypeForSchema(schema, isNullable = false, useCoreV2 = false) {
             throw new Error(`Handling of ${schema.type} hasn't been implemented yet`);
     }
     typeName = isNullable ? typeName + " | null" : typeName;
-    return Object.assign({ typeName,
+    return {
+        typeName,
         kind,
-        usedModels, isConstant: schema.type === codemodel_1.SchemaType.Constant, nullable: isNullable }, (defaultValue && { defaultValue }));
+        usedModels,
+        isConstant: schema.type === codemodel_1.SchemaType.Constant,
+        nullable: isNullable,
+        defaultValue
+    };
 }
 exports.getTypeForSchema = getTypeForSchema;
 function isModelNeeded({ kind }) {

package/dist/src/utils/schemaHelpers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schemaHelpers.js","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,yDAAmE;AAEnE,mDAS6B;AAC7B,iDAAmD;AACnD,uDAAwD;AACxD,2CAAyE;AAEzE;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,EAAE,OAAO,EAAgB,EACzB,aAAa,GAAG,KAAK;IAErB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAoB,aAAa;QAC/C,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAU,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC;AAbD,4CAaC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CACrC,EAAE,OAAO,EAAgB,EACzB,aAAa,GAAG,KAAK;IAErB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,UAAU,GAAoB,aAAa;QAC/C,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAU,CAAC,UAAU,CAAC,CAAC;AAChE,CAAC;AAbD,0DAaC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAC9B,MAAc,EACd,aAAsB,KAAK,EAC3B,YAAqB,KAAK;IAE1B,IAAI,QAAQ,GAAW,EAAE,CAAC;IAC1B,IAAI,UAAU,GAAa,EAAE,CAAC;IAC9B,IAAI,YAAY,~~GAAW~~,~~EAAE~~,CAAC;~~IAC9B~~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~~uBACE~~,QAAQ;QACR,IAAI;QACJ,UAAU,~~EACV,~~UAAU,EAAE,MAAM,CAAC,IAAI,KAAK,sBAAU,CAAC,QAAQ~~,EAC~~/C,QAAQ,EAAE,UAAU,~~IACjB,CAAC,~~YAAY,~~IAAI,EAAE,YAAY,EAAE,~~CAAC~~,EACrC~~;AACJ,CAAC;AAvID,4CAuIC;AAED,SAAS,aAAa,CAAC,EAAE,IAAI,EAAe;IAC1C,OAAO,CAAC,2BAAY,CAAC,SAAS,EAAE,2BAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACpE,CAAC;AAED,SAAgB,gBAAgB,CAAC,QAAa;IAC5C,0EAA0E;IAC1E,OAAO,OAAO,QAAQ,CAAC,MAAM,KAAK,WAAW,CAAC;AAChD,CAAC;AAHD,4CAGC;AAED;;;GAGG;AACH,SAAgB,0BAA0B,CAAC,MAAc;IACvD,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,sBAAU,CAAC,IAAI;YAClB,OAAO,0GAA0G,CAAC;QACpH,KAAK,sBAAU,CAAC,UAAU;YACxB,OAAO,gFAAgF,CAAC;QAC1F;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AATD,gEASC"}
1	+ {"version":3,"file":"schemaHelpers.js","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@autorest/typescript",
-    "version": "6.0.0-beta.15",
+    "version": "6.0.0-beta.16",
     "scripts": {
         "build": "tsc -p . && npm run copyFiles",
         "build:test:browser": "tsc -p tsconfig.browser-test.json && webpack --config webpack.config.test.js",
@@ -15,12 +15,16 @@
         "integration-test:new": "npm-run-all start-test-server generate-and-test integration-test:alone stop-test-server",
         "integration-test:browser": "npm run build:test:browser && karma start karma.conf.js",
         "generate-and-test": "npm-run-all -s build generate-swaggers integration-test:alone integration-test:browser",
-        "integration-test:alone": "mocha -r ts-node/register --timeout 2000 './test/integration/**/*spec.ts'",
+        "integration-test:alone": "mocha -r ts-node/register --timeout 2000 './test/integration/**/!(sampleTest).spec.ts'",
         "start-test-server": "ts-node test/utils/start-server.ts",
         "start-test-server:v2": "autorest-testserver",
         "stop-test-server": "autorest-testserver stop",
         "debug": "node --inspect-brk ./dist/src/main.js",
         "generate-swaggers": "ts-node ./test/utils/test-swagger-gen.ts",
+        "validate-version-tolerance": "npm run start-test-server:v2 & npm run generate-version-tolerance && npm run generate-version-tolerance:tests && npm run test-version-tolerance && npm run stop-test-server",
+        "generate-version-tolerance": "ts-node ./test/utils/version-tolerance.ts",
+        "generate-version-tolerance:tests": "ts-node ./test/utils/version-tolerance.ts --test-gen",
+        "test-version-tolerance": "mocha -r ts-node/register --timeout 2000 './test/version-tolerance/**/!(sampleTest).spec.ts'",
         "clone:specs": "git clone https://github.com/Azure/azure-rest-api-specs.git ./.tmp/specs",
         "smoke-test": "ts-node ./test/utils/smoke-test.ts",
         "copyFiles": "copyfiles src/**/*.hbs dist/ && copyfiles src/**/**/*.hbs dist/"
@@ -32,12 +36,14 @@
         "LICENSE"
     ],
     "dependencies": {
-        "@autorest/codemodel": "^4.15.0",
-        "@autorest/extension-base": "^3.2.1",
-        "@azure-rest/core-client": "1.0.0-beta.8",
+        "@autorest/codemodel": "^4.17.0",
+        "@autorest/extension-base": "^3.4.1",
+        "@azure-rest/core-client": "1.0.0-alpha.20220112.1",
+        "@autorest/testmodeler": "^1.0.4",
         "@azure-tools/codegen": "^2.5.294",
         "@azure/core-client": "^1.3.0",
         "@azure/core-http": "^1.2.4",
+        "@azure/core-http-compat": "^1.1.0",
         "@azure/core-lro": "^2.1.0",
         "@azure/core-paging": "^1.2.0",
         "@azure/core-rest-pipeline": "^1.3.0",

package/src/autorestSession.ts CHANGED Viewed

@@ -1,4 +1,8 @@
-import { Host, Session, startSession } from "@autorest/extension-base";
+import {
+  AutorestExtensionHost,
+  Session,
+  startSession
+} from "@autorest/extension-base";
 import { CodeModel, codeModelSchema } from "@autorest/codemodel";
 import { extractAutorestOptions } from "./utils/autorestOptions";
 import { PackageDetails } from "./models/packageDetails";
@@ -6,6 +10,7 @@ import { TracingInfo } from "./models/clientDetails";
 export interface AutorestOptions {
   restLevelClient?: boolean;
+  rlcShortcut?: boolean;
   azureArm?: boolean;
   addCredentials?: boolean;
   credentialKeyHeaderName?: string;
@@ -27,24 +32,20 @@ export interface AutorestOptions {
   headAsBoolean?: boolean;
   isTestPackage?: boolean;
   generateTest?: boolean;
+  batch?: [string, any][];
+  multiClient?: boolean;
+  generateSample?: boolean;
+  coreHttpCompatMode?: boolean;
 }
-let host: Host;
+let host: AutorestExtensionHost;
 let session: Session<CodeModel>;
 let options: AutorestOptions;
-export async function initializeSession(autorestHost: Host) {
-  if (!host) {
-    host = autorestHost;
-  }
-  if (!session) {
-    session = await startSession<CodeModel>(host, undefined, codeModelSchema);
-  }
-  if (!options) {
-    options = await extractAutorestOptions();
-  }
+export async function initializeSession(autorestHost: AutorestExtensionHost) {
+  host = autorestHost;
+  session = await startSession<CodeModel>(host, codeModelSchema);
+  options = await extractAutorestOptions();
 }
 export function getSession(): Session<CodeModel> {
@@ -57,7 +58,7 @@ export function getSession(): Session<CodeModel> {
   return session;
 }
-export function getHost(): Host {
+export function getHost(): AutorestExtensionHost {
   if (!host) {
     throw new Error(
       "Host has not been initialized, make sure to call initializeSession early in the plugin startup"

package/src/conflictResolver.ts CHANGED Viewed

@@ -1,5 +1,4 @@
 import { ClientDetails } from "./models/clientDetails";
-import { ParameterDetails } from "./models/parameterDetails";
 const RESERVED_MEMBER_NAMES = ["pipeline"];