@typespec/playground 0.13.0-dev.0 → 0.13.0-dev.1

package/dist/index.js

@@ -1,4 +1,4 @@
-export { c as createBrowserHost, r as registerMonacoLanguage } from './services-BTSPLy3C.js';
+export { c as createBrowserHost, r as registerMonacoLanguage } from './services-CzxNzZLi.js';
 export { createUrlStateStorage } from './state-storage.js';
 
 function registerMonacoDefaultWorkersForVite() {

package/dist/react/index.js

@@ -7,7 +7,7 @@ import { $ } from '@typespec/compiler/typekit';
 import { DocumentBulletList24Regular, Dismiss24Regular, Settings24Regular, Save16Regular, Broom16Filled, Bug16Regular, FolderListRegular, DataLineRegular, ErrorCircle16Filled, Warning16Filled, ChevronDown16Regular } from '@fluentui/react-icons';
 import debounce from 'debounce';
 import { CompletionItemTag } from 'vscode-languageserver';
-import { a as resolveVirtualPath, p as printDebugInfo, d as debugGlobals, g as getMonacoRange, c as createBrowserHost, r as registerMonacoLanguage } from '../services-BTSPLy3C.js';
+import { a as resolveVirtualPath, p as printDebugInfo, d as debugGlobals, g as getMonacoRange, u as updateDiagnosticsForCodeFixes, c as createBrowserHost, r as registerMonacoLanguage } from '../services-CzxNzZLi.js';
 import { ErrorBoundary } from 'react-error-boundary';
 import { TypeGraph } from '@typespec/html-program-viewer/react';
 import '@typespec/html-program-viewer/style.css';
@@ -2073,10 +2073,12 @@ const Playground = (props) => {
         severity: diag.severity === "error" ? MarkerSeverity.Error : MarkerSeverity.Warning,
         tags: diag.code === "deprecated" ? [CompletionItemTag.Deprecated] : void 0
       }));
+      updateDiagnosticsForCodeFixes(typespecCompiler, state2.program.diagnostics);
       debugGlobals().program = state2.program;
       debugGlobals().$$ = $(state2.program);
       editor.setModelMarkers(typespecModel, "owner", markers ?? []);
     } else {
+      updateDiagnosticsForCodeFixes(typespecCompiler, []);
       editor.setModelMarkers(typespecModel, "owner", []);
     }
   }, [host, selectedEmitter, compilerOptions, typespecModel]);

package/dist/{services-BTSPLy3C.js → services-CzxNzZLi.js}

@@ -341,6 +341,12 @@ const MonacoToLsp = {
   codeActionContext
 };
 
+let _currentDiagnostics = [];
+let _currentCompiler;
+function updateDiagnosticsForCodeFixes(compiler, diagnostics) {
+  _currentDiagnostics = diagnostics;
+  _currentCompiler = compiler;
+}
 function getIndentAction(value) {
   switch (value) {
     case "none":
@@ -588,6 +594,66 @@ async function registerMonacoLanguage(host) {
       return { suggestions };
     }
   });
