@typespec/prettier-plugin-typespec 0.66.0-dev.0 → 0.67.0-dev.0

package/dist/index.js

@@ -446,7 +446,9 @@ const diagnostics = {
         severity: "error",
         messages: {
             default: `Augment decorator first argument must be a type reference.`,
-            noInstance: `Cannot reference template instances`,
+            noInstance: `Cannot reference template instances.`,
+            noModelExpression: `Cannot augment model expressions.`,
+            noUnionExpression: `Cannot augment union expressions.`,
         },
     },
     "duplicate-decorator": {
@@ -1110,6 +1112,9 @@ const diagnostics = {
         severity: "error",
         messages: {
             default: paramMessage `Union variant "${"name"}" must be a model type.`,
+            noEnvelopeModel: paramMessage `Union variant "${"name"}" must be a model type when the union has envelope: none.`,
+            discriminantMismatch: paramMessage `Variant "${"name"}" explicitly defines the discriminator property "${"discriminant"}" but the value "${"propertyValue"}" do not match the variant name "${"variantName"}".`,
+            duplicateDefaultVariant: `Discriminated union only allow a single default variant(Without a variant name).`,
             noDiscriminant: paramMessage `Variant "${"name"}" type is missing the discriminant property "${"discriminant"}".`,
             wrongDiscriminantType: paramMessage `Variant "${"name"}" type's discriminant property "${"discriminant"}" must be a string literal or string enum member.`,
         },
@@ -1292,12 +1297,28 @@ const diagnostics = {
             default: "Cannot apply both string (legacy) visibility modifiers and enum-based visibility modifiers to a property.",
         },
     },
+    "visibility-legacy": {
+        severity: "warning",
+        messages: {
+            default: paramMessage `String (legacy) visibility modifier '${"modifier"}' is deprecated and will be removed in TypeSpec version 1.0-rc. Use '${"newModifier"}' instead.`,
+            unrecognized: paramMessage `String (legacy) visibility modifier '${"modifier"}' is not recognized. This warning will become an error in TypeSpec 1.0-rc.`,
+            none: "String (legacy) visibility modifier 'none' should be replaced with '@invisible(Lifecycle)'. This warning will become an error in TypeSpec 1.0-rc.",
+        },
+    },
     "default-visibility-not-member": {
         severity: "error",
         messages: {
             default: "The default visibility modifiers of a class must be members of the class enum.",
         },
     },
+    "operation-visibility-constraint-empty": {
+        severity: "warning",
+        messages: {
+            default: "Operation visibility constraints with no arguments are deprecated and will become an error in TypeSpec version 1.0-rc.",
+            returnType: "Return type visibility constraints with no arguments are deprecated and will become an error in TypeSpec version 1.0-rc.",
+            parameter: "Parameter visibility constraints with no arguments are deprecated and will become an error in TypeSpec version 1.0-rc. To disable effective PATCH optionality, use @patch(#{ implicitOptionality: false }) instead.",
+        },
+    },
     // #endregion
     // #region CLI
     "no-compatible-vs-installed": {
@@ -1415,6 +1436,9 @@ function compilerAssert(condition, message, target) {
     }
     throw new Error(message);
 }
+function defineCodeFix(fix) {
+    return fix;
+}
 
 //
 // Generated by scripts/regen-nonascii-map.js
@@ -2235,6 +2259,52 @@ function lookupInNonAsciiMap(codePoint, map) {
     return false;
 }
 
+function createTripleQuoteIndentCodeFix(location) {
+    return defineCodeFix({
+        id: "triple-quote-indent",
+        label: "Format triple-quote-indent",
+        fix: (context) => {
+            const splitStr = "\n";
+            const tripleQuote = '"""';
+            const tripleQuoteLen = tripleQuote.length;
+            const text = location.file.text.slice(location.pos + tripleQuoteLen, location.end - tripleQuoteLen);
+            const lines = splitLines(text);
+            if (lines.length === 0) {
+                return;
+            }
+            if (lines.length === 1) {
+                const indentNumb = getIndentNumbInLine(lines[0]);
+                const prefix = " ".repeat(indentNumb);
+                return context.replaceText(location, [tripleQuote, lines[0], `${prefix}${tripleQuote}`].join(splitStr));
+            }
+            if (lines[0].trim() === "") {
+                lines.shift();
+            }
+            const lastLine = lines[lines.length - 1];
+            if (lastLine.trim() === "") {
+                lines.pop();
+            }
+            let prefix = "";
+            const minIndentNumb = Math.min(...lines.map((line) => getIndentNumbInLine(line)));
+            const lastLineIndentNumb = getIndentNumbInLine(lastLine);
+            if (minIndentNumb < lastLineIndentNumb) {
+                const indentDiff = lastLineIndentNumb - minIndentNumb;
+                prefix = " ".repeat(indentDiff);
+            }
+            const middle = lines.map((line) => `${prefix}${line}`).join(splitStr);
+            return context.replaceText(location, `${tripleQuote}${splitStr}${middle}${splitStr}${" ".repeat(lastLineIndentNumb)}${tripleQuote}`);
+            function getIndentNumbInLine(lineText) {
+                let curStart = 0;
+                while (curStart < lineText.length &&
+                    isWhiteSpaceSingleLine(lineText.charCodeAt(curStart))) {
+                    curStart++;
+                }
+                return curStart;
+            }
+        },
+    });
+}
+
 // All conflict markers consist of the same character repeated seven times.  If it is
 // a <<<<<<< or >>>>>>> marker then it is also followed by a space.
 const mergeConflictMarkerLength = 7;
@@ -3062,9 +3132,6 @@ function createScanner(source, diagnosticHandler) {
             }
             end--;
         }
