npm - @zuplo/cli - Versions diffs - 7.8.18 → 7.8.20 - Mend

@zuplo/cli 7.8.18 → 7.8.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (727) hide show

package/dist/cmds/delete.js CHANGED Viewed

@@ -2,16 +2,17 @@ import { captureEvent } from "../common/analytics/lib.js";
 import { authenticate } from "../common/middleware/authentication.js";
 import { confirmLinkedConfig } from "../common/middleware/confirm-linked-config.js";
 import { fetchAccount } from "../common/middleware/get-account-param.js";
+import { hasBranchFlag } from "../common/middleware/get-environment-param.js";
 import { fetchProject } from "../common/middleware/get-project-param.js";
 import { configure } from "../common/middleware/user-configuration.js";
 import { identify } from "../common/middleware/user-identification.js";
 import { deleteZup } from "../delete/handler.js";
 export default {
-    desc: "Deletes the Zuplo API by URL",
+    desc: "Deletes a deployed Zuplo environment by URL or branch name",
     command: "delete",
     builder: (yargs) => {
         return yargs
-            .usage("$0 delete --url <url> [options]")
+            .usage("$0 delete (--url <url> | --branch <branch>) [options]")
             .option("api-key", {
             type: "string",
             describe: "The API Key from Zuplo",
@@ -24,8 +25,7 @@ export default {
         })
             .option("branch", {
             type: "string",
-            describe: "The branch name to delete deployments for",
-            hidden: true,
+            describe: "The branch name of the environment to delete (the value passed to `zuplo deploy --branch`)",
         })
             .option("project", {
             type: "string",
@@ -45,7 +45,8 @@ export default {
         })
             .boolean("wait")
             .check((argv) => {
-            if (!argv.url && !argv.branch) {
+            const branch = hasBranchFlag(process.argv) ? argv.branch : undefined;
+            if (!argv.url && !branch) {
                 throw new Error("--url is required");
             }
             if (argv.url && argv.branch) {
@@ -58,6 +59,10 @@ export default {
                 "$0 delete --url https://my-api-dev-123abc.zuplo.app",
                 "Delete a deployed environment by its URL",
             ],
+            [
+                "$0 delete --branch my-feature",
+                "Delete the environment deployed from the my-feature branch",
+            ],
             [
                 "$0 delete --url https://my-api-dev-123abc.zuplo.app --wait",
                 "Delete an environment and wait until the deletion is complete",

package/dist/cmds/delete.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../src/cmds/delete.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAC;AACvE,OAAO,EAAa,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE5D,eAAe;IACb,IAAI,EAAE,~~8BAA8B~~;~~IACpC~~,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,CAAC,KAAW,EAAiB,EAAE;QACtC,OAAO,KAAK;aACT,KAAK,CAAC,~~iCAAiC~~,CAAC;~~aACxC~~,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,wBAAwB;YAClC,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,QAAQ;SAChB,CAAC;aACD,MAAM,CAAC,KAAK,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,oCAAoC;SAC/C,CAAC;aACD,MAAM,CAAC,QAAQ,EAAE;YAChB,IAAI,EAAE,QAAQ;YACd,QAAQ,~~EAAE~~,~~2CAA2C~~;~~YACrD~~,~~MAAM,EAAE,IAAI;SACb,~~CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,kBAAkB;SAC7B,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,kBAAkB;SAC7B,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,oDAAoD;SAC/D,CAAC;aACD,MAAM,CAAC,sBAAsB,EAAE;YAC9B,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,uDAAuD;SAClE,CAAC;aACD,OAAO,CAAC,MAAM,CAAC;aACf,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;~~YAEd~~,IAAI,CAAC,IAAI,CAAC,~~GAAG~~,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;~~gBAC9B~~,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACvC,CAAC;YACD,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;aACD,OAAO,CAAC;YACP;gBACE,qDAAqD;gBACrD,0CAA0C;aAC3C;YACD;gBACE,4DAA4D;gBAC5D,+DAA+D;aAChE;SACF,CAAC;aACD,UAAU,CAAC;YACV,YAAY;YACZ,SAAS;YACT,mBAAmB;YACnB,YAAY;YACZ,YAAY;YACZ,QAAQ;SACT,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAa,EAAE,EAAE;QAC/B,MAAM,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QACpD,MAAM,SAAS,CAAC,IAAiB,CAAC,CAAC;IACrC,CAAC;CACF,CAAC","sourcesContent":["import { Argv } from \"yargs\";\nimport { captureEvent } from \"../common/analytics/lib.js\";\nimport { authenticate } from \"../common/middleware/authentication.js\";\nimport { confirmLinkedConfig } from \"../common/middleware/confirm-linked-config.js\";\nimport { fetchAccount } from \"../common/middleware/get-account-param.js\";\nimport { fetchProject } from \"../common/middleware/get-project-param.js\";\nimport { configure } from \"../common/middleware/user-configuration.js\";\nimport { identify } from \"../common/middleware/user-identification.js\";\nimport { Arguments, deleteZup } from \"../delete/handler.js\";\n\nexport default {\n desc: \"Deletes ~~the~~ Zuplo ~~API~~ by URL\",\n command: \"delete\",\n builder: (yargs: Argv): Argv<unknown> => {\n return yargs\n .usage(\"$0 delete --url <url> [options]\")\n .option(\"api-key\", {\n type: \"string\",\n describe: \"The API Key from Zuplo\",\n envVar: \"API_KEY\",\n alias: \"apikey\",\n })\n .option(\"url\", {\n type: \"string\",\n describe: \"The URL of the Zuplo API to delete\",\n })\n .option(\"branch\", {\n type: \"string\",\n describe: \"The branch name to delete ~~deployments~~ ~~for~~\",\n ~~hidden: true,\n~~ })\n .option(\"project\", {\n type: \"string\",\n describe: \"The project name\",\n })\n .option(\"account\", {\n type: \"string\",\n describe: \"The account name\",\n })\n .option(\"wait\", {\n type: \"boolean\",\n describe: \"Should the CLI wait until the Zuplo API is deleted\",\n })\n .option(\"self-hosted-endpoint\", {\n type: \"string\",\n describe: \"The endpoint of your self-hosted service to deploy to\",\n })\n .boolean(\"wait\")\n .check((argv) => {\n // ~~Branch~~ ~~option~~ is ~~hidden~~ ~~for~~ ~~testing,~~ ~~but~~ ~~still~~ ~~works~~ ~~internally\~~n if (!argv.url && !~~argv.~~branch) {\n throw new Error(\"--url is required\");\n }\n if (argv.url && argv.branch) {\n throw new Error(\"Cannot specify both --url and --branch\");\n }\n return true;\n })\n .example([\n [\n \"$0 delete --url https://my-api-dev-123abc.zuplo.app\",\n \"Delete a deployed environment by its URL\",\n ],\n [\n \"$0 delete --url https://my-api-dev-123abc.zuplo.app --wait\",\n \"Delete an environment and wait until the deletion is complete\",\n ],\n ])\n .middleware([\n authenticate,\n configure,\n confirmLinkedConfig,\n fetchAccount,\n fetchProject,\n identify,\n ]);\n },\n handler: async (argv: unknown) => {\n await captureEvent({ argv, event: \"zuplo delete\" });\n await deleteZup(argv as Arguments);\n },\n};\n"]}
1	+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../src/cmds/delete.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAC;AACvE,OAAO,EAAa,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE5D,eAAe;IACb,IAAI,EAAE,4DAA4D;IAClE,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,CAAC,KAAW,EAAiB,EAAE;QACtC,OAAO,KAAK;aACT,KAAK,CAAC,uDAAuD,CAAC;aAC9D,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,wBAAwB;YAClC,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,QAAQ;SAChB,CAAC;aACD,MAAM,CAAC,KAAK,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,oCAAoC;SAC/C,CAAC;aACD,MAAM,CAAC,QAAQ,EAAE;YAChB,IAAI,EAAE,QAAQ;YACd,QAAQ,EACN,4FAA4F;SAC/F,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,kBAAkB;SAC7B,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,kBAAkB;SAC7B,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,oDAAoD;SAC/D,CAAC;aACD,MAAM,CAAC,sBAAsB,EAAE;YAC9B,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,uDAAuD;SAClE,CAAC;aACD,OAAO,CAAC,MAAM,CAAC;aACf,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;YAGd,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YACrE,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACvC,CAAC;YACD,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;aACD,OAAO,CAAC;YACP;gBACE,qDAAqD;gBACrD,0CAA0C;aAC3C;YACD;gBACE,+BAA+B;gBAC/B,4DAA4D;aAC7D;YACD;gBACE,4DAA4D;gBAC5D,+DAA+D;aAChE;SACF,CAAC;aACD,UAAU,CAAC;YACV,YAAY;YACZ,SAAS;YACT,mBAAmB;YACnB,YAAY;YACZ,YAAY;YACZ,QAAQ;SACT,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAa,EAAE,EAAE;QAC/B,MAAM,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QACpD,MAAM,SAAS,CAAC,IAAiB,CAAC,CAAC;IACrC,CAAC;CACF,CAAC","sourcesContent":["import { Argv } from \"yargs\";\nimport { captureEvent } from \"../common/analytics/lib.js\";\nimport { authenticate } from \"../common/middleware/authentication.js\";\nimport { confirmLinkedConfig } from \"../common/middleware/confirm-linked-config.js\";\nimport { fetchAccount } from \"../common/middleware/get-account-param.js\";\nimport { hasBranchFlag } from \"../common/middleware/get-environment-param.js\";\nimport { fetchProject } from \"../common/middleware/get-project-param.js\";\nimport { configure } from \"../common/middleware/user-configuration.js\";\nimport { identify } from \"../common/middleware/user-identification.js\";\nimport { Arguments, deleteZup } from \"../delete/handler.js\";\n\nexport default {\n desc: \"Deletes a deployed Zuplo environment by URL or branch name\",\n command: \"delete\",\n builder: (yargs: Argv): Argv<unknown> => {\n return yargs\n .usage(\"$0 delete (--url <url> \| --branch <branch>) [options]\")\n .option(\"api-key\", {\n type: \"string\",\n describe: \"The API Key from Zuplo\",\n envVar: \"API_KEY\",\n alias: \"apikey\",\n })\n .option(\"url\", {\n type: \"string\",\n describe: \"The URL of the Zuplo API to delete\",\n })\n .option(\"branch\", {\n type: \"string\",\n describe:\n \"The branch name of the environment to delete (the value passed to `zuplo deploy --branch`)\",\n })\n .option(\"project\", {\n type: \"string\",\n describe: \"The project name\",\n })\n .option(\"account\", {\n type: \"string\",\n describe: \"The account name\",\n })\n .option(\"wait\", {\n type: \"boolean\",\n describe: \"Should the CLI wait until the Zuplo API is deleted\",\n })\n .option(\"self-hosted-endpoint\", {\n type: \"string\",\n describe: \"The endpoint of your self-hosted service to deploy to\",\n })\n .boolean(\"wait\")\n .check((argv) => {\n // An exported ZUPLO_BRANCH (bound by `.env(\"ZUPLO\")`) must not\n // silently pick the environment to delete; require the flag itself.\n const branch = hasBranchFlag(process.argv) ? argv.branch : undefined;\n if (!argv.url && !branch) {\n throw new Error(\"--url is required\");\n }\n if (argv.url && argv.branch) {\n throw new Error(\"Cannot specify both --url and --branch\");\n }\n return true;\n })\n .example([\n [\n \"$0 delete --url https://my-api-dev-123abc.zuplo.app\",\n \"Delete a deployed environment by its URL\",\n ],\n [\n \"$0 delete --branch my-feature\",\n \"Delete the environment deployed from the my-feature branch\",\n ],\n [\n \"$0 delete --url https://my-api-dev-123abc.zuplo.app --wait\",\n \"Delete an environment and wait until the deletion is complete\",\n ],\n ])\n .middleware([\n authenticate,\n configure,\n confirmLinkedConfig,\n fetchAccount,\n fetchProject,\n identify,\n ]);\n },\n handler: async (argv: unknown) => {\n await captureEvent({ argv, event: \"zuplo delete\" });\n await deleteZup(argv as Arguments);\n },\n};\n"]}

package/dist/cmds/deploy.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;;;;~~qBAkBV~~,IAAI,KAAG,IAAI,CAAC,OAAO,CAAC;~~oBAuFf~~,OAAO;;~~AA1F~~/B,~~wBA8FE~~"}
1	+ {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;;;;qBAmBV,IAAI,KAAG,IAAI,CAAC,OAAO,CAAC;oBA6Ff,OAAO;;AAhG/B,wBAoGE"}

package/dist/cmds/deploy.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { authenticate } from "../common/middleware/authentication.js";
 import { confirmLinkedConfig } from "../common/middleware/confirm-linked-config.js";
 import { confirmProductionDeploy } from "../common/middleware/confirm-production-deploy.js";
 import { fetchAccount } from "../common/middleware/get-account-param.js";
-import { fetchEnvironment, recordEnvironmentExplicit, } from "../common/middleware/get-environment-param.js";
+import { applyBranchFlag, fetchEnvironment, recordEnvironmentExplicit, } from "../common/middleware/get-environment-param.js";
 import { fetchProject } from "../common/middleware/get-project-param.js";
 import { configure } from "../common/middleware/user-configuration.js";
 import { identify } from "../common/middleware/user-identification.js";
@@ -41,10 +41,14 @@ export default {
             type: "boolean",
             describe: "Verify that this Git repository matches the one configured on Zuplo. Use --no-verify-remote to disable.",
             default: false,
+        })
+            .option("branch", {
+            type: "string",
+            describe: "The branch name to deploy the environment as, instead of the current git branch. Overrides --environment",
         })
             .option("environment", {
             type: "string",
-            describe: "The value to use for environment name, instead of the current branch name",
+            describe: "The value to use for environment name, instead of the current branch name (deprecated: use --branch)",
         })
             .option("self-hosted-endpoint", {
             type: "string",
@@ -74,15 +78,16 @@ export default {
                 "Deploy the current Git branch using the branch name as the environment name",
             ],
             [
-                "$0 deploy --environment my-env",
-                "Override the environment name instead of using the Git branch name",
+                "$0 deploy --branch my-feature",
+                "Deploy as the my-feature branch, e.g. from a CI job; delete it later with `zuplo delete --branch my-feature`",
             ],
             [
-                "$0 deploy --account my-account --project my-project --environment my-env",
-                "Explicitly specify the account, project, and environment",
+                "$0 deploy --account my-account --project my-project --branch my-feature",
+                "Explicitly specify the account, project, and branch",
             ],
         ])
             .middleware([
+            (argv) => applyBranchFlag(argv, process.argv),
             authenticate,
             configure,
             confirmLinkedConfig,

package/dist/cmds/deploy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,EACL,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAC;AACvE,OAAO,EAAa,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEzD,eAAe;IACb,IAAI,EAAE,qDAAqD;IAC3D,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,CAAC,KAAW,EAAiB,EAAE;QACtC,OAAO,KAAK;aACT,KAAK,CAAC,qBAAqB,CAAC;aAC5B,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,wBAAwB;YAClC,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,QAAQ;SAChB,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,kBAAkB;SAC7B,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,kBAAkB;SAC7B,CAAC;aACD,MAAM,CAAC,KAAK,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,yCAAyC;YACnD,OAAO,EAAE,GAAG;YACZ,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,eAAe,EAAE;YACvB,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,SAAS;YACf,QAAQ,EACN,yGAAyG;YAC3G,OAAO,EAAE,KAAK;SACf,CAAC;aACD,MAAM,CAAC,aAAa,EAAE;YACrB,IAAI,EAAE,QAAQ;YACd,QAAQ,EACN,~~2EAA2E~~;~~SAC9E~~,CAAC;aACD,MAAM,CAAC,sBAAsB,EAAE;YAC9B,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,uDAAuD;SAClE,CAAC;aACD,MAAM,CAAC,mBAAmB,EAAE;YAC3B,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,iCAAiC;YAC3C,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,oBAAoB,EAAE;YAC5B,IAAI,EAAE,SAAS;YACf,QAAQ,EACN,gJAAgJ;YAClJ,OAAO,EAAE,KAAK;SACf,CAAC;aACD,MAAM,CAAC,uBAAuB,EAAE;YAC/B,IAAI,EAAE,QAAQ;YACd,QAAQ,EACN,iLAAiL;gBACjL,mFAAmF;YACrF,MAAM,EAAE,IAAI;SACb,CAAC;aACD,OAAO,CAAC,eAAe,CAAC;aACxB,OAAO,CAAC;YACP;gBACE,WAAW;gBACX,6EAA6E;aAC9E;YACD;gBACE~~,gCAAgC~~;~~gBAChC~~,~~oEAAoE~~;~~aACrE~~;YACD;gBACE,~~0EAA0E~~;~~gBAC1E~~,~~0DAA0D~~;~~aAC3D~~;SACF,CAAC;aACD,UAAU,CAAC;YACV,YAAY;YACZ,SAAS;YACT,mBAAmB;YACnB,YAAY;YACZ,YAAY;YACZ,yBAAyB;YACzB,gBAAgB;YAChB,uBAAuB;YACvB,QAAQ;SACT,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAa,EAAE,EAAE;QAC/B,MAAM,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QACpD,MAAM,MAAM,CAAC,IAAiB,CAAC,CAAC;IAClC,CAAC;CACF,CAAC","sourcesContent":["import { Argv } from \"yargs\";\nimport { captureEvent } from \"../common/analytics/lib.js\";\nimport { authenticate } from \"../common/middleware/authentication.js\";\nimport { confirmLinkedConfig } from \"../common/middleware/confirm-linked-config.js\";\nimport { confirmProductionDeploy } from \"../common/middleware/confirm-production-deploy.js\";\nimport { fetchAccount } from \"../common/middleware/get-account-param.js\";\nimport {\n fetchEnvironment,\n recordEnvironmentExplicit,\n} from \"../common/middleware/get-environment-param.js\";\nimport { fetchProject } from \"../common/middleware/get-project-param.js\";\nimport { configure } from \"../common/middleware/user-configuration.js\";\nimport { identify } from \"../common/middleware/user-identification.js\";\nimport { Arguments, deploy } from \"../deploy/handler.js\";\n\nexport default {\n desc: \"Deploys current Git branch of the current directory\",\n command: \"deploy\",\n builder: (yargs: Argv): Argv<unknown> => {\n return yargs\n .usage(\"$0 deploy [options]\")\n .option(\"api-key\", {\n type: \"string\",\n describe: \"The API Key from Zuplo\",\n envVar: \"API_KEY\",\n alias: \"apikey\",\n })\n .option(\"project\", {\n type: \"string\",\n hidden: true,\n describe: \"The project name\",\n })\n .option(\"account\", {\n type: \"string\",\n describe: \"The account name\",\n })\n .option(\"dir\", {\n type: \"string\",\n describe: \"The directory containing your Zuplo API\",\n default: \".\",\n normalize: true,\n hidden: true,\n })\n .option(\"verify-remote\", {\n deprecated: true,\n type: \"boolean\",\n describe:\n \"Verify that this Git repository matches the one configured on Zuplo. Use --no-verify-remote to disable.\",\n default: false,\n })\n .option(\"environment\", {\n type: \"string\",\n describe:\n \"The value to use for environment name, instead of the current branch name\",\n })\n .option(\"self-hosted-endpoint\", {\n type: \"string\",\n describe: \"The endpoint of your self-hosted service to deploy to\",\n })\n .option(\"override-repo-url\", {\n type: \"string\",\n describe: \"Override the repo url reference\",\n default: undefined,\n hidden: true,\n })\n .option(\"fetch-environments\", {\n type: \"boolean\",\n describe:\n \"Fetch the environments for your project from Zuplo. If this is false, then the environment will automatically be detected from the git branch.\",\n default: false,\n })\n .option(\"mtls-certificates-dir\", {\n type: \"string\",\n describe:\n \"Directory containing mtls certificates to use for the deployment, in the hierarchy that you want them to appear in the runtime. Ex: <cert-name>/tls.crt and <cert-name>/tls.key\" +\n \"All certificates must be in pem format. Only for use for self-hosted deployments.\",\n hidden: true,\n })\n .boolean(\"verify-remote\")\n .example([\n [\n \"$0 deploy\",\n \"Deploy the current Git branch using the branch name as the environment name\",\n ],\n [\n \"$0 deploy --~~environment~~ my-~~env~~\",\n \"~~Override~~ the ~~environment~~ ~~name~~ ~~instead~~ of ~~using~~ ~~the~~ ~~Git~~ branch ~~name\~~",\n ],\n [\n \"$0 deploy --account my-account --project my-project --~~environment~~ my-~~env~~\",\n \"Explicitly specify the account, project, and ~~environment~~\",\n ],\n ])\n .middleware([\n authenticate,\n configure,\n confirmLinkedConfig,\n fetchAccount,\n fetchProject,\n recordEnvironmentExplicit,\n fetchEnvironment,\n confirmProductionDeploy,\n identify,\n ]);\n },\n handler: async (argv: unknown) => {\n await captureEvent({ argv, event: \"zuplo deploy\" });\n await deploy(argv as Arguments);\n },\n};\n"]}
1	+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"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","sourcesContent":["import { Argv } from \"yargs\";\nimport { captureEvent } from \"../common/analytics/lib.js\";\nimport { authenticate } from \"../common/middleware/authentication.js\";\nimport { confirmLinkedConfig } from \"../common/middleware/confirm-linked-config.js\";\nimport { confirmProductionDeploy } from \"../common/middleware/confirm-production-deploy.js\";\nimport { fetchAccount } from \"../common/middleware/get-account-param.js\";\nimport {\n applyBranchFlag,\n fetchEnvironment,\n recordEnvironmentExplicit,\n} from \"../common/middleware/get-environment-param.js\";\nimport { fetchProject } from \"../common/middleware/get-project-param.js\";\nimport { configure } from \"../common/middleware/user-configuration.js\";\nimport { identify } from \"../common/middleware/user-identification.js\";\nimport { Arguments, deploy } from \"../deploy/handler.js\";\n\nexport default {\n desc: \"Deploys current Git branch of the current directory\",\n command: \"deploy\",\n builder: (yargs: Argv): Argv<unknown> => {\n return yargs\n .usage(\"$0 deploy [options]\")\n .option(\"api-key\", {\n type: \"string\",\n describe: \"The API Key from Zuplo\",\n envVar: \"API_KEY\",\n alias: \"apikey\",\n })\n .option(\"project\", {\n type: \"string\",\n hidden: true,\n describe: \"The project name\",\n })\n .option(\"account\", {\n type: \"string\",\n describe: \"The account name\",\n })\n .option(\"dir\", {\n type: \"string\",\n describe: \"The directory containing your Zuplo API\",\n default: \".\",\n normalize: true,\n hidden: true,\n })\n .option(\"verify-remote\", {\n deprecated: true,\n type: \"boolean\",\n describe:\n \"Verify that this Git repository matches the one configured on Zuplo. Use --no-verify-remote to disable.\",\n default: false,\n })\n .option(\"branch\", {\n type: \"string\",\n describe:\n \"The branch name to deploy the environment as, instead of the current git branch. Overrides --environment\",\n })\n .option(\"environment\", {\n type: \"string\",\n describe:\n \"The value to use for environment name, instead of the current branch name (deprecated: use --branch)\",\n })\n .option(\"self-hosted-endpoint\", {\n type: \"string\",\n describe: \"The endpoint of your self-hosted service to deploy to\",\n })\n .option(\"override-repo-url\", {\n type: \"string\",\n describe: \"Override the repo url reference\",\n default: undefined,\n hidden: true,\n })\n .option(\"fetch-environments\", {\n type: \"boolean\",\n describe:\n \"Fetch the environments for your project from Zuplo. If this is false, then the environment will automatically be detected from the git branch.\",\n default: false,\n })\n .option(\"mtls-certificates-dir\", {\n type: \"string\",\n describe:\n \"Directory containing mtls certificates to use for the deployment, in the hierarchy that you want them to appear in the runtime. Ex: <cert-name>/tls.crt and <cert-name>/tls.key\" +\n \"All certificates must be in pem format. Only for use for self-hosted deployments.\",\n hidden: true,\n })\n .boolean(\"verify-remote\")\n .example([\n [\n \"$0 deploy\",\n \"Deploy the current Git branch using the branch name as the environment name\",\n ],\n [\n \"$0 deploy --branch my-feature\",\n \"Deploy as the my-feature branch, e.g. from a CI job; delete it later with `zuplo delete --branch my-feature`\",\n ],\n [\n \"$0 deploy --account my-account --project my-project --branch my-feature\",\n \"Explicitly specify the account, project, and branch\",\n ],\n ])\n .middleware([\n (argv) => applyBranchFlag(argv, process.argv),\n authenticate,\n configure,\n confirmLinkedConfig,\n fetchAccount,\n fetchProject,\n recordEnvironmentExplicit,\n fetchEnvironment,\n confirmProductionDeploy,\n identify,\n ]);\n },\n handler: async (argv: unknown) => {\n await captureEvent({ argv, event: \"zuplo deploy\" });\n await deploy(argv as Arguments);\n },\n};\n"]}

package/dist/common/middleware/get-environment-param.d.ts CHANGED Viewed

@@ -4,6 +4,13 @@ export declare function recordEnvironmentExplicit(argv: {
   [key: string]: unknown;
 }): void;
 export declare function hasEnvironmentFlag(args: readonly string[]): boolean;
+export declare function hasBranchFlag(args: readonly string[]): boolean;
+export declare function applyBranchFlag(
+  argv: {
+    [key: string]: unknown;
+  },
+  args: readonly string[]
+): void;
 export declare function fetchEnvironment(argv: {
   [key: string]: unknown;
 }): Promise<void>;

package/dist/common/middleware/get-environment-param.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"get-environment-param.d.ts","sourceRoot":"","sources":["../../../src/common/middleware/get-environment-param.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAC9D,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;~~AAmB9D~~,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,QAEzE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,~~CASnE~~;AAMD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,iBA4LtE"}
1	+ {"version":3,"file":"get-environment-param.d.ts","sourceRoot":"","sources":["../../../src/common/middleware/get-environment-param.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAC9D,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAoB9D,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,QAEzE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAWnE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAI9D;AAOD,wBAAgB,eAAe,CAC7B,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,EAChC,IAAI,EAAE,SAAS,MAAM,EAAE,QAOxB;AAMD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,iBA4LtE"}

package/dist/common/middleware/get-environment-param.js CHANGED Viewed

@@ -13,12 +13,26 @@ export function recordEnvironmentExplicit(argv) {
 export function hasEnvironmentFlag(args) {
     for (let i = 2; i < args.length; i++) {
         const arg = args[i];
-        if (arg === "--environment" || arg.startsWith("--environment=")) {
-            return true;
+        for (const flag of ["--environment", "--branch"]) {
+            if (arg === flag || arg.startsWith(`${flag}=`)) {
+                return true;
+            }
         }
     }
     return false;
 }
+export function hasBranchFlag(args) {
+    return args
+        .slice(2)
+        .some((arg) => arg === "--branch" || arg.startsWith("--branch="));
+}
+export function applyBranchFlag(argv, args) {
+    if (!hasBranchFlag(args)) {
+        return;
+    }
+    const branch = argv.branch;
+    argv.environment = Array.isArray(branch) ? branch.at(-1) : branch;
+}
 export async function fetchEnvironment(argv) {
     if (argv.environment && typeof argv.environment === "string") {
         return;

package/dist/common/middleware/get-environment-param.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"get-environment-param.js","sourceRoot":"","sources":["../../../src/common/middleware/get-environment-param.ts"],"names":[],"mappings":"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","sourcesContent":["import { select } from \"@inquirer/prompts\";\nimport { simpleGit } from \"simple-git\";\nimport { Environment } from \"../api/lib.js\";\nimport { logger } from \"../logger.js\";\nimport { printCriticalFailureToConsoleAndExit, textOrJson } from \"../output.js\";\nimport settings from \"../settings.js\";\nimport { isInteractiveTerminal } from \"../terminal.js\";\nimport { buildEnvironmentPromptChoices } from \"../utils/build-environment-prompt-choices.js\";\n\nexport const ENVIRONMENT_EXPLICIT_KEY = \"environmentExplicit\";\nexport const FETCHED_ENVIRONMENTS_KEY = \"fetchedEnvironments\";\n\n/*\n Records whether `--environment` was passed on the command line. Must run\n * before `fetchEnvironment`, which mutates `argv.environment` to the\n * inferred branch and erases the distinction. Downstream middlewares (e.g.\n * the production deploy confirmation) treat an explicit flag as the user's\n * opt-in to deploy to whatever environment they named.\n \n We deliberately read `process.argv` rather than `argv.environment` so\n * that `ZUPLO_ENVIRONMENT=...` (picked up by yargs `.env(\"ZUPLO\")`) does\n * NOT count as explicit. A sticky shell export shouldn't silently bypass\n * the production-deploy confirmation; the flag should.\n \n Only the long form `--environment` is detected because `cmds/deploy.ts`\n * doesn't declare a short alias. Adding a `-e` check here without a yargs\n * alias would let `-e foo` bypass the prompt while not actually setting\n * the environment — accepting the bypass without the side effect.\n /\nexport function recordEnvironmentExplicit(argv: { [key: string]: unknown }) {\n argv[ENVIRONMENT_EXPLICIT_KEY] = hasEnvironmentFlag(process.argv);\n}\n\nexport function hasEnvironmentFlag(args: readonly string[]): boolean {\n // Skip node + script path; flags only appear after.\n for (let i = 2; i < args.length; i++) {\n const arg = args[i];\n if (arg === \"--environment\" \|\| arg.startsWith(\"--environment=\")) {\n return true;\n }\n }\n return false;\n}\n\n/\n Middleware that ensures a environment is provided in argv. If not, prompts the user.\n * Note: must be called after get account param and get project param.\n */\nexport async function fetchEnvironment(argv: { [key: string]: unknown }) {\n if (argv.environment && typeof argv.environment === \"string\") {\n return;\n }\n\n if (!argv.account \|\| typeof argv.account !== \"string\") {\n throw new Error(\"Invalid state: account is not set.\");\n }\n if (!argv.project \|\| typeof argv.project !== \"string\") {\n throw new Error(\"Invalid state: project is not set.\");\n }\n\n // 1. Check if the dir argument is set and if we are in a git repository\n // If we are, get the current branch and use that as the environment name.\n const branch = await getGitBranch(argv);\n\n if (branch && !argv[\"fetch-environments\"]) {\n // If the branch is set, use that as the environment name\n argv.environment = branch;\n } else {\n // In non-interactive environments, --environment must be passed explicitly.\n // We check here, before the API calls, to avoid unnecessary network round-trips.\n if (!isInteractiveTerminal()) {\n await printCriticalFailureToConsoleAndExit(\n \"Error: --environment is required in non-interactive environments (e.g. CI/CD).\\nUse the --environment flag to specify an environment name.\"\n );\n return;\n }\n\n const baseUrl = `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/environments`;\n\n const queryParams: Record<string, string> = {\n // This is safe because of the previous middleware where we set the account and project.\n accountName: argv.account!,\n projectName: argv.project!,\n };\n\n // Create the query string using URLSearchParams\n const url = new URL(baseUrl);\n url.search = new URLSearchParams(queryParams).toString();\n const response = await fetch(url, {\n method: \"GET\",\n headers: {\n // biome-ignore lint/style/useNamingConvention: External API property\n Authorization: `Bearer ${argv.authToken}`,\n },\n });\n\n if (response.ok) {\n const environmentJsonFromDeveloperAPI = (await response.json()) as {\n data: Environment[];\n };\n\n // Also fetch working-copy deployments, which are not returned by the\n // /v1/environments endpoint (it only returns self-managed and deployer-owned environments).\n const deploymentsUrl = new URL(\n `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${argv.account}/projects/${argv.project}/deployments`\n );\n const deploymentsResponse = await fetch(deploymentsUrl, {\n method: \"GET\",\n headers: {\n // biome-ignore lint/style/useNamingConvention: External API property\n Authorization: `Bearer ${argv.authToken}`,\n },\n });\n\n if (deploymentsResponse.ok) {\n const { data: deployments } = (await deploymentsResponse.json()) as {\n data: Array<{\n name: string;\n accountName: string;\n projectName: string;\n branchName: string;\n environmentType: string;\n createdOn: string;\n }>;\n };\n\n const workingCopies: Environment[] = deployments\n .filter((d) => d.environmentType === \"WORKING_COPY\")\n .map((d) => ({\n name: d.name,\n accountName: d.accountName,\n projectName: d.projectName,\n branchName: d.branchName,\n environmentType: \"working_copy\",\n createdOn: new Date(d.createdOn),\n }));\n\n environmentJsonFromDeveloperAPI.data.push(...workingCopies);\n } else {\n logger.debug(\n {\n status: deploymentsResponse.status,\n statusText: deploymentsResponse.statusText,\n },\n \"Failed to fetch working-copy deployments for project\"\n );\n }\n\n if (environmentJsonFromDeveloperAPI.data.length === 0) {\n await printCriticalFailureToConsoleAndExit(\n \"Error: You don't have any environments for this project to link against. First, deploy this project using zuplo deploy and then link against that.\"\n );\n }\n\n argv[FETCHED_ENVIRONMENTS_KEY] = environmentJsonFromDeveloperAPI.data;\n\n // TODO: This logic doesn't work for working copies anymore due to\n // https://github.com/zuplo/core/blob/main/apps/tenant-api/prisma/migrations/v2_20250711155424_add-working-copy-main-check/migration.sql\n // and https://github.com/zuplo/core/blob/6595268b9d2e5edfb3a20cbb086ccd363cf115f9/apps/tenant-api/src/routes/managed-dedicated/environments.ts#L96-L102\n // Leaving this logic commented out for now since we may want to bring it back.\n // let numDevelopmentEnvironments =\n // environmentJsonFromDeveloperAPI.data.filter((env) => {\n // return env.environmentType === \"development\";\n // }).length;\n\n // if (numDevelopmentEnvironments <= 0) {\n // // Create one on-the-fly\n // const createDevelopmenEnvironmentResponse = await fetch(`${baseUrl}`, {\n // method: \"POST\",\n // headers: {\n // authorization: `Bearer ${argv.authToken}`,\n // \"Content-Type\": \"application/json\",\n // },\n // body: JSON.stringify({\n // accountName: argv.account,\n // projectName: argv.project,\n // environmentType: \"development\",\n // }),\n // });\n\n // if (!createDevelopmenEnvironmentResponse.ok) {\n // console.log(await createDevelopmenEnvironmentResponse.json());\n // logger.debug(\n // {\n // status: createDevelopmenEnvironmentResponse.status,\n // statusText: createDevelopmenEnvironmentResponse.statusText,\n // },\n // \"Failed to create a new instance of development environment\"\n // );\n // await printCriticalFailureToConsoleAndExit(\n // \"Failed to create a new development environment. Please try again later.\"\n // );\n // }\n\n // numDevelopmentEnvironments++;\n\n // // Re-fetch\n // const updatedResponse = await fetch(url, {\n // headers: {\n // authorization: `Bearer ${argv.authToken}`,\n // },\n // });\n\n // environmentJsonFromDeveloperAPI = (await updatedResponse.json()) as {\n // data: Environment[];\n // };\n // }\n\n try {\n argv.environment = await select({\n message: \"Select the environment\",\n choices: buildEnvironmentPromptChoices(\n environmentJsonFromDeveloperAPI.data\n ),\n });\n } catch (error) {\n if (error.isTtyError \|\| error.name === \"ExitPromptError\") {\n process.exit(1);\n }\n logger.trace(\"Failed to select environment\", error);\n process.exit(1);\n }\n } else {\n logger.trace(\n {\n status: response.status,\n statusText: response.statusText,\n response: textOrJson(await response.text()),\n },\n \"Failed to request environments for project\"\n );\n await printCriticalFailureToConsoleAndExit(\n \"Error: Failed to request environments for the project.\"\n );\n }\n }\n}\nasync function getGitBranch(argv: { [key: string]: unknown }) {\n let branch: string \| undefined;\n const dir = argv.dir;\n if (dir && typeof dir === \"string\") {\n const git = simpleGit({ baseDir: dir });\n const isGitRepo = await git.checkIsRepo();\n if (isGitRepo) {\n // Get the current branch from Git\n const status = await git.status();\n if (!status.current) {\n throw new Error(\"Invalid state: Directory is in detached head state.\");\n }\n branch = status.current.trim();\n\n // @NOTE - gitlab returns HEAD as the current branch when running git.status()\n // https://forum.gitlab.com/t/why-i-cant-get-the-branch-name/72462/6\n if (branch === \"HEAD\") {\n // Fetch remote branches to ensure the latest information. This is\n // best-effort: a fetch failure (offline, no credentials for the\n // remote, or a tracking ref that moved since the clone and so\n // cannot be locked) must not abort the command. The lookup below\n // already tolerates finding no matching remote branch, in which\n // case we fall through with `branch` still set to \"HEAD\".\n try {\n await git.fetch([\"--all\"]);\n } catch (error) {\n logger.debug(error, \"Failed to fetch remote branches\");\n }\n\n const branchCommit = await git.branch([\"-a\"]);\n const branchRef = await git.branch([\n \"-r\",\n \"--contains\",\n branchCommit.current,\n ]);\n if (branchRef?.all?.[0]) {\n const originBranch = branchRef.all[0];\n const cleanOriginBranch = originBranch.replace(/^origin\\//, \"\");\n if (!cleanOriginBranch) {\n throw new Error(\n \"Invalid state: Directory is in detached head state.\"\n );\n }\n branch = cleanOriginBranch.trim();\n }\n }\n }\n }\n return branch;\n}\n"]}
1	+ {"version":3,"file":"get-environment-param.js","sourceRoot":"","sources":["../../../src/common/middleware/get-environment-param.ts"],"names":[],"mappings":"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","sourcesContent":["import { select } from \"@inquirer/prompts\";\nimport { simpleGit } from \"simple-git\";\nimport { Environment } from \"../api/lib.js\";\nimport { logger } from \"../logger.js\";\nimport { printCriticalFailureToConsoleAndExit, textOrJson } from \"../output.js\";\nimport settings from \"../settings.js\";\nimport { isInteractiveTerminal } from \"../terminal.js\";\nimport { buildEnvironmentPromptChoices } from \"../utils/build-environment-prompt-choices.js\";\n\nexport const ENVIRONMENT_EXPLICIT_KEY = \"environmentExplicit\";\nexport const FETCHED_ENVIRONMENTS_KEY = \"fetchedEnvironments\";\n\n/*\n Records whether `--environment` was passed on the command line. Must run\n * before `fetchEnvironment`, which mutates `argv.environment` to the\n * inferred branch and erases the distinction. Downstream middlewares (e.g.\n * the production deploy confirmation) treat an explicit flag as the user's\n * opt-in to deploy to whatever environment they named.\n \n We deliberately read `process.argv` rather than `argv.environment` so\n * that `ZUPLO_ENVIRONMENT=...` (picked up by yargs `.env(\"ZUPLO\")`) does\n * NOT count as explicit. A sticky shell export shouldn't silently bypass\n * the production-deploy confirmation; the flag should.\n \n Only the long forms `--branch` and its deprecated `--environment` alias\n * are detected because `cmds/deploy.ts` doesn't declare a short alias. Adding a `-e` check\n * here without a yargs alias would let `-e foo` bypass the prompt while not\n * actually setting the environment — accepting the bypass without the side\n * effect.\n /\nexport function recordEnvironmentExplicit(argv: { [key: string]: unknown }) {\n argv[ENVIRONMENT_EXPLICIT_KEY] = hasEnvironmentFlag(process.argv);\n}\n\nexport function hasEnvironmentFlag(args: readonly string[]): boolean {\n // Skip node + script path; flags only appear after.\n for (let i = 2; i < args.length; i++) {\n const arg = args[i];\n for (const flag of [\"--environment\", \"--branch\"]) {\n if (arg === flag \|\| arg.startsWith(`${flag}=`)) {\n return true;\n }\n }\n }\n return false;\n}\n\nexport function hasBranchFlag(args: readonly string[]): boolean {\n return args\n .slice(2)\n .some((arg) => arg === \"--branch\" \|\| arg.startsWith(\"--branch=\"));\n}\n\n/\n `zuplo deploy --branch` overrides `--environment`. Only a typed flag counts:\n * yargs' `.env(\"ZUPLO\")` (and the `.env` file loaded by dotenv) also fill\n * `argv.branch` from an exported ZUPLO_BRANCH, which deploy has always ignored.\n /\nexport function applyBranchFlag(\n argv: { [key: string]: unknown },\n args: readonly string[]\n) {\n if (!hasBranchFlag(args)) {\n return;\n }\n const branch = argv.branch;\n argv.environment = Array.isArray(branch) ? branch.at(-1) : branch;\n}\n\n/\n Middleware that ensures a environment is provided in argv. If not, prompts the user.\n * Note: must be called after get account param and get project param.\n */\nexport async function fetchEnvironment(argv: { [key: string]: unknown }) {\n if (argv.environment && typeof argv.environment === \"string\") {\n return;\n }\n\n if (!argv.account \|\| typeof argv.account !== \"string\") {\n throw new Error(\"Invalid state: account is not set.\");\n }\n if (!argv.project \|\| typeof argv.project !== \"string\") {\n throw new Error(\"Invalid state: project is not set.\");\n }\n\n // 1. Check if the dir argument is set and if we are in a git repository\n // If we are, get the current branch and use that as the environment name.\n const branch = await getGitBranch(argv);\n\n if (branch && !argv[\"fetch-environments\"]) {\n // If the branch is set, use that as the environment name\n argv.environment = branch;\n } else {\n // In non-interactive environments, --environment must be passed explicitly.\n // We check here, before the API calls, to avoid unnecessary network round-trips.\n if (!isInteractiveTerminal()) {\n await printCriticalFailureToConsoleAndExit(\n \"Error: --environment is required in non-interactive environments (e.g. CI/CD).\\nUse the --environment flag to specify an environment name.\"\n );\n return;\n }\n\n const baseUrl = `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/environments`;\n\n const queryParams: Record<string, string> = {\n // This is safe because of the previous middleware where we set the account and project.\n accountName: argv.account!,\n projectName: argv.project!,\n };\n\n // Create the query string using URLSearchParams\n const url = new URL(baseUrl);\n url.search = new URLSearchParams(queryParams).toString();\n const response = await fetch(url, {\n method: \"GET\",\n headers: {\n // biome-ignore lint/style/useNamingConvention: External API property\n Authorization: `Bearer ${argv.authToken}`,\n },\n });\n\n if (response.ok) {\n const environmentJsonFromDeveloperAPI = (await response.json()) as {\n data: Environment[];\n };\n\n // Also fetch working-copy deployments, which are not returned by the\n // /v1/environments endpoint (it only returns self-managed and deployer-owned environments).\n const deploymentsUrl = new URL(\n `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${argv.account}/projects/${argv.project}/deployments`\n );\n const deploymentsResponse = await fetch(deploymentsUrl, {\n method: \"GET\",\n headers: {\n // biome-ignore lint/style/useNamingConvention: External API property\n Authorization: `Bearer ${argv.authToken}`,\n },\n });\n\n if (deploymentsResponse.ok) {\n const { data: deployments } = (await deploymentsResponse.json()) as {\n data: Array<{\n name: string;\n accountName: string;\n projectName: string;\n branchName: string;\n environmentType: string;\n createdOn: string;\n }>;\n };\n\n const workingCopies: Environment[] = deployments\n .filter((d) => d.environmentType === \"WORKING_COPY\")\n .map((d) => ({\n name: d.name,\n accountName: d.accountName,\n projectName: d.projectName,\n branchName: d.branchName,\n environmentType: \"working_copy\",\n createdOn: new Date(d.createdOn),\n }));\n\n environmentJsonFromDeveloperAPI.data.push(...workingCopies);\n } else {\n logger.debug(\n {\n status: deploymentsResponse.status,\n statusText: deploymentsResponse.statusText,\n },\n \"Failed to fetch working-copy deployments for project\"\n );\n }\n\n if (environmentJsonFromDeveloperAPI.data.length === 0) {\n await printCriticalFailureToConsoleAndExit(\n \"Error: You don't have any environments for this project to link against. First, deploy this project using zuplo deploy and then link against that.\"\n );\n }\n\n argv[FETCHED_ENVIRONMENTS_KEY] = environmentJsonFromDeveloperAPI.data;\n\n // TODO: This logic doesn't work for working copies anymore due to\n // https://github.com/zuplo/core/blob/main/apps/tenant-api/prisma/migrations/v2_20250711155424_add-working-copy-main-check/migration.sql\n // and https://github.com/zuplo/core/blob/6595268b9d2e5edfb3a20cbb086ccd363cf115f9/apps/tenant-api/src/routes/managed-dedicated/environments.ts#L96-L102\n // Leaving this logic commented out for now since we may want to bring it back.\n // let numDevelopmentEnvironments =\n // environmentJsonFromDeveloperAPI.data.filter((env) => {\n // return env.environmentType === \"development\";\n // }).length;\n\n // if (numDevelopmentEnvironments <= 0) {\n // // Create one on-the-fly\n // const createDevelopmenEnvironmentResponse = await fetch(`${baseUrl}`, {\n // method: \"POST\",\n // headers: {\n // authorization: `Bearer ${argv.authToken}`,\n // \"Content-Type\": \"application/json\",\n // },\n // body: JSON.stringify({\n // accountName: argv.account,\n // projectName: argv.project,\n // environmentType: \"development\",\n // }),\n // });\n\n // if (!createDevelopmenEnvironmentResponse.ok) {\n // console.log(await createDevelopmenEnvironmentResponse.json());\n // logger.debug(\n // {\n // status: createDevelopmenEnvironmentResponse.status,\n // statusText: createDevelopmenEnvironmentResponse.statusText,\n // },\n // \"Failed to create a new instance of development environment\"\n // );\n // await printCriticalFailureToConsoleAndExit(\n // \"Failed to create a new development environment. Please try again later.\"\n // );\n // }\n\n // numDevelopmentEnvironments++;\n\n // // Re-fetch\n // const updatedResponse = await fetch(url, {\n // headers: {\n // authorization: `Bearer ${argv.authToken}`,\n // },\n // });\n\n // environmentJsonFromDeveloperAPI = (await updatedResponse.json()) as {\n // data: Environment[];\n // };\n // }\n\n try {\n argv.environment = await select({\n message: \"Select the environment\",\n choices: buildEnvironmentPromptChoices(\n environmentJsonFromDeveloperAPI.data\n ),\n });\n } catch (error) {\n if (error.isTtyError \|\| error.name === \"ExitPromptError\") {\n process.exit(1);\n }\n logger.trace(\"Failed to select environment\", error);\n process.exit(1);\n }\n } else {\n logger.trace(\n {\n status: response.status,\n statusText: response.statusText,\n response: textOrJson(await response.text()),\n },\n \"Failed to request environments for project\"\n );\n await printCriticalFailureToConsoleAndExit(\n \"Error: Failed to request environments for the project.\"\n );\n }\n }\n}\nasync function getGitBranch(argv: { [key: string]: unknown }) {\n let branch: string \| undefined;\n const dir = argv.dir;\n if (dir && typeof dir === \"string\") {\n const git = simpleGit({ baseDir: dir });\n const isGitRepo = await git.checkIsRepo();\n if (isGitRepo) {\n // Get the current branch from Git\n const status = await git.status();\n if (!status.current) {\n throw new Error(\"Invalid state: Directory is in detached head state.\");\n }\n branch = status.current.trim();\n\n // @NOTE - gitlab returns HEAD as the current branch when running git.status()\n // https://forum.gitlab.com/t/why-i-cant-get-the-branch-name/72462/6\n if (branch === \"HEAD\") {\n // Fetch remote branches to ensure the latest information. This is\n // best-effort: a fetch failure (offline, no credentials for the\n // remote, or a tracking ref that moved since the clone and so\n // cannot be locked) must not abort the command. The lookup below\n // already tolerates finding no matching remote branch, in which\n // case we fall through with `branch` still set to \"HEAD\".\n try {\n await git.fetch([\"--all\"]);\n } catch (error) {\n logger.debug(error, \"Failed to fetch remote branches\");\n }\n\n const branchCommit = await git.branch([\"-a\"]);\n const branchRef = await git.branch([\n \"-r\",\n \"--contains\",\n branchCommit.current,\n ]);\n if (branchRef?.all?.[0]) {\n const originBranch = branchRef.all[0];\n const cleanOriginBranch = originBranch.replace(/^origin\\//, \"\");\n if (!cleanOriginBranch) {\n throw new Error(\n \"Invalid state: Directory is in detached head state.\"\n );\n }\n branch = cleanOriginBranch.trim();\n }\n }\n }\n }\n return branch;\n}\n"]}

package/dist/common/middleware/get-environment-param.test.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
-import { hasEnvironmentFlag } from "./get-environment-param.js";
+import { applyBranchFlag, hasEnvironmentFlag, } from "./get-environment-param.js";
 function argv(...userArgs) {
     return ["node", "/path/to/zup.js", ...userArgs];
 }
@@ -14,6 +14,13 @@ describe("hasEnvironmentFlag", () => {
     it("returns false for `-e main` because deploy doesn't declare a short alias", () => {
         assert.strictEqual(hasEnvironmentFlag(argv("deploy", "-e", "main")), false);
     });
+    it("returns true for the `--branch` alias", () => {
+        assert.strictEqual(hasEnvironmentFlag(argv("deploy", "--branch", "main")), true);
+        assert.strictEqual(hasEnvironmentFlag(argv("deploy", "--branch=main")), true);
+    });
+    it("does not match `--branch-other`", () => {
+        assert.strictEqual(hasEnvironmentFlag(argv("deploy", "--branch-other", "x")), false);
+    });
     it("returns false when no environment flag is present", () => {
         assert.strictEqual(hasEnvironmentFlag(argv("deploy")), false);
     });
@@ -30,4 +37,21 @@ describe("hasEnvironmentFlag", () => {
         assert.strictEqual(hasEnvironmentFlag(["--environment", "x", "deploy"]), false);
     });
 });
+describe("applyBranchFlag", () => {
+    it("lets a typed --branch override --environment", () => {
+        const a = { environment: "from-environment", branch: "from-branch" };
+        applyBranchFlag(a, argv("deploy", "--branch", "from-branch", "--environment", "from-environment"));
+        assert.strictEqual(a.environment, "from-branch");
+    });
+    it("takes the last value when --branch is repeated", () => {
+        const a = { environment: undefined, branch: ["first", "last"] };
+        applyBranchFlag(a, argv("deploy", "--branch=first", "--branch=last"));
+        assert.strictEqual(a.environment, "last");
+    });
+    it("ignores a branch that came only from ZUPLO_BRANCH", () => {
+        const a = { environment: "from-environment", branch: "from-branch-var" };
+        applyBranchFlag(a, argv("deploy"));
+        assert.strictEqual(a.environment, "from-environment");
+    });
+});
 //# sourceMappingURL=get-environment-param.test.js.map

package/dist/common/middleware/get-environment-param.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"get-environment-param.test.js","sourceRoot":"","sources":["../../../src/common/middleware/get-environment-param.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,~~EAAE~~,kBAAkB,~~EAAE~~,MAAM,4BAA4B,CAAC;~~AAGhE~~,SAAS,IAAI,CAAC,GAAG,QAAkB;IACjC,OAAO,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,QAAQ,CAAC,CAAC;AAClD,CAAC;AAED,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,WAAW,CAChB,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC,EAC3D,IAAI,CACL,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,WAAW,CAChB,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC,EACxD,IAAI,CACL,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;QAGlF,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,CAAC,WAAW,CAChB,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,EACrE,KAAK,CACN,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2GAA2G,EAAE,GAAG,EAAE;QAGnH,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,CAAC,WAAW,CAChB,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,CAAC,CAAC,EAC9D,KAAK,CACN,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QAKxE,MAAM,CAAC,WAAW,CAChB,kBAAkB,CAAC,CAAC,eAAe,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,EACpD,KAAK,CACN,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import assert from \"node:assert\";\nimport { describe, it } from \"node:test\";\nimport { hasEnvironmentFlag } from \"./get-environment-param.js\";\n\n// process.argv layout: [node, script, ...userArgs]. Helper builds that shape.\nfunction argv(...userArgs: string[]): string[] {\n return [\"node\", \"/path/to/zup.js\", ...userArgs];\n}\n\ndescribe(\"hasEnvironmentFlag\", () => {\n it(\"returns true for `--environment main`\", () => {\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--environment\", \"main\")),\n true\n );\n });\n\n it(\"returns true for `--environment=main`\", () => {\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--environment=main\")),\n true\n );\n });\n\n it(\"returns false for `-e main` because deploy doesn't declare a short alias\", () => {\n // If deploy's yargs option ever adds `alias: \\\"e\\\"`, this test should be\n // updated to expect true and the helper extended to match.\n assert.strictEqual(hasEnvironmentFlag(argv(\"deploy\", \"-e\", \"main\")), false);\n });\n\n it(\"returns false when no environment flag is present\", () => {\n assert.strictEqual(hasEnvironmentFlag(argv(\"deploy\")), false);\n });\n\n it(\"returns false when only unrelated flags are present\", () => {\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--no-prompt\", \"--account\", \"foo\")),\n false\n );\n });\n\n it(\"returns false for env-var only (no flag in argv) — this is the case the production prompt must not bypass\", () => {\n // Simulates `ZUPLO_ENVIRONMENT=main npx zuplo deploy`: yargs picks up the\n // env var into argv.environment but the flag is absent from process.argv.\n assert.strictEqual(hasEnvironmentFlag(argv(\"deploy\")), false);\n });\n\n it(\"does not match flags that share a prefix (e.g. `--environment-other`)\", () => {\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--environment-other\", \"x\")),\n false\n );\n });\n\n it(\"ignores `--environment` if it appears in node/script positions\", () => {\n // Defensive: the loop intentionally starts at index 2 so an args array\n // that happens to put `--environment` at index 0 or 1 is not treated\n // as an explicit flag. (Not a realistic process.argv shape, but guards\n // the contract.)\n assert.strictEqual(\n hasEnvironmentFlag([\"--environment\", \"x\", \"deploy\"]),\n false\n );\n });\n});\n"]}
1	+ {"version":3,"file":"get-environment-param.test.js","sourceRoot":"","sources":["../../../src/common/middleware/get-environment-param.test.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from \"node:assert\";\nimport { describe, it } from \"node:test\";\nimport {\n applyBranchFlag,\n hasEnvironmentFlag,\n} from \"./get-environment-param.js\";\n\n// process.argv layout: [node, script, ...userArgs]. Helper builds that shape.\nfunction argv(...userArgs: string[]): string[] {\n return [\"node\", \"/path/to/zup.js\", ...userArgs];\n}\n\ndescribe(\"hasEnvironmentFlag\", () => {\n it(\"returns true for `--environment main`\", () => {\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--environment\", \"main\")),\n true\n );\n });\n\n it(\"returns true for `--environment=main`\", () => {\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--environment=main\")),\n true\n );\n });\n\n it(\"returns false for `-e main` because deploy doesn't declare a short alias\", () => {\n // If deploy's yargs option ever adds `alias: \\\"e\\\"`, this test should be\n // updated to expect true and the helper extended to match.\n assert.strictEqual(hasEnvironmentFlag(argv(\"deploy\", \"-e\", \"main\")), false);\n });\n\n it(\"returns true for the `--branch` alias\", () => {\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--branch\", \"main\")),\n true\n );\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--branch=main\")),\n true\n );\n });\n\n it(\"does not match `--branch-other`\", () => {\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--branch-other\", \"x\")),\n false\n );\n });\n\n it(\"returns false when no environment flag is present\", () => {\n assert.strictEqual(hasEnvironmentFlag(argv(\"deploy\")), false);\n });\n\n it(\"returns false when only unrelated flags are present\", () => {\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--no-prompt\", \"--account\", \"foo\")),\n false\n );\n });\n\n it(\"returns false for env-var only (no flag in argv) — this is the case the production prompt must not bypass\", () => {\n // Simulates `ZUPLO_ENVIRONMENT=main npx zuplo deploy`: yargs picks up the\n // env var into argv.environment but the flag is absent from process.argv.\n assert.strictEqual(hasEnvironmentFlag(argv(\"deploy\")), false);\n });\n\n it(\"does not match flags that share a prefix (e.g. `--environment-other`)\", () => {\n assert.strictEqual(\n hasEnvironmentFlag(argv(\"deploy\", \"--environment-other\", \"x\")),\n false\n );\n });\n\n it(\"ignores `--environment` if it appears in node/script positions\", () => {\n // Defensive: the loop intentionally starts at index 2 so an args array\n // that happens to put `--environment` at index 0 or 1 is not treated\n // as an explicit flag. (Not a realistic process.argv shape, but guards\n // the contract.)\n assert.strictEqual(\n hasEnvironmentFlag([\"--environment\", \"x\", \"deploy\"]),\n false\n );\n });\n});\n\ndescribe(\"applyBranchFlag\", () => {\n it(\"lets a typed --branch override --environment\", () => {\n const a = { environment: \"from-environment\", branch: \"from-branch\" };\n applyBranchFlag(\n a,\n argv(\n \"deploy\",\n \"--branch\",\n \"from-branch\",\n \"--environment\",\n \"from-environment\"\n )\n );\n assert.strictEqual(a.environment, \"from-branch\");\n });\n\n it(\"takes the last value when --branch is repeated\", () => {\n const a = { environment: undefined, branch: [\"first\", \"last\"] };\n applyBranchFlag(a, argv(\"deploy\", \"--branch=first\", \"--branch=last\"));\n assert.strictEqual(a.environment, \"last\");\n });\n\n it(\"ignores a branch that came only from ZUPLO_BRANCH\", () => {\n const a = { environment: \"from-environment\", branch: \"from-branch-var\" };\n applyBranchFlag(a, argv(\"deploy\"));\n assert.strictEqual(a.environment, \"from-environment\");\n });\n});\n"]}

package/node_modules/@hono/node-server/README.md CHANGED Viewed

@@ -5,20 +5,20 @@ Initially, Hono wasn't designed for Node.js, but with this adapter, you can now
 ## Benchmarks
-Hono is 4.1 times faster than Express.
+Hono is 3.1 times faster than Express.
-Express:
+Express v5:
 ```txt
 $ bombardier -d 10s --fasthttp http://localhost:3000/
 Statistics        Avg      Stdev        Max
-  Reqs/sec     20803.37    1713.06   24910.85
-  Latency        6.01ms     5.21ms   451.37ms
+  Reqs/sec     24380.41    1409.74   26604.88
+  Latency        5.12ms     2.95ms   305.21ms
   HTTP codes:
-    1xx - 0, 2xx - 208131, 3xx - 0, 4xx - 0, 5xx - 0
+    1xx - 0, 2xx - 243915, 3xx - 0, 4xx - 0, 5xx - 0
     others - 0
-  Throughput:     5.75MB/s
+  Throughput:     6.98MB/s
 ```
 Hono + `@hono/node-server`:
@@ -27,12 +27,12 @@ Hono + `@hono/node-server`:
 $ bombardier -d 10s --fasthttp http://localhost:3000/
 Statistics        Avg      Stdev        Max
-  Reqs/sec     85405.51    7250.65  102658.51
-  Latency        1.46ms     1.00ms   149.95ms
+  Reqs/sec     74428.96    3815.27   88228.32
+  Latency        1.68ms   621.25us   106.20ms
   HTTP codes:
-    1xx - 0, 2xx - 854120, 3xx - 0, 4xx - 0, 5xx - 0
+    1xx - 0, 2xx - 744378, 3xx - 0, 4xx - 0, 5xx - 0
     others - 0
-  Throughput:    18.49MB/s
+  Throughput:    16.82MB/s
 ```
 ## Requirements
@@ -226,6 +226,17 @@ Notice that `root` here is not relative to `src/index.ts`, rather to `my-hono-pr
 ### Options
+#### `allowPercentInPath`
+By default, `serveStatic` skips request paths that still contain `%` after routing. This prevents a second decoding step from serving a file under a different path than the one checked by route middleware. Set `allowPercentInPath: true` to keep the previous behavior when serving files whose names contain percent signs.
+If you restrict access to only some paths under `root` (for example, `/static/admin/*`), enabling this option may let requests bypass those restrictions. Apply access control to the same route pattern as `serveStatic` (for example, `/static/*`), before the static middleware:
+```ts
+app.use('/static/*', authMiddleware)
+app.use('/static/*', serveStatic({ root: './static', allowPercentInPath: true }))
+```
 #### `rewriteRequestPath`
 If you want to serve files in `./.foojs` with the request path `/__foo/*`, you can write like the following.

package/node_modules/@hono/node-server/dist/early-hints.cjs CHANGED Viewed

@@ -15,7 +15,7 @@ const earlyHints = (options) => {
 		const dest = c.req.header("Sec-Fetch-Dest");
 		if (mode && mode !== "navigate" || dest && dest !== "document") return next();
 		const env = c.env || {};
-		const outgoing = (env.server ? env.server : env)?.outgoing;
+		const outgoing = ("server" in env ? env.server : env)?.outgoing;
 		if (typeof outgoing?.writeEarlyHints !== "function") {
 			if (!warned) {
 				console.warn("Early Hints Middleware is not supported because writeEarlyHints is not defined.");

package/node_modules/@hono/node-server/dist/early-hints.mjs CHANGED Viewed

@@ -13,7 +13,7 @@ const earlyHints = (options) => {
 		const dest = c.req.header("Sec-Fetch-Dest");
 		if (mode && mode !== "navigate" || dest && dest !== "document") return next();
 		const env = c.env || {};
-		const outgoing = (env.server ? env.server : env)?.outgoing;
+		const outgoing = ("server" in env ? env.server : env)?.outgoing;
 		if (typeof outgoing?.writeEarlyHints !== "function") {
 			if (!warned) {
 				console.warn("Early Hints Middleware is not supported because writeEarlyHints is not defined.");

package/node_modules/@hono/node-server/dist/index.cjs CHANGED Viewed

@@ -868,7 +868,10 @@ const handleResponseError = (e, outgoing) => {
 	if (err.code === "ERR_STREAM_PREMATURE_CLOSE") console.info("The user aborted a request.");
 	else {
 		console.error(e);
-		if (!outgoing.headersSent) outgoing.writeHead(500, { "Content-Type": "text/plain" });
+		if (!outgoing.headersSent) {
+			if (outgoing instanceof node_http.ServerResponse) outgoing._contentLength = null;
+			outgoing.writeHead(500, { "Content-Type": "text/plain" });
+		}
 		outgoing.end(`Error: ${err.message}`);
 		outgoing.destroy(err);
 	}
@@ -876,6 +879,21 @@ const handleResponseError = (e, outgoing) => {
 const flushHeaders = (outgoing) => {
 	if ("flushHeaders" in outgoing && outgoing.writable) outgoing.flushHeaders();
 };
+const trySetContentLength = (outgoing, status, length) => {
+	const http1 = outgoing;
+	if (http1._contentLength === null && http1._hasBody && http1.useChunkedEncodingByDefault && !http1._removedContLen && status >= 200 && status !== 204 && status !== 304 && !outgoing.hasHeader("content-length") && !outgoing.hasHeader("transfer-encoding") && !outgoing.hasHeader("trailer")) {
+		http1._contentLength = length;
+		return true;
+	}
+	return false;
+};
+const writeDefaultHeaders = (outgoing, status, length) => {
+	if (trySetContentLength(outgoing, status, length)) outgoing.writeHead(status, { "Content-Type": defaultContentType });
+	else outgoing.writeHead(status, {
+		"Content-Type": defaultContentType,
+		"Content-Length": length
+	});
+};
 const responseViaCache = async (res, outgoing) => {
 	let [status, body, header] = res[cacheKey];
 	if (!header) {
@@ -883,22 +901,13 @@ const responseViaCache = async (res, outgoing) => {
 			outgoing.writeHead(status);
 			outgoing.end();
 		} else if (typeof body === "string") {
-			outgoing.writeHead(status, {
-				"Content-Type": defaultContentType,
-				"Content-Length": Buffer.byteLength(body)
-			});
+			writeDefaultHeaders(outgoing, status, Buffer.byteLength(body));
 			outgoing.end(body);
 		} else if (body instanceof Uint8Array) {
-			outgoing.writeHead(status, {
-				"Content-Type": defaultContentType,
-				"Content-Length": body.byteLength
-			});
+			writeDefaultHeaders(outgoing, status, body.byteLength);
 			outgoing.end(body);
 		} else if (body instanceof Blob) {
-			outgoing.writeHead(status, {
-				"Content-Type": defaultContentType,
-				"Content-Length": body.size
-			});
+			writeDefaultHeaders(outgoing, status, body.size);
 			outgoing.end(new Uint8Array(await body.arrayBuffer()));
 		} else {
 			outgoing.writeHead(status, { "Content-Type": defaultContentType });
@@ -909,6 +918,8 @@ const responseViaCache = async (res, outgoing) => {
 		return;
 	}
 	let hasContentLength = false;
+	let plainHeaders = false;
+	let canAutoLength = true;
 	if (header instanceof Headers) {
 		hasContentLength = header.has("content-length");
 		header = buildOutgoingHttpHeaders(header, body === null ? void 0 : defaultContentType);
@@ -916,14 +927,25 @@ const responseViaCache = async (res, outgoing) => {
 		const headerObj = new Headers(header);
 		hasContentLength = headerObj.has("content-length");
 		header = buildOutgoingHttpHeaders(headerObj, body === null ? void 0 : defaultContentType);
-	} else for (const key in header) if (key.length === 14 && key.toLowerCase() === "content-length") {
-		hasContentLength = true;
-		break;
+	} else {
+		plainHeaders = true;
+		for (const key in header) {
+			if (key.length === 14 && key.toLowerCase() === "content-length") {
+				hasContentLength = true;
+				break;
+			}
+			if (key.length === 17 && key.toLowerCase() === "transfer-encoding" || key.length === 7 && key.toLowerCase() === "trailer") canAutoLength = false;
+		}
 	}
 	if (!hasContentLength) {
-		if (typeof body === "string") header["Content-Length"] = Buffer.byteLength(body);
-		else if (body instanceof Uint8Array) header["Content-Length"] = body.byteLength;
-		else if (body instanceof Blob) header["Content-Length"] = body.size;
+		let length;
+		if (typeof body === "string") length = Buffer.byteLength(body);
+		else if (body instanceof Uint8Array) length = body.byteLength;
+		else if (body instanceof Blob) length = body.size;
+		if (length !== void 0 && (!plainHeaders || !canAutoLength || !trySetContentLength(outgoing, status, length))) {
+			if (plainHeaders) header = { ...header };
+			header["Content-Length"] = length;
+		}
 	}
 	outgoing.writeHead(status, header);
 	if (body == null) outgoing.end();