@azure-tools/typespec-azure-core 0.40.0-dev.5 → 0.40.0-dev.7

package/dist/src/rules/no-enum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-enum.d.ts","sourceRoot":"","sources":["../../../src/rules/no-enum.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU;;EAqBrB,CAAC"}
+{"version":3,"file":"no-enum.d.ts","sourceRoot":"","sources":["../../../src/rules/no-enum.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,UAAU;;EAsBrB,CAAC"}

package/dist/src/rules/no-enum.js

@@ -1,4 +1,4 @@
-import { createRule, paramMessage } from "@typespec/compiler";
+import { SyntaxKind, createRule, getPositionBeforeTrivia, getSourceLocation, paramMessage, } from "@typespec/compiler";
 import { getVersionsForEnum } from "@typespec/versioning";
 export const noEnumRule = createRule({
     name: "no-enum",
@@ -17,9 +17,100 @@ export const noEnumRule = createRule({
                 context.reportDiagnostic({
                     format: { enumName: en.name },
                     target: en,
+                    codefixes: [createEnumToExtensibleUnionCodeFix(en)],
                 });
             },
         };
     },
 });
+function createEnumToExtensibleUnionCodeFix(en) {
+    function convertEnumMemberToUnionVariant(node) {
+        switch (node.kind) {
+            case SyntaxKind.EnumSpreadMember:
+                return getSourceLocation(node.target).file.text.slice(node.target.pos, node.target.end);
+            case SyntaxKind.EnumMember:
+                return node.value
+                    ? `${node.id.sv}: ${node.value.kind === SyntaxKind.NumericLiteral
+                        ? node.value.value
+                        : `"${node.value.value}"`}`
+                    : `"${node.id.sv}"`;
+        }
+    }
+    return {
+        id: "enum-to-extensible-union",
+        label: "Convert to extensible union",
+        fix(context) {
+            const type = typeof [...en.members.values()][0].value === "number" ? "number" : "string";
+            const indent = getIndent(en.node);
+            const script = getTypeSpecScript(en.node);
+            if (script === undefined) {
+                return [];
+            }
+            return [
+                context.replaceText(getSourceLocation(en.node), [
+                    getNodeAnnotations(en.node),
+                    `union ${en.name} {\n`,
+                    `${indent}  `,
+                    `${type},\n`,
+                    ...en.node.members.map((member) => {
+                        return `${getNodeTrivia(script, member)}${getNodeAnnotations(member)}${convertEnumMemberToUnionVariant(member)},`;
+                    }),
+                    getNodeTrivia(script, en.node.end - 1),
+                    "}",
+                ].join("")),
+            ];
+        },
+    };
+}
+function getIndent(node) {
+    const source = getSourceLocation(node).file.text;
+    const start = source.lastIndexOf("\n", node.pos);
+    return source.slice(start + 1, node.pos);
+}
+function getTypeSpecScript(node) {
+    let root = node;
+    while (root.parent !== undefined) {
+        root = root.parent;
+    }
+    if (root.kind !== SyntaxKind.TypeSpecScript) {
+        return undefined;
+    }
+    return root;
+}
+function getNodeTrivia(root, node) {
+    const end = typeof node === "number" ? node : node.pos;
+    const pos = getPositionBeforeTrivia(root, end);
+    return root.file.text.slice(pos, end);
+}
+function getNodeAnnotations(node) {
+    var _a, _b, _c;
+    const source = getSourceLocation(node).file.text;
+    let endOfTrivia = node.pos;
+    for (const directive of (_a = node.directives) !== null && _a !== void 0 ? _a : []) {
+        if (directive.end > endOfTrivia) {
+            endOfTrivia = directive.end;
+        }
+    }
+    for (const doc of (_b = node.docs) !== null && _b !== void 0 ? _b : []) {
+        if (doc.end > endOfTrivia) {
+            endOfTrivia = doc.end;
+        }
+    }
+    if ("decorators" in node) {
+        for (const dec of (_c = node.decorators) !== null && _c !== void 0 ? _c : []) {
+            if (dec.end > endOfTrivia) {
+                endOfTrivia = dec.end;
+            }
+        }
+    }
+    for (let i = endOfTrivia; i < node.end; i++) {
+        if (source[i] === " ") {
+            endOfTrivia = i + 1;
+        }
+        else {
+            break;
+        }
+    }
+    return getSourceLocation(node).file.text.slice(node.pos, endOfTrivia);
+}
 //# sourceMappingURL=no-enum.js.map

