@vercel/fun 1.2.1 → 1.3.1

package/dist/src/unzip.js

@@ -1,106 +1,93 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unzip = exports.unzipToTemp = exports.ZipFile = exports.zipFromBuffer = exports.zipFromFile = void 0;
+exports.ZipFile = exports.zipFromBuffer = exports.zipFromFile = void 0;
+exports.unzipToTemp = unzipToTemp;
+exports.unzip = unzip;
 const node_os_1 = require("node:os");
 const stat_mode_1 = __importDefault(require("stat-mode"));
-const promisepipe_1 = __importDefault(require("promisepipe"));
 const debug_1 = __importDefault(require("debug"));
 const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
-const stream_to_promise_1 = __importDefault(require("stream-to-promise"));
+const consumers_1 = require("node:stream/consumers");
+const promises_2 = require("node:stream/promises");
 const yauzl_promise_1 = require("yauzl-promise");
 Object.defineProperty(exports, "ZipFile", { enumerable: true, get: function () { return yauzl_promise_1.ZipFile; } });
 Object.defineProperty(exports, "zipFromFile", { enumerable: true, get: function () { return yauzl_promise_1.open; } });
 Object.defineProperty(exports, "zipFromBuffer", { enumerable: true, get: function () { return yauzl_promise_1.fromBuffer; } });
 const debug = (0, debug_1.default)('@vercel/fun:unzip');
-function unzipToTemp(data, tmpDir = (0, node_os_1.tmpdir)()) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const dir = (0, node_path_1.join)(tmpDir, `zeit-fun-${Math.random()
-            .toString(16)
-            .substring(2)}`);
-        let zip;
-        if (Buffer.isBuffer(data)) {
-            debug('Unzipping buffer (length=%o) to temp dir %o', data.length, dir);
-            zip = yield (0, yauzl_promise_1.fromBuffer)(data);
-        }
-        else {
-            debug('Unzipping %o to temp dir %o', data, dir);
-            zip = yield (0, yauzl_promise_1.open)(data);
-        }
-        yield unzip(zip, dir);
-        yield zip.close();
-        debug('Finished unzipping to %o', dir);
-        return dir;
-    });
+async function unzipToTemp(data, tmpDir = (0, node_os_1.tmpdir)()) {
+    const dir = (0, node_path_1.join)(tmpDir, `zeit-fun-${Math.random()
+        .toString(16)
+        .substring(2)}`);
+    let zip;
+    if (Buffer.isBuffer(data)) {
+        debug('Unzipping buffer (length=%o) to temp dir %o', data.length, dir);
+        zip = await (0, yauzl_promise_1.fromBuffer)(data);
+    }
+    else {
+        debug('Unzipping %o to temp dir %o', data, dir);
+        zip = await (0, yauzl_promise_1.open)(data);
+    }
+    await unzip(zip, dir);
+    await zip.close();
+    debug('Finished unzipping to %o', dir);
+    return dir;
 }
-exports.unzipToTemp = unzipToTemp;
 const getMode = (entry) => new stat_mode_1.default({ mode: entry.externalFileAttributes >>> 16 });
-function unzip(zipFile, dir, opts = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let entry;
-        const strip = opts.strip || 0;
-        while ((entry = yield zipFile.readEntry()) !== null) {
-            const fileName = strip === 0
-                ? entry.fileName
-                : entry.fileName
-                    .split('/')
-                    .slice(strip)
-                    .join('/');
-            const destPath = (0, node_path_1.join)(dir, fileName);
-            if (/\/$/.test(entry.fileName)) {
-                debug('Creating directory %o', destPath);
-                yield (0, promises_1.mkdir)(destPath, { recursive: true });
+async function unzip(zipFile, dir, opts = {}) {
+    let entry;
+    const strip = opts.strip || 0;
+    while ((entry = await zipFile.readEntry()) !== null) {
+        const fileName = strip === 0
+            ? entry.fileName
+            : entry.fileName
+                .split('/')
+                .slice(strip)
+                .join('/');
+        const destPath = (0, node_path_1.join)(dir, fileName);
+        if (/\/$/.test(entry.fileName)) {
+            debug('Creating directory %o', destPath);
+            await (0, promises_1.mkdir)(destPath, { recursive: true });
+        }
+        else {
+            const [entryStream] = await Promise.all([
+                entry.openReadStream(),
+                // ensure parent directory exists
+                (0, promises_1.mkdir)((0, node_path_1.dirname)(destPath), { recursive: true })
+            ]);
+            const mode = getMode(entry);
+            if (mode.isSymbolicLink()) {
+                const linkDest = await (0, consumers_1.text)(entryStream);
+                debug('Creating symboling link %o to %o', destPath, linkDest);
+                await (0, promises_1.symlink)(linkDest, destPath);
             }
             else {
-                const [entryStream] = yield Promise.all([
-                    entry.openReadStream(),
-                    // ensure parent directory exists
-                    (0, promises_1.mkdir)((0, node_path_1.dirname)(destPath), { recursive: true })
-                ]);
-                const mode = getMode(entry);
-                if (mode.isSymbolicLink()) {
-                    const linkDest = String(yield (0, stream_to_promise_1.default)(entryStream));
-                    debug('Creating symboling link %o to %o', destPath, linkDest);
-                    yield (0, promises_1.symlink)(linkDest, destPath);
+                const modeOctal = mode.toOctal();
+                const modeVal = parseInt(modeOctal, 8);
+                if (modeVal === 0) {
+                    debug('Unzipping file to %o', destPath);
                 }
                 else {
-                    const modeOctal = mode.toOctal();
-                    const modeVal = parseInt(modeOctal, 8);
-                    if (modeVal === 0) {
-                        debug('Unzipping file to %o', destPath);
-                    }
-                    else {
-                        debug('Unzipping file to %o with mode %s (%s)', destPath, modeOctal, String(mode));
-                    }
-                    try {
-                        yield (0, promises_1.unlink)(destPath);
-                    }
-                    catch (err) {
-                        if (err.code !== 'ENOENT') {
-                            throw err;
-                        }
+                    debug('Unzipping file to %o with mode %s (%s)', destPath, modeOctal, String(mode));
+                }
+                try {
+                    await (0, promises_1.unlink)(destPath);
+                }
+                catch (err) {
+                    if (err.code !== 'ENOENT') {
+                        throw err;
                     }
-                    const destStream = (0, node_fs_1.createWriteStream)(destPath, {
-                        mode: modeVal
-                    });
-                    yield (0, promisepipe_1.default)(entryStream, destStream);
                 }
+                const destStream = (0, node_fs_1.createWriteStream)(destPath, {
+                    mode: modeVal
+                });
+                await (0, promises_2.pipeline)(entryStream, destStream);
             }
         }
-    });
+    }
 }
-exports.unzip = unzip;
 //# sourceMappingURL=unzip.js.map

package/dist/src/unzip.js.map

@@ -1 +1 @@
-{"version":3,"file":"unzip.js","sourceRoot":"","sources":["../../src/unzip.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"unzip.js","sourceRoot":"","sources":["../../src/unzip.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fun",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "Local Lambda development environment",
   "main": "dist/src/index",
   "typings": "dist/src/index",
@@ -27,11 +27,9 @@
     "ms": "2.1.1",
     "node-fetch": "2.6.7",
     "path-to-regexp": "8.2.0",
-    "promisepipe": "3.0.0",
     "semver": "7.5.4",
     "stat-mode": "0.3.0",
-    "stream-to-promise": "2.2.0",
-    "tar": "6.2.1",
+    "tar": "7.5.7",
     "tinyexec": "0.3.2",
     "tree-kill": "1.2.2",
     "uid-promise": "1.0.0",
@@ -43,7 +41,7 @@
     "@types/debug": "4.1.9",
     "@types/generic-pool": "3.1.9",
     "@types/micro": "7.3.6",
-    "@types/node": "18.19.74",
+    "@types/node": "20.19.33",
     "@types/node-fetch": "2.5.0",
     "@types/tar": "4.0.0",
     "@types/yauzl-promise": "2.1.0",
@@ -54,7 +52,7 @@
     "pre-commit": "1.2.2",
     "prettier": "1.15.3",
     "source-map-support": "0.5.10",
-    "typescript": "4.9.3",
+    "typescript": "5.9.3",
     "vitest": "3.0.5"
   },
   "pre-commit": "lint:staged",
@@ -66,6 +64,6 @@
   },
   "packageManager": "pnpm@10.1.0",
   "engines": {
-    "node": ">= 18"
+    "node": ">= 20"
   }
 }