From 178b7f1c3f4d448b7e99a4892c846497cc5e7f3a Mon Sep 17 00:00:00 2001 From: Digimezzo Date: Fri, 13 Nov 2026 20:20:14 +0100 Subject: [PATCH 01/22] Update jest-preset-angular --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 77d2bf67..25d61b79 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "electron-builder": "26.3.6", "electron-reload": "1.5.0", "jest": "29.6.1", - "jest-preset-angular": "13.1.1", + "jest-preset-angular": "^14.0.0", "npm-run-all": "4.1.5", "npx": "10.2.0", "rxjs": "6.6.3", From c61946aacdb742f13a46712f13efd09ebf4fa80f Mon Sep 17 00:00:00 2001 From: Digimezzo Date: Fri, 13 Nov 2026 20:24:55 +0100 Subject: [PATCH 02/22] Bro --- angular.json | 2 +- package.json | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/angular.json b/angular.json index ed3efafb..957df004 100644 --- a/angular.json +++ b/angular.json @@ -135,7 +135,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "knowte:build" + "buildTarget": "knowte:build" } } } diff --git a/package.json b/package.json index 25d61b79..59310100 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "test": "npx jest --verbose" }, "dependencies": { - "@angular/animations": "^16.2.12", + "@angular/animations": "^17.3.12", "@angular/cdk": "16.2.12", "@angular/material": "16.2.12", "@electron/remote": "^2.1.3", @@ -69,17 +69,17 @@ }, "devDependencies": { "@angular-builders/custom-webpack": "^16.0.0", - "@angular-devkit/build-angular": "^16.2.16", - "@angular/cli": "16.2.16", - "@angular/common": "16.2.12", - "@angular/compiler": "16.2.12", - "@angular/compiler-cli": "16.2.12", - "@angular/core": "16.2.12", - "@angular/forms": "16.2.12", - "@angular/language-service": "16.2.12", - "@angular/platform-browser": "16.2.12", - "@angular/platform-browser-dynamic": "16.2.12", - "@angular/router": "16.2.12", + "@angular-devkit/build-angular": "^17.3.17", + "@angular/cli": "17.3.17", + "@angular/common": "17.3.12", + "@angular/compiler": "17.3.12", + "@angular/compiler-cli": "17.3.12", + "@angular/core": "17.3.12", + "@angular/forms": "17.3.12", + "@angular/language-service": "17.3.12", + "@angular/platform-browser": "17.3.12", + "@angular/platform-browser-dynamic": "17.3.12", + "@angular/router": "17.3.12", "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", "@types/d3-dispatch": "3.0.1", @@ -102,9 +102,9 @@ "tslint": "~6.1.0", "type-fest": "3.13.1", "typemoq": "^2.1.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "wait-on": "3.2.0", "webdriver-manager": "12.1.1", - "zone.js": "~0.13.3" + "zone.js": "~0.14.10" } -} +} \ No newline at end of file From b538b1c239c7c36949d10f7b91685c061ed55f2e Mon Sep 17 00:00:00 2001 From: Digimezzo Date: Fri, 13 Nov 2026 20:52:57 +0100 Subject: [PATCH 03/22] Upgrade to Angular 17 --- main.js.map | 2 +- package.json | 16 +++++++--------- src/app/app.module.ts | 19 ++++++++++--------- src/app/common/settings/settings-store.js.map | 2 +- .../note/markdown-note/markdown-highlight.ts | 4 ++-- .../note/markdown-note/markdown-scroll-map.ts | 8 ++++---- .../note/markdown-note/markdown-unc-path.ts | 4 ++-- tsconfig-serve.json | 2 +- tsconfig.app.json | 2 +- tsconfig.base.json | 3 ++- tsconfig.spec.json | 1 - 11 files changed, 31 insertions(+), 32 deletions(-) diff --git a/main.js.map b/main.js.map index 151879a1..510fbf39 100644 --- a/main.js.map +++ b/main.js.map @@ -1 +1 @@ -{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA4E;AAC5E,8FAA8F;AAC9F,6EAA6E;AAC7E,uHAAuH;AACvH,+CAA+B;AAC/B,2DAA2D;AAC3D,+BAA+B;AAC/B,yBAAyB;AACzB,6BAA6B;AAC7B,2BAA2B;AAC3B,6EAAyE;AAEzE,cAAG,CAAC,WAAW,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;AAEhE,sBAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACnB,sBAAG,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,cAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;AAEjG,IAAI,UAAU,EAAE,KAAK,CAAC;AACtB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;AAE9C,+DAA+D;AAC/D,qCAAqC;AACrC,MAAM,SAAS,GAAQ,MAAM,CAAC;AAE9B,wDAAwD;AACxD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;IACxC,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC1F;AAED,uDAAuD;AACvD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACvC,MAAM,kBAAmB,SAAQ,YAAY;CAAG;AAChD,SAAS,CAAC,aAAa,GAAG,IAAI,kBAAkB,EAAE,CAAC;AAEnD,8FAA8F;AAC9F,sBAAG,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;AAEnC,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AACpD,UAAU,CAAC,UAAU,EAAE,CAAC;AAExB,OAAO,CAAC,0BAA0B,CAAC,CAAC,eAAe,CAAC;IAChD,GAAG,EAAH,cAAG;IACH,OAAO,EAAP,kBAAO;IACP,aAAa,EAAE,GAAG,EAAE,CAAC,UAAU;IAC/B,GAAG,EAAH,sBAAG;CACN,CAAC,CAAC;AAEH,SAAS,gBAAgB;IACrB,MAAM,UAAU,GAAY,cAAG,CAAC,yBAAyB,EAAE,CAAC;IAE5D,IAAI,CAAC,UAAU,EAAE;QACb,cAAG,CAAC,IAAI,EAAE,CAAC;KACd;SAAM;QACH,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC9B,OAAO,CAAC,6BAA6B,CAAC,CAAC,uBAAuB,CAAC,EAAE,GAAG,EAAH,cAAG,EAAE,aAAa,EAAb,wBAAa,EAAE,GAAG,EAAH,sBAAG,EAAE,CAAC,CAAC;SAC/F;QAED,cAAG,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,EAAE;YAC/D,sEAAsE;YACtE,IAAI,UAAU,EAAE;gBACZ,IAAI,UAAU,CAAC,WAAW,EAAE,EAAE;oBAC1B,UAAU,CAAC,OAAO,EAAE,CAAC;iBACxB;gBAED,UAAU,CAAC,KAAK,EAAE,CAAC;aACtB;QACL,CAAC,CAAC,CAAC;QAEH,eAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAEnC,oDAAoD;QACpD,MAAM,eAAe,GAAG,iBAAiB,CAAC;YACtC,YAAY,EAAE,GAAG;YACjB,aAAa,EAAE,GAAG;SACrB,CAAC,CAAC;QAEH,gDAAgD;QAChD,UAAU,GAAG,IAAI,wBAAa,CAAC;YAC3B,CAAC,EAAE,eAAe,CAAC,CAAC;YACpB,CAAC,EAAE,eAAe,CAAC,CAAC;YACpB,KAAK,EAAE,eAAe,CAAC,KAAK;YAC5B,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,QAAQ,EAAE,GAAG;YACb,SAAS,EAAE,GAAG;YACd,eAAe,EAAE,MAAM;YACvB,KAAK,EAAE,cAAc,EAAE;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC;YACrG,cAAc,EAAE;gBACZ,WAAW,EAAE,KAAK;gBAClB,eAAe,EAAE,IAAI;gBACrB,gBAAgB,EAAE,KAAK;gBACvB,UAAU,EAAE,KAAK;aACpB;YACD,IAAI,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAE1C,SAAS,CAAC,cAAc,GAAG,cAAc,EAAE,CAAC;QAE5C,sEAAsE;QACtE,0EAA0E;QAC1E,iDAAiD;QACjD,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAEnC,IAAI,KAAK,EAAE;YACP,OAAO,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE;gBAClC,QAAQ,EAAE,OAAO,CAAC,GAAG,SAAS,wBAAwB,CAAC;aAC1D,CAAC,CAAC;YACH,UAAU,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;SAC/C;aAAM;YACH,UAAU,CAAC,OAAO,CACd,GAAG,CAAC,MAAM,CAAC;gBACP,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC;gBACjD,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,IAAI;aAChB,CAAC,CACL,CAAC;SACL;QAED,yCAAyC;QAEzC,qCAAqC;QACrC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACzB,gEAAgE;YAChE,mEAAmE;YACnE,oDAAoD;YACpD,UAAU,GAAG,SAAS,CAAC;YAEvB,oFAAoF;YACpF,cAAG,CAAC,IAAI,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,iFAAiF;QACjF,wDAAwD;QACxD,UAAU,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;YAChC,UAAU,CAAC,IAAI,EAAE,CAAC;YAClB,UAAU,CAAC,KAAK,EAAE,CAAC;YACnB,uBAAuB,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,uCAAuC;QACvC,MAAM,cAAc,GAAG,CAAC,CAAM,EAAE,QAAgB,EAAE,EAAE;YAChD,uDAAuD;YACvD,IAAI,QAAQ,KAAK,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE;gBAC9C,CAAC,CAAC,cAAc,EAAE,CAAC;gBACnB,gBAAgB,CAAC,QAAQ,CAAC,CAAC;aAC9B;QACL,CAAC,CAAC;QAEF,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;QAC3D,UAAU,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE;YAC7D,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC7D,IAAI,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,KAAK,EAAE;gBACnC,IAAI,KAAK,EAAE;oBACP,UAAU,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;iBAC3C;gBAED,KAAK,CAAC,cAAc,EAAE,CAAC;aAC1B;QACL,CAAC,CAAC,CAAC;KACN;AACL,CAAC;AAED,SAAS,uBAAuB;IAC5B,MAAM,QAAQ,GAAG,iBAAM,CAAC,cAAc,EAAE,CAAC;IAEzC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO;KACV;IAED,KAAK,MAAM,MAAM,IAAI,wBAAa,CAAC,aAAa,EAAE,EAAE;QAChD,IAAI,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE;YACxE,SAAS;SACZ;QAED,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,WAAW,IAAI,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACnH,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAC9C,MAAM,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK;YACtC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC;YACpC,MAAM,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM;YACvC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,CAAC,CACxC,CAAC;QAEF,IAAI,UAAU,EAAE;YACZ,SAAS;SACZ;QAED,MAAM,QAAQ,GAAG,iBAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;QAC5D,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAExD,IAAI,YAAY,EAAE;YACd,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SAC/B;QAED,IAAI,WAAW,EAAE;YACb,MAAM,CAAC,UAAU,EAAE,CAAC;SACvB;QAED,MAAM,CAAC,SAAS,CAAC;YACb,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;YAChF,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;YAClF,KAAK;YACL,MAAM;SACT,CAAC,CAAC;QAEH,IAAI,WAAW,EAAE;YACb,MAAM,CAAC,QAAQ,EAAE,CAAC;SACrB;QAED,IAAI,YAAY,EAAE;YACd,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;SAC9B;KACJ;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAW;IACjC,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACvB,sBAAG,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;QACzE,OAAO;KACV;IACD,gBAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,cAAc;IACnB,MAAM,QAAQ,GAAG,IAAI,8BAAa,CAAC,cAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAE5D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE;QACpC,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,EAAE;YAC3B,QAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;SAC3C;aAAM;YACH,QAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;SAC5C;KACJ;IAED,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAC9C,CAAC;AAUD,IAAI,eAA4C,CAAC;AACjD,IAAI,oBAA+D,CAAC;AACpE,IAAI,oBAA+D,CAAC;AACpE,IAAI,kBAAkB,GAAY,KAAK,CAAC;AACxC,IAAI,0BAA0B,GAAY,KAAK,CAAC;AAChD,IAAI,2BAA2B,GAAY,IAAI,CAAC;AAChD,IAAI,qBAAqB,GAAW,CAAC,CAAC;AAEtC,SAAS,aAAa,CAAC,KAAa;IAChC,IAAI,CAAC,0BAA0B,EAAE;QAC7B,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACnB;IACD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAChC,OAAO,CAAC,KAAa,EAAE,EAAE;QACrB,sBAAG,CAAC,IAAI,CAAC,4BAA4B,KAAK,IAAI,KAAK,YAAY,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC;IACrI,CAAC,CAAC;AACN,CAAC;AAED,SAAS,8BAA8B;IACnC,IAAI;QACA,MAAM,YAAY,GAAW,IAAI,CAAC,IAAI,CAAC,cAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,CAAC;QAC/E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YAC9B,OAAO,EAAE,CAAC;SACb;QACD,oGAAoG;QACpG,MAAM,KACF,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,EADhD,EAAE,iBAAiB,EAAE,eAAe,EAAE,2BAA2B,EAAE,UAAU,OAC7B,EADkC,gBAAgB,cAAlG,uEAAoG,CACpD,CAAC;QACvD,OAAO,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;KAC3C;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAED,SAAS,aAAa,CAAC,MAAe;IAClC,MAAM,IAAI,GAAW,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC;IAChG,OAAO,KAAK,CAAC,CAAC,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC,CAAC,UAAU,SAAS,mBAAmB,IAAI,EAAE,CAAC;AACjG,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAsB,EAAE,cAAuB;IACxE,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE;QACpE,OAAO,kBAAkB,CAAC;KAC7B;IACD,IAAI,KAAK,CAAC,cAAc,KAAK,cAAc,EAAE;QACzC,OAAO,2BAA2B,CAAC;KACtC;IACD,MAAM,gBAAgB,GAAuB,8BAA8B,EAAE,CAAC;IAC9E,0GAA0G;IAC1G,IAAI,gBAAgB,IAAI,SAAS,IAAI,gBAAgB,KAAK,KAAK,CAAC,gBAAgB,EAAE;QAC9E,OAAO,kBAAkB,CAAC;KAC7B;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAsB;IAClD,IAAI,eAAe,KAAK,KAAK,EAAE;QAC3B,eAAe,GAAG,SAAS,CAAC;KAC/B;IACD,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE;QAC5B,OAAO;KACV;IACD,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE;QACtC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;KAC1B;SAAM;QACH,yGAAyG;QACzG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;KACxB;AACL,CAAC;AAED,wGAAwG;AACxG,SAAS,+BAA+B;IACpC,IAAI,kBAAkB,EAAE;QACpB,OAAO;KACV;IACD,kBAAkB,GAAG,IAAI,CAAC;IAE1B,IAAI;QACA,yFAAyF;QACzF,EAAE,CAAC,KAAK,CAAC,cAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;YACtE,IAAI,QAAQ,KAAK,aAAa,EAAE;gBAC5B,OAAO;aACV;YACD,YAAY,CAAC,oBAAoB,CAAC,CAAC;YACnC,oBAAoB,GAAG,UAAU,CAAC,GAAG,EAAE;gBACnC,MAAM,KAAK,GAAgC,eAAe,CAAC;gBAC3D,IAAI,KAAK,IAAI,SAAS,IAAI,mBAAmB,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC,IAAI,SAAS,EAAE;oBACjF,sBAAG,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;oBACjE,sBAAsB,CAAC,KAAK,CAAC,CAAC;oBAC9B,uBAAuB,CAAC,GAAG,CAAC,CAAC;iBAChC;YACL,CAAC,EAAE,GAAG,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;KACN;IAAC,OAAO,KAAK,EAAE;QACZ,sBAAG,CAAC,IAAI,CAAC,yDAAyD,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;KACtF;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,iBAAyB;IACtD,IAAI,CAAC,2BAA2B,IAAI,eAAe,IAAI,SAAS,IAAI,oBAAoB,IAAI,SAAS,EAAE;QACnG,OAAO;KACV;IAED,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,0BAA0B,CAAC,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACnG,KAAK,CAAC,mBAAmB,iBAAiB,KAAK,CAAC,CAAC;IACjD,oBAAoB,GAAG,UAAU,CAAC,GAAG,EAAE;QACnC,oBAAoB,GAAG,SAAS,CAAC;QACjC,IAAI,UAAU,IAAI,SAAS,IAAI,eAAe,IAAI,SAAS,EAAE;YACzD,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC1B,OAAO;SACV;QAED,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC1B,+BAA+B,EAAE,CAAC;QAElC,MAAM,gBAAgB,GAAuB,8BAA8B,EAAE,CAAC;QAC9E,MAAM,cAAc,GAAY,cAAc,EAAE,CAAC;QACjD,KAAK,CAAC,eAAe,CAAC,CAAC;QACvB,MAAM,MAAM,GAAkB,eAAe,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACzE,KAAK,CAAC,gCAAgC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/D,MAAM,aAAa,GAAW,IAAI,CAAC,GAAG,EAAE,CAAC;QACzC,KAAK,CAAC,eAAe,CAAC,CAAC;QACvB,IAAI,0BAA0B,EAAE;YAC5B,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAC/E,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;SAChF;QACD,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,MAAM,MAAM,GAAqB,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACrD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;gBAC5C,YAAY,GAAG,IAAI,CAAC;gBACpB,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBACzB,sBAAG,CAAC,IAAI,CAAC,qCAAqC,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,MAAM,CAAC,CAAC;gBAChF,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;gBAC1C,YAAY,GAAG,IAAI,CAAC;gBACpB,KAAK,CAAC,eAAe,CAAC,CAAC;gBACvB,OAAO,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACvB,YAAY,GAAG,IAAI,CAAC;gBACpB,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,KAAK,GAAoB,EAAE,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC;QACpH,eAAe,GAAG,KAAK,CAAC;QAExB,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACrB,IAAI,eAAe,KAAK,KAAK,EAAE;gBAC3B,eAAe,GAAG,SAAS,CAAC;aAC/B;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IACpC,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAC1B,CAAC;AAED,SAAe,mBAAmB,CAAC,cAAuB,EAAE,KAA8B;;QACtF,MAAM,KAAK,GAAgC,eAAe,CAAC;QAE3D,IAAI,KAAK,IAAI,SAAS,EAAE;YACpB,KAAK,CAAC,mBAAmB,CAAC,CAAC;YAC3B,sBAAG,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;YAC9E,OAAO,SAAS,CAAC;SACpB;QAED,eAAe,GAAG,SAAS,CAAC;QAE5B,oFAAoF;QACpF,IAAI,0BAA0B,EAAE;YAC5B,KAAK,CAAC,4BAA4B,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,kBAAkB,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;SAC/H;QACD,MAAM,WAAW,GAAG,0BAA0B,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAY,MAAM,KAAK,CAAC,MAAM,CAAC;QAC7C,IAAI,0BAA0B,EAAE;YAC5B,KAAK,CAAC,8BAA8B,QAAQ,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SAC3G;QACD,MAAM,WAAW,GAAuB,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAEjH,IAAI,WAAW,IAAI,SAAS,EAAE;YAC1B,KAAK,CAAC,yBAAyB,WAAW,EAAE,CAAC,CAAC;YAC9C,sBAAG,CAAC,IAAI,CAAC,uCAAuC,WAAW,gCAAgC,CAAC,CAAC;YAC7F,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAC9B,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,KAAK,CAAC,MAAM,CAAC;IACxB,CAAC;CAAA;AAED,SAAS,eAAe,CACpB,cAAuB,EACvB,IAAa,EACb,MAAmE;IAEnE,MAAM,QAAQ,GAAG,IAAI,8BAAa,CAAC,cAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAE5D,MAAM,UAAU,GAAkB,IAAI,wBAAa,iCAC5C,MAAM,KACT,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,GAAG,EACd,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,cAAc,EACrB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC,EACrG,cAAc,EAAE;YACZ,WAAW,EAAE,KAAK;YAClB,eAAe,EAAE,IAAI;YACrB,gBAAgB,EAAE,KAAK;YACvB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAC;SACjD,EACD,IAAI,IACN,CAAC;IAEH,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAE1C,yCAAyC;IAEzC,IAAI,KAAK,EAAE;QACP,OAAO,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE;YAClC,QAAQ,EAAE,OAAO,CAAC,GAAG,SAAS,wBAAwB,CAAC;SAC1D,CAAC,CAAC;KACN;IAED,UAAU,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE,EAAE;QACtC,gFAAgF;QAChF,CAAC,CAAC,cAAc,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,uCAAuC;IACvC,MAAM,cAAc,GAAG,CAAC,CAAM,EAAE,QAAgB,EAAE,EAAE;QAChD,uDAAuD;QACvD,IAAI,QAAQ,KAAK,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE;YAC9C,CAAC,CAAC,cAAc,EAAE,CAAC;YACnB,gBAAgB,CAAC,QAAQ,CAAC,CAAC;SAC9B;IACL,CAAC,CAAC;IAEF,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IAC3D,UAAU,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7D,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAC7D,IAAI,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,KAAK,EAAE;YACnC,IAAI,KAAK,EAAE;gBACP,UAAU,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;aAC3C;YAED,KAAK,CAAC,cAAc,EAAE,CAAC;SAC1B;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAe,gBAAgB,CAAC,QAAgB,EAAE,MAAc,EAAE,cAAuB;;QACrF,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,MAAM,EAAE,CAAC,CAAC;QAChD,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC/B,oDAAoD;QACpD,MAAM,eAAe,GAAG,iBAAiB,CAAC;YACtC,YAAY,EAAE,GAAG;YACjB,aAAa,EAAE,GAAG;YAClB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,GAAG,MAAM,QAAQ;SAC1B,CAAC,CAAC;QAEH,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,UAAU,GAA8B,MAAM,mBAAmB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QAE7F,IAAI,UAAU,IAAI,SAAS,EAAE;YACzB,KAAK,CAAC,6BAA6B,UAAU,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;YAChE,IAAI,eAAe,CAAC,CAAC,IAAI,SAAS,IAAI,eAAe,CAAC,CAAC,IAAI,SAAS,EAAE;gBAClE,UAAU,CAAC,SAAS,CAAC;oBACjB,CAAC,EAAE,eAAe,CAAC,CAAC;oBACpB,CAAC,EAAE,eAAe,CAAC,CAAC;oBACpB,KAAK,EAAE,eAAe,CAAC,KAAK;oBAC5B,MAAM,EAAE,eAAe,CAAC,MAAM;iBACjC,CAAC,CAAC;aACN;iBAAM;gBACH,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;gBAClE,UAAU,CAAC,MAAM,EAAE,CAAC;aACvB;YAED,6FAA6F;YAC7F,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,aAAa,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;YACjI,UAAU,CAAC,IAAI,EAAE,CAAC;YAClB,UAAU,CAAC,KAAK,EAAE,CAAC;YACnB,KAAK,CAAC,sCAAsC,CAAC,CAAC;SACjD;aAAM;YACH,gDAAgD;YAChD,MAAM,aAAa,GAAkB,eAAe,CAAC,cAAc,EAAE,IAAI,EAAE;gBACvE,CAAC,EAAE,eAAe,CAAC,CAAC;gBACpB,CAAC,EAAE,eAAe,CAAC,CAAC;gBACpB,KAAK,EAAE,eAAe,CAAC,KAAK;gBAC5B,MAAM,EAAE,eAAe,CAAC,MAAM;aACjC,CAAC,CAAC;YACH,KAAK,CAAC,oCAAoC,aAAa,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAI,0BAA0B,EAAE;gBAC5B,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAC;gBACjG,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;gBACjF,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;gBAC7F,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;aAC5F;YACD,aAAa,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;gBACnC,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAClC,aAAa,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,KAAK,EAAE,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;YAC7C,UAAU,GAAG,aAAa,CAAC;SAC9B;QAED,SAAS,CAAC,cAAc,GAAG,cAAc,CAAC;QAE1C,sEAAsE;QACtE,0EAA0E;QAC1E,iDAAiD;QACjD,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACnC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAE5C,qFAAqF;QACrF,uBAAuB,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;CAAA;AAED,IAAI;IACA,sBAAG,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAE1C,oBAAoB;IACpB,kBAAO,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,KAAU,EAAE,GAAQ,EAAE,EAAE;QACpD,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAC3E,sBAAG,CAAC,KAAK,CAAC,qCAAqC,KAAK,CAAC,OAAO,EAAE,CAAC,CAClE,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,QAAQ;IACR,kBAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAU,EAAE,IAAS,EAAE,EAAE;QAC1C,MAAM,GAAG,GAAG,IAAI,wBAAa,CAAC;YAC1B,IAAI,EAAE,KAAK;YACX,cAAc,EAAE;gBACZ,eAAe,EAAE,IAAI;gBACrB,UAAU,EAAE,KAAK;aACpB;SACJ,CAAC,CAAC;QAEH,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAEhD,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;YACvC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,WAAW;IACX,kBAAO,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,KAAU,EAAE,IAAS,EAAE,EAAE;QAC/C,MAAM,GAAG,GAAG,IAAI,wBAAa,CAAC;YAC1B,IAAI,EAAE,KAAK;YACX,cAAc,EAAE;gBACZ,eAAe,EAAE,IAAI;gBACrB,UAAU,EAAE,KAAK;aACpB;SACJ,CAAC,CAAC;QAEH,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAEhD,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAS,EAAE;YAC7C,MAAM,OAAO,GAAW,MAAM,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAE7D,IAAI;gBACA,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBAE9C,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;gBAC3C,gBAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC5C;YAAC,OAAO,KAAK,EAAE;gBACZ,OAAO,CAAC,GAAG,CAAC,iCAAiC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aACjE;QACL,CAAC,CAAA,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,yDAAyD;IACzD,sDAAsD;IACtD,cAAG,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAElC,cAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACjB,iBAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,uBAAuB,CAAC,CAAC;QACtD,iBAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,uBAAuB,CAAC,CAAC;QAE9D,qGAAqG;QACrG,MAAM,QAAQ,GAAG,IAAI,8BAAa,CAAC,cAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAC5D,0BAA0B,GAAG,QAAQ,CAAC,GAAG,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;QAClF,2BAA2B,GAAG,QAAQ,CAAC,GAAG,CAAC,6BAA6B,EAAE,IAAI,CAAC,CAAC;QAChF,sBAAG,CAAC,IAAI,CAAC,gCAAgC,2BAA2B,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC;QAClG,IAAI,0BAA0B,EAAE;YAC5B,OAAO,CAAC,2BAA2B,CAAC,CAAC,2BAA2B,CAAC,sBAAG,CAAC,CAAC;SACzE;IACL,CAAC,CAAC,CAAC;IAEH,oCAAoC;IACpC,cAAG,CAAC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC7B,sBAAG,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QACvD,2DAA2D;QAC3D,8DAA8D;QAC9D,uCAAuC;QACvC,gBAAgB;QAChB,IAAI;QACJ,cAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,cAAG,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;QACpB,gEAAgE;QAChE,4DAA4D;QAC5D,IAAI,UAAU,KAAK,IAAI,EAAE;YACrB,gBAAgB,EAAE,CAAC;SACtB;IACL,CAAC,CAAC,CAAC;CACN;AAAC,OAAO,KAAK,EAAE;IACZ,cAAc;IACd,eAAe;CAClB"} \ No newline at end of file +{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 59310100..c5891658 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ }, "dependencies": { "@angular/animations": "^17.3.12", - "@angular/cdk": "16.2.12", - "@angular/material": "16.2.12", + "@angular/cdk": "17.3.10", + "@angular/material": "17.3.10", "@electron/remote": "^2.1.3", "@fortawesome/fontawesome-free": "^6.3.0", "angular-split": "14.1.0", @@ -54,12 +54,12 @@ "fs-extra": "10.1.0", "line-awesome": "^1.3.0", "lokijs": "^1.5.12", - "marked": "^4.3.0", + "marked": "^9.0.0", "material-design-icons": "^3.0.1", "mermaid": "^12.2.0", "moment": "^2.27.0", "nanoid": "^4.0.0", - "ngx-markdown": "^16.0.0", + "ngx-markdown": "^17.0.0", "prismjs": "^1.30.0", "quill": "^1.3.7", "quill-blot-formatter": "^1.0.5", @@ -68,7 +68,7 @@ "tslib": "^2.4.1" }, "devDependencies": { - "@angular-builders/custom-webpack": "^16.0.0", + "@angular-builders/custom-webpack": "^17.0.0", "@angular-devkit/build-angular": "^17.3.17", "@angular/cli": "17.3.17", "@angular/common": "17.3.12", @@ -83,9 +83,7 @@ "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", "@types/d3-dispatch": "3.0.1", - "@types/dom-webcodecs": "0.1.5", "@types/jest": "^26.0.22", - "@types/marked": "^4.0.8", "@types/node": "^14.14.33", "codelyzer": "^6.0.0", "core-js": "2.6.1", @@ -102,9 +100,9 @@ "tslint": "~6.1.0", "type-fest": "3.13.1", "typemoq": "^2.1.0", - "typescript": "5.4.5", + "typescript": "~5.4.5", "wait-on": "3.2.0", "webdriver-manager": "12.1.1", "zone.js": "~0.14.10" } -} \ No newline at end of file +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9a6c8ec8..ed1090dd 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -26,9 +26,8 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; import { AngularSplitModule } from 'angular-split'; import { marked } from 'marked'; -import { MarkdownModule, MarkedOptions, MarkedRenderer } from 'ngx-markdown'; +import { MARKED_OPTIONS, MarkdownModule, MarkedOptions, MarkedRenderer } from 'ngx-markdown'; import 'reflect-metadata'; -import 'zone.js/mix'; import '../polyfills'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; @@ -167,14 +166,16 @@ export function MarkedOptionsFactory(): MarkedOptions { return MarkedRenderer.prototype.link.call(renderer, href ? getNoteLinkPreviewHref(href) : href, title, text) as string; }; - renderer.code = (code: string, infostring: string, escaped: boolean) => { + const htmlEscapes: Record = { + '&': '&', + '<': '<', + '>': '>', + }; + + renderer.code = (code: string, infostring: string | undefined, escaped: boolean) => { const language = infostring?.trim().split(/\s+/, 1)[0].toLowerCase(); if (language === 'mermaid') { - const escapedCode = code.replace(/[&<>]/g, (character) => ({ - '&': '&', - '<': '<', - '>': '>', - })[character]); + const escapedCode = code.replace(/[&<>]/g, (character) => htmlEscapes[character] ?? character); return `
${escapedCode}
`; } return MarkedRenderer.prototype.code.call(renderer, code, infostring, escaped) as string; @@ -279,7 +280,7 @@ export function MarkedOptionsFactory(): MarkedOptions { imports: [ MarkdownModule.forRoot({ markedOptions: { - provide: MarkedOptions, + provide: MARKED_OPTIONS, useFactory: MarkedOptionsFactory, }, sanitize: SecurityContext.HTML, diff --git a/src/app/common/settings/settings-store.js.map b/src/app/common/settings/settings-store.js.map index 90332920..228ef8ca 100644 --- a/src/app/common/settings/settings-store.js.map +++ b/src/app/common/settings/settings-store.js.map @@ -1 +1 @@ -{"version":3,"file":"settings-store.js","sourceRoot":"","sources":["settings-store.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,6BAA6B;AAE7B,MAAa,aAAa;IAItB,YAAmB,iBAAyB;QACxC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;QAChE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IAEM,GAAG,CAAC,GAAW;QAClB,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAChE,CAAC;IAEM,GAAG,CAAI,GAAW,EAAE,QAAY;QACnC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAM,CAAC;IAC5D,CAAC;IAEM,GAAG,CAAI,GAAW,EAAE,KAAQ;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAEO,IAAI;QACR,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;YACnC,OAAO,EAAE,CAAC;SACb;QAED,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,OAAO,EAAE,CAAC;SACb;QAED,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACxE,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SACtE;QAED,OAAO,MAAiC,CAAC;IAC7C,CAAC;IAEO,IAAI;QACR,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,GAAG,IAAI,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;QAC9E,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7E,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC;CACJ;AA/CD,sCA+CC"} \ No newline at end of file +{"version":3,"file":"settings-store.js","sourceRoot":"","sources":["settings-store.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,6BAA6B;AAE7B,MAAa,aAAa;IAItB,YAAmB,iBAAyB;QACxC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;QAChE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IAEM,GAAG,CAAC,GAAW;QAClB,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAChE,CAAC;IAEM,GAAG,CAAI,GAAW,EAAE,QAAY;QACnC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAM,CAAC;IAC5D,CAAC;IAEM,GAAG,CAAI,GAAW,EAAE,KAAQ;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAEO,IAAI;QACR,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YACpC,OAAO,EAAE,CAAC;QACd,CAAC;QAED,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,EAAE,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACzE,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,MAAiC,CAAC;IAC7C,CAAC;IAEO,IAAI;QACR,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,GAAG,IAAI,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;QAC9E,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7E,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC;CACJ;AA/CD,sCA+CC"} \ No newline at end of file diff --git a/src/app/components/note/markdown-note/markdown-highlight.ts b/src/app/components/note/markdown-note/markdown-highlight.ts index 3242ebbd..de237506 100644 --- a/src/app/components/note/markdown-note/markdown-highlight.ts +++ b/src/app/components/note/markdown-note/markdown-highlight.ts @@ -1,6 +1,6 @@ -import { marked } from 'marked'; +import { MarkedExtension } from 'marked'; -export const markdownHighlightExtension: marked.MarkedExtension = { +export const markdownHighlightExtension: MarkedExtension = { extensions: [ { name: 'mark', diff --git a/src/app/components/note/markdown-note/markdown-scroll-map.ts b/src/app/components/note/markdown-note/markdown-scroll-map.ts index 3b5ddafc..79a12797 100644 --- a/src/app/components/note/markdown-note/markdown-scroll-map.ts +++ b/src/app/components/note/markdown-note/markdown-scroll-map.ts @@ -1,4 +1,4 @@ -import { marked } from 'marked'; +import { marked, MarkedOptions, Tokens } from 'marked'; interface SourceBlock { startLine: number; @@ -47,7 +47,7 @@ function normalizeSource(source: string, pedantic: boolean): string { export function buildSourceBlocks( source: string, preview: HTMLElement, - options: marked.MarkedOptions, + options: MarkedOptions, sanitize: (html: string) => string, ): SourceBlock[] { // Only DOM structure is compared; generated heading IDs are stripped by preview sanitization. @@ -93,7 +93,7 @@ export function buildSourceBlocks( if (token.type === 'list' && 'items' in token && actual[0] instanceof HTMLElement) { const items = Array.from(actual[0].children).filter((child) => child.tagName === 'LI'); let itemOffset = 0; - token.items.forEach((item: marked.Tokens.ListItem, index: number) => { + token.items.forEach((item: Tokens.ListItem, index: number) => { const itemStart = token.raw.indexOf(item.raw, itemOffset); if (itemStart >= 0 && items[index]) { const line = startLine + token.raw.substring(0, itemStart).split('\n').length - 1; @@ -128,7 +128,7 @@ export class MarkdownScrollMap { public constructor( private input: HTMLTextAreaElement, private preview: HTMLElement, - private options: marked.MarkedOptions, + private options: MarkedOptions, private sanitize: (html: string) => string, ) { this.mirror = document.createElement('pre'); diff --git a/src/app/components/note/markdown-note/markdown-unc-path.ts b/src/app/components/note/markdown-note/markdown-unc-path.ts index caaffe68..771f3923 100644 --- a/src/app/components/note/markdown-note/markdown-unc-path.ts +++ b/src/app/components/note/markdown-note/markdown-unc-path.ts @@ -1,4 +1,4 @@ -import { marked } from 'marked'; +import { MarkedExtension } from 'marked'; const uncPathPattern = /^\\\\[^\\/\s]+(?:\\[^\\/\s]+)+/; @@ -6,7 +6,7 @@ function escapeHtml(value: string): string { return value.replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); } -export const markdownUncPathExtension: marked.MarkedExtension = { +export const markdownUncPathExtension: MarkedExtension = { extensions: [ { name: 'uncPath', diff --git a/tsconfig-serve.json b/tsconfig-serve.json index eeeb1c85..52cdd77a 100644 --- a/tsconfig-serve.json +++ b/tsconfig-serve.json @@ -7,7 +7,7 @@ "experimentalDecorators": true, "module": "commonjs", "target": "es2015", - "types": ["node", "dom-webcodecs"], + "types": ["node"], "lib": ["es2017", "es2016", "es2015", "dom"] }, "include": ["main.ts"], diff --git a/tsconfig.app.json b/tsconfig.app.json index ff04e85b..85672486 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -4,7 +4,7 @@ "outDir": "../out-tsc/app", "module": "esnext", "baseUrl": "", - "types": ["dom-webcodecs"] + "types": [] }, "exclude": ["**/*.spec.ts"] } diff --git a/tsconfig.base.json b/tsconfig.base.json index 99efc734..c8e9ce5b 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -11,7 +11,8 @@ "allowSyntheticDefaultImports": true, "target": "ES2022", "typeRoots": ["node_modules/@types"], - "lib": ["es2017", "es2016", "es2015", "dom"], + "lib": ["es2017", "es2016", "es2015", "dom", "dom.iterable"], + "skipLibCheck": true, "useDefineForClassFields": false }, "include": ["main.ts", "src/**/*", "tsconfig.app.json"], diff --git a/tsconfig.spec.json b/tsconfig.spec.json index 6487b57e..ecc5c08b 100644 --- a/tsconfig.spec.json +++ b/tsconfig.spec.json @@ -5,7 +5,6 @@ "types": [ "jest", // 1 "node", - "dom-webcodecs" ], "esModuleInterop": true, // 2 "emitDecoratorMetadata": true // 3 From f1437dea9bc4277f50e7944711b3844d5ead314d Mon Sep 17 00:00:00 2001 From: Digimezzo Date: Fri, 13 Nov 2026 21:13:57 +0100 Subject: [PATCH 04/22] Upgrade to Angular 18 --- angular.json | 2 +- package.json | 34 +++++++++++++-------------- src/app/app.module.ts | 18 +++++--------- src/css/angular-material-theming.scss | 12 +++++----- tsconfig.json | 3 +++ 5 files changed, 33 insertions(+), 36 deletions(-) diff --git a/angular.json b/angular.json index 957df004..f3a02157 100644 --- a/angular.json +++ b/angular.json @@ -133,7 +133,7 @@ "defaultConfiguration": "dev" }, "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", + "builder": "@angular/build:extract-i18n", "options": { "buildTarget": "knowte:build" } diff --git a/package.json b/package.json index c5891658..38a17115 100644 --- a/package.json +++ b/package.json @@ -38,9 +38,9 @@ "test": "npx jest --verbose" }, "dependencies": { - "@angular/animations": "^17.3.12", - "@angular/cdk": "17.3.10", - "@angular/material": "17.3.10", + "@angular/animations": "^18.2.14", + "@angular/cdk": "^18.2.14", + "@angular/material": "^18.2.14", "@electron/remote": "^2.1.3", "@fortawesome/fontawesome-free": "^6.3.0", "angular-split": "14.1.0", @@ -59,7 +59,7 @@ "mermaid": "^12.2.0", "moment": "^2.27.0", "nanoid": "^4.0.0", - "ngx-markdown": "^17.0.0", + "ngx-markdown": "^18.0.0", "prismjs": "^1.30.0", "quill": "^1.3.7", "quill-blot-formatter": "^1.0.5", @@ -68,18 +68,18 @@ "tslib": "^2.4.1" }, "devDependencies": { - "@angular-builders/custom-webpack": "^17.0.0", - "@angular-devkit/build-angular": "^17.3.17", - "@angular/cli": "17.3.17", - "@angular/common": "17.3.12", - "@angular/compiler": "17.3.12", - "@angular/compiler-cli": "17.3.12", - "@angular/core": "17.3.12", - "@angular/forms": "17.3.12", - "@angular/language-service": "17.3.12", - "@angular/platform-browser": "17.3.12", - "@angular/platform-browser-dynamic": "17.3.12", - "@angular/router": "17.3.12", + "@angular-builders/custom-webpack": "^18.0.0", + "@angular/build": "^18.2.21", + "@angular/cli": "18.2.21", + "@angular/common": "18.2.14", + "@angular/compiler": "18.2.14", + "@angular/compiler-cli": "18.2.14", + "@angular/core": "18.2.14", + "@angular/forms": "18.2.14", + "@angular/language-service": "18.2.14", + "@angular/platform-browser": "18.2.14", + "@angular/platform-browser-dynamic": "18.2.14", + "@angular/router": "18.2.14", "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", "@types/d3-dispatch": "3.0.1", @@ -105,4 +105,4 @@ "webdriver-manager": "12.1.1", "zone.js": "~0.14.10" } -} +} \ No newline at end of file diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ed1090dd..a88d6a3c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,5 @@ import { ScrollingModule } from '@angular/cdk/scrolling'; -import { HttpClient, HttpClientModule } from '@angular/common/http'; +import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import { ErrorHandler, NgModule, SecurityContext } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatBottomSheetModule } from '@angular/material/bottom-sheet'; @@ -216,8 +216,7 @@ export function MarkedOptionsFactory(): MarkedOptions { // }; } -@NgModule({ - declarations: [ +@NgModule({ declarations: [ AppComponent, BackupSettingsComponent, WindowControlsComponent, @@ -277,8 +276,7 @@ export function MarkedOptionsFactory(): MarkedOptions { InformationAboutComponent, InformationComponentsComponent, ], - imports: [ - MarkdownModule.forRoot({ + bootstrap: [AppComponent], imports: [MarkdownModule.forRoot({ markedOptions: { provide: MARKED_OPTIONS, useFactory: MarkedOptionsFactory, @@ -307,7 +305,6 @@ export function MarkedOptionsFactory(): MarkedOptions { BrowserModule, ScrollingModule, FormsModule, - HttpClientModule, AppRoutingModule, AngularSplitModule, TranslateModule.forRoot({ @@ -316,9 +313,7 @@ export function MarkedOptionsFactory(): MarkedOptions { useFactory: HttpLoaderFactory, deps: [HttpClient], }, - }), - ], - providers: [ + })], providers: [ ElectronService, CollectionService, CollectionClient, @@ -366,7 +361,6 @@ export function MarkedOptionsFactory(): MarkedOptions { { provide: BaseSettings, useClass: Settings }, { provide: BaseApplication, useClass: Application }, { provide: BaseAppearanceService, useClass: AppearanceService }, - ], - bootstrap: [AppComponent], -}) + provideHttpClient(withInterceptorsFromDi()), + ] }) export class AppModule {} diff --git a/src/css/angular-material-theming.scss b/src/css/angular-material-theming.scss index a3315488..c0cb6e4d 100644 --- a/src/css/angular-material-theming.scss +++ b/src/css/angular-material-theming.scss @@ -1,6 +1,6 @@ @use '@angular/material' as mat; -$custom-typography: mat.define-typography-config( +$custom-typography: mat.m2-define-typography-config( $font-family: 'opensans', ); @@ -49,11 +49,11 @@ $custom-palette: ( ), ); -$primary-palette: mat.define-palette($custom-palette); -$accent-palette: mat.define-palette($custom-palette); -$warn-palette: mat.define-palette($custom-palette); +$primary-palette: mat.m2-define-palette($custom-palette); +$accent-palette: mat.m2-define-palette($custom-palette); +$warn-palette: mat.m2-define-palette($custom-palette); -$dark-theme: mat.define-dark-theme( +$dark-theme: mat.m2-define-dark-theme( ( color: ( primary: $primary-palette, @@ -63,7 +63,7 @@ $dark-theme: mat.define-dark-theme( ) ); -$light-theme: mat.define-light-theme( +$light-theme: mat.m2-define-light-theme( ( color: ( primary: $primary-palette, diff --git a/tsconfig.json b/tsconfig.json index 70bee4a3..9bc4b713 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,8 @@ { "extends": "./tsconfig.base.json", + "compilerOptions": { + "esModuleInterop": true + }, "angularCompilerOptions": { "strictTemplates": true } From 190b7bff4aa5bc6b4b21a516226ae1df5a15cb14 Mon Sep 17 00:00:00 2001 From: Digimezzo Date: Fri, 13 Nov 2026 21:36:16 +0100 Subject: [PATCH 05/22] Upgrade to Angular 19 --- angular.json | 6 +-- package.json | 44 +++++++++---------- src/app/app.component.ts | 1 + src/app/app.module.ts | 43 +++++++++--------- .../active-notebook-and-search.component.ts | 1 + .../collection-switcher.component.ts | 1 + .../move-notes-bottom-sheet.component.ts | 1 + .../collection/collection.component.ts | 15 ++++--- ...ote-type-chooser-bottom-sheet.component.ts | 1 + .../accent-button/accent-button.component.ts | 1 + .../icon-text-button.component.ts | 1 + .../toggle-switch/toggle-switch.component.ts | 1 + .../transparent-button.component.ts | 1 + .../confirmation-dialog.component.ts | 3 +- .../dialog-header/dialog-header.component.ts | 3 +- .../error-dialog/error-dialog.component.ts | 1 + .../input-dialog/input-dialog.component.ts | 1 + .../license-dialog.component.ts | 3 +- .../note-link-dialog.component.ts | 1 + .../notification-dialog.component.ts | 1 + .../password-input-dialog.component.ts | 1 + .../rename-collection-dialog.component.ts | 1 + .../rename-notebook-dialog.component.ts | 1 + ...pell-checker-languages-dialog.component.ts | 1 + .../font-size-switcher.component.ts | 1 + .../information-about.component.ts | 1 + .../information-components.component.ts | 1 + .../information/information.component.ts | 1 + .../components/loading/loading.component.ts | 1 + .../logo-full/logo-full.component.ts | 1 + .../logo-main/logo-main.component.ts | 1 + .../main-menu/main-menu.component.ts | 1 + .../actions-bottom-sheet.component.ts | 1 + .../search-bottom-sheet.component.ts | 1 + .../spell-check-bottom-sheet.component.ts | 1 + .../text-size-bottom-sheet.component.ts | 1 + .../markdown-note/markdown-note.component.ts | 1 + .../note-status-bar.component.ts | 1 + src/app/components/note/note.component.ts | 1 + .../notebook-switcher.component.ts | 1 + src/app/components/notes/notes.component.ts | 1 + .../advanced-settings.component.ts | 3 +- .../appearance-settings.component.ts | 1 + .../backup-settings.component.ts | 1 + .../notes-settings.component.ts | 1 + .../settings-text-size-in-notes.component.ts | 1 + .../components/settings/settings.component.ts | 1 + .../spell-check-languages.component.ts | 1 + .../sub-menu-item/sub-menu-item.component.ts | 1 + .../components/sub-menu/sub-menu.component.ts | 1 + .../tasks-progress.component.ts | 3 +- .../theme-switcher.component.ts | 1 + src/app/components/trash/trash.component.ts | 1 + .../components/welcome/welcome.component.ts | 1 + .../window-controls.component.ts | 1 + ...virtual-scroll-viewport-patch-directive.ts | 1 + src/app/directives/pixel-snap.directive.ts | 1 + src/app/directives/webview.directive.ts | 3 +- src/app/pipes/fix-image-paths.pipe.ts | 1 + src/app/pipes/sanitize-markdown.pipe.ts | 1 + src/app/pipes/truncate.pipe.ts | 3 +- tsconfig.json | 2 +- 62 files changed, 121 insertions(+), 60 deletions(-) diff --git a/angular.json b/angular.json index f3a02157..6f3949f0 100644 --- a/angular.json +++ b/angular.json @@ -120,14 +120,14 @@ "serve": { "builder": "@angular-builders/custom-webpack:dev-server", "options": { - "browserTarget": "knowte:build" + "buildTarget": "knowte:build" }, "configurations": { "dev": { - "browserTarget": "knowte:build:dev" + "buildTarget": "knowte:build:dev" }, "production": { - "browserTarget": "knowte:build:production" + "buildTarget": "knowte:build:production" } }, "defaultConfiguration": "dev" diff --git a/package.json b/package.json index 38a17115..2144b7c0 100644 --- a/package.json +++ b/package.json @@ -38,9 +38,9 @@ "test": "npx jest --verbose" }, "dependencies": { - "@angular/animations": "^18.2.14", - "@angular/cdk": "^18.2.14", - "@angular/material": "^18.2.14", + "@angular/animations": "^19.2.25", + "@angular/cdk": "^19.2.19", + "@angular/material": "^19.2.19", "@electron/remote": "^2.1.3", "@fortawesome/fontawesome-free": "^6.3.0", "angular-split": "14.1.0", @@ -54,12 +54,12 @@ "fs-extra": "10.1.0", "line-awesome": "^1.3.0", "lokijs": "^1.5.12", - "marked": "^9.0.0", + "marked": "^15.0.0", "material-design-icons": "^3.0.1", "mermaid": "^12.2.0", "moment": "^2.27.0", "nanoid": "^4.0.0", - "ngx-markdown": "^18.0.0", + "ngx-markdown": "^19.0.0", "prismjs": "^1.30.0", "quill": "^1.3.7", "quill-blot-formatter": "^1.0.5", @@ -68,23 +68,23 @@ "tslib": "^2.4.1" }, "devDependencies": { - "@angular-builders/custom-webpack": "^18.0.0", - "@angular/build": "^18.2.21", - "@angular/cli": "18.2.21", - "@angular/common": "18.2.14", - "@angular/compiler": "18.2.14", - "@angular/compiler-cli": "18.2.14", - "@angular/core": "18.2.14", - "@angular/forms": "18.2.14", - "@angular/language-service": "18.2.14", - "@angular/platform-browser": "18.2.14", - "@angular/platform-browser-dynamic": "18.2.14", - "@angular/router": "18.2.14", + "@angular-builders/custom-webpack": "^19.0.0", + "@angular/build": "^19.2.27", + "@angular/cli": "19.2.27", + "@angular/common": "19.2.25", + "@angular/compiler": "19.2.25", + "@angular/compiler-cli": "19.2.25", + "@angular/core": "19.2.25", + "@angular/forms": "19.2.25", + "@angular/language-service": "19.2.25", + "@angular/platform-browser": "19.2.25", + "@angular/platform-browser-dynamic": "19.2.25", + "@angular/router": "19.2.25", "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", "@types/d3-dispatch": "3.0.1", - "@types/jest": "^26.0.22", - "@types/node": "^14.14.33", + "@types/jest": "^29.0.0", + "@types/node": "^22.20.5", "codelyzer": "^6.0.0", "core-js": "2.6.1", "electron": "^43.0.0", @@ -100,9 +100,9 @@ "tslint": "~6.1.0", "type-fest": "3.13.1", "typemoq": "^2.1.0", - "typescript": "~5.4.5", + "typescript": "~5.8.3", "wait-on": "3.2.0", "webdriver-manager": "12.1.1", - "zone.js": "~0.14.10" + "zone.js": "~0.15.1" } -} \ No newline at end of file +} diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 4773223a..7c0fb7cd 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -21,6 +21,7 @@ import { TranslatorService } from './services/translator/translator.service'; selector: 'app-root', templateUrl: './app.component.html', styleUrls: ['./app.component.scss'], + standalone: false }) export class AppComponent implements OnInit, OnDestroy { private subscription: Subscription = new Subscription(); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a88d6a3c..9baa80c5 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -25,7 +25,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; import { AngularSplitModule } from 'angular-split'; -import { marked } from 'marked'; +import { marked, Tokens } from 'marked'; import { MARKED_OPTIONS, MarkdownModule, MarkedOptions, MarkedRenderer } from 'ngx-markdown'; import 'reflect-metadata'; import '../polyfills'; @@ -161,30 +161,27 @@ marked.use(markdownUncPathExtension); export function MarkedOptionsFactory(): MarkedOptions { const renderer = new MarkedRenderer(); - renderer.link = (href: string, title: string, text: string) => { - // Keep Angular's HTML sanitization enabled; render internal URLs as safe local anchors. - return MarkedRenderer.prototype.link.call(renderer, href ? getNoteLinkPreviewHref(href) : href, title, text) as string; - }; + const htmlEscapes: Record = { '&': '&', '<': '<', '>': '>' }; - const htmlEscapes: Record = { - '&': '&', - '<': '<', - '>': '>', + renderer.link = (token: Tokens.Link) => { + const href = token.href ? getNoteLinkPreviewHref(token.href) : token.href; + return MarkedRenderer.prototype.link.call(renderer, { ...token, href }) as string; }; - renderer.code = (code: string, infostring: string | undefined, escaped: boolean) => { - const language = infostring?.trim().split(/\s+/, 1)[0].toLowerCase(); + renderer.code = (token: Tokens.Code) => { + const language = token.lang?.trim().split(/\s+/, 1)[0].toLowerCase(); if (language === 'mermaid') { - const escapedCode = code.replace(/[&<>]/g, (character) => htmlEscapes[character] ?? character); + const escapedCode = token.text.replace(/[&<>]/g, (c) => htmlEscapes[c] ?? c); return `
${escapedCode}
`; } - return MarkedRenderer.prototype.code.call(renderer, code, infostring, escaped) as string; + return MarkedRenderer.prototype.code.call(renderer, token) as string; }; // remove task list bullets - renderer.list = (body: string, ordered: boolean, start: number) => { + renderer.list = (token: Tokens.List) => { + const html = MarkedRenderer.prototype.list.call(renderer, token) as string; const divElement = document.createElement('div'); - divElement.innerHTML = body; + divElement.innerHTML = html; divElement.querySelectorAll('li').forEach((li) => { li.childNodes.forEach((child) => { @@ -200,7 +197,7 @@ export function MarkedOptionsFactory(): MarkedOptions { }); }); - return MarkedRenderer.prototype.list.call(renderer, divElement.innerHTML, ordered, start) as string; + return divElement.innerHTML; }; return { renderer }; @@ -216,7 +213,8 @@ export function MarkedOptionsFactory(): MarkedOptions { // }; } -@NgModule({ declarations: [ +@NgModule({ + declarations: [ AppComponent, BackupSettingsComponent, WindowControlsComponent, @@ -276,7 +274,9 @@ export function MarkedOptionsFactory(): MarkedOptions { InformationAboutComponent, InformationComponentsComponent, ], - bootstrap: [AppComponent], imports: [MarkdownModule.forRoot({ + bootstrap: [AppComponent], + imports: [ + MarkdownModule.forRoot({ markedOptions: { provide: MARKED_OPTIONS, useFactory: MarkedOptionsFactory, @@ -313,7 +313,9 @@ export function MarkedOptionsFactory(): MarkedOptions { useFactory: HttpLoaderFactory, deps: [HttpClient], }, - })], providers: [ + }), + ], + providers: [ ElectronService, CollectionService, CollectionClient, @@ -362,5 +364,6 @@ export function MarkedOptionsFactory(): MarkedOptions { { provide: BaseApplication, useClass: Application }, { provide: BaseAppearanceService, useClass: AppearanceService }, provideHttpClient(withInterceptorsFromDi()), - ] }) + ], +}) export class AppModule {} diff --git a/src/app/components/active-notebook-and-search/active-notebook-and-search.component.ts b/src/app/components/active-notebook-and-search/active-notebook-and-search.component.ts index b906a97e..8a37a988 100644 --- a/src/app/components/active-notebook-and-search/active-notebook-and-search.component.ts +++ b/src/app/components/active-notebook-and-search/active-notebook-and-search.component.ts @@ -10,6 +10,7 @@ import { SearchService } from '../../services/search/search.service'; templateUrl: './active-notebook-and-search.component.html', styleUrls: ['./active-notebook-and-search.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class ActiveNotebookAndSearchComponent implements OnInit { @ViewChild('searchInput', { static: true }) public searchInputElement: ElementRef; diff --git a/src/app/components/collection-switcher/collection-switcher.component.ts b/src/app/components/collection-switcher/collection-switcher.component.ts index 9cdee39d..336ef491 100644 --- a/src/app/components/collection-switcher/collection-switcher.component.ts +++ b/src/app/components/collection-switcher/collection-switcher.component.ts @@ -20,6 +20,7 @@ import { RenameCollectionDialogComponent } from '../dialogs/rename-collection-di templateUrl: './collection-switcher.component.html', styleUrls: ['./collection-switcher.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class CollectionSwitcherComponent implements OnInit, OnDestroy { private subscription: Subscription; diff --git a/src/app/components/collection/bottom-sheets/move-notes-bottom-sheet/move-notes-bottom-sheet.component.ts b/src/app/components/collection/bottom-sheets/move-notes-bottom-sheet/move-notes-bottom-sheet.component.ts index ae1c994e..b93db05f 100644 --- a/src/app/components/collection/bottom-sheets/move-notes-bottom-sheet/move-notes-bottom-sheet.component.ts +++ b/src/app/components/collection/bottom-sheets/move-notes-bottom-sheet/move-notes-bottom-sheet.component.ts @@ -11,6 +11,7 @@ import { ErrorDialogComponent } from '../../../dialogs/error-dialog/error-dialog selector: 'app-move-notes-bottom-sheet', templateUrl: 'move-notes-bottom-sheet.component.html', styleUrls: ['./move-notes-bottom-sheet.component.scss'], + standalone: false }) export class MoveNotesBottomSheetComponent implements OnInit { constructor( diff --git a/src/app/components/collection/collection.component.ts b/src/app/components/collection/collection.component.ts index 594c36ff..74413e84 100644 --- a/src/app/components/collection/collection.component.ts +++ b/src/app/components/collection/collection.component.ts @@ -41,16 +41,17 @@ import {AnimatedPage} from "../animated-page"; animations: [ trigger('selectionAction', [ transition(':enter', [ - style({opacity: 0, transform: 'translateY(16px)'}), - animate('150ms {{enterDelay}} ease-out', style({opacity: 1, transform: 'translateY(0)'})), - ], {params: {enterDelay: '0ms'}}), + style({ opacity: 0, transform: 'translateY(16px)' }), + animate('150ms {{enterDelay}} ease-out', style({ opacity: 1, transform: 'translateY(0)' })), + ], { params: { enterDelay: '0ms' } }), transition(':leave', [ - style({opacity: 1, transform: 'translateY(0)'}), - animate('150ms {{leaveDelay}} ease-in', style({opacity: 0, transform: 'translateY(16px)'})), - ], {params: {leaveDelay: '0ms'}}), + style({ opacity: 1, transform: 'translateY(0)' }), + animate('150ms {{leaveDelay}} ease-in', style({ opacity: 0, transform: 'translateY(16px)' })), + ], { params: { leaveDelay: '0ms' } }), ]), ], - encapsulation: ViewEncapsulation.None + encapsulation: ViewEncapsulation.None, + standalone: false }) export class CollectionComponent extends AnimatedPage implements OnInit, OnDestroy { private subscription: Subscription; diff --git a/src/app/components/collection/note-type-chooser-bottom-sheet/note-type-chooser-bottom-sheet.component.ts b/src/app/components/collection/note-type-chooser-bottom-sheet/note-type-chooser-bottom-sheet.component.ts index e61f6512..efea5f3a 100644 --- a/src/app/components/collection/note-type-chooser-bottom-sheet/note-type-chooser-bottom-sheet.component.ts +++ b/src/app/components/collection/note-type-chooser-bottom-sheet/note-type-chooser-bottom-sheet.component.ts @@ -6,6 +6,7 @@ import { NoteCreator } from '../note-creator'; selector: 'app-note-type-chooser-bottom-sheet', templateUrl: 'note-type-chooser-bottom-sheet.component.html', styleUrls: ['./note-type-chooser-bottom-sheet.component.scss'], + standalone: false }) export class NoteTypeChooserBottomSheetComponent { constructor( diff --git a/src/app/components/controls/accent-button/accent-button.component.ts b/src/app/components/controls/accent-button/accent-button.component.ts index 441d4f5c..9645bd64 100644 --- a/src/app/components/controls/accent-button/accent-button.component.ts +++ b/src/app/components/controls/accent-button/accent-button.component.ts @@ -7,5 +7,6 @@ import { Component } from '@angular/core'; host: { style: 'display: inline-block', }, + standalone: false }) export class AccentButtonComponent {} diff --git a/src/app/components/controls/icon-text-button/icon-text-button.component.ts b/src/app/components/controls/icon-text-button/icon-text-button.component.ts index 2ad9749b..49144202 100644 --- a/src/app/components/controls/icon-text-button/icon-text-button.component.ts +++ b/src/app/components/controls/icon-text-button/icon-text-button.component.ts @@ -7,6 +7,7 @@ import { Component, Input } from '@angular/core'; host: { style: 'display: inline-block', }, + standalone: false }) export class IconTextButtonComponent { @Input() public icon: string; diff --git a/src/app/components/controls/toggle-switch/toggle-switch.component.ts b/src/app/components/controls/toggle-switch/toggle-switch.component.ts index f700bf28..28af707b 100644 --- a/src/app/components/controls/toggle-switch/toggle-switch.component.ts +++ b/src/app/components/controls/toggle-switch/toggle-switch.component.ts @@ -4,6 +4,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; selector: 'app-toggle-switch', templateUrl: './toggle-switch.component.html', styleUrls: ['./toggle-switch.component.scss'], + standalone: false }) export class ToggleSwitchComponent { @Input() diff --git a/src/app/components/controls/transparent-button/transparent-button.component.ts b/src/app/components/controls/transparent-button/transparent-button.component.ts index 847b9078..18fa44bb 100644 --- a/src/app/components/controls/transparent-button/transparent-button.component.ts +++ b/src/app/components/controls/transparent-button/transparent-button.component.ts @@ -7,6 +7,7 @@ import { Component, Input } from '@angular/core'; host: { style: 'display: inline-block', }, + standalone: false }) export class TransparentButtonComponent { @Input() diff --git a/src/app/components/dialogs/confirmation-dialog/confirmation-dialog.component.ts b/src/app/components/dialogs/confirmation-dialog/confirmation-dialog.component.ts index a8ec4dee..9e99304f 100644 --- a/src/app/components/dialogs/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/app/components/dialogs/confirmation-dialog/confirmation-dialog.component.ts @@ -5,7 +5,8 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; selector: 'app-confirmation-dialog', templateUrl: './confirmation-dialog.component.html', styleUrls: ['./confirmation-dialog.component.scss'], - encapsulation: ViewEncapsulation.None + encapsulation: ViewEncapsulation.None, + standalone: false }) export class ConfirmationDialogComponent implements OnInit { constructor(@Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { diff --git a/src/app/components/dialogs/dialog-header/dialog-header.component.ts b/src/app/components/dialogs/dialog-header/dialog-header.component.ts index 851c9ba2..c0df2e13 100644 --- a/src/app/components/dialogs/dialog-header/dialog-header.component.ts +++ b/src/app/components/dialogs/dialog-header/dialog-header.component.ts @@ -4,7 +4,8 @@ import { Component, OnInit, Input, ViewEncapsulation } from '@angular/core'; selector: 'app-dialog-header', templateUrl: './dialog-header.component.html', styleUrls: ['./dialog-header.component.scss'], - encapsulation: ViewEncapsulation.None + encapsulation: ViewEncapsulation.None, + standalone: false }) export class DialogHeaderComponent implements OnInit { constructor() { diff --git a/src/app/components/dialogs/error-dialog/error-dialog.component.ts b/src/app/components/dialogs/error-dialog/error-dialog.component.ts index 36504b97..17f44c0b 100644 --- a/src/app/components/dialogs/error-dialog/error-dialog.component.ts +++ b/src/app/components/dialogs/error-dialog/error-dialog.component.ts @@ -9,6 +9,7 @@ import { FileAccess } from '../../../common/io/file-access'; templateUrl: './error-dialog.component.html', styleUrls: ['./error-dialog.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class ErrorDialogComponent implements OnInit { constructor( diff --git a/src/app/components/dialogs/input-dialog/input-dialog.component.ts b/src/app/components/dialogs/input-dialog/input-dialog.component.ts index d7f76042..9da3ba8d 100644 --- a/src/app/components/dialogs/input-dialog/input-dialog.component.ts +++ b/src/app/components/dialogs/input-dialog/input-dialog.component.ts @@ -6,6 +6,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; templateUrl: './input-dialog.component.html', styleUrls: ['./input-dialog.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class InputDialogComponent implements OnInit { constructor(@Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { diff --git a/src/app/components/dialogs/license-dialog/license-dialog.component.ts b/src/app/components/dialogs/license-dialog/license-dialog.component.ts index 8d3a4923..a5ec081b 100644 --- a/src/app/components/dialogs/license-dialog/license-dialog.component.ts +++ b/src/app/components/dialogs/license-dialog/license-dialog.component.ts @@ -5,7 +5,8 @@ import { MatDialogRef } from '@angular/material/dialog'; selector: 'app-license-dialog', templateUrl: './license-dialog.component.html', styleUrls: ['./license-dialog.component.scss'], - encapsulation: ViewEncapsulation.None + encapsulation: ViewEncapsulation.None, + standalone: false }) export class LicenseDialogComponent implements OnInit { constructor(private dialogRef: MatDialogRef) { diff --git a/src/app/components/dialogs/note-link-dialog/note-link-dialog.component.ts b/src/app/components/dialogs/note-link-dialog/note-link-dialog.component.ts index f54f5492..37be6d5d 100644 --- a/src/app/components/dialogs/note-link-dialog/note-link-dialog.component.ts +++ b/src/app/components/dialogs/note-link-dialog/note-link-dialog.component.ts @@ -7,6 +7,7 @@ import { CollectionUtils } from '../../../common/utils/collection-utils'; selector: 'app-note-link-dialog', templateUrl: './note-link-dialog.component.html', styleUrls: ['./note-link-dialog.component.scss'], + standalone: false }) export class NoteLinkDialogComponent { private _searchText: string = ''; diff --git a/src/app/components/dialogs/notification-dialog/notification-dialog.component.ts b/src/app/components/dialogs/notification-dialog/notification-dialog.component.ts index a0df8a44..06221df0 100644 --- a/src/app/components/dialogs/notification-dialog/notification-dialog.component.ts +++ b/src/app/components/dialogs/notification-dialog/notification-dialog.component.ts @@ -5,6 +5,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; templateUrl: './notification-dialog.component.html', styleUrls: ['./notification-dialog.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class NotificationDialogComponent implements OnInit { constructor(@Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { diff --git a/src/app/components/dialogs/password-input-dialog/password-input-dialog.component.ts b/src/app/components/dialogs/password-input-dialog/password-input-dialog.component.ts index 60c59281..a0d56a8f 100644 --- a/src/app/components/dialogs/password-input-dialog/password-input-dialog.component.ts +++ b/src/app/components/dialogs/password-input-dialog/password-input-dialog.component.ts @@ -6,6 +6,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; templateUrl: './password-input-dialog.component.html', styleUrls: ['./password-input-dialog.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class PasswordInputDialogComponent implements OnInit { constructor(@Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { diff --git a/src/app/components/dialogs/rename-collection-dialog/rename-collection-dialog.component.ts b/src/app/components/dialogs/rename-collection-dialog/rename-collection-dialog.component.ts index 47d8f25d..0e9122f4 100644 --- a/src/app/components/dialogs/rename-collection-dialog/rename-collection-dialog.component.ts +++ b/src/app/components/dialogs/rename-collection-dialog/rename-collection-dialog.component.ts @@ -11,6 +11,7 @@ import { ErrorDialogComponent } from '../error-dialog/error-dialog.component'; templateUrl: './rename-collection-dialog.component.html', styleUrls: ['./rename-collection-dialog.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class RenameCollectionDialogComponent implements OnInit { constructor( diff --git a/src/app/components/dialogs/rename-notebook-dialog/rename-notebook-dialog.component.ts b/src/app/components/dialogs/rename-notebook-dialog/rename-notebook-dialog.component.ts index f7bd87f5..534e6057 100644 --- a/src/app/components/dialogs/rename-notebook-dialog/rename-notebook-dialog.component.ts +++ b/src/app/components/dialogs/rename-notebook-dialog/rename-notebook-dialog.component.ts @@ -11,6 +11,7 @@ import { ErrorDialogComponent } from '../error-dialog/error-dialog.component'; templateUrl: './rename-notebook-dialog.component.html', styleUrls: ['./rename-notebook-dialog.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class RenameNotebookDialogComponent implements OnInit { constructor( diff --git a/src/app/components/dialogs/set-spell-checker-languages-dialog/set-spell-checker-languages-dialog.component.ts b/src/app/components/dialogs/set-spell-checker-languages-dialog/set-spell-checker-languages-dialog.component.ts index 30e6abbf..e194d023 100644 --- a/src/app/components/dialogs/set-spell-checker-languages-dialog/set-spell-checker-languages-dialog.component.ts +++ b/src/app/components/dialogs/set-spell-checker-languages-dialog/set-spell-checker-languages-dialog.component.ts @@ -6,6 +6,7 @@ import { Component, ViewEncapsulation } from '@angular/core'; templateUrl: './set-spell-checker-languages-dialog.component.html', styleUrls: ['./set-spell-checker-languages-dialog.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class SetSpellCheckerLanguagesDialogComponent { constructor() {} diff --git a/src/app/components/font-size-switcher/font-size-switcher.component.ts b/src/app/components/font-size-switcher/font-size-switcher.component.ts index efdc963e..b9f94c5f 100644 --- a/src/app/components/font-size-switcher/font-size-switcher.component.ts +++ b/src/app/components/font-size-switcher/font-size-switcher.component.ts @@ -7,6 +7,7 @@ import { BaseAppearanceService } from '../../services/appearance/base-appearance templateUrl: './font-size-switcher.component.html', styleUrls: ['./font-size-switcher.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class FontSizeSwitcherComponent implements OnInit { constructor(public appearance: BaseAppearanceService) {} diff --git a/src/app/components/information/information-about/information-about.component.ts b/src/app/components/information/information-about/information-about.component.ts index 18c0ebd4..35245fca 100644 --- a/src/app/components/information/information-about/information-about.component.ts +++ b/src/app/components/information/information-about/information-about.component.ts @@ -10,6 +10,7 @@ import {ProductInformation} from "../../../common/application/product-informatio templateUrl: './information-about.component.html', styleUrls: ['./information-about.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class InformationAboutComponent { public constructor(private dialog: MatDialog) {} diff --git a/src/app/components/information/information-components/information-components.component.ts b/src/app/components/information/information-components/information-components.component.ts index d05334b0..444599ae 100644 --- a/src/app/components/information/information-components/information-components.component.ts +++ b/src/app/components/information/information-components/information-components.component.ts @@ -7,6 +7,7 @@ import {Constants} from "../../../common/application/constants"; templateUrl: './information-components.component.html', styleUrls: ['./information-components.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class InformationComponentsComponent { public constructor() {} diff --git a/src/app/components/information/information.component.ts b/src/app/components/information/information.component.ts index dcf80e8f..df4c1950 100644 --- a/src/app/components/information/information.component.ts +++ b/src/app/components/information/information.component.ts @@ -10,6 +10,7 @@ import {enterLeftToRight, enterRightToLeft} from "../../animations/animations"; styleUrls: ['./information.component.scss'], encapsulation: ViewEncapsulation.None, animations: [enterLeftToRight, enterRightToLeft], + standalone: false }) export class InformationComponent extends AnimatedPage { public constructor(public appearance: BaseAppearanceService, private router: Router) { diff --git a/src/app/components/loading/loading.component.ts b/src/app/components/loading/loading.component.ts index f40d1911..f0f6f290 100644 --- a/src/app/components/loading/loading.component.ts +++ b/src/app/components/loading/loading.component.ts @@ -8,6 +8,7 @@ import { CollectionService } from '../../services/collection/collection.service' templateUrl: './loading.component.html', styleUrls: ['./loading.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class LoadingComponent implements OnInit { constructor(private collectionService: CollectionService, public appearance: BaseAppearanceService, public router: Router) {} diff --git a/src/app/components/logo-full/logo-full.component.ts b/src/app/components/logo-full/logo-full.component.ts index ce935003..62635793 100644 --- a/src/app/components/logo-full/logo-full.component.ts +++ b/src/app/components/logo-full/logo-full.component.ts @@ -7,6 +7,7 @@ import { ProductInformation } from '../../common/application/product-information templateUrl: './logo-full.component.html', styleUrls: ['./logo-full.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class LogoFullComponent implements OnInit { constructor() {} diff --git a/src/app/components/logo-main/logo-main.component.ts b/src/app/components/logo-main/logo-main.component.ts index 55432ede..340c3ab6 100644 --- a/src/app/components/logo-main/logo-main.component.ts +++ b/src/app/components/logo-main/logo-main.component.ts @@ -6,6 +6,7 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; templateUrl: './logo-main.component.html', styleUrls: ['./logo-main.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class LogoMainComponent implements OnInit { constructor() {} diff --git a/src/app/components/main-menu/main-menu.component.ts b/src/app/components/main-menu/main-menu.component.ts index 59803676..a9b594e7 100644 --- a/src/app/components/main-menu/main-menu.component.ts +++ b/src/app/components/main-menu/main-menu.component.ts @@ -6,6 +6,7 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; templateUrl: './main-menu.component.html', styleUrls: ['./main-menu.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class MainMenuComponent implements OnInit { constructor() {} diff --git a/src/app/components/note/bottom-sheets/actions-bottom-sheet/actions-bottom-sheet.component.ts b/src/app/components/note/bottom-sheets/actions-bottom-sheet/actions-bottom-sheet.component.ts index 3e4f422d..883c8b95 100644 --- a/src/app/components/note/bottom-sheets/actions-bottom-sheet/actions-bottom-sheet.component.ts +++ b/src/app/components/note/bottom-sheets/actions-bottom-sheet/actions-bottom-sheet.component.ts @@ -14,6 +14,7 @@ export interface NoteActionsData { selector: 'app-actions-bottom-sheet', templateUrl: './actions-bottom-sheet.component.html', styleUrls: ['./actions-bottom-sheet.component.scss'], + standalone: false }) export class ActionsBottomSheetComponent { constructor( diff --git a/src/app/components/note/bottom-sheets/search-bottom-sheet/search-bottom-sheet.component.ts b/src/app/components/note/bottom-sheets/search-bottom-sheet/search-bottom-sheet.component.ts index 10b5ea78..d310399d 100644 --- a/src/app/components/note/bottom-sheets/search-bottom-sheet/search-bottom-sheet.component.ts +++ b/src/app/components/note/bottom-sheets/search-bottom-sheet/search-bottom-sheet.component.ts @@ -6,6 +6,7 @@ import { SearchClient } from '../../../../services/search/search.client'; selector: 'app-search-bottom-sheet', styleUrls: ['./search-bottom-sheet.component.scss'], templateUrl: 'search-bottom-sheet.component.html', + standalone: false }) export class SearchBottomSheetComponent implements OnInit, AfterViewInit { private _searchText: string = ''; diff --git a/src/app/components/note/bottom-sheets/spell-check-bottom-sheet/spell-check-bottom-sheet.component.ts b/src/app/components/note/bottom-sheets/spell-check-bottom-sheet/spell-check-bottom-sheet.component.ts index 6f9938c0..0d6e780d 100644 --- a/src/app/components/note/bottom-sheets/spell-check-bottom-sheet/spell-check-bottom-sheet.component.ts +++ b/src/app/components/note/bottom-sheets/spell-check-bottom-sheet/spell-check-bottom-sheet.component.ts @@ -3,6 +3,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-spell-check-bottom-sheet', templateUrl: 'spell-check-bottom-sheet.component.html', + standalone: false }) export class SpellCheckBottomSheetComponent { constructor() {} diff --git a/src/app/components/note/bottom-sheets/text-size-bottom-sheet/text-size-bottom-sheet.component.ts b/src/app/components/note/bottom-sheets/text-size-bottom-sheet/text-size-bottom-sheet.component.ts index 86159880..4333115c 100644 --- a/src/app/components/note/bottom-sheets/text-size-bottom-sheet/text-size-bottom-sheet.component.ts +++ b/src/app/components/note/bottom-sheets/text-size-bottom-sheet/text-size-bottom-sheet.component.ts @@ -3,6 +3,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-text-size-bottom-sheet', templateUrl: 'text-size-bottom-sheet.component.html', + standalone: false }) export class TextSizeBottomSheetComponent { constructor() {} diff --git a/src/app/components/note/markdown-note/markdown-note.component.ts b/src/app/components/note/markdown-note/markdown-note.component.ts index a838cbb1..ca9a4a00 100644 --- a/src/app/components/note/markdown-note/markdown-note.component.ts +++ b/src/app/components/note/markdown-note/markdown-note.component.ts @@ -18,6 +18,7 @@ import { MarkdownScrollMap } from './markdown-scroll-map'; templateUrl: './markdown-note.component.html', styleUrls: ['./markdown-note.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class MarkdownNoteComponent implements AfterViewInit, OnDestroy { private isPickingNote: boolean = false; diff --git a/src/app/components/note/note-status-bar/note-status-bar.component.ts b/src/app/components/note/note-status-bar/note-status-bar.component.ts index c6cdb64b..e4a712a9 100644 --- a/src/app/components/note/note-status-bar/note-status-bar.component.ts +++ b/src/app/components/note/note-status-bar/note-status-bar.component.ts @@ -12,6 +12,7 @@ export type NoteSaveStatus = 'saved' | 'unsaved' | 'failed'; selector: 'app-note-status-bar', styleUrls: ['./note-status-bar.component.scss'], templateUrl: 'note-status-bar.component.html', + standalone: false }) export class NoteStatusBarComponent { constructor( diff --git a/src/app/components/note/note.component.ts b/src/app/components/note/note.component.ts index 37ee0342..e3b5ddf8 100644 --- a/src/app/components/note/note.component.ts +++ b/src/app/components/note/note.component.ts @@ -48,6 +48,7 @@ import { NoteSaveStatus } from './note-status-bar/note-status-bar.component'; templateUrl: './note.component.html', styleUrls: ['./note.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class NoteComponent implements OnInit { private subscription: Subscription = new Subscription(); diff --git a/src/app/components/note/notebook-switcher/notebook-switcher.component.ts b/src/app/components/note/notebook-switcher/notebook-switcher.component.ts index bab3a631..dc43b0e5 100644 --- a/src/app/components/note/notebook-switcher/notebook-switcher.component.ts +++ b/src/app/components/note/notebook-switcher/notebook-switcher.component.ts @@ -13,6 +13,7 @@ import { TranslatorService } from '../../../services/translator/translator.servi templateUrl: './notebook-switcher.component.html', styleUrls: ['./notebook-switcher.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class NotebookSwitcherComponent implements OnInit, OnDestroy { private subscription: Subscription = new Subscription(); diff --git a/src/app/components/notes/notes.component.ts b/src/app/components/notes/notes.component.ts index 56ffffcd..4fe23b85 100644 --- a/src/app/components/notes/notes.component.ts +++ b/src/app/components/notes/notes.component.ts @@ -16,6 +16,7 @@ import {SearchService} from '../../services/search/search.service'; templateUrl: './notes.component.html', styleUrls: ['./notes.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class NotesComponent implements OnInit, OnDestroy { private _category: string; diff --git a/src/app/components/settings/advanced-settings/advanced-settings.component.ts b/src/app/components/settings/advanced-settings/advanced-settings.component.ts index dcb4f67f..bed3f695 100644 --- a/src/app/components/settings/advanced-settings/advanced-settings.component.ts +++ b/src/app/components/settings/advanced-settings/advanced-settings.component.ts @@ -14,10 +14,11 @@ import * as fs from 'fs-extra'; @Component({ selector: 'app-advanced-settings', - host: {style: 'display: block; width: 100%;'}, + host: { style: 'display: block; width: 100%;' }, templateUrl: './advanced-settings.component.html', styleUrls: ['./advanced-settings.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class AdvancedSettingsComponent { public constructor( diff --git a/src/app/components/settings/appearance-settings/appearance-settings.component.ts b/src/app/components/settings/appearance-settings/appearance-settings.component.ts index d84a08e4..d235a669 100644 --- a/src/app/components/settings/appearance-settings/appearance-settings.component.ts +++ b/src/app/components/settings/appearance-settings/appearance-settings.component.ts @@ -10,6 +10,7 @@ import {Desktop} from "../../../common/io/desktop"; templateUrl: './appearance-settings.component.html', styleUrls: ['./appearance-settings.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class AppearanceSettingsComponent { public constructor( diff --git a/src/app/components/settings/backup-settings/backup-settings.component.ts b/src/app/components/settings/backup-settings/backup-settings.component.ts index 4ecc5876..7e05919d 100644 --- a/src/app/components/settings/backup-settings/backup-settings.component.ts +++ b/src/app/components/settings/backup-settings/backup-settings.component.ts @@ -13,6 +13,7 @@ import { ErrorDialogComponent } from '../../dialogs/error-dialog/error-dialog.co templateUrl: './backup-settings.component.html', styleUrls: ['./backup-settings.component.scss'], host: { style: 'display: block;' }, + standalone: false }) export class BackupSettingsComponent { @Input() public restoreOnly: boolean = false; diff --git a/src/app/components/settings/notes-settings/notes-settings.component.ts b/src/app/components/settings/notes-settings/notes-settings.component.ts index 39128910..3df7bf83 100644 --- a/src/app/components/settings/notes-settings/notes-settings.component.ts +++ b/src/app/components/settings/notes-settings/notes-settings.component.ts @@ -11,6 +11,7 @@ import { templateUrl: './notes-settings.component.html', styleUrls: ['./notes-settings.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class NotesSettingsComponent { public constructor( diff --git a/src/app/components/settings/settings-text-size-in-notes/settings-text-size-in-notes.component.ts b/src/app/components/settings/settings-text-size-in-notes/settings-text-size-in-notes.component.ts index deb11897..4ae77e5a 100644 --- a/src/app/components/settings/settings-text-size-in-notes/settings-text-size-in-notes.component.ts +++ b/src/app/components/settings/settings-text-size-in-notes/settings-text-size-in-notes.component.ts @@ -8,6 +8,7 @@ import { CollectionService } from '../../../services/collection/collection.servi templateUrl: './settings-text-size-in-notes.component.html', styleUrls: ['./settings-text-size-in-notes.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class SettingsTextSizeInNotesComponent { constructor(private collectionService: CollectionService, private settings: BaseSettings) {} diff --git a/src/app/components/settings/settings.component.ts b/src/app/components/settings/settings.component.ts index 0f0652df..24d16258 100644 --- a/src/app/components/settings/settings.component.ts +++ b/src/app/components/settings/settings.component.ts @@ -10,6 +10,7 @@ import {enterLeftToRight, enterRightToLeft} from "../../animations/animations"; styleUrls: ['./settings.component.scss'], encapsulation: ViewEncapsulation.None, animations: [enterLeftToRight, enterRightToLeft], + standalone: false }) export class SettingsComponent extends AnimatedPage { public constructor( diff --git a/src/app/components/spell-check-languages/spell-check-languages.component.ts b/src/app/components/spell-check-languages/spell-check-languages.component.ts index 0f09b045..bbce7b1f 100644 --- a/src/app/components/spell-check-languages/spell-check-languages.component.ts +++ b/src/app/components/spell-check-languages/spell-check-languages.component.ts @@ -8,6 +8,7 @@ import { SpellCheckService } from '../../services/spell-check/spell-check.servic templateUrl: './spell-check-languages.component.html', styleUrls: ['./spell-check-languages.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class SpellCheckLanguagesComponent { constructor(private spellCheckService: SpellCheckService) {} diff --git a/src/app/components/sub-menu/sub-menu-item/sub-menu-item.component.ts b/src/app/components/sub-menu/sub-menu-item/sub-menu-item.component.ts index 6251414a..0db728eb 100644 --- a/src/app/components/sub-menu/sub-menu-item/sub-menu-item.component.ts +++ b/src/app/components/sub-menu/sub-menu-item/sub-menu-item.component.ts @@ -8,6 +8,7 @@ const countLabelMinWidth: number = 22; host: { style: 'display: block' }, templateUrl: './sub-menu-item.component.html', styleUrls: ['./sub-menu-item.component.scss'], + standalone: false }) export class SubMenuItemComponent implements AfterViewInit, OnDestroy { private resizeObserver: ResizeObserver; diff --git a/src/app/components/sub-menu/sub-menu.component.ts b/src/app/components/sub-menu/sub-menu.component.ts index 2f2fb1eb..17c5dc16 100644 --- a/src/app/components/sub-menu/sub-menu.component.ts +++ b/src/app/components/sub-menu/sub-menu.component.ts @@ -5,5 +5,6 @@ import { Component, ViewEncapsulation } from '@angular/core'; host: { style: 'display: block' }, templateUrl: './sub-menu.component.html', styleUrls: ['./sub-menu.component.scss'], + standalone: false }) export class SubMenuComponent {} diff --git a/src/app/components/tasks-progress/tasks-progress.component.ts b/src/app/components/tasks-progress/tasks-progress.component.ts index 696beb96..b8711c14 100644 --- a/src/app/components/tasks-progress/tasks-progress.component.ts +++ b/src/app/components/tasks-progress/tasks-progress.component.ts @@ -3,7 +3,8 @@ import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-tasks-progress', templateUrl: './tasks-progress.component.html', - styleUrls: ['./tasks-progress.component.scss'] + styleUrls: ['./tasks-progress.component.scss'], + standalone: false }) export class TasksProgressComponent implements OnInit { private _closedTasksCount: number; diff --git a/src/app/components/theme-switcher/theme-switcher.component.ts b/src/app/components/theme-switcher/theme-switcher.component.ts index c6dd4406..b439b035 100644 --- a/src/app/components/theme-switcher/theme-switcher.component.ts +++ b/src/app/components/theme-switcher/theme-switcher.component.ts @@ -8,6 +8,7 @@ import { Theme } from '../../services/appearance/theme/theme'; templateUrl: './theme-switcher.component.html', styleUrls: ['./theme-switcher.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class ThemeSwitcherComponent implements OnInit { constructor(public appearanceService: BaseAppearanceService) {} diff --git a/src/app/components/trash/trash.component.ts b/src/app/components/trash/trash.component.ts index dd1976fc..e9fed975 100644 --- a/src/app/components/trash/trash.component.ts +++ b/src/app/components/trash/trash.component.ts @@ -16,6 +16,7 @@ import { ErrorDialogComponent } from '../dialogs/error-dialog/error-dialog.compo templateUrl: './trash.component.html', styleUrls: ['./trash.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class TrashComponent implements OnInit, OnDestroy { private subscription: Subscription = new Subscription(); diff --git a/src/app/components/welcome/welcome.component.ts b/src/app/components/welcome/welcome.component.ts index 640d2bb8..582ef181 100644 --- a/src/app/components/welcome/welcome.component.ts +++ b/src/app/components/welcome/welcome.component.ts @@ -14,6 +14,7 @@ import { ErrorDialogComponent } from '../dialogs/error-dialog/error-dialog.compo templateUrl: './welcome.component.html', styleUrls: ['./welcome.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class WelcomeComponent implements OnInit { constructor( diff --git a/src/app/components/window-controls/window-controls.component.ts b/src/app/components/window-controls/window-controls.component.ts index 5e87eb83..02122f29 100644 --- a/src/app/components/window-controls/window-controls.component.ts +++ b/src/app/components/window-controls/window-controls.component.ts @@ -7,6 +7,7 @@ import { BrowserWindow } from 'electron'; templateUrl: './window-controls.component.html', styleUrls: ['./window-controls.component.scss'], encapsulation: ViewEncapsulation.None, + standalone: false }) export class WindowControlsComponent implements OnInit { constructor() {} diff --git a/src/app/directives/cdk-virtual-scroll-viewport-patch-directive.ts b/src/app/directives/cdk-virtual-scroll-viewport-patch-directive.ts index 22c02f10..ac391ab5 100644 --- a/src/app/directives/cdk-virtual-scroll-viewport-patch-directive.ts +++ b/src/app/directives/cdk-virtual-scroll-viewport-patch-directive.ts @@ -9,6 +9,7 @@ import { debounceTime, takeUntil } from 'rxjs/operators'; */ @Directive({ selector: 'cdk-virtual-scroll-viewport', + standalone: false }) export class CdkVirtualScrollViewportPatchDirective implements OnInit, OnDestroy { protected readonly destroy$: Subject = new Subject(); diff --git a/src/app/directives/pixel-snap.directive.ts b/src/app/directives/pixel-snap.directive.ts index dde0bd0d..a3e44e7f 100644 --- a/src/app/directives/pixel-snap.directive.ts +++ b/src/app/directives/pixel-snap.directive.ts @@ -3,6 +3,7 @@ import { AfterViewInit, Directive, ElementRef, NgZone, OnDestroy } from '@angula // Keeps a badge on whole device pixels, so its background and text are rounded the same way and the text stays centered. @Directive({ selector: '[appPixelSnap]', + standalone: false }) export class PixelSnapDirective implements AfterViewInit, OnDestroy { private resizeObserver: ResizeObserver; diff --git a/src/app/directives/webview.directive.ts b/src/app/directives/webview.directive.ts index 52f05bc1..350cb8ec 100644 --- a/src/app/directives/webview.directive.ts +++ b/src/app/directives/webview.directive.ts @@ -1,7 +1,8 @@ import { Directive } from '@angular/core'; @Directive({ - selector: 'webview' + selector: 'webview', + standalone: false }) export class WebviewDirective { diff --git a/src/app/pipes/fix-image-paths.pipe.ts b/src/app/pipes/fix-image-paths.pipe.ts index f067eda9..c7498d58 100644 --- a/src/app/pipes/fix-image-paths.pipe.ts +++ b/src/app/pipes/fix-image-paths.pipe.ts @@ -6,6 +6,7 @@ import { CollectionFileAccess } from '../services/collection/collection-file-acc @Pipe({ name: 'fixImagePaths', + standalone: false }) export class FixImagePathsPipe implements PipeTransform { public constructor( diff --git a/src/app/pipes/sanitize-markdown.pipe.ts b/src/app/pipes/sanitize-markdown.pipe.ts index 041996e6..09080e8a 100644 --- a/src/app/pipes/sanitize-markdown.pipe.ts +++ b/src/app/pipes/sanitize-markdown.pipe.ts @@ -3,6 +3,7 @@ import DOMPurify from 'dompurify'; @Pipe({ name: 'sanitizeMarkdown', + standalone: false }) export class SanitizeMarkdownPipe implements PipeTransform { public constructor() {} diff --git a/src/app/pipes/truncate.pipe.ts b/src/app/pipes/truncate.pipe.ts index 3c3584ae..c42e628f 100644 --- a/src/app/pipes/truncate.pipe.ts +++ b/src/app/pipes/truncate.pipe.ts @@ -1,7 +1,8 @@ import { Pipe, PipeTransform } from '@angular/core'; @Pipe({ - name: 'truncate' + name: 'truncate', + standalone: false }) export class TruncatePipe implements PipeTransform { public transform(value: string, limit: number, completeWords: boolean, ellipsis: string = '...'): string { diff --git a/tsconfig.json b/tsconfig.json index 9bc4b713..75ebc059 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.base.json", "compilerOptions": { - "esModuleInterop": true + "esModuleInterop": true, }, "angularCompilerOptions": { "strictTemplates": true From 537c66298a40783d55c8371ba8faacd3c96dd2fc Mon Sep 17 00:00:00 2001 From: Digimezzo Date: Fri, 13 Nov 2026 22:08:31 +0100 Subject: [PATCH 06/22] Fix unit tests --- src/app/common/utils/note-link.spec.ts | 9 +- .../markdown-note/markdown-highlight.spec.ts | 15 ++- .../note/markdown-note/markdown-highlight.ts | 14 ++- .../markdown-note.component.spec.ts | 109 ++++++++++++------ .../markdown-note/markdown-scroll-map.spec.ts | 11 +- .../markdown-note/markdown-unc-path.spec.ts | 11 +- .../components/trash/trash.component.spec.ts | 2 +- 7 files changed, 116 insertions(+), 55 deletions(-) diff --git a/src/app/common/utils/note-link.spec.ts b/src/app/common/utils/note-link.spec.ts index 7eb08d53..7542f8ab 100644 --- a/src/app/common/utils/note-link.spec.ts +++ b/src/app/common/utils/note-link.spec.ts @@ -8,9 +8,10 @@ import { markdownHighlightExtension } from '../../components/note/markdown-note/ describe('Note link Markdown', () => { beforeAll(() => marked.use(markdownHighlightExtension)); const renderer = new Renderer(); - renderer.link = (href, title, text) => Renderer.prototype.link.call( - renderer, href ? getNoteLinkPreviewHref(href) : href, title, text, - ); + renderer.link = (token) => Renderer.prototype.link.call(renderer, { + ...token, + href: token.href ? getNoteLinkPreviewHref(token.href) : token.href, +}); it.each(['AbC_123-xyz', 'target'])('preserves case-sensitive IDs: %s', (id) => { const source = createNoteLink(id, 'A note'); @@ -32,7 +33,7 @@ describe('Note link Markdown', () => { 'A ==highlighted== title', ])('escapes labels without creating extra markup: %s', (title) => { const container = document.createElement('div'); - container.innerHTML = marked.parse(createNoteLink('target', title), { renderer }); + container.innerHTML = marked.parse(createNoteLink('target', title), { renderer, async: false }) as string; expect(container.querySelector('a').textContent).toBe(title); expect(container.querySelectorAll('a')).toHaveLength(1); expect(container.querySelectorAll('img, strong, em, code')).toHaveLength(0); diff --git a/src/app/components/note/markdown-note/markdown-highlight.spec.ts b/src/app/components/note/markdown-note/markdown-highlight.spec.ts index dcb56143..2cb1ad7e 100644 --- a/src/app/components/note/markdown-note/markdown-highlight.spec.ts +++ b/src/app/components/note/markdown-note/markdown-highlight.spec.ts @@ -1,10 +1,13 @@ import { SecurityContext } from '@angular/core'; import { TestBed } from '@angular/core/testing'; import { DomSanitizer } from '@angular/platform-browser'; -import { marked } from 'marked'; +import { marked, MarkedOptions } from 'marked'; import { SanitizeMarkdownPipe } from '../../../pipes/sanitize-markdown.pipe'; import { markdownHighlightExtension } from './markdown-highlight'; +export const parseSync = (src: string, options: MarkedOptions = {}): string => + marked.parse(src, { ...options, async: false }) as string; + describe('Markdown highlighting', () => { beforeAll(() => marked.use(markdownHighlightExtension)); @@ -17,7 +20,7 @@ describe('Markdown highlighting', () => { ['==first\nsecond==', '

first\nsecond

\n'], ['==& text==', '

& text

\n'], ])('renders %s', (source, expected) => { - expect(marked.parse(source)).toBe(expected); + expect(parseSync(source)).toBe(expected); }); it.each([ @@ -30,23 +33,23 @@ describe('Markdown highlighting', () => { '[link](https://example.com/==path==)', '![==alt==](image.png)', ])('does not highlight literal markers in %s', (source) => { - expect(marked.parse(source)).not.toContain(''); + expect(parseSync(source)).not.toContain(''); }); it('preserves escaped equals inside highlights', () => { - expect(marked.parse('==one \\== two==')).toBe('

one == two

\n'); + expect(parseSync('==one \\== two==')).toBe('

one == two

\n'); }); it('preserves highlights through Angular preview sanitization', () => { const sanitizer = TestBed.inject(DomSanitizer); - const html = marked.parse('==**highlight**=='); + const html = parseSync('==**highlight**=='); expect(sanitizer.sanitize(SecurityContext.HTML, html)).toBe('

highlight

'); }); it('preserves highlights while removing unsafe HTML through the Markdown pipe', () => { const pipe = new SanitizeMarkdownPipe(); - const html = marked.parse('==highlight=='); + const html = parseSync('==highlight=='); expect(pipe.transform(html)).toContain('highlight'); expect(pipe.transform(html)).not.toContain('