@swell/cli 2.9.0 → 2.9.2

package/dist/lib/apps/index.js

@@ -354,8 +354,11 @@ export function appAssetImage(appPath, fileName) {
         }
     }
 }
+function getNameFromFilePath(filePath) {
+    return path.parse(filePath).name.replaceAll('_', '-');
+}
 export function appConfigFromFile(filePath, configType, appPath) {
-    const { name } = path.parse(filePath);
+    const name = getNameFromFilePath(filePath);
     // Notification basenames must not contain dots: the inspect identifier
     // grammar (app.<slug>.<model>.<name>) splits on '.', so a dotted name
     // would silently misparse on lookup.
@@ -376,7 +379,7 @@ export function appConfigFromFile(filePath, configType, appPath) {
     return config;
 }
 export function findAppConfig(app, filePath, configType) {
-    const { name } = path.parse(filePath);
+    const name = getNameFromFilePath(filePath);
     const config = app?.configs?.find((c) => c && c.type === configType && c.name === name);
     return config;
 }

package/dist/lib/swell-function-wrapper.d.ts

@@ -167,6 +167,7 @@ declare class SwellError extends Error {
     status: any;
     body: any;
     code: any;
+    retry: any;
     get isRetryable(): boolean;
 }
 /**

package/dist/lib/swell-function-wrapper.js

@@ -26,7 +26,11 @@ async function request(originalRequest, _env, context) {
     catch (error) {
         // Log the error for Swell
         console.error(error);
-        response = new SwellResponse({ error: error.message }, { status: error.status || 500 });
+        const errorBody = {
+            ...(error.body ?? { error: error.message }),
+            retry: error.retry === false ? false : undefined,
+        };
+        response = new SwellResponse(errorBody, { status: error.status || 500 });
     }
     return SwellResponse._respond(req, response, context);
 }
@@ -392,6 +396,7 @@ class SwellError extends Error {
         this.status = options.status || 500;
         this.body = body;
         this.code = options.code || body?.error?.code;
+        this.retry = options.retry;
     }
     get isRetryable() {
         return RETRYABLE_CODES.has(this.code);

package/oclif.manifest.json

@@ -809,7 +809,7 @@
           "name": "versions"
         }
       },
-      "description": "The command shows the latest information about your app including the name,\ndescription, version, public ID, test store, and more. If the \u001b[35m\u001b[1mversions\u001b[22m\u001b[39m argument is passed,\nit will output all versions of the app instead.",
+      "description": "The command shows the latest information about your app including the name,\ndescription, version, public ID, test store, and more. If the versions argument is passed,\nit will output all versions of the app instead.",
       "examples": [
         {
           "command": "swell app info",
@@ -1108,7 +1108,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:\n\u001b[4massets/\u001b[24m\n\u001b[4mcontent/\u001b[24m\n\u001b[4mfrontend/\u001b[24m\n\u001b[4mcomponents/\u001b[24m\n\u001b[4mfunctions/\u001b[24m\n\u001b[4mmodels/\u001b[24m\n\u001b[4mnotifications/\u001b[24m\n\u001b[4msettings/\u001b[24m\n\u001b[4mtheme/\u001b[24m\n\u001b[4mwebhooks/\u001b[24m\n\u001b[4mfrontend/\u001b[24m",
+      "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",
@@ -1157,7 +1157,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:\n\u001b[4massets/\u001b[24m\n\u001b[4mcontent/\u001b[24m\n\u001b[4mfrontend/\u001b[24m\n\u001b[4mcomponents/\u001b[24m\n\u001b[4mfunctions/\u001b[24m\n\u001b[4mmodels/\u001b[24m\n\u001b[4mnotifications/\u001b[24m\n\u001b[4msettings/\u001b[24m\n\u001b[4mtheme/\u001b[24m\n\u001b[4mwebhooks/\u001b[24m",
+      "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",
@@ -3072,7 +3072,7 @@
           "name": "targetPath"
         }
       },
-      "description": "Pull all theme files, a specific file, or a specific configuration\ntype from a theme in your store's test environment to your local machine.\n\nIf APPID is not specified, you will be prompted with a list of themes to choose from.\n\nTheme file directories:\n\u001b[4massets/\u001b[24m\n\u001b[4mtheme/\u001b[24m",
+      "description": "Pull all theme files, a specific file, or a specific configuration\ntype from a theme in your store's test environment to your local machine.\n\nIf APPID is not specified, you will be prompted with a list of themes to choose from.\n\nTheme file directories:\nassets/\ntheme/",
       "examples": [
         "swell theme pull",
         "swell theme pull mytheme",
@@ -3143,7 +3143,7 @@
           "name": "file"
         }
       },
-      "description": "Push all theme files, a specific file, or a specific configuration\ntype to an theme in your store's test environment.\n\nIf the theme 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 theme 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\nTheme file directories:\n\u001b[4massets/\u001b[24m\n\u001b[4mtheme/\u001b[24m",
+      "description": "Push all theme files, a specific file, or a specific configuration\ntype to an theme in your store's test environment.\n\nIf the theme 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 theme 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\nTheme file directories:\nassets/\ntheme/",
       "examples": [
         "swell theme push",
         "swell theme push assets",
@@ -3378,5 +3378,5 @@
       ]
     }
   },
-  "version": "2.9.0"
+  "version": "2.9.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.9.0",
+  "version": "2.9.2",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [
@@ -116,7 +116,7 @@
     "lint": "eslint . --ext .ts --config .eslintrc",
     "postpack": "shx rm -f oclif.manifest.json",
     "posttest": "npm run lint",
-    "prepack": "npm run build && oclif manifest && oclif readme",
+    "prepack": "npm run build && oclif manifest && NODE_ENV=production oclif readme",
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
     "publish-alpha": "npm version prerelease --preid=alpha && npm publish --tag alpha"
   },