Skip to content

feat: lazy loading of antlr to reduce chunk size #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bohreromir wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: lazy loading of antlr to reduce chunk size #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/lib/components/editor/MonacoEditor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
import { onMount, onDestroy } from 'svelte';
import { browser } from '$app/environment';
import { theme } from '$lib/theme.svelte';
import {
registerTrinoSql,
setCompletionDefaultsGetter,
TRINO_SQL_LANGUAGE_ID
} from '$lib/editor/trinosql';
import { TRINO_SQL_LANGUAGE_ID } from '$lib/editor/language-id';

let {
value = $bindable(),
Expand Down Expand Up @@ -134,6 +130,8 @@
// Guarded by `browser` because SvelteKit evaluates component scripts on the server too.
const workerImport = browser ? import('monaco-editor/esm/vs/editor/editor.worker?worker') : null;
const monacoImport = browser ? import('monaco-editor') : null;
// The Trino SQL language pulls in the ANTLR parser (~1 MB); load it lazily alongside Monaco.
const trinoSqlImport = browser ? import('$lib/editor/trinosql') : null;

function toMonacoTheme(t: string): string {
return t === 'dark' ? 'vs-dark' : 'vs';
Expand All @@ -151,6 +149,7 @@
};

monaco = await monacoImport!;
const { registerTrinoSql, setCompletionDefaultsGetter } = await trinoSqlImport!;

setCompletionDefaultsGetter(() => ({
catalog: defaultCatalog || undefined,
Expand Down
3 changes: 3 additions & 0 deletions src/lib/editor/language-id.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Kept separate from trinosql.ts so it can be imported without pulling in the
// ANTLR lexer/parser, which are only loaded client-side together with Monaco.
export const TRINO_SQL_LANGUAGE_ID = 'trinosql';
13 changes: 5 additions & 8 deletions src/lib/editor/trinosql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ import type * as Monaco from 'monaco-editor';
import { CharStream } from 'antlr4ng';
import { SqlBaseLexer } from './generated/SqlBaseLexer.js';
import { tokenMap } from './tokenMap';
import { TRINO_SQL_LANGUAGE_ID } from './language-id.js';
import {
createCompletionProvider,
type CompletionDefaults
} from './completion/completion-provider.js';

const LANGUAGE_ID = 'trinosql';

class TrinoSqlTokenizerState implements Monaco.languages.IState {
clone(): Monaco.languages.IState {
return new TrinoSqlTokenizerState();
Expand All @@ -39,20 +38,20 @@ export interface RegisterOptions {
}

export function registerTrinoSql(monaco: typeof Monaco, options: RegisterOptions = {}): void {
if (monaco.languages.getLanguages().some((lang) => lang.id === LANGUAGE_ID)) {
if (monaco.languages.getLanguages().some((lang) => lang.id === TRINO_SQL_LANGUAGE_ID)) {
return;
}

monaco.languages.register({ id: LANGUAGE_ID });
monaco.languages.register({ id: TRINO_SQL_LANGUAGE_ID });

if (options.completionEnabled !== false) {
monaco.languages.registerCompletionItemProvider(
LANGUAGE_ID,
TRINO_SQL_LANGUAGE_ID,
createCompletionProvider(monaco, () => defaultsGetter())
);
}

monaco.languages.setTokensProvider(LANGUAGE_ID, {
monaco.languages.setTokensProvider(TRINO_SQL_LANGUAGE_ID, {
getInitialState: () => new TrinoSqlTokenizerState(),
tokenize: (line: string, state: Monaco.languages.IState) => {
const inputStream = CharStream.fromString(line);
Expand All @@ -73,5 +72,3 @@ export function registerTrinoSql(monaco: typeof Monaco, options: RegisterOptions
}
});
}

export { LANGUAGE_ID as TRINO_SQL_LANGUAGE_ID };
Loading