create separate test case for CommonTokenBuilder

mermaid-js · Yokozuna59 · Sep 2, 2023 · Sep 2, 2023 · Sep 2, 2023 · Sep 2, 2023
commit 51896f30f56cafc6bd1fddf09ae88b1762498c35
diff --git a/packages/parser/tests/greedy.test.ts b/packages/parser/tests/greedy.test.ts
@@ -0,0 +1,64 @@
+import { createLangiumGrammarServices, createServicesForGrammar } from 'langium/grammar';
+import { describe, expect, it } from 'vitest';
+import { CommonTokenBuilder } from '../src/index.js';
+import type { TokenType } from 'chevrotain';
+import { EmptyFileSystem } from 'langium';
+
+const grammarServices = createLangiumGrammarServices(EmptyFileSystem).grammar;
+
+async function createServicesFromGrammar(grammar: string) {
+  const services = await createServicesForGrammar({
+    grammar,
+    module: {
+      parser: {
+        TokenBuilder: () => new CommonTokenBuilder([], grammarServices),
+      },
+    },
+  });
+
+  return {
+    grammar: services.Grammar,
+    tokenBuilder: services.parser.TokenBuilder,
+  };
+}
+
+describe('CommonTokenBuilder', async () => {
+  it('should handle grammar with one greedy rule', async () => {
+    const grammar = `
+      grammar TestGrammar
+      entry Rule:
+        'rule' value=(LessGreedy | Greedy);
+
+      hidden terminal WS: /\\s+/;
+
+      /** @greedy */
+      terminal Greedy: /[\\w\\d]+/;
+      terminal LessGreedy: /[\\w]+/;
+    `;
+    const services = await createServicesFromGrammar(grammar);
+    const tokens = services.tokenBuilder.buildTokens(services.grammar) as TokenType[];
+
+    expect(tokens[2].name).toBe('LessGreedy');
+    expect(tokens[3].name).toBe('Greedy');
+  });
+
+  it('should handle grammar with more than one greedy rule', async () => {
+    const grammar = `
+      grammar TestGrammar
+      entry Rule:
+        'rule' value=(LessGreedy | Greedy);
+
+      hidden terminal WS: /\\s+/;
+
+      /** @greedy */
+      terminal LessGreedy: /[\\w]+/;
+      /** @greedy */
+      terminal Greedy: /[\\w\\d]+/;
+    `;
+    const services = await createServicesFromGrammar(grammar);
+    const tokens = services.tokenBuilder.buildTokens(services.grammar) as TokenType[];
+
+    expect(tokens[2].name).toBe('LessGreedy');
+    expect(tokens[3].name).toBe('Greedy');
+  });
+});
diff --git a/packages/parser/tests/sankey-tokenBuilder.test.ts b/packages/parser/tests/sankey-tokenBuilder.test.ts
diff --git a/packages/mermaid-example-diagram/src/types/index.d.ts b/packages/mermaid-example-diagram/src/types/index.d.ts

 declare global {
  interface Window {
    mermaid: any; // 👈️ turn off type checking
  }
 }
