@typespec/prettier-plugin-typespec 0.47.0 → 0.48.0-dev.1

package/dist/index.js

@@ -90,6 +90,7 @@ var SyntaxKind;
     SyntaxKind[SyntaxKind["ProjectionStatement"] = 80] = "ProjectionStatement";
     SyntaxKind[SyntaxKind["ProjectionDecoratorReferenceExpression"] = 81] = "ProjectionDecoratorReferenceExpression";
     SyntaxKind[SyntaxKind["Return"] = 82] = "Return";
+    SyntaxKind[SyntaxKind["JsNamespaceDeclaration"] = 83] = "JsNamespaceDeclaration";
 })(SyntaxKind || (SyntaxKind = {}));
 var IdentifierKind;
 (function (IdentifierKind) {
@@ -100,6 +101,7 @@ var IdentifierKind;
     IdentifierKind[IdentifierKind["Declaration"] = 4] = "Declaration";
     IdentifierKind[IdentifierKind["Other"] = 5] = "Other";
 })(IdentifierKind || (IdentifierKind = {}));
+/** Used to explicitly specify that a diagnostic has no target. */
 const NoTarget = Symbol.for("NoTarget");
 var ListenerFlow;
 (function (ListenerFlow) {
@@ -185,7 +187,7 @@ function createSourceFile(text, path) {
         };
     }
 }
-function getSourceLocation(target) {
+function getSourceLocation(target, options = {}) {
     if (target === NoTarget || target === undefined) {
         return undefined;
     }
@@ -200,17 +202,17 @@ function getSourceLocation(target) {
         if (!target.declarations[0]) {
             return createSyntheticSourceLocation();
         }
-        return getSourceLocationOfNode(target.declarations[0]);
+        return getSourceLocationOfNode(target.declarations[0], options);
     }
     else if (typeof target.kind === "number") {
         // node
-        return getSourceLocationOfNode(target);
+        return getSourceLocationOfNode(target, options);
     }
     else {
         // type
         const targetNode = target.node;
         if (targetNode) {
-            return getSourceLocationOfNode(targetNode);
+            return getSourceLocationOfNode(targetNode, options);
         }
         return createSyntheticSourceLocation();
     }
@@ -223,7 +225,7 @@ function createSyntheticSourceLocation(loc = "<unknown location>") {
         isSynthetic: true,
     };
 }
-function getSourceLocationOfNode(node) {
+function getSourceLocationOfNode(node, options) {
     let root = node;
     while (root.parent !== undefined) {
         root = root.parent;
@@ -233,6 +235,9 @@ function getSourceLocationOfNode(node) {
             ? undefined
             : "<unknown location - cannot obtain source location of unbound node - file bug at https://github.com/microsoft/typespec>");
     }
+    if (options.locateId && "id" in node && node.id !== undefined) {
+        node = node.id;
+    }
     return {
         file: root.file,
         pos: node.pos,
@@ -1123,6 +1128,12 @@ const diagnostics = {
             default: paramMessage `Alias type '${"typeName"}' recursively references itself.`,
         },
     },
+    "circular-prop": {
+        severity: "error",
+        messages: {
+            default: paramMessage `Property '${"propName"}' recursively references itself.`,
+        },
+    },
     "conflict-marker": {
         severity: "error",
         messages: {
@@ -4617,6 +4628,7 @@ path, options, print) {
         case SyntaxKind.EmptyStatement:
             return "";
         case SyntaxKind.JsSourceFile:
+        case SyntaxKind.JsNamespaceDeclaration:
         case SyntaxKind.InvalidStatement:
             return getRawText(node, options);
         default:
@@ -6388,6 +6400,7 @@ function createParser(code, options = {}) {
                 ...finishNode(pos),
             };
         }
+        parseExpected(Token.Semicolon);
         return {
             kind: SyntaxKind.AugmentDecoratorStatement,
             target,
@@ -7608,6 +7621,7 @@ function createParser(code, options = {}) {
         }
         const items = [];
         while (true) {
+            const startingPos = tokenPos();
             const { pos, docs, directives, decorators } = parseAnnotations({
                 skipParsingDocNodes: Boolean(kind.invalidAnnotationTarget),
             });
@@ -7682,7 +7696,7 @@ function createParser(code, options = {}) {
                 // Example: `model M { a: B <missing semicolon> c: D }
                 parseExpected(kind.delimiter);
             }
-            if (pos === tokenPos()) {
+            if (startingPos === tokenPos()) {
                 // Error recovery: we've inserted everything during this loop iteration
                 // and haven't made any progress. Assume that the current token is a bad
                 // representation of the end of the the list that we're trying to get
@@ -8059,6 +8073,7 @@ function visitChildren(node, cb) {
         case SyntaxKind.ExternKeyword:
         case SyntaxKind.UnknownKeyword:
         case SyntaxKind.JsSourceFile:
+        case SyntaxKind.JsNamespaceDeclaration:
         case SyntaxKind.DocText:
             return;
         default: