@swell/cli 2.1.0 → 2.2.1

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

@@ -13,6 +13,6 @@ export default class AppPull extends PushAppCommand {
         env: string;
     };
     static summary: string;
-    run(): Promise<void>;
     logPulledChanges(pulled: string[], removed: string[]): void;
+    run(): Promise<void>;
 }

package/dist/commands/app/pull.js

@@ -36,6 +36,12 @@ ${Object.values(ConfigPaths)
         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;
@@ -44,10 +50,4 @@ ${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,15 +3,15 @@ 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 summary: string;
-    static delayOrientation: boolean;
     static orientation: {
         env: string;
     };
-    resolvePushPaths(file: string): {
+    static summary: string;
+    resolvePushPaths(file: string, appPathFlag?: string): {
         filePath: string;
         relativePath: string;
     };

package/dist/commands/app/push.js

@@ -10,6 +10,7 @@ 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.
 
@@ -38,14 +39,15 @@ ${Object.values(ConfigPaths)
             description: 'skip deploying app frontend',
         }),
     };
-    static summary = 'Push local files to your Swell app.';
-    static delayOrientation = true;
     static orientation = {
         env: 'test',
     };
-    resolvePushPaths(file) {
-        // Join the appPath and file to get the absolute filePath
-        const filePath = path.resolve(process.cwd(), file);
+    static summary = 'Push local files to your Swell app.';
+    resolvePushPaths(file, appPathFlag) {
+        // If --app-path was explicitly provided, resolve FILE relative to appPath
+        // Otherwise, resolve relative to cwd for better UX (tab completion)
+        const baseDir = appPathFlag ? this.appPath : process.cwd();
+        const filePath = path.resolve(baseDir, file);
         // Check if filePath is outside of appPath
         const relativePath = path.relative(this.appPath, filePath);
         if (relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
@@ -71,7 +73,7 @@ ${Object.values(ConfigPaths)
             return;
         }
         if (file) {
-            const { filePath, relativePath } = this.resolvePushPaths(file);
+            const { filePath, relativePath } = this.resolvePushPaths(file, flags['app-path']);
             // Push individual files if not referring to the whole app path
             if (filePath !== this.appPath) {
                 if (!filePathExists(filePath)) {

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

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

package/dist/commands/app/release.js

@@ -56,10 +56,10 @@ The app must be connected to a partner account with access to publish.`;
             description: 'skip confirmation prompt',
         }),
     };
-    static summary = 'Release a new version of your an app for publishing to the App Store.';
     static orientation = {
         env: 'test',
     };
+    static summary = 'Release a new version of your an app for publishing to the App Store.';
     async run() {
         const { args, flags } = await this.parse(AppRelease);
         const { amend, message, 'not-supported': notSupported, 'release-notes': releaseNotesFile, yes, } = flags;

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

@@ -11,10 +11,10 @@ export default class AppVersion extends PushAppCommand {
         '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;
     };
+    static summary: string;
     run(): Promise<void>;
     private createRemoteVersion;
     private gitCommit;

package/dist/commands/app/version.js

@@ -67,10 +67,10 @@ behavior by using the --no-git-tag option.`;
             description: 'skip confirmation prompt',
         }),
     };
-    static summary = 'Increment the version of your Swell app.';
     static orientation = {
         env: 'test',
     };
+    static summary = 'Increment the version of your Swell app.';
     async run() {
         const { args, flags } = await this.parse(AppVersion);
         const { amend, 'no-git-tag': noGitTag, yes } = flags;
@@ -96,7 +96,9 @@ behavior by using the --no-git-tag option.`;
         const latestVersion = await this.getVersion();
         const remoteVersion = latestVersion?.version;
         // Suggest the next version if not provided
-        if (!nextVersion && semver.gt(localVersion, remoteVersion)) {
+        if (!nextVersion &&
+            remoteVersion &&
+            semver.gt(localVersion, remoteVersion)) {
             nextVersion = localVersion;
         }
         // If the user didn't specify a version, show the latest one
@@ -187,7 +189,7 @@ behavior by using the --no-git-tag option.`;
             // increment the version
             version = semver.inc(localVersion, version);
         }
-        if (semver.lt(version, localVersion)) {
+        if (semver.lte(version, localVersion)) {
             this.error(`Version ${version} must be greater than the current version ${localVersion}.`);
         }
         return version;

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

@@ -1,6 +1,5 @@
 import { CreateAppCommand } from '../../create-app-command.js';
 export default class CreateApp extends CreateAppCommand {
-    appType: string;
     static args: {
         id: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
     };
@@ -10,11 +9,18 @@ export default class CreateApp extends CreateAppCommand {
         description: string;
     }[];
     static flags: any;
-    createSwellConfig({ allowOverwrite, inputId, inputStorefrontApp, inputType, inputYes, nestedPath, }: {
+    appType: string;
+    createSwellConfig({ allowOverwrite, inputId, inputStorefrontApp, inputType, inputName, inputVersion, inputDescription, inputFrontend, inputIntegrationType, inputIntegrationId, inputYes, nestedPath, }: {
         allowOverwrite?: boolean;
+        inputDescription?: string;
+        inputFrontend?: string;
         inputId?: string;
+        inputIntegrationId?: string;
+        inputIntegrationType?: string;
+        inputName?: string;
         inputStorefrontApp?: string;
         inputType?: string;
+        inputVersion?: string;
         inputYes?: boolean;
         nestedPath?: boolean;
     }): Promise<{
@@ -22,6 +28,7 @@ export default class CreateApp extends CreateAppCommand {
         config: any;
         installedStorefrontApp: any;
         swellConfigJson: {
+            extensions?: any[] | undefined;
             theme: {
                 storefront: {
                     app: string;
@@ -33,6 +40,7 @@ export default class CreateApp extends CreateAppCommand {
             type: string;
             version: string;
         } | {
+            extensions?: any[] | undefined;
             permissions: never[];
             description: string;
             id: string;

package/dist/commands/create/app.js

@@ -7,30 +7,49 @@ import { newConfig, swellConfigFileExists } from '../../lib/app-config.js';
 import { toAppId, toAppName } from '../../lib/create/index.js';
 import style from '../../lib/style.js';
 export default class CreateApp extends CreateAppCommand {
-    appType = '';
     static args = {
         id: Args.string({
             default: '',
-            description: `id of the app to create`,
+            description: `id of the app to create (required in -y)`,
         }),
     };
     static description = 'Create an app.';
     static examples = [
         {
             command: 'swell create app',
-            description: 'Create app following command prompts.',
+            description: 'Interactive: follow prompts to create an app.',
+        },
+        {
+            command: 'swell create app my_app -t admin -y',
+            description: 'Non-interactive: minimal with defaults.',
+        },
+        {
+            command: 'swell create app my_app --type admin --name "My App" --version 1.0.1 --description "" -y',
+            description: 'Non-interactive: explicit name, version, description.',
+        },
+        {
+            command: 'swell create app my_app --type admin --frontend astro -y',
+            description: 'Non-interactive: initialize an Astro frontend.',
         },
         {
-            command: 'swell create app my_app -y',
-            description: 'Create app and accept all default values.',
+            command: 'swell create app my_theme --type theme --storefront-app proxima -y',
+            description: 'Non-interactive: theme targeting a specific storefront app.',
+        },
+        {
+            command: 'swell create app my_payment --type integration --integration-type payment --integration-id card -y',
+            description: 'Non-interactive: payment integration for credit cards.',
+        },
+        {
+            command: 'swell create app my_shipping --type integration --integration-type shipping --integration-id fedex -y',
+            description: 'Non-interactive: shipping integration for FedEx.',
         },
         {
             command: 'swell create app -p yarn',
-            description: 'Create app with yarn package manager instead of npm by default.',
+            description: 'Package manager: use Yarn instead of npm.',
         },
         {
             command: 'swell create app -p none',
-            description: 'Create app without installing TypeScript bindings, etc.',
+            description: 'Package manager: skip installing default dependencies.',
         },
     ];
     static flags = {
@@ -42,34 +61,66 @@ export default class CreateApp extends CreateAppCommand {
         }),
         type: Flags.string({
             char: 't',
-            description: `create a specific app type`,
+            description: `create a specific app type (required in -y)`,
             options: ['admin', 'integration', 'storefront', 'theme'],
         }),
+        name: Flags.string({
+            char: 'n',
+            description: `application name (default: capitalized ID)`,
+        }),
+        version: Flags.string({
+            char: 'v',
+            description: `application version (default: 1.0.0)`,
+        }),
+        description: Flags.string({
+            char: 'd',
+            description: `application description`,
+        }),
     };
-    async createSwellConfig({ allowOverwrite = true, inputId = '', inputStorefrontApp, inputType, inputYes, nestedPath = true, }) {
-        let confirmYes = inputYes;
+    appType = '';
+    async createSwellConfig({ allowOverwrite = true, inputId = '', inputStorefrontApp, inputType, inputName, inputVersion, inputDescription, inputFrontend, inputIntegrationType, inputIntegrationId, inputYes, nestedPath = true, }) {
+        const confirmYes = inputYes;
+        let appId = toAppId(inputId || '');
+        let storefrontInstalledApps;
+        let storefrontAppId;
+        let installedStorefrontApp;
+        // check missed parameters
+        if (confirmYes) {
+            if (!appId) {
+                this.error('Missing application id for non-interactive mode\n\nYou need to provide an app id value for non-interactive mode\n\nExample: swell create app reviews --type admin -y', {
+                    exit: 1,
+                });
+            }
+            if (!inputType) {
+                this.error('Missing required flag for non-interactive mode: --type\n\nValid types: admin, integration, storefront, theme\n\nExample: swell create app reviews --type admin -y', {
+                    exit: 1,
+                });
+            }
+            if (!inputName) {
+                inputName = toAppName(inputId);
+            }
+            if (!inputVersion) {
+                inputVersion = '1.0.0';
+            }
+        }
         const type = inputType ||
-            (confirmYes
-                ? 'admin'
-                : await select({
-                    choices: [
-                        { name: 'Admin', value: 'admin' },
-                        { name: 'Integration', value: 'integration' },
-                        { name: 'Storefront', value: 'storefront' },
-                        { name: 'Theme', value: 'theme' },
-                    ],
-                    message: `What is the primary purpose of the app?`,
-                }));
+            (await select({
+                choices: [
+                    { name: 'Admin', value: 'admin' },
+                    { name: 'Integration', value: 'integration' },
+                    { name: 'Storefront', value: 'storefront' },
+                    { name: 'Theme', value: 'theme' },
+                ],
+                message: `What is the primary purpose of the app?`,
+            }));
         const typeLabel = type === 'theme' ? 'theme' : 'app';
         const typeLabelTitle = type === 'theme' ? 'Theme' : 'App';
-        const name = confirmYes
-            ? toAppName(inputId)
-            : await input({
+        const name = inputName ||
+            (await input({
                 default: inputId ? toAppName(inputId) : '',
                 message: `${typeLabelTitle} name`,
                 validate: (answer) => answer.length > 2,
-            });
-        let appId = toAppId(inputId || '');
+            }));
         if (!appId) {
             appId = await input({
                 default: toAppId(name),
@@ -77,39 +128,135 @@ export default class CreateApp extends CreateAppCommand {
                 validate: (answer) => answer.length > 2,
             });
             appId = toAppId(appId);
-            confirmYes = Boolean(inputYes && appId);
         }
-        const version = confirmYes
-            ? '1.0.0'
-            : await input({
+        const version = inputVersion ||
+            (await input({
                 default: '1.0.0',
                 message: `${typeLabelTitle} version`,
-            });
-        const description = confirmYes
-            ? ''
-            : await input({
-                default: 'Something special',
-                message: `Describe your ${typeLabel}`,
-            });
-        let storefrontInstalledApps;
-        let storefrontAppId;
-        let installedStorefrontApp;
+            }));
+        const description = inputDescription ||
+            (confirmYes
+                ? ''
+                : await input({
+                    default: 'Something special',
+                    message: `Describe your ${typeLabel}`,
+                }));
+        let integrationType;
+        let extensions;
+        if (type === 'integration') {
+            if (confirmYes && !inputIntegrationType) {
+                this.error('Missing required flag for non-interactive mode for integration app: --integration-type\n\nValid types: generic, payment, shipping, tax\n\nExample: swell create app reviews --type integration --integration-type generic -y', {
+                    exit: 1,
+                });
+            }
+            integrationType =
+                inputIntegrationType ||
+                    (await select({
+                        choices: [
+                            { name: 'Generic', value: 'generic' },
+                            { name: 'Payment gateway', value: 'payment' },
+                            { name: 'Shipping service', value: 'shipping' },
+                            { name: 'Tax service', value: 'tax' },
+                        ],
+                        message: `What type of integration?`,
+                    }));
+            // Create extensions array based on integration type
+            switch (integrationType) {
+                case 'generic': {
+                    // No extension needed for generic integrations
+                    break;
+                }
+                case 'payment':
+                case 'shipping':
+                case 'tax': {
+                    // Unified validation for all extension-based integrations
+                    if (confirmYes && !inputIntegrationId) {
+                        const validValues = integrationType === 'payment'
+                            ? "use 'card' for credit card integration or unique custom ID for other payment integrations"
+                            : 'unique custom ID';
+                        this.error(`Missing required flag for non-interactive mode for ${integrationType} integration: --integration-id\n\nValid values: ${validValues}\n\nExample: swell create app my_app --type integration --integration-type ${integrationType} --integration-id ${integrationType === 'payment' ? 'card' : 'myid'} -y`, {
+                            exit: 1,
+                        });
+                    }
+                    // Interactive prompting
+                    let integrationId = inputIntegrationId;
+                    if (!integrationId) {
+                        if (integrationType === 'payment') {
+                            const methodChoice = await select({
+                                choices: [
+                                    { name: 'Credit card', value: 'card' },
+                                    { name: 'Custom method', value: 'custom' },
+                                ],
+                                message: `What type of payment method?`,
+                            });
+                            integrationId =
+                                methodChoice === 'custom'
+                                    ? await input({
+                                        message: `Enter a unique ID for your payment method`,
+                                        validate: (answer) => answer.length > 2,
+                                    })
+                                    : methodChoice; // 'card'
+                        }
+                        else {
+                            // Shipping or tax
+                            const serviceLabel = integrationType === 'shipping'
+                                ? 'shipping service'
+                                : 'tax service';
+                            integrationId = await input({
+                                message: `Enter a unique ID for your ${serviceLabel}`,
+                                validate: (answer) => answer.length > 2,
+                            });
+                        }
+                    }
+                    // Unified validation
+                    if (integrationId.length < 3) {
+                        this.error(`--integration-id must contain at least 3 characters\n\nValid value is a custom ID containing at least 3 characters\n\nExample: swell create app my_app --type integration --integration-type ${integrationType} --integration-id ${integrationType === 'payment' ? 'card' : 'myid'} -y`, {
+                            exit: 1,
+                        });
+                    }
+                    // Create extension
+                    extensions = [
+                        {
+                            id: integrationId,
+                            type: integrationType,
+                        },
+                    ];
+                    break;
+                }
+                default: {
+                    this.error('Incorrect value for --integration-type\n\nValid types: generic, payment, shipping, tax\n\nExample: swell create app reviews --type integration --integration-type generic -y', {
+                        exit: 1,
+                    });
+                }
+            }
+        }
         if (type === 'theme') {
             storefrontInstalledApps = await this.getInstalledStorefrontApps();
             if (storefrontInstalledApps === false) {
-                return;
+                this.error('There are no installed storefront apps\n\nTo use the theme type, you first need to install the storefront app', {
+                    exit: 1,
+                });
+            }
+            storefrontAppId = inputStorefrontApp || '';
+            if (!storefrontAppId) {
+                if (storefrontInstalledApps.length === 1) {
+                    storefrontAppId = storefrontInstalledApps[0].id;
+                }
+                else {
+                    if (confirmYes) {
+                        this.error('There are several installed storefront apps to choose from\n\nYou should select a specific storefront app in the non-interactive mode using --storefront-app appid\n\nExample: swell create app reviews --type theme --storefront-app proxima -y', {
+                            exit: 1,
+                        });
+                    }
+                    storefrontAppId = await select({
+                        choices: storefrontInstalledApps.map(({ app, id }) => ({
+                            name: app.name,
+                            value: id,
+                        })),
+                        message: `Which storefront app is your theme for?`,
+                    });
+                }
             }
-            storefrontAppId =
-                inputStorefrontApp ||
-                    (storefrontInstalledApps.length > 1
-                        ? await select({
-                            choices: storefrontInstalledApps.map(({ app, id }) => ({
-                                name: app.name,
-                                value: id,
-                            })),
-                            message: `Which storefront app is your theme for?`,
-                        })
-                        : storefrontInstalledApps[0].id);
             installedStorefrontApp = storefrontInstalledApps.find((installedApp) => inputStorefrontApp
                 ? inputStorefrontApp === installedApp.app_private_id ||
                     inputStorefrontApp === installedApp.app_public_id ||
@@ -117,7 +264,20 @@ export default class CreateApp extends CreateAppCommand {
                     inputStorefrontApp === toAppId(installedApp.app_private_id)
                 : installedApp.id === storefrontAppId);
             if (!installedStorefrontApp) {
-                this.error(`Could not find an installed storefront app by id: ${storefrontAppId}`);
+                this.error(`Could not find an installed storefront app by id: ${storefrontAppId}\n\nThe selected storefront app is not among the installed storefront apps`, {
+                    exit: 1,
+                });
+            }
+        }
+        // check inputFrontend value
+        if (!installedStorefrontApp &&
+            confirmYes &&
+            inputFrontend &&
+            inputFrontend !== 'none') {
+            const projectType = this.getProjectType(inputFrontend);
+            if (!projectType) {
+                // error should be thrown from getProjectType
+                return;
             }
         }
         const swellConfigJson = {
@@ -137,6 +297,7 @@ export default class CreateApp extends CreateAppCommand {
                 : {
                     permissions: [],
                 }),
+            ...(extensions && { extensions }),
         };
         const appPath = path.join(process.cwd(), inputId || appId);
         if (swellConfigFileExists(appPath)) {
@@ -151,7 +312,9 @@ export default class CreateApp extends CreateAppCommand {
                 }
             }
             else {
-                this.error(`An app already exists in the target path ${appPath}.`);
+                this.error(`An app already exists in the target path ${appPath}.\n\nCannot overwrite existing app`, {
+                    exit: 1,
+                });
             }
         }
         this.log(`\nCreating ${this.appType === 'theme' ? 'theme' : 'app'} ${style.appConfigValue(name)} in ${appPath}/swell.json`);
@@ -172,13 +335,19 @@ export default class CreateApp extends CreateAppCommand {
     async run() {
         const { args, flags } = await this.parse(CreateApp);
         const { id } = args;
-        const { pkg, yes } = flags;
-        const confirmYes = Boolean(yes && id);
+        const { pkg, yes, name, type, version, description, frontend } = flags;
+        const confirmYes = Boolean(yes);
         const createParams = await this.createSwellConfig({
             inputId: id,
             inputStorefrontApp: flags['storefront-app'],
-            inputType: flags.type,
+            inputType: type,
             inputYes: confirmYes,
+            inputName: name,
+            inputVersion: version,
+            inputDescription: description,
+            inputFrontend: frontend,
+            inputIntegrationType: flags['integration-type'],
+            inputIntegrationId: flags['integration-id'],
         });
         if (!createParams) {
             return;

package/dist/commands/create/content.d.ts

@@ -1,6 +1,9 @@
 import { CreateCollectionCommand } from '../../create-collection-command.js';
 import { ConfigType } from '../../lib/apps/index.js';
 export default class CreateContent extends CreateCollectionCommand {
+    static args: {
+        collection: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+    };
     static description: string;
     static examples: {
         command: string;
@@ -12,6 +15,7 @@ export default class CreateContent extends CreateCollectionCommand {
         label: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         overwrite: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         views: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static summary: string;
     createType: ConfigType;