@azure-tools/typespec-ts 0.15.0 → 0.16.0-alpha.20230918.1

package/dist/src/modular/buildCodeModel.js

@@ -1,14 +1,13 @@
 import { getPagedResult, isFixed } from "@azure-tools/typespec-azure-core";
-import { getDoc, getFriendlyName, getMaxLength, getMaxValue, getMinLength, getMinValue, getPattern, getSummary, getVisibility, ignoreDiagnostics, isErrorModel, isNeverType, getEffectiveModelType, getDiscriminator, isKey, isStringType, getPropertyType, isNumericType, getFormat, getMinItems, getMaxItems, listServices, getProjectedName, isNullType, getEncode, isTemplateDeclarationOrInstance } from "@typespec/compiler";
-import { getAuthentication, getHeaderFieldName, getHttpOperation, getPathParamName, getQueryParamName, getServers, isStatusCode, isHeader } from "@typespec/http";
+import { getDoc, getFriendlyName, getMaxLength, getMaxValue, getMinLength, getMinValue, getPattern, getSummary, getVisibility, ignoreDiagnostics, isErrorModel, isNeverType, getEffectiveModelType, getDiscriminator, isKey, isStringType, getPropertyType, isNumericType, getMinItems, getMaxItems, listServices, getProjectedName, isNullType, getEncode, isTemplateDeclarationOrInstance, getFormat } from "@typespec/compiler";
+import { getAuthentication, getHeaderFieldName, getPathParamName, getQueryParamName, getServers, isStatusCode, isHeader, getHttpOperation } from "@typespec/http";
 import { getAddedOnVersions } from "@typespec/versioning";
-import { listClients, listOperationGroups, listOperationsInOperationGroup, isApiVersion, getDefaultApiVersion, getClientNamespaceString, createSdkContext, getSdkUnion, getAllModels, getSdkSimpleType } from "@azure-tools/typespec-client-generator-core";
+import { listClients, listOperationGroups, listOperationsInOperationGroup, isApiVersion, getDefaultApiVersion, getClientNamespaceString, getSdkUnion, getAllModels, getSdkSimpleType } from "@azure-tools/typespec-client-generator-core";
 import { getResourceOperation } from "@typespec/rest";
-import { transformRLCOptions } from "../transform/transfromRLCOptions.js";
-import { getEnrichedDefaultApiVersion } from "../utils/modelUtils.js";
+import { getEnrichedDefaultApiVersion, isAzureCoreErrorType } from "../utils/modelUtils.js";
 import { camelToSnakeCase, toCamelCase } from "../utils/casingUtils.js";
