@swell/cli 2.1.0 → 2.2.1

package/dist/commands/create/content.js

@@ -1,27 +1,40 @@
 import { checkbox } from '@inquirer/prompts';
-import { Flags } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
 import { CreateCollectionCommand } from '../../create-collection-command.js';
 import { ConfigType } from '../../lib/apps/index.js';
-import { parseFields, parseViews, } from '../../lib/create/content.js';
-import { toFileName } from '../../lib/create/index.js';
+import { parseFields, parseViews, validateViews, } from '../../lib/create/content.js';
+import { toCollectionLabel, toCollectionName, toFileName, } from '../../lib/create/index.js';
+import { SCHEMAS } from '../../lib/create/schemas.js';
 export default class CreateContent extends CreateCollectionCommand {
-    static description = `This command assists in generating UI model configuration files. CLI will prompt for values when flags are not present.`;
+    static args = {
+        collection: Args.string({
+            default: '',
+            description: 'collection ID to create or apply to, e.g., products (required with -y)',
+        }),
+    };
+    static description = `Interactive mode: choose to create a new collection or extend an existing standard collection. The CLI will propose a list of standard collections you can extend.
+
+Non-interactive (-y): provide COLLECTION explicitly. To discover standard collections first, run: swell models.`;
     static examples = [
         {
             command: 'swell create content',
             description: 'Create content model interactively.',
         },
         {
-            command: 'swell create content visitors -v list,edit,new',
-            description: 'Specify views delimited by semicolons.',
+            command: 'swell create content products -y',
+            description: 'Apply configuration to a standard collection (non-interactive)',
         },
         {
-            command: 'swell create content visitors -f name:short_text,description:long_text,verified:boolean,visitor_count:integer,photo:image,orders:collection',
-            description: 'Specify fields with types delimited by semicolons',
+            command: 'swell create content visitors -v list,edit,new -f name:short_text,verified:boolean -l "Visitors" -d "" -y',
+            description: 'Create custom collection with explicit fields and views (non-interactive)',
         },
         {
-            command: 'swell create content visitors -o -f verified:short_text -v list,edit,new -d "Visitor Views"',
-            description: 'Specify fields, views, and description.',
+            command: 'swell create content visitors --overwrite -y',
+            description: 'Non-interactive: force overwrite existing config file',
+        },
+        {
+            command: 'swell create content visitors -f name:short_text,description:long_text,verified:boolean,visitor_count:integer,photo:image,orders:collection',
+            description: 'Specify fields with types delimited by commas (interactive mode)',
         },
     ];
     static flags = {
@@ -33,30 +46,85 @@ export default class CreateContent extends CreateCollectionCommand {
         fields: Flags.string({
             char: 'f',
             default: '',
-            description: 'list of content model fields delimited by commas',
+            description: 'comma-separated id:type pairs (e.g., name:short_text, verified:boolean)',
         }),
         label: Flags.string({
             char: 'l',
             default: '',
-            description: 'content model label',
+            description: 'display label for the content model (defaults to capitalized collection name)',
         }),
         overwrite: Flags.boolean({
             default: false,
-            description: 'overwrite existing content model configuration file',
+            description: 'overwrite existing content model configuration file (use with -y to force overwrite)',
         }),
         views: Flags.string({
             char: 'v',
             default: '',
-            description: 'list of content model views delimited by commas, i.e. list,edit,new',
+            description: 'comma-separated views - valid: list, edit, new',
+        }),
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'accept all default values; non-interactive, never prompts; errors if required values are missing',
         }),
     };
     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 { args, flags } = await this.parse(CreateContent);
+        const confirmYes = Boolean(flags.yes);
+        // NON-INTERACTIVE PATH
+        if (confirmYes) {
+            // Validate required arguments
+            const argCollection = args.collection;
+            if (!argCollection) {
+                this.error('Missing required argument for non-interactive mode: COLLECTION\n\nExample: swell create content products -y\n\nTip: run `swell models` to list standard collections you can extend.', { exit: 1 });
+            }
+            // Process and normalize collection name
+            const collection = toCollectionName(argCollection);
+            // Apply defaults for optional values
+            const label = flags.label || toCollectionLabel(collection);
+            const description = flags.description || '';
+            // Validate and parse views
+            let viewsList;
+            if (flags.views) {
+                viewsList = flags.views
+                    .split(',')
+                    .map((v) => v.trim())
+                    .filter(Boolean);
+                validateViews(viewsList, this.error.bind(this));
+            }
+            else {
+                // Default views when not specified
+                viewsList = ['list', 'edit', 'new'];
+            }
+            // Parse fields (no validation - trust user input)
+            const fieldsRaw = (flags.fields || '');
+            const fieldPairs = fieldsRaw
+                ? fieldsRaw
+                    .split(',')
+                    .map((v) => v.trim())
+                    .filter(Boolean)
+                : [];
+            // Build file body
+            const fileName = toFileName(collection);
+            const fileBody = {
+                $schema: SCHEMAS.CONTENT,
+                collection,
+                description,
+                fields: parseFields(fieldPairs),
+                label,
+                views: parseViews(viewsList),
+            };
+            // Create file with overwrite handling
+            await this.createFile({ fileBody, fileName }, flags.overwrite, 
+            /* shouldConfirm */ false);
+            return;
+        }
+        // INTERACTIVE PATH (existing logic)
         const { collection, description, label } = await this.promptCollection();
         const fileName = toFileName(collection);
         const fileBody = {
+            $schema: SCHEMAS.CONTENT,
             collection,
         };
         const { fields, overwrite, views } = flags;

package/dist/commands/create/function.js

