@trpc/server 10.0.0-alpha.8 → 10.0.0-proxy-alpha.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-alpha.8",
+  "version": "10.0.0-proxy-alpha.53",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -12,12 +12,16 @@
   },
   "eslintConfig": {
     "rules": {
-      "explicit-module-boundary-types": "off"
+      "explicit-module-boundary-types": "off",
+      "no-restricted-imports": [
+        "error",
+        "@trpc/server"
+      ]
     }
   },
   "scripts": {
-    "test": "jest",
-    "build": "rollup -c"
+    "benchmark": "yarn tsc --project tsconfig.benchmark.json",
+    "ts-watch": "tsc --project tsconfig.watch.json"
   },
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,11 +32,21 @@
       "require": "./dist/index.js",
       "default": "./dist/index.js"
     },
+    "./adapters/aws-lambda": {
+      "import": "./dist/adapters/aws-lambda/index.mjs",
+      "require": "./dist/adapters/aws-lambda/index.js",
+      "default": "./dist/adapters/aws-lambda/index.js"
+    },
     "./adapters/express": {
       "import": "./dist/adapters/express.mjs",
       "require": "./dist/adapters/express.js",
       "default": "./dist/adapters/express.js"
     },
+    "./adapters/fastify": {
+      "import": "./dist/adapters/fastify/index.mjs",
+      "require": "./dist/adapters/fastify/index.js",
+      "default": "./dist/adapters/fastify/index.js"
+    },
     "./adapters/next": {
       "import": "./dist/adapters/next.mjs",
       "require": "./dist/adapters/next.js",
@@ -48,46 +62,61 @@
       "require": "./dist/adapters/standalone.js",
       "default": "./dist/adapters/standalone.js"
     },
-    "./adapters/fastify": {
-      "import": "./dist/adapters/fastify.mjs",
-      "require": "./dist/adapters/fastify.js",
-      "default": "./dist/adapters/fastify.js"
-    },
     "./adapters/ws": {
       "import": "./dist/adapters/ws.mjs",
       "require": "./dist/adapters/ws.js",
       "default": "./dist/adapters/ws.js"
     },
-    "./ws": {
-      "import": "./dist/ws/index.mjs",
-      "require": "./dist/ws/index.js",
-      "default": "./dist/ws/index.js"
+    "./adapters/fetch": {
+      "import": "./dist/adapters/fetch/index.mjs",
+      "require": "./dist/adapters/fetch/index.js",
+      "default": "./dist/adapters/fetch/index.js"
     },
     "./rpc": {
       "import": "./dist/rpc/index.mjs",
       "require": "./dist/rpc/index.js",
       "default": "./dist/rpc/index.js"
+    },
+    "./observable": {
+      "import": "./dist/observable/index.mjs",
+      "require": "./dist/observable/index.js",
+      "default": "./dist/observable/index.js"
+    },
+    "./subscription": {
+      "import": "./dist/subscription.mjs",
+      "require": "./dist/subscription.js",
+      "default": "./dist/subscription.js"
+    },
+    "./shared": {
+      "import": "./dist/shared/index.mjs",
+      "require": "./dist/shared/index.js",
+      "default": "./dist/shared/index.js"
     }
   },
   "files": [
-    "README.md",
     "dist",
+    "src",
+    "README.md",
     "adapters",
-    "ws",
     "rpc",
-    "src"
+    "observable",
+    "subscription",
+    "shared"
   ],
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.0.0",
-    "@testing-library/user-event": "^13.2.1",
+    "@cloudflare/workers-types": "^3.14.1",
+    "@fastify/websocket": "^5.0.0",
+    "@miniflare/core": "^2.4.0",
+    "@tanstack/react-query": "^4.0.10",
+    "@types/aws-lambda": "^8.10.97",
     "@types/express": "^4.17.12",
     "@types/hash-sum": "^1.0.0",
     "@types/ws": "^8.2.0",
     "abort-controller": "^3.0.0",
+    "aws-lambda": "^1.0.7",
     "devalue": "^2.0.1",
     "express": "^4.17.1",
     "fastify": "^3.27.1",
@@ -95,18 +124,17 @@
     "fastify-websocket": "^4.0.0",
     "hash-sum": "^2.0.0",
     "jest": "^27.1.0",
+    "jest-environment-miniflare": "^2.4.0",
     "konn": "^0.7.0",
+    "miniflare": "^2.4.0",
     "myzod": "^1.3.1",
-    "next": "^12.0.1",
+    "next": "^12.1.6",
     "node-fetch": "^2.6.1",
     "superstruct": "^0.15.2",
