@matdata/yasqe 4.7.5 → 5.0.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.5",
+  "version": "5.0.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#>

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.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 */