@orpc/nest 2.0.0-beta.24 → 2.0.0-beta.26

package/dist/index.mjs

@@ -1,12 +1,12 @@
 import { Readable } from 'node:stream';
-import { Module, applyDecorators, Options, Delete, Patch, Put, Post, Get, Head, HttpCode, UseInterceptors, StreamableFile, HttpException, Injectable, Inject, Optional } from '@nestjs/common';
+import { Module, applyDecorators, UseInterceptors, StreamableFile, HttpException, Options, Delete, Patch, Put, Post, Get, Head, HttpCode, Injectable, Inject, Optional } from '@nestjs/common';
 import { HttpAdapterHost } from '@nestjs/core';
 import { ProcedureContract, getPathMeta } from '@orpc/contract';
 import { getOpenAPIMeta, DEFAULT_OPENAPI_METHOD, getDynamicPathParams } from '@orpc/openapi';
 import { OpenAPIHandlerCodecCore } from '@orpc/openapi/standard';
-import { DEFAULT_SUCCESS_STATUS, getRouter, unlazy, Procedure } from '@orpc/server';
+import { unlazy, Procedure, DEFAULT_SUCCESS_STATUS, getRouter } from '@orpc/server';
 import { StandardHandler } from '@orpc/server/standard';
-import { mergeHttpPath, value, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
+import { value, isAsyncIteratorObject, stringifyJSON, mergeHttpPath, NullProtoObj } from '@orpc/shared';
 import { flattenStandardHeader, generateContentDisposition } from '@standardserver/core';
 import { toStandardLazyRequest, toEventStream } from '@standardserver/node';
 import { mergeMap } from 'rxjs';
@@ -76,45 +76,66 @@ const MethodDecoratorMap = {
 };
 function Implement(contract) {
   if (contract instanceof ProcedureContract) {
-    const meta = getOpenAPIMeta(contract);
-    if (meta?.path === void 0) {
-      throw new TypeError(`
-        @Implement decorator requires contract to have a 'openapi.path' meta.
-        Please define one using '.meta(openapi({ path: '/example' }))'.
-        Or use "populateRouterContractOpenAPIPaths" from "@orpc/openapi" utility to automatically fill in any missing paths.
-      `);
-    }
-    const method = meta.method ?? DEFAULT_OPENAPI_METHOD;
-    const path = toNestPattern(meta.prefix ? mergeHttpPath(meta.prefix, meta.path) : meta.path);
-    const successStatus = meta.successStatus ?? DEFAULT_SUCCESS_STATUS;
     return (target, propertyKey, descriptor) => {
       applyDecorators(
-        MethodDecoratorMap[method](path),
-        HttpCode(successStatus),
+        toNestRouteDecorator(contract),
         UseInterceptors(ImplementInterceptor)
       )(target, propertyKey, descriptor);
     };
   }
   return (target, propertyKey, descriptor) => {
-    for (const key in contract) {
-      let methodName = `${propertyKey}_${key}`;
-      let i = 0;
-      while (methodName in target) {
-        methodName = `${propertyKey}_${key}_${i++}`;
-      }
-      target[methodName] = async function(...args) {
-        const router = await descriptor.value.apply(this, args);
-        return getRouter(router, [key]);
-      };
+    UseInterceptors(ImplementInterceptor)(target, propertyKey, descriptor);
+    implementRouterContract(contract, target, propertyKey, descriptor);
+  };
+}
+function toNestRouteDecorator(contract) {
+  const meta = getOpenAPIMeta(contract);
+  if (meta?.path === void 0) {
+    throw new TypeError(`
+      @Implement decorator requires contract to have a 'openapi.path' meta.
+      Please define one using '.meta(openapi({ path: '/example' }))'.
+      Or use "populateRouterContractOpenAPIPaths" from "@orpc/openapi" utility to automatically fill in any missing paths.
+    `);
+  }
+  const method = meta.method ?? DEFAULT_OPENAPI_METHOD;
+  const path = toNestPattern(meta.prefix ? mergeHttpPath(meta.prefix, meta.path) : meta.path);
+  const successStatus = meta.successStatus ?? DEFAULT_SUCCESS_STATUS;
+  return applyDecorators(
+    MethodDecoratorMap[method](path),
+    HttpCode(successStatus)
+  );
+}
+function implementRouterContract(contract, target, propertyKey, descriptor) {
+  for (const key in contract) {
+    let methodName = `${propertyKey}_${key}`;
+    let i = 0;
+    while (methodName in target) {
+      methodName = `${propertyKey}_${key}_${i++}`;
+    }
+    target[methodName] = async function(...args) {
+      const router = await descriptor.value.apply(this, args);
+      return getRouter(router, [key]);
+    };
+    Object.setPrototypeOf(target[methodName], descriptor.value);
+    queueMicrotask(() => {
       for (const p of Reflect.getOwnMetadataKeys(target, propertyKey)) {
         Reflect.defineMetadata(p, Reflect.getOwnMetadata(p, target, propertyKey), target, methodName);
       }
       for (const p of Reflect.getOwnMetadataKeys(target.constructor, propertyKey)) {
         Reflect.defineMetadata(p, Reflect.getOwnMetadata(p, target.constructor, propertyKey), target.constructor, methodName);
       }
-      Implement(contract[key])(target, methodName, Object.getOwnPropertyDescriptor(target, methodName));
+    });
+    const childContract = contract[key];
+    const childDescriptor = Object.getOwnPropertyDescriptor(target, methodName);
+    if (childContract instanceof ProcedureContract) {
+      const routeDecorator = toNestRouteDecorator(childContract);
+      queueMicrotask(() => {
+        routeDecorator(target, methodName, childDescriptor);
+      });
+    } else {
+      implementRouterContract(childContract, target, methodName, childDescriptor);
     }
-  };
+  }
 }
 let ImplementInterceptor = class {
   config;
@@ -239,21 +260,26 @@ function flattenParamValue(value2) {
 }
 function toORPCOpenAPIParams(contract, params) {
   const meta = getOpenAPIMeta(contract);
-  if (!params || meta?.path === void 0) {
-    return void 0;
-  }
-  const dynamicParams = getDynamicPathParams(meta.prefix ? mergeHttpPath(meta.prefix, meta.path) : meta.path);
-  if (!dynamicParams) {
+  if (!params || meta?.path === void 0 || Object.keys(params).length === 0) {
     return void 0;
   }
-  return dynamicParams.reduce((acc, config) => {
-    const value2 = config.allowsSlash ? flattenParamValue(params?.["*"] ?? params?.path) : flattenParamValue(params?.[config.parameterName]);
-    if (value2 === void 0) {
-      return acc;
+  const orpcParams = new NullProtoObj();
+  const restKey = Object.hasOwn(params, "*") ? "*" : "path";
+  for (const [key, value2] of Object.entries(params)) {
+    if (key === restKey) {
+      const restParams = getDynamicPathParams(
+        meta.prefix ? mergeHttpPath(meta.prefix, meta.path) : meta.path
+      )?.filter((c) => c.allowsSlash);
+      if (restParams?.length) {
+        for (const c of restParams) {
+          orpcParams[c.parameterName] = flattenParamValue(value2);
+        }
+        continue;
+      }
     }
-    acc[config.parameterName] = value2;
-    return acc;
-  }, {});
+    orpcParams[key] = flattenParamValue(value2);
+  }
+  return orpcParams;
 }
 function toNestPattern(path) {
   const params = getDynamicPathParams(path);

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@orpc/nest",
   "type": "module",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.26",
   "license": "MIT",
+  "funding": "https://github.com/sponsors/dinwwwh",
   "homepage": "https://orpc.dev",
   "repository": {
     "type": "git",
@@ -39,11 +40,11 @@
   "dependencies": {
     "@standardserver/core": "^0.7.1",
     "@standardserver/node": "^0.7.1",
-    "@orpc/contract": "2.0.0-beta.24",
-    "@orpc/client": "2.0.0-beta.24",
-    "@orpc/openapi": "2.0.0-beta.24",
-    "@orpc/shared": "2.0.0-beta.24",
-    "@orpc/server": "2.0.0-beta.24"
+    "@orpc/client": "2.0.0-beta.26",
+    "@orpc/contract": "2.0.0-beta.26",
+    "@orpc/openapi": "2.0.0-beta.26",
+    "@orpc/server": "2.0.0-beta.26",
+    "@orpc/shared": "2.0.0-beta.26"
   },
   "devDependencies": {
     "@fastify/cookie": "^11.0.2",