@matdata/yasqe 4.7.4 → 4.8.0

package/grammar/tokenizer.ts

@@ -44,8 +44,8 @@ export interface Token {
   string: string;
   start: number;
 }
+import * as grammar from "./_tokenizer-table.js";
 export default function (config: CodeMirror.EditorConfiguration): CodeMirror.Mode<State> {
-  const grammar = require("./_tokenizer-table.js");
   const ll1_table = grammar.table;
 
   const IRI_REF = '<[^<>"`|{}^\\\x00-\x20]*>';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@matdata/yasqe",
   "description": "Yet Another SPARQL Query Editor",
-  "version": "4.7.4",
+  "version": "4.8.0",
   "main": "build/yasqe.min.js",
   "types": "build/ts/src/index.d.ts",
   "license": "MIT",

package/src/CodeMirror.ts

@@ -8,24 +8,24 @@ import {
   EditorConfiguration as CmEditorConfiguration,
 } from "codemirror";
 
-const _CodeMirror = require("codemirror");
+import _CodeMirror from "codemirror";
 
 import * as sparql11Mode from "../grammar/tokenizer";
 import { default as prefixFold } from "./prefixFold";
 import { TokenizerState } from "./index";
 
-require("codemirror/addon/fold/foldcode.js");
-require("codemirror/addon/fold/foldgutter.js");
-require("codemirror/addon/fold/xml-fold.js");
-require("codemirror/addon/fold/brace-fold.js");
-require("codemirror/addon/hint/show-hint.js");
-require("codemirror/addon/search/searchcursor.js");
-require("codemirror/addon/search/match-highlighter.js");
-require("codemirror/addon/edit/matchbrackets.js");
-require("codemirror/addon/runmode/runmode.js");
-require("codemirror/lib/codemirror.css");
-require("codemirror/addon/fold/foldgutter.css");
-require("./scss/codemirrorMods.scss");
+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);
@@ -50,5 +50,5 @@ interface CodeMirror extends Omit<CmEditor, "getOption" | "setOption" | "on" | "
 
   foldCode(firstPrefixLine: number, prefix: string, collapse: "fold" | "unfold"): void;
 }
-const CodeMirror: { new (): CodeMirror; signal: (target: any, name: string, ...args: any[]) => void } = _CodeMirror;
+const CodeMirror: any = _CodeMirror;
 export default CodeMirror;

package/src/autocompleters/index.ts

@@ -2,8 +2,8 @@ import { default as Yasqe, Token, Hint, Position, Config, HintFn, HintConfig } f
 import Trie from "../trie";
 import { EventEmitter } from "events";
 import { take } from "lodash-es";