+  monaco.languages.registerCodeActionProvider("typespec", {
+    async provideCodeActions(model, range) {
+      const compiler = _currentCompiler;
+      if (!compiler) return { actions: [], dispose: () => {
+      } };
+      const actions = [];
+      for (const diag of _currentDiagnostics) {
+        if (!diag.codefixes?.length) continue;
+        const loc = compiler.getSourceLocation(diag.target, { locateId: true });
+        if (!loc || loc.file.path !== "/test/main.tsp") continue;
+        const monacoRange = getMonacoRange(compiler, diag.target);
+        if (!monacoRangesOverlap(monacoRange, range)) continue;
+        for (const fix of diag.codefixes) {
+          const edits = await compiler.resolveCodeFix(fix);
+          const workspaceEdits = edits.filter((edit) => edit.file.path === "/test/main.tsp").map((edit) => {
+            const start = edit.file.getLineAndCharacterOfPosition(edit.pos);
+            if (edit.kind === "insert-text") {
+              return {
+                resource: model.uri,
+                textEdit: {
+                  range: {
+                    startLineNumber: start.line + 1,
+                    startColumn: start.character + 1,
+                    endLineNumber: start.line + 1,
+                    endColumn: start.character + 1
+                  },
+                  text: edit.text
+                },
+                versionId: void 0
+              };
+            } else {
+              const end = edit.file.getLineAndCharacterOfPosition(edit.end);
+              return {
+                resource: model.uri,
+                textEdit: {
+                  range: {
+                    startLineNumber: start.line + 1,
+                    startColumn: start.character + 1,
+                    endLineNumber: end.line + 1,
+                    endColumn: end.character + 1
+                  },
+                  text: edit.text
+                },
+                versionId: void 0
+              };
+            }
+          });
+          if (workspaceEdits.length > 0) {
+            actions.push({
+              title: fix.label,
+              kind: "quickfix",
+              edit: { edits: workspaceEdits }
+            });
+          }
+        }
+      }
+      return { actions, dispose: () => {
+      } };
+    }
+  });
   monaco.editor.defineTheme("typespec", {
     base: "vs",
     inherit: true,
@@ -661,5 +727,17 @@ function getMonacoRange(typespecCompiler, target) {
     endColumn: end.character + 1
   };
 }
+function monacoRangesOverlap(a, b) {
+  if (a.endLineNumber < b.startLineNumber || b.endLineNumber < a.startLineNumber) {
+    return false;
+  }
+  if (a.endLineNumber === b.startLineNumber && a.endColumn < b.startColumn) {
+    return false;
+  }
+  if (b.endLineNumber === a.startLineNumber && b.endColumn < a.startColumn) {
+    return false;
+  }
+  return true;
+}
 
-export { resolveVirtualPath as a, createBrowserHost as c, debugGlobals as d, getMonacoRange as g, printDebugInfo as p, registerMonacoLanguage as r };
+export { resolveVirtualPath as a, createBrowserHost as c, debugGlobals as d, getMonacoRange as g, printDebugInfo as p, registerMonacoLanguage as r, updateDiagnosticsForCodeFixes as u };

package/dist/src/react/playground.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playground.d.ts","sourceRoot":"","sources":["../../../src/react/playground.tsx"],"names":[],"mappings":"AAGA,OAAO,sCAAsC,CAAC;AAG9C,OAAO,EAML,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAKf,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQjE,OAAO,KAAK,EAAoB,gBAAgB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEpF,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAGrF,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,WAAW,CAAC;IAElB,iDAAiD;IACjD,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,kCAAkC;IAClC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAEtC,wBAAwB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAE3C,oCAAoC;IACpC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,yDAAyD;IACzD,sBAAsB,CAAC,EAAE,eAAe,CAAC;IACzC,6CAA6C;IAC7C,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAE3D;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAEvB,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAE9B,uBAAuB;IACvB,KAAK,CAAC,EAAE,eAAe,CAAC;IAExB,kDAAkD;IAClD,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAE1B,4FAA4F;IAC5F,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEpD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAE7C,aAAa,CAAC,EAAE,wBAAwB,CAAC;IAEzC;;OAEG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAEhB,oBAAoB;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,4BAA4B;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,eAAO,MAAM,UAAU,EAAE,iBAAiB,CAAC,eAAe,CAiPzD,CAAC"}
+{"version":3,"file":"playground.d.ts","sourceRoot":"","sources":["../../../src/react/playground.tsx"],"names":[],"mappings":"AAGA,OAAO,sCAAsC,CAAC;AAG9C,OAAO,EAML,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAKf,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQjE,OAAO,KAAK,EAAoB,gBAAgB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEpF,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAGrF,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,WAAW,CAAC;IAElB,iDAAiD;IACjD,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,kCAAkC;IAClC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAEtC,wBAAwB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAE3C,oCAAoC;IACpC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,yDAAyD;IACzD,sBAAsB,CAAC,EAAE,eAAe,CAAC;IACzC,6CAA6C;IAC7C,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAE3D;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAEvB,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAE9B,uBAAuB;IACvB,KAAK,CAAC,EAAE,eAAe,CAAC;IAExB,kDAAkD;IAClD,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAE1B,4FAA4F;IAC5F,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEpD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAE7C,aAAa,CAAC,EAAE,wBAAwB,CAAC;IAEzC;;OAEG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAEhB,oBAAoB;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,4BAA4B;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,eAAO,MAAM,UAAU,EAAE,iBAAiB,CAAC,eAAe,CAqPzD,CAAC"}

package/dist/src/services.d.ts

@@ -1,6 +1,12 @@
-import { DiagnosticTarget, NoTarget } from '@typespec/compiler';
+import { Diagnostic, DiagnosticTarget, NoTarget } from '@typespec/compiler';
 import { BrowserHost } from './types.js';
 import * as monaco from "monaco-editor";
+/**
+ * Update the current diagnostics so the Monaco code action provider can
+ * surface codefixes for the playground's own compilation results.
+ * Call this after every compilation.
+ */
+export declare function updateDiagnosticsForCodeFixes(compiler: typeof import("@typespec/compiler"), diagnostics: readonly Diagnostic[]): void;
 export declare function registerMonacoLanguage(host: BrowserHost): Promise<void>;
 export declare function getMonacoRange(typespecCompiler: typeof import("@typespec/compiler"), target: DiagnosticTarget | typeof NoTarget): monaco.IRange;
 //# sourceMappingURL=services.d.ts.map

package/dist/src/services.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../src/services.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,QAAQ,EAEd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAMxC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAmC9C,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,WAAW,iBAsU7D;AAED,wBAAgB,cAAc,CAC5B,gBAAgB,EAAE,cAAc,oBAAoB,CAAC,EACrD,MAAM,EAAE,gBAAgB,GAAG,OAAO,QAAQ,GACzC,MAAM,CAAC,MAAM,CAkBf"}
+{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../src/services.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,QAAQ,EAEd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAMxC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAO9C;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,cAAc,oBAAoB,CAAC,EAC7C,WAAW,EAAE,SAAS,UAAU,EAAE,QAInC;AAmCD,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,WAAW,iBA4X7D;AAED,wBAAgB,cAAc,CAC5B,gBAAgB,EAAE,cAAc,oBAAoB,CAAC,EACrD,MAAM,EAAE,gBAAgB,GAAG,OAAO,QAAQ,GACzC,MAAM,CAAC,MAAM,CAkBf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/playground",
-  "version": "0.13.0-dev.0",
+  "version": "0.13.0-dev.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec playground UI components.",
   "homepage": "https://typespec.io",
@@ -64,7 +64,7 @@
     "@typespec/bundler": "^0.5.0 || >=0.6.0-dev <0.6.0",
     "@typespec/compiler": "^1.9.0",
     "@typespec/html-program-viewer": "^0.79.0 || >=0.80.0-dev <0.80.0",
-    "@typespec/http": "^1.9.0",
+    "@typespec/http": "^1.9.1",
     "@typespec/openapi": "^1.9.0",
     "@typespec/openapi3": "^1.9.0",
     "@typespec/protobuf": "^0.79.0 || >=0.80.0-dev <0.80.0",