diff --git a/packages/mermaid-flowchart-elk/src/flowRenderer-elk.js b/packages/mermaid-flowchart-elk/src/flowRenderer-elk.js
      let vertexText = vertex.text !== undefined ? vertex.text : vertex.id;

      // We create a SVG label, either by delegating to addHtmlLabel or manually
      let vertexNode;
      const labelData = { width: 0, height: 0 };

      const ports = [
        nodeEl = await insertNode(nodes, node, vertex.dir);
        boundingBox = nodeEl.node().getBBox();
      } else {
        const svgLabel = doc.createElementNS('http://www.w3.org/2000/svg', 'text');
        // svgLabel.setAttribute('style', styles.labelStyle.replace('color:', 'fill:'));
        // const rows = vertexText.split(common.lineBreakRegex);
        // for (const row of rows) {
 * Add edges to graph based on parsed graph definition
 *
 * @param {object} edges The edges to add to the graph
 * @param {object} g The graph object
 * @param cy
 * @param diagObj
 * @param graph
 /**
 * Recursive function that iterates over an array of nodes and inserts the children of each node.
 * It also recursively populates the inserts the children of the children and so on.
 * @param {*} graph
 * @param nodeArray
 * @param parentLookupDb
 */
diff --git a/packages/mermaid-zenuml/src/mermaidUtils.ts b/packages/mermaid-zenuml/src/mermaidUtils.ts
 export let sanitizeText: (str: string) => string;
 // eslint-disable @typescript-eslint/no-explicit-any
 export let setupGraphViewbox: (
  graph: any,
  svgElem: any,
  padding: any,
  useMaxWidth: boolean
 ) => void;

 export const injectUtils = (
  _log: Record<keyof typeof LEVELS, typeof console.log>,
  _setLogLevel: any,
  _getConfig: any,
  _sanitizeText: any,
  _setupGraphViewbox: any
 ) => {
diff --git a/packages/parser/src/language/sankey/module.ts b/packages/parser/src/language/sankey/module.ts
 /**
 * Declaration of `Sankey` services.
 */
 export type SankeyAddedServices = {
  parser: {
    LangiumParser: LangiumParser;
    TokenBuilder: SankeyTokenBuilder;

	declare global {
	interface Window {
	mermaid: any; // 👈️ turn off type checking
Check warning on line 5 in packages/mermaid-example-diagram/src/types/index.d.ts GitHub Actions / lint `Unexpected any. Specify a different type`
	}
	}
	let vertexText = vertex.text !== undefined ? vertex.text : vertex.id;

	// We create a SVG label, either by delegating to addHtmlLabel or manually
	let vertexNode;
Check warning on line 67 in packages/mermaid-flowchart-elk/src/flowRenderer-elk.js GitHub Actions / lint `'vertexNode' is defined but never used`
	const labelData = { width: 0, height: 0 };

	const ports = [
	nodeEl = await insertNode(nodes, node, vertex.dir);
	boundingBox = nodeEl.node().getBBox();
	} else {
	const svgLabel = doc.createElementNS('http://www.w3.org/2000/svg', 'text');
Check warning on line 191 in packages/mermaid-flowchart-elk/src/flowRenderer-elk.js GitHub Actions / lint `'svgLabel' is assigned a value but never used`
	// svgLabel.setAttribute('style', styles.labelStyle.replace('color:', 'fill:'));
	// const rows = vertexText.split(common.lineBreakRegex);
	// for (const row of rows) {
	* Add edges to graph based on parsed graph definition
	*
	* @param {object} edges The edges to add to the graph
	* @param {object} g The graph object
Check warning on line 397 in packages/mermaid-flowchart-elk/src/flowRenderer-elk.js GitHub Actions / lint `Expected @param names to be "edges, diagObj, graph, svg". Got "edges, g, cy, diagObj, graph, svg"`
	* @param cy
	* @param diagObj
	* @param graph
	/**
	* Recursive function that iterates over an array of nodes and inserts the children of each node.
	* It also recursively populates the inserts the children of the children and so on.
	* @param {*} graph
Check warning on line 680 in packages/mermaid-flowchart-elk/src/flowRenderer-elk.js GitHub Actions / lint `Expected @param names to be "nodeArray, parentLookupDb". Got "graph, nodeArray, parentLookupDb"`
	* @param nodeArray
	* @param parentLookupDb
	*/
	export let sanitizeText: (str: string) => string;
	// eslint-disable @typescript-eslint/no-explicit-any
	export let setupGraphViewbox: (
	graph: any,
Check warning on line 34 in packages/mermaid-zenuml/src/mermaidUtils.ts GitHub Actions / lint `Unexpected any. Specify a different type`
	svgElem: any,
Check warning on line 35 in packages/mermaid-zenuml/src/mermaidUtils.ts GitHub Actions / lint `Unexpected any. Specify a different type`
	padding: any,
Check warning on line 36 in packages/mermaid-zenuml/src/mermaidUtils.ts GitHub Actions / lint `Unexpected any. Specify a different type`
	useMaxWidth: boolean
	) => void;

	export const injectUtils = (
	_log: Record<keyof typeof LEVELS, typeof console.log>,
	_setLogLevel: any,
Check warning on line 42 in packages/mermaid-zenuml/src/mermaidUtils.ts GitHub Actions / lint `Unexpected any. Specify a different type`
	_getConfig: any,
Check warning on line 43 in packages/mermaid-zenuml/src/mermaidUtils.ts GitHub Actions / lint `Unexpected any. Specify a different type`
	_sanitizeText: any,
	_setupGraphViewbox: any
	) => {
	/**
	* Declaration of `Sankey` services.
	*/
	export type SankeyAddedServices = {
Check failure on line 24 in packages/parser/src/language/sankey/module.ts GitHub Actions / lint Use an `interface` instead of a `type`
	parser: {
	LangiumParser: LangiumParser;
	TokenBuilder: SankeyTokenBuilder;