@@ -70,10 +70,13 @@ export default class CreateFunction extends CreateConfigCommand {
         let writeFunctionFileParams = {
             description,
             events,
+            extension: undefined,
             functionName: functionName || '',
-            language: (functionName?.includes('.ts')
+            language: (functionName?.endsWith('.ts')
                 ? 'ts'
-                : 'js'),
+                : functionName?.endsWith('.js')
+                    ? 'js'
+                    : undefined),
             route,
             schedule,
             trigger: trigger,
@@ -85,6 +88,23 @@ export default class CreateFunction extends CreateConfigCommand {
         await this.writeFunctionFile(writeFunctionFileParams, overwrite);
     }
     async gatherInput(params) {
+        // Check if there are any extensions in the app configuration
+        const extensions = this.swellConfig.get('extensions') || [];
+        let { extension } = params;
+        const extensionsWithId = extensions.filter((ext) => ext.id);
+        if (extensionsWithId.length > 0 && !extension) {
+            const extensionChoices = [
+                { name: 'Not for an extension', value: '' },
+                ...extensionsWithId.map((ext) => ({
+                    name: ext.id,
+                    value: ext.id,
+                })),
+            ];
+            extension = await select({
+                choices: extensionChoices,
+                message: 'Is this function for an app extension?',
+            });
+        }
         let { language } = params;
         if (!language) {
             language = await select({
@@ -155,9 +175,9 @@ export default class CreateFunction extends CreateConfigCommand {
                 message: 'Name your function',
             });
         }
-        const { description } = params;
+        let { description } = params;
         if (!description) {
-            await input({
+            description = await input({
                 default: 'Does a thing when another other thing happens',
                 message: 'Describe what the function does',
             });
@@ -165,6 +185,7 @@ export default class CreateFunction extends CreateConfigCommand {
         return {
             description,
             events: events || '',
+            extension: extension || undefined,
             functionName,
             language,
             route: route || '',
@@ -172,13 +193,14 @@ export default class CreateFunction extends CreateConfigCommand {
             trigger,
         };
     }
-    async writeFunctionFile({ description, events, functionName, language, route, schedule, trigger, }, overwrite) {
+    async writeFunctionFile({ description, events, extension, functionName, language, route, schedule, trigger, }, overwrite) {
         const fileName = toFunctionFileName(functionName);
         await this.createFile({
             extension: language,
             fileBody: getFunctionTemplate({
                 description,
                 events,
+                extension,
                 functionName,
                 language,
                 route,

package/dist/commands/create/index.js

@@ -26,9 +26,13 @@ export default class Create extends Command {
                     name: 'Notification',
                     value: 'notification',
                 },
+                {
+                    name: 'Tests',
+                    value: 'tests',
+                },
             ],
             message: 'What do you want to create?',
         });
-        this.log(JSON.stringify(createTarget));
+        await this.config.runCommand(`create:${createTarget}`);
     }
 }

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

@@ -1,6 +1,9 @@
 import { CreateCollectionCommand } from '../../create-collection-command.js';
 import { ConfigType } from '../../lib/apps/index.js';
 export default class CreateModel 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 CreateModel extends CreateCollectionCommand {
         fields: 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>;
+        yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static summary: string;
     createType: ConfigType;

package/dist/commands/create/model.js

@@ -1,27 +1,36 @@
 import { checkbox } from '@inquirer/prompts';
-import { Flags } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
 import { CreateCollectionCommand } from '../../create-collection-command.js';
 import { ConfigType } from '../../lib/apps/index.js';
-import { toFileName } from '../../lib/create/index.js';
+import { toCollectionLabel, toCollectionName, toFileName, } from '../../lib/create/index.js';
 import { parseEvents, parseFields, } from '../../lib/create/model.js';
+import { SCHEMAS } from '../../lib/create/schemas.js';
 export default class CreateModel extends CreateCollectionCommand {
-    static description = `This command assists in generating data model configuration files. CLI will prompt for values when flags are not present.`;
+    static args = {
+        collection: Args.string({
+            default: '',
+            description: 'collection ID to create or apply to, e.g., products (required with -y)',
+        }),
+    };
+    static description = `Interactive mode: choose to create a new collection or extend an existing standard collection. The CLI will propose a list of standard collections you can extend.
+
+Non-interactive (-y): provide COLLECTION explicitly. To discover standard collections first, run: swell inspect models.`;
     static examples = [
         {
             command: 'swell create model',
-            description: 'Create data model configuration interactively.',
+            description: 'Create data model configuration interactively',
         },
         {
-            command: 'swell create model visitors -e created,updated,deleted.',
-            description: 'Specify events of the data model.',
+            command: 'swell create model products -y',
+            description: 'Apply configuration to a standard collection (non-interactive)',
         },
         {
-            command: 'swell create model visitors -f first_name:string,last_name:string,photo:file,visit_count:int,visits:link',
-            description: 'Specify fields of the data model.',
+            command: 'swell create model visitors -e created,updated -f title:string,photo:image -l "Visitors" -d "" -y',
+            description: 'Create custom collection with explicit fields (non-interactive)',
         },
         {
-            command: 'swell create model visitors -f first_name:string,last_name:string,photo:file,visit_count:int,visits:link -d "Visitors Tracking" -o -e created,updated,deleted',
-            description: 'Scaffold a data model configuration with args and flags.',
+            command: 'swell inspect models',
+            description: 'List standard collections available for extending',
         },
     ];
     static flags = {
@@ -33,40 +42,129 @@ export default class CreateModel extends CreateCollectionCommand {
         events: Flags.string({
             char: 'e',
             default: 'created,updated,deleted',
-            description: 'list of data model events delimited by commas',
+            description: 'comma-separated events - valid: created, updated, deleted',
         }),
         fields: Flags.string({
             char: 'f',
             default: '',
-            description: 'list of data model fields delimited by commas',
+            description: 'comma-separated id:type pairs (e.g., title:string, price:currency). Types: collection, currency, image, int, link, string',
         }),
         label: Flags.string({
             char: 'l',
             default: '',
-            description: 'data model label, i.e. Products',
+            description: 'display label for the model (defaults to capitalized collection name)',
         }),
         overwrite: Flags.boolean({
             default: false,
-            description: 'Overwrite existing data model configuration file.',
+            description: 'overwrite existing data model configuration file (use with -y to force overwrite)',
+        }),
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'accept all default values; non-interactive, never prompts; errors if required values are missing',
         }),
     };
-    static summary = 'Initialize a data model config file with properties in the models folder.';
+    static summary = 'Create or extend a data model configuration in the models folder.';
     createType = ConfigType.MODEL;
     async run() {
-        const { flags } = await this.parse(CreateModel);
+        const { args, flags } = await this.parse(CreateModel);
+        const confirmYes = Boolean(flags.yes);
+        // Helper validators
+        const validEventValues = ['created', 'updated', 'deleted'];
+        const validFieldTypes = [
+            'collection',
+            'currency',
+            'image',
+            'int',
+            'link',
+            'string',
+        ];
+        const validateEvents = (values) => {
+            const invalid = values.filter((v) => !validEventValues.includes(v));
+            if (invalid.length > 0) {
+                this.error(`Invalid event(s): ${invalid.join(', ')}\n\nValid events: ${validEventValues.join(', ')}\n\nExample: swell create model visitors -e created,updated -y`, { exit: 1 });
+            }
+        };
+        const validateFields = (pairs) => {
+            const invalid = [];
+            for (const pair of pairs) {
+                if (!pair.includes(':')) {
+                    invalid.push(pair);
+                    continue;
+                }
+                const type = pair.split(':')[1]?.trim();
+                if (!validFieldTypes.includes(type)) {
+                    invalid.push(pair);
+                }
+            }
+            if (invalid.length > 0) {
+                this.error(`Invalid field(s): ${invalid.join(', ')}\n\nValid types: ${validFieldTypes.join(', ')}\n\nExample: swell create model visitors -f title:string,price:currency -y`, { exit: 1 });
+            }
+        };
+        if (confirmYes) {
+            const argCollection = args.collection;
+            if (!argCollection) {
+                this.error('Missing required argument for non-interactive mode: COLLECTION\n\nExample: swell create model products -y\n\nTip: run `swell inspect models` to list standard collections you can extend.', { exit: 1 });
+            }
+            const collection = toCollectionName(argCollection);
+            const label = flags.label || toCollectionLabel(collection);
+            const description = flags.description || '';
+            const eventsRaw = (flags.events || 'created,updated,deleted');
+            const eventsList = eventsRaw
+                .split(',')
+                .map((v) => v.trim())
+                .filter(Boolean);
+            validateEvents(eventsList);
+            const fieldsRaw = (flags.fields || '');
+            const fieldPairs = fieldsRaw
+                ? fieldsRaw
+                    .split(',')
+                    .map((v) => v.trim())
+                    .filter(Boolean)
+                : [];
+            validateFields(fieldPairs);
+            const fileName = toFileName(collection);
+            const fileBody = {
+                $schema: SCHEMAS.MODEL,
+                collection,
+                description,
+                fields: parseFields(fieldPairs),
+                label,
+                events: parseEvents(eventsList),
+            };
+            await this.createFile({ fileBody, fileName }, flags.overwrite, 
+            /* shouldConfirm */ false);
+            return;
+        }
+        // Interactive flow (prompts)
         const { collection, description, label } = await this.promptCollection();
         const fileName = toFileName(collection);
         const fileBody = {
+            $schema: SCHEMAS.MODEL,
             collection,
         };
         const { events, fields, overwrite } = flags;
-        if (label) {
+        if (label)
             fileBody.label = label;
-        }
         fileBody.description = description;
-        fileBody.fields = fields ? parseFields(fields.split(',')) : {};
-        if (fileBody.events) {
-            fileBody.events = events ? parseEvents(events.split(',')) : {};
+        if (fields) {
+            const pairs = fields
+                .split(',')
+                .map((v) => v.trim())
+                .filter(Boolean);
+            validateFields(pairs);
+            fileBody.fields = parseFields(pairs);
+        }
+        else {
+            fileBody.fields = {};
+        }
+        // If events were provided via flag, use them; otherwise prompt
+        if (events && events !== 'created,updated,deleted') {
+            const eventsList = events
+                .split(',')
+                .map((v) => v.trim())
+                .filter(Boolean);
+            validateEvents(eventsList);
+            fileBody.events = parseEvents(eventsList);
         }
         else {
             const eventsInput = await checkbox({
@@ -79,9 +177,6 @@ export default class CreateModel extends CreateCollectionCommand {
             });
             fileBody.events = parseEvents(eventsInput);
         }
-        await this.createFile({
-            fileBody,
-            fileName,
-        }, overwrite);
+        await this.createFile({ fileBody, fileName }, overwrite);
     }
 }

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

@@ -0,0 +1,15 @@
+import { AppCommand } from '../../app-command.js';
+export default class CreateTests extends AppCommand {
+    static description: string;
+    static summary: string;
+    static examples: {
+        command: string;
+        description: string;
+    }[];
+    static flags: {
+        overwrite: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+    private logScaffoldResult;
+}

package/dist/commands/create/tests.js

@@ -0,0 +1,79 @@
+import { Flags } from '@oclif/core';
+import { AppCommand } from '../../app-command.js';
+import { toAppId } from '../../lib/create/index.js';
+import { createTestsScaffold, } from '../../lib/create/tests.js';
+export default class CreateTests extends AppCommand {
+    static description = 'Initialize a vitest + Cloudflare Workers test setup that reuses swell-cli authentication.';
+    static summary = 'Create test scaffolding for your Swell app.';
+    static examples = [
+        {
+            command: 'swell create tests',
+            description: 'Create a basic test setup using TypeScript.',
+        },
+        {
+            command: 'swell create tests --overwrite',
+            description: 'Regenerate test files, overwriting existing ones.',
+        },
+    ];
+    static flags = {
+        overwrite: Flags.boolean({
+            default: false,
+            description: 'overwrite existing test files if they already exist',
+        }),
+        yes: Flags.boolean({
+            char: 'y',
+            default: false,
+            description: 'accept defaults, skip prompts (no prompts currently, included for consistency)',
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(CreateTests);
+        const appIdFromConfig = (this.swellConfig.get('id') ||
+            this.swellConfig.get('private_id') ||
+            this.swellConfig.get('public_id'));
+        const appId = appIdFromConfig ||
+            toAppId(this.swellConfig.get('name')) ||
+            'app';
+        const result = await createTestsScaffold({
+            appPath: this.appPath,
+            appId,
+            overwrite: Boolean(flags.overwrite),
+        });
+        this.logScaffoldResult(result);
+    }
+    logScaffoldResult(result) {
+        const hasChanges = result.createdFiles.length > 0 || result.packageJsonUpdated;
+        if (hasChanges) {
+            this.log('');
+            this.log('✓ Created test scaffolding');
+        }
+        if (result.createdFiles.length > 0) {
+            this.log('');
+            this.log('Created:');
+            for (const file of result.createdFiles) {
+                this.log(`  ${file}`);
+            }
+        }
+        if (result.skippedFiles.length > 0) {
+            this.log('');
+            this.log('Skipped (already exist):');
+            for (const file of result.skippedFiles) {
+                this.log(`  ${file}`);
+            }
+        }
+        if (result.packageJsonUpdated) {
+            this.log('');
+            this.log('Updated package.json with test scripts and devDependencies.');
+        }
+        for (const warning of result.warnings) {
+            this.warn(warning);
+        }
+        if (hasChanges) {
+            this.log('');
+            this.log('Next steps:');
+            this.log('  1. npm install');
+            this.log('  2. npm test');
+        }
+        this.log('');
+    }
+}

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

@@ -0,0 +1,25 @@
+import { SwellCommand } from '../../swell-command.js';
+export default class Content extends SwellCommand {
+    static summary: string;
+    static description: string;
+    static args: {
+        'content-id': import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static flags: {
+        live: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+    };
+    static examples: string[];
+    run(): Promise<void>;
+    protected catch(error: Error): Promise<any>;
+    private listContent;
+    private showContentViews;
+    private showContentView;
+    private resolveContentId;
+    private showContentDetail;
+    private reverseResolveContentId;
+    private getAppBySlug;
+    private getAppSlugId;
+    private throwContentNotFound;
+    private showContent;
+}