@apimatic/cli 1.5.0 → 2.0.0-beta.2

package/lib/actions/plugin/record-metadata.js

@@ -1,6 +1,5 @@
 import { ApiService } from '../../infrastructure/services/api-service.js';
 import { PluginRecordMetadataPrompts } from '../../prompts/plugin/record-metadata.js';
-import { PluginConfigContext } from '../../types/plugin-config-context.js';
 import { ActionResult } from '../action-result.js';
 /**
  * Suggested in the prompts as an example of the shape each field takes.
@@ -16,40 +15,44 @@ const DEFAULT_METADATA = {
  * plugin.
  */
 export class PluginRecordMetadataAction {
+    prompts = new PluginRecordMetadataPrompts();
+    apiService = new ApiService();
+    configDir;
+    commandMetadata;
+    authKey;
     constructor(configDir, commandMetadata, authKey = null) {
-        this.prompts = new PluginRecordMetadataPrompts();
-        this.apiService = new ApiService();
-        this.execute = async (buildDirectory) => {
-            const input = await this.prompts.inputPluginMetadata(DEFAULT_METADATA);
-            if ('cancelled' in input) {
-                return ActionResult.cancelled(input.cancelled);
-            }
-            const metadata = input.metadata;
-            const account = await this.prompts.spinnerAccountInfo(this.apiService.getAccountInfo(this.configDir, this.commandMetadata.shell, this.authKey));
-            if (account.isErr()) {
-                this.prompts.accountInfoUnavailable();
-            }
-            const author = account.isOk() ? authorOf(account.value) : undefined;
-            const writeResult = await new PluginConfigContext(buildDirectory).upsertMetadata(metadata, author);
-            if (writeResult.isErr()) {
-                switch (writeResult.error) {
-                    case 'unreadable':
-                        this.prompts.pluginConfigUnreadable();
-                        return ActionResult.failed();
-                    case 'unwritable':
-                        this.prompts.pluginConfigNotWritten();
-                        return ActionResult.failed();
-                    default:
-                        throw writeResult.error;
-                }
-            }
-            this.prompts.metadataRecorded(metadata);
-            return ActionResult.success(writeResult.value);
-        };
         this.configDir = configDir;
         this.commandMetadata = commandMetadata;
         this.authKey = authKey;
     }
+    execute = async (project) => {
+        const input = await this.prompts.inputPluginMetadata(DEFAULT_METADATA);
+        if ('cancelled' in input) {
+            this.prompts.metadataCancelled(input.cancelled);
+            return ActionResult.cancelled(input.cancelled);
+        }
+        const metadata = input.metadata;
+        const account = await this.prompts.spinnerAccountInfo(this.apiService.getAccountInfo(this.configDir, this.commandMetadata.shell, this.authKey));
+        if (account.isErr()) {
+            this.prompts.accountInfoUnavailable();
+        }
+        const author = account.isOk() ? authorOf(account.value) : undefined;
+        const writeResult = await project.pluginConfig().upsertMetadata(metadata, author);
+        if (writeResult.isErr()) {
+            switch (writeResult.error) {
+                case 'unreadable':
+                    this.prompts.pluginConfigUnreadable();
+                    return ActionResult.failed();
+                case 'unwritable':
+                    this.prompts.pluginConfigNotWritten();
+                    return ActionResult.failed();
+                default:
+                    throw writeResult.error;
+            }
+        }
+        this.prompts.metadataRecorded(metadata);
+        return ActionResult.success(writeResult.value);
+    };
 }
 function authorOf(account) {
     return account.FullName ? { name: account.FullName, email: account.Email || undefined } : undefined;

package/lib/actions/plugin/record-metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"record-metadata.js","sourceRoot":"","sources":["../../../src/actions/plugin/record-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AAKtF,OAAO,EAAE,mBAAmB,EAAuB,MAAM,sCAAsC,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;GAEG;AACH,MAAM,gBAAgB,GAAmB;IACvC,QAAQ,EAAE,eAAe;IACzB,UAAU,EAAE,eAAe;IAC3B,aAAa,EAAE,OAAO;CACvB,CAAC;AAEF;;;;GAIG;AACH,MAAM,OAAO,0BAA0B;IAOrC,YAAY,SAAwB,EAAE,eAAgC,EAAE,UAAyB,IAAI;QANpF,YAAO,GAAgC,IAAI,2BAA2B,EAAE,CAAC;QACzE,eAAU,GAAe,IAAI,UAAU,EAAE,CAAC;QAW3C,YAAO,GAAG,KAAK,EAC7B,cAA6B,EACe,EAAE;YAC9C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;YACvE,IAAI,WAAW,IAAI,KAAK,EAAE,CAAC;gBACzB,OAAO,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACjD,CAAC;YAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YAChC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CACnD,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CACzF,CAAC;YACF,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;gBACpB,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;YACxC,CAAC;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACpE,MAAM,WAAW,GAAG,MAAM,IAAI,mBAAmB,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACnG,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC;gBACxB,QAAQ,WAAW,CAAC,KAAK,EAAE,CAAC;oBAC1B,KAAK,YAAY;wBACf,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;wBACtC,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;oBAC/B,KAAK,YAAY;wBACf,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;wBACtC,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;oBAC/B;wBACE,MAAM,WAAW,CAAC,KAAqB,CAAC;gBAC5C,CAAC;YACH,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACxC,OAAO,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC,CAAC;QAtCA,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CAoCF;AAED,SAAS,QAAQ,CAAC,OAAyB;IACzC,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACtG,CAAC"}
+{"version":3,"file":"record-metadata.js","sourceRoot":"","sources":["../../../src/actions/plugin/record-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AAOtF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;GAEG;AACH,MAAM,gBAAgB,GAAmB;IACvC,QAAQ,EAAE,eAAe;IACzB,UAAU,EAAE,eAAe;IAC3B,aAAa,EAAE,OAAO;CACvB,CAAC;AAEF;;;;GAIG;AACH,MAAM,OAAO,0BAA0B;IACpB,OAAO,GAAgC,IAAI,2BAA2B,EAAE,CAAC;IACzE,UAAU,GAAe,IAAI,UAAU,EAAE,CAAC;IAC1C,SAAS,CAAgB;IACzB,eAAe,CAAkB;IACjC,OAAO,CAAgB;IAExC,YAAY,SAAwB,EAAE,eAAgC,EAAE,OAAO,GAAkB,IAAI;QACnG,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEe,OAAO,GAAG,KAAK,EAAE,OAAuB,EAAuC,EAAE;QAC/F,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;QACvE,IAAI,WAAW,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAChD,OAAO,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CACnD,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CACzF,CAAC;QACF,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;QACxC,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACpE,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAClF,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC;YACxB,QAAQ,WAAW,CAAC,KAAK,EAAE,CAAC;gBAC1B,KAAK,YAAY;oBACf,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;oBACtC,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;gBAC/B,KAAK,YAAY;oBACf,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;oBACtC,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;gBAC/B;oBACE,MAAM,WAAW,CAAC,KAAqB,CAAC;YAC5C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACxC,OAAO,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC,CAAC;CACH;AAED,SAAS,QAAQ,CAAC,OAAyB;IACzC,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACtG,CAAC"}

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

@@ -1,13 +1,15 @@
-import { DirectoryPath } from "../../types/file/directoryPath.js";
-import { ActionResult } from "../action-result.js";
-import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { CommandMetadata } from '../../types/common/command-metadata.js';
+import { DirectoryPath } from '../../types/file/directoryPath.js';
+import { ProjectContext } from '../../types/project-context.js';
+import { ActionResult } from '../action-result.js';
 export declare class GenerateAction {
     private readonly prompts;
-    private readonly launcherService;
-    private readonly portalService;
+    private readonly buildService;
     private readonly configDir;
     private readonly commandMetadata;
     private readonly authKey;
     constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata, authKey?: string | null);
-    readonly execute: (buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, force: boolean, zipPortal: boolean, displayMessages?: boolean) => Promise<ActionResult>;
+    readonly execute: (project: ProjectContext, portalDirectory: DirectoryPath, force: boolean, zipPortal: boolean) => Promise<ActionResult>;
+    private confirmOverwrite;
+    private build;
 }

package/lib/actions/portal/generate.js

@@ -1,69 +1,58 @@
-import { PortalGeneratePrompts } from "../../prompts/portal/generate.js";
-import { PortalService } from "../../infrastructure/services/portal-service.js";
-import { ActionResult } from "../action-result.js";
-import { BuildContext } from "../../types/build-context.js";
-import { PortalContext } from "../../types/portal-context.js";
-import { withDirPath } from "../../infrastructure/tmp-extensions.js";
-import { LauncherService } from "../../infrastructure/launcher-service.js";
-import { TempContext } from "../../types/temp-context.js";
-import { ServiceError } from "../../infrastructure/service-error.js";
+import { PortalBuildService } from '../../infrastructure/portal-build-service.js';
+import { PortalGeneratePrompts } from '../../prompts/portal/generate.js';
+import { PortalContext } from '../../types/portal-context.js';
+import { ActionResult } from '../action-result.js';
+import { PreparePortalProjectAction } from './prepare-project.js';
 export class GenerateAction {
+    prompts = new PortalGeneratePrompts();
+    buildService = new PortalBuildService();
+    configDir;
+    commandMetadata;
+    authKey;
     constructor(configDir, commandMetadata, authKey = null) {
-        this.prompts = new PortalGeneratePrompts();
-        this.launcherService = new LauncherService();
-        this.portalService = new PortalService();
-        this.execute = async (buildDirectory, portalDirectory, force, zipPortal, displayMessages = true) => {
-            if (buildDirectory.isEqual(portalDirectory)) {
-                this.prompts.directoryCannotBeSame(portalDirectory);
-                return ActionResult.failed();
-            }
-            const buildContext = new BuildContext(buildDirectory);
-            if (!(await buildContext.validate())) {
-                this.prompts.srcDirectoryEmpty(buildDirectory);
-                return ActionResult.failed();
-            }
-            const portalContext = new PortalContext(portalDirectory);
-            if (!force && (await portalContext.exists()) && !(await this.prompts.overwritePortal(portalDirectory))) {
-                this.prompts.portalDirectoryNotEmpty();
-                return ActionResult.cancelled();
-            }
-            return await withDirPath(async (tempDirectory) => {
-                const tempContext = new TempContext(tempDirectory);
-                const buildZipPath = await tempContext.zip(buildDirectory);
-                const response = await this.prompts.generatePortal(this.portalService.generatePortal(buildZipPath, this.configDir, this.commandMetadata, this.authKey));
-                if (response.isErr()) {
-                    const error = response.error;
-                    if (error instanceof ServiceError) {
-                        const sdkMergeFailedErrors = error.getError("sdkMergeFailed");
-                        if (sdkMergeFailedErrors) {
-                            this.prompts.portalGenerationSdkMergeFailed(sdkMergeFailedErrors);
-                        }
-                        else {
-                            this.prompts.portalGenerationError(error.errorMessage);
-                        }
-                    }
-                    else if (typeof error === "string") {
-                        this.prompts.portalGenerationError(error);
-                    }
-                    else {
-                        const errorZipPath = await tempContext.save(error);
-                        const reportPath = await portalContext.saveError(errorZipPath);
-                        await this.launcherService.openFile(reportPath);
-                        this.prompts.portalGenerationErrorWithReport(reportPath);
-                    }
-                    return ActionResult.failed();
-                }
-                const tempPortalZipPath = await tempContext.save(response.value);
-                await portalContext.save(tempPortalZipPath, zipPortal);
-                if (displayMessages) {
-                    this.prompts.portalGenerated(portalDirectory);
-                }
-                return ActionResult.success();
-            });
-        };
         this.configDir = configDir;
         this.commandMetadata = commandMetadata;
         this.authKey = authKey;
     }
+    execute = async (project, portalDirectory, force, zipPortal) => {
+        if (project.isSourceDirectory(portalDirectory)) {
+            this.prompts.directoryCannotBeSame(portalDirectory);
+            return ActionResult.failed();
+        }
+        // The destination is emptied before the site is written, so a destination that holds
+        // the source would delete the very files being built from.
+        if (project.isSourceWithin(portalDirectory)) {
+            this.prompts.destinationContainsSource(project.sourceDirectory(), portalDirectory);
+            return ActionResult.failed();
+        }
+        const portalContext = new PortalContext(portalDirectory);
+        return await new PreparePortalProjectAction(this.configDir, this.commandMetadata, this.authKey).execute(project, {
+            confirm: () => this.confirmOverwrite(portalContext, portalDirectory, force),
+            onPrepared: (portalProject) => this.build(portalProject, portalContext, portalDirectory, zipPortal)
+        });
+    };
+    async confirmOverwrite(portalContext, portalDirectory, force) {
+        if (force || !(await portalContext.exists()) || (await this.prompts.overwritePortal(portalDirectory))) {
+            return true;
+        }
+        this.prompts.portalDirectoryNotEmpty();
+        return false;
+    }
+    async build(portalProject, portalContext, portalDirectory, zipPortal) {
+        const build = await this.prompts.buildPortal(this.buildService.build(portalProject));
+        if (build.isErr()) {
+            // Written before the temp directory is removed, so the log outlives the build.
+            const logPath = await portalContext.saveBuildLog(build.error.log);
+            this.prompts.buildFailed(build.error.log, logPath);
+            return ActionResult.failed();
+        }
+        const saved = await this.prompts.savePortal(portalContext.save(build.value.output, zipPortal));
+        if (saved.isErr()) {
+            return ActionResult.failed();
+        }
+        this.prompts.portalGenerated(portalDirectory);
+        this.prompts.nextSteps(portalDirectory, zipPortal);
+        return ActionResult.success();
+    }
 }
 //# sourceMappingURL=generate.js.map

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

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

package/lib/actions/portal/prepare-project.d.ts

@@ -0,0 +1,25 @@
+import { PortalProjectPaths } from '../../infrastructure/portal-project-service.js';
+import { CommandMetadata } from '../../types/common/command-metadata.js';
+import { DirectoryPath } from '../../types/file/directoryPath.js';
+import { PortalArtifacts } from '../../types/portal/portal-artifacts.js';
+import { PortalSource } from '../../types/portal/portal-source.js';
+import { ProjectContext } from '../../types/project-context.js';
+import { ActionResult } from '../action-result.js';
+/** What the caller does within the shared run, in the order the run does it. */
+export interface PreparationSteps {
+    /** Asked once the source is read, before the artifacts are fetched; false cancels the run. */
+    confirm?: () => Promise<boolean>;
+    onPrepared: (portalProject: PortalProjectPaths, source: PortalSource, artifacts: PortalArtifacts) => Promise<ActionResult>;
+}
+export declare class PreparePortalProjectAction {
+    private readonly configDir;
+    private readonly commandMetadata;
+    private readonly authKey;
+    private readonly prompts;
+    private readonly projectService;
+    private readonly authorizationService;
+    private readonly artifactsService;
+    constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata, authKey?: string | null);
+    /** Takes the caller's next step rather than returning, because its temporary directories must outlive this call. */
+    readonly execute: (project: ProjectContext, { confirm, onPrepared }: PreparationSteps) => Promise<ActionResult>;
+}

