From 8453255ed364fa1e81be7a131e571db24f453ddc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:51:18 +0000 Subject: [PATCH 001/315] chore(deps): update node.js to v20.18.1 --- Dockerfile | 4 ++-- Dockerfile.alpine | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa3a73880..49b59cd36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM node:20.15.1-bullseye-slim AS builder +FROM node:20.18.1-bullseye-slim AS builder # Configure build dependencies in a single layer RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -35,7 +35,7 @@ RUN cp -R build/src/* src/. && \ rm src/services/asset_path.ts # Runtime stage -FROM node:20.15.1-bullseye-slim +FROM node:20.18.1-bullseye-slim # Install only runtime dependencies RUN apt-get update && apt-get install -y --no-install-recommends \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index e4b7f4a7d..d8d54d7c0 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,5 +1,5 @@ # Build stage -FROM node:20.15.1-alpine AS builder +FROM node:20.18.1-alpine AS builder # Configure build dependencies RUN apk add --no-cache --virtual .build-dependencies \ @@ -34,7 +34,7 @@ RUN cp -R build/src/* src/. && \ rm src/services/asset_path.ts # Runtime stage -FROM node:20.15.1-alpine +FROM node:20.18.1-alpine # Install runtime dependencies RUN apk add --no-cache su-exec shadow From 87600dc65bd62008687f684b801e906c63c9bbe4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:51:25 +0000 Subject: [PATCH 002/315] chore(deps): update webfreak001/deploy-nightly action to v3.2.0 --- .github/workflows/nightly.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9190ac414..f040eeecb 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -75,7 +75,7 @@ jobs: overwrite: true - name: Deploy release - uses: WebFreak001/deploy-nightly@v3.1.0 + uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: ${{ env.GITHUB_UPLOAD_URL }} release_id: ${{ env.GITHUB_RELEASE_ID }} @@ -83,7 +83,7 @@ jobs: asset_name: TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-nightly.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash asset_content_type: application/zip # required by GitHub API - name: Deploy installer release - uses: WebFreak001/deploy-nightly@v3.1.0 + uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: ${{ env.GITHUB_UPLOAD_URL }} release_id: ${{ env.GITHUB_RELEASE_ID }} @@ -120,7 +120,7 @@ jobs: overwrite: true - name: Deploy release - uses: WebFreak001/deploy-nightly@v3.1.0 + uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: ${{ env.GITHUB_UPLOAD_URL }} release_id: ${{ env.GITHUB_RELEASE_ID }} From c8f1108a3c7682fcb80c4192e29b6741116eb22a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:52:07 +0000 Subject: [PATCH 003/315] fix(deps): update dependency is-svg to v4.4.0 --- package-lock.json | 36 ++++++++++++++++++++++-------------- package.json | 2 +- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index caa13b5ed..aed19bce8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,7 +53,7 @@ "image-type": "4.1.0", "ini": "5.0.0", "is-animated": "2.0.2", - "is-svg": "4.3.2", + "is-svg": "4.4.0", "jimp": "0.22.12", "joplin-turndown-plugin-gfm": "1.0.12", "jquery": "3.7.1", @@ -8834,18 +8834,25 @@ "license": "MIT" }, "node_modules/fast-xml-parser": { - "version": "3.21.1", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz", - "integrity": "sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz", + "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + }, + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + } + ], + "license": "MIT", "dependencies": { - "strnum": "^1.0.4" + "strnum": "^1.0.5" }, "bin": { - "xml2js": "cli.js" - }, - "funding": { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" + "fxparser": "src/cli/cli.js" } }, "node_modules/fastest-levenshtein": { @@ -11008,11 +11015,12 @@ } }, "node_modules/is-svg": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.3.2.tgz", - "integrity": "sha512-mM90duy00JGMyjqIVHu9gNTjywdZV+8qNasX8cm/EEYZ53PHDgajvbBwNVvty5dwSAxLUD3p3bdo+7sR/UMrpw==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.4.0.tgz", + "integrity": "sha512-v+AgVwiK5DsGtT9ng+m4mClp6zDAmwrW8nZi6Gg15qzvBnRWWdfWA1TGaXyCDnWq5g5asofIgMVl3PjKxvk1ug==", + "license": "MIT", "dependencies": { - "fast-xml-parser": "^3.19.0" + "fast-xml-parser": "^4.1.3" }, "engines": { "node": ">=6" diff --git a/package.json b/package.json index ed35922cc..fad543ed5 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "image-type": "4.1.0", "ini": "5.0.0", "is-animated": "2.0.2", - "is-svg": "4.3.2", + "is-svg": "4.4.0", "jimp": "0.22.12", "joplin-turndown-plugin-gfm": "1.0.12", "jquery": "3.7.1", From ecca6952d1fb9634dedf78ae6b88bf4bd754a472 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:52:31 +0000 Subject: [PATCH 004/315] fix(deps): update dependency yargs to v17.7.2 --- dump-db/package-lock.json | 324 +++++++++++--------------------------- 1 file changed, 93 insertions(+), 231 deletions(-) diff --git a/dump-db/package-lock.json b/dump-db/package-lock.json index 1648fc6cc..34f880948 100644 --- a/dump-db/package-lock.json +++ b/dump-db/package-lock.json @@ -423,6 +423,14 @@ "dev": true, "license": "MIT" }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -566,53 +574,16 @@ "license": "ISC" }, "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dependencies": { "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", + "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" - } - }, - "node_modules/cliui/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" }, "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" + "node": ">=12" } }, "node_modules/decompress-response": { @@ -850,6 +821,14 @@ "node": ">=0.10.0" } }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -1146,6 +1125,30 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -1249,14 +1252,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, "node_modules/wrap-ansi/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -1287,38 +1282,6 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -1334,70 +1297,29 @@ } }, "node_modules/yargs": { - "version": "17.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", - "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", - "license": "MIT", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dependencies": { - "cliui": "^7.0.2", + "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", - "yargs-parser": "^21.0.0" + "yargs-parser": "^21.1.1" }, "engines": { "node": ">=12" } }, "node_modules/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==", + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "engines": { "node": ">=12" } - }, - "node_modules/yargs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } } }, "dependencies": { @@ -1577,6 +1499,11 @@ "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", "dev": true }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, "anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -1661,43 +1588,13 @@ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, "cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "requires": { "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", + "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } - } } }, "decompress-response": { @@ -1850,6 +1747,11 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, "is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -2025,6 +1927,24 @@ "safe-buffer": "~5.2.0" } }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -2103,11 +2023,6 @@ "strip-ansi": "^6.0.0" }, "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -2128,29 +2043,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } } } }, @@ -2165,53 +2057,23 @@ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, "yargs": { - "version": "17.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", - "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "requires": { - "cliui": "^7.0.2", + "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", - "yargs-parser": "^21.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } - } + "yargs-parser": "^21.1.1" } }, "yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==" + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" } } } From 35bc2ade9c5d8f74b22ef65cc39613bd5204ea04 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:52:45 +0000 Subject: [PATCH 005/315] fix(deps): update dependency yauzl to v3.2.0 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index caa13b5ed..176ca5617 100644 --- a/package-lock.json +++ b/package-lock.json @@ -96,7 +96,7 @@ "vanilla-js-wheel-zoom": "9.0.4", "ws": "8.18.0", "xml2js": "0.6.2", - "yauzl": "3.1.3" + "yauzl": "3.2.0" }, "bin": { "trilium": "src/main.js" @@ -17001,9 +17001,10 @@ } }, "node_modules/yauzl": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.1.3.tgz", - "integrity": "sha512-JCCdmlJJWv7L0q/KylOekyRaUrdEoUxWkWVcgorosTROCFWiS9p2NNPE9Yb91ak7b1N5SxAZEliWpspbZccivw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.2.0.tgz", + "integrity": "sha512-Ow9nuGZE+qp1u4JIPvg+uCiUr7xGQWdff7JQSk5VGYTAZMDe2q8lxJ10ygv10qmSj031Ty/6FNJpLO4o1Sgc+w==", + "license": "MIT", "dependencies": { "buffer-crc32": "~0.2.3", "pend": "~1.2.0" diff --git a/package.json b/package.json index ed35922cc..bb8e39d9f 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "vanilla-js-wheel-zoom": "9.0.4", "ws": "8.18.0", "xml2js": "0.6.2", - "yauzl": "3.1.3" + "yauzl": "3.2.0" }, "devDependencies": { "@electron-forge/cli": "7.5.0", From caf5b34d70e08160d31189c2452f0ddf261d1c4c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:53:17 +0000 Subject: [PATCH 006/315] chore(deps): update docker/login-action action to v3 --- .github/workflows/main-docker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml index 4291c894a..34c84851e 100644 --- a/.github/workflows/main-docker.yml +++ b/.github/workflows/main-docker.yml @@ -151,14 +151,14 @@ jobs: run: cat package.json | grep -v electron > server-package.json - name: Login to GHCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.GHCR_REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.DOCKERHUB_REGISTRY }} username: ${{ secrets.DOCKERHUB_USERNAME }} @@ -219,14 +219,14 @@ jobs: latest=false - name: Login to GHCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.GHCR_REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.DOCKERHUB_REGISTRY }} username: ${{ secrets.DOCKERHUB_USERNAME }} From 1e478a7a52e952cc744b134d7f5b561f967e2281 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:53:20 +0000 Subject: [PATCH 007/315] chore(deps): update docker/metadata-action action to v5 --- .github/workflows/main-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml index 4291c894a..d3dd29d8d 100644 --- a/.github/workflows/main-docker.yml +++ b/.github/workflows/main-docker.yml @@ -120,7 +120,7 @@ jobs: uses: actions/checkout@v4 - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }} @@ -210,7 +210,7 @@ jobs: - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }} From 0cb7d82d16093d842287b01a5086655ab1961202 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:53:41 +0000 Subject: [PATCH 008/315] chore(deps): update stringbean/docker-healthcheck-action action to v3 --- .github/workflows/dev.yml | 2 +- .github/workflows/main-docker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 296ceb6d6..ce9c55d4c 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -87,7 +87,7 @@ jobs: echo "Container ID: $CONTAINER_ID" - name: Wait for the healthchecks to pass - uses: stringbean/docker-healthcheck-action@v1 + uses: stringbean/docker-healthcheck-action@v3 with: container: trilium_local wait-time: 50 diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml index 4291c894a..61fea591d 100644 --- a/.github/workflows/main-docker.yml +++ b/.github/workflows/main-docker.yml @@ -72,7 +72,7 @@ jobs: echo "Container ID: $CONTAINER_ID" - name: Wait for the healthchecks to pass - uses: stringbean/docker-healthcheck-action@v1 + uses: stringbean/docker-healthcheck-action@v3 with: container: trilium_local wait-time: 50 From 190c7f72746922f7691680f1fa502e62e3a02d36 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:53:55 +0000 Subject: [PATCH 009/315] fix(deps): update dependency chokidar to v4 --- package-lock.json | 86 +++++++++++++++++++++++++++++++++++------------ package.json | 2 +- 2 files changed, 65 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index caa13b5ed..b23dc1a75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "better-sqlite3": "11.3.0", "bootstrap": "5.3.3", "boxicons": "2.1.4", - "chokidar": "3.6.0", + "chokidar": "4.0.1", "cls-hooked": "4.2.2", "codemirror": "5.65.18", "compression": "1.7.4", @@ -4503,6 +4503,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -5090,6 +5091,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, "engines": { "node": ">=8" } @@ -5293,6 +5295,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, "dependencies": { "fill-range": "^7.1.1" }, @@ -5731,26 +5734,18 @@ } }, "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz", + "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==", + "license": "MIT", "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "readdirp": "^4.0.1" }, "engines": { - "node": ">= 8.10.0" + "node": ">= 14.16.0" }, "funding": { "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" } }, "node_modules/chownr": { @@ -8961,6 +8956,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -9313,6 +9309,7 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -9553,6 +9550,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -10850,6 +10848,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, "dependencies": { "binary-extensions": "^2.0.0" }, @@ -10964,6 +10963,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, "engines": { "node": ">=0.12.0" } @@ -12766,6 +12766,31 @@ "url": "https://opencollective.com/nodemon" } }, + "node_modules/nodemon/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, "node_modules/nodemon/node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -12775,6 +12800,19 @@ "node": ">=4" } }, + "node_modules/nodemon/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, "node_modules/nodemon/node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -13444,6 +13482,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, "engines": { "node": ">=8.6" }, @@ -14149,14 +14188,16 @@ } }, "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dependencies": { - "picomatch": "^2.2.1" - }, + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", + "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", + "license": "MIT", "engines": { - "node": ">=8.10.0" + "node": ">= 14.16.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/rechoir": { @@ -15771,6 +15812,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "dependencies": { "is-number": "^7.0.0" }, diff --git a/package.json b/package.json index ed35922cc..28c458056 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "better-sqlite3": "11.3.0", "bootstrap": "5.3.3", "boxicons": "2.1.4", - "chokidar": "3.6.0", + "chokidar": "4.0.1", "cls-hooked": "4.2.2", "codemirror": "5.65.18", "compression": "1.7.4", From 5faa6e1d67427dda8501ee3354c9af63255143ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:54:26 +0000 Subject: [PATCH 010/315] fix(deps): update dependency helmet to v8 --- package-lock.json | 11 ++++++----- package.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index caa13b5ed..2ec0eb3d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "express-session": "1.18.1", "force-graph": "1.46.0", "fs-extra": "11.2.0", - "helmet": "7.1.0", + "helmet": "8.0.0", "html": "1.0.0", "html2plaintext": "2.1.4", "http-proxy-agent": "7.0.2", @@ -9800,11 +9800,12 @@ } }, "node_modules/helmet": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-7.1.0.tgz", - "integrity": "sha512-g+HZqgfbpXdCkme/Cd/mZkV0aV3BZZZSugecH03kl38m/Kmdx8jKjBikpDj2cr+Iynv4KpYEviojNdTJActJAg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-8.0.0.tgz", + "integrity": "sha512-VyusHLEIIO5mjQPUI1wpOAEu+wl6Q0998jzTxqUYGE45xCIcAxy3MsbEK/yyJUJ3ADeMoB6MornPH6GMWAf+Pw==", + "license": "MIT", "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/history": { diff --git a/package.json b/package.json index ed35922cc..3cfcc73f6 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "express-session": "1.18.1", "force-graph": "1.46.0", "fs-extra": "11.2.0", - "helmet": "7.1.0", + "helmet": "8.0.0", "html": "1.0.0", "html2plaintext": "2.1.4", "http-proxy-agent": "7.0.2", From d6991467ed107059eb9f0f01fc145d2646d34df0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 00:58:50 +0000 Subject: [PATCH 011/315] chore(deps): update dependency @types/cookie-parser to v1.4.8 --- package-lock.json | 11 ++++++----- package.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58eac797b..fa5c3e8bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -114,7 +114,7 @@ "@types/better-sqlite3": "7.6.11", "@types/cls-hooked": "4.3.8", "@types/compression": "1.7.5", - "@types/cookie-parser": "1.4.7", + "@types/cookie-parser": "1.4.8", "@types/csurf": "1.11.5", "@types/debounce": "1.2.4", "@types/ejs": "3.1.5", @@ -3363,11 +3363,12 @@ } }, "node_modules/@types/cookie-parser": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.7.tgz", - "integrity": "sha512-Fvuyi354Z+uayxzIGCwYTayFKocfV7TuDYZClCdIP9ckhvAu/ixDtCB6qx2TT0FKjPLf1f3P/J1rgf6lPs64mw==", + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.8.tgz", + "integrity": "sha512-l37JqFrOJ9yQfRQkljb41l0xVphc7kg5JTjjr+pLRZ0IyZ49V4BQ8vbF4Ut2C2e+WH4al3xD3ZwYwIUfnbT4NQ==", "dev": true, - "dependencies": { + "license": "MIT", + "peerDependencies": { "@types/express": "*" } }, diff --git a/package.json b/package.json index d856cfcbd..b53463d32 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "@types/better-sqlite3": "7.6.11", "@types/cls-hooked": "4.3.8", "@types/compression": "1.7.5", - "@types/cookie-parser": "1.4.7", + "@types/cookie-parser": "1.4.8", "@types/csurf": "1.11.5", "@types/debounce": "1.2.4", "@types/ejs": "3.1.5", From c68bb23feedb5a62975d39725b999c49903eb10e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 00:47:25 +0000 Subject: [PATCH 012/315] chore(deps): update dependency @types/express-session to v1.18.1 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58eac797b..f42bd9a93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -121,7 +121,7 @@ "@types/electron-squirrel-startup": "1.0.2", "@types/escape-html": "1.0.4", "@types/express": "4.17.21", - "@types/express-session": "1.18.0", + "@types/express-session": "1.18.1", "@types/html": "1.0.4", "@types/ini": "4.1.1", "@types/jasmine": "5.1.4", @@ -3684,10 +3684,11 @@ } }, "node_modules/@types/express-session": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.0.tgz", - "integrity": "sha512-27JdDRgor6PoYlURY+Y5kCakqp5ulC0kmf7y+QwaY+hv9jEFuQOThgkjyA53RP3jmKuBsH5GR6qEfFmvb8mwOA==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.1.tgz", + "integrity": "sha512-S6TkD/lljxDlQ2u/4A70luD8/ZxZcrU5pQwI1rVXCiaVIywoFgbA+PIUNDjPhQpPdK0dGleLtYc/y7XWBfclBg==", "dev": true, + "license": "MIT", "dependencies": { "@types/express": "*" } diff --git a/package.json b/package.json index d856cfcbd..2b252763b 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "@types/electron-squirrel-startup": "1.0.2", "@types/escape-html": "1.0.4", "@types/express": "4.17.21", - "@types/express-session": "1.18.0", + "@types/express-session": "1.18.1", "@types/html": "1.0.4", "@types/ini": "4.1.1", "@types/jasmine": "5.1.4", From 3825b0642da0341b1cb900354865c87c891b01d4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 00:47:40 +0000 Subject: [PATCH 013/315] chore(deps): update electron-forge monorepo to v7.6.0 --- package-lock.json | 446 +++++++++++++++++++++++++++++++--------------- package.json | 12 +- 2 files changed, 310 insertions(+), 148 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58eac797b..a467252cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -103,12 +103,12 @@ "trilium": "src/main.js" }, "devDependencies": { - "@electron-forge/cli": "7.5.0", - "@electron-forge/maker-deb": "7.5.0", - "@electron-forge/maker-dmg": "7.5.0", - "@electron-forge/maker-squirrel": "7.5.0", - "@electron-forge/maker-zip": "7.5.0", - "@electron-forge/plugin-auto-unpack-natives": "7.5.0", + "@electron-forge/cli": "7.6.0", + "@electron-forge/maker-deb": "7.6.0", + "@electron-forge/maker-dmg": "7.6.0", + "@electron-forge/maker-squirrel": "7.6.0", + "@electron-forge/maker-zip": "7.6.0", + "@electron-forge/plugin-auto-unpack-natives": "7.6.0", "@playwright/test": "1.48.2", "@types/archiver": "6.0.2", "@types/better-sqlite3": "7.6.11", @@ -280,9 +280,9 @@ } }, "node_modules/@electron-forge/cli": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.5.0.tgz", - "integrity": "sha512-dlxr4ac5ONWs1Wmbgh18rclxcp9Fe5SzCF9ookp08Z1w4YP9FbQd1SHs0oLKWLF6qH9qdX8H2EWB9Nt6tOzC5g==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.6.0.tgz", + "integrity": "sha512-5G7rBbvTb4HJDiCuhncBzNaRj1e1dEmrk6jExpziqv4Y8p9b+nxfdOjsjWu0hvAl4k2V65Rnm1uEkAA7MmlZOQ==", "dev": true, "funding": [ { @@ -294,9 +294,10 @@ "url": "https://tidelift.com/subscription/pkg/npm-.electron-forge-cli?utm_medium=referral&utm_source=npm_fund" } ], + "license": "MIT", "dependencies": { - "@electron-forge/core": "7.5.0", - "@electron-forge/shared-types": "7.5.0", + "@electron-forge/core": "7.6.0", + "@electron-forge/shared-types": "7.6.0", "@electron/get": "^3.0.0", "chalk": "^4.0.0", "commander": "^4.1.1", @@ -319,6 +320,7 @@ "resolved": "https://registry.npmjs.org/@electron/get/-/get-3.1.0.tgz", "integrity": "sha512-F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.1.1", "env-paths": "^2.2.0", @@ -340,6 +342,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", @@ -349,38 +352,22 @@ "node": ">=6 <7 || >=8" } }, - "node_modules/@electron-forge/cli/node_modules/@electron/get/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/@electron-forge/cli/node_modules/@electron/get/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } }, - "node_modules/@electron-forge/cli/node_modules/@electron/get/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/@electron-forge/cli/node_modules/commander": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } @@ -390,6 +377,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -399,11 +387,12 @@ "node": ">=12" } }, - "node_modules/@electron-forge/cli/node_modules/jsonfile": { + "node_modules/@electron-forge/cli/node_modules/fs-extra/node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -411,19 +400,20 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/@electron-forge/cli/node_modules/universalify": { + "node_modules/@electron-forge/cli/node_modules/fs-extra/node_modules/universalify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/core": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-7.5.0.tgz", - "integrity": "sha512-Hg/fXabRZtMbyrtnpzpb3i49qNai+juCg+6bgyjYfWgJGr5VGH947lWd7skujH5qJ+Y7FgvANDGnenZuQwxZNw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-7.6.0.tgz", + "integrity": "sha512-DgkjpoK+SPExNTLZL1v81zl0RswQWvMXkMnMqZYf0/S/KHKTXWsoE9KTzr8fDGpiG3nUJXWMqHyny9zLoUdKXQ==", "dev": true, "funding": [ { @@ -435,21 +425,22 @@ "url": "https://tidelift.com/subscription/pkg/npm-.electron-forge-core?utm_medium=referral&utm_source=npm_fund" } ], + "license": "MIT", "dependencies": { - "@electron-forge/core-utils": "7.5.0", - "@electron-forge/maker-base": "7.5.0", - "@electron-forge/plugin-base": "7.5.0", - "@electron-forge/publisher-base": "7.5.0", - "@electron-forge/shared-types": "7.5.0", - "@electron-forge/template-base": "7.5.0", - "@electron-forge/template-vite": "7.5.0", - "@electron-forge/template-vite-typescript": "7.5.0", - "@electron-forge/template-webpack": "7.5.0", - "@electron-forge/template-webpack-typescript": "7.5.0", - "@electron-forge/tracer": "7.5.0", + "@electron-forge/core-utils": "7.6.0", + "@electron-forge/maker-base": "7.6.0", + "@electron-forge/plugin-base": "7.6.0", + "@electron-forge/publisher-base": "7.6.0", + "@electron-forge/shared-types": "7.6.0", + "@electron-forge/template-base": "7.6.0", + "@electron-forge/template-vite": "7.6.0", + "@electron-forge/template-vite-typescript": "7.6.0", + "@electron-forge/template-webpack": "7.6.0", + "@electron-forge/template-webpack-typescript": "7.6.0", + "@electron-forge/tracer": "7.6.0", "@electron/get": "^3.0.0", "@electron/packager": "^18.3.5", - "@electron/rebuild": "^3.2.10", + "@electron/rebuild": "^3.7.0", "@malept/cross-spawn-promise": "^2.0.0", "chalk": "^4.0.0", "debug": "^4.3.1", @@ -477,13 +468,14 @@ } }, "node_modules/@electron-forge/core-utils": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.5.0.tgz", - "integrity": "sha512-PtyQT6qeOEJsi4ltoB7Jb6YUUCwK3gDt5gVyAF2aJ8eZi9rJ0hasHc5vjcmBaz9FwDMjYZrBD8oRBhNgbhEakQ==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.6.0.tgz", + "integrity": "sha512-7XVKHPI87p558kVen280yB1UC2cVGHvrMfnPFv4zm3TQHEVaKWKW+5y+UZsKUnGAukNlahHWuHF/1S8dRCJNEg==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.5.0", - "@electron/rebuild": "^3.2.10", + "@electron-forge/shared-types": "7.6.0", + "@electron/rebuild": "^3.7.0", "@malept/cross-spawn-promise": "^2.0.0", "chalk": "^4.0.0", "debug": "^4.3.1", @@ -512,6 +504,7 @@ "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" } ], + "license": "Apache-2.0", "dependencies": { "cross-spawn": "^7.0.1" }, @@ -524,6 +517,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -540,6 +534,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -554,6 +549,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -566,6 +562,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -581,6 +578,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -596,6 +594,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -611,6 +610,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -620,6 +620,7 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } @@ -796,12 +797,13 @@ } }, "node_modules/@electron-forge/maker-base": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.5.0.tgz", - "integrity": "sha512-+jluKW2UPxaI1+qQQ8fqaUVVbZohRjOSF0Iti7STRFbgJKJitzPB24Cjji9qJCKIx5klMeEiwp0YPAE/d9Xt8g==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.6.0.tgz", + "integrity": "sha512-GrVYhiA/g0NXrI13LcXrT+JKLlq8kkYyO6w0jQORqDFeRSLRoLhrru5w0msg0wINGugBe+/NwyAyFZ2KaQ6o4g==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.5.0", + "@electron-forge/shared-types": "7.6.0", "fs-extra": "^10.0.0", "which": "^2.0.2" }, @@ -814,6 +816,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -828,6 +831,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -840,18 +844,20 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/maker-deb": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-7.5.0.tgz", - "integrity": "sha512-rMXYJzu2LuyDQ5TX4VzQ2OSWDFC7Y1nJpBoyJvXfkA5fF5NNScOFYPv1YzEYAXMcG5hCOVLorsG9HDTEC8uh9g==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-7.6.0.tgz", + "integrity": "sha512-vTg/wJwfdWM4Hm1NlU0g30ODn6z3NBukQdWOS2xXJQ/Y0KnQRVN7ThSlxxzWJy0tI6hGAlpziJjpXozTfhM/Nw==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.5.0", - "@electron-forge/shared-types": "7.5.0" + "@electron-forge/maker-base": "7.6.0", + "@electron-forge/shared-types": "7.6.0" }, "engines": { "node": ">= 16.4.0" @@ -861,13 +867,14 @@ } }, "node_modules/@electron-forge/maker-dmg": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-7.5.0.tgz", - "integrity": "sha512-OcySukBT6FQJRbb0CKXnre4e0JinJfDGteCOLypB8UsN5Wg/4lIDB0hMhBmWGPJkZXKUDGkB1lhkdcLKbzT50Q==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-7.6.0.tgz", + "integrity": "sha512-Wa4XG9r4RldF5uy7vef5/BR8o/P+BmltZIbZulnFwhOYEu4Quj+SDF1bet7y3tM2i1am/sEocFcBHXC7CRk8xg==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.5.0", - "@electron-forge/shared-types": "7.5.0", + "@electron-forge/maker-base": "7.6.0", + "@electron-forge/shared-types": "7.6.0", "fs-extra": "^10.0.0" }, "engines": { @@ -916,13 +923,14 @@ } }, "node_modules/@electron-forge/maker-squirrel": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-7.5.0.tgz", - "integrity": "sha512-fz3vbp1BnbQWeZVVM3lKOGhrCVKLjAXKDTntBL2+8Rz02a63eozGjOtC5KZYXax6nM4TF6LvwjagY/qTs5jFag==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-7.6.0.tgz", + "integrity": "sha512-8tqsJBRAe37YZSKv1fPc1tijQljkSlUQCaeun37ZOM/viurSeydt5nu2M+UDmJHAfD/PRZMjnYvCCWH+08wGVg==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.5.0", - "@electron-forge/shared-types": "7.5.0", + "@electron-forge/maker-base": "7.6.0", + "@electron-forge/shared-types": "7.6.0", "fs-extra": "^10.0.0" }, "engines": { @@ -937,6 +945,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -951,6 +960,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -963,18 +973,20 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/maker-zip": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-7.5.0.tgz", - "integrity": "sha512-gIO3bEbubOJqWV6kd0b9nBwTrFfFQv/K8PAqg6e0uSZiy7QuSCFZVAZse02gO3AzxVDSVjjTQ4nmXBXC4Glh1A==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-7.6.0.tgz", + "integrity": "sha512-sDPQoEs6CnkxsydvnfZByBGf+RREky2xqiusWCvaPnUoLRpq96SFaBb1BRCS6tQKQHKkaEUXEC5pBdrYGLHPVg==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.5.0", - "@electron-forge/shared-types": "7.5.0", + "@electron-forge/maker-base": "7.6.0", + "@electron-forge/shared-types": "7.6.0", "cross-zip": "^4.0.0", "fs-extra": "^10.0.0", "got": "^11.8.5" @@ -1022,51 +1034,55 @@ } }, "node_modules/@electron-forge/plugin-auto-unpack-natives": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-auto-unpack-natives/-/plugin-auto-unpack-natives-7.5.0.tgz", - "integrity": "sha512-cT/yTAr5Zd81HANi5bdyCoSG9nzIrB1WIEkFA7sWuyATiOjk9SGKn1aM543XWJ/TFkTg0800JpyocsSC9wOzEg==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-auto-unpack-natives/-/plugin-auto-unpack-natives-7.6.0.tgz", + "integrity": "sha512-rSWRLJinRIxtlkLke0uJzOLksRnXszu3hZrzlgOWChDuMFM298yb6gxWAjYh94VoNxXrUHl9Cd4ia/5+wgPwwg==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/plugin-base": "7.5.0", - "@electron-forge/shared-types": "7.5.0" + "@electron-forge/plugin-base": "7.6.0", + "@electron-forge/shared-types": "7.6.0" }, "engines": { "node": ">= 16.4.0" } }, "node_modules/@electron-forge/plugin-base": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.5.0.tgz", - "integrity": "sha512-44AbXSb5lDY8uHIo0mJ91atOSWgxv3iuECk07/gDBiuMPX62dwHnLteEjQF4GBXJZTpnV7SxhD+d2AUBQmoojw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.6.0.tgz", + "integrity": "sha512-9llu4algWZJAJFVVZtd/Xa71c0QVxRmoMrpHX2SB+XJ+ZlFVdXrlnhn2hc/CnM0by9cBElyAL3cx3533OKS7lA==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.5.0" + "@electron-forge/shared-types": "7.6.0" }, "engines": { "node": ">= 16.4.0" } }, "node_modules/@electron-forge/publisher-base": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.5.0.tgz", - "integrity": "sha512-PcF3jWA+oXRwNVWjKW6GxHJywJ62QXpYF/8SMs7kgKzBDzLqrbUnWuaXoCP5kCP+AxM495ZU5L2dyJek1eM+VA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.6.0.tgz", + "integrity": "sha512-IL9bbIb/4J4I1bfW53RAmE/Al835XJsOwFXTLUnxnaGtbWg5jz7eiyw9Vl8XvvfHN1Dpoa9f94to8keU2MXgDg==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.5.0" + "@electron-forge/shared-types": "7.6.0" }, "engines": { "node": ">= 16.4.0" } }, "node_modules/@electron-forge/shared-types": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.5.0.tgz", - "integrity": "sha512-VXuLVGYa3ZulBlmjA40ZEpk+iPH5ebN0v7t27wDt3rm23bph2aQrL7uSTLXhobenXYBVKggXnQt6rJ9A7FCDNQ==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.6.0.tgz", + "integrity": "sha512-qpJRaPo/tx/+t3iFdUWnK4Tk/elo+Izk3yS+BhzfaF0XOK8wS+NNYW4vycK6eVMxN3Yu7/924MQFtPlCKlWHvA==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/tracer": "7.5.0", + "@electron-forge/tracer": "7.6.0", "@electron/packager": "^18.3.5", - "@electron/rebuild": "^3.2.10", + "@electron/rebuild": "^3.7.0", "listr2": "^7.0.2" }, "engines": { @@ -1074,12 +1090,13 @@ } }, "node_modules/@electron-forge/template-base": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.5.0.tgz", - "integrity": "sha512-wEz4FI90jje4FdwJ4FzqUejodfioNcJjlgG2Ci1FiRn4Qv0jX4MP8SEgKmnD44181/44HgMa429zxRv/fDYzOw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.6.0.tgz", + "integrity": "sha512-lhvab8a/knuGnpzep8BMOEkgnkHGr11QELGBzslEnA6rwZi9DDyEgmMCk6VWOVQNHMeuEqh5XlgjVqJmjW6nIQ==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.5.0", + "@electron-forge/shared-types": "7.6.0", "@malept/cross-spawn-promise": "^2.0.0", "debug": "^4.3.1", "fs-extra": "^10.0.0", @@ -1104,6 +1121,7 @@ "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" } ], + "license": "Apache-2.0", "dependencies": { "cross-spawn": "^7.0.1" }, @@ -1116,6 +1134,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -1130,6 +1149,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -1142,18 +1162,20 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/template-vite": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.5.0.tgz", - "integrity": "sha512-AkMO5nW5jC8ijCYeoAK7hu+K5o7NMoHNsn71eepJ/kjOnSxXjJeBVGmP4DgzF2zc6AgeRz2TCKx6P8GUtFG5cw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.6.0.tgz", + "integrity": "sha512-C0V0dGDO1hLXnAM9lGnZU0esNOTbxwcgILWJXv0mYErBkmputAIi3HM1Is3h3JdSijXgVbRWcIQxFxJlOCpB/A==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.5.0", - "@electron-forge/template-base": "7.5.0", + "@electron-forge/shared-types": "7.6.0", + "@electron-forge/template-base": "7.6.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1161,13 +1183,14 @@ } }, "node_modules/@electron-forge/template-vite-typescript": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.5.0.tgz", - "integrity": "sha512-bD9QQ6uEsDHp6/V7odCkoK53egy0A4LEh++F1VYFt7SWJ5+InkcSLww7ELz2hrNmpmXb+euRrNagL1gorPToSA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.6.0.tgz", + "integrity": "sha512-i2Bt5Hehoq2CNNrUQjl8DQX7VatBMQ6mv+CCa+m+EV92nUYxXsoFva62/5ITpc3gFAGd1upw/S7dTbHV6GOwsA==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.5.0", - "@electron-forge/template-base": "7.5.0", + "@electron-forge/shared-types": "7.6.0", + "@electron-forge/template-base": "7.6.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1179,6 +1202,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -1193,6 +1217,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -1205,6 +1230,7 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } @@ -1214,6 +1240,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -1228,6 +1255,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -1240,18 +1268,20 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/template-webpack": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.5.0.tgz", - "integrity": "sha512-Il9dO4VMhxibsYTsKRkccWUN3WFg55PEQFL93oarFcEtAT3sjMx/1bZDj/2AIHqbwIf7IrCylPKiPP2uUNOM9Q==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.6.0.tgz", + "integrity": "sha512-+HEf0ryUfLpHvl27TXSdP2Ob69+ktNtr5EnmroZGGIxhSAtEs4HloPtDF9PSfBzm38pZhQBZn78kY9LbITTGjg==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.5.0", - "@electron-forge/template-base": "7.5.0", + "@electron-forge/shared-types": "7.6.0", + "@electron-forge/template-base": "7.6.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1259,13 +1289,14 @@ } }, "node_modules/@electron-forge/template-webpack-typescript": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.5.0.tgz", - "integrity": "sha512-Q11xAzFxWtES0bwykMd8MAzrVRtmSruXQxQIvqM7Qf3VmU8joq8v5njmn13LeCDkcRGjALiJqO8EsgsW3bttNw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.6.0.tgz", + "integrity": "sha512-fDj4DkGxJJjGL8lpowFnkX7PvV9koLHKJuyusK8p8ayVMGoHpHrIcVCrV06tKYOvhFrL/ahW+CKKvjlxF8niEg==", "dev": true, + "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.5.0", - "@electron-forge/template-base": "7.5.0", + "@electron-forge/shared-types": "7.6.0", + "@electron-forge/template-base": "7.6.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1277,6 +1308,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -1291,6 +1323,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -1303,6 +1336,7 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } @@ -1312,6 +1346,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -1326,6 +1361,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -1338,15 +1374,17 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/tracer": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.5.0.tgz", - "integrity": "sha512-1dE0wKCmv/K3BXCH70o2jp/y2kXgZQm73gIvzyadySXYwu2L4BWxhAO+Q+JsnbUk+nclHEup5ph4D0JoPIWLcQ==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.6.0.tgz", + "integrity": "sha512-Rn76RHqNhLyZDnu+xY/X73+bv+Q09XKaZBL/WvlYBbvrrHe26NOHJ3IHXxkWRokSWd4B7lOGLGKm3j1Il8dVbQ==", "dev": true, + "license": "MIT", "dependencies": { "chrome-trace-event": "^1.0.3" }, @@ -1413,6 +1451,91 @@ "semver": "bin/semver.js" } }, + "node_modules/@electron/node-gyp": { + "version": "10.2.0-electron.1", + "resolved": "git+ssh://git@github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2", + "integrity": "sha512-CrYo6TntjpoMO1SHjl5Pa/JoUsECNqNdB7Kx49WLQpWzPw53eEITJ2Hs9fh/ryUYDn4pxZz11StaBYBrLFJdqg==", + "dev": true, + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^8.1.0", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^10.2.1", + "nopt": "^6.0.0", + "proc-log": "^2.0.1", + "semver": "^7.3.5", + "tar": "^6.2.1", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": ">=12.13.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@electron/node-gyp/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@electron/node-gyp/node_modules/nopt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "^1.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/@electron/notarize": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-1.2.3.tgz", @@ -1531,10 +1654,11 @@ } }, "node_modules/@electron/packager": { - "version": "18.3.5", - "resolved": "https://registry.npmjs.org/@electron/packager/-/packager-18.3.5.tgz", - "integrity": "sha512-ClgTxXTt3MesWAcjIxIkgxELjTcllw1FRoVsihP7uT48kpDMqI71p4XvnMWbq8PvU57TcrKICAaLkxRhbc+/wQ==", + "version": "18.3.6", + "resolved": "https://registry.npmjs.org/@electron/packager/-/packager-18.3.6.tgz", + "integrity": "sha512-1eXHB5t+SQKvUiDpWGpvr90ZSSbXj+isrh3YbjCTjKT4bE4SQrKSBfukEAaBvp67+GXHFtCHjQgN9qSTFIge+Q==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "@electron/asar": "^3.2.13", "@electron/get": "^3.0.0", @@ -1614,9 +1738,9 @@ } }, "node_modules/@electron/packager/node_modules/@electron/notarize": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.3.2.tgz", - "integrity": "sha512-zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz", + "integrity": "sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==", "dev": true, "license": "MIT", "dependencies": { @@ -1763,11 +1887,13 @@ } }, "node_modules/@electron/rebuild": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.6.0.tgz", - "integrity": "sha512-zF4x3QupRU3uNGaP5X1wjpmcjfw1H87kyqZ00Tc3HvriV+4gmOGuvQjGNkrJuXdsApssdNyVwLsy+TaeTGGcVw==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.1.tgz", + "integrity": "sha512-sKGD+xav4Gh25+LcLY0rjIwcCFTw+f/HU1pB48UVbwxXXRGaXEqIH0AaYKN46dgd/7+6kuiDXzoyAEvx1zCsdw==", "dev": true, + "license": "MIT", "dependencies": { + "@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2", "@malept/cross-spawn-promise": "^2.0.0", "chalk": "^4.0.0", "debug": "^4.1.1", @@ -1776,7 +1902,6 @@ "got": "^11.7.0", "node-abi": "^3.45.0", "node-api-version": "^0.2.0", - "node-gyp": "^9.0.0", "ora": "^5.1.0", "read-binary-file-arch": "^1.0.6", "semver": "^7.3.5", @@ -1805,6 +1930,7 @@ "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" } ], + "license": "Apache-2.0", "dependencies": { "cross-spawn": "^7.0.1" }, @@ -1817,6 +1943,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -1831,6 +1958,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -1843,6 +1971,7 @@ "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.0.tgz", "integrity": "sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^7.3.5" } @@ -1852,6 +1981,7 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } @@ -8554,6 +8684,13 @@ "node": ">=0.10.0" } }, + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "dev": true, + "license": "Apache-2.0" + }, "node_modules/express": { "version": "4.21.1", "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", @@ -12015,10 +12152,11 @@ "dev": true }, "node_modules/make-fetch-happen": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.0.tgz", - "integrity": "sha512-OnEfCLofQVJ5zgKwGk55GaqosqKjaR6khQlJY3dBAA+hM25Bc5CmX5rKUfVut+rYA3uidA7zb7AvcglU87rPRg==", + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", + "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", "dev": true, + "license": "ISC", "dependencies": { "agentkeepalive": "^4.2.1", "cacache": "^16.1.0", @@ -12082,6 +12220,7 @@ "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", "dev": true, + "license": "MIT", "dependencies": { "p-defer": "^1.0.0" }, @@ -12188,6 +12327,7 @@ "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", "dev": true, + "license": "MIT", "dependencies": { "map-age-cleaner": "^0.1.1", "mimic-fn": "^2.0.0", @@ -13077,6 +13217,7 @@ "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -13095,6 +13236,7 @@ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -13686,6 +13828,16 @@ "opencollective-postinstall": "^2.0.2" } }, + "node_modules/proc-log": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz", + "integrity": "sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -14051,6 +14203,7 @@ "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz", "integrity": "sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.3.4" }, @@ -14279,9 +14432,9 @@ } }, "node_modules/resedit": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/resedit/-/resedit-2.0.2.tgz", - "integrity": "sha512-UKTnq602iVe+W5SyRAQx/WdWMnlDiONfXBLFg/ur4QE4EQQ8eP7Jgm5mNXdK12kKawk1vvXPja2iXKqZiGDW6Q==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/resedit/-/resedit-2.0.3.tgz", + "integrity": "sha512-oTeemxwoMuxxTYxXUwjkrOPfngTQehlv0/HoYFNkB4uzsP1Un1A9nI8JQKGOFkxpqkC7qkMs0lUsGrvUlbLNUA==", "dev": true, "license": "MIT", "dependencies": { @@ -15538,10 +15691,11 @@ } }, "node_modules/tar": { - "version": "6.1.15", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz", - "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, + "license": "ISC", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -16281,6 +16435,7 @@ "resolved": "https://registry.npmjs.org/username/-/username-5.1.0.tgz", "integrity": "sha512-PCKbdWw85JsYMvmCv5GH3kXmM66rCd9m1hBEDutPNv94b/pqCMT4NtcKyeWYvLFiE8b+ha1Jdl8XAaUdPn5QTg==", "dev": true, + "license": "MIT", "dependencies": { "execa": "^1.0.0", "mem": "^4.3.0" @@ -16939,6 +17094,7 @@ "resolved": "https://registry.npmjs.org/yarn-or-npm/-/yarn-or-npm-3.0.1.tgz", "integrity": "sha512-fTiQP6WbDAh5QZAVdbMQkecZoahnbOjClTQhzv74WX5h2Uaidj1isf9FDes11TKtsZ0/ZVfZsqZ+O3x6aLERHQ==", "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^6.0.5", "pkg-dir": "^4.2.0" @@ -16952,10 +17108,11 @@ } }, "node_modules/yarn-or-npm/node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", "dev": true, + "license": "MIT", "dependencies": { "nice-try": "^1.0.4", "path-key": "^2.0.1", @@ -16972,6 +17129,7 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -16981,6 +17139,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -16990,6 +17149,7 @@ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^1.0.0" }, @@ -17002,6 +17162,7 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -17011,6 +17172,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, diff --git a/package.json b/package.json index d856cfcbd..b49f04b1a 100644 --- a/package.json +++ b/package.json @@ -141,12 +141,12 @@ "yauzl": "3.1.3" }, "devDependencies": { - "@electron-forge/cli": "7.5.0", - "@electron-forge/maker-deb": "7.5.0", - "@electron-forge/maker-dmg": "7.5.0", - "@electron-forge/maker-squirrel": "7.5.0", - "@electron-forge/maker-zip": "7.5.0", - "@electron-forge/plugin-auto-unpack-natives": "7.5.0", + "@electron-forge/cli": "7.6.0", + "@electron-forge/maker-deb": "7.6.0", + "@electron-forge/maker-dmg": "7.6.0", + "@electron-forge/maker-squirrel": "7.6.0", + "@electron-forge/maker-zip": "7.6.0", + "@electron-forge/plugin-auto-unpack-natives": "7.6.0", "@playwright/test": "1.48.2", "@types/archiver": "6.0.2", "@types/better-sqlite3": "7.6.11", From 4bba0410c4c960b39d5fa9eca64927671cc2d373 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 02:08:55 +0000 Subject: [PATCH 014/315] fix(deps): update dependency @mermaid-js/layout-elk to v0.1.7 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff204b16e..089296f17 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@electron/remote": "2.1.2", "@excalidraw/excalidraw": "0.17.6", "@highlightjs/cdn-assets": "11.10.0", - "@mermaid-js/layout-elk": "0.1.5", + "@mermaid-js/layout-elk": "0.1.7", "archiver": "7.0.1", "async-mutex": "0.5.0", "autocomplete.js": "0.38.1", @@ -3074,9 +3074,10 @@ } }, "node_modules/@mermaid-js/layout-elk": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@mermaid-js/layout-elk/-/layout-elk-0.1.5.tgz", - "integrity": "sha512-6ML4iWdVdyIkSW47KiID9runHzaomLxdMfNo9U60LJvfcQkB/FAjg0Vjc4AZEQnnBq7ibAoAknAWlT1XetwXSg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/@mermaid-js/layout-elk/-/layout-elk-0.1.7.tgz", + "integrity": "sha512-G3AJ2jMaCAqky2CT3z/sf3pK5UuS3tne98GsXDl3PkKByCmPmOYmJPf+6oX5PUlV3HNWWHuSgtZ9NU/CZDSuHQ==", + "license": "MIT", "dependencies": { "d3": "^7.9.0", "elkjs": "^0.9.3" diff --git a/package.json b/package.json index da1930f40..4cb42af03 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@electron/remote": "2.1.2", "@excalidraw/excalidraw": "0.17.6", "@highlightjs/cdn-assets": "11.10.0", - "@mermaid-js/layout-elk": "0.1.5", + "@mermaid-js/layout-elk": "0.1.7", "archiver": "7.0.1", "async-mutex": "0.5.0", "autocomplete.js": "0.38.1", From b553fc911d1f3f5a71c54ce1e5a3715fb21474dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 02:09:05 +0000 Subject: [PATCH 015/315] fix(deps): update dependency mermaid to v11.4.1 --- package-lock.json | 35 +++++++++++++++++------------------ package.json | 2 +- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff204b16e..31d59ded9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -66,7 +66,7 @@ "knockout": "3.5.1", "mark.js": "8.11.1", "marked": "14.1.3", - "mermaid": "11.4.0", + "mermaid": "11.4.1", "mime-types": "2.1.35", "mind-elixir": "4.3.1", "multer": "1.4.5-lts.1", @@ -3608,14 +3608,6 @@ "integrity": "sha512-jBqiORIzKDOToaF63Fm//haOCHuwQuLa2202RK4MozpA6lh93eCBc+/8+wZn5OzjJt3ySdc+74SXWXB55Ewtyw==", "dev": true }, - "node_modules/@types/dompurify": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz", - "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==", - "dependencies": { - "@types/trusted-types": "*" - } - }, "node_modules/@types/ejs": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz", @@ -4069,7 +4061,8 @@ "node_modules/@types/trusted-types": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", - "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==" + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "optional": true }, "node_modules/@types/turndown": { "version": "5.0.5", @@ -7358,9 +7351,13 @@ } }, "node_modules/dompurify": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz", - "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.1.tgz", + "integrity": "sha512-NBHEsc0/kzRYQd+AY6HR6B/IgsqzBABrqJbpCDQII/OK6h7B7LXzweZTDsqSW2LkTRpoxf18YUP+YjGySk6B3w==", + "license": "(MPL-2.0 OR Apache-2.0)", + "optionalDependencies": { + "@types/trusted-types": "^2.0.7" + } }, "node_modules/domutils": { "version": "2.8.0", @@ -12222,15 +12219,15 @@ } }, "node_modules/mermaid": { - "version": "11.4.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.4.0.tgz", - "integrity": "sha512-mxCfEYvADJqOiHfGpJXLs4/fAjHz448rH0pfY5fAoxiz70rQiDSzUUy4dNET2T08i46IVpjohPd6WWbzmRHiPA==", + "version": "11.4.1", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.4.1.tgz", + "integrity": "sha512-Mb01JT/x6CKDWaxigwfZYuYmDZ6xtrNwNlidKZwkSrDaY9n90tdrJTV5Umk+wP1fZscGptmKFXHsXMDEVZ+Q6A==", + "license": "MIT", "dependencies": { "@braintree/sanitize-url": "^7.0.1", "@iconify/utils": "^2.1.32", "@mermaid-js/parser": "^0.3.0", "@types/d3": "^7.4.3", - "@types/dompurify": "^3.0.5", "cytoscape": "^3.29.2", "cytoscape-cose-bilkent": "^4.1.0", "cytoscape-fcose": "^2.2.0", @@ -12238,7 +12235,7 @@ "d3-sankey": "^0.12.3", "dagre-d3-es": "7.0.11", "dayjs": "^1.11.10", - "dompurify": "^3.0.11 <3.1.7", + "dompurify": "^3.2.1", "katex": "^0.16.9", "khroma": "^2.1.0", "lodash-es": "^4.17.21", @@ -12253,6 +12250,7 @@ "version": "13.0.3", "resolved": "https://registry.npmjs.org/marked/-/marked-13.0.3.tgz", "integrity": "sha512-rqRix3/TWzE9rIoFGIn8JmsVfhiuC8VIQ8IdX5TfzmeBucdY05/0UlzKaw0eVtpcN/OdVFpBk7CjKGo9iHJ/zA==", + "license": "MIT", "bin": { "marked": "bin/marked.js" }, @@ -12268,6 +12266,7 @@ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], + "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } diff --git a/package.json b/package.json index da1930f40..33c114341 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "knockout": "3.5.1", "mark.js": "8.11.1", "marked": "14.1.3", - "mermaid": "11.4.0", + "mermaid": "11.4.1", "mime-types": "2.1.35", "mind-elixir": "4.3.1", "multer": "1.4.5-lts.1", From b2ff7fdf934a890d6f98ca55e38849777fdc5352 Mon Sep 17 00:00:00 2001 From: SiriusXT <1160925501@qq.com> Date: Fri, 29 Nov 2024 18:01:12 +0800 Subject: [PATCH 016/315] Add supported link protocols --- src/public/app/services/link.js | 11 ++++++++--- src/services/html_sanitizer.ts | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/public/app/services/link.js b/src/public/app/services/link.js index ed39563bc..30d30594d 100644 --- a/src/public/app/services/link.js +++ b/src/public/app/services/link.js @@ -258,9 +258,14 @@ function goToLinkExt(evt, hrefLink, $link) { } else { // Enable protocols supported by CKEditor 5 to be clickable. // Refer to `allowedProtocols` in https://github.com/TriliumNext/trilium-ckeditor5/blob/main/packages/ckeditor5-build-balloon-block/src/ckeditor.ts. - // Adding `:` to these links might be safer. - const otherAllowedProtocols = ['mailto:', 'tel:', 'sms:', 'sftp:', 'smb:', 'slack:', 'zotero:']; - if (otherAllowedProtocols.some(protocol => hrefLink.toLowerCase().startsWith(protocol))){ + // And be consistent with `allowedSchemes` in `src\services\html_sanitizer.ts` + const allowedSchemes = [ + 'http', 'https', 'ftp', 'ftps', 'mailto', 'data', 'evernote', 'file', 'facetime', 'gemini', 'git', + 'gopher', 'imap', 'irc', 'irc6', 'jabber', 'jar', 'lastfm', 'ldap', 'ldaps', 'magnet', 'message', + 'mumble', 'nfs', 'onenote', 'pop', 'rmi', 's3', 'sftp', 'skype', 'sms', 'spotify', 'steam', 'svn', 'udp', + 'view-source', 'vlc', 'vnc', 'ws', 'wss', 'xmpp', 'jdbc', 'slack', 'tel', 'smb', 'zotero' + ]; + if (allowedSchemes.some(protocol => hrefLink.toLowerCase().startsWith(protocol+':'))){ window.open(hrefLink, '_blank'); } } diff --git a/src/services/html_sanitizer.ts b/src/services/html_sanitizer.ts index f6f889049..86bb6bdb6 100644 --- a/src/services/html_sanitizer.ts +++ b/src/services/html_sanitizer.ts @@ -54,11 +54,12 @@ function sanitize(dirtyHtml: string) { allowedAttributes: { '*': [ 'class', 'style', 'title', 'src', 'href', 'hash', 'disabled', 'align', 'alt', 'center', 'data-*' ] }, + // Be consistent with `allowedSchemes` in `src\public\app\services\link.js` allowedSchemes: [ - 'http', 'https', 'ftp', 'ftps', 'mailto', 'data', 'evernote', 'file', 'facetime', 'irc', 'gemini', 'git', + 'http', 'https', 'ftp', 'ftps', 'mailto', 'data', 'evernote', 'file', 'facetime', 'gemini', 'git', 'gopher', 'imap', 'irc', 'irc6', 'jabber', 'jar', 'lastfm', 'ldap', 'ldaps', 'magnet', 'message', 'mumble', 'nfs', 'onenote', 'pop', 'rmi', 's3', 'sftp', 'skype', 'sms', 'spotify', 'steam', 'svn', 'udp', - 'view-source', 'vnc', 'ws', 'wss', 'xmpp', 'jdbc', 'slack' + 'view-source', 'vlc', 'vnc', 'ws', 'wss', 'xmpp', 'jdbc', 'slack', 'tel', 'smb', 'zotero' ], nonTextTags: [ 'head' From 428e6b9e41dcf46618e9536e1f38255ebfd6fd07 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 13:06:36 +0000 Subject: [PATCH 017/315] fix(deps): update dependency i18next-http-backend to v3 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4563e5d8b..f87cec6af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "https-proxy-agent": "7.0.5", "i18next": "24.0.2", "i18next-fs-backend": "2.6.0", - "i18next-http-backend": "2.7.1", + "i18next-http-backend": "3.0.1", "image-type": "4.1.0", "ini": "5.0.0", "is-animated": "2.0.2", @@ -10079,9 +10079,9 @@ "license": "MIT" }, "node_modules/i18next-http-backend": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.7.1.tgz", - "integrity": "sha512-vPksHIckysGgykCD8JwCr2YsJEml9Cyw+Yu2wtb4fQ7xIn9RH/hkUDh5UkwnIzb0kSL4SJ30Ab/sCInhQxbCgg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-3.0.1.tgz", + "integrity": "sha512-XT2lYSkbAtDE55c6m7CtKxxrsfuRQO3rUfHzj8ZyRtY9CkIX3aRGwXGTkUhpGWce+J8n7sfu3J0f2wTzo7Lw0A==", "license": "MIT", "dependencies": { "cross-fetch": "4.0.0" diff --git a/package.json b/package.json index bb30df31c..98c7dbaa4 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "https-proxy-agent": "7.0.5", "i18next": "24.0.2", "i18next-fs-backend": "2.6.0", - "i18next-http-backend": "2.7.1", + "i18next-http-backend": "3.0.1", "image-type": "4.1.0", "ini": "5.0.0", "is-animated": "2.0.2", From 0089346d0485f756d430c8d0d594cfb0455d8dd8 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 1 Dec 2024 02:02:33 +0200 Subject: [PATCH 018/315] feat(electron): enable native window buttons on frameless --- src/public/app/layouts/desktop_layout.js | 2 -- src/services/window.ts | 14 ++++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/public/app/layouts/desktop_layout.js b/src/public/app/layouts/desktop_layout.js index 995654f4c..a0f7f167c 100644 --- a/src/public/app/layouts/desktop_layout.js +++ b/src/public/app/layouts/desktop_layout.js @@ -103,7 +103,6 @@ export default class DesktopLayout { .class("tab-row-container") .child(new LeftPaneToggleWidget(true)) .child(new TabRowWidget().class("full-width")) - .child(new TitleBarButtonsWidget()) .css('height', '40px') .css('background-color', 'var(--launcher-pane-background-color)') .setParent(appContext) @@ -122,7 +121,6 @@ export default class DesktopLayout { .css("flex-grow", "1") .optChild(!launcherPaneIsHorizontal, new FlexContainer('row') .child(new TabRowWidget()) - .child(new TitleBarButtonsWidget()) .css('height', '40px') ) .child(new FlexContainer('row') diff --git a/src/services/window.ts b/src/services/window.ts index d0c625a15..370df0e63 100644 --- a/src/services/window.ts +++ b/src/services/window.ts @@ -8,7 +8,7 @@ import sqlInit from "./sql_init.js"; import cls from "./cls.js"; import keyboardActionsService from "./keyboard_actions.js"; import remoteMain from "@electron/remote/main/index.js"; -import { App, BrowserWindow, WebContents, ipcMain } from 'electron'; +import { App, BrowserWindow, BrowserWindowConstructorOptions, WebContents, ipcMain } from 'electron'; import { fileURLToPath } from "url"; import { dirname } from "path"; @@ -71,6 +71,12 @@ async function createMainWindow(app: App) { const { BrowserWindow } = (await import('electron')); // should not be statically imported + const extraOpts: Partial = {}; + if (!optionService.getOptionBool('nativeTitleBarVisible')) { + extraOpts.titleBarStyle = "hidden"; + extraOpts.titleBarOverlay = (process.platform !== "darwin"); + } + mainWindow = new BrowserWindow({ x: mainWindowState.x, y: mainWindowState.y, @@ -82,9 +88,9 @@ async function createMainWindow(app: App) { contextIsolation: false, spellcheck: spellcheckEnabled, webviewTag: true - }, - frame: optionService.getOptionBool('nativeTitleBarVisible'), - icon: getIcon() + }, + icon: getIcon(), + ...extraOpts }); mainWindowState.manage(mainWindow); From 60192977c9e8a07a26170c4e47c02a25c63f7a00 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 1 Dec 2024 02:18:35 +0200 Subject: [PATCH 019/315] feat(electron): set overlay information at runtime --- src/public/app/desktop.js | 18 ++++++++++++++++-- src/public/stylesheets/theme-next.css | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/public/app/desktop.js b/src/public/app/desktop.js index 835624d35..313bee034 100644 --- a/src/public/app/desktop.js +++ b/src/public/app/desktop.js @@ -30,8 +30,7 @@ bundleService.getWidgetBundlesByParent().then(async widgetBundles => { glob.setupGlobs(); if (utils.isElectron()) { - utils.dynamicRequire('electron').ipcRenderer.on('globalShortcut', - async (event, actionName) => appContext.triggerCommand(actionName)); + initOnElectron(); } macInit.init(); @@ -43,3 +42,18 @@ noteAutocompleteService.init(); if (utils.isElectron()) { electronContextMenu.setupContextMenu(); } + +function initOnElectron() { + const electron = utils.dynamicRequire('electron'); + electron.ipcRenderer.on('globalShortcut', async (event, actionName) => appContext.triggerCommand(actionName)); + + // Update the native title bar buttons. + const electronRemote = utils.dynamicRequire("@electron/remote"); + const currentWindow = electronRemote.getCurrentWindow(); + currentWindow.setTitleBarOverlay({ + color: "red", + symbolColor: "white" + }); + + console.log("Electron initialized."); +} \ No newline at end of file diff --git a/src/public/stylesheets/theme-next.css b/src/public/stylesheets/theme-next.css index 22556aba9..8c3bf8536 100644 --- a/src/public/stylesheets/theme-next.css +++ b/src/public/stylesheets/theme-next.css @@ -20,7 +20,7 @@ :root { /* --main-font-family: "Noto Sans", sans-serif; */ - --main-font-family: "Ubuntu Sans", sans-serif; + --main-font-family: "Segoe UI", sans-serif; /* --main-font-family: "Ubuntu", sans-serif; */ /* --main-font-family: "Nunito", sans-serif; */ /* --main-font-family: "Inter", sans-serif; */ From 01512152ea5345d417b49c98c206a1cd851db615 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 1 Dec 2024 02:36:00 +0200 Subject: [PATCH 020/315] feat(electron): load overlay information from CSS --- src/public/app/desktop.js | 7 ++++--- src/public/stylesheets/style.css | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/public/app/desktop.js b/src/public/app/desktop.js index 313bee034..aa9564c07 100644 --- a/src/public/app/desktop.js +++ b/src/public/app/desktop.js @@ -50,10 +50,11 @@ function initOnElectron() { // Update the native title bar buttons. const electronRemote = utils.dynamicRequire("@electron/remote"); const currentWindow = electronRemote.getCurrentWindow(); + const documentStyle = window.getComputedStyle(document.documentElement); currentWindow.setTitleBarOverlay({ - color: "red", - symbolColor: "white" + color: documentStyle.getPropertyValue("--native-titlebar-background"), + symbolColor: documentStyle.getPropertyValue("--native-titlebar-foreground") }); - + console.log("Electron initialized."); } \ No newline at end of file diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index cb8cdd1aa..87a2144d1 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -21,6 +21,8 @@ :root { --submenu-opening-delay: 300ms; + --native-titlebar-background: var(--left-pane-background-color); + --native-titlebar-foreground: var(--main-text-color); } html { From bd890c49d5a8df25113d4e3f5b825e436405a13a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 1 Dec 2024 03:02:03 +0200 Subject: [PATCH 021/315] feat(electron): relocate pin to global menu --- src/public/app/widgets/buttons/global_menu.js | 22 ++++ src/public/app/widgets/title_bar_buttons.js | 112 ------------------ 2 files changed, 22 insertions(+), 112 deletions(-) delete mode 100644 src/public/app/widgets/title_bar_buttons.js diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js index 9ee235a45..6607c0182 100644 --- a/src/public/app/widgets/buttons/global_menu.js +++ b/src/public/app/widgets/buttons/global_menu.js @@ -143,6 +143,11 @@ const TPL = ` + +
diff --git a/docs/backend_api/classes/becca_entities_battachment.default.html b/docs/backend_api/classes/becca_entities_battachment.default.html index 382811e3c..f4ea26a88 100644 --- a/docs/backend_api/classes/becca_entities_battachment.default.html +++ b/docs/backend_api/classes/becca_entities_battachment.default.html @@ -1,6 +1,6 @@ default | trilium