-const CodeMirror = require("codemirror");
-require("./show-hint.scss");
+import CodeMirror from "codemirror";
+import "./show-hint.scss";
 export interface CompleterConfig {
   onInitialize?: (this: CompleterConfig, yasqe: Yasqe) => void; //allows for e.g. registering event listeners in yasqe, like the prefix autocompleter does
   isValidCompletionPosition: (yasqe: Yasqe) => boolean;
@@ -81,7 +81,7 @@ export class Completer extends EventEmitter {
     if (this.trie) return Promise.resolve(take(this.trie.autoComplete(stringToAutocomplete), SUGGESTIONS_LIMIT));
     if (this.config.get instanceof Array)
       return Promise.resolve(
-        this.config.get.filter((possibleMatch) => possibleMatch.indexOf(stringToAutocomplete) === 0)
+        this.config.get.filter((possibleMatch) => possibleMatch.indexOf(stringToAutocomplete) === 0),
       );
     //assuming it's a function
     return Promise.resolve(this.config.get(this.yasqe, token)).then((r) => {
@@ -300,7 +300,7 @@ export function postprocessIriCompletion(_yasqe: Yasqe, token: AutocompletionTok
 export const fetchFromLov = (
   yasqe: Yasqe,
   type: "class" | "property",
-  token?: AutocompletionToken
+  token?: AutocompletionToken,
 ): Promise<string[]> => {
   var reqProtocol = window.location.protocol.indexOf("http") === 0 ? "https://" : "http://";
   const notificationKey = "autocomplete_" + type;

package/src/autocompleters/show-hint.scss

@@ -1,5 +1,5 @@
 //This is a copy of the codemirror show-hint css
-//Including this ourselves, as we don't want this css to be auto-scoped to yasqe by webpack
+//Including this ourselves, as we don't want this css to be auto-scoped to yasqe
 .CodeMirror-hints {
   position: absolute;
   z-index: 10;

package/src/defaults.ts

@@ -6,10 +6,10 @@
  */
 import { default as Yasqe, Config, PlainRequestConfig } from "./";
 import * as queryString from "query-string";
+import CodeMirror from "codemirror";
 //need to pass Yasqe object as argument, as the imported version might not have inherited all (e.g. `fold`) props of Codemirror yet
 export default function get() {
   const prefixCcApi = "https://prefix.cc/popular/all.file.json";
-  const CodeMirror = require("codemirror");
   const config: Omit<Config, "requestConfig"> = {
     mode: "sparql11",
     value: `PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -135,7 +135,7 @@ SELECT * WHERE {
     queryArgument: undefined, //undefined means: get query argument based on query mode
     endpoint: "https://dbpedia.org/sparql",
     method: "POST",
-    acceptHeaderGraph: "application/n-triples,*/*;q=0.9",
+    acceptHeaderGraph: "text/turtle,*/*;q=0.9",
     acceptHeaderSelect: "application/sparql-results+json,*/*;q=0.9",
     acceptHeaderUpdate: "text/plain,*/*;q=0.9",
     namedGraphs: [],

package/src/index.ts

@@ -1,5 +1,5 @@
-require("./scss/yasqe.scss");
-require("./scss/buttons.scss");
+import "./scss/yasqe.scss";
+import "./scss/buttons.scss";
 import { findFirstPrefixLine } from "./prefixFold";
 import { getPrefixesFromQuery, addPrefixes, removePrefixes, Prefixes } from "./prefixUtils";
 import { getPreviousNonWsToken, getNextNonWsToken, getCompleteToken } from "./tokenUtils";

package/build/yasqe.html

@@ -1,108 +0,0 @@
-<!doctype html><html><head><meta charset="UTF-8"/><style>body {
-        font-family: "Roboto", sans-serif;
-        margin: 0px;
-      }
-      .navItem a {
-        color: #555;
-        text-decoration: none;
-        padding: 5px;
-        padding-right: 15px;
-      }
-      .navItem a:hover {
-        color: #222;
-      }
-      .navItem.active a {
-        color: black;
-        font-size: 110%;
-      }</style><link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"/><style></style><script defer="defer" src="/yasqe.min.js"></script><link href="/yasqe.min.css" rel="stylesheet"></head><body><div style="background:#eee"><nav style="display: flex"><img src="webpack/yasgui.png" style="max-height:50px;padding:5px;margin-left: 10px" alt="Yasgui Logo"/><ul style="display: flex; list-style: none; align-self: center"><li class="navItem false"><a class="nav-link" href="yasgui.html">Yasgui</a></li><li class="navItem active"><a class="nav-link" href="yasqe.html">Yasqe</a></li><li class="navItem false"><a class="nav-link" href="yasr.html">Yasr</a></li></ul></nav></div><div style="display:none; background-color: grey; color:yellow" id="noExternalServicesWarning">Running yasqe without references to external services such as LOV and prefix.cc Mainly useful for test-suite purposes</div><a id="noExternalServicesToggle" style="display:none;" href="/yasqe.html?noExternalServices=1">Run yasqe without references to external services</a><div id="yasqe"></div><script>var isIE11 = !!window.MSInputMethodContext && !!document.documentMode;
-      if (isIE11) {
-        var polyfills = document.createElement("script");
-        polyfills.setAttribute("src", "//yasgui.triply.cc/yasgui.polyfill.min.js");
-        document.head.appendChild(polyfills);
-      }
-      window.onpageshow = function() {
-				const noExternalServices = document.location.search.indexOf("noExternalServices") >= 0;
-        if (noExternalServices) {
-					document.getElementById('noExternalServicesWarning').style.display = 'block'
-          //avoid references to external services such as lov and prefix.cc
-          //Useful for unit-testing purposes
-          Yasqe.defaults.autocompleters.splice(Yasqe.defaults.autocompleters.indexOf("prefixes"), 1);
-          Yasqe.forkAutocompleter("prefixes", {
-            name: "prefixes-local",
-            persistenceId: null,
-            get: () => {
-              return new Promise(resolve => {
-                setTimeout(() => {
-                  resolve(
-                    [
-                      "foaf: <http://xmlns.com/foaf/0.1/>",
-                      "geo: <http://www.opengis.net/ont/geosparql#>",
-                      "rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>",
-                      "rdfa: <http://www.w3.org/ns/rdfa#>",
-                      "rdfdata: <http://rdf.data-vocabulary.org/rdf.xml#>",
-                      "rdfdf: <http://www.openlinksw.com/virtrdf-data-formats#>",
-                      "rdfg: <http://www.w3.org/2004/03/trix/rdfg-1/>",
-                      "rdfp: <https://w3id.org/rdfp/>",
-                      "rdfs: <http://www.w3.org/2000/01/rdf-schema#>",
-                      "testa: <https://test.a.com/>",
-                      "testb: <https://test.b.com/>",
-                      "testc: <https://test.c.com/>"
-                    ],
-                    20
-                  );
-                });
-              });
-            }
-          });
-          Yasqe.defaults.autocompleters.splice(Yasqe.defaults.autocompleters.indexOf("property"), 1);
-          const propCompletions = [
-            "http://www.opengis.net/ont/geosparql#defaultGeometry",
-            "http://www.opengis.net/ont/geosparql#asWKT",
-            "http://www.opengis.net/ont/geosparql#asGML"
-          ];
-          for (let i = 0; i < 1000; i++) {
-            propCompletions.push("https://test.a.com/" + i);
-          }
-
-          Yasqe.forkAutocompleter("property", {
-            name: "property-local",
-            get: function(yasqe, token) {
-              console.log(
-                propCompletions,
-                propCompletions.filter(iri => token.autocompletionString.indexOf(iri) === 0)
-              );
-              return new Promise(resolve => {
-                setTimeout(() => {
-                  resolve(propCompletions.filter(iri => iri.indexOf(token.autocompletionString) === 0));
-                });
-              });
-            }
-          });
-          const classCompletions = [];
-          for (let i = 0; i < 1000; i++) {
-            classCompletions.push("https://test.b.com/" + i);
-          }
-
-          Yasqe.defaults.autocompleters.splice(Yasqe.defaults.autocompleters.indexOf("class"), 1);
-          Yasqe.forkAutocompleter("class", {
-            name: "class-local",
-            get: function(yasqe, token) {
-              return new Promise(resolve => {
-                setTimeout(() => {
-                  resolve(classCompletions.filter(iri => iri.indexOf(token.autocompletionString) === 0));
-                });
-              });
-            }
-          });
-        } else {
-					document.getElementById('noExternalServicesToggle').style.display = 'block'
-				}
-
-        window.yasqe = new Yasqe(document.getElementById("yasqe"));
-        window.yasqe.on("queryResponse", function() {
-          console.log("response event", arguments);
-        });
-        window.yasqe.on("query", function() {
-          console.log("query event", arguments);
-        });
-      };</script></body></html>

package/build/yasqe.min.js.LICENSE.txt

@@ -1,3 +0,0 @@
-/*! @license DOMPurify 3.3.0 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.3.0/LICENSE */
-
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */