adapty 0.8.4-beta.1 → 0.8.5

package/dist/lib/errors.d.ts

@@ -1,17 +1,17 @@
-export interface ApiErrorBody {
-    detail?: string;
-    error?: string;
-    error_code?: string;
-    errors?: Record<string, string[]>;
-    retry_after_seconds?: number;
-    status_code?: number;
-}
+export type ApiErrorBody = {
+    detail?: string | undefined;
+    error?: string | undefined;
+    error_code?: string | undefined;
+    errors?: Record<string, string[]> | undefined;
+    retry_after_seconds?: number | undefined;
+    status_code?: number | undefined;
+};
 export type ApiErrorFormat = 'asa' | 'developer';
-export interface ApiErrorOptions {
-    detail?: string;
-    retryAfterSeconds?: number;
-}
-export interface ListedError {
+export type ApiErrorOptions = {
+    detail?: string | undefined;
+    retryAfterSeconds?: number | undefined;
+};
+export type ListedError = {
     apple_error_code?: null | string;
     apple_error_message?: null | string;
     error_code?: string;
@@ -20,18 +20,18 @@ export interface ListedError {
     message?: string;
     validation_error_code?: string;
     validation_error_message?: string;
-}
+};
 export declare function describeListedError(error: ListedError): {
     code: string | undefined;
     text: string;
 };
 export declare class ApiError extends Error {
-    statusCode: number;
+    code?: string | undefined;
+    detail?: string | undefined;
     errorCode: string;
     fieldErrors: Record<string, string[]>;
-    code?: string;
-    detail?: string;
-    retryAfterSeconds?: number;
+    retryAfterSeconds?: number | undefined;
+    statusCode: number;
     constructor(statusCode: number, errorCode: string, fieldErrors: Record<string, string[]>, opts?: ApiErrorOptions);
     private static humanMessage;
     toHuman(): string;

package/dist/lib/errors.js

@@ -2,33 +2,36 @@ export function describeListedError(error) {
     const code = error.error_code ?? error.apple_error_code ?? error.validation_error_code ?? undefined;
     const reason = error.message ?? error.apple_error_message ?? error.validation_error_message ?? code ?? 'rejected';
     const position = error.input_ref === null || error.input_ref === undefined ? '' : ` (item ${error.input_ref + 1})`;
-    return { code, text: `${reason}${position}` };
+    const field = error.field_name ? `${error.field_name}: ` : '';
+    return { code, text: `${field}${reason}${position}` };
 }
 export class ApiError extends Error {
-    statusCode;
-    errorCode;
-    fieldErrors;
     // Read by oclif's prettyPrint to render a `Code: ...` line under the message.
     code;
     detail;
+    errorCode;
+    fieldErrors;
     retryAfterSeconds;
+    statusCode;
     constructor(statusCode, errorCode, fieldErrors, opts = {}) {
         // `message` is what oclif's default error renderer prints. Prefer the server's human text (an ASA
         // `detail` or the developer API's field errors) over the bare code, which reads as gibberish on its own.
         super(ApiError.humanMessage(errorCode, fieldErrors, opts.detail));
+        this.name = 'ApiError';
         this.statusCode = statusCode;
         this.errorCode = errorCode;
         this.fieldErrors = fieldErrors;
-        this.name = 'ApiError';
         this.detail = opts.detail;
         this.retryAfterSeconds = opts.retryAfterSeconds;
         // Surface real server codes as a secondary line; hide synthetic `http_<status>` fallbacks.
-        if (!errorCode.startsWith('http_'))
+        if (!errorCode.startsWith('http_')) {
             this.code = errorCode;
+        }
     }
     static humanMessage(errorCode, fieldErrors, detail) {
-        if (detail)
+        if (detail) {
             return detail;
+        }
         const parts = [];
         for (const [field, msgs] of Object.entries(fieldErrors)) {
             for (const msg of msgs) {
@@ -85,8 +88,8 @@ function parseListedErrors(errors, statusCode, opts) {
             fieldErrors[item.field_name] = [...(fieldErrors[item.field_name] ?? []), item.message];
         }
     }
-    const described = errors.map((item) => describeListedError(item));
-    const detail = described.map((item) => item.text).join('; ');
+    const described = errors.map(item => describeListedError(item));
+    const detail = described.map(item => item.text).join('; ');
     return new ApiError(statusCode, described[0]?.code ?? `http_${statusCode}`, fieldErrors, {
         ...opts,
         detail: detail || undefined,
@@ -110,8 +113,9 @@ export function parseApiError(statusCode, body, opts = {}, format = 'developer')
         const fieldErrors = {};
         for (const item of parsed.detail) {
             const field = (item.loc ?? []).slice(1).join('.') || 'body';
-            if (item.msg)
+            if (item.msg) {
                 fieldErrors[field] = [...(fieldErrors[field] ?? []), item.msg];
+            }
         }
         return new ApiError(statusCode, `http_${statusCode}`, fieldErrors, opts);
     }

package/dist/lib/flags.d.ts

@@ -2,7 +2,7 @@ export declare function isValidUuid(value: string): boolean;
 export declare const appFlag: {
     app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
 };
-export interface PaginatedResponse<T> {
+export type PaginatedResponse<T> = {
     data: T[];
     meta: {
         pagination: {
@@ -11,12 +11,12 @@ export interface PaginatedResponse<T> {
             pages: number;
         };
     };
-}
+};
 export declare const paginationFlags: {
     page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
     'page-size': import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
 };
 export declare function paginationParams(flags: {
-    page: number;
+    'page': number;
     'page-size': number;
 }): Record<string, string>;

package/dist/lib/flags.js

@@ -6,6 +6,7 @@ export function isValidUuid(value) {
 export const appFlag = {
     app: Flags.string({
         description: 'App ID (UUID)',
+        // eslint-disable-next-line @typescript-eslint/require-await -- FIXME if you see this
         async parse(input) {
             if (!isValidUuid(input)) {
                 throw new Error('Invalid app ID format. Run `adapty apps list` to find your app ID.');
@@ -16,7 +17,7 @@ export const appFlag = {
     }),
 };
 export const paginationFlags = {
-    page: Flags.integer({
+    'page': Flags.integer({
         default: 1,
         description: 'Page number',
         min: 1,

package/dist/lib/flow-help.js

@@ -17,11 +17,16 @@ const DRAFT_FLOW_MARKER = 'Flow must be published before placing in a placement'
  * `flowId` is taken from the single flow audience, or `<FLOW_ID>` when it is ambiguous.
  */
 export function draftFlowError(error, app, audiences) {
-    if (!(error instanceof ApiError) || !error.message.includes(DRAFT_FLOW_MARKER))
+    if (!(error instanceof ApiError) || !error.message.includes(DRAFT_FLOW_MARKER)) {
         return null;
-    const flows = (audiences ?? []).filter((a) => a.content_type === 'flow' && typeof a.flow_id === 'string');
-    const flowId = flows.length === 1 ? flows[0].flow_id : '<FLOW_ID>';
-    return ('Cannot attach a draft flow to a placement — publish it first.\n' +
-        `Publish:  adapty flows publish --app ${app} ${flowId}\n` +
-        flowFixLinks(flowId));
+    }
+    const flowIds = (audiences ?? [])
+        .filter(a => a.content_type === 'flow')
+        .map(a => a.flow_id)
+        .filter((id) => typeof id === 'string');
+    const onlyFlowId = flowIds.length === 1 ? flowIds[0] : undefined;
+    const flowId = onlyFlowId ?? '<FLOW_ID>';
+    return ('Cannot attach a draft flow to a placement — publish it first.\n'
+        + `Publish:  adapty flows publish --app ${app} ${flowId}\n`
+        + flowFixLinks(flowId));
 }

package/dist/lib/output.js

@@ -3,10 +3,12 @@ function formatLabel(snakeKey) {
     return snakeKey
         .split('_')
         .map((w) => {
-        if (w === 'ids')
+        if (w === 'ids') {
             return 'IDs';
-        if (UPPER_WORDS.has(w))
+        }
+        if (UPPER_WORDS.has(w)) {
             return w.toUpperCase();
+        }
         return w.charAt(0).toUpperCase() + w.slice(1);
     })
         .join(' ');
@@ -18,19 +20,22 @@ function renderArrayItems(items, indent) {
     const childIndent = indent + '  ';
     const lines = [];
     for (const item of items) {
-        if (item === undefined || item === null)
+        if (item === undefined || item === null) {
             continue;
+        }
         if (Array.isArray(item)) {
             lines.push(...renderArrayItems(item, childIndent));
         }
         else if (isScalar(item)) {
+            // eslint-disable-next-line @typescript-eslint/no-base-to-string -- FIXME if you see this
             lines.push(`${indent}- ${String(item)}`);
         }
         else {
-            const rendered = renderObject(item, childIndent);
-            if (rendered.length === 0)
+            const [head, ...rest] = renderObject(item, childIndent);
+            if (head === undefined) {
                 continue;
-            lines.push(`${indent}- ${rendered[0].slice(childIndent.length)}`, ...rendered.slice(1));
+            }
+            lines.push(`${indent}- ${head.slice(childIndent.length)}`, ...rest);
         }
     }
     return lines;
@@ -38,13 +43,15 @@ function renderArrayItems(items, indent) {
 function renderObject(data, indent) {
     const lines = [];
     for (const [key, value] of Object.entries(data)) {
-        if (value === undefined || value === null)
+        if (value === undefined || value === null) {
             continue;
+        }
         const label = `${indent}${formatLabel(key)}:`;
         if (Array.isArray(value)) {
-            if (value.length === 0)
+            if (value.length === 0) {
                 continue;
-            if (value.every((v) => isScalar(v))) {
+            }
+            if (value.every(v => isScalar(v))) {
                 lines.push(`${label} ${value.map(String).join(', ')}`);
             }
             else {
@@ -52,25 +59,29 @@ function renderObject(data, indent) {
             }
         }
         else if (isScalar(value)) {
+            // eslint-disable-next-line @typescript-eslint/no-base-to-string -- FIXME if you see this
             lines.push(`${label} ${String(value)}`);
         }
         else {
             const nested = renderObject(value, indent + '  ');
-            if (nested.length > 0)
+            if (nested.length > 0) {
                 lines.push(label, ...nested);
+            }
         }
     }
     return lines;
 }
 export function printResponse(data, log) {
-    for (const line of renderObject(data, ''))
+    for (const line of renderObject(data, '')) {
         log(line);
+    }
 }
 export function printList(items, log, pagination) {
     for (const [i, item] of items.entries()) {
         printResponse(item, log);
-        if (i < items.length - 1)
+        if (i < items.length - 1) {
             log('---');
+        }
     }
     if (pagination) {
         log('');

package/dist/lib/preview.d.ts

@@ -5,10 +5,10 @@ export declare const DEFAULT_DEVICE_ID = "iphone-14";
 export declare const ORIENTATIONS: readonly ["landscape", "portrait"];
 export declare const DEFAULT_ORIENTATION = "portrait";
 /** Payload the render page expects. Wire format shared with the UI, hence camelCase. */
-export interface PreviewPayload {
+export type PreviewPayload = {
     flow: Record<string, unknown>;
     remoteConfigs: unknown[];
-}
+};
 /**
  * Accepts either a dashboard-api envelope (`{config, remote_configs, ...}`) or a bare
  * builder config, and returns the shape the render page injects.
@@ -18,10 +18,10 @@ export interface PreviewPayload {
  * rejected there instead — better to say so here, against the file the user named.
  */
 export declare function normalizePreviewConfig(raw: unknown): PreviewPayload;
-export interface RenderTarget {
+export type RenderTarget = {
     device: string;
     orientation: string;
     /** Omitted lets the render page fall back to the flow's first screen. */
-    screen?: string;
-}
+    screen?: string | undefined;
+};
 export declare function buildRenderUrl(target: RenderTarget, payload: PreviewPayload): string;

package/dist/lib/preview.js

@@ -39,8 +39,9 @@ function encodeConfigFragment(payload) {
 }
 export function buildRenderUrl(target, payload) {
     const url = appUrl(PREVIEW_PATH);
-    if (target.screen)
+    if (target.screen) {
         url.searchParams.set('screen', target.screen);
+    }
     url.searchParams.set('device', target.device);
     url.searchParams.set('orientation', target.orientation);
     url.hash = `config=${encodeConfigFragment(payload)}`;