@typespec/compiler 0.46.0-dev.9 → 0.47.0-dev.0

package/dist/src/formatter/parser.js

@@ -1,13 +1,16 @@
 import { getSourceLocation } from "../core/diagnostics.js";
 import { parse as typespecParse, visitChildren } from "../core/parser.js";
 import { SyntaxKind } from "../core/types.js";
+import { mutate } from "../core/util.js";
 export function parse(text, parsers, opts) {
-    const result = typespecParse(text, { comments: true, docs: false });
+    const result = typespecParse(text, { comments: true, docs: true });
     flattenNamespaces(result);
     const errors = result.parseDiagnostics.filter((x) => x.severity === "error");
     if (errors.length > 0 && !result.printable) {
         throw new PrettierParserError(errors[0]);
     }
+    // Remove doc comments as those are handled directly.
+    mutate(result).comments = result.comments.filter((x) => !(x.kind === SyntaxKind.BlockComment && x.parsedAsDocs));
     return result;
 }
 /**

package/dist/src/formatter/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/formatter/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,KAAK,IAAI,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAoB,UAAU,EAAsB,MAAM,kBAAkB,CAAC;AAEpF,MAAM,UAAU,KAAK,CACnB,IAAY,EACZ,OAAyC,EACzC,IAA+C;IAE/C,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAEpE,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAE1B,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;IAC7E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;QAC1C,MAAM,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;KAC1C;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,IAAU;IACnC,aAAa,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB,EAAE;YAC/C,IAAI,OAAO,GAAG,IAAI,CAAC;YACnB,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtB,OAAO,OAAO,CAAC,UAAU,IAAI,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE;gBACzD,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;gBAC7B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aACtB;YACD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE;gBAC3B,GAAG;aACJ,CAAC,CAAC;YACH,iBAAiB,CAAC,OAAO,CAAC,CAAC;SAC5B;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAE5C,YAAmC,KAAiB;;QAClD,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QADY,UAAK,GAAL,KAAK,CAAY;QAElD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,GAAG,GAAG;YACT,KAAK,EAAE,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,mCAAI,CAAC;YACzB,GAAG,EAAE,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,mCAAI,CAAC;SACxB,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/formatter/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,KAAK,IAAI,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAoB,UAAU,EAAsB,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,UAAU,KAAK,CACnB,IAAY,EACZ,OAAyC,EACzC,IAA+C;IAE/C,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnE,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAE1B,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;IAC7E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;QAC1C,MAAM,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;KAC1C;IACD,qDAAqD;IACrD,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAC9C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,YAAY,IAAI,CAAC,CAAC,YAAY,CAAC,CAC/D,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,IAAU;IACnC,aAAa,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB,EAAE;YAC/C,IAAI,OAAO,GAAG,IAAI,CAAC;YACnB,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtB,OAAO,OAAO,CAAC,UAAU,IAAI,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE;gBACzD,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;gBAC7B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aACtB;YACD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE;gBAC3B,GAAG;aACJ,CAAC,CAAC;YACH,iBAAiB,CAAC,OAAO,CAAC,CAAC;SAC5B;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAE5C,YAAmC,KAAiB;;QAClD,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QADY,UAAK,GAAL,KAAK,CAAY;QAElD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,GAAG,GAAG;YACT,KAAK,EAAE,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,mCAAI,CAAC;YACzB,GAAG,EAAE,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,mCAAI,CAAC;SACxB,CAAC;IACJ,CAAC;CACF"}

package/dist/src/formatter/print/comment-handler.d.ts

@@ -1,5 +1,5 @@
 import { Printer } from "prettier";
-import { Node } from "../../core/index.js";
+import { Node } from "../../core/types.js";
 /**
  * Override the default behavior to attach comments to syntax node.
  */

