@knocklabs/cli 1.0.2 → 1.0.4

package/dist/commands/audience/push.js

@@ -112,6 +112,10 @@ class AudiencePush extends _basecommand.default {
                     commit: flags.commit,
                     commit_message: flags["commit-message"],
                     audience: audience.content
+                }, {
+                    query: flags.force ? {
+                        force: true
+                    } : undefined
                 });
                 // Update the audience directory with the successfully pushed audience
                 // payload from the server.
@@ -158,7 +162,8 @@ _define_property(AudiencePush, "flags", {
         dependsOn: [
             "commit"
         ]
-    })
+    }),
+    force: _flag.force
 });
 _define_property(AudiencePush, "args", {
     audienceKey: _core.Args.string({

package/dist/commands/guide/push.js

@@ -162,7 +162,8 @@ _define_property(GuidePush, "flags", {
         dependsOn: [
             "commit"
         ]
-    })
+    }),
+    force: _flag.force
 });
 _define_property(GuidePush, "args", {
     guideKey: _core.Args.string({

package/dist/commands/layout/push.js

@@ -168,7 +168,8 @@ _define_property(EmailLayoutPush, "flags", {
         dependsOn: [
             "commit"
         ]
-    })
+    }),
+    force: _flag.force
 });
 _define_property(EmailLayoutPush, "args", {
     emailLayoutKey: _core.Args.string({

package/dist/commands/message-type/push.js

@@ -165,7 +165,8 @@ _define_property(MessageTypePush, "flags", {
         dependsOn: [
             "commit"
         ]
-    })
+    }),
+    force: _flag.force
 });
 _define_property(MessageTypePush, "args", {
     messageTypeKey: _core.Args.string({

package/dist/commands/partial/push.js

@@ -165,7 +165,8 @@ _define_property(PartialPush, "flags", {
         dependsOn: [
             "commit"
         ]
-    })
+    }),
+    force: _flag.force
 });
 _define_property(PartialPush, "args", {
     partialKey: _core.Args.string({

package/dist/commands/push.js

@@ -112,6 +112,9 @@ class Push extends _basecommand.default {
             ...flags["commit-message"] ? [
                 "--commit-message",
                 flags["commit-message"]
+            ] : [],
+            ...flags.force ? [
+                "--force"
             ] : []
         ];
         // Note: Because we're pushing the different resource types sequentially,
@@ -147,7 +150,8 @@ _define_property(Push, "flags", {
         dependsOn: [
             "commit"
         ]
-    })
+    }),
+    force: _flag.force
 });
 const runResourcePushCommand = async (resourceType, targetDirCtx, args)=>{
     const subdirPath = _nodepath.resolve(targetDirCtx.abspath, _resources.RESOURCE_SUBDIRS[resourceType]);

package/dist/commands/translation/push.js

@@ -153,7 +153,8 @@ _define_property(TranslationPush, "flags", {
         dependsOn: [
             "commit"
         ]
-    })
+    }),
+    force: _flag.force
 });
 _define_property(TranslationPush, "args", {
     translationRef: _core.Args.string({

package/dist/commands/workflow/push.js

@@ -162,7 +162,8 @@ _define_property(WorkflowPush, "flags", {
         dependsOn: [
             "commit"
         ]
-    })
+    }),
+    force: _flag.force
 });
 _define_property(WorkflowPush, "args", {
     workflowKey: _core.Args.string({

package/dist/lib/api-v1.js

@@ -73,7 +73,8 @@ class ApiV1 {
             branch: flags.branch,
             annotate: flags.annotate,
             commit: flags.commit,
-            commit_message: flags["commit-message"]
+            commit_message: flags["commit-message"],
+            force: flags.force
         });
         const data = {
             workflow
@@ -187,7 +188,8 @@ class ApiV1 {
             branch: flags.branch,
             commit: flags.commit,
             commit_message: flags["commit-message"],
-            namespace: translation.namespace
+            namespace: translation.namespace,
+            force: flags.force
         });
         return this.put(`/translations/${translation.locale_code}`, {
             translation
@@ -238,7 +240,8 @@ class ApiV1 {
             branch: flags.branch,
             annotate: flags.annotate,
             commit: flags.commit,
-            commit_message: flags["commit-message"]
+            commit_message: flags["commit-message"],
+            force: flags.force
         });
         const data = {
             email_layout: layout
@@ -289,7 +292,8 @@ class ApiV1 {
             branch: flags.branch,
             annotate: flags.annotate,
             commit: flags.commit,
-            commit_message: flags["commit-message"]
+            commit_message: flags["commit-message"],
+            force: flags.force
         });
         const data = {
             partial
@@ -347,7 +351,8 @@ class ApiV1 {
             branch: flags.branch,
             annotate: flags.annotate,
             commit: flags.commit,
-            commit_message: flags["commit-message"]
+            commit_message: flags["commit-message"],
+            force: flags.force
         });
         const data = {
             message_type: messageType
@@ -411,7 +416,8 @@ class ApiV1 {
             branch: flags.branch,
             annotate: flags.annotate,
             commit: flags.commit,
-            commit_message: flags["commit-message"]
+            commit_message: flags["commit-message"],
+            force: flags.force
         });
         const data = {
             guide

package/dist/lib/helpers/flag.js

@@ -21,6 +21,9 @@ _export(exports, {
     get filePath () {
         return filePath;
     },
+    get force () {
+        return force;
+    },
     get jsonStr () {
         return jsonStr;
     },
@@ -152,3 +155,6 @@ const branch = slug({
     // Using lodash's once avoids unnecessarily reading the branch file multiple times.
     default: (0, _lodash.once)(_branch.readSlugFromBranchFile)
 });
+const force = _core.Flags.boolean({
+    summary: "Force pushes the resource or resources to Knock, overwriting whatever is currently stored. " + "If you're using this on a non-development environment, you should also ensure you `commit` the changes."
+});

package/dist/lib/helpers/json.js

@@ -22,7 +22,7 @@ _export(exports, {
         return tryJsonParse;
     }
 });
-const _jsonlint = /*#__PURE__*/ _interop_require_wildcard(require("@prantlf/jsonlint"));
+const _jsonlint = /*#__PURE__*/ _interop_require_wildcard(require("@knocklabs/jsonlint"));
 const _fsextra = /*#__PURE__*/ _interop_require_wildcard(require("fs-extra"));
 const _error = require("./error");
 function _getRequireWildcardCache(nodeInterop) {
@@ -73,7 +73,7 @@ const parseJson = (json)=>{
     try {
         payload = _jsonlint.parse(json);
     } catch (error) {
-        // https://github.com/prantlf/jsonlint#error-handling
+        // https://github.com/knocklabs/repackage/tree/main/packages/jsonlint
         if (!(error instanceof SyntaxError)) throw error;
         errors.push(new _error.JsonSyntaxError(error.message));
     }

package/dist/lib/marshal/translation/helpers.js

@@ -103,7 +103,8 @@ const formatLanguage = (translation)=>{
 const isValidLocale = (localeCode)=>Boolean(_localecodes.default.getByTag(localeCode));
 const isTranslationDir = (dirPath)=>{
     const locale = _nodepath.basename(dirPath);
-    return isValidLocale(locale);
+    const parentDirName = _nodepath.basename(_nodepath.dirname(dirPath));
+    return parentDirName === "translations" && isValidLocale(locale);
 };
 const buildTranslationFileCtx = async (dirPath, translationIdentifier, options)=>{
     const ref = (0, _processorisomorphic.formatRef)(translationIdentifier.localeCode, translationIdentifier.namespace);

package/dist/lib/marshal/translation/reader.js

@@ -170,7 +170,7 @@ const readAllForCommandTarget = async (target)=>{
                 const dirents = await _fsextra.readdir(targetCtx.abspath, {
                     withFileTypes: true
                 });
-                const translationDirPaths = dirents.filter((dirent)=>dirent.isDirectory() && (0, _helpers.isTranslationDir)(dirent.name)).map((dirent)=>_nodepath.resolve(targetCtx.abspath, dirent.name));
+                const translationDirPaths = dirents.filter((dirent)=>dirent.isDirectory() && (0, _helpers.isValidLocale)(dirent.name)).map((dirent)=>_nodepath.resolve(targetCtx.abspath, dirent.name));
                 const translationFilePaths = (await Promise.all(translationDirPaths.map(async (abspath)=>(0, _helpers.lsTranslationDir)(abspath)))).flat();
                 return readTranslationFiles(translationFilePaths);
             }

package/dist/lib/run-context/loader.js

@@ -85,9 +85,6 @@ const evaluateRecursively = async (ctx, currDir)=>{
         } else if (await _messagetype.isMessageTypeDir(currDir)) {
             ctx.resourceDir = buildResourceDirContext("message_type", currDir);
         } else if (_translation.isTranslationDir(currDir)) {
-            // NOTE: Must keep this check as last in the order of directory-type checks
-            // since the `isTranslationDir` only checks that the directory name is a
-            // valid locale name.
             ctx.resourceDir = buildResourceDirContext("translation", currDir);
         }
     }

package/oclif.manifest.json

@@ -289,6 +289,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "force": {
+          "name": "force",
+          "summary": "Force pushes the resource or resources to Knock, overwriting whatever is currently stored. If you're using this on a non-development environment, you should also ensure you `commit` the changes.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -901,6 +907,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "force": {
+          "name": "force",
+          "summary": "Force pushes the resource or resources to Knock, overwriting whatever is currently stored. If you're using this on a non-development environment, you should also ensure you `commit` the changes.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -1318,6 +1330,98 @@
         "switch.js"
       ]
     },
+    "channel:list": {
+      "aliases": [],
+      "args": {},
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "service-token": {
+          "env": "KNOCK_SERVICE_TOKEN",
+          "name": "service-token",
+          "required": false,
+          "summary": "The service token to authenticate with.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "api-origin": {
+          "hidden": true,
+          "name": "api-origin",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "channel:list",
+      "pluginAlias": "@knocklabs/cli",
+      "pluginName": "@knocklabs/cli",
+      "pluginType": "core",
+      "strict": true,
+      "summary": "Display all channels configured for the account.",
+      "enableJsonFlag": true,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "channel",
+        "list.js"
+      ]
+    },
+    "environment:list": {
+      "aliases": [],
+      "args": {},
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "service-token": {
+          "env": "KNOCK_SERVICE_TOKEN",
+          "name": "service-token",
+          "required": false,
+          "summary": "The service token to authenticate with.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "api-origin": {
+          "hidden": true,
+          "name": "api-origin",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "environment:list",
+      "pluginAlias": "@knocklabs/cli",
+      "pluginName": "@knocklabs/cli",
+      "pluginType": "core",
+      "strict": true,
+      "summary": "Display all environments configured for the account.",
+      "enableJsonFlag": true,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "environment",
+        "list.js"
+      ]
+    },
     "commit:get": {
       "aliases": [],
       "args": {
@@ -1609,98 +1713,6 @@
         "promote.js"
       ]
     },
-    "channel:list": {
-      "aliases": [],
-      "args": {},
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "service-token": {
-          "env": "KNOCK_SERVICE_TOKEN",
-          "name": "service-token",
-          "required": false,
-          "summary": "The service token to authenticate with.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "api-origin": {
-          "hidden": true,
-          "name": "api-origin",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "channel:list",
-      "pluginAlias": "@knocklabs/cli",
-      "pluginName": "@knocklabs/cli",
-      "pluginType": "core",
-      "strict": true,
-      "summary": "Display all channels configured for the account.",
-      "enableJsonFlag": true,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "channel",
-        "list.js"
-      ]
-    },
-    "environment:list": {
-      "aliases": [],
-      "args": {},
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "service-token": {
-          "env": "KNOCK_SERVICE_TOKEN",
-          "name": "service-token",
-          "required": false,
-          "summary": "The service token to authenticate with.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "api-origin": {
-          "hidden": true,
-          "name": "api-origin",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "environment:list",
-      "pluginAlias": "@knocklabs/cli",
-      "pluginName": "@knocklabs/cli",
-      "pluginType": "core",
-      "strict": true,
-      "summary": "Display all environments configured for the account.",
-      "enableJsonFlag": true,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "environment",
-        "list.js"
-      ]
-    },
     "guide:activate": {
       "aliases": [],
       "args": {
@@ -2342,6 +2354,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "force": {
+          "name": "force",
+          "summary": "Force pushes the resource or resources to Knock, overwriting whatever is currently stored. If you're using this on a non-development environment, you should also ensure you `commit` the changes.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -2914,6 +2932,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "force": {
+          "name": "force",
+          "summary": "Force pushes the resource or resources to Knock, overwriting whatever is currently stored. If you're using this on a non-development environment, you should also ensure you `commit` the changes.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -3486,6 +3510,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "force": {
+          "name": "force",
+          "summary": "Force pushes the resource or resources to Knock, overwriting whatever is currently stored. If you're using this on a non-development environment, you should also ensure you `commit` the changes.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -4069,6 +4099,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "force": {
+          "name": "force",
+          "summary": "Force pushes the resource or resources to Knock, overwriting whatever is currently stored. If you're using this on a non-development environment, you should also ensure you `commit` the changes.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -4519,6 +4555,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "force": {
+          "name": "force",
+          "summary": "Force pushes the resource or resources to Knock, overwriting whatever is currently stored. If you're using this on a non-development environment, you should also ensure you `commit` the changes.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -5237,6 +5279,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "force": {
+          "name": "force",
+          "summary": "Force pushes the resource or resources to Knock, overwriting whatever is currently stored. If you're using this on a non-development environment, you should also ensure you `commit` the changes.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -5423,5 +5471,5 @@
       ]
     }
   },
-  "version": "1.0.2"
+  "version": "1.0.4"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knocklabs/cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Knock CLI",
   "author": "@knocklabs",
   "bin": {
@@ -16,12 +16,15 @@
     "/npm-shrinkwrap.json",
     "/oclif.manifest.json"
   ],
+  "resolutions": {
+    "axios": "1.14.0"
+  },
   "dependencies": {
+    "@knocklabs/jsonlint": "^2.0.0",
     "@knocklabs/mgmt": "0.21.0",
     "@oclif/core": "^3",
     "@oclif/plugin-help": "^6",
-    "@prantlf/jsonlint": "^14.1.0",
-    "axios": "^1.13.5",
+    "axios": "1.14.0",
     "date-fns": "^2.30.0",
     "degit": "^2.8.4",
     "enquirer": "^2.4.1",
@@ -37,13 +40,13 @@
   "devDependencies": {
     "@oclif/test": "^3",
     "@swc/cli": "^0.8.0",
-    "@swc/core": "^1.15.11",
+    "@swc/core": "^1.15.18",
     "@swc/helpers": "^0.5.18",
     "@types/chai": "^4",
     "@types/degit": "^2.8.6",
     "@types/fs-extra": "^11.0.4",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.19.33",
+    "@types/node": "^20.19.37",
     "chai": "^4",
     "eslint": "^7.32.0",
     "eslint-config-oclif": "^4",