* ui: replace deprecated packages and fix npm audit findings
Swap the mdast stub for @types/mdast, move the katex override to 0.19.0,
and override glob, source-map and html-encoding-sniffer under
workbox-build and http-server so installs no longer pull deprecated
packages. Apply the non-breaking npm audit fixes to the lockfile.
Assisted-by: Claude (Opus 5.5 Medium)
* ui: migrate Llama Chat to SvelteKit 3 and its built-in service worker
Move to SvelteKit 3, Vite 8, TypeScript 6 and Storybook 10.6. The
SvelteKit options move from svelte.config.js into sveltekit() in
vite.config.ts, $lib imports become #lib subpath imports from
package.json, and $app/environment becomes $app/env. Modules named
server.* or living under a server/ folder are server-only in SvelteKit 3,
so the llama-server components, store and enums move to llama-server
names.
@vite-pwa/sveltekit and Workbox give way to SvelteKit's own service
worker in src/service-worker, registered by usePwa(), which precaches the
app files and leaves API requests to the network. A small plugin emits
manifest.webmanifest. static/sw.js removes the worker of older builds, and
llama-server serves a self-removing service-worker.js as well as sw.js
when the built-in UI is off or replaced.
Assisted-by: Claude (Opus 5.5 Medium)
* ui: use SvelteKit 3's update detection and Svelte 5's current patterns
A page the service worker doesn't control now learns of a new build
from SvelteKit itself: `updated` from $app/state checks
_app/version.json on navigation, on focus and every hour. It replaces
the version Llama Chat kept in localStorage and compared by hand.
Reload on the update prompt pulls in the new worker and activates it
before reloading, so one click lands on the new build, whether or not
a worker controlled the page.
Following Svelte's current guidance:
- usePwa keeps its state in $state rather than a store, and no effect
checks `browser`
- nearViewport, autoResizeTextarea and the custom CSS injection are
attachments ({@attach}) rather than actions (use:)
- class lists use arrays rather than class: directives
- the chat contexts come from createContext, typed, in place of
setContext/getContext with string keys
- ActionIconCopyToClipboard takes $props() rather than `export let`
Assisted-by: Claude (Opus 5.5 Medium)
* ui: move to ESLint 10
ESLint 9 is out of support. Every plugin the app uses supports 10:
typescript-eslint, eslint-plugin-svelte, perfectionist,
simple-import-sort, eslint-plugin-storybook and eslint-config-prettier.
@eslint/js and @eslint/compat follow.
ESLint 10's recommended rules ask for two things the code now does:
errors rethrown from a catch keep the caught error as their `cause`,
and no variable starts with a value that every path overwrites.
Assisted-by: Claude (Opus 5.5 Medium)
* ui: override minimatch to clear npm audit's last finding
ESLint 10.14, @eslint/config-array 0.23.5 and typescript-eslint 8.72
depend on minimatch 10, which GHSA-g3hv-75wg-m249 (denial of service
via globparts amplification) affects below 11.0.1. Their fixed releases
move to minimatch 11 but are all younger than the repo's 7-day
min-release-age, so an override pins minimatch 11.0.5, the newest the
rule allows. The three only call new Minimatch(), match() and
minimatch(), which minimatch 11 keeps. npm audit now finds nothing.
Assisted-by: Claude (Opus 5.5 Medium)
145 lines
4.7 KiB
TypeScript
145 lines
4.7 KiB
TypeScript
import { DiffLineKind } from '#lib/enums/index.ts';
|
|
import { computeLineDiff, type DiffLine, renderUnifiedDiff } from '#lib/utils/index.ts';
|
|
import { describe, expect, it } from 'vitest';
|
|
|
|
describe('computeLineDiff', () => {
|
|
it('returns empty for two empty inputs', () => {
|
|
expect(computeLineDiff('', '')).toEqual([]);
|
|
});
|
|
|
|
it('marks every line as removed for an empty new text', () => {
|
|
expect(computeLineDiff('a\nb\nc', '')).toEqual([
|
|
{ kind: 'remove', oldLine: 1, text: 'a' },
|
|
{ kind: 'remove', oldLine: 2, text: 'b' },
|
|
{ kind: 'remove', oldLine: 3, text: 'c' }
|
|
]);
|
|
});
|
|
|
|
it('marks every line as added for an empty old text', () => {
|
|
expect(computeLineDiff('', 'a\nb')).toEqual([
|
|
{ kind: 'add', newLine: 1, text: 'a' },
|
|
{ kind: 'add', newLine: 2, text: 'b' }
|
|
]);
|
|
});
|
|
|
|
it('detects a single-line replace', () => {
|
|
expect(computeLineDiff('old', 'new')).toEqual([
|
|
{ kind: 'add', newLine: 1, text: 'new' },
|
|
{ kind: 'remove', oldLine: 1, text: 'old' }
|
|
]);
|
|
});
|
|
|
|
it('preserves interleaved context around additions', () => {
|
|
const oldText = ['a', 'b', 'c'].join('\n');
|
|
const newText = ['a', 'b', 'B', 'c'].join('\n');
|
|
|
|
expect(computeLineDiff(oldText, newText)).toEqual([
|
|
{ kind: 'context', newLine: 1, oldLine: 1, text: 'a' },
|
|
{ kind: 'context', newLine: 2, oldLine: 2, text: 'b' },
|
|
{ kind: 'add', newLine: 3, text: 'B' },
|
|
{ kind: 'context', newLine: 4, oldLine: 3, text: 'c' }
|
|
]);
|
|
});
|
|
|
|
it('preserves interleaved context around an isolated replace', () => {
|
|
// Multi-line context around a one-line change -> the diff should
|
|
// show context flanking the changed line at its natural position.
|
|
const oldText = ['a', 'b', 'c', 'd'].join('\n');
|
|
const newText = ['a', 'b', 'X', 'd'].join('\n');
|
|
|
|
expect(computeLineDiff(oldText, newText)).toEqual([
|
|
{ kind: 'context', newLine: 1, oldLine: 1, text: 'a' },
|
|
{ kind: 'context', newLine: 2, oldLine: 2, text: 'b' },
|
|
{ kind: 'add', newLine: 3, text: 'X' },
|
|
{ kind: 'remove', oldLine: 3, text: 'c' },
|
|
{ kind: 'context', newLine: 4, oldLine: 4, text: 'd' }
|
|
]);
|
|
});
|
|
|
|
it('preserves interleaved context around removals', () => {
|
|
const oldText = ['a', 'b', 'c', 'd'].join('\n');
|
|
const newText = ['a', 'c', 'd'].join('\n');
|
|
|
|
expect(computeLineDiff(oldText, newText)).toEqual([
|
|
{ kind: 'context', newLine: 1, oldLine: 1, text: 'a' },
|
|
{ kind: 'remove', oldLine: 2, text: 'b' },
|
|
{ kind: 'context', newLine: 2, oldLine: 3, text: 'c' },
|
|
{ kind: 'context', newLine: 3, oldLine: 4, text: 'd' }
|
|
]);
|
|
});
|
|
|
|
it('handles purely identical inputs', () => {
|
|
const text = 'x\ny\nz';
|
|
const result = computeLineDiff(text, text);
|
|
|
|
expect(result).toEqual([
|
|
{ kind: 'context', newLine: 1, oldLine: 1, text: 'x' },
|
|
{ kind: 'context', newLine: 2, oldLine: 2, text: 'y' },
|
|
{ kind: 'context', newLine: 3, oldLine: 3, text: 'z' }
|
|
]);
|
|
});
|
|
|
|
it('strips a trailing newline on the old/new inputs', () => {
|
|
expect(computeLineDiff('a\n', 'a\nb\n')).toEqual([
|
|
{ kind: 'context', newLine: 1, oldLine: 1, text: 'a' },
|
|
{ kind: 'add', newLine: 2, text: 'b' }
|
|
]);
|
|
});
|
|
|
|
it('normalizes trailing CR on each line', () => {
|
|
expect(computeLineDiff('a\r\nb\r\n', 'a\nb')).toEqual([
|
|
{ kind: 'context', newLine: 1, oldLine: 1, text: 'a' },
|
|
{ kind: 'context', newLine: 2, oldLine: 2, text: 'b' }
|
|
]);
|
|
});
|
|
|
|
it('keeps line numbers monotonic across mixed add/remove/context', () => {
|
|
const oldText = ['l1', 'l2', 'l3', 'l4', 'l5'].join('\n');
|
|
const newText = ['l1', 'l2-EDIT', 'l3', 'l4-NEW', 'l5'].join('\n');
|
|
const diff = computeLineDiff(oldText, newText);
|
|
|
|
// Walk the diff: every oldLine must increase strictly, and every
|
|
// newLine must increase strictly. Lines missing one side (add or
|
|
// remove) carry no number on that side.
|
|
let lastOld = 0;
|
|
let lastNew = 0;
|
|
|
|
for (const line of diff) {
|
|
if (line.oldLine !== undefined) {
|
|
expect(line.oldLine).toBeGreaterThan(lastOld);
|
|
lastOld = line.oldLine;
|
|
}
|
|
|
|
if (line.newLine !== undefined) {
|
|
expect(line.newLine).toBeGreaterThan(lastNew);
|
|
lastNew = line.newLine;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
describe('renderUnifiedDiff', () => {
|
|
it('returns empty string for empty diff', () => {
|
|
expect(renderUnifiedDiff([])).toBe('');
|
|
});
|
|
|
|
it('prefixes each line with `+`, `-`, or a single space', () => {
|
|
const lines: DiffLine[] = [
|
|
{ kind: DiffLineKind.CONTEXT, text: 'ctx' },
|
|
{ kind: DiffLineKind.ADD, text: 'plus' },
|
|
{ kind: DiffLineKind.REMOVE, text: 'minus' }
|
|
];
|
|
|
|
expect(renderUnifiedDiff(lines)).toBe(' ctx\n+plus\n-minus');
|
|
});
|
|
|
|
it('ignores oldLine/newLine metadata when emitting prefixes', () => {
|
|
const lines: DiffLine[] = [
|
|
{ kind: DiffLineKind.CONTEXT, newLine: 1, oldLine: 1, text: 'a' },
|
|
{ kind: DiffLineKind.ADD, newLine: 2, text: 'b' }
|
|
];
|
|
|
|
expect(renderUnifiedDiff(lines)).toBe(' a\n+b');
|
|
});
|
|
});
|