@reckona/mreact-router 0.0.207 → 0.0.209

package/src/client.ts

@@ -53,6 +53,7 @@ const nodeBuiltinPackages = new Set(builtinModules.flatMap((name) => [name, `nod
 export interface ClientRouteManifestEntry {
   bytes?: number;
   css?: readonly string[];
+  dynamicImports?: readonly string[];
   path: string;
   kind: AppRoute["kind"];
   client: boolean;
@@ -842,14 +843,14 @@ function clientRouteComponentOrigin(options: {
     return "server-only-import";
   }
 
-  if (options.analysis.hasUseClientDirective) {
-    return "use-client-directive";
-  }
-
   if (/\.compat(?:\.mreact)?\.[cm]?[jt]sx?$/.test(options.filename)) {
     return "compat-filename";
   }
 
+  if (options.analysis.hasUseClientDirective) {
+    return "use-client-directive";
+  }
+
   if (/\.client(?:\.mreact)?\.[cm]?[jt]sx?$/.test(options.filename)) {
     return "client-filename";
   }
@@ -1853,6 +1854,11 @@ function isClientBoundaryFallbackEligibleSource(source: string, filename?: strin
     }
   }
 
+  sourceWithoutGuardedUndefinedCallbacks = removeSelfContainedIntrinsicHandlerAttributes(
+    sourceWithoutGuardedUndefinedCallbacks,
+    callbackPropNames,
+  );
+
   return (
     !/\bon[A-Z][A-Za-z0-9_$]*\s*=/u.test(sourceWithoutGuardedUndefinedCallbacks) &&
     !/\bglobalThis\b/u.test(source)
@@ -1896,6 +1902,20 @@ function propsCallbackAliasNames(source: string): Set<string> {
     }
   }
 
+  for (const match of source.matchAll(
+    /\b(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*props\s*\[\s*["']([A-Za-z_$][\w$]*)["']\s*\]/gu,
+  )) {
+    const localName = match[1];
+    const propName = match[2];
+
+    if (
+      localName !== undefined &&
+      (isCallbackPropName(propName) || isCallbackPropName(localName))
+    ) {
+      names.add(localName);
+    }
+  }
+
   for (const match of source.matchAll(
     /\b(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*\(\s*props\s+as\s+[^)]+\)\.([A-Za-z_$][\w$]*)\b/gu,
   )) {
@@ -1978,6 +1998,14 @@ function memberCallbackNames(source: string): Set<string> {
     }
   }
 
+  for (const match of source.matchAll(/\[\s*["']([A-Za-z_$][\w$]*)["']\s*\]/gu)) {
+    const memberName = match[1];
+
+    if (memberName !== undefined && isCallbackPropName(memberName)) {
+      names.add(memberName);
+    }
+  }
+
   return names;
 }
 
@@ -2009,6 +2037,56 @@ function removeSafeCallbackHandlerAttributes(
   return cursor === 0 ? source : result + source.slice(cursor);
 }
 
+function removeSelfContainedIntrinsicHandlerAttributes(
+  source: string,
+  callbackNames: ReadonlySet<string>,
+): string {
+  const attributePattern = /\bon[A-Z][A-Za-z0-9_$]*\s*=\s*\{/gu;
+  let result = "";
+  let cursor = 0;
+
+  for (const match of source.matchAll(attributePattern)) {
+    const start = match.index;
+    const expressionStart = start + match[0].length;
+    const end = matchingBraceEnd(source, expressionStart - 1);
+
+    if (end === undefined || !isIntrinsicJsxAttribute(source, start)) {
+      continue;
+    }
+
+    const expression = source.slice(expressionStart, end);
+    if (
+      !isInlineFunctionExpression(expression) ||
+      Array.from(callbackNames).some((name) =>
+        new RegExp(String.raw`\b${escapeRegExp(name)}\b`, "u").test(expression),
+      )
+    ) {
+      continue;
+    }
+
+    result += source.slice(cursor, start);
+    cursor = end + 1;
+  }
+
+  return cursor === 0 ? source : result + source.slice(cursor);
+}
+
+function isIntrinsicJsxAttribute(source: string, attributeStart: number): boolean {
+  const tagStart = source.lastIndexOf("<", attributeStart);
+  if (tagStart === -1 || source.lastIndexOf(">", attributeStart) > tagStart) {
+    return false;
+  }
+
+  return /^<\s*[a-z][A-Za-z0-9:_-]*(?:\s|$)/u.test(source.slice(tagStart, attributeStart));
+}
+
+function isInlineFunctionExpression(expression: string): boolean {
+  return (
+    /^\s*(?:async\s+)?(?:\([^)]*\)|[A-Za-z_$][\w$]*)\s*=>/u.test(expression) ||
+    /^\s*(?:async\s+)?function(?:\s+[A-Za-z_$][\w$]*)?\s*\(/u.test(expression)
+  );
+}
+
 function matchingBraceEnd(source: string, openBraceIndex: number): number | undefined {
   let depth = 0;
   let quote: '"' | "'" | "`" | undefined;
@@ -3372,10 +3450,10 @@ function __mreactResolveRouteNode(value) {
 `
     : `function __mreactSyncDomRefBindings() {}
 `;
-  const boundaryOnlyHydrationBlock = routeRequiresFullHydration
-    || clientReferenceManifest.length === 0
-    ? ""
-    : `${routeCellHydrationIndent}if (!__mreactHasNonSerializableClientBoundaries(__mreactMarker) && __mreactHydrateClientBoundaries(document, __mreactClientReferences, __mreactClientReferenceComponents)) {
+  const boundaryOnlyHydrationBlock =
+    routeRequiresFullHydration || clientReferenceManifest.length === 0
+      ? ""
+      : `${routeCellHydrationIndent}if (!__mreactHasNonSerializableClientBoundaries(__mreactMarker) && __mreactHydrateClientBoundaries(document, __mreactClientReferences, __mreactClientReferenceComponents)) {
 ${routeCellHydrationIndent}  __mreactMarker.setAttribute(${JSON.stringify(routeHydrationContract.hydratedAttribute)}, "true");
 ${routeCellHydrationIndent}  __mreactMarkRouteHydrated();
 ${routeCellHydrationIndent}  return;
@@ -3414,7 +3492,18 @@ ${routeOutOfOrderFragmentHydration}  const __mreactMarker = document.querySelect
   const __mreactProps = __mreactPropsText === undefined
     ? {}
     : JSON.parse(__mreactPropsText);
-${restoreRequestUrl ? "  if (__mreactProps.request) __mreactProps.request.url = document.URL;\n" : ""}
+${
+  restoreRequestUrl
+    ? `  if (__mreactProps.request) {
+    const __mreactRouteUrl = new URL(document.URL);
+    __mreactProps.request.url = __mreactRouteUrl.href;
+    __mreactProps.request.pathname = __mreactRouteUrl.pathname;
+    __mreactProps.request.search = __mreactRouteUrl.search;
+    __mreactProps.request.hash = __mreactRouteUrl.hash;
+  }
+`
+    : ""
+}
   const __mreactClientReferences = __mreactClientReferencesElement?.textContent === undefined
     ? []
     : JSON.parse(__mreactClientReferencesElement.textContent);
@@ -5400,6 +5489,10 @@ function workspaceRuntimePlugin(options: {
       "@reckona/mreact-compat/server",
       packageFile("react-compat", "@reckona/mreact-compat", "server"),
     ],
+    [
+      "@reckona/mreact-shared/server-render-value-internal",
+      packageFile("shared", "@reckona/mreact-shared", "server-render-value-internal"),
+    ],
     ["@reckona/mreact-reactive-dom", reactiveDomPath],
   ]);
 
@@ -5428,7 +5521,7 @@ function workspaceRuntimePlugin(options: {
       buildApi.onResolve(
         {
           filter:
-            /^(?:react(?:\/jsx-(?:dev-)?runtime)?|react-dom(?:\/(?:client|server))?|@reckona\/mreact-(?:compat|reactive-core|reactive-dom)(?:\/(?:event-priority|flight|internal|jsx-dev-runtime|jsx-runtime|scheduler))?)$/,
+            /^(?:react(?:\/jsx-(?:dev-)?runtime)?|react-dom(?:\/(?:client|server))?|@reckona\/mreact-(?:compat|reactive-core|reactive-dom)(?:\/(?:event-priority|flight|internal|jsx-dev-runtime|jsx-runtime|scheduler))?|@reckona\/mreact-shared\/server-render-value-internal)$/,
         },
         (args) => {
           const path = runtimePaths.get(args.path);
@@ -5452,6 +5545,7 @@ export function emitReactiveEffectRunDevtoolsEvent() {}
 export function hasReactiveDevtoolsEmitter() { return false; }
 export function currentDevtoolsEmitter() { return undefined; }
 export function currentReactiveDevtools() { return undefined; }
+export function registerReactiveDevtoolsResource() { return { dispose() {}, update() {} }; }
 export function invalidateReactiveDevtoolsCache() {}
 export function prepareReactiveEffectRunDevtoolsEvent() { return undefined; }`,
         loader: "ts",

package/src/config.ts

@@ -32,6 +32,12 @@ export interface AppRouterProductionOptions {
   dropClientConsole?: boolean | readonly AppRouterClientConsoleMethod[] | undefined;
 }
 
+/** Opt-in compile-time constraints for route and component execution modes. */
+export interface AppRouterExecutionContracts {
+  noCompatComponents?: readonly string[] | undefined;
+  serverOnlyRoutes?: readonly string[] | undefined;
+}
+
 export interface AppRouterProjectOptions {
   assetBaseUrl?: string | undefined;
   buildConcurrency?: number | undefined;
@@ -39,6 +45,7 @@ export interface AppRouterProjectOptions {
   clientSourceMaps?: AppRouterClientSourceMapOption | undefined;
   /** Project-local server module exporting a named `dehydrateOptions` policy. */
   dehydratePolicyModule?: string | undefined;
+  executionContracts?: AppRouterExecutionContracts | undefined;
   /**
    * Legacy route root. When provided without routesDir/projectRoot, this keeps
    * the historical "appDir is the whole app boundary" behavior.
@@ -64,6 +71,7 @@ export interface ResolvedAppRouterProject {
   clientSourceMaps: AppRouterClientSourceMapMode;
   clientConsolePureFunctions?: readonly string[] | undefined;
   dehydratePolicyModule?: string | undefined;
+  executionContracts?: AppRouterExecutionContracts | undefined;
   projectRoot: string;
   publicAssetBaseUrl?: string | undefined;
   publicDir: string;
@@ -105,6 +113,9 @@ export function resolveAppRouterProjectOptions(
               allowedSourceDirs,
             ),
           }),
+      ...(options.executionContracts === undefined
+        ? {}
+        : { executionContracts: normalizeExecutionContracts(options.executionContracts) }),
       projectRoot: appDir,
       ...(options.publicAssetBaseUrl === undefined
         ? {}
@@ -140,6 +151,9 @@ export function resolveAppRouterProjectOptions(
             allowedSourceDirs,
           ),
         }),
+    ...(options.executionContracts === undefined
+      ? {}
+      : { executionContracts: normalizeExecutionContracts(options.executionContracts) }),
     projectRoot,
     ...(options.publicAssetBaseUrl === undefined
       ? {}
@@ -149,6 +163,24 @@ export function resolveAppRouterProjectOptions(
   };
 }
 
+function normalizeExecutionContracts(
+  contracts: AppRouterExecutionContracts,
+): AppRouterExecutionContracts {
+  const noCompatComponents = uniquePatterns(contracts.noCompatComponents);
+  const serverOnlyRoutes = uniquePatterns(contracts.serverOnlyRoutes);
+
+  return {
+    ...(noCompatComponents.length === 0 ? {} : { noCompatComponents }),
+    ...(serverOnlyRoutes.length === 0 ? {} : { serverOnlyRoutes }),
+  };
+}
+
+function uniquePatterns(patterns: readonly string[] | undefined): string[] {
+  return [...new Set((patterns ?? []).filter((pattern) => pattern.length > 0))].sort(
+    (left, right) => left.localeCompare(right),
+  );
+}
+
 function resolvePolicyModule(
   projectRoot: string,
   modulePath: string,

package/src/index.ts

@@ -5,13 +5,20 @@ export {
   createBoundaryReport,
   formatBoundaryReport,
   formatBoundaryReportJson,
+  validateBoundaryExecutionContracts,
 } from "./boundaries.js";
 export type {
   AnalyzeAppBoundariesOptions,
+  BoundaryExecutionMode,
+  BoundaryReportByteCost,
   BoundaryReport,
   BoundaryReportComponent,
+  BoundaryReportCost,
+  BoundaryReportDecision,
   BoundaryReportRoute,
   BoundaryReportSummary,
+  BoundarySourcePosition,
+  BoundarySourceRange,
   CreateBoundaryReportInput,
   CreateBoundaryReportRouteInput,
 } from "./boundaries.js";
@@ -142,6 +149,7 @@ export async function rotateSession<TData>(
 export type {
   AwsLambdaArtifactManifest,
   AwsLambdaGeneratedHandlerPreloadMode,
+  BoundaryCostOptions,
   BuildAppPhase,
   BuildAppPhaseTiming,
   BuildAppOptions,
@@ -195,6 +203,7 @@ export type {
   RobotsRule,
   RouteHeadDescriptor,
   RouteHandlerContext,
+  RouteLocation,
   RouteLoader,
   RouteMetadata,
   RouteParams,
@@ -208,6 +217,7 @@ export type {
   AppRouterClientConsoleMethod,
   AppRouterClientSourceMapMode,
   AppRouterClientSourceMapOption,
+  AppRouterExecutionContracts,
   AppRouterProductionOptions,
 } from "./config.js";
 export type {

package/src/module-runner.ts

@@ -1381,6 +1381,14 @@ function workspacePackageResolutionPlugin() {
       "@reckona/mreact-server",
       { entry: "index", monorepoDir: "server", packageName: "@reckona/mreact-server" },
     ],
+    [
+      "@reckona/mreact-shared/server-render-value-internal",
+      {
+        entry: "server-render-value-internal",
+        monorepoDir: "shared",
+        packageName: "@reckona/mreact-shared",
+      },
+    ],
   ]);
   const routerEntries = new Map([
     ["@reckona/mreact-router", join(packageRoot, sourceOrDist)],
@@ -1400,7 +1408,7 @@ function workspacePackageResolutionPlugin() {
       buildApi.onResolve(
         {
           filter:
-            /^(?:react(?:\/jsx-(?:dev-)?runtime)?|react-dom(?:\/(?:client|server))?|@reckona\/(?:mreact(?:\/(?:jsx-dev-runtime|jsx-runtime))?|mreact-(?:auth|query|reactive-core|server|router|compat)(?:\/(?:event-priority|flight|internal|jsx-dev-runtime|jsx-runtime|scheduler|app-router-globals|link|native-escape|navigation-state|session|stream-list|internal\/native-escape|internal\/session))?))$/,
+            /^(?:react(?:\/jsx-(?:dev-)?runtime)?|react-dom(?:\/(?:client|server))?|@reckona\/(?:mreact(?:\/(?:jsx-dev-runtime|jsx-runtime))?|mreact-shared\/server-render-value-internal|mreact-(?:auth|query|reactive-core|server|router|compat)(?:\/(?:event-priority|flight|internal|jsx-dev-runtime|jsx-runtime|scheduler|app-router-globals|link|native-escape|navigation-state|session|stream-list|internal\/native-escape|internal\/session))?))$/,
         },
         (args) => {
           const routerPath = routerEntries.get(args.path);

package/src/render.ts

@@ -64,7 +64,11 @@ import {
 } from "./cache.js";
 import {
   trackRequestHeaderReads,
+  routeLocationFromRequest,
+  routeLocationForHydration,
+  routeLocationFromUrl,
   type TrackedHeaderRequest,
+  withTrackedRouteLocation,
   withTrackedRequest,
 } from "./request-header-tracking.js";
 import { configuredHstsHeader, hasInvalidConfiguredHsts } from "./security-headers.js";
@@ -108,6 +112,7 @@ import { viteDefineCacheKey, vitePluginsCacheKey } from "./vite-plugin-cache-key
 import type {
   ManifestDescriptor,
   RobotsManifest,
+  RouteLocation,
   RouteParams,
   RouteMetadata,
   SitemapEntry,
@@ -543,7 +548,7 @@ interface ServerComponentProps {
   data: unknown;
   params: RouteParams;
   queryClient: QueryClient;
-  request: Request;
+  request: RouteLocation;
 }
 
 type ServerComponent = (props: ServerComponentProps) => string | PromiseLike<string>;
@@ -1185,7 +1190,7 @@ async function renderAppRequestInternal(
           clientRoute,
           props: {
             params: matched.params,
-            request: { url: url.pathname },
+            request: routeLocationForHydration(url),
           },
           routePath: matched.route.path,
           script: clientScript,
@@ -1252,7 +1257,7 @@ async function renderAppRequestInternal(
             const renderedPage = await runWithQueryClient(queryClient, () =>
               runServerModuleWithSlots(
                 stringOutput.code,
-                withTrackedRequest(
+                withTrackedRouteLocation(
                   {
                     data,
                     params: matched.params,
@@ -1260,6 +1265,7 @@ async function renderAppRequestInternal(
                   },
                   appRequest,
                   trackedRequest,
+                  routeLocationFromUrl(url),
                 ),
                 matched.route.file,
                 options.serverModules,
@@ -1281,7 +1287,7 @@ async function renderAppRequestInternal(
                   script: clientScript,
                   props: {
                     params: matched.params,
-                    request: { url: url.pathname },
+                    request: routeLocationForHydration(url),
                     data,
                   },
                 })
@@ -1296,7 +1302,7 @@ async function renderAppRequestInternal(
                 appDir: options.appDir,
                 pageFile: matched.route.file,
                 html: pageHtmlForLayout,
-                props: withTrackedRequest(
+                props: withTrackedRouteLocation(
                   {
                     data,
                     params: matched.params,
@@ -1304,6 +1310,7 @@ async function renderAppRequestInternal(
                   },
                   appRequest,
                   trackedRequest,
+                  routeLocationFromUrl(url),
                 ),
                 slots: renderedPage.slots,
                 serverModules: options.serverModules,
@@ -1437,7 +1444,7 @@ async function renderAppRequestInternal(
               params: matched.params,
               queryClient,
               request: appRequest,
-              requestUrl: url.pathname,
+              requestUrl: url.href,
               trackedRequest,
               routePath: matched.route.path,
               routeScripts: options.clientScripts,
@@ -1470,7 +1477,7 @@ async function renderAppRequestInternal(
           }
 
           const data = streamData;
-          const props = withTrackedRequest(
+          const props = withTrackedRouteLocation(
             {
               data,
               params: matched.params,
@@ -1478,6 +1485,7 @@ async function renderAppRequestInternal(
             },
             appRequest,
             trackedRequest,
+            routeLocationFromUrl(url),
           );
           phaseStartedAt = renderTimingPhaseStartedAt(timing);
           const stream = runServerStreamModule(output.code, {
@@ -1487,7 +1495,7 @@ async function renderAppRequestInternal(
             markerRequest: options.request,
             prerenderVariantCapture: options.prerenderVariantCapture,
             props,
-            requestUrl: url.pathname,
+            requestUrl: url.href,
             routePath: matched.route.path,
             routeScripts: options.clientScripts,
             serverModules: options.serverModules,
@@ -1557,7 +1565,7 @@ async function renderAppRequestInternal(
         const renderedPage = await runWithQueryClient(queryClient, () =>
           runServerModuleWithSlots(
             output.code,
-            withTrackedRequest(
+            withTrackedRouteLocation(
               {
                 data,
                 params: matched.params,
@@ -1565,6 +1573,7 @@ async function renderAppRequestInternal(
               },
               appRequest,
               trackedRequest,
+              routeLocationFromUrl(url),
             ),
             matched.route.file,
             options.serverModules,
@@ -1592,7 +1601,7 @@ async function renderAppRequestInternal(
               script: clientScript,
               props: {
                 params: matched.params,
-                request: { url: url.pathname },
+                request: routeLocationForHydration(url),
                 data,
               },
             })
@@ -1608,7 +1617,7 @@ async function renderAppRequestInternal(
             appDir: options.appDir,
             pageFile: matched.route.file,
             html: pageHtmlForLayout,
-            props: withTrackedRequest(
+            props: withTrackedRouteLocation(
               {
                 data,
                 params: matched.params,
@@ -1616,6 +1625,7 @@ async function renderAppRequestInternal(
               },
               appRequest,
               trackedRequest,
+              routeLocationFromUrl(url),
             ),
             slots: renderedPage.slots,
             serverModules: options.serverModules,
@@ -2300,7 +2310,7 @@ function errorBoundaryProps(error: unknown, request: Request, routePath: string
     error: normalizeErrorForProps(error),
     params: {},
     queryClient: createQueryClient(),
-    request,
+    request: routeLocationFromRequest(request),
     requestId: requestIdForErrorContext(request),
     routeId: routeIdForPath(routePath ?? new URL(request.url).pathname),
     traceId: traceContextFromRequest(request)?.traceId,
@@ -3550,7 +3560,9 @@ function runServerStreamModule(
           script: options.script,
           props: {
             params: options.props.params,
-            request: { url: options.requestUrl },
+            request: routeLocationForHydration(
+              new URL(options.requestUrl, options.markerRequest.url),
+            ),
             data: options.props.data,
           },
         })
@@ -3797,7 +3809,7 @@ async function runServerStreamModuleWithLoading(
     importPolicy?: AppRouterImportPolicy | undefined;
   },
 ): Promise<ReadableStream<Uint8Array> | Response> {
-  const loadingProps = withTrackedRequest(
+  const loadingProps = withTrackedRouteLocation(
     {
       data: undefined,
       params: options.params,
@@ -3805,6 +3817,7 @@ async function runServerStreamModuleWithLoading(
     },
     options.request,
     options.trackedRequest,
+    routeLocationFromUrl(new URL(options.requestUrl)),
   );
   const layoutShells = await layoutShellsForPage(
     options.appDir,
@@ -3836,7 +3849,7 @@ async function runServerStreamModuleWithLoading(
         script: options.script,
         props: {
           params: options.params,
-          request: { url: options.requestUrl },
+          request: routeLocationForHydration(new URL(options.requestUrl)),
         },
       })
     : serverOnlyRouteMarkerParts(
@@ -3879,7 +3892,7 @@ async function runServerStreamModuleWithLoading(
         await appendServerStreamModule(
           code,
           boundarySink,
-          withTrackedRequest(
+          withTrackedRouteLocation(
             {
               data,
               params: options.params,
@@ -3887,6 +3900,7 @@ async function runServerStreamModuleWithLoading(
             },
             options.request,
             options.trackedRequest,
+            routeLocationFromUrl(new URL(options.requestUrl)),
           ),
           options.pageFile,
           options.serverModules,

package/src/request-header-tracking.ts

@@ -1,3 +1,5 @@
+import type { RouteLocation } from "./types.js";
+
 /**
  * Observes request inputs read by application code during a render.
  *
@@ -159,3 +161,62 @@ export function withTrackedRequest<T extends object>(
 
   return context;
 }
+
+/**
+ * Adds the serializable location view used by shared page and layout props.
+ * The full Request remains available to loaders, handlers, and metadata code.
+ */
+export function withTrackedRouteLocation<T extends object>(
+  values: T,
+  request: Request,
+  tracked: TrackedHeaderRequest | undefined,
+  location?: RouteLocation,
+): T & { request: RouteLocation } {
+  const context = values as T & { request: RouteLocation };
+  let currentLocation = location ?? routeLocationFromRequest(request);
+
+  Object.defineProperty(context, "request", {
+    configurable: true,
+    enumerable: true,
+    get() {
+      tracked?.markRequestAccess();
+      return currentLocation;
+    },
+    set(value: RouteLocation) {
+      tracked?.markRequestAccess();
+      currentLocation = value;
+    },
+  });
+
+  return context;
+}
+
+/** Returns the URL fields that are safe to serialize into route HTML. */
+export function routeLocationFromRequest(request: Request): RouteLocation {
+  return routeLocationFromUrl(new URL(request.url));
+}
+
+/** Returns a serializable route location from a URL without request metadata. */
+export function routeLocationFromUrl(url: URL): RouteLocation {
+  return {
+    hash: url.hash,
+    pathname: url.pathname,
+    search: url.search,
+    url: url.href,
+  };
+}
+
+/**
+ * Returns the route location placeholder embedded in cached HTML. The client
+ * hydration runtime replaces it with document.URL before invoking shared code.
+ * Query values stay out of reusable HTML because they can contain credentials
+ * or other request-specific data.
+ */
+export function routeLocationForHydration(url: URL): RouteLocation {
+  return {
+    hash: "",
+    pathname: url.pathname,
+    search: "",
+    url: url.pathname,
+  };
+}