@marimo-team/islands 0.19.11-dev2 → 0.19.11-dev3

package/dist/main.js

@@ -30615,7 +30615,8 @@ ${c.sqlString}
     terminal: false,
     pylsp: false,
     basedpyright: false,
-    ty: false
+    ty: false,
+    pyrefly: false
   });
   function hasCapability(e) {
     var _a2;
@@ -32891,6 +32892,21 @@ ${c.sqlString}
       ]
     }), {});
     return r = () => c.resyncAllDocuments(), c;
+  }), pyreflyClient = once((e) => {
+    var _a2;
+    let r, c = new NotebookLanguageServerClient(new LanguageServerClient({
+      transport: createTransport("pyrefly", async () => {
+        await (r == null ? void 0 : r());
+      }),
+      rootUri: getLSPDocumentRootUri(),
+      workspaceFolders: [],
+      initializationOptions: {
+        pyrefly: {
+          displayTypeErrors: ((_a2 = e.diagnostics) == null ? void 0 : _a2.enabled) ?? false ? "force-on" : "force-off"
+        }
+      }
+    }), {});
+    return r = () => c.resyncAllDocuments(), c;
   }), pyrightClient = once((e) => {
     let r, c = new NotebookLanguageServerClient(new LanguageServerClient({
       transport: createTransport("basedpyright", async () => {
@@ -32928,7 +32944,7 @@ ${c.sqlString}
     getExtension(e, r, c, d, f) {
       return [
         (() => {
-          var _a2, _b3, _c3, _d2;
+          var _a2, _b3, _c3, _d2, _e8;
           let d2 = {
             defaultKeymap: false,
             activateOnTyping: r.activate_on_typing,
@@ -32936,7 +32952,7 @@ ${c.sqlString}
           }, _ = {
             hideOnChange: true
           }, v = [];
-          ((_a2 = f == null ? void 0 : f.pylsp) == null ? void 0 : _a2.enabled) && hasCapability("pylsp") && v.push(pylspClient(f)), ((_b3 = f == null ? void 0 : f.ty) == null ? void 0 : _b3.enabled) && hasCapability("ty") && v.push(tyLspClient(f)), ((_c3 = f == null ? void 0 : f.basedpyright) == null ? void 0 : _c3.enabled) && hasCapability("basedpyright") && v.push(pyrightClient(f));
+          ((_a2 = f == null ? void 0 : f.pylsp) == null ? void 0 : _a2.enabled) && hasCapability("pylsp") && v.push(pylspClient(f)), ((_b3 = f == null ? void 0 : f.ty) == null ? void 0 : _b3.enabled) && hasCapability("ty") && v.push(tyLspClient(f)), ((_c3 = f == null ? void 0 : f.pyrefly) == null ? void 0 : _c3.enabled) && hasCapability("pyrefly") && v.push(pyreflyClient(f)), ((_d2 = f == null ? void 0 : f.basedpyright) == null ? void 0 : _d2.enabled) && hasCapability("basedpyright") && v.push(pyrightClient(f));
           let y = r.signature_hint_on_typing, S = y ? /(\w+|\w+\.|\/)$/ : /(\w+|\w+\.|\(|\/|,)$/;
           if (v.length > 0) {
             let r2 = v.length === 1 ? v[0] : new FederatedLanguageServerClient(v);
@@ -32948,7 +32964,7 @@ ${c.sqlString}
                 useSnippetOnCompletion: true,
                 hoverConfig: _,
                 completionConfig: d2,
-                diagnosticsEnabled: ((_d2 = f.diagnostics) == null ? void 0 : _d2.enabled) ?? false,
+                diagnosticsEnabled: ((_e8 = f.diagnostics) == null ? void 0 : _e8.enabled) ?? false,
                 sendIncrementalChanges: false,
                 signatureHelpEnabled: true,
                 signatureActivateOnTyping: y,
@@ -73307,7 +73323,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.11-dev2"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.11-dev3"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime$88 = require_compiler_runtime();
   function useKeydownOnElement(e, r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.19.11-dev2",
+  "version": "0.19.11-dev3",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/components/app-config/user-config-form.tsx

@@ -228,6 +228,7 @@ export const UserConfigForm: React.FC = () => {
       pylsp: true,
       ty: true,
       basedpyright: true,
+      pyrefly: true,
     };
   }
 
@@ -672,6 +673,48 @@ export const UserConfigForm: React.FC = () => {
                   </div>
                 )}
               />
+              <FormField
+                control={form.control}
+                name="language_servers.pyrefly.enabled"
+                render={({ field }) => (
+                  <div className="flex flex-col gap-1">
+                    <FormItem className={formItemClasses}>
+                      <FormLabel>
+                        <Badge variant="defaultOutline" className="mr-2">
+                          Beta
+                        </Badge>
+                        Pyrefly (
+                        <ExternalLink href="https://github.com/facebook/pyrefly">
+                          docs
+                        </ExternalLink>
+                        )
+                      </FormLabel>
+                      <FormControl>
+                        <Checkbox
+                          data-testid="pyrefly-checkbox"
+                          checked={field.value}
+                          disabled={field.disabled}
+                          onCheckedChange={(checked) => {
+                            field.onChange(Boolean(checked));
+                          }}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                      <IsOverridden
+                        userConfig={config}
+                        name="language_servers.pyrefly.enabled"
+                      />
+                    </FormItem>
+                    {field.value && !capabilities.pyrefly && (
+                      <Banner kind="danger">
+                        Pyrefly is not available in your current environment.
+                        Please install <Kbd className="inline">pyrefly</Kbd> in
+                        your environment.
+                      </Banner>
+                    )}
+                  </div>
+                )}
+              />
               <FormField
                 control={form.control}
                 name="language_servers.ty.enabled"

package/src/core/codemirror/language/languages/python.ts

@@ -175,6 +175,44 @@ const tyLspClient = once((_: LSPConfig) => {
   return notebookClient;
 });
 
+const pyreflyClient = once(
+  (lspConfig: LSPConfig & { diagnostics: DiagnosticsConfig }) => {
+    let resyncCallback: (() => Promise<void>) | undefined;
+
+    const transport = createTransport("pyrefly", async () => {
+      await resyncCallback?.();
+    });
+
+    const lspClientOpts = {
+      transport,
+      rootUri: getLSPDocumentRootUri(),
+      workspaceFolders: [],
+    };
+
+    // We wrap the client in a NotebookLanguageServerClient to add some
+    // additional functionality to handle multiple cells
+    const notebookClient = new NotebookLanguageServerClient(
+      new LanguageServerClient({
+        ...lspClientOpts,
+        initializationOptions: {
+          pyrefly: {
+            displayTypeErrors:
+              (lspConfig.diagnostics?.enabled ?? false)
+                ? "force-on"
+                : "force-off",
+          },
+        },
+      }),
+      {},
+    );
+
+    // Set the resync callback now that the client exists
+    resyncCallback = () => notebookClient.resyncAllDocuments();
+
+    return notebookClient;
+  },
+);
+
 const pyrightClient = once((_: LSPConfig) => {
   let resyncCallback: (() => Promise<void>) | undefined;
 
@@ -263,6 +301,9 @@ export class PythonLanguageAdapter implements LanguageAdapter<{}> {
       if (lspConfig?.ty?.enabled && hasCapability("ty")) {
         clients.push(tyLspClient(lspConfig));
       }
+      if (lspConfig?.pyrefly?.enabled && hasCapability("pyrefly")) {
+        clients.push(pyreflyClient(lspConfig));
+      }
       if (lspConfig?.basedpyright?.enabled && hasCapability("basedpyright")) {
         clients.push(pyrightClient(lspConfig));
       }

package/src/core/codemirror/lsp/transports.ts

@@ -14,7 +14,7 @@ import { getRuntimeManager } from "../../runtime/config";
  * @returns The transport.
  */
 export function createTransport(
-  serverName: "pylsp" | "basedpyright" | "copilot" | "ty",
+  serverName: "pylsp" | "basedpyright" | "copilot" | "ty" | "pyrefly",
   onReconnect?: () => Promise<void>,
 ) {
   const runtimeManager = getRuntimeManager();

package/src/core/config/capabilities.ts

@@ -8,6 +8,7 @@ export const capabilitiesAtom = atom<Capabilities>({
   pylsp: false,
   basedpyright: false,
   ty: false,
+  pyrefly: false,
 });
 
 export function hasCapability(key: keyof Capabilities): boolean {

package/src/core/runtime/runtime.ts

@@ -140,7 +140,7 @@ export class RuntimeManager {
   /**
    * The URL of the copilot server.
    */
-  getLSPURL(lsp: "pylsp" | "basedpyright" | "copilot" | "ty"): URL {
+  getLSPURL(lsp: "pylsp" | "basedpyright" | "copilot" | "ty" | "pyrefly"): URL {
     if (lsp === "copilot") {
       // For copilot, don't include any query parameters
       const url = this.formatWsURL(`/lsp/${lsp}`);