@matdata/yasqe 5.20.3 → 6.1.0

package/build/ts/src/index.d.ts

@@ -1,13 +1,16 @@
 import "./scss/yasqe.scss";
 import "./scss/buttons.scss";
+import "./scss/codemirrorMods.scss";
 import "leaflet/dist/leaflet.css";
 import { Prefixes } from "./prefixUtils";
-import * as sparql11Mode from "../grammar/tokenizer";
 import { Storage as YStorage } from "@matdata/yasgui-utils";
 import * as queryString from "query-string";
 import * as Sparql from "./sparql";
 import * as Autocompleter from "./autocompleters";
-import CodeMirror from "./CodeMirror";
+import { EditorFacade, EditorOptions } from "./editor/facade";
+import type { Position, Token, TokenizerState } from "./editor/tokenizerRunner";
+import type { ExtraKeys } from "./editor/keymap";
+import type { HintFn } from "./editor/autocompletion";
 import { YasqeAjaxConfig } from "./sparql";
 export interface Yasqe {
     on(eventName: "query", handler: (instance: Yasqe, req: Request, abortController?: AbortController) => void): void;
@@ -16,7 +19,6 @@ export interface Yasqe {
     off(eventName: "queryAbort", handler: (instance: Yasqe, req: Request) => void): void;
     on(eventName: "queryResponse", handler: (instance: Yasqe, response: any, duration: number) => void): void;
     off(eventName: "queryResponse", handler: (instance: Yasqe, response: any, duration: number) => void): void;
-    showHint: (conf: HintConfig) => void;
     on(eventName: "error", handler: (instance: Yasqe) => void): void;
     off(eventName: "error", handler: (instance: Yasqe) => void): void;
     on(eventName: "blur", handler: (instance: Yasqe) => void): void;
@@ -35,9 +37,18 @@ export interface Yasqe {
     off(eventName: "saveManagedQuery", handler: () => void): void;
     on(eventName: "downloadRqFile", handler: () => void): void;
     off(eventName: "downloadRqFile", handler: () => void): void;
-    on(eventName: string, handler: () => void): void;
+    on(eventName: "change", handler: (instance: Yasqe, changeObj?: any) => void): void;
+    off(eventName: "change", handler: (instance: Yasqe, changeObj?: any) => void): void;
+    on(eventName: "changes", handler: (instance: Yasqe) => void): void;
+    off(eventName: "changes", handler: (instance: Yasqe) => void): void;
+    on(eventName: "cursorActivity", handler: (instance: Yasqe) => void): void;
+    off(eventName: "cursorActivity", handler: (instance: Yasqe) => void): void;
+    on(eventName: "focus", handler: (instance: Yasqe) => void): void;
+    off(eventName: "focus", handler: (instance: Yasqe) => void): void;
+    on(eventName: string, handler: (...args: any[]) => void): void;
+    off(eventName: string, handler: (...args: any[]) => void): void;
 }
-export declare class Yasqe extends CodeMirror {
+export declare class Yasqe extends EditorFacade {
     private static storageNamespace;
     autocompleters: {
         [name: string]: Autocompleter.Completer | undefined;
@@ -75,9 +86,10 @@ export declare class Yasqe extends CodeMirror {
     private handleQuery;
     private handleQueryResponse;
     private handleQueryAbort;
+    protected getHintFn(): HintFn | undefined;
+    private pendingHintFn;
     private registerEventListeners;
     private unregisterEventListeners;
-    emit(event: string, ...data: any[]): void;
     getStorageId(getter?: Config["persistenceId"]): string | undefined;
     private drawButtons;
     private toggleHamburgerMenu;
@@ -114,7 +126,7 @@ export declare class Yasqe extends CodeMirror {
         [varName: string]: string;
     } | Array<{
         [varName: string]: string;
-    }>): any;
+    }>): string;
     getValueWithoutComments(): string;
     setCheckSyntaxErrors(isEnabled: boolean): void;
     checkSyntax(): void;
@@ -133,6 +145,9 @@ export declare class Yasqe extends CodeMirror {
     enableCompleter(name: string): Promise<void>;
     disableCompleter(name: string): void;
     autocomplete(fromAutoShow?: boolean): void;
+    private buildHintFn;
+    isAutocompletionActive(): boolean;
+    hideAutocompletion(): void;
     collapsePrefixes(collapse?: boolean): void;
     getPrefixesFromQuery(): Prefixes;
     addPrefixes(prefixes: string | Prefixes): void;
@@ -147,10 +162,10 @@ export declare class Yasqe extends CodeMirror {
     getAsWgetString(config?: Sparql.YasqeAjaxConfig): string;
     hasAuthenticationCredentials(config?: Sparql.YasqeAjaxConfig): boolean;
     abortQuery(): void;
-    expandEditor(): void;
+    expandEditor: () => void;
     destroy(): void;
     static Sparql: typeof Sparql;
-    static runMode: any;
+    static runMode: (text: string, _mode: any, callback: (text: string, style: string | null) => void) => TokenizerState;
     static clearStorage(): void;
     static Autocompleters: {
         [name: string]: Autocompleter.CompleterConfig;
@@ -158,65 +173,31 @@ export declare class Yasqe extends CodeMirror {
     static registerAutocompleter(value: Autocompleter.CompleterConfig, enable?: boolean): void;
     static defaults: {
         requestConfig: PlainRequestConfig;
-        value?: any;
+        value?: string;
+        persistenceId: ((yasqe: Yasqe) => string) | string | undefined | null;
+        persistencyExpire: number;
+        extraKeys: ExtraKeys<Yasqe>;
         mode: string;
-        theme?: string;
-        indentUnit?: number;
-        smartIndent?: boolean;
+        lineNumbers?: boolean;
+        lineWrapping?: boolean;
+        readOnly?: boolean;
         tabSize?: number;
+        indentUnit?: number;
         indentWithTabs?: boolean;
-        electricChars?: boolean;
-        rtlMoveVisually?: boolean;
-        keyMap?: string;
-        extraKeys?: string | import("codemirror").KeyMap;
-        lineWrapping?: boolean;
-        lineNumbers?: boolean;
-        firstLineNumber?: number;
-        lineNumberFormatter?: (line: number) => string;
+        theme?: string;
+        tabMode: string;
+        foldGutter: boolean | object;
         gutters?: string[];
-        foldGutter: any;
-        fixedGutter?: boolean;
-        scrollbarStyle?: string;
-        coverGutterNextToScrollbar?: boolean;
-        inputStyle?: import("codemirror").InputStyle;
-        readOnly?: any;
-        screenReaderLabel?: string;
-        showCursorWhenSelecting?: boolean;
-        lineWiseCopyCut?: boolean;
-        pasteLinesPerSelection?: boolean;
-        selectionsMayTouch?: boolean;
-        undoDepth?: number;
-        historyEventDelay?: number;
-        tabindex?: number;
-        autofocus?: boolean;
-        dragDrop?: boolean;
-        allowDropFileTypes?: Array<string>;
-        onDragEvent?: (instance: import("codemirror").Editor, event: DragEvent) => boolean;
-        onKeyEvent?: (instance: import("codemirror").Editor, event: KeyboardEvent) => boolean;
-        cursorBlinkRate?: number;
-        cursorScrollMargin?: number;
-        cursorHeight?: number;
-        resetSelectionOnContextMenu?: boolean;
-        workTime?: number;
-        workDelay?: number;
-        pollInterval?: number;
-        flattenSpans?: boolean;
-        addModeClass?: boolean;
-        maxHighlightLength?: number;
-        viewportMargin?: number;
-        spellcheck?: boolean;
-        autocorrect?: boolean;
-        autocapitalize?: boolean;
-        lint?: boolean | import("codemirror").LintStateOptions | import("codemirror").Linter | import("codemirror").AsyncLinter;
         matchBrackets: boolean;
-        showHint?: boolean;
-        hintOptions?: import("codemirror").ShowHintOptions;
-        highlightSelectionMatches: {
+        highlightSelectionMatches: boolean | {
             showToken?: RegExp;
             annotateScrollbar?: boolean;
         };
-        persistenceId: ((yasqe: Yasqe) => string) | string | undefined | null;
-        persistencyExpire: number;
+        autoCloseBrackets?: boolean;
+        fixedGutter?: boolean;
+        placeholder?: string;
+        autofocus?: boolean;
+        viewportMargin?: number;
         collapsePrefixesOnLoad: boolean;
         syntaxErrorCheck: boolean;
         createShareableLink: ((yasqe: Yasqe) => string) | undefined | null;
@@ -224,7 +205,6 @@ export declare class Yasqe extends CodeMirror {
         consumeShareLink: ((yasqe: Yasqe) => void) | undefined | null;
         showQueryButton: boolean;
         pluginButtons: (() => HTMLElement[] | HTMLElement) | undefined;
-        tabMode: string;
         autocompleters: string[];
         hintConfig: Partial<HintConfig>;
         resizeable: boolean;
@@ -241,49 +221,17 @@ export declare class Yasqe extends CodeMirror {
         name: string;
     } & Partial<Autocompleter.CompleterConfig>, enable?: boolean): void;
 }
-export type TokenizerState = sparql11Mode.State;
-export type Position = CodeMirror.Position;
-export type Token = CodeMirror.Token;
-export interface HintList {
-    list: Hint[];
-    from: Position;
-    to: Position;
-}
-export interface Hint {
-    text: string;
-    displayText?: string;
-    className?: string;
-    render?: (el: HTMLElement, self: Hint, data: any) => void;
-    from?: Position;
-    to?: Position;
-}
-export type HintFn = {
-    async?: boolean;
-} & (() => Promise<HintList> | HintList);
+export type { TokenizerState, Position, Token } from "./editor/tokenizerRunner";
+export type { Hint, HintList, HintFn } from "./editor/autocompletion";
+export type { EditorOptions } from "./editor/facade";
+export type { ExtraKeys } from "./editor/keymap";
 export interface HintConfig {
     completeOnSingleClick?: boolean;
     container?: HTMLElement;
     closeCharacters?: RegExp;
     completeSingle?: boolean;
-    hint: HintFn;
     alignWithWord?: boolean;
     closeOnUnfocus?: boolean;
-    customKeys?: any;
-    extraKeys?: {
-        [key: string]: (yasqe: Yasqe, event: {
-            close: () => void;
-            data: {
-                from: Position;
-                to: Position;
-                list: Hint[];
-            };
-            length: number;
-            menuSize: () => void;
-            moveFocus: (movement: number) => void;
-            pick: () => void;
-            setFocus: (index: number) => void;
-        }) => void;
-    };
 }
 export interface BasicAuthConfig {
     username: string;
@@ -340,8 +288,9 @@ export interface Snippet {
     code: string;
     group?: string;
 }
-export interface Config extends Partial<CodeMirror.EditorConfiguration> {
+export interface Config extends Omit<EditorOptions, "extraKeys"> {
     mode: string;
+    extraKeys: ExtraKeys<Yasqe>;
     collapsePrefixesOnLoad: boolean;
     syntaxErrorCheck: boolean;
     createShareableLink: ((yasqe: Yasqe) => string) | undefined | null;
@@ -352,12 +301,12 @@ export interface Config extends Partial<CodeMirror.EditorConfiguration> {
     showQueryButton: boolean;
     requestConfig: RequestConfig<Yasqe> | ((yasqe: Yasqe) => RequestConfig<Yasqe>);
     pluginButtons: (() => HTMLElement[] | HTMLElement) | undefined;
-    highlightSelectionMatches: {
+    highlightSelectionMatches: boolean | {
         showToken?: RegExp;
         annotateScrollbar?: boolean;
     };
     tabMode: string;
-    foldGutter: any;
+    foldGutter: boolean | object;
     matchBrackets: boolean;
     autocompleters: string[];
     hintConfig: Partial<HintConfig>;

package/build/ts/src/index.js

@@ -9,8 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import "./scss/yasqe.scss";
 import "./scss/buttons.scss";
+import "./scss/codemirrorMods.scss";
 import "leaflet/dist/leaflet.css";
-import { findFirstPrefixLine } from "./prefixFold";
+import { findFirstPrefixLine as findFirstPrefixLineInDoc, foldAt, unfoldAt } from "./editor/folding";
 import { getPrefixesFromQuery, addPrefixes, removePrefixes } from "./prefixUtils";
 import { getPreviousNonWsToken, getNextNonWsToken, getCompleteToken } from "./tokenUtils";
 import { Storage as YStorage } from "@matdata/yasgui-utils";
@@ -21,7 +22,9 @@ import * as Sparql from "./sparql";
 import * as Autocompleter from "./autocompleters";
 import { mergeWith, escape } from "lodash-es";
 import getDefaults from "./defaults";
-import CodeMirror from "./CodeMirror";
+import { EditorFacade } from "./editor/facade";
+import { runMode as runTokenizer } from "./editor/tokenizerRunner";
+import { isCompletionActive, openCompletion, hideCompletion } from "./editor/autocompletion";
 import { spfmt } from "sparql-formatter";
 import * as L from "leaflet";
 import { coordinatesToWkt, wrapWktLiteral } from "./mapWidget";
@@ -29,9 +32,53 @@ const TOAST_DEFAULT_DURATION = 3000;
 const TOAST_WARNING_DURATION = 4000;
 const TOAST_WARNING_DELAY = 500;
 const TOAST_FADEOUT_DURATION = 300;
-export class Yasqe extends CodeMirror {
+const EDITOR_OPTION_KEYS = [
+    "mode",
+    "value",
+    "lineNumbers",
+    "lineWrapping",
+    "readOnly",
+    "tabSize",
+    "indentUnit",
+    "indentWithTabs",
+    "theme",
+    "extraKeys",
+    "tabMode",
+    "foldGutter",
+    "gutters",
+    "matchBrackets",
+    "highlightSelectionMatches",
+    "autoCloseBrackets",
+    "fixedGutter",
+    "placeholder",
+    "autofocus",
+    "viewportMargin",
+];
+function mergeConfig(conf) {
+    return mergeWith({}, Yasqe.defaults, conf, (_objValue, srcValue) => {
+        if (Array.isArray(srcValue)) {
+            return srcValue;
+        }
+    });
+}
+function createRootEl(parent) {
+    if (!parent)
+        throw new Error("No parent passed as argument. Dont know where to draw YASQE");
+    const rootEl = document.createElement("div");
+    rootEl.className = "yasqe";
+    parent.appendChild(rootEl);
+    return rootEl;
+}
+export class Yasqe extends EditorFacade {
     constructor(parent, conf = {}) {
-        super();
+        const config = mergeConfig(conf);
+        const rootEl = createRootEl(parent);
+        const editorOptions = {};
+        for (const key of EDITOR_OPTION_KEYS) {
+            if (config[key] !== undefined)
+                editorOptions[key] = config[key];
+        }
+        super(rootEl, editorOptions);
         this.autocompleters = {};
         this.prevQueryValid = false;
         this.queryValid = true;
@@ -40,22 +87,70 @@ export class Yasqe extends CodeMirror {
             var _a, _b;
             (_b = (_a = this.config).consumeShareLink) === null || _b === void 0 ? void 0 : _b.call(_a, this);
         };
-        this.notificationEls = {};
-        if (!parent)
-            throw new Error("No parent passed as argument. Dont know where to draw YASQE");
-        this.rootEl = document.createElement("div");
-        this.rootEl.className = "yasqe";
-        parent.appendChild(this.rootEl);
-        this.config = mergeWith({}, Yasqe.defaults, conf, (objValue, srcValue) => {
-            if (Array.isArray(srcValue)) {
-                return srcValue;
+        this.handleChange = () => {
+            this.checkSyntax();
+            this.checkConstructVariables();
+            this.updateQueryButton();
+        };
+        this.handleBlur = () => {
+            this.saveQuery();
+        };
+        this.handleChanges = () => {
+            this.checkSyntax();
+            this.checkConstructVariables();
+            this.updateQueryButton();
+        };
+        this.handleCursorActivity = () => {
+            this.autocomplete(true);
+            const cursor = this.getDoc().getCursor();
+            const token = this.getTokenAt(cursor);
+            if (token && token.type === "variable-3") {
+                this.showNotification("uri-describe-hint", "CTRL+click: find triples where URI is subject. CTRL+SHIFT+click: find triples where URI is object.");
             }
-        });
-        const cm = CodeMirror(this.rootEl, this.config);
-        for (const key of Object.getOwnPropertyNames(Yasqe.prototype)) {
-            cm[key] = Yasqe.prototype[key].bind(this);
-        }
-        Object.assign(this, CodeMirror.prototype, cm);
+            else {
+                this.hideNotification("uri-describe-hint");
+            }
+        };
+        this.handleQuery = (_yasqe, req, abortController) => {
+            this.req = req;
+            this.abortController = abortController;
+            this.updateQueryButton();
+        };
+        this.handleQueryResponse = (_yasqe, _response, duration) => {
+            this.lastQueryDuration = duration;
+            this.req = undefined;
+            this.updateQueryButton();
+        };
+        this.handleQueryAbort = (_yasqe, _req) => {
+            this.req = undefined;
+            this.updateQueryButton();
+        };
+        this.initDrag = () => {
+            document.documentElement.addEventListener("mousemove", this.doDrag, false);
+            document.documentElement.addEventListener("mouseup", this.stopDrag, false);
+        };
+        this.doDrag = (event) => {
+            this.getWrapperElement().style.height = this.calculateDragOffset(event, this.rootEl) + "px";
+        };
+        this.stopDrag = () => {
+            document.documentElement.removeEventListener("mousemove", this.doDrag, false);
+            document.documentElement.removeEventListener("mouseup", this.stopDrag, false);
+            this.emit("resize", this.getWrapperElement().style.height);
+            if (this.getStorageId() && this.persistentConfig) {
+                this.persistentConfig.editorHeight = this.getWrapperElement().style.height;
+                this.saveQuery();
+            }
+            this.refresh();
+            if (this.snippetsResizeHandler) {
+                this.snippetsResizeHandler();
+            }
+        };
+        this.notificationEls = {};
+        this.expandEditor = () => {
+            this.setSize(null, "100%");
+        };
+        this.rootEl = rootEl;
+        this.config = config;
         this.storage = new YStorage(Yasqe.storageNamespace);
         this.drawButtons();
         this.drawSnippetsBar();
@@ -107,43 +202,11 @@ export class Yasqe extends CodeMirror {
             this.collapsePrefixes(true);
         this.registerEventListeners();
     }
-    handleChange() {
-        this.checkSyntax();
-        this.checkConstructVariables();
-        this.updateQueryButton();
-    }
-    handleBlur() {
-        this.saveQuery();
-    }
-    handleChanges() {
-        this.checkSyntax();
-        this.checkConstructVariables();
-        this.updateQueryButton();
-    }
-    handleCursorActivity() {
-        this.autocomplete(true);
-        const cursor = this.getDoc().getCursor();
-        const token = this.getTokenAt(cursor);
-        if (token && token.type === "variable-3") {
-            this.showNotification("uri-describe-hint", "Hold CTRL - left mouse click on URI to DESCRIBE");
-        }
-        else {
-            this.hideNotification("uri-describe-hint");
-        }
-    }
-    handleQuery(_yasqe, req, abortController) {
-        this.req = req;
-        this.abortController = abortController;
-        this.updateQueryButton();
-    }
-    handleQueryResponse(_yasqe, _response, duration) {
-        this.lastQueryDuration = duration;
-        this.req = undefined;
-        this.updateQueryButton();
-    }
-    handleQueryAbort(_yasqe, _req) {
-        this.req = undefined;
-        this.updateQueryButton();
+    getHintFn() {
+        var _a;
+        const hintFn = (_a = this.pendingHintFn) !== null && _a !== void 0 ? _a : this.buildHintFn(false);
+        this.pendingHintFn = undefined;
+        return hintFn;
     }
     registerEventListeners() {
         this.on("change", this.handleChange);
@@ -163,9 +226,6 @@ export class Yasqe extends CodeMirror {
         this.off("queryResponse", this.handleQueryResponse);
         this.off("queryAbort", this.handleQueryAbort);
     }
-    emit(event, ...data) {
-        CodeMirror.signal(this, event, this, ...data);
-    }
     getStorageId(getter) {
         const persistenceId = getter || this.config.persistenceId;
         if (!persistenceId)
@@ -1179,10 +1239,6 @@ export class Yasqe extends CodeMirror {
         this.horizontalResizeWrapper.addEventListener("dblclick", this.expandEditor);
         this.rootEl.appendChild(this.horizontalResizeWrapper);
     }
-    initDrag() {
-        document.documentElement.addEventListener("mousemove", this.doDrag, false);
-        document.documentElement.addEventListener("mouseup", this.stopDrag, false);
-    }
     calculateDragOffset(event, rootEl) {
         let parentOffset = 0;
         if (rootEl.offsetParent)
@@ -1195,22 +1251,6 @@ export class Yasqe extends CodeMirror {
         }
         return event.clientY - parentOffset - this.rootEl.offsetTop + scrollOffset;
     }
-    doDrag(event) {
-        this.getWrapperElement().style.height = this.calculateDragOffset(event, this.rootEl) + "px";
-    }
-    stopDrag() {
-        document.documentElement.removeEventListener("mousemove", this.doDrag, false);
-        document.documentElement.removeEventListener("mouseup", this.stopDrag, false);
-        this.emit("resize", this.getWrapperElement().style.height);
-        if (this.getStorageId() && this.persistentConfig) {
-            this.persistentConfig.editorHeight = this.getWrapperElement().style.height;
-            this.saveQuery();
-        }
-        this.refresh();
-        if (this.snippetsResizeHandler) {
-            this.snippetsResizeHandler();
-        }
-    }
     duplicateLine() {
         const cur = this.getDoc().getCursor();
         if (cur) {
@@ -1405,10 +1445,7 @@ export class Yasqe extends CodeMirror {
         if (!this.getDoc().somethingSelected())
             this.execCommand("selectAll");
         const from = this.getDoc().getCursor("start");
-        var to = {
-            line: this.getDoc().getCursor("end").line,
-            ch: this.getDoc().getSelection().length,
-        };
+        const to = this.getDoc().getCursor("end");
         var absStart = this.getDoc().indexFromPos(from);
         var absEnd = this.getDoc().indexFromPos(to);
         const res = this.autoformatSelection(absStart, absEnd);
@@ -1417,7 +1454,7 @@ export class Yasqe extends CodeMirror {
             var startLine = this.getDoc().posFromIndex(absStart).line;
             var endLine = this.getDoc().posFromIndex(absStart + res.length).line;
             for (var i = startLine; i <= endLine; i++) {
-                this.indentLine(i, "smart");
+                this.indentLine(i);
             }
         });
     }
@@ -1508,6 +1545,7 @@ export class Yasqe extends CodeMirror {
     checkSyntax() {
         this.queryValid = true;
         this.clearGutter("gutterErrorBar");
+        this.clearSyntaxErrorHighlight();
         var state;
         for (var l = 0; l < this.getDoc().lineCount(); ++l) {
             var precise = false;
@@ -1530,6 +1568,16 @@ export class Yasqe extends CodeMirror {
                     }
                     return;
                 }
+                const lineLength = this.getDoc().getLine(l).length;
+                const startCh = typeof state.errorStartPos === "number"
+                    ? Math.max(0, Math.min(lineLength, state.errorStartPos))
+                    : Math.max(0, Math.min(lineLength, token.start));
+                const fallbackEnd = token.string ? startCh + token.string.length : startCh + 1;
+                const endCandidate = typeof state.errorEndPos === "number" ? state.errorEndPos : fallbackEnd;
+                const endCh = Math.max(startCh + 1, Math.min(lineLength, endCandidate));
+                if (endCh > startCh) {
+                    this.setSyntaxErrorHighlight({ line: l, ch: startCh }, { line: l, ch: endCh });
+                }
                 const errorEl = document.createElement("i");
                 errorEl.className = "fas fa-exclamation-circle parseErrorIcon";
                 if (state.errorMsg) {
@@ -1672,17 +1720,57 @@ export class Yasqe extends CodeMirror {
     autocomplete(fromAutoShow = false) {
         if (this.getDoc().somethingSelected())
             return;
-        for (let i in this.config.autocompleters) {
-            const autocompleter = this.autocompleters[this.config.autocompleters[i]];
-            if (!autocompleter || !autocompleter.autocomplete(fromAutoShow))
+        const hintFn = this.buildHintFn(fromAutoShow);
+        if (!hintFn)
+            return;
+        this.pendingHintFn = hintFn;
+        openCompletion(this.view);
+    }
+    buildHintFn(fromAutoShow) {
+        const hintFns = [];
+        for (const name of this.config.autocompleters) {
+            const autocompleter = this.autocompleters[name];
+            if (!autocompleter)
                 continue;
+            const hintFn = autocompleter.autocomplete(fromAutoShow);
+            if (hintFn)
+                hintFns.push(hintFn);
         }
+        if (hintFns.length === 0)
+            return undefined;
+        return () => __awaiter(this, void 0, void 0, function* () {
+            const results = yield Promise.all(hintFns.map((fn) => fn()));
+            let aggregated;
+            for (const result of results) {
+                if (!result || !result.list || result.list.length === 0)
+                    continue;
+                if (!aggregated) {
+                    aggregated = { list: [...result.list], from: result.from, to: result.to };
+                }
+                else {
+                    aggregated.list.push(...result.list);
+                }
+            }
+            return aggregated;
+        });
+    }
+    isAutocompletionActive() {
+        return isCompletionActive(this.view.state);
+    }
+    hideAutocompletion() {
+        hideCompletion(this.view);
     }
     collapsePrefixes(collapse = true) {
-        const firstPrefixLine = findFirstPrefixLine(this);
+        const firstPrefixLine = findFirstPrefixLineInDoc(this.runner, this.view.state.doc);
         if (firstPrefixLine === undefined)
             return;
-        this.foldCode(firstPrefixLine, CodeMirror.fold.prefix, collapse ? "fold" : "unfold");
+        const offset = this.view.state.doc.line(firstPrefixLine + 1).from;
+        if (collapse) {
+            foldAt(this.view, offset);
+        }
+        else {
+            unfoldAt(this.view, offset);
+        }
     }
     getPrefixesFromQuery() {
         return getPrefixesFromQuery(this);
@@ -1694,12 +1782,6 @@ export class Yasqe extends CodeMirror {
         return removePrefixes(this, prefixes);
     }
     updateWidget() {
-        if (this.cursorCoords &&
-            this.state.completionActive &&
-            this.state.completionActive.widget) {
-            const newTop = this.cursorCoords(null).bottom;
-            this.state.completionActive.widget.hints.style.top = newTop + "px";
-        }
     }
     query(config) {
         var _a;
@@ -1754,9 +1836,6 @@ export class Yasqe extends CodeMirror {
             this.emit("queryAbort", this, this.req);
         }
     }
-    expandEditor() {
-        this.setSize(null, "100%");
-    }
     destroy() {
         var _a, _b, _c;
         this.abortQuery();
@@ -1772,6 +1851,7 @@ export class Yasqe extends CodeMirror {
             this.disableCompleter(autocompleter);
         }
         window.removeEventListener("hashchange", this.handleHashChange);
+        this.destroyEditor();
         this.rootEl.remove();
     }
     static clearStorage() {
@@ -1798,10 +1878,9 @@ export class Yasqe extends CodeMirror {
 }
 Yasqe.storageNamespace = "triply";
 Yasqe.Sparql = Sparql;
-Yasqe.runMode = CodeMirror.runMode;
+Yasqe.runMode = (text, _mode, callback) => runTokenizer(text, callback);
 Yasqe.Autocompleters = {};
 Yasqe.defaults = getDefaults();
-Object.assign(CodeMirror.prototype, Yasqe.prototype);
 Autocompleter.completers.forEach((c) => {
     Yasqe.registerAutocompleter(c);
 });