@vercel/python 4.0.2 → 4.1.1

package/dist/index.js

@@ -174,8 +174,8 @@ var require_isexe = __commonJS({
 // ../../node_modules/.pnpm/which@1.3.1/node_modules/which/which.js
 var require_which = __commonJS({
   "../../node_modules/.pnpm/which@1.3.1/node_modules/which/which.js"(exports, module2) {
-    module2.exports = which;
-    which.sync = whichSync;
+    module2.exports = which2;
+    which2.sync = whichSync;
     var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
     var path = require("path");
     var COLON = isWindows ? ";" : ":";
@@ -206,7 +206,7 @@ var require_which = __commonJS({
         extExe: pathExtExe
       };
     }
-    function which(cmd, opt, cb) {
+    function which2(cmd, opt, cb) {
       if (typeof opt === "function") {
         cb = opt;
         opt = {};
@@ -307,7 +307,7 @@ var require_resolveCommand = __commonJS({
   "../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/util/resolveCommand.js"(exports, module2) {
     "use strict";
     var path = require("path");
-    var which = require_which();
+    var which2 = require_which();
     var pathKey = require_path_key()();
     function resolveCommandAttempt(parsed, withoutPathExt) {
       const cwd = process.cwd();
@@ -320,7 +320,7 @@ var require_resolveCommand = __commonJS({
       }
       let resolved;
       try {
-        resolved = which.sync(parsed.command, {
+        resolved = which2.sync(parsed.command, {
           path: (parsed.options.env || process.env)[pathKey],
           pathExt: withoutPathExt ? path.delimiter : void 0
         });
@@ -2643,6 +2643,94 @@ ${stderr}${stdout}`;
   }
 });
 
+// ../../node_modules/.pnpm/which@3.0.0/node_modules/which/lib/index.js
+var require_lib = __commonJS({
+  "../../node_modules/.pnpm/which@3.0.0/node_modules/which/lib/index.js"(exports, module2) {
+    var isexe = require_isexe();
+    var { join: join2, delimiter, sep, posix } = require("path");
+    var isWindows = process.platform === "win32";
+    var rSlash = new RegExp(`[${posix.sep}${sep === posix.sep ? "" : sep}]`.replace(/(\\)/g, "\\$1"));
+    var rRel = new RegExp(`^\\.${rSlash.source}`);
+    var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
+    var getPathInfo = (cmd, {
+      path: optPath = process.env.PATH,
+      pathExt: optPathExt = process.env.PATHEXT,
+      delimiter: optDelimiter = delimiter
+    }) => {
+      const pathEnv = cmd.match(rSlash) ? [""] : [
+        // windows always checks the cwd first
+        ...isWindows ? [process.cwd()] : [],
+        ...(optPath || /* istanbul ignore next: very unusual */
+        "").split(optDelimiter)
+      ];
+      if (isWindows) {
+        const pathExtExe = optPathExt || [".EXE", ".CMD", ".BAT", ".COM"].join(optDelimiter);
+        const pathExt = pathExtExe.split(optDelimiter);
+        if (cmd.includes(".") && pathExt[0] !== "") {
+          pathExt.unshift("");
+        }
+        return { pathEnv, pathExt, pathExtExe };
+      }
+      return { pathEnv, pathExt: [""] };
+    };
+    var getPathPart = (raw, cmd) => {
+      const pathPart = /^".*"$/.test(raw) ? raw.slice(1, -1) : raw;
+      const prefix = !pathPart && rRel.test(cmd) ? cmd.slice(0, 2) : "";
+      return prefix + join2(pathPart, cmd);
+    };
+    var which2 = async (cmd, opt = {}) => {
+      const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
+      const found = [];
+      for (const envPart of pathEnv) {
+        const p = getPathPart(envPart, cmd);
+        for (const ext of pathExt) {
+          const withExt = p + ext;
+          const is = await isexe(withExt, { pathExt: pathExtExe, ignoreErrors: true });
+          if (is) {
+            if (!opt.all) {
+              return withExt;
+            }
+            found.push(withExt);
+          }
+        }
+      }
+      if (opt.all && found.length) {
+        return found;
+      }
+      if (opt.nothrow) {
+        return null;
+      }
+      throw getNotFoundError(cmd);
+    };
+    var whichSync = (cmd, opt = {}) => {
+      const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
+      const found = [];
+      for (const pathEnvPart of pathEnv) {
+        const p = getPathPart(pathEnvPart, cmd);
+        for (const ext of pathExt) {
+          const withExt = p + ext;
+          const is = isexe.sync(withExt, { pathExt: pathExtExe, ignoreErrors: true });
+          if (is) {
+            if (!opt.all) {
+              return withExt;
+            }
+            found.push(withExt);
+          }
+        }
+      }
+      if (opt.all && found.length) {
+        return found;
+      }
+      if (opt.nothrow) {
+        return null;
+      }
+      throw getNotFoundError(cmd);
+    };
+    module2.exports = which2;
+    which2.sync = whichSync;
+  }
+});
+
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -2654,10 +2742,10 @@ __export(src_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(src_exports);
-var import_path = require("path");
-var import_execa2 = __toESM(require_execa());
 var import_fs = __toESM(require("fs"));
+var import_execa2 = __toESM(require_execa());
 var import_util = require("util");
+var import_path = require("path");
 var import_build_utils3 = require("@vercel/build-utils");
 
 // src/install.ts
@@ -2762,7 +2850,20 @@ async function installRequirementsFile({
 
 // src/version.ts
 var import_build_utils2 = require("@vercel/build-utils");
+var import_which = __toESM(require_lib());
 var allOptions = [
+  {
+    version: "3.11",
+    pipPath: "pip3.11",
+    pythonPath: "python3.11",
+    runtime: "python3.11"
+  },
+  {
+    version: "3.10",
+    pipPath: "pip3.10",
+    pythonPath: "python3.10",
+    runtime: "python3.10"
+  },
   {
     version: "3.9",
     pipPath: "pip3.9",
@@ -2791,7 +2892,15 @@ function getLatestPythonVersion({
   if (isDev) {
     return getDevPythonVersion();
   }
-  return allOptions[0];
+  const selection = allOptions.find(isInstalled2);
+  if (!selection) {
+    throw new import_build_utils2.NowBuildError({
+      code: "PYTHON_NOT_FOUND",
+      link: "http://vercel.link/python-version",
+      message: `Unable to find any supported Python versions.`
+    });
+  }
+  return selection;
 }
 function getSupportedPythonVersion({
   isDev,
@@ -2802,7 +2911,9 @@ function getSupportedPythonVersion({
   }
   let selection = getLatestPythonVersion({ isDev: false });
   if (typeof pipLockPythonVersion === "string") {
-    const found = allOptions.find((o) => o.version === pipLockPythonVersion);
+    const found = allOptions.find(
+      (o) => o.version === pipLockPythonVersion && isInstalled2(o)
+    );
     if (found) {
       selection = found;
     } else {
@@ -2830,6 +2941,9 @@ function isDiscontinued({ discontinueDate }) {
   const today = Date.now();
   return discontinueDate !== void 0 && discontinueDate.getTime() <= today;
 }
+function isInstalled2({ pipPath, pythonPath }) {
+  return Boolean(import_which.default.sync(pipPath, { nothrow: true })) && Boolean(import_which.default.sync(pythonPath, { nothrow: true }));
+}
 
 // src/index.ts
 var readFile = (0, import_util.promisify)(import_fs.default.readFile);
@@ -2961,19 +3075,20 @@ var build = async ({
   const entrypointWithSuffix = `${entrypoint}${suffix}`;
   (0, import_build_utils3.debug)("Entrypoint with suffix is", entrypointWithSuffix);
   const handlerPyContents = originalHandlerPyContents.replace(/__VC_HANDLER_MODULE_NAME/g, moduleName).replace(/__VC_HANDLER_ENTRYPOINT/g, entrypointWithSuffix);
-  const handlerPyFilename = "vc__handler__python";
-  await writeFile((0, import_path.join)(workPath, `${handlerPyFilename}.py`), handlerPyContents);
   const globOptions = {
     cwd: workPath,
     ignore: config && typeof config.excludeFiles === "string" ? config.excludeFiles : "node_modules/**"
   };
-  const lambda = await (0, import_build_utils3.createLambda)({
-    files: await (0, import_build_utils3.glob)("**", globOptions),
+  const files = await (0, import_build_utils3.glob)("**", globOptions);
+  const handlerPyFilename = "vc__handler__python";
+  files[`${handlerPyFilename}.py`] = new import_build_utils3.FileBlob({ data: handlerPyContents });
+  const output = new import_build_utils3.Lambda({
+    files,
     handler: `${handlerPyFilename}.vc_handler`,
     runtime: pythonVersion.runtime,
     environment: {}
   });
-  return { output: lambda };
+  return { output };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "4.0.2",
+  "version": "4.1.1",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -15,17 +15,21 @@
   },
   "devDependencies": {
     "@types/execa": "^0.9.0",
+    "@types/fs-extra": "11.0.2",
     "@types/jest": "27.4.1",
     "@types/node": "14.18.33",
-    "@vercel/build-utils": "7.2.1",
-    "@vercel/ncc": "0.24.0",
+    "@types/which": "3.0.0",
+    "@vercel/build-utils": "7.5.1",
     "execa": "^1.0.0",
-    "jest-junit": "16.0.0"
+    "fs-extra": "11.1.1",
+    "jest-junit": "16.0.0",
+    "which": "3.0.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
     "test-unit": "pnpm test test/unit.test.ts",
-    "test-e2e": "pnpm test test/integration-*"
+    "test-e2e": "pnpm test test/integration-*",
+    "type-check": "tsc --noEmit"
   }
 }