void 0.26.1 → 0.28.0

package/dist/{project-paths-GgcMozYz.mjs → project-paths-DMvEeSau.mjs}

@@ -1,4 +1,4 @@
-import { a as join, i as isAbsolute, l as relative, o as normalize } from "./dist-BVqXeR_h.mjs";
+import { a as join, i as isAbsolute, o as normalize } from "./dist-ipQi0Q8y.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { createJiti } from "jiti";
@@ -39,8 +39,8 @@ function loadVoidConfig(root) {
 			source: LEGACY_CONFIG_FILE,
 			value: JSON.parse(readFileSync(jsonPath, "utf-8"))
 		};
-	} catch {
-		throw new Error(`config: Invalid JSON in ${LEGACY_CONFIG_FILE}.`);
+	} catch (error) {
+		throw new Error(`config: Invalid JSON in ${LEGACY_CONFIG_FILE}.`, { cause: error });
 	}
 }
 //#endregion
@@ -73,19 +73,16 @@ const SOURCE_CONVENTIONS = /* @__PURE__ */ new Set([
 	...AUTH_CONFIG_FILES,
 	...ENV_CONFIG_FILES
 ]);
-function validateSourceDir(value, label = "sourceDir") {
-	if (value.trim() !== value || value.length === 0) throw new Error(`config: "${label}" in void.json must be a non-empty relative directory.`);
-	if (value === "." || value === ".." || value.startsWith("../") || value.includes("/../") || value.endsWith("/..") || isAbsolute(value)) throw new Error(`config: "${label}" path '${value}' in void.json must be a relative directory.`);
+function validateSourceDir(value) {
+	if (value.trim() !== value || value.length === 0) throw new Error("config: \"sourceDir\" in void.json must be a non-empty relative directory.");
+	if (value === "." || value === ".." || value.startsWith("../") || value.includes("/../") || value.endsWith("/..") || isAbsolute(value)) throw new Error(`config: "sourceDir" path '${value}' in void.json must be a relative directory.`);
 	const normalized = normalize(value).replace(/\/+$/, "");
-	if (normalized === "" || normalized === ".") throw new Error(`config: "${label}" path '${value}' in void.json must be a relative directory.`);
+	if (normalized === "" || normalized === ".") throw new Error(`config: "sourceDir" path '${value}' in void.json must be a relative directory.`);
 	return normalized;
 }
 function getSourceDir(config) {
 	return config?.sourceDir ? validateSourceDir(config.sourceDir) : "";
 }
-function resolveCandidate(root, sourceDir, candidate) {
-	return sourceDir ? join(root, sourceDir, candidate) : join(root, candidate);
-}
 function resolveProjectPaths(root, config) {
 	const sourceDir = getSourceDir(config);
 	const sourceRoot = sourceDir ? join(root, sourceDir) : root;
@@ -105,10 +102,9 @@ function resolveProjectPaths(root, config) {
 		migrationsDir: join(sourceRoot, "db", "migrations"),
 		schemaFile: join(sourceRoot, "db", "schema.ts"),
 		schemaDir: join(sourceRoot, "db", "schema"),
-		srcDir: join(sourceRoot, "src"),
 		ssrDir: sourceDir ? sourceRoot : join(root, "src"),
 		sourceRelative,
-		authConfigCandidates: AUTH_CONFIG_FILES.map((file) => resolveCandidate(root, sourceDir, file)),
+		authConfigCandidates: AUTH_CONFIG_FILES.map((file) => join(sourceRoot, file)),
 		envFileCandidates
 	};
 }
@@ -128,8 +124,7 @@ function assertNoRootSourceConventionConflicts(paths) {
 	if (!paths.sourceDir) return;
 	const conflicts = Array.from(SOURCE_CONVENTIONS).filter((convention) => existsSync(join(paths.root, convention)) && existsSync(join(paths.sourceRoot, convention)));
 	if (conflicts.length === 0) return;
-	const relSource = relative(paths.root, paths.sourceRoot);
-	throw new Error(`sourceDir: void.json sets "sourceDir": "${paths.sourceDir}", but convention path(s) also exist at the project root: ${conflicts.join(", ")}. Move them under "${relSource}" or remove the root copy.`);
+	throw new Error(`sourceDir: void.json sets "sourceDir": "${paths.sourceDir}", but convention path(s) also exist at the project root: ${conflicts.join(", ")}. Move them under "${paths.sourceDir}" or remove the root copy.`);
 }
 //#endregion
 export { validateSourceDir as a, loadVoidConfig as c, resolveProjectPaths as i, readProjectPaths as n, TYPED_CONFIG_FILE as o, resolvePagesDir as r, loadTypedVoidConfigFile as s, assertNoRootSourceConventionConflicts as t };

package/dist/{project-DQstYTxO.mjs → project-rqDnVsJN.mjs}

@@ -1,5 +1,5 @@
-import { a as join, n as dirname } from "./dist-BVqXeR_h.mjs";
-import { c as normalizePlatformApiUrl, s as listPlatformConnections } from "./platform-registry-P387v42A.mjs";
+import { a as join, n as dirname } from "./dist-ipQi0Q8y.mjs";
+import { c as normalizePlatformApiUrl, s as listPlatformConnections } from "./platform-registry-B9mWX9LO.mjs";
 import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { normalizeApplicationDomain } from "@void/platform";
 //#region src/cli/project.ts
@@ -84,6 +84,10 @@ function writePlatformSelection(root, connection) {
 	}, null, 2) + "\n");
 	return true;
 }
