@nuxt/kit-nightly 4.6.0-29843345.e2eb0b5e → 4.6.0-29843546.4d3ded85

package/dist/index.mjs

@@ -233,7 +233,7 @@ async function getNuxtModuleVersion(module, nuxt = useNuxt()) {
 	return false;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/c12@4.0.0-rc.1_chokidar@5.0.0_dotenv@18.0.1_giget@3.3.1_jiti@2.7.0_magicast@0.5.4/node_modules/c12/dist/index.mjs
+//#region ../../node_modules/.pnpm/c12@4.0.0-rc.2_dotenv@18.0.4_giget@3.3.1_jiti@2.7.0_magicast@0.5.4/node_modules/c12/dist/index.mjs
 async function setupDotenv(options) {
 	const targetEnvironment = options.env ?? process.env;
 	const environment = await loadDotenv({
@@ -241,7 +241,8 @@ async function setupDotenv(options) {
 		fileName: options.fileName ?? ".env",
 		env: targetEnvironment,
 		interpolate: options.interpolate ?? true,
-		expandFileReferences: options.expandFileReferences ?? false
+		expandFileReferences: options.expandFileReferences ?? false,
+		parse: options.parse
 	});
 	const dotenvVars = getDotEnvVars(targetEnvironment);
 	for (const key in environment) {
@@ -260,7 +261,7 @@ async function loadDotenv(options) {
 	for (const file of dotenvFiles) {
 		const dotenvFile = resolve(cwd, file);
 		if (!statSync(dotenvFile, { throwIfNoEntry: false })?.isFile()) continue;
-		const parsed = await readEnvFile(dotenvFile);
+		const parsed = await readEnvFile(dotenvFile, options.parse);
 		for (const key in parsed) {
 			if (key in environment && !dotenvVars.has(key)) continue;
 			environment[key] = parsed[key];
@@ -283,13 +284,14 @@ async function loadDotenv(options) {
 	return environment;
 }
 let _parseEnv = nodeUtil.parseEnv;
-async function readEnvFile(path) {
+async function readEnvFile(path, parse) {
 	const src = readFileSync(path, "utf8");
+	if (parse) return parse(src);
 	if (!_parseEnv) try {
 		const dotenv = await import("dotenv");
 		_parseEnv = (src) => dotenv.parse(src);
 	} catch {
-		throw new Error("Failed to parse .env file: `node:util.parseEnv` is not available and `dotenv` package is not installed. Please upgrade your runtime or install `dotenv` as a dependency.");
+		throw new Error("Failed to parse .env file: `node:util.parseEnv` is not available and `dotenv` package is not installed. Please upgrade your runtime, install `dotenv` as a dependency or provide a custom `parse` option.");
 	}
 	return _parseEnv(src);
 }
@@ -299,28 +301,107 @@ function interpolate(target, source = {}, parse = (v) => v) {
 	}
 	function interpolate(value, parents = []) {
 		if (typeof value !== "string") return value;
-		return parse((value.match(/(.?\${?(?:[\w:]+)?}?)/g) || []).reduce((newValue, match) => {
-			const parts = /(.?)\${?([\w:]+)?}?/g.exec(match) || [];
-			const prefix = parts[1];
-			let value, replacePart;
-			if (prefix === "\\") {
-				replacePart = parts[0] || "";
-				value = replacePart.replace(String.raw`\$`, "$");
-			} else {
-				const key = parts[2];
-				replacePart = (parts[0] || "").slice(prefix.length);
-				if (parents.includes(key)) {
-					console.warn(`Please avoid recursive environment variables ( loop: ${parents.join(" > ")} > ${key} )`);
-					return "";
+		let result = "";
+		let index = 0;
+		while (index < value.length) {
+			const char = value[index];
+			if (char === "\\" && value[index + 1] === "$") {
+				result += "$";
+				index += 2;
+				continue;
+			}
+			const ref = char === "$" ? parseRef(value, index) : void 0;
+			if (!ref) {
+				result += char;
+				index++;
+				continue;
+			}
+			if (parents.includes(ref.key)) {
+				if (ref.defaultValue !== void 0) {
+					result += interpolate(ref.defaultValue, parents);
+					index = ref.end;
+					continue;
 				}
-				value = getValue(key);
-				value = interpolate(value, [...parents, key]);
+				console.warn(`Please avoid recursive environment variables ( loop: ${parents.join(" > ")} > ${ref.key} )`);
+				return "";
 			}
-			return value === void 0 ? newValue : newValue.replace(replacePart, value);
-		}, value));
+			let resolved = interpolate(getValue(ref.key), [...parents, ref.key]);
+			if (ref.defaultValue !== void 0 && (resolved === void 0 || ref.operator === ":-" && resolved === "")) resolved = interpolate(ref.defaultValue, parents);
+			result += resolved === void 0 ? value.slice(index, ref.end) : resolved;
+			index = ref.end;
+		}
+		return parse(result);
 	}
 	for (const key in target) target[key] = interpolate(getValue(key));
 }
+const REF_NAME_RE = /\w+/y;
+const BRACED_REF_NAME_RE = /[\w:]+/y;
+function parseRef(input, start) {
+	let index = start + 1;
+	const braced = input[index] === "{";
+	if (braced) index++;
+	const nameRe = braced ? BRACED_REF_NAME_RE : REF_NAME_RE;
+	nameRe.lastIndex = index;
+	const name = nameRe.exec(input);
+	if (!name) return;
+	let key = name[0];
+	index = nameRe.lastIndex;
+	if (!braced) return {
+		key,
+		end: index
+	};
+	if (input[index] === "}") return {
+		key,
+		end: index + 1
+	};
+	if (input[index] === "-") {
+		let operator = "-";
+		if (key.endsWith(":")) {
+			key = key.slice(0, -1);
+			operator = ":-";
+		}
+		const defaultValue = key ? readDefault(input, index + 1) : void 0;
+		if (!defaultValue) return;
+		return {
+			key,
+			operator,
+			defaultValue: defaultValue.value,
+			end: defaultValue.end
+		};
+	}
+	return {
+		key,
+		end: index
+	};
+}
+function readDefault(input, start) {
+	let value = "";
+	let depth = 1;
+	for (let index = start; index < input.length; index++) {
+		const char = input[index];
+		if (char === "\\" && index + 1 < input.length) {
+			const next = input[index + 1];
+			value += next === "{" || next === "}" ? next : char + next;
+			index++;
+			continue;
+		}
+		if (char === "$" && input[index + 1] === "{") {
+			depth++;
+			value += "${";
+			index++;
+			continue;
+		}
+		if (char === "{") depth++;
+		if (char === "}") {
+			depth--;
+			if (depth === 0) return {
+				value,
+				end: index + 1
+			};
+		}
+		value += char;
+	}
+}
 function getDotEnvVars(targetEnvironment) {
 	const globalRegistry = globalThis.__c12_dotenv_vars__ ||= /* @__PURE__ */ new Map();
 	if (!globalRegistry.has(targetEnvironment)) globalRegistry.set(targetEnvironment, /* @__PURE__ */ new Set());
@@ -456,6 +537,7 @@ async function loadConfig(options) {
 		for (const key in r.config) if (key.startsWith("$")) delete r.config[key];
 	}
 	if (options.configFileRequired && !r._configFile) throw new Error(`Required config (${r.configFile}) cannot be resolved.`);
+	if (options.schema != null) r.config = await validateConfig(r.config, options.schema);
 	return r;
 }
 async function extendConfig(config, options) {
@@ -520,7 +602,7 @@ async function resolveConfig(source, options, sourceOptions = {}) {
 		const { downloadTemplate } = await import("giget").catch((error) => {
 			throw new Error(`Extending config from \`${source}\` requires \`giget\` peer dependency to be installed.\n\nInstall it with: \`npx nypm i giget\``, { cause: error });
 		});
-		const { digest } = await import("./ohash-CFjVeWQ7.mjs").then((n) => n.dist_exports);
+		const { digest } = await import("./ohash-CoyG-I2s.mjs").then((n) => n.dist_exports);
 		const cloneName = source.replace(/\W+/g, "_").split("_").splice(0, 3).join("_") + "_" + digest(source).slice(0, 10).replace(/[-_]/g, "");
 		let cloneDir;
 		const localNodeModules = resolve(options.cwd, "node_modules");
@@ -578,13 +660,9 @@ async function resolveConfig(source, options, sourceOptions = {}) {
 		}
 	}
 	if (typeof res.config === "function") res.config = await res.config(options.context);
-	if (options.envName) {
-		const envConfig = {
-			...res.config["$" + options.envName],
-			...res.config.$env?.[options.envName]
-		};
-		if (Object.keys(envConfig).length > 0) res.config = _merger(envConfig, res.config);
-	}
+	if (res.config && typeof res.config === "object" && !Array.isArray(res.config) && !Object.isExtensible(res.config)) res.config = { ...res.config };
+	const envConfigs = (Array.isArray(options.envName) ? options.envName : [options.envName]).filter(Boolean).reverse().flatMap((envName) => [res.config.$env?.[envName], res.config["$" + envName]]).filter((c) => c && Object.keys(c).length > 0);
+	if (envConfigs.length > 0) res.config = (options.envMerger || _merger)({}, ...envConfigs, res.config);
 	res.meta = defu(res.sourceOptions.meta, res.config.$meta);
 	delete res.config.$meta;
 	if (res.sourceOptions.overrides) res.config = _merger(res.sourceOptions.overrides, res.config);
@@ -592,6 +670,18 @@ async function resolveConfig(source, options, sourceOptions = {}) {
 	res.source = _normalize(res.source);
 	return res;
 }
+async function validateConfig(config, schema) {
+	if (typeof schema?.["~standard"]?.validate !== "function") throw new TypeError("Invalid `schema` option: expected a Standard Schema (https://standardschema.dev).");
+	const result = await schema["~standard"].validate(config);
+	if (result.issues) {
+		const messages = result.issues.map((issue) => {
+			const path = issue.path?.map((p) => String(typeof p === "object" ? p.key : p)).join(".");
+			return `  - ${path ? `${path}: ` : ""}${issue.message}`;
+		});
+		throw new Error(`Config validation failed (${schema["~standard"].vendor}):\n${messages.join("\n")}`, { cause: result.issues });
+	}
+	return result.value;
+}
 function tryResolve(id, options) {
 	const res = resolveModulePath(id, {
 		try: true,

package/dist/internal/index.d.mts

@@ -168,7 +168,7 @@ export declare const buildDiagnostics: import("nostics").Diagnostics<{
   };
 }, readonly [import("nostics").DiagnosticReporter<{
   method?: import("nostics").ConsoleMethod;
-}>]>;
+}, any>], never>;
 //#endregion
 //#region src/diagnostics/plugins.d.ts
 /**
@@ -264,7 +264,7 @@ export declare const pluginDiagnostics: import("nostics").Diagnostics<{
   };
 }, readonly [import("nostics").DiagnosticReporter<{
   method?: import("nostics").ConsoleMethod;
-}>]>;
+}, any>], never>;
 //#endregion
 //#region src/diagnostics/components.d.ts
 /**
@@ -381,7 +381,7 @@ export declare const componentDiagnostics: import("nostics").Diagnostics<{
   };
 }, readonly [import("nostics").DiagnosticReporter<{
   method?: import("nostics").ConsoleMethod;
-}>]>;
+}, any>], never>;
 //#endregion
 //#region src/diagnostics/pages.d.ts
 /**
@@ -555,7 +555,7 @@ export declare const pageDiagnostics: import("nostics").Diagnostics<{
   };
 }, readonly [import("nostics").DiagnosticReporter<{
   method?: import("nostics").ConsoleMethod;
-}>]>;
+}, any>], never>;
 //#endregion
 //#region src/diagnostics/config.d.ts
 /**
@@ -721,7 +721,7 @@ export declare const configDiagnostics: import("nostics").Diagnostics<{
   };
 }, readonly [import("nostics").DiagnosticReporter<{
   method?: import("nostics").ConsoleMethod;
-}>]>;
+}, any>], never>;
 //#endregion
 //#region src/diagnostics/head.d.ts
 /**
@@ -769,7 +769,7 @@ export declare const headDiagnostics: import("nostics").Diagnostics<{
   };
 }, readonly [import("nostics").DiagnosticReporter<{
   method?: import("nostics").ConsoleMethod;
-}>]>;
+}, any>], never>;
 //#endregion
 //#region src/diagnostics/bundler.d.ts
 /**
@@ -958,7 +958,7 @@ export declare const bundlerDiagnostics: import("nostics").Diagnostics<{
   };
 }, readonly [import("nostics").DiagnosticReporter<{
   method?: import("nostics").ConsoleMethod;
-}>]>;
+}, any>], never>;
 //#endregion
 //#region src/internal/pending-templates.d.ts
 /** @internal */

package/dist/{ohash-CFjVeWQ7.mjs → ohash-CoyG-I2s.mjs}

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-//#region ../../node_modules/.pnpm/c12@4.0.0-rc.1_chokidar@5.0.0_dotenv@18.0.1_giget@3.3.1_jiti@2.7.0_magicast@0.5.4/node_modules/c12/dist/_chunks/libs/ohash.mjs
+//#region ../../node_modules/.pnpm/c12@4.0.0-rc.2_dotenv@18.0.4_giget@3.3.1_jiti@2.7.0_magicast@0.5.4/node_modules/c12/dist/_chunks/libs/ohash.mjs
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit-nightly",
-  "version": "4.6.0-29843345.e2eb0b5e",
+  "version": "4.6.0-29843546.4d3ded85",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -32,10 +32,10 @@
     "destr": "^2.0.5",
     "errx": "^0.2.2",
     "exsolve": "^1.1.1",
-    "ignore": "^7.0.9",
+    "ignore": "^7.0.10",
     "klona": "^2.0.6",
     "microdiff": "^1.6.0",
-    "nostics": "^1.2.0",
+    "nostics": "^1.3.0",
     "nypm": "^0.6.10",
     "pathe": "^2.0.3",
     "rc9": "^3.1.0",
@@ -46,7 +46,7 @@
     "verkit": "^0.5.0"
   },
   "peerDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29843345.e2eb0b5e",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29843546.4d3ded85",
     "confbox": ">=0.1.0",
     "dotenv": "*",
     "giget": ">=3.1.0",
@@ -82,11 +82,11 @@
     }
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29843345.e2eb0b5e",
-    "c12": "4.0.0-rc.1",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29843546.4d3ded85",
+    "c12": "4.0.0-rc.2",
     "chokidar": "^5.0.0",
     "confbox": "^0.3.1",
-    "dotenv": "^18.0.1",
+    "dotenv": "^18.0.4",
     "giget": "^3.3.1",
     "hookable": "^6.1.2",
     "jiti": "^2.7.0",
@@ -97,13 +97,13 @@
     "tsdown": "0.23.0",
     "untyped": "^2.0.0",
     "vite": "^8.3.1",
-    "vitest": "5.0.1"
+    "vitest": "5.0.2"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
   "inlinedDependencies": {
-    "c12": "4.0.0-rc.1",
+    "c12": "4.0.0-rc.2",
     "pkg-types": "2.3.3",
     "untyped": "2.0.0"
   },