@apimatic/cli 1.5.0 → 2.0.0-beta.1

package/lib/infrastructure/portal-project-service.d.ts

@@ -0,0 +1,77 @@
+import { Result } from 'neverthrow';
+import { DirectoryPath } from '../types/file/directoryPath.js';
+import { FilePath } from '../types/file/filePath.js';
+import { CheckedFile } from '../types/portal/content-tree.js';
+import { PortalArtifacts } from '../types/portal/portal-artifacts.js';
+import { PortalSettings, PortalSource } from '../types/portal/portal-source.js';
+export declare const COPIED_DEPENDENCIES: string[];
+export declare const LINKED_DEPENDENCIES: string[];
+export declare const TEMPLATE_DEPENDENCIES: string[];
+/** Where the SDKs and the context plugin are laid out as the site serves them, inside the project. */
+export declare const DOWNLOADS_DIRECTORY_NAME = "downloads";
+/** Where the project keeps its copy of `content/`, and an empty one where the source has none. */
+export declare const CONTENT_COPY_DIRECTORY_NAME = "content";
+export interface PortalProjectPaths {
+    projectDirectory: DirectoryPath;
+    /** Vite's CLI entry point, resolved from the CLI's own dependencies. */
+    viteBinary: FilePath;
+    /** The source's `content/`, which the project's copy stands in for; null where the source has none. */
+    contentSource: DirectoryPath | null;
+}
+/** `portal.config.json`, which the template reads as `BuildPaths`; a test holds the two to one shape. */
+export interface PortalBuildPaths {
+    specs: Record<string, string>;
+    codeSamples: string | null;
+    contentDir: string;
+    generatedDir: string;
+    staticDir: string | null;
+    downloadsDir: string | null;
+}
+/**
+ * Prepares the throwaway Vite project that both `portal generate` and `portal serve` run.
+ * The project points at the user's `src/` by absolute path, but for a copy of `content/`: the
+ * browser bundle names the pages' directory, and a preview keeps the copy at what it last accepted.
+ */
+export declare class PortalProjectService {
+    private readonly fileService;
+    private readonly pagesService;
+    private readonly require;
+    /** Checks this installation can run the portal build at all, before any work is done. */
+    runtimeProblem(): string | null;
+    prepare(projectDirectory: DirectoryPath, source: PortalSource, artifacts: PortalArtifacts): Promise<Result<PortalProjectPaths, string>>;
+    /**
+     * Environment for the child process. Deliberately an allow-list: the auth key must not
+     * reach the build, and any stray `VITE_*` variable would be inlined into the output.
+     */
+    childEnvironment(): Record<string, string>;
+    private writeCodeSamples;
+    private writeFragments;
+    private writeDownloads;
+    private linkDependencies;
+    private copyDependencies;
+    /** The project's copy of `content/`, which stands empty where the source has none. */
+    private contentDirectory;
+    private writeConfiguration;
+    /**
+     * The dev server picks the files up and reloads the browser. Each is written only when its
+     * contents change, so an edit that leaves the site as it was, such as a plugin command
+     * rewriting its own block, reloads nothing; the answer says whether anything was written.
+     */
+    applyConfig(projectDirectory: DirectoryPath, settings: PortalSettings): Promise<Result<boolean, string>>;
+    /**
+     * Brings the project's copy of `content/` in line: `checked` files as checked, since a later save went
+     * unchecked, the rest as on disk, nothing the source lost, and only what changed, so little reloads.
+     */
+    applyContent(projectDirectory: DirectoryPath, contentDirectory: DirectoryPath, checked: CheckedFile[]): Promise<Result<void, string>>;
+    private syncContent;
+    /** Every file below `directory` that the build reads, and none when it is gone. */
+    private contentFiles;
+    private writeAppearance;
+    /**
+     * The browser imports `portal.identity.json` whole, since a retained JSON module is not
+     * tree-shaken per property, which is why it holds nothing that addresses this machine.
+     */
+    private appearanceFiles;
+    private templateDirectory;
+    private packageDirectory;
+}

package/lib/infrastructure/portal-project-service.js

