@orpc/server 0.0.0-next.df024bb → 0.0.0-next.e0f01a5

package/dist/shared/server.DFuJLDuo.mjs

@@ -0,0 +1,190 @@
+import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
+import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
+import '@orpc/standard-server/batch';
+import { ORPCError, toORPCError } from '@orpc/client';
+import { S as StrictGetMethodPlugin } from './server.BW-nUGgA.mjs';
+import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.C37gDhSZ.mjs';
+
+class CompositeStandardHandlerPlugin {
+  plugins;
+  constructor(plugins = []) {
+    this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+  }
+  init(options) {
+    for (const plugin of this.plugins) {
+      plugin.init?.(options);
+    }
+  }
+}
+
+class StandardHandler {
+  constructor(router, matcher, codec, options) {
+    this.matcher = matcher;
+    this.codec = codec;
+    const plugins = new CompositeStandardHandlerPlugin(options.plugins);
+    plugins.init(options);
+    this.interceptors = toArray(options.interceptors);
+    this.clientInterceptors = toArray(options.clientInterceptors);
+    this.rootInterceptors = toArray(options.rootInterceptors);
+    this.matcher.init(router);
+  }
+  interceptors;
+  clientInterceptors;
+  rootInterceptors;
+  async handle(request, options) {
+    const prefix = options.prefix?.replace(/\/$/, "") || void 0;
+    if (prefix && !request.url.pathname.startsWith(`${prefix}/`) && request.url.pathname !== prefix) {
+      return { matched: false, response: void 0 };
+    }
+    return intercept(
+      this.rootInterceptors,
+      { ...options, request, prefix },
+      async (interceptorOptions) => {
+        let isDecoding = false;
+        try {
+          return await intercept(
+            this.interceptors,
+            interceptorOptions,
+            async ({ request: request2, context, prefix: prefix2 }) => {
+              const method = request2.method;
+              const url = request2.url;
+              const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
+              const match = await this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`);
+              if (!match) {
+                return { matched: false, response: void 0 };
+              }
+              const client = createProcedureClient(match.procedure, {
+                context,
+                path: match.path,
+                interceptors: this.clientInterceptors
+              });
+              isDecoding = true;
+              const input = await this.codec.decode(request2, match.params, match.procedure);
+              isDecoding = false;
+              const lastEventId = Array.isArray(request2.headers["last-event-id"]) ? request2.headers["last-event-id"].at(-1) : request2.headers["last-event-id"];
+              const output = await client(input, { signal: request2.signal, lastEventId });
+              const response = this.codec.encode(output, match.procedure);
+              return {
+                matched: true,
+                response
+              };
+            }
+          );
+        } catch (e) {
+          const error = isDecoding && !(e instanceof ORPCError) ? new ORPCError("BAD_REQUEST", {
+            message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
+            cause: e
+          }) : toORPCError(e);
+          const response = this.codec.encodeError(error);
+          return {
+            matched: true,
+            response
+          };
+        }
+      }
+    );
+  }
+}
+
+class StandardRPCCodec {
+  constructor(serializer) {
+    this.serializer = serializer;
+  }
+  async decode(request, _params, _procedure) {
+    const serialized = request.method === "GET" ? parseEmptyableJSON(request.url.searchParams.getAll("data").at(-1)) : await request.body();
+    return this.serializer.deserialize(serialized);
+  }
+  encode(output, _procedure) {
+    return {
+      status: 200,
+      headers: {},
+      body: this.serializer.serialize(output)
+    };
+  }
+  encodeError(error) {
+    return {
+      status: error.status,
+      headers: {},
+      body: this.serializer.serialize(error.toJSON())
+    };
+  }
+}
+
+class StandardRPCMatcher {
+  tree = {};
+  pendingRouters = [];
+  init(router, path = []) {
+    const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {
+      const httpPath = toHttpPath(path2);
+      if (isProcedure(contract)) {
+        this.tree[httpPath] = {
+          path: path2,
+          contract,
+          procedure: contract,
+          // this mean dev not used contract-first so we can used contract as procedure directly
+          router
+        };
+      } else {
+        this.tree[httpPath] = {
+          path: path2,
+          contract,
+          procedure: void 0,
+          router
+        };
+      }
+    });
+    this.pendingRouters.push(...laziedOptions.map((option) => ({
+      ...option,
+      httpPathPrefix: toHttpPath(option.path)
+    })));
+  }
+  async match(_method, pathname) {
+    if (this.pendingRouters.length) {
+      const newPendingRouters = [];
+      for (const pendingRouter of this.pendingRouters) {
+        if (pathname.startsWith(pendingRouter.httpPathPrefix)) {
+          const { default: router } = await unlazy(pendingRouter.router);
+          this.init(router, pendingRouter.path);
+        } else {
+          newPendingRouters.push(pendingRouter);
+        }
+      }
+      this.pendingRouters = newPendingRouters;
+    }
+    const match = this.tree[pathname];
+    if (!match) {
+      return void 0;
+    }
+    if (!match.procedure) {
+      const { default: maybeProcedure } = await unlazy(getRouter(match.router, match.path));
+      if (!isProcedure(maybeProcedure)) {
+        throw new Error(`
+          [Contract-First] Missing or invalid implementation for procedure at path: ${toHttpPath(match.path)}.
+          Ensure that the procedure is correctly defined and matches the expected contract.
+        `);
+      }
+      match.procedure = createContractedProcedure(maybeProcedure, match.contract);
+    }
+    return {
+      path: match.path,
+      procedure: match.procedure
+    };
+  }
+}
+
+class StandardRPCHandler extends StandardHandler {
+  constructor(router, options) {
+    options.plugins ??= [];
+    const strictGetMethodPluginEnabled = options.strictGetMethodPluginEnabled ?? true;
+    if (strictGetMethodPluginEnabled) {
+      options.plugins.push(new StrictGetMethodPlugin());
+    }
+    const jsonSerializer = new StandardRPCJsonSerializer(options);
+    const serializer = new StandardRPCSerializer(jsonSerializer);
+    const matcher = new StandardRPCMatcher();
+    const codec = new StandardRPCCodec(serializer);
+    super(router, matcher, codec, options);
+  }
+}
+
+export { CompositeStandardHandlerPlugin as C, StandardHandler as S, StandardRPCCodec as a, StandardRPCHandler as b, StandardRPCMatcher as c };

package/dist/shared/server.DMhSfHk1.d.ts

@@ -0,0 +1,10 @@
+import { C as Context } from './server.BVHsfJ99.js';
+import { g as StandardHandleOptions } from './server.CaWivVk3.js';
+
+type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+
+export type { FriendlyStandardHandleOptions as F };

package/dist/shared/server.D_vpYits.d.ts

@@ -0,0 +1,18 @@
+import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
+import { C as Context, R as Router } from './server.BVHsfJ99.js';
+import { b as StandardHandlerOptions, i as StandardHandler } from './server.CaWivVk3.js';
+
+interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
+    /**
+     * Enables or disables the StrictGetMethodPlugin.
+     *
+     * @default true
+     */
+    strictGetMethodPluginEnabled?: boolean;
+}
+declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
+    constructor(router: Router<any, T>, options: StandardRPCHandlerOptions<T>);
+}
+
+export { StandardRPCHandler as a };
+export type { StandardRPCHandlerOptions as S };

package/dist/shared/server.Dwnm6cSk.d.mts

@@ -0,0 +1,10 @@
+import { C as Context } from './server.BVHsfJ99.mjs';
+import { g as StandardHandleOptions } from './server.B1oIHH_j.mjs';
+
+type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+
+export type { FriendlyStandardHandleOptions as F };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.df024bb",
+  "version": "0.0.0-next.e0f01a5",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,16 +34,6 @@
       "import": "./dist/adapters/fetch/index.mjs",
       "default": "./dist/adapters/fetch/index.mjs"
     },
-    "./hono": {
-      "types": "./dist/adapters/hono/index.d.mts",
-      "import": "./dist/adapters/hono/index.mjs",
-      "default": "./dist/adapters/hono/index.mjs"
-    },
-    "./next": {
-      "types": "./dist/adapters/next/index.d.mts",
-      "import": "./dist/adapters/next/index.mjs",
-      "default": "./dist/adapters/next/index.mjs"
-    },
     "./node": {
       "types": "./dist/adapters/node/index.d.mts",
       "import": "./dist/adapters/node/index.mjs",
@@ -53,20 +43,16 @@
   "files": [
     "dist"
   ],
-  "peerDependencies": {
-    "hono": ">=4.6.0",
-    "next": ">=14.0.0"
-  },
   "dependencies": {
-    "@orpc/client": "0.0.0-next.df024bb",
-    "@orpc/shared": "0.0.0-next.df024bb",
-    "@orpc/standard-server": "0.0.0-next.df024bb",
-    "@orpc/contract": "0.0.0-next.df024bb",
-    "@orpc/standard-server-fetch": "0.0.0-next.df024bb",
-    "@orpc/standard-server-node": "0.0.0-next.df024bb"
+    "@orpc/client": "0.0.0-next.e0f01a5",
+    "@orpc/shared": "0.0.0-next.e0f01a5",
+    "@orpc/contract": "0.0.0-next.e0f01a5",
+    "@orpc/standard-server-fetch": "0.0.0-next.e0f01a5",
+    "@orpc/standard-server-node": "0.0.0-next.e0f01a5",
+    "@orpc/standard-server": "0.0.0-next.e0f01a5"
   },
   "devDependencies": {
-    "light-my-request": "^6.5.1"
+    "supertest": "^7.1.0"
   },
   "scripts": {
     "build": "unbuild",

package/dist/adapters/hono/index.d.mts

@@ -1,20 +0,0 @@
-import { FetchHandler } from '../fetch/index.mjs';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.mjs';
-import { Value, MaybeOptionalOptions } from '@orpc/shared';
-import { Context as Context$1, MiddlewareHandler } from 'hono';
-import { C as Context } from '../../shared/server.ptXwNGQr.mjs';
-import { S as StandardHandleOptions } from '../../shared/server.BT-fqIEm.mjs';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.BMaJxq9W.mjs';
-import '@orpc/client';
-import '@orpc/contract';
-import '@orpc/standard-server';
-
-type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: Value<T, [Context$1]>;
-} : {
-    context: Value<T, [Context$1]>;
-});
-declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
-
-export { type CreateMiddlewareOptions, FetchHandler, createMiddleware };

package/dist/adapters/hono/index.d.ts

@@ -1,20 +0,0 @@
-import { FetchHandler } from '../fetch/index.js';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.js';
-import { Value, MaybeOptionalOptions } from '@orpc/shared';
-import { Context as Context$1, MiddlewareHandler } from 'hono';
-import { C as Context } from '../../shared/server.ptXwNGQr.js';
-import { S as StandardHandleOptions } from '../../shared/server.xL87pHsk.js';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.DpdgHO1j.js';
-import '@orpc/client';
-import '@orpc/contract';
-import '@orpc/standard-server';
-
-type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: Value<T, [Context$1]>;
-} : {
-    context: Value<T, [Context$1]>;
-});
-declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
-
-export { type CreateMiddlewareOptions, FetchHandler, createMiddleware };

package/dist/adapters/hono/index.mjs

@@ -1,32 +0,0 @@
-export { R as RPCHandler } from '../../shared/server.KwueCzFr.mjs';
-import { value } from '@orpc/shared';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.BBGuTxHE.mjs';
-import '@orpc/client';
-import '../../shared/server.Q6ZmnTgO.mjs';
-import '../../shared/server.V6zT5iYQ.mjs';
-import '@orpc/contract';
-import '@orpc/client/standard';
-
-function createMiddleware(handler, ...[options]) {
-  return async (c, next) => {
-    const bodyProps = /* @__PURE__ */ new Set(["arrayBuffer", "blob", "formData", "json", "text"]);
-    const request = c.req.method === "GET" || c.req.method === "HEAD" ? c.req.raw : new Proxy(c.req.raw, {
-      // https://github.com/honojs/middleware/blob/main/packages/trpc-server/src/index.ts#L39
-      get(target, prop) {
-        if (bodyProps.has(prop)) {
-          return () => c.req[prop]();
-        }
-        return Reflect.get(target, prop, target);
-      }
-    });
-    const context = await value(options?.context ?? {}, c);
-    const { matched, response } = await handler.handle(request, { ...options, context });
-    if (matched) {
-      return c.newResponse(response.body, response);
-    }
-    await next();
-  };
-}
-
-export { createMiddleware };

package/dist/adapters/next/index.d.mts

@@ -1,27 +0,0 @@
-import { FetchHandler } from '../fetch/index.mjs';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.mjs';
-import { Value, MaybeOptionalOptions } from '@orpc/shared';
-import { NextRequest } from 'next/server';
-import { C as Context } from '../../shared/server.ptXwNGQr.mjs';
-import { S as StandardHandleOptions } from '../../shared/server.BT-fqIEm.mjs';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.BMaJxq9W.mjs';
-import '@orpc/client';
-import '@orpc/contract';
-import '@orpc/standard-server';
-
-type ServeOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: Value<T, [NextRequest]>;
-} : {
-    context: Value<T, [NextRequest]>;
-});
-interface ServeResult {
-    GET(req: NextRequest): Promise<Response>;
-    POST(req: NextRequest): Promise<Response>;
-    PUT(req: NextRequest): Promise<Response>;
-    PATCH(req: NextRequest): Promise<Response>;
-    DELETE(req: NextRequest): Promise<Response>;
-}
-declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
-
-export { FetchHandler, type ServeOptions, type ServeResult, serve };

package/dist/adapters/next/index.d.ts

@@ -1,27 +0,0 @@
-import { FetchHandler } from '../fetch/index.js';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.js';
-import { Value, MaybeOptionalOptions } from '@orpc/shared';
-import { NextRequest } from 'next/server';
-import { C as Context } from '../../shared/server.ptXwNGQr.js';
-import { S as StandardHandleOptions } from '../../shared/server.xL87pHsk.js';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.DpdgHO1j.js';
-import '@orpc/client';
-import '@orpc/contract';
-import '@orpc/standard-server';
-
-type ServeOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: Value<T, [NextRequest]>;
-} : {
-    context: Value<T, [NextRequest]>;
-});
-interface ServeResult {
-    GET(req: NextRequest): Promise<Response>;
-    POST(req: NextRequest): Promise<Response>;
-    PUT(req: NextRequest): Promise<Response>;
-    PATCH(req: NextRequest): Promise<Response>;
-    DELETE(req: NextRequest): Promise<Response>;
-}
-declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
-
-export { FetchHandler, type ServeOptions, type ServeResult, serve };

package/dist/adapters/next/index.mjs

@@ -1,29 +0,0 @@
-export { R as RPCHandler } from '../../shared/server.KwueCzFr.mjs';
-import { value } from '@orpc/shared';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.BBGuTxHE.mjs';
-import '@orpc/client';
-import '../../shared/server.Q6ZmnTgO.mjs';
-import '../../shared/server.V6zT5iYQ.mjs';
-import '@orpc/contract';
-import '@orpc/client/standard';
-
-function serve(handler, ...[options]) {
-  const main = async (req) => {
-    const context = await value(options?.context ?? {}, req);
-    const { matched, response } = await handler.handle(req, { ...options, context });
-    if (matched) {
-      return response;
-    }
-    return new Response(`Cannot find a matching procedure for ${req.url}`, { status: 404 });
-  };
-  return {
-    GET: main,
-    POST: main,
-    PUT: main,
-    PATCH: main,
-    DELETE: main
-  };
-}
-
-export { serve };

package/dist/shared/server.BBGuTxHE.mjs

@@ -1,163 +0,0 @@
-import { ORPCError, toORPCError } from '@orpc/client';
-import { intercept, trim, parseEmptyableJSON } from '@orpc/shared';
-import { C as CompositePlugin } from './server.Q6ZmnTgO.mjs';
-import { c as createProcedureClient, e as eachContractProcedure, a as convertPathToHttpPath, i as isProcedure, u as unlazy, g as getRouterChild, b as createContractedProcedure } from './server.V6zT5iYQ.mjs';
-import { RPCSerializer } from '@orpc/client/standard';
-
-class StandardHandler {
-  constructor(router, matcher, codec, options = {}) {
-    this.matcher = matcher;
-    this.codec = codec;
-    this.options = options;
-    this.plugin = new CompositePlugin(options.plugins);
-    this.plugin.init(this.options);
-    this.matcher.init(router);
-  }
-  plugin;
-  handle(request, ...[options]) {
-    return intercept(
-      this.options.rootInterceptors ?? [],
-      {
-        request,
-        ...options,
-        context: options?.context ?? {}
-        // context is optional only when all fields are optional so we can safely force it to have a context
-      },
-      async (interceptorOptions) => {
-        let isDecoding = false;
-        try {
-          return await intercept(
-            this.options.interceptors ?? [],
-            interceptorOptions,
-            async (interceptorOptions2) => {
-              const method = interceptorOptions2.request.method;
-              const url = interceptorOptions2.request.url;
-              const pathname = `/${trim(url.pathname.replace(interceptorOptions2.prefix ?? "", ""), "/")}`;
-              const match = await this.matcher.match(method, pathname);
-              if (!match) {
-                return { matched: false, response: void 0 };
-              }
-              const client = createProcedureClient(match.procedure, {
-                context: interceptorOptions2.context,
-                path: match.path,
-                interceptors: this.options.clientInterceptors
-              });
-              isDecoding = true;
-              const input = await this.codec.decode(request, match.params, match.procedure);
-              isDecoding = false;
-              const lastEventId = Array.isArray(request.headers["last-event-id"]) ? request.headers["last-event-id"].at(-1) : request.headers["last-event-id"];
-              const output = await client(input, { signal: request.signal, lastEventId });
-              const response = this.codec.encode(output, match.procedure);
-              return {
-                matched: true,
-                response
-              };
-            }
-          );
-        } catch (e) {
-          const error = isDecoding ? new ORPCError("BAD_REQUEST", {
-            message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
-            cause: e
-          }) : toORPCError(e);
-          const response = this.codec.encodeError(error);
-          return {
-            matched: true,
-            response
-          };
-        }
-      }
-    );
-  }
-}
-
-class RPCCodec {
-  serializer;
-  constructor(options = {}) {
-    this.serializer = options.serializer ?? new RPCSerializer();
-  }
-  async decode(request, _params, _procedure) {
-    const serialized = request.method === "GET" ? parseEmptyableJSON(request.url.searchParams.getAll("data").at(-1)) : await request.body();
-    return this.serializer.deserialize(serialized);
-  }
-  encode(output, _procedure) {
-    return {
-      status: 200,
-      headers: {},
-      body: this.serializer.serialize(output)
-    };
-  }
-  encodeError(error) {
-    return {
-      status: error.status,
-      headers: {},
-      body: this.serializer.serialize(error.toJSON())
-    };
-  }
-}
-
-class RPCMatcher {
-  tree = {};
-  pendingRouters = [];
-  init(router, path = []) {
-    const laziedOptions = eachContractProcedure({
-      router,
-      path
-    }, ({ path: path2, contract }) => {
-      const httpPath = convertPathToHttpPath(path2);
-      if (isProcedure(contract)) {
-        this.tree[httpPath] = {
-          path: path2,
-          contract,
-          procedure: contract,
-          // this mean dev not used contract-first so we can used contract as procedure directly
-          router
-        };
-      } else {
-        this.tree[httpPath] = {
-          path: path2,
-          contract,
-          procedure: void 0,
-          router
-        };
-      }
-    });
-    this.pendingRouters.push(...laziedOptions.map((option) => ({
-      ...option,
-      httpPathPrefix: convertPathToHttpPath(option.path)
-    })));
-  }
-  async match(_method, pathname) {
-    if (this.pendingRouters.length) {
-      const newPendingRouters = [];
-      for (const pendingRouter of this.pendingRouters) {
-        if (pathname.startsWith(pendingRouter.httpPathPrefix)) {
-          const { default: router } = await unlazy(pendingRouter.lazied);
-          this.init(router, pendingRouter.path);
-        } else {
-          newPendingRouters.push(pendingRouter);
-        }
-      }
-      this.pendingRouters = newPendingRouters;
-    }
-    const match = this.tree[pathname];
-    if (!match) {
-      return void 0;
-    }
-    if (!match.procedure) {
-      const { default: maybeProcedure } = await unlazy(getRouterChild(match.router, ...match.path));
-      if (!isProcedure(maybeProcedure)) {
-        throw new Error(`
-          [Contract-First] Missing or invalid implementation for procedure at path: ${convertPathToHttpPath(match.path)}.
-          Ensure that the procedure is correctly defined and matches the expected contract.
-        `);
-      }
-      match.procedure = createContractedProcedure(match.contract, maybeProcedure);
-    }
-    return {
-      path: match.path,
-      procedure: match.procedure
-    };
-  }
-}
-
-export { RPCCodec as R, StandardHandler as S, RPCMatcher as a };

package/dist/shared/server.BMaJxq9W.d.mts

@@ -1,9 +0,0 @@
-import { C as Context } from './server.ptXwNGQr.mjs';
-import { a as StandardHandlerOptions, b as StandardMatcher, c as StandardCodec } from './server.BT-fqIEm.mjs';
-
-interface RPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T> {
-    matcher?: StandardMatcher;
-    codec?: StandardCodec;
-}
-
-export type { RPCHandlerOptions as R };