neon 3.0.0 → 3.1.0

package/dist/utils/enrichers.js

@@ -1,159 +1,106 @@
 import { isNeonApiError, messageFromBody } from "../api.js";
 import { isConfigInit, isCurrentBranchProbe } from "../context.js";
 import { looksLikeBranchId } from "./formats.js";
-export const branchIdResolve = async ({ branch, apiClient, projectId, }) => {
-    branch = branch.toString();
-    if (looksLikeBranchId(branch)) {
-        return branch;
-    }
-    const { data } = await apiClient.listProjectBranches({
-        projectId,
-    });
-    const branchData = data.branches.find((b) => b.name === branch);
-    if (!branchData) {
-        throw new Error(`Branch ${branch} not found.\nAvailable branches: ${data.branches
-            .map((b) => b.name)
-            .join(", ")}`);
-    }
-    return branchData.id;
+//#region src/utils/enrichers.ts
+const branchIdResolve = async ({ branch, apiClient, projectId }) => {
+	branch = branch.toString();
+	if (looksLikeBranchId(branch)) return branch;
+	const { data } = await apiClient.listProjectBranches({ projectId });
+	const branchData = data.branches.find((b) => b.name === branch);
+	if (!branchData) throw new Error(`Branch ${branch} not found.\nAvailable branches: ${data.branches.map((b) => b.name).join(", ")}`);
+	return branchData.id;
 };
 const getBranchIdFromProps = async (props) => {
-    const branch = "branch" in props && typeof props.branch === "string"
-        ? props.branch
-        : props.id;
-    if (branch) {
-        return await branchIdResolve({
-            branch,
-            apiClient: props.apiClient,
-            projectId: props.projectId,
-        });
-    }
-    const { data } = await props.apiClient.listProjectBranches({
-        projectId: props.projectId,
-    });
-    const defaultBranch = data.branches.find((b) => b.default);
-    if (defaultBranch) {
-        return defaultBranch.id;
-    }
-    throw new Error("No default branch found");
+	const branch = "branch" in props && typeof props.branch === "string" ? props.branch : props.id;
+	if (branch) return await branchIdResolve({
+		branch,
+		apiClient: props.apiClient,
+		projectId: props.projectId
+	});
+	const { data } = await props.apiClient.listProjectBranches({ projectId: props.projectId });
+	const defaultBranch = data.branches.find((b) => b.default);
+	if (defaultBranch) return defaultBranch.id;
+	throw new Error("No default branch found");
 };
-export const branchIdFromProps = async (props) => {
-    props.branchId = await getBranchIdFromProps(props);
-    return props.branchId;
+const branchIdFromProps = async (props) => {
+	props.branchId = await getBranchIdFromProps(props);
+	return props.branchId;
 };
-export const resolveBranchRef = async (props) => {
-    const branch = typeof props.branch === "string" ? props.branch : props.id;
-    const { data } = await props.apiClient.listProjectBranches({
-        projectId: props.projectId,
-    });
-    const branches = data.branches;
-    if (branch) {
-        const ref = branch.toString();
-        const found = looksLikeBranchId(ref)
-            ? branches.find((b) => b.id === ref)
-            : branches.find((b) => b.name === ref);
-        if (found) {
-            return {
-                branchId: found.id,
-                branchName: found.name ?? found.id,
-                usedDefault: false,
-            };
-        }
-        // A `br-…` id absent from the listing is still usable as an id (trust it like
-        // branchIdResolve does); only an unresolved *name* is a genuine error.
-        if (looksLikeBranchId(ref)) {
-            return { branchId: ref, branchName: ref, usedDefault: false };
-        }
-        throw new Error(`Branch ${ref} not found.\nAvailable branches: ${branches
-            .map((b) => b.name)
-            .join(", ")}`);
-    }
-    const defaultBranch = branches.find((b) => b.default);
-    if (!defaultBranch) {
-        throw new Error("No default branch found");
-    }
-    return {
-        branchId: defaultBranch.id,
-        branchName: defaultBranch.name ?? defaultBranch.id,
-        usedDefault: true,
-    };
+const resolveBranchRef = async (props) => {
+	const branch = typeof props.branch === "string" ? props.branch : props.id;
+	const { data } = await props.apiClient.listProjectBranches({ projectId: props.projectId });
+	const branches = data.branches;
+	if (branch) {
+		const ref = branch.toString();
+		const found = looksLikeBranchId(ref) ? branches.find((b) => b.id === ref) : branches.find((b) => b.name === ref);
+		if (found) return {
+			branchId: found.id,
+			branchName: found.name ?? found.id,
+			usedDefault: false
+		};
+		if (looksLikeBranchId(ref)) return {
+			branchId: ref,
+			branchName: ref,
+			usedDefault: false
+		};
+		throw new Error(`Branch ${ref} not found.\nAvailable branches: ${branches.map((b) => b.name).join(", ")}`);
+	}
+	const defaultBranch = branches.find((b) => b.default);
+	if (!defaultBranch) throw new Error("No default branch found");
+	return {
+		branchId: defaultBranch.id,
+		branchName: defaultBranch.name ?? defaultBranch.id,
+		usedDefault: true
+	};
 };
-export const resolveSingleDatabase = async (props) => {
-    const { data } = await props.apiClient.listProjectBranchDatabases(props.projectId, props.branchId);
-    const databases = data.databases;
-    if (props.database !== undefined) {
-        if (!databases.find((d) => d.name === props.database)) {
-            throw new Error(`Database not found: ${props.database}. Available databases on branch ${props.branchId}: ${databases.map((d) => d.name).join(", ")}`);
-        }
-        return props.database;
-    }
-    if (databases.length === 0) {
-        throw new Error(`No databases found for the branch: ${props.branchId}`);
-    }
-    if (databases.length === 1) {
-        return databases[0].name;
-    }
-    throw new Error(`Multiple databases found for the branch, please provide one with the --database option: ${databases.map((d) => d.name).join(", ")}`);
+const resolveSingleDatabase = async (props) => {
+	const { data } = await props.apiClient.listProjectBranchDatabases(props.projectId, props.branchId);
+	const databases = data.databases;
+	if (props.database !== void 0) {
+		if (!databases.find((d) => d.name === props.database)) throw new Error(`Database not found: ${props.database}. Available databases on branch ${props.branchId}: ${databases.map((d) => d.name).join(", ")}`);
+		return props.database;
+	}
+	if (databases.length === 0) throw new Error(`No databases found for the branch: ${props.branchId}`);
+	if (databases.length === 1) return databases[0].name;
+	throw new Error(`Multiple databases found for the branch, please provide one with the --database option: ${databases.map((d) => d.name).join(", ")}`);
 };
-export const fillSingleProject = async (props) => {
-    // The offline `--current-branch` probe needs no project at all and runs with no
-    // API client (auth was skipped), so resolving a single project here would both
-    // hit the network and dereference a null client. Skip it entirely.
-    if (isCurrentBranchProbe(props)) {
-        return props;
-    }
-    // `config init` is purely local (scaffold + npm install) and runs with no API
-    // client, so resolving a single project here would dereference a null client.
-    if (isConfigInit(props)) {
-        return props;
-    }
-    if (props.projectId) {
-        return { ...props, projectId: props.projectId };
-    }
-    // If no orgId is provided, try to auto-fill it if there's only one org
-    let orgId = props.orgId;
-    if (!orgId) {
-        const { data: orgsData } = await props.apiClient.getCurrentUserOrganizations();
-        if (orgsData.organizations.length === 1) {
-            orgId = orgsData.organizations[0].id;
-        }
-    }
-    try {
-        const { data } = await props.apiClient.listProjects({
-            limit: 2,
-            org_id: orgId,
-        });
-        if (data.projects.length === 0) {
-            throw new Error("No projects found");
-        }
-        if (data.projects.length > 1) {
-            throw new Error(`Multiple projects found, please provide one with the --project-id option`);
-        }
-        return {
-            ...props,
-            projectId: data.projects[0].id,
-        };
-    }
-    catch (error) {
-        // If the API error is about missing org_id, provide a user-friendly message
-        if (isNeonApiError(error) &&
-            error.status === 400 &&
-            messageFromBody(error.data)?.includes("org_id is required")) {
-            throw new Error("Multiple projects found, please provide one with the --project-id option");
-        }
-        throw error;
-    }
+const fillSingleProject = async (props) => {
+	if (isCurrentBranchProbe(props)) return props;
+	if (isConfigInit(props)) return props;
+	if (props.projectId) return {
+		...props,
+		projectId: props.projectId
+	};
+	let orgId = props.orgId;
+	if (!orgId) {
+		const { data: orgsData } = await props.apiClient.getCurrentUserOrganizations();
+		if (orgsData.organizations.length === 1) orgId = orgsData.organizations[0].id;
+	}
+	try {
+		const { data } = await props.apiClient.listProjects({
+			limit: 2,
+			org_id: orgId
+		});
+		if (data.projects.length === 0) throw new Error("No projects found");
+		if (data.projects.length > 1) throw new Error(`Multiple projects found, please provide one with the --project-id option`);
+		return {
+			...props,
+			projectId: data.projects[0].id
+		};
+	} catch (error) {
+		if (isNeonApiError(error) && error.status === 400 && messageFromBody(error.data)?.includes("org_id is required")) throw new Error("Multiple projects found, please provide one with the --project-id option");
+		throw error;
+	}
 };
-export const fillSingleOrg = async (props) => {
-    if (props.orgId) {
-        return props;
-    }
-    const { data } = await props.apiClient.getCurrentUserOrganizations();
-    if (data.organizations.length === 0) {
-        throw new Error("No organizations found");
-    }
-    if (data.organizations.length > 1) {
-        throw new Error(`Multiple organizations found, please provide one with the --org-id option`);
-    }
-    return { ...props, orgId: data.organizations[0].id };
+const fillSingleOrg = async (props) => {
+	if (props.orgId) return props;
+	const { data } = await props.apiClient.getCurrentUserOrganizations();
+	if (data.organizations.length === 0) throw new Error("No organizations found");
+	if (data.organizations.length > 1) throw new Error(`Multiple organizations found, please provide one with the --org-id option`);
+	return {
+		...props,
+		orgId: data.organizations[0].id
+	};
 };
+//#endregion
+export { branchIdFromProps, branchIdResolve, fillSingleOrg, fillSingleProject, resolveBranchRef, resolveSingleDatabase };

package/dist/utils/esbuild.js

@@ -1,210 +1,151 @@
-import { spawn } from "node:child_process";
+import { globalInstallCommand, resolveInvokingPackageManager } from "./package_manager.js";
 import { existsSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
-import { tmpdir } from "node:os";
 import { basename, join } from "node:path";
+import { tmpdir } from "node:os";
+import { spawn } from "node:child_process";
 import which from "which";
-const NOT_FOUND = "esbuild not found. neon ships esbuild for most platforms; if you see " +
-    "this, install esbuild and ensure it is on your PATH (e.g. `npm i -g " +
-    "esbuild`), or set NEON_ESBUILD_PATH to an esbuild binary.";
-// Prepended to the ESM bundle. Bundled dependencies are frequently CommonJS, but an ESM
-// output (`--format=esm`) has no `require` / `__filename` / `__dirname` in scope — so any
-// bundled CJS code that calls `require(...)` would fail at load with
-// `Dynamic require of "x" is not supported`. Re-create those globals via `createRequire`
-// so CJS and ESM dependencies coexist in the single `index.mjs`.
+//#region src/utils/esbuild.ts
+const notFoundMessage = () => {
+	const install = globalInstallCommand(resolveInvokingPackageManager(), "esbuild");
+	const how = install ? `install esbuild and ensure it is on your PATH (e.g. \`${install.command} ${install.args.join(" ")}\`), or ` : "put an esbuild binary on your PATH, or ";
+	return `esbuild not found. neon ships esbuild for most platforms, so this is unexpected. ${how[0].toUpperCase()}${how.slice(1)}set NEON_ESBUILD_PATH to an esbuild binary.`;
+};
 const ESM_CJS_INTEROP_BANNER = "import{createRequire as ___cr}from'module';import{fileURLToPath as ___f}from'url';import{dirname as ___d}from'path';const require=___cr(import.meta.url);const __filename=___f(import.meta.url);const __dirname=___d(__filename);";
 const defaultDeps = {
-    // @yao-pkg/pkg defines process.pkg inside the packaged binary.
-    isPackaged: () => process.pkg !== undefined,
-    loadEsbuild: (name) => import(name),
+	isPackaged: () => process.pkg !== void 0,
+	loadEsbuild: (name) => import(name)
 };
-// Internal signal: the esbuild JS module could not be imported (exotic platform
-// or not installed). Tells bundleEntry to fall back to the binary; never shown
-// to the user.
-class ModuleNotAvailable extends Error {
-}
+var ModuleNotAvailable = class extends Error {};
 const message = (err) => err instanceof Error ? err.message : String(err);
 const toFilesByBasename = (files) => {
-    const out = {};
-    for (const f of files)
-        out[basename(f.path)] = f.contents;
-    return out;
+	const out = {};
+	for (const f of files) out[basename(f.path)] = f.contents;
+	return out;
 };
 const bundleViaModule = async (source, loadEsbuild, externalPackages) => {
-    // esbuild is resolved by a COMPUTED specifier, never the literal string
-    // 'esbuild'. Both rollup (bundle step) and @yao-pkg/pkg (binary step)
-    // statically scan for literal import()/require() calls and would otherwise
-    // pull esbuild and its native Go binary into the bundle/snapshot — bloating
-    // the packaged CLI and emitting "cannot bundle native binary" warnings. The
-    // packaged binary never imports esbuild at all (the isPackaged guard sends it
-    // to the binary path), so keeping this specifier invisible to the scanners is
-    // what keeps esbuild out of the snapshot.
-    // Do NOT "simplify" this back to import('esbuild').
-    const name = ["es", "build"].join("");
-    let esbuild;
-    try {
-        esbuild = await loadEsbuild(name);
-    }
-    catch {
-        throw new ModuleNotAvailable();
-    }
-    // Mirrors the binary-path bundling flags; write:false keeps output in memory.
-    // logLevel:'silent' suppresses esbuild's own stderr — the rejected error
-    // still carries the diagnostic, matching the binary path's captured-stderr.
-    const result = await esbuild
-        .build({
-        entryPoints: [source],
-        bundle: true,
-        // Emit `index.mjs` (not `out.js`): the Functions runtime imports the archive's entry
-        // by the conventional `index.{js,mjs}` name, and `.mjs` makes Node treat the ESM
-        // output as a module without needing a `package.json` type marker alongside it.
-        outfile: "index.mjs",
-        write: false,
-        minify: true,
-        format: "esm",
-        platform: "node",
-        // Bundle dependencies into the entry so the deployed archive is self-contained (the
-        // Functions runtime has no node_modules). Node built-ins stay external on
-        // platform:'node'. The banner re-creates require/__filename/__dirname for bundled CJS.
-        banner: { js: ESM_CJS_INTEROP_BANNER },
-        // Only what the policy declared unbundleable; everything else is still inlined.
-        external: [...externalPackages],
-        // Reveals which packages were inlined, so a deploy can report an undeclared
-        // native dependency. Free here — esbuild is already running.
-        metafile: true,
-        logLevel: "silent",
-    })
-        .catch((err) => {
-        throw new Error(`Failed to bundle function from ${source}. ${message(err)}`.trim());
-    });
-    const files = result.outputFiles ?? [];
-    // write:false with one entry always yields index.mjs (no source map — we don't emit one);
-    // an empty set means the API contract changed under us — fail loud rather than ship an
-    // empty archive.
-    if (files.length === 0) {
-        throw new Error(`Failed to bundle function from ${source}. esbuild produced no output.`);
-    }
-    return {
-        files: toFilesByBasename(files),
-        ...(result.metafile ? { metafile: result.metafile } : {}),
-        warnings: [],
-    };
+	const name = ["es", "build"].join("");
+	let esbuild;
+	try {
+		esbuild = await loadEsbuild(name);
+	} catch {
+		throw new ModuleNotAvailable();
+	}
+	const result = await esbuild.build({
+		entryPoints: [source],
+		bundle: true,
+		outfile: "index.mjs",
+		write: false,
+		minify: true,
+		format: "esm",
+		platform: "node",
+		banner: { js: ESM_CJS_INTEROP_BANNER },
+		external: [...externalPackages],
+		metafile: true,
+		logLevel: "silent"
+	}).catch((err) => {
+		throw new Error(`Failed to bundle function from ${source}. ${message(err)}`.trim());
+	});
+	const files = result.outputFiles ?? [];
+	if (files.length === 0) throw new Error(`Failed to bundle function from ${source}. esbuild produced no output.`);
+	return {
+		files: toFilesByBasename(files),
+		...result.metafile ? { metafile: result.metafile } : {},
+		warnings: []
+	};
 };
-// Find the esbuild binary at deploy time. An explicit override is authoritative
-// (so it fails loudly if wrong); otherwise prefer the host PATH, then a locally
-// installed copy.
 const resolveEsbuild = () => {
-    const override = process.env.NEON_ESBUILD_PATH;
-    if (override) {
-        if (existsSync(override))
-            return override;
-        throw new Error(NOT_FOUND);
-    }
-    const onPath = which.sync("esbuild", { nothrow: true });
-    if (onPath)
-        return onPath;
-    // CWD-relative (not install-relative): helps the dev checkout where esbuild is
-    // a devDependency. In `npm i -g` and pkg installs the PATH branch above wins.
-    const local = join(process.cwd(), "node_modules", ".bin", "esbuild");
-    if (existsSync(local))
-        return local;
-    throw new Error(NOT_FOUND);
+	const override = process.env.NEON_ESBUILD_PATH;
+	if (override) {
+		if (existsSync(override)) return override;
+		throw new Error(`NEON_ESBUILD_PATH is set to ${override}, but no file exists there. Point it at an esbuild binary, or unset it to use the one neon ships.`);
+	}
+	const onPath = which.sync("esbuild", { nothrow: true });
+	if (onPath) return onPath;
+	const local = join(process.cwd(), "node_modules", ".bin", "esbuild");
+	if (existsSync(local)) return local;
+	throw new Error(notFoundMessage());
 };
 const runEsbuild = (bin, args) => new Promise((resolve, reject) => {
-    // stderr is captured (NOT inherited): with --log-level=error a success emits
-    // nothing, and a failure's diagnostic is read out below. Never use 'inherit'.
-    const child = spawn(bin, args, { stdio: ["ignore", "ignore", "pipe"] });
-    let stderr = "";
-    child.stderr.on("data", (chunk) => {
-        stderr += chunk.toString();
-    });
-    child.on("error", reject);
-    child.on("close", (code) => {
-        resolve({ code, stderr });
-    });
+	const child = spawn(bin, args, { stdio: [
+		"ignore",
+		"ignore",
+		"pipe"
+	] });
+	let stderr = "";
+	child.stderr.on("data", (chunk) => {
+		stderr += chunk.toString();
+	});
+	child.on("error", reject);
+	child.on("close", (code) => {
+		resolve({
+			code,
+			stderr
+		});
+	});
 });
 const bundleViaBinary = async (source, externalPackages) => {
-    const bin = resolveEsbuild();
-    const outDir = mkdtempSync(join(tmpdir(), "neon-fn-bundle-"));
-    const outfile = join(outDir, "index.mjs");
-    const metafilePath = join(outDir, "meta.json");
-    try {
-        const { code, stderr } = await runEsbuild(bin, [
-            source,
-            "--bundle",
-            `--outfile=${outfile}`,
-            "--minify",
-            "--format=esm",
-            "--platform=node",
-            `--banner:js=${ESM_CJS_INTEROP_BANNER}`,
-            // One flag per package, mirroring the module path's `external` array.
-            ...externalPackages.map((pkg) => `--external:${pkg}`),
-            // Written beside the output so a deploy can report an undeclared native
-            // dependency here too, not only on the module path.
-            `--metafile=${metafilePath}`,
-            "--log-level=error",
-        ]);
-        if (code !== 0) {
-            throw new Error(`Failed to bundle function from ${source}. ${stderr.trim()}`.trim());
-        }
-        // No `--sourcemap`: the Functions runtime has no source-map support, so an uploaded
-        // `index.mjs.map` is never consumed — emitting it only inflated the archive.
-        const metafile = readMetafile(metafilePath);
-        return {
-            files: { "index.mjs": new Uint8Array(readFileSync(outfile)) },
-            ...(metafile.metafile ? { metafile: metafile.metafile } : {}),
-            warnings: metafile.warnings,
-        };
-    }
-    finally {
-        rmSync(outDir, { recursive: true, force: true });
-    }
+	const bin = resolveEsbuild();
+	const outDir = mkdtempSync(join(tmpdir(), "neon-fn-bundle-"));
+	const outfile = join(outDir, "index.mjs");
+	const metafilePath = join(outDir, "meta.json");
+	try {
+		const { code, stderr } = await runEsbuild(bin, [
+			source,
+			"--bundle",
+			`--outfile=${outfile}`,
+			"--minify",
+			"--format=esm",
+			"--platform=node",
+			`--banner:js=${ESM_CJS_INTEROP_BANNER}`,
+			...externalPackages.map((pkg) => `--external:${pkg}`),
+			`--metafile=${metafilePath}`,
+			"--log-level=error"
+		]);
+		if (code !== 0) throw new Error(`Failed to bundle function from ${source}. ${stderr.trim()}`.trim());
+		const metafile = readMetafile(metafilePath);
+		return {
+			files: { "index.mjs": new Uint8Array(readFileSync(outfile)) },
+			...metafile.metafile ? { metafile: metafile.metafile } : {},
+			warnings: metafile.warnings
+		};
+	} finally {
+		rmSync(outDir, {
+			recursive: true,
+			force: true
+		});
+	}
 };
 /**
- * Read the metafile the binary path asked esbuild to write.
- *
- * We always pass `--metafile`, so an unreadable one means esbuild did not do what it was
- * told. That is worth saying rather than swallowing — but not worth failing a deploy over,
- * because the metafile only powers an advisory report. Reported and skipped.
- */
+* Read the metafile the binary path asked esbuild to write.
+*
+* We always pass `--metafile`, so an unreadable one means esbuild did not do what it was
+* told. That is worth saying rather than swallowing — but not worth failing a deploy over,
+* because the metafile only powers an advisory report. Reported and skipped.
+*/
 const readMetafile = (path) => {
-    let parsed;
-    try {
-        parsed = JSON.parse(readFileSync(path, "utf8"));
-    }
-    catch (cause) {
-        return {
-            warnings: [
-                `esbuild was asked for a metafile but none could be read (${message(cause)}). ` +
-                    `The bundle is unaffected; this deploy cannot check for an undeclared ` +
-                    `native dependency.`,
-            ],
-        };
-    }
-    if (typeof parsed !== "object" || parsed === null) {
-        return {
-            warnings: [
-                "esbuild wrote a metafile that is not an object. The bundle is unaffected; " +
-                    "this deploy cannot check for an undeclared native dependency.",
-            ],
-        };
-    }
-    return { metafile: parsed, warnings: [] };
+	let parsed;
+	try {
+		parsed = JSON.parse(readFileSync(path, "utf8"));
+	} catch (cause) {
+		return { warnings: [`esbuild was asked for a metafile but none could be read (${message(cause)}). The bundle is unaffected; this deploy cannot check for an undeclared native dependency.`] };
+	}
+	if (typeof parsed !== "object" || parsed === null) return { warnings: ["esbuild wrote a metafile that is not an object. The bundle is unaffected; this deploy cannot check for an undeclared native dependency."] };
+	return {
+		metafile: parsed,
+		warnings: []
+	};
 };
-// Bundle `source` into the files the Functions archive expects, keyed by
-// basename. npm installs bundle in-process via the esbuild module; the packaged
-// binary (and platforms esbuild can't run on) shell out to an esbuild binary.
-export const bundleEntry = async (source, options = {}) => {
-    const isPackaged = options.isPackaged ?? defaultDeps.isPackaged;
-    const loadEsbuild = options.loadEsbuild ?? defaultDeps.loadEsbuild;
-    const external = options.externalPackages ?? [];
-    if (isPackaged())
-        return bundleViaBinary(source, external);
-    try {
-        return await bundleViaModule(source, loadEsbuild, external);
-    }
-    catch (err) {
-        if (err instanceof ModuleNotAvailable)
-            return bundleViaBinary(source, external);
-        throw err;
-    }
+const bundleEntry = async (source, options = {}) => {
+	const isPackaged = options.isPackaged ?? defaultDeps.isPackaged;
+	const loadEsbuild = options.loadEsbuild ?? defaultDeps.loadEsbuild;
+	const external = options.externalPackages ?? [];
+	if (isPackaged()) return bundleViaBinary(source, external);
+	try {
+		return await bundleViaModule(source, loadEsbuild, external);
+	} catch (err) {
+		if (err instanceof ModuleNotAvailable) return bundleViaBinary(source, external);
+		throw err;
+	}
 };
+//#endregion
+export { bundleEntry };