@@ -0,0 +1,309 @@
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import fsExtra from 'fs-extra';
+import { err, ok } from 'neverthrow';
+import { DirectoryPath } from '../types/file/directoryPath.js';
+import { FileName } from '../types/file/fileName.js';
+import { FilePath } from '../types/file/filePath.js';
+import { isSkippedWithin } from '../types/portal/content-tree.js';
+import { GENERATED_DIRECTORY_NAME } from '../types/portal/generated-pages.js';
+import { GENERATED_INCLUDES_DIRECTORY_NAME, pageFragments } from '../types/portal/page-fragments.js';
+import { PLUGIN_DOWNLOAD, SDK_DOWNLOADS_FOLDER, sdkDownload } from '../types/portal/portal-downloads.js';
+import { PortalStylesheet } from '../types/portal/portal-stylesheet.js';
+import { errorMessage } from '../utils/error-utils.js';
+import { envInfo } from './env-info.js';
+import { FileService } from './file-service.js';
+import { PortalPagesService } from './portal-pages-service.js';
+// Copied, not linked: Tailwind rebases their `url()`s onto the project, and no relative path crosses drives.
+export const COPIED_DEPENDENCIES = ['@fontsource-variable/geist', '@fontsource-variable/geist-mono'];
+// Linked one by one rather than through a single link to the CLI's `node_modules`: under a
+// pnpm global install, `npx` or `pnpm dlx` the package has no nested `node_modules`, and a
+// single link also lets Vite write its scratch files into the CLI's own install directory.
+export const LINKED_DEPENDENCIES = [
+    '@fumadocs/api-docs',
+    '@scalar/json-magic',
+    '@tailwindcss/vite',
+    '@tanstack/react-router',
+    '@tanstack/react-start',
+    '@tanstack/start-static-server-functions',
+    '@vitejs/plugin-react',
+    'fumadocs-core',
+    'fumadocs-mdx',
+    'fumadocs-openapi',
+    'fumadocs-ui',
+    'lucide-react',
+    'react',
+    'react-dom',
+    'rehype-raw',
+    'shiki',
+    'tailwindcss',
+    'tslib',
+    'vite',
+    'yaml'
+];
+export const TEMPLATE_DEPENDENCIES = [...COPIED_DEPENDENCIES, ...LINKED_DEPENDENCIES];
+/** Beside `portal.config.json`; `src/lib/portal.ts` imports it. */
+const IDENTITY_FILE_NAME = 'portal.identity.json';
+/** In `src/styles/`, beside `app.css`, which imports it. */
+const STYLESHEET_FILE_NAME = 'theme.css';
+/** Where the SDKs and the context plugin are laid out as the site serves them, inside the project. */
+export const DOWNLOADS_DIRECTORY_NAME = 'downloads';
+/** Where the project keeps its copy of `content/`, and an empty one where the source has none. */
+export const CONTENT_COPY_DIRECTORY_NAME = 'content';
+/**
+ * Prepares the throwaway Vite project that both `portal generate` and `portal serve` run.
+ * The project points at the user's `src/` by absolute path, but for a copy of `content/`: the
+ * browser bundle names the pages' directory, and a preview keeps the copy at what it last accepted.
+ */
+export class PortalProjectService {
+    fileService = new FileService();
+    pagesService = new PortalPagesService();
+    require = createRequire(import.meta.url);
+    /** Checks this installation can run the portal build at all, before any work is done. */
+    runtimeProblem() {
+        for (const dependency of TEMPLATE_DEPENDENCIES) {
+            if (this.packageDirectory(dependency) === undefined) {
+                return `The portal build dependency '${dependency}' is missing from this installation. Reinstall the CLI and try again.`;
+            }
+        }
+        return null;
+    }
+    async prepare(projectDirectory, source, artifacts) {
+        const template = this.templateDirectory();
+        if (template === undefined) {
+            return err('The bundled portal template is missing from this installation. Reinstall the CLI and try again.');
+        }
+        const viteDirectory = this.packageDirectory('vite');
+        if (viteDirectory === undefined) {
+            return err("The portal build dependency 'vite' is missing from this installation. Reinstall the CLI and try again.");
+        }
+        await this.fileService.copyDirectoryContents(template, projectDirectory);
+        await this.linkDependencies(projectDirectory);
+        await this.copyDependencies(projectDirectory);
+        await this.writeConfiguration(projectDirectory, source, await this.contentDirectory(projectDirectory, source), await this.writeCodeSamples(projectDirectory, artifacts.codeSampleCatalogs), await this.writeDownloads(projectDirectory, artifacts));
+        const pages = await this.pagesService.write(projectDirectory.join(GENERATED_DIRECTORY_NAME), source.generatedPages);
+        if (pages.isErr()) {
+            return err(pages.error);
+        }
+        // Once: they change only with the artifacts, which a preview fetches when it starts.
+        await this.writeFragments(projectDirectory.join(GENERATED_INCLUDES_DIRECTORY_NAME), pageFragments(artifacts.sdkDocs));
+        return ok({
+            projectDirectory,
+            viteBinary: new FilePath(viteDirectory.join('bin'), new FileName('vite.js')),
+            contentSource: source.contentDirectory
+        });
+    }
+    /**
+     * Environment for the child process. Deliberately an allow-list: the auth key must not
+     * reach the build, and any stray `VITE_*` variable would be inlined into the output.
+     */
+    childEnvironment() {
+        const allowed = [
+            'PATH',
+            'Path',
+            'HOME',
+            'USERPROFILE',
+            'TMPDIR',
+            'TEMP',
+            'TMP',
+            'LANG',
+            'LC_ALL',
+            'SYSTEMROOT',
+            'SystemRoot',
+            'SystemDrive'
+        ];
+        const environment = {};
+        for (const name of allowed) {
+            const value = process.env[name];
+            if (value !== undefined) {
+                environment[name] = value;
+            }
+        }
+        // Large specs push the prerender pass past Node's default heap. V8 honours the last
+        // occurrence of the flag, so appending unconditionally would override a limit the user
+        // raised on purpose, and lower it on a machine whose default is already higher.
+        const nodeOptions = process.env.NODE_OPTIONS ?? '';
+        environment.NODE_OPTIONS = /--max[-_]old[-_]space[-_]size/.test(nodeOptions)
+            ? nodeOptions
+            : `${nodeOptions} --max-old-space-size=4096`.trim();
+        return environment;
+    }
+    // The template places the samples on the specs as it bundles them, so the specs are read where they are.
+    async writeCodeSamples(projectDirectory, codeSampleCatalogs) {
+        if (codeSampleCatalogs.isEmpty()) {
+            return null;
+        }
+        const file = new FilePath(projectDirectory, new FileName('code-samples.json'));
+        await this.fileService.writeContents(file, JSON.stringify(codeSampleCatalogs.toJson()));
+        return file;
+    }
+    async writeFragments(directory, fragments) {
+        for (const { folder, fileName, contents } of fragments) {
+            const target = directory.join(folder);
+            await this.fileService.createDirectoryIfNotExists(target);
+            await this.fileService.writeContents(new FilePath(target, fileName), contents);
+        }
+    }
+    async writeDownloads(projectDirectory, artifacts) {
+        if (artifacts.sdks.size === 0 && artifacts.plugin === undefined) {
+            return null;
+        }
+        const downloads = projectDirectory.join(DOWNLOADS_DIRECTORY_NAME);
+        await this.fileService.createDirectoryIfNotExists(downloads);
+        for (const [language, archive] of artifacts.sdks) {
+            const sdks = downloads.join(SDK_DOWNLOADS_FOLDER);
+            await this.fileService.createDirectoryIfNotExists(sdks);
+            await this.fileService.copy(archive, new FilePath(sdks, sdkDownload(language)));
+        }
+        if (artifacts.plugin !== undefined) {
+            await this.fileService.copy(artifacts.plugin, new FilePath(downloads, PLUGIN_DOWNLOAD));
+        }
+        return downloads;
+    }
+    async linkDependencies(projectDirectory) {
+        const modules = projectDirectory.join('node_modules');
+        await this.fileService.createDirectoryIfNotExists(modules);
+        for (const dependency of LINKED_DEPENDENCIES) {
+            const target = this.packageDirectory(dependency);
+            if (target === undefined) {
+                continue;
+            }
+            const link = modules.join(dependency);
+            if (dependency.includes('/')) {
+                await this.fileService.createDirectoryIfNotExists(new DirectoryPath(path.dirname(link.toString())));
+            }
+            // A junction is the only link type Windows grants without elevation.
+            await fsExtra.symlink(target.toString(), link.toString(), process.platform === 'win32' ? 'junction' : 'dir');
+        }
+    }
+    async copyDependencies(projectDirectory) {
+        for (const dependency of COPIED_DEPENDENCIES) {
+            const target = this.packageDirectory(dependency);
+            if (target !== undefined) {
+                await this.fileService.copyDirectoryContents(target, projectDirectory.join('node_modules', dependency));
+            }
+        }
+    }
+    /** The project's copy of `content/`, which stands empty where the source has none. */
+    async contentDirectory(projectDirectory, source) {
+        const copy = projectDirectory.join(CONTENT_COPY_DIRECTORY_NAME);
+        await this.fileService.createDirectoryIfNotExists(copy);
+        if (source.contentDirectory !== null) {
+            // Before the dev server starts: it lists the pages once, and one missing then stays missing.
+            await this.syncContent(source.contentDirectory, copy, []);
+        }
+        return copy;
+    }
+    async writeConfiguration(projectDirectory, source, contentDirectory, codeSamples, downloads) {
+        const specs = {};
+        for (const spec of source.specs) {
+            specs[spec.slug] = spec.file.toPosix();
+        }
+        // Everything here addresses this machine, so it stays behind `portal.server.ts` and the
+        // build's own config files.
+        const configuration = {
+            specs,
+            codeSamples: codeSamples === null ? null : codeSamples.toPosix(),
+            contentDir: contentDirectory.toPosix(),
+            generatedDir: projectDirectory.join(GENERATED_DIRECTORY_NAME).toPosix(),
+            staticDir: source.staticDirectory === null ? null : source.staticDirectory.toPosix(),
+            downloadsDir: downloads === null ? null : downloads.toPosix()
+        };
+        await this.fileService.writeContents(new FilePath(projectDirectory, new FileName('portal.config.json')), JSON.stringify(configuration, null, 2));
+        await this.writeAppearance(projectDirectory, source.config);
+    }
+    /**
+     * The dev server picks the files up and reloads the browser. Each is written only when its
+     * contents change, so an edit that leaves the site as it was, such as a plugin command
+     * rewriting its own block, reloads nothing; the answer says whether anything was written.
+     */
+    async applyConfig(projectDirectory, settings) {
+        let written = false;
+        try {
+            for (const [file, contents] of this.appearanceFiles(projectDirectory, settings.config)) {
+                if (await this.fileService.replaceContentsIfChanged(file, contents)) {
+                    written = true;
+                }
+            }
+        }
+        catch (error) {
+            return err(errorMessage(error));
+        }
+        const pages = await this.pagesService.write(projectDirectory.join(GENERATED_DIRECTORY_NAME), settings.generatedPages);
+        return pages.map((pagesWritten) => written || pagesWritten);
+    }
+    /**
+     * Brings the project's copy of `content/` in line: `checked` files as checked, since a later save went
+     * unchecked, the rest as on disk, nothing the source lost, and only what changed, so little reloads.
+     */
+    async applyContent(projectDirectory, contentDirectory, checked) {
+        try {
+            await this.syncContent(contentDirectory, projectDirectory.join(CONTENT_COPY_DIRECTORY_NAME), checked);
+            return ok(undefined);
+        }
+        catch (error) {
+            return err(errorMessage(error));
+        }
+    }
+    async syncContent(from, to, checked) {
+        const files = await this.contentFiles(from);
+        for (const file of files) {
+            const target = file.rebased(from, to);
+            const read = checked.find((each) => each.file.isEqual(file));
+            if (read === undefined) {
+                await this.fileService.copyIfChanged(file, target);
+            }
+            else {
+                await this.fileService.replaceContentsIfChanged(target, read.contents);
+            }
+        }
+        for (const copied of await this.contentFiles(to)) {
+            if (!files.some((file) => file.rebased(from, to).isEqual(copied))) {
+                await this.fileService.deleteFile(copied);
+            }
+        }
+    }
+    /** Every file below `directory` that the build reads, and none when it is gone. */
+    async contentFiles(directory) {
+        if (!(await this.fileService.directoryExists(directory))) {
+            return [];
+        }
+        return (await this.fileService.getDirectory(directory))
+            .getAllFiles()
+            .filter((file) => !isSkippedWithin(file, directory));
+    }
+    async writeAppearance(projectDirectory, config) {
+        for (const [file, contents] of this.appearanceFiles(projectDirectory, config)) {
+            await this.fileService.writeContents(file, contents);
+        }
+    }
+    /**
+     * The browser imports `portal.identity.json` whole, since a retained JSON module is not
+     * tree-shaken per property, which is why it holds nothing that addresses this machine.
+     */
+    appearanceFiles(projectDirectory, config) {
+        return [
+            [new FilePath(projectDirectory, new FileName(IDENTITY_FILE_NAME)), JSON.stringify(config.identity(), null, 2)],
+            [
+                new FilePath(projectDirectory.join('src').join('styles'), new FileName(STYLESHEET_FILE_NAME)),
+                PortalStylesheet.of(config).toString()
+            ]
+        ];
+    }
+    templateDirectory() {
+        const template = envInfo.packageRoot().join('portal-template');
+        return this.fileService.directoryExistsSync(template) ? template : undefined;
+    }
+    // `require.resolve` cannot be used directly: a package whose `exports` map hides
+    // `package.json` throws, so the candidate roots are walked instead.
+    packageDirectory(name) {
+        for (const candidate of this.require.resolve.paths(name) ?? []) {
+            const manifest = path.join(candidate, name, 'package.json');
+            if (fsExtra.existsSync(manifest)) {
+                return new DirectoryPath(path.dirname(manifest));
+            }
+        }
+        return undefined;
+    }
+}
+//# sourceMappingURL=portal-project-service.js.map

