@twick/2d 0.13.0 → 0.14.2

package/src/lib/code/CodeTokenizer.ts

@@ -1,54 +1,54 @@
-export type CodeTokenizer = (input: string) => string[];
-
-/**
- * Default tokenizer function used by ownerless code signals.
- *
- * @param input - The code to tokenize.
- */
-export function defaultTokenize(input: string): string[] {
-  const tokens: string[] = [];
-  let currentToken = '';
-  let whitespace = false;
-
-  for (const char of input) {
-    switch (char) {
-      case ' ':
-      case '\t':
-      case '\n':
-        if (!whitespace && currentToken !== '') {
-          tokens.push(currentToken);
-          currentToken = '';
-        }
-        whitespace = true;
-        currentToken += char;
-        break;
-      case '(':
-      case ')':
-      case '{':
-      case '}':
-      case '[':
-      case ']':
-        if (currentToken !== '') {
-          tokens.push(currentToken);
-          currentToken = '';
-        }
-        whitespace = false;
-        tokens.push(char);
-        break;
-      default:
-        if (whitespace && currentToken !== '') {
-          tokens.push(currentToken);
-          currentToken = '';
-        }
-        whitespace = false;
-        currentToken += char;
-        break;
-    }
-  }
-
-  if (currentToken !== '') {
-    tokens.push(currentToken);
-  }
-
-  return tokens;
-}
+export type CodeTokenizer = (input: string) => string[];
+
+/**
+ * Default tokenizer function used by ownerless code signals.
+ *
+ * @param input - The code to tokenize.
+ */
+export function defaultTokenize(input: string): string[] {
+  const tokens: string[] = [];
+  let currentToken = '';
+  let whitespace = false;
+
+  for (const char of input) {
+    switch (char) {
+      case ' ':
+      case '\t':
+      case '\n':
+        if (!whitespace && currentToken !== '') {
+          tokens.push(currentToken);
+          currentToken = '';
+        }
+        whitespace = true;
+        currentToken += char;
+        break;
+      case '(':
+      case ')':
+      case '{':
+      case '}':
+      case '[':
+      case ']':
+        if (currentToken !== '') {
+          tokens.push(currentToken);
+          currentToken = '';
+        }
+        whitespace = false;
+        tokens.push(char);
+        break;
+      default:
+        if (whitespace && currentToken !== '') {
+          tokens.push(currentToken);
+          currentToken = '';
+        }
+        whitespace = false;
+        currentToken += char;
+        break;
+    }
+  }
+
+  if (currentToken !== '') {
+    tokens.push(currentToken);
+  }
+
+  return tokens;
+}

package/src/lib/code/DefaultHighlightStyle.ts

