erudit 3.0.0-dev.2 → 3.0.0-dev.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (321) hide show
  1. package/app/app.vue +195 -172
  2. package/app/assets/icons/cameo-add.svg +3 -0
  3. package/app/assets/icons/diamond.svg +3 -0
  4. package/app/assets/icons/graduation.svg +3 -0
  5. package/app/components/Avatar.vue +118 -0
  6. package/app/components/EruditLink.vue +17 -0
  7. package/app/components/Loading.vue +23 -23
  8. package/app/components/SiteAside.vue +393 -382
  9. package/app/components/SiteMain.vue +32 -35
  10. package/app/components/ads/Ads.vue +33 -0
  11. package/app/components/ads/AdsBannerAside.vue +61 -0
  12. package/app/components/ads/AdsBannerBottom.vue +22 -0
  13. package/app/components/ads/AdsProviderCustom.vue +35 -0
  14. package/app/components/ads/AdsProviderYandex.vue +91 -0
  15. package/app/components/ads/AdsReplacer.vue +73 -0
  16. package/app/components/aside/AsideListItem.vue +91 -74
  17. package/app/components/aside/AsideMajor.vue +56 -56
  18. package/app/components/aside/AsideMinor.vue +97 -71
  19. package/app/components/aside/major/PaneContentScroll.vue +23 -23
  20. package/app/components/aside/major/PaneSwitch.vue +54 -54
  21. package/app/components/aside/major/PaneSwitchButton.vue +63 -63
  22. package/app/components/aside/major/SiteInfo.vue +85 -85
  23. package/app/components/aside/major/panes/Language.vue +79 -79
  24. package/app/components/aside/major/panes/Pages.vue +50 -34
  25. package/app/components/aside/major/panes/Search.vue +11 -11
  26. package/app/components/aside/major/panes/nav/Nav.vue +92 -91
  27. package/app/components/aside/major/panes/nav/NavBook.vue +95 -86
  28. package/app/components/aside/major/panes/nav/NavBookLoading.vue +24 -24
  29. package/app/components/aside/major/panes/nav/NavGlobal.vue +16 -16
  30. package/app/components/aside/major/panes/nav/fnav/FNav.vue +105 -105
  31. package/app/components/aside/major/panes/nav/fnav/FNavBook.vue +32 -32
  32. package/app/components/aside/major/panes/nav/fnav/FNavFlags.vue +40 -40
  33. package/app/components/aside/major/panes/nav/fnav/FNavFolder.vue +60 -60
  34. package/app/components/aside/major/panes/nav/fnav/FNavItem.vue +34 -34
  35. package/app/components/aside/major/panes/nav/fnav/FNavSeparator.vue +80 -80
  36. package/app/components/aside/major/panes/nav/fnav/FNavTopic.vue +24 -24
  37. package/app/components/aside/major/panes/other/ItemContent.vue +29 -29
  38. package/app/components/aside/major/panes/other/ItemGenerator.vue +13 -15
  39. package/app/components/aside/major/panes/other/ItemTheme.vue +54 -54
  40. package/app/components/aside/major/panes/other/Other.vue +16 -16
  41. package/app/components/aside/minor/{Contribute.vue → AsideMinorContribute.vue} +175 -145
  42. package/app/components/aside/minor/AsideMinorNews.vue +11 -11
  43. package/app/components/aside/minor/AsideMinorPane.vue +15 -15
  44. package/app/components/aside/minor/AsideMinorTopLink.vue +66 -67
  45. package/app/components/aside/minor/content/AsideMinorContent.vue +89 -92
  46. package/app/components/aside/minor/contributor/AsideMinorContributor.vue +78 -0
  47. package/app/components/aside/minor/contributor/BookContribution.vue +64 -0
  48. package/app/components/aside/minor/topic/AsideMinorTopic.vue +31 -32
  49. package/app/components/aside/minor/topic/TopicContributors.vue +183 -177
  50. package/app/components/aside/minor/topic/TopicNav.vue +49 -49
  51. package/app/components/aside/minor/topic/TopicToc.vue +212 -203
  52. package/app/components/aside/minor/topic/TopicTocItem.vue +19 -31
  53. package/app/components/aside/utils/AsideOverlayPane.vue +40 -40
  54. package/app/components/bitran/BitranContent.vue +90 -63
  55. package/app/components/bitran/RenderWrapper.vue +10 -10
  56. package/app/components/contributor/ContributorListItem.vue +43 -35
  57. package/app/components/main/MainActionButton.vue +51 -0
  58. package/app/components/main/MainBitranContent.vue +55 -0
  59. package/app/components/main/{utils/Breadcrumb.vue → MainBreadcrumb.vue} +63 -75
  60. package/app/components/main/MainDescription.vue +24 -0
  61. package/app/components/main/MainSection.vue +58 -0
  62. package/app/components/main/MainTitle.vue +76 -0
  63. package/app/components/main/cameo/MainCameo.vue +135 -0
  64. package/app/components/main/cameo/MainCameoData.vue +232 -0
  65. package/app/components/main/content/ContentBreadcrumb.vue +28 -0
  66. package/app/components/main/{utils → content}/ContentDecoration.vue +29 -29
  67. package/app/components/main/{utils → content}/ContentPopover.vue +188 -176
  68. package/app/components/main/{utils → content}/ContentPopovers.vue +111 -105
  69. package/app/components/main/{utils → content}/ContentReferences.vue +70 -70
  70. package/app/components/main/{utils → content}/reference/ReferenceGroup.vue +38 -38
  71. package/app/components/main/{utils → content}/reference/ReferenceItem.vue +70 -68
  72. package/app/components/main/{utils → content}/reference/ReferenceSource.vue +120 -116
  73. package/app/components/main/topic/MainTopic.vue +76 -79
  74. package/app/components/main/topic/TopicPartSwitch.vue +119 -118
  75. package/app/components/preview/Preview.vue +186 -177
  76. package/app/components/preview/PreviewDisplay.vue +139 -139
  77. package/app/components/preview/PreviewFooterAction.vue +73 -73
  78. package/app/components/preview/PreviewLoading.vue +14 -14
  79. package/app/components/preview/PreviewScreen.vue +141 -99
  80. package/app/components/preview/display/Alert.vue +50 -50
  81. package/app/components/preview/display/Custom.vue +18 -18
  82. package/app/components/preview/display/GenericLink.vue +48 -48
  83. package/app/components/preview/display/PageLink.vue +22 -20
  84. package/app/components/preview/display/Unique.vue +46 -49
  85. package/app/components/sponsor/SponsorTier1.vue +89 -0
  86. package/app/components/sponsor/SponsorTier2.vue +109 -0
  87. package/app/components/transition/Fade.vue +19 -19
  88. package/app/components/tree/TreeContainer.vue +11 -11
  89. package/app/components/tree/TreeItem.vue +93 -89
  90. package/app/composables/adsAllowed.ts +11 -0
  91. package/app/composables/asset.ts +12 -0
  92. package/app/composables/bitran.ts +108 -127
  93. package/app/composables/bitranLocation.ts +7 -7
  94. package/app/composables/contentData.ts +38 -36
  95. package/app/composables/contentPage.ts +168 -156
  96. package/app/composables/contentRoute.ts +45 -45
  97. package/app/composables/darkMagic.ts +24 -24
  98. package/app/composables/externalApi.ts +69 -63
  99. package/app/composables/favicon.ts +8 -8
  100. package/app/composables/formatText.ts +99 -86
  101. package/app/composables/head.ts +24 -0
  102. package/app/composables/majorPane.ts +62 -60
  103. package/app/composables/phrases.ts +77 -80
  104. package/app/composables/theme.ts +29 -29
  105. package/app/composables/url.ts +43 -33
  106. package/app/pages/_test/preview.vue +110 -110
  107. package/app/pages/article/[...articleId].vue +3 -3
  108. package/app/pages/book/[...bookId].vue +42 -47
  109. package/app/pages/contributor/[contributorId].vue +227 -0
  110. package/app/pages/contributors.vue +184 -0
  111. package/app/pages/group/[...groupId].vue +53 -65
  112. package/app/pages/index.vue +32 -32
  113. package/app/pages/practice/[...practice].vue +3 -3
  114. package/app/pages/sponsors.vue +95 -0
  115. package/app/pages/summary/[...summaryId].vue +3 -3
  116. package/app/plugins/analytics.ts +95 -0
  117. package/app/plugins/prerender.server.ts +34 -0
  118. package/app/public/favicon/article.svg +5 -5
  119. package/app/public/favicon/default.svg +3 -3
  120. package/app/public/favicon/practice.svg +3 -3
  121. package/app/public/favicon/summary.svg +4 -4
  122. package/app/public/logotype.svg +2 -2
  123. package/app/scripts/_immediate.js +9 -9
  124. package/app/scripts/aside/index.ts +59 -59
  125. package/app/scripts/aside/major/nav.ts +26 -26
  126. package/app/scripts/aside/minor/state.ts +37 -37
  127. package/app/scripts/flag.ts +28 -28
  128. package/app/scripts/og.ts +28 -27
  129. package/app/scripts/preview/build.ts +76 -73
  130. package/app/scripts/preview/data/alert.ts +19 -19
  131. package/app/scripts/preview/data/custom.ts +8 -8
  132. package/app/scripts/preview/data/genericLink.ts +24 -24
  133. package/app/scripts/preview/data/pageLink.ts +23 -20
  134. package/app/scripts/preview/data/unique.ts +69 -70
  135. package/app/scripts/preview/data.ts +24 -24
  136. package/app/scripts/preview/display.ts +37 -37
  137. package/app/scripts/preview/footer.ts +9 -9
  138. package/app/scripts/preview/request.ts +51 -51
  139. package/app/scripts/preview/state.ts +63 -63
  140. package/app/styles/_immediate.css +7 -7
  141. package/app/styles/_util.scss +43 -43
  142. package/app/styles/_utils.scss +44 -44
  143. package/app/styles/app.scss +91 -91
  144. package/app/styles/def/_bp.scss +27 -27
  145. package/app/styles/def/_size.scss +7 -7
  146. package/app/styles/def/_z.scss +5 -5
  147. package/app/styles/normalize.scss +49 -63
  148. package/app/styles/partials/_darkMagic.scss +5 -5
  149. package/app/styles/partials/_fnav.scss +15 -15
  150. package/app/styles/partials/_preview.scss +5 -5
  151. package/bin/erudit.mjs +2 -0
  152. package/const.ts +3 -0
  153. package/globalPath.ts +21 -21
  154. package/globals/bitran.ts +1 -47
  155. package/globals/cameo.ts +5 -0
  156. package/globals/content.ts +27 -22
  157. package/globals/contributor.ts +5 -5
  158. package/globals/erudit.ts +5 -5
  159. package/globals/register.ts +23 -18
  160. package/globals/sponsor.ts +17 -0
  161. package/languages/en.ts +108 -95
  162. package/languages/ru.ts +112 -99
  163. package/module/bitran.ts +66 -34
  164. package/module/config.ts +35 -34
  165. package/module/imports.ts +74 -46
  166. package/module/index.ts +47 -47
  167. package/module/logger.ts +10 -10
  168. package/module/paths.ts +22 -22
  169. package/module/restart.ts +61 -61
  170. package/nuxt.config.ts +126 -112
  171. package/package.json +22 -15
  172. package/server/api/aside/major/nav/bookIds.ts +5 -5
  173. package/server/api/aside/major/nav/bookNav/[...bookId].ts +17 -20
  174. package/server/api/aside/major/nav/global.ts +7 -7
  175. package/server/api/aside/minor/book/[...bookId].ts +18 -0
  176. package/server/api/aside/minor/contributor/[contributorId].ts +18 -0
  177. package/server/api/aside/minor/group/[...groupId].ts +18 -0
  178. package/server/api/aside/minor/news.ts +7 -7
  179. package/server/api/aside/minor/topic.ts +36 -0
  180. package/server/api/bitran/content/[...location].ts +13 -0
  181. package/server/api/bitran/toc/[...location].ts +9 -0
  182. package/server/api/cameo/data/[cameoId].ts +42 -0
  183. package/server/api/cameo/ids.ts +5 -0
  184. package/server/api/content/data.ts +75 -72
  185. package/server/api/contributor/count.ts +6 -6
  186. package/server/api/contributor/list.ts +44 -0
  187. package/server/api/contributor/page/[contributorId].ts +14 -0
  188. package/server/api/fake/content.ts +11 -11
  189. package/server/api/fake/shared/languages.ts +12 -12
  190. package/server/api/language/functions.ts +12 -12
  191. package/server/api/language/phrase/[phraseId].ts +19 -19
  192. package/server/api/language/phraseIds.ts +8 -8
  193. package/server/api/prerender/assets/cameo.ts +14 -0
  194. package/server/api/prerender/assets/contributor.ts +12 -0
  195. package/server/api/prerender/assets/sponsor.ts +13 -0
  196. package/server/api/prerender/cameos.ts +12 -0
  197. package/server/api/prerender/language.ts +9 -0
  198. package/server/api/preview/page/[...parts].ts +78 -51
  199. package/server/api/preview/unique/{[location].ts → [...location].ts} +48 -55
  200. package/server/api/problem/generator/[...path].ts +26 -0
  201. package/server/api/sponsor/cameo/data/[sponsorId].ts +51 -0
  202. package/server/api/sponsor/cameo/ids.ts +5 -0
  203. package/server/api/sponsor/count.ts +5 -0
  204. package/server/api/sponsor/list.ts +36 -0
  205. package/server/plugin/bitran/content.ts +252 -187
  206. package/server/plugin/bitran/{products → elements}/include.ts +229 -230
  207. package/server/plugin/bitran/location.ts +43 -25
  208. package/server/plugin/bitran/toc.ts +94 -83
  209. package/server/plugin/bitran/transpiler.ts +18 -46
  210. package/server/plugin/build/close.ts +12 -10
  211. package/server/plugin/build/jobs/content/builderArgs.ts +8 -8
  212. package/server/plugin/build/jobs/content/generic.ts +191 -176
  213. package/server/plugin/build/jobs/content/parse.ts +113 -100
  214. package/server/plugin/build/jobs/content/path.ts +6 -6
  215. package/server/plugin/build/jobs/content/type/book.ts +9 -9
  216. package/server/plugin/build/jobs/content/type/group.ts +37 -37
  217. package/server/plugin/build/jobs/content/type/topic.ts +36 -36
  218. package/server/plugin/build/jobs/contributors.ts +69 -66
  219. package/server/plugin/build/jobs/language.ts +36 -36
  220. package/server/plugin/build/jobs/nav.ts +345 -210
  221. package/server/plugin/build/process.ts +34 -25
  222. package/server/plugin/build/rebuild.ts +68 -55
  223. package/server/plugin/build/setup.ts +19 -21
  224. package/server/plugin/content/context.ts +119 -112
  225. package/server/plugin/db/entities/Book.ts +7 -7
  226. package/server/plugin/db/entities/Content.ts +45 -49
  227. package/server/plugin/db/entities/Contribution.ts +10 -10
  228. package/server/plugin/db/entities/Contributor.ts +25 -16
  229. package/server/plugin/db/entities/File.ts +10 -0
  230. package/server/plugin/db/entities/Group.ts +14 -14
  231. package/server/plugin/db/entities/Hash.ts +15 -15
  232. package/server/plugin/db/entities/Topic.ts +20 -20
  233. package/server/plugin/db/entities/Unique.ts +21 -21
  234. package/server/plugin/db/reset.ts +12 -0
  235. package/server/plugin/db/setup.ts +49 -34
  236. package/server/plugin/global.ts +18 -18
  237. package/server/plugin/importer.ts +16 -12
  238. package/server/plugin/index.ts +9 -9
  239. package/server/plugin/logger.ts +23 -23
  240. package/server/plugin/nav/node.ts +27 -26
  241. package/server/plugin/nav/utils.ts +179 -129
  242. package/server/plugin/repository/asideMinor.ts +51 -0
  243. package/server/plugin/repository/book.ts +39 -21
  244. package/server/plugin/repository/cameo.ts +16 -0
  245. package/server/plugin/repository/content.ts +240 -238
  246. package/server/plugin/repository/contentId.ts +40 -0
  247. package/server/plugin/repository/contributor.ts +129 -8
  248. package/server/plugin/repository/file.ts +10 -0
  249. package/server/plugin/repository/frontNav.ts +145 -148
  250. package/server/plugin/repository/topic.ts +35 -32
  251. package/server/plugin/sponsor/build.ts +82 -0
  252. package/server/plugin/sponsor/index.ts +5 -0
  253. package/server/plugin/sponsor/repository.ts +56 -0
  254. package/server/routes/asset/[...assetPath].ts +34 -0
  255. package/server/routes/robots.txt.ts +9 -0
  256. package/server/routes/sitemap.xml.ts +103 -0
  257. package/server/tsconfig.json +9 -9
  258. package/shared/aside/minor.ts +55 -50
  259. package/shared/asset.ts +17 -15
  260. package/shared/bitran/content.ts +9 -0
  261. package/shared/bitran/contentId.ts +56 -0
  262. package/shared/bitran/toc.ts +8 -8
  263. package/shared/breadcrumb.ts +7 -0
  264. package/shared/content/bookId.ts +12 -0
  265. package/shared/content/context.ts +9 -9
  266. package/shared/content/data/base.ts +32 -32
  267. package/shared/content/data/index.ts +5 -5
  268. package/shared/content/data/type/book.ts +5 -5
  269. package/shared/content/data/type/group.ts +6 -6
  270. package/shared/content/data/type/topic.ts +11 -11
  271. package/shared/content/previousNext.ts +9 -9
  272. package/shared/contributor.ts +34 -5
  273. package/shared/frontNav.ts +41 -41
  274. package/shared/icons.ts +38 -38
  275. package/shared/image.ts +5 -5
  276. package/shared/link.ts +28 -25
  277. package/shared/popover.ts +8 -0
  278. package/shared/types/language.ts +84 -75
  279. package/shared/utils/objectsEqual.ts +4 -4
  280. package/shared/utils/stringColor.ts +9 -9
  281. package/test/contentId.test.ts +91 -0
  282. package/test/utils/url.test.ts +99 -0
  283. package/tsconfig.json +8 -8
  284. package/utils/contentPath.ts +67 -0
  285. package/utils/ext.ts +41 -0
  286. package/utils/stress.ts +9 -9
  287. package/utils/url.ts +23 -0
  288. package/app/components/ads/BannerTemplate.vue +0 -51
  289. package/app/components/ads/BottomBanner.vue +0 -45
  290. package/app/components/ads/LeftBanner.vue +0 -50
  291. package/app/components/aside/minor/AsideMinorContributor.vue +0 -5
  292. package/app/components/contributor/ContributorAvatar.vue +0 -43
  293. package/app/components/main/utils/ContentDescription.vue +0 -19
  294. package/app/components/main/utils/ContentFlag.vue +0 -15
  295. package/app/components/main/utils/ContentSection.vue +0 -45
  296. package/app/components/main/utils/ContentTitle.vue +0 -39
  297. package/app/composables/bitranContent.ts +0 -37
  298. package/app/pages/members.vue +0 -6
  299. package/app/public/user.svg +0 -10
  300. package/app/scripts/aside/minor/topic.ts +0 -3
  301. package/app/styles/default.scss +0 -83
  302. package/server/api/aside/minor/path.ts +0 -78
  303. package/server/api/bitran/content/[location].ts +0 -7
  304. package/server/api/bitran/toc/[location].ts +0 -7
  305. package/server/plugin/bitran/products/link.ts +0 -116
  306. package/server/plugin/bitran/setup.ts +0 -9
  307. package/server/plugin/content/absoluteId.ts +0 -94
  308. package/shared/bitran/context.ts +0 -8
  309. package/shared/bitran/default.ts +0 -46
  310. package/shared/bitran/link/Link.vue +0 -167
  311. package/shared/bitran/link/factory.ts +0 -24
  312. package/shared/bitran/link/icon.svg +0 -3
  313. package/shared/bitran/link/languages/en.ts +0 -7
  314. package/shared/bitran/link/languages/ru.ts +0 -7
  315. package/shared/bitran/link/renderer.ts +0 -21
  316. package/shared/bitran/link/shared.ts +0 -17
  317. package/shared/bitran/link/target.ts +0 -134
  318. package/shared/bitran/link/transpiler.ts +0 -10
  319. package/shared/bitran/location.ts +0 -166
  320. package/test/bitran/link/target.test.ts +0 -141
  321. package/test/bitran/location.test.ts +0 -143
