neon 3.0.0 → 3.1.1

package/dist/init/vsix.js

@@ -1,111 +1,89 @@
-/**
- * Shared VSIX download utilities for extension installation.
- * Supports corporate proxy via NEON_VSX_GALLERY_URL env var.
- */
+import "./build_config.js";
 import { createWriteStream } from "node:fs";
-import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { tmpdir } from "node:os";
 import { pipeline } from "node:stream/promises";
-import { INTERNAL_VSX_GALLERY } from "./build_config.js";
-export const NEON_EXTENSION_ID = "databricks.neon-local-connect";
+//#region src/init/vsix.ts
+/**
+* Shared VSIX download utilities for extension installation.
+* Supports corporate proxy via NEON_VSX_GALLERY_URL env var.
+*/
+const NEON_EXTENSION_ID = "databricks.neon-local-connect";
 const OPEN_VSX_API = "https://open-vsx.org/api";
 /**
- * Downloads a .vsix file for the Neon extension.
- *
- * Strategy:
- * 1. If NEON_VSX_GALLERY_URL is set, download from the corporate proxy gallery
- * 2. Otherwise, download from the public Open VSX API
- *
- * Returns the path to the temp .vsix file, or null on failure.
- */
-export async function downloadVsix() {
-    // Runtime env var takes priority, then build-time baked value
-    const proxyGallery = process.env.NEON_VSX_GALLERY_URL || INTERNAL_VSX_GALLERY || "";
-    if (proxyGallery) {
-        return downloadFromGallery(proxyGallery);
-    }
-    return downloadFromOpenVsx();
+* Downloads a .vsix file for the Neon extension.
+*
+* Strategy:
+* 1. If NEON_VSX_GALLERY_URL is set, download from the corporate proxy gallery
+* 2. Otherwise, download from the public Open VSX API
+*
+* Returns the path to the temp .vsix file, or null on failure.
+*/
+async function downloadVsix() {
+	const proxyGallery = process.env.NEON_VSX_GALLERY_URL || "";
+	if (proxyGallery) return downloadFromGallery(proxyGallery);
+	return downloadFromOpenVsx();
 }
 /**
- * Downloads from a VS Code marketplace-compatible gallery API (corporate proxy).
- * Uses the VS Code extensionquery POST API to find the VSIX download URL.
- */
+* Downloads from a VS Code marketplace-compatible gallery API (corporate proxy).
+* Uses the VS Code extensionquery POST API to find the VSIX download URL.
+*/
 async function downloadFromGallery(galleryUrl) {
-    const [publisher, name] = NEON_EXTENSION_ID.split(".");
-    const baseUrl = galleryUrl.replace(/\/+$/, "");
-    const queryUrl = `${baseUrl}/extensionquery`;
-    try {
-        // Query the marketplace API for the extension
-        const queryRes = await fetch(queryUrl, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json;api-version=6.1-preview.1",
-            },
-            body: JSON.stringify({
-                filters: [
-                    {
-                        criteria: [
-                            { filterType: 7, value: `${publisher}.${name}` },
-                        ],
-                    },
-                ],
-                flags: 914,
-            }),
-            signal: AbortSignal.timeout(15000),
-        });
-        if (!queryRes.ok)
-            return null;
-        const data = (await queryRes.json());
-        // Find the VSIX download URL from the response
-        const extension = data.results?.[0]?.extensions?.[0];
-        const latestVersion = extension?.versions?.[0];
-        const vsixFile = latestVersion?.files?.find((f) => f.assetType === "Microsoft.VisualStudio.Services.VSIXPackage");
-        if (!vsixFile?.source)
-            return null;
-        // Download the VSIX
-        const vsixRes = await fetch(vsixFile.source, {
-            signal: AbortSignal.timeout(30000),
-            redirect: "follow",
-        });
-        if (!vsixRes.ok || !vsixRes.body)
-            return null;
-        const tmpPath = join(tmpdir(), `${NEON_EXTENSION_ID}-proxy.vsix`);
-        const fileStream = createWriteStream(tmpPath);
-        await pipeline(vsixRes.body, fileStream);
-        return tmpPath;
-    }
-    catch {
-        return null;
-    }
+	const [publisher, name] = NEON_EXTENSION_ID.split(".");
+	const queryUrl = `${galleryUrl.replace(/\/+$/, "")}/extensionquery`;
+	try {
+		const queryRes = await fetch(queryUrl, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json;api-version=6.1-preview.1"
+			},
+			body: JSON.stringify({
+				filters: [{ criteria: [{
+					filterType: 7,
+					value: `${publisher}.${name}`
+				}] }],
+				flags: 914
+			}),
+			signal: AbortSignal.timeout(15e3)
+		});
+		if (!queryRes.ok) return null;
+		const vsixFile = (((await queryRes.json()).results?.[0]?.extensions?.[0])?.versions?.[0])?.files?.find((f) => f.assetType === "Microsoft.VisualStudio.Services.VSIXPackage");
+		if (!vsixFile?.source) return null;
+		const vsixRes = await fetch(vsixFile.source, {
+			signal: AbortSignal.timeout(3e4),
+			redirect: "follow"
+		});
+		if (!vsixRes.ok || !vsixRes.body) return null;
+		const tmpPath = join(tmpdir(), `${NEON_EXTENSION_ID}-proxy.vsix`);
+		const fileStream = createWriteStream(tmpPath);
+		await pipeline(vsixRes.body, fileStream);
+		return tmpPath;
+	} catch {
+		return null;
+	}
 }
 /**
- * Downloads from the public Open VSX API.
- */
+* Downloads from the public Open VSX API.
+*/
 async function downloadFromOpenVsx() {
-    const [publisher, name] = NEON_EXTENSION_ID.split(".");
-    const metaUrl = `${OPEN_VSX_API}/${publisher}/${name}/latest`;
-    try {
-        const metaRes = await fetch(metaUrl, {
-            signal: AbortSignal.timeout(10000),
-        });
-        if (!metaRes.ok)
-            return null;
-        const meta = (await metaRes.json());
-        const downloadUrl = meta.files?.download;
-        if (!downloadUrl)
-            return null;
-        const vsixRes = await fetch(downloadUrl, {
-            signal: AbortSignal.timeout(30000),
-        });
-        if (!vsixRes.ok || !vsixRes.body)
-            return null;
-        const tmpPath = join(tmpdir(), `${NEON_EXTENSION_ID}-${meta.version ?? "latest"}.vsix`);
-        const fileStream = createWriteStream(tmpPath);
-        await pipeline(vsixRes.body, fileStream);
-        return tmpPath;
-    }
-    catch {
-        return null;
-    }
+	const [publisher, name] = NEON_EXTENSION_ID.split(".");
+	const metaUrl = `${OPEN_VSX_API}/${publisher}/${name}/latest`;
+	try {
+		const metaRes = await fetch(metaUrl, { signal: AbortSignal.timeout(1e4) });
+		if (!metaRes.ok) return null;
+		const meta = await metaRes.json();
+		const downloadUrl = meta.files?.download;
+		if (!downloadUrl) return null;
+		const vsixRes = await fetch(downloadUrl, { signal: AbortSignal.timeout(3e4) });
+		if (!vsixRes.ok || !vsixRes.body) return null;
+		const tmpPath = join(tmpdir(), `${NEON_EXTENSION_ID}-${meta.version ?? "latest"}.vsix`);
+		const fileStream = createWriteStream(tmpPath);
+		await pipeline(vsixRes.body, fileStream);
+		return tmpPath;
+	} catch {
+		return null;
+	}
 }