@@ -1,98 +1,98 @@
-import {HighlightStyle} from '@codemirror/language';
-import {tags as t} from '@lezer/highlight';
-
-export const DefaultHighlightStyle = HighlightStyle.define([
-  {tag: t.keyword, color: '#5e81ac'},
-  {
-    tag: [t.name, t.deleted, t.character, t.propertyName, t.macroName],
-    color: '#88c0d0',
-  },
-  {tag: [t.variableName], color: '#8fbcbb'},
-  {tag: [t.function(t.variableName)], color: '#8fbcbb'},
-  {tag: [t.labelName], color: '#81a1c1'},
-  {
-    tag: [t.color, t.constant(t.name), t.standard(t.name)],
-    color: '#5e81ac',
-  },
-  {tag: [t.definition(t.name), t.separator], color: '#a3be8c'},
-  {tag: [t.brace], color: '#8fbcbb'},
-  {
-    tag: [t.annotation],
-    color: '#d30102',
-  },
-  {
-    tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace],
-    color: '#b48ead',
-  },
-  {
-    tag: [t.typeName, t.className],
-    color: '#ECEFF4',
-  },
-  {
-    tag: [t.operator, t.operatorKeyword],
-    color: '#a3be8c',
-  },
-  {
-    tag: [t.tagName],
-    color: '#b48ead',
-  },
-  {
-    tag: [t.squareBracket],
-    color: '#ECEFF4',
-  },
-  {
-    tag: [t.angleBracket],
-    color: '#ECEFF4',
-  },
-  {
-    tag: [t.attributeName],
-    color: '#eceff4',
-  },
-  {
-    tag: [t.regexp],
-    color: '#5e81ac',
-  },
-  {
-    tag: [t.quote],
-    color: '#b48ead',
-  },
-  {tag: [t.string], color: '#a3be8c'},
-  {
-    tag: t.link,
-    color: '#a3be8c',
-    textDecoration: 'underline',
-    textUnderlinePosition: 'under',
-  },
-  {
-    tag: [t.url, t.escape, t.special(t.string)],
-    color: '#8fbcbb',
-  },
-  {tag: [t.meta], color: '#88c0d0'},
-  {tag: [t.monospace], color: '#d8dee9', fontStyle: 'italic'},
-  {tag: [t.comment], color: '#4c566a', fontStyle: 'italic'},
-  {tag: t.strong, fontWeight: 'bold', color: '#5e81ac'},
-  {tag: t.emphasis, fontStyle: 'italic', color: '#5e81ac'},
-  {tag: t.strikethrough, textDecoration: 'line-through'},
-  {tag: t.heading, fontWeight: 'bold', color: '#5e81ac'},
-  {tag: t.special(t.heading1), fontWeight: 'bold', color: '#5e81ac'},
-  {tag: t.heading1, fontWeight: 'bold', color: '#5e81ac'},
-  {
-    tag: [t.heading2, t.heading3, t.heading4],
-    fontWeight: 'bold',
-    color: '#5e81ac',
-  },
-  {
-    tag: [t.heading5, t.heading6],
-    color: '#5e81ac',
-  },
-  {tag: [t.atom, t.bool, t.special(t.variableName)], color: '#d08770'},
-  {
-    tag: [t.processingInstruction, t.inserted],
-    color: '#8fbcbb',
-  },
-  {
-    tag: [t.contentSeparator],
-    color: '#ebcb8b',
-  },
-  {tag: t.invalid, color: '#434c5e', borderBottom: `1px dotted #d30102`},
-]);
+import {HighlightStyle} from '@codemirror/language';
+import {tags as t} from '@lezer/highlight';
+
+export const DefaultHighlightStyle = HighlightStyle.define([
+  {tag: t.keyword, color: '#5e81ac'},
+  {
+    tag: [t.name, t.deleted, t.character, t.propertyName, t.macroName],
+    color: '#88c0d0',
+  },
+  {tag: [t.variableName], color: '#8fbcbb'},
+  {tag: [t.function(t.variableName)], color: '#8fbcbb'},
+  {tag: [t.labelName], color: '#81a1c1'},
+  {
+    tag: [t.color, t.constant(t.name), t.standard(t.name)],
+    color: '#5e81ac',
+  },
+  {tag: [t.definition(t.name), t.separator], color: '#a3be8c'},
+  {tag: [t.brace], color: '#8fbcbb'},
+  {
+    tag: [t.annotation],
+    color: '#d30102',
+  },
+  {
+    tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace],
+    color: '#b48ead',
+  },
+  {
+    tag: [t.typeName, t.className],
+    color: '#ECEFF4',
+  },
+  {
+    tag: [t.operator, t.operatorKeyword],
+    color: '#a3be8c',
+  },
+  {
+    tag: [t.tagName],
+    color: '#b48ead',
+  },
+  {
+    tag: [t.squareBracket],
+    color: '#ECEFF4',
+  },
+  {
+    tag: [t.angleBracket],
+    color: '#ECEFF4',
+  },
+  {
+    tag: [t.attributeName],
+    color: '#eceff4',
+  },
+  {
+    tag: [t.regexp],
+    color: '#5e81ac',
+  },
+  {
+    tag: [t.quote],
+    color: '#b48ead',
+  },
+  {tag: [t.string], color: '#a3be8c'},
+  {
+    tag: t.link,
+    color: '#a3be8c',
+    textDecoration: 'underline',
+    textUnderlinePosition: 'under',
+  },
+  {
+    tag: [t.url, t.escape, t.special(t.string)],
+    color: '#8fbcbb',
+  },
+  {tag: [t.meta], color: '#88c0d0'},
+  {tag: [t.monospace], color: '#d8dee9', fontStyle: 'italic'},
+  {tag: [t.comment], color: '#4c566a', fontStyle: 'italic'},
+  {tag: t.strong, fontWeight: 'bold', color: '#5e81ac'},
+  {tag: t.emphasis, fontStyle: 'italic', color: '#5e81ac'},
+  {tag: t.strikethrough, textDecoration: 'line-through'},
+  {tag: t.heading, fontWeight: 'bold', color: '#5e81ac'},
+  {tag: t.special(t.heading1), fontWeight: 'bold', color: '#5e81ac'},
+  {tag: t.heading1, fontWeight: 'bold', color: '#5e81ac'},
+  {
+    tag: [t.heading2, t.heading3, t.heading4],
+    fontWeight: 'bold',
+    color: '#5e81ac',
+  },
+  {
+    tag: [t.heading5, t.heading6],
+    color: '#5e81ac',
+  },
+  {tag: [t.atom, t.bool, t.special(t.variableName)], color: '#d08770'},
+  {
+    tag: [t.processingInstruction, t.inserted],
+    color: '#8fbcbb',
+  },
+  {
+    tag: [t.contentSeparator],
+    color: '#ebcb8b',
+  },
+  {tag: t.invalid, color: '#434c5e', borderBottom: `1px dotted #d30102`},
+]);

