@apimatic/cli 1.1.0-alpha.21 → 1.1.0-alpha.22

package/lib/actions/portal/serve.d.ts

@@ -1,14 +1,16 @@
-import { PortalServePrompts } from "../../prompts/portal/serve.js";
-import { ServeFlags, ServePaths } from "../../types/portal/serve.js";
-import { ServeHandler } from "../../application/portal/serve/serve-handler.js";
-import { Result } from "../../types/common/result.js";
-import { PortalService } from "../../infrastructure/services/portal-service.js";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { ActionResult } from "../action-result.js";
+import { CommandMetadata } from "../../types/common/command-metadata.js";
 export declare class PortalServeAction {
-    protected readonly prompts: PortalServePrompts;
-    protected readonly serveHandler: ServeHandler;
-    protected readonly docsPortalService: PortalService;
-    constructor(prompts: PortalServePrompts, serveHandler: ServeHandler, docsPortalService: PortalService);
-    servePortal(flags: ServeFlags, paths: ServePaths, commandName: string, generatePortal: (buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, commandName: string, force: boolean, zipPortal: boolean) => Promise<ActionResult>): Promise<Result<string, string>>;
+    private readonly prompts;
+    private readonly networkService;
+    private readonly launcherService;
+    private readonly application;
+    private readonly configDir;
+    private readonly commandMetadata;
+    private readonly authKey;
+    private isPortalServed;
+    constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata, authKey?: string | null);
+    execute(buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, port: number, openInBrowser: boolean, hotReload: boolean, onAfterServe?: () => void): Promise<ActionResult>;
+    private clearStandardInput;
 }

package/lib/actions/portal/serve.js