package/dist/src/formatter/print/comment-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comment-handler.d.ts","sourceRoot":"","sources":["../../../../src/formatter/print/comment-handler.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAc,MAAM,qBAAqB,CAAC;AASvD;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAK1D,CAAC"}
+{"version":3,"file":"comment-handler.d.ts","sourceRoot":"","sources":["../../../../src/formatter/print/comment-handler.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAkC,MAAM,qBAAqB,CAAC;AAU3E;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAQ1D,CAAC"}

package/dist/src/formatter/print/comment-handler.js

@@ -1,11 +1,16 @@
 import prettier from "prettier";
-import { SyntaxKind } from "../../core/index.js";
+import { SyntaxKind } from "../../core/types.js";
 const { util } = prettier;
 /**
  * Override the default behavior to attach comments to syntax node.
  */
 export const commentHandler = {
-    ownLine: (comment) => [addEmptyInterfaceComment, addEmptyModelComment, addStatementDecoratorComment].some((x) => x(comment)),
+    ownLine: (comment, text, options, ast, isLastComment) => [
+        addEmptyInterfaceComment,
+        addEmptyModelComment,
+        addStatementDecoratorComment,
+        handleOnlyComments,
+    ].some((x) => x({ comment, text, options, ast: ast, isLastComment })),
 };
 /**
  * When a comment is on an empty interface make sure it gets added as a dangling comment on it and not on the identifier.
@@ -16,7 +21,7 @@ export const commentHandler = {
  *   // My comment
  * }
  */
-function addEmptyInterfaceComment(comment) {
+function addEmptyInterfaceComment({ comment }) {
     const { precedingNode, enclosingNode } = comment;
     if (enclosingNode &&
         enclosingNode.kind === SyntaxKind.InterfaceStatement &&
@@ -39,7 +44,7 @@ function addEmptyInterfaceComment(comment) {
  * model Foo {
  * }
  */
-function addStatementDecoratorComment(comment) {
+function addStatementDecoratorComment({ comment }) {
     const { enclosingNode, precedingNode } = comment;
     if (precedingNode &&
         precedingNode.kind === SyntaxKind.DecoratorExpression &&
@@ -48,6 +53,8 @@ function addStatementDecoratorComment(comment) {
             enclosingNode.kind === SyntaxKind.ModelStatement ||
             enclosingNode.kind === SyntaxKind.EnumStatement ||
             enclosingNode.kind === SyntaxKind.OperationStatement ||
+            enclosingNode.kind === SyntaxKind.ScalarStatement ||
+            enclosingNode.kind === SyntaxKind.InterfaceStatement ||
             enclosingNode.kind === SyntaxKind.ModelProperty ||
             enclosingNode.kind === SyntaxKind.EnumMember ||
             enclosingNode.kind === SyntaxKind.UnionStatement)) {
@@ -65,7 +72,7 @@ function addStatementDecoratorComment(comment) {
  *   // My comment
  * }
  */
-function addEmptyModelComment(comment) {
+function addEmptyModelComment({ comment }) {
     const { precedingNode, enclosingNode } = comment;
     if (enclosingNode &&
         enclosingNode.kind === SyntaxKind.ModelStatement &&
@@ -79,4 +86,29 @@ function addEmptyModelComment(comment) {
     }
     return false;
 }
+function handleOnlyComments({ comment, ast, isLastComment }) {
+    var _a, _b;
+    const { enclosingNode } = comment;
+    if (((_a = ast === null || ast === void 0 ? void 0 : ast.statements) === null || _a === void 0 ? void 0 : _a.length) === 0) {
+        if (isLastComment) {
+            util.addDanglingComment(ast, comment, undefined);
+        }
+        else {
+            util.addLeadingComment(ast, comment);
+        }
+        return true;
+    }
+    if ((enclosingNode === null || enclosingNode === void 0 ? void 0 : enclosingNode.kind) === SyntaxKind.TypeSpecScript &&
+        enclosingNode.statements.length === 0 &&
+        ((_b = enclosingNode.directives) === null || _b === void 0 ? void 0 : _b.length) === 0) {
+        if (isLastComment) {
+            util.addDanglingComment(enclosingNode, comment, undefined);
+        }
+        else {
+            util.addLeadingComment(enclosingNode, comment);
+        }
+        return true;
+    }
+    return false;
+}
 //# sourceMappingURL=comment-handler.js.map

package/dist/src/formatter/print/comment-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"comment-handler.js","sourceRoot":"","sources":["../../../../src/formatter/print/comment-handler.ts"],"names":[],"mappings":"AAAA,OAAO,QAAqB,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAQ,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;AAO1B;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAoC;IAC7D,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CACnB,CAAC,wBAAwB,EAAE,oBAAoB,EAAE,4BAA4B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACxF,CAAC,CAAC,OAAO,CAAC,CACX;CACJ,CAAC;AAEF;;;;;;;;GAQG;AACH,SAAS,wBAAwB,CAAC,OAAoB;IACpD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,IACE,aAAa;QACb,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB;QACpD,aAAa,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;QACrC,aAAa;QACb,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,UAAU,EAC5C;QACA,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,4BAA4B,CAAC,OAAoB;IACxD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,IACE,aAAa;QACb,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,mBAAmB;QACrD,aAAa;QACb,CAAC,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB;YACnD,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,cAAc;YAChD,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,aAAa;YAC/C,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB;YACpD,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,aAAa;YAC/C,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,UAAU;YAC5C,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,cAAc,CAAC,EACnD;QACA,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,oBAAoB,CAAC,OAAoB;IAChD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,IACE,aAAa;QACb,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,cAAc;QAChD,aAAa,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;QACrC,aAAa;QACb,CAAC,aAAa,KAAK,aAAa,CAAC,EAAE;YACjC,aAAa,KAAK,aAAa,CAAC,EAAE;YAClC,aAAa,KAAK,aAAa,CAAC,OAAO,CAAC,EAC1C;QACA,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"comment-handler.js","sourceRoot":"","sources":["../../../../src/formatter/print/comment-handler.ts"],"names":[],"mappings":"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"}

package/dist/src/formatter/print/needs-parens.d.ts

@@ -1,5 +1,5 @@
 import { AstPath } from "prettier";
-import { Node } from "../../core/index.js";
+import { Node } from "../../core/types.js";
 import { TypeSpecPrettierOptions } from "./types.js";
 /**
  * Check if the current path should be wrapped in parentheses

package/dist/src/formatter/print/needs-parens.js

@@ -1,4 +1,4 @@
-import { SyntaxKind } from "../../core/index.js";
+import { SyntaxKind } from "../../core/types.js";
 /**
  * Check if the current path should be wrapped in parentheses
  * @param path Prettier print path.

package/dist/src/formatter/print/printer.d.ts

@@ -1,10 +1,11 @@
 import prettier, { AstPath, Doc, Printer } from "prettier";
-import { AliasStatementNode, ArrayExpressionNode, AugmentDecoratorStatementNode, Comment, DecoratorDeclarationStatementNode, DecoratorExpressionNode, DirectiveExpressionNode, EnumMemberNode, EnumStatementNode, FunctionDeclarationStatementNode, InterfaceStatementNode, IntersectionExpressionNode, MemberExpressionNode, ModelExpressionNode, ModelPropertyNode, ModelStatementNode, Node, OperationSignatureDeclarationNode, OperationSignatureReferenceNode, OperationStatementNode, ProjectionArithmeticExpressionNode, ProjectionBlockExpressionNode, ProjectionCallExpressionNode, ProjectionEqualityExpressionNode, ProjectionLambdaExpressionNode, ProjectionLambdaParameterDeclarationNode, ProjectionLogicalExpressionNode, ProjectionMemberExpressionNode, ProjectionModelExpressionNode, ProjectionModelPropertyNode, ProjectionRelationalExpressionNode, ProjectionTupleExpressionNode, ProjectionUnaryExpressionNode, ReturnExpressionNode, ScalarStatementNode, TupleExpressionNode, TypeReferenceNode, UnionExpressionNode, UnionStatementNode, UnionVariantNode, ValueOfExpressionNode } from "../../core/types.js";
+import { AliasStatementNode, ArrayExpressionNode, AugmentDecoratorStatementNode, Comment, DecoratorDeclarationStatementNode, DecoratorExpressionNode, DirectiveExpressionNode, EnumMemberNode, EnumStatementNode, FunctionDeclarationStatementNode, InterfaceStatementNode, IntersectionExpressionNode, MemberExpressionNode, ModelExpressionNode, ModelPropertyNode, ModelStatementNode, Node, OperationSignatureDeclarationNode, OperationSignatureReferenceNode, OperationStatementNode, ProjectionArithmeticExpressionNode, ProjectionBlockExpressionNode, ProjectionCallExpressionNode, ProjectionEqualityExpressionNode, ProjectionLambdaExpressionNode, ProjectionLambdaParameterDeclarationNode, ProjectionLogicalExpressionNode, ProjectionMemberExpressionNode, ProjectionModelExpressionNode, ProjectionModelPropertyNode, ProjectionRelationalExpressionNode, ProjectionTupleExpressionNode, ProjectionUnaryExpressionNode, ReturnExpressionNode, ScalarStatementNode, TupleExpressionNode, TypeReferenceNode, TypeSpecScriptNode, UnionExpressionNode, UnionStatementNode, UnionVariantNode, ValueOfExpressionNode } from "../../core/types.js";
 import { FlattenedNamespaceStatementNode } from "../types.js";
 import { DecorableNode, PrettierChildPrint, TypeSpecPrettierOptions } from "./types.js";
 export declare const typespecPrinter: Printer<Node>;
 export declare function printTypeSpec(path: AstPath<Node>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): prettier.Doc;
 export declare function printNode(path: AstPath<Node>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): prettier.Doc;
+export declare function printTypeSpecScript(path: AstPath<TypeSpecScriptNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): Doc;
 export declare function printAliasStatement(path: AstPath<AliasStatementNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): prettier.doc.builders.Doc[];
 export declare function canAttachComment(node: Node): boolean;
 export declare function printComment(commentPath: AstPath<Node | Comment>, options: TypeSpecPrettierOptions): Doc;
@@ -16,6 +17,7 @@ export declare function printDecorators(path: AstPath<DecorableNode>, options: o
 };
 export declare function printDecorator(path: AstPath<DecoratorExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): prettier.doc.builders.Doc[];
 export declare function printAugmentDecorator(path: AstPath<AugmentDecoratorStatementNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): prettier.doc.builders.Doc[];
+export declare function printDocComments(path: AstPath<Node>, options: object, print: PrettierChildPrint): prettier.doc.builders.Group | "";
 export declare function printDirectives(path: AstPath<Node>, options: object, print: PrettierChildPrint): prettier.doc.builders.Group | "";
 export declare function printDirective(path: AstPath<DirectiveExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): prettier.doc.builders.Doc[];
 export declare function printDirectiveArgs(path: AstPath<DirectiveExpressionNode>, options: object, print: PrettierChildPrint): prettier.doc.builders.Concat | "";

package/dist/src/formatter/print/printer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"printer.d.ts","sourceRoot":"","sources":["../../../../src/formatter/print/printer.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAI3D,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,6BAA6B,EAG7B,OAAO,EACP,iCAAiC,EACjC,uBAAuB,EACvB,uBAAuB,EACvB,cAAc,EAEd,iBAAiB,EACjB,gCAAgC,EAGhC,sBAAsB,EACtB,0BAA0B,EAE1B,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EAEjB,kBAAkB,EAClB,IAAI,EAGJ,iCAAiC,EACjC,+BAA+B,EAC/B,sBAAsB,EACtB,kCAAkC,EAClC,6BAA6B,EAC7B,4BAA4B,EAC5B,gCAAgC,EAGhC,8BAA8B,EAC9B,wCAAwC,EACxC,+BAA+B,EAC/B,8BAA8B,EAC9B,6BAA6B,EAC7B,2BAA2B,EAI3B,kCAAkC,EAElC,6BAA6B,EAC7B,6BAA6B,EAC7B,oBAAoB,EACpB,mBAAmB,EAMnB,mBAAmB,EACnB,iBAAiB,EAEjB,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAG9D,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAOxF,eAAO,MAAM,eAAe,EAAE,OAAO,CAAC,IAAI,CAKzC,CAAC;AAEF,wBAAgB,aAAa,CAE3B,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EACnB,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,GACxB,QAAQ,CAAC,GAAG,CAad;AAOD,wBAAgB,SAAS,CAEvB,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EACnB,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,GACxB,QAAQ,CAAC,GAAG,CA8Od;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACjC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAK1B;AAuBD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAQpD;AAED,wBAAgB,YAAY,CAC1B,WAAW,EAAE,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,EACpC,OAAO,EAAE,uBAAuB,GAC/B,GAAG,CAYL;AAwCD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,EAC5B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,EACzB,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,GACpC;IAAE,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAclD;AAWD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,OAAO,CAAC,uBAAuB,CAAC,EACtC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAI1B;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,OAAO,CAAC,6BAA6B,CAAC,EAC5C,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAI1B;AAsBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,oCAS9F;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,OAAO,CAAC,uBAAuB,CAAC,EACtC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAI1B;AA+CD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,OAAO,CAAC,uBAAuB,CAAC,EACtC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,qCAY1B;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,OAAO,CAAC,iBAAiB,CAAC,EAChC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAK1B;AA0BD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,EAC7B,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAS1B;AAUD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACjC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAM1B;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACjC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,sCAmB1B;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAC/B,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAM1B;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,CAAC,sBAAsB,CAAC,EACrC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAgB1B;AAgBD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,OAAO,CAAC,sBAAsB,CAAC,EACrC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,sCAiC1B;AA6BD;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,OAAO,CAAC,0BAA0B,CAAC,EACzC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,+BAwB1B;AAMD,wBAAgB,UAAU,CACxB,IAAI,EAAE,OAAO,CAAC,mBAAmB,CAAC,EAClC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,GACxB,GAAG,CAEL;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,OAAO,CAAC,mBAAmB,GAAG,6BAA6B,CAAC,EAClE,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,GACxB,GAAG,CAYL;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,EACnC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,GACxB,GAAG,CAGL;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,OAAO,CAAC,mBAAmB,GAAG,6BAA6B,CAAC,EAClE,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAiB1B;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACjC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAoB1B;AA4DD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,OAAO,CAAC,iBAAiB,GAAG,2BAA2B,CAAC,EAC9D,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAuB1B;AAMD,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,UAYjC;AAiCD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,OAAO,CAAC,mBAAmB,CAAC,EAClC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAiB1B;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,CAAC,+BAA+B,CAAC,EAC9C,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAiB1B;AAED,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,OAAO,CAAC,iCAAiC,CAAC,EAChD,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAG1B;AAED,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,OAAO,CAAC,+BAA+B,CAAC,EAC9C,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAG1B;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,CAAC,sBAAsB,CAAC,EACrC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAgB1B;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,IAAI,EACnD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAChB,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,MAAM,CAAC,+BA0BlB;AAYD,wBAAgB,UAAU,CACxB,IAAI,EAAE,OAAO,CAAC,mBAAmB,CAAC,EAClC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,8DAoB1B;AASD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,EACzC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,GACxB,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAI3B;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAC7C,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,GACxB,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAG3B;AAoFD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,OAAO,CAAC,iCAAiC,GAAG,gCAAgC,CAAC,EACnF,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,GACxB,QAAQ,CAAC,GAAG,CAOd;AA6ID,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,OAAO,CAAC,6BAA6B,CAAC,EAC5C,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,mFAY1B;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,OAAO,CAAC,8BAA8B,CAAC,EAC7C,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAI1B;AAED,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,OAAO,CACT,+BAA+B,GAC/B,kCAAkC,GAClC,gCAAgC,GAChC,kCAAkC,CACrC,EACD,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAI1B;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,OAAO,CAAC,6BAA6B,CAAC,EAC5C,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAG1B;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,OAAO,CAAC,4BAA4B,CAAC,EAC3C,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAW1B;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,OAAO,CAAC,8BAA8B,CAAC,EAC7C,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAS1B;AAED,wBAAgB,yCAAyC,CACvD,IAAI,EAAE,OAAO,CAAC,wCAAwC,CAAC,EACvD,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,6BAG1B;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,EACnC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,kBAAkB,+BAG1B"}
+{"version":3,"file":"printer.d.ts","sourceRoot":"","sources":["../../../../src/formatter/print/printer.ts"],"names":[],"mappings":"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"}

package/dist/src/formatter/print/printer.js

@@ -7,6 +7,14 @@ import { commentHandler } from "./comment-handler.js";
 import { needsParens } from "./needs-parens.js";
 const { align, breakParent, group, hardline, ifBreak, indent, join, line, softline } = prettier.doc.builders;
 const { isNextLineEmpty } = prettier.util;
+/**
+ * If the decorators for that node should try to be kept inline.
+ */
+const DecoratorsTryInline = {
+    modelProperty: true,
+    enumMember: true,
+    unionVariant: true,
+};
 export const typespecPrinter = {
     print: printTypeSpec,
     canAttachComment: canAttachComment,
@@ -17,10 +25,11 @@ export function printTypeSpec(
 // Path to the AST node to print
 path, options, print) {
     const node = path.getValue();
+    const docs = printDocComments(path, options, print);
     const directives = shouldPrintDirective(node) ? printDirectives(path, options, print) : "";
     const printedNode = printNode(path, options, print);
     const value = needsParens(path, options) ? ["(", printedNode, ")"] : printedNode;
-    const parts = [directives, value];
+    const parts = [docs, directives, value];
     if (node.kind === SyntaxKind.TypeSpecScript) {
         // For TypeSpecScript(root of typespec document) we had a new line at the end.
         // This must be done here so the hardline entry can be the last item of the doc array returned by the printer
@@ -37,13 +46,10 @@ export function printNode(
 // Path to the AST node to print
 path, options, print) {
     const node = path.getValue();
-    printDirectives(path, options, print);
     switch (node.kind) {
         // Root
         case SyntaxKind.TypeSpecScript:
-            return [
-                printStatementSequence(path, options, print, "statements"),
-            ];
+            return printTypeSpecScript(path, options, print);
         // Statements
         case SyntaxKind.ImportStatement:
             return [`import "${node.path.value}";`];
@@ -182,6 +188,7 @@ path, options, print) {
         case SyntaxKind.Return:
             return printReturnExpression(path, options, print);
         case SyntaxKind.Doc:
+            return printDoc(path, options, print);
         case SyntaxKind.DocText:
         case SyntaxKind.DocParamTag:
         case SyntaxKind.DocTemplateTag:
@@ -190,8 +197,9 @@ path, options, print) {
             // https://github.com/microsoft/typespec/issues/1319 Tracks pretty-printing doc comments.
             compilerAssert(false, "Currently, doc comments are only handled as regular comments and we do not opt in to parsing them so we shouldn't reach here.");
             return "";
-        case SyntaxKind.JsSourceFile:
         case SyntaxKind.EmptyStatement:
+            return "";
+        case SyntaxKind.JsSourceFile:
         case SyntaxKind.InvalidStatement:
             return getRawText(node, options);
         default:
@@ -202,6 +210,16 @@ path, options, print) {
             return getRawText(node, options);
     }
 }
+export function printTypeSpecScript(path, options, print) {
+    const node = path.getValue();
+    const nodeHasComments = hasComments(node, CommentCheckFlags.Dangling);
+    const body = [];
+    if (nodeHasComments) {
+        body.push(printDanglingComments(path, options, { sameIndent: true }));
+    }
+    body.push(printStatementSequence(path, options, print, "statements"));
+    return body;
+}
 export function printAliasStatement(path, options, print) {
     const id = path.call(print, "id");
     const template = printTemplateParameters(path, options, print, "templateParameters");
@@ -227,6 +245,13 @@ export function canAttachComment(node) {
     return Boolean(kind &&
         kind !== SyntaxKind.LineComment &&
         kind !== SyntaxKind.BlockComment &&
+        kind !== SyntaxKind.EmptyStatement &&
+        kind !== SyntaxKind.Doc &&
+        kind !== SyntaxKind.DocParamTag &&
+        kind !== SyntaxKind.DocReturnsTag &&
+        kind !== SyntaxKind.DocTemplateTag &&
+        kind !== SyntaxKind.DocText &&
+        kind !== SyntaxKind.DocUnknownTag &&
         !(node.flags & 8 /* NodeFlags.Synthetic */));
 }
 export function printComment(commentPath, options) {
@@ -244,11 +269,10 @@ export function printComment(commentPath, options) {
 function printBlockComment(commentPath, options) {
     const comment = commentPath.getValue();
     const rawComment = options.originalText.slice(comment.pos + 2, comment.end - 2);
-    if (isIndentableBlockComment(rawComment)) {
-        const printed = printIndentableBlockComment(rawComment);
-        return printed;
-    }
-    return ["/*", rawComment, "*/"];
+    const printed = isIndentableBlockComment(rawComment)
+        ? printIndentableBlockCommentContent(rawComment)
+        : rawComment;
+    return ["/*", printed, "*/"];
 }
 function isIndentableBlockComment(rawComment) {
     // If the comment has multiple lines and every line starts with a star
@@ -258,28 +282,42 @@ function isIndentableBlockComment(rawComment) {
     const lines = `*${rawComment}*`.split("\n");
     return lines.length > 1 && lines.every((line) => line.trim()[0] === "*");
 }
-function printIndentableBlockComment(rawComment) {
+function printIndentableBlockCommentContent(rawComment) {
     const lines = rawComment.split("\n");
     return [
-        "/*",
         join(hardline, lines.map((line, index) => index === 0
             ? line.trimEnd()
             : " " + (index < lines.length - 1 ? line.trim() : line.trimStart()))),
-        "*/",
     ];
 }
+/** Print a doc comment. */
+function printDoc(path, options, print) {
+    const node = path.getValue();
+    const rawComment = options.originalText.slice(node.pos + 3, node.end - 2);
+    const printed = isIndentableBlockComment(rawComment)
+        ? printIndentableBlockCommentContent(rawComment)
+        : rawComment.includes("\n")
+            ? rawComment
+            : ` ${rawComment.trim()} `;
+    return ["/**", printed, "*/"];
+}
 export function printDecorators(path, options, print, { tryInline }) {
     const node = path.getValue();
     if (node.decorators.length === 0) {
         return { decorators: "", multiline: false };
     }
-    const shouldBreak = !tryInline || node.decorators.length >= 3 || hasNewlineBetweenOrAfterDecorators(node, options);
+    const shouldBreak = shouldDecoratorBreakLine(path, options, { tryInline });
     const decorators = path.map((x) => [print(x), ifBreak(line, " ")], "decorators");
     return {
         decorators: group([shouldBreak ? breakParent : "", decorators]),
         multiline: shouldBreak,
     };
 }
+/** Check if the decorators of the given node should be broken in sparate line */
+function shouldDecoratorBreakLine(path, options, { tryInline }) {
+    const node = path.getValue();
+    return (!tryInline || node.decorators.length >= 3 || hasNewlineBetweenOrAfterDecorators(node, options));
+}
 /**
  * Check if there is already new lines in between the decorators of the node.
  */
@@ -307,6 +345,14 @@ function printAugmentDecoratorArgs(path, options, print) {
         ")",
     ];
 }
+export function printDocComments(path, options, print) {
+    const node = path.getValue();
+    if (node.docs === undefined || node.docs.length === 0) {
+        return "";
+    }
+    const docs = path.map((x) => [print(x), line], "docs");
+    return group([...docs, breakParent]);
+}
 export function printDirectives(path, options, print) {
     const node = path.getValue();
     if (node.directives === undefined || node.directives.length === 0) {
@@ -378,7 +424,9 @@ export function printEnumMember(path, options, print) {
     const node = path.getValue();
     const id = path.call(print, "id");
     const value = node.value ? [": ", path.call(print, "value")] : "";
-    const { decorators, multiline } = printDecorators(path, options, print, { tryInline: true });
+    const { decorators, multiline } = printDecorators(path, options, print, {
+        tryInline: DecoratorsTryInline.enumMember,
+    });
     const propertyIndex = path.stack[path.stack.length - 2];
     const isNotFirst = typeof propertyIndex === "number" && propertyIndex > 0;
     return [multiline && isNotFirst ? hardline : "", decorators, id, value];
@@ -410,7 +458,9 @@ export function printUnionVariantsBlock(path, options, print) {
 export function printUnionVariant(path, options, print) {
     const id = path.call(print, "id");
     const value = [": ", path.call(print, "value")];
-    const { decorators } = printDecorators(path, options, print, { tryInline: true });
+    const { decorators } = printDecorators(path, options, print, {
+        tryInline: DecoratorsTryInline.unionVariant,
+    });
     return [decorators, id, value];
 }
 export function printInterfaceStatement(path, options, print) {
@@ -534,18 +584,19 @@ export function printTuple(path, options, print) {
 }
 export function printMemberExpression(path, options, print) {
     const node = path.getValue();
-    return [node.base ? [path.call(print, "base"), "."] : "", path.call(print, "id")];
+    return [node.base ? [path.call(print, "base"), node.selector] : "", path.call(print, "id")];
 }
 export function printModelExpression(path, options, print) {
     const inBlock = isModelExpressionInBlock(path);
+    const node = path.getValue();
     if (inBlock) {
         return group(printModelPropertiesBlock(path, options, print));
     }
     else {
-        return group([
-            indent(join(", ", path.map((arg) => [softline, print(arg)], "properties"))),
-            softline,
-        ]);
+        const properties = node.properties.length === 0
+            ? ""
+            : indent(joinPropertiesInBlock(path, options, print, ifBreak(",", ", "), softline));
+        return group([properties, softline]);
     }
 }
 export function printModelStatement(path, options, print) {
@@ -579,16 +630,54 @@ function printModelPropertiesBlock(path, options, print) {
     const tryInline = ((_a = path.getParentNode()) === null || _a === void 0 ? void 0 : _a.kind) === SyntaxKind.TemplateParameterDeclaration;
     const lineDoc = tryInline ? softline : hardline;
     const seperator = isModelAValue(path) ? "," : ";";
-    const body = [
-        lineDoc,
-        join([seperator, lineDoc], path.map((x) => [print(x)], "properties")),
-        hasProperties ? ifBreak(seperator) : "",
-    ];
+    const body = [joinPropertiesInBlock(path, options, print, seperator, lineDoc)];
     if (nodeHasComments) {
         body.push(printDanglingComments(path, options, { sameIndent: true }));
     }
     return group(["{", indent(body), lineDoc, "}"]);
 }
+function joinPropertiesInBlock(path, options, print, separator, regularLine) {
+    const doc = [regularLine];
+    const propertyContainerNode = path.getValue();
+    let newLineBeforeNextProp = false;
+    path.each((item, propertyIndex) => {
+        const isFirst = propertyIndex === 0;
+        const isLast = propertyIndex === propertyContainerNode.properties.length - 1;
+        const shouldWrapInNewLines = shouldWrapPropertyInNewLines(item, options);
+        if ((newLineBeforeNextProp || shouldWrapInNewLines) && !isFirst) {
+            doc.push(hardline);
+            newLineBeforeNextProp = false;
+        }
+        doc.push(print(item));
+        if (isLast) {
+            doc.push(ifBreak(separator));
+        }
+        else {
+            doc.push(separator);
+            doc.push(regularLine);
+            if (shouldWrapInNewLines) {
+                newLineBeforeNextProp = true;
+            }
+        }
+    }, "properties");
+    return doc;
+}
+/**
+ * Check if property item (PropertyNode, SpreadProperty) should be wrapped in new lines.
+ * It can be wrapped for the following reasons:
+ * - has decorators on lines above
+ * - has leading comments
+ */
+function shouldWrapPropertyInNewLines(path, options) {
+    var _a;
+    const node = path.getValue();
+    return (((node.kind === SyntaxKind.ModelProperty || node.kind === SyntaxKind.ProjectionModelProperty) &&
+        shouldDecoratorBreakLine(path, options, {
+            tryInline: DecoratorsTryInline.modelProperty,
+        })) ||
+        hasComments(node, CommentCheckFlags.Leading) ||
+        (node.docs && ((_a = node.docs) === null || _a === void 0 ? void 0 : _a.length) > 0));
+}
 /**
  * Figure out if this model is being used as a definition or value.
  * @returns true if the model is used as a value(e.g. decorator value), false if it is used as a model definition.
@@ -610,14 +699,11 @@ function isModelAValue(path) {
 }
 export function printModelProperty(path, options, print) {
     const node = path.getValue();
-    const propertyIndex = path.stack[path.stack.length - 2];
-    const isNotFirst = typeof propertyIndex === "number" && propertyIndex > 0;
-    const { decorators, multiline } = printDecorators(path, options, print, {
-        tryInline: true,
+    const { decorators } = printDecorators(path, options, print, {
+        tryInline: DecoratorsTryInline.modelProperty,
     });
     const id = printIdentifier(node.id, options);
     return [
-        multiline && isNotFirst ? hardline : "",
         printDirectives(path, options, print),
         decorators,
         id,