@knpkv/confluence-to-markdown 0.2.0 → 0.4.1

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 (336) hide show
  1. package/CHANGELOG.md +60 -0
  2. package/LICENSE +21 -0
  3. package/README.md +282 -14
  4. package/dist/ConfluenceAuth.d.ts +76 -0
  5. package/dist/ConfluenceAuth.d.ts.map +1 -0
  6. package/dist/ConfluenceAuth.js +356 -0
  7. package/dist/ConfluenceAuth.js.map +1 -0
  8. package/dist/ConfluenceClient.d.ts +26 -2
  9. package/dist/ConfluenceClient.d.ts.map +1 -1
  10. package/dist/ConfluenceClient.js +98 -92
  11. package/dist/ConfluenceClient.js.map +1 -1
  12. package/dist/ConfluenceConfig.d.ts +4 -24
  13. package/dist/ConfluenceConfig.d.ts.map +1 -1
  14. package/dist/ConfluenceConfig.js +45 -7
  15. package/dist/ConfluenceConfig.js.map +1 -1
  16. package/dist/ConfluenceError.d.ts +89 -6
  17. package/dist/ConfluenceError.d.ts.map +1 -1
  18. package/dist/ConfluenceError.js +88 -5
  19. package/dist/ConfluenceError.js.map +1 -1
  20. package/dist/GitError.d.ts +103 -0
  21. package/dist/GitError.d.ts.map +1 -0
  22. package/dist/GitError.js +85 -0
  23. package/dist/GitError.js.map +1 -0
  24. package/dist/GitService.d.ts +175 -0
  25. package/dist/GitService.d.ts.map +1 -0
  26. package/dist/GitService.js +431 -0
  27. package/dist/GitService.js.map +1 -0
  28. package/dist/LocalFileSystem.d.ts +29 -4
  29. package/dist/LocalFileSystem.d.ts.map +1 -1
  30. package/dist/LocalFileSystem.js +80 -6
  31. package/dist/LocalFileSystem.js.map +1 -1
  32. package/dist/MarkdownConverter.d.ts +49 -2
  33. package/dist/MarkdownConverter.d.ts.map +1 -1
  34. package/dist/MarkdownConverter.js +73 -111
  35. package/dist/MarkdownConverter.js.map +1 -1
  36. package/dist/SchemaConverterError.d.ts +108 -0
  37. package/dist/SchemaConverterError.d.ts.map +1 -0
  38. package/dist/SchemaConverterError.js +84 -0
  39. package/dist/SchemaConverterError.js.map +1 -0
  40. package/dist/Schemas.d.ts +225 -1
  41. package/dist/Schemas.d.ts.map +1 -1
  42. package/dist/Schemas.js +155 -6
  43. package/dist/Schemas.js.map +1 -1
  44. package/dist/SyncEngine.d.ts +30 -20
  45. package/dist/SyncEngine.d.ts.map +1 -1
  46. package/dist/SyncEngine.js +566 -117
  47. package/dist/SyncEngine.js.map +1 -1
  48. package/dist/ast/BlockNode.d.ts +468 -0
  49. package/dist/ast/BlockNode.d.ts.map +1 -0
  50. package/dist/ast/BlockNode.js +319 -0
  51. package/dist/ast/BlockNode.js.map +1 -0
  52. package/dist/ast/Document.d.ts +244 -0
  53. package/dist/ast/Document.d.ts.map +1 -0
  54. package/dist/ast/Document.js +69 -0
  55. package/dist/ast/Document.js.map +1 -0
  56. package/dist/ast/InlineNode.d.ts +477 -0
  57. package/dist/ast/InlineNode.d.ts.map +1 -0
  58. package/dist/ast/InlineNode.js +263 -0
  59. package/dist/ast/InlineNode.js.map +1 -0
  60. package/dist/ast/MacroNode.d.ts +267 -0
  61. package/dist/ast/MacroNode.d.ts.map +1 -0
  62. package/dist/ast/MacroNode.js +164 -0
  63. package/dist/ast/MacroNode.js.map +1 -0
  64. package/dist/ast/index.d.ts +10 -0
  65. package/dist/ast/index.d.ts.map +1 -0
  66. package/dist/ast/index.js +14 -0
  67. package/dist/ast/index.js.map +1 -0
  68. package/dist/bin.js +33 -149
  69. package/dist/bin.js.map +1 -1
  70. package/dist/commands/auth.d.ts +15 -0
  71. package/dist/commands/auth.d.ts.map +1 -0
  72. package/dist/commands/auth.js +86 -0
  73. package/dist/commands/auth.js.map +1 -0
  74. package/dist/commands/clone.d.ts +12 -0
  75. package/dist/commands/clone.d.ts.map +1 -0
  76. package/dist/commands/clone.js +93 -0
  77. package/dist/commands/clone.js.map +1 -0
  78. package/dist/commands/delete.d.ts +13 -0
  79. package/dist/commands/delete.d.ts.map +1 -0
  80. package/dist/commands/delete.js +48 -0
  81. package/dist/commands/delete.js.map +1 -0
  82. package/dist/commands/errorHandler.d.ts +14 -0
  83. package/dist/commands/errorHandler.d.ts.map +1 -0
  84. package/dist/commands/errorHandler.js +33 -0
  85. package/dist/commands/errorHandler.js.map +1 -0
  86. package/dist/commands/git.d.ts +22 -0
  87. package/dist/commands/git.d.ts.map +1 -0
  88. package/dist/commands/git.js +72 -0
  89. package/dist/commands/git.js.map +1 -0
  90. package/dist/commands/index.d.ts +11 -0
  91. package/dist/commands/index.d.ts.map +1 -0
  92. package/dist/commands/index.js +11 -0
  93. package/dist/commands/index.js.map +1 -0
  94. package/dist/commands/layers.d.ts +31 -0
  95. package/dist/commands/layers.d.ts.map +1 -0
  96. package/dist/commands/layers.js +137 -0
  97. package/dist/commands/layers.js.map +1 -0
  98. package/dist/commands/new.d.ts +9 -0
  99. package/dist/commands/new.d.ts.map +1 -0
  100. package/dist/commands/new.js +80 -0
  101. package/dist/commands/new.js.map +1 -0
  102. package/dist/commands/pageTree.d.ts +18 -0
  103. package/dist/commands/pageTree.d.ts.map +1 -0
  104. package/dist/commands/pageTree.js +20 -0
  105. package/dist/commands/pageTree.js.map +1 -0
  106. package/dist/commands/shared.d.ts +15 -0
  107. package/dist/commands/shared.d.ts.map +1 -0
  108. package/dist/commands/shared.js +27 -0
  109. package/dist/commands/shared.js.map +1 -0
  110. package/dist/commands/sync.d.ts +15 -0
  111. package/dist/commands/sync.d.ts.map +1 -0
  112. package/dist/commands/sync.js +101 -0
  113. package/dist/commands/sync.js.map +1 -0
  114. package/dist/index.d.ts +10 -1
  115. package/dist/index.d.ts.map +1 -1
  116. package/dist/index.js +14 -0
  117. package/dist/index.js.map +1 -1
  118. package/dist/internal/NodeLayers.d.ts +7 -0
  119. package/dist/internal/NodeLayers.d.ts.map +1 -0
  120. package/dist/internal/NodeLayers.js +19 -0
  121. package/dist/internal/NodeLayers.js.map +1 -0
  122. package/dist/internal/frontmatter.d.ts +10 -0
  123. package/dist/internal/frontmatter.d.ts.map +1 -1
  124. package/dist/internal/frontmatter.js +16 -0
  125. package/dist/internal/frontmatter.js.map +1 -1
  126. package/dist/internal/gitCommands.d.ts +78 -0
  127. package/dist/internal/gitCommands.d.ts.map +1 -0
  128. package/dist/internal/gitCommands.js +156 -0
  129. package/dist/internal/gitCommands.js.map +1 -0
  130. package/dist/internal/hashUtils.d.ts +42 -1
  131. package/dist/internal/hashUtils.d.ts.map +1 -1
  132. package/dist/internal/hashUtils.js +38 -2
  133. package/dist/internal/hashUtils.js.map +1 -1
  134. package/dist/internal/oauthServer.d.ts +55 -0
  135. package/dist/internal/oauthServer.d.ts.map +1 -0
  136. package/dist/internal/oauthServer.js +110 -0
  137. package/dist/internal/oauthServer.js.map +1 -0
  138. package/dist/internal/pathUtils.d.ts +21 -4
  139. package/dist/internal/pathUtils.d.ts.map +1 -1
  140. package/dist/internal/pathUtils.js +24 -13
  141. package/dist/internal/pathUtils.js.map +1 -1
  142. package/dist/internal/tokenStorage.d.ts +75 -0
  143. package/dist/internal/tokenStorage.d.ts.map +1 -0
  144. package/dist/internal/tokenStorage.js +149 -0
  145. package/dist/internal/tokenStorage.js.map +1 -0
  146. package/dist/internal/userCache.d.ts +42 -0
  147. package/dist/internal/userCache.d.ts.map +1 -0
  148. package/dist/internal/userCache.js +51 -0
  149. package/dist/internal/userCache.js.map +1 -0
  150. package/dist/parsers/ConfluenceParser.d.ts +26 -0
  151. package/dist/parsers/ConfluenceParser.d.ts.map +1 -0
  152. package/dist/parsers/ConfluenceParser.js +792 -0
  153. package/dist/parsers/ConfluenceParser.js.map +1 -0
  154. package/dist/parsers/MarkdownParser.d.ts +26 -0
  155. package/dist/parsers/MarkdownParser.d.ts.map +1 -0
  156. package/dist/parsers/MarkdownParser.js +873 -0
  157. package/dist/parsers/MarkdownParser.js.map +1 -0
  158. package/dist/parsers/index.d.ts +8 -0
  159. package/dist/parsers/index.d.ts.map +1 -0
  160. package/dist/parsers/index.js +8 -0
  161. package/dist/parsers/index.js.map +1 -0
  162. package/dist/schemas/ConfluenceSchema.d.ts +21 -0
  163. package/dist/schemas/ConfluenceSchema.d.ts.map +1 -0
  164. package/dist/schemas/ConfluenceSchema.js +38 -0
  165. package/dist/schemas/ConfluenceSchema.js.map +1 -0
  166. package/dist/schemas/ConversionSchema.d.ts +35 -0
  167. package/dist/schemas/ConversionSchema.d.ts.map +1 -0
  168. package/dist/schemas/ConversionSchema.js +208 -0
  169. package/dist/schemas/ConversionSchema.js.map +1 -0
  170. package/dist/schemas/MarkdownSchema.d.ts +21 -0
  171. package/dist/schemas/MarkdownSchema.d.ts.map +1 -0
  172. package/dist/schemas/MarkdownSchema.js +38 -0
  173. package/dist/schemas/MarkdownSchema.js.map +1 -0
  174. package/dist/schemas/hast/HastFromHtml.d.ts +27 -0
  175. package/dist/schemas/hast/HastFromHtml.d.ts.map +1 -0
  176. package/dist/schemas/hast/HastFromHtml.js +107 -0
  177. package/dist/schemas/hast/HastFromHtml.js.map +1 -0
  178. package/dist/schemas/hast/HastSchema.d.ts +195 -0
  179. package/dist/schemas/hast/HastSchema.d.ts.map +1 -0
  180. package/dist/schemas/hast/HastSchema.js +183 -0
  181. package/dist/schemas/hast/HastSchema.js.map +1 -0
  182. package/dist/schemas/hast/index.d.ts +9 -0
  183. package/dist/schemas/hast/index.d.ts.map +1 -0
  184. package/dist/schemas/hast/index.js +3 -0
  185. package/dist/schemas/hast/index.js.map +1 -0
  186. package/dist/schemas/index.d.ts +14 -0
  187. package/dist/schemas/index.d.ts.map +1 -0
  188. package/dist/schemas/index.js +16 -0
  189. package/dist/schemas/index.js.map +1 -0
  190. package/dist/schemas/mdast/MdastFromMarkdown.d.ts +30 -0
  191. package/dist/schemas/mdast/MdastFromMarkdown.d.ts.map +1 -0
  192. package/dist/schemas/mdast/MdastFromMarkdown.js +79 -0
  193. package/dist/schemas/mdast/MdastFromMarkdown.js.map +1 -0
  194. package/dist/schemas/mdast/MdastSchema.d.ts +385 -0
  195. package/dist/schemas/mdast/MdastSchema.d.ts.map +1 -0
  196. package/dist/schemas/mdast/MdastSchema.js +266 -0
  197. package/dist/schemas/mdast/MdastSchema.js.map +1 -0
  198. package/dist/schemas/mdast/index.d.ts +10 -0
  199. package/dist/schemas/mdast/index.d.ts.map +1 -0
  200. package/dist/schemas/mdast/index.js +4 -0
  201. package/dist/schemas/mdast/index.js.map +1 -0
  202. package/dist/schemas/mdast/mdastToString.d.ts +13 -0
  203. package/dist/schemas/mdast/mdastToString.d.ts.map +1 -0
  204. package/dist/schemas/mdast/mdastToString.js +85 -0
  205. package/dist/schemas/mdast/mdastToString.js.map +1 -0
  206. package/dist/schemas/nodes/block/BlockSchema.d.ts +43 -0
  207. package/dist/schemas/nodes/block/BlockSchema.d.ts.map +1 -0
  208. package/dist/schemas/nodes/block/BlockSchema.js +634 -0
  209. package/dist/schemas/nodes/block/BlockSchema.js.map +1 -0
  210. package/dist/schemas/nodes/block/index.d.ts +7 -0
  211. package/dist/schemas/nodes/block/index.d.ts.map +1 -0
  212. package/dist/schemas/nodes/block/index.js +7 -0
  213. package/dist/schemas/nodes/block/index.js.map +1 -0
  214. package/dist/schemas/nodes/index.d.ts +9 -0
  215. package/dist/schemas/nodes/index.d.ts.map +1 -0
  216. package/dist/schemas/nodes/index.js +12 -0
  217. package/dist/schemas/nodes/index.js.map +1 -0
  218. package/dist/schemas/nodes/inline/InlineSchema.d.ts +48 -0
  219. package/dist/schemas/nodes/inline/InlineSchema.d.ts.map +1 -0
  220. package/dist/schemas/nodes/inline/InlineSchema.js +436 -0
  221. package/dist/schemas/nodes/inline/InlineSchema.js.map +1 -0
  222. package/dist/schemas/nodes/inline/index.d.ts +7 -0
  223. package/dist/schemas/nodes/inline/index.d.ts.map +1 -0
  224. package/dist/schemas/nodes/inline/index.js +7 -0
  225. package/dist/schemas/nodes/inline/index.js.map +1 -0
  226. package/dist/schemas/nodes/macro/MacroSchema.d.ts +27 -0
  227. package/dist/schemas/nodes/macro/MacroSchema.d.ts.map +1 -0
  228. package/dist/schemas/nodes/macro/MacroSchema.js +162 -0
  229. package/dist/schemas/nodes/macro/MacroSchema.js.map +1 -0
  230. package/dist/schemas/nodes/macro/index.d.ts +7 -0
  231. package/dist/schemas/nodes/macro/index.d.ts.map +1 -0
  232. package/dist/schemas/nodes/macro/index.js +7 -0
  233. package/dist/schemas/nodes/macro/index.js.map +1 -0
  234. package/dist/schemas/preprocessing/ConfluencePreprocessor.d.ts +24 -0
  235. package/dist/schemas/preprocessing/ConfluencePreprocessor.d.ts.map +1 -0
  236. package/dist/schemas/preprocessing/ConfluencePreprocessor.js +351 -0
  237. package/dist/schemas/preprocessing/ConfluencePreprocessor.js.map +1 -0
  238. package/dist/schemas/preprocessing/index.d.ts +8 -0
  239. package/dist/schemas/preprocessing/index.d.ts.map +1 -0
  240. package/dist/schemas/preprocessing/index.js +2 -0
  241. package/dist/schemas/preprocessing/index.js.map +1 -0
  242. package/dist/serializers/ConfluenceSerializer.d.ts +30 -0
  243. package/dist/serializers/ConfluenceSerializer.d.ts.map +1 -0
  244. package/dist/serializers/ConfluenceSerializer.js +551 -0
  245. package/dist/serializers/ConfluenceSerializer.js.map +1 -0
  246. package/dist/serializers/MarkdownSerializer.d.ts +34 -0
  247. package/dist/serializers/MarkdownSerializer.d.ts.map +1 -0
  248. package/dist/serializers/MarkdownSerializer.js +355 -0
  249. package/dist/serializers/MarkdownSerializer.js.map +1 -0
  250. package/dist/serializers/index.d.ts +8 -0
  251. package/dist/serializers/index.d.ts.map +1 -0
  252. package/dist/serializers/index.js +8 -0
  253. package/dist/serializers/index.js.map +1 -0
  254. package/package.json +27 -16
  255. package/src/ConfluenceAuth.ts +571 -0
  256. package/src/ConfluenceClient.ts +188 -156
  257. package/src/ConfluenceConfig.ts +63 -7
  258. package/src/ConfluenceError.ts +110 -14
  259. package/src/GitError.ts +92 -0
  260. package/src/GitService.ts +859 -0
  261. package/src/LocalFileSystem.ts +179 -9
  262. package/src/MarkdownConverter.ts +126 -122
  263. package/src/SchemaConverterError.ts +108 -0
  264. package/src/Schemas.ts +223 -6
  265. package/src/SyncEngine.ts +745 -162
  266. package/src/ast/BlockNode.ts +425 -0
  267. package/src/ast/Document.ts +90 -0
  268. package/src/ast/InlineNode.ts +323 -0
  269. package/src/ast/MacroNode.ts +245 -0
  270. package/src/ast/index.ts +83 -0
  271. package/src/bin.ts +50 -249
  272. package/src/commands/auth.ts +117 -0
  273. package/src/commands/clone.ts +145 -0
  274. package/src/commands/delete.ts +57 -0
  275. package/src/commands/errorHandler.ts +32 -0
  276. package/src/commands/git.ts +114 -0
  277. package/src/commands/index.ts +10 -0
  278. package/src/commands/layers.ts +211 -0
  279. package/src/commands/new.ts +99 -0
  280. package/src/commands/pageTree.ts +40 -0
  281. package/src/commands/shared.ts +35 -0
  282. package/src/commands/sync.ts +129 -0
  283. package/src/index.ts +21 -1
  284. package/src/internal/NodeLayers.ts +21 -0
  285. package/src/internal/frontmatter.ts +21 -0
  286. package/src/internal/gitCommands.ts +229 -0
  287. package/src/internal/hashUtils.ts +65 -3
  288. package/src/internal/oauthServer.ts +199 -0
  289. package/src/internal/pathUtils.ts +34 -17
  290. package/src/internal/tokenStorage.ts +240 -0
  291. package/src/internal/userCache.ts +90 -0
  292. package/src/parsers/ConfluenceParser.ts +950 -0
  293. package/src/parsers/MarkdownParser.ts +1198 -0
  294. package/src/parsers/index.ts +8 -0
  295. package/src/schemas/ConfluenceSchema.ts +56 -0
  296. package/src/schemas/ConversionSchema.ts +318 -0
  297. package/src/schemas/MarkdownSchema.ts +56 -0
  298. package/src/schemas/hast/HastFromHtml.ts +153 -0
  299. package/src/schemas/hast/HastSchema.ts +274 -0
  300. package/src/schemas/hast/index.ts +35 -0
  301. package/src/schemas/index.ts +20 -0
  302. package/src/schemas/mdast/MdastFromMarkdown.ts +118 -0
  303. package/src/schemas/mdast/MdastSchema.ts +566 -0
  304. package/src/schemas/mdast/index.ts +59 -0
  305. package/src/schemas/mdast/mdastToString.ts +102 -0
  306. package/src/schemas/nodes/block/BlockSchema.ts +773 -0
  307. package/src/schemas/nodes/block/index.ts +13 -0
  308. package/src/schemas/nodes/index.ts +20 -0
  309. package/src/schemas/nodes/inline/InlineSchema.ts +523 -0
  310. package/src/schemas/nodes/inline/index.ts +14 -0
  311. package/src/schemas/nodes/macro/MacroSchema.ts +226 -0
  312. package/src/schemas/nodes/macro/index.ts +6 -0
  313. package/src/schemas/preprocessing/ConfluencePreprocessor.ts +446 -0
  314. package/src/schemas/preprocessing/index.ts +8 -0
  315. package/src/serializers/ConfluenceSerializer.ts +717 -0
  316. package/src/serializers/MarkdownSerializer.ts +493 -0
  317. package/src/serializers/index.ts +8 -0
  318. package/test/GitService.test.ts +209 -0
  319. package/test/MarkdownConverter.test.ts +37 -3
  320. package/test/Schemas.test.ts +97 -2
  321. package/test/ast/BlockNode.test.ts +265 -0
  322. package/test/ast/Document.test.ts +126 -0
  323. package/test/ast/InlineNode.test.ts +161 -0
  324. package/test/fixtures/integration-test.html.fixture +103 -0
  325. package/test/fixtures/integration-test.md.expected +257 -0
  326. package/test/integration.test.ts +269 -0
  327. package/test/oauthServer.test.ts +50 -0
  328. package/test/parsers/ConfluenceParser.test.ts +283 -0
  329. package/test/schemas/ConfluencePreprocessor.test.ts +180 -0
  330. package/test/schemas/ConversionSchema.test.ts +159 -0
  331. package/test/schemas/HastSchema.test.ts +138 -0
  332. package/test/schemas/MdastSchema.test.ts +145 -0
  333. package/test/schemas/nodes/block/BlockSchema.test.ts +173 -0
  334. package/test/schemas/nodes/inline/InlineSchema.test.ts +198 -0
  335. package/test/schemas/nodes/macro/MacroSchema.test.ts +142 -0
  336. package/test/tokenStorage.test.ts +99 -0
