@swell/cli 2.9.3 → 2.9.5

package/dist/push-app-command.d.ts

@@ -1,4 +1,5 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import type { GlobbyFilterFunction } from 'globby';
 import * as fs from 'node:fs';
 import { App, AppConfig, ConfigType, FrontendProjectType } from './lib/apps/index.js';
@@ -26,7 +27,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
     deployAppFrontend(force?: boolean, log?: boolean): Promise<void>;
     deployFrontend(projectType: FrontendProjectType): Promise<string>;
     ensureAppExists(file?: string, shouldCreate?: boolean): Promise<boolean>;
-    ensureLoggedIn(): Promise<true | undefined>;
+    ensureLoggedIn(): Promise<void>;
     exec(command: string, cwd?: string, onOutput?: (string: string) => any | false): Promise<void>;
     execFrontend(command: string, onOutput?: (string: string) => any | false): Promise<void>;
     getAllAppStorefronts(params?: {
@@ -46,8 +47,8 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
         targetPath?: string;
     }, shouldChoose?: boolean): Promise<App | undefined>;
     getExistingApp(appId: string): Promise<App>;
-    getFrontendDeploymentHash(): string | undefined;
-    getFrontendProjectType(required?: boolean): FrontendProjectType | null;
+    getFrontendDeploymentHash(): Promise<string | undefined>;
+    getFrontendProjectType(required?: boolean): Promise<FrontendProjectType | null>;
     getStorefrontToPull(args?: {
         appId?: string;
         targetPath?: string;
@@ -66,6 +67,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
         env?: string;
         'storefront-id'?: string;
         'storefront-select'?: boolean;
+        yes?: boolean;
     }, defaultStorefront?: any): Promise<void>;
     handleWatchFileChange(configFile: string, configType: ConfigType, event: WatchFileEvent): Promise<void>;
     logAppFrontendUrl(): void;
@@ -76,7 +78,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
     logStorefrontFrontendUrl(storefront?: any, branchId?: string): void;
     pushFile(relativePath: string): Promise<void>;
     pushFilePath(relativePath: string, force?: boolean): Promise<void>;
-    resolveAppPath(appId?: string, targetPath?: string): string;
+    resolveAppPath(appId?: string, targetPath?: string): Promise<string>;
     runWatchChangeQueue(): Promise<void>;
     saveCurrentStorefront(): void;
     logLocalPreviewUrl(): void;
@@ -88,7 +90,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
         logChanges?: boolean;
         onChange?: (appConfig?: AppConfig, result?: any) => void;
         syncAll?: boolean;
-    }): Promise<void>;
+    }): Promise<fs.FSWatcher>;
     wranglerDeployFrontend(_projectType: FrontendProjectType): Promise<string>;
     private confirmRemoveInstalledApp;
 }

package/dist/push-app-command.js

@@ -6,7 +6,7 @@ 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, getConfigTypeFromPath, getConfigTypeKeyFromValue, getFrontendProjectType, getProjectCommands, globAllFilesByPath, hashString, isPathDirectory, } from './lib/apps/index.js';
+import { ConfigType, getFrontendProjectValidValues, allConfigFilesInDir, CUSTOM_FRAMEWORK_SLUG, appConfigFromFile, 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';
@@ -121,7 +121,7 @@ export class PushAppCommand extends RemoteAppCommand {
             return;
         }
         // Get commands transformed for the detected package manager
-        const { buildCommand } = getProjectCommands(this.appPath, projectType);
+        const { buildCommand } = await getProjectCommands(this.appPath, projectType);
         if (!buildCommand) {
             // No build command needed for this framework
             return;
@@ -251,11 +251,11 @@ export class PushAppCommand extends RemoteAppCommand {
     }
     async deployAppFrontend(force, log) {
         const currentStore = localConfig.getDefaultStore();
-        const projectType = this.getFrontendProjectType(false);
+        const projectType = await this.getFrontendProjectType(false);
         if (!projectType) {
             return;
         }
-        const deploymentHash = this.getFrontendDeploymentHash();
+        const deploymentHash = await this.getFrontendDeploymentHash();
         // Build and deploy only if there are files to push
         if (deploymentHash &&
             (force || deploymentHash !== this.app.frontend?.deployment_hash)) {
@@ -335,7 +335,6 @@ export class PushAppCommand extends RemoteAppCommand {
             this.log('Logging in...\n');
             await this.config.runCommand('login');
             this.log();
-            return true;
         }
     }
     async exec(command, cwd, onOutput) {
@@ -386,25 +385,20 @@ export class PushAppCommand extends RemoteAppCommand {
         const query = Object.entries(params || {})
             .map(([key, value]) => `${key}=${value}`)
             .join('&');
-        try {
-            return this.handleRequestErrors(async () => this.api.get({
-                adminPath: `/apps/${this.app.id}/storefront?${query}`,
-            }));
-        }
-        catch {
-            // noop
-        }
+        return this.handleRequestErrors(async () => this.api.get({
+            adminPath: `/apps/${this.app.id}/storefront?${query}`,
+        }));
     }
     async getAppToPull(args, shouldChoose = true) {
         const { appId, targetPath } = args;
         const klass = this.ctor;
         const currentStore = localConfig.getDefaultStore();
         await this.api.setStoreEnv(currentStore, klass.orientation?.env);
-        this.resolveAppPath(appId, targetPath);
-        if (isPathDirectory(this.appPath)) {
-            this.swellConfig = swellConfig(this.appPath);
-            const localAppId = this.swellConfig.get('id');
-            const localAppType = this.swellConfig.get('type');
+        await this.resolveAppPath(appId, targetPath);
+        if (await isPathDirectory(this.appPath)) {
+            this.swellConfig = await swellConfig(this.appPath);
+            const localAppId = String(this.swellConfig.get('id'));
+            const localAppType = String(this.swellConfig.get('type'));
             if (localAppId) {
                 if (appId && appId !== localAppId) {
                     this.error(`${localAppType === 'theme' ? 'A theme' : 'An app'} already exists in this path with a different ID: ${style.appConfigValue(localAppId)}`);
@@ -418,7 +412,7 @@ export class PushAppCommand extends RemoteAppCommand {
                 ? await this.chooseAppToPull()
                 : undefined;
         if (shouldChoose) {
-            this.swellConfig = swellConfig(this.appPath);
+            this.swellConfig = await swellConfig(this.appPath);
         }
         return app;
     }
@@ -436,8 +430,8 @@ export class PushAppCommand extends RemoteAppCommand {
             }
         }
     }
-    getFrontendDeploymentHash() {
-        const localConfigs = this.getLocalAppConfigs();
+    async getFrontendDeploymentHash() {
+        const localConfigs = await this.getLocalAppConfigs();
         let frontendHashes = localConfigs
             .filter((config) => config.filePath?.startsWith(`frontend${path.sep}`))
             .map((config) => config.hash)
@@ -449,13 +443,13 @@ export class PushAppCommand extends RemoteAppCommand {
         }
         return frontendHashes.length > 0 ? hashString(frontendHashes) : undefined;
     }
-    getFrontendProjectType(required = true) {
+    async getFrontendProjectType(required = true) {
         this.frontendPath = path.join(this.appPath, 'frontend');
-        const frontendExists = filePathExists(this.frontendPath);
+        const frontendExists = await filePathExistsAsync(this.frontendPath);
         if (!required && !frontendExists) {
             return null;
         }
-        const projectType = getFrontendProjectType(this.appPath);
+        const projectType = await getFrontendProjectType(this.appPath);
         if (!projectType) {
             // If frontend not required, just return null (don't error)
             if (!required) {
@@ -475,10 +469,10 @@ export class PushAppCommand extends RemoteAppCommand {
         const { appId, targetPath } = args;
         const targetStorefront = flags['storefront-id'];
         const targetApp = await this.getAppToPull(args, false);
-        this.resolveAppPath(appId, targetPath);
+        await this.resolveAppPath(appId, targetPath);
         // Only use default if path exists
         let defaultStorefront;
-        if (isPathDirectory(this.appPath)) {
+        if (await isPathDirectory(this.appPath)) {
             defaultStorefront = localConfig.getDefaultStorefront(this.appPath);
         }
         await this.setStorefrontEnv(flags, defaultStorefront);
@@ -501,7 +495,7 @@ export class PushAppCommand extends RemoteAppCommand {
                 const appId = this.appType === 'theme'
                     ? this.storefront.theme_app_id
                     : this.storefront.app_id;
-                this.resolveAppPath(this.storefront.name, targetPath);
+                await this.resolveAppPath(this.storefront.name, targetPath);
                 this.app = await this.getApp(appId);
             }
             else {
@@ -509,7 +503,7 @@ export class PushAppCommand extends RemoteAppCommand {
                 // However it's a good fallback in case the storefront was deleted
                 // Choosing a theme app will proceed to pull app files
                 this.app = await this.chooseAppToPull();
-                this.resolveAppPath(this.app.name, targetPath);
+                await this.resolveAppPath(this.app.name, targetPath);
             }
         }
         else {
@@ -528,7 +522,7 @@ export class PushAppCommand extends RemoteAppCommand {
                 : this.storefront.app_id;
             this.app = await this.getApp(appId);
         }
-        this.swellConfig = swellConfig(this.appPath);
+        this.swellConfig = await swellConfig(this.appPath);
         return this.storefront;
     }
     async getStorefrontToPush(flags = {}) {
@@ -600,6 +594,7 @@ export class PushAppCommand extends RemoteAppCommand {
     async setStorefrontEnv(flags, defaultStorefront) {
         const currentStore = localConfig.getDefaultStore();
         const targetStorefront = flags['storefront-id'];
+        const nonInteractive = flags.yes || false;
         if (defaultStorefront &&
             !targetStorefront &&
             !flags['storefront-id'] &&
@@ -615,7 +610,7 @@ export class PushAppCommand extends RemoteAppCommand {
         else {
             const hasTestEnv = await this.api.isTestEnvEnabled();
             if (hasTestEnv) {
-                const env = await selectEnvironmentId();
+                const env = nonInteractive ? 'test' : await selectEnvironmentId();
                 await this.api.setStoreEnv(currentStore, env);
             }
         }
@@ -636,7 +631,7 @@ export class PushAppCommand extends RemoteAppCommand {
                 break;
             }
             default: {
-                config = appConfigFromFile(configFile, configType, this.appPath);
+                config = await appConfigFromFile(configFile, configType, this.appPath);
                 this.watchingChangeQueue.set(configFile, {
                     action: 'push',
                     appConfig: config,
@@ -682,19 +677,21 @@ export class PushAppCommand extends RemoteAppCommand {
     async pushFile(relativePath) {
         const basePath = relativePath.split(path.sep)[0];
         const configType = getConfigTypeFromPath(basePath) || ConfigType.FILE;
-        const config = appConfigFromFile(relativePath, configType, this.appPath);
+        const config = await appConfigFromFile(relativePath, configType, this.appPath);
         await this.pushRemoteFile(config);
     }
     async pushFilePath(relativePath, force) {
         const topDir = relativePath.split(path.sep)[0];
-        const configType = (getConfigTypeFromPath(topDir) || 'file');
-        const configTypeKey = getConfigTypeKeyFromValue(configType) || 'file';
+        const configType = getConfigTypeFromPath(topDir) || ConfigType.FILE;
+        const configTypeKey = getConfigTypeKeyFromValue(configType) || ConfigType.FILE;
         const exAppConfigs = (this.app?.configs || []).filter((config) => config.filePath?.startsWith(`${relativePath}/`));
-        const allFiles = [];
-        const pushFiles = [];
+        const promises = [];
         for (const { configFile } of allConfigFilesInDir(this.appPath, relativePath, configTypeKey)) {
-            const config = appConfigFromFile(configFile, configType, this.appPath);
-            allFiles.push(config);
+            promises.push(appConfigFromFile(configFile, configType, this.appPath));
+        }
+        const allFiles = await Promise.all(promises);
+        const pushFiles = [];
+        for (const config of allFiles) {
             const exConfig = exAppConfigs.find((exConfig) => config.filePath === exConfig.filePath);
             if (!force && exConfig && exConfig.hash === config.hash) {
                 continue;
@@ -709,18 +706,16 @@ export class PushAppCommand extends RemoteAppCommand {
                 // eslint-disable-next-line no-await-in-loop
                 await Promise.all(pushFiles
                     .splice(0, pushConcurrency)
-                    .map(async (appConfig) => {
-                    await this.pushRemoteFile(appConfig);
-                }));
+                    .map((appConfig) => this.pushRemoteFile(appConfig)));
             }
         }
         // Remove any deleted files
         if (filesToRemove.length > 0) {
             while (filesToRemove.length > 0) {
                 // eslint-disable-next-line no-await-in-loop
-                await Promise.all(filesToRemove.splice(0, PUSH_CONCURRENCY).map(async (appConfig) => {
-                    await this.removeRemoteFile(appConfig);
-                }));
+                await Promise.all(filesToRemove
+                    .splice(0, PUSH_CONCURRENCY)
+                    .map((appConfig) => this.removeRemoteFile(appConfig)));
             }
         }
         if (!hasChanges && !force) {
@@ -731,12 +726,12 @@ export class PushAppCommand extends RemoteAppCommand {
             this.log(`${style.success('✔')} Pushed ${style.path(relativePath)} to ${style.appConfigValue(this.app.name)}.`);
         }
     }
-    resolveAppPath(appId, targetPath) {
+    async resolveAppPath(appId, targetPath) {
         const resolvedAppId = appId || '';
         let resolvedPath = targetPath || resolvedAppId;
         // If app_id matches directory, use it as target path
         if (!targetPath &&
-            isPathDirectory(path.resolve(process.cwd(), resolvedAppId))) {
+            (await isPathDirectory(path.resolve(process.cwd(), resolvedAppId)))) {
             resolvedPath = resolvedAppId;
         }
         // Reset app path if appId is provided
@@ -765,7 +760,7 @@ export class PushAppCommand extends RemoteAppCommand {
                 }));
             }
             catch {
-                // noop
+                // TODO: Ignore only some errors
             }
         }
         /* eslint-enable no-await-in-loop */
@@ -848,13 +843,12 @@ export class PushAppCommand extends RemoteAppCommand {
         await this.setWatchingFiles();
         if (syncAll) {
             await this.pushAppConfigs();
-            fs.watch(this.appPath, { recursive: true }, async (_eventType, _filename) => {
+            return fs.watch(this.appPath, { recursive: true }, async (_eventType, _filename) => {
                 await this.pushAppConfigs();
                 await this.setWatchingFiles();
             });
-            return;
         }
-        fs.watch(this.appPath, { recursive: true }, this.watchListener);
+        return fs.watch(this.appPath, { recursive: true }, this.watchListener);
     }
     async wranglerDeployFrontend(_projectType) {
         let deploymentUrl;
@@ -863,7 +857,7 @@ export class PushAppCommand extends RemoteAppCommand {
         let outputBuffer = '';
         this.log(`\nDeploying to Cloudflare...\n`);
         // Get the wrangler deploy command for the detected package manager
-        const pm = detectPackageManager(this.appPath);
+        const pm = await detectPackageManager(this.appPath);
         const deployCommand = transformCommand('npx wrangler deploy', pm);
         try {
             await this.execFrontend(deployCommand, (string) => {

package/dist/remote-app-command.d.ts

@@ -1,3 +1,5 @@
+import { type Ora } from 'ora';
+import type { AppCommandOrientation } from './types/index.js';
 import { AppCommand } from './app-command.js';
 import { App, AppConfig, AppVersion } from './lib/apps/index.js';
 /**
@@ -24,12 +26,12 @@ export declare abstract class RemoteAppCommand extends AppCommand {
     getConfigData(configId: string): Promise<any>;
     protected getCreateUpdateApp(updateApp?: App | null): Promise<App>;
     protected getInstalledApp(): Promise<any>;
-    protected getLocalAppConfigs(): AppConfig[];
+    protected getLocalAppConfigs(): Promise<AppConfig[]>;
     protected getVersion(version?: null | string | undefined): Promise<AppVersion>;
     protected getVersions(version?: null | string | undefined): Promise<AppVersion[]>;
     protected handleRequestErrors(request: () => any, spinnerError?: () => void): Promise<any>;
     init(): Promise<void>;
-    protected installApp(version: string, spinner?: any): Promise<any>;
+    protected installApp(version: string, spinner?: Ora): Promise<any>;
     isConfigDeprecated(config: AppConfig): boolean;
     localFrontendUrl(storeId: string, localId: string): string;
     logOrientation(orientation?: AppCommandOrientation): Promise<void>;
@@ -51,8 +53,8 @@ export declare abstract class RemoteAppCommand extends AppCommand {
     storefrontFrontendUrl(storeId: string, storefront?: any, branchId?: string, preview?: boolean): string;
     protected swellRcPath(): string;
     protected timestampStyled(): string;
-    protected updateInstalledApp(version: string, spinner?: any): Promise<void>;
-    protected updateVersion(version: string, body: any, spinner?: any): Promise<void>;
+    protected updateInstalledApp(version: string, spinner?: Ora): Promise<void>;
+    protected updateVersion(version: string, body: any, spinner?: Ora): Promise<void>;
     /**
      * Reads the .swellrc file and sets up the remote app configuration.
      *

package/dist/remote-app-command.js

@@ -5,7 +5,7 @@ import * as path from 'node:path';
 import { default as ora } from 'ora';
 import { AppCommand } from './app-command.js';
 import { readRcFile, writeRcFile } from './lib/app-config.js';
-import { AppConfig, FunctionProcessingError, IgnoringFileError, SwellJsonFields, allBaseFilesInDir, allConfigFilesPaths, appConfigFromFile, batchAppFilesByType, deleteFile, hashFile, writeFile, writeJsonFile, PUSH_CONCURRENCY, } from './lib/apps/index.js';
+import { AppConfig, ConfigType, FunctionProcessingError, IgnoringFileError, SwellJsonFields, allBaseFilesInDir, allConfigFilesPaths, appConfigFromFile, batchAppFilesByType, deleteFile, hashFile, writeFile, writeJsonFile, PUSH_CONCURRENCY, } from './lib/apps/index.js';
 import { default as localConfig } from './lib/config.js';
 import { getAppFrontendHost, getLocalFrontendHost, getLoginHost, getStorefrontFrontendHost, } from './lib/constants.js';
 import { toAppId } from './lib/create/index.js';
@@ -78,20 +78,21 @@ export class RemoteAppCommand extends AppCommand {
                 },
             });
             // Instantiate AppConfig for each object
-            app.configs = (configs.results || []).map((config) => AppConfig.create({
+            app.configs = await Promise.all((configs.results || []).map((config) => AppConfig.create({
                 ...config,
                 appPath: this.appPath,
-            }));
+            })));
             // Pull app configs to compare with theme for push/pull
             if (themeId && this.themeSyncApp) {
                 const appConfigs = await this.api.get({ adminPath: `/apps/${id}/configs` }, { query: { limit: 1000 } });
+                const promises = [];
                 for (const appConfig of appConfigs.results || []) {
                     const themeConfig = app.configs.find((config) => config.filePath === appConfig.file_path);
                     if (themeConfig && themeConfig.fileHash !== appConfig.hash) {
                         themeConfig.hash = appConfig.hash;
                     }
                     else if (!themeConfig && appConfig) {
-                        app.configs.push(AppConfig.create({
+                        promises.push(AppConfig.create({
                             ...appConfig,
                             appConfigId: appConfig.id,
                             appPath: this.appPath,
@@ -99,6 +100,10 @@ export class RemoteAppCommand extends AppCommand {
                         }));
                     }
                 }
+                if (promises.length > 0) {
+                    const list = await Promise.all(promises);
+                    app.configs.push(...list);
+                }
                 for (const themeConfig of app.configs) {
                     const appConfig = appConfigs.results.find((config) => themeConfig.filePath === config.file_path);
                     if (!appConfig) {
@@ -178,7 +183,7 @@ export class RemoteAppCommand extends AppCommand {
                 throw error;
             }
         }
-        if (!this.swellConfig.store.id) {
+        if (!this.swellConfig.store?.id) {
             throw new Error('App swell.json is missing or `id` is not defined.');
         }
         const body = {
@@ -244,17 +249,15 @@ export class RemoteAppCommand extends AppCommand {
         // check if app is already installed on store
         return this.api.get({ adminPath: `/client/apps/${this.app.id}` }, {});
     }
-    getLocalAppConfigs() {
-        const localConfigs = [];
+    async getLocalAppConfigs() {
+        const promises = [];
         for (const { configFile, configType } of allConfigFilesPaths(this.appPath)) {
-            const config = appConfigFromFile(configFile, configType, this.appPath);
-            localConfigs.push(config);
+            promises.push(appConfigFromFile(configFile, configType, this.appPath));
         }
         for (const filePath of allBaseFilesInDir(this.appPath)) {
-            const config = appConfigFromFile(filePath, 'file', this.appPath);
-            localConfigs.push(config);
+            promises.push(appConfigFromFile(filePath, ConfigType.FILE, this.appPath));
         }
-        return localConfigs;
+        return Promise.all(promises);
     }
     async getVersion(version) {
         const versionsResponse = await this.api.get({ adminPath: `/apps/${this.app.id}/versions` }, {
@@ -289,8 +292,11 @@ export class RemoteAppCommand extends AppCommand {
             try {
                 jsonError = JSON.parse(error.message);
             }
-            catch {
-                // noop, likely JSON parse error
+            catch (error) {
+                // Skip JSON parse error
+                if (!(error instanceof SyntaxError)) {
+                    throw error;
+                }
             }
             if (!showedErrors) {
                 if (jsonError && jsonError.error) {
@@ -312,8 +318,8 @@ export class RemoteAppCommand extends AppCommand {
             await this.logOrientation();
         }
     }
-    async installApp(version, spinner) {
-        return this.api.post({ adminPath: `/client/apps` }, {
+    installApp(version, spinner) {
+        return this.api.post({ adminPath: '/client/apps' }, {
             body: { app_id: this.app.id, version },
             onAsyncGetPath: (response) => ({
                 adminPath: `/client/app-async-status/${response.app_id}`,
@@ -352,8 +358,10 @@ export class RemoteAppCommand extends AppCommand {
     async pullAppConfigs(force, confirmRemove = true) {
         const pulled = [];
         const removed = [];
-        const localConfigs = this.getLocalAppConfigs();
-        const remoteConfigs = await this.cleanRemoteConfigs(await this.pullAppJsonAndRemoteConfigs(), false);
+        const [localConfigs, remoteConfigs] = await Promise.all([
+            this.getLocalAppConfigs(),
+            this.pullAppJsonAndRemoteConfigs().then((remoteConfigs) => this.cleanRemoteConfigs(remoteConfigs, false)),
+        ]);
         const batches = batchAppFilesByType(remoteConfigs);
         for (const batch of batches) {
             const remoteBatchConfigs = remoteConfigs.filter((config) => config.type === batch.type);
@@ -364,13 +372,15 @@ export class RemoteAppCommand extends AppCommand {
                 try {
                     const localConfig = localBatchConfigs.find((config) => config.filePath === batchConfig.filePath);
                     if (localConfig) {
-                        const hash = hashFile(batchConfig.appPath, undefined, batchConfig.filePath);
+                        const hash = hashFile(batchConfig.appPath, localConfig.fileData, batchConfig.filePath);
                         if (hash === batchConfig.hash) {
                             return false;
                         }
                     }
                 }
-                catch { }
+                catch {
+                    // TODO: Ignore only some errors
+                }
                 return true;
             });
             const filesToRemove = localBatchConfigs.filter((config) => !batch.configs.some((batchConfig) => batchConfig.filePath === config.filePath));
@@ -439,7 +449,7 @@ export class RemoteAppCommand extends AppCommand {
             swellConfigJson.id = toAppId(this.app.private_id);
             await writeJsonFile(path.join(this.appPath, 'swell.json'), swellConfigJson);
         }
-        const swellConfig = appConfigFromFile('swell.json', 'file', this.appPath);
+        const swellConfig = await appConfigFromFile('swell.json', ConfigType.FILE, this.appPath);
         swellConfig.id = swellJson?.id;
         return [swellConfig, ...allOtherConfigs];
     }
@@ -460,8 +470,10 @@ export class RemoteAppCommand extends AppCommand {
     async pushAppConfigs(force) {
         const pushed = [];
         const removed = [];
-        const localConfigs = this.getLocalAppConfigs();
-        const remoteConfigs = await this.cleanRemoteConfigs(this.app?.configs || []);
+        const [localConfigs, remoteConfigs] = await Promise.all([
+            this.getLocalAppConfigs(),
+            this.cleanRemoteConfigs(this.app?.configs || []),
+        ]);
         // Do not allow more than 10K files
         if (localConfigs.length > 10000) {
             this.error(`Apps only support up to 10,000 files. Found ${localConfigs.length} files.`);
@@ -470,8 +482,10 @@ export class RemoteAppCommand extends AppCommand {
         for (const batch of batches) {
             const remoteBatchConfigs = remoteConfigs.filter((config) => config.type === batch.type);
             const pushFiles = batch.configs.filter((batchConfig) => {
+                if (force)
+                    return true;
                 const remoteConfig = remoteBatchConfigs.find((config) => batchConfig.filePath === config.filePath);
-                return Boolean(force || !remoteConfig || remoteConfig.hash !== batchConfig.hash);
+                return Boolean(!remoteConfig || remoteConfig.hash !== batchConfig.hash);
             });
             const filesToRemove = remoteBatchConfigs.filter((config) => !batch.configs.some((batchConfig) => batchConfig.filePath === config.filePath));
             // Skip if there are no config changes
@@ -538,7 +552,7 @@ export class RemoteAppCommand extends AppCommand {
             }
             if (error instanceof FunctionProcessingError) {
                 log &&
-                    spinner.fail(`${error.message} ${error.originalError?.message?.toLowerCase()}`);
+                    spinner.fail(`${error.message} ${error.cause?.message?.toLowerCase()}`);
                 return;
             }
             log && spinner.fail(error.message);

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

@@ -1,3 +1,4 @@
+import type Api from './types/index.js';
 import { HttpMethod } from './lib/api.js';
 import { SwellCommand } from './swell-command.js';
 export declare const headerFlag: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;

package/dist/swell-api-command.js

@@ -1,6 +1,6 @@
 import { Flags } from '@oclif/core';
-import * as fs from 'node:fs';
-import path from 'node:path';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
 import { FetchError } from 'node-fetch';
 import { HttpMethod } from './lib/api.js';
 import { resolveAppId } from './lib/apps/resolve.js';
@@ -168,7 +168,7 @@ export class SwellApiCommand extends SwellCommand {
             return;
         }
         const bodyData = this.isFilePath(body)
-            ? await fs.promises.readFile(path.resolve(body), 'utf8')
+            ? await fs.readFile(path.resolve(body), 'utf8')
             : body;
         return JSON.parse(bodyData);
     }

package/dist/types/index.d.ts

@@ -0,0 +1,94 @@
+/**
+ * @fileoverview Type definitions for the application.
+ */
+import type { default as Conf } from 'conf';
+declare namespace Api {
+    export interface AuthenticationHeaders {
+        publicKey?: string;
+        secretKey?: string;
+        sessionId?: string;
+    }
+    /**
+     * The paths to the API endpoints. Typically a Command will define the
+     * path to the API endpoint it needs.
+     */
+    export interface Paths {
+        adminPath?: string;
+        backendPath?: string;
+        frontendPath?: string;
+    }
+    type RequestInit = import('node-fetch').RequestInit;
+    /**
+     * The options to pass to our generic API request function. This extends
+     * the built-in fetch RequestInit interface.
+     */
+    export interface RequestOptions extends RequestInit {
+        body?: any;
+        headers?: Record<string, string>;
+        onAsyncGetPath?: (response: any) => Paths;
+        query?: any;
+        sessionId?: string;
+        spinner?: any;
+        rawResponse?: boolean;
+    }
+    export {};
+}
+export default Api;
+/**
+ * The configuration of an app as defined by the developer.
+ */
+export interface LocalApp extends Conf<App> {
+    swDirPath: string;
+}
+export interface AppCommandOrientation {
+    env?: string;
+    storeId?: string;
+}
+/**
+ * A log item as defined by the Swell API.
+ */
+export interface LogItem {
+    app: string;
+    data: string;
+    date: string;
+    env: string;
+    ip: string;
+    req: string;
+    request: string;
+    status: string;
+    time: string;
+    type: string;
+}
+export interface Store {
+    name: string;
+    email: string;
+    sessionId: string;
+    storeId: string;
+}
+export interface User {
+    email: string;
+    name: string;
+}
+export interface UserAuthorization {
+    client_id: string;
+    client_name: string;
+}
+export interface App {
+    id: string;
+    name: string;
+    type: string;
+    private_id: string;
+    public_id?: string;
+}
+export interface Model {
+    name: string;
+    namespace?: string;
+    app_id?: string;
+    deprecated?: boolean;
+    fields: {
+        [key: string]: {
+            name: string;
+            type: string;
+        };
+    };
+}

package/dist/types/index.js

@@ -0,0 +1,4 @@
+/**
+ * @fileoverview Type definitions for the application.
+ */
+export {};

package/oclif.manifest.json

@@ -3556,5 +3556,5 @@
       ]
     }
   },
-  "version": "2.9.3"
+  "version": "2.9.5"
 }