-    "typescript": "4.4.4",
+    "typescript": "4.7.4",
     "ws": "^8.0.0",
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "e5ded22d38809f6de68df26ed069ca3cf93bb368",
-  "dependencies": {
-    "tslib": "^2.1.0"
-  }
+  "gitHead": "1c5cae03b77ff2ba6b6b870f8dc95021605435ae"
 }

package/rpc/dist/trpc-server-rpc.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var codes = require('../../dist/codes-33cef953.cjs.dev.js');
+var codes = require('../../dist/codes-130e62df.cjs.dev.js');
 
 
 

package/rpc/dist/trpc-server-rpc.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var codes = require('../../dist/codes-e0df67c4.cjs.prod.js');
+var codes = require('../../dist/codes-aff770a3.cjs.prod.js');
 
 
 

package/rpc/dist/trpc-server-rpc.esm.js

@@ -1 +1 @@
-export { T as TRPC_ERROR_CODES_BY_KEY, a as TRPC_ERROR_CODES_BY_NUMBER } from '../../dist/codes-fe07bf82.esm.js';
+export { T as TRPC_ERROR_CODES_BY_KEY, a as TRPC_ERROR_CODES_BY_NUMBER } from '../../dist/codes-5678cc97.esm.js';

package/rpc/index.js

@@ -1 +1 @@
-module.exports = require('../dist/rpc/index');
+module.exports = require('../dist/rpc');

package/shared/index.d.ts

@@ -0,0 +1 @@
+export * from '../dist/shared';

package/shared/index.js

@@ -0,0 +1 @@
+module.exports = require('../dist/shared');

package/src/adapters/aws-lambda/index.ts

@@ -0,0 +1,173 @@
+import type {
+  Context as APIGWContext,
+  APIGatewayProxyEvent,
+  APIGatewayProxyEventV2,
+  APIGatewayProxyResult,
+  APIGatewayProxyStructuredResultV2,
+} from 'aws-lambda';
+import { TRPCError, resolveHTTPResponse } from '../..';
+import { AnyRouter, inferRouterContext } from '../../core';
+import { HTTPHeaders, HTTPRequest } from '../../http/internals/types';
+import type { HTTPResponse } from '../../http/internals/types';
+import {
+  APIGatewayEvent,
+  APIGatewayResult,
+  AWSLambdaOptions,
+  UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
+  isPayloadV1,
+  isPayloadV2,
+} from './utils';
+
+export type { CreateAWSLambdaContextOptions, AWSLambdaOptions } from './utils';
+
+function lambdaEventToHTTPRequest(event: APIGatewayEvent): HTTPRequest {
+  const query = new URLSearchParams();
+  for (const [key, value] of Object.entries(
+    event.queryStringParameters ?? {},
+  )) {
+    if (typeof value !== 'undefined') {
+      query.append(key, value);
+    }
+  }
+
+  return {
+    method: getHTTPMethod(event),
+    query: query,
+    headers: event.headers,
+    body: event.body,
+  };
+}
+
+function getHTTPMethod(event: APIGatewayEvent) {
+  if (isPayloadV1(event)) {
+    return event.httpMethod;
+  }
+  if (isPayloadV2(event)) {
+    return event.requestContext.http.method;
+  }
+  throw new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
+  });
+}
+
+function getPath(event: APIGatewayEvent) {
+  if (isPayloadV1(event)) {
+    const matches = event.resource.matchAll(/\{(.*?)\}/g);
+    for (const match of matches) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const group = match[1]!;
+      if (group.includes('+') && event.pathParameters) {
+        return event.pathParameters[group.replace('+', '')] || '';
+      }
+    }
+    return event.path.slice(1);
+  }
+  if (isPayloadV2(event)) {
+    const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
+    for (const match of matches) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const group = match[1]!;
+      if (group.includes('+') && event.pathParameters) {
+        return event.pathParameters[group.replace('+', '')] || '';
+      }
+    }
+    return event.rawPath.slice(1);
+  }
+  throw new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
+  });
+}
+function transformHeaders(headers: HTTPHeaders): APIGatewayResult['headers'] {
+  const obj: APIGatewayResult['headers'] = {};
+
+  for (const [key, value] of Object.entries(headers)) {
+    if (typeof value === 'undefined') {
+      continue;
+    }
+    obj[key] = Array.isArray(value) ? value.join(',') : value;
+  }
+  return obj;
+}
+function tRPCOutputToAPIGatewayOutput<
+  TEvent extends APIGatewayEvent,
+  TResult extends APIGatewayResult,
+>(event: TEvent, response: HTTPResponse): TResult {
+  if (isPayloadV1(event)) {
+    const resp: APIGatewayProxyResult = {
+      statusCode: response.status,
+      body: response.body ?? '',
+      headers: transformHeaders(response.headers ?? {}),
+    };
+    return resp as TResult;
+  } else if (isPayloadV2(event)) {
+    const resp: APIGatewayProxyStructuredResultV2 = {
+      statusCode: response.status,
+      body: response.body ?? undefined,
+      headers: transformHeaders(response.headers ?? {}),
+    };
+    return resp as TResult;
+  } else {
+    throw new TRPCError({
+      code: 'INTERNAL_SERVER_ERROR',
+      message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
+    });
+  }
+}
+
+/** Will check the createContext of the TRouter and get the parameter of event.
+ * @internal
+ **/
+type inferAPIGWEvent<
+  TRouter extends AnyRouter,
+  TEvent extends APIGatewayEvent,
+> = AWSLambdaOptions<TRouter, TEvent>['createContext'] extends NonNullable<
+  AWSLambdaOptions<TRouter, TEvent>['createContext']
+>
+  ? Parameters<AWSLambdaOptions<TRouter, TEvent>['createContext']>[0]['event']
+  : APIGatewayEvent;
+
+/** 1:1 mapping of v1 or v2 input events, deduces which is which.
+ * @internal
+ **/
+type inferAPIGWReturn<T> = T extends APIGatewayProxyEvent
+  ? APIGatewayProxyResult
+  : T extends APIGatewayProxyEventV2
+  ? APIGatewayProxyStructuredResultV2
+  : never;
+export function awsLambdaRequestHandler<
+  TRouter extends AnyRouter,
+  TEvent extends inferAPIGWEvent<TRouter, TEvent>,
+  TResult extends inferAPIGWReturn<TEvent>,
+>(
+  opts: AWSLambdaOptions<TRouter, TEvent>,
+): (event: TEvent, context: APIGWContext) => Promise<TResult> {
+  return async (event, context) => {
+    const req = lambdaEventToHTTPRequest(event);
+    const path = getPath(event);
+    const createContext = async function _createContext(): Promise<
+      inferRouterContext<TRouter>
+    > {
+      return await opts.createContext?.({ event, context });
+    };
+
+    const response = await resolveHTTPResponse({
+      router: opts.router,
+      batching: opts.batching,
+      responseMeta: opts?.responseMeta,
+      createContext,
+      req,
+      path,
+      error: null,
+      onError(o) {
+        opts?.onError?.({
+          ...o,
+          req: event,
+        });
+      },
+    });
+
+    return tRPCOutputToAPIGatewayOutput<TEvent, TResult>(event, response);
+  };
+}