package/lib/infrastructure/portal-project-service.js.map

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

package/lib/infrastructure/service-error.d.ts

@@ -21,6 +21,7 @@ export declare class ServiceError {
     static badRequest(customMessage: string, errors: Record<string, string[]>): ServiceError;
     static forbidden(customMessage: string): ServiceError;
     static notFound(customMessage: string): ServiceError;
+    static invalidResponse(customMessage: string): ServiceError;
     static timeout(customMessage: string): ServiceError;
     static unauthorizedWithHint(apiMessage: string | null): ServiceError;
     static readonly values: ServiceError[];

package/lib/infrastructure/service-error.js

@@ -1,4 +1,3 @@
-var _a;
 import axios from "axios";
 import { ApiError, ProblemDetailsError } from "@apimatic/sdk";
 import { format as f } from "../prompts/format.js";
@@ -15,28 +14,47 @@ export var ServiceErrorCode;
     ServiceErrorCode["Timeout"] = "TIMEOUT";
 })(ServiceErrorCode || (ServiceErrorCode = {}));
 export class ServiceError {
+    code;
+    defaultMessage;
+    errors;
+    static defaultErrorMessage = `An unexpected error occurred, please try again later. If the problem persists, please reach out to our team at ${f.var("support@apimatic.io")}`;
+    static NotFound = new ServiceError(ServiceErrorCode.NotFound, "Resource not found.", {});
+    static ServerError = new ServiceError(ServiceErrorCode.ServerError, this.defaultErrorMessage, {});
+    static NetworkError = new ServiceError(ServiceErrorCode.NetworkError, "Unable to connect to the server.", {});
+    static InvalidResponse = new ServiceError(ServiceErrorCode.InvalidResponse, this.defaultErrorMessage, {});
+    static UnAuthorized = new ServiceError(ServiceErrorCode.UnAuthorized, "Unauthorized access.", {});
     static badRequest(customMessage, errors) {
-        return new _a(ServiceErrorCode.BadRequest, customMessage, errors);
+        return new ServiceError(ServiceErrorCode.BadRequest, customMessage, errors);
     }
     static forbidden(customMessage) {
-        return new _a(ServiceErrorCode.Forbidden, customMessage, {});
+        return new ServiceError(ServiceErrorCode.Forbidden, customMessage, {});
     }
     static notFound(customMessage) {
-        return new _a(ServiceErrorCode.NotFound, customMessage, {});
+        return new ServiceError(ServiceErrorCode.NotFound, customMessage, {});
+    }
+    static invalidResponse(customMessage) {
+        return new ServiceError(ServiceErrorCode.InvalidResponse, customMessage, {});
     }
     static timeout(customMessage) {
-        return new _a(ServiceErrorCode.Timeout, customMessage, {});
+        return new ServiceError(ServiceErrorCode.Timeout, customMessage, {});
     }
     static unauthorizedWithHint(apiMessage) {
         // Both remedies name the full `auth login` command: the key is supplied to
         // that command, not to whichever one hit the 401 — most of them don't accept
         // an --auth-key flag at all.
         const loginCommand = f.cmdAlt("apimatic", "auth", "login");
-        const message = `${apiMessage !== null && apiMessage !== void 0 ? apiMessage : "Authorization has been denied for this request."} ` +
+        const message = `${apiMessage ?? "Authorization has been denied for this request."} ` +
             `Please run ${loginCommand} to log in via browser, ` +
             `or provide a valid auth key using the ${loginCommand} ${f.flag("auth-key")}`;
-        return new _a(ServiceErrorCode.UnAuthorized, message, {});
-    }
+        return new ServiceError(ServiceErrorCode.UnAuthorized, message, {});
+    }
+    static values = [
+        ServiceError.NotFound,
+        ServiceError.ServerError,
+        ServiceError.NetworkError,
+        ServiceError.InvalidResponse,
+        ServiceError.UnAuthorized
+    ];
     constructor(code, defaultMessage, errors) {
         this.code = code;
         this.defaultMessage = defaultMessage;
@@ -49,30 +67,15 @@ export class ServiceError {
         return this.errors[key];
     }
 }
