@swell/cli 2.3.2 → 2.3.3

package/dist/commands/app/dev.js

@@ -297,6 +297,8 @@ ENVIRONMENT = "development"
         // Get all functions in this app
         const functions = await this.getAppFunctions();
         if (functions.length === 0) {
+            // Create routing server to proxy requests to frontend even without functions
+            await this.createFunctionRouter(serverPort);
             spinner.stop();
             return;
         }
@@ -308,7 +310,7 @@ ENVIRONMENT = "development"
         this.watchForChanges({
             onChange: this.onChangeFunctionWatcher.bind(this),
         });
-        // Create a routing server that proxies requests to function servers
+        // Create routing server after function servers are ready
         await this.createFunctionRouter(serverPort);
         spinner.succeed(`App function server running on port ${serverPort}\n`);
         this.log(`${style.appConfigName(`Functions:`)}`);

package/dist/commands/logs.d.ts

@@ -18,7 +18,6 @@ export default class Logs extends SwellCommand {
     static summary: string;
     private output;
     run(): Promise<void>;
-    __run(): Promise<void>;
     private getLogs;
     private getLogsAndWriteToStream;
 }

package/dist/commands/logs.js

@@ -1,5 +1,4 @@
 import { Flags } from '@oclif/core';
-import ora from 'ora';
 import { LineOutput, LoggedItem, TableOutput } from '../lib/logs/index.js';
 import { SwellCommand } from '../swell-command.js';
 // the columns available to display in the table
