@typespec/compiler 1.0.0-rc.2-dev.10 → 1.0.0-rc.2-dev.13

package/dist/manifest.js

@@ -1,4 +1,4 @@
 export default {
-  "version": "1.0.0-rc.2-dev.10",
-  "commit": "55835ce7bafdb6c36fbd9802d30d69c2561e4026"
+  "version": "1.0.0-rc.2-dev.13",
+  "commit": "db65b12a5240b9bc3cf1f78fa604dc68e420e88c"
 };

package/dist/src/core/cli/actions/format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../../src/core/cli/actions/format.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AACD,wBAAsB,YAAY,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,iBAyBzE"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../../src/core/cli/actions/format.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,iBAMzE"}

package/dist/src/core/cli/actions/format.js

@@ -1,30 +1,77 @@
+import pc from "picocolors";
 import { logDiagnostics } from "../../diagnostics.js";
-import { findUnformattedTypeSpecFiles, formatTypeSpecFiles } from "../../formatter-fs.js";
+import { checkFilesFormat, formatFiles } from "../../formatter-fs.js";
 export async function formatAction(host, args) {
     if (args["check"]) {
-        const unformatted = await findUnformattedTypeSpecFiles(args["include"], {
+        await check(host, args);
+    }
+    else {
+        await format(host, args);
+    }
+}
+async function check(host, args) {
+    await host.logger.trackAction("Checking format", "", async (task) => {
+        const result = await checkFilesFormat(args["include"], {
             exclude: args["exclude"],
-            debug: args.debug,
         });
-        if (unformatted.length > 0) {
-            // eslint-disable-next-line no-console
-            console.log(`Found ${unformatted.length} unformatted files:`);
-            for (const file of unformatted) {
-                // eslint-disable-next-line no-console
-                console.log(` - ${file}`);
-            }
+        if (result.errored.length > 0) {
+            logDiagnostics(result.errored.map((x) => x[1]), host.logSink);
+        }
+        if (result.needsFormat.length > 0 || result.errored.length > 0) {
+            const msg = [
+                needsFormatText(result.needsFormat),
+                result.errored.length > 0 ? errorText(result.errored) : undefined,
+                formattedText(result.formatted),
+                result.ignored.length > 0 ? ignoredText(result.ignored) : undefined,
+            ];
+            task.warn(msg.filter((x) => x).join(", "));
             process.exit(1);
         }
-    }
-    else {
-        const [_, diagnostics] = await formatTypeSpecFiles(args["include"], {
+        else {
+            const msg = [
+                formattedText(result.formatted),
+                result.ignored.length > 0 ? ignoredText(result.ignored) : undefined,
+            ];
+            task.succeed(msg.filter((x) => x).join(", "));
+        }
+    });
+}
+async function format(host, args) {
+    await host.logger.trackAction("Formatting", "", async (task) => {
+        const result = await formatFiles(args["include"], {
             exclude: args["exclude"],
-            debug: args.debug,
         });
-        if (diagnostics.length > 0) {
-            logDiagnostics(diagnostics, host.logSink);
+        const msg = [
+            result.formatted.length > 0 ? formattedText(result.formatted) : undefined,
+            result.alreadyFormatted.length > 0 ? unchangedText(result.alreadyFormatted) : undefined,
+            result.ignored.length > 0 ? ignoredText(result.ignored) : undefined,
+            result.errored.length > 0 ? errorText(result.errored) : undefined,
+        ]
+            .filter((x) => x)
+            .join(", ");
+        if (result.errored.length > 0) {
+            logDiagnostics(result.errored.map((x) => x[1]), host.logSink);
+            task.warn(msg);
             process.exit(1);
         }
-    }
+        else {
+            task.succeed(msg);
+        }
+    });
+}
+function formattedText(files) {
+    return pc.green(`${files.length} formatted`);
+}
+function unchangedText(files) {
+    return pc.green(`${files.length} unchanged`);
+}
+function needsFormatText(files) {
+    return pc.yellow(`${files.length} need format`);
+}
+function ignoredText(files) {
+    return pc.gray(`${files.length} ignored`);
+}
+function errorText(errored) {
+    return pc.red(`${errored.length} error${errored.length > 1 ? "s" : ""}`);
 }
 //# sourceMappingURL=format.js.map

package/dist/src/core/cli/actions/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../src/core/cli/actions/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,4BAA4B,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAS1F,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAqB,EAAE,IAAgB;IACxE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAClB,MAAM,WAAW,GAAG,MAAM,4BAA4B,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACtE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;YACxB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;QACH,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,SAAS,WAAW,CAAC,MAAM,qBAAqB,CAAC,CAAC;YAC9D,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAC/B,sCAAsC;gBACtC,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YAC5B,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YAClE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;YACxB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;QACH,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../src/core/cli/actions/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAWtE,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAqB,EAAE,IAAgB;IACxE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAClB,MAAM,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,KAAK,UAAU,KAAK,CAAC,IAAqB,EAAE,IAAgB;IAC1D,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAClE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACrD,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;SACzB,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,cAAc,CACZ,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC/B,IAAI,CAAC,OAAO,CACb,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/D,MAAM,GAAG,GAAG;gBACV,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC;gBACnC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;gBACjE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC/B,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;aACpE,CAAC;YAEF,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG;gBACV,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC/B,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;aACpE,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,IAAqB,EAAE,IAAgB;IAC3D,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7D,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YAChD,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;SACzB,CAAC,CAAC;QACH,MAAM,GAAG,GAAG;YACV,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;YACzE,MAAM,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;YACvF,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;YACnE,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;SAClE;aACE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAChB,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,cAAc,CACZ,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC/B,IAAI,CAAC,OAAO,CACb,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,aAAa,CAAC,KAAwB;IAC7C,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM,YAAY,CAAC,CAAC;AAC/C,CAAC;AACD,SAAS,aAAa,CAAC,KAAwB;IAC7C,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM,YAAY,CAAC,CAAC;AAC/C,CAAC;AACD,SAAS,eAAe,CAAC,KAAwB;IAC/C,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,cAAc,CAAC,CAAC;AAClD,CAAC;AACD,SAAS,WAAW,CAAC,KAAwB;IAC3C,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,UAAU,CAAC,CAAC;AAC5C,CAAC;AACD,SAAS,SAAS,CAAC,OAAwC;IACzD,OAAO,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,SAAS,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC3E,CAAC"}

package/dist/src/core/formatter-fs.d.ts

@@ -1,29 +1,73 @@
 import { Diagnostic } from "./types.js";
 export interface TypeSpecFormatOptions {
     exclude?: string[];
-    debug?: boolean;
 }
+/**  The paths of which are either relative or absolute based on the original file path patterns. */
 export interface TypeSpecFormatResult {
-    /**
-     * The list of files which were formatted successfully, the paths of which are either relative or absolute based on the original file path patterns.
-     */
-    formattedFiles: string[];
+    /** Files which were formatted successfully, */
+    readonly formatted: string[];
+    /** Files which had a valid format already. */
+    readonly alreadyFormatted: string[];
+    /** Files that were included in the filter but are not in the scope of the typespec formatter. */
+    readonly ignored: string[];
+    /** Files with errors */
+    readonly errored: [string, Diagnostic][];
 }
 /**
- * Format all the TypeSpec files.
+ * Format all the TypeSpec project files(.tsp, tspconfig.yaml).
  * @param patterns List of wildcard pattern searching for TypeSpec files.
  * @returns list of files which failed to format.
  */
-export declare function formatTypeSpecFiles(patterns: string[], { exclude, debug }: TypeSpecFormatOptions): Promise<[TypeSpecFormatResult, readonly Diagnostic[]]>;
+export declare function formatFiles(patterns: string[], { exclude }: TypeSpecFormatOptions): Promise<TypeSpecFormatResult>;
+export interface CheckFilesFormatResult {
+    readonly formatted: string[];
+    readonly needsFormat: string[];
+    readonly ignored: string[];
+    readonly errored: [string, Diagnostic][];
+}
 /**
- * Find all the unformatted files.
- * @returns list of files not formatted.
+ * Check the format of the files in the given pattern.
  */
-export declare function findUnformattedTypeSpecFiles(patterns: string[], { exclude, debug }: TypeSpecFormatOptions): Promise<string[]>;
-export declare function formatTypeSpecFile(filename: string): Promise<void>;
+export declare function checkFilesFormat(patterns: string[], { exclude }: TypeSpecFormatOptions): Promise<CheckFilesFormatResult>;
+export type FormatFileResult = 
+/** File formatted successfully. */
+{
+    kind: "formatted";
+}
+/** File was already formatted. */
+ | {
+    kind: "already-formatted";
+}
+/** File is not in a format that can be formatted by TypeSpec */
+ | {
+    kind: "ignored";
+}
+/** Error occurred, probably a parsing error. */
+ | {
+    kind: "error";
+    diagnostic: Diagnostic;
+};
+export declare function formatFile(filename: string): Promise<FormatFileResult>;
+export type CheckFormatResult = 
+/** File formatted successfully. */
+{
+    kind: "formatted";
+}
+/** File needs format */
+ | {
+    kind: "needs-format";
+}
+/** File is not in a format that can be formatted by TypeSpec */
+ | {
+    kind: "ignored";
+}
+/** Error occurred, probably a parsing error. */
+ | {
+    kind: "error";
+    diagnostic: Diagnostic;
+};
 /**
  * Check the given TypeSpec file is correctly formatted.
- * @returns true if code is formatted correctly.
  */
-export declare function checkFormatTypeSpecFile(filename: string): Promise<boolean>;
+export declare function checkFileFormat(filename: string): Promise<CheckFormatResult>;
 //# sourceMappingURL=formatter-fs.d.ts.map

package/dist/src/core/formatter-fs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatter-fs.d.ts","sourceRoot":"","sources":["../../../src/core/formatter-fs.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAY,MAAM,YAAY,CAAC;AAElD,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAAE,EAClB,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB,GACxC,OAAO,CAAC,CAAC,oBAAoB,EAAE,SAAS,UAAU,EAAE,CAAC,CAAC,CAyBxD;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,MAAM,EAAE,EAClB,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB,GACxC,OAAO,CAAC,MAAM,EAAE,CAAC,CAoBnB;AAED,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,iBAKxD;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAIhF"}
+{"version":3,"file":"formatter-fs.d.ts","sourceRoot":"","sources":["../../../src/core/formatter-fs.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAY,MAAM,YAAY,CAAC;AAElD,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,oGAAoG;AACpG,MAAM,WAAW,oBAAoB;IACnC,+CAA+C;IAC/C,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC7B,8CAA8C;IAC9C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IACpC,iGAAiG;IACjG,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B,wBAAwB;IACxB,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;CAC1C;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAAE,EAClB,EAAE,OAAO,EAAE,EAAE,qBAAqB,GACjC,OAAO,CAAC,oBAAoB,CAAC,CAyB/B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;CAC1C;AACD;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAAE,EAClB,EAAE,OAAO,EAAE,EAAE,qBAAqB,GACjC,OAAO,CAAC,sBAAsB,CAAC,CAyBjC;AAED,MAAM,MAAM,gBAAgB;AAC1B,mCAAmC;AACjC;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE;AACvB,kCAAkC;GAChC;IAAE,IAAI,EAAE,mBAAmB,CAAA;CAAE;AAC/B,gEAAgE;GAC9D;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;AACrB,gDAAgD;GAC9C;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC;AAE9C,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA4B5E;AAED,MAAM,MAAM,iBAAiB;AAC3B,mCAAmC;AACjC;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE;AACvB,wBAAwB;GACtB;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE;AAC1B,gEAAgE;GAC9D;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE;AACrB,gDAAgD;GAC9C;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC;AAE9C;;GAEG;AACH,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAwBlF"}

package/dist/src/core/formatter-fs.js

@@ -2,81 +2,128 @@ import { readFile, writeFile } from "fs/promises";
 import { globby } from "globby";
 import { resolveConfig } from "prettier";
 import { PrettierParserError } from "../formatter/parser.js";
-import { checkFormatTypeSpec, formatTypeSpec } from "./formatter.js";
+import { checkFormat, format, getFormatterFromFilename } from "./formatter.js";
 import { createDiagnostic } from "./messages.js";
 import { normalizePath } from "./path-utils.js";
 import { NoTarget } from "./types.js";
 /**
- * Format all the TypeSpec files.
+ * Format all the TypeSpec project files(.tsp, tspconfig.yaml).
  * @param patterns List of wildcard pattern searching for TypeSpec files.
  * @returns list of files which failed to format.
  */
-export async function formatTypeSpecFiles(patterns, { exclude, debug }) {
+export async function formatFiles(patterns, { exclude }) {
     const files = await findFiles(patterns, exclude);
-    const diagnostics = [];
-    const formattedFiles = [];
+    const errored = [];
+    const formatted = [];
+    const alreadyFormatted = [];
+    const ignored = [];
     for (const file of files) {
-        try {
-            await formatTypeSpecFile(file);
-            formattedFiles.push(file);
-        }
-        catch (e) {
-            if (e instanceof PrettierParserError) {
-                const details = debug ? e.message : "";
-                diagnostics.push(createDiagnostic({
-                    code: "format-failed",
-                    format: { file, details },
-                    target: NoTarget,
-                }));
-            }
-            else {
-                throw e;
-            }
+        const result = await formatFile(file);
+        switch (result.kind) {
+            case "formatted":
+                formatted.push(file);
+                break;
+            case "already-formatted":
+                alreadyFormatted.push(file);
+                break;
+            case "ignored":
+                ignored.push(file);
+                break;
+            case "error":
+                errored.push([file, result.diagnostic]);
+                break;
         }
     }
-    return [{ formattedFiles }, diagnostics];
+    return { formatted, ignored, errored, alreadyFormatted };
 }
 /**
- * Find all the unformatted files.
- * @returns list of files not formatted.
+ * Check the format of the files in the given pattern.
  */
-export async function findUnformattedTypeSpecFiles(patterns, { exclude, debug }) {
+export async function checkFilesFormat(patterns, { exclude }) {
     const files = await findFiles(patterns, exclude);
-    const unformatted = [];
+    const errored = [];
+    const formatted = [];
+    const needsFormat = [];
+    const ignored = [];
     for (const file of files) {
-        try {
-            if (!(await checkFormatTypeSpecFile(file))) {
-                unformatted.push(file);
-            }
-        }
-        catch (e) {
-            if (e instanceof PrettierParserError) {
-                const details = debug ? e.message : "";
-                // eslint-disable-next-line no-console
-                console.error(`File '${file}' failed to format. ${details}`);
-                unformatted.push(file);
-            }
-            else {
-                throw e;
-            }
+        const result = await checkFileFormat(file);
+        switch (result.kind) {
+            case "formatted":
+                formatted.push(file);
+                break;
+            case "needs-format":
+                formatted.push(file);
+                break;
+            case "ignored":
+                ignored.push(file);
+                break;
+            case "error":
+                errored.push([file, result.diagnostic]);
+                break;
         }
     }
-    return unformatted;
+    return { formatted, needsFormat, ignored, errored };
 }
-export async function formatTypeSpecFile(filename) {
+export async function formatFile(filename) {
     const content = await readFile(filename, "utf-8");
     const prettierConfig = await resolveConfig(filename);
-    const formattedContent = await formatTypeSpec(content, prettierConfig ?? {});
-    await writeFile(filename, formattedContent);
+    const formatter = getFormatterFromFilename(filename);
+    if (formatter === undefined) {
+        return { kind: "ignored" };
+    }
+    try {
+        const formattedContent = await format(content, formatter, prettierConfig ?? {});
+        if (formattedContent === content) {
+            return { kind: "already-formatted" };
+        }
+        await writeFile(filename, formattedContent);
+        return { kind: "formatted" };
+    }
+    catch (e) {
+        if (e instanceof PrettierParserError) {
+            return {
+                kind: "error",
+                diagnostic: createDiagnostic({
+                    code: "format-failed",
+                    format: { file: filename, details: e.message },
+                    target: NoTarget,
+                }),
+            };
+        }
+        else {
+            throw e;
+        }
+    }
 }
 /**
  * Check the given TypeSpec file is correctly formatted.
- * @returns true if code is formatted correctly.
  */
-export async function checkFormatTypeSpecFile(filename) {
+export async function checkFileFormat(filename) {
     const content = await readFile(filename, "utf-8");
     const prettierConfig = await resolveConfig(filename);
-    return await checkFormatTypeSpec(content, prettierConfig ?? {});
+    const formatter = getFormatterFromFilename(filename);
+    if (formatter === undefined) {
+        return { kind: "ignored" };
+    }
+    try {
+        const formatted = await checkFormat(content, formatter, prettierConfig ?? {});
+        return { kind: formatted ? "formatted" : "needs-format" };
+    }
+    catch (e) {
+        if (e instanceof PrettierParserError) {
+            return {
+                kind: "error",
+                diagnostic: createDiagnostic({
+                    code: "format-failed",
+                    format: { file: filename, details: e.message },
+                    target: NoTarget,
+                }),
+            };
+        }
+        else {
+            throw e;
+        }
+    }
 }
 async function findFiles(include, ignore = []) {
     const patterns = [

package/dist/src/core/formatter-fs.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatter-fs.js","sourceRoot":"","sources":["../../../src/core/formatter-fs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"formatter-fs.js","sourceRoot":"","sources":["../../../src/core/formatter-fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAc,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkBlD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,QAAkB,EAClB,EAAE,OAAO,EAAyB;IAElC,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;QACtC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,WAAW;gBACd,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrB,MAAM;YACR,KAAK,mBAAmB;gBACtB,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC5B,MAAM;YACR,KAAK,SAAS;gBACZ,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,MAAM;YACR,KAAK,OAAO;gBACV,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;gBACxC,MAAM;QACV,CAAC;IACH,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAC3D,CAAC;AAQD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAkB,EAClB,EAAE,OAAO,EAAyB;IAElC,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;QAC3C,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,WAAW;gBACd,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrB,MAAM;YACR,KAAK,cAAc;gBACjB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrB,MAAM;YACR,KAAK,SAAS;gBACZ,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,MAAM;YACR,KAAK,OAAO;gBACV,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;gBACxC,MAAM;QACV,CAAC;IACH,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AACtD,CAAC;AAYD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,QAAgB;IAC/C,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;IACD,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC;QAChF,IAAI,gBAAgB,KAAK,OAAO,EAAE,CAAC;YACjC,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC;QACvC,CAAC;QACD,MAAM,SAAS,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QAC5C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC/B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,mBAAmB,EAAE,CAAC;YACrC,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,UAAU,EAAE,gBAAgB,CAAC;oBAC3B,IAAI,EAAE,eAAe;oBACrB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;oBAC9C,MAAM,EAAE,QAAQ;iBACjB,CAAC;aACH,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAYD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,QAAgB;IACpD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;IACD,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC;QAC9E,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC;IAC5D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,mBAAmB,EAAE,CAAC;YACrC,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,UAAU,EAAE,gBAAgB,CAAC;oBAC3B,IAAI,EAAE,eAAe;oBACrB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;oBAC9C,MAAM,EAAE,QAAQ;iBACjB,CAAC;aACH,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,OAAiB,EAAE,SAAmB,EAAE;IAC/D,MAAM,QAAQ,GAAG;QACf,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAC7B,kBAAkB;QAClB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7C,CAAC;IACF,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}

package/dist/src/core/formatter.d.ts

@@ -1,4 +1,34 @@
 import type { Options } from "prettier";
+export type Formatter = "typespec" | "tspconfig";
+/**
+ * Get the formatter name for the given filename
+ * @param filename The filename to check
+ */
+export declare function getFormatterFromFilename(filename: string): Formatter | undefined;
+/**
+ * Format the code with the given formatter
+ * @param code The code to format
+ * @param formatter The formatter to use
+ * @param prettierConfig Optional config for prettier
+ * @returns The formatted code
+ * @throws PrettierParserError if the code is not valid
+ */
+export declare function format(code: string, formatter: Formatter, prettierConfig?: Options): Promise<string>;
+/**
+ * Check the given code is correctly formatted with the given formatter
+ * @param code The code to check the format of
+ * @param formatter The formatter to use
+ * @param prettierConfig Optional config for prettier
+ * @returns true if the code is formatted correctly
+ * @throws PrettierParserError if the code is not valid
+ */
+export declare function checkFormat(code: string, formatter: Formatter, prettierConfig?: Options): Promise<boolean>;
+/**
+ * Format TypeSpec code
+ * @param code Code to format
+ * @param prettierConfig Optional config for prettier.
+ * @returns Formatted code
+ */
 export declare function formatTypeSpec(code: string, prettierConfig?: Options): Promise<string>;
 /**
  * Check the given is correctly formatted.

package/dist/src/core/formatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatter.d.ts","sourceRoot":"","sources":["../../../src/core/formatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAIxC,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ5F;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC,CAMlB"}
+{"version":3,"file":"formatter.d.ts","sourceRoot":"","sources":["../../../src/core/formatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAMxC,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,WAAW,CAAC;AAEjD;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAUhF;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAC1B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC,CAElB;AAwBD;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ5F;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC,CAMlB"}

package/dist/src/core/formatter.js

@@ -1,7 +1,68 @@
-import { check, format } from "prettier/standalone";
+import YamlPlugin from "prettier/plugins/yaml.js";
+import { check, format as prettierFormat } from "prettier/standalone";
 import * as typespecPrettierPlugin from "../formatter/index.js";
+import { getAnyExtensionFromPath } from "./path-utils.js";
+/**
+ * Get the formatter name for the given filename
+ * @param filename The filename to check
+ */
+export function getFormatterFromFilename(filename) {
+    const ext = getAnyExtensionFromPath(filename);
+    if (filename.endsWith("tspconfig.yaml")) {
+        return "tspconfig";
+    }
+    switch (ext) {
+        case ".tsp":
+            return "typespec";
+    }
+    return undefined;
+}
+/**
+ * Format the code with the given formatter
+ * @param code The code to format
+ * @param formatter The formatter to use
+ * @param prettierConfig Optional config for prettier
+ * @returns The formatted code
+ * @throws PrettierParserError if the code is not valid
+ */
+export async function format(code, formatter, prettierConfig) {
+    return runFormatter(prettierFormat, code, formatter, prettierConfig);
+}
+/**
+ * Check the given code is correctly formatted with the given formatter
+ * @param code The code to check the format of
+ * @param formatter The formatter to use
+ * @param prettierConfig Optional config for prettier
+ * @returns true if the code is formatted correctly
+ * @throws PrettierParserError if the code is not valid
+ */
+export async function checkFormat(code, formatter, prettierConfig) {
+    return runFormatter(check, code, formatter, prettierConfig);
+}
+async function runFormatter(fn, code, formatter, prettierConfig) {
+    switch (formatter) {
+        case "typespec":
+            return fn(code, {
+                ...prettierConfig,
+                parser: "typespec",
+                plugins: [typespecPrettierPlugin],
+            });
+        case "tspconfig":
+            return await fn(code, {
+                ...prettierConfig,
+                parser: "yaml",
+                plugins: [YamlPlugin],
+            });
+    }
+}
+/**
+ * Format TypeSpec code
+ * @param code Code to format
+ * @param prettierConfig Optional config for prettier.
+ * @returns Formatted code
+ */
 export async function formatTypeSpec(code, prettierConfig) {
-    const output = await format(code, {
+    const output = await prettierFormat(code, {
         ...prettierConfig,
         parser: "typespec",
         plugins: [typespecPrettierPlugin],

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

@@ -1 +1 @@
-{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../../src/core/formatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,sBAAsB,MAAM,uBAAuB,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,cAAwB;IACzE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE;QAChC,GAAG,cAAc;QACjB,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,CAAC,sBAAsB,CAAC;KAClC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAY,EACZ,cAAwB;IAExB,OAAO,KAAK,CAAC,IAAI,EAAE;QACjB,GAAG,cAAc;QACjB,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,CAAC,sBAAsB,CAAC;KAClC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../../src/core/formatter.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,sBAAsB,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAI1D;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,QAAgB;IACvD,MAAM,GAAG,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAC9C,IAAI,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACxC,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,UAAU,CAAC;IACtB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,IAAY,EACZ,SAAoB,EACpB,cAAwB;IAExB,OAAO,YAAY,CAAC,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;AACvE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAAY,EACZ,SAAoB,EACpB,cAAwB;IAExB,OAAO,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;AAC9D,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,EAAmD,EACnD,IAAY,EACZ,SAAoB,EACpB,cAAwB;IAExB,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,UAAU;YACb,OAAO,EAAE,CAAC,IAAI,EAAE;gBACd,GAAG,cAAc;gBACjB,MAAM,EAAE,UAAU;gBAClB,OAAO,EAAE,CAAC,sBAAsB,CAAC;aAClC,CAAC,CAAC;QACL,KAAK,WAAW;YACd,OAAO,MAAM,EAAE,CAAC,IAAI,EAAE;gBACpB,GAAG,cAAc;gBACjB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,CAAC,UAAU,CAAC;aACtB,CAAC,CAAC;IACP,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,cAAwB;IACzE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE;QACxC,GAAG,cAAc;QACjB,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,CAAC,sBAAsB,CAAC;KAClC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAY,EACZ,cAAwB;IAExB,OAAO,KAAK,CAAC,IAAI,EAAE;QACjB,GAAG,cAAc;QACjB,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,CAAC,sBAAsB,CAAC;KAClC,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/compiler",
-  "version": "1.0.0-rc.2-dev.10",
+  "version": "1.0.0-rc.2-dev.13",
   "description": "TypeSpec Compiler Preview",
   "author": "Microsoft Corporation",
   "license": "MIT",
@@ -101,8 +101,8 @@
     "@types/semver": "^7.5.8",
     "@types/yargs": "~17.0.33",
     "@typespec/internal-build-utils": "^0.69.0 || >=0.70.0-dev <0.70.0",
-    "@vitest/coverage-v8": "^3.0.9",
-    "@vitest/ui": "^3.0.9",
+    "@vitest/coverage-v8": "^3.1.2",
+    "@vitest/ui": "^3.1.2",
     "c8": "^10.1.3",
     "grammarkdown": "~3.3.2",
     "pathe": "^2.0.3",
@@ -110,7 +110,7 @@
     "source-map-support": "~0.5.21",
     "tmlanguage-generator": "^0.6.1 || >=0.7.0-dev <0.7.0",
     "typescript": "~5.8.2",
-    "vitest": "^3.0.9",
+    "vitest": "^3.1.2",
     "vscode-oniguruma": "~2.0.1",
     "vscode-textmate": "~9.2.0"
   },