@matdata/yasqe 5.20.3 → 6.1.0

package/src/scss/buttons.scss

@@ -597,7 +597,8 @@
     margin: 0;
     padding-top: 100px;
 
-    .CodeMirror-wrap {
+    .CodeMirror-wrap,
+    .cm-editor {
       padding-top: 10px;
     }
 
@@ -617,7 +618,8 @@
       }
     }
 
-    .CodeMirror {
+    .CodeMirror,
+    .cm-editor {
       height: calc(100vh - 150px) !important;
     }
   }

package/src/scss/codemirrorMods.scss

@@ -1,18 +1,105 @@
 .yasqe {
-  .CodeMirror {
+  .CodeMirror,
+  .cm-editor {
     line-height: 1.5em;
     font-size: 14px;
-    border: 1px solid var(--yasgui-border-color);
+    border: 1px solid var(--yasgui-border-color, #ddd);
+    background: var(--yasgui-bg-primary, #fff);
+    color: var(--yasgui-text-primary, #000);
+    height: 100%;
+  }
+  .cm-editor.cm-focused {
+    outline: none;
+  }
+  .cm-scroller {
+    font-family: monospace;
+    overflow: auto;
+  }
+  .cm-gutters {
+    background-color: var(--yasgui-bg-secondary, #f7f7f7);
+    border-right: 1px solid var(--yasgui-border-color, #ddd);
+    color: var(--yasgui-text-secondary, #999);
+  }
+  .cm-activeLineGutter {
+    background-color: transparent;
+  }
+
+  // Default (light) token colors, mirroring the CodeMirror 5 default theme
+  .cm-s-default {
+    span.cm-keyword {
+      color: #708;
+    }
+    span.cm-atom {
+      color: #219;
+    }
+    span.cm-number {
+      color: #164;
+    }
+    span.cm-variable-3 {
+      color: #085;
+    }
+    span.cm-string {
+      color: #a11;
+    }
+    span.cm-string-2 {
+      color: #f50;
+    }
+    span.cm-meta {
+      color: #555;
+    }
+    span.cm-comment {
+      color: #a50;
+    }
+    span.cm-punc {
+      color: inherit;
+    }
   }
 
   span.cm-error {
     border-bottom: 2px dotted red;
   }
-  .gutterErrorBar {
-    width: 4px;
+  .cm-syntax-error-token {
+    color: #d32f2f;
+    text-decoration-line: underline;
+    text-decoration-style: wavy;
+    text-decoration-color: #d32f2f;
+    text-underline-offset: 2px;
+  }
+  // Reserve a fixed width for the marker gutters so that adding an error/warning
+  // icon does not increase the gutter width (which would shift the whole editor).
+  .cm-gutter-gutterErrorBar,
+  .cm-gutter-gutterConstructWarning {
+    width: 16px;
+  }
+  .cm-gutter-gutterErrorBar .cm-gutterElement,
+  .cm-gutter-gutterConstructWarning .cm-gutterElement {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    // Let the tooltip escape the (small) gutter element
+    overflow: visible;
   }
 
-  .CodeMirror-foldmarker {
+  // Fold gutter arrows. The fold markers (see editor/folding.ts) only carry the
+  // CodeMirror-foldgutter-open / -folded classes; provide the arrow glyphs here.
+  .cm-foldGutter .cm-gutterElement {
+    padding: 0 1px;
+    cursor: pointer;
+    color: var(--yasgui-text-secondary, #999);
+  }
+  .cm-foldMarker {
+    display: inline-block;
+    line-height: 1;
+  }
+  .CodeMirror-foldgutter-open::after {
+    content: "\25BE"; // ▾
+  }
+  .CodeMirror-foldgutter-folded::after {
+    content: "\25B8"; // ▸
+  }
+
+  .CodeMirror-foldmarker,
+  .cm-foldPlaceholder {
     color: #6e2500;
     text-shadow:
       #ff935e 1px 1px 2px,
@@ -21,12 +108,18 @@
       #ff935e -1px 1px 2px;
     font-size: 19px;
   }
+  .cm-foldPlaceholder {
+    background: transparent;
+    border: none;
+    padding: 0 0.2em;
+    cursor: pointer;
+  }
 }
 
 // Rainbow bracket colors for default theme
-.cm-s-default {
+.yasqe .cm-s-default {
   span.cm-bracket-level-0 {
-    color: #ffd700;
+    color: #c4b878;
   } // Gold
   span.cm-bracket-level-1 {
     color: #da70d6;
@@ -38,22 +131,25 @@
     color: #439143;
   } // Pale green
   span.cm-bracket-paren {
-    color: #997;
+    color: #654;
   } // Constant color for () and []
   span.cm-bracket-mismatch {
     color: #f00;
   } // Red for mismatched brackets
 }
 // Put these outside of yasqe as the root element can be changed
-.CodeMirror-hints.default {
+.CodeMirror-hints.default,
+.cm-tooltip.CodeMirror-hints {
   max-width: 1000px;
 }
-.CodeMirror-hints.default li {
+.CodeMirror-hints.default li,
+.cm-tooltip.CodeMirror-hints li {
   text-overflow: ellipsis;
   overflow: hidden;
 }
 @media only screen and (max-width: 1000px) {
-  .CodeMirror-hints.default {
+  .CodeMirror-hints.default,
+  .cm-tooltip.CodeMirror-hints {
     max-width: 800px;
   }
 }

package/src/scss/yasqe.scss

@@ -7,7 +7,8 @@
   min-height: 0;
   overflow: hidden;
 
-  .CodeMirror {
+  .CodeMirror,
+  .cm-editor {
     min-height: 60px;
     // Height is set via inline style by the resize handler
   }
@@ -19,7 +20,8 @@
     float: left;
   }
 
-  .CodeMirror-hint {
+  .CodeMirror-hint,
+  .CodeMirror-hints > ul > li {
     max-width: 30em;
   }
 

package/src/tooltip.ts

@@ -7,25 +7,28 @@
 import Yasqe from "./";
 
 export default function tooltip(_yasqe: Yasqe, parent: HTMLElement, html: string) {
-  var tooltip: HTMLDivElement;
-  parent.onmouseover = function () {
+  // Render the tooltip inside the yasqe root (so the scoped `.yasqe .yasqe_tooltip`
+  // styles apply) but position it `fixed` relative to the icon. Fixed positioning
+  // escapes the `overflow` clipping of the CodeMirror gutter/scroller, which would
+  // otherwise hide the tooltip behind the editor.
+  let tooltip: HTMLDivElement | undefined;
+  parent.onmouseover = function (this: HTMLElement) {
     if (!tooltip) {
       tooltip = document.createElement("div");
       tooltip.className = "yasqe_tooltip";
+      _yasqe.rootEl.appendChild(tooltip);
     }
-    // if ($(yasqe.getWrapperElement()).offset().top >= tooltip.offset().top) {
-    //shit, move the tooltip down. The tooltip now hovers over the top edge of the yasqe instance
-    // tooltip.css("bottom", "auto");
-    // tooltip.css("top", "26px");
-    // }
-    tooltip.style.display = "block";
     tooltip.innerHTML = html;
-    parent.appendChild(tooltip);
+    tooltip.style.display = "block";
+    // `this` is the element the handler fires on. The gutter marker is rendered as a clone of
+    // `parent`, so position relative to `this` rather than the (possibly detached) `parent`.
+    const rect = this.getBoundingClientRect();
+    tooltip.style.position = "fixed";
+    tooltip.style.left = `${rect.right + 6}px`;
+    tooltip.style.top = `${rect.top}px`;
+    tooltip.style.zIndex = "10000";
   };
   parent.onmouseout = function () {
-    if (tooltip) {
-      tooltip.style.display = "none";
-    }
-    tooltip.innerHTML = html;
+    if (tooltip) tooltip.style.display = "none";
   };
 }

package/build/ts/src/CodeMirror.d.ts

@@ -1,30 +0,0 @@
-import { Editor as CmEditor, Doc as CmDoc, Token as CmToken, Position as CmPosition, EditorConfiguration as CmEditorConfiguration } from "codemirror";
-import * as sparql11Mode from "../grammar/tokenizer";
-import { TokenizerState } from "./index";
-import "codemirror/addon/fold/foldcode.js";
-import "codemirror/addon/fold/foldgutter.js";
-import "codemirror/addon/fold/xml-fold.js";
-import "codemirror/addon/fold/brace-fold.js";
-import "codemirror/addon/hint/show-hint.js";
-import "codemirror/addon/search/searchcursor.js";
-import "codemirror/addon/search/match-highlighter.js";
-import "codemirror/addon/edit/matchbrackets.js";
-import "codemirror/addon/runmode/runmode.js";
-import "codemirror/lib/codemirror.css";
-import "codemirror/addon/fold/foldgutter.css";
-import "./scss/codemirrorMods.scss";
-declare namespace CodeMirror {
-    type Doc = CmDoc;
-    type Position = CmPosition;
-    type EditorConfiguration = CmEditorConfiguration;
-    interface Token extends CmToken {
-        state: sparql11Mode.State;
-    }
-}
-interface CodeMirror extends Omit<CmEditor, "getOption" | "setOption" | "on" | "off"> {
-    getOption(opt: "queryType"): TokenizerState["queryType"];
-    setOption(opt: "queryType", val: TokenizerState["queryType"]): void;
-    foldCode(firstPrefixLine: number, prefix: string, collapse: "fold" | "unfold"): void;
-}
-declare const CodeMirror: any;
-export default CodeMirror;

package/build/ts/src/CodeMirror.js

@@ -1,20 +0,0 @@
-import _CodeMirror from "codemirror";
-import * as sparql11Mode from "../grammar/tokenizer";
-import { default as prefixFold } from "./prefixFold";
-import "codemirror/addon/fold/foldcode.js";
-import "codemirror/addon/fold/foldgutter.js";
-import "codemirror/addon/fold/xml-fold.js";
-import "codemirror/addon/fold/brace-fold.js";
-import "codemirror/addon/hint/show-hint.js";
-import "codemirror/addon/search/searchcursor.js";
-import "codemirror/addon/search/match-highlighter.js";
-import "codemirror/addon/edit/matchbrackets.js";
-import "codemirror/addon/runmode/runmode.js";
-import "codemirror/lib/codemirror.css";
-import "codemirror/addon/fold/foldgutter.css";
-import "./scss/codemirrorMods.scss";
-_CodeMirror.registerHelper("fold", "prefix", prefixFold);
-_CodeMirror.defineMode("sparql11", sparql11Mode.default);
-const CodeMirror = _CodeMirror;
-export default CodeMirror;
-//# sourceMappingURL=CodeMirror.js.map

package/build/ts/src/CodeMirror.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CodeMirror.js","sourceRoot":"","sources":["../../../../../packages/yasqe/src/CodeMirror.ts"],"names":[],"mappings":"AAUA,OAAO,WAAW,MAAM,YAAY,CAAC;AAErC,OAAO,KAAK,YAAY,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAGrD,OAAO,mCAAmC,CAAC;AAC3C,OAAO,qCAAqC,CAAC;AAC7C,OAAO,mCAAmC,CAAC;AAC3C,OAAO,qCAAqC,CAAC;AAC7C,OAAO,oCAAoC,CAAC;AAC5C,OAAO,yCAAyC,CAAC;AACjD,OAAO,8CAA8C,CAAC;AACtD,OAAO,wCAAwC,CAAC;AAChD,OAAO,qCAAqC,CAAC;AAC7C,OAAO,+BAA+B,CAAC;AACvC,OAAO,sCAAsC,CAAC;AAC9C,OAAO,4BAA4B,CAAC;AAEpC,WAAW,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;AACzD,WAAW,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;AAsBzD,MAAM,UAAU,GAAQ,WAAW,CAAC;AACpC,eAAe,UAAU,CAAC"}

package/build/ts/src/prefixFold.d.ts

@@ -1,8 +0,0 @@
-import { default as Yasqe, Position } from "./";
-import CodeMirror from "codemirror";
-export declare function findFirstPrefixLine(yasqe: Yasqe): number;
-export declare function findFirstPrefix(yasqe: Yasqe, line: number, startFromCharIndex?: number, lineText?: string): number;
-export default function (yasqe: Yasqe, start: Position): {
-    from: CodeMirror.Position;
-    to: CodeMirror.Position;
-};

package/build/ts/src/prefixFold.js

@@ -1,87 +0,0 @@
-import CodeMirror from "codemirror";
-import * as TokenUtils from "./tokenUtils";
-const PREFIX_KEYWORD = "PREFIX ";
-export function findFirstPrefixLine(yasqe) {
-    var lastLine = yasqe.getDoc().lastLine();
-    for (var i = 0; i <= lastLine; ++i) {
-        const firstPrefix = findFirstPrefix(yasqe, i);
-        if (firstPrefix != null && firstPrefix >= 0) {
-            return i;
-        }
-    }
-}
-export function findFirstPrefix(yasqe, line, startFromCharIndex = 0, lineText) {
-    if (!lineText)
-        lineText = yasqe.getDoc().getLine(line);
-    if (!lineText)
-        return undefined;
-    lineText = lineText.toUpperCase();
-    const charIndex = lineText.indexOf(PREFIX_KEYWORD, startFromCharIndex);
-    if (charIndex >= 0) {
-        const tokenType = yasqe.getTokenTypeAt(CodeMirror.Pos(line, charIndex + 1));
-        if (tokenType === "keyword") {
-            return charIndex;
-        }
-    }
-}
-export default function (yasqe, start) {
-    var line = start.line, lineText = yasqe.getDoc().getLine(line);
-    function hasPreviousPrefix() {
-        var hasPreviousPrefix = false;
-        for (var i = line - 1; i >= 0; i--) {
-            if (yasqe.getDoc().getLine(i).toUpperCase().indexOf(PREFIX_KEYWORD) >= 0) {
-                hasPreviousPrefix = true;
-                break;
-            }
-        }
-        return hasPreviousPrefix;
-    }
-    var getLastPrefixPos = function (line, ch) {
-        var prefixKeywordToken = yasqe.getTokenAt(CodeMirror.Pos(line, ch + 1));
-        if (!prefixKeywordToken || prefixKeywordToken.type != "keyword")
-            return -1;
-        var prefixShortname = TokenUtils.getNextNonWsToken(yasqe, line, prefixKeywordToken.end + 1);
-        if (!prefixShortname || prefixShortname.type != "string-2")
-            return -1;
-        var prefixUri = TokenUtils.getNextNonWsToken(yasqe, line, prefixShortname.end + 1);
-        if (!prefixUri || prefixUri.type != "variable-3")
-            return -1;
-        return prefixUri.end;
-    };
-    if (hasPreviousPrefix())
-        return;
-    var prefixStart = findFirstPrefix(yasqe, line, start.ch, lineText);
-    if (prefixStart == null)
-        return;
-    var stopAt = "{";
-    var stopAtNextLine = false;
-    var lastLine = yasqe.getDoc().lastLine(), endCh;
-    var prefixEndChar = getLastPrefixPos(line, prefixStart);
-    var prefixEndLine = line;
-    for (var i = line; i <= lastLine; ++i) {
-        if (stopAtNextLine)
-            break;
-        var text = yasqe.getDoc().getLine(i), pos = i == line ? prefixStart + 1 : 0;
-        for (;;) {
-            if (!stopAtNextLine && text.indexOf(stopAt) >= 0)
-                stopAtNextLine = true;
-            var nextPrefixDeclaration = text.toUpperCase().indexOf(PREFIX_KEYWORD, pos);
-            if (nextPrefixDeclaration >= 0) {
-                if ((endCh = getLastPrefixPos(i, nextPrefixDeclaration)) > 0) {
-                    prefixEndChar = endCh;
-                    prefixEndLine = i;
-                    pos = prefixEndChar;
-                }
-                pos++;
-            }
-            else {
-                break;
-            }
-        }
-    }
-    return {
-        from: CodeMirror.Pos(line, prefixStart + PREFIX_KEYWORD.length),
-        to: CodeMirror.Pos(prefixEndLine, prefixEndChar),
-    };
-}
-//# sourceMappingURL=prefixFold.js.map

package/build/ts/src/prefixFold.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"prefixFold.js","sourceRoot":"","sources":["../../../../../packages/yasqe/src/prefixFold.ts"],"names":[],"mappings":"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"}

package/src/CodeMirror.ts

@@ -1,54 +0,0 @@
-//Do not want to import this using typescript. Somehow, we get a tangled mess when transpiling to es6 with ts,
-//and applying babel.
-import {
-  Editor as CmEditor,
-  Doc as CmDoc,
-  Token as CmToken,
-  Position as CmPosition,
-  EditorConfiguration as CmEditorConfiguration,
-} from "codemirror";
-
-import _CodeMirror from "codemirror";
-
-import * as sparql11Mode from "../grammar/tokenizer";
-import { default as prefixFold } from "./prefixFold";
-import { TokenizerState } from "./index";
-
-import "codemirror/addon/fold/foldcode.js";
-import "codemirror/addon/fold/foldgutter.js";
-import "codemirror/addon/fold/xml-fold.js";
-import "codemirror/addon/fold/brace-fold.js";
-import "codemirror/addon/hint/show-hint.js";
-import "codemirror/addon/search/searchcursor.js";
-import "codemirror/addon/search/match-highlighter.js";
-import "codemirror/addon/edit/matchbrackets.js";
-import "codemirror/addon/runmode/runmode.js";
-import "codemirror/lib/codemirror.css";
-import "codemirror/addon/fold/foldgutter.css";
-import "./scss/codemirrorMods.scss";
-
-_CodeMirror.registerHelper("fold", "prefix", prefixFold);
-_CodeMirror.defineMode("sparql11", sparql11Mode.default);
-
-namespace CodeMirror {
-  export type Doc = CmDoc;
-  export type Position = CmPosition;
-  export type EditorConfiguration = CmEditorConfiguration;
-  export interface Token extends CmToken {
-    state: sparql11Mode.State;
-  }
-}
-interface CodeMirror extends Omit<CmEditor, "getOption" | "setOption" | "on" | "off"> {
-  /**
-   * Added some more specific typings for `getOption`
-   * For some functions (called from keyboard combinations like ctrl-enter) we cannot use member props of our object
-   * as these are lost when we are receiving the native CM object as argument
-   * Only way to persistently store these options is by using getOption and setOption
-   */
-  getOption(opt: "queryType"): TokenizerState["queryType"];
-  setOption(opt: "queryType", val: TokenizerState["queryType"]): void;
-
-  foldCode(firstPrefixLine: number, prefix: string, collapse: "fold" | "unfold"): void;
-}
-const CodeMirror: any = _CodeMirror;
-export default CodeMirror;

package/src/prefixFold.ts

@@ -1,94 +0,0 @@
-import { default as Yasqe, Position } from "./";
-import CodeMirror from "codemirror";
-import * as TokenUtils from "./tokenUtils";
-const PREFIX_KEYWORD = "PREFIX ";
-
-export function findFirstPrefixLine(yasqe: Yasqe) {
-  var lastLine = yasqe.getDoc().lastLine();
-  for (var i = 0; i <= lastLine; ++i) {
-    const firstPrefix = findFirstPrefix(yasqe, i);
-    if (firstPrefix != null && firstPrefix >= 0) {
-      return i;
-    }
-  }
-}
-
-export function findFirstPrefix(yasqe: Yasqe, line: number, startFromCharIndex = 0, lineText?: string) {
-  if (!lineText) lineText = yasqe.getDoc().getLine(line);
-  if (!lineText) return undefined;
-  lineText = lineText.toUpperCase();
-  const charIndex = lineText.indexOf(PREFIX_KEYWORD, startFromCharIndex);
-  if (charIndex >= 0) {
-    const tokenType = yasqe.getTokenTypeAt(CodeMirror.Pos(line, charIndex + 1));
-    if (tokenType === "keyword") {
-      return charIndex;
-    }
-  }
-}
-export default function (yasqe: Yasqe, start: Position) {
-  var line = start.line,
-    lineText = yasqe.getDoc().getLine(line);
-
-  // var startCh, tokenType;
-
-  function hasPreviousPrefix() {
-    var hasPreviousPrefix = false;
-    for (var i = line - 1; i >= 0; i--) {
-      if (yasqe.getDoc().getLine(i).toUpperCase().indexOf(PREFIX_KEYWORD) >= 0) {
-        hasPreviousPrefix = true;
-        break;
-      }
-    }
-    return hasPreviousPrefix;
-  }
-
-  var getLastPrefixPos = function (line: number, ch: number) {
-    var prefixKeywordToken = yasqe.getTokenAt(CodeMirror.Pos(line, ch + 1));
-    if (!prefixKeywordToken || prefixKeywordToken.type != "keyword") return -1;
-    var prefixShortname = TokenUtils.getNextNonWsToken(yasqe, line, prefixKeywordToken.end + 1);
-    if (!prefixShortname || prefixShortname.type != "string-2") return -1; //missing prefix keyword shortname
-    var prefixUri = TokenUtils.getNextNonWsToken(yasqe, line, prefixShortname.end + 1);
-    if (!prefixUri || prefixUri.type != "variable-3") return -1; //missing prefix uri
-    return prefixUri.end;
-  };
-
-  //only use opening prefix declaration
-  if (hasPreviousPrefix()) return;
-  var prefixStart = findFirstPrefix(yasqe, line, start.ch, lineText);
-
-  if (prefixStart == null) return;
-  var stopAt = "{"; //if this char is there, we won't have a chance of finding more prefixes
-  var stopAtNextLine = false;
-  var lastLine = yasqe.getDoc().lastLine(),
-    endCh;
-  var prefixEndChar = getLastPrefixPos(line, prefixStart);
-  var prefixEndLine = line;
-
-  // outer:
-  for (var i = line; i <= lastLine; ++i) {
-    if (stopAtNextLine) break;
-    var text = yasqe.getDoc().getLine(i),
-      pos = i == line ? prefixStart + 1 : 0;
-
-    for (;;) {
-      if (!stopAtNextLine && text.indexOf(stopAt) >= 0) stopAtNextLine = true;
-
-      var nextPrefixDeclaration = text.toUpperCase().indexOf(PREFIX_KEYWORD, pos);
-
-      if (nextPrefixDeclaration >= 0) {
-        if ((endCh = getLastPrefixPos(i, nextPrefixDeclaration)) > 0) {
-          prefixEndChar = endCh;
-          prefixEndLine = i;
-          pos = prefixEndChar;
-        }
-        pos++;
-      } else {
-        break;
-      }
-    }
-  }
-  return {
-    from: CodeMirror.Pos(line, prefixStart + PREFIX_KEYWORD.length),
-    to: CodeMirror.Pos(prefixEndLine, prefixEndChar),
-  };
-}