mirror of
https://github.com/heyman/heynote.git
synced 2025-03-14 15:18:13 +01:00
Move block parsing functions into their own JS module so that they can be imported in node land when running Playwright tests
This commit is contained in:
Jonatan Heyman
parent
f356e3b249
commit
158ac08418
126
src/editor/block/block-parsing.js
Normal file
126
src/editor/block/block-parsing.js
Normal file
@ -0,0 +1,126 @@
|
||||
import { syntaxTree } from "@codemirror/language"
|
||||
import { Note, Document, NoteDelimiter } from "../lang-heynote/parser.terms.js"
|
||||
import { IterMode } from "@lezer/common";
|
||||
|
||||
// tracks the size of the first delimiter
|
||||
export let firstBlockDelimiterSize
|
||||
|
||||
|
||||
function startTimer() {
|
||||
const timeStart = performance.now();
|
||||
return function () {
|
||||
return Math.round(performance.now() - timeStart);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return a list of blocks in the document from the syntax tree.
|
||||
* syntaxTreeAvailable() should have been called before this function to ensure the syntax tree is available.
|
||||
*/
|
||||
export function getBlocksFromSyntaxTree(state) {
|
||||
//const timer = startTimer()
|
||||
const blocks = [];
|
||||
const tree = syntaxTree(state, state.doc.length)
|
||||
if (tree) {
|
||||
tree.iterate({
|
||||
enter: (type) => {
|
||||
if (type.type.id == Document || type.type.id == Note) {
|
||||
return true
|
||||
} else if (type.type.id === NoteDelimiter) {
|
||||
const langNode = type.node.getChild("NoteLanguage")
|
||||
const language = state.doc.sliceString(langNode.from, langNode.to)
|
||||
const isAuto = !!type.node.getChild("Auto")
|
||||
const contentNode = type.node.nextSibling
|
||||
blocks.push({
|
||||
language: {
|
||||
name: language,
|
||||
auto: isAuto,
|
||||
},
|
||||
content: {
|
||||
from: contentNode.from,
|
||||
to: contentNode.to,
|
||||
},
|
||||
delimiter: {
|
||||
from: type.from,
|
||||
to: type.to,
|
||||
},
|
||||
range: {
|
||||
from: type.node.from,
|
||||
to: contentNode.to,
|
||||
},
|
||||
})
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
mode: IterMode.IgnoreMounts,
|
||||
});
|
||||
firstBlockDelimiterSize = blocks[0]?.delimiter.to
|
||||
}
|
||||
//console.log("getBlocksSyntaxTree took", timer(), "ms")
|
||||
return blocks
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse blocks from document's string contents using String.indexOf()
|
||||
*/
|
||||
export function getBlocksFromString(state) {
|
||||
//const timer = startTimer()
|
||||
const blocks = []
|
||||
const doc = state.doc
|
||||
if (doc.length === 0) {
|
||||
return [];
|
||||
}
|
||||
const content = doc.sliceString(0, doc.length)
|
||||
const delim = "\n∞∞∞"
|
||||
let pos = 0
|
||||
while (pos < doc.length) {
|
||||
const blockStart = content.indexOf(delim, pos);
|
||||
if (blockStart != pos) {
|
||||
console.error("Error parsing blocks, expected delimiter at", pos)
|
||||
break;
|
||||
}
|
||||
const langStart = blockStart + delim.length;
|
||||
const delimiterEnd = content.indexOf("\n", langStart)
|
||||
if (delimiterEnd < 0) {
|
||||
console.error("Error parsing blocks. Delimiter didn't end with newline")
|
||||
break
|
||||
}
|
||||
const langFull = content.substring(langStart, delimiterEnd);
|
||||
let auto = false;
|
||||
let lang = langFull;
|
||||
if (langFull.endsWith("-a")) {
|
||||
auto = true;
|
||||
lang = langFull.substring(0, langFull.length - 2);
|
||||
}
|
||||
const contentFrom = delimiterEnd + 1;
|
||||
let blockEnd = content.indexOf(delim, contentFrom);
|
||||
if (blockEnd < 0) {
|
||||
blockEnd = doc.length;
|
||||
}
|
||||
|
||||
const block = {
|
||||
language: {
|
||||
name: lang,
|
||||
auto: auto,
|
||||
},
|
||||
content: {
|
||||
from: contentFrom,
|
||||
to: blockEnd,
|
||||
},
|
||||
delimiter: {
|
||||
from: blockStart,
|
||||
to: delimiterEnd + 1,
|
||||
},
|
||||
range: {
|
||||
from: blockStart,
|
||||
to: blockEnd,
|
||||
},
|
||||
};
|
||||
blocks.push(block);
|
||||
pos = blockEnd;
|
||||
}
|
||||
//console.log("getBlocksFromString() took", timer(), "ms")
|
||||
return blocks;
|
||||
}
|
||||
@ -1,137 +1,14 @@
|
||||
import { ViewPlugin, EditorView, Decoration, WidgetType, lineNumbers } from "@codemirror/view"
|
||||
import { layer, RectangleMarker } from "@codemirror/view"
|
||||
import { EditorState, RangeSetBuilder, StateField, Facet , StateEffect, RangeSet, Transaction} from "@codemirror/state";
|
||||
import { syntaxTree, ensureSyntaxTree, syntaxTreeAvailable } from "@codemirror/language"
|
||||
import { Note, Document, NoteDelimiter } from "../lang-heynote/parser.terms.js"
|
||||
import { IterMode } from "@lezer/common";
|
||||
import { EditorState, RangeSetBuilder, StateField, RangeSet, Transaction} from "@codemirror/state";
|
||||
import { syntaxTreeAvailable } from "@codemirror/language"
|
||||
import { useHeynoteStore } from "../../stores/heynote-store.js"
|
||||
import { heynoteEvent, LANGUAGE_CHANGE, CURSOR_CHANGE } from "../annotation.js";
|
||||
import { mathBlock } from "./math.js"
|
||||
import { emptyBlockSelected } from "./select-all.js";
|
||||
import { firstBlockDelimiterSize, getBlocksFromSyntaxTree, getBlocksFromString } from "./block-parsing.js";
|
||||
|
||||
|
||||
function startTimer() {
|
||||
const timeStart = performance.now();
|
||||
return function () {
|
||||
return Math.round(performance.now() - timeStart);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
// tracks the size of the first delimiter
|
||||
let firstBlockDelimiterSize
|
||||
|
||||
/**
|
||||
* Return a list of blocks in the document from the syntax tree.
|
||||
* syntaxTreeAvailable() should have been called before this function to ensure the syntax tree is available.
|
||||
*/
|
||||
export function getBlocksFromSyntaxTree(state) {
|
||||
//const timer = startTimer()
|
||||
const blocks = [];
|
||||
const tree = syntaxTree(state, state.doc.length)
|
||||
if (tree) {
|
||||
tree.iterate({
|
||||
enter: (type) => {
|
||||
if (type.type.id == Document || type.type.id == Note) {
|
||||
return true
|
||||
} else if (type.type.id === NoteDelimiter) {
|
||||
const langNode = type.node.getChild("NoteLanguage")
|
||||
const language = state.doc.sliceString(langNode.from, langNode.to)
|
||||
const isAuto = !!type.node.getChild("Auto")
|
||||
const contentNode = type.node.nextSibling
|
||||
blocks.push({
|
||||
language: {
|
||||
name: language,
|
||||
auto: isAuto,
|
||||
},
|
||||
content: {
|
||||
from: contentNode.from,
|
||||
to: contentNode.to,
|
||||
},
|
||||
delimiter: {
|
||||
from: type.from,
|
||||
to: type.to,
|
||||
},
|
||||
range: {
|
||||
from: type.node.from,
|
||||
to: contentNode.to,
|
||||
},
|
||||
})
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
mode: IterMode.IgnoreMounts,
|
||||
});
|
||||
firstBlockDelimiterSize = blocks[0]?.delimiter.to
|
||||
}
|
||||
//console.log("getBlocksSyntaxTree took", timer(), "ms")
|
||||
return blocks
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse blocks from document's string contents using String.indexOf()
|
||||
*/
|
||||
export function getBlocksFromString(state) {
|
||||
//const timer = startTimer()
|
||||
const blocks = []
|
||||
const doc = state.doc
|
||||
if (doc.length === 0) {
|
||||
return [];
|
||||
}
|
||||
const content = doc.sliceString(0, doc.length)
|
||||
const delim = "\n∞∞∞"
|
||||
let pos = 0
|
||||
while (pos < doc.length) {
|
||||
const blockStart = content.indexOf(delim, pos);
|
||||
if (blockStart != pos) {
|
||||
console.error("Error parsing blocks, expected delimiter at", pos)
|
||||
break;
|
||||
}
|
||||
const langStart = blockStart + delim.length;
|
||||
const delimiterEnd = content.indexOf("\n", langStart)
|
||||
if (delimiterEnd < 0) {
|
||||
console.error("Error parsing blocks. Delimiter didn't end with newline")
|
||||
break
|
||||
}
|
||||
const langFull = content.substring(langStart, delimiterEnd);
|
||||
let auto = false;
|
||||
let lang = langFull;
|
||||
if (langFull.endsWith("-a")) {
|
||||
auto = true;
|
||||
lang = langFull.substring(0, langFull.length - 2);
|
||||
}
|
||||
const contentFrom = delimiterEnd + 1;
|
||||
let blockEnd = content.indexOf(delim, contentFrom);
|
||||
if (blockEnd < 0) {
|
||||
blockEnd = doc.length;
|
||||
}
|
||||
|
||||
const block = {
|
||||
language: {
|
||||
name: lang,
|
||||
auto: auto,
|
||||
},
|
||||
content: {
|
||||
from: contentFrom,
|
||||
to: blockEnd,
|
||||
},
|
||||
delimiter: {
|
||||
from: blockStart,
|
||||
to: delimiterEnd + 1,
|
||||
},
|
||||
range: {
|
||||
from: blockStart,
|
||||
to: blockEnd,
|
||||
},
|
||||
};
|
||||
blocks.push(block);
|
||||
pos = blockEnd;
|
||||
}
|
||||
//console.log("getBlocksFromString() took", timer(), "ms")
|
||||
return blocks;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the blocks from the document state.
|
||||
* If the syntax tree is available, we'll extract the blocks from that. Otherwise
|
||||
|
||||
@ -2,7 +2,7 @@ import { expect, test } from "@playwright/test"
|
||||
import { EditorState } from "@codemirror/state"
|
||||
|
||||
import { heynoteLang } from "../src/editor/lang-heynote/heynote.js"
|
||||
import { getBlocksFromSyntaxTree, getBlocksFromString } from "../src/editor/block/block.js"
|
||||
import { getBlocksFromSyntaxTree, getBlocksFromString } from "../src/editor/block/block-parsing.js"
|
||||
|
||||
test("parse blocks from both syntax tree and string contents", async ({page}) => {
|
||||
const contents = `
|
||||
|
||||
Loading…
Reference in New Issue
Block a user