package/lib/actions/portal/prepare-project.js

@@ -0,0 +1,68 @@
+import { PortalProjectService } from '../../infrastructure/portal-project-service.js';
+import { PortalArtifactsService } from '../../infrastructure/services/portal-artifacts-service.js';
+import { PortalAuthorizationService } from '../../infrastructure/services/portal-authorization-service.js';
+import { withPortalProjectDirectory, withDirPath } from '../../infrastructure/tmp-extensions.js';
+import { PreparePortalProjectPrompts } from '../../prompts/portal/prepare-project.js';
+import { ActionResult } from '../action-result.js';
+export class PreparePortalProjectAction {
+    configDir;
+    commandMetadata;
+    authKey;
+    prompts = new PreparePortalProjectPrompts();
+    projectService = new PortalProjectService();
+    authorizationService = new PortalAuthorizationService();
+    artifactsService = new PortalArtifactsService();
+    constructor(configDir, commandMetadata, authKey = null) {
+        this.configDir = configDir;
+        this.commandMetadata = commandMetadata;
+        this.authKey = authKey;
+    }
+    /** Takes the caller's next step rather than returning, because its temporary directories must outlive this call. */
+    execute = async (project, { confirm = async () => true, onPrepared }) => {
+        const sourceDirectory = project.sourceDirectory();
+        const runtimeProblem = this.projectService.runtimeProblem();
+        if (runtimeProblem !== null) {
+            this.prompts.runtimeUnsupported(runtimeProblem);
+            return ActionResult.failed();
+        }
+        const authorization = await this.authorizationService.authorize(this.configDir, this.commandMetadata.shell, this.authKey);
+        if (authorization.isErr()) {
+            this.prompts.authorizationFailed(authorization.error);
+            return ActionResult.failed();
+        }
+        // Ahead of the server run, which can take minutes: a mistake or a question should not wait on it.
+        const source = await project.portalSource().resolve();
+        if (source.isErr()) {
+            this.prompts.sourceProblem(source.error, sourceDirectory);
+            return ActionResult.failed();
+        }
+        this.prompts.filesShadowedByStatic(source.value.shadowedFiles);
+        this.prompts.contentNotices(source.value.contentNotices, sourceDirectory);
+        if (!(await confirm())) {
+            return ActionResult.cancelled();
+        }
+        // The artifacts live in this directory for as long as the caller needs them, so it wraps
+        // everything that reads them rather than being opened and closed around the call.
+        return await withDirPath(async (artifactsDirectory) => {
+            const artifacts = await this.prompts.generateArtifacts(this.artifactsService.generate(sourceDirectory, artifactsDirectory, this.configDir, this.commandMetadata, this.authKey));
+            if (artifacts.isErr()) {
+                return ActionResult.failed();
+            }
+            this.prompts.unplacedSamples(artifacts.value.codeSampleCatalogs.unplacedIn(source.value.specs.flatMap((spec) => spec.endpoints)));
+            const missing = source.value.generatedPages.missingFrom(artifacts.value);
+            if (missing !== null) {
+                this.prompts.artifactsIncomplete(missing);
+                return ActionResult.failed();
+            }
+            return await withPortalProjectDirectory(sourceDirectory, async (tempDirectory) => {
+                const portalProject = await this.projectService.prepare(tempDirectory, source.value, artifacts.value);
+                if (portalProject.isErr()) {
+                    this.prompts.runtimeUnsupported(portalProject.error);
+                    return ActionResult.failed();
+                }
+                return await onPrepared(portalProject.value, source.value, artifacts.value);
+            });
+        });
+    };
+}
+//# sourceMappingURL=prepare-project.js.map

