a3d9f90af5
ts_library() is deprecated and will presumably be dropped from a future rules_nodejs, and it wasn't working with the jest tests after updating, so we switch over to ts_project(). There are some downsides: - It's a bit slower, as the worker mode doesn't appear to function at the moment. - Getting it working with a mix of source files and generated files was quite tricky, especially as things behave differently on Windows, and differently when editing with VS Code. Solved with a small patch to the rules, and a wrapper script that copies everything into the bin folder first. To keep VS Code working correctly as well, the built files are symlinked into the source folder. - TS libraries are not implicitly linked to node_modules, so they can't be imported with an absolute name like "lib/proto" - we need to use relative paths like "../lib/proto" instead. Adjusting "paths" in tsconfig.json makes it work for TS compilation, but then it fails at the esbuild stage. We could resolve it by wrapping the TS libraries in a subsequent js_library() call, but that has the downside of losing the transient dependencies, meaning they need to be listed again. Alternatively we might be able to solve it in the future by adjusting esbuild, but for now the paths have been made relative to keep things simple. Upsides: - Along with updates to the Svelte tooling, Svelte typing has improved. All exports made in a Svelte file are now visible to other files that import them, and we no longer rebuild the Svelte files when TS files are updated, as the Svelte files do no type checking themselves, and are just a simple transpilation. Svelte-check now works on Windows again, and there should be no errors when editing in VS Code after you've built the project. The only downside seems to be that cmd+clicking on a Svelte imports jumps to the .d.ts file instead of the original now; presumably they'll fix that in a future plugin update. - Each subfolder now has its own tsconfig.json, and tsc can be called directly for testing purposes (but beware it will place build products in the source tree): ts/node_modules/.bin/tsc -b ts - We can drop the custom esbuild_toolchain, as it's included in the latest rules_nodejs. Other changes: - "image_module_support" is moved into lib/, and imported with <reference types=...> - Images are now imported directly from their npm package; the extra copy step has been removed. Windows users may need to use "bazel clean" before building this, due to old files lying around in the build folder.
331 lines
9.3 KiB
TypeScript
331 lines
9.3 KiB
TypeScript
// Copyright: Ankitects Pty Ltd and contributors
|
|
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
/* eslint
|
|
@typescript-eslint/no-explicit-any: "off",
|
|
*/
|
|
|
|
import { DeckConfig } from "../lib/proto";
|
|
import { DeckOptionsState } from "./lib";
|
|
import { get } from "svelte/store";
|
|
|
|
const exampleData = {
|
|
allConfig: [
|
|
{
|
|
config: {
|
|
id: "1",
|
|
name: "Default",
|
|
mtimeSecs: "1618570764",
|
|
usn: -1,
|
|
config: {
|
|
learnSteps: [1, 10],
|
|
relearnSteps: [10],
|
|
newPerDay: 10,
|
|
reviewsPerDay: 200,
|
|
initialEase: 2.5,
|
|
easyMultiplier: 1.2999999523162842,
|
|
hardMultiplier: 1.2000000476837158,
|
|
intervalMultiplier: 1,
|
|
maximumReviewInterval: 36500,
|
|
minimumLapseInterval: 1,
|
|
graduatingIntervalGood: 1,
|
|
graduatingIntervalEasy: 4,
|
|
leechAction: "LEECH_ACTION_TAG_ONLY",
|
|
leechThreshold: 8,
|
|
capAnswerTimeToSecs: 60,
|
|
other: "eyJuZXciOnsic2VwYXJhdGUiOnRydWV9LCJyZXYiOnsiZnV6eiI6MC4wNSwibWluU3BhY2UiOjF9fQ==",
|
|
},
|
|
},
|
|
useCount: 1,
|
|
},
|
|
{
|
|
config: {
|
|
id: "1618570764780",
|
|
name: "another one",
|
|
mtimeSecs: "1618570781",
|
|
usn: -1,
|
|
config: {
|
|
learnSteps: [1, 10, 20, 30],
|
|
relearnSteps: [10],
|
|
newPerDay: 40,
|
|
reviewsPerDay: 200,
|
|
initialEase: 2.5,
|
|
easyMultiplier: 1.2999999523162842,
|
|
hardMultiplier: 1.2000000476837158,
|
|
intervalMultiplier: 1,
|
|
maximumReviewInterval: 36500,
|
|
minimumLapseInterval: 1,
|
|
graduatingIntervalGood: 1,
|
|
graduatingIntervalEasy: 4,
|
|
leechAction: "LEECH_ACTION_TAG_ONLY",
|
|
leechThreshold: 8,
|
|
capAnswerTimeToSecs: 60,
|
|
},
|
|
},
|
|
useCount: 1,
|
|
},
|
|
],
|
|
currentDeck: {
|
|
name: "Default::child",
|
|
configId: "1618570764780",
|
|
parentConfigIds: [1],
|
|
},
|
|
defaults: {
|
|
config: {
|
|
learnSteps: [1, 10],
|
|
relearnSteps: [10],
|
|
newPerDay: 20,
|
|
reviewsPerDay: 200,
|
|
initialEase: 2.5,
|
|
easyMultiplier: 1.2999999523162842,
|
|
hardMultiplier: 1.2000000476837158,
|
|
intervalMultiplier: 1,
|
|
maximumReviewInterval: 36500,
|
|
minimumLapseInterval: 1,
|
|
graduatingIntervalGood: 1,
|
|
graduatingIntervalEasy: 4,
|
|
leechAction: "LEECH_ACTION_TAG_ONLY",
|
|
leechThreshold: 8,
|
|
capAnswerTimeToSecs: 60,
|
|
},
|
|
},
|
|
};
|
|
|
|
function startingState(): DeckOptionsState {
|
|
return new DeckOptionsState(
|
|
123,
|
|
DeckConfig.DeckConfigsForUpdate.fromObject(exampleData)
|
|
);
|
|
}
|
|
|
|
test("start", () => {
|
|
const state = startingState();
|
|
expect(state.currentDeck.name).toBe("Default::child");
|
|
});
|
|
|
|
test("deck list", () => {
|
|
const state = startingState();
|
|
expect(get(state.configList)).toStrictEqual([
|
|
{
|
|
current: true,
|
|
idx: 1,
|
|
name: "another one",
|
|
useCount: 1,
|
|
},
|
|
{
|
|
current: false,
|
|
idx: 0,
|
|
name: "Default",
|
|
useCount: 1,
|
|
},
|
|
]);
|
|
expect(get(state.currentConfig).newPerDay).toBe(40);
|
|
|
|
// rename
|
|
state.setCurrentName("zzz");
|
|
expect(get(state.configList)).toStrictEqual([
|
|
{
|
|
current: false,
|
|
idx: 0,
|
|
name: "Default",
|
|
useCount: 1,
|
|
},
|
|
{
|
|
current: true,
|
|
idx: 1,
|
|
name: "zzz",
|
|
useCount: 1,
|
|
},
|
|
]);
|
|
|
|
// add
|
|
state.addConfig("hello");
|
|
expect(get(state.configList)).toStrictEqual([
|
|
{
|
|
current: false,
|
|
idx: 0,
|
|
name: "Default",
|
|
useCount: 1,
|
|
},
|
|
{
|
|
current: true,
|
|
idx: 2,
|
|
name: "hello",
|
|
useCount: 1,
|
|
},
|
|
{
|
|
current: false,
|
|
idx: 1,
|
|
name: "zzz",
|
|
useCount: 0,
|
|
},
|
|
]);
|
|
expect(get(state.currentConfig).newPerDay).toBe(20);
|
|
|
|
// change current
|
|
state.setCurrentIndex(0);
|
|
expect(get(state.configList)).toStrictEqual([
|
|
{
|
|
current: true,
|
|
idx: 0,
|
|
name: "Default",
|
|
useCount: 2,
|
|
},
|
|
{
|
|
current: false,
|
|
idx: 2,
|
|
name: "hello",
|
|
useCount: 0,
|
|
},
|
|
{
|
|
current: false,
|
|
idx: 1,
|
|
name: "zzz",
|
|
useCount: 0,
|
|
},
|
|
]);
|
|
expect(get(state.currentConfig).newPerDay).toBe(10);
|
|
|
|
// can't delete default
|
|
expect(() => state.removeCurrentConfig()).toThrow();
|
|
|
|
// deleting old deck should work
|
|
state.setCurrentIndex(1);
|
|
state.removeCurrentConfig();
|
|
expect(get(state.currentConfig).newPerDay).toBe(10);
|
|
|
|
// as should newly added one
|
|
state.setCurrentIndex(1);
|
|
state.removeCurrentConfig();
|
|
expect(get(state.currentConfig).newPerDay).toBe(10);
|
|
|
|
// only the pre-existing deck should be listed for removal
|
|
const out = state.dataForSaving(false);
|
|
expect(out.removedConfigIds).toStrictEqual([1618570764780]);
|
|
});
|
|
|
|
test("duplicate name", () => {
|
|
const state = startingState();
|
|
|
|
// duplicate will get renamed
|
|
state.addConfig("another one");
|
|
expect(get(state.configList).find((e) => e.current)?.name).toMatch(/another.*\d+$/);
|
|
|
|
// should handle renames too
|
|
state.setCurrentName("Default");
|
|
expect(get(state.configList).find((e) => e.current)?.name).toMatch(/Default\d+$/);
|
|
});
|
|
|
|
test("parent counts", () => {
|
|
const state = startingState();
|
|
|
|
expect(get(state.parentLimits)).toStrictEqual({ newCards: 10, reviews: 200 });
|
|
|
|
// adjusting the current deck config won't alter parent
|
|
state.currentConfig.update((c) => {
|
|
c.newPerDay = 123;
|
|
return c;
|
|
});
|
|
expect(get(state.parentLimits)).toStrictEqual({ newCards: 10, reviews: 200 });
|
|
|
|
// but adjusting the default config will, since the parent deck uses it
|
|
state.setCurrentIndex(0);
|
|
state.currentConfig.update((c) => {
|
|
c.newPerDay = 123;
|
|
return c;
|
|
});
|
|
expect(get(state.parentLimits)).toStrictEqual({ newCards: 123, reviews: 200 });
|
|
});
|
|
|
|
test("saving", () => {
|
|
let state = startingState();
|
|
let out = state.dataForSaving(false);
|
|
expect(out.removedConfigIds).toStrictEqual([]);
|
|
expect(out.targetDeckId).toBe(123);
|
|
// in no-changes case, currently selected config should
|
|
// be returned
|
|
expect(out.configs.length).toBe(1);
|
|
expect(out.configs[0].name).toBe("another one");
|
|
expect(out.applyToChildren).toBe(false);
|
|
|
|
// rename, then change current deck
|
|
state.setCurrentName("zzz");
|
|
out = state.dataForSaving(true);
|
|
state.setCurrentIndex(0);
|
|
|
|
// renamed deck should be in changes, with current deck as last element
|
|
out = state.dataForSaving(true);
|
|
expect(out.configs.map((c) => c.name)).toStrictEqual(["zzz", "Default"]);
|
|
expect(out.applyToChildren).toBe(true);
|
|
|
|
// start again, adding new deck
|
|
state = startingState();
|
|
state.addConfig("hello");
|
|
|
|
// deleting it should not change removedConfigs
|
|
state.removeCurrentConfig();
|
|
out = state.dataForSaving(true);
|
|
expect(out.removedConfigIds).toStrictEqual([]);
|
|
|
|
// select the other non-default deck & remove
|
|
state.setCurrentIndex(1);
|
|
state.removeCurrentConfig();
|
|
|
|
// should be listed in removedConfigs, and modified should
|
|
// only contain Default, which is the new current deck
|
|
out = state.dataForSaving(true);
|
|
expect(out.removedConfigIds).toStrictEqual([1618570764780]);
|
|
expect(out.configs.map((c) => c.name)).toStrictEqual(["Default"]);
|
|
});
|
|
|
|
test("aux data", () => {
|
|
const state = startingState();
|
|
expect(get(state.currentAuxData)).toStrictEqual({});
|
|
state.currentAuxData.update((val) => {
|
|
return { ...val, hello: "world" };
|
|
});
|
|
|
|
// check default
|
|
state.setCurrentIndex(0);
|
|
expect(get(state.currentAuxData)).toStrictEqual({
|
|
new: {
|
|
separate: true,
|
|
},
|
|
rev: {
|
|
fuzz: 0.05,
|
|
minSpace: 1,
|
|
},
|
|
});
|
|
state.currentAuxData.update((val) => {
|
|
return { ...val, defaultAddition: true };
|
|
});
|
|
|
|
// ensure changes serialize
|
|
const out = state.dataForSaving(true);
|
|
expect(out.configs.length).toBe(2);
|
|
const json = out.configs.map(
|
|
(c) =>
|
|
JSON.parse(new TextDecoder().decode((c.config as any).other)) as Record<
|
|
string,
|
|
unknown
|
|
>
|
|
);
|
|
expect(json).toStrictEqual([
|
|
// other deck comes first
|
|
{
|
|
hello: "world",
|
|
},
|
|
// default is selected, so comes last
|
|
{
|
|
defaultAddition: true,
|
|
new: {
|
|
separate: true,
|
|
},
|
|
rev: {
|
|
fuzz: 0.05,
|
|
minSpace: 1,
|
|
},
|
|
},
|
|
]);
|
|
});
|