@swell/cli 2.6.0 → 2.7.0

package/dist/lib/inspect/settings.js

@@ -0,0 +1,56 @@
+const PATH_SEGMENT = /^[\w.-]+$/;
+const APP_PREFIX = /^app\.([^.]+)$/;
+export function parseSettingsKey(input) {
+    const appMatch = input.match(APP_PREFIX);
+    if (appMatch) {
+        return { kind: 'app', ref: appMatch[1] };
+    }
+    if (input.startsWith('app.')) {
+        return { kind: 'invalid', input };
+    }
+    if (PATH_SEGMENT.test(input)) {
+        return { kind: 'path', segment: input };
+    }
+    return { kind: 'invalid', input };
+}
+/**
+ * Produce the column-1 paste-back key for a settings record.
+ *
+ *   System (no app_id):  `record.name` (e.g. `taxes`).
+ *   App with slug:       `app.<slug>`.
+ *   App without slug:    `app.<hex>` (still pasteable — `app.<hex>` resolves).
+ *
+ * App records carry `name === app_id` (the hex), which is meaningless to a
+ * human; we never surface it. Ultimate fallback is `record.id` for degenerate
+ * records that have neither `app_id` nor `name`.
+ */
+export function formatSettingsKey(record, appSlugById) {
+    if (!record.app_id) {
+        return record.name ?? record.id ?? '-';
+    }
+    const slug = appSlugById[record.app_id] ?? record.app_id;
+    return `app.${slug}`;
+}
+/**
+ * Group a settings record. System rows (`app_id` null/undefined) belong to the
+ * platform and render under a `system` divider at the top, mirroring the
+ * notifications shape.
+ */
+export function groupSettingsRecord(record, appSlugById) {
+    if (!record.app_id) {
+        return { slug: '<system>', label: 'system', order: 0 };
+    }
+    const resolved = appSlugById[record.app_id];
+    if (!resolved) {
+        return { slug: '<not resolved>', order: 2 };
+    }
+    return { slug: resolved };
+}
+/**
+ * `general` and `admin` are flagged `deprecated: true` in the base schema and
+ * still come back from the default list (no server-side filter equivalent —
+ * `deprecated[$ne]=true` doesn't take). Filter them out client-side.
+ */
+export function isDeprecatedRecord(record) {
+    return record.deprecated === true;
+}

package/dist/lib/inspect/table.d.ts

@@ -0,0 +1,29 @@
+export interface GroupInfo {
+    /** Grouping identity. Rows with the same slug land in the same section. */
+    slug: string;
+    /** Divider text. Defaults to `slug` when omitted. */
+    label?: string;
+    /** Sort priority; lower renders first. Ties preserve insertion order. Default 1. */
+    order?: number;
+}
+export interface KeyMetaRow {
+    /** Paste-back identifier rendered as column 1. */
+    key: string;
+    /** Optional compact status string. Empty or undefined renders the key alone. */
+    meta?: string;
+    /** Optional group; when some rows carry one, multiple groups produce dividers. */
+    group?: GroupInfo;
+}
+/**
+ * Render a two-column list: paste-back key + optional compact meta string.
+ *
+ * - Rows with meta render as `  <key-padded>  <meta>`.
+ * - Rows without meta render as `  <key>` with no trailing whitespace.
+ * - Key column width is computed globally across all rows so meta columns
+ *   align vertically.
+ * - Rows with a `group` are collected into sections; sections are separated
+ *   by a blank line and a `── <label>` divider. Sections sort by `order`
+ *   (lower first), ties preserve insertion order. A single group collapses
+ *   to a flat listing.
+ */
+export declare function renderKeyMetaTable(rows: KeyMetaRow[]): string[];

package/dist/lib/inspect/table.js

@@ -0,0 +1,61 @@
+/**
+ * Render a two-column list: paste-back key + optional compact meta string.
+ *
+ * - Rows with meta render as `  <key-padded>  <meta>`.
+ * - Rows without meta render as `  <key>` with no trailing whitespace.
+ * - Key column width is computed globally across all rows so meta columns
+ *   align vertically.
+ * - Rows with a `group` are collected into sections; sections are separated
+ *   by a blank line and a `── <label>` divider. Sections sort by `order`
+ *   (lower first), ties preserve insertion order. A single group collapses
+ *   to a flat listing.
+ */
+export function renderKeyMetaTable(rows) {
+    if (rows.length === 0) {
+        return [];
+    }
+    const keyWidth = Math.max(...rows.map((r) => r.key.length));
+    const formatRow = (row) => {
+        if (row.meta && row.meta.length > 0) {
+            return `  ${row.key.padEnd(keyWidth)}  ${row.meta}`;
+        }
+        return `  ${row.key}`;
+    };
+    const hasGroups = rows.some((r) => r.group !== undefined);
+    if (!hasGroups) {
+        return rows.map((row) => formatRow(row));
+    }
+    const groupMap = new Map();
+    for (const row of rows) {
+        const info = row.group;
+        if (!info)
+            continue;
+        const existing = groupMap.get(info.slug);
+        if (existing) {
+            existing.rows.push(row);
+        }
+        else {
+            groupMap.set(info.slug, {
+                slug: info.slug,
+                label: info.label ?? info.slug,
+                order: info.order ?? 1,
+                rows: [row],
+            });
+        }
+    }
+    if (groupMap.size === 1) {
+        return rows.map((row) => formatRow(row));
+    }
+    const ordered = [...groupMap.values()].sort((a, b) => a.order - b.order);
+    const lines = [];
+    for (const group of ordered) {
+        if (lines.length > 0) {
+            lines.push('');
+        }
+        lines.push(`── ${group.label}`);
+        for (const row of group.rows) {
+            lines.push(formatRow(row));
+        }
+    }
+    return lines;
+}