-_a = ServiceError;
-ServiceError.defaultErrorMessage = `An unexpected error occurred, please try again later. If the problem persists, please reach out to our team at ${f.var("support@apimatic.io")}`;
-ServiceError.NotFound = new _a(ServiceErrorCode.NotFound, "Resource not found.", {});
-ServiceError.ServerError = new _a(ServiceErrorCode.ServerError, _a.defaultErrorMessage, {});
-ServiceError.NetworkError = new _a(ServiceErrorCode.NetworkError, "Unable to connect to the server.", {});
-ServiceError.InvalidResponse = new _a(ServiceErrorCode.InvalidResponse, _a.defaultErrorMessage, {});
-ServiceError.UnAuthorized = new _a(ServiceErrorCode.UnAuthorized, "Unauthorized access.", {});
-ServiceError.values = [
-    _a.NotFound,
-    _a.ServerError,
-    _a.NetworkError,
-    _a.InvalidResponse,
-    _a.UnAuthorized
-];
 // A ProblemDetails body carries a `title` plus a map of field errors; surface
 // the title and the first field message.
 function mapProblemDetailsError(error) {
-    var _b, _c, _d, _e, _f;
     // ProblemDetails.title and .errors are optional and result may be absent — guard
     // all three so a sparse body can't crash or render a trailing "- null".
     // TODO: This only picks the first error message, improve it to show all errors.
-    const errors = ((_c = (_b = error.result) === null || _b === void 0 ? void 0 : _b.errors) !== null && _c !== void 0 ? _c : {});
-    const firstFieldMessage = (_d = Object.values(errors)[0]) === null || _d === void 0 ? void 0 : _d[0];
-    const title = (_f = (_e = error.result) === null || _e === void 0 ? void 0 : _e.title) !== null && _f !== void 0 ? _f : "Request failed.";
+    const errors = (error.result?.errors ?? {});
+    const firstFieldMessage = Object.values(errors)[0]?.[0];
+    const title = error.result?.title ?? "Request failed.";
     const errorMessage = firstFieldMessage ? `${title}\n- ${firstFieldMessage}` : title;
     if (error.statusCode === 400)
         return ServiceError.badRequest(errorMessage, errors);
@@ -83,14 +86,13 @@ function mapProblemDetailsError(error) {
 // SDK controllers throw typed `ApiError`s (not axios errors). The API reports
 // the reason as {"message": "..."} deserialized into `result`.
 function mapApiError(error) {
-    var _b, _c;
     if (error instanceof ProblemDetailsError) {
         const serviceError = mapProblemDetailsError(error);
         if (serviceError)
             return serviceError;
     }
     if (error.statusCode === 401) {
-        const apiMessage = (_c = (_b = error.result) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : null;
+        const apiMessage = error.result?.message ?? null;
         return ServiceError.unauthorizedWithHint(apiMessage);
     }
     if (error.statusCode === 404)
@@ -104,22 +106,21 @@ function mapApiError(error) {
  * map. Every other status is left to `mapTransportError`.
  */
 function mapAxiosProblemDetails(error) {
-    var _b, _c, _d, _e, _f, _g;
     if (!axios.isAxiosError(error)) {
         return undefined;
     }
-    const body = (_b = error.response) === null || _b === void 0 ? void 0 : _b.data;
+    const body = error.response?.data;
     if (typeof body !== "object" || body === null) {
         return undefined;
     }
-    const errors = (_c = body.errors) !== null && _c !== void 0 ? _c : {};
-    const firstMessage = (_d = Object.values(errors).flat()[0]) !== null && _d !== void 0 ? _d : body.detail;
-    const title = (_e = body.title) !== null && _e !== void 0 ? _e : "Request failed.";
+    const errors = body.errors ?? {};
+    const firstMessage = Object.values(errors).flat()[0] ?? body.detail;
+    const title = body.title ?? "Request failed.";
     const message = firstMessage ? `${title}\n- ${firstMessage}` : title;
-    if (((_f = error.response) === null || _f === void 0 ? void 0 : _f.status) === 400) {
+    if (error.response?.status === 400) {
         return ServiceError.badRequest(message, errors);
     }
-    if (((_g = error.response) === null || _g === void 0 ? void 0 : _g.status) === 403) {
+    if (error.response?.status === 403) {
         return ServiceError.forbidden(message);
     }
     return undefined;
@@ -129,19 +130,16 @@ function mapAxiosProblemDetails(error) {
  * user with nothing to act on — the SDK path names the remedy but the axios path does not.
  */
 export function mapTransportError(error) {
-    var _b;
-    if (axios.isAxiosError(error) && ((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) === 401) {
+    if (axios.isAxiosError(error) && error.response?.status === 401) {
         return ServiceError.unauthorizedWithHint(null);
     }
     return handleServiceError(error);
 }
 /** For responses whose body is readable JSON; a streamed body can only be mapped by status. */
 export function mapRequestError(error) {
-    var _b;
-    return (_b = mapAxiosProblemDetails(error)) !== null && _b !== void 0 ? _b : mapTransportError(error);
+    return mapAxiosProblemDetails(error) ?? mapTransportError(error);
 }
 export function handleServiceError(error) {
-    var _b;
     if (error instanceof ApiError) {
         // A `callAsStream` error body would otherwise hang the CLI. Order against
         // `mapApiError` is free: `error.result` is only populated when the SDK
@@ -152,7 +150,7 @@ export function handleServiceError(error) {
         return serviceError;
     }
     if (axios.isAxiosError(error)) {
-        const status = (_b = error.response) === null || _b === void 0 ? void 0 : _b.status;
+        const status = error.response?.status;
         if (status === 401)
             return ServiceError.UnAuthorized;
         if (status === 404)

package/lib/infrastructure/service-error.js.map

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