@swell/cli 2.0.10 → 2.0.12

package/dist/commands/app/dev.d.ts

@@ -1,6 +1,5 @@
 import { PushAppCommand } from '../../push-app-command.js';
 export default class AppDev extends PushAppCommand {
-    static delayOrientation: boolean;
     static examples: string[];
     static flags: {
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
@@ -8,6 +7,7 @@ export default class AppDev extends PushAppCommand {
         'no-push': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         port: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
+    static delayOrientation: boolean;
     static orientation: {
         env: string;
     };

package/dist/commands/app/dev.js

@@ -2,7 +2,6 @@ import { Flags } from '@oclif/core';
 import { PushAppCommand } from '../../push-app-command.js';
 import AppFrontendDev from './frontend/dev.js';
 export default class AppDev extends PushAppCommand {
-    static delayOrientation = true;
     static examples = [
         'swell app dev',
         'swell app dev --storefront-id <id>',
@@ -18,6 +17,7 @@ export default class AppDev extends PushAppCommand {
             description: 'for storefront apps, prompt to select a storefront to preview',
         }),
     };
+    static delayOrientation = true;
     static orientation = {
         env: 'test',
     };

package/dist/commands/app/install.js

@@ -76,7 +76,7 @@ Without a store specified, install the app in the Live environment of the curren
             this.error(`You cannot install an app in the test environment of the same store.`);
         }
         config.ensureLoggedIn(storeToInstall);
-        this.api.setStoreEnv(storeToInstall, envToInstall);
+        await this.api.setStoreEnv(storeToInstall, envToInstall);
         // check if app is already installed on store
         const existingInstalledApp = await this.getInstalledApp();
         const existingVersion = existingInstalledApp?.id

package/dist/commands/app/pull.d.ts

@@ -9,7 +9,10 @@ export default class AppPull extends PushAppCommand {
     static flags: {
         force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
+    static orientation: {
+        env: string;
+    };
     static summary: string;
-    logPulledChanges(pulled: string[], removed: string[]): void;
     run(): Promise<void>;
+    logPulledChanges(pulled: string[], removed: string[]): void;
 }

package/dist/commands/app/pull.js

@@ -32,13 +32,10 @@ ${Object.values(ConfigPaths)
             description: 'force pull all files',
         }),
     };
+    static orientation = {
+        env: 'test',
+    };
     static summary = 'Pull app files from Swell to your local machine.';
-    logPulledChanges(pulled, removed) {
-        const typeLabel = this.appType === 'theme' ? 'theme' : 'app';
-        const changeCount = pulled.length + removed.length;
-        const pluralFiles = changeCount === 1 ? 'file' : 'files';
-        this.log(`Pulled ${changeCount} ${pluralFiles} from ${style.appConfigValue(this.app.name)} ${typeLabel} in ${style.path(path.resolve(this.appPath))}.`);
-    }
     async run() {
         const { args, flags } = await this.parse(AppPull);
         const { force } = flags;
@@ -47,4 +44,10 @@ ${Object.values(ConfigPaths)
         const { pulled, removed } = await this.pullAppConfigs(force);
         this.logPulledChanges(pulled, removed);
     }
+    logPulledChanges(pulled, removed) {
+        const typeLabel = this.appType === 'theme' ? 'theme' : 'app';
+        const changeCount = pulled.length + removed.length;
+        const pluralFiles = changeCount === 1 ? 'file' : 'files';
+        this.log(`Pulled ${changeCount} ${pluralFiles} from ${style.appConfigValue(this.app.name)} ${typeLabel} in ${style.path(path.resolve(this.appPath))}.`);
+    }
 }

package/dist/commands/app/push.d.ts

@@ -3,11 +3,13 @@ export default class AppPush extends PushAppCommand {
     static args: {
         file: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
     };
-    static delayOrientation: boolean;
     static description: string;
     static examples: string[];
     static flags: any;
-    static orientation: any;
+    static delayOrientation: boolean;
+    static orientation: {
+        env: string;
+    };
     static summary: string;
     resolvePushPaths(file: string): {
         filePath: string;

package/dist/commands/app/push.js

@@ -10,7 +10,6 @@ export default class AppPush extends PushAppCommand {
             description: 'relative path to a configuration file or directory to push',
         }),
     };
-    static delayOrientation = true;
     static description = `Push all app files, a specific file, or a specific configuration
 type to an app in your store's test environment.
 
@@ -39,6 +38,7 @@ ${Object.values(ConfigPaths)
             description: 'skip deploying app frontend',
         }),
     };
+    static delayOrientation = true;
     static orientation = {
         env: 'test',
     };

package/dist/commands/app/release.d.ts

@@ -7,6 +7,9 @@ export default class AppRelease extends PushAppCommand {
     static examples: string[];
     static flags: any;
     static summary: string;
+    static orientation: {
+        env: string;
+    };
     run(): Promise<void>;
     validateReleaseDetails(): void;
     private validateCreateVersion;

package/dist/commands/app/release.js

@@ -32,6 +32,7 @@ The app must be connected to a partner account with access to publish.`;
         'swell app release',
         'swell app release 2.0.0',
         'swell app release 2.0.0 --amend --release-notes ./releases/v2.0.0.md',
+        'swell app release 2.0.0 -y',
     ];
     static flags = {
         amend: Flags.boolean({
@@ -50,11 +51,18 @@ The app must be connected to a partner account with access to publish.`;
         'release-notes': Flags.string({
             description: 'relative path to a file containing release notes',
         }),
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'skip confirmation prompt',
+        }),
     };
     static summary = 'Release a new version of your an app for publishing to the App Store.';
+    static orientation = {
+        env: 'test',
+    };
     async run() {
         const { args, flags } = await this.parse(AppRelease);
-        const { amend, message, 'not-supported': notSupported, 'release-notes': releaseNotesFile, } = flags;
+        const { amend, message, 'not-supported': notSupported, 'release-notes': releaseNotesFile, yes, } = flags;
         if (!(await this.ensureAppExists(undefined, false))) {
             return;
         }
@@ -83,7 +91,7 @@ The app must be connected to a partner account with access to publish.`;
                     ? true
                     : appVersion.supported,
         };
-        if (!amend) {
+        if (!amend && !yes) {
             const continueVersion = await confirm({
                 message: `Release ${style.appConfigValue(this.app.name)} version ${appVersion.version}?`,
             });
@@ -135,6 +143,7 @@ The app must be connected to a partner account with access to publish.`;
                     version,
                     ...(flags.message ? [`-m ${JSON.stringify(flags.message)}`] : []),
                     ...(flags['no-git-tag'] ? ['--no-git-tag'] : []),
+                    ...(flags.yes ? ['-y'] : []),
                 ]);
                 this.log();
                 appVersion = await this.getVersion(version);

package/dist/commands/app/version.d.ts

@@ -9,8 +9,12 @@ export default class AppVersion extends PushAppCommand {
         amend: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         message: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'no-git-tag': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static summary: string;
+    static orientation: {
+        env: string;
+    };
     run(): Promise<void>;
     private createRemoteVersion;
     private gitCommit;

package/dist/commands/app/version.js

@@ -49,6 +49,7 @@ behavior by using the --no-git-tag option.`;
         'swell app version',
         'swell app version minor',
         'swell app version 1.0.0 -m "First release"',
+        'swell app version patch -y',
     ];
     static flags = {
         amend: Flags.boolean({
@@ -61,11 +62,18 @@ behavior by using the --no-git-tag option.`;
         'no-git-tag': Flags.boolean({
             description: 'do not create a git tag for this version',
         }),
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'skip confirmation prompt',
+        }),
     };
     static summary = 'Increment the version of your Swell app.';
+    static orientation = {
+        env: 'test',
+    };
     async run() {
         const { args, flags } = await this.parse(AppVersion);
-        const { amend, 'no-git-tag': noGitTag } = flags;
+        const { amend, 'no-git-tag': noGitTag, yes } = flags;
         let { message } = flags;
         let { nextVersion } = args;
         if (!(await this.ensureAppExists(undefined, false))) {
@@ -99,9 +107,7 @@ behavior by using the --no-git-tag option.`;
             }
             return;
         }
-        else {
-            nextVersion = this.validateAndComputeVersion(nextVersion, remoteVersion);
-        }
+        nextVersion = this.validateAndComputeVersion(nextVersion, remoteVersion);
         await this.pushAppConfigs();
         await this.deployAppFrontend(false, false);
         if (!message) {
@@ -109,11 +115,13 @@ behavior by using the --no-git-tag option.`;
                 message: `Describe the changes in version ${nextVersion}:`,
             });
         }
-        const continueVersion = await confirm({
-            message: `Create ${style.appConfigValue(this.app.name)} version ${nextVersion}?`,
-        });
-        if (!continueVersion) {
-            return;
+        if (!yes) {
+            const continueVersion = await confirm({
+                message: `Create ${style.appConfigValue(this.app.name)} version ${nextVersion}?`,
+            });
+            if (!continueVersion) {
+                return;
+            }
         }
         if (!message) {
             message = nextVersion;

package/dist/commands/login.js

@@ -44,7 +44,7 @@ have available for logging in to.
             }
         }
         const [sessionId, storeId] = await getSessionIdOrLoginInBrowser(store);
-        this.api.setStoreEnv(storeId);
+        await this.api.setStoreEnv(storeId);
         user = await this.api.get({ adminPath: 'user' }, { sessionId });
         await this.getAndSetStoreConfig({ sessionId, storeId });
         await modifyDefaultStore({ currentStoreId, storeId }, force);

package/dist/commands/theme/dev.d.ts

@@ -8,9 +8,7 @@ export default class AppThemeDev extends PushAppCommand {
         'no-push': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-select': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-    };
-    static orientation: {
-        env: string;
+        env: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     static summary: string;
     appType: string;

package/dist/commands/theme/dev.js

@@ -38,9 +38,10 @@ export default class AppThemeDev extends PushAppCommand {
             default: false,
             description: 'prompt to select a storefront to preview and push theme files to',
         }),
-    };
-    static orientation = {
-        env: 'test',
+        env: Flags.string({
+            char: 'e',
+            description: 'target environment to push to, defaults to live',
+        }),
     };
     static summary = `Run a theme in dev mode from your local machine.`;
     appType = 'theme';
@@ -51,6 +52,10 @@ export default class AppThemeDev extends PushAppCommand {
         const { flags } = await this.parse(AppThemeDev);
         const { force, local } = flags;
         const noPush = flags['no-push'];
+        await this.ensureLoggedIn();
+        // Set env from default storefront first
+        const defaultStorefront = localConfig.getDefaultStorefront(this.appPath);
+        await this.setStorefrontEnv(flags, defaultStorefront);
         if (!(await this.ensureAppExists(undefined, false))) {
             return;
         }
@@ -59,12 +64,13 @@ export default class AppThemeDev extends PushAppCommand {
             const sessionId = localConfig.getSessionId(currentStore);
             this.storefrontLocalUrl = this.localFrontendUrl(currentStore, sessionId);
         }
-        if (!noPush) {
-            await this.pushAppConfigs(force);
-        }
         await this.getStorefrontToPush(flags);
+        await this.logOrientation({ env: this.api.envId || 'live' });
         this.logStorefrontConnected();
         this.saveCurrentStorefront();
+        if (!noPush) {
+            await this.pushAppConfigs(force);
+        }
         await this.startThemeDevServer(local);
     }
     async findAndInstallDependencies() {

package/dist/commands/theme/pull.d.ts

@@ -4,16 +4,15 @@ export default class AppThemePull extends AppPull {
         appId: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
         targetPath: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
     };
-    static delayOrientation: boolean;
     static description: string;
     static examples: string[];
     static flags: {
         force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-select': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        env: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'sync-app': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
-    static orientation: {};
     static summary: string;
     appType: string;
     run(): Promise<void>;

package/dist/commands/theme/pull.js

@@ -13,7 +13,6 @@ export default class AppThemePull extends AppPull {
             description: 'path to download theme files into',
         }),
     };
-    static delayOrientation = true;
     static description = `Pull all theme files, a specific file, or a specific configuration
 type from a theme in your store's test environment to your local machine.
 
@@ -43,12 +42,15 @@ ${Object.values(ThemeConfigPaths)
             default: false,
             description: 'prompt to select a storefront to pull theme files to',
         }),
+        env: Flags.string({
+            char: 'e',
+            description: 'target environment to pull from, defaults to live',
+        }),
         'sync-app': Flags.boolean({
             default: false,
             description: 'pull app files in addition to theme files to',
         }),
     };
-    static orientation = {};
     static summary = 'Pull theme files from Swell to your local machine.';
     appType = 'theme';
     async run() {

package/dist/commands/theme/push.d.ts

@@ -3,16 +3,15 @@ export default class AppThemePush extends AppPush {
     static args: {
         file: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
     };
-    static delayOrientation: boolean;
     static description: string;
     static examples: string[];
     static flags: {
         force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-select': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        env: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'sync-app': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
-    static orientation: {};
     static summary: string;
     appType: string;
     run(): Promise<void>;

package/dist/commands/theme/push.js

@@ -1,5 +1,6 @@
 import { Args, Flags } from '@oclif/core';
 import { ThemeConfigPaths, filePathExists, isPathDirectory, } from '../../lib/apps/index.js';
+import { default as localConfig } from '../../lib/config.js';
 import style from '../../lib/style.js';
 import AppPush from '../app/push.js';
 export default class AppThemePush extends AppPush {
@@ -9,7 +10,6 @@ export default class AppThemePush extends AppPush {
             description: 'relative path to a configuration file or directory to push',
         }),
     };
-    static delayOrientation = true;
     static description = `Push all theme files, a specific file, or a specific configuration
 type to an theme in your store's test environment.
 
@@ -45,12 +45,15 @@ ${Object.values(ThemeConfigPaths)
             default: false,
             description: 'prompt to select a storefront to push theme files to',
         }),
+        env: Flags.string({
+            char: 'e',
+            description: 'target environment to push to, defaults to live',
+        }),
         'sync-app': Flags.boolean({
             default: false,
             description: 'push app files in addition to theme files',
         }),
     };
-    static orientation = {};
     static summary = 'Push local files to your Swell theme.';
     appType = 'theme';
     async run() {
@@ -58,6 +61,15 @@ ${Object.values(ThemeConfigPaths)
         const { file } = args;
         const { force } = flags;
         this.themeSyncApp = flags['sync-app'];
+        // Set default storefront env only if not syncing app, then it must be test env only
+        if (this.themeSyncApp) {
+            const currentStore = localConfig.getDefaultStore();
+            await this.api.setStoreEnv(currentStore, 'test');
+        }
+        else {
+            const defaultStorefront = localConfig.getDefaultStorefront(this.appPath);
+            await this.setStorefrontEnv(flags, defaultStorefront);
+        }
         if (!(await this.ensureAppExists(file, this.themeSyncApp))) {
             return;
         }
@@ -74,9 +86,10 @@ ${Object.values(ThemeConfigPaths)
                     this.error(`Path ${style.path(file)} does not exist.`);
                 }
                 // Targeting a directory
-                await (isPathDirectory(filePath)
+                const pushPromise = isPathDirectory(filePath)
                     ? this.pushFilePath(relativePath, force)
-                    : this.pushFile(relativePath));
+                    : this.pushFile(relativePath);
+                await pushPromise;
                 this.log();
                 this.logStorefrontFrontendUrl(this.storefront);
                 return;

package/dist/lib/api.d.ts

@@ -1,7 +1,7 @@
 export default class Api {
-    private envId;
-    private secretKey;
-    private storeId;
+    envId: string | undefined;
+    secretKey: string | undefined;
+    storeId: string | undefined;
     constructor(storeId?: string, envId?: string, secretKey?: string);
     api(pathOpts: Api.Paths, options: Api.RequestOptions): Promise<any>;
     delete(pathOpts: Api.Paths, options?: Api.RequestOptions): Promise<any>;
@@ -9,7 +9,8 @@ export default class Api {
     isAdmin(): boolean;
     post(pathOpts: Api.Paths, options?: Api.RequestOptions): Promise<any>;
     put(pathOpts: Api.Paths, options?: Api.RequestOptions): Promise<any>;
-    setStoreEnv(storeId: string, envId?: string): void;
+    setStoreEnv(storeId: string, envId?: string): Promise<void>;
+    isTestEnvEnabled(): Promise<boolean>;
     truncatePath(path: string | undefined): string | undefined;
     waitForAsyncResponse(response: any, pathOpts: Api.Paths, options?: Api.RequestOptions): Promise<any>;
 }

package/dist/lib/api.js

@@ -123,10 +123,22 @@ export default class Api {
         });
         return this.waitForAsyncResponse(response, pathOpts, options);
     }
-    setStoreEnv(storeId, envId) {
+    async setStoreEnv(storeId, envId) {
+        if (envId) {
+            const hasTestEnv = await this.isTestEnvEnabled();
+            if (!hasTestEnv) {
+                throw new Error('Test environment is not enabled for this store.');
+            }
+        }
         this.storeId = storeId;
         this.envId = envId;
     }
+    async isTestEnvEnabled() {
+        const clientRecord = await this.get({
+            adminPath: `/client`,
+        });
+        return clientRecord.test_enabled !== false;
+    }
     truncatePath(path) {
         return path?.startsWith('/') ? path.slice(1) : path;
     }
@@ -135,8 +147,9 @@ export default class Api {
         if (!response?.async_progressing || !onAsyncGetPath) {
             return response;
         }
-        /* eslint-disable-next-line no-promise-executor-return */
-        await new Promise((resolve) => setTimeout(resolve, 1000));
+        await new Promise((resolve) => {
+            setTimeout(resolve, 1000);
+        });
         const asyncResponse = await this.api(onAsyncGetPath(response), {
             method: 'GET',
             onAsyncGetPath,

package/dist/lib/apps/app-config.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="node" />
 import { ConfigType } from './index.js';
-declare class IgnoringFileError extends Error {
+export declare class IgnoringFileError extends Error {
     constructor(message: string);
 }
-declare class FunctionProcessingError extends Error {
+export declare class FunctionProcessingError extends Error {
     originalError: Error;
     constructor(message: string, error: Error);
 }
-type AppConfigFile = {
+interface AppConfigFile {
     content_type?: string;
     data?: string;
     date_uploaded?: string;
@@ -16,12 +16,12 @@ type AppConfigFile = {
     length?: number;
     md5?: string;
     url?: string;
-};
+}
 /**
  * An app configuration as defined by the Swell API. This implies that the
  * app & the configuration are saved to the API.
  */
-declare abstract class AppConfig {
+export declare abstract class AppConfig {
     appConfigId?: string;
     appPath: string;
     byteSize?: number;
@@ -53,4 +53,4 @@ declare abstract class AppConfig {
     protected abstract preparePostData(postData: any): Promise<any>;
     abstract type: ConfigType;
 }
-export { AppConfig, FunctionProcessingError, IgnoringFileError };
+export {};

package/dist/lib/apps/app-config.js

@@ -4,14 +4,14 @@ import { detectFilenameMime } from 'mime-detect';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { bundleFunction } from '../bundle.js';
-import { ConfigPaths, ConfigType, filePathExists, hashFile } from './index.js';
-class IgnoringFileError extends Error {
+import { ConfigPaths, ConfigType, filePathExists, hashFile, } from './index.js';
+export class IgnoringFileError extends Error {
     constructor(message) {
         super(message);
         this.name = 'IgnoringFileError';
     }
 }
-class FunctionProcessingError extends Error {
+export class FunctionProcessingError extends Error {
     originalError;
     constructor(message, error) {
         super(message);
@@ -23,7 +23,7 @@ class FunctionProcessingError extends Error {
  * An app configuration as defined by the Swell API. This implies that the
  * app & the configuration are saved to the API.
  */
-class AppConfig {
+export class AppConfig {
     // Used when pushing a theme and the app config is considered
     appConfigId;
     // Full local path of remote AppConfig
@@ -295,4 +295,3 @@ class AppConfigTheme extends AppConfigDefault {
         return postData;
     }
 }
-export { AppConfig, FunctionProcessingError, IgnoringFileError };