@@ -1,24 +1,119 @@
-import { Result } from "../../types/common/result.js";
-import { DirectoryPath } from "../../types/file/directoryPath.js";
+import { createServer as createLiveReloadServer } from "livereload";
+import connectLiveReload from "connect-livereload";
+import express from "express";
+import chokidar from "chokidar";
+import crypto from "crypto";
+import { Mutex } from "async-mutex";
+import { PortalServePrompts } from "../../prompts/portal/serve.js";
+import { ActionResult } from "../action-result.js";
+import { GenerateAction } from "./generate.js";
+import { NetworkService } from "../../infrastructure/network-service.js";
+import { UrlPath } from "../../types/file/urlPath.js";
+import { LauncherService } from "../../infrastructure/launcher-service.js";
+import { DebounceService } from "../../infrastructure/debounce-service.js";
 export class PortalServeAction {
-    constructor(prompts, serveHandler, docsPortalService) {
-        this.prompts = prompts;
-        this.serveHandler = serveHandler;
-        this.docsPortalService = docsPortalService;
+    constructor(configDir, commandMetadata, authKey = null) {
+        this.prompts = new PortalServePrompts();
+        this.networkService = new NetworkService();
+        this.launcherService = new LauncherService();
+        this.application = express();
+        this.isPortalServed = false;
+        this.configDir = configDir;
+        this.commandMetadata = commandMetadata;
+        this.authKey = authKey;
     }
-    async servePortal(flags, paths, commandName, generatePortal) {
-        const result = await generatePortal(new DirectoryPath(paths.sourceDirectoryPath), new DirectoryPath(paths.destinationDirectoryPath), commandName, false, false);
-        return result.mapAll(async () => {
-            const setupServerResult = await this.serveHandler.setupServer(paths.destinationDirectoryPath);
-            if (setupServerResult.isFailed()) {
-                return Result.failure(setupServerResult.error);
+    async execute(buildDirectory, portalDirectory, port, openInBrowser, hotReload, onAfterServe) {
+        const generatePortalAction = new GenerateAction(this.configDir, this.commandMetadata, this.authKey);
+        const result = await generatePortalAction.execute(buildDirectory, portalDirectory, true, false);
+        if (result.isFailed()) {
+            return ActionResult.failed();
+        }
+        const servePort = await this.networkService.getServerPort([port, 3000, 3001, 3002]);
+        if (servePort != port && !onAfterServe) {
+            this.prompts.usingFallbackPort(port, servePort);
+        }
+        const liveReloadPort = await this.networkService.getServerPort([35729, 35730, 35731, 35732]);
+        const liveReloadServer = createLiveReloadServer({ port: liveReloadPort });
+        const server = this.application
+            .use(connectLiveReload())
+            .use(express.static(portalDirectory.toString(), { extensions: ["html"] }))
+            .listen(servePort);
+        const portalUrl = new UrlPath(`http://localhost:${servePort}`);
+        this.prompts.portalServed(portalUrl);
+        if (openInBrowser) {
+            await this.launcherService.openUrlInBrowser(portalUrl);
+        }
+        this.prompts.promptForExit();
+        if (!hotReload) {
+            if (onAfterServe) {
+                onAfterServe();
             }
-            const startServerResult = await this.serveHandler.startServer(paths, flags, commandName, generatePortal);
-            if (startServerResult.isFailed()) {
-                return Result.failure(startServerResult.error);
+            this.clearStandardInput();
+            await this.prompts.blockExecution();
+            liveReloadServer.close();
+            server.close();
+            return ActionResult.success();
+        }
+        this.prompts.hotReloadEnabled(buildDirectory);
+        const watcher = chokidar.watch(buildDirectory.toString(), {
+            ignored: [/(^|[/\\])\..+/],
+            ignoreInitial: true,
+            persistent: true,
+            awaitWriteFinish: true,
+            atomic: true
+        });
+        const deletedDirectories = new Set();
+        // TODO: Verify if we need mutex and eventQueue after refactoring.
+        const eventQueue = new Map();
+        const mutex = new Mutex();
+        const debounceService = new DebounceService();
+        watcher
+            .on("all", async (event, path) => {
+            // triggers folder deletion as a single event
+            if (event == "unlinkDir") {
+                deletedDirectories.add(path);
             }
-            return Result.success(`Portal was successfully served.`);
-        }, async (message) => Result.failure(message));
+            if (event == "unlink") {
+                for (const dir of deletedDirectories) {
+                    if (path.startsWith(dir)) {
+                        return;
+                    }
+                }
+            }
+            const eventId = `${Date.now()}-${crypto.randomUUID()}`;
+            await mutex.runExclusive(async () => {
+                eventQueue.clear();
+                eventQueue.set(eventId, path);
+            });
+            await debounceService.batchSingleRequest(async () => {
+                this.prompts.changesDetected();
+                // TODO: Verify if this is needed.
+                if (!eventQueue.has(eventId)) {
+                    return;
+                }
+                await generatePortalAction.execute(buildDirectory, portalDirectory, true, false, false);
+                liveReloadServer.refresh(portalDirectory.toString());
+                this.clearStandardInput();
+            });
+        })
+            .on("error", async () => {
+            this.prompts.watcherError();
+        });
+        // Wait for SIGINT or SIGTERM
+        this.clearStandardInput();
+        await this.prompts.blockExecution();
+        await watcher.close();
+        debounceService.close();
+        liveReloadServer.close();
+        server.close();
+        return ActionResult.success();
+    }
+    // This clears the standard input to allow interrupts like CTRL+C to work properly.
+    clearStandardInput() {
+        if (process.platform !== "darwin" && process.stdin.isTTY) {
+            process.stdin.setRawMode(false);
+            process.stdin.pause();
+        }
     }
 }
 //# sourceMappingURL=serve.js.map

package/lib/actions/portal/serve.js.map

@@ -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,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"}
+{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/actions/portal/serve.ts"],"names":[],"mappings":"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"}

package/lib/actions/portal/toc/new-toc.d.ts

@@ -1,20 +1,21 @@
-import { Result } from "../../../types/common/result.js";
+import { TocGroup } from "../../../types/toc/toc.js";
 import { DirectoryPath } from "../../../types/file/directoryPath.js";
+import { CommandMetadata } from "../../../types/common/command-metadata.js";
+import { ActionResult } from "../../action-result.js";
+export declare class ContentContext {
+    private readonly contentDirectory;
+    private readonly fileService;
+    constructor(contentDirectory: DirectoryPath);
+    exists(): Promise<boolean>;
+    extractContentGroups(): Promise<TocGroup[]>;
+}
 export declare class PortalNewTocAction {
+    private readonly configDirectory;
+    private readonly commandMetadata;
     private readonly prompts;
-    private readonly sdlParser;
     private readonly tocGenerator;
-    private readonly contentParser;
-    private readonly DEFAULT_TOC_FILENAME;
-    private readonly APIMATIC_BUILD_FILENAME;
-    constructor();
-    createToc(buildDirectory: DirectoryPath, configDir: string, commandName: string, tocDirectory?: DirectoryPath, force?: boolean, expandEndpoints?: boolean, expandModels?: boolean): Promise<Result<string, string>>;
-    private writeToc;
-    private handleExistingToc;
-    private extractSdlComponents;
-    private extractContentGroups;
-    private getDestinationPath;
-    private checkExistingToc;
-    private getContentFolderPath;
-    private getSpecFolderPath;
+    private readonly fileService;
+    private readonly portalService;
+    constructor(configDirectory: DirectoryPath, commandMetadata: CommandMetadata);
+    execute(buildDirectory: DirectoryPath, tocDirectory?: DirectoryPath, force?: boolean, expandEndpoints?: boolean, expandModels?: boolean): Promise<ActionResult>;
 }

package/lib/actions/portal/toc/new-toc.js

@@ -1,133 +1,97 @@
-import * as path from "path";
-import fsExtra from "fs-extra";
+import { ok } from "neverthrow";
 import { PortalNewTocPrompts } from "../../../prompts/portal/toc/new-toc.js";
-import { Result } from "../../../types/common/result.js";
-import { getMessageInRedColor } from "../../../utils/utils.js";
-import { SdlParser } from "../../../application/portal/toc/sdl-parser.js";
 import { TocStructureGenerator } from "../../../application/portal/toc/toc-structure-generator.js";
-import { TocContentParser } from "../../../application/portal/toc/toc-content-parser.js";
-import { PortalService } from "../../../infrastructure/services/portal-service.js";
-import { FilePath } from "../../../types/file/filePath.js";
-import { FileName } from "../../../types/file/fileName.js";
+import { ActionResult } from "../../action-result.js";
+import { TocContext } from "../../../types/toc-context.js";
+import { FileService } from "../../../infrastructure/file-service.js";
 import { BuildContext } from "../../../types/build-context.js";
-export class PortalNewTocAction {
-    constructor() {
-        this.DEFAULT_TOC_FILENAME = "toc.yml";
-        this.APIMATIC_BUILD_FILENAME = "APIMATIC-BUILD.json";
-        this.prompts = new PortalNewTocPrompts();
-        this.sdlParser = new SdlParser(new PortalService());
-        this.tocGenerator = new TocStructureGenerator();
-        this.contentParser = new TocContentParser();
-    }
-    async createToc(buildDirectory, configDir, commandName, tocDirectory, force = false, expandEndpoints = false, expandModels = false) {
-        try {
-            const tocDir = await this.getDestinationPath(buildDirectory, tocDirectory);
-            const tocPath = new FilePath(tocDir, new FileName(this.DEFAULT_TOC_FILENAME));
-            const tocCheckResult = await this.handleExistingToc(tocPath, force);
-            if (!tocCheckResult.isSuccess()) {
-                return Result.cancelled(tocCheckResult.value);
-            }
-            const { endpointGroups, models } = await this.extractSdlComponents(buildDirectory, configDir, commandName, expandEndpoints, expandModels);
-            const contentGroups = await this.extractContentGroups(buildDirectory);
-            const toc = this.tocGenerator.createTocStructure(endpointGroups, models, expandEndpoints, expandModels, contentGroups);
-            const yamlString = this.tocGenerator.transformToYaml(toc);
-            await this.writeToc(tocPath.toString(), yamlString, "utf8");
-            this.prompts.displayOutroMessage(tocPath);
-            return Result.success(tocPath.toString());
-        }
-        catch (error) {
-            this.prompts.logError(getMessageInRedColor(`${error.message}`));
-            return Result.failure(`An unexpected error occurred while generating the TOC file.`);
-        }
-    }
-    async writeToc(path, content, encoding) {
-        await fsExtra.ensureFile(path);
-        await fsExtra.writeFile(path, content, encoding);
-    }
-    async handleExistingToc(tocPath, force) {
-        const shouldContinue = await this.checkExistingToc(tocPath, force);
-        if (!shouldContinue) {
-            return Result.cancelled("Operation was cancelled by the user.");
-        }
-        return Result.success("TOC check passed.");
-    }
-    async extractSdlComponents(buildDirectory, configDir, commandName, expandEndpoints, expandModels) {
-        if (!expandEndpoints && !expandModels) {
-            return { endpointGroups: new Map(), models: [] };
-        }
-        this.prompts.startProgressIndicatorWithMessage("Extracting endpoints and/or models from the API specification...");
-        const specFolderPath = await this.getSpecFolderPath(buildDirectory);
-        if (!(await fsExtra.pathExists(specFolderPath))) {
-            this.prompts.stopProgressIndicatorWithMessage(`⚠️ Could not find the specification folder at: ${specFolderPath}`);
-            this.prompts.displayInfo("Falling back to default TOC structure without expanded endpoints or models...");
-            return { endpointGroups: new Map(), models: [] };
-        }
-        const sdlResult = await this.sdlParser.getTocComponentsFromSdl(specFolderPath, configDir, commandName);
-        if (!sdlResult.isSuccess()) {
-            this.prompts.stopProgressIndicatorWithMessage(`⚠️ ${sdlResult.error}`);
-            this.prompts.displayInfo("Falling back to default TOC structure without expanded endpoints or models...");
-            return { endpointGroups: new Map(), models: [] };
-        }
-        this.prompts.stopProgressIndicatorWithMessage("Successfully extracted endpoints and/or models from the specification.");
-        return sdlResult.value;
+import { getEndpointGroupsAndModels } from "../../../types/sdl/sdl.js";
+import { withDirPath } from "../../../infrastructure/tmp-extensions.js";
+import { TempContext } from "../../../types/temp-context.js";
+import { PortalService } from "../../../infrastructure/services/portal-service.js";
+export class ContentContext {
+    constructor(contentDirectory) {
+        this.contentDirectory = contentDirectory;
+        this.fileService = new FileService();
     }
-    async extractContentGroups(buildDirectory) {
-        const contentFolderPath = await this.getContentFolderPath(buildDirectory);
-        if (!(await fsExtra.pathExists(contentFolderPath.toString()))) {
-            this.prompts.displayInfo(`⚠️ Could not locate the content folder at: ${contentFolderPath}`);
-            this.prompts.displayInfo("Skipping custom content addition in TOC...");
-            return [];
-        }
-        return await this.contentParser.parseContentFolder(contentFolderPath.toString(), contentFolderPath.toString());
+    async exists() {
+        return this.fileService.directoryExists(this.contentDirectory);
     }
-    async getDestinationPath(buildDirectory, providedTocDirectory) {
-        if (providedTocDirectory === undefined) {
-            const inferredDestination = await this.getContentFolderPath(buildDirectory);
-            return inferredDestination;
-        }
-        return providedTocDirectory;
+    async extractContentGroups() {
+        const directory = await this.fileService.getDirectory(this.contentDirectory);
+        return await directory.parseContentFolder(this.contentDirectory);
     }
-    async checkExistingToc(tocPath, force) {
-        if ((await fsExtra.pathExists(tocPath.toString())) && !force) {
-            return await this.prompts.overwriteExistingTocPrompt(tocPath);
-        }
-        return true;
+}
+export class PortalNewTocAction {
+    constructor(configDirectory, commandMetadata) {
+        this.configDirectory = configDirectory;
+        this.commandMetadata = commandMetadata;
+        this.prompts = new PortalNewTocPrompts();
+        this.tocGenerator = new TocStructureGenerator();
+        this.fileService = new FileService();
+        this.portalService = new PortalService();
     }
-    async getContentFolderPath(buildDirectory) {
-        var _a;
+    async execute(buildDirectory, tocDirectory, force = false, expandEndpoints = false, expandModels = false) {
+        var _a, _b;
+        // Validate build directory
         const buildContext = new BuildContext(buildDirectory);
-        const defaultContentFolder = buildDirectory.join("content");
         if (!(await buildContext.validate())) {
-            return defaultContentFolder;
-        }
-        try {
-            const buildConfig = await buildContext.getBuildFileContents();
-            if (((_a = buildConfig.generatePortal) === null || _a === void 0 ? void 0 : _a.contentFolder) == null) {
-                return defaultContentFolder;
-            }
-            return buildDirectory.join(buildConfig.generatePortal.contentFolder).join("content");
+            this.prompts.invalidBuildDirectory(buildDirectory);
+            return ActionResult.failed();
         }
-        catch (_b) {
-            return defaultContentFolder;
+        const buildConfig = await buildContext.getBuildFileContents();
+        const contentDirectory = buildDirectory.join((_b = (_a = buildConfig.generatePortal) === null || _a === void 0 ? void 0 : _a.contentFolder) !== null && _b !== void 0 ? _b : "content");
+        const tocDir = tocDirectory !== null && tocDirectory !== void 0 ? tocDirectory : contentDirectory;
+        const tocContext = new TocContext(tocDir);
+        if (!force && (await tocContext.exists()) && !(await this.prompts.overwriteToc(tocContext.tocPath))) {
+            this.prompts.tocFileAlreadyExists();
+            return ActionResult.cancelled();
         }
-    }
-    async getSpecFolderPath(buildDirectory) {
-        var _a;
-        const buildFilePath = path.join(buildDirectory.toString(), this.APIMATIC_BUILD_FILENAME);
-        const defaultSpecFolder = path.join(buildDirectory.toString(), "spec");
-        if (!(await fsExtra.pathExists(buildFilePath))) {
-            return defaultSpecFolder;
-        }
-        try {
-            const buildConfig = await fsExtra.readJson(buildFilePath, "utf8");
-            if (((_a = buildConfig.generatePortal) === null || _a === void 0 ? void 0 : _a.apiSpecPath) == null) {
-                return defaultSpecFolder;
+        let sdlComponents = { endpointGroups: new Map(), models: [] };
+        if (expandEndpoints || expandModels) {
+            const specDirectory = buildDirectory.join("spec");
+            if (!(await this.fileService.directoryExists(specDirectory))) {
+                this.prompts.fallingBackToDefault();
+            }
+            else {
+                const sdlResult = await withDirPath(async (tempDirectory) => {
+                    const tempContext = new TempContext(tempDirectory);
+                    const specZipPath = await tempContext.zip(specDirectory);
+                    const specFileStream = await this.fileService.getStream(specZipPath);
+                    try {
+                        const result = await this.prompts.extractEndpointGroupsAndModels(this.portalService.generateSdl(specFileStream, this.configDirectory, this.commandMetadata));
+                        if (result.isErr()) {
+                            this.prompts.fallingBackToDefault();
+                            return ok({ endpointGroups: new Map(), models: [] });
+                        }
+                        return ok(getEndpointGroupsAndModels(result.value));
+                    }
+                    finally {
+                        specFileStream.close();
+                    }
+                });
+                if (sdlResult.isErr()) {
+                    this.prompts.logError(sdlResult.error);
+                    return ActionResult.failed();
+                }
+                sdlComponents = sdlResult.value;
             }
-            return path.join(buildDirectory.toString(), buildConfig.generatePortal.apiSpecPath);
         }
-        catch (_b) {
-            return defaultSpecFolder;
+        const contentContext = new ContentContext(contentDirectory);
+        const contentExists = await contentContext.exists();
+        let contentGroups;
+        if (!contentExists) {
+            this.prompts.contentDirectoryNotFound(contentDirectory);
+            contentGroups = [];
+        }
+        else {
+            contentGroups = await contentContext.extractContentGroups();
         }
+        const toc = this.tocGenerator.createTocStructure(sdlComponents.endpointGroups, sdlComponents.models, expandEndpoints, expandModels, contentGroups);
+        const yamlString = this.tocGenerator.transformToYaml(toc);
+        const tocFilePath = await tocContext.save(yamlString);
+        this.prompts.tocCreated(tocFilePath);
+        return ActionResult.success();
     }
 }
 //# sourceMappingURL=new-toc.js.map

package/lib/actions/portal/toc/new-toc.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-toc.js","sourceRoot":"","sources":["../../../../src/actions/portal/toc/new-toc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new-toc.js","sourceRoot":"","sources":["../../../../src/actions/portal/toc/new-toc.ts"],"names":[],"mappings":"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"}

package/lib/actions/sdk/generate.d.ts

@@ -1,14 +1,13 @@
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { ActionResult } from "../action-result.js";
-import { LanguagePlatform } from "../../types/sdk/generate.js";
+import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { Language } from "../../types/sdk/generate.js";
 export declare class GenerateAction {
     private readonly prompts;
-    private readonly zipArchiver;
-    private readonly fileService;
     private readonly portalService;
     private readonly configDir;
+    private readonly commandMetadata;
     private readonly authKey;
-    constructor(configDir: DirectoryPath, authKey?: string | null);
-    readonly execute: (specDirectory: DirectoryPath, sdkDirectory: DirectoryPath, platform: LanguagePlatform, commandName: string, force: boolean, zipSdk: boolean) => Promise<ActionResult>;
-    private convertSimplePlatformToPlatform;
+    constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata, authKey?: string | null);
+    readonly execute: (specDirectory: DirectoryPath, sdkDirectory: DirectoryPath, language: Language, force: boolean, zipSdk: boolean) => Promise<ActionResult>;
 }

package/lib/actions/sdk/generate.js

@@ -1,72 +1,47 @@
-import { ZipService } from "../../infrastructure/zip-service.js";
-import { FileService } from "../../infrastructure/file-service.js";
 import { PortalService } from "../../infrastructure/services/portal-service.js";
-import { FilePath } from "../../types/file/filePath.js";
-import { FileName } from "../../types/file/fileName.js";
 import { ActionResult } from "../action-result.js";
 import { withDirPath } from "../../infrastructure/tmp-extensions.js";
 import { SdkContext } from "../../types/sdk-context.js";
-import { Platforms } from "@apimatic/sdk";
 import { SpecContext } from "../../types/spec-context.js";
 import { SdkGeneratePrompts } from "../../prompts/sdk/generate.js";
-import { LanguagePlatform } from "../../types/sdk/generate.js";
+import { TempContext } from "../../types/temp-context.js";
 export class GenerateAction {
-    constructor(configDir, authKey = null) {
+    constructor(configDir, commandMetadata, authKey = null) {
         this.prompts = new SdkGeneratePrompts();
-        this.zipArchiver = new ZipService();
-        this.fileService = new FileService();
         this.portalService = new PortalService();
-        this.execute = async (specDirectory, sdkDirectory, platform, commandName, force, zipSdk) => {
+        this.execute = async (specDirectory, sdkDirectory, language, force, zipSdk) => {
             if (specDirectory.isEqual(sdkDirectory)) {
-                return ActionResult.error(`The spec directory and sdk directory cannot be the same: "${specDirectory}"`);
+                this.prompts.sameSpecAndSdkDir(specDirectory);
+                return ActionResult.failed();
             }
             const specContext = new SpecContext(specDirectory);
             if (!(await specContext.validate())) {
-                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.`);
+                this.prompts.invalidSpecDirectory(specDirectory);
+                return ActionResult.failed();
             }
-            const sdkContext = new SdkContext(sdkDirectory, platform);
-            if (!force && (await sdkContext.exists()) && !(await this.prompts.overwriteSdk(sdkDirectory))) {
-                return ActionResult.error("Please enter a different destination folder or remove the existing files and try again.");
+            const sdkContext = new SdkContext(sdkDirectory, language);
+            if (!force && (await sdkContext.exists()) && !(await this.prompts.overwriteSdk(sdkContext.sdkLanguageDirectory))) {
+                this.prompts.destinationDirNotEmpty();
+                return ActionResult.cancelled();
             }
             return await withDirPath(async (tempDirectory) => {
-                this.prompts.displaySdkGenerationMessage();
-                const specZipPath = new FilePath(tempDirectory, new FileName("spec.zip"));
-                await this.zipArchiver.archive(specDirectory, specZipPath);
-                const sdkPlatform = this.convertSimplePlatformToPlatform(platform);
-                const response = await this.portalService.generateSdk(specZipPath, sdkPlatform, this.configDir, commandName, this.authKey);
-                if (!response.isSuccess()) {
-                    this.prompts.displaySdkGenerationErrorMessage();
-                    return ActionResult.error(response.error);
+                const tempContext = new TempContext(tempDirectory);
+                const specZipPath = await tempContext.zip(specDirectory);
+                const response = await this.prompts.generateSDK(this.portalService.generateSdk(specZipPath, language, this.configDir, this.commandMetadata, this.authKey));
+                // TODO: this should be service error
+                if (response.isErr()) {
+                    this.prompts.logGenerationError(response.error);
+                    return ActionResult.failed();
                 }
-                const tempSdkFilePath = new FilePath(tempDirectory, new FileName("sdk.zip"));
-                await this.fileService.writeFile(tempSdkFilePath, response.value);
-                await sdkContext.save(tempSdkFilePath, zipSdk);
-                this.prompts.displaySdkGenerationSuccessMessage();
+                const tempSdkFilePath = await tempContext.save(response.value);
+                const sdkLanguageDirectory = await sdkContext.save(tempSdkFilePath, zipSdk);
+                this.prompts.sdkGenerated(sdkLanguageDirectory);
                 return ActionResult.success();
             });
         };
         this.configDir = configDir;
+        this.commandMetadata = commandMetadata;
         this.authKey = authKey;
     }
-    convertSimplePlatformToPlatform(languagePlatform) {
-        switch (languagePlatform) {
-            case LanguagePlatform.CSHARP:
-                return Platforms.CsNetStandardLib;
-            case LanguagePlatform.JAVA:
-                return Platforms.JavaEclipseJreLib;
-            case LanguagePlatform.PHP:
-                return Platforms.PhpGenericLibV2;
-            case LanguagePlatform.PYTHON:
-                return Platforms.PythonGenericLib;
-            case LanguagePlatform.RUBY:
-                return Platforms.RubyGenericLib;
-            case LanguagePlatform.TYPESCRIPT:
-                return Platforms.TsGenericLib;
-            case LanguagePlatform.GO:
-                return Platforms.GoGenericLib;
-            default:
-                throw new Error(`Unknown LanguagePlatform: ${languagePlatform}`);
-        }
-    }
 }
 //# sourceMappingURL=generate.js.map

package/lib/actions/sdk/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/actions/sdk/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/actions/sdk/generate.ts"],"names":[],"mappings":"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"}