@@ -1,17 +1,18 @@
1
1
  /**
2
2
  * Confluence REST API v2 client service.
3
3
  *
4
+ * Wraps @knpkv/confluence-api-client with rate limit retry logic and pagination helpers.
5
+ *
4
6
  * @module
5
7
  */
6
8
  import * as HttpClient from "@effect/platform/HttpClient";
7
- import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
9
+ import { ConfluenceApiClient, ConfluenceApiConfig } from "@knpkv/confluence-api-client";
8
10
  import * as Context from "effect/Context";
9
11
  import * as Effect from "effect/Effect";
10
12
  import * as Layer from "effect/Layer";
13
+ import * as Redacted from "effect/Redacted";
11
14
  import * as Schedule from "effect/Schedule";
12
- import * as Schema from "effect/Schema";
13
- import { ApiError, RateLimitError } from "./ConfluenceError.js";
14
- import { PageChildrenResponseSchema, PageResponseSchema } from "./Schemas.js";
15
+ import { ApiError } from "./ConfluenceError.js";
15
16
  /**
16
17
  * Confluence REST API v2 client service.
17
18
  *
@@ -31,100 +32,58 @@ import { PageChildrenResponseSchema, PageResponseSchema } from "./Schemas.js";
31
32
  */
32
33
  export class ConfluenceClient extends Context.Tag("@knpkv/confluence-to-markdown/ConfluenceClient")() {
33
34
  }
