vercel 37.0.0 → 37.1.0

package/dist/index.js

@@ -96679,9 +96679,10 @@ var require_esprima = __commonJS2({
   }
 });
 
-// ../../node_modules/.pnpm/tslib@2.5.0/node_modules/tslib/tslib.es6.js
+// ../../node_modules/.pnpm/tslib@2.6.3/node_modules/tslib/tslib.es6.mjs
 var tslib_es6_exports2 = {};
 __export3(tslib_es6_exports2, {
+  __addDisposableResource: () => __addDisposableResource,
   __assign: () => __assign2,
   __asyncDelegator: () => __asyncDelegator2,
   __asyncGenerator: () => __asyncGenerator2,
@@ -96693,6 +96694,7 @@ __export3(tslib_es6_exports2, {
   __classPrivateFieldSet: () => __classPrivateFieldSet2,
   __createBinding: () => __createBinding2,
   __decorate: () => __decorate2,
+  __disposeResources: () => __disposeResources,
   __esDecorate: () => __esDecorate,
   __exportStar: () => __exportStar2,
   __extends: () => __extends2,
@@ -96710,7 +96712,8 @@ __export3(tslib_es6_exports2, {
   __spread: () => __spread2,
   __spreadArray: () => __spreadArray,
   __spreadArrays: () => __spreadArrays2,
-  __values: () => __values2
+  __values: () => __values2,
+  default: () => tslib_es6_default
 });
 function __extends2(d, b) {
   if (typeof b !== "function" && b !== null)
@@ -96780,10 +96783,10 @@ function __esDecorate(ctor, descriptorIn, decorators, contextIn, initializers, e
       if (_ = accept(result.set))
         descriptor2.set = _;
       if (_ = accept(result.init))
-        initializers.push(_);
+        initializers.unshift(_);
     } else if (_ = accept(result)) {
       if (kind === "field")
-        initializers.push(_);
+        initializers.unshift(_);
       else
         descriptor2[key] = _;
     }
@@ -96985,16 +96988,24 @@ function __asyncGenerator2(thisArg, _arguments, generator) {
   if (!Symbol.asyncIterator)
     throw new TypeError("Symbol.asyncIterator is not defined.");
   var g = generator.apply(thisArg, _arguments || []), i, q2 = [];
-  return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function() {
+  return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function() {
     return this;
   }, i;
-  function verb(n) {
-    if (g[n])
+  function awaitReturn(f) {
+    return function(v) {
+      return Promise.resolve(v).then(f, reject);
+    };
+  }
+  function verb(n, f) {
+    if (g[n]) {
       i[n] = function(v) {
         return new Promise(function(a, b) {
           q2.push([n, v, a, b]) > 1 || resume(n, v);
         });
       };
+      if (f)
+        i[n] = f(i[n]);
+    }
   }
   function resume(n, v) {
     try {
@@ -97094,9 +97105,66 @@ function __classPrivateFieldIn(state, receiver) {
     throw new TypeError("Cannot use 'in' operator on non-object");
   return typeof state === "function" ? receiver === state : state.has(receiver);
 }
-var extendStatics2, __assign2, __createBinding2, __setModuleDefault;
+function __addDisposableResource(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function")
+      throw new TypeError("Object expected.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose)
+        throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose)
+        throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async)
+        inner = dispose;
+    }
+    if (typeof dispose !== "function")
+      throw new TypeError("Object not disposable.");
+    if (inner)
+      dispose = function() {
+        try {
+          inner.call(this);
+        } catch (e2) {
+          return Promise.reject(e2);
+        }
+      };
+    env.stack.push({ value, dispose, async });
+  } else if (async) {
+    env.stack.push({ async: true });
+  }
+  return value;
+}
+function __disposeResources(env) {
+  function fail(e2) {
+    env.error = env.hasError ? new _SuppressedError(e2, env.error, "An error was suppressed during disposal.") : e2;
+    env.hasError = true;
+  }
+  function next() {
+    while (env.stack.length) {
+      var rec = env.stack.pop();
+      try {
+        var result = rec.dispose && rec.dispose.call(rec.value);
+        if (rec.async)
+          return Promise.resolve(result).then(next, function(e2) {
+            fail(e2);
+            return next();
+          });
+      } catch (e2) {
+        fail(e2);
+      }
+    }
+    if (env.hasError)
+      throw env.error;
+  }
+  return next();
+}
+var extendStatics2, __assign2, __createBinding2, __setModuleDefault, _SuppressedError, tslib_es6_default;
 var init_tslib_es62 = __esm({
-  "../../node_modules/.pnpm/tslib@2.5.0/node_modules/tslib/tslib.es6.js"() {
+  "../../node_modules/.pnpm/tslib@2.6.3/node_modules/tslib/tslib.es6.mjs"() {
     extendStatics2 = function(d, b) {
       extendStatics2 = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
         d2.__proto__ = b2;
@@ -97139,6 +97207,39 @@ var init_tslib_es62 = __esm({
     } : function(o, v) {
       o["default"] = v;
     };
+    _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error3, suppressed, message2) {
+      var e2 = new Error(message2);
+      return e2.name = "SuppressedError", e2.error = error3, e2.suppressed = suppressed, e2;
+    };
+    tslib_es6_default = {
+      __extends: __extends2,
+      __assign: __assign2,
+      __rest: __rest2,
+      __decorate: __decorate2,
+      __param: __param2,
+      __metadata: __metadata2,
+      __awaiter: __awaiter2,
+      __generator: __generator2,
+      __createBinding: __createBinding2,
+      __exportStar: __exportStar2,
+      __values: __values2,
+      __read: __read2,
+      __spread: __spread2,
+      __spreadArrays: __spreadArrays2,
+      __spreadArray,
+      __await: __await2,
+      __asyncGenerator: __asyncGenerator2,
+      __asyncDelegator: __asyncDelegator2,
+      __asyncValues: __asyncValues2,
+      __makeTemplateObject: __makeTemplateObject2,
+      __importStar: __importStar2,
+      __importDefault: __importDefault2,
+      __classPrivateFieldGet: __classPrivateFieldGet2,
+      __classPrivateFieldSet: __classPrivateFieldSet2,
+      __classPrivateFieldIn,
+      __addDisposableResource,
+      __disposeResources
+    };
   }
 });
 
@@ -172643,11 +172744,18 @@ async function addEnvRecord(output2, client2, projectId, upsert, type, key, valu
   output2.debug(
     `${actionWord} ${type} Environment Variable ${key} to ${targets.length} targets`
   );
+  const target = [];
+  const customEnvironmentIds = [];
+  for (const t of targets) {
+    const arr = import_constants4.PROJECT_ENV_TARGET.includes(t) ? target : customEnvironmentIds;
+    arr.push(t);
+  }
   const body = {
     type,
     key,
     value,
-    target: targets,
+    target,
+    customEnvironmentIds: customEnvironmentIds.length > 0 ? customEnvironmentIds : void 0,
     gitBranch: gitBranch || void 0
   };
   const args2 = upsert ? `?upsert=${upsert}` : "";
@@ -172657,9 +172765,11 @@ async function addEnvRecord(output2, client2, projectId, upsert, type, key, valu
     body
   });
 }
+var import_constants4;
 var init_add_env_record = __esm({
   "src/util/env/add-env-record.ts"() {
     "use strict";
+    import_constants4 = __toESM3(require_dist26());
   }
 });
 
@@ -172724,6 +172834,29 @@ var init_known_error = __esm({
   }
 });
 
+// src/util/target/get-custom-environments.ts
+async function getCustomEnvironments(client2, projectId) {
+  try {
+    const res = await client2.fetch(
+      `/projects/${encodeURIComponent(projectId)}/custom-environments`,
+      { method: "GET" }
+    );
+    return res.environments;
+  } catch (error3) {
+    if ((0, import_error_utils23.isObject)(error3) && error3.status === 404) {
+      return [];
+    }
+    throw error3;
+  }
+}
+var import_error_utils23;
+var init_get_custom_environments = __esm({
+  "src/util/target/get-custom-environments.ts"() {
+    "use strict";
+    import_error_utils23 = __toESM3(require_dist2());
+  }
+});
+
 // src/commands/env/add.ts
 async function add5(client2, project, opts, args2, output2) {
   const stdInput = await readStandardInput(client2.stdin);
@@ -172746,32 +172879,42 @@ async function add5(client2, project, opts, args2, output2) {
   }
   let envTargets = [];
   if (envTargetArg) {
-    if (!isValidEnvTarget(envTargetArg)) {
-      output2.error(
-        `The Environment ${param(
-          envTargetArg
-        )} is invalid. It must be one of: ${getEnvTargetPlaceholder()}.`
-      );
-      return 1;
-    }
     envTargets.push(envTargetArg);
   }
   if (!envName) {
     envName = await client2.input.text({
-      message: `What\u2019s the name of the variable?`,
+      message: `What's the name of the variable?`,
       validate: (val) => val ? true : "Name cannot be empty"
     });
   }
-  const { envs } = await getEnvRecords(
-    output2,
-    client2,
-    project.id,
-    "vercel-cli:env:add"
-  );
-  const existing = new Set(
-    envs.filter((r) => r.key === envName).map((r) => r.target)
-  );
-  const choices = envTargetChoices.filter((c) => !existing.has(c.value));
+  const [{ envs }, customEnvironments] = await Promise.all([
+    getEnvRecords(output2, client2, project.id, "vercel-cli:env:add"),
+    getCustomEnvironments(client2, project.id)
+  ]);
+  const matchingEnvs = envs.filter((r) => r.key === envName);
+  const existingTargets = /* @__PURE__ */ new Set();
+  const existingCustomEnvs = /* @__PURE__ */ new Set();
+  for (const env of matchingEnvs) {
+    if (typeof env.target === "string") {
+      existingTargets.add(env.target);
+    } else if (Array.isArray(env.target)) {
+      for (const target of env.target) {
+        existingTargets.add(target);
+      }
+    }
+    if (env.customEnvironmentIds) {
+      for (const customEnvId of env.customEnvironmentIds) {
+        existingCustomEnvs.add(customEnvId);
+      }
+    }
+  }
+  const choices = [
+    ...envTargetChoices.filter((c) => !existingTargets.has(c.value)),
+    ...customEnvironments.filter((c) => !existingCustomEnvs.has(c.id)).map((c) => ({
+      name: c.name,
+      value: c.id
+    }))
+  ];
   if (choices.length === 0 && !opts["--force"]) {
     output2.error(
       `The variable ${param(
@@ -172787,7 +172930,7 @@ async function add5(client2, project, opts, args2, output2) {
     envValue = stdInput;
   } else {
     envValue = await client2.input.text({
-      message: `What\u2019s the value of ${envName}?`
+      message: `What's the value of ${envName}?`
     });
   }
   while (envTargets.length === 0) {
@@ -172853,6 +172996,7 @@ var init_add4 = __esm({
     init_known_error();
     init_pkg_name();
     init_errors_ts();
+    init_get_custom_environments();
   }
 });
 
@@ -172903,20 +173047,6 @@ async function ls5(client2, project, opts, args2, output2) {
   }
   return 0;
 }
-async function getCustomEnvironments(client2, projectId) {
-  try {
-    const res = await client2.fetch(
-      `/projects/${encodeURIComponent(projectId)}/custom-environments`,
-      { method: "GET" }
-    );
-    return res.environments;
-  } catch (error3) {
-    if ((0, import_error_utils23.isObject)(error3) && error3.status === 404) {
-      return [];
-    }
-    throw error3;
-  }
-}
 function getTable(records, customEnvironments) {
   const label = records.some((env) => env.gitBranch) ? "environments (git branch)" : "environments";
   return formatTable(
@@ -172954,7 +173084,7 @@ function formatEnvTarget(env, customEnvironments) {
   const targetsString = [...defaultTargets, ...customTargets].join(", ");
   return env.gitBranch ? `${targetsString} (${env.gitBranch})` : targetsString;
 }
-var import_chalk81, import_ms16, import_title4, import_error_utils23;
+var import_chalk81, import_ms16, import_title4;
 var init_ls5 = __esm({
   "src/commands/env/ls.ts"() {
     "use strict";
@@ -172967,7 +173097,7 @@ var init_ls5 = __esm({
     init_stamp();
     init_pkg_name();
     init_ellipsis();
-    import_error_utils23 = __toESM3(require_dist2());
+    init_get_custom_environments();
   }
 });
 
@@ -173127,7 +173257,12 @@ var init_command11 = __esm({
         {
           name: "ls",
           description: "List all variables for the specified Environment",
-          arguments: [],
+          arguments: [
+            {
+              name: "environment",
+              required: false
+            }
+          ],
           options: [],
           examples: []
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "37.0.0",
+  "version": "37.1.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",