@ukwhatn/wikidot 1.0.9 → 1.0.10
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.
- package/.eslintrc.js +23 -0
- package/.github/dependabot.yml +12 -0
- package/.prettierrc +6 -0
- package/Makefile +13 -2
- package/dist/common/exceptions.d.ts +1 -1
- package/dist/common/exceptions.js.map +1 -1
- package/dist/common/index.js.map +1 -1
- package/dist/common/logger.js.map +1 -1
- package/dist/connector/ajax.d.ts +1 -1
- package/dist/connector/ajax.js +7 -6
- package/dist/connector/ajax.js.map +1 -1
- package/dist/connector/api.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/module/auth.js +6 -3
- package/dist/module/auth.js.map +1 -1
- package/dist/module/client.js +1 -2
- package/dist/module/client.js.map +1 -1
- package/dist/module/page.d.ts +4 -4
- package/dist/module/page.js +88 -81
- package/dist/module/page.js.map +1 -1
- package/dist/module/pageRevision.d.ts +3 -3
- package/dist/module/pageRevision.js +7 -7
- package/dist/module/pageRevision.js.map +1 -1
- package/dist/module/pageSource.d.ts +1 -1
- package/dist/module/pageSource.js.map +1 -1
- package/dist/module/pageVote.d.ts +2 -2
- package/dist/module/pageVote.js.map +1 -1
- package/dist/module/privateMessage.js +15 -11
- package/dist/module/privateMessage.js.map +1 -1
- package/dist/module/site.js +6 -4
- package/dist/module/site.js.map +1 -1
- package/dist/module/siteApplication.js +10 -6
- package/dist/module/siteApplication.js.map +1 -1
- package/dist/module/user.js +7 -7
- package/dist/module/user.js.map +1 -1
- package/dist/util/index.js.map +1 -1
- package/dist/util/parser/index.d.ts +1 -1
- package/dist/util/parser/odate.js +1 -1
- package/dist/util/parser/odate.js.map +1 -1
- package/dist/util/parser/user.d.ts +1 -1
- package/dist/util/parser/user.js.map +1 -1
- package/dist/util/quickModule.js +2 -2
- package/dist/util/quickModule.js.map +1 -1
- package/dist/util/requestUtil.js.map +1 -1
- package/dist/util/stringUtil.js.map +1 -1
- package/dist/util/table/charTable.js +466 -466
- package/dist/util/table/charTable.js.map +1 -1
- package/dist/util/table/index.d.ts +1 -1
- package/dist/util/table/index.js.map +1 -1
- package/package.json +18 -4
package/.eslintrc.js
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
module.exports = {
|
|
2
|
+
env: {
|
|
3
|
+
browser: true,
|
|
4
|
+
es6: true
|
|
5
|
+
},
|
|
6
|
+
extends: [
|
|
7
|
+
"eslint:recommended",
|
|
8
|
+
"plugin:@typescript-eslint/recommended",
|
|
9
|
+
"prettier"
|
|
10
|
+
],
|
|
11
|
+
plugins: [
|
|
12
|
+
"@typescript-eslint"
|
|
13
|
+
],
|
|
14
|
+
parser: "@typescript-eslint/parser",
|
|
15
|
+
parserOptions: {
|
|
16
|
+
"sourceType": "module",
|
|
17
|
+
project: "./tsconfig.json"
|
|
18
|
+
},
|
|
19
|
+
root: true,
|
|
20
|
+
rules: {
|
|
21
|
+
'@typescript-eslint/no-explicit-any': 'off',
|
|
22
|
+
}
|
|
23
|
+
}
|
package/.prettierrc
ADDED
package/Makefile
CHANGED
|
@@ -1,13 +1,24 @@
|
|
|
1
|
+
init:
|
|
2
|
+
npm install --dev
|
|
3
|
+
npx husky-init
|
|
4
|
+
npx husky add .husky/pre-commit "npm run lint && npm run fix"
|
|
5
|
+
|
|
1
6
|
release_from-develop:
|
|
2
7
|
gh pr create --base main --head develop --title "Release v$(version)" --body "Released: v$(version)"
|
|
3
8
|
gh pr merge --auto
|
|
4
9
|
gh release create $(version) --target main --latest --generate-notes --title "$(version)"
|
|
5
10
|
|
|
6
|
-
|
|
11
|
+
post-release:
|
|
7
12
|
rm -rf dist
|
|
8
13
|
git add .
|
|
9
14
|
git commit -m 'release: $(version)'
|
|
10
15
|
git push origin develop
|
|
11
16
|
make release_from-develop version=$(version)
|
|
12
17
|
|
|
13
|
-
|
|
18
|
+
lint:
|
|
19
|
+
npx eslint --fix 'src/**/*.{js,ts}'
|
|
20
|
+
|
|
21
|
+
prettier:
|
|
22
|
+
npx prettier --write 'src/**/*.{js,ts}'
|
|
23
|
+
|
|
24
|
+
PHONY: release_from-develop post-release lint prettier
|
|
@@ -92,4 +92,4 @@ declare class TargetErrorException extends WikidotException {
|
|
|
92
92
|
declare class ForbiddenException extends WikidotException {
|
|
93
93
|
constructor(message: string);
|
|
94
94
|
}
|
|
95
|
-
export { WikidotException, UnexpectedException, SessionCreateException, LoginRequiredException, AjaxModuleConnectorException, AMCHttpStatusCodeException, WikidotStatusCodeException, ResponseDataException, NotFoundException, TargetErrorException, ForbiddenException };
|
|
95
|
+
export { WikidotException, UnexpectedException, SessionCreateException, LoginRequiredException, AjaxModuleConnectorException, AMCHttpStatusCodeException, WikidotStatusCodeException, ResponseDataException, NotFoundException, TargetErrorException, ForbiddenException, };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../../src/common/exceptions.ts"],"names":[],"mappings":";AAAA,MAAM;AACN,QAAQ;AACR,MAAM;;;AAEN;;;;GAIG;AACH,MAAM,gBAAiB,SAAQ,KAAK;IAChC,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../../src/common/exceptions.ts"],"names":[],"mappings":";AAAA,MAAM;AACN,QAAQ;AACR,MAAM;;;AAEN;;;;GAIG;AACH,MAAM,gBAAiB,SAAQ,KAAK;IAChC,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;CACJ;AA2IG,4CAAgB;AAzIpB,MAAM;AACN,UAAU;AACV,MAAM;AAEN;;;;GAIG;AACH,MAAM,mBAAoB,SAAQ,gBAAgB;IAC9C,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;CACJ;AA6HG,kDAAmB;AA3HvB,MAAM;AACN,UAAU;AACV,MAAM;AAEN;;;;GAIG;AACH,MAAM,sBAAuB,SAAQ,gBAAgB;IACjD,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;CACJ;AA+GG,wDAAsB;AA7G1B;;;;GAIG;AACH,MAAM,sBAAuB,SAAQ,gBAAgB;IACjD,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;CACJ;AAqGG,wDAAsB;AAnG1B,MAAM;AACN,QAAQ;AACR,MAAM;AAEN;;;;GAIG;AACH,MAAM,4BAA6B,SAAQ,gBAAgB;IACvD,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;CACJ;AAuFG,oEAA4B;AArFhC;;;;;GAKG;AACH,MAAM,0BAA2B,SAAQ,4BAA4B;IACjE,YACI,OAAe,EACC,UAAkB;QAElC,KAAK,CAAC,OAAO,CAAC,CAAA;QAFE,eAAU,GAAV,UAAU,CAAQ;IAGtC,CAAC;CACJ;AAyEG,gEAA0B;AAvE9B;;;;;;;GAOG;AACH,MAAM,0BAA2B,SAAQ,4BAA4B;IACjE,YACI,OAAe,EACC,UAAkB;QAElC,KAAK,CAAC,OAAO,CAAC,CAAA;QAFE,eAAU,GAAV,UAAU,CAAQ;IAGtC,CAAC;CACJ;AAyDG,gEAA0B;AAvD9B;;;;GAIG;AACH,MAAM,qBAAsB,SAAQ,4BAA4B;IAC5D,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;CACJ;AA+CG,sDAAqB;AA7CzB,MAAM;AACN,aAAa;AACb,MAAM;AAEN;;;;GAIG;AACH,MAAM,iBAAkB,SAAQ,gBAAgB;IAC5C,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;CACJ;AAiCG,8CAAiB;AA/BrB;;;;GAIG;AACH,MAAM,oBAAqB,SAAQ,gBAAgB;IAC/C,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;CACJ;AAuBG,oDAAoB;AArBxB;;;;GAIG;AACH,MAAM,kBAAmB,SAAQ,gBAAgB;IAC7C,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;CACJ;AAaG,gDAAkB"}
|
package/dist/common/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AAAxB,gGAAA,MAAM,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAE7B,WAAW;AACX,SAAS,WAAW,CAAC,OAAe,SAAS,EAAE,QAAgB,OAAO;IAClE,OAAO,iBAAO,CAAC,YAAY,CAAC;QACxB,KAAK;QACL,MAAM,EAAE,iBAAO,CAAC,MAAM,CAAC,OAAO,CAC1B,iBAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAC1B,iBAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;YACpD,OAAO,GAAG,SAAS,KAAK,IAAI,IAAI,KAAK,KAAK,OAAO,EAAE,CAAA;QACvD,CAAC,CAAC,CACL;QACD,UAAU,EAAE,CAAC,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;KACjD,CAAC,CAAA;AACN,CAAC;AAEY,QAAA,MAAM,GAAG,WAAW,EAAE,CAAA"}
|
package/dist/connector/ajax.d.ts
CHANGED
|
@@ -139,4 +139,4 @@ declare class AjaxModuleConnectorClient {
|
|
|
139
139
|
*/
|
|
140
140
|
request: (bodies: Record<string, any>[], returnExceptions?: boolean, siteName?: string, siteSSLSupported?: boolean) => Promise<(Error | AxiosResponse)[]>;
|
|
141
141
|
}
|
|
142
|
-
export { AjaxModuleConnectorClient, AjaxModuleConnectorConfig, AjaxRequestHeader
|
|
142
|
+
export { AjaxModuleConnectorClient, AjaxModuleConnectorConfig, AjaxRequestHeader };
|
package/dist/connector/ajax.js
CHANGED
|
@@ -78,7 +78,9 @@ class AjaxRequestHeader {
|
|
|
78
78
|
'Content-Type': this.contentType,
|
|
79
79
|
'User-Agent': this.userAgent,
|
|
80
80
|
Referer: this.referer,
|
|
81
|
-
Cookie: Object.entries(this.cookie)
|
|
81
|
+
Cookie: Object.entries(this.cookie)
|
|
82
|
+
.map(([name, value]) => `${name}=${value};`)
|
|
83
|
+
.join(''),
|
|
82
84
|
};
|
|
83
85
|
}
|
|
84
86
|
}
|
|
@@ -148,9 +150,7 @@ class AjaxModuleConnectorClient {
|
|
|
148
150
|
throw new exceptions_1.NotFoundException(`Site is not found: ${this.siteName}.wikidot.com`);
|
|
149
151
|
}
|
|
150
152
|
// 301リダイレクトが発生し、かつhttpsにリダイレクトされている場合はSSL対応していると判断
|
|
151
|
-
return (response.status === 301 &&
|
|
152
|
-
response.headers['location'] &&
|
|
153
|
-
response.headers['location'].startsWith('https'));
|
|
153
|
+
return (response.status === 301 && response.headers['location'] && response.headers['location'].startsWith('https'));
|
|
154
154
|
};
|
|
155
155
|
/**
|
|
156
156
|
* @method request
|
|
@@ -168,7 +168,7 @@ class AjaxModuleConnectorClient {
|
|
|
168
168
|
this.request = async (bodies, returnExceptions = false, siteName, siteSSLSupported) => {
|
|
169
169
|
// 初期化が完了するまで待つ
|
|
170
170
|
while (!this.isInitialized) {
|
|
171
|
-
await new Promise(resolve => setTimeout(resolve, 100));
|
|
171
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
172
172
|
}
|
|
173
173
|
const _siteName = siteName ?? this.siteName;
|
|
174
174
|
const _siteSSLSupported = siteSSLSupported ?? this.sslSupported;
|
|
@@ -190,7 +190,7 @@ class AjaxModuleConnectorClient {
|
|
|
190
190
|
if (config && config.retryCount < config.retryLimit) {
|
|
191
191
|
// リトライ回数をインクリメント、リトライ間隔分待機してから再リクエスト
|
|
192
192
|
config.retryCount++;
|
|
193
|
-
await new Promise(resolve => setTimeout(resolve, this.config.retryInterval * 1000));
|
|
193
|
+
await new Promise((resolve) => setTimeout(resolve, this.config.retryInterval * 1000));
|
|
194
194
|
return axiosClient.request(config);
|
|
195
195
|
}
|
|
196
196
|
// リトライ回数が上限に達した場合はエラーを送出
|
|
@@ -198,6 +198,7 @@ class AjaxModuleConnectorClient {
|
|
|
198
198
|
});
|
|
199
199
|
const requestPromises = bodies.map(async (body) => {
|
|
200
200
|
let retryCount = 0;
|
|
201
|
+
// eslint-disable-next-line no-constant-condition
|
|
201
202
|
while (true) {
|
|
202
203
|
// Mutexで同時実行数制御
|
|
203
204
|
await this.semaphore.acquire();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ajax.js","sourceRoot":"","sources":["../../src/connector/ajax.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"ajax.js","sourceRoot":"","sources":["../../src/connector/ajax.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/connector/api.ts"],"names":[],"mappings":";;;AAAA,MAAa,OAAO;IAChB;;;;;OAKG;IACH,YACoB,KAAa,EACb,KAAa;QADb,UAAK,GAAL,KAAK,CAAQ;QACb,UAAK,GAAL,KAAK,CAAQ;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/connector/api.ts"],"names":[],"mappings":";;;AAAA,MAAa,OAAO;IAChB;;;;;OAKG;IACH,YACoB,KAAa,EACb,KAAa;QADb,UAAK,GAAL,KAAK,CAAQ;QACb,UAAK,GAAL,KAAK,CAAQ;IAC9B,CAAC;CACP;AAXD,0BAWC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,0CAAwC;AAA/B,gGAAA,MAAM,OAAA"}
|
package/dist/module/auth.js
CHANGED
|
@@ -30,7 +30,8 @@ class SessionCreateException extends Error {
|
|
|
30
30
|
exports.SessionCreateException = SessionCreateException;
|
|
31
31
|
class HTTPAuthentication {
|
|
32
32
|
static async login(client, username, password) {
|
|
33
|
-
await axios_1.default
|
|
33
|
+
await axios_1.default
|
|
34
|
+
.post('https://www.wikidot.com/default--flow/login__LoginPopupScreen', {
|
|
34
35
|
login: username,
|
|
35
36
|
password: password,
|
|
36
37
|
action: 'Login2Action',
|
|
@@ -38,7 +39,8 @@ class HTTPAuthentication {
|
|
|
38
39
|
}, {
|
|
39
40
|
headers: client.amcClient.header.getHeader(),
|
|
40
41
|
timeout: 20000,
|
|
41
|
-
})
|
|
42
|
+
})
|
|
43
|
+
.then((response) => {
|
|
42
44
|
if (response.status !== 200) {
|
|
43
45
|
throw new SessionCreateException('Login attempt is failed due to HTTP status code: ' + response.status);
|
|
44
46
|
}
|
|
@@ -50,7 +52,8 @@ class HTTPAuthentication {
|
|
|
50
52
|
throw new SessionCreateException('Login attempt is failed due to invalid cookies');
|
|
51
53
|
}
|
|
52
54
|
client.amcClient.header.setCookie('WIKIDOT_SESSION_ID', wikidotSessionId.split(';')[0].split('=')[1]);
|
|
53
|
-
})
|
|
55
|
+
})
|
|
56
|
+
.catch((error) => {
|
|
54
57
|
if (error instanceof axios_1.AxiosError) {
|
|
55
58
|
throw new SessionCreateException('Login attempt is failed due to HTTP error: ' + error.message);
|
|
56
59
|
}
|
package/dist/module/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/module/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/module/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAyC;AAGzC,MAAM,sBAAuB,SAAQ,KAAK;CAAG;AAgEhB,wDAAsB;AA9DnD,MAAM,kBAAkB;IACpB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,QAAgB,EAAE,QAAgB;QACjE,MAAM,eAAK;aACN,IAAI,CACD,+DAA+D,EAC/D;YACI,KAAK,EAAE,QAAQ;YACf,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,cAAc;YACtB,KAAK,EAAE,OAAO;SACjB,EACD;YACI,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE;YAC5C,OAAO,EAAE,KAAK;SACjB,CACJ;aACA,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACf,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC1B,MAAM,IAAI,sBAAsB,CAC5B,mDAAmD,GAAG,QAAQ,CAAC,MAAM,CACxE,CAAA;YACL,CAAC;YAED,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,qCAAqC,CAAC,EAAE,CAAC;gBAChE,MAAM,IAAI,sBAAsB,CAAC,6DAA6D,CAAC,CAAA;YACnG,CAAC;YAED,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC,MAAc,EAAE,EAAE,CAC7E,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAC3C,CAAA;YAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACpB,MAAM,IAAI,sBAAsB,CAAC,gDAAgD,CAAC,CAAA;YACtF,CAAC;YAED,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACzG,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,IAAI,KAAK,YAAY,kBAAU,EAAE,CAAC;gBAC9B,MAAM,IAAI,sBAAsB,CAAC,6CAA6C,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;YACnG,CAAC;YACD,MAAM,KAAK,CAAA;QACf,CAAC,CAAC,CAAA;IACV,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAc;QAC9B,IAAI,CAAC;YACD,MAAM,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;gBAC3B;oBACI,MAAM,EAAE,cAAc;oBACtB,KAAK,EAAE,QAAQ;oBACf,UAAU,EAAE,OAAO;iBACtB;aACJ,CAAC,CAAA;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,eAAe;QACnB,CAAC;QAED,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAA;IAC9D,CAAC;CACJ;AAEQ,gDAAkB"}
|
package/dist/module/client.js
CHANGED
|
@@ -82,8 +82,7 @@ class Client {
|
|
|
82
82
|
loginCheck() {
|
|
83
83
|
while (!this.isInitialized) {
|
|
84
84
|
// Wait for initialization
|
|
85
|
-
setTimeout(() => {
|
|
86
|
-
}, 1000);
|
|
85
|
+
setTimeout(() => { }, 1000);
|
|
87
86
|
}
|
|
88
87
|
if (!this.isLoggedIn) {
|
|
89
88
|
throw new exceptions_1.LoginRequiredException('Login is required to execute this function');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/module/client.ts"],"names":[],"mappings":";;;AAAA,
|
|
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,8 +1,8 @@
|
|
|
1
1
|
import { Site } from './site';
|
|
2
2
|
import { User } from './user';
|
|
3
|
-
import { PageSource } from
|
|
4
|
-
import { PageRevision, PageRevisionCollection } from
|
|
5
|
-
import { PageVoteCollection } from
|
|
3
|
+
import { PageSource } from './pageSource';
|
|
4
|
+
import { PageRevision, PageRevisionCollection } from './pageRevision';
|
|
5
|
+
import { PageVoteCollection } from './pageVote';
|
|
6
6
|
declare class SearchPagesQuery {
|
|
7
7
|
pagetype?: string;
|
|
8
8
|
category?: string;
|
|
@@ -46,7 +46,7 @@ declare class Page {
|
|
|
46
46
|
private _source?;
|
|
47
47
|
private _revisions?;
|
|
48
48
|
private _votes?;
|
|
49
|
-
constructor(site: Site, { fullname, name, category, title, children_count, comments_count, size, rating, votes_count, rating_percent, revisions_count, parent_fullname, tags, created_by, created_at, updated_by, updated_at, commented_by, commented_at }: {
|
|
49
|
+
constructor(site: Site, { fullname, name, category, title, children_count, comments_count, size, rating, votes_count, rating_percent, revisions_count, parent_fullname, tags, created_by, created_at, updated_by, updated_at, commented_by, commented_at, }: {
|
|
50
50
|
fullname: string;
|
|
51
51
|
name: string;
|
|
52
52
|
category: string;
|