@matdata/yasqe 5.12.0 → 5.13.0

package/grammar/tokenizer.ts

@@ -40,6 +40,9 @@ export interface State {
   seenWhereClause: boolean;
   constructVariables: { [varName: string]: string };
   whereVariables: { [varName: string]: string };
+  pendingToken: Token | undefined;
+  bracketStack: Array<{ type: string; level: number }>;
+  bracketLevel: number;
 }
 export interface Token {
   quotePos: "end" | "start" | "content" | undefined;
@@ -292,7 +295,7 @@ export default function (config: CodeMirror.EditorConfiguration): CodeMirror.Mod
     {
       name: "PNAME_LN",
       regex: new RegExp("^" + PNAME_LN),
-      style: "string-2",
+      style: "string",
     },
 
     {
@@ -322,6 +325,16 @@ export default function (config: CodeMirror.EditorConfiguration): CodeMirror.Mod
   }
 
   function tokenBase(stream: CodeMirror.StringStream, state: State) {
+    // If we have a pending token from a previous split, consume it from stream and return style
+    if (state.pendingToken) {
+      const token = state.pendingToken;
+      state.pendingToken = undefined;
+      // Advance the stream by the length of the pending token
+      stream.pos += token.string.length;
+      // Don't parse, just return the style
+      return token.style;
+    }
+
     function nextToken(): Token {
       let consumed: string[];
       if (state.inLiteral) {
@@ -375,6 +388,39 @@ export default function (config: CodeMirror.EditorConfiguration): CodeMirror.Mod
       for (var i = 0; i < terminals.length; ++i) {
         consumed = stream.match(terminals[i].regex as any, true, false) as any;
         if (consumed) {
+          // Special handling for PNAME_LN: split into prefix (string-2) and local name (string)
+          if (terminals[i].name === "PNAME_LN") {
+            const fullString = consumed[0];
+            const colonIndex = fullString.indexOf(":");
+            if (colonIndex >= 0) {
+              const prefixPart = fullString.substring(0, colonIndex + 1);
+              const localPart = fullString.substring(colonIndex + 1);
+
+              // Store the local name part for next token call
+              if (localPart.length > 0) {
+                state.pendingToken = {
+                  cat: "PNAME_LN_LOCAL",
+                  style: "string",
+                  string: localPart,
+                  start: stream.start + prefixPart.length,
+                  quotePos: undefined,
+                };
+
+                // Back up the stream to just after the prefix part
+                stream.pos = stream.start + prefixPart.length;
+
+                // Return the prefix part
+                return {
+                  cat: "PNAME_LN_PREFIX",
+                  style: "string-2",
+                  string: prefixPart,
+                  start: stream.start,
+                  quotePos: undefined,
+                };
+              }
+            }
+          }
+
           return {
             cat: terminals[i].name,
             style: terminals[i].style,
@@ -398,14 +444,45 @@ export default function (config: CodeMirror.EditorConfiguration): CodeMirror.Mod
 
       // Punctuation
       consumed = stream.match(grammar.punct, true, false) as any;
-      if (consumed)
+      if (consumed) {
+        const punctChar = consumed[0];
+        let style = "punc";
+
+        // Rainbow bracket colorization (only for curly braces)
+        // Parentheses and square brackets always have the same color
+        if (punctChar === "{") {
+          // Opening curly brace - rainbow color
+          state.bracketStack.push({ type: punctChar, level: state.bracketLevel });
+          style = "bracket bracket-level-" + (state.bracketLevel % 4);
+          state.bracketLevel++;
+        } else if (punctChar === "}") {
+          // Closing curly brace - rainbow color
+          if (state.bracketStack.length > 0) {
+            const last = state.bracketStack.pop();
+            if (last) {
+              state.bracketLevel = last.level;
+              style = "bracket bracket-level-" + (last.level % 4);
+            }
+          } else {
+            // Unmatched closing bracket
+            style = "bracket bracket-mismatch";
+          }
+        } else if (punctChar === "[" || punctChar === "(") {
+          // Opening parenthesis or square bracket - constant color
+          style = "bracket bracket-paren";
+        } else if (punctChar === "]" || punctChar === ")") {
+          // Closing parenthesis or square bracket - constant color
+          style = "bracket bracket-paren";
+        }
+
         return {
           cat: stream.current(),
-          style: "punc",
+          style: style,
           string: consumed[0],
           start: stream.start,
           quotePos: undefined,
         };
+      }
 
       // Token is invalid
       // better consume something anyway, or else we're stuck
@@ -498,6 +575,12 @@ export default function (config: CodeMirror.EditorConfiguration): CodeMirror.Mod
 
     const tokenOb = nextToken();
 
+    // If this is a pending token (second part of a split), just return its style without parsing
+    if (tokenOb.cat === "PNAME_LN_LOCAL") {
+      state.possibleCurrent = state.possibleNext;
+      return tokenOb.style;
+    }
+
     if (tokenOb.cat == "<invalid_token>") {
       // set error state, and
       if (state.OK == true) {
@@ -517,7 +600,8 @@ export default function (config: CodeMirror.EditorConfiguration): CodeMirror.Mod
     // or failure
     var finished = false;
     var topSymbol;
-    const tokenCat = tokenOb.cat;
+    // Treat PNAME_LN_PREFIX as PNAME_LN for parsing purposes
+    const tokenCat = tokenOb.cat === "PNAME_LN_PREFIX" ? "PNAME_LN" : tokenOb.cat;
     if (state.possibleFullIri && tokenOb.string === ">") {
       state.possibleFullIri = false;
     }
@@ -576,7 +660,10 @@ export default function (config: CodeMirror.EditorConfiguration): CodeMirror.Mod
             }
 
             //check whether a used prefix is actually defined
-            if (!state.inPrefixDecl && (tokenCat === "PNAME_NS" || tokenCat === "PNAME_LN")) {
+            if (
+              !state.inPrefixDecl &&
+              (tokenCat === "PNAME_NS" || tokenCat === "PNAME_LN" || tokenCat === "PNAME_LN_PREFIX")
+            ) {
               const colonIndex = tokenOb.string.indexOf(":");
               if (colonIndex >= 0) {
                 const prefNs = tokenOb.string.slice(0, colonIndex);
@@ -747,6 +834,9 @@ export default function (config: CodeMirror.EditorConfiguration): CodeMirror.Mod
         seenWhereClause: false,
         constructVariables: {},
         whereVariables: {},
+        pendingToken: undefined,
+        bracketStack: [],
+        bracketLevel: 0,
       };
     },
     indent: indent,

package/package.json

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

package/src/scss/codemirrorMods.scss

@@ -22,6 +22,28 @@
     font-size: 19px;
   }
 }
+
+// Rainbow bracket colors for default theme
+.cm-s-default {
+  span.cm-bracket-level-0 {
+    color: #ffd700;
+  } // Gold
+  span.cm-bracket-level-1 {
+    color: #da70d6;
+  } // Orchid
+  span.cm-bracket-level-2 {
+    color: #6bb0cc;
+  } // Sky blue
+  span.cm-bracket-level-3 {
+    color: #439143;
+  } // Pale green
+  span.cm-bracket-paren {
+    color: #997;
+  } // 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 {
   max-width: 1000px;