@azure-tools/typespec-rust 0.28.0 → 0.30.0

package/dist/src/tcgcadapter/adapter.d.ts.map

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

package/dist/src/tcgcadapter/adapter.js

@@ -5,7 +5,7 @@
 // cspell: ignore addl responseheader subclients lropaging
 import * as codegen from '@azure-tools/codegen';
 import { values } from '@azure-tools/linq';
-import { NoTarget } from '@typespec/compiler';
+import * as tsp from '@typespec/compiler';
 import * as helpers from './helpers.js';
 import * as naming from './naming.js';
 import * as shared from '../shared/shared.js';
@@ -21,7 +21,7 @@ export class AdapterError extends Error {
     constructor(code, message, target) {
         super(message);
         this.code = code;
-        this.target = target !== null && target !== void 0 ? target : NoTarget;
+        this.target = target !== null && target !== void 0 ? target : tsp.NoTarget;
     }
 }
 /**
@@ -99,8 +99,12 @@ export class Adapter {
     }
     /** converts all tcgc types to their Rust type equivalent */
     adaptTypes() {
+        var _a;
         for (const sdkUnion of this.ctx.sdkPackage.unions.filter(u => u.kind === 'union')) {
-            const rustUnion = this.getUnion(sdkUnion);
+            if (!sdkUnion.discriminatedOptions) {
+                throw new AdapterError('UnsupportedTsp', 'non-discriminated unions are not supported', (_a = sdkUnion.__raw) === null || _a === void 0 ? void 0 : _a.node);
+            }
+            const rustUnion = this.getDiscriminatedUnion(sdkUnion);
             this.crate.unions.push(rustUnion);
         }
         for (const sdkEnum of this.ctx.sdkPackage.enums) {
@@ -112,6 +116,7 @@ export class Adapter {
             const rustEnum = this.getEnum(sdkEnum);
             this.crate.enums.push(rustEnum);
         }
+        const processedTypes = new Set();
         for (const model of this.ctx.sdkPackage.models) {
             if ((model.usage & tcgc.UsageFlags.Input) === 0 && (model.usage & tcgc.UsageFlags.Output) === 0 && (model.usage & tcgc.UsageFlags.Spread) === 0) {
                 // skip types without input and output usage. this will include core
@@ -119,6 +124,14 @@ export class Adapter {
                 // we keep the models for spread params as we internally use them.
                 continue;
             }
+            // TODO: workaround for https://github.com/Azure/typespec-azure/issues/3614
+            if (processedTypes.has(model.name)) {
+                continue;
+            }
+            else {
+                processedTypes.add(model.name);
+            }
+            // END workaround
             const rustModel = this.getModel(model);
             this.crate.models.push(rustModel);
         }
@@ -159,7 +172,7 @@ export class Adapter {
             default:
                 throw new AdapterError('UnsupportedTsp', `unsupported enum underlying type ${sdkEnum.valueType.kind}`, (_a = sdkEnum.__raw) === null || _a === void 0 ? void 0 : _a.node);
         }
-        rustEnum = new rust.Enum(enumName, sdkEnum.access === 'public', !sdkEnum.isFixed, enumType);
+        rustEnum = new rust.Enum(enumName, adaptAccessFlags(sdkEnum.access), !sdkEnum.isFixed, enumType);
         rustEnum.docs = this.adaptDocs(sdkEnum.summary, sdkEnum.doc);
         this.types.set(enumName, rustEnum);
         const rustEnumNameToSdkEnumName = new Map();
@@ -208,7 +221,9 @@ export class Adapter {
         if (modelName.length === 0) {
             throw new AdapterError('InternalError', 'unnamed model', (_a = model.__raw) === null || _a === void 0 ? void 0 : _a.node); // TODO: this might no longer be an issue
         }
-        modelName = codegen.capitalize(modelName);
+        // remove any non-word characters from the name.
+        // the most common case is something like Foo.Bar.Baz
+        modelName = codegen.capitalize(modelName).replace(/\W/g, '');
         let rustModel = this.types.get(modelName);
         if (rustModel) {
             return rustModel;
@@ -285,70 +300,14 @@ export class Adapter {
         stack.pop();
         return rustModel;
     }
-    /**
-     * Gets properties of a TypeSpec union
-     *
-     * @param union tcgc union to convert
-     * @returns TypeSpec union properties
-     */
-    // TODO: Rewrite getting information from __raw?.node after https://github.com/microsoft/typespec/issues/8455 is implemented
-    getUnionProperties(union) {
-        var _a;
-        const result = {
-            discriminatorValues: new Map(),
-            discriminatorPropertyName: 'kind',
-            envelopePropertyName: 'value'
-        };
-        /*
-          eslint-disable
-            @typescript-eslint/no-explicit-any,
-            @typescript-eslint/no-unnecessary-type-assertion,
-            @typescript-eslint/no-unsafe-argument,
-            @typescript-eslint/no-unsafe-assignment,
-            @typescript-eslint/no-unsafe-member-access
-          */
-        const tspRawNode = (_a = union.__raw) === null || _a === void 0 ? void 0 : _a.node;
-        if (tspRawNode) {
-            for (const unionMember of Array.from(tspRawNode.symbol.members)) {
-                const discriminatorValue = unionMember[0];
-                const discriminatorTypeName = unionMember[1].node.value.target.sv;
-                result.discriminatorValues.set(discriminatorTypeName, discriminatorValue);
-            }
-            for (const decorator of tspRawNode.decorators) {
-                if (decorator.target.sv === 'discriminated') {
-                    const argument = decorator.arguments[0];
-                    if (argument) {
-                        for (const property of argument.properties) {
-                            const propertyName = property.id.sv;
-                            const propertyValue = property.value.value;
-                            if (propertyName === 'envelope') {
-                                if (propertyValue === 'none') {
-                                    result.envelopePropertyName = '';
-                                }
-                            }
-                            else if (propertyName === 'discriminatorPropertyName') {
-                                result.discriminatorPropertyName = propertyValue;
-                            }
-                            else if (propertyName === 'envelopePropertyName') {
-                                result.envelopePropertyName = propertyValue;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        /* eslint-enable */
-        return result;
-    }
     /**
      * converts a tcgc union to a Rust union
      *
      * @param union the tcgc union to convert
-     * @param stack is a stack of model type names used to detect recursive type definitions
      * @returns a Rust union
      */
-    getUnion(union, stack) {
-        var _a, _b, _c;
+    getDiscriminatedUnion(union) {
+        var _a, _b, _c, _d;
         if (union.name.length === 0) {
             throw new AdapterError('InternalError', 'unnamed union', (_a = union.__raw) === null || _a === void 0 ? void 0 : _a.node);
         }
@@ -357,31 +316,45 @@ export class Adapter {
         if (rustUnion) {
             return rustUnion;
         }
-        // no stack means this is the first model in
-        // the chain of potentially recursive calls
-        if (!stack) {
-            stack = new Array();
+        if (!union.discriminatedOptions) {
+            // we should have verified this earlier.
+            // having this check means the compiler won't bark
+            // at us when accessing union.discriminatedOptions
+            throw new AdapterError('InternalError', 'getDiscriminatedUnion called for non-discriminated union', (_b = union.__raw) === null || _b === void 0 ? void 0 : _b.node);
         }
-        stack.push(unionName);
-        const tspUnionProperties = this.getUnionProperties(union);
-        rustUnion = new rust.Union(unionName, union.access === 'public', tspUnionProperties.discriminatorPropertyName, tspUnionProperties.envelopePropertyName);
+        rustUnion = new rust.DiscriminatedUnion(unionName, adaptAccessFlags(union.access), union.discriminatedOptions.discriminatorPropertyName);
+        rustUnion.envelopeName = union.discriminatedOptions.envelopePropertyName;
         rustUnion.docs = this.adaptDocs(union.summary, union.doc);
         this.types.set(unionName, rustUnion);
+        // TODO: remove when https://github.com/microsoft/typespec/issues/8455 is complete
+        const discriminatorValues = new Map();
+        const rawUnion = union.__raw;
+        if (rawUnion) {
+            for (const [variantKey, variant] of rawUnion.variants) {
+                const discriminatorValue = typeof variantKey === 'string' ? variantKey : variantKey.toString();
+                if (variant.type.kind === 'Model') {
+                    discriminatorValues.set(variant.type.name, discriminatorValue);
+                }
+                else {
+                    throw new AdapterError('InternalError', `unexpected kind ${variant.type.kind} for discriminated union member`, rawUnion);
+                }
+            }
+        }
+        // END WORKAROUND
         for (const unionMember of union.variantTypes) {
-            const unionMemberType = this.getType(unionMember, stack);
-            if (unionMemberType.kind !== 'model' || unionMember.kind !== 'model') {
-                throw new AdapterError('UnsupportedTsp', `non-model union member`, (_b = unionMember.__raw) === null || _b === void 0 ? void 0 : _b.node);
+            if (unionMember.kind !== 'model') {
+                throw new AdapterError('UnsupportedTsp', `non-model union member kind ${unionMember.kind}`, (_c = unionMember.__raw) === null || _c === void 0 ? void 0 : _c.node);
             }
-            const discriminatorValue = tspUnionProperties.discriminatorValues.get(unionMember.name);
+            // TODO: use unionMember.discriminatorValue
+            const discriminatorValue = discriminatorValues.get(unionMember.name);
             if (!discriminatorValue) {
-                throw new AdapterError('InternalError', `unmatched discriminator`, (_c = union.__raw) === null || _c === void 0 ? void 0 : _c.node);
+                throw new AdapterError('InternalError', `didn't find discriminant value for type ${unionMember.name}`, (_d = unionMember.__raw) === null || _d === void 0 ? void 0 : _d.node);
             }
-            const unionMemberName = unionMemberType.name;
-            const rustUnionMember = new rust.UnionMember(unionMemberName, unionMemberType, discriminatorValue);
+            const unionMemberType = this.getModel(unionMember);
+            const rustUnionMember = new rust.DiscriminatedUnionMember(unionMemberType, discriminatorValue);
             rustUnionMember.docs = this.adaptDocs(unionMember.summary, unionMember.doc);
             rustUnion.members.push(rustUnionMember);
         }
-        stack.pop();
         return rustUnion;
     }
     getSerializedPropertyName(property) {
@@ -446,14 +419,20 @@ export class Adapter {
      * @returns the adapted Rust type
      */
     getType(type, stack) {
-        var _a, _b;
+        var _a, _b, _c;
         const getDateTimeEncoding = (encoding) => {
+            var _a;
             switch (encoding) {
+                case 'rfc3339-fixed-width':
+                    this.crate.addDependency(new rust.CrateDependency('time'));
+                    return encoding;
                 case 'rfc3339':
                 case 'rfc7231':
                     return encoding;
                 case 'unixTimestamp':
                     return 'unix_time';
+                default:
+                    throw new AdapterError('UnsupportedTsp', `unhandled date-time encoding ${encoding}`, (_a = type.__raw) === null || _a === void 0 ? void 0 : _a.node);
             }
         };
         switch (type.kind) {
@@ -578,10 +557,13 @@ export class Adapter {
                 return timeType;
             }
             case 'union': {
-                return this.getUnion(type);
+                if (!type.discriminatedOptions) {
+                    throw new AdapterError('UnsupportedTsp', 'non-discriminated unions are not supported', (_b = type.__raw) === null || _b === void 0 ? void 0 : _b.node);
+                }
+                return this.getDiscriminatedUnion(type);
             }
             default:
-                throw new AdapterError('UnsupportedTsp', `unhandled tcgc type ${type.kind}`, (_b = type.__raw) === null || _b === void 0 ? void 0 : _b.node);
+                throw new AdapterError('UnsupportedTsp', `unhandled tcgc type ${type.kind}`, (_c = type.__raw) === null || _c === void 0 ? void 0 : _c.node);
         }
     }
     /** returns a Box type */
@@ -846,6 +828,7 @@ export class Adapter {
             clientOptionsField.defaultValue = 'ClientOptions::default()';
             clientOptionsStruct.fields.push(clientOptionsField);
             rustClient.constructable = new rust.ClientConstruction(new rust.ClientOptions(clientOptionsStruct));
+            rustClient.constructable.suppressed = this.options['omit-constructors'];
             clientOptionsStruct.docs.summary = `Options used when creating a ${this.asDocLink(rustClient.name, rustClient.name)}`;
             // NOTE: per tcgc convention, if there is no param of kind credential
             // it means that the client doesn't require any kind of authentication.
@@ -883,7 +866,7 @@ export class Adapter {
                             code: 'UnsupportedAuthenticationScheme',
                             severity: 'warning',
                             message: `authentication scheme ${cred.type} is not supported`,
-                            target: (_b = (_a = param.__raw) === null || _a === void 0 ? void 0 : _a.node) !== null && _b !== void 0 ? _b : NoTarget,
+                            target: (_b = (_a = param.__raw) === null || _a === void 0 ? void 0 : _a.node) !== null && _b !== void 0 ? _b : tsp.NoTarget,
                         });
                         return AuthTypes.WithAuth;
                 }
@@ -1012,7 +995,7 @@ export class Adapter {
                     code: 'LroPagingNotSupported',
                     severity: 'warning',
                     message: `skip emitting Paging LRO ${method.name}`,
-                    target: (_d = (_c = method.__raw) === null || _c === void 0 ? void 0 : _c.node) !== null && _d !== void 0 ? _d : NoTarget,
+                    target: (_d = (_c = method.__raw) === null || _c === void 0 ? void 0 : _c.node) !== null && _d !== void 0 ? _d : tsp.NoTarget,
                 });
                 continue;
             }
@@ -1076,6 +1059,9 @@ export class Adapter {
         // client-side default value makes the param optional
         if (param.optional || param.clientDefaultValue) {
             optional = true;
+            if (!param.clientDefaultValue) {
+                paramType = this.getOptionType(this.typeToWireType(paramType));
+            }
             const paramField = new rust.StructField(paramName, 'pub', paramType);
             paramField.docs = this.adaptDocs(param.summary, param.doc);
             constructable.options.type.fields.push(paramField);
@@ -1148,7 +1134,7 @@ export class Adapter {
                 code: 'PagingMethodRename',
                 severity: 'warning',
                 message: `renamed paging method from ${method.name} to ${srcMethodName}`,
-                target: (_b = (_a = method.__raw) === null || _a === void 0 ? void 0 : _a.node) !== null && _b !== void 0 ? _b : NoTarget,
+                target: (_b = (_a = method.__raw) === null || _a === void 0 ? void 0 : _a.node) !== null && _b !== void 0 ? _b : tsp.NoTarget,
             });
         }
         const languageIndependentName = method.crossLanguageDefinitionId;
@@ -1180,7 +1166,7 @@ export class Adapter {
         const methodOptionsField = new rust.StructField('method_options', 'pub', clientMethodOptions);
         methodOptionsField.docs.summary = 'Allows customization of the method call.';
         methodOptionsStruct.fields.push(methodOptionsField);
-        const pub = method.access === 'public' ? 'pub' : 'pubCrate';
+        const pub = adaptAccessFlags(method.access);
         const methodOptions = new rust.MethodOptions(methodOptionsStruct);
         const httpMethod = method.operation.verb;
         let rustMethod;
@@ -1523,14 +1509,15 @@ export class Adapter {
         // adapt the response headers and add them to the trait
         for (const header of responseHeaders) {
             let responseHeader;
+            const lowerCasedHeader = header.serializedName.toLowerCase();
             if (header.type.kind === 'dict') {
                 if (header.serializedName !== 'x-ms-meta' && header.serializedName !== 'x-ms-or') {
                     throw new AdapterError('InternalError', `unexpected response header collection ${header.serializedName}`, header.__raw.node);
                 }
-                responseHeader = new rust.ResponseHeaderHashMap(snakeCaseName(header.name), header.serializedName);
+                responseHeader = new rust.ResponseHeaderHashMap(snakeCaseName(header.name), lowerCasedHeader);
             }
             else {
-                responseHeader = new rust.ResponseHeaderScalar(snakeCaseName(header.name), fixETagName(header.serializedName), this.typeToWireType(this.getType(header.type)));
+                responseHeader = new rust.ResponseHeaderScalar(snakeCaseName(header.name), fixETagName(lowerCasedHeader), this.typeToWireType(this.getType(header.type)));
             }
             responseHeader.docs = this.adaptDocs(header.summary, header.doc);
             responseHeadersMap.set(header, responseHeader);
@@ -1759,7 +1746,7 @@ export class Adapter {
             }
             return param.name;
         };
-        const paramName = naming.getEscapedReservedName(snakeCaseName(getCorrespondingClientParamName(param)), 'param');
+        const paramName = naming.getEscapedReservedName(snakeCaseName(getCorrespondingClientParamName(param)), 'param', reservedParams);
         let paramType = this.getType(param.type);
         // for required header/path/query method string params, we might emit them as borrowed types
         if (!param.optional && !param.onClient && (param.kind === 'header' || param.kind === 'path' || param.kind === 'query')) {
@@ -1964,6 +1951,7 @@ export class Adapter {
         switch (type.kind) {
             case 'bytes':
             case 'decimal':
+            case 'discriminatedUnion':
             case 'encodedBytes':
             case 'enum':
             case 'enumValue':
@@ -1979,8 +1967,6 @@ export class Adapter {
             case 'slice':
             case 'str':
             case 'String':
-            case 'union':
-            case 'unionMember':
             case 'Url':
             case 'Vec':
                 return type;
@@ -2224,4 +2210,17 @@ function hasClientNameDecorator(decorators) {
 function isHttpStatusCodeRange(statusCode) {
     return statusCode.start !== undefined;
 }
+/**
+ * converts tcgc's access flags (which aren't really flags) to visibility
+ * @param access the access flag to convert
+ * @returns the flag converted to visibility
+ */
+function adaptAccessFlags(access) {
+    return access === 'public' ? 'pub' : 'pubCrate';
+}
+/** contains reserved param names */
+const reservedParams = new Set([
+    // reserved per SDK guidelines
+    'options',
+]);
 //# sourceMappingURL=adapter.js.map