@marimo-team/islands 0.25.1-dev4 → 0.25.1-dev40

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

@@ -99,21 +99,21 @@ function getLatestEngine(): ConnectionName {
  */
 export class SQLLanguageAdapter implements LanguageAdapter<SQLLanguageAdapterMetadata> {
   private parser = new SQLParser();
-  readonly type = "sql";
-  sqlModeEnabled: boolean;
+  public readonly type = "sql";
+  public sqlModeEnabled: boolean;
 
-  constructor() {
+  public constructor() {
     this.sqlModeEnabled = true;
   }
 
-  get defaultMetadata(): SQLLanguageAdapterMetadata {
+  public get defaultMetadata(): SQLLanguageAdapterMetadata {
     return {
       ...this.parser.defaultMetadata,
       engine: getLatestEngine() || DUCKDB_ENGINE,
     };
   }
 
-  get defaultCode(): string {
+  public get defaultCode(): string {
     const engine = getLatestEngine();
     if (engine && engine !== DUCKDB_ENGINE) {
       return `_df = mo.sql(f"""SELECT * FROM """, engine=${engine})`;
@@ -121,9 +121,9 @@ export class SQLLanguageAdapter implements LanguageAdapter<SQLLanguageAdapterMet
     return this.parser.defaultCode;
   }
 
-  static fromQuery = (query: string) => SQLParser.fromQuery(query);
+  public static fromQuery = (query: string) => SQLParser.fromQuery(query);
 
-  transformIn(
+  public transformIn(
     pythonCode: string,
   ): [
     sqlQuery: string,
@@ -143,7 +143,7 @@ export class SQLLanguageAdapter implements LanguageAdapter<SQLLanguageAdapterMet
     return [result.code, result.offset, metadata];
   }
 
-  transformOut(
+  public transformOut(
     code: string,
     metadata: SQLLanguageAdapterMetadata,
   ): [string, number] {
@@ -151,11 +151,11 @@ export class SQLLanguageAdapter implements LanguageAdapter<SQLLanguageAdapterMet
     return [result.code, result.offset];
   }
 
-  isSupported(pythonCode: string): boolean {
+  public isSupported(pythonCode: string): boolean {
     return this.parser.isSupported(pythonCode);
   }
 
-  getExtension(
+  public getExtension(
     _cellId: CellId,
     _completionConfig: CompletionConfig,
     _hotkeys: HotkeyProvider,
@@ -309,19 +309,19 @@ class DialectAwareQueryContextAnalyzer extends QueryContextAnalyzer {
   private readonly analyzers = new Map<ParserDialects, QueryContextAnalyzer>();
   private readonly analysisParser: NodeSqlParser;
 
-  constructor(analysisParser: NodeSqlParser) {
+  public constructor(analysisParser: NodeSqlParser) {
     super(analysisParser);
     this.analysisParser = analysisParser;
   }
 
-  override getContext(
+  public override getContext(
     sql: string,
     opts: { state: EditorState },
   ): ReturnType<QueryContextAnalyzer["getContext"]> {
     return this.getAnalyzer(opts.state).getContext(sql, opts);
   }
 
-  override clearCache(): void {
+  public override clearCache(): void {
     for (const analyzer of this.analyzers.values()) {
       analyzer.clearCache();
     }
@@ -342,25 +342,25 @@ class DialectAwareSqlStructureAnalyzer extends SqlStructureAnalyzer {
   private readonly analyzers = new Map<ParserDialects, SqlStructureAnalyzer>();
   private readonly analysisParser: NodeSqlParser;
 
-  constructor(analysisParser: NodeSqlParser) {
+  public constructor(analysisParser: NodeSqlParser) {
     super(analysisParser);
     this.analysisParser = analysisParser;
   }
 
-  override analyzeDocument(
+  public override analyzeDocument(
     state: EditorState,
   ): ReturnType<SqlStructureAnalyzer["analyzeDocument"]> {
     return this.getAnalyzer(state).analyzeDocument(state);
   }
 
-  override getStatementAtPosition(
+  public override getStatementAtPosition(
     state: EditorState,
     position: number,
   ): ReturnType<SqlStructureAnalyzer["getStatementAtPosition"]> {
     return this.getAnalyzer(state).getStatementAtPosition(state, position);
   }
 
-  override getStatementsInRange(
+  public override getStatementsInRange(
     state: EditorState,
     from: number,
     to: number,
@@ -368,7 +368,7 @@ class DialectAwareSqlStructureAnalyzer extends SqlStructureAnalyzer {
     return this.getAnalyzer(state).getStatementsInRange(state, from, to);
   }
 
-  override clearCache(): void {
+  public override clearCache(): void {
     for (const analyzer of this.analyzers.values()) {
       analyzer.clearCache();
     }
@@ -392,7 +392,7 @@ class CustomSqlParser extends NodeSqlParser {
   private readonly VALIDATION_DELAY_MS = 300; // Wait 300ms after user stops typing
   private isFocused = false; // Only validate if the editor is focused
 
-  setFocusState(focused: boolean) {
+  public setFocusState(focused: boolean) {
     this.isFocused = focused;
   }
 
@@ -446,7 +446,7 @@ class CustomSqlParser extends NodeSqlParser {
     });
   }
 
-  override async validateSql(
+  public override async validateSql(
     sql: string,
     opts: { state: EditorState },
   ): Promise<SqlParseError[]> {
@@ -470,7 +470,7 @@ class CustomSqlParser extends NodeSqlParser {
     );
   }
 
-  override async parse(
+  public override async parse(
     sql: string,
     opts: { state: EditorState },
   ): Promise<NodeSqlParserResult> {

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

@@ -17,38 +17,38 @@ vi.mock("../../../runtime/config", () => ({
 
 /** Minimal stand-in for the browser WebSocket used by `WebSocketTransport`. */
 class FakeWebSocket {
-  static readonly instances: FakeWebSocket[] = [];
-  static readonly OPEN = 1;
+  public static readonly instances: FakeWebSocket[] = [];
+  public static readonly OPEN = 1;
 
-  readyState = 0;
-  readonly url: string;
+  public readyState = 0;
+  public readonly url: string;
   private readonly listeners = new Map<string, Set<(event: unknown) => void>>();
 
-  constructor(url: string) {
+  public constructor(url: string) {
     this.url = url;
     FakeWebSocket.instances.push(this);
   }
 
-  addEventListener(type: string, listener: (event: unknown) => void) {
+  public addEventListener(type: string, listener: (event: unknown) => void) {
     const listeners = this.listeners.get(type) ?? new Set();
     listeners.add(listener);
     this.listeners.set(type, listeners);
   }
 
-  send() {
+  public send() {
     // no-op
   }
 
-  close() {
+  public close() {
     this.readyState = 3;
   }
 
-  open() {
+  public open() {
     this.readyState = FakeWebSocket.OPEN;
     this.emit("open", {});
   }
 
-  receive(message: unknown) {
+  public receive(message: unknown) {
     this.emit("message", { data: JSON.stringify(message) });
   }
 

package/src/core/codemirror/lsp/federated-lsp.ts

@@ -18,12 +18,12 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
   private readonly clients: ILanguageServerClient[] = [];
   public readonly documentUri: string;
 
-  constructor(clients: ILanguageServerClient[]) {
+  public constructor(clients: ILanguageServerClient[]) {
     this.clients = clients;
     this.documentUri = getLspDocumentUri();
   }
 
-  onNotification(
+  public onNotification(
     listener: (n: {
       jsonrpc: "2.0";
       id?: null | undefined;
@@ -43,7 +43,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     };
   }
 
-  get clientCapabilities(): LSP.ClientCapabilities | undefined {
+  public get clientCapabilities(): LSP.ClientCapabilities | undefined {
     const capabilities = this.clients
       .map((client) => {
         if (client.clientCapabilities) {
@@ -59,34 +59,34 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     return mergeDictsIgnoreFalsey<LSP.ClientCapabilities>(capabilities);
   }
 
-  get ready(): boolean {
+  public get ready(): boolean {
     return this.clients.some((client) => client.ready);
   }
 
-  set ready(value: boolean) {
+  public set ready(value: boolean) {
     this.clients.forEach((client) => {
       client.ready = value;
     });
   }
 
-  get capabilities(): LSP.ServerCapabilities | null {
+  public get capabilities(): LSP.ServerCapabilities | null {
     const capabilities = this.clients
       .map((client) => client.capabilities)
       .filter((c): c is LSP.ServerCapabilities => c !== null);
     return mergeDictsIgnoreFalsey<LSP.ServerCapabilities>(capabilities);
   }
 
-  set capabilities(value: LSP.ServerCapabilities) {
+  public set capabilities(value: LSP.ServerCapabilities) {
     this.clients.forEach((client) => {
       client.capabilities = value;
     });
   }
 
-  get initializePromise(): Promise<void> {
+  public get initializePromise(): Promise<void> {
     return this.clients[0].initializePromise;
   }
 
-  set initializePromise(value: Promise<void>) {
+  public set initializePromise(value: Promise<void>) {
     this.clients.forEach((client) => {
       client.initializePromise = value;
     });
@@ -104,19 +104,19 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     return this.clients.filter((client) => client.hasCapability(method));
   }
 
-  hasCapability(method: string): boolean {
+  public hasCapability(method: string): boolean {
     return this.clients.some((client) => client.hasCapability(method));
   }
 
-  async initialize(): Promise<void> {
+  public async initialize(): Promise<void> {
     await Promise.all(this.clients.map((client) => client.initialize()));
   }
 
-  async close(): Promise<void> {
+  public async close(): Promise<void> {
     await Promise.all(this.clients.map((client) => client.close()));
   }
 
-  async textDocumentDidChange(
+  public async textDocumentDidChange(
     params: LSP.DidChangeTextDocumentParams,
   ): Promise<void> {
     await Promise.all(
@@ -124,7 +124,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     );
   }
 
-  async completionItemResolve(
+  public async completionItemResolve(
     item: LSP.CompletionItem,
   ): Promise<LSP.CompletionItem> {
     const client = this.firstWithMethod("textDocument/completion");
@@ -134,7 +134,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     return item;
   }
 
-  async textDocumentCodeAction(
+  public async textDocumentCodeAction(
     params: LSP.CodeActionParams,
   ): Promise<(LSP.Command | LSP.CodeAction)[] | null> {
     const client = this.firstWithMethod("textDocument/codeAction");
@@ -144,12 +144,14 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     return null;
   }
 
-  async codeActionResolve(action: LSP.CodeAction): Promise<LSP.CodeAction> {
+  public async codeActionResolve(
+    action: LSP.CodeAction,
+  ): Promise<LSP.CodeAction> {
     const client = this.firstWithMethod("textDocument/codeAction");
     return client ? client.codeActionResolve(action) : action;
   }
 
-  async textDocumentRename(
+  public async textDocumentRename(
     params: LSP.RenameParams,
   ): Promise<LSP.WorkspaceEdit | null> {
     const client = this.firstWithMethod("textDocument/rename");
@@ -159,7 +161,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     return null;
   }
 
-  async textDocumentPrepareRename(
+  public async textDocumentPrepareRename(
     params: LSP.PrepareRenameParams,
   ): Promise<LSP.PrepareRenameResult | null> {
     const client = this.firstWithMethod("textDocument/prepareRename");
@@ -169,7 +171,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     return null;
   }
 
-  async textDocumentSignatureHelp(
+  public async textDocumentSignatureHelp(
     params: LSP.SignatureHelpParams,
   ): Promise<LSP.SignatureHelp | null> {
     const client = this.firstWithMethod("textDocument/signatureHelp");
@@ -180,7 +182,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
   }
 
   // Merge completions from all clients
-  async textDocumentCompletion(
+  public async textDocumentCompletion(
     params: LSP.CompletionParams,
   ): Promise<LSP.CompletionList | LSP.CompletionItem[] | null> {
     const clients = this.clientsWithMethod("textDocument/completion");
@@ -191,7 +193,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     return mergeCompletions(results);
   }
 
-  async textDocumentDefinition(
+  public async textDocumentDefinition(
     params: LSP.DefinitionParams,
   ): Promise<LSP.Definition | LSP.LocationLink[] | null> {
     const client = this.firstWithMethod("textDocument/definition");
@@ -201,7 +203,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     return null;
   }
 
-  async textDocumentDidOpen(
+  public async textDocumentDidOpen(
     params: LSP.DidOpenTextDocumentParams,
   ): Promise<boolean> {
     const results = await Promise.all(
@@ -211,7 +213,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     return results.some((result) => result !== false);
   }
 
-  async textDocumentDidClose(
+  public async textDocumentDidClose(
     params: LSP.DidCloseTextDocumentParams,
   ): Promise<void> {
     await Promise.all(
@@ -219,7 +221,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     );
   }
 
-  async textDocumentWillSave(
+  public async textDocumentWillSave(
     params: LSP.WillSaveTextDocumentParams,
   ): Promise<void> {
     await Promise.all(
@@ -227,7 +229,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     );
   }
 
-  async textDocumentWillSaveWaitUntil(
+  public async textDocumentWillSaveWaitUntil(
     params: LSP.WillSaveTextDocumentParams,
   ): Promise<LSP.TextEdit[] | null> {
     // This blocks the save, so query concurrently rather than paying the sum of
@@ -247,7 +249,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     return null;
   }
 
-  async textDocumentDidSave(
+  public async textDocumentDidSave(
     params: LSP.DidSaveTextDocumentParams,
   ): Promise<void> {
     await Promise.all(
@@ -255,7 +257,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
     );
   }
 
-  async textDocumentHover(params: LSP.HoverParams): Promise<LSP.Hover> {
+  public async textDocumentHover(params: LSP.HoverParams): Promise<LSP.Hover> {
     for (const client of this.clients) {
       if (!client.hasCapability("textDocument/hover")) {
         continue;

package/src/core/codemirror/lsp/notebook-lsp.ts

@@ -42,7 +42,7 @@ class Snapshotter {
     codes: Record<CellId, string>;
   };
 
-  constructor(
+  public constructor(
     getNotebookCode: () => {
       cellIds: CellId[];
       codes: Record<CellId, string>;
@@ -226,7 +226,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
   private latestDiagnosticsVersion: number | null = null;
   private forwardedDiagnosticsVersion = 0;
 
-  constructor(
+  public constructor(
     client: ILanguageServerClient,
     initialSettings: Record<string, unknown>,
     getNotebookEditors: () => Record<
@@ -254,7 +254,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
     this.snapshotter = new Snapshotter(this.getNotebookCode.bind(this));
   }
 
-  onNotification(
+  public onNotification(
     listener: (n: {
       jsonrpc: "2.0";
       id?: null | undefined;
@@ -265,44 +265,44 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
     return this.client.onNotification(listener);
   }
 
-  get ready(): boolean {
+  public get ready(): boolean {
     return this.client.ready;
   }
 
-  set ready(value: boolean) {
+  public set ready(value: boolean) {
     this.client.ready = value;
   }
 
-  get capabilities(): LSP.ServerCapabilities | null {
+  public get capabilities(): LSP.ServerCapabilities | null {
     return this.client.capabilities;
   }
 
-  set capabilities(value: LSP.ServerCapabilities) {
+  public set capabilities(value: LSP.ServerCapabilities) {
     this.client.capabilities = value;
   }
 
-  get initializePromise(): Promise<void> {
+  public get initializePromise(): Promise<void> {
     return this.client.initializePromise;
   }
 
-  set initializePromise(value: Promise<void>) {
+  public set initializePromise(value: Promise<void>) {
     this.client.initializePromise = value;
   }
 
-  get clientCapabilities() {
+  public get clientCapabilities() {
     return this.client.clientCapabilities;
   }
 
-  async initialize(): Promise<void> {
+  public async initialize(): Promise<void> {
     await this.client.initialize();
   }
 
-  close(): void {
+  public close(): void {
     this.openCellDocumentCounts.clear();
     this.client.close();
   }
 
-  hasCapability(method: string): boolean {
+  public hasCapability(method: string): boolean {
     return this.client.hasCapability(method);
   }
 
@@ -430,7 +430,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
    * This ensures the caller uses the same lens that was sent to the server,
    * avoiding race conditions if cells change between sync and subsequent operations.
    */
-  async sync(): Promise<{
+  public async sync(): Promise<{
     params: LSP.DidChangeTextDocumentParams;
     lens: NotebookLens;
   }> {
@@ -499,7 +499,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
     });
   }
 
-  async textDocumentDefinition(
+  public async textDocumentDefinition(
     params: LSP.DefinitionParams,
   ): Promise<LSP.Definition | LSP.LocationLink[] | null> {
     // Get the cell document URI from the params
@@ -525,7 +525,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
     });
   }
 
-  async textDocumentSignatureHelp(
+  public async textDocumentSignatureHelp(
     params: LSP.SignatureHelpParams,
   ): Promise<LSP.SignatureHelp | null> {
     const cellDocumentUri = params.textDocument.uri;
@@ -572,7 +572,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
    *
    * See textDocumentRename for a similar workaround that manually applies edits.
    */
-  textDocumentCodeAction(
+  public textDocumentCodeAction(
     params: LSP.CodeActionParams,
   ): Promise<(LSP.Command | LSP.CodeAction)[] | null> {
     const disabledCodeAction = true;
@@ -582,7 +582,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
     return this.client.textDocumentCodeAction(params);
   }
 
-  codeActionResolve(action: LSP.CodeAction): Promise<LSP.CodeAction> {
+  public codeActionResolve(action: LSP.CodeAction): Promise<LSP.CodeAction> {
     return Promise.resolve(action);
   }
 
@@ -646,7 +646,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
    * LSP edit application flow. The trade-off is that we lose undo grouping
    * across cells.
    */
-  async textDocumentRename(
+  public async textDocumentRename(
     params: LSP.RenameParams,
   ): Promise<LSP.WorkspaceEdit | null> {
     // Get the cell document URI from the params
@@ -784,7 +784,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
     };
   }
 
-  async completionItemResolve(
+  public async completionItemResolve(
     params: LSP.CompletionItem,
   ): Promise<LSP.CompletionItem> {
     // Used cached result to avoid jitter while typing in the same completion item
@@ -801,7 +801,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
     return resolved;
   }
 
-  async textDocumentPrepareRename(
+  public async textDocumentPrepareRename(
     params: LSP.PrepareRenameParams,
   ): Promise<LSP.PrepareRenameResult | null> {
     // Get the cell document URI from the params

package/src/core/codemirror/misc/__tests__/dnd.test.ts

@@ -66,11 +66,11 @@ describe("dnd", () => {
 });
 
 class DragEvent extends Event {
-  dataTransfer: DataTransfer;
-  clientX: number;
-  clientY: number;
+  public dataTransfer: DataTransfer;
+  public clientX: number;
+  public clientY: number;
 
-  constructor(
+  public constructor(
     type: string,
     {
       dataTransfer,
@@ -86,14 +86,14 @@ class DragEvent extends Event {
 }
 
 class DataTransfer {
-  data: Record<string, string> = {};
-  _items: File[] = [];
+  public data: Record<string, string> = {};
+  public _items: File[] = [];
 
-  setData(type: string, data: string) {
+  public setData(type: string, data: string) {
     this.data[type] = data;
   }
 
-  get items() {
+  public get items() {
     return {
       add: (file: File) => {
         this._items.push(file);
@@ -101,11 +101,11 @@ class DataTransfer {
     };
   }
 
-  get files() {
+  public get files() {
     return this._items;
   }
 
-  getData(type: string) {
+  public getData(type: string) {
     return this.data[type];
   }
 }

package/src/core/codemirror/misc/__tests__/paste.test.ts

@@ -320,17 +320,20 @@ def foo():
 // Mock ClipboardEvent and DataTransfer
 class MockDataTransfer {
   private data: Record<string, string> = {};
-  setData(format: string, data: string) {
+  public setData(format: string, data: string) {
     this.data[format] = data;
   }
-  getData(format: string) {
+  public getData(format: string) {
     return this.data[format];
   }
 }
 
 class MockClipboardEvent extends Event {
-  clipboardData: MockDataTransfer;
-  constructor(type: string, init?: { clipboardData?: MockDataTransfer }) {
+  public clipboardData: MockDataTransfer;
+  public constructor(
+    type: string,
+    init?: { clipboardData?: MockDataTransfer },
+  ) {
     super(type);
     this.clipboardData = init?.clipboardData || new MockDataTransfer();
   }

package/src/core/codemirror/reactive-references/extension.ts

@@ -50,7 +50,7 @@ class ReactiveReferencesPlugin {
   // Debounced function to trigger highlighting
   private readonly scheduleHighlighting: DebouncedFunc<() => void>;
 
-  constructor(view: EditorView, cellId: CellId) {
+  public constructor(view: EditorView, cellId: CellId) {
     this.view = view;
     this.cellId = cellId;
 
@@ -67,13 +67,13 @@ class ReactiveReferencesPlugin {
     this.scheduleHighlighting();
   }
 
-  update(update: ViewUpdate) {
+  public update(update: ViewUpdate) {
     if (update.docChanged || update.focusChanged) {
       this.scheduleHighlighting();
     }
   }
 
-  destroy() {
+  public destroy() {
     this.scheduleHighlighting.cancel();
     this.variablesUnsubscribe();
   }