package/dist/push-app-command.js

@@ -6,8 +6,9 @@ import * as path from 'node:path';
 import Stream from 'node:stream';
 import ora from 'ora';
 import { default as swellConfig } from './lib/app-config.js';
-import { ConfigType, getFrontendProjectValidValues, allConfigFilesInDir, CUSTOM_FRAMEWORK_SLUG, appConfigFromFile, filePathExists, filePathExistsAsync, findAppConfig, getAppSlugId, getConfigTypeFromPath, getConfigTypeKeyFromValue, getFrontendProjectType, getProjectCommands, globAllFilesByPath, hashString, isPathDirectory, } from './lib/apps/index.js';
+import { ConfigType, getFrontendProjectValidValues, allConfigFilesInDir, CUSTOM_FRAMEWORK_SLUG, appConfigFromFile, filePathExists, filePathExistsAsync, findAppConfig, getConfigTypeFromPath, getConfigTypeKeyFromValue, getFrontendProjectType, getProjectCommands, globAllFilesByPath, hashString, isPathDirectory, } from './lib/apps/index.js';
 import { getGlobIgnorePathsChecker } from './lib/apps/paths.js';
+import { slugFromApp } from './lib/apps/slug.js';
 import { default as localConfig } from './lib/config.js';
 import { toAppId } from './lib/create/index.js';
 import { detectPackageManager, transformCommand, } from './lib/package-manager.js';
@@ -139,7 +140,7 @@ export class PushAppCommand extends RemoteAppCommand {
         }
         const appSlugId = (await select({
             choices: apps.results.map((app) => ({
-                name: `${style.appConfigValue(app.name)} (${getAppSlugId(app)})`,
+                name: `${style.appConfigValue(app.name)} (${slugFromApp(app) ?? app.id})`,
                 value: app.private_id,
             })),
             message: `Choose ${typeLabelPrefixed} to pull`,

package/dist/swell-api-command.d.ts

@@ -6,10 +6,6 @@ export declare abstract class SwellApiCommand extends SwellCommand {
     protected request(command: typeof SwellApiCommand, requestOptions?: Api.RequestOptions): Promise<void>;
     protected catch(error: Error): Promise<any>;
     private parseCommand;
-    /**
-     * Resolve app ObjectId from a friendly slug or return as-is if already an ObjectId.
-     */
-    private resolveAppId;
     /**
      * Resolve function ID from app ID and function name.
      */

package/dist/swell-api-command.js

@@ -3,6 +3,7 @@ import * as fs from 'node:fs';
 import path from 'node:path';
 import { FetchError } from 'node-fetch';
 import { HttpMethod } from './lib/api.js';
+import { resolveAppId } from './lib/apps/resolve.js';
 import { SwellCommand } from './swell-command.js';
 // Pattern to match /functions/{appId}/{functionName} with optional query string
 const FUNCTION_PATH_REGEX = /^\/functions\/([^/]+)\/([^/?]+)(\?.*)?$/;
@@ -85,28 +86,11 @@ export class SwellApiCommand extends SwellCommand {
             },
         };
     }
-    /**
-     * Resolve app ObjectId from a friendly slug or return as-is if already an ObjectId.
-     */
-    async resolveAppId(appIdOrSlug) {
-        // If it looks like an ObjectId (24 hex chars), return as-is
-        if (/^[\da-f]{24}$/i.test(appIdOrSlug)) {
-            return appIdOrSlug;
-        }
-        // Fetch all installed apps and filter by public_id or private_id client-side
-        const installedApps = await this.api.get({ adminPath: `/client/apps` });
-        const app = installedApps?.results?.find((a) => a.app_public_id === appIdOrSlug ||
-            a.app_private_id === `_${appIdOrSlug}`);
-        if (!app) {
-            throw new Error(`App '${appIdOrSlug}' not found`);
-        }
-        return app.app_id;
-    }
     /**
      * Resolve function ID from app ID and function name.
      */
     async resolveFunctionId(appIdOrSlug, functionName) {
-        const appId = await this.resolveAppId(appIdOrSlug);
+        const appId = await resolveAppId(this.api, appIdOrSlug);
         const functionRecord = await this.api.get({ adminPath: `/data/:functions` }, {
             query: {
                 app_id: appId,