@swell/cli 2.9.4 → 2.9.6

package/dist/lib/create/tests.js

@@ -1,6 +1,6 @@
-import * as fs from 'node:fs';
+import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { filePathExists, writeFile } from '../apps/index.js';
+import { filePathExistsAsync, writeFile } from '../apps/index.js';
 import { envDtsTemplate, integrationTestTemplate, mockRequestTemplate, setupGlobalsTemplate, swellClientTemplate, tsconfigTemplate, unitTestTemplate, vitestConfigTemplate, } from './tests/templates/index.js';
 const TEST_DEV_DEPENDENCIES = {
     '@cloudflare/vitest-pool-workers': 'latest',
@@ -8,15 +8,15 @@ const TEST_DEV_DEPENDENCIES = {
     '@swell/app-types': 'latest',
 };
 async function writeTextFile(filePath, contents, overwrite) {
-    if (!overwrite && filePathExists(filePath)) {
+    if (!overwrite && (await filePathExistsAsync(filePath))) {
         return { created: false, skipped: true };
     }
     await writeFile(filePath, contents);
     return { created: true, skipped: false };
 }
-function updatePackageJson(appPath) {
+async function updatePackageJson(appPath) {
     const pkgPath = path.join(appPath, 'package.json');
-    if (!filePathExists(pkgPath)) {
+    if (!(await filePathExistsAsync(pkgPath))) {
         return {
             updated: false,
             warning: 'package.json not found. Run `npm init` first.',
@@ -24,7 +24,7 @@ function updatePackageJson(appPath) {
     }
     let pkgRaw;
     try {
-        pkgRaw = fs.readFileSync(pkgPath, 'utf8');
+        pkgRaw = await fs.readFile(pkgPath, 'utf8');
     }
     catch (error) {
         return {
@@ -57,7 +57,7 @@ function updatePackageJson(appPath) {
     pkg.scripts = scripts;
     try {
         const next = `${JSON.stringify(pkg, null, 2)}\n`;
-        fs.writeFileSync(pkgPath, next, 'utf8');
+        await fs.writeFile(pkgPath, next, 'utf8');
         return { updated: true };
     }
     catch (error) {
@@ -67,15 +67,15 @@ function updatePackageJson(appPath) {
         };
     }
 }
-function validatePrerequisites(appPath) {
+async function validatePrerequisites(appPath) {
     const warnings = [];
     const tsconfigPath = path.join(appPath, 'tsconfig.json');
-    if (!filePathExists(tsconfigPath)) {
+    if (!(await filePathExistsAsync(tsconfigPath))) {
         warnings.push('tsconfig.json not found. test/tsconfig.json extends it; create one or tests may not compile.');
     }
     return warnings;
 }
-async function createTestsScaffold(options) {
+export async function createTestsScaffold(options) {
     const { appPath, appId, overwrite } = options;
     const result = {
         createdFiles: [],
@@ -83,7 +83,7 @@ async function createTestsScaffold(options) {
         packageJsonUpdated: false,
         warnings: [],
     };
-    const prereqWarnings = validatePrerequisites(appPath);
+    const prereqWarnings = await validatePrerequisites(appPath);
     result.warnings.push(...prereqWarnings);
     const trackFile = async (relativePath, contents) => {
         const fullPath = path.join(appPath, relativePath);
@@ -103,11 +103,10 @@ async function createTestsScaffold(options) {
     await trackFile('test/helpers/mock-request.ts', mockRequestTemplate({ appId }));
     await trackFile('test/unit/example.test.ts', unitTestTemplate());
     await trackFile('test/integration/example.test.ts', integrationTestTemplate());
-    const pkgResult = updatePackageJson(appPath);
+    const pkgResult = await updatePackageJson(appPath);
     result.packageJsonUpdated = pkgResult.updated;
     if (pkgResult.warning) {
         result.warnings.push(pkgResult.warning);
     }
     return result;
 }
-export { createTestsScaffold };

package/dist/lib/create/webhook.d.ts

@@ -1,4 +1,4 @@
-interface CreateWebhookFileBody {
+export interface CreateWebhookFileBody {
     $schema: string;
     description?: string;
     enabled?: boolean;
@@ -13,20 +13,20 @@ type ErrorHandler = (msg: string, options: {
  * Input: "payment.succeeded,payment.failed"
  * Output: ["payment.succeeded", "payment.failed"]
  */
-declare const parseEvents: (eventsInput: string) => string[];
+export declare function parseEvents(eventsInput: string): string[];
 /**
  * Validate event format (model.action pattern)
  * Valid: "product.created", "payment.succeeded"
  * Invalid: "product", "created", "", ".created", "product."
  */
-declare const validateEventFormat: (events: string[], onError: ErrorHandler) => void;
+export declare function validateEventFormat(events: string[], onError: ErrorHandler): void;
 /**
  * Validate URL format (basic check for protocol)
  */
-declare const validateUrl: (url: string, onError: ErrorHandler) => void;
+export declare function validateUrl(url: string, onError: ErrorHandler): void;
 /**
  * Convert name to webhook label
  * "payment-handler" => "Payment Handler"
  */
-declare const toWebhookLabel: (value: string) => string;
-export { CreateWebhookFileBody, parseEvents, toWebhookLabel, validateEventFormat, validateUrl, };
+export declare const toWebhookLabel: (value: string) => string;
+export {};

package/dist/lib/create/webhook.js

@@ -4,7 +4,7 @@ import { titleize } from 'inflection';
  * Input: "payment.succeeded,payment.failed"
  * Output: ["payment.succeeded", "payment.failed"]
  */
-const parseEvents = (eventsInput) => {
+export function parseEvents(eventsInput) {
     if (!eventsInput) {
         return [];
     }
@@ -12,13 +12,13 @@ const parseEvents = (eventsInput) => {
         .split(',')
         .map((e) => e.trim())
         .filter(Boolean);
-};
+}
 /**
  * Validate event format (model.action pattern)
  * Valid: "product.created", "payment.succeeded"
  * Invalid: "product", "created", "", ".created", "product."
  */
-const validateEventFormat = (events, onError) => {
+export function validateEventFormat(events, onError) {
     const invalid = [];
     for (const event of events) {
         const parts = event.split('.');
@@ -29,24 +29,29 @@ const validateEventFormat = (events, onError) => {
     if (invalid.length > 0) {
         onError(`Invalid event format: ${invalid.join(', ')}\n\nEvents must follow the 'model.action' pattern (e.g., product.created, payment.succeeded).\n\nExample: swell create webhook my-hook -u https://example.com -e order.created,order.updated -y`, { exit: 1 });
     }
-};
+}
 /**
  * Validate URL format (basic check for protocol)
  */
-const validateUrl = (url, onError) => {
+export function validateUrl(url, onError) {
     try {
         const parsed = new URL(url);
-        if (!['http:', 'https:'].includes(parsed.protocol)) {
-            throw new Error('Invalid protocol');
+        switch (parsed.protocol) {
+            case 'http:':
+            case 'https:': {
+                break;
+            }
+            default: {
+                throw new Error('Invalid protocol');
+            }
         }
     }
     catch {
         onError(`Invalid URL format: ${url}\n\nURL must be a valid HTTP or HTTPS endpoint.\n\nExample: swell create webhook my-hook -u https://example.com/webhook -e order.created -y`, { exit: 1 });
     }
-};
+}
 /**
  * Convert name to webhook label
  * "payment-handler" => "Payment Handler"
  */
-const toWebhookLabel = (value) => titleize(value).replaceAll('-', ' ');
-export { parseEvents, toWebhookLabel, validateEventFormat, validateUrl, };
+export const toWebhookLabel = (value) => titleize(value).replaceAll('-', ' ');

package/dist/lib/function-source-analysis.js

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs';
+import * as fs from 'node:fs/promises';
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 const ts = require('typescript');
@@ -11,7 +11,7 @@ const WORKFLOW_FORBIDDEN_KEYS = [
     'timeout',
 ];
 export async function analyzeFunctionSource(filePath) {
-    const sourceText = await fs.promises.readFile(filePath, 'utf8');
+    const sourceText = await fs.readFile(filePath, 'utf8');
     return analyzeFunctionSourceText(sourceText, filePath);
 }
 export function analyzeFunctionSourceText(sourceText, filePath = 'function.ts') {
@@ -207,7 +207,7 @@ function validateWorkflowConfig(config) {
     }
     const diagnostics = [];
     for (const key of WORKFLOW_FORBIDDEN_KEYS) {
-        if (key in config) {
+        if (Object.hasOwn(config, key)) {
             diagnostics.push(`Workflow config must not specify ${key}.`);
         }
     }

package/dist/lib/info.d.ts

@@ -2,7 +2,7 @@
  * Helper module for the `info` command. Encapsulates the logic for
  * displaying the app's information.
  */
-import { App, AppVersion } from './apps';
+import type { App, AppVersion } from './apps/index.js';
 interface FieldDefinition {
     label: string;
     transform?: (_arg: any) => Promise<string> | string;

package/dist/lib/logs/index.d.ts

@@ -1,3 +1,4 @@
+import type { LogItem } from '../../types/index.js';
 export { LineOutput } from './line-output.js';
 export { TableOutput } from './table-output.js';
 /**

package/dist/lib/logs/line-output.d.ts

@@ -1,3 +1,4 @@
+import type { LogItem } from '../../types/index.js';
 import { Output } from './output.js';
 export declare class LineOutput extends Output {
     prepareData(log: LogItem): string[];

package/dist/lib/logs/line-output.js

@@ -1,10 +1,18 @@
 import { Output } from './output.js';
-const COLUMN_NAMES_TO_HIDE = new Set(['date', 'request']);
 export class LineOutput extends Output {
     prepareData(log) {
-        return this.columns.map((c) => {
-            const logValue = log[c];
-            return COLUMN_NAMES_TO_HIDE.has(c) ? logValue : `${c}: ${logValue}`;
+        return this.columns.map((column) => {
+            const logValue = log[column];
+            switch (column) {
+                case 'date':
+                case 'request': {
+                    // Hide column name
+                    return logValue;
+                }
+                default: {
+                    return `${column}: ${logValue}`;
+                }
+            }
         });
     }
     write(row) {

package/dist/lib/logs/output.d.ts

@@ -1,3 +1,4 @@
+import type { LogItem } from '../../types/index.js';
 export declare abstract class Output {
     protected columns: string[];
     protected pretty: boolean;

package/dist/lib/logs/table-output.d.ts

@@ -1,3 +1,4 @@
+import type { LogItem } from '../../types/index.js';
 import { Output } from './output.js';
 export declare class TableOutput extends Output {
     private stream;

package/dist/lib/logs/table-output.js

@@ -23,12 +23,12 @@ export class TableOutput extends Output {
         this.writeHeader();
     }
     prepareData(log) {
-        return this.columns.map((c) => {
+        return this.columns.map((col) => {
             // for each column, get the value from the log item and prepare it for
             // display in the table, i.e. go through TableLoggedItem before returning
             const tableLog = new TableLoggedItem(log, this.pretty);
             const preparedLog = tableLog.prepareData();
-            return preparedLog[c];
+            return preparedLog[col];
         });
     }
     write(row) {
@@ -94,7 +94,7 @@ export class TableOutput extends Output {
         return { width, wrapWord };
     }
     writeHeader() {
-        this.stream.write(this.columns.map((c) => this.displayOptions(c)?.title || titleize(c)));
+        this.stream.write(this.columns.map((col) => this.displayOptions(col)?.title || titleize(col)));
     }
 }
 /**
@@ -120,8 +120,11 @@ class TableLoggedItem {
                 logData = JSON.stringify(logData, null, 2);
             }
         }
-        catch {
-            // do nothing, JSON parsing errors
+        catch (error) {
+            // Ignore JSON parsing errors
+            if (!(error instanceof SyntaxError)) {
+                throw error;
+            }
         }
         return logData;
     }

package/dist/lib/package-manager.d.ts

@@ -15,16 +15,16 @@ export interface PackageManagerCommands {
  * Find lock file in directory or parent directories
  * @returns Lock file name and path, or null if not found
  */
-export declare function findLockFile(directory: string): {
+export declare function findLockFile(directory: string): Promise<{
     name: string;
     packageManager: PackageManager;
     path: string;
-} | null;
+} | null>;
 /**
  * Detect package manager from lock file in directory tree
  * @returns Detected package manager, defaults to 'npm' if no lock file found
  */
-export declare function detectPackageManager(directory: string): PackageManager;
+export declare function detectPackageManager(directory: string): Promise<PackageManager>;
 /**
  * Get command templates for a package manager
  */
@@ -32,14 +32,14 @@ export declare function getPackageManagerCommands(pm: PackageManager): PackageMa
 /**
  * Detect package manager and get its commands
  */
-export declare function getPackageManager(directory: string): {
+export declare function getPackageManager(directory: string): Promise<{
     commands: PackageManagerCommands;
     lockFile: {
         name: string;
         path: string;
     } | null;
     name: PackageManager;
-};
+}>;
 /**
  * Transform an npm command to the equivalent for the detected package manager
  * Handles common patterns:

package/dist/lib/package-manager.js

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs';
+import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 /** Lock file to package manager mapping (priority order: bun > pnpm > yarn > npm) */
 const LOCK_FILES = [
@@ -44,13 +44,15 @@ const COMMANDS = {
  * Find lock file in directory or parent directories
  * @returns Lock file name and path, or null if not found
  */
-export function findLockFile(directory) {
+export async function findLockFile(directory) {
     let currentDir = path.resolve(directory);
     const { root } = path.parse(currentDir);
     while (currentDir !== root) {
         for (const [lockFile, pm] of LOCK_FILES) {
             const lockPath = path.join(currentDir, lockFile);
-            if (fs.existsSync(lockPath)) {
+            // eslint-disable-next-line no-await-in-loop
+            const exists = await fs.access(lockPath, fs.constants.R_OK).then(() => true, (_error) => false);
+            if (exists) {
                 return { name: lockFile, packageManager: pm, path: lockPath };
             }
         }
@@ -62,8 +64,8 @@ export function findLockFile(directory) {
  * Detect package manager from lock file in directory tree
  * @returns Detected package manager, defaults to 'npm' if no lock file found
  */
-export function detectPackageManager(directory) {
-    const lockFile = findLockFile(directory);
+export async function detectPackageManager(directory) {
+    const lockFile = await findLockFile(directory);
     return lockFile?.packageManager ?? 'npm';
 }
 /**
@@ -75,8 +77,8 @@ export function getPackageManagerCommands(pm) {
 /**
  * Detect package manager and get its commands
  */
-export function getPackageManager(directory) {
-    const lockFile = findLockFile(directory);
+export async function getPackageManager(directory) {
+    const lockFile = await findLockFile(directory);
     const name = lockFile?.packageManager ?? 'npm';
     return {
         commands: COMMANDS[name],

package/dist/lib/proxy.js

@@ -1,6 +1,6 @@
 import { bin, install, Tunnel } from 'cloudflared';
 import localtunnel from 'localtunnel';
-import * as fs from 'node:fs';
+import * as fs from 'node:fs/promises';
 import ora from 'ora';
 import { LOCAL_PROXY_PROVIDER } from './constants.js';
 let activeTunnel = null;
@@ -12,7 +12,8 @@ async function startCloudflaredTunnel(port) {
         activeTunnel = null;
     }
     // Ensure cloudflared binary is installed
-    if (!fs.existsSync(bin)) {
+    const exists = await fs.access(bin, fs.constants.X_OK).then(() => true, (_error) => false);
+    if (!exists) {
         const spinner = ora('Installing cloudflared tunnel (first time only)...').start();
         await install(bin);
         spinner.stop();
@@ -82,6 +83,6 @@ export async function getProxyUrl(port, context) {
     }
     catch (error) {
         console.error(error);
-        throw new Error(`Unable to start tunnel on port ${port} (${provider}): ${error.message}`);
+        throw new Error(`Unable to start tunnel on port ${port} (${provider}): ${error.message}`, { cause: error });
     }
 }

package/dist/lib/sessions.d.ts

@@ -5,5 +5,4 @@
  * @param storeId - The store to get the session id for
  * @returns A promise that resolves to the session id
  */
-declare function getSessionIdOrLoginInBrowser(storeId?: string | undefined): Promise<string[]>;
-export { getSessionIdOrLoginInBrowser };
+export declare function getSessionIdOrLoginInBrowser(storeId?: string | undefined): Promise<string[]>;

package/dist/lib/sessions.js

@@ -11,7 +11,7 @@ import style from './style.js';
  * @param storeId - The store to get the session id for
  * @returns A promise that resolves to the session id
  */
-function getSessionIdOrLoginInBrowser(storeId) {
+export function getSessionIdOrLoginInBrowser(storeId) {
     return new Promise((resolve, _reject) => {
         const onSessionId = (sessionId, storeId) => resolve([sessionId, storeId]);
         createServer(onSessionId, storeId);
@@ -108,4 +108,3 @@ function serverForLogin({ onPost, onStart, storeId, }) {
         }
     }, 100);
 }
-export { getSessionIdOrLoginInBrowser };

package/dist/lib/stores.d.ts

@@ -1,3 +1,4 @@
+import type { Store, UserAuthorization } from '../types/index.js';
 /**
  * Builds a list of stores while also highlighting the current store.
  *
@@ -12,7 +13,7 @@
  * @param currentStoreId - The ID of the default store
  * @returns A list of stores ready to display.
  */
-declare function showStores(stores: Store[], currentStoreId: string): string;
+export declare function showStores(stores: Store[], currentStoreId: string): string;
 /**
  * Select the store to login to from a CLI prompt.
  *
@@ -26,7 +27,7 @@ declare function showStores(stores: Store[], currentStoreId: string): string;
  *
  * @returns The store ID to login to
  */
-declare function selectStoreId({ authorizations, currentStoreId, force, }: {
+export declare function selectStoreId({ authorizations, currentStoreId, force, }: {
     authorizations: UserAuthorization[];
     currentStoreId: string;
     force: boolean;
@@ -39,7 +40,7 @@ declare function selectStoreId({ authorizations, currentStoreId, force, }: {
  * @returns The store ID to switch to
  * @throws CLIError - If there are no stores to switch to
  */
-declare function selectLoggedInStoreId(message?: string): Promise<string>;
+export declare function selectLoggedInStoreId(message?: string): Promise<string>;
 /**
  * Select an environment.
  *
@@ -47,7 +48,7 @@ declare function selectLoggedInStoreId(message?: string): Promise<string>;
  * @returns Environment to switch to
  * @throws CLIError - If there are no stores to switch to
  */
-declare function selectEnvironmentId(message?: string): Promise<string>;
+export declare function selectEnvironmentId(message?: string): Promise<string>;
 /**
  * Ask the user if they want to make the given store id the default store.
  *
@@ -61,8 +62,7 @@ declare function selectEnvironmentId(message?: string): Promise<string>;
  *
  * @returns void
  */
-declare function modifyDefaultStore({ currentStoreId, storeId, }: {
+export declare function modifyDefaultStore({ currentStoreId, storeId, }: {
     currentStoreId: string;
     storeId: string;
 }, force?: boolean): Promise<void>;
-export { modifyDefaultStore, selectEnvironmentId, selectLoggedInStoreId, selectStoreId, showStores, };

package/dist/lib/stores.js

@@ -16,7 +16,7 @@ import style from './style.js';
  * @param currentStoreId - The ID of the default store
  * @returns A list of stores ready to display.
  */
-function showStores(stores, currentStoreId) {
+export function showStores(stores, currentStoreId) {
     if (stores.length === 0) {
         throw new CLIError('You are not logged in to any store.');
     }
@@ -55,7 +55,7 @@ function showStores(stores, currentStoreId) {
  *
  * @returns The store ID to login to
  */
-async function selectStoreId({ authorizations, currentStoreId, force = false, }) {
+export async function selectStoreId({ authorizations, currentStoreId, force = false, }) {
     let selectStoreChoices;
     let selectedStoreId;
     // eslint-disable-next-line unicorn/prefer-ternary
@@ -105,7 +105,7 @@ async function selectStoreId({ authorizations, currentStoreId, force = false, })
  * @returns The store ID to switch to
  * @throws CLIError - If there are no stores to switch to
  */
-async function selectLoggedInStoreId(message) {
+export async function selectLoggedInStoreId(message) {
     const currentStoreId = config.getDefaultStore();
     const loggedInStores = config.get('stores') || [];
     if (loggedInStores.length === 0) {
@@ -136,7 +136,7 @@ async function selectLoggedInStoreId(message) {
  * @returns Environment to switch to
  * @throws CLIError - If there are no stores to switch to
  */
-async function selectEnvironmentId(message) {
+export async function selectEnvironmentId(message) {
     return select({
         choices: [
             {
@@ -164,7 +164,7 @@ async function selectEnvironmentId(message) {
  *
  * @returns void
  */
-async function modifyDefaultStore({ currentStoreId, storeId, }, force = false) {
+export async function modifyDefaultStore({ currentStoreId, storeId, }, force = false) {
     let modifyDefault = false;
     if (!force && currentStoreId && currentStoreId !== storeId) {
         modifyDefault = await confirm({
@@ -175,4 +175,3 @@ async function modifyDefaultStore({ currentStoreId, storeId, }, force = false) {
         config.setDefaultStore(storeId);
     }
 }
-export { modifyDefaultStore, selectEnvironmentId, selectLoggedInStoreId, selectStoreId, showStores, };