mirror of
https://github.com/ankitects/anki.git
synced 2025-09-19 14:32:22 -04:00

* Update to latest Node LTS * Add sveltekit * Split tslib into separate @generated and @tslib components SvelteKit's path aliases don't support multiple locations, so our old approach of using @tslib to refer to both ts/lib and out/ts/lib will no longer work. Instead, all generated sources and their includes are placed in a separate out/ts/generated folder, and imported via @generated instead. This also allows us to generate .ts files, instead of needing to output separate .d.ts and .js files. * Switch package.json to module type * Avoid usage of baseUrl Incompatible with SvelteKit * Move sass into ts; use relative links SvelteKit's default sass support doesn't allow overriding loadPaths * jest->vitest, graphs example working with yarn dev * most pages working in dev mode * Some fixes after rebasing * Fix/silence some svelte-check errors * Get image-occlusion working with Fabric types * Post-rebase lock changes * Editor is now checked * SvelteKit build integrated into ninja * Use the new SvelteKit entrypoint for pages like congrats/deck options/etc * Run eslint once for ts/**; fix some tests * Fix a bunch of issues introduced when rebasing over latest main * Run eslint fix * Fix remaining eslint+pylint issues; tests now all pass * Fix some issues with a clean build * Latest bufbuild no longer requires @__PURE__ hack * Add a few missed dependencies * Add yarn.bat to fix Windows build * Fix pages failing to show when ANKI_API_PORT not defined * Fix svelte-check and vitest on Windows * Set node path in ./yarn * Move svelte-kit output to ts/.svelte-kit Sadly, I couldn't figure out a way to store it in out/ if out/ is a symlink, as it breaks module resolution when SvelteKit is run. * Allow HMR inside Anki * Skip SvelteKit build when HMR is defined * Fix some post-rebase issues I should have done a normal merge instead.
76 lines
2.1 KiB
TypeScript
76 lines
2.1 KiB
TypeScript
// Copyright: Ankitects Pty Ltd and contributors
|
|
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
import type { BuildFormat } from "../build";
|
|
import type { TreeNode } from "../tree";
|
|
import { FormattingNode } from "../tree";
|
|
import { appendNode, insertNode } from "./add-merge";
|
|
import { buildFromNode } from "./build-tree";
|
|
|
|
function mergePreviousTrees<T>(forest: TreeNode[], format: BuildFormat<T>): TreeNode[] {
|
|
const [first, ...tail] = forest;
|
|
|
|
if (!(first instanceof FormattingNode)) {
|
|
return forest;
|
|
}
|
|
|
|
let merged: TreeNode[] = [first];
|
|
let sibling = first.range.firstChild.previousSibling;
|
|
|
|
while (sibling && merged.length === 1) {
|
|
const nodes = buildFromNode(sibling, format, []);
|
|
|
|
for (const node of nodes) {
|
|
merged = insertNode(node, merged, format);
|
|
}
|
|
|
|
sibling = sibling.previousSibling;
|
|
}
|
|
|
|
return [...merged, ...tail];
|
|
}
|
|
|
|
function mergeNextTrees<T>(forest: TreeNode[], format: BuildFormat<T>): TreeNode[] {
|
|
const initial = forest.slice(0, -1);
|
|
const last = forest[forest.length - 1];
|
|
|
|
if (!(last instanceof FormattingNode)) {
|
|
return forest;
|
|
}
|
|
|
|
let merged: TreeNode[] = [last];
|
|
let sibling = last.range.lastChild.nextSibling;
|
|
|
|
while (sibling && merged.length === 1) {
|
|
const nodes = buildFromNode(sibling, format, []);
|
|
|
|
for (const node of nodes) {
|
|
merged = appendNode(merged, node, format);
|
|
}
|
|
|
|
sibling = sibling.nextSibling;
|
|
}
|
|
|
|
return [...initial, ...merged];
|
|
}
|
|
|
|
export function extendAndMerge<T>(
|
|
forest: TreeNode[],
|
|
format: BuildFormat<T>,
|
|
): TreeNode[] {
|
|
const merged = mergeNextTrees(mergePreviousTrees(forest, format), format);
|
|
|
|
if (merged.length === 1) {
|
|
const [only] = merged;
|
|
|
|
if (only instanceof FormattingNode) {
|
|
const elementNode = only.getExtension();
|
|
|
|
if (elementNode && format.tryAscend(only, elementNode)) {
|
|
return extendAndMerge(merged, format);
|
|
}
|
|
}
|
|
}
|
|
|
|
return merged;
|
|
}
|