-import { getClientName } from "@azure-tools/rlc-common";
-import { getOperationGroupName, getOperationName } from "../utils/operationUtil.js";
+import { getClientName, NameType, normalizeName } from "@azure-tools/rlc-common";
+import { getOperationGroupName, getOperationName, isIgnoredHeaderParam } from "../utils/operationUtil.js";
 let CASING = "snake";
 function applyCasing(name, options = { casing: "snake" }) {
     if (options.casing === "camel") {
@@ -28,7 +27,8 @@ function isSimpleType(program, type) {
             getMaxValue,
             getMinLength,
             getMaxLength,
-            getPattern
+            getPattern,
+            getEncode
         ];
         for (const func of funcs) {
             if (func(program, type)) {
@@ -50,34 +50,37 @@ function isLro(_program, operation) {
     }
     return false;
 }
-function handleDiscriminator(context, type, model) {
+function isDiscriminator(context, type, propertyName) {
+    const discriminator = getDiscriminator(context.program, type);
+    if (discriminator && discriminator.propertyName === propertyName) {
+        return true;
+    }
+    return false;
+}
+function handleDiscriminator(context, type) {
     const discriminator = getDiscriminator(context.program, type);
     if (discriminator) {
-        let discriminatorProperty;
+        const discriminatorValues = [];
         for (const childModel of type.derivedModels) {
             const modelType = getType(context, childModel);
             for (const property of modelType.properties) {
                 if (property.restApiName === discriminator.propertyName) {
                     modelType.discriminatorValue = property.type.value;
-                    property.isDiscriminator = true;
-                    model.discriminatedSubtypes[property.type.value] = modelType;
-                    discriminatorProperty = property;
+                    discriminatorValues.push(modelType.discriminatorValue);
                 }
             }
         }
-        // it is not included in properties of cadl but needed by python codegen
-        if (discriminatorProperty) {
-            const discriminatorType = { ...discriminatorProperty.type };
-            discriminatorType.value = null;
-            const propertyCopy = {
-                ...discriminatorProperty,
+        // it is not included in properties of typespec but needed by python codegen
+        if (discriminatorValues.length > 0) {
+            const discriminatorInfo = {
+                description: `the discriminator possible values ${discriminatorValues.join(", ")}`,
                 isPolymorphic: true,
-                type: discriminatorType
+                isDiscriminator: true
             };
-            propertyCopy.description = "";
-            model.properties.push(propertyCopy);
+            return discriminatorInfo;
         }
     }
+    return undefined;
 }
 function getEffectiveSchemaType(program, type) {
     var _a;
@@ -125,14 +128,18 @@ function processModelProperties(context, newValue, model) {
         if (newValue.properties === undefined || newValue.properties === null) {
             newValue.properties = [];
         }
-        newValue.properties.push(emitProperty(context, property));
+        let newProperty = emitProperty(context, property);
+        if (isDiscriminator(context, model, property.name)) {
+            newProperty = { ...newProperty, ...handleDiscriminator(context, model) };
+        }
+        newValue.properties.push(newProperty);
     }
     // need to do discriminator outside `emitModel` to avoid infinite recursion
-    handleDiscriminator(context, model, newValue);
+    // handleDiscriminator(context, model, newValue);
 }
 function getType(context, type, options = {}) {
     // don't cache simple type(string, int, etc) since decorators may change the result
-    const enableCache = !isSimpleType(context.program, type) && !isEmptyModel(type);
+    const enableCache = !isSimpleType(context.program, type);
     const effectiveModel = !options.disableEffectiveModel &&
         (type.kind === "Model" || type.kind === "Union")
         ? getEffectiveSchemaType(context.program, type)
@@ -151,6 +158,9 @@ function getType(context, type, options = {}) {
     else {
         newValue = emitType(context, type);
     }
+    if (type.kind === "ModelProperty" || type.kind === "Scalar") {
+        newValue = applyEncoding(context.program, type, newValue);
+    }
     if (enableCache) {
         typesMap.set(effectiveModel, newValue);
         if (type.kind === "Union") {
@@ -187,11 +197,14 @@ function emitParamBase(program, parameter) {
     let name;
     let description = "";
     let addedOn;
+    let format;
     if (parameter.kind === "ModelProperty") {
+        const newParameter = applyEncoding(program, parameter, parameter);
         optional = parameter.optional;
         name = parameter.name;
         description = getDocStr(program, parameter);
         addedOn = getAddedOnVersion(program, parameter);
+        format = newParameter.format;
     }
     else {
         optional = false;
@@ -202,7 +215,8 @@ function emitParamBase(program, parameter) {
         description,
         addedOn,
         clientName: applyCasing(name, { casing: CASING }),
-        inOverload: false
+        inOverload: false,
+        format
     };
 }
 function getBodyType(program, route) {
@@ -266,6 +280,7 @@ function emitBodyParameter(context, httpOperation) {
     };
 }
 function emitParameter(context, parameter, implementation) {
+    var _a;
     const base = emitParamBase(context.program, parameter.param);
     let type = getType(context, parameter.param.type);
     let clientDefaultValue = undefined;
@@ -279,9 +294,10 @@ function emitParameter(context, parameter, implementation) {
     const paramMap = {
         restApiName: parameter.name,
         location: parameter.type,
-        type: type,
+        type: base.format ? { ...type, format: base.format } : type,
         implementation: implementation,
-        skipUrlEncoding: parameter.type === "endpointPath"
+        skipUrlEncoding: parameter.type === "endpointPath",
+        format: (_a = parameter.format) !== null && _a !== void 0 ? _a : base.format
     };
     if (paramMap.type.type === "constant") {
         clientDefaultValue = paramMap.type.value;
@@ -352,19 +368,6 @@ function emitResponseHeaders(context, headers) {
     }
     return retval;
 }
-function isAzureCoreErrorType(t) {
-    var _a;
-    if ((t === null || t === void 0 ? void 0 : t.kind) !== "Model" ||
-        !["Error", "ErrorResponse", "InnerError"].includes(t.name))
-        return false;
-    const namespaces = ".Azure.Core.Foundations".split(".");
-    while (namespaces.length > 0 &&
-        ((t === null || t === void 0 ? void 0 : t.kind) === "Model" || (t === null || t === void 0 ? void 0 : t.kind) === "Namespace") &&
-        ((_a = t.namespace) === null || _a === void 0 ? void 0 : _a.name) === namespaces.pop()) {
-        t = t.namespace;
-    }
-    return namespaces.length == 0;
-}
 function emitResponse(context, response, innerResponse) {
     var _a, _b;
     let type = undefined;
@@ -468,6 +471,9 @@ function emitBasicOperation(context, operation, operationGroupName, rlcModels) {
             op.path === sourceRoutePath);
     });
     for (const param of httpOperation.parameters.parameters) {
+        if (isIgnoredHeaderParam(param)) {
+            continue;
+        }
         const emittedParam = emitParameter(context, param, "Method");
         if (isApiVersion(context, param) && apiVersionParam === undefined) {
             apiVersionParam = emittedParam;
@@ -482,7 +488,7 @@ function emitBasicOperation(context, operation, operationGroupName, rlcModels) {
         for (const innerResponse of response.responses) {
             const emittedResponse = emitResponse(context, response, innerResponse);
             if (isErrorModel(context.program, response.type)) {
-                // * is valid status code in cadl but invalid for autorest.python
+                // * is valid status code in typespec but invalid for autorest.python
                 if (response.statusCode === "*") {
                     exceptions.push(emittedResponse);
                 }
@@ -532,7 +538,7 @@ function emitBasicOperation(context, operation, operationGroupName, rlcModels) {
     };
 }
 function isReadOnly(program, type) {
-    // https://microsoft.github.io/cadl/standard-library/rest/operations#automatic-visibility
+    // https://microsoft.github.io/typespec/standard-library/http/operations#automatic-visibility
     // Only "read" should be readOnly
     const visibility = getVisibility(program, type);
     if (visibility) {
@@ -543,7 +549,8 @@ function isReadOnly(program, type) {
     }
 }
 function emitProperty(context, property) {
-    var _a, _b;
+    var _a, _b, _c;
+    const newProperty = applyEncoding(context.program, property, property);
     let clientDefaultValue = undefined;
     const propertyDefaultKind = (_a = property.default) === null || _a === void 0 ? void 0 : _a.kind;
     if (property.default &&
@@ -552,21 +559,26 @@ function emitProperty(context, property) {
             propertyDefaultKind === "Boolean")) {
         clientDefaultValue = property.default.value;
     }
+    if (propertyDefaultKind === "EnumMember") {
+        clientDefaultValue = (_b = property.default.value) !== null && _b !== void 0 ? _b : property.default.name;
+    }
     // const [clientName, jsonName] = getPropertyNames(context, property);
     const clientName = property.name;
-    const jsonName = (_b = getProjectedName(context.program, property, "json")) !== null && _b !== void 0 ? _b : property.name;
+    const jsonName = (_c = getProjectedName(context.program, property, "json")) !== null && _c !== void 0 ? _c : property.name;
     if (property.model) {
         getType(context, property.model);
     }
+    const type = getType(context, property.type);
     return {
         clientName: applyCasing(clientName, { casing: CASING }),
         restApiName: jsonName,
-        type: getType(context, property.type),
+        type: newProperty.format ? { ...type, format: newProperty.format } : type,
         optional: property.optional,
         description: getDocStr(context.program, property),
         addedOn: getAddedOnVersion(context.program, property),
         readonly: isReadOnly(context.program, property) || isKey(context.program, property),
-        clientDefaultValue: clientDefaultValue
+        clientDefaultValue: clientDefaultValue,
+        format: newProperty.format
     };
 }
 function getName(program, type) {
@@ -589,6 +601,7 @@ function getName(program, type) {
     }
 }
 function emitModel(context, type) {
+    var _a, _b;
     // Now we know it's a defined model
     const properties = [];
     let baseModel = undefined;
@@ -596,9 +609,27 @@ function emitModel(context, type) {
         baseModel = getType(context, type.baseModel);
     }
     const effectiveName = getEffectiveSchemaType(context.program, type).name;
-    const modelName = effectiveName
-        ? effectiveName
-        : getName(context.program, type);
+    const overridedModelName = (_b = (_a = getProjectedName(context.program, type, "javascript")) !== null && _a !== void 0 ? _a : getProjectedName(context.program, type, "client")) !== null && _b !== void 0 ? _b : getFriendlyName(context.program, type);
+    let modelName = overridedModelName !== null && overridedModelName !== void 0 ? overridedModelName : (effectiveName ? effectiveName : getName(context.program, type));
+    if (!overridedModelName &&
+        type.templateMapper &&
+        type.templateMapper.args &&
+        type.templateMapper.args.length > 0 &&
+        getPagedResult(context.program, type)) {
+        modelName =
+            type.templateMapper.args
+                .map((it) => {
+                switch (it.kind) {
+                    case "Model":
+                        return it.name;
+                    case "String":
+                        return it.value;
+                    default:
+                        return "";
+                }
+            })
+                .join("") + "List";
+    }
     return {
         type: "model",
         name: modelName,
@@ -690,9 +721,11 @@ function emitCredentialUnion(cred_types) {
     return result;
 }
 function emitStdScalar(program, scalar) {
+    var _a, _b;
+    const newScalar = applyEncoding(program, scalar, scalar);
     switch (scalar.name) {
         case "bytes":
-            return { type: "byte-array", format: getEncode(program, scalar) };
+            return { type: "byte-array", format: newScalar.format };
         case "int8":
         case "int16":
         case "int32":
@@ -714,31 +747,55 @@ function emitStdScalar(program, scalar) {
         case "boolean":
             return { type: "boolean" };
         case "plainDate":
-            return { type: "date" };
+            return { type: "datetime", format: (_a = newScalar.format) !== null && _a !== void 0 ? _a : "date" };
         case "utcDateTime":
-            return { type: "datetime", format: "date-time" };
+            return { type: "datetime", format: newScalar.format };
         case "plainTime":
-            return { type: "time" };
+            return { type: "datetime", format: (_b = newScalar.format) !== null && _b !== void 0 ? _b : "time" };
+        case "offsetDateTime":
+            return { type: "string" };
         case "duration":
-            return { type: "duration" };
+            return { type: "duration", format: newScalar.format };
         case "numeric":
             return {}; // Waiting on design for more precise type https://github.com/microsoft/cadl/issues/1260
         default:
             return {};
     }
 }
+function applyEncoding(program, typespecType, target = {}) {
+    const encodeData = getEncode(program, typespecType);
+    const formatData = getFormat(program, typespecType);
+    formatData;
+    if (encodeData) {
+        const newTarget = { ...target };
+        const newType = emitScalar(program, encodeData.type);
+        // newTarget["type"] = newType["type"];
+        // If the target already has a format it takes priority. (e.g. int32)
+        newTarget["format"] = mergeFormatAndEncoding(newTarget.format, encodeData.encoding, newType["format"]);
+        return newTarget;
+    }
+    return target;
+}
+function mergeFormatAndEncoding(format, encoding, encodeAsFormat) {
+    switch (format) {
+        case undefined:
+            return encodeAsFormat !== null && encodeAsFormat !== void 0 ? encodeAsFormat : encoding;
+        case "date-time":
+            return encoding;
+        case "duration":
+        default:
+            return encodeAsFormat !== null && encodeAsFormat !== void 0 ? encodeAsFormat : encoding;
+    }
+}
 function applyIntrinsicDecorators(program, type, result) {
-    const newResult = { ...result };
+    let newResult = { ...result };
     const docStr = getDoc(program, type);
     const isString = isStringType(program, getPropertyType(type));
     const isNumeric = isNumericType(program, getPropertyType(type));
     if (!result.description && docStr) {
         newResult.description = docStr;
     }
-    const formatStr = getFormat(program, type);
-    if (isString && !result.format && formatStr) {
-        newResult.format = formatStr;
-    }
+    newResult = applyEncoding(program, type, newResult);
     const pattern = getPattern(program, type);
     if (isString && !result.pattern && pattern) {
         newResult.pattern = pattern;
@@ -771,7 +828,8 @@ function applyIntrinsicDecorators(program, type, result) {
 }
 function emitScalar(program, scalar) {
     let result = {};
-    if (program.checker.isStdType(scalar)) {
+    const isStd = program.checker.isStdType(scalar);
+    if (isStd) {
         result = emitStdScalar(program, scalar);
     }
     else if (scalar.baseScalar) {
@@ -799,7 +857,7 @@ function emitListOrDict(context, type) {
     }
     return undefined;
 }
-function mapCadlType(context, type) {
+function mapTypeSpecType(context, type) {
     switch (type.kind) {
         case "Number":
             return constantType(type.value, intOrFloat(type.value));
@@ -893,7 +951,7 @@ function emitType(context, type) {
     if (type.kind === "CredentialTypeUnion") {
         return emitCredentialUnion(type);
     }
-    const builtinType = mapCadlType(context, type);
+    const builtinType = mapTypeSpecType(context, type);
     if (builtinType !== undefined) {
         // add in description elements for types derived from primitive types (SecureString, etc.)
         const doc = getDoc(context.program, type);
@@ -944,8 +1002,32 @@ function emitOperationGroups(context, client, rlcModels) {
             operations: clientOperations
         });
     }
+    resolveConflictIfExist(operationGroups);
     return operationGroups;
 }
+function resolveConflictIfExist(operationGroups) {
+    if (operationGroups.length < 2) {
+        return;
+    }
+    const nameSet = new Set();
+    const hasConflict = operationGroups.some((g) => g.operations.some((op) => {
+        if (nameSet.has(op.name)) {
+            return true;
+        }
+        else {
+            nameSet.add(op.name);
+            return false;
+        }
+    }));
+    if (!hasConflict) {
+        return;
+    }
+    // Append operation group prefix
+    operationGroups.forEach((g) => g.operations.forEach((op) => {
+        op.oriName = op.name;
+        op.name = `${g.propertyName}_${op.name}`;
+    }));
+}
 function getServerHelper(program, namespace) {
     const servers = getServers(program, namespace);
     if (servers === undefined) {
@@ -1097,7 +1179,8 @@ function emitClients(context, namespace, rlcModelsMap) {
             operationGroups: emitOperationGroups(context, client, rlcModels),
             url: server ? server.url : "",
             apiVersions: [],
-            rlcClientName: rlcModels ? getClientName(rlcModels) : client.name
+            rlcClientName: rlcModels ? getClientName(rlcModels) : client.name,
+            subfolder: ""
         };
         const emittedApiVersionParam = getApiVersionParameter(context);
         if (emittedApiVersionParam) {
@@ -1125,19 +1208,22 @@ function getNamespaces(context) {
     }
     return namespaces;
 }
-export function emitCodeModel(context, rlcModelsMap, options = { casing: "snake" }) {
-    var _a, _b;
+export function emitCodeModel(dpgContext, rlcModelsMap, modularSourcesRoot, project, options = { casing: "snake" }) {
+    var _a, _b, _c;
     CASING = (_a = options.casing) !== null && _a !== void 0 ? _a : CASING;
-    const dpgContext = createSdkContext(context);
     const clientNamespaceString = (_b = getClientNamespaceString(dpgContext)) === null || _b === void 0 ? void 0 : _b.toLowerCase();
     // Get types
     const codeModel = {
-        options: transformRLCOptions(context.options, dpgContext),
+        options: (_c = dpgContext.rlcOptions) !== null && _c !== void 0 ? _c : {},
+        modularOptions: { sourceRoot: modularSourcesRoot },
         namespace: clientNamespaceString,
         subnamespaceToClients: {},
         clients: [],
-        types: []
+        types: [],
+        project
     };
+    typesMap.clear();
+    simpleTypesMap.clear();
     const allModels = getAllModels(dpgContext);
     for (const model of allModels) {
         getType(dpgContext, model);
@@ -1145,9 +1231,17 @@ export function emitCodeModel(context, rlcModelsMap, options = { casing: "snake"
     for (const namespace of getNamespaces(dpgContext)) {
         if (namespace === clientNamespaceString) {
             codeModel.clients = emitClients(dpgContext, namespace, rlcModelsMap);
+            codeModel.clients.length > 1 &&
+                codeModel.clients.map((client) => {
+                    client["subfolder"] = normalizeName(client.name.replace("Client", ""), NameType.File);
+                });
         }
         else {
             codeModel["subnamespaceToClients"][namespace] = emitClients(dpgContext, namespace, rlcModelsMap);
+            codeModel["subnamespaceToClients"][namespace].length > 1 &&
+                codeModel["subnamespaceToClients"][namespace].map((client) => {
+                    client["subfolder"] = normalizeName(client.name, NameType.File);
+                });
         }
     }
     codeModel["types"] = [