+/** The raw `projectId` field, without the slug and URL checks of `readProjectConfig`. */
+function readProjectIdField(root) {
+	return readProjectConfigFile(root)?.projectId;
+}
 function readProjectPlatformUrl(root) {
 	const value = readProjectConfigFile(root)?.platformUrl;
 	return typeof value === "string" && value !== "" ? normalizePlatformApiUrl(value) : null;
@@ -95,7 +99,7 @@ function shouldLinkDeployProject(root, apiUrl) {
 	return !readProjectConfig(root) && platform !== "cloudflare" && platform !== "none" && (!selectedUrl || selectedUrl === normalizePlatformApiUrl(apiUrl));
 }
 /** Resolve the immutable platform identity that every newly linked project records. */
-function attachSelectedPlatform(root, config, platformApiUrl) {
+function attachSelectedPlatform(config, platformApiUrl) {
 	const apiUrl = normalizePlatformApiUrl(platformApiUrl);
 	const connection = listPlatformConnections().find((entry) => entry.apiUrl === apiUrl);
 	if (connection?.applicationDomain && connection.proxyUrl) return {
@@ -139,4 +143,4 @@ function removeProjectConfig(root) {
 	}
 }
 //#endregion
-export { removeProjectConfig as a, writePlatformSelection as c, readProjectPlatformUrl as i, writeProjectConfig as l, readDeploymentPlatform as n, shouldLinkDeployProject as o, readProjectConfig as r, writeDeploymentPlatform as s, attachSelectedPlatform as t };
+export { readProjectPlatformUrl as a, writeDeploymentPlatform as c, readProjectIdField as i, writePlatformSelection as l, readDeploymentPlatform as n, removeProjectConfig as o, readProjectConfig as r, shouldLinkDeployProject as s, attachSelectedPlatform as t, writeProjectConfig as u };

package/dist/{project-team-CDPE1Tsg.mjs → project-team-B3_QcStG.mjs}

@@ -1,9 +1,9 @@
-import { r as readProjectConfig } from "./project-DQstYTxO.mjs";
-import { c as getToken, i as getAccountCredential } from "./auth-B5_tZLxT.mjs";
+import { r as readProjectConfig } from "./project-rqDnVsJN.mjs";
+import { c as getToken, i as getAccountCredential } from "./auth-B6iOCjKI.mjs";
 import { H as outro, L as log } from "./dist-D3m88sjf.mjs";
-import { d as printSuccess, f as sanitizeTerminalText, s as formatCount, u as note } from "./output-C50ag2r3.mjs";
-import { c as parsePlatformErrorBody, l as platformErrorMessage, n as PlatformApiError, r as PlatformClient } from "./client-C2Prx_Bi.mjs";
-import { r as requireProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-CP8rZs_p.mjs";
+import { h as sanitizeTerminalText, l as formatUrl, m as printSuccess, o as formatCount, p as note } from "./output-FNHKw5Ac.mjs";
+import { c as platformErrorMessage, n as PlatformApiError, r as PlatformClient, s as parsePlatformErrorBody } from "./client-DM9Kcf4e.mjs";
+import { r as requireProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-C_Cu7E8a.mjs";
 //#region src/cli/project-team.ts
 function clean(value) {
 	return (value ?? "—").replace(/[\u0000-\u001f\u007f]/g, " ");
@@ -56,7 +56,7 @@ async function runProjectTeamCommand(root, args) {
 		apiUrl: void 0,
 		token: getToken(root)
 	};
-	if (apiUrl) log.info(`Platform: ${apiUrl}`);
+	if (apiUrl) log.info(`Platform: ${formatUrl(apiUrl)}`);
 	if (!token) {
 		log.error(apiUrl ? `Not logged in to ${apiUrl}. Run \`void connect ${apiUrl}\` to sign in.` : "Not logged in. Run `void account login` first.");
 		process.exit(1);

package/dist/{project-token-CkZ1cN0Z.mjs → project-token-CvsRvv2I.mjs}

@@ -1,9 +1,9 @@
-import { r as readProjectConfig } from "./project-DQstYTxO.mjs";
-import { c as getToken } from "./auth-B5_tZLxT.mjs";
+import { r as readProjectConfig } from "./project-rqDnVsJN.mjs";
+import { c as getToken } from "./auth-B6iOCjKI.mjs";
 import { H as outro, L as log } from "./dist-D3m88sjf.mjs";
-import { d as printSuccess, i as dim, m as tablePrefix } from "./output-C50ag2r3.mjs";
-import { r as PlatformClient } from "./client-C2Prx_Bi.mjs";
-import { r as requireProjectBySlug } from "./resolve-project-CP8rZs_p.mjs";
+import { _ as tablePrefix, i as dim, m as printSuccess } from "./output-FNHKw5Ac.mjs";
+import { r as PlatformClient } from "./client-DM9Kcf4e.mjs";
+import { r as requireProjectBySlug } from "./resolve-project-C_Cu7E8a.mjs";
 //#region src/cli/project-token.ts
 async function resolveTarget(root, args) {
 	const humanToken = getToken(root);

package/dist/{project-tsconfig-CVJhNMxs.mjs → project-tsconfig-bveqhlYA.mjs}

@@ -1,5 +1,5 @@
-import { a as join, l as relative, n as dirname } from "./dist-BVqXeR_h.mjs";
-import { n as readProjectPaths } from "./project-paths-GgcMozYz.mjs";
+import { a as join, n as dirname, s as relative } from "./dist-ipQi0Q8y.mjs";
+import { n as readProjectPaths } from "./project-paths-DMvEeSau.mjs";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 //#region src/codegen/write-if-changed.ts
 function writeFileIfChanged(path, content) {
@@ -74,10 +74,8 @@ function createProjectTsconfig(root, hasRouteTypes, hasDb, hasSchema, options =
 * Ensure .void/tsconfig.json exists so the user's root tsconfig can extend it.
 */
 function ensureProjectTsconfig(root, hasRouteTypes, hasDb, hasSchema, options = {}) {
-	const outDir = join(root, ".void");
-	mkdirSync(outDir, { recursive: true });
 	const tsconfig = createProjectTsconfig(root, hasRouteTypes, hasDb, hasSchema, options);
-	return writeFileIfChanged(join(outDir, "tsconfig.json"), JSON.stringify(tsconfig, null, 2) + "\n");
+	return writeFileIfChanged(join(root, ".void", "tsconfig.json"), JSON.stringify(tsconfig, null, 2) + "\n");
 }
 //#endregion
 export { ensureProjectTsconfig as n, writeFileIfChanged as r, createProjectTsconfig as t };

package/dist/{project-zero-trust-DdjLR61k.mjs → project-zero-trust-D1ICiwN_.mjs}

@@ -1,9 +1,9 @@
-import { r as readProjectConfig } from "./project-DQstYTxO.mjs";
-import { c as getToken } from "./auth-B5_tZLxT.mjs";
+import { r as readProjectConfig } from "./project-rqDnVsJN.mjs";
+import { c as getToken } from "./auth-B6iOCjKI.mjs";
 import { H as outro, L as log } from "./dist-D3m88sjf.mjs";
-import { d as printSuccess, f as sanitizeTerminalText, u as note } from "./output-C50ag2r3.mjs";
-import { r as PlatformClient } from "./client-C2Prx_Bi.mjs";
-import { r as requireProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-CP8rZs_p.mjs";
+import { h as sanitizeTerminalText, m as printSuccess, p as note } from "./output-FNHKw5Ac.mjs";
+import { r as PlatformClient } from "./client-DM9Kcf4e.mjs";
+import { r as requireProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-C_Cu7E8a.mjs";
 //#region src/cli/project-zero-trust.ts
 async function resolveTarget(root, args) {
 	const token = getToken(root);

package/dist/{protocol-BPZaNqBo.d.mts → protocol-4H7V_3Os.d.mts}

@@ -1,5 +1,5 @@
 import { n as HeadDescriptor, t as HeadConfig } from "./head-C8K_iGe6.mjs";
-import { n as CloudBindings, r as CloudContext } from "./handler-CNAwjRcW.mjs";
+import { n as CloudBindings, r as CloudContext } from "./handler-_PqY82xe.mjs";
 import { a as PageRenderMode, t as DevCssAsset } from "./types-BAp5AEBU.mjs";
 //#region src/pages/protocol.d.ts
 /** Escape characters that are unsafe inside inline <script> tags to prevent XSS. */

package/dist/{protocol-CfaUwNs8.mjs → protocol-RNP0u7UY.mjs}

@@ -1,13 +1,13 @@
 import { n as isConvertedResponse } from "./response-Tn7rU0MV.mjs";
 import { i as separateDeferred, n as DEFERRED, t as ValidationError } from "./validation-error-Dg9Recn1.mjs";
 import { i as resolveHead, n as renderHeadToString, r as renderHtmlAttrs, t as renderBodyAttrs } from "./head-D2VF4ApL.mjs";
-import { t as serializePageData } from "./serialize-BPvnNQuA.mjs";
+import { n as escapeScriptJson, t as serializePageData } from "./serialize-BtQyaYoC.mjs";
 //#region src/pages/protocol.ts
 const POWERED_BY = { "X-Powered-By": "Void" };
 const RENDER_ERROR_ASSET_TAGS_KEY = "__voidPageAssetTags";
 /** Escape characters that are unsafe inside inline <script> tags to prevent XSS. */
 function safeJsonStringify(value) {
-	return (JSON.stringify(value) ?? "null").replaceAll("<", "\\u003c").replaceAll(">", "\\u003e").replaceAll("&", "\\u0026").replaceAll("\u2028", "\\u2028").replaceAll("\u2029", "\\u2029");
+	return escapeScriptJson(JSON.stringify(value) ?? "null");
 }
 function isPagesRequest(c) {
 	return c.req.header("x-voidpages") === "true";
@@ -262,7 +262,13 @@ async function handlePageGet(handler, headFn, c, componentId, renderFn, getAsset
 	}
 	const { html, assetTags } = await renderPageHtml(c, pageObj, componentId, renderMode, renderFn, getAssetTags);
 	if (!hasDeferred) return renderedResponse(c, html, "text/html; charset=utf-8", assetTags);
-	return streamDeferredResponse(html, deferredMap, c, "text/html; charset=utf-8", options?.dev === true, (group, data) => `\n<script>window.__resolveDeferred?window.__resolveDeferred(${safeJsonStringify(group)},${safeJsonStringify(data)}):(window.__deferredQueue??=[]).push([${safeJsonStringify(group)},${safeJsonStringify(data)}])<\/script>`, (group, error) => `\n<script>window.__rejectDeferred?window.__rejectDeferred(${safeJsonStringify(group)},${safeJsonStringify(error)}):(window.__deferredQueue??=[]).push([${safeJsonStringify(group)},0,${safeJsonStringify(error)}])<\/script>`, assetTags);
+	return streamDeferredResponse(html, deferredMap, c, "text/html; charset=utf-8", options?.dev === true, (group, data) => {
+		const g = safeJsonStringify(group);
+		return `\n<script>(function(d){window.__resolveDeferred?window.__resolveDeferred(${g},d):(window.__deferredQueue??=[]).push([${g},d])})(${safeJsonStringify(data)})<\/script>`;
+	}, (group, error) => {
+		const g = safeJsonStringify(group);
+		return `\n<script>(function(e){window.__rejectDeferred?window.__rejectDeferred(${g},e):(window.__deferredQueue??=[]).push([${g},0,e])})(${safeJsonStringify(error)})<\/script>`;
+	}, assetTags);
 }
 function isSameOriginAction(request) {
 	const origin = new URL(request.url).origin;