@redocly/cli 0.0.0-snapshot.1744801622 → 0.0.0-snapshot.1747233324
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/README.md +2 -2
- package/bin/cli.js +1 -1
- package/lib/auth/device-flow.d.ts +1 -0
- package/lib/auth/device-flow.d.ts.map +1 -0
- package/lib/auth/device-flow.js +15 -17
- package/lib/auth/device-flow.js.map +1 -0
- package/lib/auth/oauth-client.d.ts +1 -0
- package/lib/auth/oauth-client.d.ts.map +1 -0
- package/lib/auth/oauth-client.js +21 -23
- package/lib/auth/oauth-client.js.map +1 -0
- package/lib/commands/auth.d.ts +3 -5
- package/lib/commands/auth.d.ts.map +1 -0
- package/lib/commands/auth.js +19 -44
- package/lib/commands/auth.js.map +1 -0
- package/lib/commands/build-docs/index.d.ts +3 -2
- package/lib/commands/build-docs/index.d.ts.map +1 -0
- package/lib/commands/build-docs/index.js +24 -24
- package/lib/commands/build-docs/index.js.map +1 -0
- package/lib/commands/build-docs/types.d.ts +2 -1
- package/lib/commands/build-docs/types.d.ts.map +1 -0
- package/lib/commands/build-docs/types.js +2 -2
- package/lib/commands/build-docs/types.js.map +1 -0
- package/lib/commands/build-docs/utils.d.ts +2 -1
- package/lib/commands/build-docs/utils.d.ts.map +1 -0
- package/lib/commands/build-docs/utils.js +33 -36
- package/lib/commands/build-docs/utils.js.map +1 -0
- package/lib/commands/bundle.d.ts +6 -3
- package/lib/commands/bundle.d.ts.map +1 -0
- package/lib/commands/bundle.js +31 -32
- package/lib/commands/bundle.js.map +1 -0
- package/lib/commands/eject.d.ts +3 -2
- package/lib/commands/eject.d.ts.map +1 -0
- package/lib/commands/eject.js +11 -13
- package/lib/commands/eject.js.map +1 -0
- package/lib/commands/join.d.ts +3 -2
- package/lib/commands/join.d.ts.map +1 -0
- package/lib/commands/join.js +71 -72
- package/lib/commands/join.js.map +1 -0
- package/lib/commands/lint.d.ts +7 -5
- package/lib/commands/lint.d.ts.map +1 -0
- package/lib/commands/lint.js +33 -37
- package/lib/commands/lint.js.map +1 -0
- package/lib/commands/preview-project/constants.d.ts +2 -1
- package/lib/commands/preview-project/constants.d.ts.map +1 -0
- package/lib/commands/preview-project/constants.js +4 -6
- package/lib/commands/preview-project/constants.js.map +1 -0
- package/lib/commands/preview-project/index.d.ts +3 -2
- package/lib/commands/preview-project/index.d.ts.map +1 -0
- package/lib/commands/preview-project/index.js +21 -23
- package/lib/commands/preview-project/index.js.map +1 -0
- package/lib/commands/preview-project/types.d.ts +3 -2
- package/lib/commands/preview-project/types.d.ts.map +1 -0
- package/lib/commands/preview-project/types.js +2 -2
- package/lib/commands/preview-project/types.js.map +1 -0
- package/lib/commands/split/index.d.ts +4 -3
- package/lib/commands/split/index.d.ts.map +1 -0
- package/lib/commands/split/index.js +53 -57
- package/lib/commands/split/index.js.map +1 -0
- package/lib/commands/split/types.d.ts +2 -2
- package/lib/commands/split/types.d.ts.map +1 -0
- package/lib/commands/split/types.js +11 -13
- package/lib/commands/split/types.js.map +1 -0
- package/lib/commands/stats.d.ts +3 -2
- package/lib/commands/stats.d.ts.map +1 -0
- package/lib/commands/stats.js +21 -23
- package/lib/commands/stats.js.map +1 -0
- package/lib/commands/translations.d.ts +3 -2
- package/lib/commands/translations.d.ts.map +1 -0
- package/lib/commands/translations.js +11 -13
- package/lib/commands/translations.js.map +1 -0
- package/lib/index.d.ts +2 -1
- package/lib/index.d.ts.map +1 -0
- package/lib/index.js +64 -231
- package/lib/index.js.map +1 -0
- package/lib/otel.d.ts +2 -1
- package/lib/otel.d.ts.map +1 -0
- package/lib/otel.js +17 -20
- package/lib/otel.js.map +1 -0
- package/lib/reunite/api/api-client.d.ts +4 -3
- package/lib/reunite/api/api-client.d.ts.map +1 -0
- package/lib/reunite/api/api-client.js +14 -20
- package/lib/reunite/api/api-client.js.map +1 -0
- package/lib/reunite/api/api-keys.d.ts +2 -1
- package/lib/reunite/api/api-keys.d.ts.map +1 -0
- package/lib/reunite/api/api-keys.js +4 -20
- package/lib/reunite/api/api-keys.js.map +1 -0
- package/lib/reunite/api/domains.d.ts +5 -2
- package/lib/reunite/api/domains.d.ts.map +1 -0
- package/lib/reunite/api/domains.js +6 -15
- package/lib/reunite/api/domains.js.map +1 -0
- package/lib/reunite/api/index.d.ts +4 -3
- package/lib/reunite/api/index.d.ts.map +1 -0
- package/lib/reunite/api/index.js +4 -19
- package/lib/reunite/api/index.js.map +1 -0
- package/lib/reunite/api/types.d.ts +1 -0
- package/lib/reunite/api/types.d.ts.map +1 -0
- package/lib/reunite/api/types.js +2 -2
- package/lib/reunite/api/types.js.map +1 -0
- package/lib/reunite/commands/push-status.d.ts +6 -5
- package/lib/reunite/commands/push-status.d.ts.map +1 -0
- package/lib/reunite/commands/push-status.js +31 -37
- package/lib/reunite/commands/push-status.js.map +1 -0
- package/lib/reunite/commands/push.d.ts +6 -6
- package/lib/reunite/commands/push.d.ts.map +1 -0
- package/lib/reunite/commands/push.js +31 -40
- package/lib/reunite/commands/push.js.map +1 -0
- package/lib/reunite/commands/utils.d.ts +3 -2
- package/lib/reunite/commands/utils.d.ts.map +1 -0
- package/lib/reunite/commands/utils.js +9 -12
- package/lib/reunite/commands/utils.js.map +1 -0
- package/lib/reunite/utils.d.ts +1 -0
- package/lib/reunite/utils.d.ts.map +1 -0
- package/lib/reunite/utils.js +2 -5
- package/lib/reunite/utils.js.map +1 -0
- package/lib/types.d.ts +15 -26
- package/lib/types.d.ts.map +1 -0
- package/lib/types.js +2 -5
- package/lib/types.js.map +1 -0
- package/lib/utils/assert-node-version.d.ts +1 -0
- package/lib/utils/assert-node-version.d.ts.map +1 -0
- package/lib/utils/assert-node-version.js +8 -10
- package/lib/utils/assert-node-version.js.map +1 -0
- package/lib/utils/error.d.ts +4 -0
- package/lib/utils/error.d.ts.map +1 -0
- package/lib/utils/error.js +8 -0
- package/lib/utils/error.js.map +1 -0
- package/lib/utils/fetch-with-timeout.d.ts +1 -0
- package/lib/utils/fetch-with-timeout.d.ts.map +1 -0
- package/lib/utils/fetch-with-timeout.js +6 -8
- package/lib/utils/fetch-with-timeout.js.map +1 -0
- package/lib/utils/getCommandNameFromArgs.d.ts +1 -0
- package/lib/utils/getCommandNameFromArgs.d.ts.map +1 -0
- package/lib/utils/getCommandNameFromArgs.js +2 -4
- package/lib/utils/getCommandNameFromArgs.js.map +1 -0
- package/lib/utils/js-utils.d.ts +1 -0
- package/lib/utils/js-utils.d.ts.map +1 -0
- package/lib/utils/js-utils.js +8 -12
- package/lib/utils/js-utils.js.map +1 -0
- package/lib/utils/miscellaneous.d.ts +4 -12
- package/lib/utils/miscellaneous.d.ts.map +1 -0
- package/lib/utils/miscellaneous.js +126 -168
- package/lib/utils/miscellaneous.js.map +1 -0
- package/lib/utils/package.d.ts +2 -0
- package/lib/utils/package.d.ts.map +1 -0
- package/lib/utils/package.js +4 -0
- package/lib/utils/package.js.map +1 -0
- package/lib/utils/platform.d.ts +1 -0
- package/lib/utils/platform.d.ts.map +1 -0
- package/lib/utils/platform.js +5 -9
- package/lib/utils/platform.js.map +1 -0
- package/lib/utils/proxy-agent.d.ts +3 -0
- package/lib/utils/proxy-agent.d.ts.map +1 -0
- package/lib/utils/proxy-agent.js +6 -0
- package/lib/utils/proxy-agent.js.map +1 -0
- package/lib/utils/spinner.d.ts +1 -0
- package/lib/utils/spinner.d.ts.map +1 -0
- package/lib/utils/spinner.js +8 -10
- package/lib/utils/spinner.js.map +1 -0
- package/lib/utils/update-version-notifier.d.ts +1 -1
- package/lib/utils/update-version-notifier.d.ts.map +1 -0
- package/lib/utils/update-version-notifier.js +35 -38
- package/lib/utils/update-version-notifier.js.map +1 -0
- package/lib/wrapper.d.ts +3 -3
- package/lib/wrapper.d.ts.map +1 -0
- package/lib/wrapper.js +26 -20
- package/lib/wrapper.js.map +1 -0
- package/package.json +15 -16
- package/lib/__mocks__/@redocly/openapi-core.d.ts +0 -99
- package/lib/__mocks__/@redocly/openapi-core.js +0 -84
- package/lib/__mocks__/documents.d.ts +0 -150
- package/lib/__mocks__/documents.js +0 -123
- package/lib/__mocks__/fs.d.ts +0 -8
- package/lib/__mocks__/fs.js +0 -9
- package/lib/__mocks__/perf_hooks.d.ts +0 -3
- package/lib/__mocks__/perf_hooks.js +0 -6
- package/lib/__mocks__/redoc.d.ts +0 -6
- package/lib/__mocks__/redoc.js +0 -5
- package/lib/__tests__/commands/build-docs.test.d.ts +0 -1
- package/lib/__tests__/commands/build-docs.test.js +0 -54
- package/lib/__tests__/commands/bundle.test.d.ts +0 -1
- package/lib/__tests__/commands/bundle.test.js +0 -235
- package/lib/__tests__/commands/join.test.d.ts +0 -1
- package/lib/__tests__/commands/join.test.js +0 -274
- package/lib/__tests__/commands/lint.test.d.ts +0 -1
- package/lib/__tests__/commands/lint.test.js +0 -149
- package/lib/__tests__/commands/push-region.test.d.ts +0 -1
- package/lib/__tests__/commands/push-region.test.js +0 -90
- package/lib/__tests__/commands/push.test.d.ts +0 -1
- package/lib/__tests__/commands/push.test.js +0 -496
- package/lib/__tests__/fetch-with-timeout.test.d.ts +0 -1
- package/lib/__tests__/fetch-with-timeout.test.js +0 -64
- package/lib/__tests__/fixtures/config.d.ts +0 -21
- package/lib/__tests__/fixtures/config.js +0 -24
- package/lib/__tests__/spinner.test.d.ts +0 -1
- package/lib/__tests__/spinner.test.js +0 -43
- package/lib/__tests__/utils.test.d.ts +0 -1
- package/lib/__tests__/utils.test.js +0 -651
- package/lib/__tests__/wrapper.test.d.ts +0 -1
- package/lib/__tests__/wrapper.test.js +0 -76
- package/lib/auth/__tests__/device-flow.test.d.ts +0 -1
- package/lib/auth/__tests__/device-flow.test.js +0 -62
- package/lib/auth/__tests__/oauth-client.test.d.ts +0 -1
- package/lib/auth/__tests__/oauth-client.test.js +0 -93
- package/lib/commands/preview-docs/index.d.ts +0 -12
- package/lib/commands/preview-docs/index.js +0 -127
- package/lib/commands/preview-docs/preview-server/default.hbs +0 -24
- package/lib/commands/preview-docs/preview-server/hot.js +0 -59
- package/lib/commands/preview-docs/preview-server/oauth2-redirect.html +0 -21
- package/lib/commands/preview-docs/preview-server/preview-server.d.ts +0 -5
- package/lib/commands/preview-docs/preview-server/preview-server.js +0 -113
- package/lib/commands/preview-docs/preview-server/server.d.ts +0 -22
- package/lib/commands/preview-docs/preview-server/server.js +0 -85
- package/lib/commands/push.d.ts +0 -44
- package/lib/commands/push.js +0 -301
- package/lib/commands/split/__tests__/index.test.d.ts +0 -1
- package/lib/commands/split/__tests__/index.test.js +0 -91
- package/lib/reunite/api/__tests__/api-keys.test.d.ts +0 -1
- package/lib/reunite/api/__tests__/api-keys.test.js +0 -26
- package/lib/reunite/api/__tests__/api.client.test.d.ts +0 -1
- package/lib/reunite/api/__tests__/api.client.test.js +0 -337
- package/lib/reunite/api/__tests__/domains.test.d.ts +0 -1
- package/lib/reunite/api/__tests__/domains.test.js +0 -32
- package/lib/reunite/commands/__tests__/push-status.test.d.ts +0 -1
- package/lib/reunite/commands/__tests__/push-status.test.js +0 -563
- package/lib/reunite/commands/__tests__/push.test.d.ts +0 -1
- package/lib/reunite/commands/__tests__/push.test.js +0 -315
- package/lib/reunite/commands/__tests__/utils.test.d.ts +0 -1
- package/lib/reunite/commands/__tests__/utils.test.js +0 -51
- package/lib/utils/__mocks__/miscellaneous.d.ts +0 -43
- package/lib/utils/__mocks__/miscellaneous.js +0 -24
package/README.md
CHANGED
|
@@ -16,7 +16,7 @@ Supports OpenAPI 3.1, 3.0 and OpenAPI 2.0 (legacy Swagger), AsyncAPI 3.0 and 2.6
|
|
|
16
16
|
### Node
|
|
17
17
|
|
|
18
18
|
```sh
|
|
19
|
-
npx @redocly/cli@
|
|
19
|
+
npx @redocly/cli@latest lint path-to-root-file.yaml
|
|
20
20
|
```
|
|
21
21
|
|
|
22
22
|
Alternatively, install it globally with `npm`:
|
|
@@ -31,7 +31,7 @@ Then you can use it as `redocly [command] [options]`, for example:
|
|
|
31
31
|
redocly lint path-to-root-file.yaml
|
|
32
32
|
```
|
|
33
33
|
|
|
34
|
-
The minimum required versions of Node.js and NPM are
|
|
34
|
+
The minimum required versions of Node.js and NPM are 22.12.0 and 10.9.2 respectively.
|
|
35
35
|
|
|
36
36
|
### Docker
|
|
37
37
|
|
package/bin/cli.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-flow.d.ts","sourceRoot":"","sources":["../../src/auth/device-flow.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,qBAAa,sBAAsB;IAGrB,OAAO,CAAC,OAAO;IAAU,OAAO,CAAC,UAAU;IAAU,OAAO,CAAC,OAAO;IAFhF,OAAO,CAAC,SAAS,CAAmB;gBAEhB,OAAO,EAAE,MAAM,EAAU,UAAU,EAAE,MAAM,EAAU,OAAO,EAAE,MAAM;IAIlF,GAAG;IA0BT,OAAO,CAAC,WAAW;IAeb,WAAW,CAAC,WAAW,EAAE,MAAM;IAY/B,YAAY,CAAC,MAAM,EAAE,MAAM;IAW3B,YAAY,CAAC,YAAY,EAAE,MAAM;;;;;YAiBzB,kBAAkB;YA4BlB,cAAc;YAQd,aAAa;YAsBb,WAAW;CAiB1B"}
|
package/lib/auth/device-flow.js
CHANGED
|
@@ -1,28 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const api_client_1 = require("../reunite/api/api-client");
|
|
7
|
-
class RedoclyOAuthDeviceFlow {
|
|
1
|
+
import { blue, green } from 'colorette';
|
|
2
|
+
import * as childProcess from 'node:child_process';
|
|
3
|
+
import { logger } from '@redocly/openapi-core';
|
|
4
|
+
import { ReuniteApiClient } from '../reunite/api/api-client.js';
|
|
5
|
+
export class RedoclyOAuthDeviceFlow {
|
|
8
6
|
constructor(baseUrl, clientName, version) {
|
|
9
7
|
this.baseUrl = baseUrl;
|
|
10
8
|
this.clientName = clientName;
|
|
11
9
|
this.version = version;
|
|
12
|
-
this.apiClient = new
|
|
10
|
+
this.apiClient = new ReuniteApiClient(this.version, 'login');
|
|
13
11
|
}
|
|
14
12
|
async run() {
|
|
15
13
|
const code = await this.getDeviceCode();
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
14
|
+
logger.output('Attempting to automatically open the SSO authorization page in your default browser.\n');
|
|
15
|
+
logger.output('If the browser does not open or you wish to use a different device to authorize this request, open the following URL:\n\n');
|
|
16
|
+
logger.output(blue(code.verificationUri));
|
|
17
|
+
logger.output(`\n\n`);
|
|
18
|
+
logger.output(`Then enter the code:\n\n`);
|
|
19
|
+
logger.output(blue(code.userCode));
|
|
20
|
+
logger.output(`\n\n`);
|
|
23
21
|
this.openBrowser(code.verificationUriComplete);
|
|
24
22
|
const accessToken = await this.pollingAccessToken(code.deviceCode, code.interval, code.expiresIn);
|
|
25
|
-
|
|
23
|
+
logger.output(green('✅ Logged in\n\n'));
|
|
26
24
|
return accessToken;
|
|
27
25
|
}
|
|
28
26
|
openBrowser(url) {
|
|
@@ -130,4 +128,4 @@ class RedoclyOAuthDeviceFlow {
|
|
|
130
128
|
return await response.json();
|
|
131
129
|
}
|
|
132
130
|
}
|
|
133
|
-
|
|
131
|
+
//# sourceMappingURL=device-flow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-flow.js","sourceRoot":"","sources":["../../src/auth/device-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-client.d.ts","sourceRoot":"","sources":["../../src/auth/oauth-client.ts"],"names":[],"mappings":"AAWA,qBAAa,kBAAkB;IAKjB,OAAO,CAAC,UAAU;IAAU,OAAO,CAAC,OAAO;IAJvD,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,QAAQ,CAAkB;gBAEd,UAAU,EAAE,MAAM,EAAU,OAAO,EAAE,MAAM;IAuBzD,KAAK,CAAC,OAAO,EAAE,MAAM;IAUrB,MAAM;IAQN,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;YA4BrC,SAAS;YAUT,SAAS;YAUT,WAAW;CAM1B"}
|
package/lib/auth/oauth-client.js
CHANGED
|
@@ -1,33 +1,31 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const node_buffer_1 = require("node:buffer");
|
|
9
|
-
const device_flow_1 = require("./device-flow");
|
|
1
|
+
import { homedir } from 'node:os';
|
|
2
|
+
import * as path from 'node:path';
|
|
3
|
+
import { mkdirSync, existsSync, writeFileSync, readFileSync, rmSync } from 'node:fs';
|
|
4
|
+
import * as crypto from 'node:crypto';
|
|
5
|
+
import { Buffer } from 'node:buffer';
|
|
6
|
+
import { logger } from '@redocly/openapi-core';
|
|
7
|
+
import { RedoclyOAuthDeviceFlow } from './device-flow.js';
|
|
10
8
|
const SALT = '4618dbc9-8aed-4e27-aaf0-225f4603e5a4';
|
|
11
9
|
const CRYPTO_ALGORITHM = 'aes-256-cbc';
|
|
12
|
-
class RedoclyOAuthClient {
|
|
10
|
+
export class RedoclyOAuthClient {
|
|
13
11
|
constructor(clientName, version) {
|
|
14
12
|
this.clientName = clientName;
|
|
15
13
|
this.version = version;
|
|
16
|
-
this.dir = path.join(
|
|
17
|
-
if (!
|
|
18
|
-
|
|
14
|
+
this.dir = path.join(homedir(), '.redocly');
|
|
15
|
+
if (!existsSync(this.dir)) {
|
|
16
|
+
mkdirSync(this.dir);
|
|
19
17
|
}
|
|
20
18
|
const homeDirPath = process.env.HOME;
|
|
21
19
|
const hash = crypto.createHash('sha256');
|
|
22
20
|
hash.update(`${homeDirPath}${SALT}`);
|
|
23
21
|
const hashHex = hash.digest('hex');
|
|
24
|
-
const key =
|
|
25
|
-
const iv =
|
|
22
|
+
const key = Buffer.alloc(32, Buffer.from(hashHex).toString('base64')).toString();
|
|
23
|
+
const iv = Buffer.alloc(16, Buffer.from(process.env.HOME).toString('base64')).toString();
|
|
26
24
|
this.cipher = crypto.createCipheriv(CRYPTO_ALGORITHM, key, iv);
|
|
27
25
|
this.decipher = crypto.createDecipheriv(CRYPTO_ALGORITHM, key, iv);
|
|
28
26
|
}
|
|
29
27
|
async login(baseUrl) {
|
|
30
|
-
const deviceFlow = new
|
|
28
|
+
const deviceFlow = new RedoclyOAuthDeviceFlow(baseUrl, this.clientName, this.version);
|
|
31
29
|
const token = await deviceFlow.run();
|
|
32
30
|
if (!token) {
|
|
33
31
|
throw new Error('Failed to login');
|
|
@@ -43,7 +41,7 @@ class RedoclyOAuthClient {
|
|
|
43
41
|
}
|
|
44
42
|
}
|
|
45
43
|
async isAuthorized(baseUrl, apiKey) {
|
|
46
|
-
const deviceFlow = new
|
|
44
|
+
const deviceFlow = new RedoclyOAuthDeviceFlow(baseUrl, this.clientName, this.version);
|
|
47
45
|
if (apiKey) {
|
|
48
46
|
return await deviceFlow.verifyApiKey(apiKey);
|
|
49
47
|
}
|
|
@@ -67,15 +65,15 @@ class RedoclyOAuthClient {
|
|
|
67
65
|
async saveToken(token) {
|
|
68
66
|
try {
|
|
69
67
|
const encrypted = this.cipher.update(JSON.stringify(token), 'utf8', 'hex') + this.cipher.final('hex');
|
|
70
|
-
|
|
68
|
+
writeFileSync(path.join(this.dir, 'auth.json'), encrypted);
|
|
71
69
|
}
|
|
72
70
|
catch (error) {
|
|
73
|
-
|
|
71
|
+
logger.error(`Error saving tokens: ${error}`);
|
|
74
72
|
}
|
|
75
73
|
}
|
|
76
74
|
async readToken() {
|
|
77
75
|
try {
|
|
78
|
-
const token =
|
|
76
|
+
const token = readFileSync(path.join(this.dir, 'auth.json'), 'utf8');
|
|
79
77
|
const decrypted = this.decipher.update(token, 'hex', 'utf8') + this.decipher.final('utf8');
|
|
80
78
|
return decrypted ? JSON.parse(decrypted) : null;
|
|
81
79
|
}
|
|
@@ -85,9 +83,9 @@ class RedoclyOAuthClient {
|
|
|
85
83
|
}
|
|
86
84
|
async removeToken() {
|
|
87
85
|
const tokenPath = path.join(this.dir, 'auth.json');
|
|
88
|
-
if (
|
|
89
|
-
|
|
86
|
+
if (existsSync(tokenPath)) {
|
|
87
|
+
rmSync(tokenPath);
|
|
90
88
|
}
|
|
91
89
|
}
|
|
92
90
|
}
|
|
93
|
-
|
|
91
|
+
//# sourceMappingURL=oauth-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-client.js","sourceRoot":"","sources":["../../src/auth/oauth-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACrF,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAkB,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1E,MAAM,IAAI,GAAG,sCAAsC,CAAC;AACpD,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAEvC,MAAM,OAAO,kBAAkB;IAK7B,YAAoB,UAAkB,EAAU,OAAe;QAA3C,eAAU,GAAV,UAAU,CAAQ;QAAU,YAAO,GAAP,OAAO,CAAQ;QAC7D,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,IAAc,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,GAAG,WAAW,GAAG,IAAI,EAAE,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEnC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CACtB,EAAE,EACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACxC,CAAC,QAAQ,EAAsB,CAAC;QACjC,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CACrB,EAAE,EACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAc,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAC3D,CAAC,QAAQ,EAAuB,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAe;QACzB,MAAM,UAAU,GAAG,IAAI,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAEtF,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,CAAC;QACrC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,MAAM;QACV,IAAI,CAAC;YACH,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,aAAa;QACf,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAe,EAAE,MAAe;QACjD,MAAM,UAAU,GAAG,IAAI,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAEtF,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACrC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,kBAAkB,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAE5E,IAAI,kBAAkB,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACpE,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,KAAgB;QACtC,IAAI,CAAC;YACH,MAAM,SAAS,GACb,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtF,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,SAAS,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,wBAAwB,KAAK,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC;YACrE,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3F,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAClD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACnD,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1B,MAAM,CAAC,SAAS,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;CACF"}
|
package/lib/commands/auth.d.ts
CHANGED
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
import type { CommandArgs } from '../wrapper';
|
|
2
|
-
export declare function promptClientToken(domain: string): Promise<string>;
|
|
1
|
+
import type { CommandArgs } from '../wrapper.js';
|
|
3
2
|
export type LoginOptions = {
|
|
4
|
-
verbose?: boolean;
|
|
5
3
|
residency?: string;
|
|
6
4
|
config?: string;
|
|
7
|
-
next?: boolean;
|
|
8
5
|
};
|
|
9
|
-
export declare function handleLogin({ argv,
|
|
6
|
+
export declare function handleLogin({ argv, version }: CommandArgs<LoginOptions>): Promise<void>;
|
|
10
7
|
export type LogoutOptions = {
|
|
11
8
|
config?: string;
|
|
12
9
|
};
|
|
13
10
|
export declare function handleLogout({ version }: CommandArgs<LogoutOptions>): Promise<void>;
|
|
11
|
+
//# sourceMappingURL=auth.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,YAAY,CAAC,iBAa7E;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,YAAY,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,aAAa,CAAC,iBAKzE"}
|
package/lib/commands/auth.js
CHANGED
|
@@ -1,51 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
const api_1 = require("../reunite/api");
|
|
11
|
-
function promptClientToken(domain) {
|
|
12
|
-
return (0, miscellaneous_1.promptUser)((0, colorette_1.green)(`\n 🔑 Copy your API key from ${(0, colorette_1.blue)(`https://app.${domain}/profile`)} and paste it below`) + (0, colorette_1.yellow)(' (if you want to log in with Reunite, please run `redocly login --next` instead)'), true);
|
|
13
|
-
}
|
|
14
|
-
async function handleLogin({ argv, config, version }) {
|
|
15
|
-
if (argv.next) {
|
|
16
|
-
try {
|
|
17
|
-
const reuniteUrl = (0, api_1.getReuniteUrl)(argv.residency);
|
|
18
|
-
const oauthClient = new oauth_client_1.RedoclyOAuthClient('redocly-cli', version);
|
|
19
|
-
await oauthClient.login(reuniteUrl);
|
|
20
|
-
}
|
|
21
|
-
catch {
|
|
22
|
-
if (argv.residency) {
|
|
23
|
-
const reuniteUrl = (0, api_1.getReuniteUrl)(argv.residency);
|
|
24
|
-
(0, miscellaneous_1.exitWithError)(`❌ Connection to ${reuniteUrl} failed.`);
|
|
25
|
-
}
|
|
26
|
-
else {
|
|
27
|
-
(0, miscellaneous_1.exitWithError)(`❌ Login failed. Please check your credentials and try again.`);
|
|
28
|
-
}
|
|
29
|
-
}
|
|
1
|
+
import { logger } from '@redocly/openapi-core';
|
|
2
|
+
import { exitWithError } from '../utils/error.js';
|
|
3
|
+
import { RedoclyOAuthClient } from '../auth/oauth-client.js';
|
|
4
|
+
import { getReuniteUrl } from '../reunite/api/index.js';
|
|
5
|
+
export async function handleLogin({ argv, version }) {
|
|
6
|
+
try {
|
|
7
|
+
const reuniteUrl = getReuniteUrl(argv.residency);
|
|
8
|
+
const oauthClient = new RedoclyOAuthClient('redocly-cli', version);
|
|
9
|
+
await oauthClient.login(reuniteUrl);
|
|
30
10
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const
|
|
34
|
-
|
|
35
|
-
const clientToken = await promptClientToken(client.domain);
|
|
36
|
-
process.stdout.write((0, colorette_1.gray)('\n Logging in...\n'));
|
|
37
|
-
await client.login(clientToken, argv.verbose);
|
|
38
|
-
process.stdout.write((0, colorette_1.green)(' Authorization confirmed. ✅\n\n'));
|
|
11
|
+
catch {
|
|
12
|
+
if (argv.residency) {
|
|
13
|
+
const reuniteUrl = getReuniteUrl(argv.residency);
|
|
14
|
+
exitWithError(`❌ Connection to ${reuniteUrl} failed.`);
|
|
39
15
|
}
|
|
40
|
-
|
|
41
|
-
(
|
|
16
|
+
else {
|
|
17
|
+
exitWithError(`❌ Login failed. Please check your credentials and try again.`);
|
|
42
18
|
}
|
|
43
19
|
}
|
|
44
20
|
}
|
|
45
|
-
async function handleLogout({ version }) {
|
|
46
|
-
const
|
|
47
|
-
client.logout();
|
|
48
|
-
const oauthClient = new oauth_client_1.RedoclyOAuthClient('redocly-cli', version);
|
|
21
|
+
export async function handleLogout({ version }) {
|
|
22
|
+
const oauthClient = new RedoclyOAuthClient('redocly-cli', version);
|
|
49
23
|
oauthClient.logout();
|
|
50
|
-
|
|
24
|
+
logger.output('Logged out from the Redocly account. ✋ \n');
|
|
51
25
|
}
|
|
26
|
+
//# sourceMappingURL=auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AASxD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAA6B;IAC5E,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,IAAI,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACnE,MAAM,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACjD,aAAa,CAAC,mBAAmB,UAAU,UAAU,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,8DAA8D,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;AACH,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,EAAE,OAAO,EAA8B;IACxE,MAAM,WAAW,GAAG,IAAI,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACnE,WAAW,CAAC,MAAM,EAAE,CAAC;IAErB,MAAM,CAAC,MAAM,CAAC,2CAA2C,CAAC,CAAC;AAC7D,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import type { BuildDocsArgv } from './types';
|
|
2
|
-
import type { CommandArgs } from '../../wrapper';
|
|
1
|
+
import type { BuildDocsArgv } from './types.js';
|
|
2
|
+
import type { CommandArgs } from '../../wrapper.js';
|
|
3
3
|
export declare const handlerBuildCommand: ({ argv, config: configFromFile, collectSpecData, }: CommandArgs<BuildDocsArgv>) => Promise<void>;
|
|
4
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/build-docs/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAIpD,eAAO,MAAM,mBAAmB,uDAI7B,WAAW,CAAC,aAAa,CAAC,kBAyC5B,CAAC"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const
|
|
11
|
-
const handlerBuildCommand = async ({ argv, config: configFromFile, collectSpecData, }) => {
|
|
12
|
-
const startedAt =
|
|
13
|
-
const config =
|
|
14
|
-
const apis = await
|
|
1
|
+
import { createRequire } from 'node:module';
|
|
2
|
+
import { dirname, resolve } from 'node:path';
|
|
3
|
+
import { writeFileSync, mkdirSync } from 'node:fs';
|
|
4
|
+
import { default as redoc } from 'redoc';
|
|
5
|
+
import { performance } from 'node:perf_hooks';
|
|
6
|
+
import { getMergedConfig, isAbsoluteUrl, logger } from '@redocly/openapi-core';
|
|
7
|
+
import { getObjectOrJSON, getPageHTML } from './utils.js';
|
|
8
|
+
import { getExecutionTime, getFallbackApisOrExit } from '../../utils/miscellaneous.js';
|
|
9
|
+
import { exitWithError } from '../../utils/error.js';
|
|
10
|
+
const packageJson = createRequire(import.meta.url ?? __dirname)('../../../package.json');
|
|
11
|
+
export const handlerBuildCommand = async ({ argv, config: configFromFile, collectSpecData, }) => {
|
|
12
|
+
const startedAt = performance.now();
|
|
13
|
+
const config = getMergedConfig(configFromFile, argv.api);
|
|
14
|
+
const apis = await getFallbackApisOrExit(argv.api ? [argv.api] : [], config);
|
|
15
15
|
const { path: pathToApi } = apis[0];
|
|
16
16
|
const options = {
|
|
17
17
|
output: argv.o,
|
|
@@ -19,21 +19,21 @@ const handlerBuildCommand = async ({ argv, config: configFromFile, collectSpecDa
|
|
|
19
19
|
disableGoogleFont: argv.disableGoogleFont,
|
|
20
20
|
templateFileName: argv.template,
|
|
21
21
|
templateOptions: argv.templateOptions || {},
|
|
22
|
-
redocOptions:
|
|
22
|
+
redocOptions: getObjectOrJSON(argv.theme?.openapi, config),
|
|
23
23
|
};
|
|
24
|
-
const redocCurrentVersion =
|
|
24
|
+
const redocCurrentVersion = packageJson.dependencies.redoc;
|
|
25
25
|
try {
|
|
26
|
-
const elapsed =
|
|
27
|
-
const api = await
|
|
26
|
+
const elapsed = getExecutionTime(startedAt);
|
|
27
|
+
const api = await redoc.loadAndBundleSpec(isAbsoluteUrl(pathToApi) ? pathToApi : resolve(pathToApi));
|
|
28
28
|
collectSpecData?.(api);
|
|
29
|
-
const pageHTML = await
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
const pageHTML = await getPageHTML(api, pathToApi, { ...options, redocCurrentVersion }, argv.config);
|
|
30
|
+
mkdirSync(dirname(options.output), { recursive: true });
|
|
31
|
+
writeFileSync(options.output, pageHTML);
|
|
32
32
|
const sizeInKiB = Math.ceil(Buffer.byteLength(pageHTML) / 1024);
|
|
33
|
-
|
|
33
|
+
logger.info(`\n🎉 bundled successfully in: ${options.output} (${sizeInKiB} KiB) [⏱ ${elapsed}].\n`);
|
|
34
34
|
}
|
|
35
35
|
catch (e) {
|
|
36
|
-
|
|
36
|
+
exitWithError(e);
|
|
37
37
|
}
|
|
38
38
|
};
|
|
39
|
-
|
|
39
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/build-docs/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { VerifyConfigOptions } from '../../types';
|
|
1
|
+
import type { VerifyConfigOptions } from '../../types.js';
|
|
2
2
|
export type BuildDocsOptions = {
|
|
3
3
|
watch?: boolean;
|
|
4
4
|
output?: string;
|
|
@@ -21,3 +21,4 @@ export type BuildDocsArgv = {
|
|
|
21
21
|
openapi: string | Record<string, unknown>;
|
|
22
22
|
};
|
|
23
23
|
} & VerifyConfigOptions;
|
|
24
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/commands/build-docs/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,KAAK,EAAE;QACL,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC3C,CAAC;CACH,GAAG,mBAAmB,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
export {};
|
|
2
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/build-docs/types.ts"],"names":[],"mappings":""}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { Config } from '@redocly/openapi-core';
|
|
2
|
-
import type { BuildDocsOptions } from './types';
|
|
2
|
+
import type { BuildDocsOptions } from './types.js';
|
|
3
3
|
export declare function getObjectOrJSON(openapiOptions: string | Record<string, unknown>, config: Config): JSON | Record<string, unknown> | Config;
|
|
4
4
|
export declare function getPageHTML(api: any, pathToApi: string, { title, disableGoogleFont, templateFileName, templateOptions, redocOptions, redocCurrentVersion, }: BuildDocsOptions, configPath?: string): Promise<string>;
|
|
5
5
|
export declare function sanitizeJSONString(str: string): string;
|
|
6
6
|
export declare function escapeClosingScriptTag(str: string): string;
|
|
7
7
|
export declare function escapeUnicode(str: string): string;
|
|
8
|
+
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/commands/build-docs/utils.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAMnD,wBAAgB,eAAe,CAC7B,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChD,MAAM,EAAE,MAAM,GACb,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CA4BzC;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,EACjB,EACE,KAAK,EACL,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,YAAiB,EACjB,mBAAmB,GACpB,EAAE,gBAAgB,EACnB,UAAU,CAAC,EAAE,MAAM,mBAmCpB;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAGD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1D;AAGD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD"}
|
|
@@ -1,62 +1,58 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
const colorette_1 = require("colorette");
|
|
16
|
-
const openapi_core_1 = require("@redocly/openapi-core");
|
|
17
|
-
const miscellaneous_1 = require("../../utils/miscellaneous");
|
|
18
|
-
function getObjectOrJSON(openapiOptions, config) {
|
|
1
|
+
import { createElement } from 'react';
|
|
2
|
+
import { default as redoc } from 'redoc';
|
|
3
|
+
import { renderToString } from 'react-dom/server';
|
|
4
|
+
import { ServerStyleSheet } from 'styled-components';
|
|
5
|
+
import { default as handlebars } from 'handlebars';
|
|
6
|
+
import * as path from 'node:path';
|
|
7
|
+
import { existsSync, lstatSync, readFileSync } from 'node:fs';
|
|
8
|
+
import { isAbsoluteUrl, logger } from '@redocly/openapi-core';
|
|
9
|
+
import * as url from 'node:url';
|
|
10
|
+
import { exitWithError } from '../../utils/error.js';
|
|
11
|
+
const __internalDirname = import.meta.url
|
|
12
|
+
? path.dirname(url.fileURLToPath(import.meta.url))
|
|
13
|
+
: __dirname;
|
|
14
|
+
export function getObjectOrJSON(openapiOptions, config) {
|
|
19
15
|
switch (typeof openapiOptions) {
|
|
20
16
|
case 'object':
|
|
21
17
|
return openapiOptions;
|
|
22
18
|
case 'string':
|
|
23
19
|
try {
|
|
24
|
-
if (
|
|
25
|
-
return JSON.parse(
|
|
20
|
+
if (existsSync(openapiOptions) && lstatSync(openapiOptions).isFile()) {
|
|
21
|
+
return JSON.parse(readFileSync(openapiOptions, 'utf-8'));
|
|
26
22
|
}
|
|
27
23
|
else {
|
|
28
24
|
return JSON.parse(openapiOptions);
|
|
29
25
|
}
|
|
30
26
|
}
|
|
31
27
|
catch (e) {
|
|
32
|
-
|
|
33
|
-
|
|
28
|
+
logger.error(`Encountered error:\n\n${openapiOptions}\n\nis neither a file with a valid JSON object neither a stringified JSON object.`);
|
|
29
|
+
exitWithError(e);
|
|
34
30
|
}
|
|
35
31
|
break;
|
|
36
32
|
default: {
|
|
37
33
|
if (config) {
|
|
38
|
-
|
|
39
|
-
return config.theme.openapi ? config.theme.openapi : {};
|
|
34
|
+
logger.info(`Found ${config.configFile} and using theme.openapi options\n`);
|
|
35
|
+
return config.theme.openapi ? config.theme.openapi : {}; // FIXME: theme is deprecated (2.0)
|
|
40
36
|
}
|
|
41
37
|
return {};
|
|
42
38
|
}
|
|
43
39
|
}
|
|
44
40
|
return {};
|
|
45
41
|
}
|
|
46
|
-
async function getPageHTML(api, pathToApi, { title, disableGoogleFont, templateFileName, templateOptions, redocOptions = {}, redocCurrentVersion, }, configPath) {
|
|
47
|
-
|
|
48
|
-
const apiUrl = redocOptions.specUrl || (
|
|
49
|
-
const store = await
|
|
50
|
-
const sheet = new
|
|
51
|
-
const html =
|
|
42
|
+
export async function getPageHTML(api, pathToApi, { title, disableGoogleFont, templateFileName, templateOptions, redocOptions = {}, redocCurrentVersion, }, configPath) {
|
|
43
|
+
logger.info('Prerendering docs\n');
|
|
44
|
+
const apiUrl = redocOptions.specUrl || (isAbsoluteUrl(pathToApi) ? pathToApi : undefined);
|
|
45
|
+
const store = await redoc.createStore(api, apiUrl, redocOptions);
|
|
46
|
+
const sheet = new ServerStyleSheet();
|
|
47
|
+
const html = renderToString(sheet.collectStyles(createElement(redoc.Redoc, { store })));
|
|
52
48
|
const state = await store.toJS();
|
|
53
49
|
const css = sheet.getStyleTags();
|
|
54
50
|
templateFileName = templateFileName
|
|
55
51
|
? templateFileName
|
|
56
52
|
: redocOptions?.htmlTemplate
|
|
57
|
-
?
|
|
58
|
-
:
|
|
59
|
-
const template =
|
|
53
|
+
? path.resolve(configPath ? path.dirname(configPath) : '', redocOptions.htmlTemplate)
|
|
54
|
+
: path.join(__internalDirname, './template.hbs');
|
|
55
|
+
const template = handlebars.compile(readFileSync(templateFileName).toString());
|
|
60
56
|
return template({
|
|
61
57
|
redocHTML: `
|
|
62
58
|
<div id="redoc">${html || ''}</div>
|
|
@@ -74,14 +70,15 @@ async function getPageHTML(api, pathToApi, { title, disableGoogleFont, templateF
|
|
|
74
70
|
templateOptions,
|
|
75
71
|
});
|
|
76
72
|
}
|
|
77
|
-
function sanitizeJSONString(str) {
|
|
73
|
+
export function sanitizeJSONString(str) {
|
|
78
74
|
return escapeClosingScriptTag(escapeUnicode(str));
|
|
79
75
|
}
|
|
80
76
|
// see http://www.thespanner.co.uk/2011/07/25/the-json-specification-is-now-wrong/
|
|
81
|
-
function escapeClosingScriptTag(str) {
|
|
77
|
+
export function escapeClosingScriptTag(str) {
|
|
82
78
|
return str.replace(/<\/script>/g, '<\\/script>');
|
|
83
79
|
}
|
|
84
80
|
// see http://www.thespanner.co.uk/2011/07/25/the-json-specification-is-now-wrong/
|
|
85
|
-
function escapeUnicode(str) {
|
|
81
|
+
export function escapeUnicode(str) {
|
|
86
82
|
return str.replace(/\u2028|\u2029/g, (m) => '\\u202' + (m === '\u2028' ? '8' : '9'));
|
|
87
83
|
}
|
|
84
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/build-docs/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/commands/bundle.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { OutputExtensions,
|
|
2
|
-
import type { CommandArgs } from '../wrapper';
|
|
1
|
+
import type { OutputExtensions, VerifyConfigOptions } from '../types.js';
|
|
2
|
+
import type { CommandArgs } from '../wrapper.js';
|
|
3
3
|
export type BundleOptions = {
|
|
4
4
|
apis?: string[];
|
|
5
5
|
extends?: string[];
|
|
@@ -10,5 +10,8 @@ export type BundleOptions = {
|
|
|
10
10
|
metafile?: string;
|
|
11
11
|
'remove-unused-components'?: boolean;
|
|
12
12
|
'keep-url-references'?: boolean;
|
|
13
|
-
|
|
13
|
+
'skip-decorator'?: string[];
|
|
14
|
+
'skip-preprocessor'?: string[];
|
|
15
|
+
} & VerifyConfigOptions;
|
|
14
16
|
export declare function handleBundle({ argv, config, version, collectSpecData, }: CommandArgs<BundleOptions>): Promise<void>;
|
|
17
|
+
//# sourceMappingURL=bundle.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/commands/bundle.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,gBAAgB,EAAU,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,gBAAgB,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC,GAAG,mBAAmB,CAAC;AAExB,wBAAsB,YAAY,CAAC,EACjC,IAAI,EACJ,MAAM,EACN,OAAO,EACP,eAAe,GAChB,EAAE,WAAW,CAAC,aAAa,CAAC,iBAiH5B"}
|