@ukwhatn/wikidot 1.0.6 → 1.0.8

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 (15) hide show
  1. package/dist/module/client.js +2 -2
  2. package/dist/module/client.js.map +1 -1
  3. package/dist/module/page.d.ts +19 -4
  4. package/dist/module/page.js +88 -11
  5. package/dist/module/page.js.map +1 -1
  6. package/dist/module/pageRevision.d.ts +29 -0
  7. package/dist/module/pageRevision.js +114 -0
  8. package/dist/module/pageRevision.js.map +1 -0
  9. package/dist/module/pageSource.d.ts +7 -0
  10. package/dist/module/pageSource.js +11 -0
  11. package/dist/module/pageSource.js.map +1 -0
  12. package/dist/util/stringUtil.d.ts +1 -0
  13. package/dist/util/stringUtil.js +17 -0
  14. package/dist/util/stringUtil.js.map +1 -1
  15. package/package.json +1 -1
package/dist/module/client.js CHANGED
@@ -48,7 +48,7 @@ class ClientSiteMethods {
48
48
  }
49
49
  }
50
50
  class Client {
51
- constructor(username, amcConfig, loggingLevel = 'WARNING') {
51
+ constructor(username, amcConfig, loggingLevel = 'info') {
52
52
  common_1.logger.level = loggingLevel;
53
53
  this.amcClient = new ajax_1.AjaxModuleConnectorClient(null, amcConfig);
54
54
  this.isLoggedIn = false;
@@ -58,7 +58,7 @@ class Client {
58
58
  this.privateMessage = new ClientPrivateMessageMethods(this);
59
59
  this.site = new ClientSiteMethods(this);
60
60
  }
61
- static async init(username, password, amcConfig, loggingLevel = 'WARNING') {
61
+ static async init(username, password, amcConfig, loggingLevel = 'info') {
62
62
  const instance = new Client(username, amcConfig, loggingLevel);
63
63
  if (username && password) {
64
64
  await auth_1.HTTPAuthentication.login(instance, username, password).then(() => {
package/dist/module/client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/module/client.ts"],"names":[],"mappings":";;;AAAA,sCAAiC;AACjC,qDAA4D;AAC5D,4CAAuF;AACvF,iCAA0C;AAE1C,qDAAsH;AACtH,iCAA4B;AAC5B,iCAA4C;AAE5C,MAAM,iBAAiB;IACnB,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAClC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAY,EAAE,oBAA6B,KAAK;QACtD,OAAO,MAAM,WAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAe,EAAE,oBAA6B,KAAK;QAC7D,OAAO,MAAM,qBAAc,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,iBAAiB,CAAC,CAAC;IACjF,CAAC;CACJ;AAED,MAAM,2BAA2B;IAC7B,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAClC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,SAAe,EAAE,OAAe,EAAE,IAAY;QACrD,MAAM,+BAAc,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,QAAQ;QACV,OAAO,MAAM,oCAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,OAAO,MAAM,sCAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAAoB;QAClC,OAAO,yCAAwB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB;QAC9B,OAAO,+BAAc,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;CACJ;AAGD,MAAM,iBAAiB;IACnB,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAClC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,QAAgB;QACtB,OAAO,MAAM,WAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;CACJ;AAGD,MAAM,MAAM;IAWR,YAAY,QAAiB,EAAE,SAAqC,EAAE,eAAuB,SAAS;QAClG,eAAM,CAAC,KAAK,GAAG,YAAY,CAAC;QAE5B,IAAI,CAAC,SAAS,GAAG,IAAI,gCAAyB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAEhE,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QAErB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAE3B,IAAI,CAAC,IAAI,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,cAAc,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAiB,EAAE,QAAiB,EAAE,SAAqC,EAAE,eAAuB,SAAS;QAC3H,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QAE/D,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;YACvB,MAAM,yBAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnE,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC;gBAC3B,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAC7B,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC;YAClC,CAAC,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC;QAClC,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,MAAM;QACR,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,MAAM,yBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACzB,CAAC;IACL,CAAC;IAED,UAAU;QACN,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,0BAA0B;YAC1B,UAAU,CAAC,GAAG,EAAE;YAChB,CAAC,EAAE,IAAI,CAAC,CAAC;QACb,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,MAAM,IAAI,mCAAsB,CAAC,4CAA4C,CAAC,CAAC;QACnF,CAAC;IACL,CAAC;IAED,QAAQ;QACJ,OAAO,mBAAmB,IAAI,CAAC,QAAQ,gBAAgB,IAAI,CAAC,UAAU,GAAG,CAAC;IAC9E,CAAC;CACJ;AAEO,wBAAM"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/module/client.ts"],"names":[],"mappings":"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"}
package/dist/module/page.d.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  import { Site } from './site';
2
2
  import { User } from './user';
3
+ import { PageSource } from "./pageSource";
4
+ import { PageRevision, PageRevisionCollection } from "./pageRevision";
3
5
  declare class SearchPagesQuery {
4
6
  pagetype?: string;
5
7
  category?: string;
@@ -24,15 +26,23 @@ declare class SearchPagesQuery {
24
26
  asDict(): Record<string, any>;
25
27
  }
26
28
  declare class PageCollection extends Array<Page> {
29
+ site: Site;
30
+ constructor(site: Site, pages?: Page[]);
27
31
  private static _parse;
28
32
  static searchPages(site: Site, query?: SearchPagesQuery): Promise<PageCollection>;
29
- static _acquirePageIds(pages: Page[]): Promise<Page[]>;
33
+ static _acquirePageIds(site: Site, pages: Page[]): Promise<Page[]>;
30
34
  getPageIds(): Promise<Page[]>;
35
+ static _acquirePageSources(site: Site, pages: Page[]): Promise<Page[]>;
36
+ getPageSources(): Promise<Page[]>;
37
+ static _acquirePageRevisions(site: Site, pages: Page[]): Promise<Page[]>;
38
+ getPageRevisions(): Promise<Page[]>;
31
39
  }
32
40
  declare class Page {
33
41
  site: Site;
34
42
  private _id?;
35
- constructor(site: Site, { fullname, name, category, title, children_count, comments_count, size, rating, votes, rating_percent, revisions, parent_fullname, tags, created_by, created_at, updated_by, updated_at, commented_by, commented_at }: {
43
+ private _source?;
44
+ private _revisions?;
45
+ constructor(site: Site, { fullname, name, category, title, children_count, comments_count, size, rating, votes, rating_percent, revisions_count, parent_fullname, tags, created_by, created_at, updated_by, updated_at, commented_by, commented_at }: {
36
46
  fullname: string;
37
47
  name: string;
38
48
  category: string;
@@ -43,7 +53,7 @@ declare class Page {
43
53
  rating: number | null;
44
54
  votes: number;
45
55
  rating_percent: number | null;
46
- revisions: number;
56
+ revisions_count: number;
47
57
  parent_fullname: string | null;
48
58
  tags: string[];
49
59
  created_by: User;
@@ -63,7 +73,7 @@ declare class Page {
63
73
  rating?: number;
64
74
  votes: number;
65
75
  ratingPercent?: number;
66
- revisions: number;
76
+ revisions_count: number;
67
77
  parentFullname?: string;
68
78
  tags: string[];
69
79
  createdBy: User;
@@ -76,6 +86,11 @@ declare class Page {
76
86
  get id(): Promise<number>;
77
87
  set id(value: number);
78
88
  isIdAcquired(): boolean;
89
+ get source(): Promise<PageSource>;
90
+ set source(value: PageSource);
91
+ get revisions(): Promise<PageRevisionCollection>;
92
+ set revisions(value: PageRevisionCollection);
93
+ latestRevision(): Promise<PageRevision>;
79
94
  destroy(): Promise<void>;
80
95
  }
81
96
  export { SearchPagesQuery, PageCollection, Page };
package/dist/module/page.js CHANGED
@@ -24,6 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.Page = exports.PageCollection = exports.SearchPagesQuery = void 0;
27
+ const pageSource_1 = require("./pageSource");
28
+ const pageRevision_1 = require("./pageRevision");
27
29
  const exceptions_1 = require("../common/exceptions");
28
30
  const user_1 = require("../util/parser/user");
29
31
  const parser_1 = require("../util/parser");
@@ -90,8 +92,12 @@ class SearchPagesQuery {
90
92
  }
91
93
  exports.SearchPagesQuery = SearchPagesQuery;
92
94
  class PageCollection extends Array {
95
+ constructor(site, pages = []) {
96
+ super(...pages);
97
+ this.site = site;
98
+ }
93
99
  static _parse(site, htmlBody) {
94
- const pages = new PageCollection();
100
+ const pages = [];
95
101
  for (const _pageElement of htmlBody("span.page").toArray()) {
96
102
  const pageElement = cheerio.load(_pageElement);
97
103
  const pageParams = {};
@@ -131,7 +137,7 @@ class PageCollection extends Array {
131
137
  if (key.endsWith("_linked")) {
132
138
  key = key.slice(0, -7);
133
139
  }
134
- else if (["comments", "children"].includes(key)) {
140
+ else if (["comments", "children", "revisions"].includes(key)) {
135
141
  key = `${key}_count`;
136
142
  }
137
143
  else if (key === "rating_votes") {
@@ -149,7 +155,7 @@ class PageCollection extends Array {
149
155
  // @ts-ignore
150
156
  pages.push(new Page(site, pageParams));
151
157
  }
152
- return pages;
158
+ return new PageCollection(site, pages);
153
159
  }
154
160
  static async searchPages(site, query = new SearchPagesQuery()) {
155
161
  const queryDict = query.asDict();
@@ -187,18 +193,18 @@ class PageCollection extends Array {
187
193
  const responses = await site.amcRequest(requestBodies);
188
194
  htmlBodies.push(...responses.map(response => cheerio.load(response.data.body)));
189
195
  }
190
- const pages = new PageCollection();
196
+ const pages = [];
191
197
  for (const htmlBody of htmlBodies) {
192
198
  pages.push(...PageCollection._parse(site, htmlBody));
193
199
  }
194
- return pages;
200
+ return new PageCollection(site, pages);
195
201
  }
196
- static async _acquirePageIds(pages) {
202
+ static async _acquirePageIds(site, pages) {
197
203
  const targetPages = pages.filter(page => !page.isIdAcquired());
198
204
  if (targetPages.length === 0) {
199
205
  return pages;
200
206
  }
201
- const responses = await util_1.RequestUtil.request(targetPages[0].site.client, "GET", targetPages.map(page => `${page.getUrl()}/norender/true/noredirect/true`));
207
+ const responses = await util_1.RequestUtil.request(site.client, "GET", targetPages.map(page => `${page.getUrl()}/norender/true/noredirect/true`));
202
208
  for (const [index, response] of responses.entries()) {
203
209
  // @ts-ignore
204
210
  const idMatch = response?.data.match(/WIKIREQUEST\.info\.pageId = (\d+);/);
@@ -211,12 +217,60 @@ class PageCollection extends Array {
211
217
  }
212
218
  // noinspection JSUnusedGlobalSymbols
213
219
  async getPageIds() {
214
- return await PageCollection._acquirePageIds(this);
220
+ return await PageCollection._acquirePageIds(this.site, this);
221
+ }
222
+ static async _acquirePageSources(site, pages) {
223
+ const requestBodies = await Promise.all(pages.map(async (page) => ({
224
+ moduleName: "viewsource/ViewSourceModule",
225
+ page_id: await page.id
226
+ })));
227
+ const responses = await site.amcRequest(requestBodies);
228
+ for (const [index, response] of responses.entries()) {
229
+ const page = pages[index];
230
+ const body = response.data.body;
231
+ const source = cheerio.load(body)("div.page-source").text().trim();
232
+ page.source = new pageSource_1.PageSource(page, source);
233
+ }
234
+ return pages;
235
+ }
236
+ async getPageSources() {
237
+ return await PageCollection._acquirePageSources(this.site, this);
238
+ }
239
+ static async _acquirePageRevisions(site, pages) {
240
+ if (pages.length === 0) {
241
+ return pages;
242
+ }
243
+ const responses = await site.amcRequest(await Promise.all(pages.map(async (page) => ({
244
+ moduleName: "history/PageRevisionListModule",
245
+ page_id: await page.id,
246
+ options: { all: true },
247
+ perpage: 100000000
248
+ }))));
249
+ for (const [index, response] of responses.entries()) {
250
+ const page = pages[index];
251
+ const body = response.data.body;
252
+ const revs = [];
253
+ const bodyHtml = cheerio.load(body);
254
+ for (const revElement of bodyHtml('tr[id^="revision-row-"]').toArray()) {
255
+ const revId = parseInt(cheerio.load(revElement)("tr").attr("id").slice(13), 10);
256
+ const tds = cheerio.load(revElement)("td");
257
+ const revNo = parseInt(tds.eq(0).text().trim().slice(0, -1), 10);
258
+ const created_by = (0, user_1.userParse)(site.client, tds.eq(4).find("span.printuser"));
259
+ const created_at = (0, parser_1.odateParse)(tds.eq(5).find("span.odate"));
260
+ const comment = tds.eq(6).text().trim();
261
+ revs.push(new pageRevision_1.PageRevision(page, revId, revNo, created_by, created_at, comment));
262
+ }
263
+ page.revisions = new pageRevision_1.PageRevisionCollection(page, revs);
264
+ }
265
+ return pages;
266
+ }
267
+ async getPageRevisions() {
268
+ return await PageCollection._acquirePageRevisions(this.site, this);
215
269
  }
216
270
  }
217
271
  exports.PageCollection = PageCollection;
218
272
  class Page {
219
- constructor(site, { fullname, name, category, title, children_count, comments_count, size, rating, votes, rating_percent, revisions, parent_fullname, tags, created_by, created_at, updated_by, updated_at, commented_by, commented_at }) {
273
+ constructor(site, { fullname, name, category, title, children_count, comments_count, size, rating, votes, rating_percent, revisions_count, parent_fullname, tags, created_by, created_at, updated_by, updated_at, commented_by, commented_at }) {
220
274
  this.site = site;
221
275
  this.fullname = fullname;
222
276
  this.name = name;
@@ -228,7 +282,7 @@ class Page {
228
282
  this.rating = rating ?? undefined;
229
283
  this.votes = votes;
230
284
  this.ratingPercent = rating_percent ?? undefined;
231
- this.revisions = revisions;
285
+ this.revisions_count = revisions_count;
232
286
  this.parentFullname = parent_fullname ?? undefined;
233
287
  this.tags = tags;
234
288
  this.createdBy = created_by;
@@ -243,7 +297,7 @@ class Page {
243
297
  }
244
298
  get id() {
245
299
  if (this._id === undefined) {
246
- return PageCollection._acquirePageIds([this]).then(() => this._id);
300
+ return PageCollection._acquirePageIds(this.site, [this]).then(() => this._id);
247
301
  }
248
302
  else {
249
303
  return Promise.resolve(this._id);
@@ -255,6 +309,29 @@ class Page {
255
309
  isIdAcquired() {
256
310
  return this._id !== undefined;
257
311
  }
312
+ get source() {
313
+ if (this._source === undefined) {
314
+ return PageCollection._acquirePageSources(this.site, [this]).then(() => this._source);
315
+ }
316
+ return Promise.resolve(this._source);
317
+ }
318
+ set source(value) {
319
+ this._source = value;
320
+ }
321
+ get revisions() {
322
+ if (this._revisions === undefined) {
323
+ return PageCollection._acquirePageRevisions(this.site, [this]).then(() => this._revisions);
324
+ }
325
+ return Promise.resolve(this._revisions);
326
+ }
327
+ set revisions(value) {
328
+ this._revisions = value;
329
+ }
330
+ async latestRevision() {
331
+ // revision_countとrev_noが一致するものを取得
332
+ const revisions = await this.revisions;
333
+ return revisions.find(revision => revision.revNo === this.revisions_count);
334
+ }
258
335
  async destroy() {
259
336
  this.site.client.loginCheck();
260
337
  await this.site.amcRequest([{
package/dist/module/page.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/module/page.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/module/page.ts"],"names":[],"mappings":"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"}
package/dist/module/pageRevision.d.ts ADDED
@@ -0,0 +1,29 @@
1
+ import { Page } from "./page";
2
+ import { AbstractUser } from "./user";
3
+ import { PageSource } from "./pageSource";
4
+ declare class PageRevisionCollection extends Array<PageRevision> {
5
+ page: Page;
6
+ constructor(page: Page, revisions: PageRevision[]);
7
+ static _acquireSources(page: Page, revisions: PageRevision[]): Promise<PageRevision[]>;
8
+ getSources(): Promise<PageRevision[]>;
9
+ static _acquireHTMLs(page: Page, revisions: PageRevision[]): Promise<PageRevision[]>;
10
+ getHTMLs(): Promise<PageRevision[]>;
11
+ }
12
+ declare class PageRevision {
13
+ page: Page;
14
+ id: number;
15
+ revNo: number;
16
+ createdBy: AbstractUser;
17
+ createdAt: Date;
18
+ comment: string;
19
+ _source: PageSource | null;
20
+ _html: string | null;
21
+ constructor(page: Page, id: number, revNo: number, createdBy: AbstractUser, createdAt: Date, comment: string, _source?: PageSource | null, _html?: string | null);
22
+ isSourceAcquired(): boolean;
23
+ isHTMLAcquired(): boolean;
24
+ get source(): Promise<PageSource>;
25
+ set source(value: PageSource);
26
+ get html(): Promise<string>;
27
+ set html(value: string);
28
+ }
29
+ export { PageRevisionCollection, PageRevision };
package/dist/module/pageRevision.js ADDED
@@ -0,0 +1,114 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.PageRevision = exports.PageRevisionCollection = void 0;
27
+ const pageSource_1 = require("./pageSource");
28
+ const util_1 = require("../util");
29
+ const cheerio = __importStar(require("cheerio"));
30
+ class PageRevisionCollection extends Array {
31
+ constructor(page, revisions) {
32
+ super(...revisions);
33
+ this.page = page;
34
+ }
35
+ static async _acquireSources(page, revisions) {
36
+ const targetRevisions = [...revisions].filter(revision => !revision.isSourceAcquired());
37
+ if (targetRevisions.length === 0) {
38
+ return revisions;
39
+ }
40
+ const responses = await page.site.amcRequest(targetRevisions.map(revision => ({
41
+ moduleName: 'history/PageSourceModule',
42
+ revision_id: revision.id
43
+ })));
44
+ for (let i = 0; i < targetRevisions.length; i++) {
45
+ const revision = targetRevisions[i];
46
+ const response = responses[i];
47
+ revision.source = new pageSource_1.PageSource(page, cheerio.load(response.data.body)('div.page-source').text().trim());
48
+ }
49
+ return revisions;
50
+ }
51
+ async getSources() {
52
+ return await PageRevisionCollection._acquireSources(this.page, this);
53
+ }
54
+ static async _acquireHTMLs(page, revisions) {
55
+ const targetRevisions = [...revisions].filter(revision => !revision.isHTMLAcquired());
56
+ if (targetRevisions.length === 0) {
57
+ return revisions;
58
+ }
59
+ const responses = await page.site.amcRequest(targetRevisions.map(revision => ({
60
+ moduleName: 'history/PageVersionModule',
61
+ revision_id: revision.id
62
+ })));
63
+ for (let i = 0; i < targetRevisions.length; i++) {
64
+ const revision = targetRevisions[i];
65
+ const response = responses[i];
66
+ const source = response.data.body;
67
+ const _source = util_1.StringUtil.split(source, 'onclick="document.getElementById(\'page-version-info\').style.display=\'none\'">', 1)[1];
68
+ revision._html = util_1.StringUtil.split(_source, '</a>\n\t</div>\n\n\n\n', 1)[1].trim();
69
+ }
70
+ return revisions;
71
+ }
72
+ async getHTMLs() {
73
+ return await PageRevisionCollection._acquireHTMLs(this.page, this);
74
+ }
75
+ }
76
+ exports.PageRevisionCollection = PageRevisionCollection;
77
+ class PageRevision {
78
+ constructor(page, id, revNo, createdBy, createdAt, comment, _source = null, _html = null) {
79
+ this.page = page;
80
+ this.id = id;
81
+ this.revNo = revNo;
82
+ this.createdBy = createdBy;
83
+ this.createdAt = createdAt;
84
+ this.comment = comment;
85
+ this._source = _source;
86
+ this._html = _html;
87
+ }
88
+ isSourceAcquired() {
89
+ return this._source !== null;
90
+ }
91
+ isHTMLAcquired() {
92
+ return this._html !== null;
93
+ }
94
+ get source() {
95
+ if (!this.isSourceAcquired()) {
96
+ return PageRevisionCollection._acquireSources(this.page, [this]).then(() => this._source);
97
+ }
98
+ return Promise.resolve(this._source);
99
+ }
100
+ set source(value) {
101
+ this._source = value;
102
+ }
103
+ get html() {
104
+ if (!this.isHTMLAcquired()) {
105
+ return PageRevisionCollection._acquireHTMLs(this.page, [this]).then(() => this._html);
106
+ }
107
+ return Promise.resolve(this._html);
108
+ }
109
+ set html(value) {
110
+ this._html = value;
111
+ }
112
+ }
113
+ exports.PageRevision = PageRevision;
114
+ //# sourceMappingURL=pageRevision.js.map
package/dist/module/pageRevision.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pageRevision.js","sourceRoot":"","sources":["../../src/module/pageRevision.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6CAAwC;AACxC,kCAAmC;AAEnC,iDAAmC;AAEnC,MAAM,sBAAuB,SAAQ,KAAmB;IACpD,YACW,IAAU,EACjB,SAAyB;QAEzB,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC;QAHb,SAAI,GAAJ,IAAI,CAAM;IAIrB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,IAAU,EAAE,SAAyB;QAC9D,MAAM,eAAe,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAExF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CACxC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC7B,UAAU,EAAE,0BAA0B;YACtC,WAAW,EAAE,QAAQ,CAAC,EAAE;SAC3B,CAAC,CAAC,CACN,CAAC;QAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;YACpC,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAC9B,QAAQ,CAAC,MAAM,GAAG,IAAI,uBAAU,CAC5B,IAAI,EACJ,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CACpE,CAAC;QACN,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,OAAO,MAAM,sBAAsB,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,IAAU,EAAE,SAAyB;QAC5D,MAAM,eAAe,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;QAEtF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CACxC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC7B,UAAU,EAAE,2BAA2B;YACvC,WAAW,EAAE,QAAQ,CAAC,EAAE;SAC3B,CAAC,CAAC,CACN,CAAA;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;YACpC,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;YAClC,MAAM,OAAO,GAAG,iBAAU,CAAC,KAAK,CAAC,MAAM,EAAE,kFAAkF,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnI,QAAQ,CAAC,KAAK,GAAG,iBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,wBAAwB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACtF,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,QAAQ;QACV,OAAO,MAAM,sBAAsB,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACvE,CAAC;CACJ;AA8CO,wDAAsB;AA5C9B,MAAM,YAAY;IACd,YACW,IAAU,EACV,EAAU,EACV,KAAa,EACb,SAAuB,EACvB,SAAe,EACf,OAAe,EACf,UAA6B,IAAI,EACjC,QAAuB,IAAI;QAP3B,SAAI,GAAJ,IAAI,CAAM;QACV,OAAE,GAAF,EAAE,CAAQ;QACV,UAAK,GAAL,KAAK,CAAQ;QACb,cAAS,GAAT,SAAS,CAAc;QACvB,cAAS,GAAT,SAAS,CAAM;QACf,YAAO,GAAP,OAAO,CAAQ;QACf,YAAO,GAAP,OAAO,CAA0B;QACjC,UAAK,GAAL,KAAK,CAAsB;IAEtC,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IACjC,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC;IAC/B,CAAC;IAED,IAAI,MAAM;QACN,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAC3B,OAAO,sBAAsB,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAQ,CAAC,CAAC;QAC/F,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,MAAM,CAAC,KAAiB;QACxB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,IAAI,IAAI;QACJ,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;YACzB,OAAO,sBAAsB,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,IAAI,CAAC,KAAa;QAClB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;CACJ;AAE+B,oCAAY"}
package/dist/module/pageSource.d.ts ADDED
@@ -0,0 +1,7 @@
1
+ import { Page } from "./page";
2
+ declare class PageSource {
3
+ private page;
4
+ wikiText: string;
5
+ constructor(page: Page, wikiText: string);
6
+ }
7
+ export { PageSource };
package/dist/module/pageSource.js ADDED
@@ -0,0 +1,11 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.PageSource = void 0;
4
+ class PageSource {
5
+ constructor(page, wikiText) {
6
+ this.page = page;
7
+ this.wikiText = wikiText;
8
+ }
9
+ }
10
+ exports.PageSource = PageSource;
11
+ //# sourceMappingURL=pageSource.js.map
package/dist/module/pageSource.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pageSource.js","sourceRoot":"","sources":["../../src/module/pageSource.ts"],"names":[],"mappings":";;;AAEA,MAAM,UAAU;IAIZ,YAAY,IAAU,EAAE,QAAgB;QACpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;CACJ;AAEO,gCAAU"}
package/dist/util/stringUtil.d.ts CHANGED
@@ -16,5 +16,6 @@ declare class StringUtil {
16
16
  * @since 1.0.0
17
17
  */
18
18
  static toUnix: (targetStr: string) => string;
19
+ static split: (targetStr: string, separator: string, maxSplit: number) => string[];
19
20
  }
20
21
  export { StringUtil };
package/dist/util/stringUtil.js CHANGED
@@ -44,4 +44,21 @@ StringUtil.toUnix = (targetStr) => {
44
44
  targetStr = targetStr.replace(/:$/, '');
45
45
  return targetStr;
46
46
  };
47
+ StringUtil.split = (targetStr, separator, maxSplit) => {
48
+ const result = [];
49
+ let currentStr = targetStr;
50
+ let splitCount = 0;
51
+ let splitIndex = 0;
52
+ while (splitCount < maxSplit) {
53
+ splitIndex = currentStr.indexOf(separator);
54
+ if (splitIndex === -1) {
55
+ break;
56
+ }
57
+ result.push(currentStr.substring(0, splitIndex));
58
+ currentStr = currentStr.substring(splitIndex + separator.length);
59
+ splitCount++;
60
+ }
61
+ result.push(currentStr);
62
+ return result;
63
+ };
47
64
  //# sourceMappingURL=stringUtil.js.map
package/dist/util/stringUtil.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stringUtil.js","sourceRoot":"","sources":["../../src/util/stringUtil.ts"],"names":[],"mappings":";;;AAAA,mCAAuC;AAEvC;;;;;;;GAOG;AACH,MAAM,UAAU;;AAuCR,gCAAU;AAtCd;;;;;;;GAOG;AACW,iBAAM,GAAG,CAAC,SAAiB,EAAU,EAAE;IACjD,iCAAiC;IAEjC,OAAO;IACP,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;IAE9E,gBAAgB;IAChB,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IAEpC,gBAAgB;IAChB,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACrD,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC1C,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAC/C,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC7C,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC7C,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEzC,aAAa;IACb,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACxC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAExC,OAAO,SAAS,CAAC;AACrB,CAAC,CAAA"}
1
+ {"version":3,"file":"stringUtil.js","sourceRoot":"","sources":["../../src/util/stringUtil.ts"],"names":[],"mappings":";;;AAAA,mCAAuC;AAEvC;;;;;;;GAOG;AACH,MAAM,UAAU;;AAyDR,gCAAU;AAxDd;;;;;;;GAOG;AACW,iBAAM,GAAG,CAAC,SAAiB,EAAU,EAAE;IACjD,iCAAiC;IAEjC,OAAO;IACP,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;IAE9E,gBAAgB;IAChB,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IAEpC,gBAAgB;IAChB,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACrD,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC1C,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAC/C,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC7C,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC7C,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEzC,aAAa;IACb,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACxC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAExC,OAAO,SAAS,CAAC;AACrB,CAAC,CAAA;AAEa,gBAAK,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAE,QAAgB,EAAY,EAAE;IACvF,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,UAAU,GAAG,SAAS,CAAC;IAC3B,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,OAAO,UAAU,GAAG,QAAQ,EAAE,CAAC;QAC3B,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC3C,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;YACpB,MAAM;QACV,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QACjD,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QACjE,UAAU,EAAE,CAAC;IACjB,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxB,OAAO,MAAM,CAAC;AAClB,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ukwhatn/wikidot",
3
- "version": "1.0.6",
3
+ "version": "1.0.8",
4
4
  "description": "Library for requesting data to Wikidot",
5
5
  "homepage": "https://github.com/ukwhatn/wikidot-ts",
6
6
  "bugs": {