@@ -1,230 +1,229 @@
1
- import { BlockNode, type ElementNode } from '@bitran-js/core';
2
- import type { BitranTranspiler } from '@bitran-js/transpiler';
3
- import { IncludeNode } from '@erudit-js/bitran-elements/include/shared';
4
- import {
5
- AliasesNode,
6
- tryReplaceAlias,
7
- type Aliases,
8
- } from '@erudit-js/bitran-elements/aliases/shared';
9
-
10
- import { createBitranTranspiler } from '@server/bitran/transpiler';
11
- import { ERUDIT_SERVER } from '@server/global';
12
- import { DbUnique } from '@server/db/entities/Unique';
13
- import {
14
- toAbsoluteContentId,
15
- toAbsoluteContentLocation,
16
- } from '@server/content/absoluteId';
17
-
18
- import type { BitranContext } from '@erudit/shared/bitran/context';
19
- import {
20
- parseBitranLocation,
21
- parsePartialBitranLocation,
22
- stringifyBitranLocation,
23
- } from '@erudit/shared/bitran/location';
24
- import { createLinkTarget } from '@erudit/shared/bitran/link/target';
25
- import { LinkNode } from '@erudit/shared/bitran/link/shared';
26
-
27
- export type TraverseEnterFn = (payload: {
28
- _location: string;
29
- _bitranTranspiler: BitranTranspiler;
30
- _biCode: string;
31
- }) => Promise<any>;
32
-
33
- export type TraverseStepFn = (payload: {
34
- _location: string;
35
- _bitranTranspiler: BitranTranspiler;
36
- _node: ElementNode;
37
- }) => Promise<any>;
38
-
39
- export type TraverseLeaveFn = (payload: { _location: string }) => Promise<any>;
40
-
41
- /**
42
- * This operation is heavy as fuck.
43
- * It consumes a lot of memory and is slow.
44
- * Use as rarely as possible!
45
- */
46
- export async function traverseInclude(
47
- includeNode: IncludeNode,
48
- context: BitranContext,
49
- listeners: {
50
- enter?: TraverseEnterFn;
51
- step?: TraverseStepFn;
52
- leave?: TraverseLeaveFn;
53
- },
54
- ) {
55
- const entryLocation = stringifyBitranLocation(
56
- parsePartialBitranLocation(includeNode.id, context.location),
57
- );
58
-
59
- const travelMap: Record<string, string | null> = {
60
- // Not displayed when error, but needed for checking infinite loops
61
- [entryLocation]: null,
62
- };
63
-
64
- try {
65
- await _traverseStep(
66
- includeNode,
67
- entryLocation,
68
- context.aliases,
69
- listeners,
70
- travelMap,
71
- );
72
- } catch (message) {
73
- let finalMessage = `Include Traversal Error!\n\n${message}\n\n`;
74
-
75
- for (const [location, includeTarget] of Object.entries(
76
- travelMap,
77
- ).reverse()) {
78
- if (includeTarget === null) continue;
79
-
80
- finalMessage += `at "${printIncludeTarget(includeTarget)}" in "${location}"\n`;
81
- }
82
-
83
- throw new Error(finalMessage);
84
- }
85
- }
86
-
87
- async function _traverseStep(
88
- includeNode: IncludeNode,
89
- location: string,
90
- aliases: Aliases,
91
- listeners: {
92
- enter?: TraverseEnterFn;
93
- step?: TraverseStepFn;
94
- leave?: TraverseLeaveFn;
95
- },
96
- travelMap: Record<string, string | null>,
97
- ) {
98
- let includeTargetLocation: string;
99
-
100
- try {
101
- const parsedLocation = parseBitranLocation(location);
102
-
103
- includeTargetLocation = stringifyBitranLocation(
104
- parsePartialBitranLocation(
105
- tryReplaceAlias(includeNode.parseData.location, aliases),
106
- parsedLocation,
107
- ),
108
- );
109
-
110
- includeTargetLocation = toAbsoluteContentLocation(
111
- includeTargetLocation,
112
- parsedLocation.path!,
113
- );
114
- } catch (error) {
115
- travelMap[location] = includeNode.parseData.location;
116
- throw error;
117
- }
118
-
119
- if (includeTargetLocation in travelMap)
120
- throw `Include "${printIncludeTarget(includeNode.parseData.location)}" targets "${includeTargetLocation}" which creates infinite loop!`;
121
-
122
- travelMap[location] = includeNode.parseData.location;
123
-
124
- //
125
- // Loading Unique this Include is referencing to.
126
- //
127
-
128
- const dbUnique = await ERUDIT_SERVER.DB.manager.findOne(DbUnique, {
129
- where: { location: includeTargetLocation },
130
- });
131
-
132
- if (!dbUnique)
133
- throw `Include "${printIncludeTarget(includeNode.parseData.location)}" is targeting to non-existing unique "${includeTargetLocation}"!`;
134
-
135
- //
136
- // Creating Bitran core within loaded unique's location context.
137
- //
138
-
139
- const context: BitranContext = {
140
- location: parseBitranLocation(includeTargetLocation),
141
- aliases: dbUnique.context.aliases,
142
- };
143
-
144
- const bitranTranspiler = await createBitranTranspiler();
145
-
146
- listeners.enter &&
147
- (await listeners.enter({
148
- _biCode: dbUnique.content,
149
- _location: includeTargetLocation,
150
- _bitranTranspiler: bitranTranspiler,
151
- }));
152
-
153
- //
154
- // Parsing unique content and sub-traversing all includes if any.
155
- //
156
-
157
- let stepErrorMessage: string | undefined;
158
-
159
- await bitranTranspiler.parser.parse(dbUnique.content, {
160
- step: async (node) => {
161
- if (stepErrorMessage) return;
162
-
163
- // Skip Alias nodes to prevent them being injected into calling document context and possibly conflicting with other aliases, includes and links...
164
- if (node instanceof AliasesNode) return;
165
-
166
- // Replacing block ids with absolute ones to make possible to link to them
167
- if (node instanceof BlockNode)
168
- node.meta.id = Object.keys(travelMap)
169
- .concat([location])
170
- .join('__');
171
-
172
- if (node instanceof LinkNode) {
173
- const linkTarget = createLinkTarget(node.parseData.target, {
174
- location: context.location,
175
- aliases: context.aliases ?? {},
176
- });
177
-
178
- switch (linkTarget.type) {
179
- case 'unique':
180
- node.parseData.target = toAbsoluteContentLocation(
181
- linkTarget.strlocation,
182
- context.location?.path!,
183
- );
184
- break;
185
- case 'page':
186
- node.parseData.target = `page|${linkTarget.pageType}|${toAbsoluteContentId(linkTarget.path!, context.location?.path!)}`;
187
- break;
188
- }
189
- }
190
-
191
- if (!(node instanceof IncludeNode)) {
192
- listeners.step &&
193
- (await listeners.step({
194
- _location: includeTargetLocation,
195
- _node: node,
196
- _bitranTranspiler: bitranTranspiler,
197
- }));
198
-
199
- return;
200
- }
201
-
202
- try {
203
- await _traverseStep(
204
- node,
205
- includeTargetLocation,
206
- context.aliases,
207
- listeners,
208
- travelMap,
209
- );
210
- } catch (message: any) {
211
- stepErrorMessage = message;
212
- }
213
- },
214
- });
215
-
216
- if (stepErrorMessage) throw stepErrorMessage;
217
-
218
- //
219
- // Leaving from current Include
220
- //
221
-
222
- listeners.leave &&
223
- (await listeners.leave({
224
- _location: includeTargetLocation,
225
- }));
226
- }
227
-
228
- function printIncludeTarget(target: string) {
229
- return `<~ ${target}`;
230
- }
1
+ import { BlockNode, type ElementNode } from '@bitran-js/core';
2
+ import type { BitranTranspiler } from '@bitran-js/transpiler';
3
+ import {
4
+ parseBitranLocation,
5
+ parsePartialBitranLocation,
6
+ stringifyBitranLocation,
7
+ tryReplaceAlias,
8
+ type BitranAliases,
9
+ type BitranContext,
10
+ } from '@erudit-js/cog/schema';
11
+ import { IncludeNode } from '@erudit-js/bitran-elements/include/shared';
12
+ import { AliasesNode } from '@erudit-js/bitran-elements/aliases/shared';
13
+
14
+ import { createBitranTranspiler } from '@server/bitran/transpiler';
15
+ import { ERUDIT_SERVER } from '@server/global';
16
+ import { DbUnique } from '@server/db/entities/Unique';
17
+ import {
18
+ resolveClientContentId,
19
+ serverAbsolutizeContentPath,
20
+ } from '@server/repository/contentId';
21
+
22
+ export type TraverseEnterFn = (payload: {
23
+ _location: string;
24
+ _bitranTranspiler: BitranTranspiler;
25
+ _biCode: string;
26
+ }) => Promise<any>;
27
+
28
+ export type TraverseStepFn = (payload: {
29
+ _location: string;
30
+ _bitranTranspiler: BitranTranspiler;
31
+ _node: ElementNode;
32
+ }) => Promise<any>;
33
+
34
+ export type TraverseLeaveFn = (payload: { _location: string }) => Promise<any>;
35
+
36
+ export async function traverseInclude(
37
+ includeNode: IncludeNode,
38
+ context: BitranContext,
39
+ listeners: {
40
+ enter?: TraverseEnterFn;
41
+ step?: TraverseStepFn;
42
+ leave?: TraverseLeaveFn;
43
+ },
44
+ ): Promise<BlockNode[]> {
45
+ const rawLocation = parsePartialBitranLocation(
46
+ includeNode.id,
47
+ context.location,
48
+ );
49
+
50
+ if (rawLocation.path) {
51
+ rawLocation.path = serverAbsolutizeContentPath(
52
+ rawLocation.path,
53
+ context.location.path!,
54
+ );
55
+ }
56
+
57
+ const absEntryLocation = stringifyBitranLocation(rawLocation);
58
+
59
+ const travelMap: Record<string, string | null> = {
60
+ [absEntryLocation]: null,
61
+ };
62
+
63
+ try {
64
+ return await _traverseInclude(
65
+ includeNode,
66
+ absEntryLocation,
67
+ context.aliases,
68
+ listeners,
69
+ travelMap,
70
+ );
71
+ } catch (message) {
72
+ let finalMessage = `Include Traversal Error!\n\n${message instanceof Error ? message.message : message}\n\n`;
73
+
74
+ // Print the traversal path in the order of traversal
75
+ for (const location of Object.keys(travelMap)) {
76
+ const includeTarget = travelMap[location];
77
+ if (includeTarget === null) continue;
78
+ finalMessage += `at "${printIncludeTarget(includeTarget)}" in "${location}"\n`;
79
+ }
80
+
81
+ throw new Error(finalMessage);
82
+ }
83
+ }
84
+
85
+ async function _traverseInclude(
86
+ includeNode: IncludeNode,
87
+ location: string,
88
+ aliases: BitranAliases,
89
+ listeners: {
90
+ enter?: TraverseEnterFn;
91
+ step?: TraverseStepFn;
92
+ leave?: TraverseLeaveFn;
93
+ },
94
+ travelMap: Record<string, string | null>,
95
+ ): Promise<BlockNode[]> {
96
+ let includeTargetLocation: string;
97
+
98
+ try {
99
+ const parsedLocation = parseBitranLocation(location);
100
+
101
+ includeTargetLocation = (() => {
102
+ const _location = parsePartialBitranLocation(
103
+ tryReplaceAlias(includeNode.parseData.location, aliases),
104
+ parsedLocation,
105
+ );
106
+
107
+ if (_location.path) {
108
+ _location.path = serverAbsolutizeContentPath(
109
+ _location.path,
110
+ parsedLocation.path!,
111
+ );
112
+ }
113
+
114
+ return stringifyBitranLocation(_location);
115
+ })();
116
+ } catch (error) {
117
+ travelMap[location] = includeNode.parseData.location;
118
+ throw new Error(
119
+ `Failed to resolve include target location "${includeNode.parseData.location}" from "${location}": ${error instanceof Error ? error.message : error}`,
120
+ );
121
+ }
122
+
123
+ // Use only absolute locations as keys for infinite loop detection
124
+ if (includeTargetLocation in travelMap)
125
+ throw new Error(
126
+ `Include "${printIncludeTarget(includeNode.parseData.location)}" targets "${includeTargetLocation}" which creates infinite loop!`,
127
+ );
128
+
129
+ travelMap[location] = includeNode.parseData.location;
130
+
131
+ //
132
+ // Loading Unique this Include is referencing to.
133
+ //
134
+
135
+ const dbUnique = await ERUDIT_SERVER.DB.manager.findOne(DbUnique, {
136
+ where: { location: includeTargetLocation },
137
+ });
138
+
139
+ if (!dbUnique)
140
+ throw new Error(
141
+ `Include "${printIncludeTarget(includeNode.parseData.location)}" is targeting non-existing unique "${includeTargetLocation}"!`,
142
+ );
143
+
144
+ //
145
+ // Creating Bitran core within loaded unique's location context.
146
+ //
147
+
148
+ const context: BitranContext = {
149
+ location: parseBitranLocation(includeTargetLocation),
150
+ aliases: dbUnique.context.aliases,
151
+ };
152
+
153
+ const bitranTranspiler = await createBitranTranspiler({
154
+ eruditConfig: ERUDIT_SERVER.CONFIG,
155
+ context: structuredClone(context),
156
+ insideInclude: true,
157
+ });
158
+
159
+ if (listeners.enter) {
160
+ await listeners.enter({
161
+ _biCode: dbUnique.content,
162
+ _location: includeTargetLocation,
163
+ _bitranTranspiler: bitranTranspiler,
164
+ });
165
+ }
166
+
167
+ //
168
+ // Parsing unique content and sub-traversing all includes if any.
169
+ //
170
+
171
+ let stepErrorMessage: string | Error | undefined;
172
+
173
+ const rootNode = await bitranTranspiler.parser.parse(dbUnique.content, {
174
+ step: async (node) => {
175
+ if (stepErrorMessage) return;
176
+
177
+ // Skip Alias nodes to prevent them being injected into calling document context and possibly conflicting with other aliases, includes and links...
178
+ if (node instanceof AliasesNode) return;
179
+
180
+ // Replacing block ids with absolute ones to make possible to link to them
181
+ if (node instanceof BlockNode)
182
+ node.meta.id = Object.keys(travelMap)
183
+ .concat([location])
184
+ .join('__');
185
+
186
+ if (!(node instanceof IncludeNode)) {
187
+ if (listeners.step) {
188
+ await listeners.step({
189
+ _location: includeTargetLocation,
190
+ _node: node,
191
+ _bitranTranspiler: bitranTranspiler,
192
+ });
193
+ }
194
+ return;
195
+ }
196
+
197
+ try {
198
+ await _traverseInclude(
199
+ node,
200
+ includeTargetLocation,
201
+ context.aliases,
202
+ listeners,
203
+ travelMap,
204
+ );
205
+ } catch (err: any) {
206
+ stepErrorMessage =
207
+ err instanceof Error ? err : new Error(String(err));
208
+ }
209
+ },
210
+ });
211
+
212
+ if (stepErrorMessage) throw stepErrorMessage;
213
+
214
+ //
215
+ // Leaving from current Include
216
+ //
217
+
218
+ if (listeners.leave) {
219
+ await listeners.leave({
220
+ _location: includeTargetLocation,
221
+ });
222
+ }
223
+
224
+ return (rootNode.children as BlockNode[]) ?? [];
225
+ }
226
+
227
+ function printIncludeTarget(target: string) {
228
+ return `<~ ${target}`;
229
+ }
@@ -1,25 +1,43 @@
1
- import {
2
- decodeBitranLocation,
3
- parseBitranLocation,
4
- } from '@erudit/shared/bitran/location';
5
-
6
- export function parseUrlLocation(urlLocation: string) {
7
- urlLocation = decodeURIComponent(urlLocation);
8
- urlLocation = decodeBitranLocation(urlLocation);
9
-
10
- if (!urlLocation)
11
- throw createError({
12
- statusCode: 500,
13
- statusText: 'Empty content location router parameter!',
14
- });
15
-
16
- try {
17
- return parseBitranLocation(urlLocation);
18
- } catch (error: any) {
19
- throw createError({
20
- statusCode: 404,
21
- statusText:
22
- error?.message || `Can't parse location "${urlLocation}"!`,
23
- });
24
- }
25
- }
1
+ import {
2
+ decodeBitranLocation,
3
+ parseBitranLocation,
4
+ } from '@erudit-js/cog/schema';
5
+
6
+ import { getFullContentId } from '@server/repository/contentId';
7
+
8
+ export async function parseClientBitranLocation(clientLocation: string) {
9
+ clientLocation = decodeURIComponent(clientLocation);
10
+ clientLocation = decodeBitranLocation(clientLocation);
11
+
12
+ if (!clientLocation) {
13
+ throw createError({
14
+ statusCode: 400,
15
+ statusText: 'Empty content location router parameter!',
16
+ });
17
+ }
18
+
19
+ try {
20
+ const location = parseBitranLocation(clientLocation);
21
+
22
+ switch (location.type) {
23
+ case 'article':
24
+ case 'summary':
25
+ case 'practice':
26
+ case 'group':
27
+ location.path = getFullContentId(location.path!);
28
+ }
29
+
30
+ return location;
31
+ } catch (_error) {
32
+ let error = `Failed to parse client location "${clientLocation}"!`;
33
+
34
+ if (_error) {
35
+ error += '\n\n' + _error;
36
+ }
37
+
38
+ throw createError({
39
+ statusCode: 400,
40
+ statusText: error,
41
+ });
42
+ }
43
+ }