package/lib/actions/portal/prepare-project.js.map

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

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

@@ -1,16 +1,31 @@
-import { DirectoryPath } from "../../types/file/directoryPath.js";
-import { ActionResult } from "../action-result.js";
-import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { DirectoryPath } from '../../types/file/directoryPath.js';
+import { ActionResult } from '../action-result.js';
+import { CommandMetadata } from '../../types/common/command-metadata.js';
+import { ProjectContext } from '../../types/project-context.js';
+export declare const DEFAULT_PORTAL_PORT = 23513;
 export declare class PortalServeAction {
     private readonly prompts;
     private readonly networkService;
     private readonly launcherService;
-    private readonly application;
+    private readonly projectService;
+    private readonly devServerService;
+    private readonly fileWatchService;
     private readonly configDir;
     private readonly commandMetadata;
     private readonly authKey;
     constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata, authKey?: string | null);
-    execute(buildDirectory: DirectoryPath, portalDirectory: DirectoryPath, port: number, openInBrowser: boolean, hotReload: boolean, onAfterServe?: () => void): Promise<ActionResult>;
-    private waitForServerListening;
+    readonly execute: (project: ProjectContext, port: number, openInBrowser: boolean, onServing?: () => void) => Promise<ActionResult>;
+    /**
+     * Held to the rules a build applies: an edit a build would refuse is reported as `portal
+     * generate` would report it, and the preview keeps what it last accepted.
+     */
+    private watchConfig;
+    /** Held to a build's rules, as `apimatic.json` is: a refused save is reported, and the preview kept as it was. */
+    private watchContent;
+    /**
+     * Runs `handle` on each save the watch reports, and once at the start: what it handles was read
+     * before the preview started, which can take a minute, and a save made meanwhile reached no watch.
+     */
+    private startWatch;
     private clearStandardInput;
 }