@swell/cli 2.0.8 → 2.0.10

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

@@ -3,6 +3,7 @@ export default class AppThemeDev extends PushAppCommand {
     static examples: string[];
     static flags: {
         bundle: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         local: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'no-push': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;

package/dist/commands/theme/dev.js

@@ -21,6 +21,10 @@ export default class AppThemeDev extends PushAppCommand {
         bundle: Flags.boolean({
             description: 'bundle assets',
         }),
+        force: Flags.boolean({
+            default: false,
+            description: 'force push all configurations',
+        }),
         local: Flags.boolean({
             description: 'connect to a running local storefront app dev server',
         }),
@@ -45,13 +49,18 @@ export default class AppThemeDev extends PushAppCommand {
     }
     async run() {
         const { flags } = await this.parse(AppThemeDev);
-        const { local } = flags;
+        const { force, local } = flags;
         const noPush = flags['no-push'];
         if (!(await this.ensureAppExists(undefined, false))) {
             return;
         }
+        if (local) {
+            const currentStore = localConfig.getDefaultStore();
+            const sessionId = localConfig.getSessionId(currentStore);
+            this.storefrontLocalUrl = this.localFrontendUrl(currentStore, sessionId);
+        }
         if (!noPush) {
-            await this.pushAppConfigs();
+            await this.pushAppConfigs(force);
         }
         await this.getStorefrontToPush(flags);
         this.logStorefrontConnected();
@@ -136,7 +145,7 @@ export default class AppThemeDev extends PushAppCommand {
         const freePort = (await getPort({ port: portNumbers(3000, 3100) })) || FALLBACK_PORT;
         spinner.start(`Starting theme dev server on port ${freePort}...`);
         const storefrontUrl = local
-            ? this.localFrontendUrl(currentStore, sessionId)
+            ? this.storefrontLocalUrl
             : this.storefrontFrontendUrl(currentStore, this.storefront, undefined, true);
         const bs = BrowserSync.create();
         bs.init({

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

@@ -80,7 +80,7 @@ class AppConfig {
             this.appPath = path.join(appPath, filePath);
         }
         if (filePathExists(this.appPath)) {
-            this.fileHash = hashFile(this.appPath);
+            this.fileHash = hashFile(this.appPath, undefined, filePath);
             this.hash = this.hash || this.fileHash;
             this.fileData = fs.readFileSync(this.appPath);
             this.fileContent = this.fileData.toString('utf8');

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

@@ -131,18 +131,24 @@ declare function filePathExists(filePath: string): boolean;
 declare function writeFile(file: string, data: string): Promise<void>;
 declare function deleteFile(file: string): Promise<void>;
 declare function writeJsonFile(file: string, data?: any): Promise<void>;
-declare function hashFile(filePath: string, fileContents?: Buffer): string;
-declare function hashString(contents: string): string;
+declare function hashFile(filePath: string, fileContents?: Buffer, relativePath?: string): string;
+declare function hashString(...contents: (Buffer | string)[]): string;
 declare function appAssetImage(appPath: string, fileName: string): string | undefined;
 declare function appConfigFromFile(filePath: string, configType: ConfigType, appPath: string): AppConfig;
 declare function findAppConfig(app: App, filePath: string, configType: ConfigType): AppConfig | undefined;
+interface BatchAppFiles {
+    configs: AppConfig[];
+    type: ConfigType;
+    label: string;
+    concurrency: number;
+}
 /**
  * Get files to push in batches prioritized by dependencies
  *
- * @param configs - List of app configs
- * @returns {Array} Batches of files to push
+ * @param {AppConfig[]} configs - List of app configs
+ * @returns {BatchAppFiles[]} Batches of files to push
  */
-declare function batchAppFilesByType(configs: AppConfig[]): Array<any>;
+declare function batchAppFilesByType(configs: AppConfig[]): BatchAppFiles[];
 export { PUSH_CONCURRENCY, App, AppVersion, ConfigInputFields, ConfigPaths, ConfigPathsType, ConfigType, FrontendProjectType, FrontendProjectTypes, StorefrontConfigPaths, StorefrontConfigTypes, SwellJsonFields, ThemeConfigPaths, ThemeConfigTypes, appAssetImage, appConfigFromFile, batchAppFilesByType, deleteFile, filePathExists, findAppConfig, getAppSlugId, getConfigTypeFromPath, getConfigTypeKeyFromValue, getFrontendProjectType, hashFile, hashString, writeFile, writeJsonFile, };
 export { AppConfig, FunctionProcessingError, IgnoringFileError, } from './app-config.js';
 export { allBaseFilesInDir, allConfigDirsPaths, allConfigFilesInDir, allConfigFilesPaths, allConfigFilesPathsByType, getAllConfigPaths, globAllFilesByPath, isPathDirectory, } from './paths.js';

package/dist/lib/apps/index.js

@@ -1,4 +1,4 @@
-import { hash as blake3hash } from 'blake3-wasm';
+import { createHash as createBlake3Hash } from 'blake3-wasm';
 import { pluralize, titleize } from 'inflection';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
@@ -184,14 +184,18 @@ async function writeJsonFile(file, data = {}) {
     return writeFile(file, `${JSON.stringify(data, null, 2)}\n`);
 }
 // Hash method adapted from wrangler-sdk
-function hashFile(filePath, fileContents) {
+function hashFile(filePath, fileContents, relativePath) {
     const contents = fileContents ?? fs.readFileSync(filePath);
-    const base64Contents = contents.toString('base64');
-    const extension = path.extname(filePath).slice(1);
-    return hashString(base64Contents + extension);
+    // Include relative file path because we typically cache by hash including file metadata
+    // This allows de-duplication of cache entries for the same file contents
+    return hashString(contents, relativePath || '');
 }
-function hashString(contents) {
-    return blake3hash(contents).toString('hex').slice(0, 32);
+function hashString(...contents) {
+    const hash = createBlake3Hash();
+    for (const content of contents) {
+        hash.update(content);
+    }
+    return hash.digest('hex', { length: 16 });
 }
 function appAssetImage(appPath, fileName) {
     const assetsDirPath = path.join(appPath, ConfigPaths['ASSET']);
@@ -227,28 +231,26 @@ function findAppConfig(app, filePath, configType) {
 /**
  * Get files to push in batches prioritized by dependencies
  *
- * @param configs - List of app configs
- * @returns {Array} Batches of files to push
+ * @param {AppConfig[]} configs - List of app configs
+ * @returns {BatchAppFiles[]} Batches of files to push
  */
 function batchAppFilesByType(configs) {
     const modelsWithExtends = configs.filter((config) => config.type === 'model' && config.values.extends);
     const modelsWithoutExtends = configs.filter((config) => config.type === 'model' && !config.values.extends);
     const contentTypesWithCollection = configs.filter((config) => config.type === 'content' && config.values.collection);
     const contentTypesWithoutCollection = configs.filter((config) => config.type === 'content' && !config.values.collection);
-    const prioritized = [
+    const prioritized = new Set([
         ...modelsWithExtends,
         ...modelsWithoutExtends,
         ...contentTypesWithCollection,
         ...contentTypesWithoutCollection,
-    ];
+    ]);
     const sorted = [
-        ...prioritized,
-        ...configs.filter((config) => !prioritized.includes(config)),
+        ...prioritized.values(),
+        ...configs.filter((config) => !prioritized.has(config)),
     ];
     const batches = [];
-    // eslint-disable-next-line guard-for-in
-    for (const type in ConfigTypeBatchOrder) {
-        const configType = ConfigTypeBatchOrder[type];
+    for (const configType of ConfigTypeBatchOrder) {
         const configsByType = sorted.filter((config) => config.type === configType);
         const label = configType === ConfigType.FILE ? 'App files' : titleize(configType);
         const concurrency = configType === ConfigType.NOTIFICATION || configType === ConfigType.ASSET

package/dist/push-app-command.js

@@ -375,7 +375,7 @@ export class PushAppCommand extends RemoteAppCommand {
             const packageHash = localConfigs.find((config) => config.filePath === 'package.json')?.hash;
             frontendHashes += `|${packageHash}`;
         }
-        return frontendHashes?.length > 0 ? hashString(frontendHashes) : undefined;
+        return frontendHashes.length > 0 ? hashString(frontendHashes) : undefined;
     }
     getFrontendProjectType(required = true) {
         this.frontendPath = path.join(this.appPath, 'frontend');

package/dist/remote-app-command.d.ts

@@ -11,6 +11,7 @@ export declare abstract class RemoteAppCommand extends AppCommand {
     appCreated: boolean;
     appType: string;
     storefront?: any;
+    storefrontLocalUrl?: string;
     themeSyncApp?: boolean;
     appFrontendUrl(storeId: string, installedAppId: string): string;
     cleanRemoteConfigs(remoteConfigs: AppConfig[], deleteDeprecated?: boolean): Promise<AppConfig[]>;

package/dist/remote-app-command.js

@@ -26,6 +26,8 @@ export class RemoteAppCommand extends AppCommand {
     appType = 'any';
     // API instance of the target storefront, if applicable
     storefront = null;
+    // Indicates we are syncing with a local app frontend via proxy
+    storefrontLocalUrl = '';
     // Indicates app configs are being synced along with theme configs
     themeSyncApp = false;
     appFrontendUrl(storeId, installedAppId) {
@@ -334,6 +336,9 @@ export class RemoteAppCommand extends AppCommand {
                 ...configJson,
                 ...(themeId ? { theme_id: themeId } : undefined),
                 ...(this.themeSyncApp ? { $sync_app: true } : undefined),
+                ...(this.storefrontLocalUrl
+                    ? { $storefront_local_url: this.storefrontLocalUrl }
+                    : undefined),
             },
         });
     }
@@ -352,7 +357,7 @@ export class RemoteAppCommand extends AppCommand {
                 try {
                     const localConfig = localBatchConfigs.find((config) => config.filePath === batchConfig.filePath);
                     if (localConfig) {
-                        const hash = hashFile(batchConfig.appPath);
+                        const hash = hashFile(batchConfig.appPath, undefined, batchConfig.filePath);
                         if (hash === batchConfig.hash) {
                             return false;
                         }
@@ -374,9 +379,8 @@ export class RemoteAppCommand extends AppCommand {
             }
             if (pullFiles.length > 0) {
                 while (pullFiles.length > 0) {
-                    await Promise.all(pullFiles
-                        .splice(0, PUSH_CONCURRENCY)
-                        .map(async (config) => {
+                    // eslint-disable-next-line no-await-in-loop
+                    await Promise.all(pullFiles.splice(0, PUSH_CONCURRENCY).map(async (config) => {
                         await this.pullRemoteFile(config);
                         pulled.push(config.id);
                     }));
@@ -388,6 +392,7 @@ export class RemoteAppCommand extends AppCommand {
                     const removeList = filesToRemove
                         .map((config) => config.filePath)
                         .join('\n');
+                    // eslint-disable-next-line no-await-in-loop
                     const confirmed = await confirm({
                         default: false,
                         message: `The following files are not in the remote app:\n\n${removeList}\n\nDo you want to delete these files locally?`,
@@ -397,6 +402,7 @@ export class RemoteAppCommand extends AppCommand {
                     }
                 }
                 while (filesToRemove.length > 0) {
+                    // eslint-disable-next-line no-await-in-loop
                     await Promise.all(filesToRemove.splice(0, PUSH_CONCURRENCY).map(async (config) => {
                         await this.removeLocalFile(config);
                         removed.push(config.id);
@@ -474,10 +480,9 @@ export class RemoteAppCommand extends AppCommand {
                 this.log(`${style.appConfigName(`${batch.label} ${updatedLog}`)}`);
             }
             if (pushFiles.length > 0) {
-                while (pushFiles.length) {
-                    await Promise.all(pushFiles
-                        .splice(0, batch.concurrency)
-                        .map(async (config) => {
+                while (pushFiles.length > 0) {
+                    // eslint-disable-next-line no-await-in-loop
+                    await Promise.all(pushFiles.splice(0, batch.concurrency).map(async (config) => {
                         const pushedConfig = await this.pushRemoteFile(config);
                         if (pushedConfig) {
                             pushed.push(pushedConfig.id);
@@ -490,7 +495,8 @@ export class RemoteAppCommand extends AppCommand {
             }
             // Remove any deleted files
             if (filesToRemove.length > 0) {
-                while (filesToRemove.length) {
+                while (filesToRemove.length > 0) {
+                    // eslint-disable-next-line no-await-in-loop
                     await Promise.all(filesToRemove.splice(0, batch.concurrency).map(async (config) => {
                         await this.removeRemoteFile(config);
                         removed.push(config.id);

package/oclif.manifest.json

@@ -1473,6 +1473,12 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "force": {
+          "description": "force push all configurations",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "local": {
           "description": "connect to a running local storefront app dev server",
           "name": "local",
@@ -1835,5 +1841,5 @@
       ]
     }
   },
-  "version": "2.0.8"
+  "version": "2.0.10"
 }

package/package.json

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