@swell/cli 2.0.1-alpha.9 → 2.0.2

package/dist/commands/app/watch.js

@@ -1,11 +1,6 @@
 import { Flags } from '@oclif/core';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { appConfigFileExists } from '../../lib/app-config.js';
-import { appConfigFromFile, findAppConfig, getConfigTypeFromPath, hasAllowedFileExtension, } from '../../lib/apps/index.js';
-import style from '../../lib/style.js';
-import { RemoteAppCommand } from '../../remote-app-command.js';
-export default class AppWatch extends RemoteAppCommand {
+import { PushAppCommand } from '../../push-app-command.js';
+export default class AppWatch extends PushAppCommand {
     static description = `Watches configuration files including functions, and automatically pushes
 to the remote store.
 
@@ -26,85 +21,10 @@ Optionally synchronize all configs on change.`;
         env: 'test',
     };
     static summary = 'Watch for changes and push app configurations.';
-    watchListener = async (eventType, filename) => {
-        const configFile = filename;
-        const pathParsed = path.parse(configFile);
-        const fileDirs = pathParsed.dir.split(path.sep);
-        // only the first directory is relevant for us
-        const configDir = fileDirs[0];
-        // we only want to watch files in the root of the app directory
-        // and with the allowed extensions
-        if (!configDir ||
-            fileDirs.length > 1 ||
-            !hasAllowedFileExtension(configFile)) {
-            return;
-        }
-        const configType = getConfigTypeFromPath(configDir);
-        if (!configType) {
-            this.debug(`watchListener: ${filename} is not a valid config type`);
-            return;
-        }
-        let watchFileEvent;
-        // per node docs:
-        //
-        //    On most platforms, 'rename' is emitted whenever a filename appears
-        //    or disappears in the directory.
-        //
-        // we want however to identify delete file events so we can send the
-        // correct API request
-        if (eventType === 'rename') {
-            watchFileEvent = 'new';
-            if (!appConfigFileExists(path.join(this.appPath, configFile))) {
-                watchFileEvent = 'deleted';
-            }
-        }
-        else {
-            watchFileEvent = 'change';
-        }
-        try {
-            await this.handleFileChange(configFile, configType, watchFileEvent);
-        }
-        catch (error) {
-            // we don't want to break the watcher if an error is thrown while
-            // handling a file change
-            this.debug(error);
-            // for tests though, we want to break the watcher
-            if (process.env.NODE_ENV === 'test') {
-                // throwing does not break the test so we need to hard exit and log
-                // the error
-                console.error(style.error(error));
-                // eslint-disable-next-line no-process-exit, unicorn/no-process-exit
-                process.exit(1);
-            }
-        }
-        // refetch app to get updated configs
-        this.app = await this.getAppWithConfig(this.app.id);
-    };
     async run() {
         const { flags } = await this.parse(AppWatch);
         this.app = await this.getAppWithConfig();
         this.log('Watching for changes...');
-        if (flags['sync-all']) {
-            await this.syncAppConfigs();
-            fs.watch(this.appPath, { recursive: true }, async (eventType, filename) => {
-                if (filename && hasAllowedFileExtension(filename)) {
-                    await this.syncAppConfigs();
-                }
-            });
-            return;
-        }
-        fs.watch(this.appPath, { recursive: true }, this.watchListener);
-    }
-    async handleFileChange(configFile, configType, event) {
-        if (event === 'deleted') {
-            const appConfig = findAppConfig(this.app, configFile, configType);
-            if (!appConfig) {
-                return;
-            }
-            return this.removeConfig(appConfig);
-        }
-        const appConfig = appConfigFromFile(path.join(this.appPath, configFile), configType);
-        const result = await this.pushConfigFile(appConfig);
-        this.debug(`handleFileChange: ${configFile} pushed`, result);
+        await this.watchForChanges({ syncAll: flags['sync-all'] });
     }
 }

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

