A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
core: fix hang when resolving recursive nested notebooks
Abdullah Attaf5095fa64317
diff --git a/packages/core/__tests__/notes.test.ts b/packages/core/__tests__/notes.test.tsindex 011d77fd4..80c88f2a1 100644--- a/packages/core/__tests__/notes.test.ts+++ b/packages/core/__tests__/notes.test.ts@@ -99,8 +99,8 @@ test("delete note", () =>await db.notes.moveToTrash(id);expect(await db.notes.note(id)).toBeUndefined();- expect(await db.notebooks.totalNotes(notebookId)).toBe(0);- expect(await db.notebooks.totalNotes(subNotebookId)).toBe(0);+ expect(await db.notebooks.totalNotes(notebookId)).toStrictEqual([0]);+ expect(await db.notebooks.totalNotes(subNotebookId)).toStrictEqual([0]);}));test("get all notes", () =>@@ -323,8 +323,8 @@ test("add note to subnotebook", () =>.from({ type: "notebook", id: notebookId }, "notebook").count()).toBe(1);- expect(await db.notebooks.totalNotes(subNotebookId)).toBe(1);- expect(await db.notebooks.totalNotes(notebookId)).toBe(1);+ expect(await db.notebooks.totalNotes(subNotebookId)).toStrictEqual([1]);+ expect(await db.notebooks.totalNotes(notebookId)).toStrictEqual([1]);}));test("duplicate note to topic should not be added", () =>@@ -333,7 +333,7 @@ test("duplicate note to topic should not be added", () =>notebookTitle: "Hello",subNotebookTitle: "Home"});- expect(await db.notebooks.totalNotes(subNotebookId)).toBe(1);+ expect(await db.notebooks.totalNotes(subNotebookId)).toStrictEqual([1]);}));test("add the same note to 2 notebooks", () =>diff --git a/packages/core/src/collections/notebooks.ts b/packages/core/src/collections/notebooks.tsindex c8de8cd84..784c52be0 100644--- a/packages/core/src/collections/notebooks.ts+++ b/packages/core/src/collections/notebooks.ts@@ -22,8 +22,8 @@ import Database from "../api/index.js";import { Notebook, TrashOrItem, isTrashItem } from "../types.js";import { ICollection } from "./collection.js";import { SQLCollection } from "../database/sql-collection.js";-import { isFalse } from "../database/index.js";-import { sql } from "@streetwriters/kysely";+import { DatabaseSchema, isFalse } from "../database/index.js";+import { Kysely, sql, Transaction } from "@streetwriters/kysely";import { deleteItems } from "../utils/array.js";import {CHECK_IDS,@@ -125,65 +125,45 @@ export class Notebooks implements ICollection {await this.collection.update(ids, { pinned: state });}- async totalNotes(id: string) {- const result = await this.db- .sql()- .withRecursive(`subNotebooks(id)`, (eb) =>- eb- .selectNoFrom((eb) => eb.val(id).as("id"))- .unionAll((eb) =>- eb- .selectFrom(["relations", "subNotebooks"])- .select("relations.toId as id")- .where("toType", "==", "notebook")- .where("fromType", "==", "notebook")- .whereRef("fromId", "==", "subNotebooks.id")- .where("toId", "not in", this.db.trash.cache.notebooks)- .$narrowType<{ id: string }>()- )- )+ async totalNotes(...ids: string[]) {+ const result = await withSubNotebooks(+ this.db.sql(),+ ids,+ this.db.trash.cache.notebooks+ ).selectFrom("relations")+ .innerJoin("subNotebooks", "subNotebooks.id", "relations.fromId").where("toType", "==", "note").where("fromType", "==", "notebook")- .where("fromId", "in", (eb) =>- eb.selectFrom("subNotebooks").select("subNotebooks.id")- ).where("toId", "not in", this.db.trash.cache.notes)- .select((eb) => eb.fn.count<number>("relations.toId").as("totalNotes"))- .executeTakeFirst();+ .select((eb) => [+ "subNotebooks.rootId as id",+ eb.fn.count<number>("relations.toId").distinct().as("totalNotes")+ ])+ .groupBy("subNotebooks.rootId")+ .execute();- if (!result) return 0;- return result.totalNotes;+ return ids.map((id) => {+ const item = result.find((i) => i.id === id);+ return item ? item.totalNotes : 0;+ });}- async notes(id: string) {- const result = await this.db- .sql()- .withRecursive(`subNotebooks(id)`, (eb) =>- eb- .selectNoFrom((eb) => eb.val(id).as("id"))- .unionAll((eb) =>- eb- .selectFrom(["relations", "subNotebooks"])- .select("relations.toId as id")- .where("toType", "==", "notebook")- .where("fromType", "==", "notebook")- .whereRef("fromId", "==", "subNotebooks.id")- .where("toId", "not in", this.db.trash.cache.notebooks)- .$narrowType<{ id: string }>()- )- )+ async notes(...ids: string[]) {+ const result = await withSubNotebooks(+ this.db.sql(),+ ids,+ this.db.trash.cache.notebooks+ ).selectFrom("relations")+ .innerJoin("subNotebooks", "subNotebooks.id", "relations.fromId").where("toType", "==", "note").where("fromType", "==", "notebook")- .where("fromId", "in", (eb) =>- eb.selectFrom("subNotebooks").select("subNotebooks.id")- ).where("toId", "not in", this.db.trash.cache.notes).select("relations.toId as id")+ .distinct().$narrowType<{ id: string }>().execute();-return result.map((i) => i.id);}@@ -254,26 +234,7 @@ export class Notebooks implements ICollection {async moveToTrash(...ids: string[]) {await this.db.transaction(async (tr) => {- const query = tr- .withRecursive(`subNotebooks(id)`, (eb) =>- eb- .selectFrom(() =>- sql<{ id: string }>`(VALUES ${sql.join(- ids.map((id) => sql.raw(`('${id}')`))- )})`.as("roots")- )- .selectAll()- .unionAll((eb) =>- eb- .selectFrom(["relations", "subNotebooks"])- .select("relations.toId as id")- .where("toType", "==", "notebook")- .where("fromType", "==", "notebook")- .whereRef("fromId", "==", "subNotebooks.id")- .where("toId", "not in", this.db.trash.cache.notebooks)- .$narrowType<{ id: string }>()- )- )+ const query = withSubNotebooks(tr, ids, this.db.trash.cache.notebooks).selectFrom("subNotebooks").select("id");@@ -305,3 +266,45 @@ export class Notebooks implements ICollection {return relation[0]?.fromId;}}++export function withSubNotebooks(+ db: Kysely<DatabaseSchema> | Transaction<DatabaseSchema>,+ ids: string[],+ excluded: string[]+) {+ return db.withRecursive(`subNotebooks(id, path, rootId)`, (eb) =>+ eb+ .selectFrom(() =>+ sql<{+ id: string;+ path: string;+ rootId: string;+ }>`(VALUES ${sql.join(+ ids.map((id) => sql.raw(`('${id}', '${id}', '${id}')`))+ )})`.as("roots")+ )+ .selectAll()+ .unionAll((eb) =>+ eb+ .selectFrom(["relations", "subNotebooks"])+ .select([+ "relations.toId as id",+ // Concatenate parent path with current id+ sql<string>`subNotebooks.path || '/' || relations.toId`.as("path"),+ // Preserve original root+ "subNotebooks.rootId as rootId"+ ])+ .where("toType", "==", "notebook")+ .where("fromType", "==", "notebook")+ .whereRef("fromId", "==", "subNotebooks.id")+ .where("toId", "not in", excluded)+ // Use path to prevent cycles+ .where(+ "subNotebooks.path",+ "not like",+ sql`'%' || relations.toId || '%'`+ )+ .$narrowType<{ id: string; path: string; rootId: string }>()+ )+ );+}diff --git a/packages/core/src/collections/trash.ts b/packages/core/src/collections/trash.tsindex 752154e61..1583eff01 100644--- a/packages/core/src/collections/trash.ts+++ b/packages/core/src/collections/trash.ts@@ -34,6 +34,7 @@ import {checkIsUserPremium,FREE_NOTEBOOKS_LIMIT} from "../common.js";+import { withSubNotebooks } from "./notebooks.js";export default class Trash {collections = ["notes", "notebooks"] as const;@@ -324,27 +325,11 @@ export default class Trash {}private async subNotebooks(notebookIds: string[]) {- const ids = await this.db- .sql()- .withRecursive(`subNotebooks(id)`, (eb) =>- eb- .selectFrom((eb) =>- sql<{ id: string }>`(VALUES ${sql.join(- notebookIds.map((id) => eb.parens(sql`${id}`))- )})`.as("notebookIds")- )- .selectAll()- .unionAll((eb) =>- eb- .selectFrom(["relations", "subNotebooks"])- .select("relations.toId as id")- .where("toType", "==", "notebook")- .where("fromType", "==", "notebook")- .whereRef("fromId", "==", "subNotebooks.id")- .where("toId", "not in", this.userDeletedCache.notebooks)- .$narrowType<{ id: string }>()- )- )+ const ids = await withSubNotebooks(+ this.db.sql(),+ notebookIds,+ this.userDeletedCache.notebooks+ ).selectFrom("subNotebooks").select("id").where("id", "not in", notebookIds)