package/dist/src/rules/no-enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"no-enum.js","sourceRoot":"","sources":["../../../src/rules/no-enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC;IACnC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,sCAAsC;IACnD,QAAQ,EAAE,SAAS;IACnB,GAAG,EAAE,gFAAgF;IACrF,QAAQ,EAAE;QACR,OAAO,EAAE,YAAY,CAAA,6LAA6L;KACnN;IACD,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,IAAI,EAAE,CAAC,EAAQ,EAAE,EAAE;gBACjB,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACvD,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,gBAAgB,CAAC;oBACvB,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,EAAE;oBAC7B,MAAM,EAAE,EAAE;iBACX,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"no-enum.js","sourceRoot":"","sources":["../../../src/rules/no-enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,UAAU,EAEV,UAAU,EACV,uBAAuB,EACvB,iBAAiB,EACjB,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC;IACnC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,sCAAsC;IACnD,QAAQ,EAAE,SAAS;IACnB,GAAG,EAAE,gFAAgF;IACrF,QAAQ,EAAE;QACR,OAAO,EAAE,YAAY,CAAA,6LAA6L;KACnN;IACD,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,IAAI,EAAE,CAAC,EAAQ,EAAE,EAAE;gBACjB,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACvD,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,gBAAgB,CAAC;oBACvB,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,EAAE;oBAC7B,MAAM,EAAE,EAAE;oBACV,SAAS,EAAE,CAAC,kCAAkC,CAAC,EAAE,CAAC,CAAC;iBACpD,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,SAAS,kCAAkC,CAAC,EAAQ;IAClD,SAAS,+BAA+B,CAAC,IAA2C;QAClF,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,UAAU,CAAC,gBAAgB;gBAC9B,OAAO,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1F,KAAK,UAAU,CAAC,UAAU;gBACxB,OAAO,IAAI,CAAC,KAAK;oBACf,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,KACX,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,cAAc;wBAC3C,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK;wBAClB,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,GAC1B,EAAE;oBACJ,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,OAAO;QACL,EAAE,EAAE,0BAA0B;QAC9B,KAAK,EAAE,6BAA6B;QACpC,GAAG,CAAC,OAAO;YACT,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;YACzF,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,MAAM,GAAG,iBAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO;gBACL,OAAO,CAAC,WAAW,CACjB,iBAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,EAC1B;oBACE,kBAAkB,CAAC,EAAE,CAAC,IAAI,CAAC;oBAC3B,SAAS,EAAE,CAAC,IAAI,MAAM;oBACtB,GAAG,MAAM,IAAI;oBACb,GAAG,IAAI,KAAK;oBACZ,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;wBAChC,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,kBAAkB,CAC1D,MAAM,CACP,GAAG,+BAA+B,CAAC,MAAM,CAAC,GAAG,CAAC;oBACjD,CAAC,CAAC;oBACF,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;oBACtC,GAAG;iBACJ,CAAC,IAAI,CAAC,EAAE,CAAC,CACX;aACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,IAAU;IAC3B,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IACjD,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAU;IACnC,IAAI,IAAI,GAAG,IAAI,CAAC;IAEhB,OAAO,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,cAAc,EAAE,CAAC;QAC5C,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,aAAa,CAAC,IAAwB,EAAE,IAAmB;IAClE,MAAM,GAAG,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;IACvD,MAAM,GAAG,GAAG,uBAAuB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/C,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;;IACpC,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IAEjD,IAAI,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC;IAC3B,KAAK,MAAM,SAAS,IAAI,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE,EAAE,CAAC;QAC9C,IAAI,SAAS,CAAC,GAAG,GAAG,WAAW,EAAE,CAAC;YAChC,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,MAAA,IAAI,CAAC,IAAI,mCAAI,EAAE,EAAE,CAAC;QAClC,IAAI,GAAG,CAAC,GAAG,GAAG,WAAW,EAAE,CAAC;YAC1B,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC;QACxB,CAAC;IACH,CAAC;IACD,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,KAAK,MAAM,GAAG,IAAI,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE,EAAE,CAAC;YACxC,IAAI,GAAG,CAAC,GAAG,GAAG,WAAW,EAAE,CAAC;gBAC1B,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5C,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACtB,WAAW,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,MAAM;QACR,CAAC;IACH,CAAC;IAED,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;AACxE,CAAC"}

package/lib/models.tsp

@@ -344,3 +344,14 @@ scalar ipV6Address extends string;
 #suppress "@azure-tools/typespec-autorest/invalid-format" "Foundation."
 @format("eTag")
 scalar eTag extends string;
+
+/**
+ * Represents an Azure geography region where supported resource providers live.
+ *
+ * @example
+ *
+ * ```
+ * WestUS
+ * ```
+ */
+scalar azureLocation extends string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-azure-core",
-  "version": "0.40.0-dev.5",
+  "version": "0.40.0-dev.7",
   "author": "Microsoft Corporation",
   "description": "TypeSpec Azure Core library",
   "homepage": "https://azure.github.io/typespec-azure",