package/src/lib/code/LezerHighlighter.ts

@@ -1,113 +1,113 @@
-import type {HighlightStyle} from '@codemirror/language';
-import type {Parser, SyntaxNode, Tree} from '@lezer/common';
-import {highlightTree} from '@lezer/highlight';
-import type {CodeHighlighter, HighlightResult} from './CodeHighlighter';
-import {DefaultHighlightStyle} from './DefaultHighlightStyle';
-
-interface LezerCache {
-  tree: Tree;
-  code: string;
-  colorLookup: Map<string, string>;
-}
-
-export class LezerHighlighter implements CodeHighlighter<LezerCache | null> {
-  private static classRegex = /\.(\S+).*color:([^;]+)/;
-  private readonly classLookup = new Map<string, string>();
-
-  public constructor(
-    private readonly parser: Parser,
-    private readonly style: HighlightStyle = DefaultHighlightStyle,
-  ) {
-    for (const rule of this.style.module?.getRules().split('\n') ?? []) {
-      const match = rule.match(LezerHighlighter.classRegex);
-      if (!match) {
-        continue;
-      }
-
-      const className = match[1];
-      const color = match[2].trim();
-      this.classLookup.set(className, color);
-    }
-  }
-
-  public initialize(): boolean {
-    return true;
-  }
-
-  public prepare(code: string): LezerCache | null {
-    const colorLookup = new Map<string, string>();
-    const tree = this.parser.parse(code);
-    highlightTree(tree, this.style, (from, to, classes) => {
-      const color = this.classLookup.get(classes);
-      if (!color) {
-        return;
-      }
-
-      const cursor = tree.cursorAt(from, 1);
-      do {
-        const id = this.getNodeId(cursor.node);
-        colorLookup.set(id, color);
-      } while (cursor.next() && cursor.to <= to);
-    });
-
-    return {
-      tree,
-      code,
-      colorLookup,
-    };
-  }
-
-  public highlight(index: number, cache: LezerCache | null): HighlightResult {
-    if (!cache) {
-      return {
-        color: null,
-        skipAhead: 0,
-      };
-    }
-
-    const node = cache.tree.resolveInner(index, 1);
-    const id = this.getNodeId(node);
-    const color = cache.colorLookup.get(id);
-    if (color) {
-      return {
-        color,
-        skipAhead: node.to - index,
-      };
-    }
-
-    let skipAhead = 0;
-    if (!node.firstChild) {
-      skipAhead = node.to - index;
-    }
-
-    return {
-      color: null,
-      skipAhead,
-    };
-  }
-
-  public tokenize(code: string): string[] {
-    const tree = this.parser.parse(code);
-    const cursor = tree.cursor();
-    const tokens: string[] = [];
-    let current = 0;
-
-    do {
-      if (!cursor.node.firstChild) {
-        if (cursor.from > current) {
-          tokens.push(code.slice(current, cursor.from));
-        }
-        if (cursor.from < cursor.to) {
-          tokens.push(code.slice(cursor.from, cursor.to));
-        }
-        current = cursor.to;
-      }
-    } while (cursor.next());
-
-    return tokens;
-  }
-
-  private getNodeId(node: SyntaxNode): string {
-    return `${node.from}:${node.to}`;
-  }
-}
+import type {HighlightStyle} from '@codemirror/language';
+import type {Parser, SyntaxNode, Tree} from '@lezer/common';
+import {highlightTree} from '@lezer/highlight';
+import type {CodeHighlighter, HighlightResult} from './CodeHighlighter';
+import {DefaultHighlightStyle} from './DefaultHighlightStyle';
+
+interface LezerCache {
+  tree: Tree;
+  code: string;
+  colorLookup: Map<string, string>;
+}
+
+export class LezerHighlighter implements CodeHighlighter<LezerCache | null> {
+  private static classRegex = /\.(\S+).*color:([^;]+)/;
+  private readonly classLookup = new Map<string, string>();
+
+  public constructor(
+    private readonly parser: Parser,
+    private readonly style: HighlightStyle = DefaultHighlightStyle,
+  ) {
+    for (const rule of this.style.module?.getRules().split('\n') ?? []) {
+      const match = rule.match(LezerHighlighter.classRegex);
+      if (!match) {
+        continue;
+      }
+
+      const className = match[1];
+      const color = match[2].trim();
+      this.classLookup.set(className, color);
+    }
+  }
+
+  public initialize(): boolean {
+    return true;
+  }
+
+  public prepare(code: string): LezerCache | null {
+    const colorLookup = new Map<string, string>();
+    const tree = this.parser.parse(code);
+    highlightTree(tree, this.style, (from, to, classes) => {
+      const color = this.classLookup.get(classes);
+      if (!color) {
+        return;
+      }
+
+      const cursor = tree.cursorAt(from, 1);
+      do {
+        const id = this.getNodeId(cursor.node);
+        colorLookup.set(id, color);
+      } while (cursor.next() && cursor.to <= to);
+    });
+
+    return {
+      tree,
+      code,
+      colorLookup,
+    };
+  }
+
+  public highlight(index: number, cache: LezerCache | null): HighlightResult {
+    if (!cache) {
+      return {
+        color: null,
+        skipAhead: 0,
+      };
+    }
+
+    const node = cache.tree.resolveInner(index, 1);
+    const id = this.getNodeId(node);
+    const color = cache.colorLookup.get(id);
+    if (color) {
+      return {
+        color,
+        skipAhead: node.to - index,
+      };
+    }
+
+    let skipAhead = 0;
+    if (!node.firstChild) {
+      skipAhead = node.to - index;
+    }
+
+    return {
+      color: null,
+      skipAhead,
+    };
+  }
+
+  public tokenize(code: string): string[] {
+    const tree = this.parser.parse(code);
+    const cursor = tree.cursor();
+    const tokens: string[] = [];
+    let current = 0;
+
+    do {
+      if (!cursor.node.firstChild) {
+        if (cursor.from > current) {
+          tokens.push(code.slice(current, cursor.from));
+        }
+        if (cursor.from < cursor.to) {
+          tokens.push(code.slice(cursor.from, cursor.to));
+        }
+        current = cursor.to;
+      }
+    } while (cursor.next());
+
+    return tokens;
+  }
+
+  private getNodeId(node: SyntaxNode): string {
+    return `${node.from}:${node.to}`;
+  }
+}