@@ -19,6 +18,23 @@ const OUTPUT_COLUMNS = [
 const OUTPUT_COLUMNS_DEFAULTS = ['date', 'request', 'data', 'status', 'time'];
 // the interval to poll the API when following logs
 const FOLLOW_POLLING_INTERVAL = 1000 * 2; // 2 seconds
+/**
+ * Converts $in value to array
+ * @param value value to convert
+ * @param op operator
+ * @param convertToNumber true if string value should be converted to number
+ * @returns converted value
+ */
+function convertOperatorValue(value, op, convertToNumber = false) {
+    if (Array.isArray(value)) {
+        return value;
+    }
+    const converted = convertToNumber ? Number.parseInt(value, 10) : value;
+    if (op !== '$in') {
+        return converted;
+    }
+    return [converted];
+}
 /**
  * Builds the request options to send to the API based on the flags passed
  * to the command.
@@ -36,7 +52,7 @@ function buildLogRequestBody(flags) {
     // some filters are simple and can be mapped directly to the API
     const logFilters = [
         { filter: 'app_id', flag: 'app', operator: '$in' },
-        { filter: 'message.status', flag: 'status', operator: '$in' },
+        { filter: 'message.status', flag: 'status', operator: '$in', number: true },
         { filter: 'message.type', flag: 'type', operator: '$in' },
     ];
     // map the flags to the API query
@@ -44,7 +60,9 @@ function buildLogRequestBody(flags) {
         if (flags[filter.flag]) {
             andConditions.push({
                 [filter.filter]: filter.operator
-                    ? { [filter.operator]: flags[filter.flag] }
+                    ? {
+                        [filter.operator]: convertOperatorValue(flags[filter.flag], filter.operator, filter.number),
+                    }
                     : flags[filter.flag],
             });
         }
@@ -145,7 +163,7 @@ export default class Logs extends SwellCommand {
             char: 'p',
             default: false,
             description: 'note that this flag will take more space in the terminal and require more time to load',
-            summary: 'pretty print json data',
+            summary: 'pretty print json data in table output',
         }),
         search: Flags.string({
             char: 's',
@@ -163,10 +181,6 @@ export default class Logs extends SwellCommand {
     static summary = 'Output or stream store logs to the terminal.';
     output;
     async run() {
-        const spinner = ora();
-        spinner.fail('This command is temporarily disabled. Check back soon.');
-    }
-    async __run() {
         const { flags } = await this.parse(Logs);
         // indentify the columns to display
         const columns = flags.columns.split(',');
@@ -175,24 +189,30 @@ export default class Logs extends SwellCommand {
             flags.output === 'table'
                 ? new TableOutput(columns, flags.pretty)
                 : new LineOutput(columns, flags.pretty);
-        // first run for getting the logs
-        // we keep track of the last date we received so we can get logs after that
-        flags.startPolling = await this.getLogsAndWriteToStream(flags);
         // if following, poll the API every FOLLOW_POLLING_INTERVAL seconds and
         // write new logs to the stream
         if (flags.follow) {
+            // first get the latest log to use its date
+            // we keep track of the last date we received so we can get logs after that
+            const previousNumber = flags.number;
+            flags.number = 1; // get the latest log
+            flags.startPolling = await this.getLogsAndWriteToStream(flags, false);
+            flags.number = previousNumber;
             setInterval(async () => {
                 // when polling, we want to get logs after the last date we received
                 flags.startPolling = await this.getLogsAndWriteToStream(flags);
             }, FOLLOW_POLLING_INTERVAL);
         }
+        else {
+            await this.getLogsAndWriteToStream(flags);
+        }
     }
     async getLogs(flags) {
         const body = buildLogRequestBody(flags);
         const response = await this.api.post({ adminPath: `/data/$get/:logs` }, { body });
         return response?.results?.reverse() || [];
     }
-    async getLogsAndWriteToStream(flags) {
+    async getLogsAndWriteToStream(flags, show = true) {
         const logs = await this.getLogs(flags);
         let lastDate = '';
         if (!this.output) {
@@ -200,12 +220,13 @@ export default class Logs extends SwellCommand {
         }
         if (logs.length > 0) {
             lastDate = logs.at(-1).date;
-            for (const log of logs) {
-                this.output.write(this.output.prepareData(new LoggedItem(log)));
+            if (show) {
+                for (const log of logs) {
+                    this.output.write(this.output.prepareData(new LoggedItem(log)));
+                }
             }
         }
-        // if the user is following logs, we want to return the last date we
-        // received
-        return lastDate || flags.startPolling;
+        // if the user is following logs, we want to return the last date we received
+        return lastDate || flags.startPolling || new Date().toISOString();
     }
 }

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

@@ -89,6 +89,12 @@ export declare class AppConfigFunction extends AppConfig {
     isRootFunction(): boolean;
     preparePostData(postData: any): Promise<any>;
 }
+export declare class AppConfigComponent extends AppConfig {
+    hasValues: boolean;
+    type: ConfigType;
+    isRootComponent(): boolean;
+    preparePostData(postData: any): Promise<any>;
+}
 export declare class AppConfigAsset extends AppConfigDefault {
     hasValues: boolean;
     type: ConfigType;

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

@@ -3,7 +3,7 @@ import isEmpty from 'lodash/isEmpty.js';
 import { detectFilenameMime } from 'mime-detect';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { bundleFunction } from '../bundle.js';
+import { bundleFunction, bundleComponent } from '../bundle.js';
 import { AllConfigPaths, ConfigType, filePathExists, hashFile, } from './index.js';
 export class IgnoringFileError extends Error {
     constructor(message) {
@@ -117,6 +117,9 @@ export class AppConfig {
             case ConfigType.THEME: {
                 return new AppConfigTheme(attrs);
             }
+            case ConfigType.COMPONENT: {
+                return new AppConfigComponent(attrs);
+            }
             default: {
                 // the default type is file
                 const defaultConfig = new AppConfigDefault(attrs);
@@ -275,6 +278,43 @@ export class AppConfigFunction extends AppConfig {
         return postData;
     }
 }
+export class AppConfigComponent extends AppConfig {
+    hasValues = true;
+    type = ConfigType.COMPONENT;
+    isRootComponent() {
+        return (this.isRootConfig('components') &&
+            (this.filePath.endsWith('.jsx') || this.filePath.endsWith('.tsx')));
+    }
+    async preparePostData(postData) {
+        if (!this.isRootComponent()) {
+            return postData;
+        }
+        try {
+            // get file contents and if it's empty ignore
+            const fileData = this.prepareFileData();
+            if (!fileData) {
+                return;
+            }
+            const { code, config } = await bundleComponent(this.filePath);
+            if (!config) {
+                throw new IgnoringFileError('Component must export a `config` object.');
+            }
+            // Save the original file and the bundled version
+            postData.file = {
+                data: fileData,
+            };
+            postData.build_file = {
+                content_type: 'application/javascript',
+                data: code,
+            };
+            postData.values = config;
+        }
+        catch (error) {
+            throw new FunctionProcessingError(`Unable to compile component ${this.name}`, error);
+        }
+        return postData;
+    }
+}
 // Assets do not get installed but saved as plain files
 export class AppConfigAsset extends AppConfigDefault {
     hasValues = false;

package/dist/lib/apps/index.d.ts

@@ -93,6 +93,7 @@ export declare enum ConfigType {
     CONTENT = "content",
     FILE = "file",
     FRONTEND = "frontend",
+    COMPONENT = "component",
     FUNCTION = "function",
     MODEL = "model",
     NOTIFICATION = "notification",

package/dist/lib/apps/index.js

@@ -26,6 +26,7 @@ export var ConfigType;
     ConfigType["CONTENT"] = "content";
     ConfigType["FILE"] = "file";
     ConfigType["FRONTEND"] = "frontend";
+    ConfigType["COMPONENT"] = "component";
     ConfigType["FUNCTION"] = "function";
     ConfigType["MODEL"] = "model";
     ConfigType["NOTIFICATION"] = "notification";
@@ -44,6 +45,7 @@ const ConfigTypeBatchOrder = [
     ConfigType.WEBHOOK,
     ConfigType.THEME,
     ConfigType.FRONTEND,
+    ConfigType.COMPONENT,
     ConfigType.FILE,
 ];
 // All available configs
@@ -51,6 +53,7 @@ const AllConfigTypes = [
     'ASSET',
     'CONTENT',
     'FRONTEND',
+    'COMPONENT',
     'FUNCTION',
     'MODEL',
     'NOTIFICATION',

package/dist/lib/bundle.d.ts

@@ -1 +1,2 @@
 export declare function bundleFunction(filePath: string): Promise<any>;
+export declare function bundleComponent(filePath: string): Promise<any>;

package/dist/lib/bundle.js

@@ -36,6 +36,45 @@ export async function bundleFunction(filePath) {
         throw new Error(`Unable to compile function ${filePath}: ${error.message}`);
     }
 }
+export async function bundleComponent(filePath) {
+    try {
+        const content = fs.readFileSync(filePath, 'utf8');
+        const stdinLoader = filePath.endsWith('.tsx') ? 'tsx' : 'jsx';
+        const buildResult = await esbuild.build({
+            stdin: {
+                contents: `
+          ${content}
+          import { render, h } from "preact";
+          export const preact = { render, h };
+        `,
+                loader: stdinLoader,
+                resolveDir: path.dirname(filePath),
+            },
+            bundle: true,
+            minify: true,
+            platform: 'browser',
+            format: 'iife',
+            globalName: 'Component',
+            loader: {
+                '.ts': 'ts',
+                '.jsx': 'jsx',
+                '.tsx': 'tsx',
+            },
+            jsxFactory: 'h',
+            jsxFragment: 'Fragment',
+            write: false,
+            logLevel: 'silent',
+        });
+        const { outputFiles: [{ text: code }], } = buildResult;
+        // eslint-disable-next-line no-new-func
+        const evalFn = new Function(`${code}\nreturn { ...Component }`);
+        const { config } = evalFn();
+        return { code, config };
+    }
+    catch (error) {
+        throw new Error(`Unable to compile component ${filePath}: ${error.message}`);
+    }
+}
 function getSwellFunctionWrapper() {
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = path.dirname(__filename);

package/dist/lib/logs/table-output.js

@@ -79,7 +79,7 @@ export class TableOutput extends Output {
                 width: 6,
             },
         };
-        return columns[column];
+        return columns[column] || { width: 6 };
     }
     prepareColumnDisplay(column, extraWidth) {
         const display = this.displayOptions(column);

package/dist/push-app-command.js

@@ -792,14 +792,14 @@ export class PushAppCommand extends RemoteAppCommand {
         let deploymentUrl;
         let interactiveError = false;
         let pagesProjectError = false;
+        let outputBuffer = '';
         this.log(`\nDeploying to Cloudflare...\n`);
         try {
             await this.execFrontend(`npx wrangler deploy`, (string) => {
-                // Dependent on wrangler output
-                // Parse the deployment URL from the wrangler output.
-                const match = string.match(/^\s*(https:\/\/\S+\.workers\.dev)\s*[\S\s]*?Current Version ID: [\w-]+/m);
-                if (match && match.length > 0) {
-                    deploymentUrl = match[1];
+                // Accumulate output for URL parsing after command completes
+                outputBuffer += string;
+                // Suppress workers.dev URL from output (users should use swell domain)
+                if (string.match(/^\s*https:\/\/\S+\.workers\.dev\s*$/m)) {
                     return false;
                 }
                 // Check for Pages project error
@@ -834,6 +834,12 @@ export class PushAppCommand extends RemoteAppCommand {
                 throw error;
             }
         }
+        // Parse deployment URL from accumulated output
+        // Match the workers.dev URL that appears on its own line after "Deployed ... triggers"
+        const urlMatch = outputBuffer.match(/^\s*(https:\/\/\S+\.workers\.dev)\s*$/m);
+        if (urlMatch && urlMatch[1]) {
+            deploymentUrl = urlMatch[1];
+        }
         if (!deploymentUrl) {
             this.error('Unable to retrieve deployment URL.');
         }

package/oclif.manifest.json

@@ -190,7 +190,7 @@
           "char": "p",
           "description": "note that this flag will take more space in the terminal and require more time to load",
           "name": "pretty",
-          "summary": "pretty print json data",
+          "summary": "pretty print json data in table output",
           "allowNo": false,
           "type": "boolean"
         },
@@ -999,7 +999,7 @@
           "name": "targetPath"
         }
       },
-      "description": "Pull all app files, a specific file, or a specific configuration\ntype from an app in your store's test environment to your local machine.\n\nIf APPID is not specified, you will be prompted with a list of apps to choose from.\n\nApp file directories:\nassets/\ncontent/\nfrontend/\nfunctions/\nmodels/\nnotifications/\nsettings/\ntheme/\nwebhooks/\nfrontend/",
+      "description": "Pull all app files, a specific file, or a specific configuration\ntype from an app in your store's test environment to your local machine.\n\nIf APPID is not specified, you will be prompted with a list of apps to choose from.\n\nApp file directories:\nassets/\ncontent/\nfrontend/\ncomponents/\nfunctions/\nmodels/\nnotifications/\nsettings/\ntheme/\nwebhooks/\nfrontend/",
       "examples": [
         "swell app pull",
         "swell app pull example_app",
@@ -1048,7 +1048,7 @@
           "name": "file"
         }
       },
-      "description": "Push all app files, a specific file, or a specific configuration\ntype to an app in your store's test environment.\n\nIf the app does not exist, it will be created and its global ID saved to a .swellrc file.\n\n- If no file is specified, all configuration files will be pushed to the store.\n  This includes the app icon (assets/icon.png) and swell.json.\n- If a file is specified, only that file will be pushed to the store.\n- If a directory is specified, only files in that directory will be pushed.\n\nApp file directories:\nassets/\ncontent/\nfrontend/\nfunctions/\nmodels/\nnotifications/\nsettings/\ntheme/\nwebhooks/",
+      "description": "Push all app files, a specific file, or a specific configuration\ntype to an app in your store's test environment.\n\nIf the app does not exist, it will be created and its global ID saved to a .swellrc file.\n\n- If no file is specified, all configuration files will be pushed to the store.\n  This includes the app icon (assets/icon.png) and swell.json.\n- If a file is specified, only that file will be pushed to the store.\n- If a directory is specified, only files in that directory will be pushed.\n\nApp file directories:\nassets/\ncontent/\nfrontend/\ncomponents/\nfunctions/\nmodels/\nnotifications/\nsettings/\ntheme/\nwebhooks/",
       "examples": [
         "swell app push",
         "swell app push content",
@@ -2875,5 +2875,5 @@
       ]
     }
   },
-  "version": "2.3.2"
+  "version": "2.3.3"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [