@typespec/prettier-plugin-typespec 0.56.0-dev.2 → 0.56.0

package/dist/index.js

@@ -9,7 +9,7 @@ function createSourceFile(text, path) {
         getLineAndCharacterOfPosition,
     };
     function getLineStarts() {
-        return (lineStarts = lineStarts !== null && lineStarts !== void 0 ? lineStarts : scanLineStarts(text));
+        return (lineStarts = lineStarts ?? scanLineStarts(text));
     }
     function getLineAndCharacterOfPosition(position) {
         const starts = getLineStarts();
@@ -196,17 +196,6 @@ var ListenerFlow;
     ListenerFlow[ListenerFlow["NoRecursion"] = 1] = "NoRecursion";
 })(ListenerFlow || (ListenerFlow = {}));
 
-(this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-(this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
 /**
  * A specially typed version of `Array.isArray` to work around [this issue](https://github.com/microsoft/TypeScript/issues/17002).
  */
@@ -236,7 +225,6 @@ function createDiagnosticCreator(diagnostics, libraryName) {
         ? `It must match one of the code defined in the library '${libraryName}'`
         : "It must match one of the code defined in the compiler.";
     function createDiagnostic(diagnostic) {
-        var _a;
         const diagnosticDef = diagnostics[diagnostic.code];
         if (!diagnosticDef) {
             const codeStr = Object.keys(diagnostics)
@@ -245,7 +233,7 @@ function createDiagnosticCreator(diagnostics, libraryName) {
             const code = String(diagnostic.code);
             throw new Error(`Unexpected diagnostic code '${code}'. ${errorMessage}. Defined codes:\n${codeStr}`);
         }
-        const message = diagnosticDef.messages[(_a = diagnostic.messageId) !== null && _a !== void 0 ? _a : "default"];
+        const message = diagnosticDef.messages[diagnostic.messageId ?? "default"];
         if (!message) {
             const codeStr = Object.keys(diagnosticDef.messages)
                 .map((x) => ` - ${x}`)
@@ -681,6 +669,12 @@ const diagnostics = {
             withDetails: paramMessage `Type '${"sourceType"}' is not assignable to type '${"targetType"}'\n  ${"details"}`,
         },
     },
+    "property-required": {
+        severity: "error",
+        messages: {
+            default: paramMessage `Property '${"propName"}' is required in type '${"targetType"}' but here is optional.`,
+        },
+    },
     "no-prop": {
         severity: "error",
         messages: {
@@ -3890,7 +3884,7 @@ function createScanner(source, diagnosticHandler) {
     function error(report, pos, end) {
         const diagnostic = createDiagnostic({
             ...report,
-            target: { file, pos: pos !== null && pos !== void 0 ? pos : tokenPosition, end: end !== null && end !== void 0 ? end : position },
+            target: { file, pos: pos ?? tokenPosition, end: end ?? position },
         });
         diagnosticHandler(diagnostic);
     }
@@ -4548,9 +4542,8 @@ 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 (ast?.statements?.length === 0) {
         if (isLastComment) {
             util.addDanglingComment(ast, comment, undefined);
         }
@@ -4559,9 +4552,9 @@ function handleOnlyComments({ comment, ast, isLastComment }) {
         }
         return true;
     }
-    if ((enclosingNode === null || enclosingNode === void 0 ? void 0 : enclosingNode.kind) === SyntaxKind.TypeSpecScript &&
+    if (enclosingNode?.kind === SyntaxKind.TypeSpecScript &&
         enclosingNode.statements.length === 0 &&
-        ((_b = enclosingNode.directives) === null || _b === void 0 ? void 0 : _b.length) === 0) {
+        enclosingNode.directives?.length === 0) {
         if (isLastComment) {
             util.addDanglingComment(enclosingNode, comment, undefined);
         }
@@ -5209,14 +5202,13 @@ function printModelStatement(path, options, print) {
     ];
 }
 function printModelPropertiesBlock(path, options, print) {
-    var _a;
     const node = path.node;
     const hasProperties = node.properties && node.properties.length > 0;
     const nodeHasComments = hasComments(node, CommentCheckFlags.Dangling);
     if (!hasProperties && !nodeHasComments) {
         return "{}";
     }
-    const tryInline = ((_a = path.getParentNode()) === null || _a === void 0 ? void 0 : _a.kind) === SyntaxKind.TemplateParameterDeclaration;
+    const tryInline = path.getParentNode()?.kind === SyntaxKind.TemplateParameterDeclaration;
     const lineDoc = tryInline ? softline : hardline;
     const seperator = isModelAValue(path) ? "," : ";";
     const body = [joinMembersInBlock(path, "properties", options, print, seperator, lineDoc)];
@@ -5267,7 +5259,6 @@ function joinMembersInBlock(path, member, options, print, separator, regularLine
  * - has leading comments
  */
 function shouldWrapMemberInNewLines(path, options) {
-    var _a;
     const node = path.node;
     return ((node.kind !== SyntaxKind.ModelSpreadProperty &&
         node.kind !== SyntaxKind.ProjectionModelSpreadProperty &&
@@ -5276,7 +5267,7 @@ function shouldWrapMemberInNewLines(path, options) {
             tryInline: DecoratorsTryInline.modelProperty,
         })) ||
         hasComments(node, CommentCheckFlags.Leading) ||
-        (node.docs && ((_a = node.docs) === null || _a === void 0 ? void 0 : _a.length) > 0));
+        (node.docs && node.docs?.length > 0));
 }
 /**
  * Figure out if this model is being used as a definition or value.
@@ -5348,7 +5339,7 @@ function needBacktick(sv) {
 }
 function isModelExpressionInBlock(path) {
     const parent = path.getParentNode();
-    switch (parent === null || parent === void 0 ? void 0 : parent.kind) {
+    switch (parent?.kind) {
         case SyntaxKind.OperationSignatureDeclaration:
             return parent.parameters !== path.getNode();
         default:
@@ -5374,7 +5365,7 @@ function printScalarStatement(path, options, print) {
 function printNamespaceStatement(path, options, print) {
     const names = path.map(print, "ids");
     const currentNode = path.getNode();
-    const suffix = (currentNode === null || currentNode === void 0 ? void 0 : currentNode.statements) === undefined
+    const suffix = currentNode?.statements === undefined
         ? ";"
         : [
             " {",
@@ -5392,8 +5383,7 @@ function printOperationSignatureReference(path, options, print) {
     return [" is ", path.call(print, "baseOperation")];
 }
 function printOperationStatement(path, options, print) {
-    var _a;
-    const inInterface = ((_a = path.getParentNode()) === null || _a === void 0 ? void 0 : _a.kind) === SyntaxKind.InterfaceStatement;
+    const inInterface = path.getParentNode()?.kind === SyntaxKind.InterfaceStatement;
     const templateParams = printTemplateParameters(path, options, print, "templateParameters");
     const { decorators } = printDecorators(path, options, print, {
         tryInline: true,
@@ -5944,7 +5934,7 @@ function createParser(code, options = {}) {
                     item = parseScalarStatement(pos, decorators);
                     break;
                 case Token.NamespaceKeyword:
-                    item = parseNamespaceStatement(pos, decorators, docs);
+                    item = parseNamespaceStatement(pos, decorators, docs, directives);
                     break;
                 case Token.InterfaceKeyword:
                     item = parseInterfaceStatement(pos, decorators);
@@ -5984,8 +5974,8 @@ function createParser(code, options = {}) {
                     item = parseInvalidStatement(pos, decorators);
                     break;
             }
-            mutate(item).directives = directives;
             if (tok !== Token.NamespaceKeyword) {
+                mutate(item).directives = directives;
                 mutate(item).docs = docs;
             }
             if (isBlocklessNamespace(item)) {
@@ -6035,7 +6025,7 @@ function createParser(code, options = {}) {
                     item = parseScalarStatement(pos, decorators);
                     break;
                 case Token.NamespaceKeyword:
-                    const ns = parseNamespaceStatement(pos, decorators, docs);
+                    const ns = parseNamespaceStatement(pos, decorators, docs, directives);
                     if (!Array.isArray(ns.statements)) {
                         error({ code: "blockless-namespace-first", messageId: "topLevel", target: ns });
                     }
@@ -6103,7 +6093,7 @@ function createParser(code, options = {}) {
         }
         return directives;
     }
-    function parseNamespaceStatement(pos, decorators, docs) {
+    function parseNamespaceStatement(pos, decorators, docs, directives) {
         parseExpected(Token.NamespaceKeyword);
         let currentName = parseIdentifierOrMemberExpression();
         const nsSegments = [];
@@ -6125,12 +6115,14 @@ function createParser(code, options = {}) {
             id: nsSegments[0],
             locals: undefined,
             statements,
+            directives: directives,
             ...finishNode(pos),
         };
         for (let i = 1; i < nsSegments.length; i++) {
             outerNs = {
                 kind: SyntaxKind.NamespaceStatement,
                 decorators: [],
+                directives: [],
                 id: nsSegments[i],
                 statements: outerNs,
                 locals: undefined,
@@ -6977,15 +6969,14 @@ function createParser(code, options = {}) {
         };
     }
     function parseIdentifier(options) {
-        var _a;
-        if ((options === null || options === void 0 ? void 0 : options.recoverFromKeyword) !== false && isKeyword(token())) {
+        if (options?.recoverFromKeyword !== false && isKeyword(token())) {
             error({ code: "reserved-identifier" });
         }
         else if (token() !== Token.Identifier &&
-            (!(options === null || options === void 0 ? void 0 : options.allowStringLiteral) || token() !== Token.StringLiteral)) {
+            (!options?.allowStringLiteral || token() !== Token.StringLiteral)) {
             // Error recovery: when we fail to parse an identifier or expression,
             // we insert a synthesized identifier with a unique name.
-            error({ code: "token-expected", messageId: (_a = options === null || options === void 0 ? void 0 : options.message) !== null && _a !== void 0 ? _a : "identifier" });
+            error({ code: "token-expected", messageId: options?.message ?? "identifier" });
             return createMissingIdentifier();
         }
         const pos = tokenPos();
@@ -8131,12 +8122,11 @@ function createParser(code, options = {}) {
         return { kind: SyntaxKind.InvalidStatement, decorators, ...finishNode(pos) };
     }
     function error(report) {
-        var _a, _b, _c, _d, _e, _f;
         parseErrorInNextFinishedNode = true;
         const location = {
             file: scanner.file,
-            pos: (_b = (_a = report.target) === null || _a === void 0 ? void 0 : _a.pos) !== null && _b !== void 0 ? _b : tokenPos(),
-            end: (_d = (_c = report.target) === null || _c === void 0 ? void 0 : _c.end) !== null && _d !== void 0 ? _d : tokenEnd(),
+            pos: report.target?.pos ?? tokenPos(),
+            end: report.target?.end ?? tokenEnd(),
         };
         if (!report.printable) {
             treePrintable = false;
@@ -8145,7 +8135,7 @@ function createParser(code, options = {}) {
         // position. The code path taken by error recovery after logging an error
         // can otherwise produce redundant and less decipherable errors, which this
         // suppresses.
-        const realPos = (_f = (_e = report.target) === null || _e === void 0 ? void 0 : _e.realPos) !== null && _f !== void 0 ? _f : location.pos;
+        const realPos = report.target?.realPos ?? location.pos;
         if (realPositionOfLastError === realPos) {
             return;
         }
@@ -8158,11 +8148,10 @@ function createParser(code, options = {}) {
         parseDiagnostics.push(diagnostic);
     }
     function warning(report) {
-        var _a, _b, _c, _d;
         const location = {
             file: scanner.file,
-            pos: (_b = (_a = report.target) === null || _a === void 0 ? void 0 : _a.pos) !== null && _b !== void 0 ? _b : tokenPos(),
-            end: (_d = (_c = report.target) === null || _c === void 0 ? void 0 : _c.end) !== null && _d !== void 0 ? _d : tokenEnd(),
+            pos: report.target?.pos ?? tokenPos(),
+            end: report.target?.end ?? tokenEnd(),
         };
         const diagnostic = createDiagnostic({
             ...report,
@@ -8524,14 +8513,15 @@ function flattenNamespaces(base) {
     });
 }
 class PrettierParserError extends Error {
+    error;
+    loc;
     constructor(error) {
-        var _a, _b;
         super(error.message);
         this.error = error;
         const location = getSourceLocation(error.target);
         this.loc = {
-            start: (_a = location === null || location === void 0 ? void 0 : location.pos) !== null && _a !== void 0 ? _a : 0,
-            end: (_b = location === null || location === void 0 ? void 0 : location.end) !== null && _b !== void 0 ? _b : 0,
+            start: location?.pos ?? 0,
+            end: location?.end ?? 0,
         };
     }
 }