From adb129da59d58fb4056472204976233dc55d4439 Mon Sep 17 00:00:00 2001 From: Antonio Date: Fri, 28 Jun 2024 21:47:37 +0300 Subject: [PATCH] fix: new lines no longer break wrapped highlight blocks --- src/methods/aggregateDetails.ts | 14 +++++++++++--- test/mocks/aggregatedDetailsData.ts | 18 ++++++++++++++++++ test/mocks/renderedTemplate.ts | 26 ++++++++++++++++++++++++-- test/mocks/testDatabase.sqlite | Bin 737280 -> 737280 bytes 4 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/methods/aggregateDetails.ts b/src/methods/aggregateDetails.ts index 63a994a..09bb82d 100644 --- a/src/methods/aggregateDetails.ts +++ b/src/methods/aggregateDetails.ts @@ -25,11 +25,14 @@ export const aggregateBookAndHighlightDetails = async (): Promise { + const textForContext = annotation.ZANNOTATIONREPRESENTATIVETEXT; + const userNote = annotation.ZANNOTATIONNOTE; + return { chapter: annotation.ZFUTUREPROOFING5, - contextualText: annotation.ZANNOTATIONREPRESENTATIVETEXT, - highlight: annotation.ZANNOTATIONSELECTEDTEXT, - note: annotation.ZANNOTATIONNOTE, + contextualText: textForContext ? preserveNewlineIndentation(textForContext) : textForContext, + highlight: preserveNewlineIndentation(annotation.ZANNOTATIONSELECTEDTEXT), + note: userNote ? preserveNewlineIndentation(userNote) : userNote, highlightStyle: annotation.ZANNOTATIONSTYLE, highlightCreationDate: annotation.ZANNOTATIONCREATIONDATE, highlightModificationDate: annotation.ZANNOTATIONMODIFICATIONDATE @@ -43,3 +46,8 @@ export const aggregateBookAndHighlightDetails = async (): Promise { + return textBlock.includes('\n\n') ? textBlock.replace(/\n\n/g, '
\n') : textBlock; +} diff --git a/test/mocks/aggregatedDetailsData.ts b/test/mocks/aggregatedDetailsData.ts index 882cf07..05df178 100644 --- a/test/mocks/aggregatedDetailsData.ts +++ b/test/mocks/aggregatedDetailsData.ts @@ -18,6 +18,16 @@ export const annotationsToAggregate = [{ "ZANNOTATIONMODIFICATIONDATE": 731876693.002279, "ZANNOTATIONSTYLE": 3, "ZANNOTATIONDELETED": 0 +}, { + "ZANNOTATIONASSETID": "THBFYNJKTGFTTVCGSAE5", + "ZFUTUREPROOFING5": "Another aggregated Introduction", + "ZANNOTATIONREPRESENTATIVETEXT": "This is a contextual text for the aggregated hightlight from the Apple iPhone User Guide\n\ncontaining a new line to test the preservation of indentation", + "ZANNOTATIONSELECTEDTEXT": "aggregated hightlight from the Apple iPhone User Guide\n\ncontaining a new line to test the preservation of indentation", + "ZANNOTATIONNOTE": "Test note for the aggregated hightlight from the Apple iPhone User Guide\n\nalong with a new line to test the preservation of indentation", + "ZANNOTATIONCREATIONDATE": 731876693.002279, + "ZANNOTATIONMODIFICATIONDATE": 731876693.002279, + "ZANNOTATIONSTYLE": 3, + "ZANNOTATIONDELETED": 0 }]; export const aggregatedHighlights = [{ @@ -36,5 +46,13 @@ export const aggregatedHighlights = [{ "highlightStyle": 3, "highlightCreationDate": 731876693.002279, "highlightModificationDate": 731876693.002279 + }, { + "chapter": "Another aggregated Introduction", + "contextualText": "This is a contextual text for the aggregated hightlight from the Apple iPhone User Guide
\ncontaining a new line to test the preservation of indentation", + "highlight": "aggregated hightlight from the Apple iPhone User Guide
\ncontaining a new line to test the preservation of indentation", + "note": "Test note for the aggregated hightlight from the Apple iPhone User Guide
\nalong with a new line to test the preservation of indentation", + "highlightStyle": 3, + "highlightCreationDate": 731876693.002279, + "highlightModificationDate": 731876693.002279 }] }]; diff --git a/test/mocks/renderedTemplate.ts b/test/mocks/renderedTemplate.ts index adec8ee..85b2274 100644 --- a/test/mocks/renderedTemplate.ts +++ b/test/mocks/renderedTemplate.ts @@ -4,7 +4,7 @@ Link:: [Apple Books Link](ibooks://assetid/THBFYNJKTGFTTVCGSAE5) ## Annotations -Number of annotations:: 1 +Number of annotations:: 2 ---- @@ -13,6 +13,16 @@ Number of annotations:: 1 - 🎯 Highlight:: aggregated hightlight from the Apple iPhone User Guide - 📝 Note:: Test note for the aggregated hightlight from the Apple iPhone User Guide +---- + +- 📖 Chapter:: Another aggregated Introduction +- 🔖 Context:: This is a contextual text for the aggregated hightlight from the Apple iPhone User Guide
+containing a new line to test the preservation of indentation +- 🎯 Highlight:: aggregated hightlight from the Apple iPhone User Guide
+containing a new line to test the preservation of indentation +- 📝 Note:: Test note for the aggregated hightlight from the Apple iPhone User Guide
+along with a new line to test the preservation of indentation + `; export const renderedCustomTemplateMock = `Title:: 📕 Apple iPhone - User Guide - Instructions - with - restricted - symbols - in - title @@ -26,7 +36,7 @@ Link:: [Apple Books Link](ibooks://assetid/THBFYNJKTGFTTVCGSAE5) ## Annotations -Number of annotations:: 1 +Number of annotations:: 2 ---- @@ -37,4 +47,16 @@ Number of annotations:: 1 - 📅 Highlight taken on:: 2024-03-11 03:04:53 PM -04:00 - 📅 Highlight modified on:: 2024-03-11 03:04:53 PM -04:00 +---- + +- 📖 Chapter:: Another aggregated Introduction +- 🔖 Context:: This is a contextual text for the aggregated hightlight from the Apple iPhone User Guide
+containing a new line to test the preservation of indentation +- 🎯 Highlight:: aggregated hightlight from the Apple iPhone User Guide
+containing a new line to test the preservation of indentation +- 📝 Note:: Test note for the aggregated hightlight from the Apple iPhone User Guide
+along with a new line to test the preservation of indentation +- 📅 Highlight taken on:: 2024-03-11 03:04:53 PM -04:00 +- 📅 Highlight modified on:: 2024-03-11 03:04:53 PM -04:00 + `; diff --git a/test/mocks/testDatabase.sqlite b/test/mocks/testDatabase.sqlite index c7cfef2e597e34d6535290201d71e0bad9569474..5d4603874b85f75fa9cc6227b2c5f02e9cae0c49 100644 GIT binary patch delta 2089 zcmW;L*LM|=}F47~+1)aX`rW0tKhE_(9H zpTN840FOTM2khD1@0*-6zq!Nr+n2i8y28F_X@V;Zo+Z7Gq5$c3p#Qup^*Cuj?dZQgzQr|F?$tG z${vT4vz>5Cb{U+Sod(}!&2U=gA)KCZ!x@>waAsx`oHdYHh|^b@NpN;X55@FdI46Ap z&Q0%w^U`bK{PbMdo_4?msh4nJ>IPhtIt>@6cETkoCtRAE1(&64up{{dE>HHt70F}J zncN0fCYQoh$$_ajtxlTY8ubBOt9HS4>LIvZ-3T|R3*bg|BHW|`-R7Y?aLdqnxOHeR z+%~iZb`H&fuAx@AJ@EqWNc6#-iBoV_Vh7xvSONDWX2QJ*>i|ys;{9-cyayhLOYmTP zD?Aim0uRUA;E}iy9v!?7rNPVa*x*5Ud~gFiG1v}I4o-llVx04I>^3|TI|t9k_P}$o z)$n{wgcoAt;Kk^39lDpI*Ku(8-i*|0y<0-pq*!KcA%@LBK#d>(Yc7r_qrGB_Q+3R>Xnz#}*ixB`{H5$FkQhTgy; z=nG7S{(u1n{P$qce-RFZ{QGeV`?(7ue(r*(Uw|sBG<>f9&d$|iTUhaadw-e^P+y%p4uCO;=zP`5}{x)BGc;jz8T-x7m@NnUL=Mmxe z9zO98oGsrAe&ka4i9d52AE9{?Uz(0zPNy3!wYc6ouK%q4Y=w{&AN>+M41W#s7yd24 z7595!8vMi0ck!p6YxBL2-|{aX-&)ao2Y&GKdH(kB{gyl%;YU8WrIR-^wD##7Yg+r# zEmEh6&+)D#NlOjdu&tyV|6(uo-F>6y*XG}Q93Rsy?oJceOj}8Eqx%lSsU@ZRi#^@7 z!&Z85Ii(*l%EFjYuzwal)$IQ{3e|>97^~K8dZAFO*g%;SNghc}wXvkIBx@x%BZ-mA z*6t`6-FmTL6l}t?vK8f`mGk5=tg2StOkpGwH*-nLUCfrVrq^4*knI*SYk{G#&lZY${D2-OxX&5Qiz&R=gP$or^M^aM_yph6^td-pSR5EZ~x-c|4 z4PC-mkH}iLU=Tiav(?iebv=@be#B8QmvL<_;@X_o%R-@F#jsz|Cmh4vC}TCz-j1QH z$Iz**c?thubfIN*>H|U{BH}tCU=2j{!bqfnqmHA3ql}}7BacHBN)hFiW6Uht{&nDA I?f*Fb2li`T$p8QV delta 2092 zcmW;L=XVlW7zS`4KqxU>YwTi)J&L^>>|Mv+6_cp3W7OEq&;tZA)TrBVHOp2P7jyEJ zKY{O_1AO!&f54t~pJzB{esgEuhj-e&vfL)iZOSzBe2qr)8JjUNZ`nMFdm8?g-3kB9u7H1JXTsmJR`^@y3H&v4 z73MR?;4hhWIGkAuCugR>4;dr;IsE{>OS@n$eF*-P-Uxr}OE19ghx7#aeOe2@OWlQU zQ|IBE)L!^HwFVBQ=D=*q1~bVQFrB;sQ^`{>ncM*rNe5JtGvHv-0^^CtFqY_o1Bs(B zn%D{>i6tr?i=u`Lxy~=p#QGiAsyaW3N&%sxNd*I8# z)$qmOZ1{Yz89s|Yhfm|(@Jak6d>r2nd*jRDqxf|AFmCR{?m?^<_QX2j{g?#Zu`Tdk zY%#nWYk_xSdU$)_KD;$>3Emty0B;Pehus6M@cO_wcrD7FSEILKSM)6GjP8aV(N*wD z)DB(IG4OKanFiTQk?T0P7&!qiM7F{6k!A2)WEwmhF~Kw8NAPsG1D*;WfhWV8;fe4f zcsx7_9t$_Xqy26u^*6@CF7KCXi0zMF8F?=)=l?SxBxTm?&f zTm_4LTm_4~Tm=igTm=ifTm|#J?XcC$RWQ%X88+9;&o{@zcQf0=3)?-M+OyVsIB{lr z>~MyMPduI7rged-oC;I;np^k?rV0FL8s3~nGpX3*d}F&lQGIO_LS~#AA3Oxd1^I@@ z1~}tHfGg1E=eKC~b8e3D@h+Qu{AyP39cc0LdCVSu-}fHQ_s@KABcFi3kJvt^nxu9E z=Rr$Rl9uQUA26I;l#hM2rY>){6npL_wI*G2x5l=*xjWV5YB%tiKNKYwvK+P)<&Lk` zV)v!j+N|4bEE?Va*+%uksuLqdt54*^bqlDGGAWS)$q|Lf#7$flF&dUE&uw|V6UTa& z)}Gf3ix|;cdPKgrZWg1xHM3&N8_Q;qHoz@L?&*ATxv*S$f<@LEZK=@ zL`!DsMmDM$ktrM5sAL2MlEcZWqSj^B-D=&%l0=-u!H``I38NUPsF}I}l^Q9Nk^z~5 zffveQSWyhTkj#>sxQN7%Qw=#7va2CszyRnw*rYZ9nQV0KF=N|;R4p+3ISgC8p`)Una8CwZk YK@_XGZ?^Xp1yz}0JGx<>TmQBF5BV-%fB*mh