@azure-tools/typespec-ts 0.23.0 → 0.25.0-alpha.20240311.1

package/dist/src/transform/transfromRLCOptions.js

@@ -18,12 +18,12 @@ export function transformRLCOptions(emitterOptions, dpgContext) {
 function extractRLCOptions(dpgContext, emitterOptions, generationRootDir) {
     const program = dpgContext.program;
     const includeShortcuts = getIncludeShortcuts(emitterOptions);
-    const branded = getBranded(emitterOptions);
     const packageDetails = getPackageDetails(program, emitterOptions);
+    const flavor = getFlavor(emitterOptions, packageDetails);
     const serviceInfo = getServiceInfo(program);
     const azureSdkForJs = getAzureSdkForJs(emitterOptions);
     const generateMetadata = getGenerateMetadata(emitterOptions);
-    const generateTest = getGenerateTest(emitterOptions, branded);
+    const generateTest = getGenerateTest(emitterOptions, flavor);
     const generateSample = getGenerateSample(emitterOptions);
     const credentialInfo = getCredentialInfo(program, emitterOptions);
     const azureOutputDirectory = getAzureOutputDirectory(generationRootDir);
@@ -33,7 +33,7 @@ function extractRLCOptions(dpgContext, emitterOptions, generationRootDir) {
     return {
         ...emitterOptions,
         ...credentialInfo,
-        branded,
+        flavor,
         includeShortcuts,
         packageDetails,
         generateMetadata,
@@ -134,7 +134,7 @@ function detectIfNameConflicts(dpgContext) {
         const clientOperations = listOperationsInOperationGroup(dpgContext, client);
         for (const clientOp of clientOperations) {
             const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-            const name = getOperationName(program, route.operation);
+            const name = getOperationName(dpgContext, route.operation);
             if (nameSet.has(name)) {
                 return true;
             }
@@ -147,7 +147,7 @@ function detectIfNameConflicts(dpgContext) {
             const operations = listOperationsInOperationGroup(dpgContext, operationGroup);
             for (const op of operations) {
                 const route = ignoreDiagnostics(getHttpOperation(program, op));
-                const name = getOperationName(program, route.operation);
+                const name = getOperationName(dpgContext, route.operation);
                 if (nameSet.has(name)) {
                     return true;
                 }
@@ -163,8 +163,28 @@ function detectIfNameConflicts(dpgContext) {
 function getIncludeShortcuts(emitterOptions) {
     return Boolean(emitterOptions.includeShortcuts);
 }
-function getBranded(emitterOptions) {
-    return emitterOptions.branded !== undefined ? emitterOptions.branded : true;
+function getFlavor(emitterOptions, packageDetails) {
+    const flavor = emitterOptions.flavor;
+    if (flavor !== undefined) {
+        if (flavor.toLowerCase() === "azure") {
+            return "azure";
+        }
+        else {
+            return undefined;
+        }
+    }
+    const branded = emitterOptions.branded;
+    if (branded !== undefined) {
+        return branded ? "azure" : undefined;
+    }
+    const scopeName = packageDetails === null || packageDetails === void 0 ? void 0 : packageDetails.scopeName;
+    if (scopeName !== undefined &&
+        (scopeName.startsWith("azure") || scopeName.startsWith("msinternal"))) {
+        return "azure";
+    }
+    else {
+        return undefined;
+    }
 }
 function getPackageDetails(program, emitterOptions) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
@@ -211,13 +231,13 @@ function getGenerateMetadata(emitterOptions) {
  * @param emitterOptions
  * @returns
  */
-function getGenerateTest(emitterOptions, branded) {
-    if (!branded &&
+function getGenerateTest(emitterOptions, flavor) {
+    if (flavor !== "azure" &&
         (emitterOptions.generateTest === undefined ||
             emitterOptions.generateTest === null)) {
         return undefined;
     }
-    else if (branded &&
+    else if (flavor === "azure" &&
         (emitterOptions.generateTest === undefined ||
             emitterOptions.generateTest === null)) {
         return true;

package/dist/src/transform/transfromRLCOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"transfromRLCOptions.js","sourceRoot":"","sources":["../../../src/transform/transfromRLCOptions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transfromRLCOptions.js","sourceRoot":"","sources":["../../../src/transform/transfromRLCOptions.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/emitUtil.js

@@ -3,25 +3,25 @@ import { dirname, join } from "path";
 import { format } from "prettier";
 import { prettierJSONOptions, prettierTypeScriptOptions } from "../lib.js";
 export async function emitModels(rlcModels, program) {
-    var _a, _b;
+    var _a;
     const schemaOutput = buildSchemaTypes(rlcModels);
-    const isBranded = (_b = (_a = rlcModels === null || rlcModels === void 0 ? void 0 : rlcModels.options) === null || _a === void 0 ? void 0 : _a.branded) !== null && _b !== void 0 ? _b : true;
+    const isAzureFlavor = ((_a = rlcModels === null || rlcModels === void 0 ? void 0 : rlcModels.options) === null || _a === void 0 ? void 0 : _a.flavor) === "azure";
     if (schemaOutput) {
         const { inputModelFile, outputModelFile } = schemaOutput;
         if (inputModelFile) {
-            await emitFile(inputModelFile, program, isBranded);
+            await emitFile(inputModelFile, program, isAzureFlavor);
         }
         if (outputModelFile) {
-            await emitFile(outputModelFile, program, isBranded);
+            await emitFile(outputModelFile, program, isAzureFlavor);
         }
     }
 }
 export async function emitContentByBuilder(program, builderFnOrList, rlcModels, emitterOutputDir) {
-    var _a, _b;
+    var _a;
     if (!Array.isArray(builderFnOrList)) {
         builderFnOrList = [builderFnOrList];
     }
-    const isBranded = (_b = (_a = rlcModels === null || rlcModels === void 0 ? void 0 : rlcModels.options) === null || _a === void 0 ? void 0 : _a.branded) !== null && _b !== void 0 ? _b : true;
+    const isAzureFlavor = ((_a = rlcModels === null || rlcModels === void 0 ? void 0 : rlcModels.options) === null || _a === void 0 ? void 0 : _a.flavor) === "azure";
     for (const builderFn of builderFnOrList) {
         let contentFiles = builderFn(rlcModels);
         if (!contentFiles) {
@@ -31,16 +31,16 @@ export async function emitContentByBuilder(program, builderFnOrList, rlcModels,
             contentFiles = [contentFiles];
         }
         for (const file of contentFiles) {
-            await emitFile(file, program, isBranded, emitterOutputDir);
+            await emitFile(file, program, isAzureFlavor, emitterOutputDir);
         }
     }
 }
-async function emitFile(file, program, isBranded, emitterOutputDir) {
+async function emitFile(file, program, isAzureFlavor, emitterOutputDir) {
     const host = program.host;
     const filePath = join(emitterOutputDir !== null && emitterOutputDir !== void 0 ? emitterOutputDir : "", file.path);
     const isJson = /\.json$/gi.test(filePath);
     const isSourceCode = /\.(ts|js)$/gi.test(filePath);
-    const microsoftHeader = isBranded
+    const microsoftHeader = isAzureFlavor
         ? `// Copyright (c) Microsoft Corporation.\n`
         : "";
     const licenseHeader = `${microsoftHeader}// Licensed under the MIT license.\n`;

package/dist/src/utils/emitUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"emitUtil.js","sourceRoot":"","sources":["../../../src/utils/emitUtil.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAE3E,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,SAAmB,EAAE,OAAgB;;IACpE,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,0CAAE,OAAO,mCAAI,IAAI,CAAC;IACtD,IAAI,YAAY,EAAE;QAChB,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;QACzD,IAAI,cAAc,EAAE;YAClB,MAAM,QAAQ,CAAC,cAAc,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;SACpD;QACD,IAAI,eAAe,EAAE;YACnB,MAAM,QAAQ,CAAC,eAAe,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;SACrD;KACF;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAAgB,EAChB,eAAkD,EAClD,SAAmB,EACnB,gBAAyB;;IAEzB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;QACnC,eAAe,GAAG,CAAC,eAAe,CAAC,CAAC;KACrC;IACD,MAAM,SAAS,GAAG,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,0CAAE,OAAO,mCAAI,IAAI,CAAC;IACtD,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE;QACvC,IAAI,YAAY,GAA8B,SAAS,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,EAAE;YACjB,SAAS;SACV;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAChC,YAAY,GAAG,CAAC,YAAY,CAAC,CAAC;SAC/B;QACD,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;YAC/B,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;SAC5D;KACF;AACH,CAAC;AAED,KAAK,UAAU,QAAQ,CACrB,IAAU,EACV,OAAgB,EAChB,SAAkB,EAClB,gBAAyB;IAEzB,MAAM,IAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,eAAe,GAAG,SAAS;QAC/B,CAAC,CAAC,2CAA2C;QAC7C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,aAAa,GAAG,GAAG,eAAe,sCAAsC,CAAC;IAC/E,IAAI,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC;IAEvC,IAAI,YAAY,EAAE;QAChB,mBAAmB,GAAG,GAAG,aAAa,CAAC,SAAS,EAAE,KAAK,mBAAmB,EAAE,CAAC;KAC9E;IACD,mCAAmC;IACnC,IAAI,MAAM,IAAI,YAAY,EAAE;QAC1B,IAAI;YACF,mBAAmB,GAAG,MAAM,MAAM,CAChC,mBAAmB,EACnB,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,yBAAyB,CACzD,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,0BAA0B,QAAQ,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC;SACT;KACF;IACD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrC,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"emitUtil.js","sourceRoot":"","sources":["../../../src/utils/emitUtil.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAE3E,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,SAAmB,EAAE,OAAgB;;IACpE,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,0CAAE,MAAM,MAAK,OAAO,CAAC;IAC7D,IAAI,YAAY,EAAE;QAChB,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;QACzD,IAAI,cAAc,EAAE;YAClB,MAAM,QAAQ,CAAC,cAAc,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;SACxD;QACD,IAAI,eAAe,EAAE;YACnB,MAAM,QAAQ,CAAC,eAAe,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;SACzD;KACF;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAAgB,EAChB,eAAkD,EAClD,SAAmB,EACnB,gBAAyB;;IAEzB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;QACnC,eAAe,GAAG,CAAC,eAAe,CAAC,CAAC;KACrC;IACD,MAAM,aAAa,GAAG,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,0CAAE,MAAM,MAAK,OAAO,CAAC;IAC7D,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE;QACvC,IAAI,YAAY,GAA8B,SAAS,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,EAAE;YACjB,SAAS;SACV;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAChC,YAAY,GAAG,CAAC,YAAY,CAAC,CAAC;SAC/B;QACD,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;YAC/B,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC;SAChE;KACF;AACH,CAAC;AAED,KAAK,UAAU,QAAQ,CACrB,IAAU,EACV,OAAgB,EAChB,aAAsB,EACtB,gBAAyB;IAEzB,MAAM,IAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,eAAe,GAAG,aAAa;QACnC,CAAC,CAAC,2CAA2C;QAC7C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,aAAa,GAAG,GAAG,eAAe,sCAAsC,CAAC;IAC/E,IAAI,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC;IAEvC,IAAI,YAAY,EAAE;QAChB,mBAAmB,GAAG,GAAG,aAAa,CAAC,SAAS,EAAE,KAAK,mBAAmB,EAAE,CAAC;KAC9E;IACD,mCAAmC;IACnC,IAAI,MAAM,IAAI,YAAY,EAAE;QAC1B,IAAI;YACF,mBAAmB,GAAG,MAAM,MAAM,CAChC,mBAAmB,EACnB,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,yBAAyB,CACzD,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,0BAA0B,QAAQ,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC;SACT;KACF;IACD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrC,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;AACtD,CAAC"}

package/dist/src/utils/modelUtils.d.ts

@@ -27,13 +27,9 @@ export declare function getBodyType(program: Program, route: HttpOperation): Typ
 export declare function predictDefaultValue(dpgContext: SdkContext, param?: ModelProperty): string | number | boolean | undefined;
 export declare function getDefaultService(program: Program): Service | undefined;
 /**
- * Get the default api-version both from versioned and service decorator
- * TODO: remember to switch to TCGC once the fix is done
- * @param program
- * @param dpgContext
- * @returns default api-version value
+ * Return the default api version from the program; undefined if no default
  */
-export declare function getEnrichedDefaultApiVersion(program: Program, dpgContext: SdkContext): string | undefined;
+export declare function getDefaultApiVersionString(program: Program, dpgContext: SdkContext): string | undefined;
 export declare function trimUsage(model: any): any;
 export declare function isAzureCoreErrorType(t?: Type): boolean;
 export declare function isAnonymousObjectSchema(schema: Schema): boolean;

package/dist/src/utils/modelUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modelUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/modelUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAwBL,KAAK,EACL,aAAa,EACb,IAAI,EAUJ,OAAO,EAEP,OAAO,EAKR,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAKL,YAAY,EACZ,MAAM,EACN,aAAa,EACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAKL,aAAa,EAGd,MAAM,gBAAgB,CAAC;AAOxB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI/D,eAAO,MAAM,iBAAiB,6EAC8C,CAAC;AAE7E,eAAO,MAAM,0BAA0B,oFAAgC,CAAC;AAExE,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,EAAE,6FAInD;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,WAGnE;AA8BD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,GAAG,OAkBjD;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,EACf,OAAO,CAAC,EAAE,gBAAgB,OAsF3B;AACD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAe5E;AACD,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,KAAK,EACZ,OAAO,GAAE,OAAe,GACvB,OAAO,CAST;AA2/BD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,aAAa,EAAE,GAAG,MAAM,CAG3E;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,aAAa,EAAE,GACtB,MAAM,CAyBR;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,aAAa,EAAE,GACtB,MAAM,EAAE,CAoDV;AA+CD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,aAAa,GAAG,IAAI,EAC1B,UAAU,EAAE,GAAG,EACf,QAAQ,GAAE,MAAe,sBAW1B;AAED,wBAAgB,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,aAAa,GACnB,IAAI,GAAG,SAAS,CAWlB;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,KAAK,CAAC,EAAE,aAAa,yCAmBtB;AAoBD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAevE;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACrB,MAAM,GAAG,SAAS,CAcpB;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,OAanC;AAED,wBAAgB,oBAAoB,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,OAAO,CAetD;AAGD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,WAErD;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,WAK9C;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,YAAY,EACpB,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAAC,KAAK,CAAC,EAAE,aAAa,EAAE,CAAA;CAAO,UAwBxE"}
+{"version":3,"file":"modelUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/modelUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAwBL,KAAK,EACL,aAAa,EACb,IAAI,EASJ,OAAO,EAEP,OAAO,EAKR,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAKL,YAAY,EACZ,MAAM,EACN,aAAa,EACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAKL,aAAa,EAGd,MAAM,gBAAgB,CAAC;AAQxB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI/D,eAAO,MAAM,iBAAiB,6EAC8C,CAAC;AAE7E,eAAO,MAAM,0BAA0B,oFAAgC,CAAC;AAExE,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,EAAE,6FAInD;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,WAGnE;AA8BD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,GAAG,OAkBjD;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,EACf,OAAO,CAAC,EAAE,gBAAgB,OAsF3B;AACD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAmB5E;AACD,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,KAAK,EACZ,OAAO,GAAE,OAAe,GACvB,OAAO,CAST;AA6gCD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,aAAa,EAAE,GAAG,MAAM,CAG3E;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,aAAa,EAAE,GACtB,MAAM,CAyBR;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,aAAa,EAAE,GACtB,MAAM,EAAE,CAoDV;AA+CD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,aAAa,GAAG,IAAI,EAC1B,UAAU,EAAE,GAAG,EACf,QAAQ,GAAE,MAAe,sBAW1B;AAED,wBAAgB,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,aAAa,GACnB,IAAI,GAAG,SAAS,CAWlB;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,KAAK,CAAC,EAAE,aAAa,yCAmBtB;AAoBD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAevE;AACD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACrB,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,OAanC;AAED,wBAAgB,oBAAoB,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,OAAO,CAetD;AAGD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,WAErD;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,WAK9C;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,YAAY,EACpB,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAAC,KAAK,CAAC,EAAE,aAAa,EAAE,CAAA;CAAO,UAwBxE"}

package/dist/src/utils/modelUtils.js

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { getDiscriminator, getDoc, getEffectiveModelType, getFormat, getFriendlyName, getMaxLength, getMaxValue, getMinLength, getMinValue, getPattern, getProperty, getPropertyType, getSummary, getVisibility, isNeverType, isNumericType, isSecret, isStringType, isTemplateDeclaration, isUnknownType, isNullType, getProjectedName, NoTarget, listServices, getEncode, isRecordModelType, isArrayModelType } from "@typespec/compiler";
+import { getDiscriminator, getDoc, getEffectiveModelType, getFormat, getFriendlyName, getMaxLength, getMaxValue, getMinLength, getMinValue, getPattern, getProperty, getPropertyType, getSummary, getVisibility, isNeverType, isNumericType, isSecret, isStringType, isTemplateDeclaration, isUnknownType, isNullType, NoTarget, listServices, getEncode, isRecordModelType, isArrayModelType } from "@typespec/compiler";
 import { reportDiagnostic } from "../lib.js";
 import { NameType, normalizeName, SchemaContext } from "@azure-tools/rlc-common";
 import { getHeaderFieldName, getPathParamName, getQueryParamName, isStatusCode, createMetadataInfo, Visibility } from "@typespec/http";
 import { getPagedResult, isFixed } from "@azure-tools/typespec-azure-core";
 import { extractPagedMetadataNested } from "./operationUtil.js";
-import { getDefaultApiVersion, isApiVersion } from "@azure-tools/typespec-client-generator-core";
+import { getDefaultApiVersion, getWireName, isApiVersion } from "@azure-tools/typespec-client-generator-core";
 import { getModelNamespaceName } from "./namespaceUtils.js";
 import { KnownMediaType, hasMediaType } from "./mediaTypes.js";
 export const BINARY_TYPE_UNION = "string | Uint8Array | ReadableStream<Uint8Array> | NodeJS.ReadableStream";
@@ -132,7 +132,7 @@ export function getSchemaForType(dpgContext, typeInput, options) {
         return getSchemaForEnumMember(program, type);
     }
     if (isUnknownType(type)) {
-        const returnType = { type: "unknown" };
+        const returnType = { name: "unknown", type: "unknown" };
         if (usage && usage.includes(SchemaContext.Output)) {
             returnType.outputTypeName = "any";
             returnType.typeName = "unknown";
@@ -140,10 +140,10 @@ export function getSchemaForType(dpgContext, typeInput, options) {
         return returnType;
     }
     if (isNeverType(type)) {
-        return { type: "never" };
+        return { name: "never", type: "never" };
     }
     if (isNullType(type)) {
-        return { type: "null" };
+        return { name: "null", type: "null" };
     }
     reportDiagnostic(program, {
         code: "invalid-schema",
@@ -153,7 +153,11 @@ export function getSchemaForType(dpgContext, typeInput, options) {
     return undefined;
 }
 export function getEffectiveModelFromType(program, type) {
-    if (type.kind === "Model") {
+    /**
+     * If type is an anonymous model, tries to find a named model that has the same
+     * set of properties when non-schema properties are excluded.
+     */
+    if (type.kind === "Model" && type.name === "") {
         const effective = getEffectiveModelType(program, type, isSchemaProperty);
         if (effective.name) {
             return effective;
@@ -282,12 +286,15 @@ function getSchemaForUnion(dpgContext, union, options) {
         else {
             schema.type = "union";
             schema.typeName = (_a = union.name) !== null && _a !== void 0 ? _a : unionAlias;
+            schema.outputTypeName = union.name
+                ? union.name + "Output"
+                : outputUnionAlias;
         }
     }
     return schema;
 }
 function getSchemaForUnionVariant(dpgContext, variant, options) {
-    return getSchemaForType(dpgContext, variant, options);
+    return getSchemaForType(dpgContext, variant.type, options);
 }
 // An openapi "string" can be defined in several different ways in typespec
 function isOasString(type) {
@@ -303,6 +310,10 @@ function isOasString(type) {
         // A union where all variants are an OasString
         return type.options.every((o) => isOasString(o));
     }
+    else if (type.kind === "UnionVariant") {
+        // A union variant where the type is an OasString
+        return isOasString(type.type);
+    }
     return false;
 }
 function isStringLiteral(type) {
@@ -310,7 +321,8 @@ function isStringLiteral(type) {
     return (type.kind === "String" ||
         (type.kind === "Union" && type.options.every((o) => o.kind === "String")) ||
         (type.kind === "EnumMember" &&
-            typeof ((_a = type.value) !== null && _a !== void 0 ? _a : type.name) === "string"));
+            typeof ((_a = type.value) !== null && _a !== void 0 ? _a : type.name) === "string") ||
+        (type.kind === "UnionVariant" && type.type.kind === "String"));
 }
 // Return any string literal values for type
 function getStringValues(type) {
@@ -324,6 +336,8 @@ function getStringValues(type) {
                 .filter((x) => x !== undefined);
         case "EnumMember":
             return typeof type.value !== "number" ? [(_a = type.value) !== null && _a !== void 0 ? _a : type.name] : [];
+        case "UnionVariant":
+            return getStringValues(type.type);
         default:
             return [];
     }
@@ -419,15 +433,13 @@ function getSchemaForModel(dpgContext, model, options) {
         return getSchemaForArrayModel(dpgContext, model, options);
     }
     const program = dpgContext.program;
-    const overridedModelName = (_a = getFriendlyName(program, model)) !== null && _a !== void 0 ? _a : getProjectedName(program, model, "json");
-    const fullNamespaceName = overridedModelName !== null && overridedModelName !== void 0 ? overridedModelName : getModelNamespaceName(dpgContext, model.namespace)
+    const overridedModelName = (_a = getFriendlyName(program, model)) !== null && _a !== void 0 ? _a : getWireName(dpgContext, model);
+    const fullNamespaceName = getModelNamespaceName(dpgContext, model.namespace)
         .map((nsName) => {
         return normalizeName(nsName, NameType.Interface);
     })
         .join("") + model.name;
-    let name = ((_b = dpgContext.rlcOptions) === null || _b === void 0 ? void 0 : _b.enableModelNamespace)
-        ? fullNamespaceName
-        : model.name;
+    let name = model.name;
     if (!overridedModelName &&
         model.templateMapper &&
         model.templateMapper.args &&
@@ -448,7 +460,11 @@ function getSchemaForModel(dpgContext, model, options) {
                 .join("") + "List";
     }
     const modelSchema = {
-        name: overridedModelName !== null && overridedModelName !== void 0 ? overridedModelName : name,
+        name: overridedModelName !== name
+            ? overridedModelName
+            : ((_b = dpgContext.rlcOptions) === null || _b === void 0 ? void 0 : _b.enableModelNamespace)
+                ? fullNamespaceName
+                : name,
         type: "object",
         description: (_c = getDoc(program, model)) !== null && _c !== void 0 ? _c : ""
     };
@@ -547,7 +563,7 @@ function getSchemaForModel(dpgContext, model, options) {
         };
     }
     for (const [propName, prop] of model.properties) {
-        const restApiName = getProjectedName(program, prop, "json");
+        const restApiName = getWireName(dpgContext, prop);
         const name = `"${restApiName !== null && restApiName !== void 0 ? restApiName : propName}"`;
         if (!isSchemaProperty(program, prop)) {
             continue;
@@ -576,7 +592,14 @@ function getSchemaForModel(dpgContext, model, options) {
         if (propertyName &&
             name === `"${propertyName}"` &&
             modelSchema.discriminator) {
-            modelSchema.discriminator.type = (_p = propSchema.typeName) !== null && _p !== void 0 ? _p : propSchema.type;
+            modelSchema.discriminator = {
+                ...modelSchema.discriminator,
+                ...{
+                    type: (_p = propSchema.typeName) !== null && _p !== void 0 ? _p : propSchema.type,
+                    typeName: propSchema.typeName,
+                    outputTypeName: propSchema.outputTypeName
+                }
+            };
             continue;
         }
         // Apply decorators on the property to the type's schema
@@ -654,10 +677,6 @@ function applyIntrinsicDecorators(program, type, target) {
     if (isString && !(target === null || target === void 0 ? void 0 : target.documentation) && docStr) {
         newTarget.description = docStr;
     }
-    const restApiName = getProjectedName(program, type, "json");
-    if (restApiName) {
-        newTarget.name = restApiName;
-    }
     const summaryStr = getSummary(program, type);
     if (isString && !target.summary && summaryStr) {
         newTarget.summary = summaryStr;
@@ -700,8 +719,12 @@ function getSchemaForEnumMember(program, e) {
 }
 function getSchemaForEnum(dpgContext, e) {
     const values = [];
-    const type = enumMemberType(e.members.values().next().value);
-    for (const option of e.members.values()) {
+    const memberValues = Array.from(e.members.values());
+    if (memberValues.length === 0) {
+        return {};
+    }
+    const type = enumMemberType(memberValues[0]);
+    for (const option of memberValues) {
         if (type !== enumMemberType(option)) {
             reportDiagnostic(dpgContext.program, {
                 code: "union-unsupported",
@@ -725,7 +748,8 @@ function getSchemaForEnum(dpgContext, e) {
     return schema;
 }
 function enumMemberType(member) {
-    if (typeof member.value === "number") {
+    const memberValue = member.value;
+    if (typeof memberValue === "number") {
         return "number";
     }
     return "string";
@@ -1205,7 +1229,7 @@ export function predictDefaultValue(dpgContext, param) {
     if (!serviceNamespace) {
         return;
     }
-    const defaultApiVersion = getEnrichedDefaultApiVersion(program, dpgContext);
+    const defaultApiVersion = getDefaultApiVersionString(program, dpgContext);
     if (param && isApiVersion(dpgContext, param) && defaultApiVersion) {
         return defaultApiVersion;
     }
@@ -1239,22 +1263,13 @@ export function getDefaultService(program) {
     return services[0];
 }
 /**
- * Get the default api-version both from versioned and service decorator
- * TODO: remember to switch to TCGC once the fix is done
- * @param program
- * @param dpgContext
- * @returns default api-version value
+ * Return the default api version from the program; undefined if no default
  */
-export function getEnrichedDefaultApiVersion(program, dpgContext) {
-    const serviceNamespace = getDefaultService(program);
-    if (!serviceNamespace) {
-        return;
-    }
-    const defaultVersion = getDefaultApiVersion(dpgContext, serviceNamespace.type);
-    if (defaultVersion) {
-        return defaultVersion.value;
-    }
-    return serviceNamespace.version;
+export function getDefaultApiVersionString(program, dpgContext) {
+    var _a;
+    return getDefaultService(program)
+        ? (_a = getDefaultApiVersion(dpgContext, getDefaultService(program).type)) === null || _a === void 0 ? void 0 : _a.value
+        : undefined;
 }
 export function trimUsage(model) {
     if (typeof model !== "object") {