@swell/cli 2.9.4 → 2.9.6

package/dist/remote-app-command.js

@@ -5,7 +5,7 @@ import * as path from 'node:path';
 import { default as ora } from 'ora';
 import { AppCommand } from './app-command.js';
 import { readRcFile, writeRcFile } from './lib/app-config.js';
-import { AppConfig, FunctionProcessingError, IgnoringFileError, SwellJsonFields, allBaseFilesInDir, allConfigFilesPaths, appConfigFromFile, batchAppFilesByType, deleteFile, hashFile, writeFile, writeJsonFile, PUSH_CONCURRENCY, } from './lib/apps/index.js';
+import { AppConfig, ConfigType, FunctionProcessingError, IgnoringFileError, SwellJsonFields, allBaseFilesInDir, allConfigFilesPaths, appConfigFromFile, batchAppFilesByType, deleteFile, hashFile, writeFile, writeJsonFile, PUSH_CONCURRENCY, } from './lib/apps/index.js';
 import { default as localConfig } from './lib/config.js';
 import { getAppFrontendHost, getLocalFrontendHost, getLoginHost, getStorefrontFrontendHost, } from './lib/constants.js';
 import { toAppId } from './lib/create/index.js';
@@ -78,20 +78,21 @@ export class RemoteAppCommand extends AppCommand {
                 },
             });
             // Instantiate AppConfig for each object