+//#endregion
+export { NEON_EXTENSION_ID, downloadVsix };

package/dist/log.js

@@ -1,18 +1,19 @@
-import { format } from "node:util";
 import { isDebug } from "./env.js";
-export const log = {
-    debug: (...args) => {
-        if (isDebug()) {
-            process.stderr.write(`DEBUG: ${format(...args)}\n`);
-        }
-    },
-    warning: (...args) => {
-        process.stderr.write(`WARNING: ${format(...args)}\n`);
-    },
-    info: (...args) => {
-        process.stderr.write(`INFO: ${format(...args)}\n`);
-    },
-    error: (...args) => {
-        process.stderr.write(`ERROR: ${format(...args)}\n`);
-    },
+import { format } from "node:util";
+//#region src/log.ts
+const log = {
+	debug: (...args) => {
+		if (isDebug()) process.stderr.write(`DEBUG: ${format(...args)}\n`);
+	},
+	warning: (...args) => {
+		process.stderr.write(`WARNING: ${format(...args)}\n`);
+	},
+	info: (...args) => {
+		process.stderr.write(`INFO: ${format(...args)}\n`);
+	},
+	error: (...args) => {
+		process.stderr.write(`ERROR: ${format(...args)}\n`);
+	}
 };
+//#endregion
+export { log };

package/dist/neon_services.js

@@ -1,143 +1,118 @@
+//#region src/neon_services.ts
 /**
- * Every Neon service a `--service` flag can name, spelled the way a user types it — one
- * vocabulary for the whole CLI.
- *
- * Kebab-case rather than the `neon.ts` field names (`aiGateway`, `buckets`) so a flag reads
- * like a flag, and the full product name rather than a shortening (`object-storage`, not
- * `storage`) so nothing is ambiguous when read on its own.
- *
- * Commands take a **subset** of this via {@link ParseServicesOptions.allowed} — `config init`
- * can only declare what a `neon.ts` has a field for, `env pull` can only pull what produces
- * env vars — but the spelling of a service never varies between them. The order here is the
- * canonical one: parsing sorts into it, so a command's output never depends on the order the
- * flags were typed in.
- *
- * Not to be confused with `NeonFeature` in `init/bootstrap.ts`, which is what a *template*
- * requires. That list comes from remote manifests (`neondatabase/examples/bootstrap.yaml`),
- * spells Postgres `database`, and is not ours to rename.
- */
-export const NEON_SERVICES = [
-    "postgres",
-    "auth",
-    "data-api",
-    "functions",
-    "object-storage",
-    "ai-gateway",
+* Every Neon service a `--service` flag can name, spelled the way a user types it — one
+* vocabulary for the whole CLI.
+*
+* Kebab-case rather than the `neon.ts` field names (`aiGateway`, `buckets`) so a flag reads
+* like a flag, and the full product name rather than a shortening (`object-storage`, not
+* `storage`) so nothing is ambiguous when read on its own.
+*
+* Commands take a **subset** of this via {@link ParseServicesOptions.allowed} — `config init`
+* can only declare what a `neon.ts` has a field for, `env pull` can only pull what produces
+* env vars — but the spelling of a service never varies between them. The order here is the
+* canonical one: parsing sorts into it, so a command's output never depends on the order the
+* flags were typed in.
+*
+* Not to be confused with `NeonFeature` in `init/bootstrap.ts`, which is what a *template*
+* requires. That list comes from remote manifests (`neondatabase/examples/bootstrap.yaml`),
+* spells Postgres `database`, and is not ours to rename.
+*/
+const NEON_SERVICES = [
+	"postgres",
+	"auth",
+	"data-api",
+	"functions",
+	"object-storage",
+	"ai-gateway"
 ];
 /**
- * Spellings that used to be canonical, and the service they now mean. Accepted so a scripted
- * `--services storage` keeps working, warned about so it does not quietly become a second
- * vocabulary, and absent from help text, errors, and docs so nobody learns it fresh.
- */
-const DEPRECATED_SERVICE_ALIASES = {
-    // `config init --services storage` shipped before the vocabulary was unified.
-    storage: "object-storage",
-};
+* Spellings that used to be canonical, and the service they now mean. Accepted so a scripted
+* `--services storage` keeps working, warned about so it does not quietly become a second
+* vocabulary, and absent from help text, errors, and docs so nobody learns it fresh.
+*/
+const DEPRECATED_SERVICE_ALIASES = { storage: "object-storage" };
 /** An explicit empty selection, for commands where "declare nothing" is a real answer. */
-export const NO_SERVICES = "none";
+const NO_SERVICES = "none";
 /**
- * What to tell someone still using a retired spelling. A message rather than a log call, so
- * the parser stays free of the CLI's writer and each command can surface it in its own voice.
- */
-export const deprecatedServiceMessage = (used, canonical) => `"${used}" is the old name for "${canonical}" and still works, but it will be removed. ` +
-    `Use "${canonical}".`;
+* What to tell someone still using a retired spelling. A message rather than a log call, so
+* the parser stays free of the CLI's writer and each command can surface it in its own voice.
+*/
+const deprecatedServiceMessage = (used, canonical) => `"${used}" is the old name for "${canonical}" and still works, but it will be removed. Use "${canonical}".`;
 /**
- * Parse the raw values of a services flag into a canonical selection.
- *
- * Accepts the flag repeated (`-s auth -s postgres`) and comma-separated
- * (`-s auth,postgres`), since both read naturally and users will try either. The result is
- * deduplicated and sorted into {@link NEON_SERVICES} order, so what a command does never
- * depends on typing order.
- *
- * An unrecognized name is rejected rather than dropped: a typo would otherwise act on
- * everything *except* the service that was asked for, and report success. A name that is a
- * real service but not one this command supports says so specifically — "functions has no env
- * variables" is a different problem from a typo, and has a different fix.
- */
-export const parseServices = (raw, options) => {
-    const { allowed, flag, noneMeans, whyUnavailable = {}, onDeprecated, } = options;
-    const supported = `Supported values: ${allowed.join(", ")}${noneMeans !== undefined ? `, ${NO_SERVICES}` : ""}.`;
-    const names = raw
-        .flatMap((value) => value.split(","))
-        .map((name) => name.trim())
-        .filter((name) => name !== "");
-    if (names.length === 0) {
-        throw new Error(`${flag} needs at least one service. ${supported}`);
-    }
-    if (noneMeans !== undefined && names.includes(NO_SERVICES)) {
-        // Deduplicate before deciding it was combined with something: a repeated value is
-        // a no-op everywhere else in this parser, so `-s none -s none` must be too.
-        if (new Set(names).size > 1) {
-            throw new Error(`${flag} ${NO_SERVICES} cannot be combined with other services.`);
-        }
-        return [];
-    }
-    // Canonicalize first and unconditionally, so a retired spelling is reported against the
-    // service it means rather than as a word nobody recognizes.
-    const deprecated = new Map();
-    const resolved = names.map((name) => {
-        const canonical = DEPRECATED_SERVICE_ALIASES[name];
-        if (canonical === undefined)
-            return name;
-        deprecated.set(name, canonical);
-        return canonical;
-    });
-    const unsupported = resolved.filter((name) => !allowed.some((service) => service === name));
-    if (unsupported.length > 0) {
-        throw new Error(`${unsupportedMessage(unsupported, flag, whyUnavailable)} ${supported}`);
-    }
-    // Warned only once the selection is valid: a run that fails validation should not also
-    // carry a "still works" claim about a value that never took effect.
-    for (const [used, canonical] of deprecated)
-        onDeprecated?.(used, canonical);
-    return NEON_SERVICES.filter((service) => allowed.includes(service) && resolved.includes(service));
+* Parse the raw values of a services flag into a canonical selection.
+*
+* Accepts the flag repeated (`-s auth -s postgres`) and comma-separated
+* (`-s auth,postgres`), since both read naturally and users will try either. The result is
+* deduplicated and sorted into {@link NEON_SERVICES} order, so what a command does never
+* depends on typing order.
+*
+* An unrecognized name is rejected rather than dropped: a typo would otherwise act on
+* everything *except* the service that was asked for, and report success. A name that is a
+* real service but not one this command supports says so specifically — "functions has no env
+* variables" is a different problem from a typo, and has a different fix.
+*/
+const parseServices = (raw, options) => {
+	const { allowed, flag, noneMeans, whyUnavailable = {}, onDeprecated } = options;
+	const supported = `Supported values: ${allowed.join(", ")}${noneMeans !== void 0 ? `, ${NO_SERVICES}` : ""}.`;
+	const names = raw.flatMap((value) => value.split(",")).map((name) => name.trim()).filter((name) => name !== "");
+	if (names.length === 0) throw new Error(`${flag} needs at least one service. ${supported}`);
+	if (noneMeans !== void 0 && names.includes("none")) {
+		if (new Set(names).size > 1) throw new Error(`${flag} ${NO_SERVICES} cannot be combined with other services.`);
+		return [];
+	}
+	const deprecated = /* @__PURE__ */ new Map();
+	const resolved = names.map((name) => {
+		const canonical = DEPRECATED_SERVICE_ALIASES[name];
+		if (canonical === void 0) return name;
+		deprecated.set(name, canonical);
+		return canonical;
+	});
+	const unsupported = resolved.filter((name) => !allowed.some((service) => service === name));
+	if (unsupported.length > 0) throw new Error(`${unsupportedMessage(unsupported, flag, whyUnavailable)} ${supported}`);
+	for (const [used, canonical] of deprecated) onDeprecated?.(used, canonical);
+	return NEON_SERVICES.filter((service) => allowed.includes(service) && resolved.includes(service));
 };
 /**
- * The sentences explaining why a selection was refused. A real Neon service this command
- * cannot act on is a different mistake from a typo — different cause, different fix — so the
- * two are never answered with the same word, and each service carries its reason where the
- * command supplied one.
- */
+* The sentences explaining why a selection was refused. A real Neon service this command
+* cannot act on is a different mistake from a typo — different cause, different fix — so the
+* two are never answered with the same word, and each service carries its reason where the
+* command supplied one.
+*/
 const unsupportedMessage = (unsupported, flag, whyUnavailable) => {
-    const known = unsupported.filter((name) => NEON_SERVICES.some((service) => service === name));
-    const unknown = unsupported.filter((name) => !known.some((service) => service === name));
-    return [
-        unknown.length > 0
-            ? `Unknown service${unknown.length === 1 ? "" : "s"} ${unknown.join(", ")}.`
-            : undefined,
-        ...known.map((service) => {
-            const why = whyUnavailable[service];
-            return `${service} is not something ${flag} can select${why ? `: ${why}` : ""}.`;
-        }),
-    ]
-        .filter((part) => part !== undefined)
-        .join(" ");
+	const known = unsupported.filter((name) => NEON_SERVICES.some((service) => service === name));
+	const unknown = unsupported.filter((name) => !known.some((service) => service === name));
+	return [unknown.length > 0 ? `Unknown service${unknown.length === 1 ? "" : "s"} ${unknown.join(", ")}.` : void 0, ...known.map((service) => {
+		const why = whyUnavailable[service];
+		return `${service} is not something ${flag} can select${why ? `: ${why}` : ""}.`;
+	})].filter((part) => part !== void 0).join(" ");
 };
 /** Every spelling of the services flag, so a habit picked up on one command works on another. */
-const SERVICE_FLAG_NAMES = ["s", "service", "services"];
+const SERVICE_FLAG_NAMES = [
+	"s",
+	"service",
+	"services"
+];
 /**
- * The yargs option for a services flag, so every command that has one accepts the same
- * spellings (`-s`, `--service`, `--services`) and the same value syntax. `key` is the name the
- * command reads off `argv`; the rest become aliases.
- */
-export const servicesOption = (params) => ({
-    alias: SERVICE_FLAG_NAMES.filter((name) => name !== params.key),
-    describe: [
-        `${params.describe}: ${params.allowed.join(", ")}.`,
-        params.noneMeans !== undefined
-            ? `Pass "${NO_SERVICES}" for ${params.noneMeans}.`
-            : undefined,
-        "Repeat the flag or comma-separate.",
-        params.also,
-    ]
-        .filter((part) => part !== undefined)
-        .join(" "),
-    type: "array",
-    string: true,
+* The yargs option for a services flag, so every command that has one accepts the same
+* spellings (`-s`, `--service`, `--services`) and the same value syntax. `key` is the name the
+* command reads off `argv`; the rest become aliases.
+*/
+const servicesOption = (params) => ({
+	alias: SERVICE_FLAG_NAMES.filter((name) => name !== params.key),
+	describe: [
+		`${params.describe}: ${params.allowed.join(", ")}.`,
+		params.noneMeans !== void 0 ? `Pass "${NO_SERVICES}" for ${params.noneMeans}.` : void 0,
+		"Repeat the flag or comma-separate.",
+		params.also
+	].filter((part) => part !== void 0).join(" "),
+	type: "array",
+	string: true
 });
 /**
- * Narrow a yargs value for a services flag to the raw strings, or `undefined` when the flag
- * was not given. `argv` is untyped at the handler, and `string: true` only guarantees the
- * element type when the flag was actually parsed as an array.
- */
-export const servicesFlagValue = (value) => Array.isArray(value) ? value.map(String) : undefined;
+* Narrow a yargs value for a services flag to the raw strings, or `undefined` when the flag
+* was not given. `argv` is untyped at the handler, and `string: true` only guarantees the
+* element type when the flag was actually parsed as an array.
+*/
+const servicesFlagValue = (value) => Array.isArray(value) ? value.map(String) : void 0;
+//#endregion
+export { NEON_SERVICES, NO_SERVICES, deprecatedServiceMessage, parseServices, servicesFlagValue, servicesOption };