Merge remote-tracking branch 'origin/develop' into feature/ckeditor_lib

apps/client/src/services/froca-interface.ts

@@ -9,7 +9,7 @@ export interface Froca {
     branches: Record<string, FBranch>;
     attributes: Record<string, FAttribute>;
     attachments: Record<string, FAttachment>;
-    blobPromises: Record<string, Promise<void | FBlob> | null>;
+    blobPromises: Record<string, Promise<void | FBlob | null> | null>;
 
     getBlob(entityType: string, entityId: string): Promise<FBlob | null>;
     getNote(noteId: string, silentNotFoundError?: boolean): Promise<FNote | null>;

apps/client/src/services/froca.ts

@@ -36,7 +36,7 @@ class FrocaImpl implements Froca {
     branches!: Record<string, FBranch>;
     attributes!: Record<string, FAttribute>;
     attachments!: Record<string, FAttachment>;
-    blobPromises!: Record<string, Promise<FBlob> | null>;
+    blobPromises!: Record<string, Promise<FBlob | null> | null>;
 
     constructor() {
         this.initializedPromise = this.loadInitialTree();

apps/client/src/types.d.ts

@@ -21,7 +21,7 @@ interface CustomGlobals {
     getHeaders: typeof server.getHeaders;
     getReferenceLinkTitle: (href: string) => Promise<string>;
     getReferenceLinkTitleSync: (href: string) => string;
-    getActiveContextNote: () => FNote;
+    getActiveContextNote: () => FNote | null;
     requireLibrary: typeof library_loader.requireLibrary;
     ESLINT: Library;
     appContext: AppContext;
@@ -74,6 +74,9 @@ declare global {
     type AutoCompleteCallback = (values: AutoCompleteArg[]) => void;
 
     interface AutoCompleteArg {
+        name?: string;
+        value?: string;
+        notePathTitle?: string;
         displayKey?: "name" | "value" | "notePathTitle";
         cache?: boolean;
         source?: (term: string, cb: AutoCompleteCallback) => void,
@@ -83,7 +86,7 @@ declare global {
     }
 
     interface JQuery {
-        autocomplete: (action?: "close" | "open" | "destroy" | "val" | AutoCompleteConfig, args?: object[] | string) => JQuery<HTMLElement>;
+        autocomplete: (action?: "close" | "open" | "destroy" | "val" | AutoCompleteConfig, args?: AutoCompleteArg[] | string) => JQuery<HTMLElement>;
 
         getSelectedNotePath(): string | undefined;
         getSelectedNoteId(): string | null;

apps/client/src/widgets/buttons/attachments_actions.ts

@@ -10,7 +10,7 @@ import utils from "../../services/utils.js";
 import { Dropdown } from "bootstrap";
 import type FAttachment from "../../entities/fattachment.js";
 import type AttachmentDetailWidget from "../attachment_detail.js";
-import { NoteRow } from "@triliumnext/commons";
+import type { NoteRow } from "@triliumnext/commons";
 
 const TPL = /*html*/`
 <div class="dropdown attachment-actions">

apps/client/src/widgets/buttons/calendar.ts

@@ -11,7 +11,7 @@ import dayjs, { Dayjs } from "dayjs";
 import utc from "dayjs/plugin/utc.js";
 import isSameOrAfter from "dayjs/plugin/isSameOrAfter.js";
 import "../../stylesheets/calendar.css";
-import { AttributeRow } from "@triliumnext/commons";
+import type { AttributeRow } from "@triliumnext/commons";
 
 dayjs.extend(utc);
 dayjs.extend(isSameOrAfter);

apps/edit-docs/tsconfig.app.json

@@ -18,9 +18,6 @@
     "eslint.config.mjs"
   ],
   "references": [
-    {
-      "path": "../server/tsconfig.app.json"
-    },
     {
       "path": "../desktop/tsconfig.app.json"
     },

apps/edit-docs/tsconfig.json

@@ -3,9 +3,6 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "../server"
-    },
     {
       "path": "../desktop"
     },

apps/server/package.json

@@ -14,7 +14,7 @@
     "@excalidraw/excalidraw": "0.18.0",
     "@types/archiver": "6.0.3",
     "@types/better-sqlite3": "7.6.13",
-    "@types/cheerio": "0.22.35",
+    "@types/cheerio": "1.0.0",
     "@types/cls-hooked": "4.3.9",
     "@types/compression": "1.7.5",
     "@types/cookie-parser": "1.4.8",

packages/express-partial-content/src/createPartialContentHandler.spec.ts

@@ -1,5 +1,4 @@
 import * as utils from "./utils.js";
-import * as ParseRangeHeaderExports from "./parseRangeHeader.js";
 import { ContentDoesNotExistError } from "./ContentDoesNotExistError.js";
 import { createPartialContentHandler } from "./createPartialContentHandler.js";
 import type { ContentProvider } from "./ContentProvider.js";
@@ -87,11 +86,6 @@ describe("createPartialContentHandler tests", () => {
       }
     });
     it("returns 500 if parseRangeHeader throws other errors", async () => {
-      const parseRangeHeaderStub = vi
-        .spyOn(ParseRangeHeaderExports, "parseRangeHeader")
-        .mockImplementation(() => {
-            throw new Error("Something went wrong!")
-        });
       const contentProvider = vi.fn().mockResolvedValue({}) as ContentProvider;
       const handler = createPartialContentHandler(contentProvider, logger);
       try {

tsconfig.base.json

@@ -12,8 +12,8 @@
     "noFallthroughCasesInSwitch": true,
     "noImplicitAny": true,
     "noImplicitOverride": false,  // TODO: Re-enable it at some point.
-    "noImplicitReturns": true,
+    "noImplicitReturns": false,   // TODO: Re-enable it at some point.
-    "noUnusedLocals": true,
+    "noUnusedLocals": false,      // TODO: Re-enable it at some point.
     "skipLibCheck": true,
     "strict": true,
     "target": "es2022",