-        else {
-            error({ code: "no-new-line-end-triple-quote" });
-        }
         return [indentationStart, indentationEnd];
     }
     function unindentAndUnescapeTripleQuotedString(start, end, indentationStart, indentationEnd, token, tokenFlags) {
@@ -3085,7 +3152,10 @@ function createScanner(source, diagnosticHandler) {
                 start++;
             }
             else {
-                error({ code: "no-new-line-start-triple-quote" });
+                error({
+                    code: "no-new-line-start-triple-quote",
+                    codefixes: [createTripleQuoteIndentCodeFix({ file, pos: tokenPosition, end: position })],
+                });
             }
         }
         if (token === Token.StringLiteral || token === Token.StringTemplateTail) {
@@ -3100,7 +3170,10 @@ function createScanner(source, diagnosticHandler) {
                 end--;
             }
             else {
-                error({ code: "no-new-line-end-triple-quote" });
+                error({
+                    code: "no-new-line-end-triple-quote",
+                    codefixes: [createTripleQuoteIndentCodeFix({ file, pos: tokenPosition, end: position })],
+                });
             }
         }
         let skipUnindentOnce = false;
@@ -3171,7 +3244,10 @@ function createScanner(source, diagnosticHandler) {
                 break;
             }
             if (ch !== input.charCodeAt(indentationPos)) {
-                error({ code: "triple-quote-indent" });
+                error({
+                    code: "triple-quote-indent",
+                    codefixes: [createTripleQuoteIndentCodeFix({ file, pos: tokenPosition, end: position })],
+                });
                 break;
             }
             indentationPos++;
@@ -3381,6 +3457,77 @@ function getTokenDisplayTable(entries) {
     return table;
 }
 