35
+ /** Maximum pagination iterations to prevent infinite loops */
36
+ const MAX_PAGINATION_ITERATIONS = 100;
37
+ /** Default page size for version fetching */
38
+ const VERSIONS_PAGE_SIZE = 50;
34
39
  /**
35
40
  * Rate limit retry schedule with exponential backoff.
36
41
  */
37
42
  const rateLimitSchedule = Schedule.exponential("1 second").pipe(Schedule.union(Schedule.spaced("30 seconds")), Schedule.whileInput((error) => error._tag === "RateLimitError"), Schedule.intersect(Schedule.recurs(3)));
43
+ /**
44
+ * Map API client errors to domain errors.
45
+ */
46
+ const mapApiError = (error, endpoint, pageId) => new ApiError({
47
+ status: error.status,
48
+ message: error.message,
49
+ endpoint,
50
+ ...(pageId !== undefined && { pageId })
51
+ });
38
52
  /**
39
53
  * Create the Confluence client service.
40
54
  */
41
55
  const make = (config) => Effect.gen(function* () {
42
- const httpClient = yield* HttpClient.HttpClient;
43
- const authHeader = config.auth.type === "token"
44
- ? `Basic ${Buffer.from(`${config.auth.email}:${config.auth.token}`).toString("base64")}`
45
- : `Bearer ${config.auth.accessToken}`;
46
- const baseRequest = HttpClientRequest.get(`${config.baseUrl}/wiki/api/v2`).pipe(HttpClientRequest.setHeader("Authorization", authHeader), HttpClientRequest.setHeader("Accept", "application/json"), HttpClientRequest.setHeader("Content-Type", "application/json"));
47
- const request = (method, path, body) => Effect.gen(function* () {
48
- let req = baseRequest.pipe(HttpClientRequest.setMethod(method), HttpClientRequest.setUrl(`${config.baseUrl}/wiki/api/v2${path}`));
49
- if (body !== undefined) {
50
- req = HttpClientRequest.bodyJson(req, body).pipe(Effect.catchAll(() => Effect.succeed(req)), Effect.runSync);
51
- }
52
- const response = yield* httpClient.execute(req).pipe(Effect.mapError((error) => new ApiError({
53
- status: 0,
54
- message: `Request failed: ${error.message}`,
55
- endpoint: path
56
- })));
57
- if (response.status === 429) {
58
- const retryAfterHeader = response.headers["retry-after"];
59
- const retryAfter = retryAfterHeader ? parseInt(retryAfterHeader, 10) : undefined;
60
- return yield* Effect.fail(retryAfter !== undefined
61
- ? new RateLimitError({ retryAfter })
62
- : new RateLimitError({}));
63
- }
64
- if (response.status >= 400) {
65
- const text = yield* response.text.pipe(Effect.catchAll(() => Effect.succeed("")));
66
- return yield* Effect.fail(new ApiError({
67
- status: response.status,
68
- message: text || `HTTP ${response.status}`,
69
- endpoint: path
70
- }));
71
- }
72
- if (method === "DELETE" && response.status === 204) {
73
- return undefined;
74
- }
75
- const json = yield* response.json.pipe(Effect.mapError((error) => new ApiError({
76
- status: response.status,
77
- message: `Failed to parse response: ${error}`,
78
- endpoint: path
79
- })));
80
- return json;
81
- }).pipe(Effect.retry(rateLimitSchedule));
82
- const getPage = (id) => Effect.gen(function* () {
83
- const raw = yield* request("GET", `/pages/${id}?body-format=storage`);
84
- return yield* Schema.decodeUnknown(PageResponseSchema)(raw).pipe(Effect.mapError((error) => new ApiError({
85
- status: 0,
86
- message: `Invalid response schema: ${error.message}`,
87
- endpoint: `/pages/${id}`,
88
- pageId: id
89
- })));
90
- });
91
- const getChildren = (id) => Effect.gen(function* () {
92
- const raw = yield* request("GET", `/pages/${id}/children?body-format=storage`);
93
- return yield* Schema.decodeUnknown(PageChildrenResponseSchema)(raw).pipe(Effect.mapError((error) => new ApiError({
94
- status: 0,
95
- message: `Invalid response schema: ${error.message}`,
96
- endpoint: `/pages/${id}/children`,
97
- pageId: id
98
- })));
56
+ // Create underlying API client
57
+ const apiConfigLayer = Layer.succeed(ConfluenceApiConfig, {
58
+ baseUrl: config.baseUrl,
59
+ auth: config.auth.type === "token"
60
+ ? { type: "basic", email: config.auth.email, apiToken: Redacted.make(config.auth.token) }
61
+ : { type: "oauth2", accessToken: Redacted.make(config.auth.accessToken), cloudId: config.auth.cloudId }
99
62
  });
63
+ const httpClient = yield* HttpClient.HttpClient;
64
+ const apiClient = yield* ConfluenceApiClient.pipe(Effect.provide(ConfluenceApiClient.layer), Effect.provide(apiConfigLayer), Effect.provide(Layer.succeed(HttpClient.HttpClient, httpClient)));
65
+ const getPage = (id) => apiClient.v2.getPageById(id, { bodyFormat: "storage" }).pipe(Effect.mapError((e) => mapApiError(e, `/pages/${id}`, id)), Effect.retry(rateLimitSchedule));
66
+ const getChildren = (id) => apiClient.v2.getPageChildren(id, { bodyFormat: "storage" }).pipe(Effect.mapError((e) => mapApiError(e, `/pages/${id}/children`, id)), Effect.retry(rateLimitSchedule));
100
67
  const getAllChildren = (id) => Effect.gen(function* () {
101
68
  const allChildren = [];
102
69
  let cursor;
103
70
  let iterations = 0;
104
- const maxIterations = 100; // Prevent unbounded pagination
105
71
  do {
106
- if (iterations >= maxIterations) {
72
+ if (iterations >= MAX_PAGINATION_ITERATIONS) {
107
73
  return yield* Effect.fail(new ApiError({
108
74
  status: 0,
109
- message: `Pagination limit exceeded: more than ${maxIterations} pages of children`,
75
+ message: `Pagination limit exceeded: more than ${MAX_PAGINATION_ITERATIONS} pages of children`,
110
76
  endpoint: `/pages/${id}/children`,
111
77
  pageId: id
112
78
  }));
113
79
  }
114
- const path = cursor
115
- ? `/pages/${id}/children?body-format=storage&cursor=${cursor}`
116
- : `/pages/${id}/children?body-format=storage`;
117
- const raw = yield* request("GET", path);
118
- const response = yield* Schema.decodeUnknown(PageChildrenResponseSchema)(raw).pipe(Effect.mapError((error) => new ApiError({
119
- status: 0,
120
- message: `Invalid response schema: ${error.message}`,
121
- endpoint: path,
122
- pageId: id
123
- })));
80
+ const response = yield* apiClient.v2.getPageChildren(id, {
81
+ bodyFormat: "storage",
82
+ cursor
83
+ }).pipe(Effect.mapError((e) => mapApiError(e, `/pages/${id}/children`, id)), Effect.retry(rateLimitSchedule));
124
84
  for (const child of response.results) {
125
85
  allChildren.push(child);
126
86
  }
127
- // Extract cursor from next link if present
128
87
  cursor = response._links?.next
129
88
  ? new URL(response._links.next, config.baseUrl).searchParams.get("cursor") ?? undefined
130
89
  : undefined;
@@ -132,31 +91,78 @@ const make = (config) => Effect.gen(function* () {
132
91
  } while (cursor);
133
92
  return allChildren;
134
93
  });
135
- const createPage = (req) => Effect.gen(function* () {
136
- const raw = yield* request("POST", "/pages", req);
137
- return yield* Schema.decodeUnknown(PageResponseSchema)(raw).pipe(Effect.mapError((error) => new ApiError({
138
- status: 0,
139
- message: `Invalid response schema: ${error.message}`,
140
- endpoint: "/pages"
141
- })));
94
+ const createPage = (req) => apiClient.v2.createPage(req).pipe(Effect.mapError((e) => mapApiError(e, "/pages")), Effect.retry(rateLimitSchedule));
95
+ const updatePage = (req) => apiClient.v2.updatePage(req.id, req).pipe(Effect.mapError((e) => mapApiError(e, `/pages/${req.id}`, req.id)), Effect.retry(rateLimitSchedule));
96
+ const deletePage = (id) => apiClient.v2.deletePage(id).pipe(Effect.mapError((e) => mapApiError(e, `/pages/${id}`, id)), Effect.retry(rateLimitSchedule));
97
+ const getPageVersions = (id, options) => Effect.gen(function* () {
98
+ const allVersions = [];
99
+ let cursor;
100
+ let iterations = 0;
101
+ do {
102
+ if (iterations >= MAX_PAGINATION_ITERATIONS) {
103
+ return yield* Effect.fail(new ApiError({
104
+ status: 0,
105
+ message: `Pagination limit exceeded: more than ${MAX_PAGINATION_ITERATIONS} pages of versions`,
106
+ endpoint: `/pages/${id}/versions`,
107
+ pageId: id
108
+ }));
109
+ }
110
+ const response = yield* apiClient.v2.getPageVersions(id, {
111
+ bodyFormat: options?.includeBody ? "storage" : undefined,
112
+ cursor,
113
+ limit: VERSIONS_PAGE_SIZE
114
+ }).pipe(Effect.mapError((e) => mapApiError(e, `/pages/${id}/versions`, id)), Effect.retry(rateLimitSchedule));
115
+ for (const version of response.results) {
116
+ if (options?.since === undefined || (version.number ?? 0) > options.since) {
117
+ allVersions.push(version);
118
+ }
119
+ }
120
+ cursor = response._links?.next
121
+ ? new URL(response._links.next, config.baseUrl).searchParams.get("cursor") ?? undefined
122
+ : undefined;
123
+ iterations++;
124
+ } while (cursor);
125
+ return allVersions;
142
126
  });
143
- const updatePage = (req) => Effect.gen(function* () {
144
- const raw = yield* request("PUT", `/pages/${req.id}`, req);
145
- return yield* Schema.decodeUnknown(PageResponseSchema)(raw).pipe(Effect.mapError((error) => new ApiError({
146
- status: 0,
147
- message: `Invalid response schema: ${error.message}`,
148
- endpoint: `/pages/${req.id}`,
149
- pageId: req.id
150
- })));
127
+ const getUser = (accountId) => apiClient.v1.getUser({ accountId }).pipe(Effect.mapError((e) => mapApiError(e, `/user?accountId=${accountId}`)), Effect.retry(rateLimitSchedule));
128
+ const getSpaceId = (pageId) => Effect.gen(function* () {
129
+ const page = yield* getPage(pageId);
130
+ if (!page.spaceId) {
131
+ return yield* Effect.fail(new ApiError({
132
+ status: 0,
133
+ message: `Page ${pageId} does not have spaceId`,
134
+ endpoint: `/pages/${pageId}`,
135
+ pageId
136
+ }));
137
+ }
138
+ return page.spaceId;
151
139
  });
152
- const deletePage = (id) => request("DELETE", `/pages/${id}`);
140
+ const setEditorVersion = (pageId, version) => Effect.gen(function* () {
141
+ // Try to get current property version, only treat 404 as "not exists"
142
+ const propertyVersion = yield* apiClient.v1.getContentProperty(pageId, "editor").pipe(Effect.map((prop) => prop.version.number + 1), Effect.catchIf((e) => e.status === 404, () => Effect.succeed(1)), Effect.mapError((e) => mapApiError(e, `/content/${pageId}/property/editor`, pageId)));
143
+ const payload = {
144
+ key: "editor",
145
+ value: version,
146
+ version: { number: propertyVersion }
147
+ };
148
+ if (propertyVersion === 1) {
149
+ yield* apiClient.v1.createContentProperty(pageId, { payload }).pipe(Effect.mapError((e) => mapApiError(e, `/content/${pageId}/property/editor`, pageId)));
150
+ }
151
+ else {
152
+ yield* apiClient.v1.updateContentProperty(pageId, "editor", { payload }).pipe(Effect.mapError((e) => mapApiError(e, `/content/${pageId}/property/editor`, pageId)));
153
+ }
154
+ }).pipe(Effect.retry(rateLimitSchedule));
153
155
  return ConfluenceClient.of({
154
156
  getPage,
155
157
  getChildren,
156
158
  getAllChildren,
157
159
  createPage,
158
160
  updatePage,
159
- deletePage
161
+ deletePage,
162
+ getPageVersions,
163
+ getUser,
164
+ getSpaceId,
165
+ setEditorVersion
160
166
  });
161
167
  });
162
168
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"ConfluenceClient.js","sourceRoot":"","sources":["../src/ConfluenceClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConfluenceClient.js","sourceRoot":"","sources":["../src/ConfluenceClient.ts"],"names":[],"mappings":"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"}
@@ -22,6 +22,10 @@ declare const ConfluenceConfig_base: Context.TagClass<ConfluenceConfig, "@knpkv/
22
22
  readonly docsPath: string;
23
23
  /** Glob patterns to exclude */
24
24
  readonly excludePatterns: ReadonlyArray<string>;
25
+ /** Save original Confluence HTML alongside markdown */
26
+ readonly saveSource: boolean;
27
+ /** Glob patterns for files to track in git */
28
+ readonly trackedPaths: ReadonlyArray<string>;
25
29
  }>;
26
30
  /**
27
31
  * Configuration service for Confluence operations.
@@ -42,30 +46,6 @@ declare const ConfluenceConfig_base: Context.TagClass<ConfluenceConfig, "@knpkv/
42
46
  */
43
47
  export declare class ConfluenceConfig extends ConfluenceConfig_base {
44
48
  }
45
- /**
46
- * Layer that provides ConfluenceConfig from a config file.
47
- *
48
- * @example
49
- * ```typescript
50
- * import { ConfluenceConfig } from "@knpkv/confluence-to-markdown/ConfluenceConfig"
51
- * import { NodeFileSystem } from "@effect/platform-node"
52
- * import { Effect } from "effect"
53
- *
54
- * const program = Effect.gen(function* () {
55
- * const config = yield* ConfluenceConfig
56
- * console.log(config.rootPageId)
57
- * })
58
- *
59
- * Effect.runPromise(
60
- * program.pipe(
61
- * Effect.provide(ConfluenceConfig.layer()),
62
- * Effect.provide(NodeFileSystem.layer)
63
- * )
64
- * )
65
- * ```
66
- *
67
- * @category Layers
68
- */
69
49
  export declare const layer: (configPath?: string) => Layer.Layer<ConfluenceConfig, ConfigNotFoundError | ConfigParseError, FileSystem.FileSystem | Path.Path>;
70
50
  /**
71
51
  * Layer that provides ConfluenceConfig with direct values.
@@ -1 +1 @@
1
- {"version":3,"file":"ConfluenceConfig.d.ts","sourceRoot":"","sources":["../src/ConfluenceConfig.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAA;AACzD,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAA;AAC7C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;;IAyBpD,gCAAgC;yBACX,MAAM;IAC3B,gCAAgC;sBACd,MAAM;IACxB,yBAAyB;wBACL,MAAM;IAC1B,sBAAsB;uBACH,MAAM;IACzB,+BAA+B;8BACL,aAAa,CAAC,MAAM,CAAC;;AA/BnD;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,gBAAiB,SAAQ,qBAgBnC;CAAG;AAqCN;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,KAAK,GAChB,aAAa,MAAM,KAClB,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,mBAAmB,GAAG,gBAAgB,EAAE,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAgBvG,CAAA;AAEH;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,oBAAoB,KAC3B,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAU5B,CAAA;AAEH;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAC3B,YAAY,MAAM,EAClB,SAAS,MAAM,EACf,aAAa,MAAM,KAClB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAyBxE,CAAA"}
1
+ {"version":3,"file":"ConfluenceConfig.d.ts","sourceRoot":"","sources":["../src/ConfluenceConfig.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAA;AACzD,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAA;AAC7C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;;IAyBpD,gCAAgC;yBACX,MAAM;IAC3B,gCAAgC;sBACd,MAAM;IACxB,yBAAyB;wBACL,MAAM;IAC1B,sBAAsB;uBACH,MAAM;IACzB,+BAA+B;8BACL,aAAa,CAAC,MAAM,CAAC;IAC/C,uDAAuD;yBAClC,OAAO;IAC5B,8CAA8C;2BACvB,aAAa,CAAC,MAAM,CAAC;;AAnChD;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,gBAAiB,SAAQ,qBAoBnC;CAAG;AA+FN,eAAO,MAAM,KAAK,GAChB,aAAa,MAAM,KAClB,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,mBAAmB,GAAG,gBAAgB,EAAE,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAqBvG,CAAA;AAEH;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,oBAAoB,KAC3B,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAY5B,CAAA;AAEH;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAC3B,YAAY,MAAM,EAClB,SAAS,MAAM,EACf,aAAa,MAAM,KAClB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAoCxE,CAAA"}
@@ -30,10 +30,14 @@ import { ConfluenceConfigFileSchema } from "./Schemas.js";
30
30
  */
31
31
  export class ConfluenceConfig extends Context.Tag("@knpkv/confluence-to-markdown/ConfluenceConfig")() {
32
32
  }
33
+ /**
34
+ * Default config directory.
35
+ */
36
+ const CONFIG_DIR = ".confluence";
33
37
  /**
34
38
  * Default config file name.
35
39
  */
36
- const CONFIG_FILE_NAME = ".confluence.json";
40
+ const CONFIG_FILE_NAME = "config.json";
37
41
  /**
38
42
  * Load configuration from a file.
39
43
  */
@@ -74,16 +78,40 @@ const loadConfig = (configPath) => Effect.gen(function* () {
74
78
  *
75
79
  * @category Layers
76
80
  */
81
+ /**
82
+ * Validate docsPath configuration.
83
+ * docsPath must be either:
84
+ * - ".confluence/docs" (default, files in git repo)
85
+ * - A path outside ".confluence/" (external docs directory)
86
+ * NOT: ".confluence/other" which would cause confusion
87
+ */
88
+ const validateDocsPath = (docsPath, configPath) => {
89
+ const isDefault = docsPath === ".confluence/docs";
90
+ const isInsideConfluence = docsPath.startsWith(".confluence/") || docsPath.startsWith(".confluence\\");
91
+ const isOutside = !isInsideConfluence;
92
+ if (isDefault || isOutside) {
93
+ return Effect.void;
94
+ }
95
+ // docsPath is inside .confluence/ but not the default - this is invalid
96
+ return Effect.fail(new ConfigParseError({
97
+ path: configPath,
98
+ cause: `Invalid docsPath "${docsPath}". Must be either ".confluence/docs" (default) or a path outside ".confluence/" (e.g., "docs" for external docs).`
99
+ }));
100
+ };
77
101
  export const layer = (configPath) => Layer.effect(ConfluenceConfig, Effect.gen(function* () {
78
102
  const path = yield* Path.Path;
79
- const resolvedPath = configPath ?? path.join(process.cwd(), CONFIG_FILE_NAME);
103
+ const resolvedPath = configPath ?? path.join(process.cwd(), CONFIG_DIR, CONFIG_FILE_NAME);
80
104
  const config = yield* loadConfig(resolvedPath);
105
+ // Validate docsPath
106
+ yield* validateDocsPath(config.docsPath, resolvedPath);
81
107
  return ConfluenceConfig.of({
82
108
  rootPageId: config.rootPageId,
83
109
  baseUrl: config.baseUrl,
84
110
  ...(config.spaceKey !== undefined ? { spaceKey: config.spaceKey } : {}),
85
111
  docsPath: config.docsPath,
86
- excludePatterns: config.excludePatterns
112
+ excludePatterns: config.excludePatterns,
113
+ saveSource: config.saveSource,
114
+ trackedPaths: config.trackedPaths
87
115
  });
88
116
  }));
89
117
  /**
@@ -96,7 +124,9 @@ export const layerFromValues = (config) => Layer.succeed(ConfluenceConfig, Confl
96
124
  baseUrl: config.baseUrl,
97
125
  ...(config.spaceKey !== undefined ? { spaceKey: config.spaceKey } : {}),
98
126
  docsPath: config.docsPath,
99
- excludePatterns: config.excludePatterns
127
+ excludePatterns: config.excludePatterns,
128
+ saveSource: config.saveSource,
129
+ trackedPaths: config.trackedPaths
100
130
  }));
101
131
  /**
102
132
  * Create a new config file.
@@ -106,15 +136,23 @@ export const layerFromValues = (config) => Layer.succeed(ConfluenceConfig, Confl
106
136
  export const createConfigFile = (rootPageId, baseUrl, configPath) => Effect.gen(function* () {
107
137
  const fs = yield* FileSystem.FileSystem;
108
138
  const pathService = yield* Path.Path;
109
- const resolvedPath = configPath ?? pathService.join(process.cwd(), CONFIG_FILE_NAME);
139
+ const configDir = pathService.join(process.cwd(), CONFIG_DIR);
140
+ const resolvedPath = configPath ?? pathService.join(configDir, CONFIG_FILE_NAME);
110
141
  const config = {
111
142
  rootPageId: rootPageId,
112
143
  baseUrl,
113
- docsPath: ".docs/confluence",
114
- excludePatterns: []
144
+ docsPath: ".confluence/docs",
145
+ excludePatterns: [],
146
+ saveSource: false,
147
+ trackedPaths: ["**/*.md"]
115
148
  };
116
149
  // Validate the config
117
150
  yield* Schema.decodeUnknown(ConfluenceConfigFileSchema)(config).pipe(Effect.mapError((cause) => new ConfigParseError({ path: resolvedPath, cause })));
151
+ // Create .confluence directory if it doesn't exist
152
+ const dirExists = yield* fs.exists(configDir).pipe(Effect.catchAll(() => Effect.succeed(false)));
153
+ if (!dirExists) {
154
+ yield* fs.makeDirectory(configDir, { recursive: true }).pipe(Effect.mapError((cause) => new ConfigParseError({ path: configDir, cause })));
155
+ }
118
156
  const content = JSON.stringify(config, null, 2);
119
157
  yield* fs.writeFileString(resolvedPath, content).pipe(Effect.mapError((cause) => new ConfigParseError({ path: resolvedPath, cause })));
120
158
  return resolvedPath;
@@ -1 +1 @@
1
- {"version":3,"file":"ConfluenceConfig.js","sourceRoot":"","sources":["../src/ConfluenceConfig.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConfluenceConfig.js","sourceRoot":"","sources":["../src/ConfluenceConfig.ts"],"names":[],"mappings":"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"}