@apimatic/cli 1.1.0-alpha.20 → 1.1.0-alpha.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -6
- package/lib/actions/portal/copilot.d.ts +4 -1
- package/lib/actions/portal/copilot.js +44 -14
- package/lib/actions/portal/copilot.js.map +1 -1
- package/lib/actions/portal/generate.d.ts +2 -1
- package/lib/actions/portal/generate.js +12 -7
- package/lib/actions/portal/generate.js.map +1 -1
- package/lib/actions/portal/recipe/new-recipe.d.ts +1 -1
- package/lib/actions/portal/recipe/new-recipe.js +7 -7
- package/lib/actions/portal/recipe/new-recipe.js.map +1 -1
- package/lib/actions/portal/serve.d.ts +1 -1
- package/lib/actions/portal/serve.js +3 -3
- package/lib/actions/portal/serve.js.map +1 -1
- package/lib/actions/portal/toc/new-toc.d.ts +1 -1
- package/lib/actions/portal/toc/new-toc.js +4 -4
- package/lib/actions/portal/toc/new-toc.js.map +1 -1
- package/lib/actions/sdk/generate.d.ts +1 -1
- package/lib/actions/sdk/generate.js +3 -3
- package/lib/actions/sdk/generate.js.map +1 -1
- package/lib/application/portal/serve/portal-watcher.d.ts +2 -2
- package/lib/application/portal/serve/portal-watcher.js +4 -4
- package/lib/application/portal/serve/portal-watcher.js.map +1 -1
- package/lib/application/portal/serve/serve-handler.d.ts +1 -1
- package/lib/application/portal/serve/serve-handler.js +2 -2
- package/lib/application/portal/serve/serve-handler.js.map +1 -1
- package/lib/application/portal/toc/sdl-parser.d.ts +2 -2
- package/lib/application/portal/toc/sdl-parser.js +6 -6
- package/lib/application/portal/toc/sdl-parser.js.map +1 -1
- package/lib/client-utils/sdk-client.d.ts +4 -8
- package/lib/client-utils/sdk-client.js +5 -53
- package/lib/client-utils/sdk-client.js.map +1 -1
- package/lib/commands/api/transform.js +6 -3
- package/lib/commands/api/transform.js.map +1 -1
- package/lib/commands/api/validate.js +11 -5
- package/lib/commands/api/validate.js.map +1 -1
- package/lib/commands/portal/copilot.d.ts +1 -0
- package/lib/commands/portal/copilot.js +4 -4
- package/lib/commands/portal/copilot.js.map +1 -1
- package/lib/commands/portal/generate.js +1 -1
- package/lib/commands/portal/generate.js.map +1 -1
- package/lib/commands/portal/quickstart.js +13 -4
- package/lib/commands/portal/quickstart.js.map +1 -1
- package/lib/commands/portal/recipe/new.js +1 -1
- package/lib/commands/portal/recipe/new.js.map +1 -1
- package/lib/commands/portal/serve.js +1 -1
- package/lib/commands/portal/serve.js.map +1 -1
- package/lib/commands/portal/toc/new.js +1 -1
- package/lib/commands/portal/toc/new.js.map +1 -1
- package/lib/commands/sdk/generate.js +3 -3
- package/lib/commands/sdk/generate.js.map +1 -1
- package/lib/controllers/portal/quickstart.d.ts +1 -3
- package/lib/controllers/portal/quickstart.js +0 -3
- package/lib/controllers/portal/quickstart.js.map +1 -1
- package/lib/hooks/not-found.d.ts +3 -0
- package/lib/hooks/not-found.js +52 -0
- package/lib/hooks/not-found.js.map +1 -0
- package/lib/hooks/utils.d.ts +5 -0
- package/lib/hooks/utils.js +51 -0
- package/lib/hooks/utils.js.map +1 -0
- package/lib/infrastructure/api-client-utils.d.ts +6 -0
- package/lib/infrastructure/api-client-utils.js +34 -0
- package/lib/infrastructure/api-client-utils.js.map +1 -0
- package/lib/infrastructure/env-info.d.ts +4 -0
- package/lib/infrastructure/env-info.js +21 -0
- package/lib/infrastructure/env-info.js.map +1 -1
- package/lib/infrastructure/file-service.js +3 -3
- package/lib/infrastructure/launcher-service.d.ts +5 -0
- package/lib/infrastructure/launcher-service.js +47 -0
- package/lib/infrastructure/launcher-service.js.map +1 -0
- package/lib/infrastructure/services/api-service.js +2 -1
- package/lib/infrastructure/services/api-service.js.map +1 -1
- package/lib/infrastructure/services/auth-service.js +4 -2
- package/lib/infrastructure/services/auth-service.js.map +1 -1
- package/lib/infrastructure/services/portal-service.d.ts +7 -4
- package/lib/infrastructure/services/portal-service.js +32 -9
- package/lib/infrastructure/services/portal-service.js.map +1 -1
- package/lib/prompts/portal/copilot.d.ts +10 -4
- package/lib/prompts/portal/copilot.js +33 -16
- package/lib/prompts/portal/copilot.js.map +1 -1
- package/lib/types/events/quickstart-completed.d.ts +7 -0
- package/lib/types/events/quickstart-completed.js +10 -0
- package/lib/types/events/quickstart-completed.js.map +1 -0
- package/lib/types/events/quickstart-initiated.d.ts +7 -0
- package/lib/types/events/quickstart-initiated.js +10 -0
- package/lib/types/events/quickstart-initiated.js.map +1 -0
- package/lib/types/file/fileName.d.ts +1 -1
- package/lib/types/file/fileName.js +2 -2
- package/package.json +8 -7
package/README.md
CHANGED
|
@@ -24,7 +24,7 @@ $ npm install -g @apimatic/cli
|
|
|
24
24
|
$ apimatic COMMAND
|
|
25
25
|
running command...
|
|
26
26
|
$ apimatic (--version)
|
|
27
|
-
@apimatic/cli/1.1.0-alpha.
|
|
27
|
+
@apimatic/cli/1.1.0-alpha.21 win32-x64 node-v23.4.0
|
|
28
28
|
$ apimatic --help [COMMAND]
|
|
29
29
|
USAGE
|
|
30
30
|
$ apimatic COMMAND
|
|
@@ -74,7 +74,7 @@ DESCRIPTION
|
|
|
74
74
|
Collections.
|
|
75
75
|
|
|
76
76
|
EXAMPLES
|
|
77
|
-
$ apimatic api:transform --format=
|
|
77
|
+
$ apimatic api:transform --format=OPENAPI3YAML --file="./specs/sample.json" --destination="D:/"
|
|
78
78
|
|
|
79
79
|
$ apimatic api:transform --format=RAML --url="https://petstore.swagger.io/v2/swagger.json" --destination="D:/"
|
|
80
80
|
```
|
|
@@ -171,7 +171,7 @@ USAGE
|
|
|
171
171
|
$ apimatic autocomplete [SHELL] [-r]
|
|
172
172
|
|
|
173
173
|
ARGUMENTS
|
|
174
|
-
SHELL
|
|
174
|
+
SHELL (zsh|bash|powershell) Shell type
|
|
175
175
|
|
|
176
176
|
FLAGS
|
|
177
177
|
-r, --refresh-cache Refresh cache (ignores displaying instructions)
|
|
@@ -181,8 +181,13 @@ DESCRIPTION
|
|
|
181
181
|
|
|
182
182
|
EXAMPLES
|
|
183
183
|
$ apimatic autocomplete
|
|
184
|
+
|
|
184
185
|
$ apimatic autocomplete bash
|
|
186
|
+
|
|
185
187
|
$ apimatic autocomplete zsh
|
|
188
|
+
|
|
189
|
+
$ apimatic autocomplete powershell
|
|
190
|
+
|
|
186
191
|
$ apimatic autocomplete --refresh-cache
|
|
187
192
|
```
|
|
188
193
|
|
|
@@ -214,9 +219,10 @@ Configure API Copilot for your API Documentation portal
|
|
|
214
219
|
|
|
215
220
|
```
|
|
216
221
|
USAGE
|
|
217
|
-
$ apimatic portal:copilot [-i <value>] [--disable] [-k <value>]
|
|
222
|
+
$ apimatic portal:copilot [-i <value>] [--disable] [-f] [-k <value>]
|
|
218
223
|
|
|
219
224
|
FLAGS
|
|
225
|
+
-f, --force overwrite changes without asking for user consent.
|
|
220
226
|
-i, --input=<value> [default: ./] path to the parent directory containing the 'src' directory, which includes API
|
|
221
227
|
specifications and configuration files.
|
|
222
228
|
-k, --auth-key=<value> override current authentication state with an authentication key.
|
|
@@ -399,9 +405,9 @@ DESCRIPTION
|
|
|
399
405
|
Generate an SDK for your API
|
|
400
406
|
|
|
401
407
|
EXAMPLES
|
|
402
|
-
$ apimatic sdk:generate --platform=
|
|
408
|
+
$ apimatic sdk:generate --platform=java
|
|
403
409
|
|
|
404
|
-
$ apimatic sdk:generate --platform=
|
|
410
|
+
$ apimatic sdk:generate --platform=csharp --spec="./src/spec"
|
|
405
411
|
```
|
|
406
412
|
|
|
407
413
|
_See code: [src/commands/sdk/generate.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/sdk/generate.ts)_
|
|
@@ -2,10 +2,13 @@ import { DirectoryPath } from "../../types/file/directoryPath.js";
|
|
|
2
2
|
import { ActionResult } from "../action-result.js";
|
|
3
3
|
export declare class CopilotAction {
|
|
4
4
|
private readonly apiService;
|
|
5
|
+
private readonly fileService;
|
|
6
|
+
private readonly launcherService;
|
|
5
7
|
private readonly prompts;
|
|
6
8
|
private readonly configDir;
|
|
7
9
|
private readonly authKey;
|
|
8
10
|
constructor(configDir: DirectoryPath, authKey?: string | null);
|
|
9
|
-
execute(buildDirectory: DirectoryPath, enable: boolean): Promise<ActionResult>;
|
|
11
|
+
execute(buildDirectory: DirectoryPath, force: boolean, enable: boolean): Promise<ActionResult>;
|
|
10
12
|
private selectCopilotKey;
|
|
13
|
+
private getWelcomeMessage;
|
|
11
14
|
}
|
|
@@ -2,48 +2,78 @@ import { ApiService } from "../../infrastructure/services/api-service.js";
|
|
|
2
2
|
import { PortalCopilotPrompts } from "../../prompts/portal/copilot.js";
|
|
3
3
|
import { ActionResult } from "../action-result.js";
|
|
4
4
|
import { BuildContext } from "../../types/build-context.js";
|
|
5
|
+
import { withDirPath } from "../../infrastructure/tmp-extensions.js";
|
|
6
|
+
import { FilePath } from "../../types/file/filePath.js";
|
|
7
|
+
import { FileName } from "../../types/file/fileName.js";
|
|
8
|
+
import { FileService } from "../../infrastructure/file-service.js";
|
|
9
|
+
import { LauncherService } from "../../infrastructure/launcher-service.js";
|
|
5
10
|
export class CopilotAction {
|
|
6
11
|
constructor(configDir, authKey = null) {
|
|
7
12
|
this.apiService = new ApiService();
|
|
13
|
+
this.fileService = new FileService();
|
|
14
|
+
this.launcherService = new LauncherService();
|
|
8
15
|
this.prompts = new PortalCopilotPrompts();
|
|
9
16
|
this.configDir = configDir;
|
|
10
17
|
this.authKey = authKey;
|
|
11
18
|
}
|
|
12
|
-
async execute(buildDirectory, enable) {
|
|
19
|
+
async execute(buildDirectory, force, enable) {
|
|
13
20
|
const buildContext = new BuildContext(buildDirectory);
|
|
14
21
|
if (!(await buildContext.validate())) {
|
|
15
|
-
return ActionResult.error("
|
|
22
|
+
return ActionResult.error(`Unable to locate a valid "src" directory. Navigate to the directory containing your APIMatic Portal source or set up a new project by running apimatic portal:quickstart.`);
|
|
16
23
|
}
|
|
17
24
|
const buildJson = await buildContext.getBuildFileContents();
|
|
18
|
-
if (buildJson.apiCopilotConfig != null && !(await this.prompts.confirmOverwrite()))
|
|
25
|
+
if (!force && buildJson.apiCopilotConfig != null && !(await this.prompts.confirmOverwrite()))
|
|
19
26
|
return ActionResult.error("Exiting without making any change.");
|
|
20
|
-
const response = await this.apiService.getAccountInfo(this.configDir, this.authKey);
|
|
27
|
+
const response = await this.prompts.spinnerAccountInfo(() => this.apiService.getAccountInfo(this.configDir, this.authKey));
|
|
21
28
|
if (response.isErr()) {
|
|
22
29
|
return ActionResult.error(response._unsafeUnwrapErr());
|
|
23
30
|
}
|
|
24
|
-
const apiCopilotKey = await this.selectCopilotKey(response._unsafeUnwrap());
|
|
25
|
-
if (apiCopilotKey
|
|
26
|
-
return ActionResult.error(
|
|
31
|
+
const apiCopilotKey = await this.selectCopilotKey(response._unsafeUnwrap(), force);
|
|
32
|
+
if (apiCopilotKey instanceof Error) {
|
|
33
|
+
return ActionResult.error(apiCopilotKey.message);
|
|
27
34
|
}
|
|
28
|
-
const welcomeMessage = await this.
|
|
29
|
-
if (welcomeMessage === undefined)
|
|
30
|
-
return ActionResult.error("Exiting without making any change.");
|
|
35
|
+
const welcomeMessage = await this.getWelcomeMessage();
|
|
31
36
|
buildJson.apiCopilotConfig = {
|
|
32
37
|
isEnabled: enable,
|
|
33
38
|
key: apiCopilotKey,
|
|
34
39
|
welcomeMessage: welcomeMessage
|
|
35
40
|
};
|
|
36
41
|
await buildContext.updateBuildFileContents(buildJson);
|
|
37
|
-
this.prompts.copilotConfigured(
|
|
42
|
+
this.prompts.copilotConfigured(enable, apiCopilotKey);
|
|
38
43
|
return ActionResult.success();
|
|
39
44
|
}
|
|
40
|
-
async selectCopilotKey(subscription) {
|
|
45
|
+
async selectCopilotKey(subscription, force) {
|
|
41
46
|
if (subscription === undefined ||
|
|
42
47
|
subscription.ApiCopilotKeys === undefined ||
|
|
43
48
|
subscription.ApiCopilotKeys.length === 0) {
|
|
44
|
-
return
|
|
49
|
+
return new Error("No copilot key found for the current subscription. Please contact support at support@apimatic.io.");
|
|
50
|
+
}
|
|
51
|
+
if (subscription.ApiCopilotKeys.length === 1) {
|
|
52
|
+
if (force || (await this.prompts.confirmSingleKeyUsage(subscription.ApiCopilotKeys[0])))
|
|
53
|
+
return subscription.ApiCopilotKeys[0];
|
|
54
|
+
return new Error("Operation cancelled. No API Copilot key was selected.");
|
|
45
55
|
}
|
|
46
|
-
|
|
56
|
+
const key = await this.prompts.selectCopilotKey(subscription.ApiCopilotKeys);
|
|
57
|
+
if (key === null)
|
|
58
|
+
return new Error("Operation cancelled. No API Copilot key was selected.");
|
|
59
|
+
await this.prompts.displayApiCopilotKeyUsageWarning();
|
|
60
|
+
return key;
|
|
61
|
+
}
|
|
62
|
+
async getWelcomeMessage() {
|
|
63
|
+
return await withDirPath(async (tempDir) => {
|
|
64
|
+
const tempFile = new FilePath(tempDir, new FileName("welcome-message.md"));
|
|
65
|
+
const defaultContent = "Hi there! I'm your API Integration Assistant, here to help you learn and integrate with this API.\n" +
|
|
66
|
+
"\n" +
|
|
67
|
+
"Ask me anything about this API or try one of these example prompts:\n" +
|
|
68
|
+
"\n" +
|
|
69
|
+
"`- What authentication methods does this API support?`\n" +
|
|
70
|
+
"`- [Enter another prompt here]`";
|
|
71
|
+
await this.fileService.writeContents(tempFile, defaultContent);
|
|
72
|
+
this.prompts.openWelcomeMessageEditor();
|
|
73
|
+
await this.launcherService.openInEditor(tempFile);
|
|
74
|
+
const welcomeMessage = await this.fileService.getContents(tempFile);
|
|
75
|
+
return welcomeMessage.replace(/\r\n|\r/g, "\n");
|
|
76
|
+
});
|
|
47
77
|
}
|
|
48
78
|
}
|
|
49
79
|
//# sourceMappingURL=copilot.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot.js","sourceRoot":"","sources":["../../../src/actions/portal/copilot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"copilot.js","sourceRoot":"","sources":["../../../src/actions/portal/copilot.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,11 @@ export declare class GenerateAction {
|
|
|
4
4
|
private readonly prompts;
|
|
5
5
|
private readonly zipArchiver;
|
|
6
6
|
private readonly fileService;
|
|
7
|
+
private readonly launcherService;
|
|
7
8
|
private readonly portalService;
|
|
8
9
|
private readonly configDir;
|
|
9
10
|
private readonly authKey;
|
|
10
11
|
constructor(configDir: DirectoryPath, authKey?: string | null);
|
|
11
|
-
readonly execute: (buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, force: boolean, zipPortal: boolean) => Promise<ActionResult>;
|
|
12
|
+
readonly execute: (buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, commandName: string, force: boolean, zipPortal: boolean) => Promise<ActionResult>;
|
|
12
13
|
private parseError;
|
|
13
14
|
}
|
|
@@ -8,19 +8,21 @@ import { ActionResult } from "../action-result.js";
|
|
|
8
8
|
import { BuildContext } from "../../types/build-context.js";
|
|
9
9
|
import { PortalContext } from "../../types/portal-context.js";
|
|
10
10
|
import { withDirPath } from "../../infrastructure/tmp-extensions.js";
|
|
11
|
+
import { LauncherService } from "../../infrastructure/launcher-service.js";
|
|
11
12
|
export class GenerateAction {
|
|
12
13
|
constructor(configDir, authKey = null) {
|
|
13
14
|
this.prompts = new PortalGeneratePrompts();
|
|
14
15
|
this.zipArchiver = new ZipService();
|
|
15
16
|
this.fileService = new FileService();
|
|
17
|
+
this.launcherService = new LauncherService();
|
|
16
18
|
this.portalService = new PortalService();
|
|
17
|
-
this.execute = async (buildDirectory, portalDirectory, force, zipPortal) => {
|
|
19
|
+
this.execute = async (buildDirectory, portalDirectory, commandName, force, zipPortal) => {
|
|
18
20
|
if (buildDirectory.isEqual(portalDirectory)) {
|
|
19
21
|
return ActionResult.error(`The 'src' and 'portal' directory cannot be the same: "${portalDirectory}"`);
|
|
20
22
|
}
|
|
21
23
|
const buildContext = new BuildContext(buildDirectory);
|
|
22
|
-
if (!await buildContext.validate()) {
|
|
23
|
-
return ActionResult.error(`
|
|
24
|
+
if (!(await buildContext.validate())) {
|
|
25
|
+
return ActionResult.error(`Unable to locate a valid "src" directory. Navigate to the directory containing your APIMatic Portal source or set up a new project by running apimatic portal:quickstart.`);
|
|
24
26
|
}
|
|
25
27
|
const portalContext = new PortalContext(portalDirectory);
|
|
26
28
|
if (!force && (await portalContext.exists()) && !(await this.prompts.overwritePortal(portalDirectory))) {
|
|
@@ -30,7 +32,7 @@ export class GenerateAction {
|
|
|
30
32
|
this.prompts.displayPortalGenerationMessage();
|
|
31
33
|
const buildZipPath = new FilePath(tempDirectory, new FileName("build.zip"));
|
|
32
34
|
await this.zipArchiver.archive(buildDirectory, buildZipPath);
|
|
33
|
-
const response = await this.portalService.generatePortal(buildZipPath, this.configDir, this.authKey);
|
|
35
|
+
const response = await this.portalService.generatePortal(buildZipPath, this.configDir, commandName, this.authKey);
|
|
34
36
|
if (!response.isSuccess()) {
|
|
35
37
|
this.prompts.displayPortalGenerationErrorMessage();
|
|
36
38
|
return ActionResult.error(await this.parseError(response.error, portalDirectory, tempDirectory));
|
|
@@ -46,7 +48,7 @@ export class GenerateAction {
|
|
|
46
48
|
this.authKey = authKey;
|
|
47
49
|
}
|
|
48
50
|
async parseError(error, portalDirectory, tempDirectory) {
|
|
49
|
-
if (typeof error ===
|
|
51
|
+
if (typeof error === "string") {
|
|
50
52
|
return error;
|
|
51
53
|
}
|
|
52
54
|
const tempErrorFilePath = new FilePath(tempDirectory, new FileName("error.zip"));
|
|
@@ -54,8 +56,11 @@ export class GenerateAction {
|
|
|
54
56
|
await this.fileService.cleanDirectory(portalDirectory);
|
|
55
57
|
await this.zipArchiver.unArchive(tempErrorFilePath, portalDirectory);
|
|
56
58
|
const errorReportPath = portalDirectory.join("apimatic-debug");
|
|
57
|
-
|
|
58
|
-
|
|
59
|
+
const htmlFilePath = new FilePath(errorReportPath, new FileName("apimatic-report.html"));
|
|
60
|
+
await this.launcherService.openFile(htmlFilePath); // Open the error report in the default browser
|
|
61
|
+
return ("An error occurred during portal generation due to an issue with the input. " +
|
|
62
|
+
"An error report has been written at the destination path: " +
|
|
63
|
+
errorReportPath);
|
|
59
64
|
}
|
|
60
65
|
}
|
|
61
66
|
//# sourceMappingURL=generate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/actions/portal/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/actions/portal/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export declare class PortalRecipeAction {
|
|
|
5
5
|
private readonly sdlParser;
|
|
6
6
|
private readonly BUILD_FILE_NAME;
|
|
7
7
|
constructor();
|
|
8
|
-
createRecipe(buildDirectoryPath: DirectoryPath, configDir: string, name?: string): Promise<Result<string, string>>;
|
|
8
|
+
createRecipe(buildDirectoryPath: DirectoryPath, configDir: string, commandName: string, name?: string): Promise<Result<string, string>>;
|
|
9
9
|
private createRecipeFileName;
|
|
10
10
|
private toPascalCase;
|
|
11
11
|
private validateBuildDirectoryPath;
|
|
@@ -17,13 +17,13 @@ export class PortalRecipeAction {
|
|
|
17
17
|
this.prompts = new PortalRecipePrompts();
|
|
18
18
|
this.sdlParser = new SdlParser(new PortalService());
|
|
19
19
|
}
|
|
20
|
-
async createRecipe(buildDirectoryPath, configDir, name) {
|
|
20
|
+
async createRecipe(buildDirectoryPath, configDir, commandName, name) {
|
|
21
21
|
this.prompts.displayWelcomeMessage();
|
|
22
22
|
const recipeName = name !== null && name !== void 0 ? name : (await this.prompts.recipeNamePrompt());
|
|
23
23
|
const recipeFileName = this.createRecipeFileName(recipeName);
|
|
24
24
|
const validateBuildDirectoryPathResult = await this.validateBuildDirectoryPath(buildDirectoryPath);
|
|
25
25
|
if (validateBuildDirectoryPathResult.isFailed()) {
|
|
26
|
-
return Result.failure(`Unable to
|
|
26
|
+
return Result.failure(`Unable to locate a valid "src" directory. Navigate to the directory containing your APIMatic Portal source or set up a new project by running apimatic portal:quickstart.`);
|
|
27
27
|
}
|
|
28
28
|
//TODO: Create a type for the build config and use that here instead of any.
|
|
29
29
|
const buildConfigFilePath = await this.getBuildConfigFilePath(buildDirectoryPath);
|
|
@@ -42,7 +42,7 @@ export class PortalRecipeAction {
|
|
|
42
42
|
if (recipeAlreadyExists && !(await this.prompts.overwriteApiRecipeInTocPrompt())) {
|
|
43
43
|
return Result.cancelled("Operation was cancelled by the user.");
|
|
44
44
|
}
|
|
45
|
-
const recipeResult = await this.promptUserAndBuildNewRecipe(buildConfigResult.value, contentFolderPath, recipeName, configDir);
|
|
45
|
+
const recipeResult = await this.promptUserAndBuildNewRecipe(buildConfigResult.value, contentFolderPath, recipeName, configDir, commandName);
|
|
46
46
|
if (recipeResult.isFailed()) {
|
|
47
47
|
return Result.failure(`Unable to generate API Recipe: ${recipeResult.error}`);
|
|
48
48
|
}
|
|
@@ -69,7 +69,7 @@ export class PortalRecipeAction {
|
|
|
69
69
|
return Result.success("Portal build input folder path validated successfully.");
|
|
70
70
|
}
|
|
71
71
|
//TODO: Figure out a better way to do this without the while loop.
|
|
72
|
-
async promptUserAndBuildNewRecipe(buildConfig, contentFolderPath, recipeName, configDir) {
|
|
72
|
+
async promptUserAndBuildNewRecipe(buildConfig, contentFolderPath, recipeName, configDir, commandName) {
|
|
73
73
|
const recipe = new PortalRecipe(recipeName);
|
|
74
74
|
let endpointGroups;
|
|
75
75
|
let idx = 1;
|
|
@@ -88,7 +88,7 @@ export class PortalRecipeAction {
|
|
|
88
88
|
}
|
|
89
89
|
case StepType.Endpoint: {
|
|
90
90
|
if (!endpointGroups) {
|
|
91
|
-
const extractEndpointGroupsFromSdlResult = await this.extractEndpointGroupsFromSdl(buildConfig, contentFolderPath, configDir);
|
|
91
|
+
const extractEndpointGroupsFromSdlResult = await this.extractEndpointGroupsFromSdl(buildConfig, contentFolderPath, configDir, commandName);
|
|
92
92
|
if (extractEndpointGroupsFromSdlResult.isFailed()) {
|
|
93
93
|
return Result.failure(`${extractEndpointGroupsFromSdlResult.error}`);
|
|
94
94
|
}
|
|
@@ -214,13 +214,13 @@ export class PortalRecipeAction {
|
|
|
214
214
|
}
|
|
215
215
|
};
|
|
216
216
|
}
|
|
217
|
-
async extractEndpointGroupsFromSdl(buildConfig, contentFolderPath, configDir) {
|
|
217
|
+
async extractEndpointGroupsFromSdl(buildConfig, contentFolderPath, configDir, commandName) {
|
|
218
218
|
const specFolderPath = this.getSpecFolderPath(buildConfig, contentFolderPath);
|
|
219
219
|
if (!(await fsExtra.pathExists(specFolderPath))) {
|
|
220
220
|
return Result.failure(`API specification file not found at ${specFolderPath}.`);
|
|
221
221
|
}
|
|
222
222
|
this.prompts.startProgressIndicatorWithMessage("Extracting endpoint groups and endpoints from the API specification.");
|
|
223
|
-
const endpointGroupsResult = await this.sdlParser.getEndpointGroupsFromSdl(specFolderPath, configDir);
|
|
223
|
+
const endpointGroupsResult = await this.sdlParser.getEndpointGroupsFromSdl(specFolderPath, configDir, commandName);
|
|
224
224
|
if (endpointGroupsResult.isFailed()) {
|
|
225
225
|
this.prompts.stopProgressIndicatorWithMessage("Unable to extract endpoints from your API specification.");
|
|
226
226
|
return Result.failure(`${endpointGroupsResult.error}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-recipe.js","sourceRoot":"","sources":["../../../../src/actions/portal/recipe/new-recipe.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"new-recipe.js","sourceRoot":"","sources":["../../../../src/actions/portal/recipe/new-recipe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAsB,QAAQ,EAAiB,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAC/F,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,oDAAoD,CAAC;AAInF,MAAM,OAAO,kBAAkB;IAK7B;QAFiB,oBAAe,GAAW,qBAAqB,CAAC;QAG/D,IAAI,CAAC,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,kBAAiC,EACjC,SAAiB,EACjB,WAAmB,EACnB,IAAa;QAEb,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAErC,MAAM,UAAU,GAAG,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACnE,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAE7D,MAAM,gCAAgC,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,kBAAkB,CAAC,CAAC;QACnG,IAAI,gCAAgC,CAAC,QAAQ,EAAE,EAAE,CAAC;YAChD,OAAO,MAAM,CAAC,OAAO,CAAC,2KAA2K,CAAC,CAAC;QACrM,CAAC;QAED,4EAA4E;QAC5E,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;QAClF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QAC3E,IAAI,iBAAiB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACjC,OAAO,MAAM,CAAC,OAAO,CAAC,kCAAkC,iBAAiB,CAAC,KAAM,EAAE,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;QACjG,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACvE,iEAAiE;QACjE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC7B,OAAO,MAAM,CAAC,OAAO,CAAC,kCAAkC,aAAa,CAAC,KAAM,EAAE,CAAC,CAAC;QAClF,CAAC;QAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;QAC3G,IAAI,mBAAmB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE,CAAC,EAAE,CAAC;YACjF,OAAO,MAAM,CAAC,SAAS,CAAC,sCAAsC,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,2BAA2B,CACzD,iBAAiB,CAAC,KAAK,EACvB,iBAAiB,EACjB,UAAU,EACV,SAAS,EACT,WAAW,CACZ,CAAC;QACF,IAAI,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC,OAAO,CAAC,kCAAkC,YAAY,CAAC,KAAM,EAAE,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,qBAAqB,EAAE,CAAC;QACpD,MAAM,eAAe,CAAC,YAAY,CAChC,YAAY,CAAC,KAAM,EACnB,iBAAiB,CAAC,KAAM,EACxB,aAAa,CAAC,KAAK,EACnB,WAAW,EACX,UAAU,EACV,cAAc,EACd,mBAAmB,EACnB,iBAAiB,CAClB,CAAC;QAEF,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC;QAEtF,IAAI,CAAC,OAAO,CAAC,oCAAoC,CAAC,uBAAqC,CAAC,CAAC;QACzF,IAAI,CAAC,OAAO,CAAC,qCAAqC,CAAC,iBAAiB,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;IAC1D,CAAC;IAEO,oBAAoB,CAAC,UAAkB;QAC7C,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IAEO,YAAY,CAAC,GAAW;QAC9B,OAAO,GAAG;aACP,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;aACzE,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,kBAAiC;QACxE,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/D,OAAO,MAAM,CAAC,OAAO,CAAC,6BAA6B,kBAAkB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACtG,CAAC;QAED,OAAO,MAAM,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAClF,CAAC;IAED,kEAAkE;IAC1D,KAAK,CAAC,2BAA2B,CACvC,WAAgB,EAChB,iBAAyB,EACzB,UAAkB,EAClB,SAAiB,EACjB,WAAmB;QAEnB,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,cAAsD,CAAC;QAC3D,IAAI,GAAG,GAAW,CAAC,CAAC;QACpB,IAAI,cAAc,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC;QACvC,OAAO,cAAc,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC;YAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC;YAClE,QAAQ,QAAQ,EAAE,CAAC;gBACjB,KAAK,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;oBACtB,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,mCAAmC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAC9F,IAAI,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC;wBACpC,OAAO,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAM,CAAC,CAAC;oBACrD,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD,KAAK,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;oBACvB,IAAI,CAAC,cAAc,EAAE,CAAC;wBACpB,MAAM,kCAAkC,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAChF,WAAW,EACX,iBAAiB,EACjB,SAAS,EACT,WAAW,CACZ,CAAC;wBACF,IAAI,kCAAkC,CAAC,QAAQ,EAAE,EAAE,CAAC;4BAClD,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,kCAAkC,CAAC,KAAM,EAAE,CAAC,CAAC;wBACxE,CAAC;wBACD,cAAc,GAAG,kCAAkC,CAAC,KAAM,CAAC;oBAC7D,CAAC;oBACD,MAAM,IAAI,CAAC,oCAAoC,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;oBAClF,MAAM;gBACR,CAAC;YACH,CAAC;YACD,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE,CAAC;YACpE,GAAG,EAAE,CAAC;QACR,CAAC;QAED,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACvD,CAAC;IAEO,KAAK,CAAC,mCAAmC,CAC/C,MAAoB,EACpB,QAAgB;QAEhB,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;QACtC,IAAI,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;QAChC,IAAI,UAAU,GAAa,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,2BAA2B,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACtF,MAAM,QAAQ,GAAG,2KAA2K,CAAC;QAC7L,MAAM,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEzD,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;oBACjC,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC7F,CAAC;qBAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;oBACzE,MAAM,GAAG,KAAK,CAAC;oBACf,IAAI,CAAC;wBACH,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;oBAC5D,CAAC;oBAAC,WAAM,CAAC;wBACP,mFAAmF;oBACrF,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBACpF,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;gBACD,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC9B,MAAM,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YACvD,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YAClE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;YAEvD,IAAI,CAAC,OAAO,CAAC,mCAAmC,EAAE,CAAC;YACnD,OAAO,MAAM,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;QAC5D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,MAAM,CAAC,OAAO,CAAC,qDAAqD,CAAC,CAAC;QAC/E,CAAC;gBAAS,CAAC;YACT,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oCAAoC,CAChD,MAAoB,EACpB,cAA0C,EAC1C,QAAgB;QAEhB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,cAAc,CAAC,CAAC;QACrF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;QAC9F,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,cAAc,EAAE,iBAAiB,EAAE,YAAY,CAAC,CAAC;QAClH,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC;QACxF,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAC3E,IAAI,CAAC,OAAO,CAAC,mCAAmC,EAAE,CAAC;IACrD,CAAC;IAED,kDAAkD;IAC1C,KAAK,CAAC,YAAY,CAAC,WAAmB;QAC5C,2BAA2B;QAC3B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC,OAAO,CACnB,6BAA6B,WAAW,oEAAoE,CAC7G,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACpE,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QAC3C,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,MAAM,CAAC,OAAO,CACnB,+CAA+C,WAAW,2DAA2D,CACtH,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,UAAoB;QAChD,OAAO,MAAM,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAC9D,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,kBAAiC;QACpE,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,eAAe,CAAC,CAAC;QAC5E,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrF,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACxE,CAAC;IAED,4EAA4E;IACpE,KAAK,CAAC,gBAAgB,CAAC,mBAA2B;QACxD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAC1E,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9C,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,MAAM,CAAC,OAAO,CACnB,gEAAgE,mBAAmB,6DAA6D,CACjJ,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,wBAAwB,CAAC,OAAY,EAAE,UAAkB,EAAE,cAAsB;;QACvF,IAAI,eAAe,GAAG,MAAA,OAAO,CAAC,GAAG,0CAAE,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,aAAa,CAAC,CAAC;QACrF,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,mDAAmD;QACnD,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,CAC/C,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,cAAc,KAAK,CACxF,CAAC;QACF,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,cAAsB;QAC7D,OAAO;YACL,OAAO,EAAE;gBACP,gFAAgF,EAAE,IAAI;aACvF;YACD,MAAM,EAAE;gBACN,OAAO,EAAE;oBACP,OAAO,EAAE;wBACP,CAAC,GAAG,cAAc,kEAAkE,CAAC,EAAE,IAAI;qBAC5F;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,4BAA4B,CACxC,WAAgB,EAChB,iBAAyB,EACzB,SAAiB,EACjB,WAAmB;QAEnB,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAC9E,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YAChD,OAAO,MAAM,CAAC,OAAO,CAAC,uCAAuC,cAAc,GAAG,CAAC,CAAC;QAClF,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,iCAAiC,CAC5C,sEAAsE,CACvE,CAAC;QAEF,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,cAAc,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAEnH,IAAI,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpC,IAAI,CAAC,OAAO,CAAC,gCAAgC,CAAC,0DAA0D,CAAC,CAAC;YAC1G,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,KAAM,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,gCAAgC,CAC3C,kFAAkF,CACnF,CAAC;QACF,OAAO,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAM,CAAC,CAAC;IACrD,CAAC;IAED,0FAA0F;IAClF,iBAAiB,CAAC,WAAgB,EAAE,iBAAyB;;QACnE,MAAM,WAAW,GAAG,MAAA,WAAW,CAAC,cAAc,0CAAE,WAAW,CAAC;QAC5D,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,0FAA0F;IAClF,oBAAoB,CAAC,WAAgB,EAAE,kBAAiC;;QAC9E,MAAM,aAAa,GAAG,MAAA,WAAW,CAAC,cAAc,0CAAE,aAAa,CAAC;QAChE,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,EAAE,aAAa,CAAC,CAAC;QACjE,CAAC;QAED,OAAO,kBAAkB,CAAC,QAAQ,EAAE,CAAC;IACvC,CAAC;CACF"}
|
|
@@ -10,5 +10,5 @@ export declare class PortalServeAction {
|
|
|
10
10
|
protected readonly serveHandler: ServeHandler;
|
|
11
11
|
protected readonly docsPortalService: PortalService;
|
|
12
12
|
constructor(prompts: PortalServePrompts, serveHandler: ServeHandler, docsPortalService: PortalService);
|
|
13
|
-
servePortal(flags: ServeFlags, paths: ServePaths, generatePortal: (buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, force: boolean, zipPortal: boolean) => Promise<ActionResult>): Promise<Result<string, string>>;
|
|
13
|
+
servePortal(flags: ServeFlags, paths: ServePaths, commandName: string, generatePortal: (buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, commandName: string, force: boolean, zipPortal: boolean) => Promise<ActionResult>): Promise<Result<string, string>>;
|
|
14
14
|
}
|
|
@@ -6,14 +6,14 @@ export class PortalServeAction {
|
|
|
6
6
|
this.serveHandler = serveHandler;
|
|
7
7
|
this.docsPortalService = docsPortalService;
|
|
8
8
|
}
|
|
9
|
-
async servePortal(flags, paths, generatePortal) {
|
|
10
|
-
const result = await generatePortal(new DirectoryPath(paths.sourceDirectoryPath), new DirectoryPath(paths.destinationDirectoryPath), false, false);
|
|
9
|
+
async servePortal(flags, paths, commandName, generatePortal) {
|
|
10
|
+
const result = await generatePortal(new DirectoryPath(paths.sourceDirectoryPath), new DirectoryPath(paths.destinationDirectoryPath), commandName, false, false);
|
|
11
11
|
return result.mapAll(async () => {
|
|
12
12
|
const setupServerResult = await this.serveHandler.setupServer(paths.destinationDirectoryPath);
|
|
13
13
|
if (setupServerResult.isFailed()) {
|
|
14
14
|
return Result.failure(setupServerResult.error);
|
|
15
15
|
}
|
|
16
|
-
const startServerResult = await this.serveHandler.startServer(paths, flags, generatePortal);
|
|
16
|
+
const startServerResult = await this.serveHandler.startServer(paths, flags, commandName, generatePortal);
|
|
17
17
|
if (startServerResult.isFailed()) {
|
|
18
18
|
return Result.failure(startServerResult.error);
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/actions/portal/serve.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,MAAM,OAAO,iBAAiB;IAK5B,YAAmB,OAA2B,EAAE,YAA0B,EAAE,iBAAgC;QAC1G,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,WAAW,CACtB,KAAiB,EACjB,KAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/actions/portal/serve.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,MAAM,OAAO,iBAAiB;IAK5B,YAAmB,OAA2B,EAAE,YAA0B,EAAE,iBAAgC;QAC1G,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,WAAW,CACtB,KAAiB,EACjB,KAAiB,EACjB,WAAmB,EACnB,cAM0B;QAE1B,MAAM,MAAM,GAAG,MAAM,cAAc,CACjC,IAAI,aAAa,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAC5C,IAAI,aAAa,CAAC,KAAK,CAAC,wBAAwB,CAAC,EACjD,WAAW,EACX,KAAK,EACL,KAAK,CACN,CAAC;QAEF,OAAO,MAAM,CAAC,MAAM,CAClB,KAAK,IAAI,EAAE;YACT,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC9F,IAAI,iBAAiB,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACjC,OAAO,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAM,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;YACzG,IAAI,iBAAiB,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACjC,OAAO,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAM,CAAC,CAAC;YAClD,CAAC;YAED,OAAO,MAAM,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;QAC3D,CAAC,EACD,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAC3C,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -8,7 +8,7 @@ export declare class PortalNewTocAction {
|
|
|
8
8
|
private readonly DEFAULT_TOC_FILENAME;
|
|
9
9
|
private readonly APIMATIC_BUILD_FILENAME;
|
|
10
10
|
constructor();
|
|
11
|
-
createToc(buildDirectory: DirectoryPath, configDir: string, tocDirectory?: DirectoryPath, force?: boolean, expandEndpoints?: boolean, expandModels?: boolean): Promise<Result<string, string>>;
|
|
11
|
+
createToc(buildDirectory: DirectoryPath, configDir: string, commandName: string, tocDirectory?: DirectoryPath, force?: boolean, expandEndpoints?: boolean, expandModels?: boolean): Promise<Result<string, string>>;
|
|
12
12
|
private writeToc;
|
|
13
13
|
private handleExistingToc;
|
|
14
14
|
private extractSdlComponents;
|
|
@@ -19,7 +19,7 @@ export class PortalNewTocAction {
|
|
|
19
19
|
this.tocGenerator = new TocStructureGenerator();
|
|
20
20
|
this.contentParser = new TocContentParser();
|
|
21
21
|
}
|
|
22
|
-
async createToc(buildDirectory, configDir, tocDirectory, force = false, expandEndpoints = false, expandModels = false) {
|
|
22
|
+
async createToc(buildDirectory, configDir, commandName, tocDirectory, force = false, expandEndpoints = false, expandModels = false) {
|
|
23
23
|
try {
|
|
24
24
|
const tocDir = await this.getDestinationPath(buildDirectory, tocDirectory);
|
|
25
25
|
const tocPath = new FilePath(tocDir, new FileName(this.DEFAULT_TOC_FILENAME));
|
|
@@ -27,7 +27,7 @@ export class PortalNewTocAction {
|
|
|
27
27
|
if (!tocCheckResult.isSuccess()) {
|
|
28
28
|
return Result.cancelled(tocCheckResult.value);
|
|
29
29
|
}
|
|
30
|
-
const { endpointGroups, models } = await this.extractSdlComponents(buildDirectory, configDir, expandEndpoints, expandModels);
|
|
30
|
+
const { endpointGroups, models } = await this.extractSdlComponents(buildDirectory, configDir, commandName, expandEndpoints, expandModels);
|
|
31
31
|
const contentGroups = await this.extractContentGroups(buildDirectory);
|
|
32
32
|
const toc = this.tocGenerator.createTocStructure(endpointGroups, models, expandEndpoints, expandModels, contentGroups);
|
|
33
33
|
const yamlString = this.tocGenerator.transformToYaml(toc);
|
|
@@ -51,7 +51,7 @@ export class PortalNewTocAction {
|
|
|
51
51
|
}
|
|
52
52
|
return Result.success("TOC check passed.");
|
|
53
53
|
}
|
|
54
|
-
async extractSdlComponents(buildDirectory, configDir, expandEndpoints, expandModels) {
|
|
54
|
+
async extractSdlComponents(buildDirectory, configDir, commandName, expandEndpoints, expandModels) {
|
|
55
55
|
if (!expandEndpoints && !expandModels) {
|
|
56
56
|
return { endpointGroups: new Map(), models: [] };
|
|
57
57
|
}
|
|
@@ -62,7 +62,7 @@ export class PortalNewTocAction {
|
|
|
62
62
|
this.prompts.displayInfo("Falling back to default TOC structure without expanded endpoints or models...");
|
|
63
63
|
return { endpointGroups: new Map(), models: [] };
|
|
64
64
|
}
|
|
65
|
-
const sdlResult = await this.sdlParser.getTocComponentsFromSdl(specFolderPath, configDir);
|
|
65
|
+
const sdlResult = await this.sdlParser.getTocComponentsFromSdl(specFolderPath, configDir, commandName);
|
|
66
66
|
if (!sdlResult.isSuccess()) {
|
|
67
67
|
this.prompts.stopProgressIndicatorWithMessage(`⚠️ ${sdlResult.error}`);
|
|
68
68
|
this.prompts.displayInfo("Falling back to default TOC structure without expanded endpoints or models...");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-toc.js","sourceRoot":"","sources":["../../../../src/actions/portal/toc/new-toc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,4DAA4D,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AAEzF,OAAO,EAAE,aAAa,EAAE,MAAM,oDAAoD,CAAC;AAEnF,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,OAAO,kBAAkB;IAQ7B;QAHiB,yBAAoB,GAAW,SAAkB,CAAC;QAClD,4BAAuB,GAAW,qBAA8B,CAAC;QAGhF,IAAI,CAAC,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,YAAY,GAAG,IAAI,qBAAqB,EAAE,CAAC;QAChD,IAAI,CAAC,aAAa,GAAG,IAAI,gBAAgB,EAAE,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,SAAS,CACpB,cAA6B,EAC7B,SAAiB,EACjB,YAA4B,EAC5B,QAAiB,KAAK,EACtB,kBAA2B,KAAK,EAChC,eAAwB,KAAK;QAE7B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YAC3E,MAAM,OAAO,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAA;YAC7E,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACpE,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,CAAC;gBAChC,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,KAAM,CAAC,CAAC;YACjD,CAAC;YAED,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAChE,cAAc,EACd,SAAS,EACT,eAAe,EACf,YAAY,CACb,CAAC;YAEF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAEtE,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAC9C,cAAc,EACd,MAAM,EACN,eAAe,EACf,YAAY,EACZ,aAAa,CACd,CAAC;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAC1D,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;YAE5D,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC1C,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,GAAI,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC3E,OAAO,MAAM,CAAC,OAAO,CAAC,6DAA6D,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,OAAe,EAAE,QAAgB;QACpE,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,OAAiB,EAAE,KAAc;QAC/D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACnE,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,SAAS,CAAC,sCAAsC,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC7C,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAChC,cAA6B,EAC7B,SAAiB,EACjB,eAAwB,EACxB,YAAqB;QAErB,IAAI,CAAC,eAAe,IAAI,CAAC,YAAY,EAAE,CAAC;YACtC,OAAO,EAAE,cAAc,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,iCAAiC,CAAC,kEAAkE,CAAC,CAAC;QACnH,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAEpE,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,OAAO,CAAC,gCAAgC,CAAC,kDAAkD,cAAc,EAAE,CAAC,CAAC;YAClH,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,+EAA+E,CAAC,CAAC;YAC1G,OAAO,EAAE,cAAc,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACnD,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"new-toc.js","sourceRoot":"","sources":["../../../../src/actions/portal/toc/new-toc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,4DAA4D,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AAEzF,OAAO,EAAE,aAAa,EAAE,MAAM,oDAAoD,CAAC;AAEnF,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,OAAO,kBAAkB;IAQ7B;QAHiB,yBAAoB,GAAW,SAAkB,CAAC;QAClD,4BAAuB,GAAW,qBAA8B,CAAC;QAGhF,IAAI,CAAC,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,YAAY,GAAG,IAAI,qBAAqB,EAAE,CAAC;QAChD,IAAI,CAAC,aAAa,GAAG,IAAI,gBAAgB,EAAE,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,SAAS,CACpB,cAA6B,EAC7B,SAAiB,EACjB,WAAmB,EACnB,YAA4B,EAC5B,QAAiB,KAAK,EACtB,kBAA2B,KAAK,EAChC,eAAwB,KAAK;QAE7B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YAC3E,MAAM,OAAO,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAA;YAC7E,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACpE,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,CAAC;gBAChC,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,KAAM,CAAC,CAAC;YACjD,CAAC;YAED,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAChE,cAAc,EACd,SAAS,EACT,WAAW,EACX,eAAe,EACf,YAAY,CACb,CAAC;YAEF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAEtE,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAC9C,cAAc,EACd,MAAM,EACN,eAAe,EACf,YAAY,EACZ,aAAa,CACd,CAAC;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAC1D,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;YAE5D,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC1C,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,GAAI,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC3E,OAAO,MAAM,CAAC,OAAO,CAAC,6DAA6D,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,OAAe,EAAE,QAAgB;QACpE,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,OAAiB,EAAE,KAAc;QAC/D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACnE,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,SAAS,CAAC,sCAAsC,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC7C,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAChC,cAA6B,EAC7B,SAAiB,EACjB,WAAmB,EACnB,eAAwB,EACxB,YAAqB;QAErB,IAAI,CAAC,eAAe,IAAI,CAAC,YAAY,EAAE,CAAC;YACtC,OAAO,EAAE,cAAc,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,iCAAiC,CAAC,kEAAkE,CAAC,CAAC;QACnH,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAEpE,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,OAAO,CAAC,gCAAgC,CAAC,kDAAkD,cAAc,EAAE,CAAC,CAAC;YAClH,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,+EAA+E,CAAC,CAAC;YAC1G,OAAO,EAAE,cAAc,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACnD,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,cAAc,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAEvG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC;YAC3B,IAAI,CAAC,OAAO,CAAC,gCAAgC,CAAC,MAAM,SAAS,CAAC,KAAM,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,+EAA+E,CAAC,CAAC;YAC1G,OAAO,EAAE,cAAc,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,gCAAgC,CAC3C,wEAAwE,CACzE,CAAC;QACF,OAAO,SAAS,CAAC,KAAM,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,cAA6B;QAC9D,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;QAE1E,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC;YAC9D,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,8CAA8C,iBAAiB,EAAE,CAAC,CAAC;YAC5F,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,4CAA4C,CAAC,CAAC;YACvE,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,cAA6B,EAAE,oBAAoC;QAClG,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAC5E,OAAO,mBAAmB,CAAC;QAC7B,CAAC;QACD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,OAAiB,EAAE,KAAc;QAC9D,IAAI,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC7D,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,cAA6B;;QAC9D,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,oBAAoB,GAAG,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE5D,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;YACrC,OAAO,oBAAoB,CAAC;QAC9B,CAAC;QAED,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,oBAAoB,EAAE,CAAC;YAC9D,IAAI,CAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,aAAa,KAAI,IAAI,EAAE,CAAC;gBACtD,OAAO,oBAAoB,CAAC;YAC9B,CAAC;YACD,OAAO,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvF,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,oBAAoB,CAAC;QAC9B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,cAA6B;;QAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACzF,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;QAEvE,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;YAC/C,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAElE,IAAI,CAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,WAAW,KAAI,IAAI,EAAE,CAAC;gBACpD,OAAO,iBAAiB,CAAC;YAC3B,CAAC;YACD,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACtF,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,iBAAiB,CAAC;QAC3B,CAAC;IACH,CAAC;CACF"}
|
|
@@ -9,6 +9,6 @@ export declare class GenerateAction {
|
|
|
9
9
|
private readonly configDir;
|
|
10
10
|
private readonly authKey;
|
|
11
11
|
constructor(configDir: DirectoryPath, authKey?: string | null);
|
|
12
|
-
readonly execute: (specDirectory: DirectoryPath, sdkDirectory: DirectoryPath, platform: LanguagePlatform, force: boolean, zipSdk: boolean) => Promise<ActionResult>;
|
|
12
|
+
readonly execute: (specDirectory: DirectoryPath, sdkDirectory: DirectoryPath, platform: LanguagePlatform, commandName: string, force: boolean, zipSdk: boolean) => Promise<ActionResult>;
|
|
13
13
|
private convertSimplePlatformToPlatform;
|
|
14
14
|
}
|
|
@@ -16,13 +16,13 @@ export class GenerateAction {
|
|
|
16
16
|
this.zipArchiver = new ZipService();
|
|
17
17
|
this.fileService = new FileService();
|
|
18
18
|
this.portalService = new PortalService();
|
|
19
|
-
this.execute = async (specDirectory, sdkDirectory, platform, force, zipSdk) => {
|
|
19
|
+
this.execute = async (specDirectory, sdkDirectory, platform, commandName, force, zipSdk) => {
|
|
20
20
|
if (specDirectory.isEqual(sdkDirectory)) {
|
|
21
21
|
return ActionResult.error(`The spec directory and sdk directory cannot be the same: "${specDirectory}"`);
|
|
22
22
|
}
|
|
23
23
|
const specContext = new SpecContext(specDirectory);
|
|
24
24
|
if (!(await specContext.validate())) {
|
|
25
|
-
return ActionResult.error(`
|
|
25
|
+
return ActionResult.error(`Unable to locate a valid "src" directory. Navigate to the directory containing your APIMatic Portal source or set up a new project by running apimatic portal:quickstart.`);
|
|
26
26
|
}
|
|
27
27
|
const sdkContext = new SdkContext(sdkDirectory, platform);
|
|
28
28
|
if (!force && (await sdkContext.exists()) && !(await this.prompts.overwriteSdk(sdkDirectory))) {
|
|
@@ -33,7 +33,7 @@ export class GenerateAction {
|
|
|
33
33
|
const specZipPath = new FilePath(tempDirectory, new FileName("spec.zip"));
|
|
34
34
|
await this.zipArchiver.archive(specDirectory, specZipPath);
|
|
35
35
|
const sdkPlatform = this.convertSimplePlatformToPlatform(platform);
|
|
36
|
-
const response = await this.portalService.generateSdk(specZipPath, sdkPlatform, this.configDir, this.authKey);
|
|
36
|
+
const response = await this.portalService.generateSdk(specZipPath, sdkPlatform, this.configDir, commandName, this.authKey);
|
|
37
37
|
if (!response.isSuccess()) {
|
|
38
38
|
this.prompts.displaySdkGenerationErrorMessage();
|
|
39
39
|
return ActionResult.error(response.error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/actions/sdk/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,OAAO,cAAc;IAQzB,YAAY,SAAwB,EAAE,UAAyB,IAAI;QAPlD,YAAO,GAAuB,IAAI,kBAAkB,EAAE,CAAC;QACvD,gBAAW,GAAe,IAAI,UAAU,EAAE,CAAC;QAC3C,gBAAW,GAAgB,IAAI,WAAW,EAAE,CAAC;QAC7C,kBAAa,GAAkB,IAAI,aAAa,EAAE,CAAC;QASpD,YAAO,GAAG,KAAK,EAC7B,aAA4B,EAC5B,YAA2B,EAC3B,QAA0B,EAC1B,KAAc,EACd,MAAe,EACQ,EAAE;YACzB,IAAI,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;gBACxC,OAAO,YAAY,CAAC,KAAK,CAAC,6DAA6D,aAAa,GAAG,CAAC,CAAC;YAC3G,CAAC;YAED,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,aAAa,CAAC,CAAC;YACnD,IAAI,CAAC,CAAC,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;gBACpC,OAAO,YAAY,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/actions/sdk/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { ActionResult } from "../../../actions/action-result.js";
|
|
|
5
5
|
export declare class PortalWatcher {
|
|
6
6
|
private watcherHandler;
|
|
7
7
|
constructor();
|
|
8
|
-
watchAndRegeneratePortalOnChange(paths: ServePaths, generatePortal: (buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, force: boolean, zipPortal: boolean) => Promise<ActionResult>): Promise<chokidar.FSWatcher>;
|
|
8
|
+
watchAndRegeneratePortalOnChange(paths: ServePaths, commandName: string, generatePortal: (buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, commandName: string, force: boolean, zipPortal: boolean) => Promise<ActionResult>): Promise<chokidar.FSWatcher>;
|
|
9
9
|
cancelPendingOperations(): void;
|
|
10
|
-
protected handleFileChange(paths: ServePaths, eventQueue: Map<string, string>, eventId: string, generatePortal: (buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, force: boolean, zipPortal: boolean) => Promise<ActionResult>): Promise<void>;
|
|
10
|
+
protected handleFileChange(paths: ServePaths, eventQueue: Map<string, string>, eventId: string, commandName: string, generatePortal: (buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, commandName: string, force: boolean, zipPortal: boolean) => Promise<ActionResult>): Promise<void>;
|
|
11
11
|
}
|
|
@@ -8,7 +8,7 @@ export class PortalWatcher {
|
|
|
8
8
|
constructor() {
|
|
9
9
|
this.watcherHandler = new WatcherHandler();
|
|
10
10
|
}
|
|
11
|
-
async watchAndRegeneratePortalOnChange(paths, generatePortal) {
|
|
11
|
+
async watchAndRegeneratePortalOnChange(paths, commandName, generatePortal) {
|
|
12
12
|
//Regex matches any hidden files and folders.
|
|
13
13
|
const watcher = chokidar.watch(paths.sourceDirectoryPath, {
|
|
14
14
|
ignored: [/(^|[/\\])\..+/],
|
|
@@ -38,7 +38,7 @@ export class PortalWatcher {
|
|
|
38
38
|
eventQueue.set(eventId, path);
|
|
39
39
|
});
|
|
40
40
|
await this.watcherHandler.execute(async () => {
|
|
41
|
-
await this.handleFileChange(paths, eventQueue, eventId, generatePortal);
|
|
41
|
+
await this.handleFileChange(paths, eventQueue, eventId, commandName, generatePortal);
|
|
42
42
|
});
|
|
43
43
|
})
|
|
44
44
|
.on("error", () => {
|
|
@@ -53,11 +53,11 @@ export class PortalWatcher {
|
|
|
53
53
|
this.watcherHandler.cancel();
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
|
-
async handleFileChange(paths, eventQueue, eventId, generatePortal) {
|
|
56
|
+
async handleFileChange(paths, eventQueue, eventId, commandName, generatePortal) {
|
|
57
57
|
if (!eventQueue.has(eventId)) {
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
|
-
const result = await generatePortal(new DirectoryPath(paths.sourceDirectoryPath), new DirectoryPath(paths.destinationDirectoryPath), true, false);
|
|
60
|
+
const result = await generatePortal(new DirectoryPath(paths.sourceDirectoryPath), new DirectoryPath(paths.destinationDirectoryPath), commandName, true, false);
|
|
61
61
|
result.map((error) => console.log(error));
|
|
62
62
|
}
|
|
63
63
|
}
|