@@ -1,21 +1,45 @@
-import { SwellCommand } from '../../swell-command.js';
-export default class CreateApp extends SwellCommand {
+import { CreateAppCommand } from '../../create-app-command.js';
+export default class CreateApp extends CreateAppCommand {
     static args: {
         id: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
     };
-    static flags: {
-        pkg: 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 description: string;
     static examples: {
         command: string;
         description: string;
     }[];
+    static flags: any;
+    appType: string;
+    createSwellConfig({ allowOverwrite, inputId, inputStorefrontApp, inputType, inputYes, nestedPath, }: {
+        allowOverwrite?: boolean;
+        inputId: string;
+        inputStorefrontApp?: string;
+        inputType?: string;
+        inputYes?: boolean;
+        nestedPath?: boolean;
+    }): Promise<{
+        appId: string;
+        config: any;
+        installedStorefrontApp: any;
+        swellConfigJson: {
+            theme: {
+                storefront: {
+                    app: string;
+                };
+            };
+            description: string;
+            id: string;
+            name: string;
+            type: string;
+            version: string;
+        } | {
+            permissions: never[];
+            description: string;
+            id: string;
+            name: string;
+            type: string;
+            version: string;
+        };
+    } | undefined>;
     run(): Promise<void>;
-    private tryPackageSetup;
-    private setupPackage;
-    private findPackageManager;
-    private doesPackageManagerExist;
-    private createAppConfigFolders;
 }

package/dist/commands/create/app.js

@@ -1,35 +1,19 @@
-import path from 'path';
-import { exec } from 'child_process';
-import { promisify } from 'util';
 import { confirm, input, select } from '@inquirer/prompts';
 import { Args, Flags } from '@oclif/core';
+import path from 'node:path';
 import ora from 'ora';
-import { appConfigFileExists, newConfig } from '../../lib/app-config.js';
+import { CreateAppCommand } from '../../create-app-command.js';
+import { newConfig, swellConfigFileExists } from '../../lib/app-config.js';
+import { toAppId, toAppName } from '../../lib/create/index.js';
 import style from '../../lib/style.js';
-import { SwellCommand } from '../../swell-command.js';
-import { toAppName, toAppId } from '../../lib/create/index.js';
-import { getAllConfigPaths, writeJsonFile } from '../../lib/apps/index.js';
-const execAsync = promisify(exec);
-export default class CreateApp extends SwellCommand {
+export default class CreateApp extends CreateAppCommand {
     static args = {
         id: Args.string({
             default: '',
             description: `id of the app to create`,
         }),
     };
-    static flags = {
-        pkg: Flags.string({
-            char: 'p',
-            default: 'npm',
-            description: `use npm or yarn to install default dependencies, or none to disable`,
-            options: ['npm', 'yarn', 'none'],
-        }),
-        yes: Flags.boolean({
-            char: 'y',
-            description: `accept all default values`,
-        }),
-    };
-    static description = 'Initialize an app with config file and folder structure.';
+    static description = 'Create an app.';
     static examples = [
         {
             command: 'swell create app',
@@ -48,63 +32,130 @@ export default class CreateApp extends SwellCommand {
             description: 'Create app without installing TypeScript bindings, etc.',
         },
     ];
-    async run() {
-        const { args, flags } = await this.parse(CreateApp);
-        const { id } = args;
-        const { pkg, yes } = flags;
-        let confirmYes = yes && id;
+    static flags = {
+        pkg: Flags.string({
+            char: 'p',
+            default: 'npm',
+            description: `use npm or yarn to install default dependencies, or none to disable`,
+            options: ['npm', 'yarn', 'none'],
+        }),
+        type: Flags.string({
+            char: 't',
+            description: `create a specific app type`,
+            options: ['admin', 'integration', 'storefront', 'theme'],
+        }),
+    };
+    appType = '';
+    async createSwellConfig({ allowOverwrite = true, inputId, inputStorefrontApp, inputType, inputYes, nestedPath = true, }) {
+        let confirmYes = inputYes;
+        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?`,
+                }));
+        const typeLabel = type === 'theme' ? 'theme' : 'app';
+        const typeLabelTitle = type === 'theme' ? 'Theme' : 'App';
         const name = confirmYes
-            ? toAppName(id)
+            ? toAppName(inputId)
             : await input({
-                message: 'App name',
-                default: id ? toAppName(id) : '',
+                default: inputId ? toAppName(inputId) : '',
+                message: `${typeLabelTitle} name`,
                 validate: (answer) => answer.length > 2,
             });
-        let appId = toAppId(id || '');
+        let appId = toAppId(inputId || '');
         if (!appId) {
             appId = await input({
-                message: 'App ID',
                 default: toAppId(name),
+                message: `${typeLabelTitle} ID`,
                 validate: (answer) => answer.length > 2,
             });
             appId = toAppId(appId);
-            confirmYes = yes && appId;
+            confirmYes = Boolean(inputYes && appId);
         }
+        const version = confirmYes
+            ? '1.0.0'
+            : await input({
+                default: '1.0.0',
+                message: `${typeLabelTitle} version`,
+            });
         const description = confirmYes
             ? ''
             : await input({
-                message: 'Describe what the app does',
                 default: 'Something special',
+                message: `Describe your ${typeLabel}`,
             });
-        const type = confirmYes
-            ? 'admin'
-            : await select({
-                message: 'What is the primary purpose of the app?',
-                choices: [
-                    { name: 'Admin', value: 'admin' },
-                    { name: 'Integration', value: 'integration' },
-                    { name: 'Storefront', value: 'storefront' },
-                ],
-            });
-        const appConfigJson = {
+        let storefrontInstalledApps;
+        let storefrontAppId;
+        let installedStorefrontApp;
+        if (type === 'theme') {
+            storefrontInstalledApps = await this.getInstalledStorefrontApps();
+            if (storefrontInstalledApps === false) {
+                return;
+            }
+            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 ||
+                    inputStorefrontApp === installedApp.app_id ||
+                    inputStorefrontApp === toAppId(installedApp.app_private_id)
+                : installedApp.id === storefrontAppId);
+            if (!installedStorefrontApp) {
+                this.error(`Could not find an installed storefront app by id: ${storefrontAppId}`);
+            }
+        }
+        const swellConfigJson = {
+            description,
             id: appId,
-            version: '1.0.0',
             name,
-            description,
             type,
-            permissions: [],
+            version,
+            ...(type === 'theme'
+                ? {
+                    theme: {
+                        storefront: {
+                            app: toAppId(installedStorefrontApp.app_private_id),
+                        },
+                    },
+                }
+                : {
+                    permissions: [],
+                }),
         };
-        const config = newConfig(appId);
-        if (!confirmYes && appConfigFileExists(config.path)) {
-            const continueCreateApp = await confirm({
-                message: `An app already exists in the target folder ${appId}. Overwrite?`,
-            });
-            if (!continueCreateApp) {
-                return;
+        const appPath = path.join(process.cwd(), appId);
+        if (swellConfigFileExists(appPath)) {
+            if (allowOverwrite) {
+                if (!confirmYes) {
+                    const continueCreateApp = await confirm({
+                        message: `An app already exists in the target path ${appPath}. Overwrite?`,
+                    });
+                    if (!continueCreateApp) {
+                        return;
+                    }
+                }
+            }
+            else {
+                this.error(`An app already exists in the target path ${appPath}.`);
             }
         }
-        this.log(`\nCreating app ${style.appConfigValue(name)} in ${config.path}`);
-        this.log(`\n${JSON.stringify(appConfigJson, null, 4)}\n`);
+        this.log(`\nCreating ${this.appType === 'theme' ? 'theme' : 'app'} ${style.appConfigValue(name)} in ${appPath}/swell.json`);
+        this.log(`\n${JSON.stringify(swellConfigJson, null, 2)}\n`);
         const confirmCreateApp = confirmYes
             ? true
             : await confirm({
@@ -113,98 +164,53 @@ export default class CreateApp extends SwellCommand {
         if (!confirmCreateApp) {
             return;
         }
+        const config = newConfig(nestedPath ? appId : '');
+        config.clear();
+        config.set(swellConfigJson);
+        return { appId, config, installedStorefrontApp, swellConfigJson };
+    }
+    async run() {
+        const { args, flags } = await this.parse(CreateApp);
+        const { id } = args;
+        const { pkg, yes } = flags;
+        const confirmYes = Boolean(yes && id);
+        const createParams = await this.createSwellConfig({
+            inputId: id,
+            inputStorefrontApp: flags['storefront-app'],
+            inputType: flags.type,
+            inputYes: confirmYes,
+        });
+        if (!createParams) {
+            return;
+        }
+        const { appId, config, installedStorefrontApp } = createParams;
         !confirmYes && this.log();
         const spinner = ora();
         spinner.start('Creating app...');
-        config.clear();
-        config.set(appConfigJson);
         if (pkg !== 'none') {
             await this.tryPackageSetup(appId, config, pkg);
         }
         await this.createAppConfigFolders(config);
-        spinner.succeed(`${style.appConfigValue(name)} app created.`);
-        this.log('\nNext steps:');
-        this.log(`Run ${style.command('swell app push')} to push configurations to your test store.`);
-        this.log(`Run ${style.command('swell app install')} to install the app in another store or environment.`);
-    }
-    async tryPackageSetup(name, config, pkg) {
-        try {
-            await this.setupPackage(name, config, pkg);
+        spinner.succeed(`${style.appConfigValue(config.get('name'))} app created.\n`);
+        let createdFrontend;
+        let createdTheme;
+        if (installedStorefrontApp) {
+            createdTheme = await this.createThemeApp(config, flags, installedStorefrontApp);
         }
-        catch (err) {
-            this.log(`There was an error setting up the package manager: ${err.message}`);
-        }
-    }
-    async setupPackage(name, config, pkg) {
-        const execAsync = promisify(exec);
-        const packageJson = {
-            name,
-            version: config.get('version'),
-            description: config.get('description'),
-            scripts: {},
-            devDependencies: {
-                '@swell/app-types': '^1.0.5',
-            },
-        };
-        const tsConfig = {
-            compilerOptions: {
-                target: 'esnext',
-                module: 'esnext',
-                lib: ['esnext', 'webworker'],
-                types: ['@swell/app-types'],
-            },
-            include: ['**/*.ts'],
-            exclude: ['node_modules'],
-        };
-        await writeJsonFile(path.join(path.dirname(config.path), 'package.json'), packageJson);
-        await writeJsonFile(path.join(path.dirname(config.path), 'tsconfig.json'), tsConfig);
-        try {
-            const packageManager = await this.findPackageManager(pkg);
-            await execAsync(`${packageManager} install`, {
-                cwd: path.dirname(config.path),
-            });
-        }
-        catch (err) {
-            this.error(err.message);
-        }
-    }
-    async findPackageManager(pkg) {
-        let packageManager = pkg ? pkg : '';
-        // Determine if system has yarn or npm install
-        if (packageManager) {
-            if (await this.doesPackageManagerExist(packageManager)) {
-                return packageManager;
-            }
+        else if (config.get('type') === 'storefront') {
+            createdFrontend = await this.createStorefrontApp(config, flags);
         }
         else {
-            if (await this.doesPackageManagerExist('npm')) {
-                return 'npm';
-            }
-            else if (await this.doesPackageManagerExist('yarn')) {
-                return 'yarn';
-            }
+            createdFrontend = await this.createFrontendApp(config, flags);
         }
-    }
-    async doesPackageManagerExist(packageManager) {
-        try {
-            await execAsync(`${packageManager} --version`);
-            return true;
-        }
-        catch (err) {
-            this.debug(`Could not find ${packageManager} on your system. Please install ${packageManager} and try again.`);
-            return false;
+        this.log('\nNext steps:');
+        this.log(`Run ${style.command('swell app push')} to push configurations to your test store.`);
+        this.log(`Run ${style.command('swell app install')} to install the app in another store or environment.`);
+        if (createdFrontend) {
+            this.log(`Run ${style.command('swell app frontend dev')} to start a local dev server for your frontend app.`);
         }
-    }
-    async createAppConfigFolders(config) {
-        for (const type of getAllConfigPaths()) {
-            // Create a config folder
-            await execAsync(`mkdir -p ${type}`, {
-                cwd: path.dirname(config.path),
-            });
-            // Create gitkeep file
-            await execAsync(`touch ${path.join(type, '.gitkeep')}`, {
-                cwd: path.dirname(config.path),
-            });
+        else if (createdTheme) {
+            this.log(`Run ${style.command('swell app theme dev')} to start a local dev server for your theme.`);
         }
     }
 }

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

@@ -7,11 +7,11 @@ export default class CreateContent extends CreateCollectionCommand {
         description: string;
     }[];
     static flags: {
-        label: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         description: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         fields: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        views: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        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>;
     };
     static summary: string;
     createType: ConfigType;

package/dist/commands/create/content.js

@@ -25,11 +25,6 @@ export default class CreateContent extends CreateCollectionCommand {
         },
     ];
     static flags = {
-        label: Flags.string({
-            char: 'l',
-            default: '',
-            description: 'content model label',
-        }),
         description: Flags.string({
             char: 'd',
             default: '',
@@ -40,21 +35,26 @@ export default class CreateContent extends CreateCollectionCommand {
             default: '',
             description: 'list of content model fields delimited by commas',
         }),
-        views: Flags.string({
-            char: 'v',
+        label: Flags.string({
+            char: 'l',
             default: '',
-            description: 'list of content model views delimited by commas, i.e. list,edit,new',
+            description: 'content model label',
         }),
         overwrite: Flags.boolean({
             default: false,
             description: 'overwrite existing content model configuration file',
         }),
+        views: Flags.string({
+            char: 'v',
+            default: '',
+            description: 'list of content model views delimited by commas, i.e. list,edit,new',
+        }),
     };
     static summary = 'Initialize a content UI model config file with properties in the content folder.';
     createType = ConfigType.CONTENT;
     async run() {
         const { flags } = await this.parse(CreateContent);
-        const { label, description, collection } = await this.promptCollection();
+        const { collection, description, label } = await this.promptCollection();
         const fileName = toFileName(collection);
         const fileBody = {
             collection,
@@ -70,12 +70,12 @@ export default class CreateContent extends CreateCollectionCommand {
         }
         else {
             const viewsInput = await checkbox({
-                message: 'Which views does your content have?',
                 choices: [
                     { name: 'List view', value: 'list' },
                     { name: 'Edit view', value: 'edit' },
                     { name: 'New view', value: 'new' },
                 ],
+                message: 'Which views does your content have?',
             });
             fileBody.views = parseViews(viewsInput);
         }

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

@@ -0,0 +1,12 @@
+import { CreateAppCommand } from '../../create-app-command.js';
+export default class CreateFrontend extends CreateAppCommand {
+    static description: string;
+    static examples: {
+        command: string;
+        description: string;
+    }[];
+    static flags: {
+        pkg: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/create/frontend.js

@@ -0,0 +1,38 @@
+import { Flags } from '@oclif/core';
+import ora from 'ora';
+import { CreateAppCommand } from '../../create-app-command.js';
+import swellConfig from '../../lib/app-config.js';
+export default class CreateFrontend extends CreateAppCommand {
+    static description = 'Initialize a frontend app framework and folder structure.';
+    static examples = [
+        {
+            command: 'swell create frontend',
+            description: 'Create frontend app following command prompts.',
+        },
+        {
+            command: 'swell create frontend -y',
+            description: 'Create frontend app and accept all default values.',
+        },
+    ];
+    static flags = {
+        pkg: Flags.string({
+            char: 'p',
+            default: 'npm',
+            description: `use npm or yarn to install default dependencies, or none to disable`,
+            options: ['npm', 'yarn', 'none'],
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(CreateFrontend);
+        const newSwellConfig = swellConfig();
+        const appType = newSwellConfig?.get('type');
+        const spinner = ora();
+        if (appType === 'theme') {
+            spinner.fail(`You can't create app frontend in a theme.`);
+            return;
+        }
+        await (appType === 'storefront'
+            ? this.createStorefrontApp(newSwellConfig, flags, true)
+            : this.createFrontendApp(newSwellConfig, flags, true));
+    }
+}

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

@@ -1,6 +1,6 @@
-import { CreateCommand } from '../../create-command.js';
+import { CreateConfigCommand } from '../../create-config-command.js';
 import { ConfigType } from '../../lib/apps/index.js';
-export default class CreateFunction extends CreateCommand {
+export default class CreateFunction extends CreateConfigCommand {
     static args: {
         functionName: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
         trigger: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
@@ -13,9 +13,9 @@ export default class CreateFunction extends CreateCommand {
     static flags: {
         description: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         events: 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>;
         route: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         schedule: 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>;
     };
     static summary: string;
     createType: ConfigType;