@marimo-team/islands 0.25.1-dev26 → 0.25.1-dev28

package/src/core/codemirror/go-to-definition/underline.ts

@@ -57,7 +57,7 @@ class MetaUnderlineVariablePlugin {
   private hoveredRange: { from: number; to: number; position: number } | null;
   private onClick: (view: EditorView) => void;
 
-  constructor(view: EditorView, onClick: (view: EditorView) => void) {
+  public constructor(view: EditorView, onClick: (view: EditorView) => void) {
     this.view = view;
     this.commandClickMode = false;
     this.hoveredRange = null;
@@ -69,13 +69,13 @@ class MetaUnderlineVariablePlugin {
     window.addEventListener("mouseleave", this.windowBlur);
   }
 
-  update(_update: ViewUpdate) {
+  public update(_update: ViewUpdate) {
     // We cannot add any transactions here (e.g. clearing underlines),
     // otherwise CM fails with
     // "Calls to EditorView.update are not allowed while an update is in progress"
   }
 
-  destroy() {
+  public destroy() {
     window.removeEventListener("keydown", this.keydown);
     window.removeEventListener("keyup", this.keyup);
     window.removeEventListener("blur", this.windowBlur);

package/src/core/codemirror/keymaps/vim.ts

@@ -346,7 +346,7 @@ class CodeMirrorVimSync {
     // noop
   }
 
-  addInstance(instance: EditorView) {
+  public addInstance(instance: EditorView) {
     this.instances.add(instance);
 
     const cm = getCM(instance);
@@ -376,11 +376,11 @@ class CodeMirrorVimSync {
     });
   }
 
-  removeInstance(instance: EditorView) {
+  public removeInstance(instance: EditorView) {
     this.instances.delete(instance);
   }
 
-  broadcastModeChange(
+  public broadcastModeChange(
     originInstance: EditorView,
     mode: string,
     subMode?: string,

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

@@ -41,23 +41,23 @@ export const MARKDOWN_INITIAL_HIDE_CODE = true;
 export class MarkdownLanguageAdapter implements LanguageAdapter<MarkdownLanguageAdapterMetadata> {
   private parser = new MarkdownParser();
 
-  readonly type = "markdown";
-  readonly defaultCode = this.parser.defaultCode;
-  readonly defaultMetadata: MarkdownLanguageAdapterMetadata =
+  public readonly type = "markdown";
+  public readonly defaultCode = this.parser.defaultCode;
+  public readonly defaultMetadata: MarkdownLanguageAdapterMetadata =
     this.parser.defaultMetadata;
 
-  static fromMarkdown(markdown: string) {
+  public static fromMarkdown(markdown: string) {
     return MarkdownParser.fromMarkdown(markdown);
   }
 
-  transformIn(
+  public transformIn(
     pythonCode: string,
   ): [string, number, MarkdownLanguageAdapterMetadata] {
     const result = this.parser.transformIn(pythonCode);
     return [result.code, result.offset, result.metadata];
   }
 
-  transformOut(
+  public transformOut(
     code: string,
     metadata: MarkdownLanguageAdapterMetadata,
   ): [string, number] {
@@ -65,11 +65,11 @@ export class MarkdownLanguageAdapter implements LanguageAdapter<MarkdownLanguage
     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,

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

@@ -261,25 +261,25 @@ const pyrightClient = once((_: LSPConfig) => {
 export class PythonLanguageAdapter implements LanguageAdapter<{}> {
   private parser = new PythonParser();
 
-  readonly type = "python";
-  readonly defaultCode = this.parser.defaultCode;
-  readonly defaultMetadata = this.parser.defaultMetadata;
+  public readonly type = "python";
+  public readonly defaultCode = this.parser.defaultCode;
+  public readonly defaultMetadata = this.parser.defaultMetadata;
 
-  transformIn(code: string): [string, number, {}] {
+  public transformIn(code: string): [string, number, {}] {
     const result = this.parser.transformIn(code);
     return [result.code, result.offset, result.metadata];
   }
 
-  transformOut(code: string, metadata: {}): [string, number] {
+  public transformOut(code: string, metadata: {}): [string, number] {
     const result = this.parser.transformOut(code, metadata);
     return [result.code, result.offset];
   }
 
-  isSupported(code: string): boolean {
+  public isSupported(code: string): boolean {
     return this.parser.isSupported(code);
   }
 
-  getExtension(
+  public getExtension(
     cellId: CellId,
     completionConfig: CompletionConfig,
     hotkeys: HotkeyProvider,

package/src/core/codemirror/language/languages/sql/completion-builder.ts

@@ -25,7 +25,7 @@ export class CompletionBuilder {
   /**
    * Add a table with its columns at the specified path
    */
-  addTable(path: string[], table: DataTable): this {
+  public addTable(path: string[], table: DataTable): this {
     const tableNamespace: SQLNamespace = {
       self: tableToCompletion({
         table: table,
@@ -44,7 +44,7 @@ export class CompletionBuilder {
   /**
    * Add a schema at the specified path
    */
-  addSchema(path: string[], schema: DatabaseSchema): this {
+  public addSchema(path: string[], schema: DatabaseSchema): this {
     const schemaObject: SQLNamespace = {
       self: schemaToCompletion({
         namespace: schema,
@@ -60,7 +60,7 @@ export class CompletionBuilder {
   /**
    * Add a database at the specified path
    */
-  addDatabase(path: string[], database: Database): this {
+  public addDatabase(path: string[], database: Database): this {
     const databaseObject: SQLNamespace = {
       self: databaseToCompletion({
         namespace: database,
@@ -90,14 +90,14 @@ export class CompletionBuilder {
   /**
    * Build the final schema
    */
-  build(): SQLNamespace {
+  public build(): SQLNamespace {
     return this.schema;
   }
 
   /**
    * Reset for reuse
    */
-  reset(): this {
+  public reset(): this {
     this.schema = {};
     return this;
   }

package/src/core/codemirror/language/languages/sql/completion-store.ts

@@ -28,7 +28,7 @@ const datasetTableCompletionsAtom = atom((get) => {
 class SQLCompletionStore {
   private cache: LRUCache<DataSourceConnection, CachedSchema>;
 
-  constructor() {
+  public constructor() {
     this.cache = new LRUCache(10, {
       create: (connection) => this.getConnectionSchema(connection),
     });
@@ -121,7 +121,7 @@ class SQLCompletionStore {
    * Returns the raw dialect of the connection passed from the backend,
    * or null if the connection is not found
    */
-  getInternalDialect(connectionName: ConnectionName): string | null {
+  public getInternalDialect(connectionName: ConnectionName): string | null {
     const connection = this.getConnection(connectionName);
     if (!connection) {
       return null;
@@ -133,7 +133,7 @@ class SQLCompletionStore {
    * Get the inferred SQL dialect for a connection
    * If the connection is not found, return the standard SQL dialect.
    */
-  getDialect(connectionName: ConnectionName): SQLDialect {
+  public getDialect(connectionName: ConnectionName): SQLDialect {
     const connection = this.getConnection(connectionName);
     if (!connection) {
       return ModifiedStandardSQL;
@@ -141,7 +141,7 @@ class SQLCompletionStore {
     return guessDialect(connection);
   }
 
-  getCompletionSource(connectionName: ConnectionName): SQLConfig | null {
+  public getCompletionSource(connectionName: ConnectionName): SQLConfig | null {
     const connection = this.getConnection(connectionName);
     if (!connection) {
       return null;

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;