package/src/adapters/aws-lambda/utils.ts

@@ -0,0 +1,92 @@
+import type {
+  Context as APIGWContext,
+  APIGatewayProxyEvent,
+  APIGatewayProxyEventV2,
+  APIGatewayProxyResult,
+  APIGatewayProxyStructuredResultV2,
+} from 'aws-lambda';
+import type { AnyRouter, inferRouterContext } from '../../core';
+import type { ResponseMetaFn } from '../../http/internals/types';
+import { OnErrorFunction } from '../../internals/types';
+
+export type APIGatewayEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2;
+export type APIGatewayResult =
+  | APIGatewayProxyResult
+  | APIGatewayProxyStructuredResultV2;
+
+export type CreateAWSLambdaContextOptions<T extends APIGatewayEvent> = {
+  event: T;
+  context: APIGWContext;
+};
+export type AWSLambdaCreateContextFn<
+  TRouter extends AnyRouter,
+  TEvent extends APIGatewayEvent,
+> = ({
+  event,
+  context,
+}: CreateAWSLambdaContextOptions<TEvent>) =>
+  | inferRouterContext<TRouter>
+  | Promise<inferRouterContext<TRouter>>;
+
+export type AWSLambdaOptions<
+  TRouter extends AnyRouter,
+  TEvent extends APIGatewayEvent,
+> =
+  | {
+      router: TRouter;
+      batching?: {
+        enabled: boolean;
+      };
+      onError?: OnErrorFunction<TRouter, TEvent>;
+      responseMeta?: ResponseMetaFn<TRouter>;
+    } & (
+      | {
+          /**
+           * @link https://trpc.io/docs/context
+           **/
+          createContext: AWSLambdaCreateContextFn<TRouter, TEvent>;
+        }
+      | {
+          /**
+           * @link https://trpc.io/docs/context
+           **/
+          createContext?: AWSLambdaCreateContextFn<TRouter, TEvent>;
+        }
+    );
+
+export function isPayloadV1(
+  event: APIGatewayEvent,
+): event is APIGatewayProxyEvent {
+  return determinePayloadFormat(event) == '1.0';
+}
+export function isPayloadV2(
+  event: APIGatewayEvent,
+): event is APIGatewayProxyEventV2 {
+  return determinePayloadFormat(event) == '2.0';
+}
+
+function determinePayloadFormat(
+  event: APIGatewayEvent,
+): APIGatewayPayloadFormatVersion {
+  // https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
+  // According to AWS support, version is is extracted from the version property in the event.
+  // If there is no version property, then the version is implied as 1.0
+  const unknownEvent = event as { version?: string };
+  if (typeof unknownEvent.version === 'undefined') {
+    return '1.0';
+  } else {
+    if (['1.0', '2.0'].includes(unknownEvent.version)) {
+      return unknownEvent.version as APIGatewayPayloadFormatVersion;
+    } else {
+      return 'custom';
+    }
+  }
+}
+export type DefinedAPIGatewayPayloadFormats = '1.0' | '2.0';
+export type APIGatewayPayloadFormatVersion =
+  | DefinedAPIGatewayPayloadFormats
+  | 'custom';
+
+export const UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE =
+  'Custom payload format version not handled by this adapter. Please use either 1.0 or 2.0. More information here' +
+  'https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html';