Attachment represent data related/attached to the note. Conceptually similar to attributes, but intended for larger amounts of data and generally not accessible to the user.

-

Hierarchy (View Summary)

Constructors

Hierarchy (View Summary)

Constructors

Properties

attachmentId? blobId? contentLength? @@ -47,10 +47,10 @@ larger amounts of data and generally not accessible to the user.

save setContent updateFromRow -

Constructors

Properties

attachmentId?: string
blobId?: string
contentLength?: number

optionally added to the entity

-
dateCreated?: string
dateModified?: string
isDecrypted?: boolean
isProtected?: boolean
isSynced?: boolean
mime: string
noteId?: number
ownerId: string

either noteId or revisionId to which this attachment belongs

-
position?: number
role: string
title: string
type?: "file" | "image"
utcDateCreated: string
utcDateModified?: string
utcDateScheduledForErasureSince?: null | string

Accessors

Methods

  • Returns {
        attachmentId: undefined | string;
        blobId: undefined | string;
        contentLength: undefined | number;
        dateModified: undefined | string;
        isDeleted: boolean;
        isProtected: boolean;
        mime: string;
        ownerId: string;
        position: undefined | number;
        role: string;
        title: undefined | string;
        utcDateModified: undefined | string;
        utcDateScheduledForErasureSince: undefined | null | string;
    }

  • Returns {
        attachmentId: undefined | string;
        blobId: undefined | string;
        contentLength: undefined | number;
        dateModified: undefined | string;
        isDeleted: boolean;
        isProtected: boolean;
        mime: string;
        ownerId: string;
        position: undefined | number;
        role: string;
        title: undefined | string;
        utcDateModified: undefined | string;
        utcDateScheduledForErasureSince: undefined | null | string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    +

Constructors

Properties

attachmentId?: string
blobId?: string
contentLength?: number

optionally added to the entity

+
dateCreated?: string
dateModified?: string
isDecrypted?: boolean
isProtected?: boolean
isSynced?: boolean
mime: string
noteId?: number
ownerId: string

either noteId or revisionId to which this attachment belongs

+
position?: number
role: string
title: string
type?: "file" | "image"
utcDateCreated: string
utcDateModified?: string
utcDateScheduledForErasureSince?: null | string

Accessors

Methods

  • Returns {
        attachmentId: undefined | string;
        blobId: undefined | string;
        contentLength: undefined | number;
        dateModified: undefined | string;
        isDeleted: boolean;
        isProtected: boolean;
        mime: string;
        ownerId: string;
        position: undefined | number;
        role: string;
        title: undefined | string;
        utcDateModified: undefined | string;
        utcDateScheduledForErasureSince: undefined | null | string;
    }

  • Returns {
        attachmentId: undefined | string;
        blobId: undefined | string;
        contentLength: undefined | number;
        dateModified: undefined | string;
        isDeleted: boolean;
        isProtected: boolean;
        mime: string;
        ownerId: string;
        position: undefined | number;
        role: string;
        title: undefined | string;
        utcDateModified: undefined | string;
        utcDateScheduledForErasureSince: undefined | null | string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

    -

    Parameters

    • deleteId: null | string = null

    Returns void

  • Parameters

    • content: string | Buffer<ArrayBufferLike>
    • Optionalopts: ContentOpts

    Returns void

+

Parameters

  • deleteId: null | string = null

Returns void

  • Parameters

    • content: string | Buffer<ArrayBufferLike>
    • Optionalopts: ContentOpts

    Returns void

diff --git a/docs/backend_api/classes/becca_entities_battribute.default.html b/docs/backend_api/classes/becca_entities_battribute.default.html index a34359a10..f5d75b8f6 100644 --- a/docs/backend_api/classes/becca_entities_battribute.default.html +++ b/docs/backend_api/classes/becca_entities_battribute.default.html @@ -1,6 +1,6 @@ default | trilium

Attribute is an abstract concept which has two real uses - label (key - value pair) and relation (representing named relationship between source and target note)

-

Hierarchy (View Summary)

Constructors

Hierarchy (View Summary)

Constructors

Properties

attributeId blobId? dateCreated? @@ -47,7 +47,7 @@ and relation (representing named relationship between source and target note)

update updateFromRow validate -

Constructors

Properties

attributeId: string
blobId?: string
dateCreated?: string
dateModified?: string
isInheritable: boolean
isProtected?: boolean
isSynced?: boolean
name: string
noteId: string
position: number
utcDateCreated: string
utcDateModified?: string
value: string

Accessors

Methods

  • Returns {
        attributeId: string;
        isDeleted: boolean;
        isInheritable: boolean;
        name: string;
        noteId: string;
        position: number;
        type: AttributeType;
        utcDateModified: undefined | string;
        value: string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    +

Constructors

Properties

attributeId: string
blobId?: string
dateCreated?: string
dateModified?: string
isInheritable: boolean
isProtected?: boolean
isSynced?: boolean
name: string
noteId: string
position: number
utcDateCreated: string
utcDateModified?: string
value: string

Accessors

Methods

  • Returns {
        attributeId: string;
        isDeleted: boolean;
        isInheritable: boolean;
        name: string;
        noteId: string;
        position: number;
        type: AttributeType;
        utcDateModified: undefined | string;
        value: string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

    -

    Parameters

    • deleteId: null | string = null

    Returns void

+

Parameters

  • deleteId: null | string = null

Returns void

diff --git a/docs/backend_api/classes/becca_entities_bblob.default.html b/docs/backend_api/classes/becca_entities_bblob.default.html index 2f692516b..beb757b33 100644 --- a/docs/backend_api/classes/becca_entities_bblob.default.html +++ b/docs/backend_api/classes/becca_entities_bblob.default.html @@ -1,5 +1,5 @@ default | trilium

Base class for all backend entities.

-

Hierarchy (View Summary)

Constructors

Hierarchy (View Summary)

Constructors

Properties

Constructors

Properties

blobId?: string
content: string | Buffer<ArrayBufferLike>
contentLength: number
dateCreated?: string
dateModified?: string
isProtected?: boolean
isSynced?: boolean
utcDateCreated: string
utcDateModified?: string

Accessors

Methods

  • Returns {
        blobId: undefined | string;
        content: null | string | Buffer<ArrayBufferLike>;
        contentLength: number;
        dateModified: undefined | string;
        utcDateModified: undefined | string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    +

Constructors

Properties

blobId?: string
content: string | Buffer<ArrayBufferLike>
contentLength: number
dateCreated?: string
dateModified?: string
isProtected?: boolean
isSynced?: boolean
utcDateCreated: string
utcDateModified?: string

Accessors

Methods

  • Returns {
        blobId: undefined | string;
        content: null | string | Buffer<ArrayBufferLike>;
        contentLength: number;
        dateModified: undefined | string;
        utcDateModified: undefined | string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

    -

    Parameters

    • deleteId: null | string = null

    Returns void

+

Parameters

  • deleteId: null | string = null

Returns void

diff --git a/docs/backend_api/classes/becca_entities_bbranch.default.html b/docs/backend_api/classes/becca_entities_bbranch.default.html index 6f6aa797e..dedfb0639 100644 --- a/docs/backend_api/classes/becca_entities_bbranch.default.html +++ b/docs/backend_api/classes/becca_entities_bbranch.default.html @@ -2,7 +2,7 @@ parents.

Note that you should not rely on the branch's identity, since it can change easily with a note's move. Always check noteId instead.

-

Hierarchy (View Summary)

Constructors

Hierarchy (View Summary)

Constructors

Properties

blobId? branchId? dateCreated? @@ -42,16 +42,16 @@ Always check noteId instead.

save update updateFromRow -

Constructors

Properties

blobId?: string
branchId?: string
dateCreated?: string
dateModified?: string
isExpanded: boolean
isProtected?: boolean
isSynced?: boolean
noteId: string
notePosition: number
parentNoteId: string
prefix: null | string
utcDateCreated: string
utcDateModified?: string

Accessors

  • get isWeak(): boolean
  • Branch is weak when its existence should not hinder deletion of its note. +

Constructors

Properties

blobId?: string
branchId?: string
dateCreated?: string
dateModified?: string
isExpanded: boolean
isProtected?: boolean
isSynced?: boolean
noteId: string
notePosition: number
parentNoteId: string
prefix: null | string
utcDateCreated: string
utcDateModified?: string

Accessors

  • get isWeak(): boolean
  • Branch is weak when its existence should not hinder deletion of its note. As a result, note with only weak branches should be immediately deleted. An example is shared or bookmarked clones - they are created automatically and exist for technical reasons, not as user-intended actions. From user perspective, they don't count as real clones and for the purpose of deletion should not act as a clone.

    -

    Returns boolean

Methods

  • Delete a branch. If this is a last note's branch, delete the note as well.

    +

    Returns boolean

Methods

  • Delete a branch. If this is a last note's branch, delete the note as well.

    Parameters

    • OptionaldeleteId: string

      optional delete identified

    • OptionaltaskContext: TaskContext

    Returns boolean

    true if note has been deleted, false otherwise

    -
  • Returns {
        branchId: undefined | string;
        isDeleted: boolean;
        isExpanded: boolean;
        noteId: string;
        notePosition: number;
        parentNoteId: string;
        prefix: null | string;
        utcDateModified: undefined | string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    +
  • Returns {
        branchId: undefined | string;
        isDeleted: boolean;
        isExpanded: boolean;
        noteId: string;
        notePosition: number;
        parentNoteId: string;
        prefix: null | string;
        utcDateModified: undefined | string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

    -

    Parameters

    • deleteId: null | string = null

    Returns void

+

Parameters

  • deleteId: null | string = null

Returns void

diff --git a/docs/backend_api/classes/becca_entities_betapi_token.default.html b/docs/backend_api/classes/becca_entities_betapi_token.default.html index 7811fc953..a82e30a78 100644 --- a/docs/backend_api/classes/becca_entities_betapi_token.default.html +++ b/docs/backend_api/classes/becca_entities_betapi_token.default.html @@ -6,7 +6,7 @@ Used by:

The format user is presented with is "_". This is also called "authToken" to distinguish it from tokenHash and token.

-

Hierarchy (View Summary)

Constructors

Hierarchy (View Summary)

Constructors

Properties

blobId? dateCreated? dateModified? @@ -36,7 +36,7 @@ from tokenHash and token.

putEntityChange save updateFromRow -

Constructors

Properties

blobId?: string
dateCreated?: string
dateModified?: string
etapiTokenId?: string
isProtected?: boolean
isSynced?: boolean
name: string
tokenHash: string
utcDateCreated: string
utcDateModified?: string

Accessors

Methods

  • Returns {
        etapiTokenId: undefined | string;
        isDeleted: boolean;
        name: string;
        tokenHash: string;
        utcDateCreated: string;
        utcDateModified: undefined | string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    +

Constructors

Properties

blobId?: string
dateCreated?: string
dateModified?: string
etapiTokenId?: string
isProtected?: boolean
isSynced?: boolean
name: string
tokenHash: string
utcDateCreated: string
utcDateModified?: string

Accessors

Methods

  • Returns {
        etapiTokenId: undefined | string;
        isDeleted: boolean;
        name: string;
        tokenHash: string;
        utcDateCreated: string;
        utcDateModified: undefined | string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

    -

    Parameters

    • deleteId: null | string = null

    Returns void

+

Parameters

  • deleteId: null | string = null

Returns void

diff --git a/docs/backend_api/classes/becca_entities_bnote.default.html b/docs/backend_api/classes/becca_entities_bnote.default.html index 74e685829..7d34d4eba 100644 --- a/docs/backend_api/classes/becca_entities_bnote.default.html +++ b/docs/backend_api/classes/becca_entities_bnote.default.html @@ -1,5 +1,5 @@ default | trilium

Trilium's main entity, which can represent text note, image, code note, file attachment etc.

-

Hierarchy (View Summary)

Constructors

Hierarchy (View Summary)

Constructors

Properties

Constructors

Properties

__flatTextCache: null | string
blobId?: string
children: default[]
contentAndAttachmentsAndRevisionsSize: null | number

size of the note content, attachment contents and revision contents in bytes

-
contentAndAttachmentsSize: null | number

size of the note content, attachment contents in bytes

-
contentSize: null | number

size of the content in bytes

-
dateCreated?: string
dateModified?: string
isBeingDeleted: boolean

set during the deletion operation, before it is completed (removed from becca completely).

-
isDecrypted: boolean
isProtected?: boolean
isSynced?: boolean
mime: string
noteId: string
ownedAttributes: default[]
parentBranches: default[]
parents: default[]
revisionCount: null | number

number of note revisions for this note

-
targetRelations: default[]
title: string
type:
    | "search"
    | "file"
    | "text"
    | "code"
    | "relationMap"
    | "render"
    | "book"
    | "mermaid"
    | "canvas"
    | "image"
    | "noteMap"
    | "launcher"
    | "doc"
    | "contentWidget"
    | "webView"
    | "mindMap"
utcDateCreated: string
utcDateModified?: string

Accessors

Methods

  • Parameters

    • Optionaltype: null | string
    • Optionalname: null | string

    Returns void

  • Adds a new attribute to this note. The attribute is saved and returned. +

Constructors

Properties

__flatTextCache: null | string
blobId?: string
children: default[]
contentAndAttachmentsAndRevisionsSize: null | number

size of the note content, attachment contents and revision contents in bytes

+
contentAndAttachmentsSize: null | number

size of the note content, attachment contents in bytes

+
contentSize: null | number

size of the content in bytes

+
dateCreated?: string
dateModified?: string
isBeingDeleted: boolean

set during the deletion operation, before it is completed (removed from becca completely).

+
isDecrypted: boolean
isProtected?: boolean
isSynced?: boolean
mime: string
noteId: string
ownedAttributes: default[]
parentBranches: default[]
parents: default[]
revisionCount: null | number

number of note revisions for this note

+
targetRelations: default[]
title: string
type:
    | "search"
    | "file"
    | "text"
    | "code"
    | "relationMap"
    | "render"
    | "book"
    | "mermaid"
    | "canvas"
    | "image"
    | "noteMap"
    | "launcher"
    | "doc"
    | "contentWidget"
    | "webView"
    | "mindMap"
utcDateCreated: string
utcDateModified?: string

Accessors

Methods

  • Parameters

    • Optionaltype: null | string
    • Optionalname: null | string

    Returns void

  • Adds a new attribute to this note. The attribute is saved and returned. See addLabel, addRelation for more specific methods.

    Parameters

    • type: AttributeType

      attribute type (label / relation)

    • name: string

      name of the attribute, not including the leading ~/#

    • value: string = ""

      value of the attribute - text for labels, target note ID for relations; optional.

      -
    • isInheritable: boolean = false
    • position: null | number = null

    Returns default

  • Adds a new label to this note. The label attribute is saved and returned.

    +
  • isInheritable: boolean = false
  • position: null | number = null

Returns default

  • Adds a new label to this note. The label attribute is saved and returned.

    Parameters

    • name: string

      name of the label, not including the leading #

    • value: string = ""

      text value of the label; optional

      -
    • isInheritable: boolean = false

    Returns default

  • Adds a new relation to this note. The relation attribute is saved and +

  • isInheritable: boolean = false

Returns default

  • Adds a new relation to this note. The relation attribute is saved and returned.

    Parameters

    • name: string

      name of the relation, not including the leading ~

      -
    • targetNoteId: string
    • isInheritable: boolean = false

    Returns default

  • Some notes are eligible for conversion into an attachment of its parent, note must have these properties:

    +
  • targetNoteId: string
  • isInheritable: boolean = false

Returns default

  • Some notes are eligible for conversion into an attachment of its parent, note must have these properties:

    • it has exactly one target relation
    • it has a relation from its parent note
    • @@ -197,36 +197,36 @@ returned.

      Currently, works only for image notes.

      In the future, this functionality might get more generic and some of the requirements relaxed.

    Parameters

    • opts: ConvertOpts = ...

    Returns null | default

    null if note is not eligible for conversion

    -
  • (Soft) delete a note and all its descendants.

    +
  • (Soft) delete a note and all its descendants.

    Parameters

    • deleteId: null | string = null

      optional delete identified

      -
    • taskContext: null | TaskContext = null

    Returns void

  • Gives all possible note paths leading to this note. Paths containing search note are ignored (could form cycles)

    +
  • taskContext: null | TaskContext = null

Returns void

  • Gives all possible note paths leading to this note. Paths containing search note are ignored (could form cycles)

    Returns string[][]

    array of notePaths (each represented by array of noteIds constituting the particular note path)

    -
  • Parameters

    • type: string

      attribute type (label, relation, etc.)

    • name: string

      attribute name

    Returns null | default

    attribute of the given type and name. If there are more such attributes, first is returned. Returns null if there's no such attribute belonging to this note.

    -
  • Parameters

    • type: string
    • name: string
    • Optionalvalue: null | string

    Returns undefined | default

  • Beware that the method must not create a copy of the array, but actually returns its internal array +

  • Parameters

    • type: string
    • name: string
    • Optionalvalue: null | string

    Returns undefined | default

  • Beware that the method must not create a copy of the array, but actually returns its internal array (for performance reasons)

    Parameters

    • Optionaltype: string

      (optional) attribute type to filter

    • Optionalname: string

      (optional) attribute name to filter

    Returns default[]

    all note's attributes, including inherited ones

    -
  • Parameters

  • Parameters

    • type: string

      attribute type (label, relation, etc.)

    • name: string

      attribute name

    Returns null | string

    attribute value of given type and name or null if no such attribute exists.

    -
  • Returns a note path considered to be the "best"

    +
  • Returns a note path considered to be the "best"

    Parameters

    • hoistedNoteId: string = 'root'

    Returns string[]

    array of noteIds constituting the particular note path

    -
  • Returns a note path considered to be the "best"

    +
  • Returns a note path considered to be the "best"

    Parameters

    • hoistedNoteId: string = 'root'

    Returns string

    serialized note path (e.g. 'root/a1h315/js725h')

    -
  • Note content has quite special handling - it's not a separate entity, but a lazily loaded +

  • Note content has quite special handling - it's not a separate entity, but a lazily loaded part of Note entity with its own sync. Reasons behind this hybrid design has been:

    • content can be quite large, and it's not necessary to load it / fill memory for any note access even if we don't need a content, especially for bulk operations like search
    • changes in the note metadata or title should not trigger note content sync (so we keep separate utcDateModified and entity changes records)
    • but to the user note content and title changes are one and the same - single dateModified (so all changes must go through Note and content is not a separate entity)
    -

    Returns string | Buffer<ArrayBufferLike>

  • This is used for:

    • fast searching
    • note similarity evaluation
    • @@ -234,114 +234,114 @@ part of Note entity with its own sync. Reasons behind this hybrid design has bee

    Returns string

    • returns flattened textual representation of note, prefixes and attributes
    -
  • Returns default[]

    returns only notes which are templated, does not include their subtrees in effect returns notes which are influenced by note's non-inheritable attributes

    -
  • Returns any

    valid object or null if the content cannot be parsed as JSON

    -
  • Returns any

    valid object or null if the content cannot be parsed as JSON

    +
  • Parameters

    • Optionalname: string

      label name to filter

    Returns default[]

    all note's labels (attributes with type label), including inherited ones

    -
  • Parameters

    • name: string

      label name

    Returns null | string

    label value if label exists, null otherwise

    -
  • Parameters

    • name: string

      label name to filter

    Returns string[]

    all note's label values, including inherited ones

    -
  • Parameters

    • type: string
    • name: string
    • value: null | string = null

    Returns null | default

    attribute belonging to this specific note (excludes inherited attributes)

    +
  • Parameters

    • type: string
    • name: string
    • value: null | string = null

    Returns null | default

    attribute belonging to this specific note (excludes inherited attributes)

    This method can be significantly faster than the getAttribute()

    -
  • Beware that the method must not create a copy of the array, but actually returns its internal array +

  • Beware that the method must not create a copy of the array, but actually returns its internal array (for performance reasons)

    Parameters

    • type: null | string = null

      (optional) attribute type to filter

    • name: null | string = null

      (optional) attribute name to filter

    • value: null | string = null

      (optional) attribute value to filter

    Returns default[]

    note's "owned" attributes - excluding inherited ones

    -
  • Parameters

  • Parameters

    • type: string

      attribute type (label, relation, etc.)

    • name: string

      attribute name

    Returns null | string

    attribute value of given type and name or null if no such attribute exists.

    -
  • Parameters

    • name: string

      label name to filter

    Returns default[]

    all note's labels (attributes with type label), excluding inherited ones

    -
  • Parameters

    • name: string

      label name

    Returns null | string

    label value if label exists, null otherwise

    -
  • Parameters

    • name: string

      label name to filter

    Returns string[]

    all note's label values, excluding inherited ones

    -
  • Parameters

    • Optionalname: null | string

      relation name to filter

    Returns default[]

    all note's relations (attributes with type relation), excluding inherited ones

    -
  • Parameters

    • name: string

      relation name

    Returns null | string

    relation value if relation exists, null otherwise

    -
  • Parameters

    • Optionalname: string

      relation name to filter

    Returns default[]

    all note's relations (attributes with type relation), including inherited ones

    -
  • Parameters

    • name: string

      relation name

    Returns null | string

    relation value if relation exists, null otherwise

    -
  • Returns null | "frontend" | "backend"

    JS script environment - either "frontend" or "backend"

    -
  • Parameters

    • hoistedNoteId: string = 'root'

    Returns NotePathRecord[]

  • Parameters

    • __namedParameters: { includeArchived?: boolean; includeHidden?: boolean; resolveSearch?: boolean } = {}

    Returns { notes: default[]; relationships: Relationship[] }

  • Parameters

    • __namedParameters: { includeArchived?: boolean; includeHidden?: boolean; resolveSearch?: boolean } = {}

    Returns string[]

    includes the subtree root note as well

    -
  • Parameters

    • type: string
    • name: string
    • value: null | string = null

    Returns boolean

  • Returns null | "frontend" | "backend"

    JS script environment - either "frontend" or "backend"

    +
  • Parameters

    • hoistedNoteId: string = 'root'

    Returns NotePathRecord[]

  • Parameters

    • __namedParameters: { includeArchived?: boolean; includeHidden?: boolean; resolveSearch?: boolean } = {}

    Returns { notes: default[]; relationships: Relationship[] }

  • Parameters

    • __namedParameters: { includeArchived?: boolean; includeHidden?: boolean; resolveSearch?: boolean } = {}

    Returns string[]

    includes the subtree root note as well

    +
  • Parameters

    • type: string
    • name: string
    • value: null | string = null

    Returns boolean

  • Parameters

    • name: string

      label name

    • Optionalvalue: string

      label value

    Returns boolean

    true if label exists (including inherited)

    -
  • Parameters

  • Parameters

    • type: string
    • name: string

      attribute name

    • Optionalvalue: string

      attribute value

    Returns boolean

    true if note has an attribute with given type and name (excluding inherited)

    -
  • Parameters

    • name: string

      label name

    • Optionalvalue: string

      label value

    Returns boolean

    true if label exists (excluding inherited)

    -
  • Parameters

    • name: string

      relation name

    • Optionalvalue: string

      relation value

    Returns boolean

    true if relation exists (excluding inherited)

    -
  • Parameters

    • name: string

      relation name

    • Optionalvalue: string

      relation value

    Returns boolean

    true if relation exists (including inherited)

    -
  • Parameters

    • ancestorNoteId: string

    Returns boolean

    true if ancestorNoteId occurs in at least one of the note's paths

    -
  • Parameters

    • opts: ConvertOpts = ...

    Returns boolean

  • Returns boolean

    boolean - true if there's no non-hidden path, note is not cloned to the visible tree

    -
  • Parameters

    • ancestorNoteId: string

    Returns boolean

    true if ancestorNoteId occurs in at least one of the note's paths

    +
  • Parameters

    • opts: ConvertOpts = ...

    Returns boolean

  • Returns boolean

    boolean - true if there's no non-hidden path, note is not cloned to the visible tree

    +
  • Parameters

    • name: string

      label name

    Returns boolean

    true if label exists (including inherited) and does not have "false" value.

    -
  • Returns boolean

    true if this note is the root of the note tree. Root note has "root" noteId

    -
  • Mark the entity as (soft) deleted. It will be completely erased later.

    +
  • Returns boolean

    true if this note is the root of the note tree. Root note has "root" noteId

    +
  • Mark the entity as (soft) deleted. It will be completely erased later.

    This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

    -

    Parameters

    • deleteId: null | string = null

    Returns void

  • Removes given attribute name-value pair if it exists.

    Parameters

    • type: string

      attribute type (label, relation, etc.)

    • name: string

      attribute name

    • Optionalvalue: string

      attribute value (optional)

      -

    Returns void

  • Remove label name-value pair, if it exists.

    +

Returns void

  • Remove label name-value pair, if it exists.

    Parameters

    • name: string

      label name

    • Optionalvalue: string

      label value

      -

    Returns void

  • Remove the relation name-value pair, if it exists.

    +

Returns void

  • Remove the relation name-value pair, if it exists.

    Parameters

    • name: string

      relation name

    • Optionalvalue: string

      relation value (noteId)

      -

    Returns void

  • Parameters

    • __namedParameters: AttachmentRow
    • matchBy: string = 'attachmentId'

      choose by which property we detect if to update an existing attachment. Supported values are either 'attachmentId' (default) or 'title'

      -

    Returns default

  • Update's given attribute's value or creates it if it doesn't exist

    +

Returns default

  • Update's given attribute's value or creates it if it doesn't exist

    Parameters

    • type: AttributeType

      attribute type (label, relation, etc.)

    • name: string

      attribute name

    • Optionalvalue: string

      attribute value (optional)

      -

    Returns void

  • Parameters

    • content: string | Buffer<ArrayBufferLike>
    • opts: ContentOpts = {}

    Returns void

  • Update's given label's value or creates it if it doesn't exist

    +

Returns void

  • Parameters

    • content: string | Buffer<ArrayBufferLike>
    • opts: ContentOpts = {}

    Returns void

  • Update's given label's value or creates it if it doesn't exist

    Parameters

    • name: string

      label name

    • Optionalvalue: string

      label value

      -

    Returns void

  • Update's given relation's value or creates it if it doesn't exist

    +

Returns void

  • Update's given relation's value or creates it if it doesn't exist

    Parameters

    • name: string

      relation name

    • Optionalvalue: string

      relation value (noteId)

      -

    Returns void

  • Based on enabled, the attribute is either set or removed.

    +

Returns void

  • Based on enabled, the attribute is either set or removed.

    Parameters

    • type: AttributeType

      attribute type ('relation', 'label' etc.)

    • enabled: boolean

      toggle On or Off

    • name: string

      attribute name

    • Optionalvalue: string

      attribute value (optional)

      -

    Returns void

  • Based on enabled, label is either set or removed.

    +

Returns void

  • Based on enabled, label is either set or removed.

    Parameters

    • enabled: boolean

      toggle On or Off

    • name: string

      label name

    • Optionalvalue: string

      label value (optional)

      -

    Returns void

  • Based on enabled, relation is either set or removed.

    +

Returns void

  • Based on enabled, relation is either set or removed.

    Parameters

    • enabled: boolean

      toggle On or Off

    • name: string

      relation name

    • Optionalvalue: string

      relation value (noteId)

      -

    Returns void

+

Returns void

diff --git a/docs/backend_api/classes/becca_entities_boption.default.html b/docs/backend_api/classes/becca_entities_boption.default.html index e8f01a50c..b13ceb36f 100644 --- a/docs/backend_api/classes/becca_entities_boption.default.html +++ b/docs/backend_api/classes/becca_entities_boption.default.html @@ -1,5 +1,5 @@ default | trilium

Option represents a name-value pair, either directly configurable by the user or some system property.

-

Hierarchy (View Summary)

Constructors

Hierarchy (View Summary)

Constructors

Properties

blobId?: string
dateCreated?: string
dateModified?: string
isProtected?: boolean
isSynced?: boolean
name: string
utcDateCreated: string
utcDateModified?: string
value: string

Accessors

Methods

  • Returns {
        isSynced: undefined | boolean;
        name: string;
        utcDateModified: undefined | string;
        value: string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    +

Constructors

Properties

blobId?: string
dateCreated?: string
dateModified?: string
isProtected?: boolean
isSynced?: boolean
name: string
utcDateCreated: string
utcDateModified?: string
value: string

Accessors

Methods

  • Returns {
        isSynced: undefined | boolean;
        name: string;
        utcDateModified: undefined | string;
        value: string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

    -

    Parameters

    • deleteId: null | string = null

    Returns void

+

Parameters

  • deleteId: null | string = null

Returns void

diff --git a/docs/backend_api/classes/becca_entities_brecent_note.default.html b/docs/backend_api/classes/becca_entities_brecent_note.default.html index 716fc9814..5d536c7b8 100644 --- a/docs/backend_api/classes/becca_entities_brecent_note.default.html +++ b/docs/backend_api/classes/becca_entities_brecent_note.default.html @@ -1,5 +1,5 @@ default | trilium

RecentNote represents recently visited note.

-

Hierarchy (View Summary)

Constructors

Hierarchy (View Summary)

Constructors

Properties

blobId?: string
dateCreated?: string
dateModified?: string
isProtected?: boolean
isSynced?: boolean
noteId: string
notePath: string
utcDateCreated: string
utcDateModified?: string

Accessors

Methods

  • Mark the entity as (soft) deleted. It will be completely erased later.

    +

Constructors

Properties

blobId?: string
dateCreated?: string
dateModified?: string
isProtected?: boolean
isSynced?: boolean
noteId: string
notePath: string
utcDateCreated: string
utcDateModified?: string

Accessors

Methods

  • Mark the entity as (soft) deleted. It will be completely erased later.

    This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

    -

    Parameters

    • deleteId: null | string = null

    Returns void

+

Parameters

  • deleteId: null | string = null

Returns void

diff --git a/docs/backend_api/classes/becca_entities_brevision.default.html b/docs/backend_api/classes/becca_entities_brevision.default.html index 42a0b64e5..da201582a 100644 --- a/docs/backend_api/classes/becca_entities_brevision.default.html +++ b/docs/backend_api/classes/becca_entities_brevision.default.html @@ -1,6 +1,6 @@ default | trilium

Revision represents a snapshot of note's title and content at some point in the past. It's used for seamless note versioning.

-

Hierarchy (View Summary)

Constructors

Hierarchy (View Summary)

Constructors

Properties

blobId? content? contentLength? @@ -47,11 +47,11 @@ It's used for seamless note versioning.

save setContent updateFromRow -

Constructors

Properties

blobId?: string
content?: string | Buffer<ArrayBufferLike>
contentLength?: number
dateCreated?: string
dateLastEdited?: string
dateModified?: string
isProtected?: boolean
isSynced?: boolean
mime: string
noteId: string
revisionId?: string
title: string
type: string
utcDateCreated: string
utcDateLastEdited?: string
utcDateModified?: string

Accessors

Methods

  • Returns {
        blobId: undefined | string;
        content: undefined | string | Buffer<ArrayBufferLike>;
        contentLength: undefined | number;
        dateCreated: undefined | string;
        dateLastEdited: undefined | string;
        isProtected: undefined | boolean;
        mime: string;
        noteId: string;
        revisionId: undefined | string;
        title: undefined | string;
        type: string;
        utcDateCreated: string;
        utcDateLastEdited: undefined | string;
        utcDateModified: undefined | string;
    }

  • Returns {
        blobId: undefined | string;
        content: undefined | string | Buffer<ArrayBufferLike>;
        contentLength: undefined | number;
        dateCreated: undefined | string;
        dateLastEdited: undefined | string;
        isProtected: undefined | boolean;
        mime: string;
        noteId: string;
        revisionId: undefined | string;
        title: undefined | string;
        type: string;
        utcDateCreated: string;
        utcDateLastEdited: undefined | string;
        utcDateModified: undefined | string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    +

Constructors

Properties

blobId?: string
content?: string | Buffer<ArrayBufferLike>
contentLength?: number
dateCreated?: string
dateLastEdited?: string
dateModified?: string
isProtected?: boolean
isSynced?: boolean
mime: string
noteId: string
revisionId?: string
title: string
type: string
utcDateCreated: string
utcDateLastEdited?: string
utcDateModified?: string

Accessors

Methods

  • Returns {
        blobId: undefined | string;
        content: undefined | string | Buffer<ArrayBufferLike>;
        contentLength: undefined | number;
        dateCreated: undefined | string;
        dateLastEdited: undefined | string;
        isProtected: undefined | boolean;
        mime: string;
        noteId: string;
        revisionId: undefined | string;
        title: undefined | string;
        type: string;
        utcDateCreated: string;
        utcDateLastEdited: undefined | string;
        utcDateModified: undefined | string;
    }

  • Returns {
        blobId: undefined | string;
        content: undefined | string | Buffer<ArrayBufferLike>;
        contentLength: undefined | number;
        dateCreated: undefined | string;
        dateLastEdited: undefined | string;
        isProtected: undefined | boolean;
        mime: string;
        noteId: string;
        revisionId: undefined | string;
        title: undefined | string;
        type: string;
        utcDateCreated: string;
        utcDateLastEdited: undefined | string;
        utcDateModified: undefined | string;
    }

  • Mark the entity as (soft) deleted. It will be completely erased later.

    This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

    -

    Parameters

    • deleteId: null | string = null

    Returns void

  • Parameters

    • content: string | Buffer<ArrayBufferLike>
    • opts: ContentOpts = {}

    Returns void

+

Parameters

  • deleteId: null | string = null

Returns void

  • Parameters

    • content: string | Buffer<ArrayBufferLike>
    • opts: ContentOpts = {}

    Returns void

diff --git a/docs/backend_api/interfaces/becca_entities_rows.AttachmentRow.html b/docs/backend_api/interfaces/becca_entities_rows.AttachmentRow.html index b50d16189..e0d1e5e48 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.AttachmentRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.AttachmentRow.html @@ -1,4 +1,4 @@ -AttachmentRow | trilium
interface AttachmentRow {
    attachmentId?: string;
    blobId?: string;
    content?: string | Buffer<ArrayBufferLike>;
    contentLength?: number;
    dateModified?: string;
    isProtected?: boolean;
    mime: string;
    ownerId?: string;
    position?: number;
    role: string;
    title: string;
    utcDateModified?: string;
    utcDateScheduledForErasureSince?: string;
}

Properties

attachmentId? +AttachmentRow | trilium
interface AttachmentRow {
    attachmentId?: string;
    blobId?: string;
    content?: string | Buffer<ArrayBufferLike>;
    contentLength?: number;
    dateModified?: string;
    isProtected?: boolean;
    mime: string;
    ownerId?: string;
    position?: number;
    role: string;
    title: string;
    utcDateModified?: string;
    utcDateScheduledForErasureSince?: string;
}

Properties

attachmentId?: string
blobId?: string
content?: string | Buffer<ArrayBufferLike>
contentLength?: number
dateModified?: string
isProtected?: boolean
mime: string
ownerId?: string
position?: number
role: string
title: string
utcDateModified?: string
utcDateScheduledForErasureSince?: string
+

Properties

attachmentId?: string
blobId?: string
content?: string | Buffer<ArrayBufferLike>
contentLength?: number
dateModified?: string
isProtected?: boolean
mime: string
ownerId?: string
position?: number
role: string
title: string
utcDateModified?: string
utcDateScheduledForErasureSince?: string
diff --git a/docs/backend_api/interfaces/becca_entities_rows.AttributeRow.html b/docs/backend_api/interfaces/becca_entities_rows.AttributeRow.html index 13232fc56..badc7f521 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.AttributeRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.AttributeRow.html @@ -1,4 +1,4 @@ -AttributeRow | trilium
interface AttributeRow {
    attributeId?: string;
    isInheritable?: boolean;
    name: string;
    noteId?: string;
    position?: null | number;
    type: AttributeType;
    utcDateModified?: string;
    value?: string;
}

Properties

attributeId? +AttributeRow | trilium
interface AttributeRow {
    attributeId?: string;
    isInheritable?: boolean;
    name: string;
    noteId?: string;
    position?: null | number;
    type: AttributeType;
    utcDateModified?: string;
    value?: string;
}

Properties

attributeId?: string
isInheritable?: boolean
name: string
noteId?: string
position?: null | number
utcDateModified?: string
value?: string
+

Properties

attributeId?: string
isInheritable?: boolean
name: string
noteId?: string
position?: null | number
utcDateModified?: string
value?: string
diff --git a/docs/backend_api/interfaces/becca_entities_rows.BlobRow.html b/docs/backend_api/interfaces/becca_entities_rows.BlobRow.html index f5a23e08a..2f038e1c2 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.BlobRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.BlobRow.html @@ -1,6 +1,6 @@ -BlobRow | trilium
interface BlobRow {
    blobId: string;
    content: string | Buffer<ArrayBufferLike>;
    contentLength: number;
    dateModified: string;
    utcDateModified: string;
}

Properties

blobId +BlobRow | trilium
interface BlobRow {
    blobId: string;
    content: string | Buffer<ArrayBufferLike>;
    contentLength: number;
    dateModified: string;
    utcDateModified: string;
}

Properties

blobId: string
content: string | Buffer<ArrayBufferLike>
contentLength: number
dateModified: string
utcDateModified: string
+

Properties

blobId: string
content: string | Buffer<ArrayBufferLike>
contentLength: number
dateModified: string
utcDateModified: string
diff --git a/docs/backend_api/interfaces/becca_entities_rows.BranchRow.html b/docs/backend_api/interfaces/becca_entities_rows.BranchRow.html index b5225a135..293f63d5e 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.BranchRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.BranchRow.html @@ -1,4 +1,4 @@ -BranchRow | trilium
interface BranchRow {
    branchId?: string;
    isDeleted?: boolean;
    isExpanded?: boolean;
    noteId: string;
    notePosition?: null | number;
    parentNoteId: string;
    prefix?: null | string;
    utcDateModified?: string;
}

Properties

branchId? +BranchRow | trilium
interface BranchRow {
    branchId?: string;
    isDeleted?: boolean;
    isExpanded?: boolean;
    noteId: string;
    notePosition?: null | number;
    parentNoteId: string;
    prefix?: null | string;
    utcDateModified?: string;
}

Properties

branchId?: string
isDeleted?: boolean
isExpanded?: boolean
noteId: string
notePosition?: null | number
parentNoteId: string
prefix?: null | string
utcDateModified?: string
+

Properties

branchId?: string
isDeleted?: boolean
isExpanded?: boolean
noteId: string
notePosition?: null | number
parentNoteId: string
prefix?: null | string
utcDateModified?: string
diff --git a/docs/backend_api/interfaces/becca_entities_rows.EtapiTokenRow.html b/docs/backend_api/interfaces/becca_entities_rows.EtapiTokenRow.html index 6a8afd207..f21d78572 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.EtapiTokenRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.EtapiTokenRow.html @@ -1,7 +1,7 @@ -EtapiTokenRow | trilium
interface EtapiTokenRow {
    etapiTokenId?: string;
    isDeleted?: boolean;
    name: string;
    tokenHash: string;
    utcDateCreated?: string;
    utcDateModified?: string;
}

Properties

etapiTokenId? +EtapiTokenRow | trilium
interface EtapiTokenRow {
    etapiTokenId?: string;
    isDeleted?: boolean;
    name: string;
    tokenHash: string;
    utcDateCreated?: string;
    utcDateModified?: string;
}

Properties

etapiTokenId?: string
isDeleted?: boolean
name: string
tokenHash: string
utcDateCreated?: string
utcDateModified?: string
+

Properties

etapiTokenId?: string
isDeleted?: boolean
name: string
tokenHash: string
utcDateCreated?: string
utcDateModified?: string
diff --git a/docs/backend_api/interfaces/becca_entities_rows.NoteRow.html b/docs/backend_api/interfaces/becca_entities_rows.NoteRow.html index e1ec0ca59..4a56f60b9 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.NoteRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.NoteRow.html @@ -1,4 +1,4 @@ -NoteRow | trilium
interface NoteRow {
    blobId: string;
    content?: string | Buffer<ArrayBufferLike>;
    dateCreated: string;
    dateModified: string;
    deleteId: string;
    isDeleted: boolean;
    isProtected: boolean;
    mime: string;
    noteId: string;
    title: string;
    type:
        | "search"
        | "file"
        | "text"
        | "code"
        | "relationMap"
        | "render"
        | "book"
        | "mermaid"
        | "canvas"
        | "image"
        | "noteMap"
        | "launcher"
        | "doc"
        | "contentWidget"
        | "webView"
        | "mindMap";
    utcDateCreated: string;
    utcDateModified: string;
}

Properties

blobId +NoteRow | trilium
interface NoteRow {
    blobId: string;
    content?: string | Buffer<ArrayBufferLike>;
    dateCreated: string;
    dateModified: string;
    deleteId: string;
    isDeleted: boolean;
    isProtected: boolean;
    mime: string;
    noteId: string;
    title: string;
    type:
        | "search"
        | "file"
        | "text"
        | "code"
        | "relationMap"
        | "render"
        | "book"
        | "mermaid"
        | "canvas"
        | "image"
        | "noteMap"
        | "launcher"
        | "doc"
        | "contentWidget"
        | "webView"
        | "mindMap";
    utcDateCreated: string;
    utcDateModified: string;
}

Properties

blobId: string
content?: string | Buffer<ArrayBufferLike>
dateCreated: string
dateModified: string
deleteId: string
isDeleted: boolean
isProtected: boolean
mime: string
noteId: string
title: string
type:
    | "search"
    | "file"
    | "text"
    | "code"
    | "relationMap"
    | "render"
    | "book"
    | "mermaid"
    | "canvas"
    | "image"
    | "noteMap"
    | "launcher"
    | "doc"
    | "contentWidget"
    | "webView"
    | "mindMap"
utcDateCreated: string
utcDateModified: string
+

Properties

blobId: string
content?: string | Buffer<ArrayBufferLike>
dateCreated: string
dateModified: string
deleteId: string
isDeleted: boolean
isProtected: boolean
mime: string
noteId: string
title: string
type:
    | "search"
    | "file"
    | "text"
    | "code"
    | "relationMap"
    | "render"
    | "book"
    | "mermaid"
    | "canvas"
    | "image"
    | "noteMap"
    | "launcher"
    | "doc"
    | "contentWidget"
    | "webView"
    | "mindMap"
utcDateCreated: string
utcDateModified: string
diff --git a/docs/backend_api/interfaces/becca_entities_rows.OptionRow.html b/docs/backend_api/interfaces/becca_entities_rows.OptionRow.html index 951402e00..6b9427cd8 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.OptionRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.OptionRow.html @@ -1,11 +1,11 @@ OptionRow | trilium

Database representation of an option.

Options are key-value pairs that are used to store information such as user preferences (for example the current theme, sync server information), but also information about the state of the application).

-
interface OptionRow {
    isSynced: boolean;
    name: string;
    utcDateModified?: string;
    value: string;
}

Properties

interface OptionRow {
    isSynced: boolean;
    name: string;
    utcDateModified?: string;
    value: string;
}

Properties

isSynced: boolean

true if the value should be synced across multiple instances (e.g. locale) or false if it should be local-only (e.g. theme).

-
name: string

The name of the option.

-
utcDateModified?: string
value: string

The value of the option.

-
+
name: string

The name of the option.

+
utcDateModified?: string
value: string

The value of the option.

+
diff --git a/docs/backend_api/interfaces/becca_entities_rows.RecentNoteRow.html b/docs/backend_api/interfaces/becca_entities_rows.RecentNoteRow.html index d7458d9da..d4fdb1f9d 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.RecentNoteRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.RecentNoteRow.html @@ -1,4 +1,4 @@ -RecentNoteRow | trilium
interface RecentNoteRow {
    noteId: string;
    notePath: string;
    utcDateCreated?: string;
}

Properties

noteId +RecentNoteRow | trilium
interface RecentNoteRow {
    noteId: string;
    notePath: string;
    utcDateCreated?: string;
}

Properties

noteId: string
notePath: string
utcDateCreated?: string
+

Properties

noteId: string
notePath: string
utcDateCreated?: string
diff --git a/docs/backend_api/interfaces/becca_entities_rows.RevisionRow.html b/docs/backend_api/interfaces/becca_entities_rows.RevisionRow.html index a6a5402d3..64ed1ab21 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.RevisionRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.RevisionRow.html @@ -1,4 +1,4 @@ -RevisionRow | trilium
interface RevisionRow {
    blobId?: string;
    contentLength?: number;
    dateCreated: string;
    dateLastEdited?: string;
    isProtected?: boolean;
    mime: string;
    noteId: string;
    revisionId?: string;
    title: string;
    type: string;
    utcDateCreated: string;
    utcDateLastEdited?: string;
    utcDateModified: string;
}

Properties

blobId? +RevisionRow | trilium
interface RevisionRow {
    blobId?: string;
    contentLength?: number;
    dateCreated: string;
    dateLastEdited?: string;
    isProtected?: boolean;
    mime: string;
    noteId: string;
    revisionId?: string;
    title: string;
    type: string;
    utcDateCreated: string;
    utcDateLastEdited?: string;
    utcDateModified: string;
}

Properties

blobId?: string
contentLength?: number
dateCreated: string
dateLastEdited?: string
isProtected?: boolean
mime: string
noteId: string
revisionId?: string
title: string
type: string
utcDateCreated: string
utcDateLastEdited?: string
utcDateModified: string
+

Properties

blobId?: string
contentLength?: number
dateCreated: string
dateLastEdited?: string
isProtected?: boolean
mime: string
noteId: string
revisionId?: string
title: string
type: string
utcDateCreated: string
utcDateLastEdited?: string
utcDateModified: string
diff --git a/docs/backend_api/types/becca_entities_rows.AttributeType.html b/docs/backend_api/types/becca_entities_rows.AttributeType.html index 26f515f7b..c55212d07 100644 --- a/docs/backend_api/types/becca_entities_rows.AttributeType.html +++ b/docs/backend_api/types/becca_entities_rows.AttributeType.html @@ -1 +1 @@ -AttributeType | trilium
AttributeType: "label" | "relation" | "label-definition" | "relation-definition"
+AttributeType | trilium
AttributeType: "label" | "relation" | "label-definition" | "relation-definition"
diff --git a/docs/backend_api/types/becca_entities_rows.NoteType.html b/docs/backend_api/types/becca_entities_rows.NoteType.html index f509dd66e..8352415bc 100644 --- a/docs/backend_api/types/becca_entities_rows.NoteType.html +++ b/docs/backend_api/types/becca_entities_rows.NoteType.html @@ -1 +1 @@ -NoteType | trilium
NoteType: typeof ALLOWED_NOTE_TYPES[number]
+NoteType | trilium
NoteType: typeof ALLOWED_NOTE_TYPES[number]
diff --git a/docs/backend_api/variables/becca_entities_rows.ALLOWED_NOTE_TYPES.html b/docs/backend_api/variables/becca_entities_rows.ALLOWED_NOTE_TYPES.html index 57d702701..9e0de4bf4 100644 --- a/docs/backend_api/variables/becca_entities_rows.ALLOWED_NOTE_TYPES.html +++ b/docs/backend_api/variables/becca_entities_rows.ALLOWED_NOTE_TYPES.html @@ -1,4 +1,4 @@ ALLOWED_NOTE_TYPES | trilium

Variable ALLOWED_NOTE_TYPESConst

ALLOWED_NOTE_TYPES: readonly [
    "file",
    "image",
    "search",
    "noteMap",
    "launcher",
    "doc",
    "contentWidget",
    "text",
    "relationMap",
    "render",
    "canvas",
    "mermaid",
    "book",
    "webView",
    "code",
    "mindMap",
] = ...

There are many different Note types, some of which are entirely opaque to the end user. Those types should be used only for checking against, they are not for direct use.

-
+
diff --git a/docs/backend_api/variables/services_backend_script_api.default.html b/docs/backend_api/variables/services_backend_script_api.default.html index 7f9939dd7..0411fa280 100644 --- a/docs/backend_api/variables/services_backend_script_api.default.html +++ b/docs/backend_api/variables/services_backend_script_api.default.html @@ -1 +1 @@ -default | trilium
default: new (currentNote: default, apiParams: ApiParams) => Api
+default | trilium
default: new (currentNote: default, apiParams: ApiParams) => Api
diff --git a/docs/backend_api/variables/services_sql.default.html b/docs/backend_api/variables/services_sql.default.html index ccc3ed24f..037d90e28 100644 --- a/docs/backend_api/variables/services_sql.default.html +++ b/docs/backend_api/variables/services_sql.default.html @@ -1,7 +1,7 @@ default | trilium
default: {
    copyDatabase: (targetFilePath: string) => Promise<void>;
    dbConnection: Database;
    disableSlowQueryLogging: <T>(cb: () => T) => T;
    execute: (query: string, params?: any) => RunResult;
    executeMany: (query: string, params: any) => void;
    executeScript: (query: string) => DatabaseType;
    fillParamList: (
        paramIds: string[] | Set<string>,
        truncate?: boolean,
    ) => void;
    getColumn: <T>(query: string, params?: any) => T[];
    getManyRows: <T>(query: string, params: any) => T[];
    getMap: <K extends string | number | symbol, V>(
        query: string,
        params?: any,
    ) => Record<K, V>;
    getRawRows: <T extends {} | unknown[]>(query: string, params?: any) => T[];
    getRow: <T>(query: string, params?: any) => T;
    getRowOrNull: <T>(query: string, params?: any) => T | null;
    getRows: <T>(query: string, params?: any) => T[];
    getValue: <T>(query: string, params?: any) => T;
    insert: <T extends {}>(
        tableName: string,
        rec: T,
        replace?: boolean,
    ) => undefined | null | number | bigint;
    iterateRows: <T>(query: string, params?: any) => IterableIterator<T>;
    rebuildIntegrationTestDatabase: () => void;
    replace: <T extends {}>(tableName: string, rec: T) => number | null;
    transactional: <T>(
        func: (statement: Statement<unknown[], unknown>) => T,
    ) => any;
    upsert: <T extends {}>(
        tableName: string,
        primaryKey: string,
        rec: T,
    ) => void;
}

Type declaration

  • copyDatabase: (targetFilePath: string) => Promise<void>
  • dbConnection: Database
  • disableSlowQueryLogging: <T>(cb: () => T) => T
  • execute: (query: string, params?: any) => RunResult

    Execute SQL

    -
  • executeMany: (query: string, params: any) => void
  • executeScript: (query: string) => DatabaseType
  • fillParamList: (paramIds: string[] | Set<string>, truncate?: boolean) => void
  • getColumn: <T>(query: string, params?: any) => T[]

    Get a first column in an array.

    -
  • getManyRows: <T>(query: string, params: any) => T[]
  • getMap: <K extends string | number | symbol, V>(
        query: string,
        params?: any,
    ) => Record<K, V>

    Get a map of first column mapping to second column.

    -
  • getRawRows: <T extends {} | unknown[]>(query: string, params?: any) => T[]
  • getRow: <T>(query: string, params?: any) => T

    Get first returned row.

    -
  • getRowOrNull: <T>(query: string, params?: any) => T | null
  • getRows: <T>(query: string, params?: any) => T[]

    Get all returned rows.

    -
  • getValue: <T>(query: string, params?: any) => T

    Get single value from the given query - first column from first returned row.

    -
  • insert: <T extends {}>(
        tableName: string,
        rec: T,
        replace?: boolean,
    ) => undefined | null | number | bigint
  • iterateRows: <T>(query: string, params?: any) => IterableIterator<T>
  • rebuildIntegrationTestDatabase: () => void
  • replace: <T extends {}>(tableName: string, rec: T) => number | null
  • transactional: <T>(func: (statement: Statement<unknown[], unknown>) => T) => any
  • upsert: <T extends {}>(tableName: string, primaryKey: string, rec: T) => void
+
  • executeMany: (query: string, params: any) => void
  • executeScript: (query: string) => DatabaseType
  • fillParamList: (paramIds: string[] | Set<string>, truncate?: boolean) => void
  • getColumn: <T>(query: string, params?: any) => T[]

    Get a first column in an array.

    +
  • getManyRows: <T>(query: string, params: any) => T[]
  • getMap: <K extends string | number | symbol, V>(
        query: string,
        params?: any,
    ) => Record<K, V>

    Get a map of first column mapping to second column.

    +
  • getRawRows: <T extends {} | unknown[]>(query: string, params?: any) => T[]
  • getRow: <T>(query: string, params?: any) => T

    Get first returned row.

    +
  • getRowOrNull: <T>(query: string, params?: any) => T | null
  • getRows: <T>(query: string, params?: any) => T[]

    Get all returned rows.

    +
  • getValue: <T>(query: string, params?: any) => T

    Get single value from the given query - first column from first returned row.

    +
  • insert: <T extends {}>(
        tableName: string,
        rec: T,
        replace?: boolean,
    ) => undefined | null | number | bigint
  • iterateRows: <T>(query: string, params?: any) => IterableIterator<T>
  • rebuildIntegrationTestDatabase: () => void
  • replace: <T extends {}>(tableName: string, rec: T) => number | null
  • transactional: <T>(func: (statement: Statement<unknown[], unknown>) => T) => any
  • upsert: <T extends {}>(tableName: string, primaryKey: string, rec: T) => void
  • diff --git a/src/services/sql.ts b/src/services/sql.ts index 0f1cf5ea4..d2b14c669 100644 --- a/src/services/sql.ts +++ b/src/services/sql.ts @@ -347,7 +347,6 @@ export default { /** * Get single value from the given query - first column from first returned row. * - * @method * @param query - SQL query with ? used as parameter placeholder * @param params - array of params if needed * @returns single value @@ -357,7 +356,6 @@ export default { /** * Get first returned row. * - * @method * @param query - SQL query with ? used as parameter placeholder * @param params - array of params if needed * @returns - map of column name to column value @@ -368,7 +366,6 @@ export default { /** * Get all returned rows. * - * @method * @param query - SQL query with ? used as parameter placeholder * @param params - array of params if needed * @returns - array of all rows, each row is a map of column name to column value @@ -381,7 +378,6 @@ export default { /** * Get a map of first column mapping to second column. * - * @method * @param query - SQL query with ? used as parameter placeholder * @param params - array of params if needed * @returns - map of first column to second column @@ -391,7 +387,6 @@ export default { /** * Get a first column in an array. * - * @method * @param query - SQL query with ? used as parameter placeholder * @param params - array of params if needed * @returns array of first column of all returned rows @@ -401,7 +396,6 @@ export default { /** * Execute SQL * - * @method * @param query - SQL query with ? used as parameter placeholder * @param params - array of params if needed */ From 1833894004bcb5709704efc1d3216ac5b31406a8 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 11 Dec 2024 19:34:34 +0200 Subject: [PATCH 246/315] chore(backend-docs): update after new library added --- ...ntities_abstract_becca_entity.default.html | 8 +- .../becca_entities_battachment.default.html | 14 +- .../becca_entities_battribute.default.html | 8 +- .../classes/becca_entities_bblob.default.html | 8 +- .../becca_entities_bbranch.default.html | 14 +- .../becca_entities_betapi_token.default.html | 8 +- .../classes/becca_entities_bnote.default.html | 144 +++++++++--------- .../becca_entities_boption.default.html | 8 +- .../becca_entities_brecent_note.default.html | 8 +- .../becca_entities_brevision.default.html | 16 +- .../becca_entities_rows.AttachmentRow.html | 4 +- .../becca_entities_rows.AttributeRow.html | 4 +- .../becca_entities_rows.BlobRow.html | 4 +- .../becca_entities_rows.BranchRow.html | 4 +- .../becca_entities_rows.EtapiTokenRow.html | 4 +- .../becca_entities_rows.NoteRow.html | 4 +- .../becca_entities_rows.OptionRow.html | 8 +- .../becca_entities_rows.RecentNoteRow.html | 4 +- .../becca_entities_rows.RevisionRow.html | 4 +- .../becca_entities_rows.AttributeType.html | 2 +- .../types/becca_entities_rows.NoteType.html | 2 +- ...ecca_entities_rows.ALLOWED_NOTE_TYPES.html | 2 +- .../services_backend_script_api.default.html | 2 +- .../variables/services_sql.default.html | 2 +- 24 files changed, 143 insertions(+), 143 deletions(-) diff --git a/docs/backend_api/classes/becca_entities_abstract_becca_entity.default.html b/docs/backend_api/classes/becca_entities_abstract_becca_entity.default.html index 4ae0766fe..257ec2584 100644 --- a/docs/backend_api/classes/becca_entities_abstract_becca_entity.default.html +++ b/docs/backend_api/classes/becca_entities_abstract_becca_entity.default.html @@ -1,5 +1,5 @@ default | trilium

    Base class for all backend entities.

    -

    Type Parameters

    Hierarchy (View Summary)

    Constructors

    Type Parameters

    Hierarchy (View Summary)

    Constructors

    Properties

    blobId?: string
    dateCreated?: string
    dateModified?: string
    isProtected?: boolean
    isSynced?: boolean
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    Methods

    • Parameters

      • content: string | Buffer<ArrayBufferLike>
      • opts: ContentOpts = {}

      Returns void

    • Mark the entity as (soft) deleted. It will be completely erased later.

      +

    Constructors

    Properties

    blobId?: string
    dateCreated?: string
    dateModified?: string
    isProtected?: boolean
    isSynced?: boolean
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    Methods

    • Parameters

      • content: string | Buffer<ArrayBufferLike>
      • opts: ContentOpts = {}

      Returns void

    • Mark the entity as (soft) deleted. It will be completely erased later.

      This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

      -

      Parameters

      • deleteId: null | string = null

      Returns void

    +

    Parameters

    • deleteId: null | string = null

    Returns void

    diff --git a/docs/backend_api/classes/becca_entities_battachment.default.html b/docs/backend_api/classes/becca_entities_battachment.default.html index f4ea26a88..13b07c061 100644 --- a/docs/backend_api/classes/becca_entities_battachment.default.html +++ b/docs/backend_api/classes/becca_entities_battachment.default.html @@ -1,6 +1,6 @@ default | trilium

    Attachment represent data related/attached to the note. Conceptually similar to attributes, but intended for larger amounts of data and generally not accessible to the user.

    -

    Hierarchy (View Summary)

    Constructors

    Hierarchy (View Summary)

    Constructors

    Properties

    attachmentId? blobId? contentLength? @@ -47,10 +47,10 @@ larger amounts of data and generally not accessible to the user.

    save setContent updateFromRow -

    Constructors

    Properties

    attachmentId?: string
    blobId?: string
    contentLength?: number

    optionally added to the entity

    -
    dateCreated?: string
    dateModified?: string
    isDecrypted?: boolean
    isProtected?: boolean
    isSynced?: boolean
    mime: string
    noteId?: number
    ownerId: string

    either noteId or revisionId to which this attachment belongs

    -
    position?: number
    role: string
    title: string
    type?: "file" | "image"
    utcDateCreated: string
    utcDateModified?: string
    utcDateScheduledForErasureSince?: null | string

    Accessors

    Methods

    • Returns {
          attachmentId: undefined | string;
          blobId: undefined | string;
          contentLength: undefined | number;
          dateModified: undefined | string;
          isDeleted: boolean;
          isProtected: boolean;
          mime: string;
          ownerId: string;
          position: undefined | number;
          role: string;
          title: undefined | string;
          utcDateModified: undefined | string;
          utcDateScheduledForErasureSince: undefined | null | string;
      }

    • Returns {
          attachmentId: undefined | string;
          blobId: undefined | string;
          contentLength: undefined | number;
          dateModified: undefined | string;
          isDeleted: boolean;
          isProtected: boolean;
          mime: string;
          ownerId: string;
          position: undefined | number;
          role: string;
          title: undefined | string;
          utcDateModified: undefined | string;
          utcDateScheduledForErasureSince: undefined | null | string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      +

    Constructors

    Properties

    attachmentId?: string
    blobId?: string
    contentLength?: number

    optionally added to the entity

    +
    dateCreated?: string
    dateModified?: string
    isDecrypted?: boolean
    isProtected?: boolean
    isSynced?: boolean
    mime: string
    noteId?: number
    ownerId: string

    either noteId or revisionId to which this attachment belongs

    +
    position?: number
    role: string
    title: string
    type?: "file" | "image"
    utcDateCreated: string
    utcDateModified?: string
    utcDateScheduledForErasureSince?: null | string

    Accessors

    Methods

    • Returns {
          attachmentId: undefined | string;
          blobId: undefined | string;
          contentLength: undefined | number;
          dateModified: undefined | string;
          isDeleted: boolean;
          isProtected: boolean;
          mime: string;
          ownerId: string;
          position: undefined | number;
          role: string;
          title: undefined | string;
          utcDateModified: undefined | string;
          utcDateScheduledForErasureSince: undefined | null | string;
      }

    • Returns {
          attachmentId: undefined | string;
          blobId: undefined | string;
          contentLength: undefined | number;
          dateModified: undefined | string;
          isDeleted: boolean;
          isProtected: boolean;
          mime: string;
          ownerId: string;
          position: undefined | number;
          role: string;
          title: undefined | string;
          utcDateModified: undefined | string;
          utcDateScheduledForErasureSince: undefined | null | string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

      -

      Parameters

      • deleteId: null | string = null

      Returns void

    • Parameters

      • content: string | Buffer<ArrayBufferLike>
      • Optionalopts: ContentOpts

      Returns void

    +

    Parameters

    • deleteId: null | string = null

    Returns void

    • Parameters

      • content: string | Buffer<ArrayBufferLike>
      • Optionalopts: ContentOpts

      Returns void

    diff --git a/docs/backend_api/classes/becca_entities_battribute.default.html b/docs/backend_api/classes/becca_entities_battribute.default.html index f5d75b8f6..7ceaf1f7a 100644 --- a/docs/backend_api/classes/becca_entities_battribute.default.html +++ b/docs/backend_api/classes/becca_entities_battribute.default.html @@ -1,6 +1,6 @@ default | trilium

    Attribute is an abstract concept which has two real uses - label (key - value pair) and relation (representing named relationship between source and target note)

    -

    Hierarchy (View Summary)

    Constructors

    Hierarchy (View Summary)

    Constructors

    Properties

    attributeId blobId? dateCreated? @@ -47,7 +47,7 @@ and relation (representing named relationship between source and target note)

    update updateFromRow validate -

    Constructors

    Properties

    attributeId: string
    blobId?: string
    dateCreated?: string
    dateModified?: string
    isInheritable: boolean
    isProtected?: boolean
    isSynced?: boolean
    name: string
    noteId: string
    position: number
    utcDateCreated: string
    utcDateModified?: string
    value: string

    Accessors

    Methods

    • Returns {
          attributeId: string;
          isDeleted: boolean;
          isInheritable: boolean;
          name: string;
          noteId: string;
          position: number;
          type: AttributeType;
          utcDateModified: undefined | string;
          value: string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      +

    Constructors

    Properties

    attributeId: string
    blobId?: string
    dateCreated?: string
    dateModified?: string
    isInheritable: boolean
    isProtected?: boolean
    isSynced?: boolean
    name: string
    noteId: string
    position: number
    utcDateCreated: string
    utcDateModified?: string
    value: string

    Accessors

    Methods

    • Returns {
          attributeId: string;
          isDeleted: boolean;
          isInheritable: boolean;
          name: string;
          noteId: string;
          position: number;
          type: AttributeType;
          utcDateModified: undefined | string;
          value: string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

      -

      Parameters

      • deleteId: null | string = null

      Returns void

    +

    Parameters

    • deleteId: null | string = null

    Returns void

    diff --git a/docs/backend_api/classes/becca_entities_bblob.default.html b/docs/backend_api/classes/becca_entities_bblob.default.html index beb757b33..90f26b7e8 100644 --- a/docs/backend_api/classes/becca_entities_bblob.default.html +++ b/docs/backend_api/classes/becca_entities_bblob.default.html @@ -1,5 +1,5 @@ default | trilium

    Base class for all backend entities.

    -

    Hierarchy (View Summary)

    Constructors

    Hierarchy (View Summary)

    Constructors

    Properties

    Constructors

    Properties

    blobId?: string
    content: string | Buffer<ArrayBufferLike>
    contentLength: number
    dateCreated?: string
    dateModified?: string
    isProtected?: boolean
    isSynced?: boolean
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    Methods

    • Returns {
          blobId: undefined | string;
          content: null | string | Buffer<ArrayBufferLike>;
          contentLength: number;
          dateModified: undefined | string;
          utcDateModified: undefined | string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      +

    Constructors

    Properties

    blobId?: string
    content: string | Buffer<ArrayBufferLike>
    contentLength: number
    dateCreated?: string
    dateModified?: string
    isProtected?: boolean
    isSynced?: boolean
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    Methods

    • Returns {
          blobId: undefined | string;
          content: null | string | Buffer<ArrayBufferLike>;
          contentLength: number;
          dateModified: undefined | string;
          utcDateModified: undefined | string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

      -

      Parameters

      • deleteId: null | string = null

      Returns void

    +

    Parameters

    • deleteId: null | string = null

    Returns void

    diff --git a/docs/backend_api/classes/becca_entities_bbranch.default.html b/docs/backend_api/classes/becca_entities_bbranch.default.html index dedfb0639..201603936 100644 --- a/docs/backend_api/classes/becca_entities_bbranch.default.html +++ b/docs/backend_api/classes/becca_entities_bbranch.default.html @@ -2,7 +2,7 @@ parents.

    Note that you should not rely on the branch's identity, since it can change easily with a note's move. Always check noteId instead.

    -

    Hierarchy (View Summary)

    Constructors

    Hierarchy (View Summary)

    Constructors

    Properties

    blobId? branchId? dateCreated? @@ -42,16 +42,16 @@ Always check noteId instead.

    save update updateFromRow -

    Constructors

    Properties

    blobId?: string
    branchId?: string
    dateCreated?: string
    dateModified?: string
    isExpanded: boolean
    isProtected?: boolean
    isSynced?: boolean
    noteId: string
    notePosition: number
    parentNoteId: string
    prefix: null | string
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    • get isWeak(): boolean
    • Branch is weak when its existence should not hinder deletion of its note. +

    Constructors

    Properties

    blobId?: string
    branchId?: string
    dateCreated?: string
    dateModified?: string
    isExpanded: boolean
    isProtected?: boolean
    isSynced?: boolean
    noteId: string
    notePosition: number
    parentNoteId: string
    prefix: null | string
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    • get isWeak(): boolean
    • Branch is weak when its existence should not hinder deletion of its note. As a result, note with only weak branches should be immediately deleted. An example is shared or bookmarked clones - they are created automatically and exist for technical reasons, not as user-intended actions. From user perspective, they don't count as real clones and for the purpose of deletion should not act as a clone.

      -

      Returns boolean

    Methods

    • Delete a branch. If this is a last note's branch, delete the note as well.

      +

      Returns boolean

    Methods

    • Delete a branch. If this is a last note's branch, delete the note as well.

      Parameters

      • OptionaldeleteId: string

        optional delete identified

      • OptionaltaskContext: TaskContext

      Returns boolean

      true if note has been deleted, false otherwise

      -
    • Returns {
          branchId: undefined | string;
          isDeleted: boolean;
          isExpanded: boolean;
          noteId: string;
          notePosition: number;
          parentNoteId: string;
          prefix: null | string;
          utcDateModified: undefined | string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      +
    • Returns {
          branchId: undefined | string;
          isDeleted: boolean;
          isExpanded: boolean;
          noteId: string;
          notePosition: number;
          parentNoteId: string;
          prefix: null | string;
          utcDateModified: undefined | string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

      -

      Parameters

      • deleteId: null | string = null

      Returns void

    +

    Parameters

    • deleteId: null | string = null

    Returns void

    diff --git a/docs/backend_api/classes/becca_entities_betapi_token.default.html b/docs/backend_api/classes/becca_entities_betapi_token.default.html index a82e30a78..354bc3b65 100644 --- a/docs/backend_api/classes/becca_entities_betapi_token.default.html +++ b/docs/backend_api/classes/becca_entities_betapi_token.default.html @@ -6,7 +6,7 @@ Used by:

    The format user is presented with is "_". This is also called "authToken" to distinguish it from tokenHash and token.

    -

    Hierarchy (View Summary)

    Constructors

    Hierarchy (View Summary)

    Constructors

    Properties

    blobId? dateCreated? dateModified? @@ -36,7 +36,7 @@ from tokenHash and token.

    putEntityChange save updateFromRow -

    Constructors

    Properties

    blobId?: string
    dateCreated?: string
    dateModified?: string
    etapiTokenId?: string
    isProtected?: boolean
    isSynced?: boolean
    name: string
    tokenHash: string
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    Methods

    • Returns {
          etapiTokenId: undefined | string;
          isDeleted: boolean;
          name: string;
          tokenHash: string;
          utcDateCreated: string;
          utcDateModified: undefined | string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      +

    Constructors

    Properties

    blobId?: string
    dateCreated?: string
    dateModified?: string
    etapiTokenId?: string
    isProtected?: boolean
    isSynced?: boolean
    name: string
    tokenHash: string
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    Methods

    • Returns {
          etapiTokenId: undefined | string;
          isDeleted: boolean;
          name: string;
          tokenHash: string;
          utcDateCreated: string;
          utcDateModified: undefined | string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

      -

      Parameters

      • deleteId: null | string = null

      Returns void

    +

    Parameters

    • deleteId: null | string = null

    Returns void

    diff --git a/docs/backend_api/classes/becca_entities_bnote.default.html b/docs/backend_api/classes/becca_entities_bnote.default.html index 7d34d4eba..dfd3fdced 100644 --- a/docs/backend_api/classes/becca_entities_bnote.default.html +++ b/docs/backend_api/classes/becca_entities_bnote.default.html @@ -1,5 +1,5 @@ default | trilium

    Trilium's main entity, which can represent text note, image, code note, file attachment etc.

    -

    Hierarchy (View Summary)

    Constructors

    Hierarchy (View Summary)

    Constructors

    Properties

    Constructors

    Properties

    __flatTextCache: null | string
    blobId?: string
    children: default[]
    contentAndAttachmentsAndRevisionsSize: null | number

    size of the note content, attachment contents and revision contents in bytes

    -
    contentAndAttachmentsSize: null | number

    size of the note content, attachment contents in bytes

    -
    contentSize: null | number

    size of the content in bytes

    -
    dateCreated?: string
    dateModified?: string
    isBeingDeleted: boolean

    set during the deletion operation, before it is completed (removed from becca completely).

    -
    isDecrypted: boolean
    isProtected?: boolean
    isSynced?: boolean
    mime: string
    noteId: string
    ownedAttributes: default[]
    parentBranches: default[]
    parents: default[]
    revisionCount: null | number

    number of note revisions for this note

    -
    targetRelations: default[]
    title: string
    type:
        | "search"
        | "file"
        | "text"
        | "code"
        | "relationMap"
        | "render"
        | "book"
        | "mermaid"
        | "canvas"
        | "image"
        | "noteMap"
        | "launcher"
        | "doc"
        | "contentWidget"
        | "webView"
        | "mindMap"
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    Methods

    • Parameters

      • Optionaltype: null | string
      • Optionalname: null | string

      Returns void

    • Adds a new attribute to this note. The attribute is saved and returned. +

    Constructors

    Properties

    __flatTextCache: null | string
    blobId?: string
    children: default[]
    contentAndAttachmentsAndRevisionsSize: null | number

    size of the note content, attachment contents and revision contents in bytes

    +
    contentAndAttachmentsSize: null | number

    size of the note content, attachment contents in bytes

    +
    contentSize: null | number

    size of the content in bytes

    +
    dateCreated?: string
    dateModified?: string
    isBeingDeleted: boolean

    set during the deletion operation, before it is completed (removed from becca completely).

    +
    isDecrypted: boolean
    isProtected?: boolean
    isSynced?: boolean
    mime: string
    noteId: string
    ownedAttributes: default[]
    parentBranches: default[]
    parents: default[]
    revisionCount: null | number

    number of note revisions for this note

    +
    targetRelations: default[]
    title: string
    type:
        | "search"
        | "file"
        | "text"
        | "code"
        | "relationMap"
        | "render"
        | "book"
        | "mermaid"
        | "canvas"
        | "image"
        | "noteMap"
        | "launcher"
        | "doc"
        | "contentWidget"
        | "webView"
        | "mindMap"
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    Methods

    • Parameters

      • Optionaltype: null | string
      • Optionalname: null | string

      Returns void

    • Adds a new attribute to this note. The attribute is saved and returned. See addLabel, addRelation for more specific methods.

      Parameters

      • type: AttributeType

        attribute type (label / relation)

      • name: string

        name of the attribute, not including the leading ~/#

      • value: string = ""

        value of the attribute - text for labels, target note ID for relations; optional.

        -
      • isInheritable: boolean = false
      • position: null | number = null

      Returns default

    • Adds a new label to this note. The label attribute is saved and returned.

      +
    • isInheritable: boolean = false
    • position: null | number = null

    Returns default

    • Adds a new label to this note. The label attribute is saved and returned.

      Parameters

      • name: string

        name of the label, not including the leading #

      • value: string = ""

        text value of the label; optional

        -
      • isInheritable: boolean = false

      Returns default

    • Adds a new relation to this note. The relation attribute is saved and +

    • isInheritable: boolean = false

    Returns default

    • Adds a new relation to this note. The relation attribute is saved and returned.

      Parameters

      • name: string

        name of the relation, not including the leading ~

        -
      • targetNoteId: string
      • isInheritable: boolean = false

      Returns default

    • Some notes are eligible for conversion into an attachment of its parent, note must have these properties:

      +
    • targetNoteId: string
    • isInheritable: boolean = false

    Returns default

    • Some notes are eligible for conversion into an attachment of its parent, note must have these properties:

      • it has exactly one target relation
      • it has a relation from its parent note
      • @@ -197,36 +197,36 @@ returned.

        Currently, works only for image notes.

        In the future, this functionality might get more generic and some of the requirements relaxed.

      Parameters

      • opts: ConvertOpts = ...

      Returns null | default

      null if note is not eligible for conversion

      -
    • (Soft) delete a note and all its descendants.

      +
    • (Soft) delete a note and all its descendants.

      Parameters

      • deleteId: null | string = null

        optional delete identified

        -
      • taskContext: null | TaskContext = null

      Returns void

    • Gives all possible note paths leading to this note. Paths containing search note are ignored (could form cycles)

      +
    • taskContext: null | TaskContext = null

    Returns void

    • Gives all possible note paths leading to this note. Paths containing search note are ignored (could form cycles)

      Returns string[][]

      array of notePaths (each represented by array of noteIds constituting the particular note path)

      -
    • Parameters

      • type: string

        attribute type (label, relation, etc.)

      • name: string

        attribute name

      Returns null | default

      attribute of the given type and name. If there are more such attributes, first is returned. Returns null if there's no such attribute belonging to this note.

      -
    • Parameters

      • type: string
      • name: string
      • Optionalvalue: null | string

      Returns undefined | default

    • Beware that the method must not create a copy of the array, but actually returns its internal array +

    • Parameters

      • type: string
      • name: string
      • Optionalvalue: null | string

      Returns undefined | default

    • Beware that the method must not create a copy of the array, but actually returns its internal array (for performance reasons)

      Parameters

      • Optionaltype: string

        (optional) attribute type to filter

      • Optionalname: string

        (optional) attribute name to filter

      Returns default[]

      all note's attributes, including inherited ones

      -
    • Parameters

    • Parameters

      • type: string

        attribute type (label, relation, etc.)

      • name: string

        attribute name

      Returns null | string

      attribute value of given type and name or null if no such attribute exists.

      -
    • Returns a note path considered to be the "best"

      +
    • Returns a note path considered to be the "best"

      Parameters

      • hoistedNoteId: string = 'root'

      Returns string[]

      array of noteIds constituting the particular note path

      -
    • Returns a note path considered to be the "best"

      +
    • Returns a note path considered to be the "best"

      Parameters

      • hoistedNoteId: string = 'root'

      Returns string

      serialized note path (e.g. 'root/a1h315/js725h')

      -
    • Note content has quite special handling - it's not a separate entity, but a lazily loaded +

    • Note content has quite special handling - it's not a separate entity, but a lazily loaded part of Note entity with its own sync. Reasons behind this hybrid design has been:

      • content can be quite large, and it's not necessary to load it / fill memory for any note access even if we don't need a content, especially for bulk operations like search
      • changes in the note metadata or title should not trigger note content sync (so we keep separate utcDateModified and entity changes records)
      • but to the user note content and title changes are one and the same - single dateModified (so all changes must go through Note and content is not a separate entity)
      -

      Returns string | Buffer<ArrayBufferLike>

    • This is used for:

      • fast searching
      • note similarity evaluation
      • @@ -234,114 +234,114 @@ part of Note entity with its own sync. Reasons behind this hybrid design has bee

      Returns string

      • returns flattened textual representation of note, prefixes and attributes
      -
    • Returns default[]

      returns only notes which are templated, does not include their subtrees in effect returns notes which are influenced by note's non-inheritable attributes

      -
    • Returns any

      valid object or null if the content cannot be parsed as JSON

      -
    • Returns any

      valid object or null if the content cannot be parsed as JSON

      +
    • Parameters

      • Optionalname: string

        label name to filter

      Returns default[]

      all note's labels (attributes with type label), including inherited ones

      -
    • Parameters

      • name: string

        label name

      Returns null | string

      label value if label exists, null otherwise

      -
    • Parameters

      • name: string

        label name to filter

      Returns string[]

      all note's label values, including inherited ones

      -
    • Parameters

      • type: string
      • name: string
      • value: null | string = null

      Returns null | default

      attribute belonging to this specific note (excludes inherited attributes)

      +
    • Parameters

      • type: string
      • name: string
      • value: null | string = null

      Returns null | default

      attribute belonging to this specific note (excludes inherited attributes)

      This method can be significantly faster than the getAttribute()

      -
    • Beware that the method must not create a copy of the array, but actually returns its internal array +

    • Beware that the method must not create a copy of the array, but actually returns its internal array (for performance reasons)

      Parameters

      • type: null | string = null

        (optional) attribute type to filter

      • name: null | string = null

        (optional) attribute name to filter

      • value: null | string = null

        (optional) attribute value to filter

      Returns default[]

      note's "owned" attributes - excluding inherited ones

      -
    • Parameters

    • Parameters

      • type: string

        attribute type (label, relation, etc.)

      • name: string

        attribute name

      Returns null | string

      attribute value of given type and name or null if no such attribute exists.

      -
    • Parameters

      • name: string

        label name to filter

      Returns default[]

      all note's labels (attributes with type label), excluding inherited ones

      -
    • Parameters

      • name: string

        label name

      Returns null | string

      label value if label exists, null otherwise

      -
    • Parameters

      • name: string

        label name to filter

      Returns string[]

      all note's label values, excluding inherited ones

      -
    • Parameters

      • Optionalname: null | string

        relation name to filter

      Returns default[]

      all note's relations (attributes with type relation), excluding inherited ones

      -
    • Parameters

      • name: string

        relation name

      Returns null | string

      relation value if relation exists, null otherwise

      -
    • Parameters

      • Optionalname: string

        relation name to filter

      Returns default[]

      all note's relations (attributes with type relation), including inherited ones

      -
    • Parameters

      • name: string

        relation name

      Returns null | string

      relation value if relation exists, null otherwise

      -
    • Returns null | "frontend" | "backend"

      JS script environment - either "frontend" or "backend"

      -
    • Parameters

      • hoistedNoteId: string = 'root'

      Returns NotePathRecord[]

    • Parameters

      • __namedParameters: { includeArchived?: boolean; includeHidden?: boolean; resolveSearch?: boolean } = {}

      Returns { notes: default[]; relationships: Relationship[] }

    • Parameters

      • __namedParameters: { includeArchived?: boolean; includeHidden?: boolean; resolveSearch?: boolean } = {}

      Returns string[]

      includes the subtree root note as well

      -
    • Parameters

      • type: string
      • name: string
      • value: null | string = null

      Returns boolean

    • Returns null | "frontend" | "backend"

      JS script environment - either "frontend" or "backend"

      +
    • Parameters

      • hoistedNoteId: string = 'root'

      Returns NotePathRecord[]

    • Parameters

      • __namedParameters: { includeArchived?: boolean; includeHidden?: boolean; resolveSearch?: boolean } = {}

      Returns { notes: default[]; relationships: Relationship[] }

    • Parameters

      • __namedParameters: { includeArchived?: boolean; includeHidden?: boolean; resolveSearch?: boolean } = {}

      Returns string[]

      includes the subtree root note as well

      +
    • Parameters

      • type: string
      • name: string
      • value: null | string = null

      Returns boolean

    • Parameters

      • name: string

        label name

      • Optionalvalue: string

        label value

      Returns boolean

      true if label exists (including inherited)

      -
    • Parameters

    • Parameters

      • type: string
      • name: string

        attribute name

      • Optionalvalue: string

        attribute value

      Returns boolean

      true if note has an attribute with given type and name (excluding inherited)

      -
    • Parameters

      • name: string

        label name

      • Optionalvalue: string

        label value

      Returns boolean

      true if label exists (excluding inherited)

      -
    • Parameters

      • name: string

        relation name

      • Optionalvalue: string

        relation value

      Returns boolean

      true if relation exists (excluding inherited)

      -
    • Parameters

      • name: string

        relation name

      • Optionalvalue: string

        relation value

      Returns boolean

      true if relation exists (including inherited)

      -
    • Parameters

      • ancestorNoteId: string

      Returns boolean

      true if ancestorNoteId occurs in at least one of the note's paths

      -
    • Parameters

      • opts: ConvertOpts = ...

      Returns boolean

    • Returns boolean

      boolean - true if there's no non-hidden path, note is not cloned to the visible tree

      -
    • Parameters

      • ancestorNoteId: string

      Returns boolean

      true if ancestorNoteId occurs in at least one of the note's paths

      +
    • Parameters

      • opts: ConvertOpts = ...

      Returns boolean

    • Returns boolean

      boolean - true if there's no non-hidden path, note is not cloned to the visible tree

      +
    • Parameters

      • name: string

        label name

      Returns boolean

      true if label exists (including inherited) and does not have "false" value.

      -
    • Returns boolean

      true if this note is the root of the note tree. Root note has "root" noteId

      -
    • Mark the entity as (soft) deleted. It will be completely erased later.

      +
    • Returns boolean

      true if this note is the root of the note tree. Root note has "root" noteId

      +
    • Mark the entity as (soft) deleted. It will be completely erased later.

      This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

      -

      Parameters

      • deleteId: null | string = null

      Returns void

    • Removes given attribute name-value pair if it exists.

      Parameters

      • type: string

        attribute type (label, relation, etc.)

      • name: string

        attribute name

      • Optionalvalue: string

        attribute value (optional)

        -

      Returns void

    • Remove label name-value pair, if it exists.

      +

    Returns void

    • Remove label name-value pair, if it exists.

      Parameters

      • name: string

        label name

      • Optionalvalue: string

        label value

        -

      Returns void

    • Remove the relation name-value pair, if it exists.

      +

    Returns void

    • Remove the relation name-value pair, if it exists.

      Parameters

      • name: string

        relation name

      • Optionalvalue: string

        relation value (noteId)

        -

      Returns void

    • Parameters

      • __namedParameters: AttachmentRow
      • matchBy: string = 'attachmentId'

        choose by which property we detect if to update an existing attachment. Supported values are either 'attachmentId' (default) or 'title'

        -

      Returns default

    • Update's given attribute's value or creates it if it doesn't exist

      +

    Returns default

    • Update's given attribute's value or creates it if it doesn't exist

      Parameters

      • type: AttributeType

        attribute type (label, relation, etc.)

      • name: string

        attribute name

      • Optionalvalue: string

        attribute value (optional)

        -

      Returns void

    • Parameters

      • content: string | Buffer<ArrayBufferLike>
      • opts: ContentOpts = {}

      Returns void

    • Update's given label's value or creates it if it doesn't exist

      +

    Returns void

    • Parameters

      • content: string | Buffer<ArrayBufferLike>
      • opts: ContentOpts = {}

      Returns void

    • Update's given label's value or creates it if it doesn't exist

      Parameters

      • name: string

        label name

      • Optionalvalue: string

        label value

        -

      Returns void

    • Update's given relation's value or creates it if it doesn't exist

      +

    Returns void

    • Update's given relation's value or creates it if it doesn't exist

      Parameters

      • name: string

        relation name

      • Optionalvalue: string

        relation value (noteId)

        -

      Returns void

    • Based on enabled, the attribute is either set or removed.

      +

    Returns void

    • Based on enabled, the attribute is either set or removed.

      Parameters

      • type: AttributeType

        attribute type ('relation', 'label' etc.)

      • enabled: boolean

        toggle On or Off

      • name: string

        attribute name

      • Optionalvalue: string

        attribute value (optional)

        -

      Returns void

    • Based on enabled, label is either set or removed.

      +

    Returns void

    • Based on enabled, label is either set or removed.

      Parameters

      • enabled: boolean

        toggle On or Off

      • name: string

        label name

      • Optionalvalue: string

        label value (optional)

        -

      Returns void

    • Based on enabled, relation is either set or removed.

      +

    Returns void

    • Based on enabled, relation is either set or removed.

      Parameters

      • enabled: boolean

        toggle On or Off

      • name: string

        relation name

      • Optionalvalue: string

        relation value (noteId)

        -

      Returns void

    +

    Returns void

    diff --git a/docs/backend_api/classes/becca_entities_boption.default.html b/docs/backend_api/classes/becca_entities_boption.default.html index b13ceb36f..00343c60a 100644 --- a/docs/backend_api/classes/becca_entities_boption.default.html +++ b/docs/backend_api/classes/becca_entities_boption.default.html @@ -1,5 +1,5 @@ default | trilium

    Option represents a name-value pair, either directly configurable by the user or some system property.

    -

    Hierarchy (View Summary)

    Constructors

    Hierarchy (View Summary)

    Constructors

    Properties

    blobId?: string
    dateCreated?: string
    dateModified?: string
    isProtected?: boolean
    isSynced?: boolean
    name: string
    utcDateCreated: string
    utcDateModified?: string
    value: string

    Accessors

    Methods

    • Returns {
          isSynced: undefined | boolean;
          name: string;
          utcDateModified: undefined | string;
          value: string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      +

    Constructors

    Properties

    blobId?: string
    dateCreated?: string
    dateModified?: string
    isProtected?: boolean
    isSynced?: boolean
    name: string
    utcDateCreated: string
    utcDateModified?: string
    value: string

    Accessors

    Methods

    • Returns {
          isSynced: undefined | boolean;
          name: string;
          utcDateModified: undefined | string;
          value: string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

      -

      Parameters

      • deleteId: null | string = null

      Returns void

    +

    Parameters

    • deleteId: null | string = null

    Returns void

    diff --git a/docs/backend_api/classes/becca_entities_brecent_note.default.html b/docs/backend_api/classes/becca_entities_brecent_note.default.html index 5d536c7b8..e40727288 100644 --- a/docs/backend_api/classes/becca_entities_brecent_note.default.html +++ b/docs/backend_api/classes/becca_entities_brecent_note.default.html @@ -1,5 +1,5 @@ default | trilium

    RecentNote represents recently visited note.

    -

    Hierarchy (View Summary)

    Constructors

    Hierarchy (View Summary)

    Constructors

    Properties

    blobId?: string
    dateCreated?: string
    dateModified?: string
    isProtected?: boolean
    isSynced?: boolean
    noteId: string
    notePath: string
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    Methods

    • Mark the entity as (soft) deleted. It will be completely erased later.

      +

    Constructors

    Properties

    blobId?: string
    dateCreated?: string
    dateModified?: string
    isProtected?: boolean
    isSynced?: boolean
    noteId: string
    notePath: string
    utcDateCreated: string
    utcDateModified?: string

    Accessors

    Methods

    • Mark the entity as (soft) deleted. It will be completely erased later.

      This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

      -

      Parameters

      • deleteId: null | string = null

      Returns void

    +

    Parameters

    • deleteId: null | string = null

    Returns void

    diff --git a/docs/backend_api/classes/becca_entities_brevision.default.html b/docs/backend_api/classes/becca_entities_brevision.default.html index da201582a..795e1fb8f 100644 --- a/docs/backend_api/classes/becca_entities_brevision.default.html +++ b/docs/backend_api/classes/becca_entities_brevision.default.html @@ -1,6 +1,6 @@ default | trilium

    Revision represents a snapshot of note's title and content at some point in the past. It's used for seamless note versioning.

    -

    Hierarchy (View Summary)

    Constructors

    Hierarchy (View Summary)

    Constructors

    Properties

    blobId? content? contentLength? @@ -47,11 +47,11 @@ It's used for seamless note versioning.

    save setContent updateFromRow -

    Constructors

    Properties

    blobId?: string
    content?: string | Buffer<ArrayBufferLike>
    contentLength?: number
    dateCreated?: string
    dateLastEdited?: string
    dateModified?: string
    isProtected?: boolean
    isSynced?: boolean
    mime: string
    noteId: string
    revisionId?: string
    title: string
    type: string
    utcDateCreated: string
    utcDateLastEdited?: string
    utcDateModified?: string

    Accessors

    Methods

    • Returns {
          blobId: undefined | string;
          content: undefined | string | Buffer<ArrayBufferLike>;
          contentLength: undefined | number;
          dateCreated: undefined | string;
          dateLastEdited: undefined | string;
          isProtected: undefined | boolean;
          mime: string;
          noteId: string;
          revisionId: undefined | string;
          title: undefined | string;
          type: string;
          utcDateCreated: string;
          utcDateLastEdited: undefined | string;
          utcDateModified: undefined | string;
      }

    • Returns {
          blobId: undefined | string;
          content: undefined | string | Buffer<ArrayBufferLike>;
          contentLength: undefined | number;
          dateCreated: undefined | string;
          dateLastEdited: undefined | string;
          isProtected: undefined | boolean;
          mime: string;
          noteId: string;
          revisionId: undefined | string;
          title: undefined | string;
          type: string;
          utcDateCreated: string;
          utcDateLastEdited: undefined | string;
          utcDateModified: undefined | string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      +

    Constructors

    Properties

    blobId?: string
    content?: string | Buffer<ArrayBufferLike>
    contentLength?: number
    dateCreated?: string
    dateLastEdited?: string
    dateModified?: string
    isProtected?: boolean
    isSynced?: boolean
    mime: string
    noteId: string
    revisionId?: string
    title: string
    type: string
    utcDateCreated: string
    utcDateLastEdited?: string
    utcDateModified?: string

    Accessors

    Methods

    • Returns {
          blobId: undefined | string;
          content: undefined | string | Buffer<ArrayBufferLike>;
          contentLength: undefined | number;
          dateCreated: undefined | string;
          dateLastEdited: undefined | string;
          isProtected: undefined | boolean;
          mime: string;
          noteId: string;
          revisionId: undefined | string;
          title: undefined | string;
          type: string;
          utcDateCreated: string;
          utcDateLastEdited: undefined | string;
          utcDateModified: undefined | string;
      }

    • Returns {
          blobId: undefined | string;
          content: undefined | string | Buffer<ArrayBufferLike>;
          contentLength: undefined | number;
          dateCreated: undefined | string;
          dateLastEdited: undefined | string;
          isProtected: undefined | boolean;
          mime: string;
          noteId: string;
          revisionId: undefined | string;
          title: undefined | string;
          type: string;
          utcDateCreated: string;
          utcDateLastEdited: undefined | string;
          utcDateModified: undefined | string;
      }

    • Mark the entity as (soft) deleted. It will be completely erased later.

      This is a low-level method, for notes and branches use note.deleteNote() and 'branch.deleteBranch()` instead.

      -

      Parameters

      • deleteId: null | string = null

      Returns void

    • Parameters

      • content: string | Buffer<ArrayBufferLike>
      • opts: ContentOpts = {}

      Returns void

    +

    Parameters

    • deleteId: null | string = null

    Returns void

    • Parameters

      • content: string | Buffer<ArrayBufferLike>
      • opts: ContentOpts = {}

      Returns void

    diff --git a/docs/backend_api/interfaces/becca_entities_rows.AttachmentRow.html b/docs/backend_api/interfaces/becca_entities_rows.AttachmentRow.html index e0d1e5e48..051d71159 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.AttachmentRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.AttachmentRow.html @@ -1,4 +1,4 @@ -AttachmentRow | trilium
    interface AttachmentRow {
        attachmentId?: string;
        blobId?: string;
        content?: string | Buffer<ArrayBufferLike>;
        contentLength?: number;
        dateModified?: string;
        isProtected?: boolean;
        mime: string;
        ownerId?: string;
        position?: number;
        role: string;
        title: string;
        utcDateModified?: string;
        utcDateScheduledForErasureSince?: string;
    }

    Properties

    attachmentId? +AttachmentRow | trilium
    interface AttachmentRow {
        attachmentId?: string;
        blobId?: string;
        content?: string | Buffer<ArrayBufferLike>;
        contentLength?: number;
        dateModified?: string;
        isProtected?: boolean;
        mime: string;
        ownerId?: string;
        position?: number;
        role: string;
        title: string;
        utcDateModified?: string;
        utcDateScheduledForErasureSince?: string;
    }

    Properties

    attachmentId?: string
    blobId?: string
    content?: string | Buffer<ArrayBufferLike>
    contentLength?: number
    dateModified?: string
    isProtected?: boolean
    mime: string
    ownerId?: string
    position?: number
    role: string
    title: string
    utcDateModified?: string
    utcDateScheduledForErasureSince?: string
    +

    Properties

    attachmentId?: string
    blobId?: string
    content?: string | Buffer<ArrayBufferLike>
    contentLength?: number
    dateModified?: string
    isProtected?: boolean
    mime: string
    ownerId?: string
    position?: number
    role: string
    title: string
    utcDateModified?: string
    utcDateScheduledForErasureSince?: string
    diff --git a/docs/backend_api/interfaces/becca_entities_rows.AttributeRow.html b/docs/backend_api/interfaces/becca_entities_rows.AttributeRow.html index badc7f521..f0e9c027d 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.AttributeRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.AttributeRow.html @@ -1,4 +1,4 @@ -AttributeRow | trilium
    interface AttributeRow {
        attributeId?: string;
        isInheritable?: boolean;
        name: string;
        noteId?: string;
        position?: null | number;
        type: AttributeType;
        utcDateModified?: string;
        value?: string;
    }

    Properties

    attributeId? +AttributeRow | trilium
    interface AttributeRow {
        attributeId?: string;
        isInheritable?: boolean;
        name: string;
        noteId?: string;
        position?: null | number;
        type: AttributeType;
        utcDateModified?: string;
        value?: string;
    }

    Properties

    attributeId?: string
    isInheritable?: boolean
    name: string
    noteId?: string
    position?: null | number
    utcDateModified?: string
    value?: string
    +

    Properties

    attributeId?: string
    isInheritable?: boolean
    name: string
    noteId?: string
    position?: null | number
    utcDateModified?: string
    value?: string
    diff --git a/docs/backend_api/interfaces/becca_entities_rows.BlobRow.html b/docs/backend_api/interfaces/becca_entities_rows.BlobRow.html index 2f038e1c2..0ac3c2ede 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.BlobRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.BlobRow.html @@ -1,6 +1,6 @@ -BlobRow | trilium
    interface BlobRow {
        blobId: string;
        content: string | Buffer<ArrayBufferLike>;
        contentLength: number;
        dateModified: string;
        utcDateModified: string;
    }

    Properties

    blobId +BlobRow | trilium
    interface BlobRow {
        blobId: string;
        content: string | Buffer<ArrayBufferLike>;
        contentLength: number;
        dateModified: string;
        utcDateModified: string;
    }

    Properties

    blobId: string
    content: string | Buffer<ArrayBufferLike>
    contentLength: number
    dateModified: string
    utcDateModified: string
    +

    Properties

    blobId: string
    content: string | Buffer<ArrayBufferLike>
    contentLength: number
    dateModified: string
    utcDateModified: string
    diff --git a/docs/backend_api/interfaces/becca_entities_rows.BranchRow.html b/docs/backend_api/interfaces/becca_entities_rows.BranchRow.html index 293f63d5e..1cd89ccf9 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.BranchRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.BranchRow.html @@ -1,4 +1,4 @@ -BranchRow | trilium
    interface BranchRow {
        branchId?: string;
        isDeleted?: boolean;
        isExpanded?: boolean;
        noteId: string;
        notePosition?: null | number;
        parentNoteId: string;
        prefix?: null | string;
        utcDateModified?: string;
    }

    Properties

    branchId? +BranchRow | trilium
    interface BranchRow {
        branchId?: string;
        isDeleted?: boolean;
        isExpanded?: boolean;
        noteId: string;
        notePosition?: null | number;
        parentNoteId: string;
        prefix?: null | string;
        utcDateModified?: string;
    }

    Properties

    branchId?: string
    isDeleted?: boolean
    isExpanded?: boolean
    noteId: string
    notePosition?: null | number
    parentNoteId: string
    prefix?: null | string
    utcDateModified?: string
    +

    Properties

    branchId?: string
    isDeleted?: boolean
    isExpanded?: boolean
    noteId: string
    notePosition?: null | number
    parentNoteId: string
    prefix?: null | string
    utcDateModified?: string
    diff --git a/docs/backend_api/interfaces/becca_entities_rows.EtapiTokenRow.html b/docs/backend_api/interfaces/becca_entities_rows.EtapiTokenRow.html index f21d78572..c7aef325d 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.EtapiTokenRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.EtapiTokenRow.html @@ -1,7 +1,7 @@ -EtapiTokenRow | trilium
    interface EtapiTokenRow {
        etapiTokenId?: string;
        isDeleted?: boolean;
        name: string;
        tokenHash: string;
        utcDateCreated?: string;
        utcDateModified?: string;
    }

    Properties

    etapiTokenId? +EtapiTokenRow | trilium
    interface EtapiTokenRow {
        etapiTokenId?: string;
        isDeleted?: boolean;
        name: string;
        tokenHash: string;
        utcDateCreated?: string;
        utcDateModified?: string;
    }

    Properties

    etapiTokenId?: string
    isDeleted?: boolean
    name: string
    tokenHash: string
    utcDateCreated?: string
    utcDateModified?: string
    +

    Properties

    etapiTokenId?: string
    isDeleted?: boolean
    name: string
    tokenHash: string
    utcDateCreated?: string
    utcDateModified?: string
    diff --git a/docs/backend_api/interfaces/becca_entities_rows.NoteRow.html b/docs/backend_api/interfaces/becca_entities_rows.NoteRow.html index 4a56f60b9..a73d80306 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.NoteRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.NoteRow.html @@ -1,4 +1,4 @@ -NoteRow | trilium
    interface NoteRow {
        blobId: string;
        content?: string | Buffer<ArrayBufferLike>;
        dateCreated: string;
        dateModified: string;
        deleteId: string;
        isDeleted: boolean;
        isProtected: boolean;
        mime: string;
        noteId: string;
        title: string;
        type:
            | "search"
            | "file"
            | "text"
            | "code"
            | "relationMap"
            | "render"
            | "book"
            | "mermaid"
            | "canvas"
            | "image"
            | "noteMap"
            | "launcher"
            | "doc"
            | "contentWidget"
            | "webView"
            | "mindMap";
        utcDateCreated: string;
        utcDateModified: string;
    }

    Properties

    blobId +NoteRow | trilium
    interface NoteRow {
        blobId: string;
        content?: string | Buffer<ArrayBufferLike>;
        dateCreated: string;
        dateModified: string;
        deleteId: string;
        isDeleted: boolean;
        isProtected: boolean;
        mime: string;
        noteId: string;
        title: string;
        type:
            | "search"
            | "file"
            | "text"
            | "code"
            | "relationMap"
            | "render"
            | "book"
            | "mermaid"
            | "canvas"
            | "image"
            | "noteMap"
            | "launcher"
            | "doc"
            | "contentWidget"
            | "webView"
            | "mindMap";
        utcDateCreated: string;
        utcDateModified: string;
    }

    Properties

    blobId: string
    content?: string | Buffer<ArrayBufferLike>
    dateCreated: string
    dateModified: string
    deleteId: string
    isDeleted: boolean
    isProtected: boolean
    mime: string
    noteId: string
    title: string
    type:
        | "search"
        | "file"
        | "text"
        | "code"
        | "relationMap"
        | "render"
        | "book"
        | "mermaid"
        | "canvas"
        | "image"
        | "noteMap"
        | "launcher"
        | "doc"
        | "contentWidget"
        | "webView"
        | "mindMap"
    utcDateCreated: string
    utcDateModified: string
    +

    Properties

    blobId: string
    content?: string | Buffer<ArrayBufferLike>
    dateCreated: string
    dateModified: string
    deleteId: string
    isDeleted: boolean
    isProtected: boolean
    mime: string
    noteId: string
    title: string
    type:
        | "search"
        | "file"
        | "text"
        | "code"
        | "relationMap"
        | "render"
        | "book"
        | "mermaid"
        | "canvas"
        | "image"
        | "noteMap"
        | "launcher"
        | "doc"
        | "contentWidget"
        | "webView"
        | "mindMap"
    utcDateCreated: string
    utcDateModified: string
    diff --git a/docs/backend_api/interfaces/becca_entities_rows.OptionRow.html b/docs/backend_api/interfaces/becca_entities_rows.OptionRow.html index 6b9427cd8..00095a891 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.OptionRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.OptionRow.html @@ -1,11 +1,11 @@ OptionRow | trilium

    Database representation of an option.

    Options are key-value pairs that are used to store information such as user preferences (for example the current theme, sync server information), but also information about the state of the application).

    -
    interface OptionRow {
        isSynced: boolean;
        name: string;
        utcDateModified?: string;
        value: string;
    }

    Properties

    interface OptionRow {
        isSynced: boolean;
        name: string;
        utcDateModified?: string;
        value: string;
    }

    Properties

    isSynced: boolean

    true if the value should be synced across multiple instances (e.g. locale) or false if it should be local-only (e.g. theme).

    -
    name: string

    The name of the option.

    -
    utcDateModified?: string
    value: string

    The value of the option.

    -
    +
    name: string

    The name of the option.

    +
    utcDateModified?: string
    value: string

    The value of the option.

    +
    diff --git a/docs/backend_api/interfaces/becca_entities_rows.RecentNoteRow.html b/docs/backend_api/interfaces/becca_entities_rows.RecentNoteRow.html index d4fdb1f9d..db4228e96 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.RecentNoteRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.RecentNoteRow.html @@ -1,4 +1,4 @@ -RecentNoteRow | trilium
    interface RecentNoteRow {
        noteId: string;
        notePath: string;
        utcDateCreated?: string;
    }

    Properties

    noteId +RecentNoteRow | trilium
    interface RecentNoteRow {
        noteId: string;
        notePath: string;
        utcDateCreated?: string;
    }

    Properties

    noteId: string
    notePath: string
    utcDateCreated?: string
    +

    Properties

    noteId: string
    notePath: string
    utcDateCreated?: string
    diff --git a/docs/backend_api/interfaces/becca_entities_rows.RevisionRow.html b/docs/backend_api/interfaces/becca_entities_rows.RevisionRow.html index 64ed1ab21..4c1e15835 100644 --- a/docs/backend_api/interfaces/becca_entities_rows.RevisionRow.html +++ b/docs/backend_api/interfaces/becca_entities_rows.RevisionRow.html @@ -1,4 +1,4 @@ -RevisionRow | trilium
    interface RevisionRow {
        blobId?: string;
        contentLength?: number;
        dateCreated: string;
        dateLastEdited?: string;
        isProtected?: boolean;
        mime: string;
        noteId: string;
        revisionId?: string;
        title: string;
        type: string;
        utcDateCreated: string;
        utcDateLastEdited?: string;
        utcDateModified: string;
    }

    Properties

    blobId? +RevisionRow | trilium
    interface RevisionRow {
        blobId?: string;
        contentLength?: number;
        dateCreated: string;
        dateLastEdited?: string;
        isProtected?: boolean;
        mime: string;
        noteId: string;
        revisionId?: string;
        title: string;
        type: string;
        utcDateCreated: string;
        utcDateLastEdited?: string;
        utcDateModified: string;
    }

    Properties

    blobId?: string
    contentLength?: number
    dateCreated: string
    dateLastEdited?: string
    isProtected?: boolean
    mime: string
    noteId: string
    revisionId?: string
    title: string
    type: string
    utcDateCreated: string
    utcDateLastEdited?: string
    utcDateModified: string
    +

    Properties

    blobId?: string
    contentLength?: number
    dateCreated: string
    dateLastEdited?: string
    isProtected?: boolean
    mime: string
    noteId: string
    revisionId?: string
    title: string
    type: string
    utcDateCreated: string
    utcDateLastEdited?: string
    utcDateModified: string
    diff --git a/docs/backend_api/types/becca_entities_rows.AttributeType.html b/docs/backend_api/types/becca_entities_rows.AttributeType.html index c55212d07..dd5dac765 100644 --- a/docs/backend_api/types/becca_entities_rows.AttributeType.html +++ b/docs/backend_api/types/becca_entities_rows.AttributeType.html @@ -1 +1 @@ -AttributeType | trilium
    AttributeType: "label" | "relation" | "label-definition" | "relation-definition"
    +AttributeType | trilium
    AttributeType: "label" | "relation" | "label-definition" | "relation-definition"
    diff --git a/docs/backend_api/types/becca_entities_rows.NoteType.html b/docs/backend_api/types/becca_entities_rows.NoteType.html index 8352415bc..718929fff 100644 --- a/docs/backend_api/types/becca_entities_rows.NoteType.html +++ b/docs/backend_api/types/becca_entities_rows.NoteType.html @@ -1 +1 @@ -NoteType | trilium
    NoteType: typeof ALLOWED_NOTE_TYPES[number]
    +NoteType | trilium
    NoteType: typeof ALLOWED_NOTE_TYPES[number]
    diff --git a/docs/backend_api/variables/becca_entities_rows.ALLOWED_NOTE_TYPES.html b/docs/backend_api/variables/becca_entities_rows.ALLOWED_NOTE_TYPES.html index 9e0de4bf4..2e533747b 100644 --- a/docs/backend_api/variables/becca_entities_rows.ALLOWED_NOTE_TYPES.html +++ b/docs/backend_api/variables/becca_entities_rows.ALLOWED_NOTE_TYPES.html @@ -1,4 +1,4 @@ ALLOWED_NOTE_TYPES | trilium

    Variable ALLOWED_NOTE_TYPESConst

    ALLOWED_NOTE_TYPES: readonly [
        "file",
        "image",
        "search",
        "noteMap",
        "launcher",
        "doc",
        "contentWidget",
        "text",
        "relationMap",
        "render",
        "canvas",
        "mermaid",
        "book",
        "webView",
        "code",
        "mindMap",
    ] = ...

    There are many different Note types, some of which are entirely opaque to the end user. Those types should be used only for checking against, they are not for direct use.

    -
    +
    diff --git a/docs/backend_api/variables/services_backend_script_api.default.html b/docs/backend_api/variables/services_backend_script_api.default.html index 0411fa280..17130a55a 100644 --- a/docs/backend_api/variables/services_backend_script_api.default.html +++ b/docs/backend_api/variables/services_backend_script_api.default.html @@ -1 +1 @@ -default | trilium
    default: new (currentNote: default, apiParams: ApiParams) => Api
    +default | trilium
    default: new (currentNote: default, apiParams: ApiParams) => Api
    diff --git a/docs/backend_api/variables/services_sql.default.html b/docs/backend_api/variables/services_sql.default.html index 037d90e28..7539d0148 100644 --- a/docs/backend_api/variables/services_sql.default.html +++ b/docs/backend_api/variables/services_sql.default.html @@ -4,4 +4,4 @@
  • getRawRows: <T extends {} | unknown[]>(query: string, params?: any) => T[]
  • getRow: <T>(query: string, params?: any) => T

    Get first returned row.

  • getRowOrNull: <T>(query: string, params?: any) => T | null
  • getRows: <T>(query: string, params?: any) => T[]

    Get all returned rows.

  • getValue: <T>(query: string, params?: any) => T

    Get single value from the given query - first column from first returned row.

    -
  • insert: <T extends {}>(
        tableName: string,
        rec: T,
        replace?: boolean,
    ) => undefined | null | number | bigint
  • iterateRows: <T>(query: string, params?: any) => IterableIterator<T>
  • rebuildIntegrationTestDatabase: () => void
  • replace: <T extends {}>(tableName: string, rec: T) => number | null
  • transactional: <T>(func: (statement: Statement<unknown[], unknown>) => T) => any
  • upsert: <T extends {}>(tableName: string, primaryKey: string, rec: T) => void
  • +
  • insert: <T extends {}>(
        tableName: string,
        rec: T,
        replace?: boolean,
    ) => undefined | null | number | bigint
  • iterateRows: <T>(query: string, params?: any) => IterableIterator<T>
  • rebuildIntegrationTestDatabase: () => void
  • replace: <T extends {}>(tableName: string, rec: T) => number | null
  • transactional: <T>(func: (statement: Statement<unknown[], unknown>) => T) => any
  • upsert: <T extends {}>(tableName: string, primaryKey: string, rec: T) => void
  • From 92b639d7dce07820fc0d310c8663cb8a0a001fce Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 11 Dec 2024 21:36:11 +0200 Subject: [PATCH 247/315] style(next): add back tree options --- src/public/stylesheets/theme-next/shell.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index 2ddfebc8c..d01c6c40b 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -346,8 +346,12 @@ div.quick-search .search-button.show { /* Tree */ #left-pane .tree-actions { - /* TODO: relocate instead of hiding */ - display: none; + right: 3px; + bottom: 6px; +} + +button.tree-floating-button { + font-size: 18px !important; } #left-pane div.tree { From 6f2b91f76e2dada4827f2ce994645b631604425f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 11 Dec 2024 21:40:17 +0200 Subject: [PATCH 248/315] style(next): explore showing tree actions on hover only --- src/public/stylesheets/theme-next/shell.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index d01c6c40b..7bd975dd3 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -348,6 +348,12 @@ div.quick-search .search-button.show { #left-pane .tree-actions { right: 3px; bottom: 6px; + transform: translateY(200%) !important; + transition: transform 250ms ease-in-out; +} + +#left-pane:hover .tree-actions { + transform: translateY(0) !important; } button.tree-floating-button { From 0a02c2538c8ca3d360c692a8eaf8051cc0b7db7d Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Wed, 11 Dec 2024 22:26:19 +0200 Subject: [PATCH 249/315] style(next): use a better layout for the paths displayed in the "Recent Changes" section --- src/public/stylesheets/theme-next.css | 1 + src/public/stylesheets/theme-next/shell.css | 35 +++++++++++++++++---- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/public/stylesheets/theme-next.css b/src/public/stylesheets/theme-next.css index 2c0b089c7..fe410689a 100644 --- a/src/public/stylesheets/theme-next.css +++ b/src/public/stylesheets/theme-next.css @@ -62,6 +62,7 @@ --timeline-left-gap: 20px; --timeline-right-gap: 20px; + --timeline-item-vertical-margin: 4px; --timeline-bullet-size: 10px; --timeline-bullet-vertical-pos: .75em; --timeline-connector-size: 4px; diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index e7dcbacbc..14f688ab9 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -964,10 +964,6 @@ body .calendar-dropdown-widget .calendar-body a:hover { margin: var(--bs-modal-padding); } -.recent-changes-content small { - color: var(--muted-text-color); -} - .recent-changes-content > div { padding-left: var(--timeline-left-gap); } @@ -999,13 +995,40 @@ body .calendar-dropdown-widget .calendar-body a:hover { .recent-changes-content ul li { position: relative; + color: transparent; /* Hide the "-" character */ + padding-top: var(--timeline-item-vertical-margin); + padding-bottom: var(--timeline-item-vertical-margin); +} + +.recent-changes-content ul li span { + /* Ensure spans are not transparent */ + color: var(--active-item-text-color); } .recent-changes-content ul li .note-path { - margin-left: .5em; color: var(--muted-text-color); + font-size: .75em; } +/* Item time */ +.recent-changes-content ul li > span:first-child { + display: inline-block; + min-width: 80px; + vertical-align: top; + color: var(--active-item-text-color); +} + +/* Item title & path container */ +.recent-changes-content ul li > span:nth-child(2) { + display: inline-block; +} + +/* Item path */ +.recent-changes-content ul li > span:nth-child(2) small { + display: block; + line-height: 1; + opacity: .75; +} /* Timeline connector */ .recent-changes-content ul li::before, @@ -1040,7 +1063,7 @@ body .calendar-dropdown-widget .calendar-body a:hover { .recent-changes-content ul li::after { position: absolute; content: ""; - top: var(--timeline-bullet-vertical-pos); + top: calc(var(--timeline-item-vertical-margin) + var(--timeline-bullet-vertical-pos)); left: 0; width: var(--timeline-bullet-size); height: var(--timeline-bullet-size); From 5126cd4a6c660ba194f749a60cafc69c32319bf9 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Wed, 11 Dec 2024 22:30:04 +0200 Subject: [PATCH 250/315] style(next): tweak the paths displayed in the search section --- src/public/stylesheets/theme-next/shell.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index 14f688ab9..8291ee49d 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -1220,4 +1220,15 @@ body .calendar-dropdown-widget .calendar-body a:hover { font-family: boxicons; opacity: .75; transform: translateY(4%); +} + +/* Search */ + +.search-result-widget-content .note-path .path-bracket { + display: inline; +} + +.search-result-widget-content .note-path { + opacity: .75; + font-weight: normal; } \ No newline at end of file From 9ce97decf247108f00b0865cf4d6750b2cee9fde Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Thu, 12 Dec 2024 00:31:19 +0200 Subject: [PATCH 251/315] style(next): overhaul the tree actions toolbar --- src/public/stylesheets/theme-next/shell.css | 80 +++++++++++++++++++-- 1 file changed, 75 insertions(+), 5 deletions(-) diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index 2ddfebc8c..b3b8b9b69 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -345,11 +345,6 @@ div.quick-search .search-button.show { /* Tree */ -#left-pane .tree-actions { - /* TODO: relocate instead of hiding */ - display: none; -} - #left-pane div.tree { padding: 3px 6px; animation: fade-in 200ms ease-in; @@ -471,6 +466,81 @@ div.quick-search .search-button.show { --menu-item-icon-vert-offset: 1.5px; } +/* Tree actions toolbar */ + +#left-pane .tree-actions { + --tree-actions-toolbar-horizontal-margin: 8px; + --tree-actions-toolbar-vertical-margin: 8px; + --tree-actions-toolbar-padding-size: 4px; + --tree-actions-toolbar-collapsed-width: 40px; + --tree-actions-toolbar-expand-button-size: 25px; +} + +/* Toolbar container (collapsed state) */ +#left-pane .tree-actions { + max-width: var(--tree-actions-toolbar-collapsed-width); + right: var(--tree-actions-toolbar-horizontal-margin); + bottom: var(--tree-actions-toolbar-vertical-margin); + overflow: hidden; + border: 1px solid transparent; + padding: var(--tree-actions-toolbar-padding-size); + padding-right: var(--tree-actions-toolbar-collapsed-width); + background: transparent; + transition: max-width 300ms ease-out; +} + +/* Toolbar container (expanded state) */ +#left-pane .tree-actions:hover { + max-width: 200px; + border-color: var(--dropdown-border-color); + background: var(--menu-background-color); + box-shadow: 0 5px 10px rgba(0, 0, 0, var(--dropdown-shadow-opacity)) +} + +/* Toolbar button (toolbar collapsed)*/ +#left-pane .tree-actions button { + border: unset; + color: var(--menu-item-icon-color); + opacity: 0; +} + +/* Toolbar button on hover */ +#left-pane .tree-actions button:hover { + background: var(--hover-item-background-color); +} + +/* Toolbar button (toolbar expanded) */ +#left-pane .tree-actions:hover button { + opacity: 1; + transition: opacity 200ms ease-in; +} + +/* The floating expand button (toolbar collapsed) */ +#left-pane .tree-actions::after { + display: flex; + content: "\eab4"; + position: absolute; + justify-content: center; + align-items: center; + top: 50%; + right: calc((var(--tree-actions-toolbar-collapsed-width) - var(--tree-actions-toolbar-expand-button-size)) / 2); + width: var(--tree-actions-toolbar-expand-button-size); + height: var(--tree-actions-toolbar-expand-button-size); + border-radius: 50%; + background: var(--left-pane-item-action-button-background); + color: var(--left-pane-item-action-button-color); + font-family: boxicons; + font-size: 18px; + transform: translateY(-50%); +} + +/* The floating expand button (toolbar expanded) */ +#left-pane .tree-actions:hover::after { + background: transparent; + color: var(--menu-item-icon-color); + opacity: var(--menu-item-disabled-opacity); +} + /* * Gutter */ From 8b9d4ed106655710d6656bc22085afdc413871d6 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Thu, 12 Dec 2024 00:49:05 +0200 Subject: [PATCH 252/315] style(next): tree actions toolbar: improve styling --- src/public/stylesheets/theme-next/shell.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index b3b8b9b69..28361a853 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -486,7 +486,7 @@ div.quick-search .search-button.show { padding: var(--tree-actions-toolbar-padding-size); padding-right: var(--tree-actions-toolbar-collapsed-width); background: transparent; - transition: max-width 300ms ease-out; + transition: max-width 200ms ease-in; } /* Toolbar container (expanded state) */ @@ -494,6 +494,7 @@ div.quick-search .search-button.show { max-width: 200px; border-color: var(--dropdown-border-color); background: var(--menu-background-color); + backdrop-filter: blur(10px) saturate(6); box-shadow: 0 5px 10px rgba(0, 0, 0, var(--dropdown-shadow-opacity)) } @@ -512,7 +513,7 @@ div.quick-search .search-button.show { /* Toolbar button (toolbar expanded) */ #left-pane .tree-actions:hover button { opacity: 1; - transition: opacity 200ms ease-in; + transition: opacity 250ms ease-in; } /* The floating expand button (toolbar collapsed) */ @@ -532,6 +533,7 @@ div.quick-search .search-button.show { font-family: boxicons; font-size: 18px; transform: translateY(-50%); + transition: color 200ms ease-in; } /* The floating expand button (toolbar expanded) */ @@ -539,6 +541,7 @@ div.quick-search .search-button.show { background: transparent; color: var(--menu-item-icon-color); opacity: var(--menu-item-disabled-opacity); + transition: color 200ms ease-out; } /* From 336f978adddb3e3a0f8f7132c57aa91c8e64cac3 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Thu, 12 Dec 2024 00:50:28 +0200 Subject: [PATCH 253/315] style(next): tree actions toolbar: relocate variable declarations --- src/public/stylesheets/theme-next.css | 6 ++++++ src/public/stylesheets/theme-next/shell.css | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/public/stylesheets/theme-next.css b/src/public/stylesheets/theme-next.css index 2c0b089c7..82fa98b39 100644 --- a/src/public/stylesheets/theme-next.css +++ b/src/public/stylesheets/theme-next.css @@ -48,6 +48,12 @@ --launcher-pane-button-margin: 6px; --launcher-pane-button-gap: 3px; + --tree-actions-toolbar-horizontal-margin: 8px; + --tree-actions-toolbar-vertical-margin: 8px; + --tree-actions-toolbar-padding-size: 4px; + --tree-actions-toolbar-collapsed-width: 40px; + --tree-actions-toolbar-expand-button-size: 25px; + --tab-bar-height: 50px; --tab-height: 36px; --tab-first-item-horiz-offset: 1px; diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index 28361a853..7f773fe53 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -468,14 +468,6 @@ div.quick-search .search-button.show { /* Tree actions toolbar */ -#left-pane .tree-actions { - --tree-actions-toolbar-horizontal-margin: 8px; - --tree-actions-toolbar-vertical-margin: 8px; - --tree-actions-toolbar-padding-size: 4px; - --tree-actions-toolbar-collapsed-width: 40px; - --tree-actions-toolbar-expand-button-size: 25px; -} - /* Toolbar container (collapsed state) */ #left-pane .tree-actions { max-width: var(--tree-actions-toolbar-collapsed-width); From 9d7caaae96d44a08402566200e6af6ca43e99d52 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Thu, 12 Dec 2024 00:59:48 +0200 Subject: [PATCH 254/315] style(next): tree actions toolbar: tweak transitions --- src/public/stylesheets/theme-next/shell.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index 7f773fe53..027e847f6 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -478,7 +478,9 @@ div.quick-search .search-button.show { padding: var(--tree-actions-toolbar-padding-size); padding-right: var(--tree-actions-toolbar-collapsed-width); background: transparent; - transition: max-width 200ms ease-in; + transition: max-width 400ms ease-out, + background-color 400ms ease-out, + border-color 400ms ease-out; } /* Toolbar container (expanded state) */ @@ -487,7 +489,7 @@ div.quick-search .search-button.show { border-color: var(--dropdown-border-color); background: var(--menu-background-color); backdrop-filter: blur(10px) saturate(6); - box-shadow: 0 5px 10px rgba(0, 0, 0, var(--dropdown-shadow-opacity)) + box-shadow: 0 5px 10px rgba(0, 0, 0, var(--dropdown-shadow-opacity)); } /* Toolbar button (toolbar collapsed)*/ @@ -495,6 +497,7 @@ div.quick-search .search-button.show { border: unset; color: var(--menu-item-icon-color); opacity: 0; + transition: opacity 200ms ease-out; } /* Toolbar button on hover */ From a7e000035d96c72dfcce798327ac1bac90bcdcbb Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Thu, 12 Dec 2024 01:07:18 +0200 Subject: [PATCH 255/315] style(next): tree actions toolbar: fix the user being unable to activate the action button for the last item --- src/public/stylesheets/theme-next/shell.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index 027e847f6..63c09c97c 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -346,7 +346,7 @@ div.quick-search .search-button.show { /* Tree */ #left-pane div.tree { - padding: 3px 6px; + padding: 3px 6px 40px 6px; animation: fade-in 200ms ease-in; } From e4b1f56a5ea1a7c4c31a4f2ec039f97d7c007950 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Thu, 12 Dec 2024 01:29:14 +0200 Subject: [PATCH 256/315] style(next): tree actions toolbar: fix icon alignment in certain conditions --- src/public/stylesheets/theme-next/shell.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index 63c09c97c..52481e460 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -527,6 +527,7 @@ div.quick-search .search-button.show { color: var(--left-pane-item-action-button-color); font-family: boxicons; font-size: 18px; + line-height: 1; transform: translateY(-50%); transition: color 200ms ease-in; } From eb30cb73038e925753fdf4ef6e69bd0ca1a42fe1 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Thu, 12 Dec 2024 01:46:43 +0200 Subject: [PATCH 257/315] client: add a heading to the tree settings panel --- src/public/app/widgets/note_tree.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js index cefba22a2..c11adc70d 100644 --- a/src/public/app/widgets/note_tree.js +++ b/src/public/app/widgets/note_tree.js @@ -113,6 +113,7 @@ const TPL = `
    +

    ${t("note_tree.tree-settings-title")}


    diff --git a/docs/frontend_api/FAttribute.html b/docs/frontend_api/FAttribute.html index 4516e1f1d..eb7651e65 100644 --- a/docs/frontend_api/FAttribute.html +++ b/docs/frontend_api/FAttribute.html @@ -918,7 +918,7 @@ and relation (representing named relationship between source and target note) diff --git a/docs/frontend_api/FBranch.html b/docs/frontend_api/FBranch.html index 5ce64a09f..6528e8a6c 100644 --- a/docs/frontend_api/FBranch.html +++ b/docs/frontend_api/FBranch.html @@ -1130,7 +1130,7 @@ parents.

    diff --git a/docs/frontend_api/FNote.html b/docs/frontend_api/FNote.html index 49208f06d..3bf4e5b09 100644 --- a/docs/frontend_api/FNote.html +++ b/docs/frontend_api/FNote.html @@ -8806,7 +8806,7 @@
    diff --git a/docs/frontend_api/FrontendScriptApi.html b/docs/frontend_api/FrontendScriptApi.html index b4ba0f146..cc2b9f1a1 100644 --- a/docs/frontend_api/FrontendScriptApi.html +++ b/docs/frontend_api/FrontendScriptApi.html @@ -8730,7 +8730,7 @@ Typical use case is when a new note has been created, we should wait until it is
    diff --git a/docs/frontend_api/NoteContextAwareWidget.html b/docs/frontend_api/NoteContextAwareWidget.html index 09a02b6d9..0bcf62203 100644 --- a/docs/frontend_api/NoteContextAwareWidget.html +++ b/docs/frontend_api/NoteContextAwareWidget.html @@ -1582,7 +1582,7 @@ widget with each note.
    diff --git a/docs/frontend_api/RightPanelWidget.html b/docs/frontend_api/RightPanelWidget.html index 855aab27b..abfc3657b 100644 --- a/docs/frontend_api/RightPanelWidget.html +++ b/docs/frontend_api/RightPanelWidget.html @@ -1787,7 +1787,7 @@ widget with each note.
    diff --git a/docs/frontend_api/entities_fattachment.js.html b/docs/frontend_api/entities_fattachment.js.html index e38fc1ecb..ccc598a50 100644 --- a/docs/frontend_api/entities_fattachment.js.html +++ b/docs/frontend_api/entities_fattachment.js.html @@ -93,7 +93,7 @@ export default FAttachment;
    diff --git a/docs/frontend_api/entities_fattribute.js.html b/docs/frontend_api/entities_fattribute.js.html index 7f0cd60cc..27044cab8 100644 --- a/docs/frontend_api/entities_fattribute.js.html +++ b/docs/frontend_api/entities_fattribute.js.html @@ -127,7 +127,7 @@ export default FAttribute;
    diff --git a/docs/frontend_api/entities_fblob.js.html b/docs/frontend_api/entities_fblob.js.html index b4170baea..4f647e402 100644 --- a/docs/frontend_api/entities_fblob.js.html +++ b/docs/frontend_api/entities_fblob.js.html @@ -81,7 +81,7 @@
    diff --git a/docs/frontend_api/entities_fbranch.js.html b/docs/frontend_api/entities_fbranch.js.html index 9f3af1a28..f9252ef22 100644 --- a/docs/frontend_api/entities_fbranch.js.html +++ b/docs/frontend_api/entities_fbranch.js.html @@ -106,7 +106,7 @@ export default FBranch;
    diff --git a/docs/frontend_api/entities_fnote.js.html b/docs/frontend_api/entities_fnote.js.html index b3fc9c853..9083cab69 100644 --- a/docs/frontend_api/entities_fnote.js.html +++ b/docs/frontend_api/entities_fnote.js.html @@ -1055,7 +1055,7 @@ export default FNote;
    diff --git a/docs/frontend_api/global.html b/docs/frontend_api/global.html index 3a73d00e8..ef95e02f7 100644 --- a/docs/frontend_api/global.html +++ b/docs/frontend_api/global.html @@ -898,7 +898,7 @@ not for direct use.
    diff --git a/docs/frontend_api/index.html b/docs/frontend_api/index.html index e15c1dea5..9d16d032a 100644 --- a/docs/frontend_api/index.html +++ b/docs/frontend_api/index.html @@ -56,7 +56,7 @@
    diff --git a/docs/frontend_api/services_frontend_script_api.js.html b/docs/frontend_api/services_frontend_script_api.js.html index cb50e8197..53cd61c4c 100644 --- a/docs/frontend_api/services_frontend_script_api.js.html +++ b/docs/frontend_api/services_frontend_script_api.js.html @@ -698,7 +698,7 @@ export default FrontendScriptApi;
    diff --git a/docs/frontend_api/widgets_basic_widget.js.html b/docs/frontend_api/widgets_basic_widget.js.html index 9d36a448f..e1abeeb7e 100644 --- a/docs/frontend_api/widgets_basic_widget.js.html +++ b/docs/frontend_api/widgets_basic_widget.js.html @@ -299,7 +299,7 @@ export default BasicWidget;
    diff --git a/docs/frontend_api/widgets_note_context_aware_widget.js.html b/docs/frontend_api/widgets_note_context_aware_widget.js.html index bbc72f6a3..9af03bc6b 100644 --- a/docs/frontend_api/widgets_note_context_aware_widget.js.html +++ b/docs/frontend_api/widgets_note_context_aware_widget.js.html @@ -179,7 +179,7 @@ export default NoteContextAwareWidget;
    diff --git a/docs/frontend_api/widgets_right_panel_widget.js.html b/docs/frontend_api/widgets_right_panel_widget.js.html index cb63ea9fd..618a7ebdc 100644 --- a/docs/frontend_api/widgets_right_panel_widget.js.html +++ b/docs/frontend_api/widgets_right_panel_widget.js.html @@ -115,7 +115,7 @@ export default RightPanelWidget;