-            app.configs = (configs.results || []).map((config) => AppConfig.create({
+            app.configs = await Promise.all((configs.results || []).map((config) => AppConfig.create({
                 ...config,
                 appPath: this.appPath,
-            }));
+            })));
             // Pull app configs to compare with theme for push/pull
             if (themeId && this.themeSyncApp) {
                 const appConfigs = await this.api.get({ adminPath: `/apps/${id}/configs` }, { query: { limit: 1000 } });
+                const promises = [];
                 for (const appConfig of appConfigs.results || []) {
                     const themeConfig = app.configs.find((config) => config.filePath === appConfig.file_path);
                     if (themeConfig && themeConfig.fileHash !== appConfig.hash) {
                         themeConfig.hash = appConfig.hash;
                     }
                     else if (!themeConfig && appConfig) {
-                        app.configs.push(AppConfig.create({
+                        promises.push(AppConfig.create({
                             ...appConfig,
                             appConfigId: appConfig.id,
                             appPath: this.appPath,
@@ -99,6 +100,10 @@ export class RemoteAppCommand extends AppCommand {
                         }));
                     }
                 }
+                if (promises.length > 0) {
+                    const list = await Promise.all(promises);
+                    app.configs.push(...list);
+                }
                 for (const themeConfig of app.configs) {
                     const appConfig = appConfigs.results.find((config) => themeConfig.filePath === config.file_path);
                     if (!appConfig) {
@@ -178,7 +183,7 @@ export class RemoteAppCommand extends AppCommand {
                 throw error;
             }
         }
-        if (!this.swellConfig.store.id) {
+        if (!this.swellConfig.store?.id) {
             throw new Error('App swell.json is missing or `id` is not defined.');
         }
         const body = {
@@ -244,17 +249,15 @@ export class RemoteAppCommand extends AppCommand {
         // check if app is already installed on store
         return this.api.get({ adminPath: `/client/apps/${this.app.id}` }, {});
     }
-    getLocalAppConfigs() {
-        const localConfigs = [];
+    async getLocalAppConfigs() {
+        const promises = [];
         for (const { configFile, configType } of allConfigFilesPaths(this.appPath)) {
-            const config = appConfigFromFile(configFile, configType, this.appPath);
-            localConfigs.push(config);
+            promises.push(appConfigFromFile(configFile, configType, this.appPath));
         }
         for (const filePath of allBaseFilesInDir(this.appPath)) {
-            const config = appConfigFromFile(filePath, 'file', this.appPath);
-            localConfigs.push(config);
+            promises.push(appConfigFromFile(filePath, ConfigType.FILE, this.appPath));
         }
-        return localConfigs;
+        return Promise.all(promises);
     }
     async getVersion(version) {
         const versionsResponse = await this.api.get({ adminPath: `/apps/${this.app.id}/versions` }, {
@@ -289,8 +292,11 @@ export class RemoteAppCommand extends AppCommand {
             try {
                 jsonError = JSON.parse(error.message);
             }
-            catch {
-                // noop, likely JSON parse error
+            catch (error) {
+                // Skip JSON parse error
+                if (!(error instanceof SyntaxError)) {
+                    throw error;
+                }
             }
             if (!showedErrors) {
                 if (jsonError && jsonError.error) {
@@ -312,8 +318,8 @@ export class RemoteAppCommand extends AppCommand {
             await this.logOrientation();
         }
     }
-    async installApp(version, spinner) {
-        return this.api.post({ adminPath: `/client/apps` }, {
+    installApp(version, spinner) {
+        return this.api.post({ adminPath: '/client/apps' }, {
             body: { app_id: this.app.id, version },
             onAsyncGetPath: (response) => ({
                 adminPath: `/client/app-async-status/${response.app_id}`,
@@ -352,8 +358,10 @@ export class RemoteAppCommand extends AppCommand {
     async pullAppConfigs(force, confirmRemove = true) {
         const pulled = [];
         const removed = [];
-        const localConfigs = this.getLocalAppConfigs();
-        const remoteConfigs = await this.cleanRemoteConfigs(await this.pullAppJsonAndRemoteConfigs(), false);
+        const [localConfigs, remoteConfigs] = await Promise.all([
+            this.getLocalAppConfigs(),
+            this.pullAppJsonAndRemoteConfigs().then((remoteConfigs) => this.cleanRemoteConfigs(remoteConfigs, false)),
+        ]);
         const batches = batchAppFilesByType(remoteConfigs);
         for (const batch of batches) {
             const remoteBatchConfigs = remoteConfigs.filter((config) => config.type === batch.type);
@@ -364,13 +372,15 @@ export class RemoteAppCommand extends AppCommand {
                 try {
                     const localConfig = localBatchConfigs.find((config) => config.filePath === batchConfig.filePath);
                     if (localConfig) {
-                        const hash = hashFile(batchConfig.appPath, undefined, batchConfig.filePath);
+                        const hash = hashFile(batchConfig.appPath, localConfig.fileData, batchConfig.filePath);
                         if (hash === batchConfig.hash) {
                             return false;
                         }
                     }
                 }
-                catch { }
+                catch {
+                    // TODO: Ignore only some errors
+                }
                 return true;
             });
             const filesToRemove = localBatchConfigs.filter((config) => !batch.configs.some((batchConfig) => batchConfig.filePath === config.filePath));
@@ -439,7 +449,7 @@ export class RemoteAppCommand extends AppCommand {
             swellConfigJson.id = toAppId(this.app.private_id);
             await writeJsonFile(path.join(this.appPath, 'swell.json'), swellConfigJson);
         }
-        const swellConfig = appConfigFromFile('swell.json', 'file', this.appPath);
+        const swellConfig = await appConfigFromFile('swell.json', ConfigType.FILE, this.appPath);
         swellConfig.id = swellJson?.id;
         return [swellConfig, ...allOtherConfigs];
     }
@@ -460,8 +470,10 @@ export class RemoteAppCommand extends AppCommand {
     async pushAppConfigs(force) {
         const pushed = [];
         const removed = [];
-        const localConfigs = this.getLocalAppConfigs();
-        const remoteConfigs = await this.cleanRemoteConfigs(this.app?.configs || []);
+        const [localConfigs, remoteConfigs] = await Promise.all([
+            this.getLocalAppConfigs(),
+            this.cleanRemoteConfigs(this.app?.configs || []),
+        ]);
         // Do not allow more than 10K files
         if (localConfigs.length > 10000) {
             this.error(`Apps only support up to 10,000 files. Found ${localConfigs.length} files.`);
@@ -470,8 +482,10 @@ export class RemoteAppCommand extends AppCommand {
         for (const batch of batches) {
             const remoteBatchConfigs = remoteConfigs.filter((config) => config.type === batch.type);
             const pushFiles = batch.configs.filter((batchConfig) => {
+                if (force)
+                    return true;
                 const remoteConfig = remoteBatchConfigs.find((config) => batchConfig.filePath === config.filePath);
-                return Boolean(force || !remoteConfig || remoteConfig.hash !== batchConfig.hash);
+                return Boolean(!remoteConfig || remoteConfig.hash !== batchConfig.hash);
             });
             const filesToRemove = remoteBatchConfigs.filter((config) => !batch.configs.some((batchConfig) => batchConfig.filePath === config.filePath));
             // Skip if there are no config changes
@@ -538,7 +552,7 @@ export class RemoteAppCommand extends AppCommand {
             }
             if (error instanceof FunctionProcessingError) {
                 log &&
-                    spinner.fail(`${error.message} ${error.originalError?.message?.toLowerCase()}`);
+                    spinner.fail(`${error.message} ${error.cause?.message?.toLowerCase()}`);
                 return;
             }
             log && spinner.fail(error.message);

package/dist/swell-api-command.d.ts

@@ -1,3 +1,4 @@
+import type Api from './types/index.js';
 import { HttpMethod } from './lib/api.js';
 import { SwellCommand } from './swell-command.js';
 export declare const headerFlag: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;

package/dist/swell-api-command.js

@@ -1,6 +1,6 @@
 import { Flags } from '@oclif/core';
-import * as fs from 'node:fs';
-import path from 'node:path';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
 import { FetchError } from 'node-fetch';
 import { HttpMethod } from './lib/api.js';
 import { resolveAppId } from './lib/apps/resolve.js';
@@ -168,7 +168,7 @@ export class SwellApiCommand extends SwellCommand {
             return;
         }
         const bodyData = this.isFilePath(body)
-            ? await fs.promises.readFile(path.resolve(body), 'utf8')
+            ? await fs.readFile(path.resolve(body), 'utf8')
             : body;
         return JSON.parse(bodyData);
     }

package/dist/types/index.d.ts

@@ -0,0 +1,94 @@
+/**
+ * @fileoverview Type definitions for the application.
+ */
+import type { default as Conf } from 'conf';
+declare namespace Api {
+    export interface AuthenticationHeaders {
+        publicKey?: string;
+        secretKey?: string;
+        sessionId?: string;
+    }
+    /**
+     * The paths to the API endpoints. Typically a Command will define the
+     * path to the API endpoint it needs.
+     */
+    export interface Paths {
+        adminPath?: string;
+        backendPath?: string;
+        frontendPath?: string;
+    }
+    type RequestInit = import('node-fetch').RequestInit;
+    /**
+     * The options to pass to our generic API request function. This extends
+     * the built-in fetch RequestInit interface.
+     */
+    export interface RequestOptions extends RequestInit {
+        body?: any;
+        headers?: Record<string, string>;
+        onAsyncGetPath?: (response: any) => Paths;
+        query?: any;
+        sessionId?: string;
+        spinner?: any;
+        rawResponse?: boolean;
+    }
+    export {};
+}
+export default Api;
+/**
+ * The configuration of an app as defined by the developer.
+ */
+export interface LocalApp extends Conf<App> {
+    swDirPath: string;
+}
+export interface AppCommandOrientation {
+    env?: string;
+    storeId?: string;
+}
+/**
+ * A log item as defined by the Swell API.
+ */
+export interface LogItem {
+    app: string;
+    data: string;
+    date: string;
+    env: string;
+    ip: string;
+    req: string;
+    request: string;
+    status: string;
+    time: string;
+    type: string;
+}
+export interface Store {
+    name: string;
+    email: string;
+    sessionId: string;
+    storeId: string;
+}
+export interface User {
+    email: string;
+    name: string;
+}
+export interface UserAuthorization {
+    client_id: string;
+    client_name: string;
+}
+export interface App {
+    id: string;
+    name: string;
+    type: string;
+    private_id: string;
+    public_id?: string;
+}
+export interface Model {
+    name: string;
+    namespace?: string;
+    app_id?: string;
+    deprecated?: boolean;
+    fields: {
+        [key: string]: {
+            name: string;
+            type: string;
+        };
+    };
+}

package/dist/types/index.js

@@ -0,0 +1,4 @@
+/**
+ * @fileoverview Type definitions for the application.
+ */
+export {};

package/oclif.manifest.json

@@ -3556,5 +3556,5 @@
       ]
     }
   },
-  "version": "2.9.4"
+  "version": "2.9.6"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.9.4",
+  "version": "2.9.6",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [
@@ -32,7 +32,7 @@
     "@oclif/errors": "1.3.6",
     "@oclif/plugin-help": "6.0.4",
     "@oclif/plugin-plugins": "3.9.4",
-    "ajv": "8.17.1",
+    "ajv": "8.20.0",
     "ajv-errors": "3.0.0",
     "ajv-formats": "3.0.1",
     "blake3-wasm": "2.1.5",
@@ -83,7 +83,7 @@
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-prettier": "5.0.1",
     "eslint-plugin-unicorn": "48.0.1",
-    "mocha": "10.2.0",
+    "mocha": "11.7.6",
     "nock": "13.3.6",
     "oclif": "4.0.3",
     "shx": "0.3.4",