package/src/adapters/express.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type * as express from 'express';
-import { AnyRouter } from '../router';
+import { AnyRouter } from '../core';
 import { nodeHTTPRequestHandler } from './node-http';
 import {
   NodeHTTPCreateContextFnOptions,
@@ -15,10 +15,10 @@ export type CreateExpressContextOptions = NodeHTTPCreateContextFnOptions<
 export function createExpressMiddleware<TRouter extends AnyRouter>(
   opts: NodeHTTPHandlerOptions<TRouter, express.Request, express.Response>,
 ): express.Handler {
-  return (req, res) => {
-    const endpoint = req.path.substr(1);
+  return async (req, res) => {
+    const endpoint = req.path.slice(1);
 
-    nodeHTTPRequestHandler({
+    await nodeHTTPRequestHandler({
       ...opts,
       req,
       res,

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -1,13 +1,12 @@
-import { URLSearchParams } from 'url';
 import { FastifyReply, FastifyRequest } from 'fastify';
 import { assertNotBrowser } from '../../assertNotBrowser';
-import { NodeHTTPCreateContextOption } from '../node-http';
-import { AnyRouter, inferRouterContext } from '../../router';
-import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
+import { AnyRouter, inferRouterContext } from '../../core';
 import {
   HTTPBaseHandlerOptions,
   HTTPRequest,
 } from '../../http/internals/types';
+import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
+import { NodeHTTPCreateContextOption } from '../node-http';
 
 assertNotBrowser();
 
@@ -67,13 +66,12 @@ export async function fastifyRequestHandler<
   if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
     res.statusCode = result.status;
   }
-
   for (const [key, value] of Object.entries(result.headers ?? {})) {
     if (typeof value === 'undefined') {
       continue;
     }
-    res.header(key, value);
-  }
 
-  res.send(result.body);
+    void res.header(key, value);
+  }
+  await res.send(result.body);
 }

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -1,10 +1,10 @@
-/// <reference types="fastify-websocket" />
+/// <reference types="@fastify/websocket" />
 import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
-import { fastifyRequestHandler } from './fastifyRequestHandler';
-import { NodeHTTPCreateContextFnOptions } from '../node-http';
-import { applyWSSHandler, WSSHandlerOptions } from '../ws';
 import { FastifyHandlerOptions } from '.';
-import { AnyRouter } from '../..';
+import { AnyRouter } from '../../core';
+import { NodeHTTPCreateContextFnOptions } from '../node-http';
+import { WSSHandlerOptions, applyWSSHandler } from '../ws';
+import { fastifyRequestHandler } from './fastifyRequestHandler';
 
 export interface FastifyTRPCPluginOptions<TRouter extends AnyRouter> {
   prefix?: string;
@@ -30,18 +30,26 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
     },
   );
 
-  fastify.all(`${opts.prefix ?? ''}/:path`, (req, res) => {
+  let prefix = opts.prefix ?? '';
+
+  // https://github.com/fastify/fastify-plugin/blob/fe079bef6557a83794bf437e14b9b9edb8a74104/plugin.js#L11
+  // @ts-expect-error property 'default' does not exists on type ...
+  if (typeof fastifyTRPCPlugin.default !== 'function') {
+    prefix = ''; // handled by fastify internally
+  }
+
+  fastify.all(`${prefix}/:path`, async (req, res) => {
     const path = (req.params as any).path;
-    fastifyRequestHandler({ ...opts.trpcOptions, req, res, path });
+    await fastifyRequestHandler({ ...opts.trpcOptions, req, res, path });
   });
 
   if (opts.useWSS) {
     applyWSSHandler<TRouter>({
-      ...(opts.trpcOptions as WSSHandlerOptions<TRouter>),
+      ...(opts.trpcOptions as unknown as WSSHandlerOptions<TRouter>),
       wss: fastify.websocketServer,
     });
     // eslint-disable-next-line @typescript-eslint/no-empty-function
-    fastify.get(opts.prefix ?? '/', { websocket: true }, () => {});
+    fastify.get(prefix ?? '/', { websocket: true }, () => {});
   }
 
   done();

package/src/adapters/fetch/fetchRequestHandler.ts

@@ -0,0 +1,61 @@
+import { assertNotBrowser } from '../../assertNotBrowser';
+import { AnyRouter } from '../../core';
+import { HTTPRequest } from '../../http/internals/types';
+import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
+import { FetchHandlerOptions } from './types';
+
+assertNotBrowser();
+
+export type FetchHandlerRequestOptions<TRouter extends AnyRouter> = {
+  req: Request;
+  endpoint: string;
+} & FetchHandlerOptions<TRouter>;
+
+export async function fetchRequestHandler<TRouter extends AnyRouter>(
+  opts: FetchHandlerRequestOptions<TRouter>,
+): Promise<Response> {
+  const createContext = async () => {
+    return opts.createContext?.({ req: opts.req });
+  };
+
+  const url = new URL(opts.req.url);
+  const path = url.pathname.slice(opts.endpoint.length + 1);
+  const req: HTTPRequest = {
+    query: url.searchParams,
+    method: opts.req.method,
+    headers: Object.fromEntries(opts.req.headers),
+    body: await opts.req.text(),
+  };
+
+  const result = await resolveHTTPResponse({
+    req,
+    createContext,
+    path,
+    router: opts.router,
+    batching: opts.batching,
+    responseMeta: opts.responseMeta,
+    onError(o) {
+      opts?.onError?.({ ...o, req: opts.req });
+    },
+  });
+
+  const res = new Response(result.body, {
+    status: result.status,
+  });
+
+  for (const [key, value] of Object.entries(result.headers ?? {})) {
+    if (typeof value === 'undefined') {
+      continue;
+    }
+
+    if (typeof value === 'string') {
+      res.headers.set(key, value);
+      continue;
+    }
+
+    for (const v of value) {
+      res.headers.append(key, v);
+    }
+  }
+  return res;
+}

package/src/adapters/fetch/index.ts

@@ -0,0 +1,2 @@
+export * from './fetchRequestHandler';
+export * from './types';

package/src/adapters/fetch/types.ts

@@ -0,0 +1,28 @@
+import { AnyRouter, inferRouterContext } from '../../core';
+import { HTTPBaseHandlerOptions } from '../../http/internals/types';
+
+export type FetchCreateContextFnOptions = {
+  req: Request;
+};
+
+export type FetchCreateContextFn<TRouter extends AnyRouter> = (opts: {
+  req: Request;
+}) => inferRouterContext<TRouter> | Promise<inferRouterContext<TRouter>>;
+
+export type FetchCreateContextOption<TRouter extends AnyRouter> =
+  unknown extends inferRouterContext<TRouter>
+    ? {
+        /**
+         * @link https://trpc.io/docs/context
+         **/
+        createContext?: FetchCreateContextFn<TRouter>;
+      }
+    : {
+        /**
+         * @link https://trpc.io/docs/context
+         **/
+        createContext: FetchCreateContextFn<TRouter>;
+      };
+
+export type FetchHandlerOptions<TRouter extends AnyRouter> =
+  HTTPBaseHandlerOptions<TRouter, Request> & FetchCreateContextOption<TRouter>;

package/src/adapters/lambda/index.ts

@@ -0,0 +1,18 @@
+import {
+  CreateAWSLambdaContextOptions,
+  awsLambdaRequestHandler,
+} from '../aws-lambda';
+import { APIGatewayEvent } from '../aws-lambda/utils';
+
+export * from '../aws-lambda';
+
+/**
+ * @deprecated use `aws-lambda` instead
+ */
+export type CreateLambdaContextOptions<T extends APIGatewayEvent> =
+  CreateAWSLambdaContextOptions<T>;
+
+/**
+ * @deprecated use `aws-lambda` instead
+ */
+export const lambdaRequestHandler = awsLambdaRequestHandler;