+/**
+ * Print a string as a TypeSpec identifier. If the string is a valid identifier, return it as is otherwise wrap it into backticks.
+ * @param sv Identifier string value.
+ * @returns Identifier string as it would be represented in a TypeSpec file.
+ *
+ * @example
+ * ```ts
+ * printIdentifier("foo") // foo
+ * printIdentifier("foo bar") // `foo bar`
+ * ```
+ */
+function printIdentifier$1(sv) {
+    if (needBacktick(sv)) {
+        const escapedString = sv
+            .replace(/\\/g, "\\\\")
+            .replace(/\n/g, "\\n")
+            .replace(/\r/g, "\\r")
+            .replace(/\t/g, "\\t")
+            .replace(/`/g, "\\`");
+        return `\`${escapedString}\``;
+    }
+    else {
+        return sv;
+    }
+}
+function needBacktick(sv) {
+    if (sv.length === 0) {
+        return false;
+    }
+    if (Keywords.has(sv)) {
+        return true;
+    }
+    let cp = sv.codePointAt(0);
+    if (!isIdentifierStart(cp)) {
+        return true;
+    }
+    let pos = 0;
+    do {
+        pos += utf16CodeUnits(cp);
+    } while (pos < sv.length && isIdentifierContinue((cp = sv.codePointAt(pos))));
+    return pos < sv.length;
+}
+function splitLines(text) {
+    const lines = [];
+    let start = 0;
+    let pos = 0;
+    while (pos < text.length) {
+        const ch = text.charCodeAt(pos);
+        switch (ch) {
+            case 13 /* CharCode.CarriageReturn */:
+                if (text.charCodeAt(pos + 1) === 10 /* CharCode.LineFeed */) {
+                    lines.push(text.slice(start, pos));
+                    start = pos + 2;
+                    pos++;
+                }
+                else {
+                    lines.push(text.slice(start, pos));
+                    start = pos + 1;
+                }
+                break;
+            case 10 /* CharCode.LineFeed */:
+                lines.push(text.slice(start, pos));
+                start = pos + 1;
+                break;
+        }
+        pos++;
+    }
+    lines.push(text.slice(start));
+    return lines;
+}
+
 /**
  * The fixed set of options for each of the kinds of delimited lists in TypeSpec.
  */
@@ -6427,49 +6574,6 @@ function isBlocklessNamespace(node) {
     return node.statements === undefined;
 }
 
-/**
- * Print a string as a TypeSpec identifier. If the string is a valid identifier, return it as is otherwise wrap it into backticks.
- * @param sv Identifier string value.
- * @returns Identifier string as it would be represented in a TypeSpec file.
- *
- * @example
- * ```ts
- * printIdentifier("foo") // foo
- * printIdentifier("foo bar") // `foo bar`
- * ```
- */
-function printIdentifier$1(sv) {
-    if (needBacktick(sv)) {
-        const escapedString = sv
-            .replace(/\\/g, "\\\\")
-            .replace(/\n/g, "\\n")
-            .replace(/\r/g, "\\r")
-            .replace(/\t/g, "\\t")
-            .replace(/`/g, "\\`");
-        return `\`${escapedString}\``;
-    }
-    else {
-        return sv;
-    }
-}
-function needBacktick(sv) {
-    if (sv.length === 0) {
-        return false;
-    }
-    if (Keywords.has(sv)) {
-        return true;
-    }
-    let cp = sv.codePointAt(0);
-    if (!isIdentifierStart(cp)) {
-        return true;
-    }
-    let pos = 0;
-    do {
-        pos += utf16CodeUnits(cp);
-    } while (pos < sv.length && isIdentifierContinue((cp = sv.codePointAt(pos))));
-    return pos < sv.length;
-}
-
 var yu=Object.create;var vt=Object.defineProperty;var Au=Object.getOwnPropertyDescriptor;var vu=Object.getOwnPropertyNames;var Bu=Object.getPrototypeOf,wu=Object.prototype.hasOwnProperty;var fr=e=>{throw TypeError(e)};var dr=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports),Bt=(e,t)=>{for(var r in t)vt(e,r,{get:t[r],enumerable:true});},_u=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let u of vu(t))!wu.call(e,u)&&u!==r&&vt(e,u,{get:()=>t[u],enumerable:!(n=Au(t,u))||n.enumerable});return e};var Me=(e,t,r)=>(r=e!=null?yu(Bu(e)):{},_u(vt(r,"default",{value:e,enumerable:true}),e));var xu=(e,t,r)=>t.has(e)||fr("Cannot "+r);var pr=(e,t,r)=>t.has(e)?fr("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(e):t.set(e,r);var pe=(e,t,r)=>(xu(e,t,"access private method"),r);var st=dr((na,Fn)=>{var pn=new Proxy(String,{get:()=>pn});Fn.exports=pn;});var Wn=dr(nr=>{Object.defineProperty(nr,"__esModule",{value:true});function Bi(){return new Proxy({},{get:()=>e=>e})}var Hn=/\r\n|[\n\r\u2028\u2029]/;function wi(e,t,r){let n=Object.assign({column:0,line:-1},e.start),u=Object.assign({},n,e.end),{linesAbove:i=2,linesBelow:o=3}=r||{},s=n.line,a=n.column,D=u.line,l=u.column,p=Math.max(s-(i+1),0),f=Math.min(t.length,D+o);s===-1&&(p=0),D===-1&&(f=t.length);let d=D-s,c={};if(d)for(let F=0;F<=d;F++){let m=F+s;if(!a)c[m]=true;else if(F===0){let h=t[m-1].length;c[m]=[a,h-a+1];}else if(F===d)c[m]=[0,l];else {let h=t[m-F].length;c[m]=[0,h];}}else a===l?a?c[s]=[a,0]:c[s]=true:c[s]=[a,l-a];return {start:p,end:f,markerLines:c}}function _i(e,t,r={}){let u=Bi(),i=e.split(Hn),{start:o,end:s,markerLines:a}=wi(t,i,r),D=t.start&&typeof t.start.column=="number",l=String(s).length,f=e.split(Hn,s).slice(o,s).map((d,c)=>{let F=o+1+c,h=` ${` ${F}`.slice(-l)} |`,C=a[F],v=!a[F+1];if(C){let E="";if(Array.isArray(C)){let g=d.slice(0,Math.max(C[0]-1,0)).replace(/[^\t]/g," "),j=C[1]||1;E=[`
  `,u.gutter(h.replace(/\d/g," "))," ",g,u.marker("^").repeat(j)].join(""),v&&r.message&&(E+=" "+u.message(r.message));}return [u.marker(">"),u.gutter(h),d.length>0?` ${d}`:"",E].join("")}else return ` ${u.gutter(h)}${d.length>0?` ${d}`:""}`}).join(`
 `);return r.message&&!D&&(f=`${" ".repeat(l+1)}${r.message}
@@ -9067,34 +9171,6 @@ function printStringTemplateExpression(path, options, print) {
         return content;
     }
 }
-function splitLines(text) {
-    const lines = [];
-    let start = 0;
-    let pos = 0;
-    while (pos < text.length) {
-        const ch = text.charCodeAt(pos);
-        switch (ch) {
-            case 13 /* CharCode.CarriageReturn */:
-                if (text.charCodeAt(pos + 1) === 10 /* CharCode.LineFeed */) {
-                    lines.push(text.slice(start, pos));
-                    start = pos;
-                    pos++;
-                }
-                else {
-                    lines.push(text.slice(start, pos));
-                    start = pos;
-                }
-                break;
-            case 10 /* CharCode.LineFeed */:
-                lines.push(text.slice(start, pos));
-                start = pos;
-                break;
-        }
-        pos++;
-    }
-    lines.push(text.slice(start));
-    return lines;
-}
 function trimMultilineString(lines, whitespaceIndent) {
     const newLines = [];
     for (let i = 0; i < lines.length; i++) {