@vitejs/plugin-rsc 0.5.33 → 0.5.35

package/dist/transforms/index.js

@@ -1,5 +1,5 @@
-import { i as tinyassert } from "../dist-uqdtSkzK.js";
-import { a as isDirective, i as hasDirective, n as extractIdentifiers, o as rejectNonAsyncFunction, r as extractNames, s as validateNonAsyncFunction, t as buildScopeTree } from "../scope-Bdx33sQv.js";
+import { r as tinyassert } from "../shared-BWJvctW6.js";
+import { a as isDirective, i as hasDirective, n as extractIdentifiers, o as rejectNonAsyncFunction, r as extractNames, s as validateNonAsyncFunction, t as buildScopeTree } from "../scope-Ck0n25my.js";
 import MagicString from "magic-string";
 import { walk } from "estree-walker";
 //#region src/transforms/hoist.ts
@@ -86,9 +86,10 @@ function transformHoistInlineDirective(input, viteAst, { runtime, rejectNonAsync
 		if ((node.type === "FunctionExpression" || node.type === "FunctionDeclaration" || node.type === "ArrowFunctionExpression") && node.body.type === "BlockStatement") {
 			const match = matchDirective(node.body.body, directive)?.match;
 			if (!match) return;
+			const methodInfo = getMethodInfo(node, parent, match[0]);
 			if (!node.async && rejectNonAsyncFunction) throw Object.assign(/* @__PURE__ */ new Error(`"${directive}" doesn't allow non async function`), { pos: node.start });
 			const declName = node.type === "FunctionDeclaration" && node.id.name;
-			const originalName = declName || parent?.type === "VariableDeclarator" && parent.id.type === "Identifier" && parent.id.name || "anonymous_server_function";
+			const originalName = declName || methodInfo?.name || parent?.type === "VariableDeclarator" && parent.id.type === "Identifier" && parent.id.name || "anonymous_server_function";
 			const bindVars = getBindVars(node, scopeTree);
 			let newParams = [...bindVars.map((b) => b.root), ...node.params.map((n) => input.slice(n.start, n.end))].join(", ");
 			if (bindVars.length > 0 && options.decode) {
@@ -111,7 +112,13 @@ function transformHoistInlineDirective(input, viteAst, { runtime, rejectNonAsync
 				const bindArgs = options.encode ? options.encode("[" + bindVars.map((b) => b.expr).join(", ") + "]") : bindVars.map((b) => b.expr).join(", ");
 				newCode = `${newCode}.bind(null, ${bindArgs})`;
 			}
-			if (declName) {
+			if (methodInfo) {
+				const isStatic = methodInfo.node.type === "MethodDefinition";
+				const key = input.slice(methodInfo.node.key.start, methodInfo.node.key.end);
+				const propertyKey = !methodInfo.node.computed && methodInfo.node.key.type === "Identifier" ? `["${key}"]` : `[${key}]`;
+				output.update(methodInfo.node.start, node.start, `${isStatic ? "static " : ""}${propertyKey}${isStatic ? " = " : ": "}`);
+				if (isStatic) newCode += ";";
+			} else if (declName) {
 				newCode = `const ${declName} = ${newCode};`;
 				if (parent?.type === "ExportDefaultDeclaration") {
 					output.remove(parent.start, node.start);
@@ -127,6 +134,21 @@ function transformHoistInlineDirective(input, viteAst, { runtime, rejectNonAsync
 		names
 	};
 }
+function getMethodInfo(node, parent, directive) {
+	if (node.type !== "FunctionExpression") return;
+	let method;
+	if (parent?.type === "Property" && parent.value === node && (parent.method || parent.kind !== "init")) method = parent;
+	else if (parent?.type === "MethodDefinition") method = parent;
+	else return;
+	if (method.type === "MethodDefinition" && !method.static) throw Object.assign(/* @__PURE__ */ new Error(`It is not allowed to define inline ${JSON.stringify(directive)} class instance methods.`), { pos: method.start });
+	if (method.type === "MethodDefinition" && method.key.type === "PrivateIdentifier") throw Object.assign(/* @__PURE__ */ new Error(`It is not allowed to define inline ${JSON.stringify(directive)} private class methods.`), { pos: method.start });
+	if (method.type === "Property" && method.kind !== "init" || method.type === "MethodDefinition" && method.kind !== "method") throw Object.assign(/* @__PURE__ */ new Error(`It is not allowed to define inline ${JSON.stringify(directive)} getters or setters.`), { pos: method.start });
+	const keyName = !method.computed && method.key.type === "Identifier" ? method.key.name : void 0;
+	return {
+		node: method,
+		name: keyName
+	};
+}
 function getRuntimeHoistPosition(ast) {
 	for (const statement of ast.body) if (!isDirective(statement)) return statement.start;
 	return 0;
@@ -246,59 +268,61 @@ function dedupeByPrefix(paths) {
 function scanModuleExports(viteAst) {
 	const ast = viteAst;
 	const groups = [];
-	for (const node of ast.body) if (node.type === "ExportNamedDeclaration") if (node.declaration) if (node.declaration.type === "VariableDeclaration") {
-		const declaration = node.declaration;
-		groups.push({
-			type: "variable-declaration",
-			node,
-			declaration,
-			declarators: declaration.declarations.map((declarator) => {
-				const isFunction = declarator.id.type === "Identifier" && declarator.init ? getIsFunction(declarator.init) : void 0;
-				return {
-					node: declarator,
-					exports: extractNames(declarator.id).map((name) => ({
+	for (const node of ast.body) if (node.type === "ExportNamedDeclaration") {
+		if (node.declaration) {
+			if (node.declaration.type === "VariableDeclaration") {
+				const declaration = node.declaration;
+				groups.push({
+					type: "variable-declaration",
+					node,
+					declaration,
+					declarators: declaration.declarations.map((declarator) => {
+						const isFunction = declarator.id.type === "Identifier" && declarator.init ? getIsFunction(declarator.init) : void 0;
+						return {
+							node: declarator,
+							exports: extractNames(declarator.id).map((name) => ({
+								localName: name,
+								exportName: name,
+								meta: {
+									declName: name,
+									isFunction,
+									valueNode: declarator.init ?? void 0
+								}
+							}))
+						};
+					})
+				});
+			} else {
+				tinyassert(node.declaration.id);
+				const name = node.declaration.id.name;
+				groups.push({
+					type: "declaration",
+					node,
+					declaration: node.declaration,
+					export: {
 						localName: name,
 						exportName: name,
 						meta: {
 							declName: name,
-							isFunction,
-							valueNode: declarator.init ?? void 0
+							isFunction: getIsFunction(node.declaration),
+							valueNode: node.declaration
 						}
-					}))
+					}
+				});
+			}
+		} else groups.push({
+			type: "specifiers",
+			node,
+			exports: node.specifiers.map((specifier) => {
+				return {
+					node: specifier,
+					localName: specifier.local.type === "Identifier" ? specifier.local.name : "__unsupported_string_export__",
+					exportName: specifier.exported.type === "Identifier" ? specifier.exported.name : "__unsupported_string_export__",
+					meta: {}
 				};
 			})
 		});
-	} else {
-		tinyassert(node.declaration.id);
-		const name = node.declaration.id.name;
-		groups.push({
-			type: "declaration",
-			node,
-			declaration: node.declaration,
-			export: {
-				localName: name,
-				exportName: name,
-				meta: {
-					declName: name,
-					isFunction: getIsFunction(node.declaration),
-					valueNode: node.declaration
-				}
-			}
-		});
-	}
-	else groups.push({
-		type: "specifiers",
-		node,
-		exports: node.specifiers.map((specifier) => {
-			return {
-				node: specifier,
-				localName: specifier.local.type === "Identifier" ? specifier.local.name : "__unsupported_string_export__",
-				exportName: specifier.exported.type === "Identifier" ? specifier.exported.name : "__unsupported_string_export__",
-				meta: {}
-			};
-		})
-	});
-	else if (node.type === "ExportAllDeclaration") groups.push({
+	} else if (node.type === "ExportAllDeclaration") groups.push({
 		type: "export-all",
 		node
 	});
@@ -567,8 +591,10 @@ function transformWrapExport(input, viteAst, options) {
 		const selectedExportNames = new Set(exports.filter((entry) => filter(entry.exportName, entry.meta)).map((entry) => entry.exportName));
 		if (selectedExportNames.size === 0) continue;
 		if (group.declaration.kind === "const") output.update(group.declaration.start, group.declaration.start + 5, "let");
-		for (const declarator of group.declarators) if (declarator.exports.some(({ exportName }) => selectedExportNames.has(exportName))) if (declarator.node.init) validateNonAsyncFunction(options, declarator.node.init);
-		else rejectNonAsyncFunction(options, declarator.node.start);
+		for (const declarator of group.declarators) if (declarator.exports.some(({ exportName }) => selectedExportNames.has(exportName))) {
+			if (declarator.node.init) validateNonAsyncFunction(options, declarator.node.init);
+			else rejectNonAsyncFunction(options, declarator.node.start);
+		}
 		emitWrappedAssignments(group.node.start, group.declaration.start, exports, selectedExportNames);
 	} else if (group.type === "specifiers") {
 		const skippedExports = [];
@@ -707,10 +733,12 @@ function transformProxyExport(viteAst, options) {
 				else removeNode(node);
 			} else if (!options.ignoreExportAllDeclaration) throw new Error("unsupported ExportAllDeclaration");
 			else if (!options.keep) removeNode(node);
-		} else if (group.type === "default") if (filter("default", group.meta)) {
-			validateNonAsyncFunction(options, group.node.declaration);
-			createExport(node, ["default"]);
-		} else removeNode(node);
+		} else if (group.type === "default") {
+			if (filter("default", group.meta)) {
+				validateNonAsyncFunction(options, group.node.declaration);
+				createExport(node, ["default"]);
+			} else removeNode(node);
+		}
 	}
 	if (!options.keep) {
 		for (const node of ast.body) if (!exportNodes.has(node)) removeNode(node);
@@ -788,13 +816,14 @@ async function collectExportScan(resolvedId, context, seen) {
 }
 function collectExplicitExportNames(ast) {
 	const names = /* @__PURE__ */ new Set();
-	for (const node of ast.body) if (node.type === "ExportNamedDeclaration") if (node.declaration) {
-		if (node.declaration.type === "FunctionDeclaration" || node.declaration.type === "ClassDeclaration") {
-			if (node.declaration.id) names.add(node.declaration.id.name);
-		} else if (node.declaration.type === "VariableDeclaration") for (const decl of node.declaration.declarations) for (const name of extractNames(decl.id)) names.add(name);
-	} else for (const spec of node.specifiers) if (spec.exported.type === "Identifier") names.add(spec.exported.name);
-	else throw Object.assign(/* @__PURE__ */ new Error("unsupported string literal export name"), { pos: spec.exported.start });
-	else if (node.type === "ExportDefaultDeclaration") names.add("default");
+	for (const node of ast.body) if (node.type === "ExportNamedDeclaration") {
+		if (node.declaration) {
+			if (node.declaration.type === "FunctionDeclaration" || node.declaration.type === "ClassDeclaration") {
+				if (node.declaration.id) names.add(node.declaration.id.name);
+			} else if (node.declaration.type === "VariableDeclaration") for (const decl of node.declaration.declarations) for (const name of extractNames(decl.id)) names.add(name);
+		} else for (const spec of node.specifiers) if (spec.exported.type === "Identifier") names.add(spec.exported.name);
+		else throw Object.assign(/* @__PURE__ */ new Error("unsupported string literal export name"), { pos: spec.exported.start });
+	} else if (node.type === "ExportDefaultDeclaration") names.add("default");
 	else if (node.type === "ExportAllDeclaration") {
 		if (node.exported?.type === "Identifier") names.add(node.exported.name);
 	}

package/dist/utils/encryption-runtime.d.ts

@@ -1,5 +1,4 @@
 //#region src/utils/encryption-runtime.d.ts
-declare function encryptActionBoundArgs(originalValue: unknown): Promise<string>;
-declare function decryptActionBoundArgs(encrypted: ReturnType<typeof encryptActionBoundArgs>): Promise<unknown>;
-//#endregion
-export { decryptActionBoundArgs, encryptActionBoundArgs };
+export declare function encryptActionBoundArgs(originalValue: unknown): Promise<string>;
+export declare function decryptActionBoundArgs(encrypted: ReturnType<typeof encryptActionBoundArgs>): Promise<unknown>;
+//#endregion

package/dist/utils/encryption-runtime.js

@@ -1,10 +1,12 @@
-import { r as once } from "../dist-uqdtSkzK.js";
+import { n as once } from "../shared-BWJvctW6.js";
 import { a as fromBase64, i as encryptBuffer, n as concatArrayStream, r as decryptBuffer, t as arrayToStream } from "../encryption-utils-BNbYHtC4.js";
 import { renderToReadableStream } from "../react/rsc/server.js";
 import encryptionKeySource from "virtual:vite-rsc/encryption-key";
 //#region src/utils/encryption-runtime.ts
 async function encryptActionBoundArgs(originalValue) {
-	return encryptBuffer(await concatArrayStream(renderToReadableStream(originalValue)), await getEncryptionKey());
+	const serialized = renderToReadableStream(originalValue);
+	const serializedBuffer = await concatArrayStream(serialized);
+	return encryptBuffer(serializedBuffer, await getEncryptionKey());
 }
 async function decryptActionBoundArgs(encrypted) {
 	const [{ createFromReadableStream }, serializedBuffer] = await Promise.all([import("../react/rsc/client.js"), decryptBuffer(await encrypted, await getEncryptionKey())]);

package/dist/utils/rpc.d.ts

@@ -1,7 +1,6 @@
 //#region src/utils/rpc.d.ts
-declare function createRpcServer<T extends object>(handlers: T): (request: Request) => Promise<Response>;
-declare function createRpcClient<T>(options: {
+export declare function createRpcServer<T extends object>(handlers: T): (request: Request) => Promise<Response>;
+export declare function createRpcClient<T>(options: {
   endpoint: string;
 }): T;
-//#endregion
-export { createRpcClient, createRpcServer };
+//#endregion